Repository navigation
fix(provider-acp): Grok threads finish when a monitor ends before the reply #30344
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
Open
juliusmarminge
wants to merge
12
commits into
main
Choose a base branch
from
fix/issue-30304
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+268
−14
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
fc1e95f
test(server): reproduce #30304 Grok monitor completed mid-turn wedgin…
juliusmarminge 7bdf76c
fix(provider-acp): Grok turns finalize when a monitor ends before the…
juliusmarminge 2ded4d2
fix(provider-acp): a mid-turn TaskOutput result survives prompt settl…
juliusmarminge af23452
fix(provider-acp): a TaskOutput failure before task_completed survive…
juliusmarminge 1735660
fix(provider-acp): settlement replays the TaskOutput snapshot, not th…
juliusmarminge 8177808
Merge remote-tracking branch 'origin/main' into fix/issue-30304
juliusmarminge 449cdbd
Merge remote-tracking branch 'origin/main' into fix/issue-30304
juliusmarminge e066f47
test(server): drop Grok monitor hydration rows other cases already cover
juliusmarminge 861a374
Merge remote-tracking branch 'origin/main' into fix/issue-30304
juliusmarminge db02d08
Merge remote-tracking branch 'origin/main' into fix/issue-30304
juliusmarminge 14d07a8
Merge remote-tracking branch 'origin/main' into fix/issue-30304
juliusmarminge c5990ea
test(server): cover an outputless Grok monitor end with no TaskOutput…
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.
Store the full row text in the background cache when a later terminal hydration carries output.
When a terminal cache already exists, line 4558 stores only
backgroundCompletion.appendOutput. Lines 4544-4547 append that text to the row, so the row holds earlier output plus the new text. Settlement replays the cached value through the completion handler at 5337, which replaces the tool output. The earlier output is then lost. Cache the row's full text, as the first-hydration branch already does.Suggested fix
output: !cached ? toolOutputText(hydrated) : backgroundCompletion.appendOutput.length > 0 - ? backgroundCompletion.appendOutput + ? toolOutputText(hydrated) : (cached.output ?? toolOutputText(hydrated)),Committable suggestion