Repository navigation
fix(provider-grok): steer queued messages into a running Grok turn #37335
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
+150
−39
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
efb1466
test(server): Grok steer reaches the running turn without restarting it
juliusmarminge 072bebc
fix(provider-grok): steer queued messages into a running Grok turn
juliusmarminge 23f13dc
fix(server): Grok steers with attachments wait for the running turn
juliusmarminge c9bc311
fix(provider-grok): Grok steers carry their images into the running turn
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
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.
Re-check the active turn after the attachment reads, before
steering.send.steerTurnchecksactiveTurnbefore it awaits attachment text and image reads. It then sends tocontext.nativeThreadId, which is the native session. If T1 finishes during those reads and T2 starts in the same session, the steer can be injected into T2 under T1's identity. The steer takes no permit that start uses, so nothing prevents this.Build the image blocks first, then confirm
contextis still the active turn before sending. If it is not, return the same protocol error that the initial check uses. The orchestrator then handles the message as a follow-up.Suggested fix
const text = yield* providerMessageTextWithAttachmentPaths({ text: turnInput.message.text, attachments: turnInput.message.attachments, resolveAttachmentPath: host.resolveAttachmentPath, resolveExtractedTextPath: host.resolveExtractedTextPath, }); - const steerId = yield* steering.send( - runtime, - context.nativeThreadId, - text, - yield* imageAttachmentBlocks(turnInput.message.attachments), - ); + const images = yield* imageAttachmentBlocks(turnInput.message.attachments); + // The reads above yield, so the turn may have finished. Re-check before sending. + if ((yield* Ref.get(activeTurn)) !== context || context.finalized) { + return yield* new ProviderAdapter.ProviderAdapterProtocolError({ + driver, + detail: `Provider turn ${turnInput.providerTurnId} is not active and cannot be steered.`, + }); + } + const steerId = yield* steering.send(runtime, context.nativeThreadId, text, images);The re-check narrows the window but does not make the check and dispatch atomic. Whether the orchestrator starts T2 during this window, and whether Grok queues the interject into T2, remain external to this repository.
Severity note: the failure misroutes the message to a different turn. It does not drop the message, and it requires a narrow timing window.