hammoc 1.5.0 → 1.7.0

package/packages/server/dist/services/cliChatEngine.js

@@ -0,0 +1,2977 @@
+/**
+ * CliChatEngine (Epic 32 — Story 32.4)
+ *
+ * The **second `ChatEngine` implementation** behind the Epic 32 seam — the CLI
+ * (subscription-pool) conversation engine. Where `ChatService` drives the Claude
+ * Agent SDK, this engine:
+ *   1. spawns an *interactive* `claude` TUI in a PTY (no `--print` — headless
+ *      output uses the same billing as the SDK, which Epic 32 exists to avoid),
+ *   2. injects the prompt over stdin,
+ *   3. watches that session's JSONL file and re-emits each completed `assistant`
+ *      content block through the **existing `StreamCallbacks`** (so the client and
+ *      `@hammoc/shared` need zero changes — the wire shape matches SDK mode).
+ *
+ * Granularity differs from SDK mode by design: the session JSONL only gains a line
+ * when a content block *completes*, so text arrives as one chunk per block rather
+ * than token-by-token (accepted constraint, spike §1/§9-2). SDK mode keeps real
+ * token streaming.
+ *
+ * The CLI engine grows by story: 32.4 built the core happy-path (prompt → block
+ * response); 32.5 fills standalone rewind (`rewindFiles`, below — billing-neutral
+ * SDK file-rewind reuse); 32.6 wires the interactive tool-approval round-trip
+ * (`canUseTool` web dialog) — **constrained**: the permission prompt leaves NO
+ * session-JSONL signal (the `tool_use` line is written only *after* approval —
+ * spike §10 closed by Story 32.6 Task 1), so the dialog is detected from the PTY
+ * ANSI *state* (§6.2-class modal, §7.1-sanctioned state-signal use) and driven by
+ * keys (Enter = approve, Esc = deny); the scraped tool name/input are best-effort
+ * and `updatedInput` is unsupported (claude runs its own tool). See
+ * `handlePermission` below for the full constraint list. 32.7 adds the generation
+ * *progress* signal (the spinner's "↓ N tokens · Ns", read from the same PTY frames
+ * and emitted on value change via `onGenerationProgress` — see `emitProgressFromGrid`,
+ * whose token source became the Story 37.1 screen grid in Story 37.2) and
+ * *verifies* thinking display (mechanism-complete; see the thinking branch in
+ * `handleAssistantLine`). 32.8 wires the last interactive flow — the `AskUserQuestion`
+ * selection modal (`canUseTool` web question card) — also **constrained**: like the
+ * permission dialog it leaves no pre-answer JSONL signal (verified Task 1), so the modal
+ * is detected from the PTY ANSI state and its questions/options are scraped, the reused
+ * `canUseTool` answer is translated to menu keys (single-select ↓+Enter; multiSelect
+ * Space-toggle + → Submit), and any non-drivable case (multi-question, unparseable,
+ * custom "Other") is Esc-cancelled so the modal can never deadlock the response path.
+ * See `handleQuestion` below. 32.9 fills the last gap 32.6 AC5 left as "(optional) live
+ * `onToolUse` parity, only when it does not collide with the permission order / regression-0":
+ * `handleAssistantLine` now *emits* each tool_use block (and the drain emits each tool_result
+ * line) through the SAME `onToolUse`/`onToolResult` callbacks SDK mode uses (mapping copied
+ * from `streamHandler`), so a tool card renders live — which file is being written shows the
+ * moment it happens, not only on reload. The verification gate (Task 1) found the permission
+ * card's id namespace (synthetic `cli-perm-N`) and the real tool id (`toolu_…`) can never
+ * match, so id-merge is impossible; the honest floor is taken: a tool that went through the
+ * 32.6 permission dialog is *suppressed* live (it already has the standalone permission card
+ * and renders on reload), while auto-approved / safe tools (Bypass mode; read-only/auto-
+ * approved tools in default mode) emit live. No double-render: `stream:complete-messages`
+ * replaces the live cards with the authoritative reload at turn end (same as SDK mode), so
+ * client + `@hammoc/shared` are unchanged — the engine only *calls* the existing callbacks.
+ *
+ * [Source: docs/spike-32.1-cli-output-source.md#7.1; docs/prd/epic-32-cli-engine-core.md#Story 32.4+]
+ */
+import { resolveEffectiveModel, sanitizeToolResultContent, effectiveModelIs1M, isAutoNative1MModel } from '@hammoc/shared';
+import path from 'path';
+import fs from 'fs/promises';
+import { watch, mkdirSync, writeFileSync, createWriteStream } from 'fs';
+import { sessionService } from './sessionService.js';
+import { cliSessionPool } from './cliSessionPool.js';
+import { createCliScreenModel, CLI_SCREEN_COLS, CLI_SCREEN_ROWS } from './cliScreenModel.js';
+import { setCliScreen } from './cliScreenCache.js';
+import { createTrailingThrottle } from '../utils/trailingThrottle.js';
+import { readSpinnerProgress } from './cliSpinnerProgress.js';
+import { detectPermissionDialog, detectUsageLimit, detectRateLimit, extractToolName, extractPromptSentence, detectQuestionModal, parseQuestionModal, parsePrecedingText, parsePrecedingPermissionText, countQuestionTabs, parseQuestionTabHeaders, parseQuestionTabBody, parseConfirmChoiceMenu, readPermissionMode, permissionModeCycleIndex, isIdleInputGrid, isGeneratingGrid, classifyPreInjectScreen, CLI_PERMISSION_MODE_CYCLE, } from './cliModalDetect.js';
+import { liveFooterText, scrollbackBodyRows } from './cliGridRegion.js';
+import { parseGridCards, collectToolHeaderKeys, restoreFlickeredToolBullets } from './cliGridCards.js';
+import { rateLimitProbeService } from './rateLimitProbeService.js';
+import { parseJSONLFile, parseTaskNotification } from './historyParser.js';
+import { rewindSessionFiles } from './fileRewind.js';
+import { DEFAULT_WORKSPACE_TEMPLATE, resolveTemplateVariables } from './workspaceContext.js';
+import { createLogger } from '../utils/logger.js';
+import { SDKError, SDKErrorCode } from '../utils/errors.js';
+import { CliDebugLog } from '../utils/cliDebugLog.js';
+const log = createLogger('cliChatEngine');
+function keyLabel(k) {
+    if (k === ' ')
+        return 'SPACE';
+    if (k === '\r')
+        return 'ENTER';
+    if (k === '\x1b[B')
+        return 'DOWN';
+    if (k === '\x1b[C')
+        return 'RIGHT';
+    if (k === '\x1b[D')
+        return 'LEFT';
+    if (k === '\x1b')
+        return 'ESC';
+    return k.length > 3 ? `text(${k.length})` : k;
+}
+/** Strip control characters from custom free-text answers before PTY injection.
+ *  CR/LF would be interpreted as Enter (premature submit), ANSI escapes as cursor keys. */
+function sanitizeCustomText(text) {
+    return text.replace(/[\r\n\x1b\x00-\x1f]/g, '').trim();
+}
+/** Module-scoped question counter — survives across engine instances (which are created per-turn)
+ *  so `cli-q-N` IDs never collide with the client's seenPermissionIds (which persists per-session). */
+let globalQuestionCounter = 0;
+/**
+ * CLI attachment passthrough (image support in CLI mode). The interactive PTY carries
+ * only text, so image attachments — already saved to disk by `imageStorageService` —
+ * are referenced *by path* rather than embedded as base64 (SDK mode's approach). Two
+ * cooperating pieces:
+ *  - `uniqueAttachmentDirs`: directories to grant read access to via `--add-dir`. The
+ *    attachments live under `~/.claude/projects/<slug>/images`, OUTSIDE the project
+ *    cwd, so without this the model's Read is blocked (or prompts for permission).
+ *  - `appendAttachmentInstruction`: an explicit "use your Read tool to open these
+ *    files" line appended to the prompt. A bare path in the text does NOT reliably
+ *    trigger a Read — the model must be told. Verified by real-PTY smoke: a
+ *    `--add-dir`'d image referenced this way is read (vision) with no permission
+ *    prompt in default mode.
+ */
+function uniqueAttachmentDirs(paths) {
+    if (!paths || paths.length === 0)
+        return [];
+    const dirs = new Set();
+    for (const p of paths)
+        dirs.add(path.dirname(p));
+    return [...dirs];
+}
+function appendAttachmentInstruction(content, paths) {
+    if (!paths || paths.length === 0)
+        return content;
+    const many = paths.length > 1;
+    const list = paths.map((p) => `- ${p}`).join('\n');
+    return `${content}\n\n[Attached image${many ? 's' : ''} — use your Read tool to open ${many ? 'these files' : 'this file'} and view ${many ? 'them' : 'it'}:\n${list}]`;
+}
+/**
+ * Poll interval (ms) for session-file detection + draining. `fs.watch` is wired
+ * as the low-latency trigger, but its reliability varies by platform (§7.2-2),
+ * so a poll loop is the deterministic fallback that also covers the case where
+ * the project's sessions directory does not exist yet (brand-new project).
+ */
+const POLL_MS = 60;
+/**
+ * Prompt-injection timing (all empirically tuned against claude v2.1.162 — verified
+ * by a real-PTY smoke, not assumed; the spike's `content + '\r'` single-write
+ * assumption was stale). Two footguns the engine works around:
+ *
+ *  1. **Readiness.** claude emits a few setup frames, *pauses* during setup checks,
+ *     then renders the input box. Injecting during that pre-box pause loses the
+ *     prompt. So injection waits until the input-box marker (`❯`) has rendered and
+ *     output then goes quiet (with a hard fallback if the marker never appears).
+ *  2. **Submit.** A prompt and its Enter arriving close together are coalesced as a
+ *     *paste* — the CR becomes a literal newline, not a submit (a 150ms gap failed;
+ *     a 1000ms gap submitted cleanly). So Enter is a SEPARATE write sent a clear gap
+ *     after the typed text, read as a distinct Enter keypress.
+ */
+const CLI_PROMPT_MARKER = '❯'; // Claude Code interactive input-box prompt glyph
+const CLI_BOOT_SETTLE_MS = 400; // quiet after the box marker before typing
+const CLI_MAX_BOOT_WAIT_MS = 4000; // boot readiness re-poll interval (inject as soon as the grid is a
+// ready input box). No hard ceiling/abort: a large resume repaint can take a while and "unknown" means
+// "still painting"; injection is grid-gated so we keep polling. A genuine boot freeze is covered by the
+// soft screen-stall affordance (boot is now mirrored), pty.onExit (crash), and the user's Stop.
+const CLI_SUBMIT_GAP_MS = 1000; // Enter sent this long after the prompt text
+/**
+ * Tool-approval interception (Story 32.6 — *constrained*; keys verified against
+ * claude v2.1.162 by a real-PTY observation, Task 1). The interactive permission
+ * prompt leaves **no signal in the session JSONL** — the `tool_use` line is written
+ * only *after* the user approves (spike §10 closed: at dialog time the JSONL held
+ * only bookkeeping; the assistant `tool_use` line appeared post-approval). So the
+ * dialog exists only on the PTY ANSI screen — a §6.2-class absolute-coordinate modal
+ * — and detection is an ANSI *state* signal (§7.1-sanctioned, the same channel the
+ * `❯` readiness marker uses), never a content source.
+ *
+ * Verified key mapping (claude permission dialog: "❯ 1. Yes / 2. Yes, allow all
+ * edits… / 3. No · Esc to cancel") — BOTH directions empirically keyed against a
+ * real PTY: **Enter** selects the pre-highlighted "1. Yes" (approve — the file was
+ * created only after Enter); **Esc** ("Esc to cancel") denies — the dialog dismissed,
+ * the file was NOT created, and the JSONL recorded a `tool_result` with
+ * `is_error:true` ("The user doesn't want to proceed…") + "[Request interrupted by
+ * user for tool use]", i.e. the *same* envelope SDK deny (`interrupt:true`) produces,
+ * so a denied tool renders identically on reload. ("3. No" continue-after-deny is the
+ * alternate deny affordance; we map deny→Esc for the interrupt semantics.)
+ */
+const CLI_PERMISSION_ALLOW_KEY = '\r'; // Enter → pre-highlighted "1. Yes"
+const CLI_PERMISSION_DENY_KEY = '\x1b'; // Esc → "Esc to cancel"
+/**
+ * Shift+Tab (`CSI Z` = `\x1b[Z`) — advances claude's permission-mode cycle by ONE step
+ * (normal → accept edits → plan → auto → wrap). The ONLY mechanism that cycles the mode
+ * (Meta+M is NOT a mode switch — empirically refuted, Story 37.5). Driven through the same
+ * `pty.write` path the permission/question keys use; spaced by `CLI_QUESTION_KEY_GAP_MS`
+ * (each Shift+Tab is a discrete keypress, like the menu keys).
+ */
+const CLI_PERMISSION_CYCLE_KEY = '\x1b[Z';
+/**
+ * Hard ceiling on the live permission-mode driver's steps (Story 37.5 re-design 2026-06-14).
+ * Normal reach is ≤ N-1 forward steps; the headroom absorbs a transient misread or a slow frame
+ * that costs an extra lap. A run that can't land within this many is abnormal — stop and let the
+ * next spawn's `--permission-mode` be the backstop rather than spinning the PTY forever.
+ */
+const CLI_PERMISSION_MAX_STEPS = CLI_PERMISSION_MODE_CYCLE.length * 3;
+/**
+ * AskUserQuestion selection-modal interception (Story 32.8 — *constrained*; the JSONL/ANSI
+ * behavior and EVERY key were verified against claude v2.1.162 by a real-PTY observation,
+ * Task 1). Like the permission dialog (32.6), the question modal leaves **no structured
+ * signal in the session JSONL before the user answers** — the `tool_use(AskUserQuestion)`
+ * line (carrying the full questions/options) is written only *after* selection (Task 1 (a):
+ * at modal-display time the JSONL held only bookkeeping; the assistant `tool_use` +
+ * `tool_result(type=user)` + `text(end_turn)` appeared post-selection, the *same*
+ * envelope SDK mode produces, so it renders on reload — AC5, no code). So the modal lives
+ * only on the PTY ANSI screen (a §6.2-class absolute-coordinate box), detection is an ANSI
+ * *state* signal (§7.1-sanctioned, the channel the `❯` readiness marker uses), and the
+ * questions/options are *scraped* from that screen — low fidelity, the documented constraint.
+ *
+ * Verified key model (claude v2.1.162; Task 1 (b)) — the highlight starts on the first
+ * option (row 0):
+ *   - **Single-select:** `↓` × targetIndex, then **Enter** — selects AND submits in one
+ *     keypress (Task 1: ↓ moved Red→Green, Enter confirmed `=Green`).
+ *   - **multiSelect:** **Space** toggles the highlighted `[ ]` checkbox; after toggling,
+ *     **→** (right) moves to the header "✔ Submit" tab and **Enter** submits — count-
+ *     independent (Task 1: Space on Cat, →, Enter confirmed `=Cat`).
+ *   - **Esc** cancels the modal — the deadlock guard for an unparseable modal or an answer
+ *     that maps to no listed option.
+ *
+ * A multi-question modal is *tabbed* (one question's options visible at a time →
+ * `←  ☐ Q1  ☐ Q2  ✔ Submit  →`). 32.8 left these as a *single-question* constraint and Esc-cancelled
+ * them; **ISSUE-99 drives them** by navigating the tabs to reconstruct every question, presenting one
+ * multi-question card, and driving each answer back into the tab bar (`handleMultiQuestion` below).
+ * The web card/round-trip (`canUseTool('AskUserQuestion')` → `updatedInput.answers`) is reused
+ * verbatim for both (client + `@hammoc/shared` unchanged — the engine only *calls* it and translates
+ * the answer to keys). See `handleQuestion` (single) / `handleMultiQuestion` (multi) below.
+ */
+const CLI_QUESTION_DOWN_KEY = '\x1b[B'; // ↓ — move highlight to the next option
+const CLI_QUESTION_RIGHT_KEY = '\x1b[C'; // → — move to the next tab (multiSelect Submit / next question)
+const CLI_QUESTION_LEFT_KEY = '\x1b[D'; // ← — move to the PREVIOUS tab (ISSUE-99 multi-question return)
+const CLI_QUESTION_SPACE_KEY = ' '; // toggle the highlighted multiSelect checkbox
+const CLI_QUESTION_ENTER_KEY = '\r'; // select+submit (single) / activate Submit (multi)
+const CLI_QUESTION_ESC_KEY = '\x1b'; // cancel the modal (deadlock guard — AC4)
+/** Let the modal finish painting after the footer first appears, before scrape + drive. */
+const CLI_QUESTION_SETTLE_MS = 400;
+// Story 37.8: default pace for full-screen mirror frames. The actual interval is the user's
+// `cliMirrorThrottleMs` preference (passed in per-turn); this is the fallback when unset. The
+// spinner repaints many times a second, so coalescing keeps the mirror calm while bounding
+// bandwidth (the whole screen is re-sent each frame). Trailing edge keeps the latest frame.
+const CLI_SCREEN_FRAME_THROTTLE_DEFAULT_MS = 200;
+/**
+ * Story 37.11 (resume snapshot depth): how many rows ABOVE the viewport are read ONCE at injection to
+ * snapshot the resume repaint of the prior conversation (the turn baseline). The live per-frame scraper
+ * reads the VIEWPORT ONLY (deep per-frame re-scrapes of a long, scrolling conversation re-emitted cards
+ * endlessly — 실측 2026-06-16, user dump: 6,529 emits → 491 viewport-only). This depth only bounds the
+ * one-shot baseline read; it matches the emulator's scrollback retention so the whole repaint is captured.
+ */
+const CLI_RESUME_SNAPSHOT_ROWS = 5000;
+/**
+ * Story 37.11 (bounded scroll-up): the live card scraper reads the VIEWPORT first, then scrolls UP in
+ * `CLI_SCROLLUP_INCREMENT`-row steps ONLY while no already-known block (`heldCards`) is in view — so a
+ * paragraph taller than the viewport gets its HEADER recovered, while the read STOPS at the first known
+ * block (the user's "큐에 있는 헤더를 만나면 멈춤"). `MAX_ITERS` caps the climb at the snapshot retention so a
+ * pathological no-known-block frame can't spin; beyond it the turn-end reload backstops.
+ */
+const CLI_SCROLLUP_INCREMENT = 160; // two viewports per step
+const CLI_SCROLLUP_MAX_ITERS = 32; // ≈ CLI_RESUME_SNAPSHOT_ROWS / CLI_SCROLLUP_INCREMENT
+/**
+ * Gap between injected menu keys. Arrow/Space/Enter are *discrete* key events — not the
+ * typed-text-then-Enter pair that bracketed-paste coalesces (§32.4) — and Task 1 drove
+ * them reliably at 500–700ms spacing; 350ms keeps each a distinct keypress while bounding
+ * the post-answer latency (correctness over speed — a dropped arrow would mis-select).
+ */
+const CLI_QUESTION_KEY_GAP_MS = 350;
+/** Best-effort dump of the pre-injection PTY screen for the Epic 37.6 grid classifier. Story 37.6
+ *  extends it from raw-only (observe-only) to ALSO enclosing the settled grid + the classifier's
+ *  verdict (`input-box` / `selection` / `unknown`), so an `unknown`/`selection` screen's identity can
+ *  be captured (the AC4 extension-point material) and an explicit-error fail can name the snapshot for
+ *  the operator (AC3 — expose, don't blind-inject). Best-effort: never breaks a turn. */
+function capturePreInjectScreen(sessionId, raw, grid, classification) {
+    try {
+        const dir = path.join(process.cwd(), 'logs', 'claude-debug');
+        mkdirSync(dir, { recursive: true });
+        const file = path.join(dir, `${sessionId ?? 'unknown'}-${Date.now()}-preinject-screen.log`);
+        const gridSection = grid !== undefined
+            ? `\n\n===== SETTLED GRID (classification: ${classification ?? 'n/a'}) =====\n${grid.join('\n')}`
+            : '';
+        writeFileSync(file, raw + gridSection);
+        return file;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Normalize a canUseTool answer for ONE question into the sorted option indices it selects (Story
+ * 32.8 + ISSUE-99). The answer arrives in one of three shapes and all three map to the same indices:
+ *   - a bare array (`['Cat','Fish']`) — the MULTI-question card returns each multiSelect answer as an
+ *     array verbatim (websocket.ts passes the answers object through unchanged);
+ *   - a ", "-joined string (`'Cat, Fish'`) — the SINGLE-question card's multiSelect array is joined
+ *     on that separator by the reused canUseTool branch (websocket.ts:2674 / queueService.ts:845),
+ *     so it is split back on the same separator (the 32.8-MULTISELECT-DROP fix);
+ *   - a single label (`'Green'`) — a single-select answer, taken as-is (NOT split: a label may
+ *     itself contain ", ").
+ * An unmappable token (a custom "Other" entry) contributes no index, so an all-custom answer yields
+ * [] and the caller cancels rather than mis-selecting.
+ */
+function resolveSelectedIndices(labels, answer, multiSelect) {
+    const tokens = Array.isArray(answer)
+        ? answer
+        : answer == null
+            ? []
+            : multiSelect
+                ? answer.split(', ')
+                : [answer];
+    return tokens
+        .map((a) => labels.indexOf(a))
+        .filter((i) => i >= 0)
+        .sort((a, b) => a - b);
+}
+/**
+ * Translate the user's answer (canUseTool `updatedInput.answers`) into the TUI menu key
+ * sequence for a SINGLE-question modal (Story 32.8). The highlight starts on option 0 (verified
+ * Task 1). Returns null when the answer maps to no scraped option (e.g. a custom "Other" entry) —
+ * not safely drivable, so the caller cancels (Esc) rather than risk a wrong selection.
+ */
+export function buildQuestionKeys(parsed, answer) {
+    const labels = parsed.options.map((o) => o.label);
+    const selected = resolveSelectedIndices(labels, answer, parsed.multiSelect);
+    if (selected.length === 0) {
+        // Custom/free-text answer ("Other"). The TUI lists it as a "Type something" item right
+        // AFTER the real options (index = options.length). ↓×optionCount lands on "Type something",
+        // then type directly (no Enter — Enter on "Type something" submits the modal immediately;
+        // verified 2026-06-20 log). The final Enter submits the typed text.
+        const customText = !parsed.multiSelect && typeof answer === 'string' ? sanitizeCustomText(answer) : null;
+        if (!customText)
+            return null;
+        const custom = [];
+        for (let i = 0; i < labels.length; i++)
+            custom.push(CLI_QUESTION_DOWN_KEY);
+        custom.push(customText);
+        custom.push(CLI_QUESTION_ENTER_KEY); // submit
+        return custom;
+    }
+    const keys = [];
+    if (!parsed.multiSelect) {
+        // Single-select: ↓ to the option, Enter selects + submits (one keypress — verified Task 1).
+        for (let i = 0; i < selected[0]; i++)
+            keys.push(CLI_QUESTION_DOWN_KEY);
+        keys.push(CLI_QUESTION_ENTER_KEY);
+        return keys;
+    }
+    // multiSelect: walk down toggling each selected checkbox, then → to Submit + Enter.
+    let cur = 0;
+    for (const idx of selected) {
+        for (let i = cur; i < idx; i++)
+            keys.push(CLI_QUESTION_DOWN_KEY);
+        keys.push(CLI_QUESTION_SPACE_KEY);
+        cur = idx;
+    }
+    keys.push(CLI_QUESTION_RIGHT_KEY, CLI_QUESTION_ENTER_KEY);
+    return keys;
+}
+/**
+ * ISSUE-99 — translate a MULTI-question answer set into the per-tab OPTION keys (↓ / Space) for each
+ * question, leaving the tab navigation (→ between tabs, final Enter) to the engine's grid-verified
+ * driver (`handleMultiQuestion`). Returns one key array per question, in tab order; the engine drives
+ * array i on tab i, then advances. Returns null when ANY question's answer maps to no listed option
+ * (custom/Other) — a multi-question modal submits every question at once, so one unmappable answer
+ * cancels the WHOLE modal (Esc) rather than half-answering it.
+ *
+ * The composed key model is derived from the verified single-question primitives (Task 1, claude
+ * v2.1.162): within each tab the highlight starts at option 0; a multiSelect question Space-toggles
+ * each pick; a SINGLE-select question only highlights its pick (↓×index) — the highlighted option is
+ * the recorded answer, committed by Enter (explicit per-tab confirmation). The original assumption
+ * that "highlight = recorded answer" (no confirmation key needed) was disproven by JSONL evidence:
+ * multiSelect answers (Space-toggled) were recorded, but single-select answers (highlight-only)
+ * were silently dropped. Enter on a single-select tab confirms THAT TAB (does not trigger Submit);
+ * verified by owner manual testing (2026-06-20).
+ */
+export function buildMultiQuestionKeys(questions, answers) {
+    if (!answers)
+        return null;
+    const answerValues = Object.values(answers); // positional fallback (insertion order = question order)
+    const perQuestion = [];
+    for (let qi = 0; qi < questions.length; qi++) {
+        const q = questions[qi];
+        // Prefer the by-question-text key (self-consistent: the engine's scrape IS the card's answer
+        // key); fall back to position if the text key is absent (defensive — should not happen by
+        // construction, but a positional answer still lands on the right tab).
+        const answer = answers[q.question] ?? answerValues[qi];
+        const selected = resolveSelectedIndices(q.options.map((o) => o.label), answer, q.multiSelect);
+        if (selected.length === 0) {
+            // Custom/Other in multi-tab: navigate to "Type something", then type directly (no Enter
+            // to enter text mode — Enter would submit the whole modal). The final Enter confirms the
+            // text and auto-advances to the next tab. Verified by owner manual testing (2026-06-20).
+            const customText = !q.multiSelect && typeof answer === 'string' ? sanitizeCustomText(answer) : null;
+            if (!customText)
+                return null; // multiSelect custom or empty → not drivable
+            const custom = [];
+            for (let i = 0; i < q.options.length; i++)
+                custom.push(CLI_QUESTION_DOWN_KEY);
+            custom.push(customText);
+            custom.push(CLI_QUESTION_ENTER_KEY); // confirm input + auto-advance
+            perQuestion.push(custom);
+            continue;
+        }
+        const keys = [];
+        if (q.multiSelect) {
+            let cur = 0;
+            for (const idx of selected) {
+                for (let i = cur; i < idx; i++)
+                    keys.push(CLI_QUESTION_DOWN_KEY);
+                keys.push(CLI_QUESTION_SPACE_KEY);
+                cur = idx;
+            }
+        }
+        else {
+            for (let i = 0; i < selected[0]; i++)
+                keys.push(CLI_QUESTION_DOWN_KEY);
+            keys.push(CLI_QUESTION_ENTER_KEY);
+        }
+        perQuestion.push(keys);
+    }
+    return perQuestion;
+}
+/**
+ * Does this JSONL line carry claude's "[Request interrupted by user]" marker (or its "…for tool use]"
+ * variant) — the standalone user-text line claude writes when its turn is INTERRUPTED (Esc / Ctrl+C)?
+ * An interrupt writes NO end_turn assistant line, so the turn-completion drain (`tick`) never sees a
+ * `stop_reason` and would otherwise wait forever; treating this marker as a turn end is the safety net
+ * (a real 21-minute hang was observed 2026-06-14 when a stray Esc interrupted the agent and the turn
+ * never recovered — that Esc's root cause is fixed separately, but ANY interrupt-to-idle must still end
+ * the turn). Matched STRICTLY — the whole text must BE the bracketed marker — so a user PROMPT that
+ * merely *mentions* an interrupt (a question about this very behavior) cannot false-trigger it.
+ */
+function extractUserTextContent(raw) {
+    const content = raw.message?.content;
+    return typeof content === 'string'
+        ? content
+        : Array.isArray(content)
+            ? content
+                .filter((b) => b.type === 'text')
+                .map((b) => b.text ?? '')
+                .join(' ')
+            : '';
+}
+function isCliInterruptLine(raw) {
+    if (raw.type !== 'user')
+        return false;
+    return /^\s*\[Request interrupted[^\]]*\]\s*$/i.test(extractUserTextContent(raw));
+}
+/** Map the cliResumeChoice auto-pick ('summary' | 'full') to the matching resume-menu option label.
+ *  Match by keyword on claude's wording ("Resume from summary …" / "Resume full session as-is"),
+ *  falling back to position (summary first, full second) when the wording shifts across versions. */
+function pickAutoResumeOption(options, choice) {
+    const kw = choice === 'summary' ? /summary/i : /full/i;
+    const byKeyword = options.find((o) => kw.test(o.label));
+    if (byKeyword)
+        return byKeyword.label;
+    return options[choice === 'summary' ? 0 : 1]?.label;
+}
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+async function listJsonl(dir) {
+    try {
+        const files = await fs.readdir(dir);
+        return new Set(files.filter((f) => f.endsWith('.jsonl')));
+    }
+    catch {
+        return new Set();
+    }
+}
+async function fileSize(file) {
+    try {
+        return (await fs.stat(file)).size;
+    }
+    catch {
+        return 0;
+    }
+}
+/** Find the newest `*.jsonl` in `dir` that is not in the pre-spawn `baseline`. */
+async function newestNewJsonl(dir, baseline) {
+    try {
+        const candidates = (await fs.readdir(dir)).filter((f) => f.endsWith('.jsonl') && !baseline.has(f));
+        if (candidates.length === 0)
+            return null;
+        if (candidates.length === 1)
+            return candidates[0];
+        let best = null;
+        for (const name of candidates) {
+            const mtime = (await fs.stat(path.join(dir, name))).mtimeMs;
+            if (!best || mtime > best.mtime)
+                best = { name, mtime };
+        }
+        return best?.name ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+export class CliChatEngine {
+    workingDirectory;
+    permissionMode;
+    /**
+     * Story 37.5 fix — claude carries `bypassPermissions` in its live Shift+Tab cycle ONLY when the
+     * session was SPAWNED in bypass. We ALWAYS spawn in bypass (SDK parity — every mode is reachable
+     * live; the on-screen mode is aligned to the user's button mode before injection), so this is
+     * always true once a turn starts. The cycle-index helper reads it to treat bypass as on-cycle.
+     */
+    cycleHasBypass = false;
+    /**
+     * Story 37.5: the live control surface for the in-flight turn (set at spawn, cleared at
+     * teardown). Null between turns — `setPermissionMode` reads it to decide live closed loop
+     * vs. store-only fallback. See `CliLiveControl`.
+     */
+    activeCliControl = null;
+    /**
+     * Story 37.5 re-design — true while the live permission-mode driver loop is running. A concurrent
+     * `setPermissionMode` then just retargets (`this.permissionMode`) instead of starting a second
+     * driver that would fight the first over the same PTY's mode cycle.
+     */
+    permissionLoopRunning = false;
+    /**
+     * Story 33.3: user-configured `claude` binary path override (global preference).
+     * Forwarded to every spawn; empty/undefined = auto-detect, invalid = graceful
+     * fallback in `cliSessionPool.resolveClaudeBinary`.
+     */
+    cliBinaryPath;
+    /**
+     * When true (default), inject `--settings '{"showThinkingSummaries":true}'` so the
+     * interactive claude is asked to surface thinking summaries (Opus 4.7+ omit them by
+     * default). Session-scoped via `--settings` — the global config is untouched. NOTE:
+     * the actual effect depends on the server honoring the parameter for the active auth;
+     * a real CLI-mode chat must confirm it (the interactive PTY could not be reproduced in
+     * the dev shell — no Windows console there; a real entrypoint:cli session was observed
+     * to surface thinking, so this is expected to work).
+     */
+    cliShowThinkingSummaries;
+    // Epic 37.6 follow-up: auto-pick for the resume confirm menu ('ask' = card, else auto-select).
+    cliResumeChoice;
+    /**
+     * Auto-compaction master switch (shared autoCompactEnabled preference; default true). Injected
+     * into the spawn's `--settings` blob — the bundled engine's enable resolver honors it, so OFF
+     * stops the interactive claude from auto-compacting when the context fills. Applies to BOTH
+     * engines (the SDK engine reads the same preference and passes it as an inline `settings`).
+     */
+    autoCompactEnabled;
+    planModeBypassBehavior;
+    /** Current turn's CLI decision log — populated inside sendMessageWithCallbacks, read by websocket handler. */
+    currentDebugLog = null;
+    /**
+     * CLI mode performs no inline rewind-before-send, so this stays null. (Standalone
+     * rewind is the separate `rewindFiles` operation below — implemented in Story 32.5.)
+     */
+    rewindWarning = null;
+    constructor(config = {}) {
+        this.workingDirectory = config.workingDirectory;
+        this.permissionMode = config.permissionMode ?? 'default';
+        this.cliBinaryPath = config.cliBinaryPath;
+        this.cliShowThinkingSummaries = config.cliShowThinkingSummaries ?? true;
+        this.cliResumeChoice = config.cliResumeChoice ?? 'ask';
+        this.autoCompactEnabled = config.autoCompactEnabled ?? true;
+        this.planModeBypassBehavior = config.planModeBypassBehavior ?? 'override';
+    }
+    getPermissionMode() {
+        return this.permissionMode;
+    }
+    async setPermissionMode(mode) {
+        // Story 37.5 (re-design 2026-06-14) — the stored mode is BOTH the authority the next spawn maps
+        // to `--permission-mode` (AC7) AND the live TARGET the driver heads toward. Set it first so a
+        // driver already running adopts the new target on its next step (mid-flight retarget — the user
+        // cycling Ask→Accept Edits→Plan→Auto during one turn). A pick that lands off-cycle (Bypass in a
+        // turn NOT spawned in bypass; dontAsk) just stores the target; the live driver stops and the next
+        // spawn's --permission-mode applies it. In a bypass-SPAWNED turn claude carries bypass in its live
+        // cycle, so `cycleHasBypass` makes Bypass an on-cycle, live-drivable target (driven, not stored).
+        this.permissionMode = mode;
+        const control = this.activeCliControl;
+        // Store-only (no live key injection): no live turn (between turns, or the narrow spawn/teardown
+        // race where status is still 'running' but `activeCliControl` isn't set), or the target is OFF
+        // the Shift+Tab cycle (`bypassPermissions`/`dontAsk` — no reachable position; the next spawn's
+        // --permission-mode applies it instead). Aliveness, the modal guard, and the
+        // screen classification are re-checked every step INSIDE the driver (not pre-emptively here), so
+        // a generating frame is driven just like an idle one and a modal that comes up mid-drive still
+        // stops the keys before they land.
+        if (!control || permissionModeCycleIndex(mode, this.cycleHasBypass) < 0)
+            return;
+        // A driver is already running — it re-reads `this.permissionMode` each step, so it now heads for
+        // the target we just stored. Never start a second concurrent driver (two would fight over the
+        // same PTY's mode cycle).
+        if (this.permissionLoopRunning)
+            return;
+        this.permissionLoopRunning = true;
+        try {
+            await this.drivePermissionModeToTarget(control);
+        }
+        finally {
+            this.permissionLoopRunning = false;
+        }
+    }
+    /**
+     * Story 37.5 (re-design 2026-06-14) — drive claude's live permission mode toward the stored
+     * target by stepping ONE Shift+Tab (CSI Z) at a time and RE-READING the screen each step, until
+     * the target mode is the one shown. Self-corrects a misread or a slow frame (the next step
+     * re-checks) and never over-shoots permanently (it stops the moment the target is on screen). The
+     * target is re-read from `this.permissionMode` every step, so a mid-flight retarget (the user
+     * cycling Ask→Accept Edits→Plan→Auto within one turn) is followed live without restarting the driver.
+     *
+     * Replaces the old "read once → compute the N-step distance → inject the whole burst → verify
+     * once" loop, whose single up-front read made it brittle: one bad current-mode read sent the wrong
+     * key count with no chance to correct (the source of the mid-generation echo). Bounded by a step
+     * ceiling so a persistently-misreading screen (or one that never settles) can't spin forever — the
+     * next spawn's `--permission-mode` is the backstop in that abnormal case.
+     */
+    async drivePermissionModeToTarget(control) {
+        for (let step = 0; step < CLI_PERMISSION_MAX_STEPS; step++) {
+            // Pre-key guards, re-checked every step: a torn-down PTY, or a modal that came up mid-drive (a
+            // stray CSI Z must never land in a permission/question modal — same guard as the old loop).
+            if (!control.isAlive() || control.isModalPending())
+                return;
+            const target = this.permissionMode; // re-read each step ⇒ follows a mid-flight retarget
+            if (permissionModeCycleIndex(target, this.cycleHasBypass) < 0)
+                return; // off-cycle (bypass in a non-bypass turn / dontAsk) ⇒ store-only
+            const grid = await control.readSettledGrid();
+            if (!control.isAlive())
+                return;
+            // Only drive on a classifiable LIVE screen (idle input box or generating frame); an UNKNOWN
+            // boot/loading screen forbids blind keys (the next spawn applies the stored mode instead).
+            if (!isIdleInputGrid(grid) && !isGeneratingGrid(grid))
+                return;
+            if (readPermissionMode(grid) === target)
+                return; // target is on screen — done
+            control.writeKey(CLI_PERMISSION_CYCLE_KEY);
+            // Discrete keypress spacing (a coalesced burst could drop a step); the next iteration's
+            // readSettledGrid then observes the mode this keypress landed on.
+            await new Promise((r) => setTimeout(r, CLI_QUESTION_KEY_GAP_MS));
+        }
+        log.warn(`CLI permission-mode did not reach target=${this.permissionMode} within ${CLI_PERMISSION_MAX_STEPS} steps — leaving it for the next spawn's --permission-mode`);
+    }
+    /**
+     * Standalone file rewind (Story 32.5). Delegates to the shared billing-neutral
+     * `rewindSessionFiles` helper: a throwaway `query({ prompt: '' })` resumed only to
+     * drive its file-checkpoint rewind (0 tokens → no conflict with CLI mode's
+     * subscription-pool purpose). This is the documented exception to 32.4's "the CLI
+     * engine never spawns the SDK directly" rule, and the ONLY programmatic rewind path
+     * (interactive claude exposes no non-interactive rewind flag; `/rewind` is an ANSI
+     * picker; control-protocol rewind is headless-only — verified §AC2). Verified
+     * billing-neutral + working against a real CLI-created session (AC4).
+     *
+     * Separate from the inline rewind-before-send (`rewindWarning`, always null for
+     * CLI) — the "two rewinds"; do not conflate.
+     */
+    async rewindFiles(params) {
+        if (!this.workingDirectory) {
+            // Rewind needs the session JSONL + tracked files under cwd. Mirrors the
+            // sendMessageWithCallbacks cwd guard, surfaced as the rewind contract's
+            // canRewind:false (not a throw) so the handler maps it to a clean result.
+            return { canRewind: false, error: 'CliChatEngine requires a workingDirectory to locate the session JSONL' };
+        }
+        return rewindSessionFiles(params, this.workingDirectory);
+    }
+    /**
+     * Core: inject `content` into an interactive claude PTY, watch the session JSONL,
+     * and re-emit completed assistant blocks through `callbacks`. Resolves with the
+     * assembled `ChatResponse` on `stop_reason:"end_turn"`. When `canUseTool` is
+     * provided, an interactive permission dialog detected on the PTY screen is routed
+     * through it (Story 32.6 — reuses the existing web round-trip; see
+     * `handlePermission`). `onRawMessage` is the *generation-activity* signal (S-1): it
+     * resets the browser path's inactivity timer while a turn streams. It no longer keeps
+     * an input-wait alive — Story 35.1 pauses that timer for the whole input-wait.
+     * `onGenerationProgress` (Story 32.7) is the transient "↓ N tokens · Ns" signal
+     * read from the same spinner frames — emitted on value change (see `emitProgressFromGrid`).
+     * `onPhase` (Story 36.2) reports the pre-generation boot/inject phase
+     * (launching → submitting → waiting → null) so the UI shows "working" through the ~3s
+     * before the first block instead of a frozen spinner; null hands off to onGenerationProgress.
+     */
+    async sendMessageWithCallbacks(content, callbacks, options = {}, canUseTool, onRawMessage, onGenerationProgress, onPhase, onScreenFrame, screenFrameThrottleMs, backgroundTracker, onPermissionModeSync) {
+        const cwd = this.workingDirectory;
+        if (!cwd) {
+            throw new Error('CliChatEngine requires a workingDirectory to locate the session JSONL');
+        }
+        // Reference image attachments by path in the prompt (the PTY can't carry base64
+        // the way SDK mode does). No-op when there are no attachments. Paired with the
+        // `--add-dir` grants built into `args` below so the referenced files are readable.
+        const promptToInject = appendAttachmentInstruction(content, options.attachedImagePaths);
+        const projectSlug = sessionService.encodeProjectPath(cwd);
+        const sessionsDir = sessionService.getSessionsDir(cwd);
+        const resumeId = typeof options.resume === 'string' && options.resume.length > 0 ? options.resume : undefined;
+        // Build interactive claude args. NEVER --print / --output-format stream-json:
+        // headless output bills like the SDK, which is the whole reason CLI mode exists.
+        const args = [];
+        if (resumeId) {
+            // Resume an existing session. (Do NOT also pass --session-id — claude rejects
+            // --session-id + --resume unless --fork-session, mirroring the SDK; verified
+            // via `claude --help`. See chatService.ts:488-491.)
+            args.push('--resume', resumeId);
+        }
+        else if (options.sessionId && UUID_RE.test(options.sessionId)) {
+            // Pre-allocate the session id (verified standalone flag) so the CLI session id
+            // matches the caller's id — keeps the wire identical to SDK mode (no rekey).
+            args.push('--session-id', options.sessionId);
+        }
+        // ALWAYS spawn in bypass so claude carries EVERY mode (incl. bypassPermissions) in its live
+        // Shift+Tab cycle — SDK parity (the SDK reaches any mode at runtime regardless of start mode, via
+        // query.setPermissionMode). The on-screen mode is aligned to the user's button mode BEFORE the
+        // prompt is injected (attemptInjectFromGrid → alignModeThenInject), so the turn runs under the
+        // chosen mode while bypass stays reachable live mid-turn. `this.permissionMode` stays the button
+        // mode (driver target + getPermissionMode); `cycleHasBypass` is therefore always true.
+        args.push('--permission-mode', 'bypassPermissions');
+        this.cycleHasBypass = true;
+        // Apply the same 1M policy as SDK mode (resolveEffectiveModel): Opus auto-1M,
+        // Sonnet bare unless explicitly opted in. Keeps both engines consistent.
+        if (options.model)
+            args.push('--model', resolveEffectiveModel(options.model));
+        if (options.effort)
+            args.push('--effort', options.effort);
+        // Image attachments (CLI mode): grant read access to each attachment directory.
+        // The files live outside the project cwd (~/.claude/projects/.../images), so
+        // without --add-dir the model's Read is blocked. The matching prompt-side reference
+        // (`appendAttachmentInstruction`, applied to `promptToInject`) is what actually
+        // triggers the read.
+        for (const dir of uniqueAttachmentDirs(options.attachedImagePaths)) {
+            args.push('--add-dir', dir);
+        }
+        // Hammoc workspace context — SDK-mode parity. SDK mode appends this same template to the
+        // `claude_code` system-prompt preset (chatService); the interactive `claude` already runs that
+        // preset, so CLI mode appends the IDENTICAL resolved template via --append-system-prompt. This
+        // is what makes the agent Hammoc-aware (identity, clickable-link convention, feature pointers,
+        // manual/internals locations) — without it CLI-mode chats lose all of that. The customSystemPrompt
+        // override + {variable} resolution mirror chatService exactly (single source of truth =
+        // workspaceContext). Verified: node-pty delivers the multi-line arg intact to the PTY child, and
+        // billing is unaffected (the pool is set by interactive-vs-print, not prompt content — this only
+        // adds input tokens to the same subscription pool).
+        const appendTemplate = options.customSystemPrompt || DEFAULT_WORKSPACE_TEMPLATE;
+        args.push('--append-system-prompt', resolveTemplateVariables(appendTemplate, cwd));
+        // Session-scoped `--settings` JSON (the global ~/.claude/settings.json is never
+        // modified). Thinking summaries (default ON): Opus 4.7+ omit summaries unless asked.
+        const settingsObj = {};
+        if (this.cliShowThinkingSummaries) {
+            settingsObj.showThinkingSummaries = true;
+        }
+        // Auto-compaction master switch (shared autoCompactEnabled preference). The bundled engine's
+        // enable resolver reads this key (default true); setting it explicitly makes Hammoc's toggle
+        // authoritative for the session without touching the global ~/.claude/settings.json.
+        settingsObj.autoCompactEnabled = this.autoCompactEnabled;
+        // Story 37.9 (AC1 — expanded-mode spawn, embedded spike): render claude with thinking / long
+        // output NOT collapsed behind "(ctrl+o to expand)", so the settled grid carries the full screen
+        // (the foundation Story 37.10 streams thinking/tool cards from). Option (a) of the spike's
+        // (a)→(b)→(c) chain: the session-scoped `verbose` settings key — confirmed REAL (not assumed) via
+        // `claude --help`: "--verbose  Override verbose mode setting from config", so `verbose` is the
+        // config key that flag overrides; a boolean, so it cannot corrupt the --settings JSON even if a
+        // future TUI ignores it (a harmless no-op, unlike a guessed key/value). Session-scoped only — the
+        // global ~/.claude/settings.json is untouched. EMPIRICALLY CONFIRMED (2026-06-15, James) by a real
+        // node-pty A/B capture of the bundled v2.1.177 binary on the SAME ultrathink prompt: verbose:false
+        // COLLAPSES a 22s thinking block to "Thought for 22s (ctrl+o to expand)", while verbose:true renders
+        // the same-magnitude (14s) thinking EXPANDED inline with ZERO collapse markers — so option (a)
+        // suffices and the (b) `--verbose` flag / (c) one-shot Ctrl+O fallbacks are NOT needed. (The earlier
+        // "interactive claude PTY cannot be spawned in this headless shell" assumption was wrong — node-pty
+        // drives it fine.) Locked by cliVerboseThinking.realframes.test.ts.
+        settingsObj.verbose = true;
+        args.push('--settings', JSON.stringify(settingsObj));
+        // Experimental CLI debug instrumentation (HAMMOC_CLI_DEBUG=1). Adds claude's own
+        // --debug-file so its internal reasoning (including any auto-compact decision) is
+        // captured per spawn, to diagnose why claude self-compacts on some long-idle resumes.
+        // No-op unless the env flag is set; *.log is gitignored. Best-effort — instrumentation
+        // must never break a turn.
+        if (process.env.HAMMOC_CLI_DEBUG) {
+            try {
+                const dbgDir = path.join(process.cwd(), 'logs', 'claude-debug');
+                mkdirSync(dbgDir, { recursive: true });
+                const dbgSid = resumeId ?? options.sessionId ?? 'new';
+                const dbgFile = path.join(dbgDir, `${dbgSid}-${Date.now()}.log`);
+                args.push('--debug-file', dbgFile);
+                log.info(`[CLI-DEBUG] spawn resume=${resumeId ?? 'none'} sid=${dbgSid} debugFile=${dbgFile}`);
+            }
+            catch (e) {
+                log.warn(`[CLI-DEBUG] debug-file setup failed: ${e instanceof Error ? e.message : String(e)}`);
+            }
+        }
+        // Pin this turn's session file by id whenever the id is known up front. The file
+        // name is deterministic — claude writes `<id>.jsonl` for BOTH `--resume <id>` and
+        // the pre-allocated `--session-id <id>` (same flag built into `args` above) — so we
+        // target that file directly. The previous path only pinned on resume and otherwise
+        // adopted "the newest NEW *.jsonl" (newestNewJsonl); that cannot tell two new
+        // sessions in the SAME project apart, so a new-session turn could latch onto the
+        // OTHER session's freshly-created file (the new-session file-matching race —
+        // reproduced in cliChatEngine.sessionIsolation.test.ts). Hammoc always supplies a
+        // client-generated UUID for new sessions (ChatPage route `/session/:sessionId`), so
+        // the unpinned diff-detect fallback below only triggers when no id was supplied at
+        // all (claude self-assigns the id) — the one case where the file name is unknown.
+        const preallocId = !resumeId && options.sessionId && UUID_RE.test(options.sessionId) ? options.sessionId : undefined;
+        const pinnedId = resumeId ?? preallocId;
+        // New-session detection baseline (§7.2-1) is only needed for the unpinned fallback;
+        // when pinned we never scan for new files, so skip the pre-spawn snapshot.
+        const baselineFiles = pinnedId ? new Set() : await listJsonl(sessionsDir);
+        // A pinned id resolves the session file up front; resume additionally records the
+        // current size so only NEW appended assistant lines are emitted (not the replayed
+        // history) and seeds the emitted set with the existing assistant uuids.
+        let sessionFile = null;
+        let resolvedSessionId = null;
+        let lastSize = 0;
+        const emittedUuids = new Set();
+        if (pinnedId) {
+            sessionFile = sessionService.getSessionFilePath(projectSlug, pinnedId);
+            resolvedSessionId = pinnedId;
+            if (resumeId) {
+                lastSize = await fileSize(sessionFile);
+                for (const m of await parseJSONLFile(sessionFile)) {
+                    // Seed assistant uuids AND any prior compact_boundary / interrupt marker so resume replays
+                    // none of them. These seeds are load-bearing for the turn-end signals in `tick` below:
+                    // without them a compaction OR a "[Request interrupted by user]" line already in the
+                    // transcript would be re-read as "this turn ended" the instant we resume, finishing the new
+                    // turn before the model ever responds.
+                    if (m.type === 'assistant' || (m.type === 'system' && m.subtype === 'compact_boundary') || isCliInterruptLine(m)) {
+                        emittedUuids.add(m.uuid);
+                    }
+                }
+            }
+            // Pre-allocated new session: the file does not exist yet (claude creates it on the
+            // first write); lastSize stays 0 so the whole file drains once it appears.
+        }
+        const { handle, pty } = cliSessionPool.spawnClaude({ cwd, args, binaryPathOverride: this.cliBinaryPath, cols: CLI_SCREEN_COLS, rows: CLI_SCREEN_ROWS });
+        // Story 37.1: a headless screen model, one per turn (same lifecycle as the PTY),
+        // fed every PTY frame UNCONDITIONALLY (unlike the gated mirror) so the final screen
+        // grid is always reconstructed — "reconstruct always / display-only toggle" (AC3).
+        // Geometry matches the spawn geometry (120×40) so claude's in-place redraw
+        // coordinates line up. Pure foundation: no production consumer reads it yet (37.2~).
+        const screen = createCliScreenModel(CLI_SCREEN_COLS, CLI_SCREEN_ROWS);
+        // Story 37.1 (Task 4 — GO/NO-GO fixture capture): opt-in raw PTY frame dump. The
+        // interactive claude PTY cannot be reproduced in a dev shell (no Windows console —
+        // a constraint documented throughout Epic 32.x), so the real v2.1.162 frames that
+        // become regression fixtures are collected from the owner's live CLI chat. Gated by
+        // HAMMOC_CLI_PTY_DUMP (OFF by default — same opt-in shape as HAMMOC_CLI_DEBUG); the
+        // raw bytes (ANSI intact) are appended to a gitignored logs/cli-pty-dump/*.log.
+        // Best-effort — instrumentation must never break a turn.
+        let ptyDumpStream = null;
+        if (process.env.HAMMOC_CLI_PTY_DUMP) {
+            try {
+                const dumpDir = path.join(process.cwd(), 'logs', 'cli-pty-dump');
+                mkdirSync(dumpDir, { recursive: true });
+                const dumpSid = resumeId ?? options.sessionId ?? 'new';
+                const dumpFile = path.join(dumpDir, `${dumpSid}-${Date.now()}.log`);
+                ptyDumpStream = createWriteStream(dumpFile, { encoding: 'utf8' });
+                log.info(`[CLI-PTY-DUMP] raw frame capture → ${dumpFile}`);
+            }
+            catch (e) {
+                log.warn(`[CLI-PTY-DUMP] setup failed: ${e instanceof Error ? e.message : String(e)}`);
+            }
+        }
+        // HAMMOC_CLI_TOOL_TRACE (OFF by default): a structured trace of the parser's tool-completion decisions
+        // — per-frame card parse + scroll-up depth, green flips, maybeFinalize slot mapping, the file backstop,
+        // and a turn-end completion matrix — to a gitignored logs/cli-tool-trace/*.log. Best-effort.
+        let toolTraceStream = null;
+        // Activate when EITHER its own flag OR the PTY-dump flag is set — so when only HAMMOC_CLI_PTY_DUMP can
+        // be toggled (already on), the tool-completion trace rides along with no extra env. (Temporary debug
+        // convenience; both are gitignored *.log and OFF in normal runs.)
+        if (process.env.HAMMOC_CLI_TOOL_TRACE || process.env.HAMMOC_CLI_PTY_DUMP) {
+            try {
+                const traceDir = path.join(process.cwd(), 'logs', 'cli-tool-trace');
+                mkdirSync(traceDir, { recursive: true });
+                const traceSid = resumeId ?? options.sessionId ?? 'new';
+                toolTraceStream = createWriteStream(path.join(traceDir, `${traceSid}-${Date.now()}.log`), { encoding: 'utf8' });
+                log.info(`[CLI-TOOL-TRACE] → ${traceDir}/${traceSid}-*.log`);
+            }
+            catch (e) {
+                log.warn(`[CLI-TOOL-TRACE] setup failed: ${e instanceof Error ? e.message : String(e)}`);
+            }
+        }
+        const trace = (msg) => {
+            if (toolTraceStream) {
+                try {
+                    toolTraceStream.write(`${msg}\n`);
+                }
+                catch { /* best-effort */ }
+            }
+        };
+        // Unified CLI decision log — always-on, per-turn session file.
+        const dlog = new CliDebugLog(resumeId ?? options.sessionId ?? 'new');
+        this.currentDebugLog?.close();
+        this.currentDebugLog = dlog;
+        // Story 36.2: report the pre-generation phase so the UI shows progress through the
+        // ~3s boot/inject window instead of a frozen spinner. launching → (❯ seen) submitting
+        // → (Enter sent) waiting → (first block) null, handing off to onGenerationProgress.
+        onPhase?.('launching');
+        return new Promise((resolve, reject) => {
+            let settled = false;
+            // Story 37.8: full-screen mirror frame pacing. The headless screen model already holds
+            // the current screen (fed every frame for detection); serialize() turns it into a color-
+            // preserving frame the client renders as-is. The spinner repaints many times a second, so
+            // coalesce to ~100ms (trailing edge keeps the latest). `onScreenFrame` is undefined when
+            // the mirror pref is OFF or on the queue path → schedule is skipped upstream, so this
+            // callback runs only for ON sessions. The cache is refreshed in lockstep so a mid-turn
+            // late-join / refresh / collapse-expand restores the CURRENT screen. The settled-guard
+            // drops a stray trailing timer that fires after finish/abort (teardown sends the final
+            // frame directly, bypassing this guard).
+            let lastSentFrame = null;
+            const frameThrottle = createTrailingThrottle(screenFrameThrottleMs ?? CLI_SCREEN_FRAME_THROTTLE_DEFAULT_MS, (frame) => {
+                if (settled)
+                    return;
+                onScreenFrame?.(frame);
+                if (resolvedSessionId) {
+                    try {
+                        setCliScreen(resolvedSessionId, frame);
+                    }
+                    catch {
+                        /* ignore — cache refresh best-effort */
+                    }
+                }
+            });
+            let pollTimer = null;
+            let dirWatcher = null;
+            let fileWatcher = null;
+            let sessionInitEmitted = false;
+            let draining = false;
+            let accumulatedText = '';
+            let lastUsage;
+            let lastAssistantUuid = '';
+            // Prompt-injection state (see CLI_* constants).
+            let injected = false;
+            let bootBuffer = ''; // accumulated boot output, scanned for the box marker (pre-injection only)
+            let bootSettleTimer = null;
+            let bootFallbackTimer = null;
+            let bootRecoverTimer = null; // Story 37.6: post-Esc re-classify timer
+            let choiceMenuHandled = false; // Story 37.6 follow-up: one-shot handoff of a drivable confirm menu (resume prompt)
+            let submitTimer = null;
+            // Permission-dialog state (Story 32.6 — post-injection only). Story 37.4: detection reads
+            // the settled screen grid (no rolling buffer); `permissionPending` is the per-modal re-fire
+            // guard that the old buffer-clear consume used to provide.
+            let permissionPending = false; // guards re-entry while awaiting the user's decision
+            let permCounter = 0; // synthesizes a toolUseID (the real id is not in JSONL pre-approval)
+            // Live tool-card state (Story 32.9 — post-injection only).
+            // FIFO count of permission-gated tools whose live tool_use emit must be SUPPRESSED:
+            // each detected 32.6 dialog already shows a standalone permission card (synthetic
+            // `cli-perm-N`), so emitting a second card under the real `toolu_…` id would split it
+            // (the two id namespaces never match — Task 1). Incremented at dialog detection,
+            // decremented per tool_use block; the invariant "#suppressed == #permission cards" means
+            // a permission-gated tool can never produce a duplicate live card. Auto-approved/safe
+            // tools (count 0) emit live. The suppressed tool still renders on reload (no loss).
+            let permissionGatedToolsPending = 0;
+            // tool_use ids emitted live this turn (gates which tool_results to mirror live — a
+            // suppressed tool is absent here, so its result is left to reload too, no orphan).
+            const liveEmittedToolIds = new Set();
+            // tool_use ids whose tool_result was already emitted (the drain re-parses the whole
+            // file as it grows; this dedups so a result is mirrored exactly once).
+            const resultEmittedToolIds = new Set();
+            // Story 37.9: provisional-body emit (the "[본문, 선택지]" ordering fix). An input-waiting
+            // tool_use (AskUserQuestion / a permission-gated tool) lands in the JSONL only AFTER the
+            // user answers, so at modal time the lead-in prose is on SCREEN but not in the file — the
+            // file-only catchUpJSONL can't recover it and the choice card jumps ahead of its own body.
+            // We scrape that prose off the grid and emit it as a PROVISIONAL live text chunk before the
+            // choice card. This FIFO counts those provisional emits; when the drain later meets the
+            // matching canonical assistant block (the one carrying the modal tool_use), it SUPPRESSES that
+            // block's live text re-emit (arrival-order slot — AC3 primary key) so the provisional isn't
+            // double-rendered. accumulatedText still accrues the canonical text, and the turn-end
+            // stream:complete-messages reload swaps the provisional for the authoritative copy
+            // (completeness). Mirrors the permissionGatedToolsPending suppression pattern above.
+            let provisionalBodyEmitsPending = 0;
+            let provisionalBodyCounter = 0; // synthesizes a messageId for each provisional chunk
+            // Story 37.10: live grid-card emit (thinking + tool cards, NO modal trigger). The interactive
+            // claude TUI paints thinking (`Thought for Ns`) and tool (`● Tool(…)` / `⎿ result`) cards on
+            // screen the moment they happen, while the session JSONL only gains the matching block later (and
+            // for thinking, often EMPTY — signature only). We scrape those cards off the settled grid and
+            // emit them PROVISIONALLY through the same onThinking / onToolUse / onToolResult callbacks the
+            // JSONL drain uses, then reconcile by ARRIVAL-ORDER SLOT so neither source double-renders.
+            //
+            // thinking: `liveThinkingSlots` = thinking cards already emitted live this turn (grid OR drain);
+            // the grid only emits a slot it hasn't reached. `provisionalThinkingEmitsPending` is the FIFO of
+            // grid thinkings awaiting their canonical block — the drain decrements it per thinking block
+            // (empty OR not) so an EMPTY canonical (AC1) just CONSUMES the slot (provisional stands as the
+            // sole live copy — nothing to replace) while a populated one SUPPRESSES the drain's re-emit (the
+            // turn-end reload replaces the provisional with the raw thinking).
+            let liveThinkingSlots = 0;
+            let provisionalThinkingEmitsPending = 0;
+            // tool: `liveToolSlots` = tool cards already emitted live (grid OR drain). A grid tool card has no
+            // canonical `toolu_…` id (the screen truncates the input too), so it rides a SLOT-STABLE synthetic
+            // id (`cli-prov-tool-N`, a namespace the real `toolu_…` can never collide with — same trick as the
+            // permission card's `cli-perm-N`). `provToolSlotIds[slot]` holds that id so a later `⎿` result card
+            // can flip the SAME card running→complete via onToolResult (the 32.9 onToolUse(pending)→onToolResult
+            // contract). `provisionalToolEmitsPending` is the FIFO the drain decrements to SUPPRESS the matching
+            // canonical tool_use's live re-emit (checked AFTER permissionGatedToolsPending; reload replaces).
+            let liveToolSlots = 0;
+            let provisionalToolEmitsPending = 0;
+            const provToolSlotIds = [];
+            const gridResultFlippedSlots = new Set();
+            // Story 37.16 (scroll-off backstop): real `toolu_…` id → its provisional slot index, recorded when a
+            // grid tool is finalized (drain FIFO matches the provToolSlotIds emit order). Lets emitToolResults
+            // complete a provisional tool via its SYNTHETIC id (the client card kept it) when the grid never saw the
+            // green frame — i.e. a long answer scrolled the still-running tool above the viewport.
+            const provRealIdToSlot = new Map();
+            // Story 37.19 (확정 via HAMMOC_CLI_TOOL_TRACE — `finalize-tool → provSlot=0 (synthId=?)` then `backstop
+            // SKIP … noSynth=true`): the backstop must map a tool to the SLOT its screen card ACTUALLY got
+            // (`liveToolSlots`, already advanced by the resume-snapshot / earlier tools), NOT a fresh 0-based counter
+            // — else `provToolSlotIds[provSlot]` is empty and the backstop can't fire. FIFO queue of the real slots,
+            // in screen-emit order; the drain shifts one per finalized tool (kept in lockstep with the pending count).
+            const provPendingToolSlots = [];
+            // Story 37.19: only emit a `frame` trace line when the parsed-card summary CHANGES — skips the
+            // spinner-repaint duplicates that bloated the trace to ~300KB/turn (tool decisions + matrix still log
+            // every time).
+            let lastTraceFrameSig = '';
+            // Story 37.11 (AC1): general streaming TEXT is now also a live grid card (the 4th kind 37.10
+            // skipped). It rides the SAME provisional/suppress contract as thinking/tool: the grid emits
+            // the text card provisionally and `handleAssistantLine` SUPPRESSES the matching canonical text
+            // re-emit (the turn-end reload replaces). `liveTextSlots` is the cross-source high-water (grid
+            // OR drain), `provisionalTextEmitsPending` the FIFO the drain decrements. This unifies the
+            // 37.9 modal lead-in (`emitProvisionalBody`) onto one text counter — its provisional prose now
+            // rides the same FIFO, so a bare-modal still behaves as before. → the drain stops UNCONDITIONAL
+            // live text emit (race source); the screen is the single live source, the file the backstop.
+            let liveTextSlots = 0;
+            let provisionalTextEmitsPending = 0;
+            let provisionalCardCounter = 0; // synthesizes a messageId for each provisional grid text chunk
+            const fifoSnap = () => ({ thinkP: provisionalThinkingEmitsPending, toolP: provisionalToolEmitsPending, textP: provisionalTextEmitsPending, bodyP: provisionalBodyEmitsPending, thinkS: liveThinkingSlots, toolS: liveToolSlots, textS: liveTextSlots });
+            // Story 37.11 (content-set dedup): the ordered list of cards the GRID has already EMITTED this turn,
+            // each with its per-kind `slot` (the synthetic-id index for tools / the cross-source high-water for
+            // thinking/text). The live scraper keys on the card's content SIGNATURE, not its viewport position —
+            // 실측 2026-06-16 the real screen INSERTS a lead-in prose card BETWEEN already-shown cards and MUTATES
+            // a card (`● Read` → `● Read(path)`), so a position/suffix align re-emitted the whole sequence every
+            // frame (the duplicate-parse storm). A sig already here is skipped; a sig that EXTENDS one of these
+            // (same kind) is a growth (emit only the delta). Holds STABLE kinds only (text/thinking/tool) — `⎿`
+            // result cards mutate frame-to-frame and flip the preceding tool instead.
+            const heldCards = [];
+            // Story 37.12 (flickered-bullet stickiness): cross-frame memory of tool-header lines seen WITH their
+            // `●` glyph, so a later frame that catches the bullet mid-repaint (glyph momentarily erased) restores
+            // it instead of fusing the tool row into the prose above. Scoped to on-screen lines each frame.
+            const recentToolHeaderKeys = new Set();
+            // The content signature: kind + whitespace-normalized text — the dedup key (order-independent).
+            const cardSig = (c) => `${c.kind}:${c.text.replace(/\s+/g, ' ').trim().toLowerCase()}`;
+            // AskUserQuestion-modal state (Story 32.8 — post-injection only). Story 37.4: detection
+            // reads the settled grid; `questionPending` is the per-modal re-fire guard (replacing the
+            // old buffer-clear consume), held across the settle timer + the round-trip.
+            let questionPending = false; // guards re-entry while awaiting the user's answer
+            let questionSettleTimer = null; // modal paint settle
+            // questionCounter lives on the engine instance (not per-turn) so IDs are unique across
+            // turns within the same session — the client's seenPermissionIds persists for the session.
+            // Usage-limit notice state (POST-INJECTION only — see the onData handler). The limit shows
+            // only on the PTY, never in the JSONL, so without detection the turn would hang waiting for
+            // an end_turn that never arrives. Detection is deferred until after prompt injection so the
+            // resumed-transcript repaint (which may merely *quote* the banner) cannot false-trigger it.
+            // Story 37.4: read from the settled grid; a refuted scrape is simply ignored every frame
+            // (idempotent) and logged once — no buffer to clear.
+            let limitFalsePositiveLogged = false; // log a refuted (usage-contradicted) scrape once per turn
+            let lastIsGenerating = false; // tracks isGeneratingGrid transitions for debug logging
+            // Generation-progress state (Story 32.7 — post-injection only; token source = screen grid, 37.2).
+            let lastProgressTokens = -1; // last emitted token count; -1 = none yet (a real 0 still emits once)
+            let lastProgressElapsed = -1; // last emitted elapsed seconds. Gate on EITHER tokens OR time changing —
+            // the spinner's clock ticks every second even while the token count is momentarily flat, so a
+            // tokens-only gate froze the time between token changes.
+            // Story 36.2: the phase indicator ends once generation actually starts (first
+            // progress counter). Idempotent — only the first call emits the null hand-off.
+            let phaseCleared = false;
+            const clearPhase = () => {
+                if (phaseCleared)
+                    return;
+                phaseCleared = true;
+                onPhase?.(null);
+            };
+            // Story 37.5: publish the live control surface for THIS turn. Created here (inside the turn
+            // closure) so its getters capture the turn-local `settled` / `permissionPending` /
+            // `questionPending` that the instance method `setPermissionMode` cannot reach directly
+            // (out-of-scope). `writeKey` reuses the modal-key `pty.write` path; `readSettledGrid` reuses
+            // the same flush→readGrid deterministic read the detectors use. Released on teardown (below).
+            this.activeCliControl = {
+                writeKey: (key) => pty.write(key),
+                readSettledGrid: async () => {
+                    await screen.flush();
+                    return screen.readGrid();
+                },
+                isAlive: () => !settled,
+                isModalPending: () => permissionPending || questionPending,
+            };
+            const teardown = () => {
+                if (pollTimer) {
+                    clearInterval(pollTimer);
+                    pollTimer = null;
+                }
+                if (bootSettleTimer) {
+                    clearTimeout(bootSettleTimer);
+                    bootSettleTimer = null;
+                }
+                if (bootFallbackTimer) {
+                    clearTimeout(bootFallbackTimer);
+                    bootFallbackTimer = null;
+                }
+                if (bootRecoverTimer) {
+                    clearTimeout(bootRecoverTimer);
+                    bootRecoverTimer = null;
+                }
+                if (submitTimer) {
+                    clearTimeout(submitTimer);
+                    submitTimer = null;
+                }
+                if (questionSettleTimer) {
+                    clearTimeout(questionSettleTimer);
+                    questionSettleTimer = null;
+                }
+                try {
+                    dirWatcher?.close();
+                }
+                catch {
+                    /* ignore */
+                }
+                try {
+                    fileWatcher?.close();
+                }
+                catch {
+                    /* ignore */
+                }
+                dirWatcher = null;
+                fileWatcher = null;
+                // Story 37.5: release the live control surface on the SAME single teardown path — once the
+                // turn is gone there is no live PTY to drive, so a later setPermissionMode falls back to
+                // store-only (next spawn `--permission-mode`). Set before screen.dispose so no closed loop
+                // can read a disposed grid.
+                this.activeCliControl = null;
+                // Story 37.8: end-of-turn screen succession. Stop the throttle timer (no stray trailing
+                // send after settle), then send the FINAL screen directly — serialize WITH color, push to
+                // live clients (bypassing the throttle's settled-guard, since this is the legitimate end-
+                // of-turn frame), and hand off to the session-lifetime cache so the next late-join /
+                // refresh / collapse-expand restores the final screen. turn-per-process means there is no
+                // emulator between turns, so this cached frame is the only "current screen" a late-join
+                // can receive. BEFORE screen.dispose() below (a disposed emulator can't be serialized —
+                // same ordering discipline as the activeCliControl release above). Best-effort: never
+                // break teardown.
+                frameThrottle.cancel();
+                try {
+                    const finalFrame = screen.serialize();
+                    onScreenFrame?.(finalFrame);
+                    if (resolvedSessionId)
+                        setCliScreen(resolvedSessionId, finalFrame);
+                }
+                catch {
+                    /* ignore — final-frame succession best-effort */
+                }
+                // Story 37.1: release the per-turn headless emulator on the SAME single teardown
+                // path (no new dispose route) — registerDisposer routes finish/fail/onAbort/onExit
+                // and server shutdown (destroyAll) all through here, so the screen model is freed
+                // alongside the timers/watchers on every exit.
+                try {
+                    screen.dispose();
+                }
+                catch {
+                    /* ignore — dispose best-effort */
+                }
+                // Story 37.1 (Task 4): close the opt-in fixture dump on the same teardown path.
+                try {
+                    ptyDumpStream?.end();
+                    ptyDumpStream = null;
+                    toolTraceStream?.end();
+                    toolTraceStream = null;
+                    dlog.close();
+                }
+                catch {
+                    /* ignore — dump best-effort */
+                }
+            };
+            // The pool owns PTY + watcher cleanup together (1 PTY : 1 watcher, §9-3):
+            // disposing the handle runs this teardown and kills the PTY in one place.
+            cliSessionPool.registerDisposer(handle, teardown);
+            const detachAbort = () => {
+                options.abortController?.signal.removeEventListener('abort', onAbort);
+            };
+            const finish = (response) => {
+                if (settled)
+                    return;
+                settled = true;
+                detachAbort();
+                cliSessionPool.dispose(handle);
+                callbacks.onComplete?.(response);
+                resolve(response);
+            };
+            const fail = (err) => {
+                if (settled)
+                    return;
+                settled = true;
+                detachAbort();
+                cliSessionPool.dispose(handle);
+                callbacks.onError?.(err);
+                reject(err);
+            };
+            function onAbort() {
+                if (settled)
+                    return;
+                settled = true;
+                detachAbort();
+                // Interrupt claude (Ctrl+C) then tear down PTY + watcher. No onError — abort
+                // is caller-initiated (timeout/stop); the caller's catch owns the UX, the
+                // same way an SDK abort surfaces as a thrown error upstream.
+                cliSessionPool.interrupt(handle);
+                cliSessionPool.dispose(handle);
+                reject(new Error('CLI engine request aborted'));
+            }
+            if (options.abortController) {
+                if (options.abortController.signal.aborted) {
+                    onAbort();
+                    return;
+                }
+                options.abortController.signal.addEventListener('abort', onAbort);
+            }
+            // Type the prompt, then submit Enter as a SEPARATE write (bracketed-paste safe
+            // — see CLI_*_MS). Guarded so abort/exit before it fires writes nothing.
+            const injectPrompt = () => {
+                if (injected || settled)
+                    return;
+                injected = true;
+                // Story 37.6: the pre-injection snapshot is now taken UPSTREAM by attemptInjectFromGrid (it
+                // holds the settled grid + classification). Injection is reached only on the verified
+                // `input-box` path, so there is no blind inject left to capture here.
+                onPhase?.('submitting'); // input box verified — typing the prompt now
+                // Story 37.11 (resume SNAPSHOT — 실측 2026-06-16, user dump): on a `--resume` turn claude
+                // repaints the ENTIRE prior conversation onto the screen BEFORE this turn generates. Without a
+                // baseline the live scraper re-emits that whole repaint as live-badged cards (the user saw the
+                // prior turn flood in). The input box is verified HERE with NO new content yet, so snapshot the
+                // on-screen cards (deep read of the full repaint) as the turn BASELINE: seed them into
+                // `heldCards` and advance the per-kind live slots, so the scraper treats them as already-known
+                // and emits ONLY content ADDED below them as the turn runs. A fresh (non-resume) turn shows no
+                // cards here → empty snapshot → no-op. Best-effort — never break the turn over instrumentation.
+                try {
+                    for (const c of parseGridCards(scrollbackBodyRows(screen.readGrid(CLI_RESUME_SNAPSHOT_ROWS)))) {
+                        if (c.kind === 'result')
+                            continue; // results mutate per frame — excluded from heldCards
+                        const slot = c.kind === 'thinking' ? liveThinkingSlots++ : c.kind === 'tool' ? liveToolSlots++ : liveTextSlots++;
+                        heldCards.push({ kind: c.kind, sig: cardSig(c), text: c.text, slot });
+                    }
+                }
+                catch {
+                    /* best-effort resume snapshot */
+                }
+                bootBuffer = ''; // done with readiness detection — release it
+                if (bootSettleTimer) {
+                    clearTimeout(bootSettleTimer);
+                    bootSettleTimer = null;
+                }
+                if (bootFallbackTimer) {
+                    clearTimeout(bootFallbackTimer);
+                    bootFallbackTimer = null;
+                }
+                if (bootRecoverTimer) {
+                    clearTimeout(bootRecoverTimer);
+                    bootRecoverTimer = null;
+                }
+                try {
+                    pty.write(promptToInject);
+                    submitTimer = setTimeout(() => {
+                        submitTimer = null;
+                        if (settled)
+                            return;
+                        try {
+                            pty.write('\r');
+                            onPhase?.('waiting'); // prompt submitted — awaiting the first response block
+                        }
+                        catch (err) {
+                            fail(err instanceof Error ? err : new Error(String(err)));
+                        }
+                    }, CLI_SUBMIT_GAP_MS);
+                }
+                catch (err) {
+                    fail(err instanceof Error ? err : new Error(String(err)));
+                }
+            };
+            /**
+             * Story 37.5 fix — align the on-screen permission mode to the user's button mode, THEN inject.
+             * The PTY is always spawned in bypass, so a fresh idle box starts at `bypass permissions on`;
+             * if the button mode differs, step the screen down to it first (reusing the live driver + its
+             * idle/generating + modal + step-ceiling guards), then inject. A button of bypass is already
+             * there ⇒ inject straight away. Runs BEFORE the prompt lands so the turn's first tool runs under
+             * the chosen mode. A drive that can't land (abnormal misread) still falls through to inject —
+             * the next spawn's `--permission-mode` is the backstop, same as the live driver's own ceiling.
+             */
+            const alignModeThenInject = async () => {
+                if (injected || settled)
+                    return;
+                const control = this.activeCliControl;
+                if (control && this.permissionMode !== 'bypassPermissions' && !this.permissionLoopRunning) {
+                    // Stop the boot settle/ceiling timers before the align await: a mid-align fallback would
+                    // otherwise re-enter, see the loop already running, and injectPrompt onto a half-aligned
+                    // screen. (driveBootChoiceMenu clears the same timers for the same reason.) Align always
+                    // ends in injectPrompt, so the boot ceiling is no longer the backstop once we start aligning.
+                    if (bootFallbackTimer) {
+                        clearTimeout(bootFallbackTimer);
+                        bootFallbackTimer = null;
+                    }
+                    if (bootSettleTimer) {
+                        clearTimeout(bootSettleTimer);
+                        bootSettleTimer = null;
+                    }
+                    if (bootRecoverTimer) {
+                        clearTimeout(bootRecoverTimer);
+                        bootRecoverTimer = null;
+                    }
+                    this.permissionLoopRunning = true;
+                    try {
+                        await this.drivePermissionModeToTarget(control);
+                    }
+                    finally {
+                        this.permissionLoopRunning = false;
+                    }
+                    if (injected || settled)
+                        return;
+                }
+                injectPrompt();
+            };
+            /**
+             * Story 37.6 — pre-injection screen classification gate. The `❯` readiness marker is a
+             * *shared* glyph (idle input box, selection-menu highlight, and permission dialog all paint
+             * it), so its presence is necessary but NOT sufficient to inject. Once boot output settles we
+             * read the SETTLED grid (37.1) and act on a 3-way verdict instead of blind-injecting:
+             *   - `input-box`  → inject (AC1, the only injecting path).
+             *   - `selection`  → never let an Enter hit the first option (AC2). A *recognized* menu is
+             *                    safe to cancel with Esc (32.8's deadlock-guard key) — try ONCE, then
+             *                    re-classify (AC4). No second key if Esc fails to recover.
+             *   - `unknown`    → press NO blind key (AC3); at the decisive checkpoint, end the turn with
+             *                    an explicit error and expose the screen.
+             * This replaces the old `bootBuffer.includes('❯')`→inject path that mis-injected an Enter into
+             * a resume-time selection menu's first option (e.g. `/compact`), losing the prompt (실측
+             * 2026-06-11). `screen.write(data)` runs unconditionally before the boot branch, so the
+             * settled grid is already readable here (the 37.1 foundation that makes this possible).
+             */
+            const snapshotPreInject = (grid, classification) => capturePreInjectScreen(resolvedSessionId, bootBuffer, grid, classification);
+            /** AC3 hard-fail: never blind-inject — expose the screen (snapshot path + grid text) and end the
+             *  turn with an explicit error so the operator can see what the pre-injection screen was. */
+            const failUnready = (reason, grid, classification) => {
+                if (injected || settled)
+                    return;
+                const snapPath = snapshotPreInject(grid, classification);
+                log.warn(`CLI boot: ${reason} — withholding injection (no blind key). Screen (${classification}):\n${grid.join('\n').trim()}`);
+                fail(new Error(`CLI boot aborted: ${reason}. The pre-injection screen was not a usable input box` +
+                    (snapPath ? ` (screen snapshot: ${snapPath})` : '') +
+                    '.'));
+            };
+            /**
+             * Decide from the SETTLED grid (flush first — absence-based signals must not read a half-drawn
+             * frame, 37.5 weak-signal discipline). Injection is GRID-GATED: only a verified idle input box
+             * injects; a confirm menu is driven; anything else (a still-painting resume repaint = 'unknown',
+             * or a non-drivable menu) simply WAITS — this is re-run by the settle timer + the boot poll until
+             * the box appears. It NEVER hard-aborts the turn: a resume repaint of a large transcript can take
+             * a while and "unknown" almost always means "not painted yet", so aborting was a false positive
+             * (surfaced to the user as a misleading "timeout"). A genuine freeze is covered by the soft
+             * screen-stall affordance (now fed during boot) + the user's Stop; a crashed REPL by pty.onExit.
+             * Async (`flush().then`), so `injected`/`settled` are re-checked at read time.
+             */
+            const attemptInjectFromGrid = () => {
+                if (injected || settled)
+                    return;
+                void screen.flush().then(() => {
+                    if (injected || settled)
+                        return;
+                    const grid = screen.readGrid();
+                    const classification = classifyPreInjectScreen(grid);
+                    if (process.env.HAMMOC_CLI_DEBUG)
+                        snapshotPreInject(grid, classification);
+                    if (classification === 'input-box') {
+                        void alignModeThenInject(); // AC1 — verified input box (align mode → inject)
+                        return;
+                    }
+                    if (classification === 'selection') {
+                        // Story 37.6 follow-up: a confirm-style choice menu (claude's resume "summary vs full
+                        // session" prompt) is DRIVABLE — hand it to the same web card the AskUserQuestion modal
+                        // uses, or auto-pick per cliResumeChoice, instead of blind-Esc (which cancelled the
+                        // resume and hung the turn — the root cause). One-shot so a mid-round-trip re-render does
+                        // not re-fire it; a non-confirm (truly unknown) menu still falls through to Esc recovery.
+                        const choiceMenu = parseConfirmChoiceMenu(grid);
+                        if (choiceMenu && !choiceMenuHandled) {
+                            choiceMenuHandled = true;
+                            void driveBootChoiceMenu(choiceMenu);
+                            return;
+                        }
+                        // Esc-cancel REMOVED (오너 지시 2026-06-12): the old "selection → Esc to recover" rule
+                        // closed claude's resume confirm menu mid-card (the boot stage Esc'd the very menu its own
+                        // card was showing — the "flash" the user saw; originally it also hung the turn outright).
+                        // Once a confirm menu is handed to the card (choiceMenuHandled), the boot stage must NOT
+                        // touch the screen — driveBootChoiceMenu owns it through to injection. A selection that is
+                        // NOT a drivable confirm menu presses no blind key and simply WAITS (the boot poll re-runs;
+                        // the box appears once it closes, or the user Stops) — no hard abort.
+                        return;
+                    }
+                    // classification === 'unknown' — blind keys forbidden, and we do NOT abort: on a resume this
+                    // is almost always a still-painting repaint. Wait (the boot poll + settle timer re-run until
+                    // the input box appears); a true freeze surfaces via the soft screen-stall affordance.
+                });
+            };
+            /**
+             * Story 37.6 follow-up: drive a boot-stage confirm choice menu (claude's resume "summary vs
+             * full session" prompt). cliResumeChoice='ask' (default) shows it via the SAME web card the
+             * AskUserQuestion modal uses and injects the user's pick; 'summary'/'full' auto-selects that
+             * option. Either way `buildQuestionKeys` maps the choice to menu keys (↓×index + Enter). After
+             * the keys land the menu closes and the input box appears, so we re-run the gate to inject the
+             * prompt (the boot ceiling still covers a missed settle). A non-drivable answer (no card
+             * channel, or an unmapped pick) Esc-cancels so the turn stays responsive instead of hanging.
+             */
+            const driveBootChoiceMenu = async (parsed) => {
+                const cancelToStayResponsive = () => {
+                    if (!settled) {
+                        try {
+                            pty.write(CLI_QUESTION_ESC_KEY);
+                        }
+                        catch {
+                            /* PTY may already be gone */
+                        }
+                    }
+                };
+                let answer;
+                if (this.cliResumeChoice === 'ask') {
+                    // The card is an open-ended user interaction with no boot deadline — clear the boot
+                    // fallback/settle timers so the ceiling can't fire mid-card and Esc-cancel the very menu
+                    // we're showing (an unanswered card is ended by the user's own abort). Injection is
+                    // re-attempted right after the chosen keys land.
+                    if (bootFallbackTimer) {
+                        clearTimeout(bootFallbackTimer);
+                        bootFallbackTimer = null;
+                    }
+                    if (bootSettleTimer) {
+                        clearTimeout(bootSettleTimer);
+                        bootSettleTimer = null;
+                    }
+                    if (bootRecoverTimer) {
+                        clearTimeout(bootRecoverTimer);
+                        bootRecoverTimer = null;
+                    }
+                    if (!canUseTool) {
+                        cancelToStayResponsive();
+                        return;
+                    }
+                    let result;
+                    try {
+                        const signal = options.abortController?.signal ?? new AbortController().signal;
+                        result = await canUseTool('AskUserQuestion', {
+                            questions: [
+                                { question: parsed.question, header: parsed.header, multiSelect: parsed.multiSelect, options: parsed.options },
+                            ],
+                        }, { signal, toolUseID: `cli-resume-choice-${resolvedSessionId ?? 'boot'}`, title: parsed.question });
+                    }
+                    catch {
+                        cancelToStayResponsive();
+                        return;
+                    }
+                    if (settled)
+                        return;
+                    const answers = result.behavior === 'allow' && result.updatedInput
+                        ? result.updatedInput.answers
+                        : undefined;
+                    answer = answers ? (answers[parsed.question] ?? Object.values(answers)[0]) : undefined;
+                }
+                else {
+                    // Auto-pick: 'summary' | 'full' → the matching option label (keyword, else position).
+                    answer = pickAutoResumeOption(parsed.options, this.cliResumeChoice);
+                }
+                const keys = buildQuestionKeys(parsed, answer);
+                if (!keys) {
+                    cancelToStayResponsive();
+                    return;
+                }
+                for (const key of keys) {
+                    if (settled)
+                        return;
+                    try {
+                        pty.write(key);
+                    }
+                    catch {
+                        return;
+                    }
+                    await new Promise((r) => setTimeout(r, CLI_QUESTION_KEY_GAP_MS));
+                }
+                // Menu answered → claude closes it and paints the input box. The boot timers are suppressed
+                // while choiceMenuHandled (nothing else can Esc or re-inject), so drive the injection here:
+                // poll for the input box and inject once it settles; never hang — error out if it never comes.
+                for (let i = 0; i < 30 && !settled && !injected; i++) {
+                    await new Promise((r) => setTimeout(r, 100));
+                    await screen.flush();
+                    if (isIdleInputGrid(screen.readGrid())) {
+                        await alignModeThenInject();
+                        return;
+                    }
+                }
+                if (!settled && !injected) {
+                    failUnready('input box did not appear after answering the resume menu', screen.readGrid(), 'unknown');
+                }
+            };
+            /**
+             * Story 37.9 (AC3/AC4): emit the assistant prose the TUI painted ABOVE an input-waiting modal
+             * as a PROVISIONAL live text chunk, so the body lands BEFORE the choice card ("[본문, 선택지]").
+             * `prose` is a screen scrape (parsePrecedingText / parsePrecedingPermissionText) with no JSONL
+             * uuid — claude writes the whole message only post-answer — so we ALSO claim one provisional
+             * slot: handleAssistantLine suppresses the matching canonical block's live text re-emit
+             * (arrival-order FIFO) so it isn't double-rendered, and the turn-end reload replaces the
+             * provisional with the canonical copy. No-op (and no slot claimed) when there is no lead-in
+             * prose, so a bare modal behaves exactly as before. The provisional rides the normal text-chunk
+             * path → the client presentation queue keeps arrival order (the choice card is enqueued after).
+             *
+             * Story 37.11: this now COEXISTS with the general grid text branch (`emitProvisionalCards`),
+             * which runs WHILE generating; this one runs once generation PAUSES for the modal. To avoid a
+             * double-emit when a generating-frame poll already scraped this same lead-in: (a) dedup also
+             * against the held transcript's text cards (the grid may have emitted it), and (b) advance
+             * `liveTextSlots` so the POST-answer grid re-scrape of this same card falls below the slot
+             * high-water and is skipped (the cross-source guard, parser-agnostic — no held push needed).
+             */
+            const emitProvisionalBody = (prose) => {
+                if (settled || !prose || !callbacks.onTextChunk || !resolvedSessionId)
+                    return;
+                const norm = (s) => s.replace(/\s+/g, '').toLowerCase();
+                const needle = norm(prose).slice(0, 40);
+                if (needle && norm(accumulatedText).includes(needle)) {
+                    dlog.server('prov-body-dedup', { reason: 'accumulatedText', preview: prose.slice(0, 60) });
+                    return;
+                }
+                if (needle && heldCards.some((h) => h.kind === 'text' && norm(h.sig).includes(needle))) {
+                    dlog.server('prov-body-dedup', { reason: 'heldCard-match', preview: prose.slice(0, 60) });
+                    return;
+                }
+                provisionalBodyEmitsPending++;
+                const bodySlot = liveTextSlots++;
+                heldCards.push({ kind: 'text', sig: cardSig({ kind: 'text', text: prose }), text: prose, slot: bodySlot });
+                dlog.server('prov-body-emit', { slot: bodySlot, len: prose.length, preview: prose.slice(0, 80) });
+                callbacks.onTextChunk({
+                    sessionId: resolvedSessionId,
+                    messageId: `cli-provisional-${++provisionalBodyCounter}`,
+                    content: prose,
+                    done: false,
+                    provisional: true,
+                });
+            };
+            /**
+             * Story 37.10 (AC1/AC2/AC3/AC4): emit the thinking + tool cards the TUI paints on screen LIVE,
+             * with no modal trigger — the general-streaming counterpart of `emitProvisionalBody`. Runs only
+             * mid-GENERATION (`isGeneratingGrid`): that gate keeps it OFF a paused modal frame, so a
+             * permission-gated tool card (which appears only once generation halts for approval) is never
+             * double-emitted against its 32.6 standalone card. Scrapes the SCROLLBACK BODY (above the live
+             * footer) with the single-source `parseGridCards`, then walks the cards in arrival order:
+             *   - thinking → onThinking (a NEW slot only). The drain reconciles by FIFO: a populated
+             *     canonical SUPPRESSES the re-emit (reload replaces it); an EMPTY canonical (Opus 4.7+
+             *     signature-only) just consumes the slot so the provisional stands as the sole live copy (AC1).
+             *   - tool → onToolUse(status:'pending') under a slot-stable synthetic id `cli-prov-tool-N`
+             *     (AC4 — the screen has no `toolu_…`); the drain SUPPRESSES the matching canonical tool_use's
+             *     live re-emit (FIFO, after the permission-gated check) and the reload replaces it.
+             *   - result (`⎿`) → onToolResult on the preceding tool slot's synthetic id, flipping it
+             *     running→complete (32.9 onToolUse(pending)→onToolResult contract, reused) — but ONLY when
+             *     that tool's `●` bullet is GREEN. AC3 status comes from the bullet COLOR, not from `⎿`
+             *     presence: claude paints `⎿ Waiting…`/`⎿ Running…` under a still-running (gray-bullet) tool,
+             *     so "any `⎿` = done" would flip prematurely to "complete: Waiting…". Gray/unreadable stays
+             *     pending → reload supplies the result (safe degrade). `●` cards never carry text input on
+             *     screen, so the provisional tool card is name-only; the reload supplies the full input.
+             *   - text (Story 37.11/AC1) → onTextChunk(provisional) under a synthesized messageId. The 4th
+             *     kind 37.10 skipped: general streaming prose is now ALSO a live grid card, so ALL live
+             *     content comes from this ONE source (the drain no longer races it). The drain SUPPRESSES the
+             *     matching canonical text re-emit (FIFO) and the reload replaces it.
+             * Dedup (Story 37.11/AC2): the LOGICAL per-kind index of each visible card is derived from the
+             * scroll-stable `heldCards` transcript (suffix alignment), NOT the viewport position — so an old
+             * card scrolling off the viewport top no longer hides a new card below it. That logical index then
+             * feeds the unchanged cross-source slot checks (`liveThinkingSlots`/`liveToolSlots`/`liveTextSlots`,
+             * advanced by BOTH this scraper and the drain), so re-running every frame stays idempotent and the
+             * 37.10 invariants (perm-slot reservation, synthetic-id transition, green-only flip, empty-thinking
+             * preservation) are preserved. All grid emits are tagged PROVISIONAL (AC4). Viewport-bounded
+             * (real-time); the turn-end reload backfills anything that scrolled off (37.9 AC3 completeness).
+             */
+            const emitProvisionalCards = () => {
+                if (settled || !resolvedSessionId)
+                    return;
+                // Story 37.11 (the user's block-queue algorithm — bounded scroll-up): read the VIEWPORT first,
+                // then scroll UP in steps ONLY while NO already-known block (`heldCards`) is in view. This recovers
+                // the HEADER of a paragraph taller than the viewport, yet STOPS the instant the read reaches the
+                // first known block — so the depth is bounded to the NEW content, never re-scraping the whole
+                // scrolling history (a fixed deep read re-emitted endlessly: 실측 6,529 emits on a real resume turn).
+                // `heldCards` empty (a fresh turn's first frame) ⇒ viewport only. Story 37.10: read the bullet
+                // colors with the SAME window so they stay index-aligned with the rows.
+                const knownSigs = new Set(heldCards.map((h) => h.sig));
+                let depth = 0;
+                let prevRowCount = -1;
+                let bodyRows = [];
+                let bodyColors = [];
+                let cards = [];
+                for (let iter = 0; iter < CLI_SCROLLUP_MAX_ITERS; iter++) {
+                    bodyRows = scrollbackBodyRows(screen.readGrid(depth));
+                    if (bodyRows.length === prevRowCount)
+                        break; // reached the top of the buffer — nothing more above
+                    prevRowCount = bodyRows.length;
+                    bodyColors = screen.readBulletColors(depth).slice(0, bodyRows.length);
+                    // Story 37.12: restore the `●` on any tool header whose glyph flickered off THIS frame (caught
+                    // mid-repaint) BEFORE parsing, so it opens as its own tool card instead of fusing into the prose
+                    // above. Content-gated on the cross-frame memory, so prose is never promoted. Row count is
+                    // unchanged (glyph prepended), so `bodyColors` stays index-aligned.
+                    cards = parseGridCards(restoreFlickeredToolBullets(bodyRows, recentToolHeaderKeys), bodyColors);
+                    // Stop once a known block is in view: it is the bounded boundary — everything above it is known.
+                    if (knownSigs.size === 0 || cards.some((c) => knownSigs.has(cardSig(c))))
+                        break;
+                    depth += CLI_SCROLLUP_INCREMENT; // no known block yet (a tall block's header is still above) — climb
+                }
+                const traceFrameSig = `depth=${depth} rows=${bodyRows.length} cards=[${cards.map((c) => `${c.kind}:${c.toolName ?? ''}:${c.bulletColor ?? '-'}`).join(', ')}]`;
+                if (traceFrameSig !== lastTraceFrameSig) {
+                    trace(`frame ${traceFrameSig}`);
+                    lastTraceFrameSig = traceFrameSig;
+                    dlog.server('grid-frame', {
+                        scrollDepth: depth,
+                        rowCount: bodyRows.length,
+                        scrolledUp: depth > 0,
+                        cards: cards.map((c) => ({ kind: c.kind, tool: c.toolName, color: c.bulletColor, textLen: c.text.length, preview: c.text.slice(0, 50) })),
+                    });
+                }
+                // Story 37.12: refresh the cross-frame tool-header memory from the FINAL (deepest) frame read.
+                // First drop keys whose line scrolled off — retention is scoped to on-screen text INCLUDING
+                // bullet-less rows, so a tool whose glyph is currently flickering stays remembered while a tool that
+                // truly scrolled away is forgotten (can't re-promote unrelated prose later). Then add this frame's
+                // glyph-carrying tool headers — the confident observations worth remembering.
+                const onScreenToolKeys = collectToolHeaderKeys(bodyRows, true);
+                for (const key of [...recentToolHeaderKeys]) {
+                    if (!onScreenToolKeys.has(key))
+                        recentToolHeaderKeys.delete(key);
+                }
+                for (const key of collectToolHeaderKeys(bodyRows, false))
+                    recentToolHeaderKeys.add(key);
+                // CONTENT-SET dedup (replaces the position/suffix align that re-emitted the whole sequence the
+                // moment a card was inserted mid-list or mutated). Walk the visible cards; for each STABLE card:
+                //   - matches an already-emitted card of the SAME content → skip (or growth: emit the delta);
+                //   - identical-content cards (e.g. the same tool called twice) match 1:1 IN ORDER — the FIRST
+                //     unclaimed held card wins, so they are NOT merged (content is the key; order breaks the tie);
+                //   - no match → a genuinely new card → emit + record with its per-kind slot.
+                // Matching by CONTENT (not viewport position) survives the real screen's reorders: a lead-in prose
+                // card inserted ABOVE a still-running tool, a card mutating, scroll, repaint. A `⎿` result flips its
+                // preceding tool. (The old position/suffix align re-emitted the whole list when a card was inserted
+                // mid-sequence — 실측 the duplicate-parse storm.)
+                const usedHeld = new Set(); // held indices already claimed by a visible card THIS frame
+                let lastToolSlot = -1; // the tool slot a following `⎿` result card belongs to
+                let lastToolColor;
+                // Story 37.13: a tool's GREEN bullet means DONE — flip running→complete on the COLOR, NOT on a `⎿`
+                // result row appearing. The `⎿` row (when present in THIS frame, the very next card) only supplies the
+                // output; if it scrolled off we still mark complete (the turn-end reload fills the canonical output).
+                // Fixes "tool spins forever though the mirror shows a green/done bullet" — the completion row scrolls
+                // out of the viewport but the color is enough.
+                const flipDoneIfGreen = (slot, bulletColor, cardIdx) => {
+                    if (bulletColor !== 'green' || slot < 0 || gridResultFlippedSlots.has(slot))
+                        return;
+                    const sid = provToolSlotIds[slot];
+                    if (!sid)
+                        return;
+                    const next = cards[cardIdx + 1];
+                    const output = next && next.kind === 'result' && next.text.trim() ? next.text : '';
+                    gridResultFlippedSlots.add(slot);
+                    trace(`flip-green slot=${slot} sid=${sid} (screen green → done)`);
+                    dlog.server('grid-tool-green-flip', { slot, sid, hasOutput: !!output });
+                    callbacks.onToolResult?.(sid, { success: true, output }, true);
+                };
+                for (let cardIdx = 0; cardIdx < cards.length; cardIdx++) {
+                    const card = cards[cardIdx];
+                    if (card.kind === 'result') {
+                        // Flip the preceding tool running→complete ONLY when its `●` bullet is GREEN (done). claude
+                        // paints `⎿ Waiting…`/`⎿ Running…` under a still-running gray-bullet tool; those are NOT the
+                        // result (flipping shows a premature "complete: Waiting…"). Gray/unreadable stays pending →
+                        // the turn-end reload supplies the canonical result. Only a grid-provisioned slot.
+                        const sid = lastToolSlot >= 0 ? provToolSlotIds[lastToolSlot] : undefined;
+                        if (sid && !gridResultFlippedSlots.has(lastToolSlot) && lastToolColor === 'green' && card.text.trim()) {
+                            gridResultFlippedSlots.add(lastToolSlot);
+                            callbacks.onToolResult?.(sid, { success: true, output: card.text }, true);
+                        }
+                        continue;
+                    }
+                    const sig = cardSig(card);
+                    let matchIdx = -1;
+                    let growthDelta = null;
+                    const supersededDone = [];
+                    let dedupSkipReasons;
+                    for (let i = 0; i < heldCards.length; i++) {
+                        const h = heldCards[i];
+                        if (usedHeld.has(i)) {
+                            dedupSkipReasons ??= [];
+                            dedupSkipReasons.push({ idx: i, reason: 'usedHeld' });
+                            continue;
+                        }
+                        if (h.retired) {
+                            dedupSkipReasons ??= [];
+                            dedupSkipReasons.push({ idx: i, reason: 'retired' });
+                            continue;
+                        }
+                        if (h.sig !== sig && h.baseSig !== sig)
+                            continue; // neither current nor pre-growth sig matches
+                        if (card.kind === 'tool' && h.seenGreen && card.bulletColor !== 'green') {
+                            supersededDone.push(i);
+                            continue;
+                        }
+                        matchIdx = i;
+                        break;
+                    }
+                    if (matchIdx < 0) {
+                        for (let i = 0; i < heldCards.length; i++) {
+                            const h = heldCards[i];
+                            if (!usedHeld.has(i) && !h.retired && h.kind === card.kind && card.text.startsWith(h.text) && card.text.length > h.text.length) {
+                                matchIdx = i;
+                                growthDelta = card.text.slice(h.text.length);
+                                break;
+                            }
+                        }
+                    }
+                    // Log dedup miss: no match found → about to emit as new card. Capture why held candidates (same sig) were skipped.
+                    if (matchIdx < 0 && (card.kind === 'text' || card.kind === 'thinking')) {
+                        const sameSigHeld = heldCards.map((h, i) => h.sig === sig ? { idx: i, slot: h.slot, retired: !!h.retired, usedThisFrame: usedHeld.has(i), kind: h.kind } : null).filter(Boolean);
+                        if (sameSigHeld.length > 0) {
+                            dlog.server('grid-dedup-miss', { sig: sig.slice(0, 60), sameSigHeld, skipReasons: dedupSkipReasons });
+                        }
+                    }
+                    if (matchIdx >= 0) {
+                        usedHeld.add(matchIdx);
+                        const h = heldCards[matchIdx];
+                        if (growthDelta !== null) {
+                            if (!h.baseSig)
+                                h.baseSig = h.sig;
+                            h.sig = sig;
+                            h.text = card.text;
+                            if (growthDelta.trim()) {
+                                dlog.server('grid-card-growth', { kind: h.kind, slot: h.slot, deltaLen: growthDelta.length });
+                                if (h.kind === 'thinking')
+                                    callbacks.onThinking?.(growthDelta, true);
+                                else if (h.kind === 'text')
+                                    callbacks.onTextChunk?.({ sessionId: resolvedSessionId, messageId: `cli-prov-text-${provisionalCardCounter}`, content: growthDelta, done: false, provisional: true });
+                            }
+                        }
+                        else {
+                            if (h.baseSig === sig && h.sig !== sig) {
+                                // Matched via baseSig: card shrank back after a flicker-growth — restore sig
+                                h.sig = sig;
+                                h.text = card.text;
+                                h.baseSig = undefined;
+                                dlog.server('grid-card-shrink', { kind: h.kind, slot: h.slot });
+                            }
+                            else {
+                                // Exact sig match: growth episode (if any) is over — clear baseSig
+                                if (h.baseSig)
+                                    h.baseSig = undefined;
+                                dlog.server('grid-card-seen', { kind: h.kind, slot: h.slot });
+                            }
+                        }
+                        if (h.kind === 'tool') {
+                            lastToolSlot = h.slot;
+                            lastToolColor = card.bulletColor;
+                            if (card.bulletColor === 'green')
+                                h.seenGreen = true;
+                            flipDoneIfGreen(h.slot, card.bulletColor, cardIdx);
+                        }
+                        continue;
+                    }
+                    // Story 37.18 (repaint-echo dedup): a non-green tool whose sig was ALREADY claimed THIS frame by a
+                    // still-running (non-green) held card is a REPAINT of the same running tool on another scrollback row
+                    // (claude redraws a running tool — 실측 ba310cea: identical gray `● Bash(…)` on rows 231 & 242), NOT a
+                    // 2nd invocation. Skip it: a duplicate card would also leak a provisionalToolEmitsPending that the
+                    // file's single tool_use can't finalize, leaving the leftover badged (the user's "교체 안 됨"). A REAL
+                    // 2nd run shows the color transition (green held → gray card) and is opened via supersededDone below.
+                    if (card.kind === 'tool' && card.bulletColor !== 'green'
+                        && heldCards.some((h, idx) => usedHeld.has(idx) && !h.retired && h.sig === sig && !h.seenGreen)) {
+                        dlog.server('grid-card-skip', { kind: 'tool', reason: 'repaint-echo', sig: sig.slice(0, 60) });
+                        continue;
+                    }
+                    // genuinely NEW card
+                    for (const idx of supersededDone)
+                        heldCards[idx].retired = true;
+                    if ((card.kind === 'thinking' || card.kind === 'text') && !card.text.trim()) {
+                        dlog.server('grid-card-skip', { kind: card.kind, reason: 'empty' });
+                        continue;
+                    }
+                    const newIdx = heldCards.length;
+                    if (card.kind === 'thinking') {
+                        const slot = liveThinkingSlots++;
+                        heldCards.push({ kind: 'thinking', sig, text: card.text, slot });
+                        provisionalThinkingEmitsPending++;
+                        dlog.server('grid-emit-thinking', { slot, len: card.text.length, preview: card.text.slice(0, 80) });
+                        callbacks.onThinking?.(card.text, true);
+                    }
+                    else if (card.kind === 'tool') {
+                        const slot = liveToolSlots++;
+                        const synthId = `cli-prov-tool-${slot}`;
+                        provToolSlotIds[slot] = synthId;
+                        heldCards.push({ kind: 'tool', sig, text: card.text, slot, ...(card.bulletColor === 'green' ? { seenGreen: true } : {}) });
+                        provisionalToolEmitsPending++;
+                        provPendingToolSlots.push(slot); // Story 37.19: remember the REAL slot for the backstop mapping
+                        trace(`prov-emit-tool slot=${slot} sid=${synthId} name=${card.toolName ?? 'Tool'} green=${card.bulletColor === 'green'}`);
+                        dlog.server('grid-emit-tool', { slot, synthId, name: card.toolName ?? 'Tool', color: card.bulletColor });
+                        callbacks.onToolUse?.({
+                            id: synthId,
+                            name: card.toolName ?? 'Tool',
+                            input: {}, // the screen truncates the tool input — the finalize/reload supplies the full input
+                            status: 'pending',
+                            provisional: true,
+                        });
+                        lastToolSlot = slot;
+                        lastToolColor = card.bulletColor;
+                        flipDoneIfGreen(slot, card.bulletColor, cardIdx); // a tool already green on first sight = done
+                    }
+                    else if (card.kind === 'text') {
+                        const slot = liveTextSlots++;
+                        heldCards.push({ kind: 'text', sig, text: card.text, slot });
+                        provisionalTextEmitsPending++;
+                        dlog.server('grid-emit-text', { slot, len: card.text.length, preview: card.text.slice(0, 80) });
+                        callbacks.onTextChunk?.({ sessionId: resolvedSessionId, messageId: `cli-prov-text-${++provisionalCardCounter}`, content: card.text, done: false, provisional: true });
+                    }
+                    usedHeld.add(newIdx);
+                }
+            };
+            /**
+             * Permission round-trip (Story 32.6 — *constrained*). The dialog is detected
+             * from the PTY screen (no JSONL signal exists pre-approval). We reuse the
+             * **already-passed** `canUseTool` (same closure that drives SDK-mode web
+             * permissions — `websocket.ts` / `queueService.ts`) so the wire contract,
+             * client, and `@hammoc/shared` are unchanged: the engine only *calls* it and
+             * translates the verdict to a key. Honest constraints:
+             *   - Detection is ANSI-state-only (version-fragile) — no structured JSONL.
+             *   - `toolName`/`input` are best-effort scrapes; `toolUseID` is synthesized
+             *     (the real id is not in JSONL until after approval).
+             *   - `updatedInput` is unsupported — claude runs its own tool, so allow/deny
+             *     (a keypress) is the only channel (vs SDK mode rewriting tool input).
+             *   - `AskUserQuestion` (claude's own TUI question UI) is a *separate* modal,
+             *     handled by `handleQuestion` below (Story 32.8) — also *constrained*.
+             * Fired fire-and-forget from `onData`; guarded by `permissionPending` (no
+             * re-entry on dialog re-renders) and by `settled` (abort race — AC3 ②).
+             */
+            const handlePermission = (toolName, sentence, toolUseID) => {
+                void (async () => {
+                    let result;
+                    try {
+                        const signal = options.abortController?.signal ?? new AbortController().signal;
+                        result = await canUseTool(toolName, { prompt: sentence }, { signal, toolUseID, title: sentence });
+                    }
+                    catch (err) {
+                        log.warn(`canUseTool threw, denying: ${err instanceof Error ? err.message : String(err)}`);
+                        result = { behavior: 'deny', message: 'permission callback error' };
+                    }
+                    // Abort race (AC3 ②): if the turn ended/aborted while we awaited the user's
+                    // decision, the PTY is being torn down (onAbort sends Ctrl+C, which cancels
+                    // the dialog) — do nothing rather than write a stray key to a dead PTY.
+                    if (settled)
+                        return;
+                    try {
+                        pty.write(result.behavior === 'allow' ? CLI_PERMISSION_ALLOW_KEY : CLI_PERMISSION_DENY_KEY);
+                    }
+                    catch (err) {
+                        log.warn(`permission key injection failed: ${err instanceof Error ? err.message : String(err)}`);
+                    }
+                    // Allow a subsequent permission in the same turn to be detected afresh.
+                    permissionPending = false;
+                })();
+            };
+            /**
+             * AskUserQuestion round-trip (Story 32.8 — *constrained*; verified Task 1). The
+             * selection modal is detected from the PTY screen (no JSONL signal exists pre-answer,
+             * same as the permission dialog) and the question/options are scraped from it. We
+             * reuse the **already-passed** `canUseTool` — the SAME closure that drives SDK-mode
+             * web question cards (`websocket.ts` / `queueService.ts`, `interactionType:'question'`)
+             * — so the wire contract, client, and `@hammoc/shared` are unchanged: the engine only
+             * *calls* it with the scraped questions/options, then translates the returned
+             * `updatedInput.answers` into TUI menu keys (`buildQuestionKeys`). Honest constraints:
+             *   - Detection + the questions/options are ANSI scrapes (version-fragile, low fidelity).
+             *   - This handler drives the **single-question** modal; a multi-question (tabbed) modal is
+             *     routed to `handleMultiQuestion` (ISSUE-99) instead. An unparseable modal or an answer
+             *     that maps to no listed option (custom "Other") is **not driven** — the modal is
+             *     cancelled with **Esc** so the turn ends cleanly instead of hanging (AC4 deadlock guard;
+             *     the response-path is restored, never frozen).
+             *   - The wait no longer times out: Story 35.1 pauses the browser path's inactivity
+             *     timer for the whole input-wait, so even a static modal (which emits no PTY
+             *     frames) waits indefinitely — "respond when you can". The S-1 onRawMessage
+             *     heartbeat is now only a generation-activity signal, not what keeps the modal
+             *     alive; the deadlock guard below (Esc on any non-drivable case) is what still
+             *     ends the turn cleanly.
+             * Fired fire-and-forget from `onData` (after a paint settle); guarded by
+             * `questionPending` (no re-entry on modal re-renders) and by `settled` (abort race).
+             */
+            const handleQuestion = (parsed, toolUseID) => {
+                void (async () => {
+                    const cancel = (why) => {
+                        log.warn(`AskUserQuestion: ${why} — cancelling modal (Esc) to keep the turn responsive`);
+                        dlog.server('sq-cancel', { toolUseID, reason: why, settled });
+                        if (!settled) {
+                            try {
+                                pty.write(CLI_QUESTION_ESC_KEY);
+                            }
+                            catch {
+                                /* PTY may already be gone */
+                            }
+                        }
+                        questionPending = false;
+                    };
+                    dlog.server('sq-start', { toolUseID, parsed: parsed ? { question: parsed.question?.slice(0, 40), optionCount: parsed.options?.length, multiSelect: parsed.multiSelect } : null });
+                    if (!parsed) {
+                        cancel('modal not parseable as a single-question choice (or it is multi-question)');
+                        return;
+                    }
+                    let result;
+                    const input = {
+                        questions: [
+                            { question: parsed.question, header: parsed.header, multiSelect: parsed.multiSelect, options: parsed.options },
+                        ],
+                    };
+                    dlog.server('sq-canUseTool-call', { toolUseID, question: parsed.question?.slice(0, 40) });
+                    try {
+                        const signal = options.abortController?.signal ?? new AbortController().signal;
+                        result = await canUseTool('AskUserQuestion', input, {
+                            signal,
+                            toolUseID,
+                            title: parsed.question,
+                        });
+                    }
+                    catch (err) {
+                        cancel(`canUseTool threw (${err instanceof Error ? err.message : String(err)})`);
+                        return;
+                    }
+                    dlog.server('sq-canUseTool-resolved', { toolUseID, behavior: result.behavior, settled, hasAnswers: !!result.updatedInput });
+                    if (settled) {
+                        dlog.server('sq-abort-race', { toolUseID, reason: 'settled after canUseTool' });
+                        return;
+                    }
+                    const answers = result.behavior === 'allow' && result.updatedInput
+                        ? result.updatedInput.answers
+                        : undefined;
+                    const answer = answers ? (answers[parsed.question] ?? Object.values(answers)[0]) : undefined;
+                    const keys = buildQuestionKeys(parsed, answer);
+                    dlog.server('sq-keys-built', { toolUseID, answer: typeof answer === 'string' ? answer.slice(0, 30) : answer, keyCount: keys?.length ?? 0, keys: keys?.map(keyLabel) });
+                    if (!keys) {
+                        cancel('answer did not map to a listed option (custom/Other is not drivable)');
+                        return;
+                    }
+                    for (const key of keys) {
+                        if (settled) {
+                            dlog.server('sq-abort-race', { toolUseID, reason: 'settled during key drive' });
+                            return;
+                        }
+                        try {
+                            pty.write(key);
+                            dlog.server('sq-key-write', { toolUseID, key: keyLabel(key) });
+                        }
+                        catch (err) {
+                            dlog.server('sq-key-fail', { toolUseID, key: keyLabel(key), err: err instanceof Error ? err.message : String(err) });
+                            questionPending = false;
+                            return;
+                        }
+                        await new Promise((r) => setTimeout(r, CLI_QUESTION_KEY_GAP_MS));
+                    }
+                    dlog.server('sq-done', { toolUseID });
+                    questionPending = false;
+                })();
+            };
+            /**
+             * ISSUE-99 — AskUserQuestion **multi-question** round-trip. claude renders a multi-question
+             * modal as a TABBED box: one question's options are visible at a time, with a header tab bar
+             * (`←  ☐ Q1  ☐ Q2  ✔ Submit  →`) navigated left/right. The single-question path (32.8) cannot
+             * build a one-shot card from the first frame, so 32.8 Esc-cancelled these; this driver fills
+             * that gap by *interactively* reconstructing every question, presenting ONE multi-question web
+             * card (the client already supports it), then driving each answer back into the tab bar.
+             *
+             * Three phases, every one guarded by `settled` (abort race) + `questionPending` and falling
+             * back to a clean Esc-cancel on ANY anomaly — so the worst case is the prior behavior (a
+             * cancelled modal), never a corrupted session:
+             *   1. READ (non-destructive — only → is pressed): scrape tab 0 (already painted), then → to
+             *      each next tab and scrape it, verifying the question actually changed. Reuses the verified
+             *      single-question body scrape per tab; headers come positionally from the tab bar.
+             *   2. PRESENT: call the SAME `canUseTool('AskUserQuestion')` seam with ALL questions → the
+             *      existing multi-question card + indefinite wait (35.1). Client / `@hammoc/shared` = 0.
+             *   3. WRITE (grid-verified closed loop): return to tab 0 (← until the first question is back,
+             *      bounded), then for each tab drive its option keys (↓ / Space — `buildMultiQuestionKeys`),
+             *      → to the next tab (verifying the advance), and a final Enter on the Submit tab. A failed
+             *      verification or an unmappable answer Esc-cancels.
+             *
+             * Honest constraints (the same family 32.8 documented): detection + every scrape is ANSI/grid
+             * low-fidelity (version-fragile), and the single-select "highlight = recorded answer" commit is
+             * the one composed step not directly observed for the tabbed modal (owner live-verify gate —
+             * see `buildMultiQuestionKeys`). Fired fire-and-forget from the settle timer.
+             */
+            const handleMultiQuestion = (initialGrid, tabCount, toolUseID) => {
+                void (async () => {
+                    const cancel = (why) => {
+                        log.warn(`AskUserQuestion(multi): ${why} — cancelling modal (Esc) to keep the turn responsive`);
+                        if (!settled) {
+                            try {
+                                pty.write(CLI_QUESTION_ESC_KEY);
+                            }
+                            catch {
+                                /* PTY may already be gone */
+                            }
+                        }
+                        questionPending = false;
+                    };
+                    const settle = () => new Promise((r) => setTimeout(r, CLI_QUESTION_KEY_GAP_MS));
+                    const readSettled = async () => {
+                        await screen.flush();
+                        return screen.readGrid();
+                    };
+                    // ---- PHASE 1: READ — navigate tabs (→ only; non-destructive) scraping each question. ----
+                    const questions = [];
+                    let grid = initialGrid;
+                    for (let i = 0; i < tabCount; i++) {
+                        if (settled || !questionPending)
+                            return;
+                        let body = parseQuestionTabBody(grid);
+                        if (!body) {
+                            grid = await readSettled(); // one re-read in case the tab was mid-paint
+                            body = parseQuestionTabBody(grid);
+                        }
+                        if (!body) {
+                            cancel(`tab ${i + 1}/${tabCount} not parseable`);
+                            return;
+                        }
+                        const headers = parseQuestionTabHeaders(grid);
+                        questions.push({ question: body.question, header: headers[i], multiSelect: body.multiSelect, options: body.options });
+                        if (i < tabCount - 1) {
+                            pty.write(CLI_QUESTION_RIGHT_KEY); // → to the next question tab
+                            await settle();
+                            if (settled || !questionPending)
+                                return;
+                            grid = await readSettled();
+                            const next = parseQuestionTabBody(grid);
+                            // The tab must actually have advanced (the question text changed); if not, the nav model
+                            // is off — cancel rather than scrape the same tab twice / mis-map answers.
+                            if (!next || next.question === questions[i].question) {
+                                cancel(`tab ${i + 2}/${tabCount} did not advance`);
+                                return;
+                            }
+                        }
+                    }
+                    // We are now parked on the LAST tab (tabCount-1); the static modal emits no frames while we wait.
+                    // ---- PHASE 2: PRESENT — one multi-question card via the reused canUseTool seam. ----
+                    let result;
+                    const input = {
+                        questions: questions.map((q) => ({ question: q.question, header: q.header, multiSelect: q.multiSelect, options: q.options })),
+                    };
+                    try {
+                        const signal = options.abortController?.signal ?? new AbortController().signal;
+                        result = await canUseTool('AskUserQuestion', input, {
+                            signal,
+                            toolUseID,
+                            title: questions[0].question,
+                        });
+                    }
+                    catch (err) {
+                        cancel(`canUseTool threw (${err instanceof Error ? err.message : String(err)})`);
+                        return;
+                    }
+                    if (settled)
+                        return;
+                    const answers = result.behavior === 'allow' && result.updatedInput
+                        ? result.updatedInput.answers
+                        : undefined;
+                    const perQuestion = buildMultiQuestionKeys(questions, answers);
+                    dlog.server('mq-keys-built', {
+                        questionCount: questions.length,
+                        answers: answers ? Object.fromEntries(Object.entries(answers).map(([k, v]) => [k.slice(0, 30), v])) : null,
+                        perQuestion: perQuestion?.map((keys, i) => ({ tab: i, multiSelect: questions[i].multiSelect, keyCount: keys.length, keys: keys.map(keyLabel) })),
+                    });
+                    if (!perQuestion) {
+                        cancel('an answer did not map to a listed option (custom/Other is not drivable)');
+                        return;
+                    }
+                    // ---- PHASE 3: WRITE — return to tab 0, then answer each tab, advance, and submit. ----
+                    let atFirst = false;
+                    for (let attempt = 0; attempt <= tabCount + 2; attempt++) {
+                        if (settled || !questionPending)
+                            return;
+                        grid = await readSettled();
+                        const bodyQ = parseQuestionTabBody(grid)?.question;
+                        dlog.server('mq-return-tab0', { attempt, bodyQ: bodyQ?.slice(0, 40), target: questions[0].question.slice(0, 40), match: bodyQ === questions[0].question });
+                        if (bodyQ === questions[0].question) {
+                            atFirst = true;
+                            break;
+                        }
+                        pty.write(CLI_QUESTION_LEFT_KEY);
+                        await settle();
+                    }
+                    if (!atFirst) {
+                        cancel('could not return to the first question tab');
+                        return;
+                    }
+                    for (let i = 0; i < questions.length; i++) {
+                        dlog.server('mq-tab-drive-start', { tab: i, question: questions[i].question.slice(0, 40), multiSelect: questions[i].multiSelect, keyCount: perQuestion[i].length });
+                        for (const key of perQuestion[i]) {
+                            if (settled || !questionPending)
+                                return;
+                            try {
+                                pty.write(key);
+                                dlog.server('mq-key-write', { tab: i, key: keyLabel(key) });
+                            }
+                            catch (err) {
+                                dlog.server('mq-key-fail', { tab: i, key: keyLabel(key), err: err instanceof Error ? err.message : String(err) });
+                                questionPending = false;
+                                return;
+                            }
+                            await settle();
+                        }
+                        // Read the screen AFTER driving this tab's keys. Enter on a single-select tab
+                        // auto-advances to the next tab, so check whether we already moved before pressing →.
+                        const postGrid = await readSettled();
+                        const postBody = parseQuestionTabBody(postGrid);
+                        dlog.server('mq-tab-drive-done', { tab: i, postQuestion: postBody?.question?.slice(0, 40), postOptions: postBody?.options?.map(o => o.label) });
+                        if (settled || !questionPending)
+                            return;
+                        // Enter on single-select auto-advances. Detect: if the screen no longer shows THIS
+                        // tab's question, we already moved (to the next question or Submit). postBody=null
+                        // means the screen shows no question (e.g. Submit tab) — also counts as advanced.
+                        const alreadyAdvanced = postBody == null || postBody.question !== questions[i].question;
+                        if (alreadyAdvanced) {
+                            dlog.server('mq-tab-auto-advanced', { tab: i, skipRightKey: true });
+                        }
+                        else {
+                            dlog.server('mq-tab-advance', { tab: i, direction: '→' });
+                            pty.write(CLI_QUESTION_RIGHT_KEY);
+                            await settle();
+                        }
+                        if (i < questions.length - 1) {
+                            grid = await readSettled();
+                            const nextQ = parseQuestionTabBody(grid)?.question;
+                            dlog.server('mq-tab-verify', { tab: i + 1, expected: questions[i + 1].question.slice(0, 40), actual: nextQ?.slice(0, 40), match: nextQ === questions[i + 1].question });
+                            if (nextQ !== questions[i + 1].question) {
+                                cancel(`could not advance to tab ${i + 2}/${questions.length}`);
+                                return;
+                            }
+                        }
+                    }
+                    // Parked on the Submit tab now
+                    if (settled || !questionPending)
+                        return;
+                    dlog.server('mq-submit', { action: 'ENTER' });
+                    try {
+                        pty.write(CLI_QUESTION_ENTER_KEY);
+                    }
+                    catch {
+                        /* PTY may already be gone */
+                    }
+                    questionPending = false;
+                })();
+            };
+            /**
+             * Read the freshest "↓ N tokens" counter from the *settled screen grid* and emit
+             * it through `onGenerationProgress` — but only when the value *changed* (Story
+             * 32.7; data source moved to the grid in Story 37.2). The grid overwrites the
+             * spinner cell in place, so fusion is structurally impossible — no fusion-defense
+             * guards needed. Preserved:
+             *   - change-only throttle (not increase-only): Task 1 observed the counter
+             *     resetting at generation-segment boundaries (tool use → next API call:
+             *     614→79), so a reset is forwarded as just another change and the indicator
+             *     never freezes at the prior segment's peak;
+             *   - false-0 guard: a frame with no counter (e.g. a "Deliberating…" thinking-
+             *     phase spinner) reads as null → no emit;
+             *   - `settled` guard: this runs ASYNC after `flush()`, so settled is re-checked
+             *     HERE at emit time — no stray emit after finish/abort;
+             *   - `clearPhase`: the first counter ends the phase indicator (idempotent).
+             */
+            const emitProgressFromGrid = (grid) => {
+                if (settled || !onGenerationProgress)
+                    return; // async — re-check at emit time
+                const progress = readSpinnerProgress(grid);
+                if (!progress)
+                    return; // no counter row → don't emit a phantom 0
+                if (progress.tokens === lastProgressTokens && progress.elapsedSeconds === lastProgressElapsed)
+                    return; // change-only throttle (tokens OR elapsed)
+                lastProgressTokens = progress.tokens;
+                lastProgressElapsed = progress.elapsedSeconds;
+                clearPhase(); // spinner counter appeared → generation started; end the phase indicator
+                onGenerationProgress({
+                    tokens: progress.tokens,
+                    elapsedSeconds: progress.elapsedSeconds,
+                    ...(progress.thinking ? { thinking: true } : {}),
+                });
+            };
+            /**
+             * Story 37.8 + boot coverage: serialize the CURRENT screen (color intact) and pace it to the
+             * client through the trailing throttle, skipping an unchanged screen. Factored out of the
+             * post-injection consumer so the BOOT/resume phase can mirror its repaint too — which also feeds
+             * the soft screen-stall watchdog (driven by these frames), giving boot the same non-destructive
+             * "looks stuck?" coverage as generation. Best-effort; a serialize failure never breaks a turn.
+             */
+            const emitScreenFrame = () => {
+                if (!onScreenFrame)
+                    return;
+                try {
+                    const frame = screen.serialize();
+                    if (frame !== lastSentFrame) {
+                        lastSentFrame = frame;
+                        frameThrottle.schedule(frame);
+                    }
+                }
+                catch {
+                    /* serialize best-effort — never break a turn */
+                }
+            };
+            /**
+             * Story 37.4: ALL post-injection screen consumers (generation progress 32.7/37.2/37.3,
+             * usage limit, permission modal 32.6, question modal 32.8) read ONE settled grid per frame.
+             * `screen.write` is unconditional but async/buffered, so the onData handler schedules a single
+             * non-blocking `void screen.flush().then(consumeSettledGrid)`; this reads the settled grid once
+             * and runs every (independent) detector against it. Replaces the deleted linear `stripAnsiForDetect`
+             * + per-detector rolling buffers — the grid is the sole extraction path.
+             *
+             * Async, so `settled` is re-checked HERE (post finish/abort no stray work). The per-modal
+             * re-fire guard is now the `permissionPending` / `questionPending` flag (the old buffer-clear
+             * consume is impossible on a *living* screen — the modal stays visible every frame until the
+             * key is driven, so the flag, not an empty buffer, bounds it to one handling per modal).
+             */
+            const consumeSettledGrid = () => {
+                if (settled)
+                    return; // async — re-check at read time (no stray emit/detect after finish/abort)
+                const grid = screen.readGrid();
+                const text = grid.join('\n'); // = readScreenText(): line-spanning existence detectors
+                // (1) Generation progress (Story 32.7 / 37.2 token source / 37.3 elapsed). Gated on the
+                // callback (queue path omits it). The grid overwrites the spinner cell in place → no fusion.
+                if (onGenerationProgress)
+                    emitProgressFromGrid(grid);
+                // (1.5) Live thinking + tool cards (Story 37.10). ONLY mid-generation: `isGeneratingGrid` is the
+                // POSITIVE active-generation signal (spinner / "esc to interrupt"), which is absent the instant
+                // claude pauses to paint a permission/question modal — so this scraper never fires on a modal
+                // frame, and a permission-gated tool card (which only appears once generation halts) is left to
+                // its 32.6 standalone card. Auto-approved tools and thinking run WHILE the spinner spins, so they
+                // are scraped and emitted live; the JSONL drain reconciles by arrival-order slot (no double-render).
+                const nowGenerating = isGeneratingGrid(grid);
+                if (nowGenerating !== lastIsGenerating) {
+                    dlog.server('state-isGenerating', {
+                        from: lastIsGenerating,
+                        to: nowGenerating,
+                        questionPending,
+                        permissionPending,
+                        footer: liveFooterText(grid).slice(0, 200),
+                    });
+                    lastIsGenerating = nowGenerating;
+                }
+                if (nowGenerating) {
+                    // into `heldCards` at injection) + the bounded scroll-up that STOPS at the first known block —
+                    // not a position floor (markTurnStart), which couldn't exclude a repaint sitting IN the viewport
+                    // and blocked the scroll-up from reaching the snapshotted prior cards above it.
+                    emitProvisionalCards();
+                }
+                // (2) Usage-limit exhaustion (POST-INJECTION ONLY — this runs only because consumeSettledGrid
+                // is scheduled after injection). The "You've hit your weekly limit · resets …" notice lives
+                // ONLY on screen, never in the JSONL, so without detection the turn hangs waiting for an
+                // end_turn that never comes. Guards: the OAuth-usage corroboration (a real block sits at ~100%
+                // on some window; if every window has headroom the on-screen text is content, not a notice →
+                // ignore, log once), and the percentage-warning exclusion (inside detectUsageLimit). A refuted
+                // scrape stays on the living screen but is simply ignored every frame (idempotent) — no buffer
+                // to clear. Coded RATE_LIMIT_EXCEEDED so parseSDKError forwards the message verbatim and the
+                // resume-retry path skips it (no pointless respawn into the same wall).
+                //
+                // ★ Story 37.4 settled-gate decision (deliberate, not accidental): folding this into the shared
+                // post-flush block puts it behind the `if (settled) return` above — a usage limit is a signal to
+                // END the turn fast, but if the turn is already settled (finish/abort) there is no turn left to
+                // end, so detecting the limit then is meaningless. This implicit gate is adopted as harmless
+                // HARDENING (it prevents a stray post-settle fail), NOT a behavior regression; corroboration,
+                // POST-INJECTION scoping, and the once-log are all preserved.
+                const limitMsg = detectUsageLimit(text);
+                if (limitMsg) {
+                    if (rateLimitProbeService.isLimitCorroborated()) {
+                        fail(new SDKError(limitMsg, SDKErrorCode.RATE_LIMIT_EXCEEDED));
+                        return;
+                    }
+                    if (!limitFalsePositiveLogged) {
+                        limitFalsePositiveLogged = true;
+                        log.info('CLI: ignoring scraped usage-limit notice — real usage shows headroom (false positive): %s', limitMsg);
+                    }
+                }
+                // (2b) Transient rate-limit: a server-side throttle, DISTINCT from the weekly usage cap. Same
+                // screen-only problem (the notice is on the PTY, never the JSONL → the turn hangs on the spinner),
+                // but it's an explicit error string so no corroboration is needed — end the turn at once so the
+                // user can retry. Coded RATE_LIMIT_EXCEEDED like the usage limit (parseSDKError forwards it verbatim,
+                // the resume-retry path skips it). POST-INJECTION-gated by this same enclosing block.
+                //
+                // Scope to the LIVE FOOTER (the last few non-empty rows — the current generation's tail), exactly
+                // like the permission/question detectors below. The error is only meaningful as the CURRENT turn's
+                // outcome; with no corroboration to lean on (unlike the usage limit above), scanning the whole grid
+                // would let any quoted/scrollback mention of the string from a PRIOR turn stop a healthy new turn.
+                const rateLimitMsg = detectRateLimit(liveFooterText(grid));
+                if (rateLimitMsg) {
+                    fail(new SDKError(rateLimitMsg, SDKErrorCode.RATE_LIMIT_EXCEEDED));
+                    return;
+                }
+                // (3) Permission modal (Story 32.6). `permissionPending` is the per-modal re-fire guard: set
+                // true on detection, cleared once handlePermission resolves (key driven). The dialog stays on
+                // the living screen every frame until then, so the flag (not a buffer clear) bounds it to once.
+                //
+                // ISSUE-99 poisoning fix: detect over the LIVE FOOTER region (not the whole screen) and only
+                // when generation is PAUSED. A real dialog renders at the bottom with the spinner gone; the
+                // agent's own OUTPUT can print dialog-like text (code quoting "Do you want to…" / a permission
+                // fixture) up in the scrollback while the spinner runs below — a whole-screen scan mistook that
+                // for a live dialog and drove a key that interrupted the agent (the post-injection sibling of
+                // the pre-injection classifier poisoning, 실측 2026-06-14).
+                if (canUseTool && !permissionPending && !isGeneratingGrid(grid) && detectPermissionDialog(liveFooterText(grid))) {
+                    permissionPending = true;
+                    const toolName = extractToolName(text);
+                    const sentence = extractPromptSentence(text);
+                    // Story 37.9: emit the lead-in prose (screen scrape) BEFORE the standalone permission card
+                    // so "[본문, 선택지]" order holds — claude writes that prose to the JSONL only post-decision,
+                    // so the file-only drain can't recover it. The turn-end reload replaces this provisional.
+                    emitProvisionalBody(parsePrecedingPermissionText(grid));
+                    handlePermission(toolName, sentence, `cli-perm-${++permCounter}`);
+                    // Story 32.9: this tool's tool_use block (written only AFTER the decision — 32.6 Task 1;
+                    // allow AND deny both record one block — verified) must NOT be live-emitted, or its real-id
+                    // card would split from the standalone permission card above. Mark one block for suppression;
+                    // the dialog always precedes the block (claude blocks on the prompt), so the counter is set
+                    // before the drain sees it.
+                    permissionGatedToolsPending++;
+                    // Story 37.10 (TOOL-PERM-RESCRAPE): also reserve this gated tool's GRID-side slot. The
+                    // drain-side suppression above keeps the canonical `toolu_…` from re-emitting, but the live
+                    // grid scraper (`emitProvisionalCards`) dedups on its OWN counter (`liveToolSlots`), which the
+                    // permission path never advanced. Once the user approves and generation resumes
+                    // (`isGeneratingGrid` true), claude can keep the gated `● Tool(…)` card in the scrollback while
+                    // the spinner runs again — the scraper would then see this slot as free (`toolIdx >= liveToolSlots`)
+                    // and re-provision it as a `cli-prov-tool-N` card, double-rendering against the 32.6 `cli-perm-N`
+                    // card AND leaking a `provisionalToolEmitsPending` that wrongly suppresses a LATER tool's live
+                    // emit. Advancing the slot makes the scraper treat it as already-spoken-for. The slot id is left
+                    // UNSET (no `provToolSlotIds` entry) so the gated tool's `⎿` result stays on the reload path —
+                    // its existing honest fallback; we do NOT flip the permission card via onToolResult (unverified
+                    // client contract, minimal change). Correct whether or not claude re-exposes the card: if it does
+                    // the double-render is prevented; if it doesn't, a following tool simply renders via the drain
+                    // instead of the grid (still live, reload authoritative) — no loss, no double render either way.
+                    const gatedSlot = liveToolSlots++;
+                    // Story 37.11 (content-set): the slot reservation alone isn't seen by the content-set dedup,
+                    // which recognizes an already-spoken card by `heldCards` membership (its content signature), not
+                    // by a slot counter. So also record the gated tool's on-screen card here, so when the resumed
+                    // spinner re-scrapes the SAME `● Tool(…)` line it matches this entry and is skipped. The slot is
+                    // left WITHOUT a `provToolSlotIds` entry (as above) — the gated tool's `⎿` result stays on the
+                    // reload path. Match the scraper's text: the gated `● <name>(…)` line, glyph stripped.
+                    const gatedRow = grid.find((r) => /^\s*●/.test(r) && r.includes(`${toolName}(`));
+                    if (gatedRow) {
+                        const gatedText = gatedRow.trim().replace(/^●\s*/, '').trim();
+                        heldCards.push({ kind: 'tool', sig: cardSig({ kind: 'tool', text: gatedText }), text: gatedText, slot: gatedSlot });
+                    }
+                }
+                // (4) AskUserQuestion modal (Story 32.8). Mutually exclusive with the permission path above
+                // (checked first; the two detectors require disjoint signatures, so they never cross-fire).
+                // `questionPending` is the per-modal re-fire guard, held across the settle timer + round-trip.
+                //
+                // ISSUE-99 poisoning fix — this is the bug that froze THIS session for 21 minutes (실측
+                // 2026-06-14): detect over the LIVE FOOTER region and only when generation is PAUSED. The agent
+                // had just EDITED a file full of AskUserQuestion *test fixtures* ("Enter to select" / "Chat about
+                // this" / a tabbed "☐ … ☐ … ✔ Submit" header); claude painted that diff in the scrollback while
+                // the spinner ran, the old whole-screen scan read it as a live multi-question modal, failed to
+                // parse it, and drove an Esc that interrupted the agent — and the turn never recovered. A real
+                // modal sits in the live region with the spinner gone, so both guards still admit it.
+                if (canUseTool && !permissionPending && !questionPending && !isGeneratingGrid(grid) && detectQuestionModal(liveFooterText(grid))) {
+                    dlog.server('modal-detect-question', { questionCounter: globalQuestionCounter + 1 });
+                    questionPending = true;
+                    // Let the modal finish painting (the footer first appearing does not mean every option row is
+                    // drawn yet). When the timer FIRES, re-flush and re-read the grid: the modal is fully painted
+                    // *at fire time*, so parse the freshest settled grid — NOT a half-drawn snapshot captured at
+                    // detection. The re-read is async too, so re-check `settled` / `questionPending` once more (the
+                    // last line of defense against an abort landing during the settle window).
+                    questionSettleTimer = setTimeout(() => {
+                        questionSettleTimer = null;
+                        void screen.flush().then(async () => {
+                            if (settled || !questionPending)
+                                return;
+                            // Ordering fix: catch the JSONL drain up to NOW so the preceding text/tool cards
+                            // land BEFORE the question card. The screen detector (fast) otherwise beats the
+                            // poll-based drain (slow), so the card jumped ahead of its own preceding work and
+                            // those cards only appeared AFTER the answer. The file holds the full, correctly-
+                            // ordered blocks (text AND tool_use) — unlike the old prose scrape, which recovered
+                            // only leading text and never the tool cards.
+                            await catchUpJSONL();
+                            if (settled || !questionPending)
+                                return;
+                            const freshGrid = screen.readGrid();
+                            // Story 37.9: emit the lead-in prose (screen scrape) BEFORE the question card so
+                            // "[본문, 선택지]" order holds. catchUpJSONL above drains any blocks ALREADY in the file
+                            // (correctly ordered), but the prose that leads into THIS modal lands in the JSONL only
+                            // post-answer, so it isn't there yet — the screen is the only pre-answer source. The
+                            // turn-end reload replaces this provisional with the authoritative block.
+                            emitProvisionalBody(parsePrecedingText(freshGrid));
+                            // ISSUE-99: branch on the header tab count. A single ballot box ⇒ the single-round-trip
+                            // path (32.8); more than one ⇒ the tabbed multi-question driver. Either way a
+                            // non-drivable case ends in a clean Esc-cancel.
+                            const toolUseID = `cli-q-${++globalQuestionCounter}`;
+                            if (countQuestionTabs(freshGrid) > 1) {
+                                handleMultiQuestion(freshGrid, countQuestionTabs(freshGrid), toolUseID);
+                            }
+                            else {
+                                handleQuestion(parseQuestionModal(freshGrid), toolUseID);
+                            }
+                        });
+                    }, CLI_QUESTION_SETTLE_MS);
+                }
+                // (5) Story 37.8: full-screen mirror frame. We are inside the post-flush settled consumer, so
+                // the screen is current — serialize + pace it (no extra flush; reuse this settled read so
+                // detection timing is unchanged). Factored into emitScreenFrame so boot mirrors too.
+                emitScreenFrame();
+            };
+            // S-1 heartbeat: during generation the session JSONL is silent until a block
+            // completes (§4.5), so onTextChunk/onThinking can't keep the caller's
+            // inactivity timer alive. The ONLY real-time signal is PTY data (spinner /
+            // "↓ N tokens" frames, §4.7) — forward each frame through onRawMessage so the
+            // timer is reset *while generating*. This timer-reset channel is wired **only on
+            // the browser path** (the `onRawMessage` argument of websocket.ts's
+            // `sendMessageWithCallbacks` call, which owns the activity-based inactivity
+            // timeout); the queue path passes no `onRawMessage` and has no inactivity timeout
+            // (only the inter-prompt `delayMs`), so a permission `await` there simply blocks
+            // naturally.
+            //
+            // Story 35.1: the browser path now *pauses* that inactivity timer for the whole
+            // input-wait (permission / AskUserQuestion), so onRawMessage no longer has any role
+            // in keeping an input-wait alive — it is purely a generation-activity signal. The
+            // browser-vs-queue asymmetry above is moot during the wait (both now block
+            // indefinitely); it still describes generation-time behavior.
+            //
+            // The same data stream drives injection readiness (pre-injection: accumulate
+            // boot output, inject once the `❯` box marker renders and output goes quiet —
+            // CLI_PROMPT_MARKER) and, post-injection, permission-dialog (32.6) and
+            // AskUserQuestion-modal (32.8) detection (below). (Trusted-folder happy-path — a
+            // new/untrusted folder's trust dialog is deferred, §7.3.)
+            pty.onData((data) => {
+                onRawMessage?.('cli-pty-activity');
+                // Story 37.1: feed the headless screen model UNCONDITIONALLY (no gate), before the
+                // mirror/scrape branches so it sees the exact same raw frame. This is the code form
+                // of "reconstruct always / display-only toggle": the screen model is always supplied
+                // while the mirror below is toggled. Pure observer — does not alter the frame or any
+                // downstream scrape. Foundation only: nothing reads this grid in this story (37.2~).
+                screen.write(data);
+                // Story 37.1 (Task 4): mirror the raw frame to the opt-in fixture dump (no-op
+                // unless HAMMOC_CLI_PTY_DUMP is set). Best-effort — never break a turn.
+                if (ptyDumpStream) {
+                    try {
+                        ptyDumpStream.write(data);
+                    }
+                    catch {
+                        /* ignore — dump best-effort */
+                    }
+                }
+                // Story 37.8: the live raw-delta mirror passthrough was removed here — the mirror is
+                // now driven by full self-contained screen frames serialized in consumeSettledGrid
+                // (post-flush), so a per-frame delta passthrough is no longer needed.
+                // Pre-injection (boot/resume): accumulate output until the ❯ readiness marker, then classify
+                // the SETTLED grid before injecting (Story 37.6). The `❯` marker is a cheap, NECESSARY-but-
+                // insufficient trigger (it is shared by the input box, selection menus, and the permission
+                // dialog) — so it only arms the settle timer; the actual decision (`input-box`/`selection`/
+                // `unknown`) is made by attemptInjectFromGrid on the flushed grid. The POST-injection grid
+                // detectors (consumeSettledGrid) still run only after injection.
+                if (!injected) {
+                    // Mirror the boot/resume repaint to the client AND feed the soft screen-stall watchdog (both
+                    // are driven by these serialized frames) so the BOOT phase has the same non-destructive
+                    // "looks stuck? — Stop" coverage as generation — that is what lets us drop the old hard boot
+                    // timeout (see armBootPoll) without leaving a silent boot hang.
+                    void screen.flush().then(emitScreenFrame);
+                    // While the card is driving a confirm menu (choiceMenuHandled), suppress the boot settle
+                    // timer — re-entering attemptInjectFromGrid would re-classify the still-open menu and
+                    // (pre-2026-06-12) Esc it out from under the card. driveBootChoiceMenu owns the screen
+                    // until injection.
+                    if (choiceMenuHandled)
+                        return;
+                    bootBuffer += data;
+                    if (bootBuffer.includes(CLI_PROMPT_MARKER)) {
+                        // The raw `❯` is a CHEAP trigger to flush+classify — NOT proof of the real input box (a
+                        // resume repaint QUOTES `❯` from scrollback). Injection stays grid-gated in
+                        // attemptInjectFromGrid (only a real footer input box injects), so a quoted `❯` merely
+                        // schedules a harmless re-classify — never a blind inject, and (post-fix) never an abort.
+                        if (bootSettleTimer)
+                            clearTimeout(bootSettleTimer);
+                        bootSettleTimer = setTimeout(() => attemptInjectFromGrid(), CLI_BOOT_SETTLE_MS);
+                    }
+                    return;
+                }
+                // Story 37.4: one settled grid read per frame feeds EVERY post-injection consumer (progress /
+                // usage limit / permission / question). `screen.write` above is unconditional but async/buffered,
+                // so the grid is only definitive after `flush()` resolves — schedule it non-blocking (`void …then`)
+                // to keep the hot path clear. The deleted linear `stripAnsiForDetect` + rolling buffers are gone;
+                // the grid is the sole extraction path.
+                void screen.flush().then(consumeSettledGrid);
+            });
+            pty.onExit(({ exitCode }) => {
+                // Interactive claude is a REPL — it should not exit before end_turn. An early
+                // exit means spawn/auth/onboarding failure. (Our own kill after finish sets
+                // settled=true first, so this is a no-op on the normal path.)
+                if (settled)
+                    return;
+                fail(new Error(`claude CLI exited (code ${exitCode}) before completing the turn`));
+            });
+            // Boot readiness POLL (replaces the old decisive ceiling). Every CLI_MAX_BOOT_WAIT_MS we re-run
+            // the grid classifier and inject AS SOON AS a real input box appears (or drive a resume confirm
+            // menu). We do NOT hard-abort on a not-yet-ready screen: a resume repaint of a large transcript
+            // can take a while, and "unknown" almost always means "still painting", not "broken" — aborting
+            // there was a false positive (surfaced as a misleading "timeout"; the old `bootMarkerSeen` gate
+            // made it worse, since a resume repaint QUOTES `❯` in scrollback and prematurely promoted the
+            // checkpoint to decisive). Injection stays grid-gated (only a verified footer input box injects),
+            // so polling is safe. Genuine stuck cases are covered without a destructive timeout: a frozen
+            // boot screen trips the soft screen-stall affordance (now fed during boot — see onData), a
+            // crashed REPL fires pty.onExit, and the user's Stop always works. The settle timer (onData)
+            // gives the fast path; this poll is the steady backstop.
+            const armBootPoll = () => {
+                bootFallbackTimer = setTimeout(() => {
+                    if (injected || settled || choiceMenuHandled)
+                        return;
+                    attemptInjectFromGrid(); // inject if ready / drive a confirm menu; otherwise keep waiting
+                    armBootPoll();
+                }, CLI_MAX_BOOT_WAIT_MS);
+            };
+            armBootPoll();
+            const emitSessionInitOnce = (model) => {
+                if (sessionInitEmitted || !resolvedSessionId)
+                    return;
+                sessionInitEmitted = true;
+                const metadata = { model, cwd };
+                callbacks.onSessionInit?.(resolvedSessionId, metadata);
+            };
+            // Resume: session id is known up front, so announce it immediately (the
+            // caller emits session:resumed + marks the stream active).
+            if (resumeId)
+                emitSessionInitOnce();
+            /**
+             * Story 37.11 (progressive finalize — PER-KIND binding): when the file-parsed canonical for a block
+             * arrives, re-emit it with `provisional:false` so the client REPLACES the live provisional in place
+             * (drops the badge). Bound PER KIND — the Nth canonical thinking finalizes the OLDEST still-provisional
+             * thinking on the client, etc. — NOT by unified sequence position. The screen and file order the
+             * blocks DIFFERENTLY: a still-running tool sits at the BOTTOM, so on screen it precedes the response
+             * text the file lists before it; a unified-sequence binding diverged there and stalled (the user's
+             * "교체 안 됨"). Per-kind is robust to that interleave order. The friendly tool name (Update vs Edit) is
+             * irrelevant (bound by order, the canonical name overwrites); a permission-gated tool never emits a
+             * provisional card so it doesn't shift the per-kind count; a rarer count mismatch (missed / misread
+             * card) is corrected by the turn-end reload.
+             */
+            const maybeFinalize = (kind, content, toolName, toolInput, toolId) => {
+                if (kind === 'thinking') {
+                    if (content.trim())
+                        callbacks.onThinking?.(content, false);
+                }
+                else if (kind === 'text') {
+                    if (content.trim()) {
+                        callbacks.onTextChunk?.({ sessionId: resolvedSessionId ?? '', messageId: `cli-fin-text-${++provisionalCardCounter}`, content, done: false, provisional: false });
+                    }
+                }
+                else if (kind === 'tool') {
+                    // The client finalizes the OLDEST provisional tool card (keeping its id so the screen result-flip
+                    // still lands) with this canonical name+input. The id here is only a fallback for the rare grid-
+                    // behind case (no provisional tool to claim → created fresh under the real `toolu_…` id).
+                    callbacks.onToolUse?.({ id: toolId ?? `cli-fin-tool-${++provisionalCardCounter}`, name: toolName ?? 'Tool', input: toolInput ?? {}, status: 'pending', provisional: false });
+                }
+            };
+            /** Process one parsed assistant line. Returns true when the turn ended. */
+            const handleAssistantLine = (raw) => {
+                if (emittedUuids.has(raw.uuid))
+                    return false;
+                emittedUuids.add(raw.uuid);
+                // Story 36.2 (AC1): the first assistant block means generation has started — end the
+                // phase indicator here too, so a response that emits no spinner counter (no "↓ N tokens"
+                // frame) still leaves the waiting phase. Idempotent with emitProgressFromGrid, which fires
+                // first when a spinner counter appears; whichever comes first wins, the other is a no-op.
+                clearPhase();
+                lastAssistantUuid = raw.uuid;
+                const envelope = raw.message;
+                emitSessionInitOnce(envelope?.model);
+                const blockContent = envelope?.content;
+                if (Array.isArray(blockContent)) {
+                    // Story 37.9: if this block carries the input-waiting tool_use whose lead-in prose was
+                    // already emitted provisionally, suppress its live TEXT re-emit so the provisional isn't
+                    // double-rendered (the provisional holds the arrival-order slot; the turn-end reload
+                    // replaces it). accumulatedText still accrues the canonical text below — only the live wire
+                    // emit is skipped. Match: an AskUserQuestion tool_use (question modal) OR any tool_use while
+                    // a permission-gated tool is pending (the gated block — same FIFO as
+                    // permissionGatedToolsPending, read here BEFORE the loop decrements it).
+                    let suppressBlockText = false;
+                    if (provisionalBodyEmitsPending > 0) {
+                        const carriesModalTool = blockContent.some((b) => b.type === 'tool_use' &&
+                            (b.name === 'AskUserQuestion' || permissionGatedToolsPending > 0));
+                        if (carriesModalTool) {
+                            suppressBlockText = true;
+                            provisionalBodyEmitsPending--;
+                        }
+                    }
+                    let textIdx = 0;
+                    for (const block of blockContent) {
+                        if (block.type === 'thinking') {
+                            // Thinking display: thinking blocks flow through the SAME onThinking →
+                            // thinking:chunk path as SDK mode (renders live + on reload). The
+                            // empty-thinking guard below matters because Opus 4.7+ OMIT thinking
+                            // summaries by default, so the block often arrives EMPTY (signature only)
+                            // unless summaries are explicitly requested. `cliShowThinkingSummaries`
+                            // (default ON) requests them — the arg build above injects
+                            // `--settings '{"showThinkingSummaries":true}'` into the interactive spawn
+                            // (session-scoped; the global ~/.claude/settings.json is never touched).
+                            // Evidence this works in CLI mode: a real entrypoint:cli session on this
+                            // host (claude v2.1.162, opus-4-8) surfaced POPULATED thinking. (#52376
+                            // reports subscription sessions get redacted thinking, but a real CLI
+                            // session here contradicted that — so we wire it and let a live CLI chat
+                            // confirm. Note: `-p`/print runs as entrypoint:sdk-ts, a DIFFERENT path,
+                            // so a `-p` test does NOT represent interactive CLI mode.)
+                            //
+                            // Story 37.10 (AC1): reconcile with the live grid scraper. `emitProvisionalCards` may
+                            // have already emitted this thinking off the screen (the summary paints before the JSONL
+                            // block lands). Match by arrival-order FIFO (`provisionalThinkingEmitsPending`): consume
+                            // the slot whether the canonical is POPULATED or EMPTY. Populated → SUPPRESS the re-emit
+                            // (the turn-end reload swaps the provisional for the raw thinking). Empty (Opus 4.7+
+                            // signature-only) → there is nothing to emit anyway, so the grid provisional simply stands
+                            // as the sole live copy (AC1 empty-canonical: preserve, don't erase). With no provisional
+                            // pending the drain is first to this slot (grid slower / scrolled) → emit canonical and
+                            // advance the shared slot counter so the scraper won't re-emit it.
+                            const thinking = block.thinking;
+                            if (provisionalThinkingEmitsPending > 0) {
+                                provisionalThinkingEmitsPending--;
+                                dlog.server('drain-thinking-suppress', { len: thinking?.length ?? 0, reason: 'provisional-pending', fifo: fifoSnap() });
+                                maybeFinalize('thinking', thinking ?? ''); // swap the live ∴ scrape for the canonical, drop the badge
+                            }
+                            else if (thinking && thinking.trim()) {
+                                liveThinkingSlots++;
+                                dlog.server('drain-thinking-emit', { len: thinking.length, preview: thinking.slice(0, 80) });
+                                callbacks.onThinking?.(thinking);
+                            }
+                            else {
+                                dlog.server('drain-thinking-skip', { empty: true });
+                            }
+                        }
+                        else if (block.type === 'text') {
+                            const text = block.text;
+                            if (text && text.trim() && text.trim() !== '(no content)') {
+                                accumulatedText += text;
+                                if (suppressBlockText) {
+                                    dlog.server('drain-text-suppress', { len: text.length, reason: 'modal-lead-in', fifo: fifoSnap() });
+                                    maybeFinalize('text', text);
+                                }
+                                else if (provisionalBodyEmitsPending > 0) {
+                                    provisionalBodyEmitsPending--;
+                                    dlog.server('drain-text-suppress', { len: text.length, reason: 'body-pending', fifo: fifoSnap() });
+                                    maybeFinalize('text', text);
+                                }
+                                else if (provisionalTextEmitsPending > 0) {
+                                    provisionalTextEmitsPending--;
+                                    dlog.server('drain-text-suppress', { len: text.length, reason: 'grid-pending', fifo: fifoSnap() });
+                                    maybeFinalize('text', text);
+                                }
+                                else {
+                                    liveTextSlots++;
+                                    dlog.server('drain-text-emit', { len: text.length, preview: text.slice(0, 80) });
+                                    callbacks.onTextChunk?.({
+                                        sessionId: resolvedSessionId ?? '',
+                                        messageId: `${raw.uuid}-t${textIdx++}`,
+                                        content: text,
+                                        done: false,
+                                    });
+                                }
+                            }
+                        }
+                        else if (block.type === 'tool_use') {
+                            // Story 32.9: live tool-card emission. The envelope is identical to SDK mode
+                            // (verified against real CLI sessions — `{type:'tool_use', id:'toolu_…', name,
+                            // input}`), so reuse the SDK mapping (`streamHandler.handleToolUseBlock`) and
+                            // the existing onToolUse → `tool:call` wire verbatim. The block also renders on
+                            // reload (the authoritative `stream:complete-messages` replaces the live cards
+                            // at turn end), so this only adds the *live* view — no double render.
+                            const toolBlock = block;
+                            if (toolBlock.name === 'EnterPlanMode' && this.permissionMode !== 'plan') {
+                                if (this.planModeBypassBehavior === 'sync') {
+                                    this.permissionMode = 'plan';
+                                    log.info('[CLI] EnterPlanMode (sync) — switching Hammoc button to Plan');
+                                    onPermissionModeSync?.('plan');
+                                }
+                                else if (this.permissionMode === 'bypassPermissions') {
+                                    setTimeout(() => {
+                                        if (this.permissionMode === 'bypassPermissions' && !settled) {
+                                            log.info('[CLI] EnterPlanMode in Bypass (override) — restoring Bypass on PTY');
+                                            void this.setPermissionMode('bypassPermissions');
+                                        }
+                                    }, 500);
+                                }
+                            }
+                            if (permissionGatedToolsPending > 0) {
+                                permissionGatedToolsPending--;
+                                dlog.server('drain-tool-suppress', { name: toolBlock.name, id: toolBlock.id, reason: 'permission-gated', fifo: fifoSnap() });
+                            }
+                            else if (provisionalToolEmitsPending > 0) {
+                                // Story 37.10 (AC4): a grid provisional tool card already occupies this slot
+                                // (synthetic `cli-prov-tool-N`, arrival-order FIFO — checked AFTER the permission
+                                // gate so an interleaved gated tool consumes its own counter first). Suppress the
+                                // canonical live re-emit; a real-`toolu_…` card here would split from the provisional.
+                                // Left OUT of liveEmittedToolIds: the client card KEEPS its synthetic id (chatStore finalize:
+                                // "KEEPING its id", the screen flip rides it), so a real-id onToolResult would orphan. Instead
+                                // (Story 37.16) record real id → this tool's provisional slot (drain FIFO matches provToolSlotIds)
+                                // so emitToolResults can complete it via the SYNTHETIC id — the scroll-off backstop for when the
+                                // grid never sees green (the running tool scrolled above the viewport). The turn-end reload still
+                                // replaces the name-only provisional with the full-input canonical.
+                                provisionalToolEmitsPending--;
+                                const finalizeSlot = provPendingToolSlots.shift() ?? -1;
+                                const finalizeSynthId = provToolSlotIds[finalizeSlot];
+                                dlog.server('drain-tool-suppress', { name: toolBlock.name, id: toolBlock.id, reason: 'provisional-pending', finalizeSlot, finalizeSynthId, fifo: fifoSnap() });
+                                maybeFinalize('tool', '', toolBlock.name, toolBlock.input, finalizeSynthId ?? toolBlock.id);
+                                provRealIdToSlot.set(toolBlock.id, finalizeSlot);
+                                trace(`finalize-tool name=${toolBlock.name} realId=${toolBlock.id} → provSlot=${finalizeSlot} synthId=${finalizeSynthId ?? '(fallback toolu_)'}`);
+                            }
+                            else {
+                                const toolCall = {
+                                    id: toolBlock.id,
+                                    name: toolBlock.name,
+                                    input: toolBlock.input,
+                                    status: 'pending',
+                                };
+                                liveEmittedToolIds.add(toolBlock.id);
+                                liveToolSlots++;
+                                dlog.server('drain-tool-emit', { name: toolBlock.name, id: toolBlock.id });
+                                callbacks.onToolUse?.(toolCall);
+                            }
+                        }
+                    }
+                }
+                else if (typeof blockContent === 'string') {
+                    const text = blockContent;
+                    if (text.trim() && text.trim() !== '(no content)') {
+                        accumulatedText += text;
+                        // Story 37.11 (AC1): same single-live-source contract as the block-array text path —
+                        // suppress the live re-emit when the grid already provisioned this slot; otherwise emit
+                        // authoritatively and advance the high-water.
+                        if (provisionalTextEmitsPending > 0) {
+                            provisionalTextEmitsPending--;
+                            maybeFinalize('text', text); // string-content path — same progressive finalize as block-array text
+                        }
+                        else {
+                            liveTextSlots++;
+                            callbacks.onTextChunk?.({
+                                sessionId: resolvedSessionId ?? '',
+                                messageId: raw.uuid,
+                                content: text,
+                                done: false,
+                            });
+                        }
+                    }
+                }
+                if (envelope?.usage) {
+                    // Context-window size — the ring's *denominator*. The session JSONL carries
+                    // per-request token counts but NOT the model's window, so derive it from the
+                    // model: an explicit `[1m]` opt-in or an Opus auto-1M runs at 1M, else the 200K
+                    // default. SDK mode pulls this from `modelUsage`; CLI mode has no such field, so
+                    // it previously hard-coded `contextWindow:0` — which made the ring treat the data
+                    // as missing and stay hidden the entire CLI session.
+                    const contextWindowSize = effectiveModelIs1M(options.model) || isAutoNative1MModel(envelope.model) ? 1_000_000 : 200_000;
+                    lastUsage = {
+                        inputTokens: envelope.usage.input_tokens ?? 0,
+                        outputTokens: envelope.usage.output_tokens ?? 0,
+                        cacheReadInputTokens: envelope.usage.cache_read_input_tokens ?? 0,
+                        cacheCreationInputTokens: envelope.usage.cache_creation_input_tokens ?? 0,
+                        totalCostUSD: 0,
+                        contextWindow: contextWindowSize,
+                        model: envelope.model,
+                    };
+                    // Live context — the ring's *numerator*. Every completed response writes a JSONL
+                    // line carrying its exact input-context usage; forward it through the SAME
+                    // `onContextEstimate` channel SDK mode uses (→ `context:estimate` → ring update) so
+                    // the ring fills block-by-block *during* a turn instead of only at end_turn. The
+                    // total is the real reported context (uncached input + both cache buckets), not an
+                    // estimate; the client keeps the max (context only grows between compactions). Same
+                    // value repeats across a response's block lines — the client's >current guard dedups.
+                    const totalContextTokens = (envelope.usage.input_tokens ?? 0) +
+                        (envelope.usage.cache_read_input_tokens ?? 0) +
+                        (envelope.usage.cache_creation_input_tokens ?? 0);
+                    callbacks.onContextEstimate?.(totalContextTokens, contextWindowSize);
+                }
+                return envelope?.stop_reason === 'end_turn';
+            };
+            /**
+             * Story 32.9 (AC3, AC5): mirror a user line's tool_result blocks through onToolResult,
+             * but only for tools that were live-emitted this turn (`liveEmittedToolIds`). A
+             * permission-gated tool was suppressed (no live card), so its result is left to reload
+             * too — a `tool:result` for a card that does not exist live would orphan it. Deduped per
+             * tool_use_id (`resultEmittedToolIds`) because the drain re-parses the whole file as it
+             * grows. The success/output/error + XML-strip mapping mirrors
+             * `streamHandler.handleToolResultBlock` / `historyParser` exactly (envelope-compatible),
+             * so the live result matches what reload would render.
+             */
+            const emitToolResults = (raw) => {
+                const content = raw.message?.content;
+                if (!Array.isArray(content))
+                    return;
+                for (const block of content) {
+                    if (block.type !== 'tool_result')
+                        continue;
+                    const trb = block;
+                    const id = trb.tool_use_id;
+                    // Story 37.16 + fix: mirror the real-id file result onto the provisional card's SYNTHETIC id — the
+                    // scroll-off backstop. It ORIGINALLY skipped a slot the grid had already flipped green
+                    // (gridResultFlippedSlots), assuming the flip's onToolResult had reached the client. But that flip
+                    // is LOST when the canonical tool:call races AHEAD of the provisional: the client builds a fresh card
+                    // off the canonical and the earlier green-flip result never lands on it, so the card spins forever
+                    // (confirmed via turn-end-stuck: slot flipped green server-side, card still pending). So fire the
+                    // backstop REGARDLESS of the green flip — `resultEmittedToolIds` still dedupes per real id, and the
+                    // client treats a duplicate result on an already-completed card as a no-op. A non-provisional
+                    // (auto-approved) tool kept its real id and follows the original liveEmittedToolIds path below.
+                    const provSlot = provRealIdToSlot.get(id);
+                    if (provSlot !== undefined) {
+                        const synthId = provToolSlotIds[provSlot];
+                        if (resultEmittedToolIds.has(id) || !synthId) {
+                            trace(`backstop SKIP id=${id} provSlot=${provSlot} (alreadyResult=${resultEmittedToolIds.has(id)} alreadyFlipped=${gridResultFlippedSlots.has(provSlot)} noSynth=${!synthId})`);
+                            continue;
+                        }
+                        trace(`backstop FIRE id=${id} provSlot=${provSlot} → ${synthId}`);
+                        resultEmittedToolIds.add(id);
+                        gridResultFlippedSlots.add(provSlot);
+                        const provRaw = typeof trb.content === 'string' ? trb.content : '';
+                        const provErr = trb.is_error ?? false;
+                        callbacks.onToolResult?.(synthId, {
+                            success: !provErr,
+                            output: provErr ? undefined : sanitizeToolResultContent(provRaw),
+                            error: provErr ? sanitizeToolResultContent(provRaw) : undefined,
+                        }, true);
+                        continue;
+                    }
+                    if (!liveEmittedToolIds.has(id) || resultEmittedToolIds.has(id))
+                        continue;
+                    resultEmittedToolIds.add(id);
+                    const rawContent = typeof trb.content === 'string' ? trb.content : '';
+                    const cleanContent = sanitizeToolResultContent(rawContent);
+                    const isError = trb.is_error ?? false;
+                    const result = {
+                        success: !isError,
+                        output: isError ? undefined : cleanContent,
+                        error: isError ? cleanContent : undefined,
+                    };
+                    callbacks.onToolResult?.(id, result);
+                }
+            };
+            const finishTurn = () => {
+                if (toolTraceStream) {
+                    trace('=== turn-end tool matrix ===');
+                    let mDone = 0, mIncomplete = 0, mSnapshot = 0;
+                    for (const h of heldCards) {
+                        if (h.kind !== 'tool')
+                            continue;
+                        const flipped = gridResultFlippedSlots.has(h.slot);
+                        // resume-snapshot tools never receive a synthId (no client provisional card was emitted) — the
+                        // client already shows the completed history card, so they are NOT real incompletes. Without this
+                        // distinction the matrix over-reports (every restored prior tool looks INCOMPLETE).
+                        const hasSynth = !!provToolSlotIds[h.slot];
+                        let status;
+                        if (flipped) {
+                            status = h.seenGreen ? 'DONE(screen-green)' : 'DONE(file-backstop)';
+                            mDone++;
+                        }
+                        else if (!hasSynth) {
+                            status = 'SKIP(resume-snapshot)';
+                            mSnapshot++;
+                        }
+                        else {
+                            status = 'INCOMPLETE';
+                            mIncomplete++;
+                        }
+                        trace(`  slot=${h.slot} seenGreen=${!!h.seenGreen} flipped=${flipped} synth=${hasSynth} → ${status} | ${h.text.slice(0, 40)}`);
+                    }
+                    trace(`turn-end summary: done=${mDone} INCOMPLETE=${mIncomplete} resume-snapshot=${mSnapshot}`);
+                }
+                finish({
+                    id: lastAssistantUuid,
+                    sessionId: resolvedSessionId ?? '',
+                    content: accumulatedText,
+                    done: true,
+                    isError: false,
+                    usage: lastUsage,
+                });
+            };
+            const tick = async () => {
+                if (settled || draining)
+                    return;
+                draining = true;
+                try {
+                    // Phase 1 — locate this turn's session file (new session: diff-detect).
+                    if (!sessionFile) {
+                        const found = await newestNewJsonl(sessionsDir, baselineFiles);
+                        if (!found)
+                            return;
+                        sessionFile = path.join(sessionsDir, found);
+                        resolvedSessionId = found.replace(/\.jsonl$/, '');
+                        lastSize = 0;
+                        attachFileWatcher();
+                    }
+                    // Phase 2 — drain only when the file grew (avoids redundant re-parses).
+                    const size = await fileSize(sessionFile);
+                    if (size <= lastSize)
+                        return;
+                    lastSize = size;
+                    const messages = await parseJSONLFile(sessionFile);
+                    for (const raw of messages) {
+                        if (raw.isMeta)
+                            continue;
+                        // Filter (§6.3): assistant lines are the render targets; user lines are mined for
+                        // tool_result blocks (Story 32.9 — live result mirroring); every other type
+                        // (summary/system/queue-operation/command sentinels) is bookkeeping and excluded.
+                        if (raw.type === 'assistant') {
+                            if (emittedUuids.has(raw.uuid))
+                                continue;
+                            if (handleAssistantLine(raw)) {
+                                backgroundTracker?.markMainEnded();
+                                if (!backgroundTracker || backgroundTracker.isFullyDone) {
+                                    finishTurn();
+                                    return;
+                                }
+                                log.info(`[CLI] end_turn with ${backgroundTracker.pending} background task(s) pending — keeping turn alive`);
+                            }
+                        }
+                        else if (raw.type === 'user') {
+                            // An interrupt ("[Request interrupted by user]") writes NO end_turn assistant line, so
+                            // without this the turn would hang until a hard stop (실측 2026-06-14 — a stray Esc left
+                            // claude idle and the turn ran 21 min before the user stopped it). A NEW marker (not
+                            // seeded on resume, not already handled) ends the turn with whatever was generated so far.
+                            if (!emittedUuids.has(raw.uuid) && isCliInterruptLine(raw)) {
+                                emittedUuids.add(raw.uuid);
+                                log.info('[CLI] interrupt marker in JSONL (no end_turn will follow) — finishing turn');
+                                finishTurn();
+                                return;
+                            }
+                            // Detect task-notification user messages (background task completions).
+                            // Only after this turn's first assistant block — otherwise the drain re-parses
+                            // the ENTIRE JSONL file and re-emits task notifications from previous turns
+                            // (emittedUuids is per-turn, so old uuids are unknown).
+                            if (lastAssistantUuid && !emittedUuids.has(raw.uuid)) {
+                                const textContent = extractUserTextContent(raw);
+                                if (textContent) {
+                                    const taskNotif = parseTaskNotification(textContent);
+                                    if (taskNotif) {
+                                        emittedUuids.add(raw.uuid);
+                                        // trackTaskDone is called by streamCallbacks.onTaskNotification (deps.backgroundTracker)
+                                        // — not here, to avoid double-decrement.
+                                        callbacks.onTaskNotification?.({
+                                            taskId: taskNotif.taskId,
+                                            status: taskNotif.status,
+                                            summary: taskNotif.summary,
+                                            toolUseId: taskNotif.toolUseId,
+                                        });
+                                        if (backgroundTracker?.isFullyDone) {
+                                            finishTurn();
+                                            return;
+                                        }
+                                    }
+                                }
+                            }
+                            emitToolResults(raw);
+                        }
+                        else if (raw.type === 'system' && raw.subtype === 'compact_boundary') {
+                            // A compaction writes NO end_turn assistant line — only this system boundary plus a
+                            // "Compacted" stdout. Whether the boundary ENDS the turn depends entirely on its
+                            // trigger, and the two cases are opposites:
+                            //
+                            //   - `manual` — the user clicked the context ring (/compact). Compaction IS the whole
+                            //     turn; nothing follows. Treat the boundary as completion, else we'd wait forever
+                            //     for an end_turn that never comes (the original CLI compact-hang bug, fixed
+                            //     2026-06-10). Also covers a past compaction replayed on resume.
+                            //   - `auto` — claude hit the context limit WHILE servicing a normal message. It
+                            //     compacts first, then resumes generating the real response to that same message
+                            //     (실측 2026-06-17: boundary at 07:08:18, first assistant text at 07:11:13, ~1000
+                            //     more transcript lines after). Here the boundary is a MID-TURN event, not the end.
+                            //     Finishing here would strand the answer that follows — the "auto-compact then
+                            //     immediately stops" symptom. So surface a "compacting" marker and keep draining;
+                            //     the genuine end_turn line still arrives downstream and completes the turn normally.
+                            //
+                            // Guarded by emittedUuids so a prior compaction replayed on resume (seeded above) is ignored.
+                            if (emittedUuids.has(raw.uuid))
+                                continue;
+                            emittedUuids.add(raw.uuid);
+                            const cm = raw.compactMetadata;
+                            log.info(`[CLI-DEBUG] compact_boundary detected: trigger=${cm?.trigger} preTokens=${cm?.preTokens}`);
+                            if (cm?.trigger === 'auto') {
+                                // Mid-turn: show the compaction marker but do NOT finish — the real response follows.
+                                callbacks.onCompact?.({ trigger: 'auto', preTokens: cm.preTokens ?? 0 });
+                                continue;
+                            }
+                            // manual (or trigger absent): the compaction is the turn — finish as before.
+                            finishTurn();
+                            return;
+                        }
+                    }
+                }
+                catch (err) {
+                    log.warn(`tick error: ${err instanceof Error ? err.message : String(err)}`);
+                }
+                finally {
+                    draining = false;
+                }
+            };
+            const scheduleTick = () => {
+                void tick();
+            };
+            // Catch the JSONL drain up to NOW. Used right before an on-screen modal card
+            // (question) is emitted: the screen detector is faster than the poll-based drain, so
+            // without this the card lands AHEAD of the text/tool lines that precede it in the file,
+            // and those cards only surface on the next poll (after the user answers). Forcing one
+            // drain pass here emits the preceding blocks first, so the card sits in its correct
+            // place. Waits out any in-flight drain (bounded ~1s), then runs one pass; `tick`
+            // self-guards on `settled` and on the file not having grown.
+            const catchUpJSONL = async () => {
+                let guard = 0;
+                while (draining && guard++ < 200)
+                    await new Promise((r) => { setTimeout(r, 5); });
+                await tick();
+            };
+            function attachFileWatcher() {
+                if (!sessionFile)
+                    return;
+                try {
+                    fileWatcher = watch(sessionFile, scheduleTick);
+                }
+                catch {
+                    // fs.watch unreliable/unsupported here — polling covers it.
+                }
+            }
+            // Best-effort low-latency triggers; the poll loop is the reliable fallback.
+            try {
+                dirWatcher = watch(sessionsDir, scheduleTick);
+            }
+            catch {
+                // Sessions dir may not exist yet (brand-new project) — polling handles it.
+            }
+            pollTimer = setInterval(scheduleTick, POLL_MS);
+            scheduleTick();
+        });
+    }
+}
+//# sourceMappingURL=cliChatEngine.js.map