diff --git a/internal/cache/signature_cache.go b/internal/cache/signature_cache.go index d4a864e0..0a2ffa26 100644 --- a/internal/cache/signature_cache.go +++ b/internal/cache/signature_cache.go @@ -3,7 +3,9 @@ package cache import ( "crypto/sha256" "encoding/hex" + "fmt" "sort" + "strings" "sync" "time" ) @@ -98,7 +100,7 @@ func purgeExpiredSessions() { // CacheSignature stores a thinking signature for a given session and text. // Used for Claude models that require signed thinking blocks in multi-turn conversations. -func CacheSignature(sessionID, text, signature string) { +func CacheSignature(modelName, sessionID, text, signature string) { if sessionID == "" || text == "" || signature == "" { return } @@ -106,7 +108,7 @@ func CacheSignature(sessionID, text, signature string) { return } - sc := getOrCreateSession(sessionID) + sc := getOrCreateSession(fmt.Sprintf("%s#%s", GetModelGroup(modelName), sessionID)) textHash := hashText(text) sc.mu.Lock() @@ -157,12 +159,12 @@ func CacheSignature(sessionID, text, signature string) { // GetCachedSignature retrieves a cached signature for a given session and text. // Returns empty string if not found or expired. -func GetCachedSignature(sessionID, text string) string { +func GetCachedSignature(modelName, sessionID, text string) string { if sessionID == "" || text == "" { return "" } - val, ok := signatureCache.Load(sessionID) + val, ok := signatureCache.Load(fmt.Sprintf("%s#%s", GetModelGroup(modelName), sessionID)) if !ok { return "" } @@ -205,3 +207,14 @@ func ClearSignatureCache(sessionID string) { func HasValidSignature(signature string) bool { return signature != "" && len(signature) >= MinValidSignatureLen } + +func GetModelGroup(modelName string) string { + if strings.Contains(modelName, "gpt") { + return "gpt" + } else if strings.Contains(modelName, "claude") { + return "claude" + } else if strings.Contains(modelName, "gemini") { + return "gemini" + } + return modelName +} diff --git a/internal/cache/signature_cache_test.go b/internal/cache/signature_cache_test.go index e4bddbe4..6b33dfd3 100644 --- a/internal/cache/signature_cache_test.go +++ b/internal/cache/signature_cache_test.go @@ -5,6 +5,8 @@ import ( "time" ) +const testModelName = "test-model" + func TestCacheSignature_BasicStorageAndRetrieval(t *testing.T) { ClearSignatureCache("") @@ -13,10 +15,10 @@ func TestCacheSignature_BasicStorageAndRetrieval(t *testing.T) { signature := "abc123validSignature1234567890123456789012345678901234567890" // Store signature - CacheSignature(sessionID, text, signature) + CacheSignature(testModelName, sessionID, text, signature) // Retrieve signature - retrieved := GetCachedSignature(sessionID, text) + retrieved := GetCachedSignature(testModelName, sessionID, text) if retrieved != signature { t.Errorf("Expected signature '%s', got '%s'", signature, retrieved) } @@ -29,13 +31,13 @@ func TestCacheSignature_DifferentSessions(t *testing.T) { sig1 := "signature1_1234567890123456789012345678901234567890123456" sig2 := "signature2_1234567890123456789012345678901234567890123456" - CacheSignature("session-a", text, sig1) - CacheSignature("session-b", text, sig2) + CacheSignature(testModelName, "session-a", text, sig1) + CacheSignature(testModelName, "session-b", text, sig2) - if GetCachedSignature("session-a", text) != sig1 { + if GetCachedSignature(testModelName, "session-a", text) != sig1 { t.Error("Session-a signature mismatch") } - if GetCachedSignature("session-b", text) != sig2 { + if GetCachedSignature(testModelName, "session-b", text) != sig2 { t.Error("Session-b signature mismatch") } } @@ -44,13 +46,13 @@ func TestCacheSignature_NotFound(t *testing.T) { ClearSignatureCache("") // Non-existent session - if got := GetCachedSignature("nonexistent", "some text"); got != "" { + if got := GetCachedSignature(testModelName, "nonexistent", "some text"); got != "" { t.Errorf("Expected empty string for nonexistent session, got '%s'", got) } // Existing session but different text - CacheSignature("session-x", "text-a", "sigA12345678901234567890123456789012345678901234567890") - if got := GetCachedSignature("session-x", "text-b"); got != "" { + CacheSignature(testModelName, "session-x", "text-a", "sigA12345678901234567890123456789012345678901234567890") + if got := GetCachedSignature(testModelName, "session-x", "text-b"); got != "" { t.Errorf("Expected empty string for different text, got '%s'", got) } } @@ -59,12 +61,12 @@ func TestCacheSignature_EmptyInputs(t *testing.T) { ClearSignatureCache("") // All empty/invalid inputs should be no-ops - CacheSignature("", "text", "sig12345678901234567890123456789012345678901234567890") - CacheSignature("session", "", "sig12345678901234567890123456789012345678901234567890") - CacheSignature("session", "text", "") - CacheSignature("session", "text", "short") // Too short + CacheSignature(testModelName, "", "text", "sig12345678901234567890123456789012345678901234567890") + CacheSignature(testModelName, "session", "", "sig12345678901234567890123456789012345678901234567890") + CacheSignature(testModelName, "session", "text", "") + CacheSignature(testModelName, "session", "text", "short") // Too short - if got := GetCachedSignature("session", "text"); got != "" { + if got := GetCachedSignature(testModelName, "session", "text"); got != "" { t.Errorf("Expected empty after invalid cache attempts, got '%s'", got) } } @@ -76,9 +78,9 @@ func TestCacheSignature_ShortSignatureRejected(t *testing.T) { text := "Some text" shortSig := "abc123" // Less than 50 chars - CacheSignature(sessionID, text, shortSig) + CacheSignature(testModelName, sessionID, text, shortSig) - if got := GetCachedSignature(sessionID, text); got != "" { + if got := GetCachedSignature(testModelName, sessionID, text); got != "" { t.Errorf("Short signature should be rejected, got '%s'", got) } } @@ -87,15 +89,16 @@ func TestClearSignatureCache_SpecificSession(t *testing.T) { ClearSignatureCache("") sig := "validSig1234567890123456789012345678901234567890123456" - CacheSignature("session-1", "text", sig) - CacheSignature("session-2", "text", sig) + CacheSignature(testModelName, "session-1", "text", sig) + CacheSignature(testModelName, "session-2", "text", sig) - ClearSignatureCache("session-1") + // Clear using the full cache key format (modelGroup#sessionID) + ClearSignatureCache(GetModelGroup(testModelName) + "#session-1") - if got := GetCachedSignature("session-1", "text"); got != "" { + if got := GetCachedSignature(testModelName, "session-1", "text"); got != "" { t.Error("session-1 should be cleared") } - if got := GetCachedSignature("session-2", "text"); got != sig { + if got := GetCachedSignature(testModelName, "session-2", "text"); got != sig { t.Error("session-2 should still exist") } } @@ -104,15 +107,15 @@ func TestClearSignatureCache_AllSessions(t *testing.T) { ClearSignatureCache("") sig := "validSig1234567890123456789012345678901234567890123456" - CacheSignature("session-1", "text", sig) - CacheSignature("session-2", "text", sig) + CacheSignature(testModelName, "session-1", "text", sig) + CacheSignature(testModelName, "session-2", "text", sig) ClearSignatureCache("") - if got := GetCachedSignature("session-1", "text"); got != "" { + if got := GetCachedSignature(testModelName, "session-1", "text"); got != "" { t.Error("session-1 should be cleared") } - if got := GetCachedSignature("session-2", "text"); got != "" { + if got := GetCachedSignature(testModelName, "session-2", "text"); got != "" { t.Error("session-2 should be cleared") } } @@ -151,13 +154,13 @@ func TestCacheSignature_TextHashCollisionResistance(t *testing.T) { sig1 := "signature1_1234567890123456789012345678901234567890123456" sig2 := "signature2_1234567890123456789012345678901234567890123456" - CacheSignature(sessionID, text1, sig1) - CacheSignature(sessionID, text2, sig2) + CacheSignature(testModelName, sessionID, text1, sig1) + CacheSignature(testModelName, sessionID, text2, sig2) - if GetCachedSignature(sessionID, text1) != sig1 { + if GetCachedSignature(testModelName, sessionID, text1) != sig1 { t.Error("text1 signature mismatch") } - if GetCachedSignature(sessionID, text2) != sig2 { + if GetCachedSignature(testModelName, sessionID, text2) != sig2 { t.Error("text2 signature mismatch") } } @@ -169,9 +172,9 @@ func TestCacheSignature_UnicodeText(t *testing.T) { text := "한글 텍스트와 이모지 🎉 그리고 特殊文字" sig := "unicodeSig123456789012345678901234567890123456789012345" - CacheSignature(sessionID, text, sig) + CacheSignature(testModelName, sessionID, text, sig) - if got := GetCachedSignature(sessionID, text); got != sig { + if got := GetCachedSignature(testModelName, sessionID, text); got != sig { t.Errorf("Unicode text signature retrieval failed, got '%s'", got) } } @@ -184,10 +187,10 @@ func TestCacheSignature_Overwrite(t *testing.T) { sig1 := "firstSignature12345678901234567890123456789012345678901" sig2 := "secondSignature1234567890123456789012345678901234567890" - CacheSignature(sessionID, text, sig1) - CacheSignature(sessionID, text, sig2) // Overwrite + CacheSignature(testModelName, sessionID, text, sig1) + CacheSignature(testModelName, sessionID, text, sig2) // Overwrite - if got := GetCachedSignature(sessionID, text); got != sig2 { + if got := GetCachedSignature(testModelName, sessionID, text); got != sig2 { t.Errorf("Expected overwritten signature '%s', got '%s'", sig2, got) } } @@ -203,10 +206,10 @@ func TestCacheSignature_ExpirationLogic(t *testing.T) { text := "text" sig := "validSig1234567890123456789012345678901234567890123456" - CacheSignature(sessionID, text, sig) + CacheSignature(testModelName, sessionID, text, sig) // Fresh entry should be retrievable - if got := GetCachedSignature(sessionID, text); got != sig { + if got := GetCachedSignature(testModelName, sessionID, text); got != sig { t.Errorf("Fresh entry should be retrievable, got '%s'", got) } diff --git a/internal/memleak_repro_test.go b/internal/memleak_repro_test.go index 9ace27f5..267b7654 100644 --- a/internal/memleak_repro_test.go +++ b/internal/memleak_repro_test.go @@ -79,7 +79,7 @@ func TestMemoryLeak_SignatureCache(t *testing.T) { for j := 0; j < 50; j++ { text := fmt.Sprintf("%s-text-%d", sigText, j) signature := fmt.Sprintf("%s-sig-%d", sig, j) - cache.CacheSignature(sessionID, text, signature) + cache.CacheSignature("test-model", sessionID, text, signature) } } diff --git a/internal/translator/antigravity/claude/antigravity_claude_request.go b/internal/translator/antigravity/claude/antigravity_claude_request.go index 74a85637..560c5de9 100644 --- a/internal/translator/antigravity/claude/antigravity_claude_request.go +++ b/internal/translator/antigravity/claude/antigravity_claude_request.go @@ -15,7 +15,6 @@ import ( "github.com/router-for-me/CLIProxyAPI/v6/internal/thinking" "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/common" "github.com/router-for-me/CLIProxyAPI/v6/internal/util" - log "github.com/sirupsen/logrus" "github.com/tidwall/gjson" "github.com/tidwall/sjson" ) @@ -70,6 +69,7 @@ func deriveSessionID(rawJSON []byte) string { // Returns: // - []byte: The transformed request data in Gemini CLI API format func ConvertClaudeRequestToAntigravity(modelName string, inputRawJSON []byte, _ bool) []byte { + enableThoughtTranslate := true rawJSON := bytes.Clone(inputRawJSON) // Derive session ID for signature caching @@ -138,17 +138,29 @@ func ConvertClaudeRequestToAntigravity(modelName string, inputRawJSON []byte, _ // Client may send stale or invalid signatures from different sessions signature := "" if sessionID != "" && thinkingText != "" { - if cachedSig := cache.GetCachedSignature(sessionID, thinkingText); cachedSig != "" { + if cachedSig := cache.GetCachedSignature(modelName, sessionID, thinkingText); cachedSig != "" { signature = cachedSig // log.Debugf("Using cached signature for thinking block") } } - // NOTE: We do NOT fallback to client signature anymore. - // Client signatures from Claude models are incompatible with Antigravity/Gemini API. - // When switching between models (e.g., Claude Opus -> Gemini Flash), the Claude - // signatures will cause "Corrupted thought signature" errors. - // If we have no cached signature, the thinking block will be skipped below. + // Fallback to client signature only if cache miss and client signature is valid + if signature == "" { + signatureResult := contentResult.Get("signature") + clientSignature := "" + if signatureResult.Exists() && signatureResult.String() != "" { + arrayClientSignatures := strings.SplitN(signatureResult.String(), "#", 2) + if len(arrayClientSignatures) == 2 { + if modelName == arrayClientSignatures[0] { + clientSignature = arrayClientSignatures[1] + } + } + } + if 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) { @@ -162,8 +174,8 @@ func ConvertClaudeRequestToAntigravity(modelName string, inputRawJSON []byte, _ // Claude requires assistant messages to start with thinking blocks when thinking is enabled // Converting to text would break this requirement if isUnsigned { - // TypeScript plugin approach: drop unsigned thinking blocks entirely - log.Debugf("Dropping unsigned thinking block (no valid signature)") + // log.Debugf("Dropping unsigned thinking block (no valid signature)") + enableThoughtTranslate = false continue } @@ -391,8 +403,8 @@ func ConvertClaudeRequestToAntigravity(modelName string, inputRawJSON []byte, _ out, _ = sjson.SetRaw(out, "request.tools", toolsJSON) } - // Map Anthropic thinking -> Gemini thinkingBudget/includeThoughts when type==enabled - if t := gjson.GetBytes(rawJSON, "thinking"); t.Exists() && t.IsObject() && util.ModelSupportsThinking(modelName) { + // Map Anthropic thinking -> Gemini thinkingBudget/include_thoughts when type==enabled + if t := gjson.GetBytes(rawJSON, "thinking"); enableThoughtTranslate && t.Exists() && t.IsObject() { if t.Get("type").String() == "enabled" { if b := t.Get("budget_tokens"); b.Exists() && b.Type == gjson.Number { budget := int(b.Int()) diff --git a/internal/translator/antigravity/claude/antigravity_claude_request_test.go b/internal/translator/antigravity/claude/antigravity_claude_request_test.go index 4729c048..c1a5ac10 100644 --- a/internal/translator/antigravity/claude/antigravity_claude_request_test.go +++ b/internal/translator/antigravity/claude/antigravity_claude_request_test.go @@ -92,7 +92,7 @@ func TestConvertClaudeRequestToAntigravity_ThinkingBlocks(t *testing.T) { // Cache the signature - only cached signatures are used now (not client signatures) sessionID := deriveSessionID(inputJSON) - cache.CacheSignature(sessionID, "Let me think...", validSignature) + cache.CacheSignature("claude-sonnet-4-5-thinking", sessionID, "Let me think...", validSignature) defer cache.ClearSignatureCache(sessionID) output := ConvertClaudeRequestToAntigravity("claude-sonnet-4-5-thinking", inputJSON, false) @@ -131,7 +131,7 @@ func TestConvertClaudeRequestToAntigravity_ThinkingSignatureUsesCached(t *testin }`) sessionID := deriveSessionID(inputJSON) - cache.CacheSignature(sessionID, "Let me think...", cachedSignature) + cache.CacheSignature("claude-sonnet-4-5-thinking", sessionID, "Let me think...", cachedSignature) defer cache.ClearSignatureCache(sessionID) output := ConvertClaudeRequestToAntigravity("claude-sonnet-4-5-thinking", inputJSON, false) @@ -288,7 +288,7 @@ func TestConvertClaudeRequestToAntigravity_ToolUse_WithSignature(t *testing.T) { // Cache the signature - only cached signatures are used now sessionID := deriveSessionID(inputJSON) - cache.CacheSignature(sessionID, "Let me think...", validSignature) + cache.CacheSignature("claude-sonnet-4-5-thinking", sessionID, "Let me think...", validSignature) defer cache.ClearSignatureCache(sessionID) output := ConvertClaudeRequestToAntigravity("claude-sonnet-4-5-thinking", inputJSON, false) @@ -324,7 +324,7 @@ func TestConvertClaudeRequestToAntigravity_ReorderThinking(t *testing.T) { // Cache the signature - only cached signatures are used now sessionID := deriveSessionID(inputJSON) - cache.CacheSignature(sessionID, "Planning...", validSignature) + cache.CacheSignature("claude-sonnet-4-5-thinking", sessionID, "Planning...", validSignature) defer cache.ClearSignatureCache(sessionID) output := ConvertClaudeRequestToAntigravity("claude-sonnet-4-5-thinking", inputJSON, false) @@ -534,7 +534,7 @@ func TestConvertClaudeRequestToAntigravity_TrailingSignedThinking_Kept(t *testin // Cache the signature - only cached signatures are used now sessionID := deriveSessionID(inputJSON) - cache.CacheSignature(sessionID, "Valid thinking...", validSignature) + cache.CacheSignature("claude-sonnet-4-5-thinking", sessionID, "Valid thinking...", validSignature) defer cache.ClearSignatureCache(sessionID) output := ConvertClaudeRequestToAntigravity("claude-sonnet-4-5-thinking", inputJSON, false) diff --git a/internal/translator/antigravity/claude/antigravity_claude_response.go b/internal/translator/antigravity/claude/antigravity_claude_response.go index 875e54a7..d687a30e 100644 --- a/internal/translator/antigravity/claude/antigravity_claude_response.go +++ b/internal/translator/antigravity/claude/antigravity_claude_response.go @@ -73,6 +73,7 @@ func ConvertAntigravityResponseToClaude(_ context.Context, _ string, originalReq SessionID: deriveSessionID(originalRequestRawJSON), } } + modelName := gjson.GetBytes(requestRawJSON, "model").String() params := (*param).(*Params) @@ -139,13 +140,13 @@ func ConvertAntigravityResponseToClaude(_ context.Context, _ string, originalReq log.Debug("Branch: signature_delta") if params.SessionID != "" && params.CurrentThinkingText.Len() > 0 { - cache.CacheSignature(params.SessionID, params.CurrentThinkingText.String(), thoughtSignature.String()) - log.Debugf("Cached signature for thinking block (sessionID=%s, textLen=%d)", params.SessionID, params.CurrentThinkingText.Len()) + cache.CacheSignature(modelName, params.SessionID, params.CurrentThinkingText.String(), thoughtSignature.String()) + // log.Debugf("Cached signature for thinking block (sessionID=%s, textLen=%d)", params.SessionID, params.CurrentThinkingText.Len()) params.CurrentThinkingText.Reset() } output = output + "event: content_block_delta\n" - data, _ := sjson.Set(fmt.Sprintf(`{"type":"content_block_delta","index":%d,"delta":{"type":"signature_delta","signature":""}}`, params.ResponseIndex), "delta.signature", thoughtSignature.String()) + data, _ := sjson.Set(fmt.Sprintf(`{"type":"content_block_delta","index":%d,"delta":{"type":"signature_delta","signature":""}}`, params.ResponseIndex), "delta.signature", fmt.Sprintf("%s#%s", cache.GetModelGroup(modelName), thoughtSignature.String())) output = output + fmt.Sprintf("data: %s\n\n\n", data) params.HasContent = true } else if params.ResponseType == 2 { // Continue existing thinking block if already in thinking state @@ -372,7 +373,7 @@ func resolveStopReason(params *Params) string { // - string: A Claude-compatible JSON response. func ConvertAntigravityResponseToClaudeNonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string { _ = originalRequestRawJSON - _ = requestRawJSON + modelName := gjson.GetBytes(requestRawJSON, "model").String() root := gjson.ParseBytes(rawJSON) promptTokens := root.Get("response.usageMetadata.promptTokenCount").Int() @@ -437,7 +438,7 @@ func ConvertAntigravityResponseToClaudeNonStream(_ context.Context, _ string, or block := `{"type":"thinking","thinking":""}` block, _ = sjson.Set(block, "thinking", thinkingBuilder.String()) if thinkingSignature != "" { - block, _ = sjson.Set(block, "signature", thinkingSignature) + block, _ = sjson.Set(block, "signature", fmt.Sprintf("%s#%s", cache.GetModelGroup(modelName), thinkingSignature)) } responseJSON, _ = sjson.SetRaw(responseJSON, "content.-1", block) thinkingBuilder.Reset() diff --git a/internal/translator/antigravity/claude/antigravity_claude_response_test.go b/internal/translator/antigravity/claude/antigravity_claude_response_test.go index afc3d937..ef6c0afe 100644 --- a/internal/translator/antigravity/claude/antigravity_claude_response_test.go +++ b/internal/translator/antigravity/claude/antigravity_claude_response_test.go @@ -97,6 +97,7 @@ func TestConvertAntigravityResponseToClaude_SignatureCached(t *testing.T) { cache.ClearSignatureCache("") requestJSON := []byte(`{ + "model": "claude-sonnet-4-5-thinking", "messages": [{"role": "user", "content": [{"type": "text", "text": "Cache test"}]}] }`) @@ -143,7 +144,7 @@ func TestConvertAntigravityResponseToClaude_SignatureCached(t *testing.T) { ConvertAntigravityResponseToClaude(ctx, "claude-sonnet-4-5-thinking", requestJSON, requestJSON, signatureChunk, ¶m) // Verify signature was cached - cachedSig := cache.GetCachedSignature(sessionID, thinkingText) + cachedSig := cache.GetCachedSignature("claude-sonnet-4-5-thinking", sessionID, thinkingText) if cachedSig != validSignature { t.Errorf("Expected cached signature '%s', got '%s'", validSignature, cachedSig) } @@ -158,6 +159,7 @@ func TestConvertAntigravityResponseToClaude_MultipleThinkingBlocks(t *testing.T) cache.ClearSignatureCache("") requestJSON := []byte(`{ + "model": "claude-sonnet-4-5-thinking", "messages": [{"role": "user", "content": [{"type": "text", "text": "Multi block test"}]}] }`) @@ -227,7 +229,7 @@ func TestConvertAntigravityResponseToClaude_MultipleThinkingBlocks(t *testing.T) ConvertAntigravityResponseToClaude(ctx, "claude-sonnet-4-5-thinking", requestJSON, requestJSON, block1Sig, ¶m) // Verify first signature cached - if cache.GetCachedSignature(sessionID, firstThinkingText) != validSig1 { + if cache.GetCachedSignature("claude-sonnet-4-5-thinking", sessionID, firstThinkingText) != validSig1 { t.Error("First thinking block signature should be cached") } @@ -241,7 +243,7 @@ func TestConvertAntigravityResponseToClaude_MultipleThinkingBlocks(t *testing.T) ConvertAntigravityResponseToClaude(ctx, "claude-sonnet-4-5-thinking", requestJSON, requestJSON, block2Sig, ¶m) // Verify second signature cached - if cache.GetCachedSignature(sessionID, secondThinkingText) != validSig2 { + if cache.GetCachedSignature("claude-sonnet-4-5-thinking", sessionID, secondThinkingText) != validSig2 { t.Error("Second thinking block signature should be cached") } }