Merge pull request #123 from jamadeo/rmcp-1.2.0

Update to rmcp 1.2.0

Author: nikomatsakis

Cargo.toml

@@ -39,7 +39,7 @@ tracing-appender = "0.2"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
 
 # MCP SDK
-rmcp = { version = "1.0.0-alpha", features = ["server", "transport-io", "schemars"] }
+rmcp = { version = "1.2.0", features = ["server", "transport-io", "schemars"] }
 
 # CLI parsing
 clap = { version = "4.5", features = ["derive"] }

src/sacp-conductor/tests/trace_client_mcp_server.rs

@@ -439,7 +439,7 @@ async fn test_trace_client_mcp_server() -> Result<(), sacp::Error> {
                         "capabilities": Object {},
                         "clientInfo": Object {
                             "name": String("rmcp"),
-                            "version": String("1.0.0-alpha"),
+                            "version": String("1.2.0"),
                         },
                         "protocolVersion": String("2025-06-18"),
                     },
@@ -460,7 +460,7 @@ async fn test_trace_client_mcp_server() -> Result<(), sacp::Error> {
                         "protocolVersion": String("2025-06-18"),
                         "serverInfo": Object {
                             "name": String("rmcp"),
-                            "version": String("1.0.0-alpha"),
+                            "version": String("1.2.0"),
                         },
                     },
                 },

src/sacp-conductor/tests/trace_mcp_tool_call.rs

@@ -425,7 +425,7 @@ async fn test_trace_mcp_tool_call() -> Result<(), sacp::Error> {
                         "capabilities": Object {},
                         "clientInfo": Object {
                             "name": String("rmcp"),
-                            "version": String("1.0.0-alpha"),
+                            "version": String("1.2.0"),
                         },
                         "protocolVersion": String("2025-06-18"),
                     },
@@ -446,7 +446,7 @@ async fn test_trace_mcp_tool_call() -> Result<(), sacp::Error> {
                         "protocolVersion": String("2025-06-18"),
                         "serverInfo": Object {
                             "name": String("rmcp"),
-                            "version": String("1.0.0-alpha"),
+                            "version": String("1.2.0"),
                         },
                     },
                 },

src/sacp/src/mcp_server/builder.rs

@@ -510,21 +510,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(
-            tool.name(),
-            tool.description(),
-            schema_for_type::<M::Input>(),
-        )
+    let mut tool = rmcp::model::Tool::new(
+        tool.name(),
+        tool.description(),
+        schema_for_type::<M::Input>(),
+    )
+    .with_execution(rmcp::model::ToolExecution::new());
+
+    if let Some(schema) = schema_for_output::<M::Output>().ok() {
         // schema_for_output returns Err for non-object types (strings, integers, etc.)
-        // since MCP structured output requires JSON objects. We use .ok() to set
+        // since MCP structured output requires JSON objects. We 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()))
+        tool = tool.with_raw_output_schema(schema);
     }
+
+    tool
 }
 
 /// Create a [`ErasedMcpTool`] from a [`McpTool`], erasing the type details.

src/sacp/src/session.rs

@@ -680,7 +680,7 @@ where
         // Step 3: Drain any messages that were already queued and forward to client.
         // These messages arrived before we dropped the handler but haven't been
         // consumed yet. We must forward them to maintain message ordering.
-        while let Some(message) = update_rx.try_next().ok().flatten() {
+        while let Some(message) = update_rx.try_recv().ok() {
             match message {
                 SessionMessage::SessionMessage(dispatch) => {
                     // Forward the message to the client