Repository navigation
fix(provider-acp): Grok early task completion no longer replaces the child's answer #37162
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
011773d
test(provider-acp): reportless Grok task completion must not replace …
juliusmarminge 1dd737b
fix(provider-acp): Grok early task completion no longer replaces the …
juliusmarminge adc8cb1
fix(provider-acp): keep native reports for unpolled tasks after anoth…
juliusmarminge File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Allow native reports for unreported tasks when another task was handled.
Chatter suppression in
bufferPostSettleWakedepends only on whetherhandledBackgroundTaskIdsInActiveTurnis nonempty (handledInTurnCount > 0, lines 5069-5073). It does not check task IDs ormidTurnUnreportedCompletedTaskIds.When the foreground turn polls task B and task A completes unpolled before settlement, B is handled and A is unreported. A's native assistant report then arrives as an
agent_message_chunk. It is not buffered, andbufferPostSettleWakereturns without an offer (lines 5109-5115). The finalized-turn branch at lines 5398-5407 discards the chunk in the same way. The finalization offer at lines 8184-8186 finds no buffered evidence, so A stays unreported. A completed settle does not clearmidTurnUnreportedCompletedTaskIds.Limit chatter suppression so it does not apply while
midTurnUnreportedCompletedTaskIdsis nonempty. Apply this at both thebufferPostSettleWakecheck and the finalized-turn check at line 5401. Keep the suppression for monitor chatter when no unreported task is outstanding. Chunks carry no task ID, so this change cannot attribute a chunk to task A. While A is outstanding, chatter from other tasks is also buffered. Preserve the requirement to wait for native output, and do not restore completion-only offers. Extend the staggered-task test with one polled task and one unpolled task.