[worker] fase C: upgrade rmcp 1.8.0 -> 3.3.0 (Aikido 34247111, 5 advisories)

Behavior-identical migration: legacy initialize/session paths preserved,
2026-07-28 stateless lifecycle NOT enabled. The tool macros absorb the
MRTR response-enum changes, so code impact is contained to:
- Content/RawContent -> ContentBlock (renamed/merged in 3.x)
- #[tool_router(allow_empty)] on the ctors-only impl (3.3 rejects
  toolless routers; the real router is merged_tool_router())
- proxy call_tool returns CallToolResponse (manual ServerHandler impl)
- test assertions drop the removed .raw projection

Validation: cargo fmt, clippy -D warnings, 1384 lib+bin tests green.

Author: flupkede

CHANGELOG.md

@@ -20,6 +20,8 @@ finalized in place with a date — no renaming/migration step needed.
 
 - **Dependency refresh: h2, rustls, quinn-proto, zerovec-derive, moka.** A semver-safe `cargo update` lifts 126 packages within their existing requirements, clearing five open advisories without code changes: h2 0.4.15→0.4.19 (Aikido 41883526), rustls 0.23.42→0.23.45 (RUSTSEC-2026-0285), quinn-proto 0.11.16→0.11.18 (Aikido 41883527), zerovec-derive 0.11.3→0.11.6 (Aikido 41883531) and moka 0.12.15→0.12.16 (Aikido 41297220). fastembed/ort are deliberately kept at 5.17.3/rc.12 — 5.17.4 hard-requires the unstable ort rc.13 API break, which moves in its own PR.
 
+- **rmcp 1.8.0 → 3.3.0 — clears the five Aikido advisories on the MCP SDK (34247111).** Behavior-identical upgrade: the legacy `initialize` handshake and session semantics stay the default (`ProtocolVersion::LATEST` remains 2025-11-25); the 2026-07-28 stateless lifecycle is opt-in upstream and deliberately not enabled here. Code impact stayed small because the `#[tool_router]`/`#[tool_handler]` macros absorb the new MRTR response enums: `Content`/`RawContent` are now `ContentBlock`, the constructors-only impl takes `#[tool_router(allow_empty)]`, the stdio proxy's manual `call_tool` returns `CallToolResponse`, and content assertions drop the removed `.raw` projection.
+
 ## [1.3.19]
 
 ### Changed

Cargo.lock

@@ -104,9 +104,10 @@ bincode = "1.3"
 scip = "0.9"
 protobuf = "3.7"
 rand = "0.8"
-# Bumped floor from 1.5.0 to 1.8.0 for CVE patches (Aikido group: rmcp priority 82, 3 CVEs).
-# v2.x is available but is a breaking major bump — deferred.
-rmcp = { version = "1.8.0", features = ["server", "client", "transport-io", "transport-streamable-http-server", "transport-streamable-http-client-reqwest", "macros"] }
+# Aikido 34247111: 1.8.0 carries 5 advisories (CVE-2026-64684/317735/617985 + 2 more).
+# 3.x keeps legacy initialize/session behavior by default (ProtocolVersion::LATEST stays
+# V_2025_11_25); the 2026-07-28 stateless lifecycle is opt-in and NOT enabled here.
+rmcp = { version = "3.3.0", features = ["server", "client", "transport-io", "transport-streamable-http-server", "transport-streamable-http-client-reqwest", "macros"] }
 schemars = { version = "1.1.0", features = ["derive"] }
 reqwest = { version = "0.13", default-features = false, features = ["json", "rustls"] }
 sysinfo = { version = "0.38.4", default-features = true }

Cargo.toml

@@ -6,7 +6,7 @@
 use super::*;
 use rmcp::{
     handler::server::wrapper::Parameters,
-    model::{CallToolResult, Content},
+    model::{CallToolResult, ContentBlock},
     tool, tool_router, ErrorData as McpError,
 };
 
@@ -40,7 +40,7 @@ impl CodesearchService {
                 let chunk_id = match request.target.parse::<u32>() {
                     Ok(id) => id,
                     Err(_) => {
-                        return Ok(CallToolResult::success(vec![Content::text(format!(
+                        return Ok(CallToolResult::success(vec![ContentBlock::text(format!(
                             "For similar mode, `target` must be a numeric chunk_id, got: '{}'",
                             request.target
                         ))]));
@@ -54,7 +54,7 @@ impl CodesearchService {
                 };
                 self.similar_chunks(Parameters(similar_req)).await
             }
-            _ => Ok(CallToolResult::success(vec![Content::text(format!(
+            _ => Ok(CallToolResult::success(vec![ContentBlock::text(format!(
                 "Unknown explore kind '{}'. Use `outline` or `similar`.",
                 kind
             ))])),
@@ -138,20 +138,20 @@ impl CodesearchService {
             .await
         {
             Ok(c) => c,
-            Err(e) => return Ok(CallToolResult::success(vec![Content::text(e)])),
+            Err(e) => return Ok(CallToolResult::success(vec![ContentBlock::text(e)])),
         };
 
         // Outline operates on a single repo — reject group fan-out
         if ctx.is_multi {
-            return Ok(CallToolResult::success(vec![Content::text(
+            return Ok(CallToolResult::success(vec![ContentBlock::text(
                 "Tool 'explore' operates on a single repo. Use 'project' instead of 'group'."
                     .to_string(),
             )]));
         }
 
         if ctx.needs_local_db {
             if let Err(e) = self.ensure_database_exists() {
-                return Ok(CallToolResult::success(vec![Content::text(e)]));
+                return Ok(CallToolResult::success(vec![ContentBlock::text(e)]));
             }
         }
 
@@ -177,7 +177,7 @@ impl CodesearchService {
         {
             Ok(v) => v,
             Err(e) => {
-                return Ok(CallToolResult::success(vec![Content::text(format!(
+                return Ok(CallToolResult::success(vec![ContentBlock::text(format!(
                     "Error reading outline: {e:#}"
                 ))]));
             }

src/mcp/explore.rs

@@ -4,7 +4,7 @@
 use super::{convert_remote_item, merge_ranked_lists, parse_search_items_from_call_result};
 use crate::federation::RemoteSearchItem;
 use crate::mcp::types::SearchResultItem;
-use rmcp::model::{CallToolResult, Content};
+use rmcp::model::{CallToolResult, ContentBlock};
 
 fn local_item(chunk_id: u32, score: f32) -> SearchResultItem {
     SearchResultItem {
@@ -146,7 +146,7 @@ fn parse_federated_chunk_ref_rejects_garbage() {
 // === parse_search_items_from_call_result (serve-delegation re-parse) ===
 
 fn call_result_with_json(json: &str) -> CallToolResult {
-    CallToolResult::success(vec![Content::text(json.to_string())])
+    CallToolResult::success(vec![ContentBlock::text(json.to_string())])
 }
 
 #[test]