Skip to content

feat(deps): bump the minor group with 14 updates #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benbrandt merged 2 commits into from
Sep 28, 2026
+55 −35
Merged

feat(deps): bump the minor group with 14 updates #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75bb0cb
feat(deps): bump the minor group with 14 updates
dependabot[bot] Sep 28, 2026
3176e62
test(conductor): normalize rmcp version in MCP trace snapshot
benbrandt Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 32 additions & 31 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 23 additions & 4 deletions src/agent-client-protocol-conductor/tests/trace_mcp_tool_call.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
/// - Replaces session IDs with "session:0", etc.
/// - Replaces loopback HTTP endpoints with "http:endpoint:0", etc.
/// - Replaces MCP server and connection IDs with stable sequential IDs
/// - Replaces the crate version rmcp reports in MCP `clientInfo`/`serverInfo`
/// with "<rmcp version>", so rmcp upgrades don't churn the snapshot
struct EventNormalizer {
id_map: HashMap<String, String>,
next_id: usize,
Expand Down Expand Up @@ -126,7 +128,22 @@ impl EventNormalizer {
.clone()
}

/// Recursively normalize session IDs, MCP endpoints, and MCP IDs in JSON values.
/// Replace the version in rmcp's own implementation info.
///
/// rmcp fills `clientInfo`/`serverInfo` from its `CARGO_PKG_VERSION`, so the
/// value tracks `Cargo.lock` rather than anything this test exercises.
fn normalize_rmcp_version(mut info: serde_json::Value) -> serde_json::Value {
if let Some(map) = info.as_object_mut()
&& map.get("name").and_then(serde_json::Value::as_str) == Some("rmcp")
&& let Some(version) = map.get_mut("version")
{
*version = serde_json::Value::String("<rmcp version>".to_string());
}
info
}

/// Recursively normalize session IDs, MCP endpoints, MCP IDs, and rmcp
/// versions in JSON values.
fn normalize_json(&mut self, value: serde_json::Value) -> serde_json::Value {
match value {
serde_json::Value::Object(map) => {
Expand Down Expand Up @@ -163,6 +180,8 @@ impl EventNormalizer {
} else {
self.normalize_json(v)
}
} else if k == "clientInfo" || k == "serverInfo" {
Self::normalize_rmcp_version(self.normalize_json(v))
} else {
self.normalize_json(v)
};
Expand Down Expand Up @@ -666,11 +685,11 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
method: "initialize",
session: None,
params: Object {
"protocolVersion": String("2025-11-25"),
"protocolVersion": String("2026-07-28"),
"capabilities": Object {},
"clientInfo": Object {
"name": String("rmcp"),
"version": String("3.4.0"),
"version": String("<rmcp version>"),
},
},
},
Expand All @@ -689,7 +708,7 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
},
"serverInfo": Object {
"name": String("rmcp"),
"version": String("3.4.0"),
"version": String("<rmcp version>"),
},
"instructions": String("A simple test MCP server with an echo tool"),
},
Expand Down
Loading