Skip to content

feat!: relax tool result structuredContent type (SEP-2106) #919

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

Open
DaleSeo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat!: relax tool result structuredContent type (SEP-2106) #919

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 @@ -8,7 +8,7 @@
//! variants for sampling messages (SEP-1577).

use serde::{Deserialize, Serialize};
use serde_json::json;
use serde_json::{Value, json};

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

Expand Down Expand Up @@ -197,7 +197,7 @@ pub struct ToolResultContent {
pub tool_use_id: String,
pub content: Vec<ContentBlock>,
#[serde(skip_serializing_if = "Option::is_none")]
pub structured_content: Option<super::JsonObject>,
pub structured_content: Option<Value>,
#[serde(skip_serializing_if = "Option::is_none")]
pub is_error: Option<bool>,
}
Expand Down
8 changes: 1 addition & 7 deletions 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 @@ -2346,13 +2346,7 @@
"null"
]
},
"structuredContent": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"structuredContent": true,
"toolUseId": {
"type": "string"
}
Expand Down
8 changes: 1 addition & 7 deletions 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 @@ -2346,13 +2346,7 @@
"null"
]
},
"structuredContent": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"structuredContent": true,
"toolUseId": {
"type": "string"
}
Expand Down
8 changes: 1 addition & 7 deletions 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 @@ -3446,13 +3446,7 @@
"null"
]
},
"structuredContent": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"structuredContent": true,
"toolUseId": {
"type": "string"
}
Expand Down
8 changes: 1 addition & 7 deletions 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 @@ -3446,13 +3446,7 @@
"null"
]
},
"structuredContent": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"structuredContent": true,
"toolUseId": {
"type": "string"
}
Expand Down
32 changes: 32 additions & 0 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,6 +370,38 @@ 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);

@alexhancock alexhancock Jun 26, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth one that loops through all the possible primitive types (string, number, boolean, null) and does the same test? This way it would catch if anyone changes it in some way that drops support for something.

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