Pull in core schema

Author: benbrandt

Cargo.lock

@@ -17,7 +17,7 @@ include = ["/src/**/*.rs", "/README.md", "/LICENSE", "/Cargo.toml"]
 unstable = ["agent-client-protocol-schema/unstable"]
 
 [dependencies]
-agent-client-protocol-schema = { git = "https://github.com/agentclientprotocol/agent-client-protocol.git", package = "agent-client-protocol" }
+agent-client-protocol-schema = { git = "https://github.com/agentclientprotocol/agent-client-protocol.git" }
 anyhow = "1"
 async-broadcast = "0.7"
 async-trait = "0.1"

Cargo.toml

@@ -14,10 +14,7 @@
 
 use std::cell::Cell;
 
-use agent_client_protocol::{
-    self as acp, AuthenticateResponse, Client, ExtNotification, ExtRequest, ExtResponse,
-    SessionNotification, SetSessionModeResponse,
-};
+use agent_client_protocol::{self as acp, Client as _};
 use serde_json::json;
 use tokio::sync::{mpsc, oneshot};
 use tokio_util::compat::{TokioAsyncReadCompatExt as _, TokioAsyncWriteCompatExt as _};
@@ -56,9 +53,9 @@ impl acp::Agent for ExampleAgent {
     async fn authenticate(
         &self,
         arguments: acp::AuthenticateRequest,
-    ) -> Result<AuthenticateResponse, acp::Error> {
+    ) -> Result<acp::AuthenticateResponse, acp::Error> {
         log::info!("Received authenticate request {arguments:?}");
-        Ok(AuthenticateResponse::default())
+        Ok(acp::AuthenticateResponse::default())
     }
 
     async fn new_session(
@@ -99,7 +96,7 @@ impl acp::Agent for ExampleAgent {
             let (tx, rx) = oneshot::channel();
             self.session_update_tx
                 .send((
-                    SessionNotification {
+                    acp::SessionNotification {
                         session_id: arguments.session_id.clone(),
                         update: acp::SessionUpdate::AgentMessageChunk { content },
                         meta: None,
@@ -125,7 +122,7 @@ impl acp::Agent for ExampleAgent {
         args: acp::SetSessionModeRequest,
     ) -> Result<acp::SetSessionModeResponse, acp::Error> {
         log::info!("Received set session mode request {args:?}");
-        Ok(SetSessionModeResponse::default())
+        Ok(acp::SetSessionModeResponse::default())
     }
 
     #[cfg(feature = "unstable")]
@@ -137,7 +134,7 @@ impl acp::Agent for ExampleAgent {
         Ok(acp::SetSessionModelResponse::default())
     }
 
-    async fn ext_method(&self, args: ExtRequest) -> Result<ExtResponse, acp::Error> {
+    async fn ext_method(&self, args: acp::ExtRequest) -> Result<acp::ExtResponse, acp::Error> {
         log::info!(
             "Received extension method call: method={}, params={:?}",
             args.method,
@@ -146,7 +143,7 @@ impl acp::Agent for ExampleAgent {
         Ok(serde_json::value::to_raw_value(&json!({"example": "response"}))?.into())
     }
 
-    async fn ext_notification(&self, args: ExtNotification) -> Result<(), acp::Error> {
+    async fn ext_notification(&self, args: acp::ExtNotification) -> Result<(), acp::Error> {
         log::info!(
             "Received extension notification: method={}, params={:?}",
             args.method,

examples/agent.rs

@@ -12,9 +12,7 @@
 //! cargo build --example agent && cargo run --example client -- target/debug/examples/agent
 //! ```
 
-use agent_client_protocol::{
-    self as acp, Agent, ExtNotification, ExtRequest, ExtResponse, KillTerminalCommandResponse,
-};
+use agent_client_protocol::{self as acp, Agent as _};
 use anyhow::bail;
 use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
 
@@ -74,7 +72,7 @@ impl acp::Client for ExampleClient {
     async fn kill_terminal_command(
         &self,
         _args: acp::KillTerminalCommandRequest,
-    ) -> anyhow::Result<KillTerminalCommandResponse, acp::Error> {
+    ) -> anyhow::Result<acp::KillTerminalCommandResponse, acp::Error> {
         Err(acp::Error::method_not_found())
     }
 
@@ -104,11 +102,11 @@ impl acp::Client for ExampleClient {
         Ok(())
     }
 
-    async fn ext_method(&self, _args: ExtRequest) -> Result<ExtResponse, acp::Error> {
+    async fn ext_method(&self, _args: acp::ExtRequest) -> Result<acp::ExtResponse, acp::Error> {
         Err(acp::Error::method_not_found())
     }
 
-    async fn ext_notification(&self, _args: ExtNotification) -> Result<(), acp::Error> {
+    async fn ext_notification(&self, _args: acp::ExtNotification) -> Result<(), acp::Error> {
         Err(acp::Error::method_not_found())
     }
 }

examples/client.rs

@@ -1,18 +1,3 @@
-pub use agent_client_protocol_schema::{
-    AGENT_METHOD_NAMES, AgentCapabilities, AgentNotification, AgentRequest, AgentResponse,
-    AuthenticateRequest, AuthenticateResponse, CLIENT_METHOD_NAMES, CancelNotification,
-    ClientCapabilities, ClientNotification, ClientRequest, ClientResponse, ContentBlock,
-    CreateTerminalRequest, CreateTerminalResponse, Error, ExtNotification, ExtRequest, ExtResponse,
-    InitializeRequest, InitializeResponse, KillTerminalCommandRequest, KillTerminalCommandResponse,
-    LoadSessionRequest, LoadSessionResponse, NewSessionRequest, NewSessionResponse, PromptRequest,
-    PromptResponse, RawValue, ReadTextFileRequest, ReadTextFileResponse, ReleaseTerminalRequest,
-    ReleaseTerminalResponse, RequestPermissionRequest, RequestPermissionResponse, SessionId,
-    SessionNotification, SessionUpdate, SetSessionModeRequest, SetSessionModeResponse, StopReason,
-    TerminalOutputRequest, TerminalOutputResponse, V1, WaitForTerminalExitRequest,
-    WaitForTerminalExitResponse, WriteTextFileRequest, WriteTextFileResponse,
-};
-#[cfg(feature = "unstable")]
-pub use agent_client_protocol_schema::{SetSessionModelRequest, SetSessionModelResponse};
 use anyhow::Result;
 use futures::{AsyncRead, AsyncWrite, future::LocalBoxFuture};
 use rpc::{MessageHandler, RpcConnection, Side};
@@ -25,7 +10,7 @@ mod rpc_tests;
 mod stream_broadcast;
 
 pub use agent::*;
-// pub use agent_client_protocol_schema::*; // TODO
+pub use agent_client_protocol_schema::*;
 pub use client::*;
 pub use stream_broadcast::{
     StreamMessage, StreamMessageContent, StreamMessageDirection, StreamReceiver,