Skip to content

fix: preserve tools with dependentRequired property-name maps #1428

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
aphonpra-oai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: preserve tools with dependentRequired property-name maps #1428

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
33 changes: 31 additions & 2 deletions crates/rmcp/src/transport/common/mcp_headers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ fn has_off_chain_annotation(schema: &JsonObject, on_chain: bool) -> bool {
"$defs" | "definitions" | "dependentSchemas" | "patternProperties" => {

@DaleSeo DaleSeo Nov 5, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The legacy dependencies keyword from Draft 7, which is still common in hand-written schemas, has the same structure.

Suggested change
"$defs" | "definitions" | "dependentSchemas" | "patternProperties" => {
"$defs" | "definitions" | "dependencies" | "dependentSchemas" | "patternProperties" => {

schema_map_has_off_chain_annotation(value, false)
}
// Instance data, not subschemas.
"default" | "const" | "enum" | "examples" => false,
// These contain instance data or property names, not subschemas.
"default" | "const" | "enum" | "examples" | "dependentRequired" => false,
_ => subschema_has_off_chain_annotation(value, false),
})
}
Expand Down Expand Up @@ -735,6 +735,35 @@ mod tests {
assert!(validate_param_header_annotations(&schema).is_err());
}

#[test]
fn accepts_property_name_in_dependent_required() {
let schema = json!({
"type": "object",
"properties": {
"x-mcp-header": { "type": "string" },
"tenant": { "type": "string", "x-mcp-header": "Tenant" }
},
"dependentRequired": { "x-mcp-header": ["tenant"] }
});
assert_eq!(
validate_param_header_annotations(schema.as_object().unwrap()),
Ok(())
);
}

#[test]
fn rejects_header_annotation_inside_dependent_schema() {
let schema = json!({
"type": "object",
"dependentSchemas": {
"tenant": {
"properties": { "region": { "type": "string", "x-mcp-header": "Region" } }
}
}
});
assert!(validate_param_header_annotations(schema.as_object().unwrap()).is_err());
}

#[test]
fn ignores_annotation_key_in_default_value() {
let schema = schema_with(json!({
Expand Down
40 changes: 40 additions & 0 deletions crates/rmcp/src/transport/streamable_http_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2603,6 +2603,46 @@ mod tests {
);
}

#[test]
fn cache_tools_keeps_property_names_in_dependent_required() {
let valid = tool(
"valid",
json!({
"type": "object",
"properties": {
"x-mcp-header": { "type": "string" },
"tenant": { "type": "string", "x-mcp-header": "Tenant" }
},
"dependentRequired": { "x-mcp-header": ["tenant"] }
}),
);
let mut message = ServerJsonRpcMessage::response(
ServerResult::ListToolsResult(ListToolsResult::with_all_items(vec![valid])),
NumberOrString::Number(1),
);
let mut cache = HashMap::new();

cache_tools_from_response(&mut cache, &mut message, &ProtocolVersion::V_2026_07_28);

let ServerJsonRpcMessage::Response(response) = message else {
panic!("expected tools/list response");
};
let ServerResult::ListToolsResult(result) = response.result else {
panic!("expected tools/list result");
};
assert_eq!(
(
result
.tools
.iter()
.map(|tool| tool.name.as_ref())
.collect::<Vec<_>>(),
cache.keys().map(String::as_str).collect::<Vec<_>>(),
),
(vec!["valid"], vec!["valid"])
);
}

#[test]
fn cache_tools_keeps_nested_annotations_and_drops_array_annotations() {
let nested = tool(
Expand Down
Loading