From b223a29603f489063acced737b3004c32c1cf606 Mon Sep 17 00:00:00 2001
From: spoons-and-mirrors
 <212802214+spoons-and-mirrors@users.noreply.github.com>
Date: Mon, 11 Aug 2025 07:59:50 +0200
Subject: [PATCH] Fix: Sanitize MCP Tool Names for Consistency in User
 Expectations (#1769)

---
 packages/opencode/src/mcp/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/opencode/src/mcp/index.ts b/packages/opencode/src/mcp/index.ts
index 8f614b63..664111fb 100644
--- a/packages/opencode/src/mcp/index.ts
+++ b/packages/opencode/src/mcp/index.ts
@@ -149,7 +149,8 @@ export namespace MCP {
     for (const [clientName, client] of Object.entries(await clients())) {
       for (const [toolName, tool] of Object.entries(await client.tools())) {
         const sanitizedClientName = clientName.replace(/\s+/g, "_")
-        result[sanitizedClientName + "_" + toolName] = tool
+        const sanitizedToolName = toolName.replace(/[-\s]+/g, "_")
+        result[sanitizedClientName + "_" + sanitizedToolName] = tool
       }
     }
     return result