@deepseek-harness-tui/dsh-tui 0.8.6 → 0.8.7

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

@@ -1 +1 @@
-{"version":3,"file":"MessageList.d.ts","sourceRoot":"","sources":["../../../src/components/MessageList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAA8B,KAAK,eAAe,EAAE,MAAM,UAAU,CAAA;AAC3E,OAAO,KAAK,EAAE,OAAO,EAAyC,MAAM,2BAA2B,CAAA;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAa/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AA2B3D,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,WAAW,EACX,KAAK,EACL,UAAmB,EACnB,YAAwB,EACxB,cAAuB,EACvB,OAAO,EACP,WAAW,EACX,WAAW,EACX,eAAsB,EACtB,cAAc,EACd,YAAY,EACZ,eAAe,EACf,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,WAAW,GACZ,EAAE;IACD,IAAI,EAAE,SAAS,OAAO,EAAE,CAAA;IACxB,QAAQ,EAAE,OAAO,CAAA;IACjB,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IACjC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACpC,KAAK,EAAE,MAAM,CAAA;IACb,yEAAyE;IACzE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;IACzC,mEAAmE;IACnE,YAAY,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IACjC,qEAAqE;IACrE,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,EAAE,MAAM,IAAI,CAAA;IACvB;2EACuE;IACvE,WAAW,CAAC,EAAE,MAAM,IAAI,CAAA;IACxB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,8EAA8E;IAC9E,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,IAAI,KAAK,IAAI,CAAA;IAC/D,oDAAoD;IACpD,YAAY,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;IACrC,4EAA4E;IAC5E,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B;8EAC0E;IAC1E,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,0EAA0E;IAC1E,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACvC;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAChC,4DAA4D;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,qBA8VA;AAsRD;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,EACzB,KAAK,EACL,MAAM,EACN,GAAG,GACJ,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,GAAG,EAAE,MAAM,CAAA;CACZ,GAAG,KAAK,CAAC,SAAS,CAMlB"}
+{"version":3,"file":"MessageList.d.ts","sourceRoot":"","sources":["../../../src/components/MessageList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAA8B,KAAK,eAAe,EAAE,MAAM,UAAU,CAAA;AAC3E,OAAO,KAAK,EAAE,OAAO,EAAsD,MAAM,2BAA2B,CAAA;AAC5G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAe/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AA2B3D,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,WAAW,EACX,KAAK,EACL,UAAmB,EACnB,YAAwB,EACxB,cAAuB,EACvB,cAAc,EACd,OAAO,EACP,WAAW,EACX,WAAW,EACX,eAAsB,EACtB,cAAc,EACd,YAAY,EACZ,eAAe,EACf,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,WAAW,GACZ,EAAE;IACD,IAAI,EAAE,SAAS,OAAO,EAAE,CAAA;IACxB,QAAQ,EAAE,OAAO,CAAA;IACjB,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IACjC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACpC,KAAK,EAAE,MAAM,CAAA;IACb,yEAAyE;IACzE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;IACzC,mEAAmE;IACnE,YAAY,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IACjC,qEAAqE;IACrE,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B;sEACkE;IAClE,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,EAAE,MAAM,IAAI,CAAA;IACvB;2EACuE;IACvE,WAAW,CAAC,EAAE,MAAM,IAAI,CAAA;IACxB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,8EAA8E;IAC9E,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,IAAI,KAAK,IAAI,CAAA;IAC/D,oDAAoD;IACpD,YAAY,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;IACrC,4EAA4E;IAC5E,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B;8EAC0E;IAC1E,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,0EAA0E;IAC1E,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACvC;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAChC,4DAA4D;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,qBAiWA;AA2SD;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,EACzB,KAAK,EACL,MAAM,EACN,GAAG,EACH,KAAY,GACb,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,GAAG,KAAK,CAAC,SAAS,CASlB"}

package/lib/types/components/MessageList.js

@@ -7,6 +7,8 @@ import { UserPromptMessage } from './messages/UserPromptMessage.js';
 import { AssistantTextMessage } from './messages/AssistantTextMessage.js';
 import { AssistantThinkingMessage } from './messages/AssistantThinkingMessage.js';
 import { AssistantToolUseMessage } from './messages/AssistantToolUseMessage.js';
+import { SubagentMessage } from './Chat/SubagentMessage.js';
+import { isMinimalMode } from '../minimalMode.js';
 import { InterruptedByUser } from './InterruptedByUser.js';
 import { LogoV2 } from './LogoV2.js';
 import { StreamingMarkdown } from './StreamingMarkdown.js';
@@ -37,7 +39,7 @@ const DEFAULT_ROW_HEIGHT = 2;
 /** Cold-start estimate of the header block above the rows; corrected by the
  *  first layout measurement. */
 const DEFAULT_HEADER_LINES = 14;
-export function MessageList({ rows, expanded, expandedRows, selectedId, onToggleRow, model, diffLayout = 'auto', thinkingFold = 'preview', toolBackground = 'none', showAll, onToggleAll, onLoadOlder, thinkingVisible = true, registerRowRef, scrollHandle, forceMountRowId, newSinceRowId, onUnseenCount, failureHintRowId, failureHint, }) {
+export function MessageList({ rows, expanded, expandedRows, selectedId, onToggleRow, model, diffLayout = 'auto', thinkingFold = 'preview', toolBackground = 'none', activityFrames, showAll, onToggleAll, onLoadOlder, thinkingVisible = true, registerRowRef, scrollHandle, forceMountRowId, newSinceRowId, onUnseenCount, failureHintRowId, failureHint, }) {
     const hiddenCount = rows.length - MAX_RENDERED_ROWS;
     // The thinking filter runs BEFORE virtualization so window indices line up.
     const visibleRows = (showAll || hiddenCount <= 0
@@ -332,10 +334,11 @@ export function MessageList({ rows, expanded, expandedRows, selectedId, onToggle
                 // spacing; only the very first row of the whole list has none.
                 const addMargin = margins.get(row.id) === true;
                 const tool = row.tool;
-                return (_jsx(MemoRow, { rowId: row.id, kind: row.kind, text: row.text, executionTarget: row.executionTarget, streaming: row.streaming === true, durationMs: row.durationMs, time: row.time, addMargin: addMargin, isSelected: selectedId === row.id, isExpanded: expandedRows.has(row.id), expanded: expanded, model: model, diffLayout: diffLayout, thinkingFold: thinkingFold, toolBackground: toolBackground, background: rowBackground(row.id), toolCallId: tool?.callId, toolName: tool?.name, toolArgsText: tool?.argsText, toolArgsFull: tool?.argsFull, toolStatus: tool?.status, toolResultText: tool?.resultText, toolResultFull: tool?.resultFull, toolErrorText: tool?.errorText, toolFootnote: failureHintRowId === row.id ? failureHint : undefined, toolCallView: tool?.callView, toolResultView: tool?.resultView, toolStartedAt: tool?.startedAt, toolDurationMs: tool?.durationMs, nowSec: tool?.status === 'running' ? nowSec : undefined, onToggleRow: onToggleRow, setRowRef: setRowRef }, row.id));
+                const subagent = row.kind === 'subagent' ? row.subagent : undefined;
+                return (_jsx(MemoRow, { rowId: row.id, kind: row.kind, text: row.text, executionTarget: row.executionTarget, streaming: row.streaming === true, durationMs: row.durationMs, time: row.time, addMargin: addMargin, isSelected: selectedId === row.id, isExpanded: expandedRows.has(row.id), expanded: expanded, model: model, diffLayout: diffLayout, thinkingFold: thinkingFold, toolBackground: toolBackground, activityFrames: activityFrames, background: rowBackground(row.id), toolCallId: tool?.callId, toolName: tool?.name, toolArgsText: tool?.argsText, toolArgsFull: tool?.argsFull, toolStatus: tool?.status, toolResultText: tool?.resultText, toolResultFull: tool?.resultFull, toolErrorText: tool?.errorText, toolFootnote: failureHintRowId === row.id ? failureHint : undefined, toolCallView: tool?.callView, toolResultView: tool?.resultView, toolStartedAt: tool?.startedAt, toolDurationMs: tool?.durationMs, nowSec: tool?.status === 'running' ? nowSec : undefined, subagent: subagent, onToggleRow: onToggleRow, setRowRef: setRowRef }, row.id));
             }), bottomPad > 0 && _jsx(Box, { height: bottomPad, flexShrink: 0 })] }));
 }
-function TranscriptRow({ rowId, kind, text, executionTarget, streaming, durationMs, time, addMargin, isSelected, isExpanded, expanded, model, diffLayout, thinkingFold, toolBackground, background, toolCallId, toolName, toolArgsText, toolArgsFull, toolStatus, toolResultText, toolResultFull, toolErrorText, toolFootnote, toolCallView, toolResultView, toolStartedAt, toolDurationMs, onToggleRow, setRowRef, }) {
+function TranscriptRow({ rowId, kind, text, executionTarget, streaming, durationMs, time, addMargin, isSelected, isExpanded, expanded, model, diffLayout, thinkingFold, toolBackground, activityFrames, background, toolCallId, toolName, toolArgsText, toolArgsFull, toolStatus, toolResultText, toolResultFull, toolErrorText, toolFootnote, toolCallView, toolResultView, toolStartedAt, toolDurationMs, subagent, onToggleRow, setRowRef, }) {
     const ref = React.useCallback((el) => {
         setRowRef(rowId, el);
     }, [setRowRef, rowId]);
@@ -346,7 +349,7 @@ function TranscriptRow({ rowId, kind, text, executionTarget, streaming, duration
         case 'user':
             return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(UserPromptMessage, { text: text, addMargin: addMargin, isSelected: isSelected, onClick: onClick }) }));
         case 'assistant':
-            return streaming ? (_jsxs(Box, { alignItems: "flex-start", flexDirection: "row", marginTop: addMargin ? 1 : 0, width: "100%", backgroundColor: background, children: [_jsx(Box, { minWidth: 2, children: _jsx(Text, { color: "text", children: "\u25CF" }) }), _jsx(Box, { flexDirection: "column", children: _jsx(StreamingMarkdown, { children: stripNarration(text) }) })] })) : (_jsxs(Box, { width: "100%", flexDirection: "column", backgroundColor: background, ref: ref, children: [expanded && (_jsx(Box, { flexDirection: "row", justifyContent: "flex-end", gap: 1, marginTop: 1, children: _jsx(MessageMetadata, { timestamp: time, model: model }) })), _jsx(AssistantTextMessage, { text: stripNarration(text), addMargin: addMargin, isSelected: isSelected, isExpanded: isExpanded, onClick: onClick })] }));
+            return streaming ? (_jsxs(Box, { alignItems: "flex-start", flexDirection: "row", marginTop: addMargin ? 1 : 0, width: "100%", backgroundColor: background, ref: ref, children: [_jsx(Box, { minWidth: 2, children: _jsx(Text, { color: "text", children: "\u25CF" }) }), _jsx(Box, { flexDirection: "column", children: _jsx(StreamingMarkdown, { children: stripNarration(text) }) })] })) : (_jsxs(Box, { width: "100%", flexDirection: "column", backgroundColor: background, ref: ref, children: [expanded && (_jsx(Box, { flexDirection: "row", justifyContent: "flex-end", gap: 1, marginTop: 1, children: _jsx(MessageMetadata, { timestamp: time, model: model }) })), _jsx(AssistantTextMessage, { text: stripNarration(text), addMargin: addMargin, isSelected: isSelected, isExpanded: isExpanded, onClick: onClick })] }));
         case 'reasoning':
             return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(AssistantThinkingMessage, { thinking: text, addMargin: addMargin, streaming: streaming, preview: streaming &&
                         thinkingFold === 'preview' &&
@@ -396,6 +399,10 @@ function TranscriptRow({ rowId, kind, text, executionTarget, streaming, duration
             // text preview; Ctrl+O (global) or message-selection Enter reveals
             // the full summary.
             return (_jsx(Box, { marginTop: addMargin ? 1 : 0, paddingLeft: 2, backgroundColor: background, ref: ref, onClick: onClick, children: expanded || isExpanded ? (_jsx(Text, { dimColor: true, children: text })) : (_jsxs(Text, { dimColor: true, italic: true, children: ["\u2234 ", t('compact-summary-folded'), " \u00B7 ", compactPreview(text), ' ', t('hint-expand-ctrl-o')] })) }));
+        case 'subagent':
+            if (!subagent)
+                return null;
+            return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(SubagentMessage, { subagent: subagent, addMargin: addMargin, activityFrames: activityFrames, isExpanded: isExpanded, onClick: () => onToggleRow(rowId) }) }));
     }
 }
 /** Folded compact-summary preview: whitespace flattened, capped with an
@@ -412,6 +419,10 @@ const MemoRow = React.memo(TranscriptRow);
  * welcome line. It scrolls away with the transcript once the conversation
  * fills the viewport (Claude Code shows its ✦ logo in the same slot).
  */
-export function LogoHeader({ model, effort, cwd, }) {
-    return (_jsx(Box, { flexDirection: "column", marginBottom: 1, children: _jsx(LogoV2, { model: model, effort: effort, cwd: cwd }) }));
+export function LogoHeader({ model, effort, cwd, whale = true, }) {
+    // Minimal mode drops the whole splash (whale art AND wordmark) — only the
+    // transcript and a bare status bar remain.
+    if (isMinimalMode())
+        return null;
+    return (_jsx(Box, { flexDirection: "column", marginBottom: 1, children: _jsx(LogoV2, { model: model, effort: effort, cwd: cwd, whale: whale }) }));
 }

package/lib/types/components/ModelPicker.js

@@ -18,8 +18,8 @@ export function ModelPicker({ models, focusIndex, currentModel, }) {
     const { rows: terminalRows } = useTerminalSize();
     // 焦点窗口化按行预算：ListItem 带 description 时占 2 行（正文+描述，均
     // truncate 成单行），只数项数会把焦点裁出浮层（二次审查实证）。
-    // 框架行：浮层预留 8 + Pane 2 + 标题 2 + 页脚 1 = 13。
-    const { start, end } = listWindow(models.map(m => (m.description ? 2 : 1)), focusIndex, Math.max(terminalRows - 13, 2));
+    // 框架行：浮层预留 8 + Pane 2 + 标题 2 + 页脚 1 + 挂载包裹 marginTop 1 = 14。
+    const { start, end } = listWindow(models.map(m => (m.description ? 2 : 1)), focusIndex, Math.max(terminalRows - 14, 2));
     return (_jsxs(Pane, { color: "permission", children: [_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "remember", bold: true, children: t('picker-title-model') }) }), models.slice(start, end).map((model, index) => {
                         const absoluteIndex = start + index;
                         return (_jsxs(ListItem, { isFocused: absoluteIndex === focusIndex, isSelected: `${model.provider}/${model.id}` === currentModel, description: model.description, showScrollUp: absoluteIndex === start && start > 0, showScrollDown: absoluteIndex === end - 1 && end < models.length, children: [model.provider, " / ", model.name] }, `${model.provider}/${model.id}`));

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

@@ -49,7 +49,7 @@ 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, Ctrl+X opens the draft in the
+ * cursor, Tab completes the selected command, Ctrl+G 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

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;AAazB,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,qBA46BlB"}
+{"version":3,"file":"PromptInput.d.ts","sourceRoot":"","sources":["../../../src/components/PromptInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAazB,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,qBAg/BlB"}

package/lib/types/components/PromptInput.js

@@ -12,7 +12,7 @@ import { useDeclaredCursor } from '../ink/hooks/use-declared-cursor.js';
 import { stringWidth } from '../ink/stringWidth.js';
 import { formatClipboardInsert, readClipboard } from '../utils/clipboard.js';
 import { editInExternalEditor } from '../utils/externalEditor.js';
-import { parseCommandName } from '../commands.js';
+import { isHiddenCommandName, parseCommandName } from '../commands.js';
 import { appendHistory } from '../history.js';
 import { mentionAtCaret } from '../utils/mentions.js';
 import { isMod } from '../utils/modifiers.js';
@@ -77,7 +77,7 @@ 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, Ctrl+X opens the draft in the
+ * cursor, Tab completes the selected command, Ctrl+G 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
@@ -140,7 +140,7 @@ 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). */
+    /** True while the external editor owns the terminal (Ctrl+G round-trip). */
     const editorBusyRef = React.useRef(false);
     /** Enter dedupe window: cmd pipelines can deliver one Enter as `\r`+`\n`. */
     const lastEnterAtRef = React.useRef(0);
@@ -151,6 +151,11 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
         };
     }, []);
     const { columns, rows: terminalRows } = useTerminalSize();
+    const helpScrollRef = React.useRef(null);
+    // OverlayAbove reserves six terminal rows for the composer/status chrome;
+    // the help block also keeps one row below it. Its own final row is a
+    // persistent navigation hint, leaving the remainder to ScrollBox.
+    const helpViewportHeight = Math.max(3, Math.max(terminalRows - 6, 4) - 1);
     const suggestions = value.startsWith('/') ? channel.commandCompletions(value) : [];
     const overlayOpen = suggestions.length > 0 &&
         !helpOpen &&
@@ -317,10 +322,12 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
         channel.notify(t('input-interrupt-immediate'), { timeoutMs: 2500 });
     };
     /**
-     * Execute a slash command (built-in or plugin-registered) when the input
-     * resolves to one: the name parses as the first token so `/plan off`
-     * dispatches `plan` with its argument text, and the merged command list
-     * (locals + registry) decides whether the line is a command at all.
+     * Execute a slash command (built-in, plugin-registered, or hidden) when
+     * the input resolves to one: the name parses as the first token so
+     * `/plan off` dispatches `plan` with its argument text, and the merged
+     * command list (locals + registry) decides whether the line is a command
+     * at all. Hidden commands are recognized even though they are intentionally
+     * absent from the suggestion/help catalogs.
      */
     const tryRunCommand = (text) => {
         if (!text.startsWith('/'))
@@ -328,7 +335,8 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
         const parsed = parseCommandName(text);
         if (parsed === undefined)
             return false;
-        const known = channel.commandList.some(command => command.name === parsed.name);
+        const known = channel.commandList.some(command => command.name === parsed.name)
+            || isHiddenCommandName(parsed.name);
         if (!known)
             return false;
         const handled = onRunCommand(parsed.name, parsed.rawInput);
@@ -451,14 +459,22 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             });
             return;
         }
-        // Ctrl+X / Cmd+X: edit the current draft in $VISUAL/$EDITOR (issue #123,
+        // Help is modal for modified keys and every Enter variant. Ctrl+V above
+        // is the intentional exception: paste closes Help and inserts visibly.
+        // Swallow here before editor/submit/interrupt branches can mutate hidden
+        // composer or working-turn state; plain typing still dismisses Help below.
+        if (helpOpen && !key.escape && (key.ctrl || key.meta || key.super || key.return || input.includes('\n') || input.includes('\r'))) {
+            event.stopImmediatePropagation();
+            return;
+        }
+        // Ctrl+G: 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') {
+        // busy flag must always clear or Ctrl+G stays locked forever.
+        if (key.ctrl && input === 'g') {
             editorBusyRef.current = true;
             void (async () => {
                 try {
@@ -521,10 +537,13 @@ 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.
+                // the side question never interrupts the running turn. Hidden
+                // UI-only easter eggs (e.g. /deepseek) are also safe to run while
+                // streaming. 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')) {
+                if (parsed !== undefined && ((parsed.name === 'btw' && channel.commandList.some(c => c.name === 'btw'))
+                    || isHiddenCommandName(parsed.name))) {
                     tryRunCommand(value);
                     return;
                 }
@@ -583,6 +602,12 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             handleEnter();
             return;
         }
+        // Help is modal over the composer. Backtab must not cycle the session
+        // mode invisibly behind it, and plain Tab has no Help action.
+        if (helpOpen && key.tab) {
+            event.stopImmediatePropagation();
+            return;
+        }
         // 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
@@ -609,6 +634,41 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             queueSend(value);
             return;
         }
+        // Help is a viewport, not prompt history. It deliberately owns every
+        // vertical navigation event while visible; otherwise Up/Down silently
+        // walk the input history and the clipped command rows remain unreachable.
+        if (helpOpen) {
+            const page = Math.max(1, helpViewportHeight - 2);
+            if (key.upArrow || key.wheelUp) {
+                helpScrollRef.current?.scrollBy(key.wheelUp ? -3 : -1);
+                event.stopImmediatePropagation();
+                return;
+            }
+            if (key.downArrow || key.wheelDown) {
+                helpScrollRef.current?.scrollBy(key.wheelDown ? 3 : 1);
+                event.stopImmediatePropagation();
+                return;
+            }
+            if (key.pageUp || key.pageDown) {
+                helpScrollRef.current?.scrollBy(key.pageUp ? -page : page);
+                event.stopImmediatePropagation();
+                return;
+            }
+            if (key.home) {
+                helpScrollRef.current?.scrollTo(0);
+                event.stopImmediatePropagation();
+                return;
+            }
+            if (key.end) {
+                // Use a deliberately oversized absolute target rather than the
+                // sticky-bottom path: compact Help may still be measuring nested
+                // sections in this commit, while ScrollBox's render clamp resolves
+                // the target to the exact current maximum without a follow-up frame.
+                helpScrollRef.current?.scrollTo(Number.MAX_SAFE_INTEGER);
+                event.stopImmediatePropagation();
+                return;
+            }
+        }
         if (key.meta && key.upArrow) {
             // Alt+Up: pull the last pending message back for editing (pi/Codex).
             pullBackLast();
@@ -883,7 +943,7 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
     // 的 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
+    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, viewportHeight: helpViewportHeight, viewportWidth: columns, scrollRef: helpScrollRef }) })), !helpOpen && 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')

package/lib/types/components/SkillsPicker.js

@@ -37,8 +37,8 @@ function sourceLabel(source) {
 export function SkillsPicker({ skills, focusIndex, }) {
     const { rows: terminalRows } = useTerminalSize();
     // 每项恒占 2 行（正文 + 来源/简述描述行，均 truncate 成单行）。
-    // 框架行：浮层预留 8 + Pane 2 + 标题 2 + 页脚 1 = 13（ModelPicker 同款）。
-    const { start, end } = listWindow(skills.map(() => 2), focusIndex, Math.max(terminalRows - 13, 2));
+    // 框架行：浮层预留 8 + Pane 2 + 标题 2 + 页脚 1 + 挂载包裹 marginTop 1 = 14（ModelPicker 同款）。
+    const { start, end } = listWindow(skills.map(() => 2), focusIndex, Math.max(terminalRows - 14, 2));
     return (_jsxs(Pane, { color: "permission", children: [_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "remember", bold: true, children: t('picker-title-skills') }) }), skills.length === 0 ? (_jsx(Text, { dimColor: true, children: t('skills-empty') })) : (skills.slice(start, end).map((skill, index) => {
                         const absoluteIndex = start + index;
                         return (_jsx(ListItem, { isFocused: absoluteIndex === focusIndex, description: `${sourceLabel(skill.source)}${skill.description === '' ? '' : ` · ${skill.description}`}`, showScrollUp: absoluteIndex === start && start > 0, showScrollDown: absoluteIndex === end - 1 && end < skills.length, children: skill.userInvocable ? `/${skill.name}` : skill.name }, skill.name));

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

@@ -1,20 +1,8 @@
 import React from 'react';
 import type { ToolFileDiff } from '../dsh-adapter/channel.js';
-import { type CliHighlight } from '../cc/cliHighlight.js';
 export { chalkFromToken } from '../cc/syntaxTheme.js';
+export { parseAnsiRuns, highlightLines } from '../cc/syntaxRuns.js';
 import type { ToolBackground } from '../tuiDisplayPrefs.js';
-/** Parse a cli-highlight ANSI string into colored runs, preserving open
- *  spans across embedded newlines (multi-line strings/comments). Handles
- *  truecolor 38;2, 256-color 38;5 (tmux / FORCE_COLOR=2, issue #250 P1-1),
- *  and single-code 16-color SGR. */
-export declare function parseAnsiRuns(text: string): {
-    text: string;
-    color?: string;
-}[];
-export declare function highlightLines(text: string, language: string | undefined, hl: CliHighlight | null, chTheme: Record<string, (text: string) => string> | undefined, themeSig: string): readonly {
-    text: string;
-    color?: string;
-}[][] | undefined;
 export declare function SplitDiffView({ diffs, width, maxRows, verbose, toolBackground, }: {
     readonly diffs: readonly ToolFileDiff[];
     /** Content width available to the whole two-pane block (divider included). */

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

@@ -1 +1 @@
-{"version":3,"file":"SplitDiffView.d.ts","sourceRoot":"","sources":["../../../src/components/SplitDiffView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAE7D,OAAO,EAA0B,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAIjF,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAgE3D;;;oCAGoC;AACpC,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,CAuB9E;AAuBD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,EAAE,EAAE,YAAY,GAAG,IAAI,EACvB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,EAC7D,QAAQ,EAAE,MAAM,GACf,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EAAE,GAAG,SAAS,CAe3D;AAsOD,wBAAgB,aAAa,CAAC,EAC5B,KAAK,EACL,KAAK,EACL,OAAO,EACP,OAAO,EACP,cAAuB,GACxB,EAAE;IACD,QAAQ,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAA;IACvC,8EAA8E;IAC9E,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,qEAAqE;IACrE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAA;CACzC,GAAG,KAAK,CAAC,SAAS,CAiGlB"}
+{"version":3,"file":"SplitDiffView.d.ts","sourceRoot":"","sources":["../../../src/components/SplitDiffView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAO7D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAGnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAuR3D,wBAAgB,aAAa,CAAC,EAC5B,KAAK,EACL,KAAK,EACL,OAAO,EACP,OAAO,EACP,cAAuB,GACxB,EAAE;IACD,QAAQ,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAA;IACvC,8EAA8E;IAC9E,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,qEAAqE;IACrE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAA;CACzC,GAAG,KAAK,CAAC,SAAS,CAkFlB"}

package/lib/types/components/SplitDiffView.js

@@ -4,98 +4,15 @@ import { Box, Text } from '../ui.js';
 import * as JsDiff from 'diff';
 import { extname } from 'node:path';
 import { getCliHighlightPromise } from '../cc/cliHighlight.js';
-import { SYNTAX_CLASS_TO_TOKEN, chalkFromToken } from '../cc/syntaxTheme.js';
+import { highlightLines, syntaxThemeSignature } from '../cc/syntaxRuns.js';
 // Backward-compatible re-export: repro scripts import chalkFromToken from
 // this module's old home.
 export { chalkFromToken } from '../cc/syntaxTheme.js';
+export { parseAnsiRuns, highlightLines } from '../cc/syntaxRuns.js';
 import { getTheme } from '../theme.js';
 import { useTheme } from './design-system/ThemeProvider.js';
 /** Replace tabs so width math and alignment hold (pi convention). */
 const expandTabs = (text) => text.replaceAll('\t', '   ');
-// --- syntax highlighting ----------------------------------------------------
-// The hljs-class → theme-token map and chalkFromToken live in
-// ../cc/syntaxTheme.ts (shared with the markdown code-block renderer).
-/** ANSI 16-color SGR codes → rgb() strings (the dark-ansi palette path). */
-const ANSI16 = {
-    30: 'rgb(0,0,0)', 31: 'rgb(128,0,0)', 32: 'rgb(0,128,0)', 33: 'rgb(128,128,0)',
-    34: 'rgb(0,0,128)', 35: 'rgb(128,0,128)', 36: 'rgb(0,128,128)', 37: 'rgb(192,192,192)',
-    90: 'rgb(128,128,128)', 91: 'rgb(255,0,0)', 92: 'rgb(0,255,0)', 93: 'rgb(255,255,0)',
-    94: 'rgb(0,0,255)', 95: 'rgb(255,0,255)', 96: 'rgb(0,255,255)', 97: 'rgb(255,255,255)',
-};
-/** Parse a cli-highlight ANSI string into colored runs, preserving open
- *  spans across embedded newlines (multi-line strings/comments). Handles
- *  truecolor 38;2, 256-color 38;5 (tmux / FORCE_COLOR=2, issue #250 P1-1),
- *  and single-code 16-color SGR. */
-export function parseAnsiRuns(text) {
-    const runs = [];
-    let color;
-    let rest = text;
-    // eslint-disable-next-line no-control-regex -- parsing SGR is the point
-    const sgr = /\x1b\[([0-9;]+)m/;
-    while (rest.length > 0) {
-        const match = sgr.exec(rest);
-        const chunk = match === null ? rest : rest.slice(0, match.index);
-        if (chunk !== '')
-            runs.push(color === undefined ? { text: chunk } : { text: chunk, color });
-        if (match === null)
-            break;
-        const codes = match[1].split(';').map(Number);
-        if (codes.includes(0) || codes.includes(39))
-            color = undefined;
-        else if (codes[0] === 38 && codes[1] === 2 && codes.length >= 5) {
-            color = `rgb(${codes[2]},${codes[3]},${codes[4]})`;
-        }
-        else if (codes[0] === 38 && codes[1] === 5 && codes.length >= 3) {
-            color = `ansi256(${codes[2]})`;
-        }
-        else if (codes.length === 1 && ANSI16[codes[0]] !== undefined) {
-            color = ANSI16[codes[0]];
-        }
-        rest = rest.slice(match.index + match[0].length);
-    }
-    return runs;
-}
-/** Split flat runs into per-line run arrays at embedded newlines. */
-function splitRunsToLines(runs) {
-    const lines = [[]];
-    for (const run of runs) {
-        const parts = run.text.split('\n');
-        for (let i = 0; i < parts.length; i++) {
-            if (i > 0)
-                lines.push([]);
-            if (parts[i] !== '') {
-                lines[lines.length - 1].push(run.color === undefined ? { text: parts[i] } : { text: parts[i], color: run.color });
-            }
-        }
-    }
-    return lines;
-}
-/** Whole-hunk syntax runs per line, cached per (theme signature + language
- *  + text): one entry survives any amount of card re-rendering, and the
- *  palette change invalidates it (issue #250, P1-2 + P2-8). */
-const syntaxCache = new Map();
-const SYNTAX_CACHE_MAX = 40;
-export function highlightLines(text, language, hl, chTheme, themeSig) {
-    if (hl === null || chTheme === undefined || language === undefined)
-        return undefined;
-    if (text === '' || !hl.supportsLanguage(language))
-        return undefined;
-    const key = `${themeSig}${language}${text}`;
-    const cached = syntaxCache.get(key);
-    if (cached !== undefined)
-        return cached;
-    let lines;
-    try {
-        lines = splitRunsToLines(parseAnsiRuns(hl.highlight(text, { language, theme: chTheme })));
-    }
-    catch {
-        return undefined;
-    }
-    if (syntaxCache.size >= SYNTAX_CACHE_MAX)
-        syntaxCache.clear();
-    syntaxCache.set(key, lines);
-    return lines;
-}
 /**
  * Merge syntax runs with word-diff change flags over the same string: both
  * partition it, so an offset sweep yields runs carrying a syntax color AND
@@ -306,24 +223,8 @@ export function SplitDiffView({ diffs, width, maxRows, verbose, toolBackground =
     const [themeName] = useTheme();
     // Resolved-palette signature: covers dark→light, light→dark, AND the
     // `auto` base flip where the name never changes (issue #250, P1-2).
-    const themeSig = React.useMemo(() => {
-        const theme = getTheme(themeName);
-        return Object.values(SYNTAX_CLASS_TO_TOKEN)
-            .map(key => theme[key] ?? '')
-            .join('|');
-    }, [themeName]);
-    const chTheme = React.useMemo(() => {
-        const theme = getTheme(themeName);
-        const out = {};
-        for (const [tokenClass, tokenKey] of Object.entries(SYNTAX_CLASS_TO_TOKEN)) {
-            const value = theme[tokenKey];
-            if (value !== undefined)
-                out[tokenClass] = chalkFromToken(value);
-        }
-        return out;
-        // themeSig changes exactly when any syntax token's resolved value does.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [themeSig]);
+    const syntaxTheme = React.useMemo(() => getTheme(themeName), [themeName]);
+    const themeSig = React.useMemo(() => syntaxThemeSignature(syntaxTheme), [syntaxTheme]);
     // Alignment is text-only and capped BEFORE styling: the highlighter and
     // word-diff work lands only on the visible slice (issue #250, P2-8).
     const rows = [];
@@ -348,8 +249,8 @@ export function SplitDiffView({ diffs, width, maxRows, verbose, toolBackground =
     const fileSyntax = diffs.map(diff => {
         const language = extname(diff.path).replace(/^\./, '') || undefined;
         return {
-            old: highlightLines(expandTabs(diff.oldText ?? ''), language, hl, chTheme, themeSig),
-            next: highlightLines(expandTabs(diff.newText), language, hl, chTheme, themeSig),
+            old: highlightLines(expandTabs(diff.oldText ?? ''), language, hl, syntaxTheme, themeSig),
+            next: highlightLines(expandTabs(diff.newText), language, hl, syntaxTheme, themeSig),
         };
     });
     return (_jsxs(Box, { flexDirection: "column", width: paneWidth * 2 + 1, children: [visible.map((row, index) => {

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

@@ -0,0 +1,9 @@
+import React from 'react';
+import type { SubagentState } from '../dsh-adapter/subagents.js';
+export interface SubagentCardProps {
+    subagent: SubagentState;
+    focused?: boolean;
+    onClick?: () => void;
+}
+export declare function SubagentCard({ subagent, focused, onClick }: SubagentCardProps): React.ReactNode;
+//# sourceMappingURL=SubagentCard.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SubagentCard.d.ts","sourceRoot":"","sources":["../../../src/components/SubagentCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAShE,MAAM,WAAW,iBAAiB;IAAG,QAAQ,EAAE,aAAa,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CAAE;AAEvG,wBAAgB,YAAY,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,iBAAiB,GAAG,KAAK,CAAC,SAAS,CA4B/F"}

package/lib/types/components/SubagentCard.js

@@ -0,0 +1,26 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Text } from '../ui.js';
+import { t } from '../i18n.js';
+import { isMinimalMode } from '../minimalMode.js';
+function formatDuration(ms) {
+    const seconds = Math.floor(ms / 1000);
+    return seconds < 60 ? `${seconds}s` : `${Math.floor(seconds / 60)}m${seconds % 60}s`;
+}
+export function SubagentCard({ subagent, focused, onClick }) {
+    const running = subagent.status === 'running' || subagent.status === 'starting';
+    const elapsed = subagent.completedAt ? subagent.completedAt - subagent.startedAt : Date.now() - subagent.startedAt;
+    const total = subagent.tokens?.total ?? ((subagent.tokens?.input ?? 0) + (subagent.tokens?.output ?? 0) || 0);
+    // Live preview: the newest streamed line rides under the header while the
+    // subagent runs, then folds away — the dashboard stays one line per settled
+    // subagent.
+    const liveLine = running ? subagent.output[subagent.output.length - 1] : undefined;
+    const minimal = isMinimalMode();
+    const glyph = running ? (minimal ? '·' : '🟡')
+        : subagent.status === 'failed' || subagent.status === 'cancelled' ? (minimal ? '×' : '🔴')
+            : (minimal ? '✓' : '🟢');
+    const glyphColor = minimal ? undefined
+        : running ? 'warning'
+            : subagent.status === 'failed' || subagent.status === 'cancelled' ? 'error'
+                : 'success';
+    return _jsxs(Box, { flexDirection: "column", paddingLeft: 1, marginBottom: 1, onClick: onClick, children: [_jsxs(Box, { flexDirection: "row", gap: 1, children: [_jsx(Text, { color: glyphColor, children: glyph }), _jsx(Text, { bold: true, color: focused ? 'claude' : undefined, children: `${t('subagent-card-prefix')}${subagent.description}` }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: ' · ' }), _jsx(Text, { children: subagent.model ?? subagent.provider ?? 'default' }), _jsx(Text, { dimColor: true, children: ` · ${formatDuration(elapsed)} · ${total || '—'} tok · ${subagent.toolCalls.length} tools` })] })] }), liveLine && _jsx(Text, { dimColor: true, wrap: "truncate", children: `  │ ${liveLine}` })] });
+}

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

@@ -0,0 +1,13 @@
+import React from 'react';
+import type { SubagentState } from '../dsh-adapter/subagents.js';
+export interface SubagentDashboardProps {
+    subagents: SubagentState[];
+    onClose: () => void;
+    onSelect?: (agentId: string) => void;
+}
+/**
+ * SubagentDashboard — overlay panel showing all active/recent subagents.
+ * Keyboard: up/down to navigate, Enter to view detail, Esc to close.
+ */
+export declare function SubagentDashboard({ subagents, onClose, onSelect }: SubagentDashboardProps): React.ReactNode;
+//# sourceMappingURL=SubagentDashboard.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SubagentDashboard.d.ts","sourceRoot":"","sources":["../../../src/components/SubagentDashboard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAMhE,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,aAAa,EAAE,CAAA;IAC1B,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACrC;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,SAAS,EACT,OAAO,EACP,QAAQ,EACT,EAAE,sBAAsB,GAAG,KAAK,CAAC,SAAS,CAoG1C"}

package/lib/types/components/SubagentDashboard.js

@@ -0,0 +1,50 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
+import { Box, Text, useInput, ScrollBox, useTerminalSize } from '../ui.js';
+import { SubagentCard } from './SubagentCard.js';
+import { t } from '../i18n.js';
+import { Divider } from './design-system/Divider.js';
+import { isPlainReturnInput } from '../utils/modifiers.js';
+/**
+ * SubagentDashboard — overlay panel showing all active/recent subagents.
+ * Keyboard: up/down to navigate, Enter to view detail, Esc to close.
+ */
+export function SubagentDashboard({ subagents, onClose, onSelect }) {
+    const [focusIndex, setFocusIndex] = React.useState(0);
+    const scrollRef = React.useRef(null);
+    const { rows, columns } = useTerminalSize();
+    useInput((input, key, event) => {
+        if (key.escape || (key.ctrl && input === 'c')) {
+            event.stopImmediatePropagation();
+            onClose();
+            return;
+        }
+        if (key.upArrow) {
+            event.stopImmediatePropagation();
+            setFocusIndex(i => Math.max(0, i - 1));
+            scrollRef.current?.scrollBy(-3);
+            return;
+        }
+        if (key.downArrow) {
+            event.stopImmediatePropagation();
+            setFocusIndex(i => Math.min(subagents.length - 1, i + 1));
+            scrollRef.current?.scrollBy(3);
+            return;
+        }
+        if (isPlainReturnInput(input, key) && onSelect) {
+            event.stopImmediatePropagation();
+            const selected = subagents[focusIndex];
+            if (selected)
+                onSelect(selected.agentId);
+            return;
+        }
+        // Consume all input while dashboard is open
+        event.stopImmediatePropagation();
+    });
+    const running = subagents.filter(s => s.status === 'running').length;
+    const completed = subagents.filter(s => s.status === 'completed').length;
+    const failed = subagents.filter(s => s.status === 'failed').length;
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [_jsx(Divider, { color: "claude", title: t('subagent-dashboard-title'), padding: 4 }), _jsxs(Box, { flexDirection: "row", gap: 3, marginTop: 1, marginBottom: 1, children: [_jsxs(Text, { children: [_jsx(Text, { color: "claude", children: running }), _jsxs(Text, { dimColor: true, children: [" ", t('subagent-count-running')] })] }), _jsxs(Text, { children: [_jsx(Text, { color: "success", children: completed }), _jsxs(Text, { dimColor: true, children: [" ", t('subagent-count-completed')] })] }), failed > 0 && (_jsxs(Text, { children: [_jsx(Text, { color: "error", children: failed }), _jsxs(Text, { dimColor: true, children: [" ", t('subagent-count-failed')] })] }))] }), _jsx(Box, { flexDirection: "column", maxHeight: Math.max(10, rows - 10), marginTop: 1, children: _jsx(ScrollBox, { ref: scrollRef, flexDirection: "column", flexGrow: 1, children: subagents.length === 0 ? (_jsxs(Box, { flexDirection: "column", alignItems: "center", marginTop: Math.max(2, Math.floor((rows - 16) / 3)), children: [_jsx(Text, { dimColor: true, children: '○' }), _jsx(Text, { dimColor: true, children: t('subagent-none') }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t('subagent-empty-hint') }) })] })) : (subagents.map((subagent, index) => (_jsxs(Box, { flexDirection: "column", children: [_jsx(SubagentCard, { subagent: subagent, focused: index === focusIndex }), index < subagents.length - 1 && (_jsx(Text, { dimColor: true, children: '─'.repeat(Math.max(20, Math.min(72, columns - 6))) }))] }, subagent.agentId)))) }) }), _jsx(Divider, { color: "subtle", title: "", padding: 4 }), _jsx(Box, { marginTop: 0, children: _jsx(Text, { dimColor: true, children: onSelect
+                        ? t('subagent-dashboard-hint-detail')
+                        : t('subagent-dashboard-hint-basic') }) })] }));
+}

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

@@ -0,0 +1,16 @@
+import React from 'react';
+import type { SubagentState } from '../dsh-adapter/subagents.js';
+export interface SubagentDetailSceneProps {
+    subagent: SubagentState;
+    onBack: () => void;
+    onInterrupt?: (agentId: string) => void;
+}
+/**
+ * SubagentDetailScene — full-screen paged detail view for one subagent.
+ * Header block (identity + stats) stays fixed; the body pages through
+ * 摘要 / 输出 / 工具 with ←/→. Follow-up delivery was removed: the official
+ * seam only accepts continuable children, and one-shot spawn children are
+ * disposed at settlement, so the affordance would be a dead control.
+ */
+export declare function SubagentDetailScene({ subagent, onBack, onInterrupt, }: SubagentDetailSceneProps): React.ReactNode;
+//# sourceMappingURL=SubagentDetailScene.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SubagentDetailScene.d.ts","sourceRoot":"","sources":["../../../src/components/SubagentDetailScene.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAsGhE,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,aAAa,CAAA;IACvB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACxC;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,QAAQ,EACR,MAAM,EACN,WAAW,GACZ,EAAE,wBAAwB,GAAG,KAAK,CAAC,SAAS,CA+L5C"}