Skip to content

The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.

fix(mcp): preserve remote tool annotations

Steven Enamakelb3b8888c4bd8
diff --git a/crates/openhuman-core/src/mcp/module_client.rs b/crates/openhuman-core/src/mcp/module_client.rs
index 0ed89824d0..246cb1e74d 100644
--- a/crates/openhuman-core/src/mcp/module_client.rs
+++ b/crates/openhuman-core/src/mcp/module_client.rs
@@ -262,6 +262,7 @@ impl McpConfiguredClient {
description: tool.description,
input_schema: tool.input_schema,
meta: None,
+ annotations: None,
})
.collect(),
None => {
diff --git a/crates/openhuman-core/src/mcp/module_client_tests.rs b/crates/openhuman-core/src/mcp/module_client_tests.rs
index 0a97144bfb..9ff7486811 100644
--- a/crates/openhuman-core/src/mcp/module_client_tests.rs
+++ b/crates/openhuman-core/src/mcp/module_client_tests.rs
@@ -289,6 +289,7 @@ async fn static_tool_metadata_scrubbing_uses_confidential_module_delivery() {
description: Some("Search docs".to_owned()),
input_schema: serde_json::json!({"type":"object"}),
meta: Some(serde_json::json!({"ui":{"resourceUri":"ui://search"}})),
+ annotations: None,
};
let returned = client
diff --git a/crates/openhuman-core/src/mcp/ui/port.rs b/crates/openhuman-core/src/mcp/ui/port.rs
index 2fceba17a3..0bffad2412 100644
--- a/crates/openhuman-core/src/mcp/ui/port.rs
+++ b/crates/openhuman-core/src/mcp/ui/port.rs
@@ -138,6 +138,10 @@ impl UiServerPort for HostUiPort {
.iter()
.find(|remote| remote.name == tool)
.and_then(|remote| remote.meta.clone());
+ let annotations = listed
+ .iter()
+ .find(|remote| remote.name == tool)
+ .and_then(|remote| remote.annotations.clone());
let safe = crate::mcp::registry::tools_safe_for_agent(
server_id,
listed
@@ -151,10 +155,7 @@ impl UiServerPort for HostUiPort {
.collect(),
);
safe.iter().find(|candidate| candidate.name == tool)?;
- Some(UiToolDescriptor {
- meta,
- annotations: None,
- })
+ Some(UiToolDescriptor { meta, annotations })
}
async fn read_resource(&self, server_id: &str, uri: &str) -> Result<Vec<Value>, String> {
diff --git a/crates/openhuman-core/src/mcp/ui/port_tests.rs b/crates/openhuman-core/src/mcp/ui/port_tests.rs
index 29f5da3534..0dc6b23abf 100644
--- a/crates/openhuman-core/src/mcp/ui/port_tests.rs
+++ b/crates/openhuman-core/src/mcp/ui/port_tests.rs
@@ -122,6 +122,14 @@ mod module_backed {
)
.unwrap()),
names::methods::STATIC_LIST => Ok(json!(self.statics)),
+ names::methods::STATIC_LIST_TOOLS => Ok(json!([{
+ "name": "show",
+ "description": "Shows a card",
+ "input_schema": {},
+ "_meta": {"ui": {"resourceUri": "ui://card"}},
+ "annotations": {"readOnlyHint": true}
+ }])),
+ names::methods::STATIC_SCRUB_TOOLS => Ok(args[0]["tools"].clone()),
names::methods::LIST_TOOLS => Ok(json!([{
"name": "show",
"description": "Shows a card",
@@ -218,9 +226,9 @@ mod module_backed {
}
#[tokio::test]
- async fn an_installed_tool_descriptor_carries_the_tools_meta() {
+ async fn a_static_tool_descriptor_carries_the_tools_meta_and_annotations() {
let fake = Arc::new(ModulePort {
- installed: vec!["srv-1"],
+ statics: vec!["srv-1"],
..ModulePort::default()
});
let descriptor = port_over(&fake)
@@ -231,6 +239,7 @@ mod module_backed {
descriptor.meta,
Some(json!({"ui": {"resourceUri": "ui://card"}}))
);
+ assert_eq!(descriptor.annotations, Some(json!({"readOnlyHint": true})));
}
#[tokio::test]
diff --git a/vendor/tinychannels b/vendor/tinychannels
index 1ca1a4158f..82e1176c04 160000
--- a/vendor/tinychannels
+++ b/vendor/tinychannels
@@ -1 +1 @@
-Subproject commit 1ca1a4158fd607b62e4f65194c8cdf85a9371fca
+Subproject commit 82e1176c04581c9257939949903947201bc3ad61
diff --git a/vendor/tinymcp b/vendor/tinymcp
index 7e18d33415..56d2962637 160000
--- a/vendor/tinymcp
+++ b/vendor/tinymcp
@@ -1 +1 @@
-Subproject commit 7e18d33415b5e4413c05eadfb66d42a314b074a4
+Subproject commit 56d29626376b45834a25b8e0be877d635a90ac72
diff --git a/vendor/tinymemory b/vendor/tinymemory
index 245dca04ca..6018a91a77 160000
--- a/vendor/tinymemory
+++ b/vendor/tinymemory
@@ -1 +1 @@
-Subproject commit 245dca04ca43769e77da65a23697eb3c71e235f2
+Subproject commit 6018a91a773555efb50bf1959a6621292618e04a
diff --git a/vendor/tinystoragedrivers b/vendor/tinystoragedrivers
index 0b32b65c81..917c2113d8 160000
--- a/vendor/tinystoragedrivers
+++ b/vendor/tinystoragedrivers
@@ -1 +1 @@
-Subproject commit 0b32b65c81a3e1e32fc1c0f77e5634ce707f4161
+Subproject commit 917c2113d8e4b3d24131ea8ccdf730e68904a82d