fix: prevent consecutive user messages on streaming retry #9249
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
Contributor
Re-review completed. The auto-retry path has been fixed, but manual retry has the same issue.
Mention @roomote in a comment to request specific changes to this pull request or fix all unresolved issues. |
mrubens
approved these changes
Nov 13, 2025
189f412 to
6f7ddee
Compare
When a streaming error occurs after a tool use, the retry logic was adding a duplicate user message to the API conversation history, causing 400 errors. The fix skips adding the user message on retry attempts since it was already added in the first attempt.
6f7ddee to
b9d1e28
Compare
The previous fix prevented adding user messages on retry attempts to avoid consecutive user messages. However, when the assistant returns an empty response, the user message is removed from conversation history (line 2534). On retry, the fix would skip re-adding the message, leaving the conversation incomplete. Solution: Track when the user message was removed and re-add it on retry only in that specific case, while still preventing duplicate messages in normal mid-stream retry scenarios.
| userContent: currentUserContent, | ||
| includeFileDetails: false, | ||
| retryAttempt: (currentItem.retryAttempt ?? 0) + 1, | ||
| userMessageWasRemoved: true, |
Contributor
There was a problem hiding this comment.
The auto-retry path correctly sets userMessageWasRemoved: true, but the manual retry path (lines 2583-2587) doesn't set this flag. When native protocol removes the user message at line 2536 and the user manually approves retry, the missing flag means the user message won't be re-added, causing the same consecutive user message validation error. The manual retry path should also set userMessageWasRemoved: true for consistency.
Fix it with Roo Code or mention @roomote and request a fix.
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.
Fixes the 400 error that occurs when a streaming error happens after a tool use.
Problem
When a stream fails mid-execution (e.g., after a tool use), the retry logic was adding a duplicate user message to the API conversation history, causing consecutive user messages which violate API validation rules.
Solution
Skip adding the user message to conversation history on retry attempts (retryAttempt > 0) since it was already added in the first attempt.
Impact