Fix streaming delta merge for duplicate tool call indexes#3425
Open
fengjikui wants to merge 2 commits into
Open
Fix streaming delta merge for duplicate tool call indexes#3425fengjikui wants to merge 2 commits into
fengjikui wants to merge 2 commits into
Conversation
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 8a006bb32c
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
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.
Fixes #3201.
Summary
Streaming tool call deltas can include multiple entries with the same logical
indexin the first chunk. The accumulator used to assign that first list wholesale when the key was absent orNone, so duplicate-index entries bypassed the existing recursive merge path and later argument fragments merged into the wrong physical list entry.This changes the streaming delta accumulators to initialize indexed lists through the existing merge loop instead of taking the first indexed list as-is. It also applies the same initial-list normalization to the chat completion snapshot path and the matching assistant streaming accumulator, which shared the same early-return behavior.
Root cause
accumulate_delta()already knew how to merge list entries by their logicalindex, but only after an accumulator entry existed. When the first streamed value fortool_callscontained two entries withindex: 0, the fast path copied both entries directly into the snapshot. The next chunk then merged into physical slot0while the earlier arguments fragment stayed orphaned in physical slot1, producing invalid final JSON.Validation
Reproduced on current
origin/mainwith a minimal script: duplicateindex: 0entries remained as two physical list entries and the assertion that they merge failed.