🤖 fix: check abort signal in bash tool stream consumption #541
Conversation
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
Adds abort signal handling to the consumeStream() loop to prevent hangs when bash commands are interrupted while producing output. ## Problem When a new message arrives during an active bash tool execution, the streamManager aborts the current tool call. The bash tool passes the abort signal to runtime.exec(), which kills the process. However, the consumeStream() function was not checking the abort signal during its read loop. In some environments (especially over SSH or with buffered output), the streams don't close immediately after the process is killed, causing reader.read() to hang until the streams eventually close or timeout. ## Solution 1. Register abort event listener that calls reader.cancel() when fired - This interrupts reader.read() immediately if it's blocked - Eliminates race condition of checking abort before read 2. Clean up abort listener in finally block 3. Add abort detection in Promise.all error handler 4. Add abort detection after Promise.all succeeds (belt-and-suspenders) ## Testing - Added unit test that aborts a bash command producing continuous output - Verified abort completes quickly (< 2s) - All 44 bash unit tests pass - All 8 executeBash integration tests pass - All 963 unit tests pass _Generated with `cmux`_
ammar-agent
force-pushed
the
fix-bash-abort-signal-check
branch
from
5927e40 to
45a22c2
Compare
|
✅ Already implemented! The current code (commit 45a22c2) uses This ensures that if the abort signal fires while See lines 305-315 in the current implementation. |
2 participants
Fixes bash tool hanging when interrupted during execution by properly handling abort signals in stream consumption.
Problem
When a new message arrives while a bash command is executing, the tool should abort quickly. However, after PR #537 removed the 10ms wait workaround, the bash tool would hang if the abort signal fired while
reader.read()was blocked waiting for data. This was especially noticeable over SSH or with commands producing continuous output.The issue:
consumeStream()didn't listen for abort events, so when the process was killed but streams hadn't closed yet,reader.read()stayed blocked indefinitely.Solution
Register an abort event listener that immediately cancels the reader when abort fires:
This interrupts
reader.read()mid-operation rather than checking abort before each read (which has a race condition).Testing
Generated with
cmux