Repository navigation
fix(agent): fail closed when a blocking hook chain is aborted - #160
Open
alexb-openrouter wants to merge 1 commit into
Open
alexb-openrouter wants to merge 1 commit into
alexb-openrouter wants to merge 1 commit into
Conversation
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Contributor
|
I'll fix CI failures and address comments from users with write access that start with 'Devin'.
|
This branch has not been deployed
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
Risk fixed: a
PreToolUsedeny guard could be silently skipped, and the tool ran anyway. If an earlier handler returned detached work ({ async: true, work, asyncTimeout }) and that work hit its timeout while a later handler was still running, the emit signal was aborted,executeHandlerChainstopped before the remaining handlers, and the emit returnedblocked: false. The tool executor readsblocked: falseas "allowed", so a guard that would have returned{ block }never ran.abortInflight()mid-chain had the same effect.Change: in
executeHandlerChain, when the chain bails out oncontext.signal.abortedand the hook has ablockField(PreToolUse→block,UserPromptSubmit→reject), setblocked = true:The tool call then gets the existing
hook_blockedresult ("Blocked by PreToolUse hook"), andUserPromptSubmitthrows "Prompt rejected by hook". Non-blocking hooks (PostToolUse, etc.) are unchanged: an aborted chain still just stops.Tests: new cases in
hooks-contract-fixes.test.ts. The detached-timeout-skips-guard case and theabortInflight()-mid-chain case both fail onmain(blocked: false) and pass with this change. Controls check that a timeout that settles in time still runs every handler, and that non-blocking hooks are not marked blocked. Full unit suite, biome and typecheck pass.Note: open PR #107 also touches
hooks-emit.ts(handler return validation). These changes don't overlap, but one PR may need a small rebase after the other merges.