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

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

@@ -0,0 +1,20 @@
+import React from 'react';
+/**
+ * 瞬态面板的浮层容器：absolute 定位 + bottom:'100%' 把面板底边钉在锚点
+ * （父元素）顶边，向上覆盖转录尾部行，自身**不占布局高度**。
+ *
+ * 为什么必须这样：inline 模式下整帧是内容高度。瞬态面板（picker/补全/
+ * 对话框）若以 in-flow 方式挂载，帧高随之增长——终端滚动把帧顶行（splash、
+ * 历史）推进 scrollback；面板关闭时的收缩重绘又把这些行重新写回视口，同一
+ * 行在 scrollback 和视口各存一份（"每切一次 /model 多一份启动画"的真机报
+ * 告）。浮层只改写既有行的单元格内容（帧高不变、零滚动、零沉积），关闭时
+ * 原样写回，全程无重复。
+ *
+ * 先例：PromptInput 通知行（position=absolute marginTop={-1}）。
+ */
+export declare function OverlayAbove({ children, maxHeight, }: {
+    children: React.ReactNode;
+    /** 防止面板高过可用区域时探出帧顶（短会话 + 高列表）。 */
+    maxHeight?: number | undefined;
+}): React.ReactNode;
+//# sourceMappingURL=OverlayAbove.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"OverlayAbove.d.ts","sourceRoot":"","sources":["../../../src/components/OverlayAbove.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAAC,EAC3B,QAAQ,EACR,SAAS,GACV,EAAE;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,kCAAkC;IAClC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC/B,GAAG,KAAK,CAAC,SAAS,CAqBlB"}

package/lib/types/components/OverlayAbove.js

@@ -0,0 +1,18 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Box } from '../ui.js';
+/**
+ * 瞬态面板的浮层容器：absolute 定位 + bottom:'100%' 把面板底边钉在锚点
+ * （父元素）顶边，向上覆盖转录尾部行，自身**不占布局高度**。
+ *
+ * 为什么必须这样：inline 模式下整帧是内容高度。瞬态面板（picker/补全/
+ * 对话框）若以 in-flow 方式挂载，帧高随之增长——终端滚动把帧顶行（splash、
+ * 历史）推进 scrollback；面板关闭时的收缩重绘又把这些行重新写回视口，同一
+ * 行在 scrollback 和视口各存一份（"每切一次 /model 多一份启动画"的真机报
+ * 告）。浮层只改写既有行的单元格内容（帧高不变、零滚动、零沉积），关闭时
+ * 原样写回，全程无重复。
+ *
+ * 先例：PromptInput 通知行（position=absolute marginTop={-1}）。
+ */
+export function OverlayAbove({ children, maxHeight, }) {
+    return (_jsx(Box, { position: "absolute", bottom: "100%", left: 0, right: 0, flexDirection: "column", justifyContent: "flex-end", overflow: "hidden", opaque: true, ...(maxHeight === undefined ? {} : { maxHeight }), children: _jsx(Box, { flexDirection: "column", flexShrink: 0, children: children }) }));
+}

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { PresetOption } from '../channel.js';
+import type { PresetOption } from '../dsh-adapter/channel.js';
 /**
  * Agent-preset picker (issue #8) in the CC ModelPicker style — same chrome
  * as the ActivityPicker: a permission-colored Pane listing every roster

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

@@ -1 +1 @@
-{"version":3,"file":"PresetPicker.d.ts","sourceRoot":"","sources":["../../../src/components/PresetPicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAEjD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,EAC3B,OAAO,EACP,UAAU,EACV,aAAa,GACd,EAAE;IACD,OAAO,EAAE,SAAS,YAAY,EAAE,CAAA;IAChC,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;CAClC,GAAG,KAAK,CAAC,SAAS,CA8BlB"}
+{"version":3,"file":"PresetPicker.d.ts","sourceRoot":"","sources":["../../../src/components/PresetPicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAE7D;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,EAC3B,OAAO,EACP,UAAU,EACV,aAAa,GACd,EAAE;IACD,OAAO,EAAE,SAAS,YAAY,EAAE,CAAA;IAChC,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;CAClC,GAAG,KAAK,CAAC,SAAS,CA2BlB"}

package/lib/types/components/PresetPicker.js

@@ -3,8 +3,7 @@ import { t } from '../i18n.js';
 import { Box, Text } from '../ui.js';
 import { Pane } from './design-system/Pane.js';
 import { Select } from './Select.js';
-import { Byline } from './design-system/Byline.js';
-import { KeyboardShortcutHint } from './design-system/KeyboardShortcutHint.js';
+import { HintLine } from './design-system/HintLine.js';
 /**
  * Agent-preset picker (issue #8) in the CC ModelPicker style — same chrome
  * as the ActivityPicker: a permission-colored Pane listing every roster
@@ -21,5 +20,5 @@ export function PresetPicker({ presets, focusIndex, currentPreset, }) {
                             (preset.isDefault ? t('preset-default-tag') : '') +
                             (preset.broken !== undefined ? t('preset-broken-tag') : ''),
                         description: preset.broken ?? preset.description ?? preset.id,
-                    })), focusIndex: focusIndex, selectedValue: currentPreset }), _jsx(Text, { dimColor: true, italic: true, children: _jsxs(Byline, { children: [_jsx(KeyboardShortcutHint, { shortcut: "Enter", action: "confirm", bold: true }), _jsx(KeyboardShortcutHint, { shortcut: "Esc", action: "exit" })] }) })] }) }));
+                    })), focusIndex: focusIndex, selectedValue: currentPreset }), _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: t('hint-confirm-exit') }) })] }) }));
 }

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { Channel } from '../channel.js';
+import type { Channel } from '../dsh-adapter/channel.js';
 /**
  * Imperative handle for the Chat-level Ctrl+C rule: Chat's useInput listener
  * runs BEFORE this component's (EventEmitter registration order), so Chat
@@ -39,7 +39,7 @@ export interface PromptInputProps {
  * only), `❯ ` prompt char (dimmed while a turn is working), the text with a
  * block cursor at the cursor position, and below it the slash-command
  * suggestion overlay (name column + description, selected row in the
- * `suggestion` color — ported from the leak's PromptInputFooterSuggestions).
+ * `suggestion` color — mirroring Claude Code's PromptInputFooterSuggestions).
  *
  * Empty input: a solid block caret on a blank cell and nothing else — no
  * placeholder text, so the terminal-painted IME preedit (pinyin) at the
@@ -49,8 +49,9 @@ export interface PromptInputProps {
  * the input spans multiple lines (history/command selection otherwise); the
  * visible window scrolls to keep the caret row on screen past
  * MAX_VISIBLE_LINES. Enter submits, backspace/delete edit, ←/→ move the
- * cursor, Tab completes the selected command, Escape clears (or closes the
- * help menu), `?` toggles the help menu. Windows ConPTY pipelines deliver
+ * cursor, Tab completes the selected command, Ctrl+X opens the draft in the
+ * external editor ($VISUAL/$EDITOR), Escape clears (or closes the help
+ * menu), `?` toggles the help menu. Windows ConPTY pipelines deliver
  * whole lines with the Enter key lost: a trailing CR/LF in the input marks
  * a complete line to submit.
  *

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;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"}
+{"version":3,"file":"PromptInput.d.ts","sourceRoot":"","sources":["../../../src/components/PromptInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AASzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAkDxD;;;;;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;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,qBAq6BlB"}

package/lib/types/components/PromptInput.js

@@ -1,18 +1,33 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
+import { readFile, unlink } from 'node:fs/promises';
+import { basename } from 'node:path';
 import { t } from '../i18n.js';
 import { Box, Text, useInput, useTerminalSize } from '../ui.js';
 import { useDeclaredCursor } from '../ink/hooks/use-declared-cursor.js';
 import { stringWidth } from '../ink/stringWidth.js';
 import { formatClipboardInsert, readClipboard } from '../utils/clipboard.js';
-import { filterCommands, parseCommandName } from '../commands.js';
+import { editInExternalEditor } from '../utils/externalEditor.js';
+import { 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';
+import { OverlayAbove } from './OverlayAbove.js';
 const HISTORY_LIMIT = 50;
+function clipboardImageMediaType(path) {
+    if (/\.png$/iu.test(path))
+        return 'image/png';
+    if (/\.jpe?g$/iu.test(path))
+        return 'image/jpeg';
+    if (/\.webp$/iu.test(path))
+        return 'image/webp';
+    if (/\.gif$/iu.test(path))
+        return 'image/gif';
+    return undefined;
+}
 /** Index of the word boundary at or before `cursor` (readline alt+b). */
 function wordBoundaryLeft(text, cursor) {
     let index = cursor;
@@ -48,7 +63,7 @@ const MAX_VISIBLE_LINES = 5;
  * only), `❯ ` prompt char (dimmed while a turn is working), the text with a
  * block cursor at the cursor position, and below it the slash-command
  * suggestion overlay (name column + description, selected row in the
- * `suggestion` color — ported from the leak's PromptInputFooterSuggestions).
+ * `suggestion` color — mirroring Claude Code's PromptInputFooterSuggestions).
  *
  * Empty input: a solid block caret on a blank cell and nothing else — no
  * placeholder text, so the terminal-painted IME preedit (pinyin) at the
@@ -58,8 +73,9 @@ const MAX_VISIBLE_LINES = 5;
  * the input spans multiple lines (history/command selection otherwise); the
  * visible window scrolls to keep the caret row on screen past
  * MAX_VISIBLE_LINES. Enter submits, backspace/delete edit, ←/→ move the
- * cursor, Tab completes the selected command, Escape clears (or closes the
- * help menu), `?` toggles the help menu. Windows ConPTY pipelines deliver
+ * cursor, Tab completes the selected command, Ctrl+X opens the draft in the
+ * external editor ($VISUAL/$EDITOR), Escape clears (or closes the help
+ * menu), `?` toggles the help menu. Windows ConPTY pipelines deliver
  * whole lines with the Enter key lost: a trailing CR/LF in the input marks
  * a complete line to submit.
  *
@@ -75,6 +91,10 @@ const MAX_VISIBLE_LINES = 5;
 export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, selectionActive, fillText, onFillConsumed, onRewindRequest, controllerRef, }) {
     const [value, setValue] = React.useState('');
     const [cursor, setCursor] = React.useState(0);
+    const valueRef = React.useRef(value);
+    const cursorRef = React.useRef(cursor);
+    valueRef.current = value;
+    cursorRef.current = cursor;
     // Publish the live controller (fresh closure over `value` every render).
     // clear() mirrors the double-tap-Esc clear: text + caret reset.
     React.useEffect(() => {
@@ -110,6 +130,18 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
     const escTimerRef = React.useRef(null);
     /** True while a Ctrl+V clipboard read is in flight (ignore repeat keys). */
     const clipboardBusyRef = React.useRef(false);
+    /** True while the external editor owns the terminal (Ctrl+X round-trip). */
+    const editorBusyRef = React.useRef(false);
+    /**
+     * Latest committed input state. The Ctrl+V clipboard read resolves
+     * asynchronously; inserting against the render that STARTED the read
+     * would drop whatever the user typed while waiting. The continuation
+     * inserts against this mirror instead.
+     */
+    const liveInputRef = React.useRef({ value: '', cursor: 0 });
+    React.useEffect(() => {
+        liveInputRef.current = { value, cursor };
+    });
     /** Enter dedupe window: cmd pipelines can deliver one Enter as `\r`+`\n`. */
     const lastEnterAtRef = React.useRef(0);
     React.useEffect(() => {
@@ -118,10 +150,8 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
                 clearTimeout(escTimerRef.current);
         };
     }, []);
-    const { columns } = useTerminalSize();
-    const suggestions = value.startsWith('/')
-        ? filterCommands(value, channel.commandList)
-        : [];
+    const { columns, rows: terminalRows } = useTerminalSize();
+    const suggestions = value.startsWith('/') ? channel.commandCompletions(value) : [];
     const overlayOpen = suggestions.length > 0 &&
         !helpOpen &&
         !selectionActive &&
@@ -314,8 +344,19 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
         return handled;
     };
     const setInput = (next, cursorOffset = next.length) => {
+        valueRef.current = next;
+        cursorRef.current = Math.max(0, Math.min(cursorOffset, next.length));
         setValue(next);
-        setCursor(Math.max(0, Math.min(cursorOffset, next.length)));
+        setCursor(cursorRef.current);
+    };
+    /** Clipboard reads are asynchronous; insert against the latest render so
+     * typing while PowerShell owns the clipboard never gets overwritten. */
+    const insertClipboardAtCaret = (text) => {
+        const current = valueRef.current;
+        const position = cursorRef.current;
+        setInput(current.slice(0, position) + text + current.slice(position), position + text.length);
+        setSelectedCommand(0);
+        setFileSelected(0);
     };
     /** Line index of the cursor; -1 when the cursor is at the very end. */
     const cursorLine = () => {
@@ -331,6 +372,11 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
     useInput((input, key, event) => {
         if (selectionActive)
             return;
+        // The editor round-trip ends by resuming stdin one microtask before the
+        // outcome lands — drop any key squeezed into that gap so the prompt's
+        // setValue can never overwrite fresh typing (and vice versa).
+        if (editorBusyRef.current)
+            return;
         /** Insert text at the caret (typing, paste) and dismiss overlays. */
         const insertAtCaret = (text) => {
             if (helpOpen)
@@ -349,24 +395,106 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             return;
         }
         // 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).
+        // read here — text, file paths when the file manager copied files, or an
+        // exported temp-file path when the clipboard holds a raw image.
         if (isMod(key) && input === 'v') {
             if (clipboardBusyRef.current)
                 return;
+            // Match insertAtCaret's overlay/selection dismissal up front: the
+            // async continuation below only sets value/cursor, so a paste landing
+            // while the help overlay is open would otherwise insert behind it.
+            if (helpOpen)
+                onToggleHelp();
+            setSelectedCommand(0);
+            setFileSelected(0);
             clipboardBusyRef.current = true;
-            void readClipboard().then(content => {
-                clipboardBusyRef.current = false;
+            void readClipboard()
+                .then(async (content) => {
                 if (content === null) {
                     channel.notify(t('input-clipboard-empty'), { color: 'warning' });
                     return;
                 }
-                insertAtCaret(formatClipboardInsert(content));
+                if (content.kind === 'unavailable') {
+                    channel.notify(t('input-clipboard-unavailable'), { color: 'warning' });
+                    return;
+                }
+                if (content.kind === 'image') {
+                    const mediaType = clipboardImageMediaType(content.path);
+                    if (mediaType !== undefined) {
+                        try {
+                            const token = await channel.stageImage({
+                                data: new Uint8Array(await readFile(content.path)),
+                                mediaType,
+                                name: basename(content.path),
+                            });
+                            await unlink(content.path).catch(() => undefined);
+                            insertClipboardAtCaret(`${token} `);
+                            channel.notify(t('input-image-pasted', { token }), { timeoutMs: 2500 });
+                            return;
+                        }
+                        catch (error) {
+                            const message = error instanceof Error ? error.message : String(error);
+                            channel.notify(t('input-image-paste-failed', { err: message }), { color: 'warning', timeoutMs: 5000 });
+                        }
+                    }
+                }
+                // Insert against the LIVE input state: the read above resolved
+                // asynchronously and the user may have typed while waiting.
+                const text = formatClipboardInsert(content);
+                const live = liveInputRef.current;
+                const caret = Math.min(live.cursor, live.value.length);
+                setValue(live.value.slice(0, caret) + text + live.value.slice(caret));
+                setCursor(caret + text.length);
+            })
+                .catch(() => {
+                channel.notify(t('input-clipboard-read-failed'), { color: 'warning' });
+            })
+                .finally(() => {
+                // A rejected read must never wedge Ctrl+V for the rest of the
+                // session.
+                clipboardBusyRef.current = false;
             });
             return;
         }
+        // Ctrl+X / Cmd+X: edit the current draft in $VISUAL/$EDITOR (issue #123,
+        // readline's edit-and-execute-command). The draft is written to a temp
+        // file, the terminal is handed to the editor (Ink's alt-screen handoff),
+        // and the saved text replaces the input when it differs. The util maps
+        // every failure to an outcome, but the catch/finally here is the hard
+        // guarantee: a rejected promise must never kill the process, and the
+        // busy flag must always clear or Ctrl+X stays locked forever.
+        if (isMod(key) && input === 'x') {
+            editorBusyRef.current = true;
+            void (async () => {
+                try {
+                    const outcome = await editInExternalEditor(value);
+                    if (outcome.kind === 'edited') {
+                        setValue(outcome.text);
+                        setCursor(outcome.text.length);
+                        setSelectedCommand(0);
+                        setFileSelected(0);
+                    }
+                    else if (outcome.kind === 'unavailable') {
+                        channel.notify(t('input-editor-unavailable'), { color: 'warning' });
+                    }
+                    else if (outcome.kind === 'failed') {
+                        channel.notify(t('input-editor-failed', { name: outcome.message }), {
+                            color: 'warning',
+                        });
+                    }
+                }
+                catch {
+                    channel.notify(t('input-editor-failed', { name: 'unknown' }), {
+                        color: 'warning',
+                    });
+                }
+                finally {
+                    editorBusyRef.current = false;
+                }
+            })();
+            return;
+        }
         /**
-         * Unified Enter semantics (both the parsed `return` key and the raw
          * CR/LF line from Windows cmd pipelines):
          * - command menu open → run the SELECTED command (never send `/mo`);
          * - model working → STEER into the running turn (next step boundary,
@@ -384,7 +512,7 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             if (overlayOpen) {
                 const command = suggestions[selectedCommand];
                 if (command) {
-                    tryRunCommand(`/${command.name}`);
+                    tryRunCommand(command.commandLine);
                     return;
                 }
             }
@@ -398,6 +526,14 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
                 }
             }
             if (channel.working && value.trim() !== '') {
+                // CC's immediate-command semantics: /btw is exempt from steering —
+                // the side question never interrupts the running turn. Every other
+                // input keeps the steer behavior so /new /model etc. stay idle-only.
+                const parsed = value.startsWith('/') ? parseCommandName(value) : undefined;
+                if (parsed?.name === 'btw' && channel.commandList.some(c => c.name === 'btw')) {
+                    tryRunCommand(value);
+                    return;
+                }
                 steerSend(value);
                 return;
             }
@@ -416,9 +552,9 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             }
             const line = (value + input).trim();
             if (line.startsWith('/')) {
-                const matches = filterCommands(line, channel.commandList);
+                const matches = channel.commandCompletions(line);
                 if (matches.length === 1) {
-                    tryRunCommand(`/${matches[0].name}`);
+                    tryRunCommand(matches[0].commandLine);
                     return;
                 }
             }
@@ -432,8 +568,12 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             interruptSend();
             return;
         }
-        if (key.return && key.shift) {
-            // Insert a newline at the caret (multi-line input).
+        if (key.return && (key.shift || key.meta)) {
+            // Shift+Enter / Option+Enter: insert a newline at the caret
+            // (multi-line input). Shift+Enter only arrives when the terminal
+            // supports extended key reporting (kitty/modifyOtherKeys allowlist in
+            // ink/terminal.ts); Option+Enter (ESC CR) is the fallback on terminals
+            // that can't report shift — e.g. macOS Terminal.app (issue #110).
             const next = value.slice(0, cursor) + '\n' + value.slice(cursor);
             setValue(next);
             setCursor(cursor + 1);
@@ -444,11 +584,12 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             handleEnter();
             return;
         }
-        // Shift+Tab cycles the reasoning effort (dsh parity: the adapter's own
-        // level list, e.g. deepseek Off→High→Max). Must precede the plain-Tab
-        // arms — the parser reports backtab as key.tab + key.shift.
+        // Shift+Tab cycles the configured session modes (default: 默认 →
+        // 计划模式 → 完全访问; each mode bundles plan/sandbox/approval atoms —
+        // see the `modes` config). Must precede the plain-Tab arms — the parser
+        // reports backtab as key.tab + key.shift.
         if (key.tab && key.shift) {
-            void channel.cycleEffort();
+            void channel.cycleMode();
             return;
         }
         if (key.tab && fileOverlayOpen) {
@@ -460,7 +601,7 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
         if (key.tab && overlayOpen) {
             const command = suggestions[selectedCommand];
             if (command)
-                setInput(`/${command.name} `);
+                setInput(command.replacement);
             return;
         }
         // Tab while the model is working = queue for AFTER the turn (followup),
@@ -530,16 +671,9 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             setCursor(entry.length);
             return;
         }
-        if (key.leftArrow) {
-            setCursor(previous => Math.max(0, previous - 1));
-            return;
-        }
-        if (key.rightArrow) {
-            setCursor(previous => Math.min(value.length, previous + 1));
-            return;
-        }
         if (isMod(key) && key.leftArrow) {
-            // Jump to the previous word boundary (readline alt+b).
+            // Jump to the previous word boundary (readline alt+b). Must precede the
+            // bare-arrow arms: Ctrl+Left arrives as leftArrow + ctrl.
             setCursor(previous => wordBoundaryLeft(value, previous));
             return;
         }
@@ -548,6 +682,14 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             setCursor(previous => wordBoundaryRight(value, previous));
             return;
         }
+        if (key.leftArrow) {
+            setCursor(previous => Math.max(0, previous - 1));
+            return;
+        }
+        if (key.rightArrow) {
+            setCursor(previous => Math.min(value.length, previous + 1));
+            return;
+        }
         if (key.backspace) {
             if (cursor === 0)
                 return;
@@ -741,11 +883,16 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
         column: caretVisualCol(),
         active: !selectionActive,
     });
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [lastNotification && (_jsx(Box, { position: "absolute", marginTop: -1, height: 1, width: "100%", paddingLeft: 2, paddingRight: 1, flexDirection: "column", justifyContent: "flex-end", overflow: "hidden", children: _jsx(Box, { justifyContent: "flex-end", children: _jsx(Text, { color: lastNotification.color, dimColor: !lastNotification.color, wrap: "truncate", children: lastNotification.text }) }) })), helpOpen && (_jsx(Box, { marginBottom: 1, children: _jsx(HelpMenu, { commands: channel.commandList }) })), channel.pending.length > 0 && (_jsxs(Box, { flexDirection: "column", paddingLeft: 2, paddingBottom: 1, children: [channel.pending.some(item => item.placement === 'steer') && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["\u26A1 ", t('input-pending-steer-label')] }), channel.pending
-                                .filter(item => item.placement === 'steer')
-                                .map(item => (_jsxs(Text, { dimColor: true, wrap: "truncate", children: ['  ', "\u21B3 ", item.text] }, item.id)))] })), channel.pending.some(item => item.placement === 'followup') && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["\u23F3 ", t('input-pending-queue-label')] }), channel.pending
-                                .filter(item => item.placement === 'followup')
-                                .map(item => (_jsxs(Text, { dimColor: true, wrap: "truncate", children: ['  ', "\u21B3 ", item.text] }, item.id)))] })), _jsxs(Text, { dimColor: true, children: ["Alt+\u2191 ", t('input-pending-actions-hint')] })] })), fileOverlayOpen && (_jsx(Box, { paddingLeft: 2, paddingBottom: 1, children: _jsx(FileSuggestions, { files: fileMatches, selectedIndex: fileSelected, columns: columns }) })), overlayOpen && (_jsx(Box, { paddingLeft: 2, paddingBottom: 1, children: _jsx(CommandSuggestions, { commands: suggestions, selectedIndex: selectedCommand, columns: columns }) })), _jsx(Box, { flexDirection: "column", alignItems: "flex-start", justifyContent: "flex-start", borderColor: "promptBorder", borderStyle: "round", borderLeft: false, borderRight: false, borderBottom: true, width: "100%", children: _jsxs(Box, { flexDirection: "row", alignItems: "flex-start", width: "100%", children: [_jsx(Text, { dimColor: channel.working, children: "\u276F " }), _jsx(Box, { ref: valueBoxRef, flexGrow: 1, flexShrink: 1, children: value.length === 0 ? (_jsx(Text, { inverse: true, children: " " })) : (_jsx(Box, { flexDirection: "column", children: rendered })) })] }) })] }));
+    // 浮层整体挂载条件：与内部面板可见条件精确同值。关闭时必须把整个
+    // absolute 浮层移除——渲染器的 absolute-removed 检测只看被移除节点自身
+    // 的 style.position，常驻浮层 + 移除普通子节点不会触发 blit 解毒，被
+    // 覆盖的转录行会留空（见 Chat.tsx dialogOverlayOpen 注释）。
+    const floatersOpen = helpOpen || channel.pending.length > 0 || fileOverlayOpen || overlayOpen;
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [floatersOpen && (_jsxs(OverlayAbove, { maxHeight: Math.max(terminalRows - 6, 4), children: [helpOpen && (_jsx(Box, { marginBottom: 1, children: _jsx(HelpMenu, { commands: channel.commandList }) })), channel.pending.length > 0 && (_jsxs(Box, { flexDirection: "column", paddingLeft: 2, paddingBottom: 1, children: [channel.pending.some(item => item.placement === 'steer') && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["\u26A1 ", t('input-pending-steer-label')] }), channel.pending
+                                        .filter(item => item.placement === 'steer')
+                                        .map(item => (_jsxs(Text, { dimColor: true, wrap: "truncate", children: ['  ', "\u21B3 ", item.text] }, item.id)))] })), channel.pending.some(item => item.placement === 'followup') && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["\u23F3 ", t('input-pending-queue-label')] }), channel.pending
+                                        .filter(item => item.placement === 'followup')
+                                        .map(item => (_jsxs(Text, { dimColor: true, wrap: "truncate", children: ['  ', "\u21B3 ", item.text] }, item.id)))] })), _jsxs(Text, { dimColor: true, children: ["Alt+\u2191 ", t('input-pending-actions-hint')] })] })), fileOverlayOpen && (_jsx(Box, { paddingLeft: 2, paddingBottom: 1, children: _jsx(FileSuggestions, { files: fileMatches, selectedIndex: fileSelected, columns: columns }) })), overlayOpen && (_jsx(Box, { paddingLeft: 2, paddingBottom: 1, children: _jsx(CommandSuggestions, { commands: suggestions, selectedIndex: selectedCommand, columns: columns }) }))] })), lastNotification && (_jsx(Box, { position: "absolute", marginTop: -1, height: 1, width: "100%", paddingLeft: 2, paddingRight: 1, flexDirection: "column", justifyContent: "flex-end", overflow: "hidden", children: _jsx(Box, { justifyContent: "flex-end", children: _jsx(Text, { color: lastNotification.color, dimColor: !lastNotification.color, wrap: "truncate", children: lastNotification.text }) }) })), _jsx(Box, { flexDirection: "column", alignItems: "flex-start", justifyContent: "flex-start", borderColor: channel.mode.plan === true ? 'planMode' : 'promptBorder', borderStyle: "round", borderLeft: false, borderRight: false, borderBottom: true, width: "100%", children: _jsxs(Box, { flexDirection: "row", alignItems: "flex-start", width: "100%", children: [_jsx(Text, { dimColor: channel.working, children: "\u276F " }), _jsx(Box, { ref: valueBoxRef, flexGrow: 1, flexShrink: 1, children: value.length === 0 ? (_jsx(Text, { inverse: true, children: " " })) : (_jsx(Box, { flexDirection: "column", children: rendered })) })] }) })] }));
 }
 /**
  * Hard-wrap text into visual rows of at most `width` columns (CJK-aware via

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

@@ -1,15 +1,26 @@
 import React from 'react';
 import type { SessionRecord } from '../sessionHistory.js';
+/** Interaction mode of the `/resume` picker (issue #112). */
+export type ResumePickerMode = 'list' | 'confirm-delete' | 'rename';
 /**
  * `/resume` session picker in the CC ModelPicker style: a Pane with the
  * recent sessions as Select rows (title + time description, ✓ on the
- * current session), plus the Enter/Esc hint line. Only WINDOW rows render;
- * the window follows the focused row, with `↑ N more` / `↓ N more` markers
- * at the edges.
+ * current session), plus the hint line. Only WINDOW rows render; the window
+ * follows the focused row, with `↑ N more` / `↓ N more` markers at the
+ * edges.
+ *
+ * Beyond plain selection (pi-tui style session management, issue #112):
+ *  - `confirm-delete` replaces the hints with a delete confirmation for the
+ *    focused session (Enter deletes, Esc backs out);
+ *  - `rename` shows an inline SearchBox editing the focused session's title
+ *    (Enter saves, Esc discards).
+ * Keyboard handling lives in the caller (Chat).
  */
-export declare function ResumePicker({ sessions, focusIndex, currentSessionId, }: {
+export declare function ResumePicker({ sessions, focusIndex, currentSessionId, mode, renameText, }: {
     sessions: readonly SessionRecord[];
     focusIndex: number;
     currentSessionId: string;
+    mode: ResumePickerMode;
+    renameText: string;
 }): React.ReactNode;
 //# sourceMappingURL=ResumePicker.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ResumePicker.d.ts","sourceRoot":"","sources":["../../../src/components/ResumePicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAsBzD;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,EAC3B,QAAQ,EACR,UAAU,EACV,gBAAgB,GACjB,EAAE;IACD,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAA;IAClC,UAAU,EAAE,MAAM,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;CACzB,GAAG,KAAK,CAAC,SAAS,CA8ClB"}
+{"version":3,"file":"ResumePicker.d.ts","sourceRoot":"","sources":["../../../src/components/ResumePicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAuBzD,6DAA6D;AAC7D,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,gBAAgB,GAAG,QAAQ,CAAA;AAEnE;;;;;;;;;;;;;GAaG;AACH,wBAAgB,YAAY,CAAC,EAC3B,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,IAAI,EACJ,UAAU,GACX,EAAE;IACD,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAA;IAClC,UAAU,EAAE,MAAM,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,IAAI,EAAE,gBAAgB,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;CACnB,GAAG,KAAK,CAAC,SAAS,CAsElB"}

package/lib/types/components/ResumePicker.js

@@ -1,13 +1,16 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from '../ui.js';
+import { useTerminalFocus } from '../ink/hooks/use-terminal-focus.js';
+import { t, getLang } from '../i18n.js';
 import { Pane } from './design-system/Pane.js';
 import { ListItem } from './design-system/ListItem.js';
-import { Byline } from './design-system/Byline.js';
-import { KeyboardShortcutHint } from './design-system/KeyboardShortcutHint.js';
-/** Compact timestamp like `Jan 2, 03:04` for the resume list. */
+import { HintLine } from './design-system/HintLine.js';
+import { SearchBox } from './SearchBox.js';
+import { modLabel } from '../utils/modifiers.js';
+/** Compact timestamp like `Jan 2, 03:04` (en) / `1月2日 03:04` (zh). */
 function formatTimestamp(ms) {
     const date = new Date(ms);
-    return date.toLocaleString('en-US', {
+    return date.toLocaleString(getLang() === 'zh' ? 'zh-CN' : 'en-US', {
         month: 'short',
         day: 'numeric',
         hour: '2-digit',
@@ -21,14 +24,27 @@ const WINDOW = 8;
 /**
  * `/resume` session picker in the CC ModelPicker style: a Pane with the
  * recent sessions as Select rows (title + time description, ✓ on the
- * current session), plus the Enter/Esc hint line. Only WINDOW rows render;
- * the window follows the focused row, with `↑ N more` / `↓ N more` markers
- * at the edges.
+ * current session), plus the hint line. Only WINDOW rows render; the window
+ * follows the focused row, with `↑ N more` / `↓ N more` markers at the
+ * edges.
+ *
+ * Beyond plain selection (pi-tui style session management, issue #112):
+ *  - `confirm-delete` replaces the hints with a delete confirmation for the
+ *    focused session (Enter deletes, Esc backs out);
+ *  - `rename` shows an inline SearchBox editing the focused session's title
+ *    (Enter saves, Esc discards).
+ * Keyboard handling lives in the caller (Chat).
  */
-export function ResumePicker({ sessions, focusIndex, currentSessionId, }) {
+export function ResumePicker({ sessions, focusIndex, currentSessionId, mode, renameText, }) {
+    const isTerminalFocused = useTerminalFocus();
     const start = Math.max(0, Math.min(focusIndex - Math.floor(WINDOW / 2), sessions.length - WINDOW));
     const visible = sessions.slice(start, start + WINDOW);
     const above = start;
     const below = Math.max(0, sessions.length - (start + WINDOW));
-    return (_jsxs(Pane, { color: "permission", children: [_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "remember", bold: true, children: "Resume" }) }), above > 0 && (_jsxs(Text, { dimColor: true, italic: true, children: ["\u2191 ", above, " more"] })), visible.map(session => (_jsx(ListItem, { isFocused: session.id === sessions[focusIndex]?.id, isSelected: session.id === currentSessionId, description: formatTimestamp(session.updatedAt), children: session.title || session.id }, session.id))), below > 0 && (_jsxs(Text, { dimColor: true, italic: true, children: ["\u2193 ", below, " more"] }))] }), _jsx(Text, { dimColor: true, italic: true, children: _jsxs(Byline, { children: [_jsx(KeyboardShortcutHint, { shortcut: "Enter", action: "confirm", bold: true }), _jsx(KeyboardShortcutHint, { shortcut: "Esc", action: "exit" })] }) })] }));
+    const focused = sessions[focusIndex];
+    return (_jsxs(Pane, { color: "permission", children: [_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "remember", bold: true, children: t('resume-title') }) }), above > 0 && (_jsx(Text, { dimColor: true, italic: true, children: t('resume-more-above', { n: above }) })), visible.map(session => (_jsx(ListItem, { isFocused: session.id === sessions[focusIndex]?.id, isSelected: session.id === currentSessionId, description: formatTimestamp(session.updatedAt), children: session.title || session.id }, session.id))), below > 0 && (_jsx(Text, { dimColor: true, italic: true, children: t('resume-more-below', { n: below }) })), mode === 'confirm-delete' && focused !== undefined && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "error", children: t('resume-delete-confirm', { name: focused.title || focused.id }) }) })), mode === 'rename' && (_jsx(Box, { marginTop: 1, children: _jsx(SearchBox, { query: renameText, isFocused: true, isTerminalFocused: isTerminalFocused, placeholder: t('resume-rename-placeholder'), prefix: "\u270E", borderless: true }) }))] }), _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: mode === 'list'
+                        ? t('resume-hint-list', { mod: modLabel })
+                        : mode === 'confirm-delete'
+                            ? t('resume-hint-delete')
+                            : t('resume-hint-rename') }) })] }));
 }

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { ChatRow } from '../channel.js';
+import type { ChatRow } from '../dsh-adapter/channel.js';
 /**
  * Double-Esc rewind picker (CC's "Double-tap esc to rewind the code and/or
  * conversation to a previous point in time"): lists the user's past messages

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

@@ -1 +1 @@
-{"version":3,"file":"RewindPicker.d.ts","sourceRoot":"","sources":["../../../src/components/RewindPicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAM5C;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,EAC3B,IAAI,EACJ,UAAU,EACV,UAAU,GACX,EAAE;IACD,IAAI,EAAE,SAAS,OAAO,EAAE,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,OAAO,GAAG,IAAI,CAAA;CAC3B,GAAG,KAAK,CAAC,SAAS,CAuDlB"}
+{"version":3,"file":"RewindPicker.d.ts","sourceRoot":"","sources":["../../../src/components/RewindPicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAMxD;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,EAC3B,IAAI,EACJ,UAAU,EACV,UAAU,GACX,EAAE;IACD,IAAI,EAAE,SAAS,OAAO,EAAE,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,OAAO,GAAG,IAAI,CAAA;CAC3B,GAAG,KAAK,CAAC,SAAS,CA+DlB"}