Skip to content

build(deps): Preserve serde_json object order #202

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
Jun 9, 2026
Merged

build(deps): Preserve serde_json object order #202

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
8f20a73
build(deps): Preserve serde_json object order
benbrandt Jun 9, 2026
c4210df
Update snapshots
benbrandt Jun 9, 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
1 change: 1 addition & 0 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.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ tokio-util = { version = "0.7", features = ["compat"] }

# Serialization
serde = { version = "1.0", features = ["derive", "rc"] }
serde_json = { version = "1", features = ["raw_value"] }
serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
schemars = { version = "1.0", features = ["derive"] }

# UUID generation
Expand Down
36 changes: 18 additions & 18 deletions src/agent-client-protocol-conductor/tests/trace_client_mcp_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,17 +316,17 @@ async fn test_trace_client_mcp_server() -> Result<(), agent_client_protocol::Err
method: "_proxy/initialize",
session: None,
params: Object {
"protocolVersion": Number(1),
"clientCapabilities": Object {
"auth": Object {
"terminal": Bool(false),
},
"fs": Object {
"readTextFile": Bool(false),
"writeTextFile": Bool(false),
},
"terminal": Bool(false),
"auth": Object {
"terminal": Bool(false),
},
},
"protocolVersion": Number(1),
},
},
),
Expand All @@ -338,23 +338,23 @@ async fn test_trace_client_mcp_server() -> Result<(), agent_client_protocol::Err
id: String("id:0"),
is_error: false,
payload: Object {
"protocolVersion": Number(1),
"agentCapabilities": Object {
"auth": Object {},
"loadSession": Bool(false),
"mcpCapabilities": Object {
"acp": Bool(true),
"http": Bool(false),
"sse": Bool(false),
},
"promptCapabilities": Object {
"image": Bool(false),
"audio": Bool(false),
"embeddedContext": Bool(false),
"image": Bool(false),
},
"mcpCapabilities": Object {
"http": Bool(false),
"sse": Bool(false),
"acp": Bool(true),
},
"sessionCapabilities": Object {},
"auth": Object {},
},
"authMethods": Array [],
"protocolVersion": Number(1),
},
},
),
Expand All @@ -371,10 +371,10 @@ async fn test_trace_client_mcp_server() -> Result<(), agent_client_protocol::Err
"cwd": String("."),
"mcpServers": Array [
Object {
"headers": Array [],
"name": String("echo-server"),
"type": String("http"),
"name": String("echo-server"),
"url": String("acp:url:0"),
"headers": Array [],
},
],
},
Expand Down Expand Up @@ -402,13 +402,13 @@ async fn test_trace_client_mcp_server() -> Result<(), agent_client_protocol::Err
method: "session/prompt",
session: None,
params: Object {
"sessionId": String("session:0"),
"prompt": Array [
Object {
"text": String("{\"command\":\"call_tool\",\"server\":\"echo-server\",\"tool\":\"echo\",\"params\":{\"message\":\"Hello from client test!\"}}"),
"type": String("text"),
"text": String("{\"command\":\"call_tool\",\"server\":\"echo-server\",\"tool\":\"echo\",\"params\":{\"message\":\"Hello from client test!\"}}"),
},
],
"sessionId": String("session:0"),
},
},
),
Expand All @@ -423,11 +423,11 @@ async fn test_trace_client_mcp_server() -> Result<(), agent_client_protocol::Err
params: Object {
"sessionId": String("session:0"),
"update": Object {
"sessionUpdate": String("agent_message_chunk"),
"content": Object {
"text": String("OK: CallToolResult { content: [Annotated { raw: Text(RawTextContent { text: \"{\\\"call_number\\\":1,\\\"echoed\\\":\\\"Client echoes: Hello from client test!\\\"}\", meta: None }), annotations: None }], structured_content: Some(Object {\"call_number\": Number(1), \"echoed\": String(\"Client echoes: Hello from client test!\")}), is_error: Some(false), meta: None }"),
"type": String("text"),
"text": String("OK: CallToolResult { content: [Annotated { raw: Text(RawTextContent { text: \"{\\\"echoed\\\":\\\"Client echoes: Hello from client test!\\\",\\\"call_number\\\":1}\", meta: None }), annotations: None }], structured_content: Some(Object {\"echoed\": String(\"Client echoes: Hello from client test!\"), \"call_number\": Number(1)}), is_error: Some(false), meta: None }"),
},
"sessionUpdate": String("agent_message_chunk"),
},
},
},
Expand Down
80 changes: 40 additions & 40 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 @@ -308,17 +308,17 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
method: "_proxy/initialize",
session: None,
params: Object {
"protocolVersion": Number(1),
"clientCapabilities": Object {
"auth": Object {
"terminal": Bool(false),
},
"fs": Object {
"readTextFile": Bool(false),
"writeTextFile": Bool(false),
},
"terminal": Bool(false),
"auth": Object {
"terminal": Bool(false),
},
},
"protocolVersion": Number(1),
},
},
),
Expand All @@ -332,17 +332,17 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
method: "_proxy/initialize",
session: None,
params: Object {
"protocolVersion": Number(1),
"clientCapabilities": Object {
"auth": Object {
"terminal": Bool(false),
},
"fs": Object {
"readTextFile": Bool(false),
"writeTextFile": Bool(false),
},
"terminal": Bool(false),
"auth": Object {
"terminal": Bool(false),
},
},
"protocolVersion": Number(1),
},
},
),
Expand All @@ -354,23 +354,23 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
id: String("id:1"),
is_error: false,
payload: Object {
"protocolVersion": Number(1),
"agentCapabilities": Object {
"auth": Object {},
"loadSession": Bool(false),
"mcpCapabilities": Object {
"acp": Bool(true),
"http": Bool(false),
"sse": Bool(false),
},
"promptCapabilities": Object {
"image": Bool(false),
"audio": Bool(false),
"embeddedContext": Bool(false),
"image": Bool(false),
},
"mcpCapabilities": Object {
"http": Bool(false),
"sse": Bool(false),
"acp": Bool(true),
},
"sessionCapabilities": Object {},
"auth": Object {},
},
"authMethods": Array [],
"protocolVersion": Number(1),
},
},
),
Expand All @@ -382,23 +382,23 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
id: String("id:0"),
is_error: false,
payload: Object {
"protocolVersion": Number(1),
"agentCapabilities": Object {
"auth": Object {},
"loadSession": Bool(false),
"mcpCapabilities": Object {
"acp": Bool(true),
"http": Bool(false),
"sse": Bool(false),
},
"promptCapabilities": Object {
"image": Bool(false),
"audio": Bool(false),
"embeddedContext": Bool(false),
"image": Bool(false),
},
"mcpCapabilities": Object {
"http": Bool(false),
"sse": Bool(false),
"acp": Bool(true),
},
"sessionCapabilities": Object {},
"auth": Object {},
},
"authMethods": Array [],
"protocolVersion": Number(1),
},
},
),
Expand Down Expand Up @@ -430,10 +430,10 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
"cwd": String("/"),
"mcpServers": Array [
Object {
"headers": Array [],
"name": String("test"),
"type": String("http"),
"name": String("test"),
"url": String("acp:url:0"),
"headers": Array [],
},
],
},
Expand Down Expand Up @@ -499,13 +499,13 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
method: "session/prompt",
session: None,
params: Object {
"sessionId": String("session:0"),
"prompt": Array [
Object {
"text": String("{\"command\":\"call_tool\",\"server\":\"test\",\"tool\":\"echo\",\"params\":{\"message\":\"Hello from trace test!\"}}"),
"type": String("text"),
"text": String("{\"command\":\"call_tool\",\"server\":\"test\",\"tool\":\"echo\",\"params\":{\"message\":\"Hello from trace test!\"}}"),
},
],
"sessionId": String("session:0"),
},
},
),
Expand All @@ -519,13 +519,13 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
method: "session/prompt",
session: None,
params: Object {
"sessionId": String("session:0"),
"prompt": Array [
Object {
"text": String("{\"command\":\"call_tool\",\"server\":\"test\",\"tool\":\"echo\",\"params\":{\"message\":\"Hello from trace test!\"}}"),
"type": String("text"),
"text": String("{\"command\":\"call_tool\",\"server\":\"test\",\"tool\":\"echo\",\"params\":{\"message\":\"Hello from trace test!\"}}"),
},
],
"sessionId": String("session:0"),
},
},
),
Expand All @@ -539,12 +539,12 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
method: "initialize",
session: None,
params: Object {
"protocolVersion": String("2025-11-25"),
"capabilities": Object {},
"clientInfo": Object {
"name": String("rmcp"),
"version": String("1.7.0"),
},
"protocolVersion": String("2025-11-25"),
},
},
),
Expand All @@ -556,15 +556,15 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
id: String("id:7"),
is_error: false,
payload: Object {
"protocolVersion": String("2025-11-25"),
"capabilities": Object {
"tools": Object {},
},
"instructions": String("A simple test MCP server with an echo tool"),
"protocolVersion": String("2025-11-25"),
"serverInfo": Object {
"name": String("rmcp"),
"version": String("1.7.0"),
},
"instructions": String("A simple test MCP server with an echo tool"),
},
},
),
Expand Down Expand Up @@ -592,10 +592,10 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
"_meta": Object {
"progressToken": Number(0),
},
"name": String("echo"),
"arguments": Object {
"message": String("Hello from trace test!"),
},
"name": String("echo"),
},
},
),
Expand All @@ -609,14 +609,14 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
payload: Object {
"content": Array [
Object {
"text": String("{\"result\":\"Echo: Hello from trace test!\"}"),
"type": String("text"),
"text": String("{\"result\":\"Echo: Hello from trace test!\"}"),
},
],
"isError": Bool(false),
"structuredContent": Object {
"result": String("Echo: Hello from trace test!"),
},
"isError": Bool(false),
},
},
),
Expand All @@ -631,11 +631,11 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
params: Object {
"sessionId": String("session:0"),
"update": Object {
"sessionUpdate": String("agent_message_chunk"),
"content": Object {
"text": String("OK: CallToolResult { content: [Annotated { raw: Text(RawTextContent { text: \"{\\\"result\\\":\\\"Echo: Hello from trace test!\\\"}\", meta: None }), annotations: None }], structured_content: Some(Object {\"result\": String(\"Echo: Hello from trace test!\")}), is_error: Some(false), meta: None }"),
"type": String("text"),
"text": String("OK: CallToolResult { content: [Annotated { raw: Text(RawTextContent { text: \"{\\\"result\\\":\\\"Echo: Hello from trace test!\\\"}\", meta: None }), annotations: None }], structured_content: Some(Object {\"result\": String(\"Echo: Hello from trace test!\")}), is_error: Some(false), meta: None }"),
},
"sessionUpdate": String("agent_message_chunk"),
},
},
},
Expand Down Expand Up @@ -663,11 +663,11 @@ async fn test_trace_mcp_tool_call() -> Result<(), agent_client_protocol::Error>
params: Object {
"sessionId": String("session:0"),
"update": Object {
"sessionUpdate": String("agent_message_chunk"),
"content": Object {
"text": String("OK: CallToolResult { content: [Annotated { raw: Text(RawTextContent { text: \"{\\\"result\\\":\\\"Echo: Hello from trace test!\\\"}\", meta: None }), annotations: None }], structured_content: Some(Object {\"result\": String(\"Echo: Hello from trace test!\")}), is_error: Some(false), meta: None }"),
"type": String("text"),
"text": String("OK: CallToolResult { content: [Annotated { raw: Text(RawTextContent { text: \"{\\\"result\\\":\\\"Echo: Hello from trace test!\\\"}\", meta: None }), annotations: None }], structured_content: Some(Object {\"result\": String(\"Echo: Hello from trace test!\")}), is_error: Some(false), meta: None }"),
},
"sessionUpdate": String("agent_message_chunk"),
},
},
},
Expand Down
Loading