fix: Parallel tool results are serialized in completion order, silently breaking provider prompt caching#16578
Merged
Conversation
1 task
aayush-kapoor
approved these changes
Jul 2, 2026
Contributor
|
🚀 Published in:
|
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.
Background
Parallel tool results could be serialized in nondeterministic completion order instead of assistant tool-call order, causing equivalent histories to produce byte-different prompts and miss provider prompt caches.
Summary
Updated toResponseMessages to record assistant tool-call order and stably sort emitted tool-result content by matching toolCallId, with unknown ids kept last.
Testing
Kept the focused regression test for parallel tool calls resolving out of order and made its assertion type-safe.
Related Issues
Fixes #16567