EnterpriseAI/ClosedCode
1
0
Fork 0
Code Issues Pull Requests Actions 30 Packages Projects Releases Wiki Activity

fix(mcp): prevent resource key collisions (#33596)

Browse Source
This commit is contained in:
Aiden Cline
2026-06-24 00:13:58 -05:00
committed by GitHub
parent fbfd725d73
commit 6c12c32fb1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/opencode/src/mcp/catalog.ts
+3 -1
View File
@@ -100,9 +100,11 @@ export function fetch<T extends { name: string }>(
), ),
Effect.map((items) => { Effect.map((items) => {
const sanitizedClient = sanitize(clientName) const sanitizedClient = sanitize(clientName)
// Escape both the separator and escape marker so `server:uri` keys remain unambiguous.
const resourceClient = clientName.replaceAll("%", "%25").replaceAll(":", "%3A")
return Object.fromEntries( return Object.fromEntries(
items.map((item) => [ items.map((item) => [
key ? clientName + ":" + key(item) : sanitizedClient + ":" + sanitize(item.name), key ? resourceClient + ":" + key(item) : sanitizedClient + ":" + sanitize(item.name),
{ ...item, client: clientName }, { ...item, client: clientName },
]), ]),
) )