npm - @cspeach/cli - Versions diffs - 1.0.0 → 1.1.1 - Mend

@cspeach/cli 1.0.0 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (100) hide show

package/dist/agent/loop.js +22 -9
package/dist/approvals/op-labels.js +124 -0
package/dist/approvals/render.js +42 -36
package/dist/cli.js +15 -0
package/dist/commands/compact.js +28 -2
package/dist/commands/config-set.js +189 -0
package/dist/commands/config-show.js +20 -0
package/dist/commands/export-audit.js +43 -0
package/dist/commands/help.js +5 -0
package/dist/commands/plan-audit-evidence.js +266 -0
package/dist/commands/plan-audit.js +692 -0
package/dist/commands/plan-chain.js +671 -0
package/dist/commands/plan-continue.js +179 -0
package/dist/commands/plan-gate.js +154 -0
package/dist/commands/plan-resume.js +588 -33
package/dist/config/loader.js +128 -4
package/dist/config/model-defaults.js +14 -0
package/dist/cost/pricing.js +27 -1
package/dist/doctor/checks/system-roles.js +41 -0
package/dist/doctor/run.js +2 -0
package/dist/models/resolve.js +61 -0
package/dist/models/server-config.js +155 -0
package/dist/one-shot.js +25 -3
package/dist/projects/extract-cca.js +3 -1
package/dist/projects/extract-modernize.js +3 -1
package/dist/projects/extract-plan.js +60 -6
package/dist/projects/extract-test-coverage.js +3 -1
package/dist/projects/extract-upgrade.js +3 -1
package/dist/projects/handover-md.js +195 -0
package/dist/projects/index.js +1 -1
package/dist/projects/plan-run.js +137 -13
package/dist/projects/plan-schema.js +73 -0
package/dist/projects/run-lease.js +157 -0
package/dist/projects/save-command.js +26 -15
package/dist/renderer/status-footer.js +22 -12
package/dist/renderer/thinking-heartbeat.js +64 -8
package/dist/renderer/todo-block.js +51 -0
package/dist/renderer/tool-widget.js +37 -0
package/dist/repl/bracketed-paste.js +28 -19
package/dist/repl/builtin-commands.js +5 -0
package/dist/repl/current-transport.js +10 -0
package/dist/repl/history.js +86 -0
package/dist/repl/ink-stdin-guard.js +64 -0
package/dist/repl/mode-ceiling.js +16 -0
package/dist/repl/mode-cycle.js +104 -0
package/dist/repl/post-turn-status.js +24 -4
package/dist/repl/slash-completer.js +5 -0
package/dist/repl.js +954 -83
package/dist/rewind/candidates.js +194 -0
package/dist/rewind/cli.js +137 -0
package/dist/rewind/format.js +27 -0
package/dist/rewind/restore.js +245 -0
package/dist/session/audit-export.js +459 -0
package/dist/session/context-report.js +163 -0
package/dist/session/recap.js +160 -0
package/dist/skill-catalog.js +9 -3
package/dist/skills/bundled-skills.js +71 -78
package/dist/tools/approval.js +115 -7
package/dist/tools/ask-question.js +304 -3
package/dist/tools/extend-model/anchored-insert.js +604 -0
package/dist/tools/extend-model/tool.js +162 -10
package/dist/tools/fiori/fe-extend.js +76 -0
package/dist/tools/fiori/fe-scaffold.js +29 -3
package/dist/tools/fiori/floorplan-map.js +19 -0
package/dist/tools/fiori/samples/data/index.json +13602 -0
package/dist/tools/fiori/samples/data/sources.generated.js +808 -0
package/dist/tools/fiori/samples/loader.js +248 -0
package/dist/tools/fiori/samples/search.js +63 -0
package/dist/tools/fiori/samples/types.js +2 -0
package/dist/tools/fiori/smoke/assertions.js +74 -0
package/dist/tools/fiori/smoke/browser.js +52 -0
package/dist/tools/fiori/smoke/driver.js +89 -0
package/dist/tools/fiori/smoke/freestyle-spec.js +317 -0
package/dist/tools/fiori/smoke/run-smoke.js +149 -0
package/dist/tools/fiori/tools.js +328 -3
package/dist/tools/local-build.js +11 -1
package/dist/tools/sap-read.js +79 -11
package/dist/tools/sap-write.js +24 -4
package/dist/tools/snapshot.js +27 -1
package/dist/tools/subagent/agent_run.js +27 -3
package/dist/tools/todo.js +144 -0
package/dist/ui/app.js +372 -19
package/dist/ui/approval-modal.js +49 -16
package/dist/ui/ask-question-emitter.js +14 -0
package/dist/ui/context-grid.js +108 -0
package/dist/ui/footer.js +109 -30
package/dist/ui/header.js +7 -0
package/dist/ui/line-resolution.js +18 -2
package/dist/ui/rewind-emitter.js +10 -0
package/dist/ui/rewind-panel.js +81 -0
package/dist/ui/sap-state-store.js +1 -0
package/dist/ui/status-line.js +43 -0
package/dist/ui/text-input.js +72 -8
package/dist/ui/todo-emitter.js +25 -0
package/dist/ui/todo-panel.js +64 -0
package/dist/ui/turn-status-emitter.js +50 -4
package/dist/ui/turn-status.js +18 -3
package/dist/ui/widgets/ask-form.js +242 -0
package/dist/ui/widgets/ask-question-modal.js +17 -7
package/package.json +4 -1

package/dist/ui/app.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback, useRef } from 'react';
 import { Box, useInput } from 'ink';
 import crypto from 'node:crypto';
 import { Body } from './body.js';
@@ -9,10 +9,15 @@ import { CommandPalette } from './command-palette.js';
 import { FilePalette } from './file-palette.js';
 import { nextResolutionStep, applySlashPick } from './line-resolution.js';
 import { TurnStatus } from './turn-status.js';
+import { StatusLine } from './status-line.js';
 import { turnStatusEmitter } from './turn-status-emitter.js';
 import { listWorkspaceFileChoices } from '../repl/at-picker.js';
 import { RichErrorBox } from './rich-error-box.js';
 import { SessionTimeline, toTimelineEntry } from './session-timeline.js';
+import { TodoPanel } from './todo-panel.js';
+import { RewindPanel } from './rewind-panel.js';
+import { rewindEmitter } from './rewind-emitter.js';
+import { todoEmitter } from './todo-emitter.js';
 import { approvalEmitter } from './approval-emitter.js';
 import { errorEmitter } from './error-emitter.js';
 import { SapStateContext, globalStore } from './sap-state-store.js';
@@ -20,25 +25,78 @@ import { coachingPickerEmitter } from './coaching-picker-emitter.js';
 import { CoachingPicker } from './widgets/coaching-picker.js';
 import { askQuestionEmitter } from './ask-question-emitter.js';
 import { AskQuestionModal } from './widgets/ask-question-modal.js';
+import { AskForm } from './widgets/ask-form.js';
+import { runModeCommand } from '../repl/mode-cycle.js';
 import { enqueueSteering } from '../agent/steering-queue.js';
+/**
+ * Wave1 fast-follow — steering-echo truncation. The `↳ queued ▸` line
+ * used to echo the ENTIRE queued text; a queued multiline paste dumped a
+ * whole banner into scrollback (observed live). Show only the first line,
+ * clipped to STEERING_ECHO_MAX chars, with `… (+N lines)` when more lines
+ * were queued (`…` alone when just the first line was clipped). Exported
+ * for the format-pinning test.
+ */
+export const STEERING_ECHO_MAX = 60;
+export function formatSteeringEcho(text) {
+    const lines = text.split('\n');
+    const first = lines[0] ?? '';
+    const extra = lines.length - 1;
+    const clipped = first.length > STEERING_ECHO_MAX;
+    let out = clipped ? first.slice(0, STEERING_ECHO_MAX) : first;
+    if (clipped || extra > 0)
+        out += '…';
+    if (extra > 0)
+        out += ` (+${extra} line${extra === 1 ? '' : 's'})`;
+    return out;
+}
 /**
  * App — inline-mode Ink frame (Phase D6, 2026-05-17). After the
  * alt-screen detour, reverted to CC's architecture:
  *
- *   <Header />                  ← renders once, becomes scrollback
+ *   (startup banner)            ← printed once by repl.tsx, becomes scrollback
  *   <Body chunkEmitter=… />     ← <Static> commits each node, becomes scrollback
  *   {coachingPending && …}      ← inline overlays that mount above input
  *   {askQuestionPending && …}
+ *   <TurnStatus />              ← dynamic, live turn progress
+ *   <StatusLine />              ← dynamic, persistent SAP statusline (Task 4)
  *   <Footer />                  ← dynamic, re-renders at cursor (sticky-ish)
  *
  * No alt-screen, no termHeight, no PgUp scroll state. The terminal's
  * native scrollback handles all of it — mouse wheel, PgUp, search,
  * everything just works because we render inline like a normal CLI.
  */
-export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger, getToolCalls, writeMode, onInterrupt }) {
+export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger, getToolCalls, getTodos, getRewindCandidates, onRewindRestore, sapRole, sapAlias, onInterrupt }) {
     const [pendingApproval, setPendingApproval] = useState(null);
+    // Task 3 review I1(b): synchronous mirror + monotonic remount key — the same
+    // I2 treatment ask-question already has. A second approval request arriving
+    // before React re-renders must still see (and resolve) the first one, or the
+    // first producer's promise leaks and its await hangs forever (traced worst
+    // case: a turn's write approval arriving while a rewind restore's approval
+    // pends → wedged restore / permanently busy session).
+    const pendingApprovalRef = useRef(null);
+    const [approvalSeq, setApprovalSeq] = useState(0);
     const [coachingPending, setCoachingPending] = useState(null);
+    // Task 3 review I1(c): synchronous mirror for the coaching overlay — the
+    // rewind open path re-checks refs after its async candidate load (state can
+    // lag an arrival that happened during the await).
+    const coachingPendingRef = useRef(null);
+    // UX Wave 2 / Task 2 — discriminated union: v1 single-question requests
+    // render the untouched <AskQuestionModal>; v2 form requests ('questions'
+    // in req) render <AskForm>. All the input gates below only check
+    // truthiness, so both shapes suppress the global handlers identically.
     const [askQuestionPending, setAskQuestionPending] = useState(null);
+    // Review fix (I2): synchronous mirror of the pending request so a second
+    // request arriving before React re-renders can still see (and resolve)
+    // the first one — otherwise the first tool call's promise leaks and
+    // hangs forever.
+    const askQuestionPendingRef = useRef(null);
+    // Review fix (I2, + T2 rider): monotonic counter keying <AskForm> AND
+    // <AskQuestionModal> so a replacing request REMOUNTS the widget instead
+    // of React reusing the instance with stale state (v1→v1 overlap had the
+    // same stale-state exposure as v2→v2). Deliberately NOT the formId /
+    // question id (collision caveat — two requests may legitimately share
+    // one).
+    const [askQuestionSeq, setAskQuestionSeq] = useState(0);
     // 2026-06-06 (Ink picker parity) — pre-dispatch line resolution. A
     // submitted line flows through nextResolutionStep (line-resolution.ts);
     // open-slash / open-at steps mount the matching palette seeded with the
@@ -48,9 +106,55 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
     const [prefill, setPrefill] = useState({ text: '', nonce: 0 });
     const [errorStack, setErrorStack] = useState([]);
     const [showTimeline, setShowTimeline] = useState(false);
+    // Task 5 (ux-wave2) — Ctrl+T todo panel + the todoEmitter-fed list.
+    // Seeded from getTodos() so a RESUMED session shows its persisted list
+    // before any todo_set fires in this process.
+    const [showTodoPanel, setShowTodoPanel] = useState(false);
+    const [todos, setTodos] = useState(() => getTodos?.() ?? []);
+    // 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 —
+    // the panel always renders against populated data, never a loading flash.
+    const [showRewindPanel, setShowRewindPanel] = useState(false);
+    const [rewindCandidates, setRewindCandidates] = useState([]);
+    // Two-Esc chord detector: timestamp of the last lone Esc seen at idle.
+    const lastEscRef = useRef(0);
     const [footerValue, setFooterValue] = useState('');
+    // Task 7 (ux-wave1) — continuation-buffer depth mirrored up from the
+    // Footer. While a multiline draft is pending the input line is EMPTY
+    // between continuation lines, so every footerValue === '' live trigger
+    // (`/`, `@`, `?`, Shift+Tab/Alt+M) would fire mid-composition; a
+    // 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);
+    // Wave-2 review I-1: model-driven overlays (approval / ask-question /
+    // coaching) must own input EXCLUSIVELY. The todo panel opens MID-TURN by
+    // design, so a request can arrive while it (or the ? timeline) is up —
+    // leaving BOTH useInputs active. Ink delivers every keypress to every
+    // active subscriber (no stopPropagation), so one Esc would close the
+    // panel AND fire the approval modal's onCancel — silently declining a
+    // pending write; `q` typed into a free-text ask-form answer would close
+    // the panel behind it; and panel + modal stacked can overflow a 24-row
+    // terminal. Fix at the arrival site: evict the passive panels BEFORE
+    // mounting the modal. (The user can Ctrl+T / ? again after answering.)
     useEffect(() => {
-        const onReq = (req) => setPendingApproval(req);
+        const onReq = (req) => {
+            // I1(b) — a replacing request must not leak the previous producer's
+            // promise (renderApprovalModalAndAwait or the rewind restore bridge
+            // would await forever). Resolve the old one as declined first — the
+            // decline shape both producers already handle.
+            const prev = pendingApprovalRef.current;
+            if (prev) {
+                prev.resolve({ approved: false, reason: 'superseded by a newer approval request' });
+            }
+            pendingApprovalRef.current = req;
+            setApprovalSeq((s) => s + 1);
+            setShowTodoPanel(false); // I-1 — evict passive panels, see block comment
+            setShowTimeline(false);
+            setShowRewindPanel(false); // Task 3 — rewind panel joins the eviction family
+            lastEscRef.current = 0; // M3 — a mounting overlay kills any armed Esc chord
+            setPendingApproval(req);
+        };
         approvalEmitter.on('request', onReq);
         return () => {
             approvalEmitter.off('request', onReq);
@@ -58,6 +162,11 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
     }, []);
     useEffect(() => {
         const onRequest = (req) => {
+            coachingPendingRef.current = req; // I1(c) — synchronous mirror
+            setShowTodoPanel(false); // I-1 — same eviction as approval/ask-question
+            setShowTimeline(false);
+            setShowRewindPanel(false); // Task 3 — rewind panel joins the eviction family
+            lastEscRef.current = 0; // M3 — a mounting overlay kills any armed Esc chord
             setCoachingPending(req);
         };
         coachingPickerEmitter.on('request', onRequest);
@@ -67,11 +176,41 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
     }, []);
     useEffect(() => {
         const onRequest = (req) => {
+            // Review fix (I2): a second request while one is pending must not
+            // leak the first promise (the earlier tool call would hang forever).
+            // Resolve it cancelled first, in the correct shape for its kind.
+            const prev = askQuestionPendingRef.current;
+            if (prev) {
+                if ('questions' in prev) {
+                    prev.resolve({ formId: prev.formId, answers: [], cancelled: true });
+                }
+                else {
+                    prev.resolve({ answer: null, cancelled: true });
+                }
+            }
+            askQuestionPendingRef.current = req;
+            setAskQuestionSeq((s) => s + 1);
+            setShowTodoPanel(false); // I-1 — evict passive panels, see approval block
+            setShowTimeline(false);
+            setShowRewindPanel(false); // Task 3 — rewind panel joins the eviction family
+            lastEscRef.current = 0; // M3 — a mounting overlay kills any armed Esc chord
             setAskQuestionPending(req);
         };
         askQuestionEmitter.on('request', onRequest);
         return () => { askQuestionEmitter.off('request', onRequest); };
     }, []);
+    // Task 5 (ux-wave2) — todo_set fan-out → panel/strip state. Re-seed from
+    // getTodos AFTER subscribing (TurnStatus snapshot pattern): an update
+    // fired between mount and this effect would otherwise be missed.
+    useEffect(() => {
+        const onUpdate = (t) => setTodos(t);
+        todoEmitter.on('update', onUpdate);
+        setTodos(getTodos?.() ?? []);
+        return () => { todoEmitter.off('update', onUpdate); };
+        // getTodos is stable for the life of the mount (repl.tsx passes a
+        // closure over the session object) — mount-once is intentional.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     useEffect(() => {
         const onError = (err) => {
             const id = crypto.randomUUID();
@@ -83,6 +222,31 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
         errorEmitter.on('error', onError);
         return () => { errorEmitter.off('error', onError); };
     }, []);
+    // 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
+    // separate tree from repl.tsx's dispatch). An empty list is a valid open: the
+    // panel shows its "no restorable writes this session" state.
+    const openRewind = useCallback(() => {
+        void (async () => {
+            const cands = getRewindCandidates ? await getRewindCandidates() : [];
+            // I1(c) — re-check AFTER the async load: a model-driven overlay request
+            // or a turn start may have arrived during the await, and mounting the
+            // panel now would stack it over (and key-fight) the modal. Refs, not
+            // state — state can lag an arrival inside the await window.
+            if (turnStatusEmitter.isBusy())
+                return;
+            if (pendingApprovalRef.current || coachingPendingRef.current || askQuestionPendingRef.current)
+                return;
+            setRewindCandidates(cands);
+            setShowRewindPanel(true);
+        })();
+    }, [getRewindCandidates]);
+    useEffect(() => {
+        const onOpen = () => openRewind();
+        rewindEmitter.on('open', onOpen);
+        return () => { rewindEmitter.off('open', onOpen); };
+    }, [openRewind]);
     // Run one step of the pre-dispatch pipeline and act on the outcome.
     const handleStep = useCallback((step, original, files) => {
         switch (step.kind) {
@@ -109,7 +273,12 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
         // pick would have dispatched a SECOND concurrent turn into the same
         // session. Keep the typed text in the input and tell the user; proper
         // CC-style input queueing is a follow-up (docs/backlog.md).
-        if (turnStatusEmitter.snapshot().active) {
+        // BUG-2b (2026-07-05) — isBusy() (active OR reserved), not just active.
+        // A turn's async pre-turn prep (classifier / plan-resume / guarded
+        // inquirer gate) runs BEFORE turnStatusEmitter.start() marks it active;
+        // reading .active alone left that window unguarded, so a second Enter
+        // dispatched a concurrent twin turn. reserve() covers the whole window.
+        if (turnStatusEmitter.isBusy()) {
             // CC-style mid-turn steering (2026-06-08): the user typed a correction
             // while the model works. Queue it — the turn loop injects it as a user
             // message at the next round boundary — clear the box, and confirm it
@@ -117,7 +286,9 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
             const t = line.trim();
             if (t.length > 0) {
                 enqueueSteering(t);
-                chunkEmitter.emit('chunk', `\x1b[36m↳ queued ▸ ${t}\x1b[39m\n`);
+                // Fast-follow: echo a truncated receipt, not the full (possibly
+                // multiline-pasted) text — the model still gets `t` verbatim.
+                chunkEmitter.emit('chunk', `\x1b[36m↳ queued ▸ ${formatSteeringEcho(t)}\x1b[39m\n`);
             }
             setPrefill((p) => ({ text: '', nonce: p.nonce + 1 }));
             return;
@@ -135,16 +306,174 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
     }, [lineResolution]);
     // `?` key opens the timeline when the footer is empty and no other overlay
     // is active.
+    //
+    // Keystroke-leak note (Task 5, verified by probe): Ink delivers every
+    // keypress to EVERY active useInput subscriber — there is no
+    // stopPropagation — so a live-trigger character ALSO lands in the Footer's
+    // TextInput. Before Task 5 the `?` stayed hidden behind the overlay's
+    // disabled placeholder and reappeared in the input after Esc. The working
+    // mechanism is an explicit swallow: bump `prefill` with empty text, which
+    // the Footer applies on the next commit (footer.tsx honours empty prefills
+    // since Task 5). Every live trigger in this handler family does the same.
     useInput((input, _key) => {
-        if (input === '?' && footerValue === '')
+        if (footerBufferCount > 0)
+            return; // Task 7 — mid-composition, stay dormant
+        if (input === '?' && footerValue === '') {
             setShowTimeline(true);
-    }, { isActive: !lineResolution && !showTimeline && !pendingApproval && !coachingPending });
+            setPrefill((p) => ({ text: '', nonce: p.nonce + 1 })); // swallow leaked '?'
+        }
+    }, { isActive: !lineResolution && !showTimeline && !showTodoPanel && !showRewindPanel && !pendingApproval && !coachingPending && !askQuestionPending });
+    // Task 5 (ux-wave1) — live `/` opens the command palette immediately
+    // (CC-style), no Enter needed. Fill-in semantics: because the original
+    // line is empty, a pick PREFILLS `/{command} ` instead of running (the
+    // palette onSelect derives fillIn from lr.original === ''). Mid-turn the
+    // trigger stays dormant — same guard as beginSubmit — so `/` typed while
+    // the model works goes into the input as ordinary steering text.
+    useInput((input, _key) => {
+        if (input !== '/' || footerValue !== '')
+            return;
+        if (footerBufferCount > 0)
+            return; // Task 7 — mid-composition, stay dormant
+        if (turnStatusEmitter.isBusy())
+            return; // BUG-2b: steering, not palette (covers prep window)
+        setPrefill((p) => ({ text: '', nonce: p.nonce + 1 })); // swallow leaked '/'
+        handleSlashTrigger();
+    }, { isActive: !lineResolution && !showTimeline && !showTodoPanel && !showRewindPanel && !pendingApproval && !coachingPending && !askQuestionPending });
+    // Task 6 (ux-wave1) — live `@` opens the file palette with APPEND
+    // semantics: the partial line survives and the picked token lands where
+    // the user was typing (pick prefills `footerValue + '@' + name + ' '`
+    // via the existing at-mode onSelect below). Token-boundary rule: only
+    // on an empty footer or after a trailing space — `foo@bar` (emails,
+    // handles) keeps typing normally. Mid-turn the trigger stays dormant,
+    // same steering rationale as `/`.
+    //
+    // Cancel contract (reviewer spec-change): `original` INCLUDES the
+    // trigger `@`, so Esc restores `footerValue + '@'` — the `@` stays in
+    // the buffer as typed text. In this product a literal boundary `@` is
+    // CDS annotation vocabulary (`@Semantics.amount.currencyCode`,
+    // `@UI.lineItem`), so @→Esc must yield a typeable `@`, not an erase-
+    // and-retrigger loop (the restored line ends in '@', not space/empty,
+    // so the live trigger cannot re-fire while the user keeps typing).
+    //
+    // Swallow nuance vs `/`: this trigger also fires MID-LINE, so the
+    // leak-swallow prefill must carry the CURRENT footerValue — the Task-5
+    // empty-prefill trick would wipe the user's partial line along with
+    // the leaked `@`. (Both are one setValue in the Footer: text minus the
+    // leaked char. For `/` that text just happens to be empty.)
+    useInput((input, _key) => {
+        if (input !== '@')
+            return;
+        if (footerBufferCount > 0)
+            return; // Task 7 — mid-composition, stay dormant
+        if (footerValue !== '' && !footerValue.endsWith(' '))
+            return; // not a token boundary
+        if (turnStatusEmitter.isBusy())
+            return; // BUG-2b: steering, not palette (covers prep window)
+        const files = listWorkspaceFileChoices();
+        if (files.length === 0)
+            return; // nothing to pick — let `@` land as plain text
+        setPrefill((p) => ({ text: footerValue, nonce: p.nonce + 1 })); // swallow leaked '@', keep the line
+        setLineResolution({ mode: 'at', prefix: '', line: `${footerValue}@`, original: `${footerValue}@`, files });
+    }, { isActive: !lineResolution && !showTimeline && !showTodoPanel && !showRewindPanel && !pendingApproval && !coachingPending && !askQuestionPending });
+    // Task 3 (ux-wave1) — Shift+Tab / Alt+M cycle the session write mode.
+    // Same gating as the `?` handler: only when the footer is empty and no
+    // overlay owns input. Windows Terminal sends backtab as CSI Z, which Ink
+    // surfaces as key.tab + key.shift; Alt+M arrives as key.meta + 'm'.
+    // The cycle core lives in repl/mode-cycle.ts; the announce/refusal line
+    // comes back from runModeCommand and is committed dim to scrollback.
+    //
+    // Task 4 (ux-wave1) — the cycle base comes from the store, not a prop.
+    // repl.tsx seeds writeMode with the startup-EFFECTIVE mode (clamp of
+    // cfg.write_mode to the role ceiling) before render(). Byte-compat with
+    // the old cfg.write_mode prop: runModeCommand only uses the base as
+    // `clamp(sessionOverride ?? base, role)`, and clamp is idempotent —
+    // clamp(clamp(cfg, role), role) === clamp(cfg, role); after the first
+    // cycle the session override wins and the base is ignored entirely.
+    // globalStore.get() is synchronous (no rate-limiter lag — that only
+    // delays LISTENER notification, never the state itself).
+    useInput((input, key) => {
+        if (footerValue !== '')
+            return;
+        if (footerBufferCount > 0)
+            return; // Task 7 — mid-composition, stay dormant
+        const shiftTab = key.tab && key.shift;
+        const altM = key.meta && (input === 'm' || input === 'M');
+        if (!shiftTab && !altM)
+            return;
+        const { line, mode } = runModeCommand(undefined, globalStore.get().writeMode ?? 'approval-gated', sapRole, sapAlias);
+        chunkEmitter.emit('chunk', `\x1b[2m${line}\x1b[22m\n`);
+        globalStore.update({ writeMode: mode });
+        // Alt+M's 'm' also lands in the TextInput (see the leak note on the
+        // `?` handler) — swallow it. Backtab is harmless (TextInput ignores
+        // tab), but the swallow is a no-op for it anyway.
+        setPrefill((p) => ({ text: '', nonce: p.nonce + 1 }));
+    }, { isActive: !lineResolution && !showTimeline && !showTodoPanel && !showRewindPanel && !pendingApproval && !coachingPending && !askQuestionPending });
+    // Task 5 (ux-wave2) — Ctrl+T opens the todo panel. Same gate family as
+    // the Wave-1 live triggers (no overlay owns input, footer empty, no
+    // multiline draft) with ONE deliberate difference: mid-turn is ALLOWED —
+    // no turnStatusEmitter guard. Peeking at the model's task list WHILE it
+    // works is the point of the panel (the turn-status strip shows only the
+    // current item; Ctrl+T shows the whole plan). Closing is the panel's
+    // job (Esc/q/Ctrl+T in TodoPanel's useInput) — this handler is inactive
+    // while the panel is up, so the chord toggles instead of double-firing.
+    // Open re-reads getTodos(): cheap, and correct after a session resume
+    // (the emitter only fires on new todo_set calls). The leaked 't' is
+    // swallowed with an empty prefill — same mechanism as `?` / Alt+M
+    // (footerValue is '' by gate, so the empty prefill is lossless).
+    useInput((input, key) => {
+        if (!(key.ctrl && (input === 't' || input === 'T')))
+            return;
+        if (footerValue !== '')
+            return;
+        if (footerBufferCount > 0)
+            return; // Task 7 — mid-composition, stay dormant
+        setTodos(getTodos?.() ?? []);
+        setShowTodoPanel(true);
+        setPrefill((p) => ({ text: '', nonce: p.nonce + 1 })); // swallow leaked 't'
+    }, { isActive: !lineResolution && !showTimeline && !showTodoPanel && !showRewindPanel && !pendingApproval && !coachingPending && !askQuestionPending });
+    // Task 3 (ux-wave3) — Esc-Esc opens the rewind panel. Two Esc within 500ms
+    // at IDLE ONLY. The isActive gate is the full five-gate family (no overlay
+    // owns input, footer empty, no multiline draft) so a single Esc keeps its
+    // existing meaning everywhere: at idle it does nothing (this handler only
+    // ARMS on the first Esc — no side effect); while a multiline draft is
+    // buffered the Footer's discard-Esc owns it and this handler is inactive
+    // (footerBufferCount > 0 excluded), so the chord can never eat that Esc.
+    // Mid-turn is forbidden — a rewind while the model may be mid-write is
+    // unsafe — so the turn guard (isBusy covers the pre-turn reserve window too)
+    // both blocks opening AND disarms any half-formed chord.
+    useInput((_input, key) => {
+        if (!key.escape)
+            return;
+        if (turnStatusEmitter.isBusy()) {
+            lastEscRef.current = 0;
+            return;
+        }
+        const now = Date.now();
+        if (now - lastEscRef.current <= 500) {
+            lastEscRef.current = 0;
+            openRewind();
+        }
+        else {
+            lastEscRef.current = now;
+        }
+    }, {
+        isActive: !lineResolution && !showTimeline && !showTodoPanel && !showRewindPanel
+            && !pendingApproval && !coachingPending && !askQuestionPending
+            && footerValue === '' && footerBufferCount === 0,
+    });
     // Ctrl+C handler — abort in-flight turn or exit at idle.
     useInput((input, key) => {
         if (key.ctrl && input === 'c')
             onInterrupt?.();
     }, { isActive: true });
-    const clearApproval = () => setPendingApproval(null);
+    // 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.
+    const clearApproval = (req) => {
+        if (pendingApprovalRef.current === req)
+            pendingApprovalRef.current = null;
+        setPendingApproval((cur) => (cur === req ? null : cur));
+    };
     // Bare `/` + Enter — browse the full catalogue. Same palette as the
     // typed-prefix flow, just unfiltered, with nothing to restore on cancel.
     const handleSlashTrigger = () => {
@@ -163,11 +492,28 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
         : [];
     return (_jsx(SapStateContext.Provider, { value: globalStore, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Body, { chunkEmitter: chunkEmitter }), coachingPending && (_jsx(CoachingPicker, { params: coachingPending.params, onResolve: (result) => {
                         coachingPending.resolve(result);
+                        if (coachingPendingRef.current === coachingPending) {
+                            coachingPendingRef.current = null; // I1(c) — keep the mirror true
+                        }
                         setCoachingPending(null);
-                    } })), askQuestionPending && (_jsx(AskQuestionModal, { params: askQuestionPending, onResolve: (result) => {
+                    } })), askQuestionPending && ('questions' in askQuestionPending ? (_jsx(AskForm, { request: askQuestionPending, onResolve: (result) => {
+                        askQuestionPending.resolve(result);
+                        // Only clear when this request is still the pending one — a
+                        // replacing request (I2) may already own the slot.
+                        if (askQuestionPendingRef.current === askQuestionPending) {
+                            askQuestionPendingRef.current = null;
+                            setAskQuestionPending(null);
+                        }
+                    } }, askQuestionSeq)) : (_jsx(AskQuestionModal, { params: askQuestionPending, onResolve: (result) => {
                         askQuestionPending.resolve(result);
-                        setAskQuestionPending(null);
-                    } })), _jsx(TurnStatus, {}), _jsx(Footer, { onSubmit: beginSubmit, onSlashTrigger: handleSlashTrigger, onHistoryTrigger: handleHistoryTrigger, prefill: prefill, onValueChange: setFooterValue,
+                        if (askQuestionPendingRef.current === askQuestionPending) {
+                            askQuestionPendingRef.current = null;
+                            setAskQuestionPending(null);
+                        }
+                    } }, askQuestionSeq))), _jsx(TurnStatus, { inProgressTodo: todos.find((t) => t.status === 'in_progress')?.text ?? null }), _jsx(StatusLine, {}), _jsx(Footer, { onSubmit: beginSubmit, onSlashTrigger: handleSlashTrigger, onHistoryTrigger: handleHistoryTrigger, prefill: prefill, onValueChange: setFooterValue, onBufferChange: setFooterBufferCount,
+                    // Task 7 — multiline announcements (draft discarded) land as
+                    // dim scrollback lines, house style for Footer-adjacent notices.
+                    onNotice: (t) => chunkEmitter.emit('chunk', `\x1b[2m${t}\x1b[22m\n`),
                     // 2026-05-17 — disable Footer input while any modal owns
                     // input, so keystrokes don't double-fire (modal answer +
                     // spurious Footer submission with same text).
@@ -175,10 +521,14 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
                         || !!askQuestionPending
                         || !!pendingApproval
                         || !!lineResolution
-                        || showTimeline }), lineResolution?.mode === 'slash' && (_jsx(Box, { marginTop: 1, marginLeft: 2, children: _jsx(CommandPalette, { initialQuery: lineResolution.prefix, onSelect: (name) => {
+                        || showTimeline
+                        || showTodoPanel
+                        || showRewindPanel }), lineResolution?.mode === 'slash' && (_jsx(Box, { marginTop: 1, marginLeft: 2, children: _jsx(CommandPalette, { initialQuery: lineResolution.prefix, onSelect: (name) => {
                             const lr = lineResolution;
                             setLineResolution(null);
-                            handleStep(applySlashPick(name, lr.rest, lr.files), lr.original, lr.files);
+                            // Task 5 — empty original ⇔ palette opened by the live `/`
+                            // trigger (or bare `/`+Enter): fill in, don't run.
+                            handleStep(applySlashPick(name, lr.rest, lr.files, lr.original === ''), lr.original, lr.files);
                         }, onCancel: cancelResolution }) })), lineResolution?.mode === 'at' && (_jsx(Box, { marginTop: 1, marginLeft: 2, children: _jsx(FilePalette, { files: lineResolution.files, initialQuery: lineResolution.prefix, onSelect: (filename) => {
                             const lr = lineResolution;
                             setLineResolution(null);
@@ -187,14 +537,17 @@ export function App({ chunkEmitter, onSubmit, onSlashTrigger, onHistoryTrigger,
                             // (e.g. add `--scope ZMM_VENDOR_CHECK` after `--from @<file>`).
                             const resolved = lr.line.replace(/@\S*$/, `@${filename}`);
                             setPrefill((p) => ({ text: `${resolved} `, nonce: p.nonce + 1 }));
-                        }, onCancel: cancelResolution }) })), errorStack.map((e) => (_jsx(Box, { children: _jsx(RichErrorBox, { code: e.code, message: e.body, hint: e.hint, severity: "error" }) }, e.id))), showTimeline && (_jsx(Box, { marginTop: 1, marginLeft: 2, children: _jsx(SessionTimeline, { entries: timelineEntries, onClose: () => setShowTimeline(false) }) })), pendingApproval && (_jsx(Box, { marginTop: 1, marginLeft: 2, children: _jsx(ApprovalModal, { change: pendingApproval.change, effectiveRisk: pendingApproval.effectiveRisk, transport: pendingApproval.transport, onApply: () => {
+                        }, onCancel: cancelResolution }) })), errorStack.map((e) => (_jsx(Box, { children: _jsx(RichErrorBox, { code: e.code, message: e.body, hint: e.hint, severity: "error" }) }, e.id))), showTimeline && (_jsx(Box, { marginTop: 1, marginLeft: 2, children: _jsx(SessionTimeline, { entries: timelineEntries, onClose: () => setShowTimeline(false) }) })), showTodoPanel && (_jsx(Box, { marginTop: 1, marginLeft: 2, children: _jsx(TodoPanel, { todos: todos, onClose: () => setShowTodoPanel(false) }) })), showRewindPanel && (_jsx(Box, { marginTop: 1, marginLeft: 2, children: _jsx(RewindPanel, { candidates: rewindCandidates,
+                        // Panel confirms, then fires the gated executor (repl.tsx assembles
+                        // deps + bridges approval to the Ink modal) and closes itself.
+                        onRestore: (c) => { onRewindRestore?.(c); }, onClose: () => setShowRewindPanel(false) }) })), pendingApproval && (_jsx(Box, { marginTop: 1, marginLeft: 2, children: _jsx(ApprovalModal, { change: pendingApproval.change, effectiveRisk: pendingApproval.effectiveRisk, transport: pendingApproval.transport, onApply: () => {
                             pendingApproval.resolve({ approved: true });
-                            clearApproval();
+                            clearApproval(pendingApproval);
                         }, onSkip: () => {
                             pendingApproval.resolve({ approved: false, reason: 'skipped' });
-                            clearApproval();
+                            clearApproval(pendingApproval);
                         }, onDiff: () => { }, onCancel: () => {
                             pendingApproval.resolve({ approved: false, reason: '__cancel_turn__' });
-                            clearApproval();
-                        } }) }))] }) }));
+                            clearApproval(pendingApproval);
+                        } }, approvalSeq) }))] }) }));
 }

package/dist/ui/approval-modal.js CHANGED Viewed

@@ -1,6 +1,18 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useState } from 'react';
 import { Box, Text, useInput } from 'ink';
+import { verbLine, viewAffordance, toSourceLines } 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
+// /abap-plan turn. Root cause is identical to the one AskQuestionModal
+// already solves: the approval plan-gate / run-lease takeover uses
+// `@inquirer/prompts`, which toggles the terminal's raw mode (and pauses
+// stdin) out from under Ink. When it releases, Ink's INTERNAL ref-count
+// still thinks raw mode is on, so it does not re-assert it, and a modal
+// mounted afterwards receives no keypresses. Reclaiming raw stdin on mount
+// (direct process.stdin calls, because Ink's count is the thing that's
+// stale) re-syncs the OS state to what Ink's useInput expects.
+import { useReclaimRawStdin } from './widgets/ask-question-modal.js';
 const LABEL_MAP = {
     delete_op: 'delete op detected',
     prod_namespace: 'PROD namespace',
@@ -9,19 +21,19 @@ const LABEL_MAP = {
     non_prod_override: 'auto-approve policy: never',
     escalated_in_session: '>5 changes this session',
 };
-function opIcon(op) {
-    const icons = { create: 'A', modify: 'M', delete: 'D', activate: '>', release: '^' };
-    return icons[op] ?? '?';
-}
 function riskColor(level) {
     return level === 'high' ? 'red' : level === 'medium' ? 'yellow' : 'green';
 }
 export function ApprovalModal({ change, effectiveRisk, transport, onApply, onSkip, onDiff, onCancel }) {
-    const [showingDiff, setShowingDiff] = useState(false);
+    // 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).
+    useReclaimRawStdin();
+    const [viewing, setViewing] = useState(false);
+    const aff = viewAffordance(change);
     useInput((input, key) => {
-        if (showingDiff) {
+        if (viewing) {
             if (key.escape) {
-                setShowingDiff(false);
+                setViewing(false);
             }
             return;
         }
@@ -33,8 +45,10 @@ export function ApprovalModal({ change, effectiveRisk, transport, onApply, onSki
             onSkip();
             return;
         }
-        if (input === 'd') {
-            setShowingDiff(true);
+        // The review key is op-aware ([d] for modify, [v] for create/delete);
+        // display-only — it never changes the resolve contract.
+        if (aff && input === aff.key) {
+            setViewing(true);
             onDiff();
             return;
         }
@@ -43,11 +57,30 @@ export function ApprovalModal({ change, effectiveRisk, transport, onApply, onSki
             return;
         }
     });
-    if (showingDiff && change.diff) {
-        return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, children: [_jsx(Text, { bold: true, children: "Diff \\u2014 Esc to return" }), change.diff.split('\n').map((line, i) => (_jsx(Text, { color: line.startsWith('+') ? 'green' : line.startsWith('-') ? 'red' : 'gray', children: line }, i)))] }));
+    // Review sub-view — a diff (modify) or a source dump (create/delete).
+    if (viewing && aff) {
+        const isDiff = aff.key === 'd';
+        return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, children: [_jsxs(Text, { bold: true, children: [isDiff ? 'Diff' : aff.label, " \u2014 Esc to return"] }), change.diff ? (isDiff ? (change.diff.split('\n').map((line, i) => (_jsx(Text, { wrap: "truncate-end", color: line.startsWith('+') ? 'green' : line.startsWith('-') ? 'red' : 'gray', children: line }, i)))) : (toSourceLines(change.diff).map((line, i) => (_jsxs(Text, { wrap: "truncate-end", children: [_jsxs(Text, { color: "gray", children: [String(i + 1).padStart(4), "  "] }), line] }, i))))) : (_jsx(Text, { dimColor: true, children: "(no source provided by the model)" }))] }));
     }
-    const raisedLabel = effectiveRisk.raisedBy
-        .map((r) => LABEL_MAP[r] ?? r)
-        .join(', ');
-    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: riskColor(effectiveRisk.level), paddingX: 2, paddingY: 1, children: [_jsx(Text, { bold: true, children: "Approval requested" }), _jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { bold: true, color: riskColor(effectiveRisk.level), children: [" ", opIcon(change.op), " "] }), _jsx(Text, { bold: true, children: change.object }), _jsxs(Text, { color: "gray", children: [" (", change.type, ")"] })] }), _jsxs(Text, { color: riskColor(effectiveRisk.level), children: ["Risk: ", effectiveRisk.level, raisedLabel ? `  (raised from low: ${raisedLabel})` : ''] }), transport && _jsxs(Text, { color: "gray", children: ["Transport: ", transport] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { children: "[a] Apply   [d] Show diff" }), _jsx(Text, { children: "[s] Skip    [c] Cancel turn" })] })] }));
+    const raisedLabel = effectiveRisk.raisedBy.map((r) => LABEL_MAP[r] ?? r).join(', ');
+    // Meta line: Package · Transport — each segment only when genuinely known.
+    // The handler resolves `transport` per op (see op-labels displayTransport:
+    // create-family may fall back to the session transport because the create
+    // tools do; modify/delete show only an explicit one; activate/release
+    // never carry one). Nothing resolvable ⇒ the segment is OMITTED — never a
+    // placeholder or a promised-but-unminted "new" transport.
+    const metaSegs = [];
+    if (change.package)
+        metaSegs.push(`Package ${change.package}`);
+    if (transport)
+        metaSegs.push(`Transport: ${transport}`);
+    // Op-aware verb line ("Create table ZMNT_NOTE"); delete gets the hot accent.
+    const verb = verbLine(change);
+    const verbColor = change.op === 'delete' ? 'red' : undefined;
+    // Keys row — one line, human words, truncate-end (Wave-1 no-wrap rule).
+    const keys = ['[a] Approve'];
+    if (aff)
+        keys.push(`[${aff.key}] ${aff.label}`);
+    keys.push('[s] Skip', '[c] Cancel turn');
+    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: 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] }) }), metaSegs.length > 0 && (_jsx(Text, { dimColor: true, wrap: "truncate-end", children: metaSegs.join(' · ') })), _jsxs(Text, { color: riskColor(effectiveRisk.level), wrap: "truncate-end", children: ["Risk: ", effectiveRisk.level, raisedLabel ? `  (raised from low: ${raisedLabel})` : ''] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { wrap: "truncate-end", children: keys.join('   ') }) })] }));
 }

package/dist/ui/ask-question-emitter.js CHANGED Viewed

@@ -9,5 +9,19 @@ class AskQuestionEmitter extends EventEmitter {
             this.emit('request', { ...params, resolve });
         });
     }
+    /**
+     * UX Wave 2 / Task 2 — v2 batched form request. Same no-listener fallback
+     * contract as request(): resolve cancelled (v2 shape — empty answers) so
+     * callers without a mounted App fall through to their own path.
+     */
+    requestForm(form) {
+        return new Promise((resolve) => {
+            if (this.listenerCount('request') === 0) {
+                resolve({ formId: form.formId, answers: [], cancelled: true });
+                return;
+            }
+            this.emit('request', { ...form, resolve });
+        });
+    }
 }
 export const askQuestionEmitter = new AskQuestionEmitter();