Skip to content

fix(claude): extend Stop hook timeout and apply headless opts in SDK query #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lavaman131 merged 1 commit into from
Apr 22, 2026
Merged

fix(claude): extend Stop hook timeout and apply headless opts in SDK query #713

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions src/sdk/providers/claude.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,25 @@ function buildWorkflowHookCommand(subcommand: string, extraArgs: readonly string
].join(" ");
}

/**
* Effectively-unbounded timeout (in seconds) for the Stop hook command.
*
* Claude Code's Stop hook process runs three phases sequentially — the
* initial Stop hooks, then TaskCompleted hooks (per in-progress task owned
* by the teammate), then TeammateIdle hooks — and the per-hook `timeout`
* applies to the entire lifecycle. Under Claude Code's default (10 min),
* a turn that leaves tasks in-progress (e.g. via the TaskList/TodoWrite
* tool) can blow the budget and get killed, which also severs our
* `_claude-stop-hook`'s queue/release poll and strands the workflow.
*
* ~24 days — the max safe `setTimeout` value (2^31 - 1 ms) expressed in
* seconds — removes the timeout in practical terms. `waitForIdle`'s
* marker-file watch still fires as soon as our initial hook writes the
* marker, so the workflow proceeds on real hook completion, not on timer
* expiry.
*/
const STOP_HOOK_TIMEOUT_SECONDS = 2_147_483;

/**
* Inline settings injected via `claude --settings <json>` on every workflow
* spawn. Registers the workflow-owned hooks without relying on
Expand All @@ -117,7 +136,9 @@ function buildWorkflowHookCommand(subcommand: string, extraArgs: readonly string
*
* Registered hooks:
* - `Stop`: deliver queued follow-up prompts via `{decision:"block"}` and
* write an idle-marker file that `waitForIdle` watches.
* write an idle-marker file that `waitForIdle` watches. `timeout` is
* set to {@link STOP_HOOK_TIMEOUT_SECONDS} so the hook survives long
* TaskCompleted/TeammateIdle phases — see the constant's docstring.
* - `PreToolUse` matched on `AskUserQuestion`: write
* `~/.atomic/claude-hil/<session_id>` so `watchHILMarker` can fire
* `onHIL(true)` — the node card flips to the blue "awaiting_input" pulse.
Expand All @@ -140,6 +161,7 @@ const WORKFLOW_HOOK_SETTINGS = JSON.stringify({
{
type: "command",
command: buildWorkflowHookCommand("_claude-stop-hook"),
timeout: STOP_HOOK_TIMEOUT_SECONDS,
},
],
},
Expand Down Expand Up @@ -1074,7 +1096,7 @@ export class HeadlessClaudeSessionWrapper {

let sdkSessionId = "";
try {
for await (const msg of sdkQuery({ prompt, options: options ?? {} })) {
for await (const msg of sdkQuery({ prompt, options: headlessSdkOpts })) {
if (msg.type === "result") {
sdkSessionId = String(
(msg as Record<string, unknown>).session_id ?? "",
Expand Down