poly-weaver 0.4.4 → 0.5.0

package/dist/providers/claude/completion.js

@@ -1,347 +1,46 @@
-import { CLAUDE_PLAN_FILE_PATH_REGEX, extractClaudeResponse } from "./session.js";
 import { AbstractCompletionDetector } from "../base-completion.js";
+import { extractClaudeResponse } from "./session.js";
+import { trackPendingToolUses } from "./tool-tracking.js";
 /**
- * Resolution signal for any Claude Code tool launched asynchronously
- * (Agent fork/subagent, Bash with run_in_background, Monitor, etc.).
- * The launch-ack `tool_result` for these arrives with
- * `toolUseResult.isAsync === true` and is intentionally not treated as
- * resolution; the actual completion lands later as a `type: "user"` line
- * whose string `content` matches this regex. Capture group 1 is the
- * original `tool_use_id`.
- */
-const TASK_NOTIFICATION_REGEX = /^<task-notification>[\s\S]*?<tool-use-id>([^<]+)<\/tool-use-id>/;
-/**
- * Claude completion detection using the two-signal rule:
- *
- * 1. **Tool-use tracking (primary)**: Track tool_use IDs in assistant messages,
- *    mark resolved when matching tool_result appears. Complete when pending set
- *    is empty AND at least one text output was emitted.
- *
- * 2. **Quiet debounce (secondary)**: No new JSONL lines for `quietMs` after
- *    the primary signal fires.
+ * Claude completion detection for normal turns using the two-signal rule:
  *
- * Both signals must agree before the turn is considered complete.
+ * 1. Track tool_use IDs in assistant messages and mark them resolved when a
+ *    matching tool_result or async <task-notification> appears.
+ * 2. Complete only after pending tools are empty, assistant text exists after
+ *    the latest tool activity, and the quiet debounce elapses.
  *
- * **Async-launched tools**: When a tool is launched asynchronously
- * (`Agent` with or without `subagent_type`, `Bash` with
- * `run_in_background: true`, `Monitor`, etc.), the immediate `tool_result`
- * is a launch acknowledgement carrying outer field
- * `toolUseResult.isAsync === true` — *not* a real result. We deliberately
- * do not remove the `tool_use_id` from `pendingToolUses` for these acks.
- * The real resolution arrives later as a `type: "user"` line whose
- * string `message.content` begins with `<task-notification>` and embeds
- * the original `<tool-use-id>`. That message clears the pending set and
- * bumps `lastToolActivityIdx`, forcing the detector to wait for a fresh
- * assistant turn (narrative text or `ExitPlanMode`) before firing.
- *
- * **Plan-exit prefetch fallback (Claude Code ≥ 2.1.74 deferred-tools era)**:
- * Since 2.1.114, `ExitPlanMode` ships as a deferred tool — Claude must call
- * `ToolSearch({query:"select:ExitPlanMode"})` to load its schema before it can
- * call `ExitPlanMode`. Sometimes the PTY stalls after the ToolSearch returns
- * and the real `ExitPlanMode` call never lands. When we observe the full
- * pre-exit pattern (plan-file `Write`/`Edit` resolved **and** the
- * `ExitPlanMode` ToolSearch resolved), we arm a narrow staleness fallback via
- * `isStaleFallbackReady`: the plan artifact is already on disk, so resolving
- * off it is safe. The arm is deliberately narrow to avoid the
- * extended-thinking false-positives that forced removal of the broad
- * staleness fallback (commit `9ccbd83`).
- *
- * The ToolSearch prefetch is a **session-scoped** fact: once Claude has
- * resolved `ToolSearch(select:ExitPlanMode)` anywhere in the session, the
- * schema stays loaded for every subsequent turn. So the prefetch check
- * inspects both the current turn (`currentLines`) and the pre-resume
- * prefix (`priorLines`). The plan-file Write/Edit half remains
- * **turn-scoped** — iteration N must do its own edit before the fallback
- * arms, so a stale plan from iteration 1 cannot resolve iteration 2
- * before any work happens.
- *
- * **AskUserQuestion suppressor (session-wide)**: `AskUserQuestion` is
- * also a deferred tool, and Claude often pre-loads it alongside
- * `ExitPlanMode` in a single bundled query (e.g.
- * `select:ExitPlanMode,AskUserQuestion`). When a question end-state is
- * loaded, the fallback's premise — "the only valid next call after a plan
- * Write is `ExitPlanMode`, so 15 s of silence must be the PTY bug" —
- * stops holding: Claude can legitimately spend >15 s thinking before
- * emitting `AskUserQuestion`. So we track resolved
- * `ToolSearch(query.includes("AskUserQuestion"))` invocations the same
- * session-scoped way and refuse to arm the fallback when one has been
- * seen. The schema, once loaded, persists for the rest of the session, so
- * this suppressor is **session-wide**: any resolved AskUserQuestion
- * prefetch (current turn or any prior turn) disables the fallback for
- * every subsequent turn of that Claude session, including resumed
- * planner iterations. That is an accepted trade — see dump
- * `2026-05-02T17-53-03-277Z` for the bug this fixes, and KNOWN-ISSUES.md
- * §"Deferred ExitPlanMode Stall" for the regression on dump
- * `2026-05-01T16-10-11-526Z` we explicitly accept (recoverable Ctrl+C
- * hang vs. silently dropped clarification round).
+ * This detector deliberately contains no plan-mode behavior. Native plan-mode
+ * planner and simplifier turns use ClaudePlanModeDetector instead.
  */
-export class ClaudeCompletionStrategy extends AbstractCompletionDetector {
-    exitToolName;
-    // Two-signal state
+export class ClaudePrimaryDetector extends AbstractCompletionDetector {
     pendingToolUses = new Set();
     hasTextOutput = false;
     primaryFired = false;
-    exitToolCalled = false;
-    planExitPrefetchComplete = false;
-    constructor(pollMs = 500, quietMs = 500, exitToolName, staleFallbackMs = Infinity) {
-        super(pollMs, quietMs, staleFallbackMs);
-        this.exitToolName = exitToolName;
+    constructor(pollMs = 500, quietMs = 500) {
+        super(pollMs, quietMs, Infinity);
     }
     analyzeLines(currentLines) {
-        this.pendingToolUses.clear();
-        this.hasTextOutput = false;
-        this.exitToolCalled = false;
-        this.planExitPrefetchComplete = false;
-        let hasAnyToolUse = false;
-        let lastToolActivityIdx = -1;
-        let lastAssistantTextIdx = -1;
-        let lastAssistantStopReason;
-        // Collect all tool_result IDs so we can reconcile out-of-order lines.
-        // Claude Code's JSONL writer can append tool_result before the
-        // corresponding tool_use when parallel tool calls are dispatched.
-        const resolvedIds = new Set();
-        // Track per-message-id whether stop_reason was "tool_use" and whether a
-        // tool_use block has actually been observed for that id. Claude Code's
-        // session writer splits multi-block messages across separate JSONL
-        // lines (one per content block) and the gap between a text block and
-        // the corresponding tool_use block can exceed the quiet-debounce
-        // window — observed at 12 s in dump 2026-04-30T09-40-25-745Z.
-        const stopReasonToolUseMessages = new Set();
-        const messagesWithToolUseBlock = new Set();
-        // Track the tool_use IDs that participate in the deferred-ExitPlanMode
-        // dance, so we can flip `planExitPrefetchComplete` once both have their
-        // matching tool_result. AskUserQuestion prefetches are tracked
-        // separately as a session-wide suppressor.
-        const planFileWriteIds = new Set();
-        const exitPlanModePrefetchIds = new Set();
-        const askUserQuestionPrefetchIds = new Set();
-        for (let idx = 0; idx < currentLines.length; idx++) {
-            const line = currentLines[idx];
-            if (line.type === "assistant") {
-                const message = line.message;
-                if (!message?.content)
-                    continue;
-                lastAssistantStopReason = message.stop_reason;
-                const messageId = message.id;
-                if (messageId && message.stop_reason === "tool_use") {
-                    stopReasonToolUseMessages.add(messageId);
-                }
-                for (const block of message.content) {
-                    if (block.type === "tool_use" && block.id) {
-                        if (messageId)
-                            messagesWithToolUseBlock.add(messageId);
-                        // If this is the plan-exit tool, mark it and skip tracking
-                        if (this.exitToolName && block.name === this.exitToolName) {
-                            this.exitToolCalled = true;
-                            continue;
-                        }
-                        this.pendingToolUses.add(block.id);
-                        hasAnyToolUse = true;
-                        lastToolActivityIdx = idx;
-                        // Plan-file Write/Edit — artifact-on-disk half of the dance.
-                        if ((block.name === "Write" || block.name === "Edit") &&
-                            typeof block.input?.file_path === "string" &&
-                            CLAUDE_PLAN_FILE_PATH_REGEX.test(block.input.file_path)) {
-                            planFileWriteIds.add(block.id);
-                        }
-                        // ToolSearch pre-loading the ExitPlanMode schema — the other
-                        // half. A bundled query like `select:ExitPlanMode,AskUserQuestion`
-                        // hits both branches: it both arms the ExitPlanMode half and
-                        // disqualifies the fallback below via the AskUserQuestion
-                        // suppressor.
-                        if (block.name === "ToolSearch" &&
-                            typeof block.input?.query === "string") {
-                            if (block.input.query.includes("ExitPlanMode")) {
-                                exitPlanModePrefetchIds.add(block.id);
-                            }
-                            if (block.input.query.includes("AskUserQuestion")) {
-                                askUserQuestionPrefetchIds.add(block.id);
-                            }
-                        }
-                    }
-                    if (block.type === "text" && block.text) {
-                        this.hasTextOutput = true;
-                        lastAssistantTextIdx = idx;
-                    }
-                }
-            }
-            else if (line.type === "user") {
-                const message = line.message;
-                if (!message?.content)
-                    continue;
-                // String content is rare in tool-result lines but is exactly how
-                // Claude Code delivers async-tool completion notifications.
-                if (typeof message.content === "string") {
-                    const m = TASK_NOTIFICATION_REGEX.exec(message.content);
-                    if (m) {
-                        const id = m[1];
-                        this.pendingToolUses.delete(id);
-                        resolvedIds.add(id);
-                        lastToolActivityIdx = idx;
-                    }
-                    continue;
-                }
-                // Async-launch ack: the outer line carries
-                // `toolUseResult.isAsync === true`. Treat as activity but do not
-                // resolve — the matching `<task-notification>` will arrive later.
-                const tur = line
-                    .toolUseResult;
-                const isAsyncLaunch = !!tur && tur.isAsync === true;
-                for (const block of message.content) {
-                    if (block.type === "tool_result" && block.tool_use_id) {
-                        if (isAsyncLaunch) {
-                            lastToolActivityIdx = idx;
-                            continue;
-                        }
-                        this.pendingToolUses.delete(block.tool_use_id);
-                        resolvedIds.add(block.tool_use_id);
-                        lastToolActivityIdx = idx;
-                    }
-                }
-            }
-        }
-        // Reconcile out-of-order lines: remove tool_use IDs whose tool_result
-        // appeared earlier in the file (before the tool_use line).
-        for (const id of resolvedIds)
-            this.pendingToolUses.delete(id);
-        // Prefetch is "complete" when both halves of the dance have their
-        // matching tool_result — order-independent, so this works whether the
-        // ToolSearch came before or after the plan-file Write.
-        let sawResolvedPlanFileWrite = false;
-        for (const id of planFileWriteIds) {
-            if (resolvedIds.has(id)) {
-                sawResolvedPlanFileWrite = true;
-                break;
-            }
-        }
-        let sawResolvedExitPlanModePrefetch = false;
-        for (const id of exitPlanModePrefetchIds) {
-            if (resolvedIds.has(id)) {
-                sawResolvedExitPlanModePrefetch = true;
-                break;
-            }
-        }
-        let sawResolvedAskUserQuestionPrefetch = false;
-        for (const id of askUserQuestionPrefetchIds) {
-            if (resolvedIds.has(id)) {
-                sawResolvedAskUserQuestionPrefetch = true;
-                break;
-            }
-        }
-        // Prefetch is session-scoped: a resolved ToolSearch(ExitPlanMode) in any
-        // prior turn keeps the schema loaded for the current turn too. Only
-        // scan `priorLines` if the current slice did not already observe one,
-        // since the in-slice scan is strictly more authoritative (same data).
-        // The same session-scoped reasoning applies to the AskUserQuestion
-        // suppressor: a resolved AskUserQuestion prefetch from any prior turn
-        // disables the fallback for every later turn of the session.
-        if (this.priorLines.length > 0) {
-            if (!sawResolvedExitPlanModePrefetch) {
-                sawResolvedExitPlanModePrefetch = didResolvePrefetchFor(this.priorLines, "ExitPlanMode");
-            }
-            if (!sawResolvedAskUserQuestionPrefetch) {
-                sawResolvedAskUserQuestionPrefetch = didResolvePrefetchFor(this.priorLines, "AskUserQuestion");
-            }
-        }
-        this.planExitPrefetchComplete =
-            sawResolvedPlanFileWrite &&
-                sawResolvedExitPlanModePrefetch &&
-                !sawResolvedAskUserQuestionPrefetch;
-        // A message whose stop_reason is "tool_use" is guaranteed to contain at
-        // least one tool_use block. If we have not yet observed any tool_use
-        // block from such a message, the message is still being written to
-        // JSONL and the response is not done.
-        let awaitingPromisedToolUse = false;
-        for (const id of stopReasonToolUseMessages) {
-            if (!messagesWithToolUseBlock.has(id)) {
-                awaitingPromisedToolUse = true;
-                break;
-            }
-        }
-        // Guard: suppress the primary signal while the response is provably
-        // not done.
-        //   - stop_reason === null         → API response still streaming blocks.
-        //   - stop_reason === "stop_sequence" → synthetic resume responses.
-        //   - awaitingPromisedToolUse      → a message with stop_reason "tool_use"
-        //     has emitted text but its tool_use block has not yet been written
-        //     to JSONL (Claude Code splits multi-block messages across lines and
-        //     the gap can exceed the quiet-debounce window — observed at 12 s
-        //     in dump 2026-04-30T09-40-25-745Z).
-        // undefined (missing field, e.g. in test data) falls through.
-        const responseIncomplete = lastAssistantStopReason === null ||
-            lastAssistantStopReason === "stop_sequence" ||
-            awaitingPromisedToolUse;
-        // Primary signal:
-        // - the last assistant response is not mid-stream
-        // - no pending tool uses
-        // - at least one assistant text output
-        // - if tools were used, we require assistant text to appear after the
-        //   most recent tool activity (prevents resolving between tool_result and
-        //   the final narrative/verdict message).
+        const tracking = trackPendingToolUses(currentLines);
+        this.pendingToolUses = tracking.pendingToolUses;
+        this.hasTextOutput = tracking.hasTextOutput;
+        const responseIncomplete = tracking.lastAssistantStopReason === null ||
+            tracking.lastAssistantStopReason === "stop_sequence" ||
+            tracking.awaitingPromisedToolUse;
         this.primaryFired =
             !responseIncomplete &&
                 this.pendingToolUses.size === 0 &&
                 this.hasTextOutput &&
-                (!hasAnyToolUse || lastAssistantTextIdx > lastToolActivityIdx);
+                (tracking.perToolUseInfo.size === 0 ||
+                    tracking.lastAssistantTextIdx > tracking.lastToolActivityIdx);
     }
     isPrimarySignalFired() {
         return this.primaryFired;
     }
-    shouldShortCircuit(_lines) {
-        return this.exitToolCalled && this.pendingToolUses.size === 0;
-    }
-    isStaleFallbackReady() {
-        return this.planExitPrefetchComplete && this.pendingToolUses.size === 0;
-    }
     shouldSuppressPtyTimerReset() {
-        return (this.primaryFired ||
-            (this.exitToolCalled && this.pendingToolUses.size === 0) ||
-            (this.planExitPrefetchComplete && this.pendingToolUses.size === 0));
+        return this.primaryFired;
     }
     extractResponse(lines) {
         return extractClaudeResponse(lines);
     }
 }
-/**
- * Scan a slice of session lines for a resolved
- * `ToolSearch({query: includes(needle)})` invocation. Used to detect whether
- * a deferred-tool schema was loaded in any prior turn of a resumed Claude
- * session — both for the `ExitPlanMode` arming half of the prefetch fallback
- * and for the `AskUserQuestion` session-wide suppressor.
- */
-function didResolvePrefetchFor(lines, needle) {
-    const prefetchIds = new Set();
-    const resolvedIds = new Set();
-    for (const line of lines) {
-        if (line.type === "assistant") {
-            const message = line.message;
-            if (!message?.content)
-                continue;
-            for (const block of message.content) {
-                if (block.type === "tool_use" &&
-                    block.id &&
-                    block.name === "ToolSearch" &&
-                    typeof block.input?.query === "string" &&
-                    block.input.query.includes(needle)) {
-                    prefetchIds.add(block.id);
-                }
-            }
-        }
-        else if (line.type === "user") {
-            const message = line.message;
-            if (!message?.content || typeof message.content === "string")
-                continue;
-            for (const block of message.content) {
-                if (block.type === "tool_result" && block.tool_use_id) {
-                    resolvedIds.add(block.tool_use_id);
-                }
-            }
-        }
-    }
-    for (const id of prefetchIds) {
-        if (resolvedIds.has(id))
-            return true;
-    }
-    return false;
-}
 //# sourceMappingURL=completion.js.map

package/dist/providers/claude/completion.js.map

@@ -1 +1 @@
-{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/providers/claude/completion.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/providers/claude/completion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;;;;;;;GAUG;AACH,MAAM,OAAO,qBAAsB,SAAQ,0BAA0B;IAC3D,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,aAAa,GAAG,KAAK,CAAC;IACtB,YAAY,GAAG,KAAK,CAAC;IAE7B,YAAY,MAAM,GAAG,GAAG,EAAE,OAAO,GAAG,GAAG;QACrC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACnC,CAAC;IAES,YAAY,CAAC,YAA2B;QAChD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAEpD,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC;QAChD,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;QAE5C,MAAM,kBAAkB,GACtB,QAAQ,CAAC,uBAAuB,KAAK,IAAI;YACzC,QAAQ,CAAC,uBAAuB,KAAK,eAAe;YACpD,QAAQ,CAAC,uBAAuB,CAAC;QAEnC,IAAI,CAAC,YAAY;YACf,CAAC,kBAAkB;gBACnB,IAAI,CAAC,eAAe,CAAC,IAAI,KAAK,CAAC;gBAC/B,IAAI,CAAC,aAAa;gBAClB,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,KAAK,CAAC;oBACjC,QAAQ,CAAC,oBAAoB,GAAG,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IACpE,CAAC;IAES,oBAAoB;QAC5B,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAEkB,2BAA2B;QAC5C,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAES,eAAe,CAAC,KAAoB;QAC5C,OAAO,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;CACF"}

package/dist/providers/claude/session.d.ts

@@ -22,7 +22,7 @@ export declare function extractClaudeResponse(lines: SessionLine[]): string;
 /**
  * Path pattern for Claude's native plan-file location under
  * `~/.claude/plans/`. Shared by `extractClaudePlanFilePath` (artifact
- * extraction) and `ClaudeCompletionStrategy` (completion detection) so the
+ * extraction) and the Claude completion detectors so the
  * two stay in lockstep.
  */
 export declare const CLAUDE_PLAN_FILE_PATH_REGEX: RegExp;
@@ -34,12 +34,32 @@ export declare const CLAUDE_PLAN_FILE_PATH_REGEX: RegExp;
  * (always re-scanned on each run to avoid staleness).
  */
 export declare function extractClaudePlanFilePath(lines: SessionLine[]): string | undefined;
+/**
+ * Thrown when an `AskUserQuestion` tool result has a missing or malformed
+ * `toolUseResult` field. Carries `noRetry = true` so
+ * `runPhaseWithRetries` skips re-parsing the same broken JSONL and the
+ * orchestrator's executor-level hook triggers a session dump before the
+ * error propagates and the CLI exits.
+ */
+export declare class ClaudeQACaptureError extends Error {
+    readonly noRetry = true;
+    constructor(message: string);
+}
 /**
  * Extract AskUserQuestion Q&A pairs from Claude session lines.
  *
- * Walks forward to pair `tool_use` blocks (name === "AskUserQuestion") with
- * their corresponding `tool_result` responses. Multi-question calls have
- * their questions joined with "; ". Unmatched tool_use blocks are skipped.
+ * Reads the structured `toolUseResult` field on the user line (top-level,
+ * alongside `message`) — `{ questions, answers, annotations }` — and emits
+ * one `UserClarification` per sub-question, with `preview` populated from
+ * `annotations[q].preview` when present.
+ *
+ * Strict-throw contract: when a tracked `AskUserQuestion` round has a
+ * missing or malformed `toolUseResult`, throws `ClaudeQACaptureError`
+ * (with `noRetry: true`) instead of fabricating a fallback entry. The
+ * orchestrator's executor-level hook triggers a session dump before the
+ * error propagates so the broken JSONL is preserved alongside the failed
+ * step's artifacts. `tool_result` lines whose `tool_use_id` was not from
+ * `AskUserQuestion` are ignored (no throw).
  */
 export declare function extractClaudeClarifications(lines: SessionLine[]): UserClarification[];
 /**

package/dist/providers/claude/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/providers/claude/session.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAM5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAExE;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,CA0BlE;AAED;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,QAAiC,CAAC;AAE1E;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,GAAG,SAAS,CA4BlF;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,iBAAiB,EAAE,CA8CrF;AAED;;;;;GAKG;AACH,qBAAa,oBAAqB,YAAW,cAAc;IACzD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;gBAEjC,aAAa,CAAC,EAAE,MAAM,MAAM;IAIxC,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAKxD,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAOnD,eAAe,CACnB,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC;IAOZ,gBAAgB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1D,qBAAqB,CACzB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAIzB,mBAAmB,CACvB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAIhB,YAAY;CAI3B"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/providers/claude/session.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAM5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAExE;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,CA0BlE;AAED;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,QAAiC,CAAC;AAE1E;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,GAAG,SAAS,CA4BlF;AAED;;;;;;GAMG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;IAC7C,QAAQ,CAAC,OAAO,QAAQ;gBACZ,OAAO,EAAE,MAAM;CAI5B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,iBAAiB,EAAE,CAmDrF;AAiED;;;;;GAKG;AACH,qBAAa,oBAAqB,YAAW,cAAc;IACzD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;gBAEjC,aAAa,CAAC,EAAE,MAAM,MAAM;IAIxC,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAKxD,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAOnD,eAAe,CACnB,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC;IAOZ,gBAAgB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1D,qBAAqB,CACzB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAIzB,mBAAmB,CACvB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAIhB,YAAY;CAI3B"}

package/dist/providers/claude/session.js

@@ -49,7 +49,7 @@ export function extractClaudeResponse(lines) {
 /**
  * Path pattern for Claude's native plan-file location under
  * `~/.claude/plans/`. Shared by `extractClaudePlanFilePath` (artifact
- * extraction) and `ClaudeCompletionStrategy` (completion detection) so the
+ * extraction) and the Claude completion detectors so the
  * two stay in lockstep.
  */
 export const CLAUDE_PLAN_FILE_PATH_REGEX = /[/\\]\.claude[/\\]plans[/\\]/;
@@ -84,16 +84,42 @@ export function extractClaudePlanFilePath(lines) {
     }
     return undefined;
 }
+/**
+ * Thrown when an `AskUserQuestion` tool result has a missing or malformed
+ * `toolUseResult` field. Carries `noRetry = true` so
+ * `runPhaseWithRetries` skips re-parsing the same broken JSONL and the
+ * orchestrator's executor-level hook triggers a session dump before the
+ * error propagates and the CLI exits.
+ */
+export class ClaudeQACaptureError extends Error {
+    noRetry = true;
+    constructor(message) {
+        super(message);
+        this.name = "ClaudeQACaptureError";
+    }
+}
 /**
  * Extract AskUserQuestion Q&A pairs from Claude session lines.
  *
- * Walks forward to pair `tool_use` blocks (name === "AskUserQuestion") with
- * their corresponding `tool_result` responses. Multi-question calls have
- * their questions joined with "; ". Unmatched tool_use blocks are skipped.
+ * Reads the structured `toolUseResult` field on the user line (top-level,
+ * alongside `message`) — `{ questions, answers, annotations }` — and emits
+ * one `UserClarification` per sub-question, with `preview` populated from
+ * `annotations[q].preview` when present.
+ *
+ * Strict-throw contract: when a tracked `AskUserQuestion` round has a
+ * missing or malformed `toolUseResult`, throws `ClaudeQACaptureError`
+ * (with `noRetry: true`) instead of fabricating a fallback entry. The
+ * orchestrator's executor-level hook triggers a session dump before the
+ * error propagates so the broken JSONL is preserved alongside the failed
+ * step's artifacts. `tool_result` lines whose `tool_use_id` was not from
+ * `AskUserQuestion` are ignored (no throw).
  */
 export function extractClaudeClarifications(lines) {
     const clarifications = [];
-    const questionMap = new Map(); // tool_use_id → question text
+    // tool_use_id → joined-"; " question text. Used to (a) filter unrelated
+    // tool_result lines so strictness only kicks in on AskUserQuestion
+    // rounds, and (b) supply joined-question context to error messages.
+    const questionMap = new Map();
     for (const line of lines) {
         if (line.type === "assistant") {
             const message = line.message;
@@ -119,21 +145,70 @@ export function extractClaudeClarifications(lines) {
             if (!message?.content)
                 continue;
             for (const block of message.content) {
-                if (block.type === "tool_result" && block.tool_use_id) {
-                    const question = questionMap.get(block.tool_use_id);
-                    if (!question)
-                        continue;
-                    const answer = typeof block.content === "string"
-                        ? block.content
-                        : JSON.stringify(block.content);
-                    clarifications.push({ question, answer });
-                    questionMap.delete(block.tool_use_id);
-                }
+                if (block.type !== "tool_result" || !block.tool_use_id)
+                    continue;
+                const question = questionMap.get(block.tool_use_id);
+                if (!question)
+                    continue;
+                const structured = extractStructuredClarifications(line.toolUseResult, block.tool_use_id, question);
+                clarifications.push(...structured);
+                questionMap.delete(block.tool_use_id);
             }
         }
     }
     return clarifications;
 }
+/**
+ * Parse a Claude `toolUseResult` payload into per-sub-question
+ * `UserClarification` entries. Throws `ClaudeQACaptureError` with a
+ * specific reason when the payload is missing or malformed.
+ */
+function extractStructuredClarifications(toolUseResult, toolUseId, joinedQuestion) {
+    const ctx = `tool_use_id=${toolUseId} question="${joinedQuestion}"`;
+    if (toolUseResult === undefined || toolUseResult === null) {
+        throw new ClaudeQACaptureError(`toolUseResult missing (${ctx})`);
+    }
+    if (typeof toolUseResult !== "object") {
+        throw new ClaudeQACaptureError(`toolUseResult is not an object (${ctx})`);
+    }
+    const tur = toolUseResult;
+    if (!Array.isArray(tur.questions) || tur.questions.length === 0) {
+        throw new ClaudeQACaptureError(`questions field is not a non-empty array (${ctx})`);
+    }
+    if (!tur.answers || typeof tur.answers !== "object" || Array.isArray(tur.answers)) {
+        throw new ClaudeQACaptureError(`answers field is not a non-array object (${ctx})`);
+    }
+    const answers = tur.answers;
+    const annotations = (tur.annotations && typeof tur.annotations === "object" && !Array.isArray(tur.annotations))
+        ? tur.annotations
+        : undefined;
+    const questions = tur.questions;
+    const out = [];
+    for (let i = 0; i < questions.length; i++) {
+        const q = questions[i];
+        if (!q || typeof q !== "object") {
+            throw new ClaudeQACaptureError(`questions[${i}] is not an object (${ctx})`);
+        }
+        const questionText = q.question;
+        if (typeof questionText !== "string") {
+            throw new ClaudeQACaptureError(`questions[${i}].question is not a string (${ctx})`);
+        }
+        const answer = answers[questionText];
+        if (typeof answer !== "string") {
+            throw new ClaudeQACaptureError(`answers["${questionText}"] is not a string (${ctx})`);
+        }
+        const entry = { question: questionText, answer };
+        const annotation = annotations?.[questionText];
+        if (annotation && typeof annotation === "object") {
+            const preview = annotation.preview;
+            if (typeof preview === "string" && preview.length > 0) {
+                entry.preview = preview;
+            }
+        }
+        out.push(entry);
+    }
+    return out;
+}
 /**
  * Claude session handler.
  *

package/dist/providers/claude/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/providers/claude/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/providers/claude/session.ts"],"names":[],"mappings":"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"}

package/dist/providers/claude/strategy.d.ts

@@ -1,5 +1,4 @@
-import type { PlanModeConfig, ProviderStrategy, SessionHandler, BuildArgsOpts } from "../types.js";
-import { ClaudeCompletionStrategy } from "./completion.js";
+import type { PlanModeConfig, ProviderStrategy, SessionHandler, BuildArgsOpts, CompletionDetector } from "../types.js";
 export declare class ClaudeStrategy implements ProviderStrategy {
     readonly name = "claude";
     readonly displayName = "Claude Code";
@@ -9,6 +8,8 @@ export declare class ClaudeStrategy implements ProviderStrategy {
     version: string | undefined;
     get planMode(): PlanModeConfig;
     buildArgs(prompt: string, opts: BuildArgsOpts): Promise<string[]>;
-    createDetector(): ClaudeCompletionStrategy;
+    createDetector(opts?: {
+        planMode?: boolean;
+    }): CompletionDetector;
 }
 //# sourceMappingURL=strategy.d.ts.map

package/dist/providers/claude/strategy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"strategy.d.ts","sourceRoot":"","sources":["../../../src/providers/claude/strategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGnG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAG3D,qBAAa,cAAe,YAAW,gBAAgB;IACrD,QAAQ,CAAC,IAAI,YAAY;IACzB,QAAQ,CAAC,WAAW,iBAAiB;IACrC,QAAQ,CAAC,OAAO,YAAY;IAC5B,QAAQ,CAAC,UAAU,aAAa;IAChC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAA8B;IAC9D,OAAO,EAAE,MAAM,GAAG,SAAS,CAAa;IAExC,IAAI,QAAQ,IAAI,cAAc,CAO7B;IAEK,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAcvE,cAAc,IAAI,wBAAwB;CAU3C"}
+{"version":3,"file":"strategy.d.ts","sourceRoot":"","sources":["../../../src/providers/claude/strategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAOvH,qBAAa,cAAe,YAAW,gBAAgB;IACrD,QAAQ,CAAC,IAAI,YAAY;IACzB,QAAQ,CAAC,WAAW,iBAAiB;IACrC,QAAQ,CAAC,OAAO,YAAY;IAC5B,QAAQ,CAAC,UAAU,aAAa;IAChC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAA8B;IAC9D,OAAO,EAAE,MAAM,GAAG,SAAS,CAAa;IAExC,IAAI,QAAQ,IAAI,cAAc,CAO7B;IAEK,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAcvE,cAAc,CAAC,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,kBAAkB;CAalE"}