Skip to content

Revert "feat!: relax tool result structuredContent type (SEP-2106)" #932

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
DaleSeo merged 1 commit into from
Jun 26, 2026
Merged

Revert "feat!: relax tool result structuredContent type (SEP-2106)" #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions crates/rmcp/src/model/content.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// ToolUseContent/ToolResultContent are SEP-2577-deprecated; internal references are expected.
#![expect(deprecated)]
use serde::{Deserialize, Serialize};
use serde_json::{Value, json};
use serde_json::json;

use super::{Annotations, Meta, resource::ResourceContents};

Expand Down Expand Up @@ -207,7 +207,7 @@ pub struct ToolResultContent {
pub tool_use_id: String,
pub content: Vec<ContentBlock>,
#[serde(skip_serializing_if = "Option::is_none")]
pub structured_content: Option<Value>,
pub structured_content: Option<super::JsonObject>,
#[serde(skip_serializing_if = "Option::is_none")]
pub is_error: Option<bool>,
}
Expand Down
8 changes: 7 additions & 1 deletion crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2352,7 +2352,13 @@
"null"
]
},
"structuredContent": true,
"structuredContent": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"toolUseId": {
"type": "string"
}
Expand Down
8 changes: 7 additions & 1 deletion crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema_current.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2352,7 +2352,13 @@
"null"
]
},
"structuredContent": true,
"structuredContent": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"toolUseId": {
"type": "string"
}
Expand Down
8 changes: 7 additions & 1 deletion crates/rmcp/tests/test_message_schema/server_json_rpc_message_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3454,7 +3454,13 @@
"null"
]
},
"structuredContent": true,
"structuredContent": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"toolUseId": {
"type": "string"
}
Expand Down
8 changes: 7 additions & 1 deletion crates/rmcp/tests/test_message_schema/server_json_rpc_message_schema_current.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3454,7 +3454,13 @@
"null"
]
},
"structuredContent": true,
"structuredContent": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"toolUseId": {
"type": "string"
}
Expand Down
32 changes: 0 additions & 32 deletions crates/rmcp/tests/test_sampling.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,38 +370,6 @@ fn test_tool_result_content_requires_content() {
assert!(err.to_string().contains("missing field `content`"));
}

#[tokio::test]
async fn test_tool_result_content_with_array_structured_content() -> Result<()> {
let structured =
serde_json::json!([{ "city": "SF", "temp": 72 }, { "city": "NY", "temp": 65 }]);
let mut tool_result = ToolResultContent::new("call_123", vec![ContentBlock::text("forecast")]);
tool_result.structured_content = Some(structured);

let json = serde_json::to_string(&tool_result)?;
let deserialized: ToolResultContent = serde_json::from_str(&json)?;
assert_eq!(tool_result, deserialized);
assert!(deserialized.structured_content.unwrap().is_array());

Ok(())
}

#[tokio::test]
async fn test_tool_result_content_with_primitive_structured_content() -> Result<()> {
let structured = serde_json::json!(42);
let mut tool_result = ToolResultContent::new("call_123", vec![ContentBlock::text("count")]);
tool_result.structured_content = Some(structured);

let json = serde_json::to_string(&tool_result)?;
let deserialized: ToolResultContent = serde_json::from_str(&json)?;
assert_eq!(tool_result, deserialized);
assert!(matches!(
deserialized.structured_content,
Some(serde_json::Value::Number(_))
));

Ok(())
}

#[tokio::test]
async fn test_sampling_message_with_tool_use() -> Result<()> {
let message = SamplingMessage::assistant_tool_use(
Expand Down
Loading