Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

acp: Update to 0.0.30 (#36643)

Browse source 
See: https://github.com/zed-industries/agent-client-protocol/pull/20

Release Notes:

- N/A
This commit is contained in:
Agus Zubiaga 2025-08-20 21:10:36 -03:00 • committed by GitHub
parent 8ef9ecc91f
commit 6f242772cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -171,9 +171,9 @@ dependencies = [
[[package]] [[package]]
name = "agent-client-protocol" name = "agent-client-protocol"
version = "0.0.29" version = "0.0.30"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89a2cd7e0bd2bb7ed27687cfcf6561b91542c1ce23e52fd54ee59b7568c9bd84" checksum = "5f792e009ba59b137ee1db560bc37e567887ad4b5af6f32181d381fff690e2d4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"futures 0.3.31", "futures 0.3.31",

2
Cargo.toml
View file

@ -423,7 +423,7 @@ zlog_settings = { path = "crates/zlog_settings" }
# #
agentic-coding-protocol = "0.0.10" agentic-coding-protocol = "0.0.10"
agent-client-protocol = "0.0.29" agent-client-protocol = "0.0.30"
aho-corasick = "1.1" aho-corasick = "1.1"
alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" } alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
any_vec = "0.14" any_vec = "0.14"

2
crates/acp_thread/src/acp_thread.rs
View file

@ -1381,7 +1381,7 @@ impl AcpThread {
let canceled = matches!( let canceled = matches!(
result, result,
Ok(Ok(acp::PromptResponse { Ok(Ok(acp::PromptResponse {
stop_reason: acp::StopReason::Canceled stop_reason: acp::StopReason::Cancelled
})) }))
); );

2
crates/acp_thread/src/connection.rs
View file

@ -420,7 +420,7 @@ mod test_support {
.response_tx .response_tx
.take() .take()
{ {
end_turn_tx.send(acp::StopReason::Canceled).unwrap(); end_turn_tx.send(acp::StopReason::Cancelled).unwrap();
} }
} }

4
crates/agent2/src/tests/mod.rs
View file

@ -975,7 +975,7 @@ async fn test_cancellation(cx: &mut TestAppContext) {
assert!( assert!(
matches!( matches!(
last_event, last_event,
Some(Ok(ThreadEvent::Stop(acp::StopReason::Canceled))) Some(Ok(ThreadEvent::Stop(acp::StopReason::Cancelled)))
), ),
"unexpected event {last_event:?}" "unexpected event {last_event:?}"
); );
@ -1029,7 +1029,7 @@ async fn test_in_progress_send_canceled_by_next_send(cx: &mut TestAppContext) {
fake_model.end_last_completion_stream(); fake_model.end_last_completion_stream();
let events_1 = events_1.collect::<Vec<_>>().await; let events_1 = events_1.collect::<Vec<_>>().await;
assert_eq!(stop_events(events_1), vec![acp::StopReason::Canceled]); assert_eq!(stop_events(events_1), vec![acp::StopReason::Cancelled]);
let events_2 = events_2.collect::<Vec<_>>().await; let events_2 = events_2.collect::<Vec<_>>().await;
assert_eq!(stop_events(events_2), vec![acp::StopReason::EndTurn]); assert_eq!(stop_events(events_2), vec![acp::StopReason::EndTurn]);
} }

2
crates/agent2/src/thread.rs
View file

@ -2248,7 +2248,7 @@ impl ThreadEventStream {
fn send_canceled(&self) { fn send_canceled(&self) {
self.0 self.0
.unbounded_send(Ok(ThreadEvent::Stop(acp::StopReason::Canceled))) .unbounded_send(Ok(ThreadEvent::Stop(acp::StopReason::Cancelled)))
.ok(); .ok();
} }

4
crates/agent_servers/src/acp/v1.rs
View file

@ -242,7 +242,7 @@ impl AgentConnection for AcpConnection {
if suppress_abort_err && details.contains("This operation was aborted") if suppress_abort_err && details.contains("This operation was aborted")
{ {
Ok(acp::PromptResponse { Ok(acp::PromptResponse {
stop_reason: acp::StopReason::Canceled, stop_reason: acp::StopReason::Cancelled,
}) })
} else { } else {
Err(anyhow!(details)) Err(anyhow!(details))
@ -302,7 +302,7 @@ impl acp::Client for ClientDelegate {
let outcome = match result { let outcome = match result {
Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option }, Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Canceled, Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
}; };
Ok(acp::RequestPermissionResponse { outcome }) Ok(acp::RequestPermissionResponse { outcome })

2
crates/agent_servers/src/claude.rs
View file

@ -705,7 +705,7 @@ impl ClaudeAgentSession {
let stop_reason = match subtype { let stop_reason = match subtype {
ResultErrorType::Success => acp::StopReason::EndTurn, ResultErrorType::Success => acp::StopReason::EndTurn,
ResultErrorType::ErrorMaxTurns => acp::StopReason::MaxTurnRequests, ResultErrorType::ErrorMaxTurns => acp::StopReason::MaxTurnRequests,
ResultErrorType::ErrorDuringExecution => acp::StopReason::Canceled, ResultErrorType::ErrorDuringExecution => acp::StopReason::Cancelled,
}; };
end_turn_tx end_turn_tx
.send(Ok(acp::PromptResponse { stop_reason })) .send(Ok(acp::PromptResponse { stop_reason }))