Fix race condition in submitQuery preventing tool response continuations#458
Merged
Merged
Conversation
Contributor
📋 Review SummaryThis PR addresses a subtle race condition in the 🔍 General Feedback
🎯 Specific Feedback🟢 Medium
🔵 Low
✅ Highlights
|
Contributor
Code Coverage Summary
CLI Package - Full Text ReportCore Package - Full Text ReportFor detailed HTML reports, please see the 'coverage-reports-22.x-ubuntu-latest' artifact from the main CI run. |
xaelistic
pushed a commit
to xaelistic/qwen-code
that referenced
this pull request
Jun 7, 2026
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.
Problem
There was a subtle race condition in the
submitQuerymethod that could break the conversation flow when tool calls failed synchronously (e.g., due to parameter validation errors).The Race Condition Flow
submitQuery()setsisSubmittingQueryRef.current = trueprocessGeminiStreamEvents()callsscheduleToolCalls()scheduleToolCalls()synchronously callshandleCompletedTools()handleCompletedTools()tries to callsubmitQuery()with tool responses, but it's blocked becauseisSubmittingQueryRef.currentis stilltruesubmitQuery()eventually reachesfinallyblock and resets flag, but the continuation call was already rejectedWhen This Happens
This race condition occurs specifically when:
handleCompletedToolsexecutes before the originalsubmitQueryfinishesWhy This Works
Testing
This fix resolves cases where:
Linked issues / bugs
Reminder: the model might still emits invalid tool call invocation, but now the model has a chance to recover from error instead of stopping execution loop immediately.