fix: add default timeout for terminal command tool execution

[amabito]

Summary

• runTerminalCommand could hang indefinitely, blocking the entire session
• Adds a default 2-minute timeout with graceful SIGTERM -> SIGKILL shutdown
• All timers properly cleared on close/error (no resource leaks)

Changes

• core/tools/implementations/runTerminalCommand.ts — timeout logic for both streaming and non-streaming modes
• core/tools/implementations/runTerminalCommand.timeout.vitest.ts — 5 test cases covering timeout, cleanup, and background process exclusion

Details

• DEFAULT_TOOL_TIMEOUT_MS = 120_000 (2 minutes)
• SIGTERM first, SIGKILL after 5s grace period if still alive
• Inner SIGKILL timer is also cleared on process exit (no dangling timers)
• waitForCompletion=false (background) processes are not affected
• Timeout message appended to output: [Timeout: process killed after 2 minutes]

Test plan

• runTerminalCommand.timeout.vitest.ts passes
• Existing runTerminalCommand.vitest.ts unaffected
• Manual: run a long command, verify it terminates after 2 min

🤖 Generated with Claude Code

---

Continue Tasks: ✅ 1 no changes — View all

---

Summary by cubic

Add a default 2-minute timeout to runTerminalCommand to prevent hung commands from blocking sessions. Uses graceful SIGTERM → SIGKILL shutdown with accurate process-state checks and full timer cleanup.

• Bug Fixes
  • Applies to streaming and non-streaming; skipped for background runs (waitForCompletion=false).
  • On timeout: update UI, append “[Timeout: process killed after 2 minutes]”, send SIGTERM, then SIGKILL after 5s if still running.
  • Use exitCode/signalCode to detect running state; clear all timers on close/error, including the SIGKILL grace timer; add tests for timeout and cleanup.

^{Written for commit 8a01aac. Summary will update on new commits.}

[github-actions]

All contributors have signed the CLA ✍️ ✅
_{Posted by the CLA Assistant Lite bot.}

[amabito]

I have read the CLA Document and I hereby sign the CLA

[cubic-dev-ai]

3 issues found across 2 files

Prompt for AI agents (all issues)

Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.


<file name="core/tools/implementations/runTerminalCommand.ts">

<violation number="1" location="core/tools/implementations/runTerminalCommand.ts:179">
P3: Non-streaming waitForCompletion schedules timeout/sigkill timers but the error handler does not clear them, leaving timers to fire after rejection and potentially kill/mutate output for a failed spawn.</violation>

<violation number="2" location="core/tools/implementations/runTerminalCommand.ts:180">
P2: SIGKILL fallback never runs because childProc.killed becomes true immediately after SIGTERM; it does not indicate process exit. Use exitCode/signalCode to detect whether the process is still running.</violation>
</file>

<file name="core/tools/implementations/runTerminalCommand.timeout.vitest.ts">

<violation number="1" location="core/tools/implementations/runTerminalCommand.timeout.vitest.ts:35">
P2: Extra closing brace ends the describe block before the final test, leaving the last test outside the setup/teardown and out of scope for helpers/mocks.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

[amabito]

I have read the CLA Document and I hereby sign the CLA

[amabito]

recheck

[amabito]

I have read the CLA Document and I hereby sign the CLA

[amabito]

@sestinj CI is fully green (including both required checks), and this is a small, self-contained safety improvement (default 2-min timeout + proper SIGKILL timer cleanup, tests included).

Would appreciate a quick review when you have a moment. Thanks!

[sestinj]

There's a good piece of feedback on here from cubic, but otherwise I'd say this looks good if you can address that!

[amabito]

Thanks for the review!

I’ll address cubic’s feedback and push an update shortly.

[amabito]

Thanks for the review — I've addressed cubic's feedback and pushed an update.

Changes made:

1. Replaced childProc.killed checks with a running-state check based on
   exitCode === null && signalCode === null.
   (Since killed only indicates that kill() was called, not that the process has exited.)

2. Cleared sigkillTimeoutId in the error handler to ensure no delayed
   SIGKILL timer fires after rejection.

These changes were applied consistently to both streaming and non-streaming paths.

@cubic-dev-ai could you please re-run the review?
Let me know if anything else looks off.

[cubic-dev-ai]

Thanks for the review — I've addressed cubic's feedback and pushed an update.

Changes made:

1. Replaced childProc.killed checks with a running-state check based on
   ...

@amabito I have started the AI code review. It will take a few minutes to complete.

[cubic-dev-ai]

2 issues found across 2 files

Prompt for AI agents (all issues)

Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.


<file name="core/tools/implementations/runTerminalCommand.ts">

<violation number="1" location="core/tools/implementations/runTerminalCommand.ts:180">
P2: SIGKILL escalation never runs after SIGTERM because `childProc.killed` becomes true as soon as SIGTERM is sent, even if the process is still running. The timeout can leave hung processes running indefinitely.</violation>

<violation number="2" location="core/tools/implementations/runTerminalCommand.ts:200">
P2: Timeout-killed processes are reported as completed because the close handler treats `code === null` (signal termination) as success; after sending SIGTERM/SIGKILL on timeout, the final status will misleadingly be “Command completed.”</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

[amabito]

@cubic-dev-ai Thanks for the review! I've addressed both points:

1. Replaced childProc.killed with exitCode === null && signalCode === null

Added an isRunning() helper that checks the actual process state via childProc.exitCode and childProc.signalCode, since childProc.killed only reflects whether .kill() was called — not whether the process has actually exited. Applied to both streaming and non-streaming timeout/SIGKILL guards.

2. Clear sigkillTimeoutId in error handlers

Both the streaming and non-streaming childProc.on("error") handlers now clear timeoutId and sigkillTimeoutId to prevent a delayed SIGKILL firing after the promise has already been rejected.

Tests updated to set exitCode/signalCode on the mock child process — all 5 tests pass.

[amabito]

It looks like the win32 build-and-upload-vsix job is failing.

From a quick scan, I don't see any Windows-specific paths touched in this PR, but I may be missing something.

Happy to dig into the raw logs or try to reproduce locally if that helps narrow it down.

[amabito]

Any update on this? Happy to rebase if needed.

[RomneyDa]

@amabito thanks for the contribution!