sibling of 899bc8a8fd

crates/acp_thread/Cargo.toml

@@ -16,7 +16,7 @@ doctest = false
 test-support = ["gpui/test-support", "project/test-support"]
 
 [dependencies]
-agent-client-protocol.workspace = true
+agentic-coding-protocol.workspace = true
 anyhow.workspace = true
 assistant_tool.workspace = true
 buffer_diff.workspace = true
@@ -36,12 +36,11 @@ util.workspace = true
 workspace-hack.workspace = true
 
 [dev-dependencies]
+async-pipe.workspace = true
 env_logger.workspace = true
 gpui = { workspace = true, "features" = ["test-support"] }
 indoc.workspace = true
-parking_lot.workspace = true
 project = { workspace = true, "features" = ["test-support"] }
-rand.workspace = true
 tempfile.workspace = true
 util.workspace = true
 settings.workspace = true

crates/acp_thread/src/connection.rs

@@ -1,36 +1,20 @@
-use std::{error::Error, fmt, path::Path, rc::Rc};
-
-use agent_client_protocol::{self as acp};
+use agentic_coding_protocol as acp;
 use anyhow::Result;
-use gpui::{AsyncApp, Entity, Task};
-use project::Project;
-use ui::App;
-
-use crate::AcpThread;
+use futures::future::{FutureExt as _, LocalBoxFuture};
 
 pub trait AgentConnection {
-    fn new_thread(
-        self: Rc<Self>,
-        project: Entity<Project>,
-        cwd: &Path,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<Entity<AcpThread>>>;
-
-    fn auth_methods(&self) -> &[acp::AuthMethod];
-
-    fn authenticate(&self, method: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>>;
-
-    fn prompt(&self, params: acp::PromptRequest, cx: &mut App) -> Task<Result<()>>;
-
-    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App);
+    fn request_any(
+        &self,
+        params: acp::AnyAgentRequest,
+    ) -> LocalBoxFuture<'static, Result<acp::AnyAgentResult>>;
 }
 
-#[derive(Debug)]
-pub struct AuthRequired;
-
-impl Error for AuthRequired {}
-impl fmt::Display for AuthRequired {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "AuthRequired")
+impl AgentConnection for acp::AgentConnection {
+    fn request_any(
+        &self,
+        params: acp::AnyAgentRequest,
+    ) -> LocalBoxFuture<'static, Result<acp::AnyAgentResult>> {
+        let task = self.request_any(params);
+        async move { Ok(task.await?) }.boxed_local()
     }
 }