diff --git a/docs/protocol/schema.mdx b/docs/protocol/schema.mdx
index b24163ea..4793c6ba 100644
--- a/docs/protocol/schema.mdx
+++ b/docs/protocol/schema.mdx
@@ -44,6 +44,18 @@ Specifies which authentication method to use.
advertised in the initialize response.
+#### AuthenticateResponse
+
+Response to authenticate method
+
+**Type:** Object
+
+**Properties:**
+
+
+ Extension point for implementations
+
+
### initialize
Establishes the connection with a client and negotiates protocol capabilities.
@@ -210,6 +222,24 @@ See protocol docs: [Loading Sessions](https://agentclientprotocol.com/protocol/s
The ID of the session to load.
+#### LoadSessionResponse
+
+Response from loading an existing session.
+
+**Type:** Object
+
+**Properties:**
+
+
+ Extension point for implementations
+
+SessionModeState | null} >
+ **UNSTABLE**
+
+This field is not part of the spec, and may be removed or changed at any point.
+
+
+
### session/new
@@ -406,6 +436,19 @@ Only available if the client supports the `fs.readTextFile` capability.
The session ID for this request.
+#### ReadTextFileResponse
+
+Response containing the contents of a text file.
+
+**Type:** Object
+
+**Properties:**
+
+
+ Extension point for implementations
+
+
+
### fs/write_text_file
@@ -443,6 +486,18 @@ Only available if the client supports the `fs.writeTextFile` capability.
The session ID for this request.
+#### WriteTextFileResponse
+
+Response to fs/write_text_file
+
+**Type:** Object
+
+**Properties:**
+
+
+ Extension point for implementations
+
+
### session/request_permission
@@ -676,6 +731,18 @@ Request to kill a terminal command without releasing the terminal.
The ID of the terminal to kill.
+#### KillTerminalCommandResponse
+
+Response to terminal/kill command method
+
+**Type:** Object
+
+**Properties:**
+
+
+ Extension point for implementations
+
+
### terminal/output
@@ -777,6 +844,18 @@ Request to release a terminal and free its resources.
The ID of the terminal to release.
+#### ReleaseTerminalResponse
+
+Response to terminal/release method
+
+**Type:** Object
+
+**Properties:**
+
+
+ Extension point for implementations
+
+
### terminal/wait_for_exit
@@ -1346,24 +1425,6 @@ An image provided to or from an LLM.
-## LoadSessionResponse
-
-Response from loading an existing session.
-
-**Type:** Object
-
-**Properties:**
-
-
- Extension point for implementations
-
-SessionModeState | null} >
- **UNSTABLE**
-
-This field is not part of the spec, and may be removed or changed at any point.
-
-
-
## McpCapabilities
MCP capabilities supported by the agent
@@ -1723,19 +1784,6 @@ Non-breaking changes should be introduced via capabilities.
| Minimum | `0` |
| Maximum | `65535` |
-## ReadTextFileResponse
-
-Response containing the contents of a text file.
-
-**Type:** Object
-
-**Properties:**
-
-
- Extension point for implementations
-
-
-
## RequestPermissionOutcome
The outcome of a permission request.
@@ -2142,7 +2190,11 @@ The current mode of the session has changed
This type is not part of the spec, and may be removed or changed at any point.
-**Type:** `object`
+**Type:** Object
+
+**Properties:**
+
+
## StopReason
diff --git a/rust/acp.rs b/rust/acp.rs
index fb66ed2e..84e5ce95 100644
--- a/rust/acp.rs
+++ b/rust/acp.rs
@@ -176,13 +176,17 @@ impl Agent for ClientSideConnection {
.await
}
- async fn authenticate(&self, arguments: AuthenticateRequest) -> Result<(), Error> {
+ async fn authenticate(
+ &self,
+ arguments: AuthenticateRequest,
+ ) -> Result {
self.conn
- .request(
+ .request::>(
AUTHENTICATE_METHOD_NAME,
Some(ClientRequest::AuthenticateRequest(arguments)),
)
.await
+ .map(|value| value.unwrap_or_default())
}
async fn new_session(&self, arguments: NewSessionRequest) -> Result {
@@ -199,11 +203,12 @@ impl Agent for ClientSideConnection {
arguments: LoadSessionRequest,
) -> Result {
self.conn
- .request(
+ .request::>(
SESSION_LOAD_METHOD_NAME,
Some(ClientRequest::LoadSessionRequest(arguments)),
)
.await
+ .map(|value| value.unwrap_or_default())
}
#[cfg(feature = "unstable")]
@@ -349,8 +354,8 @@ impl MessageHandler for T {
Ok(ClientResponse::RequestPermissionResponse(response))
}
AgentRequest::WriteTextFileRequest(args) => {
- self.write_text_file(args).await?;
- Ok(ClientResponse::WriteTextFileResponse)
+ let response = self.write_text_file(args).await?;
+ Ok(ClientResponse::WriteTextFileResponse(response))
}
AgentRequest::ReadTextFileRequest(args) => {
let response = self.read_text_file(args).await?;
@@ -365,16 +370,16 @@ impl MessageHandler for T {
Ok(ClientResponse::TerminalOutputResponse(response))
}
AgentRequest::ReleaseTerminalRequest(args) => {
- self.release_terminal(args).await?;
- Ok(ClientResponse::ReleaseTerminalResponse)
+ let response = self.release_terminal(args).await?;
+ Ok(ClientResponse::ReleaseTerminalResponse(response))
}
AgentRequest::WaitForTerminalExitRequest(args) => {
let response = self.wait_for_terminal_exit(args).await?;
Ok(ClientResponse::WaitForTerminalExitResponse(response))
}
AgentRequest::KillTerminalCommandRequest(args) => {
- self.kill_terminal_command(args).await?;
- Ok(ClientResponse::KillTerminalResponse)
+ let response = self.kill_terminal_command(args).await?;
+ Ok(ClientResponse::KillTerminalResponse(response))
}
AgentRequest::ExtMethodRequest(args) => {
let response = self.ext_method(args.method, args.params).await?;
@@ -466,13 +471,17 @@ impl Client for AgentSideConnection {
.await
}
- async fn write_text_file(&self, arguments: WriteTextFileRequest) -> Result<(), Error> {
+ async fn write_text_file(
+ &self,
+ arguments: WriteTextFileRequest,
+ ) -> Result {
self.conn
- .request(
+ .request::>(
FS_WRITE_TEXT_FILE_METHOD_NAME,
Some(AgentRequest::WriteTextFileRequest(arguments)),
)
.await
+ .map(|value| value.unwrap_or_default())
}
async fn read_text_file(
@@ -511,13 +520,17 @@ impl Client for AgentSideConnection {
.await
}
- async fn release_terminal(&self, arguments: ReleaseTerminalRequest) -> Result<(), Error> {
+ async fn release_terminal(
+ &self,
+ arguments: ReleaseTerminalRequest,
+ ) -> Result {
self.conn
- .request(
+ .request::>(
TERMINAL_RELEASE_METHOD_NAME,
Some(AgentRequest::ReleaseTerminalRequest(arguments)),
)
.await
+ .map(|value| value.unwrap_or_default())
}
async fn wait_for_terminal_exit(
@@ -535,13 +548,14 @@ impl Client for AgentSideConnection {
async fn kill_terminal_command(
&self,
arguments: KillTerminalCommandRequest,
- ) -> Result<(), Error> {
+ ) -> Result {
self.conn
- .request(
+ .request::>(
TERMINAL_KILL_METHOD_NAME,
Some(AgentRequest::KillTerminalCommandRequest(arguments)),
)
.await
+ .map(|value| value.unwrap_or_default())
}
async fn session_notification(&self, notification: SessionNotification) -> Result<(), Error> {
@@ -657,8 +671,8 @@ impl MessageHandler for T {
Ok(AgentResponse::InitializeResponse(response))
}
ClientRequest::AuthenticateRequest(args) => {
- self.authenticate(args).await?;
- Ok(AgentResponse::AuthenticateResponse)
+ let response = self.authenticate(args).await?;
+ Ok(AgentResponse::AuthenticateResponse(response))
}
ClientRequest::NewSessionRequest(args) => {
let response = self.new_session(args).await?;
diff --git a/rust/agent.rs b/rust/agent.rs
index 0b9da83e..3d1a3019 100644
--- a/rust/agent.rs
+++ b/rust/agent.rs
@@ -45,7 +45,7 @@ pub trait Agent {
fn authenticate(
&self,
arguments: AuthenticateRequest,
- ) -> impl Future