[MCP] Prefix MCP tools names with mcp__ (#5309)

This should make it more clear that specific tools come from MCP
servers.

#4806 requested that we add the server name but we already do that.

Fixes #4806
This commit is contained in:
Gabriel Peal
2025-10-19 17:41:55 -07:00
committed by GitHub
parent 2d9ee9dbe9
commit 0170860ef2
4 changed files with 13 additions and 12 deletions

View File

@@ -44,7 +44,7 @@ async fn stdio_server_round_trip() -> anyhow::Result<()> {
let call_id = "call-123";
let server_name = "rmcp";
let tool_name = format!("{server_name}__echo");
let tool_name = format!("mcp__{server_name}__echo");
mount_sse_once_match(
&server,
@@ -182,7 +182,7 @@ async fn stdio_server_propagates_whitelisted_env_vars() -> anyhow::Result<()> {
let call_id = "call-1234";
let server_name = "rmcp_whitelist";
let tool_name = format!("{server_name}__echo");
let tool_name = format!("mcp__{server_name}__echo");
mount_sse_once_match(
&server,
@@ -317,7 +317,7 @@ async fn streamable_http_tool_call_round_trip() -> anyhow::Result<()> {
let call_id = "call-456";
let server_name = "rmcp_http";
let tool_name = format!("{server_name}__echo");
let tool_name = format!("mcp__{server_name}__echo");
mount_sse_once_match(
&server,
@@ -485,7 +485,7 @@ async fn streamable_http_with_oauth_round_trip() -> anyhow::Result<()> {
let call_id = "call-789";
let server_name = "rmcp_http_oauth";
let tool_name = format!("{server_name}__echo");
let tool_name = format!("mcp__{server_name}__echo");
mount_sse_once_match(
&server,