@deepseek-harness-tui/dsh-tui 0.5.2 → 0.6.0

package/lib/types/compat/sessionLog.js

@@ -16,10 +16,13 @@
  * marked, and already-known events are never touched.
  *
  * Storage notes: the jsonl persistence flushes by APPENDING zstd frames, so
- * the file is a concatenation of frames; every frame is decoded, the log is
- * rewritten as one frame, and the file is swapped in atomically (tmp +
- * rename). Any decode/parse anomaly aborts the repair and resume proceeds
- * unpatched — the failure mode degrades to the pre-patch behavior.
+ * the file is a concatenation of frames. Frame layout is load-bearing: the
+ * backend asserts frame 0 holds EXACTLY the header line (listings read only
+ * that frame; `assertZstdHeaderFrame`), so the repair re-encodes each frame
+ * with its original line set — frame boundaries are preserved 1:1, and any
+ * frame whose lines were untouched is copied verbatim. Any decode/parse
+ * anomaly aborts the repair and resume proceeds unpatched — the failure
+ * mode degrades to the pre-patch behavior.
  * @module @deepseek-harness-tui/dsh-tui/compat/sessionLog
  */
 import { KNOWN_SESSION_EVENT_TYPES } from '@deepseek-ai/dsh-session';
@@ -61,11 +64,12 @@ function findSessionLogFile(sessionId) {
     return undefined;
 }
 /**
- * Decode a (possibly multi-frame) zstd jsonl log. Frames are split by magic
- * scan; any frame failing to decode or any line failing to parse throws, so
- * callers abort instead of rewriting a log they did not fully understand.
+ * Decode a (possibly multi-frame) zstd jsonl log, keeping frames separate.
+ * Frames are split by magic scan; any frame failing to decode or any line
+ * failing to parse throws, so callers abort instead of rewriting a log they
+ * did not fully understand.
  * @param buf - Raw file bytes.
- * @returns Parsed event envelopes in log order.
+ * @returns Per-frame byte spans and parsed event envelopes, in log order.
  */
 function decodeFrames(buf) {
     const offsets = [];
@@ -75,20 +79,21 @@ function decodeFrames(buf) {
     }
     if (offsets.length === 0)
         throw new Error('no zstd frame found');
-    let text = '';
-    for (let i = 0; i < offsets.length; i++) {
+    return offsets.map((start, i) => {
         const end = i + 1 < offsets.length ? offsets[i + 1] : buf.length;
-        text += zstdDecompressSync(buf.subarray(offsets[i], end)).toString('utf8');
-    }
-    return text
-        .split('\n')
-        .filter((line) => line.length > 0)
-        .map((line) => {
-        const parsed = JSON.parse(line);
-        if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
-            throw new Error('session log line is not an event envelope');
-        }
-        return parsed;
+        const raw = buf.subarray(start, end);
+        const text = zstdDecompressSync(raw).toString('utf8');
+        const events = text
+            .split('\n')
+            .filter((line) => line.length > 0)
+            .map((line) => {
+            const parsed = JSON.parse(line);
+            if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
+                throw new Error('session log line is not an event envelope');
+            }
+            return parsed;
+        });
+        return { raw, events };
     });
 }
 /**
@@ -103,25 +108,35 @@ export function repairSessionLogForResume(sessionId) {
         const file = findSessionLogFile(sessionId);
         if (file === undefined)
             return 'unavailable';
-        const events = decodeFrames(readFileSync(file));
-        let changed = false;
-        for (const event of events) {
-            const type = event['type'];
-            // Only real log entries carry a numeric seq — the seq-less header row
-            // is parsed by a separate path that must not see an extra field.
-            if (typeof type === 'string' &&
-                typeof event['seq'] === 'number' &&
-                !KNOWN_SESSION_EVENT_TYPES.has(type) &&
-                event['ignorable'] === undefined) {
-                event['ignorable'] = true;
-                changed = true;
+        const frames = decodeFrames(readFileSync(file));
+        // Mark unknown types in place, tracking which frames actually changed:
+        // untouched frames are copied back verbatim, so the header frame keeps
+        // its exact original bytes (and the one-header-line invariant with it).
+        const dirty = new Set();
+        frames.forEach((frame, index) => {
+            for (const event of frame.events) {
+                const type = event['type'];
+                // Only real log entries carry a numeric seq — the seq-less header row
+                // is parsed by a separate path that must not see an extra field.
+                if (typeof type === 'string' &&
+                    typeof event['seq'] === 'number' &&
+                    !KNOWN_SESSION_EVENT_TYPES.has(type) &&
+                    event['ignorable'] === undefined) {
+                    event['ignorable'] = true;
+                    dirty.add(index);
+                }
             }
-        }
-        if (!changed)
+        });
+        if (dirty.size === 0)
             return 'clean';
-        const payload = events.map((event) => JSON.stringify(event)).join('\n') + '\n';
+        const parts = frames.map((frame, index) => {
+            if (!dirty.has(index))
+                return frame.raw;
+            const payload = frame.events.map((event) => JSON.stringify(event)).join('\n') + '\n';
+            return zstdCompressSync(Buffer.from(payload, 'utf8'));
+        });
         const tmp = `${file}.compat-${randomUUID()}.tmp`;
-        writeFileSync(tmp, zstdCompressSync(Buffer.from(payload, 'utf8')));
+        writeFileSync(tmp, Buffer.concat(parts));
         renameSync(tmp, file);
         return 'repaired';
     }
@@ -129,6 +144,76 @@ export function repairSessionLogForResume(sessionId) {
         return 'unavailable';
     }
 }
+/**
+ * Read a session's display title from its persisted log, tolerantly.
+ *
+ * Why not `persistence.load()`: the backend validates every event against
+ * KNOWN_SESSION_EVENT_TYPES and throws the WHOLE load when a third-party
+ * plugin wrote an unmarked unknown type (e.g. activity/status before the
+ * resume repair touched it) — which is exactly why pickers fell back to the
+ * cwd basename for every working-activity session. A picker label is
+ * read-only UI state: decoding frames directly here keeps titles working
+ * for logs the strict path refuses, now and for future plugin event types.
+ *
+ * Title precedence: the LAST `session/title` event wins (a /rename append
+ * overrides the first-prompt auto title), falling back to the first user
+ * message text. `hasUserMessage` drives the picker's launch-artifact filter.
+ * @param sessionId - Session whose log should be read.
+ * @returns The title info, or undefined when the log is absent/undecodable.
+ */
+export function readSessionTitleFromLog(sessionId) {
+    try {
+        const file = findSessionLogFile(sessionId);
+        if (file === undefined)
+            return undefined;
+        const frames = decodeFrames(readFileSync(file));
+        let titled;
+        let firstUser;
+        let hasUserMessage = false;
+        for (const frame of frames) {
+            for (const event of frame.events) {
+                if (event['type'] === 'session/title') {
+                    const title = event['data']?.['title'];
+                    if (typeof title === 'string' && title.trim().length > 0)
+                        titled = title;
+                }
+                else if (event['type'] === 'user/message') {
+                    hasUserMessage = true;
+                    if (firstUser === undefined) {
+                        firstUser = firstTextOfContent(event['data']?.['content']);
+                    }
+                }
+            }
+        }
+        return { title: titled ?? firstUser, hasUserMessage };
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Extract the first text block from a user/message `content` payload.
+ * Content is normally a block array; a bare string is accepted defensively.
+ * @param content - The event's content field.
+ * @returns The trimmed text, or undefined when no text block exists.
+ */
+function firstTextOfContent(content) {
+    if (typeof content === 'string')
+        return content.trim() || undefined;
+    if (!Array.isArray(content))
+        return undefined;
+    for (const block of content) {
+        if (block !== null &&
+            typeof block === 'object' &&
+            block.type === 'text' &&
+            typeof block.text === 'string') {
+            const text = (block.text).trim();
+            if (text.length > 0)
+                return text;
+        }
+    }
+    return undefined;
+}
 /**
  * Compat entry for the resume path: repair the target session's log, then
  * let resume proceed regardless of outcome. Never throws, never blocks on

package/lib/types/components/CommandSuggestions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandSuggestions.d.ts","sourceRoot":"","sources":["../../../src/components/CommandSuggestions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAElD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,aAAa,EACb,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAA;IACjC,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;CAChB,GAAG,KAAK,CAAC,SAAS,CAoDlB"}
+{"version":3,"file":"CommandSuggestions.d.ts","sourceRoot":"","sources":["../../../src/components/CommandSuggestions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAGlD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,aAAa,EACb,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAA;IACjC,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;CAChB,GAAG,KAAK,CAAC,SAAS,CAqDlB"}

package/lib/types/components/CommandSuggestions.js

@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from '../ui.js';
 import { stringWidth } from '../ink/stringWidth.js';
 import { truncateToWidth } from '../ink/truncateToWidth.js';
+import { localizedDescription } from '../commands.js';
 /**
  * The slash-command suggestion overlay, ported from the leak's
  * `PromptInputFooterSuggestions.tsx` (command layout only): a name column
@@ -25,9 +26,10 @@ export function CommandSuggestions({ commands, selectedIndex, columns, }) {
             const tagText = command.tag ? `[${command.tag}] ` : '';
             const tagWidth = stringWidth(tagText);
             const descriptionWidth = Math.max(0, columns - nameWidth - tagWidth - 4);
-            const description = stringWidth(command.description) > descriptionWidth
-                ? truncateToWidth(command.description, descriptionWidth - 1) + '…'
-                : command.description;
+            const rawDescription = localizedDescription(command);
+            const description = stringWidth(rawDescription) > descriptionWidth
+                ? truncateToWidth(rawDescription, descriptionWidth - 1) + '…'
+                : rawDescription;
             return (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: isSelected ? 'suggestion' : undefined, dimColor: !isSelected, children: padded }), tagText ? _jsx(Text, { dimColor: true, children: tagText }) : null, _jsx(Text, { color: isSelected ? 'suggestion' : undefined, dimColor: !isSelected, children: description })] }, command.name));
         }) }));
 }

package/lib/types/components/HelpMenu.d.ts

@@ -5,6 +5,7 @@ import type { LocalCommand } from '../commands.js';
  * (three-column shortcut layout, trimmed to the keys dsh-tui actually binds).
  * The command column lists the merged slash-command surface: built-in
  * commands plus plugin-registered ones from the DSH registry (plan/goal/…).
+ * Modifier labels follow the platform convention: ⌘ on macOS, ctrl elsewhere.
  */
 export declare function HelpMenu({ commands, }: {
     commands: readonly LocalCommand[];

package/lib/types/components/HelpMenu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HelpMenu.d.ts","sourceRoot":"","sources":["../../../src/components/HelpMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAElD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,EACvB,QAAQ,GACT,EAAE;IACD,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAA;CAClC,GAAG,KAAK,CAAC,SAAS,CA6DlB"}
+{"version":3,"file":"HelpMenu.d.ts","sourceRoot":"","sources":["../../../src/components/HelpMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAIlD;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,EACvB,QAAQ,GACT,EAAE;IACD,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAA;CAClC,GAAG,KAAK,CAAC,SAAS,CA6DlB"}

package/lib/types/components/HelpMenu.js

@@ -1,12 +1,15 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import Box from '../ink/components/Box.js';
 import Text from '../ink/components/Text.js';
+import { localizedDescription } from '../commands.js';
+import { modLabel } from '../utils/modifiers.js';
 /**
  * The `?` help menu, ported from the leak's `PromptInputHelpMenu.tsx`
  * (three-column shortcut layout, trimmed to the keys dsh-tui actually binds).
  * The command column lists the merged slash-command surface: built-in
  * commands plus plugin-registered ones from the DSH registry (plan/goal/…).
+ * Modifier labels follow the platform convention: ⌘ on macOS, ctrl elsewhere.
  */
 export function HelpMenu({ commands, }) {
-    return (_jsxs(Box, { paddingX: 2, flexDirection: "row", gap: 4, children: [_jsxs(Box, { flexDirection: "column", width: 26, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { dimColor: true, children: "/ for commands" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "? for this help" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+o for verbose output" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+t to toggle context" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+r to search history" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+c to interrupt" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+d to exit" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+l to redraw" }) })] }), _jsxs(Box, { flexDirection: "column", width: 24, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { dimColor: true, children: "esc to clear input" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "\u2191/\u2193 for history" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "\u2190/\u2192 to move cursor" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+\u2190/\u2192 for word jumps" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "tab to complete command" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "shift+tab to cycle effort" }) })] }), _jsxs(Box, { flexDirection: "column", flexShrink: 1, children: [_jsx(Text, { dimColor: true, children: "commands:" }), commands.map(command => (_jsx(Box, { children: _jsxs(Text, { dimColor: true, wrap: "truncate-end", children: ["/", command.name, " \u2014 ", command.description] }) }, command.name)))] })] }));
+    return (_jsxs(Box, { paddingX: 2, flexDirection: "row", gap: 4, children: [_jsxs(Box, { flexDirection: "column", width: 26, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { dimColor: true, children: "/ for commands" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "? for this help" }) }), _jsx(Box, { children: _jsxs(Text, { dimColor: true, children: [modLabel, "o for verbose output"] }) }), _jsx(Box, { children: _jsxs(Text, { dimColor: true, children: [modLabel, "t to toggle context"] }) }), _jsx(Box, { children: _jsxs(Text, { dimColor: true, children: [modLabel, "r to search history"] }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+c to interrupt" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+d to exit" }) }), _jsx(Box, { children: _jsxs(Text, { dimColor: true, children: [modLabel, "l to redraw"] }) })] }), _jsxs(Box, { flexDirection: "column", width: 24, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { dimColor: true, children: "esc to clear input" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "\u2191/\u2193 for history" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "\u2190/\u2192 to move cursor" }) }), _jsx(Box, { children: _jsxs(Text, { dimColor: true, children: [modLabel, "\u2190/\u2192 for word jumps"] }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "tab to complete command" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "shift+tab to cycle effort" }) })] }), _jsxs(Box, { flexDirection: "column", flexShrink: 1, children: [_jsx(Text, { dimColor: true, children: "commands:" }), commands.map(command => (_jsx(Box, { children: _jsxs(Text, { dimColor: true, wrap: "truncate-end", children: ["/", command.name, " \u2014 ", localizedDescription(command)] }) }, command.name)))] })] }));
 }

package/lib/types/components/PromptInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PromptInput.d.ts","sourceRoot":"","sources":["../../../src/components/PromptInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAwC5C;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,IAAI,OAAO,CAAA;IAClB,KAAK,IAAI,IAAI,CAAA;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAA;IAChB,0EAA0E;IAC1E,QAAQ,EAAE,OAAO,CAAA;IACjB,YAAY,IAAI,IAAI,CAAA;IACpB;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACrD,6EAA6E;IAC7E,eAAe,EAAE,OAAO,CAAA;IACxB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,cAAc,CAAC,IAAI,IAAI,CAAA;IACvB,8EAA8E;IAC9E,eAAe,CAAC,IAAI,IAAI,CAAA;IACxB,0EAA0E;IAC1E,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;CACzD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,cAAc,EACd,eAAe,EACf,aAAa,GACd,EAAE,gBAAgB,qBA+xBlB"}
+{"version":3,"file":"PromptInput.d.ts","sourceRoot":"","sources":["../../../src/components/PromptInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAyC5C;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,IAAI,OAAO,CAAA;IAClB,KAAK,IAAI,IAAI,CAAA;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAA;IAChB,0EAA0E;IAC1E,QAAQ,EAAE,OAAO,CAAA;IACjB,YAAY,IAAI,IAAI,CAAA;IACpB;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACrD,6EAA6E;IAC7E,eAAe,EAAE,OAAO,CAAA;IACxB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,cAAc,CAAC,IAAI,IAAI,CAAA;IACvB,8EAA8E;IAC9E,eAAe,CAAC,IAAI,IAAI,CAAA;IACxB,0EAA0E;IAC1E,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;CACzD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,cAAc,EACd,eAAe,EACf,aAAa,GACd,EAAE,gBAAgB,qBA+xBlB"}

package/lib/types/components/PromptInput.js

@@ -8,6 +8,7 @@ import { formatClipboardInsert, readClipboard } from '../utils/clipboard.js';
 import { filterCommands, parseCommandName } from '../commands.js';
 import { appendHistory } from '../history.js';
 import { mentionAtCaret } from '../utils/mentions.js';
+import { isMod } from '../utils/modifiers.js';
 import { CommandSuggestions } from './CommandSuggestions.js';
 import { FileSuggestions } from './FileSuggestions.js';
 import { HelpMenu } from './HelpMenu.js';
@@ -347,10 +348,10 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             insertAtCaret(input.replace(/\r\n/g, '\n').replace(/\r/g, '\n'));
             return;
         }
-        // Ctrl+V: raw mode hands the key to the app, so the clipboard is read
-        // here — text, or file paths when Explorer copied files (pasted files
-        // insert their paths).
-        if (key.ctrl && input === 'v') {
+        // Ctrl+V / Cmd+V: raw mode hands the key to the app, so the clipboard is
+        // read here — text, or file paths when Explorer copied files (pasted
+        // files insert their paths).
+        if (isMod(key) && input === 'v') {
             if (clipboardBusyRef.current)
                 return;
             clipboardBusyRef.current = true;
@@ -425,9 +426,9 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
                 submitText(line);
             return;
         }
-        if (key.return && key.ctrl) {
-            // Ctrl+Enter: interrupt the running turn and process this message
-            // immediately (Windows Terminal sends CSI 13;5u / 13;1;5u).
+        if (key.return && isMod(key)) {
+            // Ctrl+Enter / Cmd+Enter: interrupt the running turn and process this
+            // message immediately (Windows Terminal sends CSI 13;5u / 13;1;5u).
             interruptSend();
             return;
         }
@@ -537,12 +538,12 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             setCursor(previous => Math.min(value.length, previous + 1));
             return;
         }
-        if (key.ctrl && key.leftArrow) {
+        if (isMod(key) && key.leftArrow) {
             // Jump to the previous word boundary (readline alt+b).
             setCursor(previous => wordBoundaryLeft(value, previous));
             return;
         }
-        if (key.ctrl && key.rightArrow) {
+        if (isMod(key) && key.rightArrow) {
             // Jump to the next word boundary (readline alt+f).
             setCursor(previous => wordBoundaryRight(value, previous));
             return;
@@ -572,31 +573,31 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             setCursor(nextLine === -1 ? value.length : nextLine);
             return;
         }
-        if (key.ctrl && input === 'a') {
+        if (isMod(key) && input === 'a') {
             const lineStart = value.lastIndexOf('\n', cursor - 1) + 1;
             setCursor(lineStart);
             return;
         }
-        if (key.ctrl && input === 'e') {
+        if (isMod(key) && input === 'e') {
             const nextLine = value.indexOf('\n', cursor);
             setCursor(nextLine === -1 ? value.length : nextLine);
             return;
         }
-        if (key.ctrl && input === 'u') {
+        if (isMod(key) && input === 'u') {
             // Delete to start of line.
             const lineStart = value.lastIndexOf('\n', cursor - 1) + 1;
             setValue(value.slice(0, lineStart) + value.slice(cursor));
             setCursor(lineStart);
             return;
         }
-        if (key.ctrl && input === 'k') {
+        if (isMod(key) && input === 'k') {
             // Delete to end of line.
             const nextLine = value.indexOf('\n', cursor);
             const end = nextLine === -1 ? value.length : nextLine;
             setValue(value.slice(0, cursor) + value.slice(end));
             return;
         }
-        if (key.ctrl && input === 'w') {
+        if (isMod(key) && input === 'w') {
             // Delete the word before the cursor (CC/readline behavior): skip
             // trailing whitespace, then the whitespace-delimited word.
             const before = value.slice(0, cursor);
@@ -678,7 +679,7 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             onToggleHelp();
             return;
         }
-        if (input && !key.ctrl && !key.meta && !key.tab && !key.escape) {
+        if (input && !key.ctrl && !key.meta && !key.super && !key.tab && !key.escape) {
             // Typing anything else dismisses the help menu (CC behavior).
             if (helpOpen)
                 onToggleHelp();

package/lib/types/components/approvals/ApprovalPanel.d.ts

@@ -0,0 +1,21 @@
+/**
+ * The approval panel — Claude Code style permission prompt for the DSH
+ * approval seam (`ctx.approval`). One ask per panel: a permission-colored
+ * divider header naming the tool, the gated command recovered from the
+ * paired tool call (CC verbose full-command semantics), the asker's reason,
+ * "Do you want to proceed?", and a numbered Yes/No list.
+ *
+ * The protocol's outcome set is closed (allowed-once / rejected /
+ * cancelled / unavailable) with no allow-always or feedback channel, so
+ * the panel deliberately offers exactly two rows; Esc and Ctrl+C reject
+ * (fail closed, CC's "Esc to cancel" semantics).
+ */
+import React from 'react';
+import type { ApprovalSnapshot } from '../../approvals.js';
+export type ApprovalPanelProps = {
+    /** The approval to render (from the ApprovalStore snapshot). */
+    readonly approval: ApprovalSnapshot;
+    readonly onDecide: (outcome: 'allowed-once' | 'rejected') => void;
+};
+export declare function ApprovalPanel({ approval, onDecide }: ApprovalPanelProps): React.ReactNode;
+//# sourceMappingURL=ApprovalPanel.d.ts.map

package/lib/types/components/approvals/ApprovalPanel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ApprovalPanel.d.ts","sourceRoot":"","sources":["../../../../src/components/approvals/ApprovalPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE1D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,gEAAgE;IAChE,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAA;IACnC,QAAQ,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,UAAU,KAAK,IAAI,CAAA;CAClE,CAAA;AAID,wBAAgB,aAAa,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,kBAAkB,GAAG,KAAK,CAAC,SAAS,CAmEzF"}

package/lib/types/components/approvals/ApprovalPanel.js

@@ -0,0 +1,48 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * The approval panel — Claude Code style permission prompt for the DSH
+ * approval seam (`ctx.approval`). One ask per panel: a permission-colored
+ * divider header naming the tool, the gated command recovered from the
+ * paired tool call (CC verbose full-command semantics), the asker's reason,
+ * "Do you want to proceed?", and a numbered Yes/No list.
+ *
+ * The protocol's outcome set is closed (allowed-once / rejected /
+ * cancelled / unavailable) with no allow-always or feedback channel, so
+ * the panel deliberately offers exactly two rows; Esc and Ctrl+C reject
+ * (fail closed, CC's "Esc to cancel" semantics).
+ */
+import React from 'react';
+import { t } from '../../i18n.js';
+import { Box, Text, useInput } from '../../ui.js';
+import { Divider } from '../design-system/Divider.js';
+import { POINTER } from '../../cc/figures.js';
+const OUTCOMES = ['allowed-once', 'rejected'];
+export function ApprovalPanel({ approval, onDecide }) {
+    const [focusIndex, setFocusIndex] = React.useState(0);
+    useInput((input, key) => {
+        if (key.escape || (key.ctrl && input === 'c')) {
+            onDecide('rejected');
+            return;
+        }
+        if (key.upArrow) {
+            setFocusIndex(index => (index + OUTCOMES.length - 1) % OUTCOMES.length);
+            return;
+        }
+        if (key.downArrow) {
+            setFocusIndex(index => (index + 1) % OUTCOMES.length);
+            return;
+        }
+        if (input === '1' || input === '2') {
+            onDecide(OUTCOMES[Number(input) - 1]);
+            return;
+        }
+        if (key.return) {
+            onDecide(OUTCOMES[focusIndex]);
+        }
+    }, { isActive: true });
+    const optionLabels = [t('approval-yes'), t('approval-no')];
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, paddingLeft: 2, paddingRight: 2, width: "100%", children: [_jsx(Divider, { color: "permission", title: t('approval-waiting', { tool: approval.toolName }), padding: 4 }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [approval.command !== undefined && (_jsx(Box, { flexDirection: "column", paddingX: 2, children: _jsx(Text, { dimColor: true, wrap: "wrap", children: approval.command }) })), approval.reason !== undefined && (_jsx(Text, { dimColor: true, wrap: "wrap", children: approval.reason })), _jsx(Text, { dimColor: true, children: t('approval-proceed') })] }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: optionLabels.map((label, index) => {
+                    const focused = index === focusIndex;
+                    return (_jsxs(Box, { flexDirection: "row", marginTop: focused ? 1 : 0, children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: focused ? 'claude' : undefined, bold: focused, children: focused ? POINTER : ' ' }) }), _jsxs(Text, { bold: focused, color: focused ? 'claude' : undefined, wrap: "wrap", children: [index + 1, ". ", label] })] }, label));
+                }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t('approval-hint') }) })] }));
+}

package/lib/types/components/questions/AskUserQuestionPanel.d.ts

@@ -24,6 +24,12 @@ export type AskUserQuestionPanelProps = {
             readonly description?: string;
         }>;
         readonly multiSelect?: boolean;
+        /** Presentation intent tag (rc.6): 'plan-review' switches to the
+         *  decision-card layout; an intent never changes the protocol. */
+        readonly intent?: {
+            readonly kind: 'plan-review';
+            readonly approve: string;
+        };
     };
     /** 1-based position within the batch (progress header). */
     readonly position: number;

package/lib/types/components/questions/AskUserQuestionPanel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AskUserQuestionPanel.d.ts","sourceRoot":"","sources":["../../../../src/components/questions/AskUserQuestionPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAM3D,MAAM,MAAM,yBAAyB,GAAG;IACtC,gEAAgE;IAChE,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;QAC3F,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAC/B,CAAA;IACD,2DAA2D;IAC3D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,sDAAsD;IACtD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,iDAAiD;IACjD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACzD,2EAA2E;IAC3E,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;CAC9B,CAAA;AAED,wBAAgB,oBAAoB,CAAC,EACnC,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,QAAQ,GACT,EAAE,yBAAyB,GAAG,KAAK,CAAC,SAAS,CA8S7C"}
+{"version":3,"file":"AskUserQuestionPanel.d.ts","sourceRoot":"","sources":["../../../../src/components/questions/AskUserQuestionPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAO3D,MAAM,MAAM,yBAAyB,GAAG;IACtC,gEAAgE;IAChE,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;QAC3F,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;QAC9B;0EACkE;QAClE,QAAQ,CAAC,MAAM,CAAC,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;YAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAA;KAC7E,CAAA;IACD,2DAA2D;IAC3D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,sDAAsD;IACtD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,iDAAiD;IACjD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACzD,2EAA2E;IAC3E,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;CAC9B,CAAA;AAED,wBAAgB,oBAAoB,CAAC,EACnC,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,QAAQ,GACT,EAAE,yBAAyB,GAAG,KAAK,CAAC,SAAS,CAoT7C"}

package/lib/types/components/questions/AskUserQuestionPanel.js

@@ -17,10 +17,17 @@ import { t } from '../../i18n.js';
 import { Box, Text, useInput } from '../../ui.js';
 import { Divider } from '../design-system/Divider.js';
 import { POINTER } from '../../cc/figures.js';
+import { PlanReviewPanel } from './PlanReviewPanel.js';
 const CHECKED = '◉';
 const UNCHECKED = '○';
 const PENCIL = '✎';
 export function AskUserQuestionPanel({ question, position, total, answered, onAnswer, onCancel, }) {
+    // Plan-mode's exit_plan_mode ask carries a presentation intent: render
+    // the CC-style decision card instead of the generic questionnaire. The
+    // branch precedes every hook so hook order stays stable per remount key.
+    if (question.intent?.kind === 'plan-review') {
+        return _jsx(PlanReviewPanel, { question: question, onAnswer: onAnswer, onCancel: onCancel });
+    }
     const options = question.options ?? [];
     const multiSelect = question.multiSelect === true;
     /** Rows: the real options plus the inline input row at the tail. */
@@ -147,7 +154,7 @@ export function AskUserQuestionPanel({ question, position, total, answered, onAn
                 setCustomCursor(customText.length);
                 return;
             }
-            if (!key.ctrl && !key.meta && input) {
+            if (!key.ctrl && !key.meta && !key.super && input) {
                 setCustomText(text => text.slice(0, customCursor) + input + text.slice(customCursor));
                 setCustomCursor(cursor => cursor + input.length);
                 setError(null);
@@ -191,7 +198,7 @@ export function AskUserQuestionPanel({ question, position, total, answered, onAn
         }
         // Typing on an option appends into the input row; single-select also
         // attaches this option's label so Enter carries label + text (#9).
-        if (!key.ctrl && !key.meta && input) {
+        if (!key.ctrl && !key.meta && !key.super && input) {
             appendText(input);
             if (!multiSelect)
                 setAttached(options[focusIndex]?.label ?? null);

package/lib/types/components/questions/PlanReviewPanel.d.ts

@@ -0,0 +1,39 @@
+/**
+ * The plan-review panel — Claude Code style exit-plan-mode decision card
+ * for the DSH user-interaction seam. plan-mode's `exit_plan_mode` tool asks
+ * through `ctx.userQuestions` with `intent: { kind: 'plan-review',
+ * approve }`: the plan markdown arrives in `detail`, the approve/decline
+ * choices in `options` (labels verbatim — the protocol answers with the
+ * asker's own labels).
+ *
+ * Protocol-exact answer mapping (dsh-plan-mode):
+ * - Approve: `{ selected: [intent.approve] }` — custom MUST be absent, or
+ *   plan-mode treats it as keep-planning-with-feedback.
+ * - Keep planning / feedback: `{ selected: [declineLabel], custom? }` where
+ *   declineLabel is the first option that is not the approve label.
+ * - Esc / Ctrl+C: the store rejects with ASK_CANCELLED, which plan-mode
+ *   reads as "the user dismissed the review to speak instead".
+ */
+import React from 'react';
+import type { QuestionSelection } from '../../questions.js';
+export type PlanReviewPanelProps = {
+    /** The plan-review question (intent.kind === 'plan-review'). */
+    readonly question: {
+        readonly question: string;
+        readonly header?: string;
+        readonly detail?: string;
+        readonly options?: ReadonlyArray<{
+            readonly label: string;
+            readonly description?: string;
+        }>;
+        readonly intent?: {
+            readonly kind: 'plan-review';
+            readonly approve: string;
+        };
+    };
+    readonly onAnswer: (selection: QuestionSelection) => void;
+    /** Esc / Ctrl+C — dismissed to speak instead (ASK_CANCELLED). */
+    readonly onCancel: () => void;
+};
+export declare function PlanReviewPanel({ question, onAnswer, onCancel, }: PlanReviewPanelProps): React.ReactNode;
+//# sourceMappingURL=PlanReviewPanel.d.ts.map

package/lib/types/components/questions/PlanReviewPanel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PlanReviewPanel.d.ts","sourceRoot":"","sources":["../../../../src/components/questions/PlanReviewPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAI3D,MAAM,MAAM,oBAAoB,GAAG;IACjC,gEAAgE;IAChE,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;QAC3F,QAAQ,CAAC,MAAM,CAAC,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;YAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAA;KAC7E,CAAA;IACD,QAAQ,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACzD,iEAAiE;IACjE,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;CAC9B,CAAA;AAED,wBAAgB,eAAe,CAAC,EAC9B,QAAQ,EACR,QAAQ,EACR,QAAQ,GACT,EAAE,oBAAoB,GAAG,KAAK,CAAC,SAAS,CAgOxC"}