fix: prevent Chat resume-stream onFinish errors when requests overlap#16620
Merged
Conversation
aayush-kapoor
approved these changes
Jul 14, 2026
aayush-kapoor
added
the
backport
This was referenced Jul 14, 2026
github-actions Bot
added a commit
that referenced
this pull request
Jul 14, 2026
…#16620) ## Background Overlapping chat requests could clear the shared active response before a resume-stream request reached its finally block, causing onFinish handling to log a TypeError in development. ## Summary Chat.makeRequest now keeps a request-local active response for finish handling and only clears the shared activeResponse when it still belongs to the finishing request. ## Testing Kept the focused regression test covering an overlapped resumeStream and sendMessage request where activeResponse is cleared before the resume stream finishes. ## Related Issues Fixes #15668 Co-authored-by: alexanderjacobsen <[email protected]>
github-actions
Bot
removed
the
backport
Contributor
|
✅ Backport PR created: #17258 |
Contributor
|
🚀 Published in:
|
github-actions Bot
added a commit
that referenced
this pull request
Jul 14, 2026
…ts overlap (#17258) This is an automated backport of #16620 to the release-v6.0 branch. FYI @lgrammel --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Aayush Kapoor <[email protected]> Co-authored-by: Aayush Kapoor <[email protected]>
This was referenced Jul 20, 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
2 participants
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.
Background
Overlapping chat requests could clear the shared active response before a resume-stream request reached its finally block, causing onFinish handling to log a TypeError in development.
Summary
Chat.makeRequest now keeps a request-local active response for finish handling and only clears the shared activeResponse when it still belongs to the finishing request.
Testing
Kept the focused regression test covering an overlapped resumeStream and sendMessage request where activeResponse is cleared before the resume stream finishes.
Related Issues
Fixes #15668
Co-authored-by: alexanderjacobsen [email protected]