@cspeach/cli 1.1.51 → 1.1.53

package/dist/tools/write-pipeline.js

@@ -8,7 +8,7 @@
  *   (beforeApproval) → approval id → plan-grant claims → Rule 9 conflict warning → transport
  *   (owning-transport resolve, session fallback then resolve, or the
  *   three-tier fallback) → grant owning
- *   mismatch → Rule 7 snapshot → safety card → preGate → WAL pending →
+ *   mismatch → Rule 7 snapshot → (LT-15 D6 stop check) → safety card → preGate → WAL pending →
  *   walGate → call → onThrow / landed → (noWrite: WAL closed, envelope) → noteWriteTransport → Rule 10 syntax check →
  *   audit row (D7: after the check, status follows the verified outcome) →
  *   WAL finalize → verified activation → chain / change card → after → envelope
@@ -45,6 +45,8 @@ import { noteWriteTransport } from '../repl/current-transport.js';
 import { presentSafetyConfirmation } from '../repl/safety-confirm.js';
 import { isSafetyConfirmEnabled } from '../repl/safety-mode-state.js';
 import { argsHaveCutNote, CUT_NOTE_REFUSAL } from './cut-markers.js';
+import { methodOnlyAuditDetail, methodOnlyRefusal, runMethodOnlyGuard } from './method-only-change.js';
+import { STOPPED_BEFORE_START_RESULT, STOPPED_BEFORE_WRITE_RESULT } from '../agent/repair-partial.js';
 // ── Transcript visibility helpers (D16-display + tour slide-7, 2026-06-12) ──
 //
 // Rule 7 auto-snapshots always fired but the transcript never said so
@@ -211,6 +213,16 @@ export function snapshotSource(snap) {
     }
 }
 const refuse = (body) => ({ content: JSON.stringify(body), is_error: true });
+/**
+ * LT-15 D6 (F6) — after a stop (Esc or Ctrl+C set the same turn abort) no new
+ * card opens. The shape dispatchTool returns for a tool that never started,
+ * with a text that says nothing ran. Checked only BEFORE a card, the WAL entry
+ * and any SAP change: a write whose card was answered always runs to the end.
+ */
+const interrupted = () => ({ content: STOPPED_BEFORE_START_RESULT, is_error: true });
+/** Review M5 — past the approval spend and the snapshot: the change itself was not made. */
+const interruptedBeforeWrite = () => ({ content: STOPPED_BEFORE_WRITE_RESULT, is_error: true });
+const stopped = (ctx) => ctx.signal?.aborted === true;
 /** Rule 7 recovery text for a hard source snapshot that could not read the object. */
 const SOURCE_READ_RECOVERY = 'Pre-write source read failed (non-404) and no committed active version could be confirmed — the object may exist with source we could not read, so no snapshot was possible. If this is a live connection/auth problem, fix it and retry. If this is a freshly-created shell that got edit-locked by an earlier aborted write, recover it directly: unlock it (or activate the empty shell, then delete it) and re-run the create+write. Do not bypass Rule 7 by writing over source you never read.';
 /** Refuses a spec that would skip a gate without saying why. */
@@ -225,17 +237,21 @@ export function writeToolHandler(spec) {
     return (args, ctx) => runWritePipeline(args, ctx, spec);
 }
 /** Rule 7 — runs the spec's snapshot gate. A ToolResult means: refused, stop. */
-async function snapshotGate(a, ctx, spec, pre) {
+async function snapshotGate(a, ctx, spec, pre, preRead) {
     const s = spec.snapshot;
     if (s.kind === 'none')
         return undefined;
     if (s.kind === 'source') {
         const type = s.type(a);
         const name = s.name(a);
+        // Rule 7a guard already read this object before the approval: reuse it.
+        const read = () => (preRead && preRead.type === type && preRead.name === name
+            ? autoSnapshot(name, type, ctx.adt, preRead.outcome)
+            : autoSnapshot(name, type, ctx.adt));
         if (!s.hard) {
             // Best-effort: the object may be a shell with no readable source.
             try {
-                pre.snapshot = await autoSnapshot(name, type, ctx.adt);
+                pre.snapshot = await read();
             }
             catch { /* swallowed, as before */ }
             emitSnapshotNotice(ctx, pre.snapshot, type, name);
@@ -244,7 +260,7 @@ async function snapshotGate(a, ctx, spec, pre) {
         // HARD gate: only a genuine 404 (new object) may proceed snapshot-less. A
         // read failure on a possibly-EXISTING object means no recovery copy → block.
         try {
-            pre.snapshot = await autoSnapshot(name, type, ctx.adt);
+            pre.snapshot = await read();
         }
         catch (err) {
             return refuse({ error: ERR.SNAPSHOT_FAILED, detail: String(err) });
@@ -345,6 +361,26 @@ export async function runWritePipeline(args, ctx, spec) {
         if (refusal)
             return refuse(refusal);
     }
+    // ── Rule 7a in code (2026-10-22): a class rewrite that only changed method bodies ──
+    // Before the approval is spent. One read; the snapshot below reuses it.
+    // A refusal writes one audit line (status skipped) so Rule 7a firings can be counted.
+    let preRead;
+    if (spec.methodOnlyGuard) {
+        const g = spec.methodOnlyGuard(args);
+        if (typeCode(g.type) === 'CLAS') {
+            const startedAt = Date.now();
+            const r = await runMethodOnlyGuard(ctx.adt, g);
+            if ('refuse' in r) {
+                await auditLog(spec.audit.method, g.type, g.name, 'skipped', Date.now() - startedAt, methodOnlyAuditDetail(r.refuse));
+                return refuse(methodOnlyRefusal(r.refuse));
+            }
+            if (r.go)
+                preRead = { type: g.type, name: g.name, outcome: r.go };
+        }
+    }
+    // ── LT-15 D6: stopped before the approval is spent → nothing more ─────────
+    if (stopped(ctx))
+        return interrupted();
     // ── Gate 1: Approval ──────────────────────────────────────────────────────
     const verify = await verifyAndSpendApprovalId(raw.approval_id, spec.approval.object(args), spec.approval.op);
     if (!verify.ok)
@@ -406,9 +442,12 @@ export async function runWritePipeline(args, ctx, spec) {
         }).request;
     }
     // ── Gate 2: Snapshot (Rule 7) ─────────────────────────────────────────────
-    const snapRefusal = await snapshotGate(args, ctx, spec, pre);
+    const snapRefusal = await snapshotGate(args, ctx, spec, pre, preRead);
     if (snapRefusal)
         return snapRefusal;
+    // ── LT-15 D6: stopped during the reads above → no safety card, no preview ─
+    if (stopped(ctx))
+        return interruptedBeforeWrite();
     // ── Gate 3: Safety confirmation (Rule 7) ──────────────────────────────────
     if (spec.safetyConfirm && isSafetyConfirmEnabled()) {
         const r = await presentSafetyConfirmation(spec.safetyConfirm(args, pre.transport ?? ctx.currentTransport?.get() ?? ''));
@@ -418,6 +457,8 @@ export async function runWritePipeline(args, ctx, spec) {
     // ── preGate (preview, transport fit, package prepare) ─────────────────────
     if (spec.preGate) {
         const g = await spec.preGate(args, ctx, pre);
+        if ('interrupted' in g)
+            return interruptedBeforeWrite();
         if ('error' in g)
             return refuse(g.error);
         if (g.extra)

package/dist/ui/app.js

@@ -15,13 +15,14 @@ import { FooterLine } from './footer-line.js';
 import { ShortcutsSheet } from './widgets/shortcuts-sheet.js';
 import { wasPasted } from '../repl/paste-marker.js';
 import { turnStatusEmitter } from './turn-status-emitter.js';
-import { pickSlotOccupant, liveBudget, cardRowBudget, SLOT_ROWS_ESTIMATE, PALETTE_ROWS } from './live-area.js';
+import { pickSlotOccupant, liveBudget, cardRowBudget, queueRowBudget, SLOT_ROWS_ESTIMATE, PALETTE_ROWS } from './live-area.js';
 import { Checklist } from './checklist.js';
 import { formatChecklist, isPlanFinished, CHECKLIST_MAX_ROWS } from '../renderer/checklist-format.js';
 import { listWorkspaceFileChoices } from '../repl/at-picker.js';
 import { SessionTimeline, toTimelineEntry } from './session-timeline.js';
 import { RewindPanel } from './rewind-panel.js';
 import { rewindEmitter } from './rewind-emitter.js';
+import { queueBoxEmitter } from './queue-box-emitter.js';
 import { todoEmitter } from './todo-emitter.js';
 import { approvalEmitter } from './approval-emitter.js';
 import { useHoldRawMode } from './widgets/hold-raw-mode.js';
@@ -37,8 +38,8 @@ import { FilesCard } from './widgets/files-card.js';
 import { filesCardEmitter } from './files-card-emitter.js';
 import { uiWidth } from '../renderer/ui-width.js';
 import { runModeCommand } from '../repl/mode-cycle.js';
-import { enqueueSteering } from '../agent/steering-queue.js';
-import { steeringEchoLine, classifyMidTurnLine, midTurnSlashHint } from '../renderer/steering-echo.js';
+import { enqueueSteering, subscribeSteering, steeringSnapshot, withdrawLastSteering, drainSteeringText } from '../agent/steering-queue.js';
+import { classifyMidTurnLine, midTurnSlashHint, formatQueueRow } from '../renderer/steering-echo.js';
 // Moved to renderer/steering-echo.ts (piece 2 I1); re-exported for existing importers.
 export { STEERING_ECHO_MAX, formatSteeringEcho } from '../renderer/steering-echo.js';
 /**
@@ -48,6 +49,8 @@ export { STEERING_ECHO_MAX, formatSteeringEcho } from '../renderer/steering-echo
  * words.
  */
 const ASKING_OCCUPANTS = new Set(['ask', 'confirm', 'approval', 'coaching', 'files']);
+/** LT-15 Revision 2 — the plan gate's confirm card id (approvals/render.ts renderPlanGate). */
+export const PLAN_GATE_CARD_ID = 'plan-gate';
 export function isAskingOccupant(occupant) {
     return ASKING_OCCUPANTS.has(occupant);
 }
@@ -66,7 +69,7 @@ export function isAskingOccupant(occupant) {
  *
  * The terminal's native scrollback handles everything above the live area.
  */
-export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger, getToolCalls, getTodos, getRewindCandidates, onRewindRestore, sapRole, sapAlias, onInterrupt, onExitRequest }) {
+export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger, getToolCalls, getTodos, getRewindCandidates, onRewindRestore, sapRole, sapAlias, onInterrupt, onExitRequest, onBrake, onCardStop }) {
     // 1.1.29 — keep raw mode held across card hand-overs (Windows froze the
     // approval card when Ink released it between cards). See hold-raw-mode.ts.
     useHoldRawMode();
@@ -117,6 +120,14 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
     const [todos, setTodos] = useState(() => getTodos?.() ?? []);
     const [planClosed, setPlanClosed] = useState(() => isPlanFinished(getTodos?.() ?? []));
     const [checklistExpanded, setChecklistExpanded] = useState(false);
+    // LT-15 Feature 1 — the messages typed while the model works, waiting for
+    // its next round. Mirrors the steering queue (subscribed below).
+    const [waiting, setWaiting] = useState(() => steeringSnapshot());
+    // LT-15 Feature 2 — "a turn is running or about to" as state, so the row's
+    // "· ↑ to edit" hint follows it. The ↑ itself re-checks isBusy() live.
+    const [busy, setBusy] = useState(() => turnStatusEmitter.isBusy());
+    // LT-15 (review I3) — the Footer's put-text-in-the-box handle.
+    const footerBoxRef = useRef(null);
     // Task 3 (ux-wave3) — the Esc-Esc / /rewind panel + its lazily-loaded
     // candidate list. Candidates come from an ASYNC accessor (snapshots.list
     // reads fs), so the open handler loads them BEFORE flipping the panel on —
@@ -151,6 +162,9 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
     // palette pick that prefills would orphan the buffered lines. Pinned:
     // all live triggers stay dormant while the buffer is non-empty.
     const [footerBufferCount, setFooterBufferCount] = useState(0);
+    // LT-15 Task 5b (F5) — the Footer's Ctrl+R search is open: Esc closes the
+    // search only, never the brake (mirrored up from the Footer).
+    const [fuzzyOpen, setFuzzyOpen] = useState(false);
     // Wave-2 review I-1: model-driven overlays (approval / ask-question /
     // coaching) must own input EXCLUSIVELY. A passive panel (the ? timeline,
     // the rewind panel) can be up when a request arrives —
@@ -259,6 +273,48 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
         // closure over the session object) — mount-once is intentional.
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
+    // LT-15 Feature 1 — follow the steering queue (enqueue, the loop's drain,
+    // a withdraw) so the queue row is right in the same render (I1.3). Re-seed
+    // AFTER subscribing: a change between the first render and this effect
+    // would otherwise be missed.
+    useEffect(() => {
+        const off = subscribeSteering((q) => setWaiting(q));
+        setWaiting(steeringSnapshot());
+        return off;
+    }, []);
+    useEffect(() => {
+        const onChange = () => setBusy(turnStatusEmitter.isBusy());
+        turnStatusEmitter.on('change', onChange);
+        setBusy(turnStatusEmitter.isBusy());
+        return () => { turnStatusEmitter.off('change', onChange); };
+    }, []);
+    // LT-15 (review I3) — take waiting text out of the queue and put it back in
+    // the input box: a multiline message lands as held lines plus its last
+    // line, so it stays readable (the input row shows a newline as a space).
+    // `take` says which text (Feature 2: the last message; Task 4 adds the
+    // whole queue). Without a box to put it in, nothing is taken, so a message
+    // can never be lost between the queue and the box.
+    const returnQueueToBox = useCallback((take) => {
+        const box = footerBoxRef.current;
+        if (!box)
+            return false;
+        const text = take();
+        if (text === null)
+            return false;
+        box.putInBox(text);
+        return true;
+    }, []);
+    // LT-15 Feature 2 — ↑ on an empty box while a turn runs. The Footer is
+    // disabled whenever a card, panel or palette is open, so this never fires
+    // under an overlay. At idle it misses and ↑ is plain history.
+    const withdrawToBox = useCallback(() => turnStatusEmitter.isBusy() && returnQueueToBox(withdrawLastSteering), [returnQueueToBox]);
+    // LT-15 Task 4 (D1, review I5) — repl.tsx asks for the WHOLE queue back in
+    // the box: a turn end after Ctrl+C or an error, or a session switch.
+    useEffect(() => {
+        const onReturn = () => { returnQueueToBox(drainSteeringText); };
+        queueBoxEmitter.on('return', onReturn);
+        return () => { queueBoxEmitter.off('return', onReturn); };
+    }, [returnQueueToBox]);
     // Task 3 (ux-wave3) — load candidates (async fs read) THEN show the panel, so
     // it never renders against a stale/empty list. Shared by the Esc-Esc chord and
     // the /rewind builtin (which signals through rewindEmitter — <App> is a
@@ -334,12 +390,11 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
                 setPrefill((p) => ({ text: line, nonce: p.nonce + 1 }));
                 return;
             }
-            if (t.length > 0) {
+            // LT-15 Feature 1 (D5) — no scrollback receipt: the live queue row
+            // shows the message while it waits (a withdrawn message must not leave
+            // a false receipt). The model still gets `t` verbatim.
+            if (t.length > 0)
                 enqueueSteering(t);
-                // Fast-follow: echo a truncated receipt, not the full (possibly
-                // multiline-pasted) text — the model still gets `t` verbatim.
-                chunkEmitter.emit('chunk', steeringEchoLine(t));
-            }
             setPrefill((p) => ({ text: '', nonce: p.nonce + 1 }));
             return;
         }
@@ -516,6 +571,11 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
         if (!(key.ctrl && input === 'c'))
             return;
         const r = onInterrupt?.();
+        // LT-15 Task 4 (D1) — Ctrl+C stopped something: the waiting messages go
+        // back into the box now (a message typed after the press comes back at
+        // the turn's end, through queueBoxEmitter).
+        if (r === 'stopped')
+            returnQueueToBox(drainSteeringText);
         if (exitHintTimer.current)
             clearTimeout(exitHintTimer.current);
         if (r === 'armed') {
@@ -526,6 +586,26 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
             setExitHint(false);
         }
     }, { isActive: !overlayOpen });
+    // LT-15 Task 5b — Esc while working is the emergency brake. Only while a
+    // dispatch is busy (idle Esc keeps its meaning: the Esc-Esc rewind chord
+    // above, I3.6) and only when nothing else owns that Esc: a card, sheet or
+    // palette (overlayOpen), a held multiline draft (the Footer discards it,
+    // also a taken-back multiline message) or the Ctrl+R search (the Footer
+    // closes it, F5). Ink gives every key to every active handler, so the gate
+    // is the render-time state: the Esc that closes the search or discards the
+    // draft finds this handler still inactive. The REPL decides and acts.
+    useInput((_input, key) => {
+        if (!key.escape)
+            return;
+        if (!turnStatusEmitter.isBusy())
+            return;
+        // LT-15 final review I1 — the render-time gate lags inside one input
+        // burst (↑ then Esc): ask the Footer now whether this Esc is its own
+        // (held lines in the box, or it just handled them).
+        if (footerBoxRef.current?.ownsEscape())
+            return;
+        onBrake?.({ overlayOpen, bufferCount: footerBufferCount, fuzzyOpen });
+    }, { isActive: !!onBrake && !overlayOpen && footerBufferCount === 0 && !fuzzyOpen });
     // I1(b) — clear ONLY when this request still owns the slot: a replacing
     // request (resolved-as-superseded in onReq) may already be pending, and the
     // old modal's resolve callback must not evict it.
@@ -604,7 +684,19 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
             foldedToOne: false,
         }).length
         : 0;
-    const budget = liveBudget({ rows, checklistRows: checklistDesiredRows, cardRows, inputLines, paletteRows });
+    // LT-15 Feature 1 — "N waiting" row, hidden while a card, panel or palette
+    // holds the input (the same set that disables the Footer). Its rows count
+    // against the height cap like the status strip, and it never takes more
+    // rows than are left (fix round 1, review I-2): it folds to one line.
+    // Feature 2 (review I6): "· ↑ to edit" only while ↑ would act — a turn
+    // runs and the box is empty (no text, no held lines).
+    const queueCanEdit = busy && footerValue === '' && footerBufferCount === 0;
+    const queueRowLines = overlayOpen
+        ? []
+        : formatQueueRow(waiting, queueRowBudget({ rows, checklistRows: checklistDesiredRows, paletteRows }), { canEdit: queueCanEdit });
+    const budget = liveBudget({
+        rows, checklistRows: checklistDesiredRows, cardRows, inputLines, paletteRows, queueRows: queueRowLines.length,
+    });
     let slot = null;
     if (occupant === 'approval' && pendingApproval) {
         slot = (_jsx(Box, { marginTop: 1, marginLeft: 2, children: _jsx(ApprovalModal, { change: pendingApproval.change, effectiveRisk: pendingApproval.effectiveRisk, transport: pendingApproval.transport, width: uiWidth(columns) - 2, onApply: () => {
@@ -616,11 +708,18 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
                 }, onDiff: () => { }, onCancel: () => {
                     pendingApproval.resolve({ approved: false, reason: '__cancel_turn__' });
                     clearApproval(pendingApproval);
-                }, onInterruptTurn: () => { onInterrupt?.(); } }, approvalSeq) }));
+                }, onInterruptTurn: () => { onInterrupt?.(); }, onStopTurn: () => { onCardStop?.(); } }, approvalSeq) }));
     }
     else if (occupant === 'confirm' && confirmSlot.pending) {
         const req = confirmSlot.pending;
-        slot = (_jsx(ConfirmCard, { request: req, width: uiWidth(columns), maxRows: rows - 6, onResolve: (r) => confirmSlot.finish(req, r), onInterruptTurn: () => { onInterrupt?.(); } }, confirmSlot.seq));
+        slot = (_jsx(ConfirmCard, { request: req, width: uiWidth(columns), maxRows: rows - 6, onResolve: (r) => {
+                // LT-15 Revision 2 — Cancel on the plan gate card stops the turn too.
+                if (req.id === PLAN_GATE_CARD_ID && r.value === 'cancel')
+                    onCardStop?.();
+                confirmSlot.finish(req, r);
+            }, onInterruptTurn: () => { onInterrupt?.(); }, 
+            // LT-15 Revision 2 — Esc on the plan gate card stops the turn; other cards only cancel.
+            onEscape: req.id === PLAN_GATE_CARD_ID ? () => { onCardStop?.(); } : undefined }, confirmSlot.seq));
     }
     else if (occupant === 'ask' && askQuestionPending) {
         const req = askQuestionPending;
@@ -668,7 +767,7 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
     }
     return (_jsx(SapStateContext.Provider, { value: globalStore, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Body, { chunkEmitter: chunkEmitter }), showChecklist && (_jsx(Checklist, { todos: todos, width: checklistWidth, maxRows: Math.max(1, budget.checklistRows - 1), expanded: checklistExpanded, 
                     // liveBudget folds the checklist to 1 row whenever a card is open (occupant !== null).
-                    foldedToOne: budget.checklistRows <= 1 })), slot, occupant === null && _jsx(TurnStatus, {}), _jsx(Footer, { onSubmit: beginSubmit, onSlashTrigger: handleSlashTrigger, onHistoryTrigger: handleHistoryTrigger, prefill: prefill, onValueChange: setFooterValue, onBufferChange: setFooterBufferCount, maxLines: budget.inputMaxLines, onInputLinesChange: setInputLines, 
+                    foldedToOne: budget.checklistRows <= 1 })), slot, occupant === null && _jsx(TurnStatus, {}), queueRowLines.length > 0 && (_jsx(Box, { flexDirection: "column", children: queueRowLines.map((l, i) => (_jsx(Text, { ...roleProps('dim'), wrap: "truncate-end", children: l }, i))) })), _jsx(Footer, { onSubmit: beginSubmit, onSlashTrigger: handleSlashTrigger, onHistoryTrigger: handleHistoryTrigger, prefill: prefill, onValueChange: setFooterValue, onBufferChange: setFooterBufferCount, onFuzzyChange: setFuzzyOpen, maxLines: budget.inputMaxLines, onInputLinesChange: setInputLines, onWithdraw: withdrawToBox, boxRef: footerBoxRef, 
                     // Spec §7: "(answer above to continue)" only while a card that asks
                     // waits — not for the timeline / rewind / shortcuts panels, nor an
                     // open `/` / `@` palette (those are not slot occupants).

package/dist/ui/approval-modal.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useRef, useState } from 'react';
 import { Box, Text, useInput, useStdout } from 'ink';
-import { riskReasonText, shownRiskReasons } from '../approvals/risk-floor.js';
+import { riskReasonTexts } from '../approvals/risk-floor.js';
 import { verbLine, viewAffordance, toSourceLines, affectsLine, releaseLines, behaviourLines } from '../approvals/op-labels.js';
 // BUG-1 (2026-07-05 live smoke): the interactive approval modal mounted
 // DEAD — every keypress ignored — when it appeared after a guarded
@@ -17,7 +17,9 @@ import { useReclaimRawStdin } from './widgets/reclaim-raw-stdin.js';
 import { getLook } from '../renderer/look.js';
 import { roleProps, inkChip, legacyInkColor } from './role-props.js';
 import { wrapRows } from '../renderer/wrap-rows.js';
+import { decodeDisplayBlock } from '../renderer/html-entities.js';
 import { uiWidth } from '../renderer/ui-width.js';
+import { cardBorderStyle } from './ascii-chars.js';
 /**
  * Fix batch 2026-10-12 (Task 2): why the risk went up is the decision input,
  * so the "Risk: … (raised: …)" text wraps onto up to this many rows (both
@@ -27,7 +29,7 @@ export const RISK_MAX_ROWS = 4;
 /** Border 2 + paddingX 2 on each side. */
 const MODAL_CHROME_COLS = 6;
 function riskText(effectiveRisk) {
-    const raised = shownRiskReasons(effectiveRisk.raisedBy).map(riskReasonText).join('; ');
+    const raised = riskReasonTexts(effectiveRisk).join('; ');
     return `Risk: ${effectiveRisk.level}${raised ? `  (raised: ${raised})` : ''}`;
 }
 /** The risk text as the rows it is drawn on at card width `width`. */
@@ -85,7 +87,7 @@ function diffLineColor(line, panels) {
 export const BACK_GUARD_MS = 300;
 /** The review view's key line, always at its bottom: how to go back and how to answer from here. */
 export const viewKeysLine = (reviewKey) => `Esc or ${reviewKey}: back · a: approve · s: skip · c: cancel turn`;
-export function ApprovalModal({ change, effectiveRisk, transport, onApply, onSkip, onDiff, onCancel, onInterruptTurn, width }) {
+export function ApprovalModal({ change, effectiveRisk, transport, onApply, onSkip, onDiff, onCancel, onInterruptTurn, onStopTurn, width }) {
     const cardWidth = width ?? uiWidth();
     // BUG-1 — re-assert raw mode on mount so keypresses reach useInput even
     // when an inquirer gate ran earlier in the turn (see import block).
@@ -108,7 +110,7 @@ export function ApprovalModal({ change, effectiveRisk, transport, onApply, onSki
     const backAt = useRef(0);
     const back = () => { backAt.current = Date.now(); setViewing(false); };
     const viewLines = viewing && aff && change.diff
-        ? (aff.key === 'd' ? change.diff.split('\n') : toSourceLines(change.diff))
+        ? (aff.key === 'd' ? decodeDisplayBlock(change.diff).split('\n') : toSourceLines(change.diff))
         : [];
     const lastTop = Math.max(0, viewLines.length - viewRows);
     useInput((input, key) => {
@@ -149,6 +151,7 @@ export function ApprovalModal({ change, effectiveRisk, transport, onApply, onSki
                 return;
             }
             if (input === 'c') {
+                onStopTurn?.();
                 onCancel();
                 return;
             }
@@ -181,7 +184,10 @@ export function ApprovalModal({ change, effectiveRisk, transport, onApply, onSki
         }
         if (key.escape && Date.now() - backAt.current < BACK_GUARD_MS)
             return;
+        // LT-15 Revision 2 — Esc / [c] stop the whole turn (the same safe stop as
+        // the Esc brake), then resolve the card with the cancel-turn result.
         if (input === 'c' || key.escape) {
+            onStopTurn?.();
             onCancel();
             return;
         }
@@ -197,7 +203,7 @@ export function ApprovalModal({ change, effectiveRisk, transport, onApply, onSki
         const where = scrolls
             ? `  lines ${from + 1}–${from + shownLines.length} of ${viewLines.length} · ↑↓ scroll`
             : '';
-        return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: panels ? roleProps('frame').color : quiet, paddingX: 1, children: [_jsxs(Text, { bold: true, wrap: "truncate-end", children: [isDiff ? 'Diff' : aff.label, _jsx(Text, { color: quiet, children: where })] }), change.diff ? (isDiff ? (shownLines.map((line, i) => (_jsx(Text, { wrap: "truncate-end", color: diffLineColor(line, panels), children: line }, from + i)))) : (shownLines.map((line, i) => (_jsxs(Text, { wrap: "truncate-end", children: [_jsxs(Text, { color: quiet, children: [String(from + i + 1).padStart(4), "  "] }), line] }, from + i))))) : (_jsx(Text, { dimColor: true, children: "(no source provided by the model)" })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { wrap: "truncate-end", children: viewKeysLine(aff.key) }) })] }));
+        return (_jsxs(Box, { flexDirection: "column", borderStyle: cardBorderStyle(), borderColor: panels ? roleProps('frame').color : quiet, paddingX: 1, children: [_jsxs(Text, { bold: true, wrap: "truncate-end", children: [isDiff ? 'Diff' : aff.label, _jsx(Text, { color: quiet, children: where })] }), change.diff ? (isDiff ? (shownLines.map((line, i) => (_jsx(Text, { wrap: "truncate-end", color: diffLineColor(line, panels), children: line }, from + i)))) : (shownLines.map((line, i) => (_jsxs(Text, { wrap: "truncate-end", children: [_jsxs(Text, { color: quiet, children: [String(from + i + 1).padStart(4), "  "] }), line] }, from + i))))) : (_jsx(Text, { dimColor: true, children: "(no source provided by the model)" })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { wrap: "truncate-end", children: viewKeysLine(aff.key) }) })] }));
     }
     // Pre-wrapped rows, never Ink soft-wrap (Wave-1 rule): every row is counted.
     const risks = riskRows(effectiveRisk, cardWidth);
@@ -229,7 +235,7 @@ export function ApprovalModal({ change, effectiveRisk, transport, onApply, onSki
     if (getLook() === 'panels') {
         const risk = roleProps(riskRole(effectiveRisk.level));
         const tag = inkChip('APPROVAL');
-        return (_jsxs(Box, { flexDirection: "column", width: cardWidth, borderStyle: "round", borderColor: risk.color, paddingX: 2, paddingY: 1, children: [_jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { ...tag.props, children: tag.text }), _jsx(Text, { children: '  ' }), _jsx(Text, { ...(change.op === 'delete' ? roleProps('bad') : {}), bold: true, children: verb }), change.op === 'create' ? _jsx(Text, { ...roleProps('dim'), children: "  (new object)" }) : null] }), affects.map((row, i) => _jsx(Text, { ...roleProps('dim'), wrap: "truncate-end", children: row }, `affects-${i}`)), metaSegs.length > 0 && _jsx(Text, { ...roleProps('dim'), wrap: "truncate-end", children: metaSegs.join(' · ') }), risks.map((row, i) => _jsx(Text, { ...risk, wrap: "truncate-end", children: row }, `risk-${i}`)), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { ...roleProps('sap', { bold: true }), children: keys[0] }), _jsx(Text, { children: '   ' + keys.slice(1).join('   ') })] }) })] }));
+        return (_jsxs(Box, { flexDirection: "column", width: cardWidth, borderStyle: cardBorderStyle(), borderColor: risk.color, paddingX: 2, paddingY: 1, children: [_jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { ...tag.props, children: tag.text }), _jsx(Text, { children: '  ' }), _jsx(Text, { ...(change.op === 'delete' ? roleProps('bad') : {}), bold: true, children: verb }), change.op === 'create' ? _jsx(Text, { ...roleProps('dim'), children: "  (new object)" }) : null] }), affects.map((row, i) => _jsx(Text, { ...roleProps('dim'), wrap: "truncate-end", children: row }, `affects-${i}`)), metaSegs.length > 0 && _jsx(Text, { ...roleProps('dim'), wrap: "truncate-end", children: metaSegs.join(' · ') }), risks.map((row, i) => _jsx(Text, { ...risk, wrap: "truncate-end", children: row }, `risk-${i}`)), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { ...roleProps('sap', { bold: true }), children: keys[0] }), _jsx(Text, { children: '   ' + keys.slice(1).join('   ') })] }) })] }));
     }
-    return (_jsxs(Box, { flexDirection: "column", width: cardWidth, borderStyle: "round", borderColor: legacyInkColor(riskColor(effectiveRisk.level)), paddingX: 2, paddingY: 1, children: [_jsx(Text, { bold: true, children: "Write approval" }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { bold: true, color: verbColor, children: verb }), change.op === 'create' ? _jsx(Text, { dimColor: true, children: "  (new object)" }) : null] }) }), affects.map((row, i) => (_jsx(Text, { dimColor: true, wrap: "truncate-end", children: row }, `affects-${i}`))), metaSegs.length > 0 && (_jsx(Text, { dimColor: true, wrap: "truncate-end", children: metaSegs.join(' · ') })), risks.map((row, i) => (_jsx(Text, { color: legacyInkColor(riskColor(effectiveRisk.level)), wrap: "truncate-end", children: row }, `risk-${i}`))), _jsx(Box, { marginTop: 1, children: _jsx(Text, { wrap: "truncate-end", children: keys.join('   ') }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", width: cardWidth, borderStyle: cardBorderStyle(), borderColor: legacyInkColor(riskColor(effectiveRisk.level)), paddingX: 2, paddingY: 1, children: [_jsx(Text, { bold: true, children: "Write approval" }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { bold: true, color: verbColor, children: verb }), change.op === 'create' ? _jsx(Text, { dimColor: true, children: "  (new object)" }) : null] }) }), affects.map((row, i) => (_jsx(Text, { dimColor: true, wrap: "truncate-end", children: row }, `affects-${i}`))), metaSegs.length > 0 && (_jsx(Text, { dimColor: true, wrap: "truncate-end", children: metaSegs.join(' · ') })), risks.map((row, i) => (_jsx(Text, { color: legacyInkColor(riskColor(effectiveRisk.level)), wrap: "truncate-end", children: row }, `risk-${i}`))), _jsx(Box, { marginTop: 1, children: _jsx(Text, { wrap: "truncate-end", children: keys.join('   ') }) })] }));
 }

package/dist/ui/ascii-chars.js

@@ -1,6 +1,24 @@
 import { shouldUseUnicodeBoxChars } from '../renderer/tty.js';
-export const UNICODE_BOX = { tl: '\u256D', tr: '\u256E', bl: '\u2570', br: '\u256F', h: '\u2500', v: '\u2502' };
+export const UNICODE_BOX = { tl: '╭', tr: '╮', bl: '╰', br: '╯', h: '─', v: '│' };
+/** Square single-line frame (hand-drawn auto-approve nag box). */
+export const SQUARE_BOX = { tl: '┌', tr: '┐', bl: '└', br: '┘', h: '─', v: '│' };
+/** Double-line frame (hand-drawn advisory proposal). */
+export const DOUBLE_BOX = { tl: '╔', tr: '╗', bl: '╚', br: '╝', h: '═', v: '║' };
 export const ASCII_BOX = { tl: '+', tr: '+', bl: '+', br: '+', h: '-', v: '|' };
-export function getBoxChars() {
-    return shouldUseUnicodeBoxChars() ? UNICODE_BOX : ASCII_BOX;
+/**
+ * Characters for a hand-drawn frame: the card's own set (rounded by default),
+ * or the classic ASCII set on an old Windows console (tty.ts
+ * isWindowsLegacyTerminal). Every set is one cell per character, so the
+ * frame never changes width.
+ */
+export function getBoxChars(modern = UNICODE_BOX) {
+    return shouldUseUnicodeBoxChars() ? modern : ASCII_BOX;
+}
+/**
+ * Ink `borderStyle` for a bordered card: the card's own style (rounded by
+ * default) everywhere, Ink's 'classic' (+ - |, the same frame the change card
+ * draws by hand) on an old Windows console. One-cell border either way.
+ */
+export function cardBorderStyle(modern) {
+    return shouldUseUnicodeBoxChars() ? (modern ?? 'round') : 'classic';
 }