From 4a9effcbfa3ca0d9baa30f8d84edc06746a9795d Mon Sep 17 00:00:00 2001 From: Luis Pater Date: Mon, 16 Nov 2026 10:12:11 +0800 Subject: [PATCH] fix(translator): keep unsigned Gemini text chunks in one Claude text block - Close text content blocks in Gemini-to-Claude streaming and non-streaming responses only when the part carries a thought signature or at a non-text boundary. - Coalesce consecutive unsigned text chunks into a single text block while keeping explicitly signed text parts isolated and preserving delayed signature carriers. Closes: #7587 --- .../claude/gemini_claude_carrier_test.go | 6 +- .../gemini/claude/gemini_claude_response.go | 8 +- .../claude/gemini_claude_response_test.go | 100 ++++++++++++++++++ 3 files changed, 108 insertions(+), 6 deletions(-) diff --git a/internal/translator/gemini/claude/gemini_claude_carrier_test.go b/internal/translator/gemini/claude/gemini_claude_carrier_test.go index 44429ac0ae..f692891139 100644 --- a/internal/translator/gemini/claude/gemini_claude_carrier_test.go +++ b/internal/translator/gemini/claude/gemini_claude_carrier_test.go @@ -136,14 +136,14 @@ func TestGeminiClaudePartMetadataPreservesSupportedPayload(t *testing.T) { } func TestGeminiClaudeDelayedTextSignaturePartBoundaryRoundTrip(t *testing.T) { - parts := []string{`{"text":"unsigned"}`, `{"text":"signed"}`, `{"thoughtSignature":"` + capturedGeminiThinkingSignature + `"}`} + parts := []string{`{"text":"first "}`, `{"text":"second"}`, `{"thoughtSignature":"` + capturedGeminiThinkingSignature + `"}`} for _, mode := range []string{"nonstream", "stream same chunk", "stream split chunks"} { t.Run(mode, func(t *testing.T) { content := geminiClaudeContentForParts(t, parts, mode) output := replayGeminiClaudeContent(t, content) actual := ojson.GetBytes(output, "contents.0.parts").Array() - if len(actual) != 2 || actual[0].Get("text").String() != "unsigned" || actual[0].Get("thoughtSignature").Exists() || actual[1].Get("text").String() != "signed" || actual[1].Get("thoughtSignature").String() != capturedGeminiThinkingSignature { - t.Fatalf("delayed signature changed native text part contents: %s; content=%s", output, content) + if len(actual) != 1 || actual[0].Get("text").String() != "first second" || actual[0].Get("thoughtSignature").String() != capturedGeminiThinkingSignature { + t.Fatalf("delayed signature should bind to coalesced unsigned text block: %s; content=%s", output, content) } }) } diff --git a/internal/translator/gemini/claude/gemini_claude_response.go b/internal/translator/gemini/claude/gemini_claude_response.go index e967c61619..c7c7bb273c 100644 --- a/internal/translator/gemini/claude/gemini_claude_response.go +++ b/internal/translator/gemini/claude/gemini_claude_response.go @@ -616,8 +616,8 @@ func ConvertGeminiResponseToClaude(_ context.Context, _ string, originalRequestR p.HasVisibleOutput = true } } - if partText != "" { - // Preserve native part boundaries for signatures that may arrive later. + if hasThoughtSignature && partText != "" { + // Keep explicitly signed text parts isolated from subsequent unsigned text. appendEvent("content_block_stop", fmt.Sprintf(`{"type":"content_block_stop","index":%d}`, p.ResponseIndex)) p.ResponseIndex++ p.ResponseType = 0 @@ -876,7 +876,9 @@ func ConvertGeminiResponseToClaudeNonStream(_ context.Context, _ string, origina hasVisibleOutput = true } lastSignatureTarget = translatorcommon.GeminiClaudeCarrierText - flushText() + if partSig != "" { + flushText() + } continue } diff --git a/internal/translator/gemini/claude/gemini_claude_response_test.go b/internal/translator/gemini/claude/gemini_claude_response_test.go index e2516bd0f5..726c33bac1 100644 --- a/internal/translator/gemini/claude/gemini_claude_response_test.go +++ b/internal/translator/gemini/claude/gemini_claude_response_test.go @@ -1515,3 +1515,103 @@ func TestConvertGeminiResponseToClaude_EmptyFunctionCallPlaceholderReturnsError( t.Fatalf("expected error event for empty functionCall placeholder:\n%s", streamOut) } } + +func TestConvertGeminiResponseToClaudeStream_CoalescesConsecutiveUnsignedTextChunks(t *testing.T) { + requestJSON := []byte(`{"model":"gemini-4-argon","messages":[{"role":"user","content":"why is the sky blue?"}]}`) + chunks := [][]byte{ + []byte(`{"candidates":[{"content":{"role":"model","parts":[{"text":"First chunk, "}]}}],"modelVersion":"gemini-4-argon","responseId":"resp-7587"}`), + []byte(`{"candidates":[{"content":{"role":"model","parts":[{"text":"second chunk, "}]}}],"modelVersion":"gemini-4-argon","responseId":"resp-7587"}`), + []byte(`{"candidates":[{"content":{"role":"model","parts":[{"text":"third chunk, "}]}}],"modelVersion":"gemini-4-argon","responseId":"resp-7587"}`), + []byte(`{"candidates":[{"content":{"role":"model","parts":[{"text":"fourth chunk, "}]}}],"modelVersion":"gemini-4-argon","responseId":"resp-7587"}`), + []byte(`{"candidates":[{"content":{"role":"model","parts":[{"text":"fifth chunk."}]}}],"modelVersion":"gemini-4-argon","responseId":"resp-7587"}`), + []byte(`{"candidates":[{"content":{"role":"model","parts":[{"text":"","thoughtSignature":"sig-7587"}]}}],"modelVersion":"gemini-4-argon","responseId":"resp-7587"}`), + []byte(`{"candidates":[{"finishReason":"STOP"}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":20},"modelVersion":"gemini-4-argon","responseId":"resp-7587"}`), + []byte("[DONE]"), + } + + var param any + ctx := context.Background() + var fullOut []byte + for _, chunk := range chunks { + fullOut = append(fullOut, bytes.Join(ConvertGeminiResponseToClaude(ctx, "gemini-4-argon", requestJSON, requestJSON, chunk, ¶m), nil)...) + } + + textBlockStarts := 0 + thinkingBlockStarts := 0 + var block0Text strings.Builder + var carrierSig string + for _, line := range strings.Split(string(fullOut), "\n") { + line = strings.TrimSpace(line) + if !strings.HasPrefix(line, "data:") { + continue + } + payload := strings.TrimSpace(strings.TrimPrefix(line, "data:")) + switch ojson.Get(payload, "type").String() { + case "content_block_start": + switch ojson.Get(payload, "content_block.type").String() { + case "text": + textBlockStarts++ + case "thinking": + thinkingBlockStarts++ + } + case "content_block_delta": + switch ojson.Get(payload, "delta.type").String() { + case "text_delta": + if idx := ojson.Get(payload, "index").Int(); idx != 0 { + t.Fatalf("text_delta index = %d, want 0; output:\n%s", idx, string(fullOut)) + } + block0Text.WriteString(ojson.Get(payload, "delta.text").String()) + case "signature_delta": + if idx := ojson.Get(payload, "index").Int(); idx != 1 { + t.Fatalf("signature_delta index = %d, want 1; output:\n%s", idx, string(fullOut)) + } + carrierSig = ojson.Get(payload, "delta.signature").String() + } + } + } + + if textBlockStarts != 1 { + t.Fatalf("text content_block_start count = %d, want 1; output:\n%s", textBlockStarts, string(fullOut)) + } + if thinkingBlockStarts != 1 { + t.Fatalf("thinking content_block_start count = %d, want 1; output:\n%s", thinkingBlockStarts, string(fullOut)) + } + if got := block0Text.String(); got != "First chunk, second chunk, third chunk, fourth chunk, fifth chunk." { + t.Fatalf("block 0 text = %q, want concatenated text", got) + } + if carrierSig != "cpa-gemini-carrier-v1:previous:text:c2lnLTc1ODc" { + t.Fatalf("carrier signature = %q, want previous:text carrier", carrierSig) + } + + t.Run("isolates explicitly signed text part between unsigned chunks", func(t *testing.T) { + var p any + mixedChunks := [][]byte{ + []byte(`{"candidates":[{"content":{"role":"model","parts":[{"text":"before-1 "}]}}],"modelVersion":"gemini-4-argon","responseId":"resp-7587-mixed"}`), + []byte(`{"candidates":[{"content":{"role":"model","parts":[{"text":"before-2 "}]}}],"modelVersion":"gemini-4-argon","responseId":"resp-7587-mixed"}`), + []byte(`{"candidates":[{"content":{"role":"model","parts":[{"text":"signed-mid","thoughtSignature":"sig-mid"}]}}],"modelVersion":"gemini-4-argon","responseId":"resp-7587-mixed"}`), + []byte(`{"candidates":[{"content":{"role":"model","parts":[{"text":"after-1 "}]}}],"modelVersion":"gemini-4-argon","responseId":"resp-7587-mixed"}`), + []byte(`{"candidates":[{"content":{"role":"model","parts":[{"text":"after-2"}]},"finishReason":"STOP"}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":20},"modelVersion":"gemini-4-argon","responseId":"resp-7587-mixed"}`), + []byte("[DONE]"), + } + var mixedOut []byte + for _, ch := range mixedChunks { + mixedOut = append(mixedOut, bytes.Join(ConvertGeminiResponseToClaude(ctx, "gemini-4-argon", requestJSON, requestJSON, ch, &p), nil)...) + } + content := ojson.Parse(claudeContentFromGeminiStream(t, mixedOut).String()).Array() + if len(content) != 4 { + t.Fatalf("expected 4 content blocks (text, carrier, signed text, text), got %d: %s", len(content), string(mixedOut)) + } + if content[0].Get("type").String() != "text" || content[0].Get("text").String() != "before-1 before-2 " { + t.Fatalf("block 0 = %s, want coalesced 'before-1 before-2 '", content[0].Raw) + } + if content[1].Get("type").String() != "thinking" || content[1].Get("signature").String() != "sig-mid" { + t.Fatalf("block 1 = %s, want carrier for sig-mid", content[1].Raw) + } + if content[2].Get("type").String() != "text" || content[2].Get("text").String() != "signed-mid" { + t.Fatalf("block 2 = %s, want isolated 'signed-mid'", content[2].Raw) + } + if content[3].Get("type").String() != "text" || content[3].Get("text").String() != "after-1 after-2" { + t.Fatalf("block 3 = %s, want coalesced 'after-1 after-2'", content[3].Raw) + } + }) +}