Skip to content

fix(mcp): use colon separator for tool keys to prevent underscore collisions #33354

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
MeloMei wants to merge 1 commit into
base: dev
Choose a base branch
from
+5 −5
Open

fix(mcp): use colon separator for tool keys to prevent underscore collisions #33354

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
2 changes: 1 addition & 1 deletion packages/opencode/src/mcp/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ export const layer = Layer.effect(
}
const timeout = requestTimeout(s, clientName, mcpConfig, defaultTimeout)
for (const mcpTool of listed) {
const key = McpCatalog.sanitize(clientName) + "_" + McpCatalog.sanitize(mcpTool.name)
const key = McpCatalog.sanitize(clientName) + ":" + McpCatalog.sanitize(mcpTool.name)
result[key] = McpCatalog.convertTool(mcpTool, client, timeout)
}
}
Expand Down
8 changes: 4 additions & 4 deletions packages/opencode/test/mcp/lifecycle.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ it.instance(
command: ["echo", "test"],
})

expect(Object.keys(yield* mcp.tools())).toEqual(["paged-server_tool-one", "paged-server_tool-two"])
expect(Object.keys(yield* mcp.tools())).toEqual(["paged-server:tool-one", "paged-server:tool-two"])
expect(Object.keys(yield* mcp.prompts())).toEqual(["paged-server:prompt-one", "paged-server:prompt-two"])
expect(Object.keys(yield* mcp.resources())).toEqual(["paged-server:resource-one", "paged-server:resource-two"])
expect(serverState.listToolsCalls).toBe(2)
Expand Down Expand Up @@ -913,7 +913,7 @@ it.instance(

expect(statusName(result.status, "tools-only-server")).toBe("connected")
expect(serverState.listToolsCalls).toBe(1)
expect(Object.keys(yield* mcp.tools())).toEqual(["tools-only-server_test_tool"])
expect(Object.keys(yield* mcp.tools())).toEqual(["tools-only-server:test_tool"])
expect(yield* mcp.prompts()).toEqual({})
expect(yield* mcp.resources()).toEqual({})
expect(serverState.listPromptsCalls).toBe(0)
Expand Down Expand Up @@ -1105,8 +1105,8 @@ it.instance(
const tools = yield* mcp.tools()
const keys = Object.keys(tools)

// Server name dots should be replaced with underscores
expect(keys.some((k) => k.startsWith("my_special-server_"))).toBe(true)
// Server name dots should be replaced with underscores, separator is ":"
expect(keys.some((k) => k.startsWith("my_special-server:"))).toBe(true)
// Tool name dots should be replaced with underscores
expect(keys.some((k) => k.endsWith("tool_b"))).toBe(true)
expect(keys.length).toBe(2)
Expand Down
Loading