fix(agents): stop gateway crash from wedged claude-cli turns and persist heartbeat session bindings#98933
Merged
Merged
Conversation
Contributor
|
ClawSweeper status: review started. I am starting a fresh review of this pull request: fix(agents): stop gateway crash from wedged claude-cli turns and persist heartbeat session bindings This is item 1/1 in the current shard. Shard 0/1. This placeholder means the worker is alive and reading the current context. I will edit this same comment with the actual review when the claws are done clicking. Crustacean status: shell secured, claws on keyboard, evidence pebbles being sorted. |
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.
Fixes #98894
Fixes #98895
What Problem This Solves
Two P1 defects in the claude-cli backend found by a reliability audit:
outputPromisewas created with no rejection handler attached until afterawait writeTurnInput(...). If the child was alive but not reading stdin (hung startup, or a reseed history prompt larger than the 64 KiB pipe buffer), the stdin write callback never fired — and when the turn's no-output timer rejected the turn, the rejection had zero handlers. Node'sunhandledRejectionhandler does not treatFailoverErroras suppressible and callsprocess.exit(1): one stuck CLI turn took down every agent and channel on the gateway.persistSessionUsageUpdateskippedapplyCliSessionIdToSessionPatchfor heartbeat andpreserveRuntimeModelruns. Claude print-mode--resumemints a new session id every turn, so each heartbeat advanced the CLI conversation into a new session while the stored binding stayed on the old one — the next user turn resumed the pre-heartbeat session, silently losing everything the agent did during heartbeats and orphaning a forked session under~/.claude/projectsper heartbeat.Why This Change Was Made
await outputPromise. A late rejection of the losingwriteTurnInputpromise is absorbed by the settled race.preserveUserFacingRunState(internal handoffs only), exactly the semantics f55e986 established and 0eca3a9 intended: heartbeats keep preserving user-facing model-display state, but the CLI session binding (and binding clears) from the run persist again.User Impact
Gateways no longer hard-exit when a Claude CLI child wedges during turn startup — the turn fails through the normal failover path instead. Agents with heartbeats stop losing CLI-side conversation context after every heartbeat and stop accumulating orphaned forked sessions on disk.
Evidence
process.on("unhandledRejection")probe asserts nothing escapes.cliSessionBindingis persisted, a heartbeatclearCliSessionBindingis honored, and model-display fields remain preserved.node scripts/run-vitest.mjs src/agents/cli-runner.spawn.test.ts src/auto-reply/reply/session.test.ts(187 tests pass),pnpm tsgopass,node scripts/run-oxlint.mjson touched files clean, repo autoreview (branch mode) clean.