refactor(tool-timeout): extract createTimeoutController, deduplicate timer logic - #2
Merged
FahadBinHussain merged 1 commit intoJul 21, 2026
Conversation
…r logic - Extract composeSignals + AbortController + setTimeout/clearTimeout pattern into ToolTimeout.createTimeoutController() - Replace two duplicated AbortController/setTimeout blocks in tools.ts (built-in tools + MCP plugin tools) with a single call - Add 5 integration tests covering timeout firing, signal composition, dispose cleanup, and idle signal verification - All 15 tool-timeout tests pass; 3 pre-existing task.test.ts failures unchanged from upstream/dev
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults 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)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Closed
6 tasks
FahadBinHussain
merged commit Jul 21, 2026
cafcc31
into
FahadBinHussain:tool-execution-timeout
1 check passed
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.
Stacked on PR to anomalyco/opencode anomalyco#36869 (tool-execution-timeout by @FahadBinHussain). This extracts the repeated AbortController + setTimeout + composeSignals + clearTimeout pattern into a single
ToolTimeout.createTimeoutController()helper and adds timer-lifecycle tests.What
tool-timeout.ts: AddcreateTimeoutController({ tool, timeoutMs, userSignal })— one-stop helper that creates the AbortController, arms the timer, composes signals, and returns{ signal, dispose }for guaranteed cleanuptools.ts: Replace two duplicated blocks (built-in tools + MCP plugin tools) withcreateTimeoutControllercalls, reducing ~30 lines of duplicated low-level timer managementtool-timeout.test.ts: Add 5 integration testsNew tests
fires ToolTimeoutError after timeoutaborted signal has correct tool and timeoutMscomposes user signal with timeout signaldispose clears the timer so no abort firesfinally { dispose() }prevents leak — timer is cleared before it firesnon-aborted signal when idleVerification
The 3 pre-existing failures in
task.test.ts(subagent description, variant, permission shape) are unchanged from upstream/dev — they depend on local.opencode/agent config, not on this change.