Skip to content

Commit dea9361

Browse files
committed
Fix MCP toolset alias gating
1 parent f838f6e commit dea9361

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

src/lib/mcp/register.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,19 @@ function isMcpToolset(value: string): value is McpToolset {
4646
return mcpToolsetSet.has(value);
4747
}
4848

49+
function resolveMcpToolset(token: string): McpToolset | undefined {
50+
if (isMcpToolset(token)) return token;
51+
return standaloneToolsetAliases[token];
52+
}
53+
4954
function normalizeMcpToolset(value: string): McpToolset | undefined {
5055
const token = value.trim().toLowerCase().replace(/-/g, "_");
51-
if (isMcpToolset(token)) return token;
52-
if (standaloneToolsetAliases[token]) return standaloneToolsetAliases[token];
56+
const toolset = resolveMcpToolset(token);
57+
if (toolset) return toolset;
5358

5459
const managePrefix = "manage_";
5560
if (token.startsWith(managePrefix)) {
56-
const managedToolset = token.slice(managePrefix.length);
57-
if (isMcpToolset(managedToolset)) return managedToolset;
61+
return resolveMcpToolset(token.slice(managePrefix.length));
5862
}
5963

6064
return undefined;

0 commit comments

Comments
 (0)