@lucascouts/claude-agent-tui 0.3.1 → 0.5.0

package/dist/acp-agent.d.ts

@@ -12,6 +12,7 @@ import type { JsonlWatcher, GetMessages, SessionMessage } from "./engine-watcher
 import type { LocateOptions } from "./jsonl.js";
 import type { DiffEnrichedReaderOptions } from "./diff-enriched-reader.js";
 import type { ListSubagents, GetSubagentMessages } from "./subagent-source.js";
+import { type SidechainToolUse } from "./subagent-gate.js";
 import type { SubagentWatcher } from "./subagent-watcher.js";
 import type { DetectorSchedule, EndOfTurnDetector } from "./end-of-turn.js";
 import type { SessionGate, SessionGateOptions } from "./permissions/gate-wiring.js";
@@ -48,6 +49,12 @@ type Session = {
      * was surfaced in an earlier pump). Per-session — sub-agent row uuids are session-scoped.
      */
     emittedNested: Set<string>;
+    /** Story 054 — per-session dedup Set of sidechain inner tool_use ids already fed to the gate
+     *  correlator (R3 exactly-once). Lazy-init on the gated pump path; absent on a no-gate session. */
+    registeredSidechain?: Set<string>;
+    /** Story 054 — maps a sidechain inner tool_use id → its SidechainToolUse (parentId/toolName/
+     *  toolInput), for the decide()-time parent-Task dialog relay (Tasks 3/4). */
+    sidechainParentMap?: Map<string, SidechainToolUse>;
     /** The managed engine that owns the PTY + watcher; used for idempotent teardown (story 014). */
     engine?: SessionEngine;
     cancelled: boolean;

package/dist/acp-agent.d.ts.map

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

package/dist/acp-agent.js

@@ -17,6 +17,7 @@ import { resolveWatchTarget } from "./jsonl.js";
 import { linearizeTurns, readOrderedMessages, defaultGetMessages } from "./linearize.js";
 import { createDiffEnrichedReader } from "./diff-enriched-reader.js";
 import { sourceSubagentRows, defaultListSubagents, defaultGetSubagentMessages, hasSubagentSpawn, spawnIdsOpen, } from "./subagent-source.js";
+import { collectSidechainToolUses, registerSidechainGateToolUses, } from "./subagent-gate.js";
 import { createSubagentWatcher } from "./subagent-watcher.js";
 import { classifyDiffSource, diffToolCallUpdate } from "./diff-source.js";
 import { guardEvent } from "./billing/entrypoint-guard.js";
@@ -254,9 +255,40 @@ const ALLOW_BYPASS = !IS_ROOT || !!process.env.IS_SANDBOX;
 // payload in these XML-like markers that the CLI uses for its own display.
 // The live prompt loop drops them; replay must strip them too or they leak
 // into the UI on session/load.
-const LOCAL_COMMAND_TAG_PATTERN = /<(command-name|command-message|command-args|local-command-stdout|local-command-stderr)>[\s\S]*?<\/\1>/g;
+const LOCAL_COMMAND_MARKERS = [
+    "command-name",
+    "command-message",
+    "command-args",
+    "local-command-stdout",
+    "local-command-stderr",
+].map((tag) => ({ open: `<${tag}>`, close: `</${tag}>` }));
+// Single-pass scanner that removes each `<tag>…</tag>` marker (matching the nearest
+// closing tag of the same name, like a lazy regex would) in O(n) — no polynomial
+// backtracking (CodeQL js/polynomial-redos #1).
 function stripMarkerTags(text) {
-    return text.replace(LOCAL_COMMAND_TAG_PATTERN, "");
+    const dead = new Set();
+    let result = "";
+    let copiedUpTo = 0;
+    let i = 0;
+    while (i < text.length) {
+        if (text[i] === "<") {
+            const marker = LOCAL_COMMAND_MARKERS.find((m) => !dead.has(m.open) && text.startsWith(m.open, i));
+            if (marker) {
+                const end = text.indexOf(marker.close, i + marker.open.length);
+                if (end !== -1) {
+                    result += text.slice(copiedUpTo, i);
+                    i = copiedUpTo = end + marker.close.length;
+                    continue;
+                }
+                // No closing marker remains anywhere ahead, and `indexOf` only ever
+                // searches forward from here on, so stop treating this tag as an
+                // opener — that avoids rescanning the tail for it on every match.
+                dead.add(marker.open);
+            }
+        }
+        i++;
+    }
+    return result + text.slice(copiedUpTo);
 }
 /**
  * Return user-message content with local-command marker tags removed, or
@@ -406,6 +438,47 @@ function registerGateToolUses(raw, gate) {
         }
     }
 }
+/**
+ * Story 054 — best-effort label for the subagent that spawned a sidechain inner tool, for the ACP
+ * dialog title + the R4 visible-deny line. `parentId` is the spawning `Task`/`Agent` tool_use id; we
+ * scan the MAIN chain `messages` for the assistant `tool_use` block with `id === parentId` whose `name`
+ * is `Task`/`Agent`, and return its `input.subagent_type ?? input.description` when a string, else
+ * undefined. An orphan (`parentId === null`) has no spawn to name → undefined. Tolerant of the reduced
+ * shape in the {@link hasSubagentSpawn} style: non-object rows/messages and non-array content are skipped.
+ */
+function deriveSubagentLabel(messages, parentId) {
+    if (parentId === null)
+        return undefined;
+    for (const msg of messages) {
+        if (msg === null || typeof msg !== "object")
+            continue;
+        const inner = msg.message;
+        if (inner === null || typeof inner !== "object")
+            continue;
+        const content = inner.content;
+        if (!Array.isArray(content))
+            continue;
+        for (const block of content) {
+            if (block === null || typeof block !== "object")
+                continue;
+            const b = block;
+            if (b.type !== "tool_use" || b.id !== parentId)
+                continue;
+            if (b.name !== "Task" && b.name !== "Agent")
+                continue;
+            const input = b.input;
+            if (input === null || typeof input !== "object")
+                return undefined;
+            const i = input;
+            if (typeof i.subagent_type === "string")
+                return i.subagent_type;
+            if (typeof i.description === "string")
+                return i.description;
+            return undefined;
+        }
+    }
+    return undefined;
+}
 export class ClaudeAcpAgent {
     constructor(client, logger, engine = createStubEngine(), deps = {}) {
         this.backgroundTerminals = {};
@@ -1449,6 +1522,20 @@ export class ClaudeAcpAgent {
         // un-merged `messages` slice exactly-once (R4.1 structural: sub-agent rows never advance
         // `detectorCursor` nor register as gate tool_uses).
         await this.emitLinearizedWithNested(sessionId, session, messages);
+        // === SEAM(054) — feed the gate correlator from the sidechain rows (R3). Gated + LIVE-ONLY: runs
+        // only with a present, non-torndown gate, and NEVER inside the shared emitLinearizedWithNested that
+        // session/load replay also calls — so replay stays pure (U3). Additive: touches only the correlator +
+        // the per-session dedup Set/parentMap, never emittedNested nor the detector cursor (U2/U5).
+        if (session.gate && !session.gate.isTorndown) {
+            const subagentRows = await sourceSubagentRows(sessionId, messages, {
+                dir: session.cwd,
+                listSubagents: this.listSubagents,
+                getSubagentMessages: this.getSubagentMessages,
+            });
+            session.registeredSidechain ??= new Set();
+            session.sidechainParentMap ??= new Map();
+            registerSidechainGateToolUses(collectSidechainToolUses(subagentRows), session.gate.correlator, session.registeredSidechain, session.sidechainParentMap);
+        }
         // === SEAM(044) — Option-B sub-agent watcher: arm/refresh/teardown rides the MAIN-CHAIN spawn
         // signal (`hasSubagentSpawn` + `spawnIdsOpen` over the FULL pumped messages — design key
         // decision 4: NOT the detector's `openTaskIds`, the very inference that failed live in the
@@ -1780,7 +1867,20 @@ export class ClaudeAcpAgent {
         // (idempotent with teardownSession) so a crashed TUI leaks no port/server/scratch.
         if (gate) {
             const boundGate = gate;
-            boundGate.bindSession(startedSessionId, () => void this.pumpUpdates(startedSessionId));
+            // Story 054 — the third arg is a LAZY subagent relay resolver: at decide()-time it reads the
+            // session's sidechainParentMap (populated by the pump) to map an inner tool_use id to its parent
+            // Task id + a derived label, so the gate relays a subagent tool's dialog under the parent Task
+            // (R1/R2) or fails loud (R4). A main-chain id (no map entry) returns undefined → unchanged (U1).
+            boundGate.bindSession(startedSessionId, () => void this.pumpUpdates(startedSessionId), (innerId) => {
+                const s = this.sessions[startedSessionId];
+                const entry = s?.sidechainParentMap?.get(innerId);
+                if (!entry)
+                    return undefined;
+                return {
+                    parentId: entry.parentId,
+                    subagentLabel: deriveSubagentLabel(s?.lastMessages ?? [], entry.parentId) ?? "subagent",
+                };
+            });
             boundGate.bindPty(started.pty);
             started.pty.onExit(() => void boundGate.teardown());
         }

package/dist/claude-path.d.ts

@@ -1,12 +1,55 @@
+/**
+ * Provenance pin the live `claude` version is measured against — kept in lockstep
+ * with `fork/.fork-provenance.json`'s externalRuntimeDeps `claude` entry. A live
+ * binary whose version differs only triggers a soft drift *warning* (R1.2), never
+ * a resolution failure.
+ */
+export declare const PROVENANCE_CLAUDE_VERSION = "2.1.159";
+/**
+ * Extract the leading `x.y.z` semver from `claude --version` output.
+ *
+ * e.g. `"2.1.186 (Claude Code)\n"` → `"2.1.186"`. Pure; returns `null` when no
+ * `x.y.z` triple is present (`""`, `"not a version"`, `"\n\n"` → `null`).
+ */
+export declare function parseClaudeVersion(output: string): string | null;
+/**
+ * Injectable seam for running `claude --version` — args-list, NEVER a shell (C5).
+ * Returns the binary's stdout. The default implementation is `defaultVersionExec`.
+ */
+export type VersionExec = (binPath: string, args: readonly string[]) => string;
+/**
+ * Best-effort detection of the live `claude` version at `binPath`.
+ *
+ * Runs `--version` (args-list, no shell) via the injectable `exec` seam and parses
+ * the result. Observability only — it NEVER throws: any failure (spawn error,
+ * timeout, unparseable output) yields `null`.
+ */
+export declare function detectClaudeVersion(binPath: string, exec?: VersionExec): string | null;
+/**
+ * Emit a one-line drift warning via `log` IFF `detected` is known AND differs from
+ * `pinned` (R1.2). Silent when there is no drift or detection failed (`detected`
+ * null). Pure aside from the single `log` call.
+ */
+export declare function reportVersionDrift(detected: string | null, pinned: string, log: (...args: unknown[]) => void): void;
+/** Injectable seams for `resolveClaudePath` so callers/tests can stub the version probe. */
+export interface ResolveOptions {
+    /** Override the version probe (default: {@link detectClaudeVersion}). */
+    detectVersion?: (binPath: string) => string | null;
+    /** Override the warning sink (default: `console.error` → stderr). */
+    log?: (...args: unknown[]) => void;
+}
 /**
  * Resolve an absolute path to an executable subscription `claude` binary.
  *
- * Resolution order:
- *   1. `claude` found on `process.env.PATH` (which-style scan).
- *   2. The documented native-binary path under the vscode extension.
+ * Resolution is PATH-only: scan each `process.env.PATH` entry for an executable
+ * `claude` (which-style). On a hit, run a BEST-EFFORT version probe + drift
+ * warning (R1.1, R1.2) and return the SAME absolute PATH candidate (R5.2 — the
+ * probe never alters the returned path). On a miss, throw a fail-loud Error
+ * naming the PATH lookup plus the install hint (R1.3, R1.4) — there is NO
+ * native-binary / `.vscode` fallback anymore.
  *
  * @returns absolute path to an executable `claude`.
- * @throws Error naming both attempted locations if neither is executable.
+ * @throws Error naming the PATH lookup attempt if no executable `claude` is found.
  */
-export declare function resolveClaudePath(): string;
+export declare function resolveClaudePath(opts?: ResolveOptions): string;
 //# sourceMappingURL=claude-path.d.ts.map

package/dist/claude-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-path.d.ts","sourceRoot":"","sources":["../src/claude-path.ts"],"names":[],"mappings":"AAsCA;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAyB1C"}
+{"version":3,"file":"claude-path.d.ts","sourceRoot":"","sources":["../src/claude-path.ts"],"names":[],"mappings":"AA6BA;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAenD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGhE;AAED;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAC;AAc/E;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,WAAgC,GACrC,MAAM,GAAG,IAAI,CAMf;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,GAChC,IAAI,CAON;AAED,4FAA4F;AAC5F,MAAM,WAAW,cAAc;IAC7B,yEAAyE;IACzE,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IACnD,qEAAqE;IACrE,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACpC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,GAAE,cAAmB,GAAG,MAAM,CA6BnE"}

package/dist/claude-path.js

@@ -1,22 +1,40 @@
-// Resolves the subscription `claude` binary from PATH (story 012, R1/R1.2).
+// Resolves the subscription `claude` binary from PATH (story 012 R1/R1.2;
+// story 049 R1.1–R1.5, R5.2 — version-aware + fail-loud).
 //
 // The fork must drive the user's *subscription* claude (resolved from PATH),
 // NOT the binary embedded in @anthropic-ai/claude-agent-sdk — the SDK-embedded
 // path bills as credit, while the PATH `claude` bills as signature
 // (`entrypoint == 'cli'`, the E1 keystone — experiments/DEGRAU0-RESULTS.md).
-// This helper is ported 1:1 from the E1-validated experiments/lib/claude-path.ts,
-// preserving its resolution order: PATH first, then the documented native-binary
-// fallback (IMPLEMENTACAO-FORK-ACP §17), else throw naming BOTH attempted
-// locations (R1.3).
+//
+// Resolution is PATH-only. Story 049 DROPPED the hardcoded `2.1.159`
+// native-binary fallback (a version-specific `.vscode` path that almost
+// certainly no longer exists is a silent dead end): on a miss we now throw a
+// fail-loud Error naming the PATH lookup that was attempted plus the install
+// hint, so a missing CLI surfaces here rather than as an opaque spawn ENOENT
+// deep in the PTY engine (story 013).
+//
+// On a successful resolve the helper additionally performs a BEST-EFFORT
+// `claude --version` probe and logs a one-line provenance-drift warning when
+// the live binary differs from the pinned `PROVENANCE_CLAUDE_VERSION`
+// (fork/.fork-provenance.json). Drift is observability, never a hard stop: the
+// detect/log path never throws out of `resolveClaudePath` and never changes the
+// returned path (R5.2 — byte-identical return). The version probe spawns the
+// binary directly (execFileSync, args-list, NEVER a shell — C5).
 //
 // Dependency-free on purpose: only node: builtins (FORK.md pins node-pty + the
-// SDK as the only runtime deps; this adds none).
+// SDK as the only runtime deps; this adds none). R1.5 / C4.
+import { execFileSync } from "node:child_process";
 import { accessSync, constants } from "node:fs";
-import { homedir } from "node:os";
 import { delimiter, join } from "node:path";
-// Documented native-binary fallback (IMPLEMENTACAO-FORK-ACP §17), for claude
-// 2.1.159 (frozen base doc anchor, §3). `~` is expanded via os.homedir.
-const FALLBACK_RELATIVE_PATH = join(".vscode", "extensions", "anthropic.claude-code-2.1.159-linux-x64", "resources", "native-binary", "claude");
+/**
+ * Provenance pin the live `claude` version is measured against — kept in lockstep
+ * with `fork/.fork-provenance.json`'s externalRuntimeDeps `claude` entry. A live
+ * binary whose version differs only triggers a soft drift *warning* (R1.2), never
+ * a resolution failure.
+ */
+export const PROVENANCE_CLAUDE_VERSION = "2.1.159";
+/** Shared install hint appended to the fail-loud resolution error (R1.3). */
+const INSTALL_HINT = 'Install the Claude Code subscription CLI or ensure "claude" is on PATH.';
 /** True if `p` exists and is executable by the current process. */
 function isExecutable(p) {
     try {
@@ -27,35 +45,91 @@ function isExecutable(p) {
         return false;
     }
 }
+/**
+ * Extract the leading `x.y.z` semver from `claude --version` output.
+ *
+ * e.g. `"2.1.186 (Claude Code)\n"` → `"2.1.186"`. Pure; returns `null` when no
+ * `x.y.z` triple is present (`""`, `"not a version"`, `"\n\n"` → `null`).
+ */
+export function parseClaudeVersion(output) {
+    const match = /(\d+\.\d+\.\d+)/.exec(output);
+    return match ? match[1] : null;
+}
+/**
+ * Production `VersionExec`: spawn the binary directly via `execFileSync` (args-list,
+ * NO shell — C5) and capture stdout. Bounded by a short timeout; stderr discarded.
+ */
+function defaultVersionExec(binPath, args) {
+    return execFileSync(binPath, [...args], {
+        encoding: "utf8",
+        timeout: 5000,
+        stdio: ["ignore", "pipe", "ignore"],
+    });
+}
+/**
+ * Best-effort detection of the live `claude` version at `binPath`.
+ *
+ * Runs `--version` (args-list, no shell) via the injectable `exec` seam and parses
+ * the result. Observability only — it NEVER throws: any failure (spawn error,
+ * timeout, unparseable output) yields `null`.
+ */
+export function detectClaudeVersion(binPath, exec = defaultVersionExec) {
+    try {
+        return parseClaudeVersion(exec(binPath, ["--version"]));
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Emit a one-line drift warning via `log` IFF `detected` is known AND differs from
+ * `pinned` (R1.2). Silent when there is no drift or detection failed (`detected`
+ * null). Pure aside from the single `log` call.
+ */
+export function reportVersionDrift(detected, pinned, log) {
+    if (detected !== null && detected !== pinned) {
+        log(`[claude-path] claude version drift: detected ${detected} but provenance pins ${pinned} ` +
+            `(continuing — drift is a warning, not a hard stop)`);
+    }
+}
 /**
  * Resolve an absolute path to an executable subscription `claude` binary.
  *
- * Resolution order:
- *   1. `claude` found on `process.env.PATH` (which-style scan).
- *   2. The documented native-binary path under the vscode extension.
+ * Resolution is PATH-only: scan each `process.env.PATH` entry for an executable
+ * `claude` (which-style). On a hit, run a BEST-EFFORT version probe + drift
+ * warning (R1.1, R1.2) and return the SAME absolute PATH candidate (R5.2 — the
+ * probe never alters the returned path). On a miss, throw a fail-loud Error
+ * naming the PATH lookup plus the install hint (R1.3, R1.4) — there is NO
+ * native-binary / `.vscode` fallback anymore.
  *
  * @returns absolute path to an executable `claude`.
- * @throws Error naming both attempted locations if neither is executable.
+ * @throws Error naming the PATH lookup attempt if no executable `claude` is found.
  */
-export function resolveClaudePath() {
-    // 1. PATH lookup: scan each PATH entry for an executable `claude`.
+export function resolveClaudePath(opts = {}) {
+    // PATH lookup: scan each PATH entry for an executable `claude`.
     const pathEnv = process.env.PATH ?? "";
     const pathEntries = pathEnv.split(delimiter).filter((entry) => entry.length > 0);
     for (const entry of pathEntries) {
         const candidate = join(entry, "claude");
         if (isExecutable(candidate)) {
+            // Best-effort, non-fatal version observability — must NOT change the
+            // returned path and must NEVER throw out of the success path (R5.2).
+            const log = opts.log ?? console.error;
+            try {
+                const detected = (opts.detectVersion ?? detectClaudeVersion)(candidate);
+                if (detected) {
+                    log(`[claude-path] resolved claude ${candidate} (version ${detected})`);
+                }
+                reportVersionDrift(detected, PROVENANCE_CLAUDE_VERSION, log);
+            }
+            catch {
+                // Observability is best-effort; never let it break resolution.
+            }
             return candidate;
         }
     }
-    // 2. Documented native-binary fallback (~ expanded via os.homedir).
-    const fallback = join(homedir(), FALLBACK_RELATIVE_PATH);
-    if (isExecutable(fallback)) {
-        return fallback;
-    }
-    // 3. Neither exists: throw naming BOTH attempted locations.
-    throw new Error(`Could not resolve an executable "claude" binary. Tried: ` +
-        `(1) PATH lookup over ${pathEntries.length} entr${pathEntries.length === 1 ? "y" : "ies"} ` +
-        `("${pathEnv}"), and ` +
-        `(2) the documented native-binary fallback "${fallback}". ` +
-        `Install the Claude Code subscription CLI or ensure "claude" is on PATH.`);
+    // No executable `claude` on PATH: fail loud naming the lookup (no fallback).
+    throw new Error(`Could not resolve an executable "claude" binary. ` +
+        `Tried: PATH lookup over ${pathEntries.length} entr${pathEntries.length === 1 ? "y" : "ies"} ` +
+        `("${pathEnv}"). ${INSTALL_HINT}`);
 }

package/dist/drift-checks.d.ts

@@ -0,0 +1,57 @@
+/** The verdict a single drift check returns. `surface` names which binary-contact surface was checked. */
+export interface CheckResult {
+    /** The binary-contact surface this verdict is about (e.g. "stop_reason", "jsonl_shape"). */
+    surface: string;
+    /** True iff no drift was detected on this surface. */
+    ok: boolean;
+    /** Human-readable summary; on `ok=false` it NAMES every offending value (the consumers print it). */
+    detail: string;
+}
+/**
+ * The stop_reason values mapStopReason handles EXPLICITLY (stop-reason-map.ts:26-33). Everything else
+ * hits its default branch. These are the "terminal" taxonomy the bridge answers a turn with.
+ */
+export declare const HANDLED_STOP_REASONS: ReadonlySet<string>;
+/**
+ * stop_reason values that are NON-TERMINAL but EXPECTED (so not drift): the model pauses mid-turn. They
+ * hit mapStopReason's default branch BY DESIGN. `tool_use` is the real one seen in transcripts.
+ */
+export declare const KNOWN_NONTERMINAL_STOP_REASONS: ReadonlySet<string>;
+/** The core top-level keys EVERY raw JSONL event line must carry (jsonl.ts:513-523 — the required set). */
+export declare const REQUIRED_JSONL_KEYS: ReadonlySet<string>;
+/**
+ * Every top-level key a raw JSONL line is ALLOWED to carry = {@link REQUIRED_JSONL_KEYS} ∪ the known
+ * optional universal / per-type fields documented in jsonl.ts:528-543 (plus the universal fields seen
+ * in real fixtures). A key OUTSIDE this set is a NEW/unexpected field → drift.
+ */
+export declare const KNOWN_JSONL_KEYS: ReadonlySet<string>;
+/** The keystroke the native TUI permission prompt accepts for Yes — mirror of allow-inject.ts:29. */
+export declare const EXPECTED_ALLOW_KEYSTROKE: string;
+/**
+ * R2.1 — verify every non-null `message.stop_reason` is either HANDLED or a KNOWN non-terminal value.
+ *
+ * `null`/`undefined`/absent stop_reason is NOT drift (absence) and is ignored. A non-null value outside
+ * {@link HANDLED_STOP_REASONS} ∪ {@link KNOWN_NONTERMINAL_STOP_REASONS} (e.g. a new `pause_turn`) trips
+ * the check; `detail` names every offending value. Pure: no I/O, depends only on `lines`.
+ */
+export declare function checkStopReasons(lines: ReadonlyArray<Record<string, unknown>>): CheckResult;
+/**
+ * R2.2 — verify every SDK content-block type is covered by a handled `switch` case. A block type in
+ * `sdkBlockTypes` but NOT in `handledCases` (e.g. a new `server_tool_use`) is uncovered drift; `detail`
+ * names each uncovered type. Pure: depends only on its two iterable arguments.
+ */
+export declare function checkContentBlockCoverage(sdkBlockTypes: Iterable<string>, handledCases: Iterable<string>): CheckResult;
+/**
+ * R2.3 — verify each raw JSONL line carries every {@link REQUIRED_JSONL_KEYS} core key and NO key
+ * outside {@link KNOWN_JSONL_KEYS}. A missing core key OR a new/unexpected top-level key is drift;
+ * `detail` names the offending key(s). Guards the RAW on-disk shape (camelCase), not the reduced
+ * getSessionMessages shape. Pure: depends only on `lines`.
+ */
+export declare function checkJsonlShape(lines: ReadonlyArray<Record<string, unknown>>): CheckResult;
+/**
+ * R2.4 — verify the gate's allow keystroke is still the canonical {@link EXPECTED_ALLOW_KEYSTROKE}
+ * (`"1\r"`). On mismatch `detail` references both the expected and the actual keystroke. Mirror of
+ * allow-inject.ts:29 `KEYSTROKE_YES`. Pure: depends only on `keystroke`.
+ */
+export declare function checkAllowKeystroke(keystroke: string): CheckResult;
+//# sourceMappingURL=drift-checks.d.ts.map

package/dist/drift-checks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"drift-checks.d.ts","sourceRoot":"","sources":["../src/drift-checks.ts"],"names":[],"mappings":"AA4BA,0GAA0G;AAC1G,MAAM,WAAW,WAAW;IAC1B,4FAA4F;IAC5F,OAAO,EAAE,MAAM,CAAC;IAChB,sDAAsD;IACtD,EAAE,EAAE,OAAO,CAAC;IACZ,qGAAqG;IACrG,MAAM,EAAE,MAAM,CAAC;CAChB;AAID;;;GAGG;AACH,eAAO,MAAM,oBAAoB,EAAE,WAAW,CAAC,MAAM,CAKnD,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,8BAA8B,EAAE,WAAW,CAAC,MAAM,CAAyB,CAAC;AAEzF,2GAA2G;AAC3G,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,MAAM,CAMlD,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,WAAW,CAAC,MAAM,CAsB/C,CAAC;AAEH,qGAAqG;AACrG,eAAO,MAAM,wBAAwB,EAAE,MAAc,CAAC;AA2BtD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,WAAW,CAe3F;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC/B,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC7B,WAAW,CASb;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,WAAW,CAiB1F;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,CAalE"}

package/dist/drift-checks.js

@@ -0,0 +1,183 @@
+// === Story 049 / Task 2.1 (R2.1, R2.2, R2.3, R2.4) — pure binary-drift checks (no I/O) ============
+//
+// Single source of truth for "what binary-drift looks like" across the four surfaces the bridge reads
+// from the claude binary. Each check is PURE and referentially transparent: it takes ALREADY-PARSED
+// input and returns a `{surface, ok, detail}` verdict. There is NO `fs`, NO `child_process`/`spawn`,
+// NO `process` here — the I/O (read fixtures / spawn the live binary) belongs to the OFFLINE detector
+// (Task 3) and `smoke:live` (Task 5), which both reuse these verdicts. Keeping this module I/O-free is
+// the foundation for Task 3's spawn-import guard.
+//
+// MIRROR ANCHORS (the constants below mirror these real source surfaces — keep them honest):
+//   - stop_reason taxonomy ........ src/stop-reason-map.ts:26-33 (the 4 explicit, non-default cases of
+//                                   mapStopReason: end_turn / stop_sequence / max_tokens / refusal)
+//   - allow keystroke ............. src/permissions/allow-inject.ts:29 (KEYSTROKE_YES = "1\r")
+//   - raw JSONL field set ......... src/jsonl.ts:513-544 (the documented universal + per-type fields)
+//
+// TWO NON-OBVIOUS DECISIONS (both deliberate reads of the requirements, not oversights):
+//   1. `tool_use` is KNOWN-NON-TERMINAL, NOT drift. mapStopReason switches on the 4 terminal cases and
+//      DEFAULTS everything else to "end_turn" (with a drift log). `tool_use` legitimately appears in
+//      real transcripts — the model pauses to call a tool; that is NOT a turn end — and it hits that
+//      default branch BY DESIGN. So it is recorded as expected (KNOWN_NONTERMINAL_STOP_REASONS) and
+//      must NOT fail the check. A genuinely NEW value (e.g. `pause_turn`) still fails.
+//   2. `checkJsonlShape` guards the RAW on-disk JSONL shape (camelCase `sessionId`, `parentUuid`, ...),
+//      NOT the reduced `getSessionMessages` shape (`session_id` snake_case) that R2.3 literally lists.
+//      This is a deliberate read of R2.3's intent: the drift we want to detect is in the on-disk JSONL
+//      the bridge actually tails, so the check mirrors jsonl.ts's documented raw field set.
+//
+// node:test runner: `node --experimental-strip-types --test test/drift-checks.test.ts`
+// --- mirror constants ---------------------------------------------------------------------------
+/**
+ * The stop_reason values mapStopReason handles EXPLICITLY (stop-reason-map.ts:26-33). Everything else
+ * hits its default branch. These are the "terminal" taxonomy the bridge answers a turn with.
+ */
+export const HANDLED_STOP_REASONS = new Set([
+    "end_turn",
+    "stop_sequence",
+    "max_tokens",
+    "refusal",
+]);
+/**
+ * stop_reason values that are NON-TERMINAL but EXPECTED (so not drift): the model pauses mid-turn. They
+ * hit mapStopReason's default branch BY DESIGN. `tool_use` is the real one seen in transcripts.
+ */
+export const KNOWN_NONTERMINAL_STOP_REASONS = new Set(["tool_use"]);
+/** The core top-level keys EVERY raw JSONL event line must carry (jsonl.ts:513-523 — the required set). */
+export const REQUIRED_JSONL_KEYS = new Set([
+    "uuid",
+    "type",
+    "timestamp",
+    "sessionId",
+    "message",
+]);
+/**
+ * Every top-level key a raw JSONL line is ALLOWED to carry = {@link REQUIRED_JSONL_KEYS} ∪ the known
+ * optional universal / per-type fields documented in jsonl.ts:528-543 (plus the universal fields seen
+ * in real fixtures). A key OUTSIDE this set is a NEW/unexpected field → drift.
+ */
+export const KNOWN_JSONL_KEYS = new Set([
+    ...REQUIRED_JSONL_KEYS,
+    // universal fields (present in raw JSONL but absent from the reduced getSessionMessages shape)
+    "parentUuid",
+    "parentToolUseId",
+    "userType",
+    "version",
+    "isSidechain",
+    "entrypoint",
+    "cwd",
+    "gitBranch",
+    "logicalParentUuid",
+    "isMeta",
+    "isCompactSummary",
+    "level",
+    "isApiErrorMessage",
+    // per-type extras
+    "requestId",
+    "promptId",
+    "usage",
+    "toolUseResult",
+    "permissionMode",
+]);
+/** The keystroke the native TUI permission prompt accepts for Yes — mirror of allow-inject.ts:29. */
+export const EXPECTED_ALLOW_KEYSTROKE = "1\r";
+// --- shared helpers -----------------------------------------------------------------------------
+/**
+ * Build a verdict from a collected list of offending items: `ok=true` (with a positive summary) when
+ * the list is empty, otherwise `ok=false` with a detail that NAMES every offending item (the consumers
+ * and the unit tests assert each offending value appears in `detail`).
+ */
+function verdict(surface, offenders, okSummary) {
+    if (offenders.length === 0) {
+        return { surface, ok: true, detail: okSummary };
+    }
+    return { surface, ok: false, detail: `${surface} drift: ${offenders.join(", ")}` };
+}
+/** Read `line.message?.stop_reason` defensively (the message object is `unknown`). */
+function readStopReason(line) {
+    const message = line.message;
+    if (typeof message !== "object" || message === null) {
+        return undefined;
+    }
+    return message.stop_reason;
+}
+// --- the four checks ----------------------------------------------------------------------------
+/**
+ * R2.1 — verify every non-null `message.stop_reason` is either HANDLED or a KNOWN non-terminal value.
+ *
+ * `null`/`undefined`/absent stop_reason is NOT drift (absence) and is ignored. A non-null value outside
+ * {@link HANDLED_STOP_REASONS} ∪ {@link KNOWN_NONTERMINAL_STOP_REASONS} (e.g. a new `pause_turn`) trips
+ * the check; `detail` names every offending value. Pure: no I/O, depends only on `lines`.
+ */
+export function checkStopReasons(lines) {
+    const offenders = [];
+    for (const line of lines) {
+        const raw = readStopReason(line);
+        if (raw === null || raw === undefined) {
+            continue; // absence is not drift
+        }
+        const value = String(raw);
+        if (!HANDLED_STOP_REASONS.has(value) && !KNOWN_NONTERMINAL_STOP_REASONS.has(value)) {
+            if (!offenders.includes(value)) {
+                offenders.push(value);
+            }
+        }
+    }
+    return verdict("stop_reason", offenders, "all stop_reasons are handled or known-non-terminal");
+}
+/**
+ * R2.2 — verify every SDK content-block type is covered by a handled `switch` case. A block type in
+ * `sdkBlockTypes` but NOT in `handledCases` (e.g. a new `server_tool_use`) is uncovered drift; `detail`
+ * names each uncovered type. Pure: depends only on its two iterable arguments.
+ */
+export function checkContentBlockCoverage(sdkBlockTypes, handledCases) {
+    const handled = new Set(handledCases);
+    const offenders = [];
+    for (const type of sdkBlockTypes) {
+        if (!handled.has(type) && !offenders.includes(type)) {
+            offenders.push(type);
+        }
+    }
+    return verdict("content_block", offenders, "every SDK content-block type is a handled case");
+}
+/**
+ * R2.3 — verify each raw JSONL line carries every {@link REQUIRED_JSONL_KEYS} core key and NO key
+ * outside {@link KNOWN_JSONL_KEYS}. A missing core key OR a new/unexpected top-level key is drift;
+ * `detail` names the offending key(s). Guards the RAW on-disk shape (camelCase), not the reduced
+ * getSessionMessages shape. Pure: depends only on `lines`.
+ */
+export function checkJsonlShape(lines) {
+    const offenders = [];
+    for (const line of lines) {
+        for (const required of REQUIRED_JSONL_KEYS) {
+            const missing = `missing:${required}`;
+            if (!Object.prototype.hasOwnProperty.call(line, required) && !offenders.includes(missing)) {
+                offenders.push(missing);
+            }
+        }
+        for (const key of Object.keys(line)) {
+            const unexpected = `unexpected:${key}`;
+            if (!KNOWN_JSONL_KEYS.has(key) && !offenders.includes(unexpected)) {
+                offenders.push(unexpected);
+            }
+        }
+    }
+    return verdict("jsonl_shape", offenders, "every line matches the known raw JSONL shape");
+}
+/**
+ * R2.4 — verify the gate's allow keystroke is still the canonical {@link EXPECTED_ALLOW_KEYSTROKE}
+ * (`"1\r"`). On mismatch `detail` references both the expected and the actual keystroke. Mirror of
+ * allow-inject.ts:29 `KEYSTROKE_YES`. Pure: depends only on `keystroke`.
+ */
+export function checkAllowKeystroke(keystroke) {
+    if (keystroke === EXPECTED_ALLOW_KEYSTROKE) {
+        return {
+            surface: "allow_keystroke",
+            ok: true,
+            detail: "allow keystroke matches the canonical 1\\r",
+        };
+    }
+    return {
+        surface: "allow_keystroke",
+        ok: false,
+        detail: `allow_keystroke drift: expected ${JSON.stringify(EXPECTED_ALLOW_KEYSTROKE)} but got ${JSON.stringify(keystroke)}`,
+    };
+}

package/dist/permissions/gate-wiring.d.ts

@@ -8,7 +8,18 @@ import { type PtyWriter, type Schedule } from "./allow-inject.js";
  * prompt's rendering we have. ANY hit ⇒ the native prompt is showing (#52822 reproduced).
  */
 export declare const NATIVE_PERMISSION_PROMPT_MARKERS: readonly string[];
-/** True iff any native-prompt marker appears in `text` (after ANSI stripping). */
+/**
+ * Story 054 (R6) — the native SUBAGENT permission prompt header. claude renders a subagent tool's
+ * permission box with a "Tool use · from the <name> agent" header, distinct from the main-chain
+ * "Do you want to proceed?" markers above. Without this marker {@link textShowsNativePrompt} misses
+ * the subagent box, {@link clearNativePrompt} returns `'suppressed'` and types nothing, and the inner
+ * subagent tool hangs. The substring is specific enough not to match ordinary subagent narration
+ * ("the … agent finished its work"). The exact middot/wording is confirmed in the deferred in-Zed
+ * proof (task 8); kept separate from the verbatim Degrau-0 probe markers above.
+ */
+export declare const SUBAGENT_PROMPT_MARKER = "Tool use \u00B7 from the";
+/** True iff any native-prompt marker — main-chain or the story-054 subagent box — appears in `text`
+ *  (after ANSI stripping). */
 export declare function textShowsNativePrompt(text: string): boolean;
 /** Default bounded wait for the JSONL `tool_use` correlation to land after a hook fires (ms).
  *  The hook fires AFTER claude appended the assistant `tool_use` line, but the fs-watch → pump
@@ -17,6 +28,12 @@ export declare function textShowsNativePrompt(text: string): boolean;
 export declare const DEFAULT_CORRELATION_WAIT_MS = 5000;
 /** Default poll interval for the correlation wait (ms). */
 export declare const DEFAULT_CORRELATION_POLL_MS = 50;
+/** Story 054 — re-nudge cadence inside the correlation wait (ms): a sidechain inner tool_use line can
+ *  materialize MID-WAIT (after the first nudge) — periodically re-kicking the pump sources + registers
+ *  that lagging row before the wait expires, so the subagent tool reaches a clean match instead of a
+ *  fail-closed timeout deny. Tracked separately from the poll interval (the poll is 10-50ms; nudging on
+ *  every poll would hammer the pump) — a nudge fires only once ~250ms has elapsed since the last one. */
+export declare const DEFAULT_CORRELATION_RENUDGE_MS = 250;
 /** Default window for the native prompt to APPEAR after an allow decision (#52822 sweep, ms).
  *  If no marker renders within it, allow-suppression held (the 2.1.161 case) — nothing to clear. */
 export declare const DEFAULT_PROMPT_APPEAR_MS = 1500;
@@ -56,6 +73,8 @@ export interface SessionGateOptions {
     correlationWaitMs?: number;
     /** See {@link DEFAULT_CORRELATION_POLL_MS}. */
     correlationPollMs?: number;
+    /** See {@link DEFAULT_CORRELATION_RENUDGE_MS}. */
+    correlationRenudgeMs?: number;
     /** See {@link DEFAULT_PROMPT_APPEAR_MS}. */
     promptAppearMs?: number;
     /** See {@link DEFAULT_PROMPT_POLL_MS}. */
@@ -67,6 +86,15 @@ export interface SessionGateOptions {
     /** Injectable port allocator (default: the story-032 `findFreePort`). */
     findPort?: () => Promise<number>;
 }
+/** Story 054 — the parent-Task relay info for a subagent inner tool, resolved at decide() time. */
+export interface SubagentRelay {
+    /** The spawning Task/Agent tool_use id to attach the ACP dialog to; null = orphan (no safe target). */
+    parentId: string | null;
+    /** Best-effort subagent name for the dialog title / the R4 deny line. */
+    subagentLabel: string;
+}
+/** Resolve a subagent inner tool_use id → its relay info, or undefined for a main-chain tool. */
+export type ResolveSubagentRelay = (innerToolUseId: string) => SubagentRelay | undefined;
 /** The per-session gate runtime handle `createSession` owns and `teardownSession` disposes. */
 export interface SessionGate {
     /** The verified-free loopback port the hook server bound (== the port in the scratch hook URL). */
@@ -81,8 +109,14 @@ export interface SessionGate {
      * and an optional `nudge` invoked on every hook arrival to force an immediate pump re-read
      * (shrinking the JSONL-correlation race). MUST be called before the first tool call can be
      * approved — an unbound gate fails closed (deny).
+     *
+     * Story 054 — the third optional arg is a lazy resolver that maps an inner `tool_use.id` to its
+     * subagent {@link SubagentRelay} (parent Task id + label) by reading the session's
+     * `sidechainParentMap` (populated by the pump). `decide` uses it AFTER the correlation wait to
+     * relay a KNOWN subagent tool's dialog under its parent Task id (R1/R2), or to fail LOUD (R4) on
+     * an orphan / uncorrelatable subagent. A main-chain tool (no resolver entry) is unchanged (U1).
      */
-    bindSession(sessionId: string, nudge?: () => void): void;
+    bindSession(sessionId: string, nudge?: () => void, resolveSubagentRelay?: ResolveSubagentRelay): void;
     /** Bind the live PTY: stores the raw writer for the allow keystroke and (when the PTY exposes
      *  `onData`) attaches the recent-output tap feeding the native-prompt probe. */
     bindPty(pty: GatePty): void;

package/dist/permissions/gate-wiring.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gate-wiring.d.ts","sourceRoot":"","sources":["../../src/permissions/gate-wiring.ts"],"names":[],"mappings":"AAqCA,OAAO,EAEL,iBAAiB,EACjB,KAAK,gBAAgB,EACtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAqB,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAErF;;;;;;GAMG;AACH,eAAO,MAAM,gCAAgC,EAAE,SAAS,MAAM,EAO7D,CAAC;AAQF,kFAAkF;AAClF,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG3D;AAED;;;+EAG+E;AAC/E,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAChD,2DAA2D;AAC3D,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAC9C;oGACoG;AACpG,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAC7C,sEAAsE;AACtE,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAC1C,0FAA0F;AAC1F,eAAO,MAAM,yBAAyB,OAAO,CAAC;AAC9C;;gDAEgD;AAChD,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAI7C,2FAA2F;AAC3F,eAAO,MAAM,uBAAuB,4BAA4B,CAAC;AAMjE;;0FAE0F;AAC1F,MAAM,WAAW,OAAQ,SAAQ,SAAS;IACxC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG;QAAE,OAAO,IAAI,IAAI,CAAA;KAAE,CAAC;CAC1D;AAED,2FAA2F;AAC3F,MAAM,WAAW,kBAAkB;IACjC,gGAAgG;IAChG,MAAM,EAAE,gBAAgB,CAAC;IACzB,gGAAgG;IAChG,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,gGAAgG;IAChG,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,mFAAmF;IACnF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uFAAuF;IACvF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uFAAuF;IACvF,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,+CAA+C;IAC/C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,+CAA+C;IAC/C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,4CAA4C;IAC5C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0CAA0C;IAC1C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6CAA6C;IAC7C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,4CAA4C;IAC5C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yEAAyE;IACzE,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAClC;AAED,+FAA+F;AAC/F,MAAM,WAAW,WAAW;IAC1B,mGAAmG;IACnG,IAAI,EAAE,MAAM,CAAC;IACb,kGAAkG;IAClG,YAAY,EAAE,MAAM,CAAC;IACrB;mGAC+F;IAC/F,UAAU,EAAE,iBAAiB,CAAC;IAC9B;;;;;OAKG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IACzD;oFACgF;IAChF,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B;8EAC0E;IAC1E,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,0CAA0C;IAC1C,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B;AAqSD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,CAIrF"}
+{"version":3,"file":"gate-wiring.d.ts","sourceRoot":"","sources":["../../src/permissions/gate-wiring.ts"],"names":[],"mappings":"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"}

package/dist/permissions/gate-wiring.js

@@ -51,15 +51,27 @@ export const NATIVE_PERMISSION_PROMPT_MARKERS = [
     "1. Yes",
     "No, and tell Claude",
 ];
+/**
+ * Story 054 (R6) — the native SUBAGENT permission prompt header. claude renders a subagent tool's
+ * permission box with a "Tool use · from the <name> agent" header, distinct from the main-chain
+ * "Do you want to proceed?" markers above. Without this marker {@link textShowsNativePrompt} misses
+ * the subagent box, {@link clearNativePrompt} returns `'suppressed'` and types nothing, and the inner
+ * subagent tool hangs. The substring is specific enough not to match ordinary subagent narration
+ * ("the … agent finished its work"). The exact middot/wording is confirmed in the deferred in-Zed
+ * proof (task 8); kept separate from the verbatim Degrau-0 probe markers above.
+ */
+export const SUBAGENT_PROMPT_MARKER = "Tool use · from the";
 /** Strip CSI / common ANSI escape sequences so prompt markers match the plain text (e-gate probe). */
 function stripAnsiText(s) {
     // eslint-disable-next-line no-control-regex
     return s.replace(/\x1b\[[0-9;?]*[a-zA-Z]/g, "");
 }
-/** True iff any native-prompt marker appears in `text` (after ANSI stripping). */
+/** True iff any native-prompt marker — main-chain or the story-054 subagent box — appears in `text`
+ *  (after ANSI stripping). */
 export function textShowsNativePrompt(text) {
     const stripped = stripAnsiText(text);
-    return NATIVE_PERMISSION_PROMPT_MARKERS.some((m) => stripped.includes(m));
+    return (NATIVE_PERMISSION_PROMPT_MARKERS.some((m) => stripped.includes(m)) ||
+        stripped.includes(SUBAGENT_PROMPT_MARKER));
 }
 /** Default bounded wait for the JSONL `tool_use` correlation to land after a hook fires (ms).
  *  The hook fires AFTER claude appended the assistant `tool_use` line, but the fs-watch → pump
@@ -68,6 +80,12 @@ export function textShowsNativePrompt(text) {
 export const DEFAULT_CORRELATION_WAIT_MS = 5000;
 /** Default poll interval for the correlation wait (ms). */
 export const DEFAULT_CORRELATION_POLL_MS = 50;
+/** Story 054 — re-nudge cadence inside the correlation wait (ms): a sidechain inner tool_use line can
+ *  materialize MID-WAIT (after the first nudge) — periodically re-kicking the pump sources + registers
+ *  that lagging row before the wait expires, so the subagent tool reaches a clean match instead of a
+ *  fail-closed timeout deny. Tracked separately from the poll interval (the poll is 10-50ms; nudging on
+ *  every poll would hammer the pump) — a nudge fires only once ~250ms has elapsed since the last one. */
+export const DEFAULT_CORRELATION_RENUDGE_MS = 250;
 /** Default window for the native prompt to APPEAR after an allow decision (#52822 sweep, ms).
  *  If no marker renders within it, allow-suppression held (the 2.1.161 case) — nothing to clear. */
 export const DEFAULT_PROMPT_APPEAR_MS = 1500;
@@ -100,6 +118,10 @@ class SessionGateImpl {
         this.outputTail = "";
         this.totalOutput = 0;
         this.torndown = false;
+        /** Story 054 (R5) — per-session serial queue: the request+sweep critical section runs one at a
+         *  time so two parallel subagent dialogs never cross their shared-PTY keystrokes. The wait/
+         *  correlate/resolve prelude stays concurrent (only the raise+inject section serializes). */
+        this.permissionQueue = Promise.resolve();
     }
     get isTorndown() {
         return this.torndown;
@@ -110,6 +132,15 @@ class SessionGateImpl {
     get schedule() {
         return this.opts.schedule ?? defaultSchedule;
     }
+    /** Story 054 (R5) — append `fn` to the per-session serial chain so it runs only after the
+     *  previous critical section settles (success OR failure), serializing concurrent decides'
+     *  request+sweep sections. The chain is kept alive (and its errors swallowed) so one rejected
+     *  permission never poisons the next; the returned promise still surfaces `fn`'s own result. */
+    enqueuePermission(fn) {
+        const run = this.permissionQueue.then(fn, fn);
+        this.permissionQueue = run.then(() => undefined, () => undefined);
+        return run;
+    }
     /** Start the hook server, then write the scratch settings (server first, so the URL the settings
      *  point at is live before claude can ever read them; settings BEFORE the spawn is the caller's
      *  ordering contract — blocker c). */
@@ -138,9 +169,10 @@ class SessionGateImpl {
             throw err;
         }
     }
-    bindSession(sessionId, nudge) {
+    bindSession(sessionId, nudge, resolveSubagentRelay) {
         this.sessionId = sessionId;
         this.nudge = nudge;
+        this.resolveSubagentRelay = resolveSubagentRelay;
     }
     bindPty(pty) {
         this.pty = pty;
@@ -189,38 +221,92 @@ class SessionGateImpl {
             return "deny";
         }
         await this.waitForCorrelation(call.toolUseId);
-        const decision = await requestPermission({
-            client: this.opts.client,
-            sessionId,
-            toolCall: {
-                toolUseId: call.toolUseId,
-                toolName: call.toolName,
-                toolInput: call.toolInput,
-            },
-            correlator: this.correlator,
-            onWarn: (m) => this.warn(m),
-        });
-        if (decision === "allow") {
-            // Return the allow body FIRST (claude is blocked on this response); sweep out of band.
-            this.armAllowSweep(call);
+        // === Story 054 (§9 subagent relay) — AFTER the correlation wait, BEFORE the ACP prompt. ========
+        // The hook payload carries NO parent id (ForwardedToolCall has no parent_tool_use_id); the ONLY
+        // source of a subagent inner tool's parent is the session's sidechainParentMap, read lazily via
+        // the bound resolver. An undefined relay = a MAIN-CHAIN tool → both fields stay undefined and the
+        // requestPermission call below is byte-identical to today (U1). A KNOWN subagent inner tool relays
+        // its dialog under the parent Task id Zed already rendered (R1/R2) — UNLESS it cannot be safely
+        // relayed (orphan parent, or it never became a clean JSONL match within the wait window), in which
+        // case we fail LOUD (R4): a VISIBLE deny through the gate's warn surface (→ this.logger.error),
+        // naming the subagent + inner tool, and return "deny" WITHOUT raising a dialog against a bogus id.
+        const relay = this.resolveSubagentRelay?.(call.toolUseId);
+        let dialogToolCallId;
+        let subagentLabel;
+        if (relay) {
+            // isCleanMatch PROBES (does not consume); requestPermission's correlator.decide still consumes
+            // the inner id. The orphan branch short-circuits BEFORE the probe via `||`.
+            if (relay.parentId === null || !this.correlator.isCleanMatch(call.toolUseId)) {
+                this.warn(`[gate §9 subagent] FAIL CLOSED: subagent (${relay.subagentLabel}) tool "${call.toolName}" ` +
+                    `(tool_use ${call.toolUseId}) ${relay.parentId === null
+                        ? "is an orphan — no parent Task to attach the permission dialog to"
+                        : "never correlated in the JSONL within the wait window"} — denying (R4 visible deny).`);
+                return "deny";
+            }
+            dialogToolCallId = relay.parentId;
+            subagentLabel = relay.subagentLabel;
         }
-        return decision;
+        // === Story 054 (R5) — SERIALIZE only the raise+inject critical section. ========================
+        // dialogToolCallId/subagentLabel were computed above in the CONCURRENT prelude, so each enqueued
+        // request still carries its own parent Task id regardless of interleaving. Two parallel subagent
+        // decides therefore resolve INDEPENDENTLY (distinct inner ids in the correlator) but run their
+        // requestPermission + armAllowSweep one at a time — no native-prompt keystroke crossing on the
+        // shared PTY. A single sequential main-chain tool is a no-op through the queue (U1).
+        return this.enqueuePermission(async () => {
+            const decision = await requestPermission({
+                client: this.opts.client,
+                sessionId,
+                toolCall: {
+                    toolUseId: call.toolUseId,
+                    toolName: call.toolName,
+                    toolInput: call.toolInput,
+                },
+                correlator: this.correlator,
+                onWarn: (m) => this.warn(m),
+                dialogToolCallId,
+                subagentLabel,
+            });
+            if (decision === "allow") {
+                // Return the allow body FIRST (claude is blocked on this response); sweep out of band.
+                this.armAllowSweep(call);
+            }
+            return decision;
+        });
     }
     /** Bounded poll until the pump has registered `toolUseId` as a clean single JSONL match. On
-     *  expiry, resolve anyway — `requestPermission` then fails closed on the missing correlation. */
+     *  expiry, resolve anyway — `requestPermission` then fails closed on the missing correlation.
+     *
+     *  Story 054 — re-nudge the pump on a ~{@link DEFAULT_CORRELATION_RENUDGE_MS} cadence (tracked
+     *  SEPARATELY from the poll interval) so a sidechain inner tool_use line materializing MID-WAIT is
+     *  sourced + registered before expiry — turning a would-be timeout deny into a clean subagent match.
+     *  The nudge is best-effort: a throw never rejects the wait (it only widens the correlation window). */
     waitForCorrelation(toolUseId) {
         const waitMs = this.opts.correlationWaitMs ?? DEFAULT_CORRELATION_WAIT_MS;
         const pollMs = this.opts.correlationPollMs ?? DEFAULT_CORRELATION_POLL_MS;
+        const renudgeMs = this.opts.correlationRenudgeMs ?? DEFAULT_CORRELATION_RENUDGE_MS;
         if (this.correlator.isCleanMatch(toolUseId))
             return Promise.resolve();
         return new Promise((resolve) => {
             let elapsed = 0;
+            let sinceNudge = 0;
             const poll = () => {
                 if (this.torndown || this.correlator.isCleanMatch(toolUseId)) {
                     resolve();
                     return;
                 }
                 elapsed += pollMs;
+                // Re-nudge on its own cadence (NOT every poll): a lagging sidechain row gets re-sourced so it
+                // can register before the wait elapses. A nudge failure must never reject the wait.
+                sinceNudge += pollMs;
+                if (sinceNudge >= renudgeMs) {
+                    sinceNudge = 0;
+                    try {
+                        this.nudge?.();
+                    }
+                    catch {
+                        // a nudge failure only widens the correlation wait; never rejects or decides by itself
+                    }
+                }
                 if (elapsed >= waitMs) {
                     this.warn(`[gate §9] correlation wait expired (${waitMs}ms) for tool_use ${toolUseId} — the JSONL ` +
                         `tool_use line never reached the pump; the decision will fail closed (deny).`);

package/dist/permissions/request-permission.d.ts

@@ -89,6 +89,11 @@ export interface RequestPermissionOptions {
     correlator: ToolUseCorrelator;
     /** Optional sink for the fail-closed diagnostics (defaults to no-op; production wires the logger). */
     onWarn?: (message: string) => void;
+    /** Story 054 — when set, the ACP prompt attaches to this PARENT Task tool_call id (the id Zed already
+     *  rendered) instead of the inner tool_use id; the correlator STILL decides on the inner id. */
+    dialogToolCallId?: string;
+    /** Story 054 — the subagent's label, named in the prompt title alongside the inner tool. */
+    subagentLabel?: string;
 }
 /**
  * Correlate a forwarded tool call by `tool_use.id` and raise ACP `session/request_permission`,

package/dist/permissions/request-permission.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-permission.d.ts","sourceRoot":"","sources":["../../src/permissions/request-permission.ts"],"names":[],"mappings":"AAoBA,yEAAyE;AACzE,MAAM,MAAM,oBAAoB,GAAG,YAAY,GAAG,cAAc,GAAG,aAAa,GAAG,eAAe,CAAC;AAEnG,oGAAoG;AACpG,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,oBAAoB,CAAC;CAC5B;AAED,6FAA6F;AAC7F,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,kEAAkE;AAClE,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,OAAO,EAAE,gBAAgB,EAAE,CAAC;CAC7B;AAED,yDAAyD;AACzD,MAAM,MAAM,wBAAwB,GAChC;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,GACxB;IAAE,OAAO,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9C,8DAA8D;AAC9D,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,wBAAwB,CAAC;CACnC;AAED;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,iBAAiB,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;CACtF;AAED,iGAAiG;AACjG,MAAM,WAAW,kBAAkB;IACjC,sEAAsE;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,uEAAuE;IACvE,QAAQ,EAAE,MAAM,CAAC;IACjB,sFAAsF;IACtF,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,wFAAwF;AACxF,eAAO,MAAM,eAAe,UAAU,CAAC;AACvC,eAAO,MAAM,cAAc,SAAS,CAAC;AAErC,gFAAgF;AAChF,wBAAgB,sBAAsB,IAAI,gBAAgB,EAAE,CAK3D;AAED;;;;;;;;GAQG;AACH,qBAAa,iBAAiB;IAC5B,8FAA8F;IAC9F,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA6B;IAClD,qGAAqG;IACrG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAE9C;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAMpC,iGAAiG;IACjG,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAIxC;;;;;OAKG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM;CAS9C;AAED,6CAA6C;AAC7C,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,gBAAgB,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,sFAAsF;IACtF,UAAU,EAAE,iBAAiB,CAAC;IAC9B,sGAAsG;IACtG,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,CAiDjG"}
+{"version":3,"file":"request-permission.d.ts","sourceRoot":"","sources":["../../src/permissions/request-permission.ts"],"names":[],"mappings":"AAoBA,yEAAyE;AACzE,MAAM,MAAM,oBAAoB,GAAG,YAAY,GAAG,cAAc,GAAG,aAAa,GAAG,eAAe,CAAC;AAEnG,oGAAoG;AACpG,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,oBAAoB,CAAC;CAC5B;AAED,6FAA6F;AAC7F,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,kEAAkE;AAClE,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,OAAO,EAAE,gBAAgB,EAAE,CAAC;CAC7B;AAED,yDAAyD;AACzD,MAAM,MAAM,wBAAwB,GAChC;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,GACxB;IAAE,OAAO,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9C,8DAA8D;AAC9D,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,wBAAwB,CAAC;CACnC;AAED;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,iBAAiB,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;CACtF;AAED,iGAAiG;AACjG,MAAM,WAAW,kBAAkB;IACjC,sEAAsE;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,uEAAuE;IACvE,QAAQ,EAAE,MAAM,CAAC;IACjB,sFAAsF;IACtF,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,wFAAwF;AACxF,eAAO,MAAM,eAAe,UAAU,CAAC;AACvC,eAAO,MAAM,cAAc,SAAS,CAAC;AAErC,gFAAgF;AAChF,wBAAgB,sBAAsB,IAAI,gBAAgB,EAAE,CAK3D;AAED;;;;;;;;GAQG;AACH,qBAAa,iBAAiB;IAC5B,8FAA8F;IAC9F,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA6B;IAClD,qGAAqG;IACrG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAE9C;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAMpC,iGAAiG;IACjG,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAIxC;;;;;OAKG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM;CAS9C;AAED,6CAA6C;AAC7C,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,gBAAgB,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,sFAAsF;IACtF,UAAU,EAAE,iBAAiB,CAAC;IAC9B,sGAAsG;IACtG,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC;oGACgG;IAChG,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4FAA4F;IAC5F,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,CAuDjG"}

package/dist/permissions/request-permission.js

@@ -81,7 +81,7 @@ export class ToolUseCorrelator {
  *   `'deny'` otherwise.
  */
 export async function requestPermission(opts) {
-    const { client, sessionId, toolCall, correlator, onWarn } = opts;
+    const { client, sessionId, toolCall, correlator, onWarn, dialogToolCallId, subagentLabel } = opts;
     // 1) Correlate by tool_use.id BEFORE asking — an uncorrelated/duplicate call is denied, not prompted.
     const correlation = correlator.decide(toolCall.toolUseId);
     if (correlation === "deny") {
@@ -96,8 +96,13 @@ export async function requestPermission(opts) {
         result = await client.requestPermission({
             sessionId,
             toolCall: {
-                toolCallId: toolCall.toolUseId,
-                title: toolCall.toolName,
+                // Story 054: a subagent inner tool relays under the PARENT Task id Zed already rendered
+                // (dialogToolCallId), naming the inner tool + subagent in the title. A main-chain call (no
+                // dialogToolCallId) is byte-identical to today: toolCallId = inner id, title = bare tool name.
+                toolCallId: dialogToolCallId ?? toolCall.toolUseId,
+                title: dialogToolCallId !== undefined
+                    ? `${toolCall.toolName} · from the ${subagentLabel ?? "subagent"} agent`
+                    : toolCall.toolName,
                 rawInput: toolCall.toolInput,
             },
             options: buildPermissionOptions(),

package/dist/subagent-gate.d.ts

@@ -0,0 +1,58 @@
+import type { SessionMessage } from "./engine-watcher.js";
+import type { ToolUseCorrelator } from "./permissions/request-permission.js";
+/**
+ * One inner subagent `tool_use` extracted from a sidechain row — the unit the gate correlator is fed
+ * and the dialog is built from.
+ */
+export interface SidechainToolUse {
+    /** The inner `tool_use.id` — the correlation key fed into the gate correlator. */
+    id: string;
+    /** The spawning `Task`/`Agent` `tool_use.id` (the row's `parent_tool_use_id`); `null` = orphan. */
+    parentId: string | null;
+    /** The inner tool name (e.g. `"Bash"`, `"perplexity"`) — shown in the Zed prompt title. */
+    toolName: string;
+    /** The inner tool's raw input — forwarded to the dialog (R7). */
+    toolInput: unknown;
+}
+/**
+ * Collect every inner subagent `tool_use` from the pump's sidechain `rows` (R3, R7).
+ *
+ * Walks each SIDECHAIN `type === "assistant"` row's `message.content` and emits one
+ * {@link SidechainToolUse} per `tool_use` block, in encounter order:
+ *   - `id`        ← block.id
+ *   - `parentId`  ← row.parent_tool_use_id ?? null (a row with NO parent field → `null`, an orphan)
+ *   - `toolName`  ← block.name
+ *   - `toolInput` ← block.input (raw, for the dialog — R7)
+ *
+ * A row counts as a SIDECHAIN row when flagged `isSidechain === true` (raw-shaped fixtures) OR — in the
+ * SDK's reduced LIVE shape, which carries NO `isSidechain` field — when it has a non-empty string
+ * `parent_tool_use_id` (the only sidechain signal in the reduced shape; mirrors `linearize.ts`
+ * `isSidechainMsg`, which the proven story-041 nested render relies on). The spawning `Task`/`Agent`
+ * `tool_use` lives on the MAIN chain (no `parent_tool_use_id`, no `isSidechain`), so it is excluded —
+ * the gate owns the main chain separately. (In production the pump hands us sidechain-only rows from
+ * `sourceSubagentRows`; the guard also keeps the helper correct when fed a full transcript.)
+ *
+ * Non-`tool_use` content blocks (text, tool_result, …) contribute nothing — a text-only sidechain row
+ * yields no entries (the live fixture's sidechain rows are text-only → `[]`). Tolerant of the reduced
+ * shape in the {@link import("./subagent-source.js").hasSubagentSpawn} style: non-object rows/messages
+ * and non-array `content` are simply skipped.
+ */
+export declare function collectSidechainToolUses(rows: SessionMessage[]): SidechainToolUse[];
+/**
+ * Feed each collected {@link SidechainToolUse} into the gate `correlator` EXACTLY ONCE (R3).
+ *
+ * For every `use` whose `id` is NOT already in the `registered` dedup Set:
+ *   - `correlator.register(use.id)` — record the id in the JSONL correlation map so a subsequent hook
+ *     tool call is a clean single match (its return value is ignored; the Set is the dedup truth);
+ *   - `registered.add(use.id)` — mark it fed for this session;
+ *   - `parentMap.set(use.id, use)` — map the inner id to its use entry (carries parentId + input).
+ *
+ * Ids already in `registered` are SKIPPED. The pump re-reads overlapping rows on each pass; a naive
+ * re-`register` of the same id would increment its count to 2 → the correlator treats it as a DUPLICATE
+ * → fail-closed deny. The dedup Set is what keeps every clean id `isCleanMatch === true` across those
+ * overlapping re-reads.
+ *
+ * Mutates `correlator`, `registered`, and `parentMap` in place; returns nothing.
+ */
+export declare function registerSidechainGateToolUses(uses: SidechainToolUse[], correlator: ToolUseCorrelator, registered: Set<string>, parentMap: Map<string, SidechainToolUse>): void;
+//# sourceMappingURL=subagent-gate.d.ts.map

package/dist/subagent-gate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subagent-gate.d.ts","sourceRoot":"","sources":["../src/subagent-gate.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAE7E;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,kFAAkF;IAClF,EAAE,EAAE,MAAM,CAAC;IACX,mGAAmG;IACnG,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,2FAA2F;IAC3F,QAAQ,EAAE,MAAM,CAAC;IACjB,iEAAiE;IACjE,SAAS,EAAE,OAAO,CAAC;CACpB;AAOD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,gBAAgB,EAAE,CAgCnF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,gBAAgB,EAAE,EACxB,UAAU,EAAE,iBAAiB,EAC7B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,EACvB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GACvC,IAAI,CAON"}

package/dist/subagent-gate.js

@@ -0,0 +1,110 @@
+// Story 054 / Group 1 (tasks 1.1 + 1.2) — pure helpers that turn the pump's already-sourced sidechain
+// rows into the gate correlator's feed.
+//
+// The original `canUseTool` path covered subagent tool calls automatically; the JSONL+PTY rewrite's
+// gate (request-permission.ts) only correlates ids it has been fed from the MAIN chain, so a subagent
+// tool call has no clean match and fails closed (deny) — the gap proven by the story-053 in-Zed run.
+// This module closes that gap by sourcing the inner `tool_use` ids from the sidechain rows the pump
+// already reads (subagent-source.ts `sourceSubagentRows`) and registering each into the correlator
+// EXACTLY ONCE, so the subagent tool call becomes a clean single match and reaches the ACP prompt with
+// the inner tool's input (R3, R7).
+//
+// MODULE LOCATION (intentional, frozen by the pre-authored test): design.md/tasks.md name this
+// `src/permissions/subagent-gate.ts`, but the test imports `../dist/subagent-gate.js` (the ROOT of
+// dist/). With tsconfig rootDir:src → outDir:dist this module MUST live at `src/subagent-gate.ts` so it
+// compiles to `dist/subagent-gate.js`. The test's import line is immutable; the file location bends to
+// it (call-surface only, no behavior change).
+//
+// Pure: no I/O, no logging, no SDK eval. The only effects are the mutations of the passed-in
+// `correlator` / `registered` Set / `parentMap` (the per-session feed state the pump owns).
+/** Narrowing helper: a non-null, non-array plain object (so we can read string-keyed props safely). */
+function isObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/**
+ * Collect every inner subagent `tool_use` from the pump's sidechain `rows` (R3, R7).
+ *
+ * Walks each SIDECHAIN `type === "assistant"` row's `message.content` and emits one
+ * {@link SidechainToolUse} per `tool_use` block, in encounter order:
+ *   - `id`        ← block.id
+ *   - `parentId`  ← row.parent_tool_use_id ?? null (a row with NO parent field → `null`, an orphan)
+ *   - `toolName`  ← block.name
+ *   - `toolInput` ← block.input (raw, for the dialog — R7)
+ *
+ * A row counts as a SIDECHAIN row when flagged `isSidechain === true` (raw-shaped fixtures) OR — in the
+ * SDK's reduced LIVE shape, which carries NO `isSidechain` field — when it has a non-empty string
+ * `parent_tool_use_id` (the only sidechain signal in the reduced shape; mirrors `linearize.ts`
+ * `isSidechainMsg`, which the proven story-041 nested render relies on). The spawning `Task`/`Agent`
+ * `tool_use` lives on the MAIN chain (no `parent_tool_use_id`, no `isSidechain`), so it is excluded —
+ * the gate owns the main chain separately. (In production the pump hands us sidechain-only rows from
+ * `sourceSubagentRows`; the guard also keeps the helper correct when fed a full transcript.)
+ *
+ * Non-`tool_use` content blocks (text, tool_result, …) contribute nothing — a text-only sidechain row
+ * yields no entries (the live fixture's sidechain rows are text-only → `[]`). Tolerant of the reduced
+ * shape in the {@link import("./subagent-source.js").hasSubagentSpawn} style: non-object rows/messages
+ * and non-array `content` are simply skipped.
+ */
+export function collectSidechainToolUses(rows) {
+    const uses = [];
+    for (const row of rows) {
+        if (!isObject(row))
+            continue;
+        if (row.type !== "assistant")
+            continue;
+        // Sidechain detection: `isSidechain === true` (raw-shaped fixtures) OR a non-empty string
+        // `parent_tool_use_id` — the ONLY sidechain signal in the SDK's reduced LIVE shape, which omits
+        // `isSidechain` (mirrors linearize.ts `isSidechainMsg`). A row with no `parent_tool_use_id` field is
+        // an orphan → parentId is `null`, not `undefined`.
+        const rawParent = row.parent_tool_use_id;
+        const parentId = typeof rawParent === "string" && rawParent.length > 0 ? rawParent : null;
+        // The main-chain Task/Agent spawn has neither the flag nor a parent → excluded; the gate owns it.
+        if (row.isSidechain !== true && parentId === null)
+            continue;
+        const inner = row.message;
+        if (!isObject(inner))
+            continue;
+        const content = inner.content;
+        if (!Array.isArray(content))
+            continue;
+        for (const block of content) {
+            if (!isObject(block))
+                continue;
+            if (block.type !== "tool_use")
+                continue;
+            if (typeof block.id !== "string" || typeof block.name !== "string")
+                continue;
+            uses.push({
+                id: block.id,
+                parentId,
+                toolName: block.name,
+                toolInput: block.input,
+            });
+        }
+    }
+    return uses;
+}
+/**
+ * Feed each collected {@link SidechainToolUse} into the gate `correlator` EXACTLY ONCE (R3).
+ *
+ * For every `use` whose `id` is NOT already in the `registered` dedup Set:
+ *   - `correlator.register(use.id)` — record the id in the JSONL correlation map so a subsequent hook
+ *     tool call is a clean single match (its return value is ignored; the Set is the dedup truth);
+ *   - `registered.add(use.id)` — mark it fed for this session;
+ *   - `parentMap.set(use.id, use)` — map the inner id to its use entry (carries parentId + input).
+ *
+ * Ids already in `registered` are SKIPPED. The pump re-reads overlapping rows on each pass; a naive
+ * re-`register` of the same id would increment its count to 2 → the correlator treats it as a DUPLICATE
+ * → fail-closed deny. The dedup Set is what keeps every clean id `isCleanMatch === true` across those
+ * overlapping re-reads.
+ *
+ * Mutates `correlator`, `registered`, and `parentMap` in place; returns nothing.
+ */
+export function registerSidechainGateToolUses(uses, correlator, registered, parentMap) {
+    for (const use of uses) {
+        if (registered.has(use.id))
+            continue; // already fed this session — never double-register.
+        correlator.register(use.id);
+        registered.add(use.id);
+        parentMap.set(use.id, use);
+    }
+}

package/package.json

@@ -3,8 +3,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.3.1",
-  "description": "Run the official Claude Code TUI in Zed's agent panel on your Claude Pro/Max subscription — an ACP-over-PTY bridge created for Anthropic's June 2026 billing split (paused June 15; see README).",
+  "version": "0.5.0",
+  "description": "Run the official Claude Code TUI in Zed's agent panel on your Claude Pro/Max subscription — an ACP-over-PTY bridge created for Anthropic's billing split (paused June 15; see README).",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
   "bin": {
@@ -36,6 +36,7 @@
     "format:check": "prettier --check .",
     "check": "npm run lint && npm run format:check",
     "test": "npm run build && node --experimental-strip-types --test test/*.test.ts",
+    "smoke:live": "node experiments/smoke-live.mjs",
     "prepublishOnly": "npm run build"
   },
   "keywords": [
@@ -59,18 +60,18 @@
   "author": "lucascouts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agentclientprotocol/sdk": "0.25.0",
-    "@anthropic-ai/claude-agent-sdk": "0.3.175",
+    "@agentclientprotocol/sdk": "0.28.1",
+    "@anthropic-ai/claude-agent-sdk": "0.3.183",
     "node-pty": "1.1.0",
     "zod": "^3.25.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "0.104.1",
+    "@anthropic-ai/sdk": "0.105.0",
     "@eslint/js": "10.0.1",
-    "@types/node": "25.9.3",
-    "@typescript-eslint/eslint-plugin": "8.61.0",
-    "@typescript-eslint/parser": "8.61.0",
-    "eslint": "10.4.1",
+    "@types/node": "26.0.0",
+    "@typescript-eslint/eslint-plugin": "8.61.1",
+    "@typescript-eslint/parser": "8.61.1",
+    "eslint": "10.5.0",
     "eslint-config-prettier": "10.1.8",
     "globals": "17.6.0",
     "prettier": "3.8.4",