fix: prevent prompt loop hang when cancel races with first result#458
Merged
benbrandt merged 1 commit intoagentclientprotocol:mainfrom Mar 24, 2026
Merged
Conversation
When cancel() was called immediately after a prompt, the result message arrived before promptReplayed was set to true. The !promptReplayed check consumed it as a background task result, making the cancelled check unreachable and blocking the loop forever on query.next(). Move the cancelled check before the promptReplayed check so cancellation is always detected regardless of replay state. Fixes agentclientprotocol#442
SteffenDE
approved these changes
Mar 24, 2026
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
3 participants
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 #442
Summary
cancel()was called immediately after a prompt, the result message arrived beforepromptReplayedwas set totrue!promptReplayedcheck consumed it as a "background task result", making thesession.cancelledcheck unreachablequery.next()since no further messages would arrivesession.cancelledcheck before the!promptReplayedcheck so cancellation is always detectedTest plan
npm run buildcompiles cleannpm run lintpasses