feat: migrate MCP implementation from mcp-types to rmcp

***
feat: add MCP protocol types and rmcp adapters

codex-rs/exec/Cargo.toml

@@ -28,7 +28,6 @@ codex-common = { workspace = true, features = [
 codex-core = { workspace = true }
 codex-protocol = { workspace = true }
 codex-utils-absolute-path = { workspace = true }
-mcp-types = { workspace = true }
 owo-colors = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
@@ -56,9 +55,9 @@ assert_cmd = { workspace = true }
 codex-utils-cargo-bin = { workspace = true }
 core_test_support = { workspace = true }
 libc = { workspace = true }
-mcp-types = { workspace = true }
 predicates = { workspace = true }
 pretty_assertions = { workspace = true }
+rmcp = { workspace = true }
 tempfile = { workspace = true }
 uuid = { workspace = true }
 walkdir = { workspace = true }

codex-rs/exec/src/event_processor_with_human_output.rs

@@ -375,7 +375,8 @@ impl EventProcessor for EventProcessorWithHumanOutput {
                 ts_msg!(self, "{}", title.style(title_style));
 
                 if let Ok(res) = result {
-                    let val: serde_json::Value = res.into();
+                    let val = serde_json::to_value(res)
+                        .unwrap_or_else(|_| serde_json::Value::String("<result>".to_string()));
                     let pretty =
                         serde_json::to_string_pretty(&val).unwrap_or_else(|_| val.to_string());
 

codex-rs/exec/src/exec_events.rs

@@ -1,5 +1,5 @@
 use codex_protocol::models::WebSearchAction;
-use mcp_types::ContentBlock as McpContentBlock;
+type McpContentBlock = serde_json::Value;
 use serde::Deserialize;
 use serde::Serialize;
 use serde_json::Value as JsonValue;
@@ -256,6 +256,13 @@ pub struct CollabToolCallItem {
 /// Result payload produced by an MCP tool invocation.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, TS)]
 pub struct McpToolCallItemResult {
+    // NOTE: `rmcp::model::Content` (and its `RawContent` variants) would be a
+    // more precise Rust representation of MCP content blocks. We intentionally
+    // use `serde_json::Value` here because this crate exports JSON schema + TS
+    // types (`schemars`/`ts-rs`), and the rmcp model types aren't set up to be
+    // schema/TS friendly (and would introduce heavier coupling to rmcp's Rust
+    // representations). Using `JsonValue` keeps the payload wire-shaped and
+    // easy to export.
     pub content: Vec<McpContentBlock>,
     pub structured_content: Option<JsonValue>,
 }

codex-rs/exec/tests/event_processor_with_json_output.rs

@@ -56,6 +56,7 @@ use codex_exec::exec_events::Usage;
 use codex_exec::exec_events::WebSearchItem;
 use codex_protocol::ThreadId;
 use codex_protocol::config_types::ModeKind;
+use codex_protocol::mcp::CallToolResult;
 use codex_protocol::models::WebSearchAction;
 use codex_protocol::plan_tool::PlanItemArg;
 use codex_protocol::plan_tool::StepStatus;
@@ -63,10 +64,8 @@ use codex_protocol::plan_tool::UpdatePlanArgs;
 use codex_protocol::protocol::CodexErrorInfo;
 use codex_protocol::protocol::ExecCommandOutputDeltaEvent;
 use codex_protocol::protocol::ExecOutputStream;
-use mcp_types::CallToolResult;
-use mcp_types::ContentBlock;
-use mcp_types::TextContent;
 use pretty_assertions::assert_eq;
+use rmcp::model::Content;
 use serde_json::json;
 use std::path::PathBuf;
 use std::time::Duration;
@@ -385,6 +384,7 @@ fn mcp_tool_call_begin_and_end_emit_item_events() {
                 content: Vec::new(),
                 is_error: None,
                 structured_content: None,
+                meta: None,
             }),
         }),
     );
@@ -499,13 +499,10 @@ fn mcp_tool_call_defaults_arguments_and_preserves_structured_content() {
             invocation,
             duration: Duration::from_millis(10),
             result: Ok(CallToolResult {
-                content: vec![ContentBlock::TextContent(TextContent {
-                    annotations: None,
-                    text: "done".to_string(),
-                    r#type: "text".to_string(),
-                })],
+                content: vec![serde_json::to_value(Content::text("done")).unwrap()],
                 is_error: None,
                 structured_content: Some(json!({ "status": "ok" })),
+                meta: None,
             }),
         }),
     );
@@ -520,11 +517,7 @@ fn mcp_tool_call_defaults_arguments_and_preserves_structured_content() {
                     tool: "tool_z".to_string(),
                     arguments: serde_json::Value::Null,
                     result: Some(McpToolCallItemResult {
-                        content: vec![ContentBlock::TextContent(TextContent {
-                            annotations: None,
-                            text: "done".to_string(),
-                            r#type: "text".to_string(),
-                        })],
+                        content: vec![serde_json::to_value(Content::text("done")).unwrap()],
                         structured_content: Some(json!({ "status": "ok" })),
                     }),
                     error: None,