acp: Update to 0.0.30 (#36643)

Agus Zubiaga created 2 months ago

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

Release Notes:

- N/A

Change summary

Cargo.lock                          | 4 ++--
Cargo.toml                          | 2 +-
crates/acp_thread/src/acp_thread.rs | 2 +-
crates/acp_thread/src/connection.rs | 2 +-
crates/agent2/src/tests/mod.rs      | 4 ++--
crates/agent2/src/thread.rs         | 2 +-
crates/agent_servers/src/acp/v1.rs  | 4 ++--
crates/agent_servers/src/claude.rs  | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)

Detailed changes

Cargo.lock

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

Cargo.toml

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

crates/acp_thread/src/acp_thread.rs

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

crates/acp_thread/src/connection.rs

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

crates/agent2/src/tests/mod.rs

@@ -975,7 +975,7 @@ async fn test_cancellation(cx: &mut TestAppContext) {
     assert!(
         matches!(
             last_event,
-            Some(Ok(ThreadEvent::Stop(acp::StopReason::Canceled)))
+            Some(Ok(ThreadEvent::Stop(acp::StopReason::Cancelled)))
         ),
         "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();
 
     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;
     assert_eq!(stop_events(events_2), vec![acp::StopReason::EndTurn]);
 }

crates/agent2/src/thread.rs

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

crates/agent_servers/src/acp/v1.rs

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

crates/agent_servers/src/claude.rs

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