Files
CLIProxyAPI/internal/runtime/executor/helps/antigravity_structured_output.go
Luis Pater 1d45a5f332 fix(claude): handle forced tool restrictions in claude 5.5
- Fall back to schema prompts for Antigravity Claude 5.5 while preserving unrelated request settings.
- Normalize unsupported forced tool choices before thinking preparation in direct Claude execution and token-count paths.
- Add regression coverage for schema integrity, model boundaries, retries, and final payload rule precedence.

Closes: #7000
2026-10-26 20:36:51 +08:00

75 lines
2.8 KiB
Go

package helps
import (
"regexp"
"strings"
"github.com/router-for-me/CLIProxyAPI/v8/internal/thinking"
"github.com/router-for-me/CLIProxyAPI/v8/internal/translator/common"
"github.com/tidwall/gjson"
"github.com/tidwall/sjson"
)
var claude55Model = regexp.MustCompile(`^claude-(opus|sonnet)-5-5(?:-(high|reasoning))?(?:-[0-9]{8})?(?:\[[^\[\]]+\])?$`)
// PrepareAntigravityClaudeStructuredOutput replaces native output schemas with
// best-effort prompt instructions for Claude 5.5, which rejects forced tool use.
// Call after sensitive-word obfuscation and before schema cleaning or payload rules.
// The boolean tells the request builder not to restore VALIDATED tool mode.
func PrepareAntigravityClaudeStructuredOutput(model string, payload []byte) ([]byte, bool) {
model = strings.ToLower(thinking.ParseSuffix(strings.TrimSpace(model)).ModelName)
if !claude55Model.MatchString(model) {
return payload, false
}
containers := []string{"request.generationConfig", "request.generation_config"}
schemaKeys := []string{"responseSchema", "responseJsonSchema", "response_schema", "response_json_schema"}
var schema gjson.Result
for _, container := range containers {
for _, key := range schemaKeys {
if candidate := gjson.GetBytes(payload, container+"."+key); candidate.IsObject() {
schema = candidate
break
}
}
if schema.Exists() {
break
}
}
if !schema.Exists() {
return payload, false
}
// Wrap the untouched schema as a format, not as format settings themselves.
format := gjson.Parse(`{"type":"json_schema","schema":` + schema.Raw + `}`)
instruction := common.BuildClaudeStructuredOutputInstruction(format)
systemPath := "request.systemInstruction"
if !gjson.GetBytes(payload, systemPath).Exists() && gjson.GetBytes(payload, "request.system_instruction").Exists() {
systemPath = "request.system_instruction"
}
updated, errSet := sjson.SetBytes(payload, systemPath+".parts.-1.text", instruction)
if errSet != nil {
return payload, false
}
payload = updated
// Remove only native output leaves; other config fields and aliases stay put.
for _, container := range containers {
for _, key := range append(schemaKeys, "responseMimeType", "response_mime_type") {
payload, _ = sjson.DeleteBytes(payload, container+"."+key)
}
}
for _, container := range []string{"request.toolConfig", "request.tool_config"} {
for _, key := range []string{"functionCallingConfig", "function_calling_config"} {
path := container + "." + key
switch strings.ToUpper(gjson.GetBytes(payload, path+".mode").String()) {
case "ANY", "VALIDATED":
payload, _ = sjson.SetBytes(payload, path+".mode", "AUTO")
payload, _ = sjson.DeleteBytes(payload, path+".allowedFunctionNames")
payload, _ = sjson.DeleteBytes(payload, path+".allowed_function_names")
}
}
}
return payload, true
}