Harden Claude stream exit handling#1504
Merged
juliusmarminge merged 6 commits intomainfrom Mar 28, 2026
Merged
Conversation
- Prevent stream exit handling from racing with stopped sessions - Clear the active stream fiber only for the current stream
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
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.
Summary
runtime.errorandturn.completedpayloads so Claude exits do not crash orchestration.Testing
bun fmt,bun lint, andbun typecheck.Note
Medium Risk
Changes Claude session stream lifecycle/cleanup behavior by running
handleStreamExitinside the stream fiber and suppressing exit handling when the session is intentionally stopped, which could affect turn completion and session shutdown sequencing.Overview
Hardens Claude stream shutdown handling in
ClaudeAdapterby movinghandleStreamExitexecution into the stream fiber’s completion path (viaEffect.exit(...).flatMap(...)) instead of observer-forking a separate fiber.It now skips exit handling when
context.stoppedand tightenscontext.streamFiberreference clearing to reduce races between observer teardown and cleanup.Written by Cursor Bugbot for commit 4aa898e. This will update automatically on new commits. Configure here.
Note
Harden stream exit handling in
ClaudeAdapterby running cleanup inside the stream fiberhandleStreamExitnow runs inside the stream fiber on completion rather than being invoked via a separate observer-forked fiber, avoiding a race between the observer and fiber teardown.context.stoppedis true, preventing redundant cleanup on intentional stops.context.streamFiberreference is cleared by the observer unconditionally, and also cleared within the fiber itself when the stream exits normally.streamFiberis now typed explicitly asFiber.Fiber<void, never>and assigned before being stored on context.handleStreamExitcould be called even after the stream was stopped; it is now suppressed in that case.Macroscope summarized 4aa898e.