lywsvip/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-09-06 08:02:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(claude): recover OAuth tool aliases for repeated prefixes and malformed IDs

Browse Source 
- Normalize repeated `mcp__<server>__` alias prefixes during reverse remapping to resolve stacked aliases.
- Add a semantic-suffix fallback when parsing fails, allowing unambiguous recovery from malformed tool IDs.

Closes: #4916
This commit is contained in:
Luis Pater
2026-08-14 13:52:08 +08:00
parent 7ea9c670ea
commit f2d272da81
2 changed files with 106 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
internal/runtime/executor/claude_executor_request.go
View File

@@ -1586,9 +1586,17 @@ func (resolver claudeMCPAliasResolver) resolve(name string) (string, bool, error
return "", false, nil
}
repeatedServerPrefix := "mcp__" + server + "__" + server + "__"
if suffix, repeatedServer := strings.CutPrefix(name, repeatedServerPrefix); repeatedServer {
if original, exact := resolver.exact["mcp__"+server+"__"+suffix]; exact {
canonicalServerPrefix := "mcp__" + server + "__"
normalizedName := name
suffix := strings.TrimPrefix(name, canonicalServerPrefix)
for {
strippedSuffix, repeatedServer := strings.CutPrefix(suffix, server+"__")
if !repeatedServer {
break
}
suffix = strippedSuffix
normalizedName = canonicalServerPrefix + suffix
if original, exact := resolver.exact[normalizedName]; exact {
return original, true, nil
}
}
@@ -1608,21 +1616,30 @@ func (resolver claudeMCPAliasResolver) resolve(name string) (string, bool, error
return "", false, fmt.Errorf("cannot restore Claude OAuth MCP tool alias %q: matched multiple declared aliases", name)
}
parts, ok := parseClaudeMCPAlias(name)
if ok {
parts, validAlias := parseClaudeMCPAlias(normalizedName)
if validAlias {
for _, entry := range resolver.aliases {
if entry.parts.server == parts.server && entry.parts.semantic == parts.semantic {
matchedOriginal = entry.original
matchCount++
}
}
if matchCount == 1 {
return matchedOriginal, true, nil
}
if matchCount > 1 {
return "", false, fmt.Errorf("cannot restore Claude OAuth MCP tool alias %q: semantic suffix matches multiple declared tools", name)
} else {
// Keep generated aliases strict while allowing a malformed response tool ID
// to recover only when its request-local semantic suffix is unambiguous.
for _, entry := range resolver.aliases {
if entry.parts.server == server && strings.HasSuffix(normalizedName, "_"+entry.parts.semantic) {
matchedOriginal = entry.original
matchCount++
}
}
}
if matchCount == 1 {
return matchedOriginal, true, nil
}
if matchCount > 1 {
return "", false, fmt.Errorf("cannot restore Claude OAuth MCP tool alias %q: semantic suffix matches multiple declared tools", name)
}
return "", false, fmt.Errorf("cannot restore Claude OAuth MCP tool alias %q: no unique request-local match", name)
}

88
internal/runtime/executor/claude_executor_request_remap_test.go
View File

@@ -163,18 +163,83 @@ func TestReverseRemapOAuthToolNamesRecoversMangledAliases(t *testing.T) {
}
}
func TestReverseRemapOAuthToolNamesRecoversRepeatedServerAlias(t *testing.T) {
func TestReverseRemapOAuthToolNamesRecoversRepeatedServerAliases(t *testing.T) {
const alias = "mcp__hmzqrngkulqv__xuo7jlxlpzee_Bash"
reverseMap := map[string]string{
alias: "Bash",
"mcp__hmzqrngkulqv__aaaaaaaaaaaa_Bash": "OtherBash",
}
tests := []struct {
name string
responseAlias string
}{
{
name: "single repetition",
responseAlias: "mcp__hmzqrngkulqv__hmzqrngkulqv__xuo7jlxlpzee_Bash",
},
{
name: "multiple repetitions",
responseAlias: "mcp__hmzqrngkulqv__hmzqrngkulqv__hmzqrngkulqv__xuo7jlxlpzee_Bash",
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
response := []byte(fmt.Sprintf(`{"content":[{"type":"tool_use","id":"toolu_1","name":%q,"input":{}}]}`, test.responseAlias))
restored, errReverse := reverseRemapOAuthToolNames(response, reverseMap)
if errReverse != nil {
t.Fatalf("reverseRemapOAuthToolNames() error = %v", errReverse)
}
if got := gjson.GetBytes(restored, "content.0.name").String(); got != "Bash" {
t.Fatalf("repeated server alias restored to %q, want Bash", got)
}
line := []byte(fmt.Sprintf(`data: {"type":"content_block_start","index":0,"content_block":{"type":"tool_use","id":"toolu_1","name":%q,"input":{}}}`, test.responseAlias))
restoredLine, errStream := reverseRemapOAuthToolNamesFromStreamLine(line, reverseMap)
if errStream != nil {
t.Fatalf("reverseRemapOAuthToolNamesFromStreamLine() error = %v", errStream)
}
if got := gjson.GetBytes(helps.JSONPayload(restoredLine), "content_block.name").String(); got != "Bash" {
t.Fatalf("stream repeated server alias restored to %q, want Bash", got)
}
})
}
}
func TestReverseRemapOAuthToolNamesRecoversMalformedToolIDBySemanticSuffix(t *testing.T) {
const alias = "mcp__hmzqrngkulqv__xuo7jlxlpzee_Bash"
reverseMap := map[string]string{alias: "Bash"}
responseAlias := "mcp__hmzqrngkulqv__hmzqrngkulqv__xuo7jlxlpzee_Bash"
response := []byte(fmt.Sprintf(`{"content":[{"type":"tool_use","id":"toolu_1","name":%q,"input":{}}]}`, responseAlias))
restored, errReverse := reverseRemapOAuthToolNames(response, reverseMap)
if errReverse != nil {
t.Fatalf("reverseRemapOAuthToolNames() error = %v", errReverse)
tests := []struct {
name string
responseAlias string
}{
{name: "short tool ID", responseAlias: "mcp__hmzqrngkulqv__xuo7jlxlpze_Bash"},
{name: "long tool ID", responseAlias: "mcp__hmzqrngkulqv__xuo7jlxlpzeea_Bash"},
{name: "invalid base32 tool ID", responseAlias: "mcp__hmzqrngkulqv__xuo7jlxlpze0_Bash"},
{name: "substituted base32 tool ID", responseAlias: "mcp__hmzqrngkulqv__auo7jlxlpzee_Bash"},
{name: "repeated server and short tool ID", responseAlias: "mcp__hmzqrngkulqv__hmzqrngkulqv__xuo7jlxlpze_Bash"},
}
if got := gjson.GetBytes(restored, "content.0.name").String(); got != "Bash" {
t.Fatalf("repeated server alias restored to %q, want Bash", got)
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
response := []byte(fmt.Sprintf(`{"content":[{"type":"tool_use","id":"toolu_1","name":%q,"input":{}}]}`, test.responseAlias))
restored, errReverse := reverseRemapOAuthToolNames(response, reverseMap)
if errReverse != nil {
t.Fatalf("reverseRemapOAuthToolNames() error = %v", errReverse)
}
if got := gjson.GetBytes(restored, "content.0.name").String(); got != "Bash" {
t.Fatalf("malformed tool ID alias restored to %q, want Bash", got)
}
line := []byte(fmt.Sprintf(`data: {"type":"content_block_start","index":0,"content_block":{"type":"tool_use","id":"toolu_1","name":%q,"input":{}}}`, test.responseAlias))
restoredLine, errStream := reverseRemapOAuthToolNamesFromStreamLine(line, reverseMap)
if errStream != nil {
t.Fatalf("reverseRemapOAuthToolNamesFromStreamLine() error = %v", errStream)
}
if got := gjson.GetBytes(helps.JSONPayload(restoredLine), "content_block.name").String(); got != "Bash" {
t.Fatalf("stream malformed tool ID alias restored to %q, want Bash", got)
}
})
}
}
@@ -209,6 +274,11 @@ func TestReverseRemapOAuthToolNamesRejectsUnsafeMangledAliases(t *testing.T) {
alias: "mcp__" + firstParts.server + "__" + unknownToolID + "_" + firstParts.semantic,
wantError: "semantic suffix matches multiple declared tools",
},
{
name: "ambiguous semantic suffix with malformed tool ID",
alias: "mcp__" + firstParts.server + "__" + unknownToolID[:len(unknownToolID)-1] + "_" + firstParts.semantic,
wantError: "semantic suffix matches multiple declared tools",
},
{
name: "unrecoverable semantic suffix",
alias: "mcp__" + firstParts.server + "__" + unknownToolID + "_missing_tool",