chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-21 05:40:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr-1624' into dev

Browse Source 
# Conflicts:
#	internal/runtime/executor/claude_executor.go
#	internal/runtime/executor/claude_executor_test.go
This commit is contained in:
Luis Pater
2026-02-19 04:05:04 +08:00
parent 55f938164b 7cc725496e
commit b2b17528cb
2 changed files with 101 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/runtime/executor/claude_executor.go
View File

@@ -753,17 +753,11 @@ func applyClaudeToolPrefix(body []byte, prefix string) []byte {
return body
}
// Build a set of built-in tool names (tools with a "type" field)
builtinTools := make(map[string]bool)
if tools := gjson.GetBytes(body, "tools"); tools.Exists() && tools.IsArray() {
tools.ForEach(func(_, tool gjson.Result) bool {
if tool.Get("type").Exists() && tool.Get("type").String() != "" {
if name := tool.Get("name").String(); name != "" {
builtinTools[name] = true
}
}
return true
})
// Collect built-in tool names (those with a non-empty "type" field) so we can
// skip them consistently in both tools and message history.
builtinTools := map[string]bool{}
for _, name := range []string{"web_search", "code_execution", "text_editor", "computer"} {
builtinTools[name] = true
}
if tools := gjson.GetBytes(body, "tools"); tools.Exists() && tools.IsArray() {
@@ -771,6 +765,9 @@ func applyClaudeToolPrefix(body []byte, prefix string) []byte {
// Skip built-in tools (web_search, code_execution, etc.) which have
// a "type" field and require their name to remain unchanged.
if tool.Get("type").Exists() && tool.Get("type").String() != "" {
if n := tool.Get("name").String(); n != "" {
builtinTools[n] = true
}
return true
}
name := tool.Get("name").String()
@@ -785,7 +782,7 @@ func applyClaudeToolPrefix(body []byte, prefix string) []byte {
if gjson.GetBytes(body, "tool_choice.type").String() == "tool" {
name := gjson.GetBytes(body, "tool_choice.name").String()
if name != "" && !strings.HasPrefix(name, prefix) {
if name != "" && !strings.HasPrefix(name, prefix) && !builtinTools[name] {
body, _ = sjson.SetBytes(body, "tool_choice.name", prefix+name)
}
}
@@ -801,7 +798,7 @@ func applyClaudeToolPrefix(body []byte, prefix string) []byte {
switch partType {
case "tool_use":
name := part.Get("name").String()
if name == "" || strings.HasPrefix(name, prefix) {
if name == "" || strings.HasPrefix(name, prefix) || builtinTools[name] {
return true
}
path := fmt.Sprintf("messages.%d.content.%d.name", msgIndex.Int(), contentIndex.Int())