Skip to content

fix: Gemini thought signature validation errors #10694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daniel-lxs wants to merge 1 commit into
base: main
Choose a base branch
from
+611 −4
Open

fix: Gemini thought signature validation errors #10694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions src/api/providers/openrouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ import { NativeToolCallParser } from "../../core/assistant-message/NativeToolCal

import type { ApiHandlerOptions } from "../../shared/api"

import { convertToOpenAiMessages } from "../transform/openai-format"
import {
convertToOpenAiMessages,
sanitizeGeminiMessages,
consolidateReasoningDetails,
} from "../transform/openai-format"
import { normalizeMistralToolCallId } from "../transform/mistral-format"
import { resolveToolProtocol } from "../../utils/resolveToolProtocol"
import { TOOL_PROTOCOL } from "@roo-code/types"
Expand Down Expand Up @@ -251,13 +255,22 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
const isNativeProtocol = toolProtocol === TOOL_PROTOCOL.NATIVE
const isGemini = modelId.startsWith("google/gemini")

// For Gemini models: sanitize messages to handle thought signature validation issues.
// This must happen BEFORE fake encrypted block injection to avoid injecting for
// tool calls that will be dropped due to missing/mismatched reasoning_details.
// See: https://github.com/cline/cline/issues/8214
if (isNativeProtocol && isGemini) {
openAiMessages = sanitizeGeminiMessages(openAiMessages, modelId)
}

// For Gemini with native protocol: inject fake reasoning.encrypted block for tool calls
// This is required when switching from other models to Gemini to satisfy API validation.
// Per OpenRouter documentation (conversation with Toven, Nov 2025):
// - Create ONE reasoning_details entry per assistant message with tool calls
// - Set `id` to the FIRST tool call's ID from the tool_calls array
// - Set `data` to "skip_thought_signature_validator" to bypass signature validation
// - Set `index` to 0
// NOTE: This only runs for tool calls that survived sanitization above.
if (isNativeProtocol && isGemini) {
openAiMessages = openAiMessages.map((msg) => {
if (msg.role === "assistant") {
Expand Down Expand Up @@ -506,9 +519,11 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
}
}

// After streaming completes, store ONLY the reasoning_details we received from the API.
// After streaming completes, consolidate and store reasoning_details from the API.
// This filters out corrupted encrypted blocks (missing `data`) and consolidates by index.
if (reasoningDetailsAccumulator.size > 0) {
this.currentReasoningDetails = Array.from(reasoningDetailsAccumulator.values())
const rawDetails = Array.from(reasoningDetailsAccumulator.values())
this.currentReasoningDetails = consolidateReasoningDetails(rawDetails)
}

if (lastUsage) {
Expand Down
Loading
Loading