ai-workspace-services/opencode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(mcp): restore legacy tool names (#33593)

Browse Source
This commit is contained in:
Aiden Cline 2026-06-23 23:42:32 -05:00 committed by GitHub
parent 800d41ddab
commit 947e0017f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/opencode/src/mcp/index.ts
View File

@ -647,7 +647,7 @@ export const layer = Layer.effect(
} }
const timeout = requestTimeout(s, clientName, mcpConfig, defaultTimeout) const timeout = requestTimeout(s, clientName, mcpConfig, defaultTimeout)
for (const mcpTool of listed) { for (const mcpTool of listed) {
const key = "mcp__" + McpCatalog.sanitize(clientName) + "__" + McpCatalog.sanitize(mcpTool.name) const key = McpCatalog.sanitize(clientName) + "_" + McpCatalog.sanitize(mcpTool.name)
result[key] = McpCatalog.convertTool(mcpTool, client, timeout) result[key] = McpCatalog.convertTool(mcpTool, client, timeout)
} }
} }

6
packages/opencode/test/mcp/lifecycle.test.ts
View File

@ -382,7 +382,7 @@ it.instance(
command: ["echo", "test"], command: ["echo", "test"],
}) })
expect(Object.keys(yield* mcp.tools())).toEqual(["mcp__paged-server__tool-one", "mcp__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.prompts())).toEqual(["paged-server:prompt-one", "paged-server:prompt-two"])
expect(Object.keys(yield* mcp.resources())).toEqual(["paged-server:test://one", "paged-server:test://two"]) expect(Object.keys(yield* mcp.resources())).toEqual(["paged-server:test://one", "paged-server:test://two"])
expect(Object.keys(yield* mcp.resourceTemplates())).toEqual([ expect(Object.keys(yield* mcp.resourceTemplates())).toEqual([
@ -944,7 +944,7 @@ it.instance(
expect(statusName(result.status, "tools-only-server")).toBe("connected") expect(statusName(result.status, "tools-only-server")).toBe("connected")
expect(serverState.listToolsCalls).toBe(1) expect(serverState.listToolsCalls).toBe(1)
expect(Object.keys(yield* mcp.tools())).toEqual(["mcp__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.prompts()).toEqual({})
expect(yield* mcp.resources()).toEqual({}) expect(yield* mcp.resources()).toEqual({})
expect(serverState.listPromptsCalls).toBe(0) expect(serverState.listPromptsCalls).toBe(0)
@ -1137,7 +1137,7 @@ it.instance(
const keys = Object.keys(tools) const keys = Object.keys(tools)
// Server name dots should be replaced with underscores // Server name dots should be replaced with underscores
expect(keys.some((k) => k.startsWith("mcp__my_special-server__"))).toBe(true) expect(keys.some((k) => k.startsWith("my_special-server_"))).toBe(true)
// Tool name dots should be replaced with underscores // Tool name dots should be replaced with underscores
expect(keys.some((k) => k.endsWith("tool_b"))).toBe(true) expect(keys.some((k) => k.endsWith("tool_b"))).toBe(true)
expect(keys.length).toBe(2) expect(keys.length).toBe(2)