Update protocol schema to 0.11.0 and add session config option request

Author: xiaoyewang

Cargo.toml

@@ -19,7 +19,7 @@ tokio = { version = "1.48", features = ["full"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 
 # Protocol
-agent-client-protocol-schema = "0.10.5"
+agent-client-protocol-schema = "0.11.0"
 
 # Serialization
 serde = { version = "1.0", features = ["derive"] }

src/sacp/src/mcp_server/builder.rs

@@ -511,19 +511,21 @@ trait ErasedMcpTool<Counterpart: Role>: Send + Sync {
 /// Create an `rmcp` tool model from our [`McpTool`] trait.
 fn make_tool_model<R: Role, M: McpTool<R>>(tool: &M) -> Tool {
     {
-        rmcp::model::Tool::new(
+        let mut tool_model = rmcp::model::Tool::new(
             tool.name(),
             tool.description(),
             schema_for_type::<M::Input>(),
         )
+        .with_execution(rmcp::model::ToolExecution::new());
+
         // schema_for_output returns Err for non-object types (strings, integers, etc.)
-        // since MCP structured output requires JSON objects. We use .ok() to set
-        // output_schema to None for these tools, signaling unstructured output.
-        .with_raw_output_schema(schema_for_output::<M::Output>().ok())
-        .with_annotations(None)
-        .with_icons(None)
-        .with_meta(None)
-        .with_execution(Some(rmcp::model::ToolExecution::new()))
+        // since MCP structured output requires JSON objects. We only set output_schema
+        // when we have a valid object schema.
+        if let Ok(schema) = schema_for_output::<M::Output>() {
+            tool_model = tool_model.with_raw_output_schema(schema);
+        }
+
+        tool_model
     }
 }
 

src/sacp/src/schema/agent_to_client/requests.rs

@@ -2,8 +2,8 @@ use serde::Serialize;
 
 use crate::jsonrpc::{JsonRpcMessage, JsonRpcRequest, JsonRpcResponse};
 use crate::schema::{
-    CreateTerminalRequest, CreateTerminalResponse, KillTerminalCommandRequest,
-    KillTerminalCommandResponse, ReadTextFileRequest, ReadTextFileResponse, ReleaseTerminalRequest,
+    CreateTerminalRequest, CreateTerminalResponse, KillTerminalRequest,
+    KillTerminalResponse, ReadTextFileRequest, ReadTextFileResponse, ReleaseTerminalRequest,
     ReleaseTerminalResponse, RequestPermissionRequest, RequestPermissionResponse,
     TerminalOutputRequest, TerminalOutputResponse, WaitForTerminalExitRequest,
     WaitForTerminalExitResponse, WriteTextFileRequest, WriteTextFileResponse,
@@ -301,12 +301,12 @@ impl JsonRpcResponse for WaitForTerminalExitResponse {
 }
 
 // ============================================================================
-// KillTerminalCommandRequest
+// KillTerminalRequest
 // ============================================================================
 
 const METHOD_KILL_TERMINAL: &str = "terminal/kill";
 
-impl JsonRpcMessage for KillTerminalCommandRequest {
+impl JsonRpcMessage for KillTerminalRequest {
     fn matches_method(method: &str) -> bool {
         method == METHOD_KILL_TERMINAL
     }
@@ -327,11 +327,11 @@ impl JsonRpcMessage for KillTerminalCommandRequest {
     }
 }
 
-impl JsonRpcRequest for KillTerminalCommandRequest {
-    type Response = KillTerminalCommandResponse;
+impl JsonRpcRequest for KillTerminalRequest {
+    type Response = KillTerminalResponse;
 }
 
-impl JsonRpcResponse for KillTerminalCommandResponse {
+impl JsonRpcResponse for KillTerminalResponse {
     fn into_json(self, _method: &str) -> Result<serde_json::Value, crate::Error> {
         serde_json::to_value(self).map_err(crate::Error::into_internal_error)
     }

src/sacp/src/schema/client_to_agent/requests.rs

@@ -1,7 +1,8 @@
 use crate::schema::{
     AuthenticateRequest, AuthenticateResponse, InitializeRequest, InitializeResponse,
     LoadSessionRequest, LoadSessionResponse, NewSessionRequest, NewSessionResponse, PromptRequest,
-    PromptResponse, SetSessionModeRequest, SetSessionModeResponse,
+    PromptResponse, SetSessionConfigOptionRequest, SetSessionConfigOptionResponse,
+    SetSessionModeRequest, SetSessionModeResponse,
 };
 use serde::Serialize;
 
@@ -15,6 +16,7 @@ const METHOD_SESSION_LOAD: &str = "session/load";
 const METHOD_SESSION_NEW: &str = "session/new";
 const METHOD_SESSION_PROMPT: &str = "session/prompt";
 const METHOD_SESSION_SET_MODE: &str = "session/set_mode";
+const METHOD_SESSION_SET_CONFIG_OPTION: &str = "session/set_config_option";
 
 // ============================================================================
 // InitializeRequest
@@ -249,3 +251,42 @@ impl JsonRpcResponse for SetSessionModeResponse {
         json_cast(&value)
     }
 }
+
+// ============================================================================
+// SetSessionConfigOptionRequest
+// ============================================================================
+
+impl JsonRpcMessage for SetSessionConfigOptionRequest {
+    fn matches_method(method: &str) -> bool {
+        method == METHOD_SESSION_SET_CONFIG_OPTION
+    }
+
+    fn method(&self) -> &str {
+        METHOD_SESSION_SET_CONFIG_OPTION
+    }
+
+    fn to_untyped_message(&self) -> Result<crate::UntypedMessage, crate::Error> {
+        crate::UntypedMessage::new(self.method(), self)
+    }
+
+    fn parse_message(method: &str, params: &impl Serialize) -> Result<Self, crate::Error> {
+        if !Self::matches_method(method) {
+            return Err(crate::Error::method_not_found());
+        }
+        json_cast(params)
+    }
+}
+
+impl JsonRpcRequest for SetSessionConfigOptionRequest {
+    type Response = SetSessionConfigOptionResponse;
+}
+
+impl JsonRpcResponse for SetSessionConfigOptionResponse {
+    fn into_json(self, _method: &str) -> Result<serde_json::Value, crate::Error> {
+        serde_json::to_value(self).map_err(crate::Error::into_internal_error)
+    }
+
+    fn from_value(_method: &str, value: serde_json::Value) -> Result<Self, crate::Error> {
+        json_cast(&value)
+    }
+}

src/sacp/src/schema/enum_impls.rs

@@ -30,6 +30,7 @@ impl JsonRpcMessage for ClientRequest {
             ClientRequest::NewSessionRequest(_) => "session/new",
             ClientRequest::LoadSessionRequest(_) => "session/load",
             ClientRequest::SetSessionModeRequest(_) => "session/set_mode",
+            ClientRequest::SetSessionConfigOptionRequest(_) => "session/set_config_option",
             ClientRequest::PromptRequest(_) => "session/prompt",
             ClientRequest::ExtMethodRequest(ext) => &ext.method,
             _ => "_unknown",
@@ -47,6 +48,7 @@ impl JsonRpcMessage for ClientRequest {
             "session/new" => json_cast(params).map(ClientRequest::NewSessionRequest),
             "session/load" => json_cast(params).map(ClientRequest::LoadSessionRequest),
             "session/set_mode" => json_cast(params).map(ClientRequest::SetSessionModeRequest),
+            "session/set_config_option" => json_cast(params).map(ClientRequest::SetSessionConfigOptionRequest),
             "session/prompt" => json_cast(params).map(ClientRequest::PromptRequest),
             _ => {
                 // Check for extension methods (prefixed with underscore)
@@ -128,7 +130,7 @@ impl JsonRpcMessage for AgentRequest {
             AgentRequest::TerminalOutputRequest(_) => "terminal/output",
             AgentRequest::ReleaseTerminalRequest(_) => "terminal/release",
             AgentRequest::WaitForTerminalExitRequest(_) => "terminal/wait_for_exit",
-            AgentRequest::KillTerminalCommandRequest(_) => "terminal/kill",
+            AgentRequest::KillTerminalRequest(_) => "terminal/kill",
             AgentRequest::ExtMethodRequest(ext) => &ext.method,
             _ => "_unknown",
         }
@@ -151,7 +153,7 @@ impl JsonRpcMessage for AgentRequest {
             "terminal/wait_for_exit" => {
                 json_cast(params).map(AgentRequest::WaitForTerminalExitRequest)
             }
-            "terminal/kill" => json_cast(params).map(AgentRequest::KillTerminalCommandRequest),
+            "terminal/kill" => json_cast(params).map(AgentRequest::KillTerminalRequest),
             _ => {
                 // Check for extension methods (prefixed with underscore)
                 if let Some(custom_method) = method.strip_prefix('_') {