fix: ensure message history starts with a user turn for Gemini compatibility#1011
Open
nldhuyen0047 wants to merge 1 commit intoRightNow-AI:mainfrom
Open
fix: ensure message history starts with a user turn for Gemini compatibility#1011nldhuyen0047 wants to merge 1 commit intoRightNow-AI:mainfrom
nldhuyen0047 wants to merge 1 commit intoRightNow-AI:mainfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes a crash/rejection from the Gemini API (
INVALID_ARGUMENT) that occurs when the message history starts with a model (assistant) turn containing afunctionCallblock.Root cause
After context trimming (
validate_and_repair), the drain boundary can land on an assistant turn, leaving it at position 0. Gemini strictly requires:functionCallturn must be preceded by a user turn (not just followed by afunctionResponse)The existing
sanitize_gemini_turnsonly checked that afunctionCallwas followed by afunctionResponse— it did not guard againsti == 0(no preceding user turn).Fix
session_repair.rs— newensure_starts_with_user(): drops leading assistant turns, re-runsvalidate_and_repairin a loop to clean up newly-orphanedToolResultblocks.agent_loop.rs— callsensure_starts_with_user()after context trim and after overflow recovery (both streaming and non-streaming loops).drivers/gemini.rs—sanitize_gemini_turnsnow dropsfunctionCallparts wheni == 0as a last-resort defensive guard.channels/line.rs— minor: remove unnecessary borrow onbase64::encodecall (clippy lint).Test plan
INVALID_ARGUMENTcargo test --workspacepasses