diff --git a/internal/translator/antigravity/claude/antigravity_claude_request.go b/internal/translator/antigravity/claude/antigravity_claude_request.go index 2287bccc..54bdfa14 100644 --- a/internal/translator/antigravity/claude/antigravity_claude_request.go +++ b/internal/translator/antigravity/claude/antigravity_claude_request.go @@ -122,30 +122,31 @@ func ConvertClaudeRequestToAntigravity(modelName string, inputRawJSON []byte, _ contentResult := contentResults[j] contentTypeResult := contentResult.Get("type") if contentTypeResult.Type == gjson.String && contentTypeResult.String() == "thinking" { - // Use GetThinkingText to handle wrapped thinking objects - thinkingText := util.GetThinkingText(contentResult) + thinkingText := contentResult.Get("thinking").String() + if thinkingText == "" { + thinkingText = util.GetThinkingText(contentResult) + } signatureResult := contentResult.Get("signature") clientSignature := "" if signatureResult.Exists() && signatureResult.String() != "" { clientSignature = signatureResult.String() } - // Always try cached signature first (more reliable than client-provided) - // Client may send stale or invalid signatures from different sessions + // Prefer client-provided signature to avoid invalidating signed blocks. signature := "" - if sessionID != "" && thinkingText != "" { + if cache.HasValidSignature(clientSignature) { + signature = clientSignature + log.Debugf("Using client-provided signature for thinking block") + } + + // Fallback to cached signature only when client signature is missing/invalid. + if signature == "" && sessionID != "" && thinkingText != "" { if cachedSig := cache.GetCachedSignature(sessionID, thinkingText); cachedSig != "" { signature = cachedSig log.Debugf("Using cached signature for thinking block") } } - // Fallback to client signature only if cache miss and client signature is valid - if signature == "" && cache.HasValidSignature(clientSignature) { - signature = clientSignature - log.Debugf("Using client-provided signature for thinking block") - } - // Store for subsequent tool_use in the same message if cache.HasValidSignature(signature) { currentMessageThinkingSignature = signature diff --git a/internal/translator/antigravity/claude/antigravity_claude_request_test.go b/internal/translator/antigravity/claude/antigravity_claude_request_test.go index 1d727c94..4412cf1e 100644 --- a/internal/translator/antigravity/claude/antigravity_claude_request_test.go +++ b/internal/translator/antigravity/claude/antigravity_claude_request_test.go @@ -4,6 +4,7 @@ import ( "strings" "testing" + "github.com/router-for-me/CLIProxyAPI/v6/internal/cache" "github.com/tidwall/gjson" ) @@ -104,6 +105,36 @@ func TestConvertClaudeRequestToAntigravity_ThinkingBlocks(t *testing.T) { } } +func TestConvertClaudeRequestToAntigravity_ThinkingSignaturePrefersClient(t *testing.T) { + clientSignature := "clientSignature1234567890123456789012345678901234567890123456" + cachedSignature := "cachedSignature1234567890123456789012345678901234567890123456" + inputJSON := []byte(`{ + "model": "claude-sonnet-4-5-thinking", + "messages": [ + {"role": "user", "content": [{"type": "text", "text": "session-seed"}]}, + { + "role": "assistant", + "content": [ + {"type": "thinking", "thinking": "Let me think...", "signature": "` + clientSignature + `"}, + {"type": "text", "text": "Answer"} + ] + } + ] + }`) + + sessionID := deriveSessionID(inputJSON) + cache.CacheSignature(sessionID, "Let me think...", cachedSignature) + defer cache.ClearSignatureCache(sessionID) + + output := ConvertClaudeRequestToAntigravity("claude-sonnet-4-5-thinking", inputJSON, false) + outputStr := string(output) + + firstPart := gjson.Get(outputStr, "request.contents.1.parts.0") + if firstPart.Get("thoughtSignature").String() != clientSignature { + t.Errorf("Expected client thoughtSignature '%s', got '%s'", clientSignature, firstPart.Get("thoughtSignature").String()) + } +} + func TestConvertClaudeRequestToAntigravity_ThinkingBlockWithoutSignature(t *testing.T) { // Unsigned thinking blocks should be removed entirely (not converted to text) inputJSON := []byte(`{