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

package/lib/types/components/HelpMenu.js

@@ -2,14 +2,19 @@ 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 { t } from '../i18n.js';
 import { modLabel } from '../utils/modifiers.js';
 /**
- * The `?` help menu, ported from the leak's `PromptInputHelpMenu.tsx`
+ * The `?` help menu, mirroring Claude Code'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.
+ * Skill entries (user-invocable skills merged for `/` completion, issue
+ * #86) are hidden — a skills directory can hold dozens of entries and the
+ * menu is for chrome commands. 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: _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)))] })] }));
+    const chrome = commands.filter(command => !command.skill);
+    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: t('help-for-commands') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-this-help') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-verbose-output', { mod: modLabel }) }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-toggle-context', { mod: modLabel }) }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-search-history', { mod: modLabel }) }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-interrupt') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-exit') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-redraw', { mod: modLabel }) }) })] }), _jsxs(Box, { flexDirection: "column", width: 24, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-clear-input') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-history-nav') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-move-cursor') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-word-jumps', { mod: modLabel }) }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-complete-command') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-cycle-mode') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-open-editor') }) })] }), _jsxs(Box, { flexDirection: "column", flexShrink: 1, children: [_jsx(Text, { dimColor: true, children: t('help-commands-title') }), chrome.map(command => (_jsx(Box, { children: _jsxs(Text, { dimColor: true, wrap: "truncate-end", children: ["/", command.name, " \u2014 ", localizedDescription(command)] }) }, command.name)))] })] }));
 }

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { type HistoryEntry } from '../history.js';
 /**
- * The ctrl+r history search dialog, in the shape of the leak's
+ * The ctrl+r history search dialog, in the shape of Claude Code's
  * HistorySearchDialog/FuzzyPicker: a permission-colored Pane with a bold
  * title, the ⌕ SearchBox, the filtered history as ListItem rows (newest
  * first), and the ↑/↓ · Enter · Esc hint line. Keyboard handling lives in

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

@@ -1 +1 @@
-{"version":3,"file":"HistorySearchDialog.d.ts","sourceRoot":"","sources":["../../../src/components/HistorySearchDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAA;AAEjE;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,KAAK,EACL,YAAY,EACZ,OAAO,EACP,UAAU,GACX,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,SAAS,YAAY,EAAE,CAAA;IAChC,UAAU,EAAE,MAAM,CAAA;CACnB,GAAG,KAAK,CAAC,SAAS,CAsClB"}
+{"version":3,"file":"HistorySearchDialog.d.ts","sourceRoot":"","sources":["../../../src/components/HistorySearchDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AASzB,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAA;AAEjE;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,KAAK,EACL,YAAY,EACZ,OAAO,EACP,UAAU,GACX,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,SAAS,YAAY,EAAE,CAAA;IAChC,UAAU,EAAE,MAAM,CAAA;CACnB,GAAG,KAAK,CAAC,SAAS,CAmDlB"}

package/lib/types/components/HistorySearchDialog.js

@@ -1,14 +1,15 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Box, Text } from '../ui.js';
+import { t } from '../i18n.js';
+import { Box, Text, useTerminalSize } from '../ui.js';
 import { useTerminalFocus } from '../ink/hooks/use-terminal-focus.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';
+import { HintLine } from './design-system/HintLine.js';
 import { SearchBox } from './SearchBox.js';
+import { listWindow } from './listWindow.js';
 import { historyEntryId } from '../history.js';
 /**
- * The ctrl+r history search dialog, in the shape of the leak's
+ * The ctrl+r history search dialog, in the shape of Claude Code's
  * HistorySearchDialog/FuzzyPicker: a permission-colored Pane with a bold
  * title, the ⌕ SearchBox, the filtered history as ListItem rows (newest
  * first), and the ↑/↓ · Enter · Esc hint line. Keyboard handling lives in
@@ -16,16 +17,26 @@ import { historyEntryId } from '../history.js';
  */
 export function HistorySearchDialog({ query, cursorOffset, matches, focusIndex, }) {
     const isTerminalFocused = useTerminalFocus();
-    return (_jsx(Pane, { color: "permission", children: _jsxs(Box, { flexDirection: "column", gap: 1, children: [_jsx(Text, { bold: true, color: "permission", children: "Search history" }), _jsx(SearchBox, { query: query, cursorOffset: cursorOffset, isFocused: true, isTerminalFocused: isTerminalFocused, placeholder: "Type to search\u2026" }), matches.length === 0 ? (_jsx(Text, { dimColor: true, children: "No matching commands" })) : (matches.map((entry, index) => (_jsx(ListItem, { isFocused: index === focusIndex, description: formatRelativeAge(entry.ts), children: entry.text }, historyEntryId(entry))))), _jsx(Text, { dimColor: true, italic: true, children: _jsxs(Byline, { children: [_jsx(KeyboardShortcutHint, { shortcut: "\u2191/\u2193", action: "navigate" }), _jsx(KeyboardShortcutHint, { shortcut: "Enter", action: "select", bold: true }), _jsx(KeyboardShortcutHint, { shortcut: "Esc", action: "cancel" })] }) })] }) }));
+    const { rows: terminalRows } = useTerminalSize();
+    // 焦点窗口化按行预算：每项恒 2 行（命令 + age 描述，ListItem 保证单行
+    // 截断），容器 gap={1} 项间再空 1 行。只数项数会把焦点裁出浮层（二次
+    // 审查实证）。
+    // 框架行：浮层预留 8 + Pane 2 + 标题 1 + gap 1 + SearchBox 3（圆角边框）
+    // + gap 1 + gap 1 + 页脚 1 = 18。
+    const { start, end } = listWindow(matches.map(() => 2), focusIndex, Math.max(terminalRows - 18, 2), 1);
+    return (_jsx(Pane, { color: "permission", children: _jsxs(Box, { flexDirection: "column", gap: 1, children: [_jsx(Text, { bold: true, color: "permission", children: t('history-search-title') }), _jsx(SearchBox, { query: query, cursorOffset: cursorOffset, isFocused: true, isTerminalFocused: isTerminalFocused, placeholder: t('history-search-placeholder') }), matches.length === 0 ? (_jsx(Text, { dimColor: true, children: t('history-search-empty') })) : (matches.slice(start, end).map((entry, index) => {
+                    const absoluteIndex = start + index;
+                    return (_jsx(ListItem, { isFocused: absoluteIndex === focusIndex, description: formatRelativeAge(entry.ts), showScrollUp: absoluteIndex === start && start > 0, showScrollDown: absoluteIndex === end - 1 && end < matches.length, children: entry.text }, historyEntryId(entry)));
+                })), _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: t('hint-history-search') }) })] }) }));
 }
-/** "now", "5m ago", "2h ago", "3d ago" — like CC's formatRelativeTimeAgo. */
+/** Relative age like CC's formatRelativeTimeAgo ("now" / "5m ago" / …), localized. */
 function formatRelativeAge(ts) {
     const elapsed = Date.now() - ts;
     if (elapsed < 60_000)
-        return 'now';
+        return t('time-now');
     if (elapsed < 3_600_000)
-        return `${Math.floor(elapsed / 60_000)}m ago`;
+        return t('time-minutes-ago', { n: Math.floor(elapsed / 60_000) });
     if (elapsed < 86_400_000)
-        return `${Math.floor(elapsed / 3_600_000)}h ago`;
-    return `${Math.floor(elapsed / 86_400_000)}d ago`;
+        return t('time-hours-ago', { n: Math.floor(elapsed / 3_600_000) });
+    return t('time-days-ago', { n: Math.floor(elapsed / 86_400_000) });
 }

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

@@ -1,7 +1,7 @@
 import React from 'react';
 /**
- * The dim "interrupted" row shown when the user stops a turn, ported from
- * the leak's `InterruptedByUser.tsx`.
+ * The dim "interrupted" row shown when the user stops a turn, mirroring
+ * Claude Code's `InterruptedByUser.tsx`.
  */
 export declare function InterruptedByUser(): React.ReactNode;
 //# sourceMappingURL=InterruptedByUser.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"InterruptedByUser.d.ts","sourceRoot":"","sources":["../../../src/components/InterruptedByUser.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,KAAK,CAAC,SAAS,CAOnD"}
+{"version":3,"file":"InterruptedByUser.d.ts","sourceRoot":"","sources":["../../../src/components/InterruptedByUser.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,KAAK,CAAC,SAAS,CAOnD"}

package/lib/types/components/InterruptedByUser.js

@@ -1,9 +1,10 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { Text } from '../ui.js';
+import { t } from '../i18n.js';
 /**
- * The dim "interrupted" row shown when the user stops a turn, ported from
- * the leak's `InterruptedByUser.tsx`.
+ * The dim "interrupted" row shown when the user stops a turn, mirroring
+ * Claude Code's `InterruptedByUser.tsx`.
  */
 export function InterruptedByUser() {
-    return (_jsxs(_Fragment, { children: [_jsx(Text, { dimColor: true, children: "Interrupted " }), _jsx(Text, { dimColor: true, children: "\u00B7 What should DeepSeek do instead?" })] }));
+    return (_jsxs(_Fragment, { children: [_jsx(Text, { dimColor: true, children: t('interrupted-by-user') }), _jsx(Text, { dimColor: true, children: t('interrupted-ask-next') })] }));
 }

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { LoadedContext } from '../channel.js';
+import type { LoadedContext } from '../dsh-adapter/channel.js';
 /**
  * The startup context panel: a collapsed one-line summary of what a
  * fresh conversation will load for the current agent (system prompt

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

@@ -1 +1 @@
-{"version":3,"file":"LoadedContextPanel.d.ts","sourceRoot":"","sources":["../../../src/components/LoadedContextPanel.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,aAAa,EAAsB,MAAM,eAAe,CAAA;AA+BtE;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,OAAO,EAAE,aAAa,CAAA;IACtB,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,MAAM,IAAI,CAAA;CACrB,GAAG,KAAK,CAAC,SAAS,CAkElB"}
+{"version":3,"file":"LoadedContextPanel.d.ts","sourceRoot":"","sources":["../../../src/components/LoadedContextPanel.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,aAAa,EAAsB,MAAM,2BAA2B,CAAA;AA+BlF;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,OAAO,EAAE,aAAa,CAAA;IACtB,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,MAAM,IAAI,CAAA;CACrB,GAAG,KAAK,CAAC,SAAS,CAkElB"}

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

@@ -1 +1 @@
-{"version":3,"file":"LogoV2.d.ts","sourceRoot":"","sources":["../../../src/components/LogoV2.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAoDzB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,MAAM,CAAC,EACrB,KAAK,EACL,MAAM,EACN,GAAG,EACH,SAAiB,GAClB,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,iFAAiF;IACjF,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,GAAG,KAAK,CAAC,SAAS,CA+ElB"}
+{"version":3,"file":"LogoV2.d.ts","sourceRoot":"","sources":["../../../src/components/LogoV2.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAqDzB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,MAAM,CAAC,EACrB,KAAK,EACL,MAAM,EACN,GAAG,EACH,SAAiB,GAClB,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,iFAAiF;IACjF,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,GAAG,KAAK,CAAC,SAAS,CAiFlB"}

package/lib/types/components/LogoV2.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { t as tr } from '../i18n.js';
+import { modLabel } from '../utils/modifiers.js';
 import { readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -91,5 +92,5 @@ export function LogoV2({ model, effort, cwd, skipIntro = false, }) {
     const t = settled ? 0 : time;
     const bigDeepSeek = renderBigText('DEEPSEEK', t, wordmarkRGB, taglineRGB, FLASH, 60);
     const bigHarness = renderBigText('HARNESS', t, taglineRGB, PALE, FLASH, 60);
-    return (_jsxs(Box, { ref: ref, flexDirection: "column", marginTop: 1, children: [_jsxs(Box, { flexDirection: "row", gap: 2, width: "100%", alignItems: "center", children: [showWhale && _jsx(WhaleArt, { frameIndex: frameIndex, width: FULL_WHALE_WIDTH }), _jsxs(Box, { flexDirection: "column", flexShrink: 1, children: [_jsxs(Text, { wrap: "truncate-end", children: [sweep('✦ dsh-TUI', t, wordmarkRGB, wordmarkShimmerRGB, 60), _jsx(Text, { dimColor: true, children: '  v' + VERSION })] }), bigDeepSeek.map((row, index) => (_jsx(Text, { wrap: "truncate-end", children: row }, `ds-${index}`))), bigHarness.map((row, index) => (_jsx(Text, { wrap: "truncate-end", children: row }, `h-${index}`))), _jsxs(Text, { wrap: "truncate-end", children: [model, effort !== undefined && _jsx(Text, { dimColor: true, children: ' · ' + capitalize(effort) + ' effort' })] }), _jsx(Text, { dimColor: true, wrap: "truncate-end", children: cwd }), _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { dimColor: true, children: "Tip: " }), "/model", _jsxs(Text, { dimColor: true, children: [" ", tr('logo-tip-model'), " \u00B7 "] }), "/help", _jsxs(Text, { dimColor: true, children: [" ", tr('logo-tip-help'), " \u00B7 "] }), "Tab", _jsxs(Text, { dimColor: true, children: [" ", tr('logo-tip-tab')] })] })] })] }), _jsx(Box, { marginTop: 1, paddingLeft: showWhale ? WELCOME_PAD : 2, children: _jsx(Text, { children: sweep(tr('logo-tagline'), t, taglineRGB, FLASH, 60) }) })] }));
+    return (_jsxs(Box, { ref: ref, flexDirection: "column", marginTop: 1, children: [_jsxs(Box, { flexDirection: "row", gap: 2, width: "100%", alignItems: "center", children: [showWhale && _jsx(WhaleArt, { frameIndex: frameIndex, width: FULL_WHALE_WIDTH }), _jsxs(Box, { flexDirection: "column", flexShrink: 1, children: [_jsxs(Text, { wrap: "truncate-end", children: [sweep('✦ dsh-TUI', t, wordmarkRGB, wordmarkShimmerRGB, 60), _jsx(Text, { dimColor: true, children: '  v' + VERSION })] }), bigDeepSeek.map((row, index) => (_jsx(Text, { wrap: "truncate-end", children: row }, `ds-${index}`))), bigHarness.map((row, index) => (_jsx(Text, { wrap: "truncate-end", children: row }, `h-${index}`))), _jsxs(Text, { wrap: "truncate-end", children: [model, effort !== undefined && _jsx(Text, { dimColor: true, children: ' · ' + capitalize(effort) + ' effort' })] }), _jsx(Text, { dimColor: true, wrap: "truncate-end", children: cwd }), _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { dimColor: true, children: tr('logo-tip-prefix') }), "/model", _jsxs(Text, { dimColor: true, children: [" ", tr('logo-tip-model'), " \u00B7 "] }), "/help", _jsxs(Text, { dimColor: true, children: [" ", tr('logo-tip-help'), " \u00B7 "] }), `${modLabel}t`, _jsxs(Text, { dimColor: true, children: [" ", tr('logo-tip-trace'), " \u00B7 "] }), "Tab", _jsxs(Text, { dimColor: true, children: [" ", tr('logo-tip-tab')] })] })] })] }), _jsx(Box, { marginTop: 1, paddingLeft: showWhale ? WELCOME_PAD : 2, children: _jsx(Text, { children: sweep(tr('logo-tagline'), t, taglineRGB, FLASH, 60) }) })] }));
 }

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

@@ -1,23 +1,23 @@
 import React from 'react';
 /**
- * Markdown renderer ported from Claude Code (the leak's `Markdown.tsx`):
- * marked lexer + ANSI formatter, tables rendered as flexbox-style bordered
- * components, async syntax highlighting via cli-highlight. The ANSI strings
- * render inside raw `Text` (the ported Ink core preserves ANSI in children;
- * the fork's `Ansi` span parser drops SGR 1 bold).
+ * Markdown 渲染组件：marked 分词 + ANSI 格式化。
+ *
+ * 表格 token 交给 MarkdownTable 渲染为带边框的 flexbox 布局；
+ * 其余块级内容由 formatToken 转成 ANSI 字符串，合并后包进单个
+ * Text（整段去首尾空白）。代码块高亮由 cli-highlight 异步提供，
+ * 加载完成后自动触发一次重渲染。无 markdown 语法的纯文本走快速
+ * 路径，直接合成段落 token，省掉 lexer 调用。
  */
 type Props = {
     children: string;
-    /** When true, render all text content as dim */
+    /** 为 true 时全部文本内容以 dim 样式呈现 */
     dimColor?: boolean;
-    /** False for the streaming tail (its content changes every chunk, so a
-     *  cache entry would never hit and would only pollute the token cache). */
+    /** 为 false 时跳过 token 缓存（流式尾部的内容逐帧变化，缓存必然失效） */
     cacheTokens?: boolean;
 };
 /**
- * Renders markdown content using a hybrid approach:
- * - Tables are rendered as bordered flexbox components
- * - Other content is rendered as ANSI strings via formatToken
+ * 混合渲染 Markdown 内容：表格用带边框的 flexbox 组件，其余内容由
+ * formatToken 生成 ANSI 字符串放入 Text。高亮对象异步就绪后自动刷新。
  */
 export declare function Markdown({ children, dimColor, cacheTokens }: Props): React.ReactNode;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"Markdown.d.ts","sourceRoot":"","sources":["../../../src/components/Markdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB;;;;;;GAMG;AAEH,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,MAAM,CAAA;IAChB,gDAAgD;IAChD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;+EAC2E;IAC3E,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,CAAA;AA8DD;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,EAAE,QAAQ,EAAE,QAAgB,EAAE,WAAkB,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CAuDnG"}
+{"version":3,"file":"Markdown.d.ts","sourceRoot":"","sources":["../../../src/components/Markdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB;;;;;;;;GAQG;AAEH,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,MAAM,CAAA;IAChB,+BAA+B;IAC/B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,+CAA+C;IAC/C,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,CAAA;AA4GD;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,EAAE,QAAQ,EAAE,QAAgB,EAAE,WAAkB,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CA6BnG"}

package/lib/types/components/Markdown.js

@@ -5,30 +5,32 @@ import { Box, Text } from '../ui.js';
 import { configureMarked, formatToken, stripPromptXMLTags } from '../cc/markdown.js';
 import { getCliHighlightPromise } from '../cc/cliHighlight.js';
 import { MarkdownTable } from './MarkdownTable.js';
-// Module-level token cache — marked.lexer is the hot cost on remounts.
-// Messages are immutable; same content → same tokens.
+// ---- token 缓存 ----
 //
-// Bounds: entry count alone was not enough. Token.raw/text values are
-// slices of the lexed input, so each entry pins its entire input string;
-// during streaming the input grows every frame, and the LRU kept 500
-// near-final snapshots ≈ 500 × message size resident (~500MB for a 1MB
-// message). A character budget caps retained bytes; oversized contents
-// skip the cache entirely (they are re-lexed on remount — rare, and
-// cheaper than the retention).
-const TOKEN_CACHE_MAX = 200;
-const TOKEN_CACHE_MAX_CHARS = 200_000;
-const TOKEN_CACHE_MAX_CONTENT = 20_000;
+// marked.lexer 在组件重挂载时是最贵的开销；消息内容不可变，相同文本
+// 必然产出相同 token，因此以原文为 key 缓存。
+//
+// 容量控制不能只看条数：Token 的 raw/text 字段是输入字符串的切片，
+// 会钉住整段输入常驻内存；流式渲染时输入逐帧增长，若只按条数限流，
+// LRU 会保留大量接近最终形态的快照（1MB 消息 ≈ 500 条 × 1MB ≈
+// 500MB）。这里用字符预算限制保留量，超长内容干脆不缓存（重挂载时
+// 重跑 lexer，极少发生且远比常驻便宜）。
+const TOKEN_CACHE_CAPACITY = 200;
+const TOKEN_CACHE_CHAR_BUDGET = 200_000;
+const TOKEN_CACHE_MAX_SOURCE_LENGTH = 20_000;
 const tokenCache = new Map();
 let tokenCacheChars = 0;
-// Characters that indicate markdown syntax. If none are present, skip the
-// ~3ms marked.lexer call entirely — render as a single paragraph.
-const MD_SYNTAX_RE = /[#*`|[>\-_~]|\n\n|^\d+\. |\n\d+\. /;
-function hasMarkdownSyntax(s) {
-    return MD_SYNTAX_RE.test(s.length > 500 ? s.slice(0, 500) : s);
+// 语法探针：命中任意 markdown 结构标记才值得走 lexer；内容过长时
+// 只探测开头一段，纯文本直接跳过约 3ms 的 lexer 调用。
+const MD_SYNTAX_MARKERS = /[#*`|[>\-_~]|\n\n|^\d+\. |\n\d+\. /;
+const SYNTAX_PROBE_WINDOW = 500;
+function looksLikePlainText(s) {
+    const probe = s.length > SYNTAX_PROBE_WINDOW ? s.slice(0, SYNTAX_PROBE_WINDOW) : s;
+    return !MD_SYNTAX_MARKERS.test(probe);
 }
-function cachedLexer(content, cache) {
-    // Fast path: plain text with no markdown syntax → single paragraph token.
-    if (!hasMarkdownSyntax(content)) {
+function lexWithCache(content, allowCache) {
+    // 快速路径：纯文本直接合成单个段落 token，不触碰 lexer。
+    if (looksLikePlainText(content)) {
         return [
             {
                 type: 'paragraph',
@@ -38,23 +40,21 @@ function cachedLexer(content, cache) {
             },
         ];
     }
-    if (!cache)
+    if (!allowCache)
         return marked.lexer(content);
-    // The content string itself is the key: V8 caches the string hash in the
-    // string header, so Map lookup is hash-free after the first insert, and
-    // unlike sha256 there is no per-call digest allocation or collision risk.
+    // 直接用内容字符串做 key：V8 在字符串头缓存哈希，首次插入后 Map
+    // 查找无需再算哈希，也比 sha256 少一次摘要分配与碰撞风险。
     const hit = tokenCache.get(content);
     if (hit) {
-        // Promote to MRU
-        tokenCache.delete(content);
+        tokenCache.delete(content); // 提升为最近使用
         tokenCache.set(content, hit);
         return hit;
     }
     const tokens = marked.lexer(content);
-    if (content.length > TOKEN_CACHE_MAX_CONTENT)
+    if (content.length > TOKEN_CACHE_MAX_SOURCE_LENGTH)
         return tokens;
-    if (tokenCache.size >= TOKEN_CACHE_MAX ||
-        tokenCacheChars + content.length > TOKEN_CACHE_MAX_CHARS) {
+    if (tokenCache.size >= TOKEN_CACHE_CAPACITY ||
+        tokenCacheChars + content.length > TOKEN_CACHE_CHAR_BUDGET) {
         tokenCache.clear();
         tokenCacheChars = 0;
     }
@@ -63,44 +63,50 @@ function cachedLexer(content, cache) {
     return tokens;
 }
 /**
- * Renders markdown content using a hybrid approach:
- * - Tables are rendered as bordered flexbox components
- * - Other content is rendered as ANSI strings via formatToken
+ * 把 lexer 产出的 token 列表转成 React 节点序列：table 独立渲染，
+ * 其余 token 的 ANSI 文本先累积拼接，再统一包成 Text（去除首尾空白）。
+ */
+function renderTokensToNodes(tokens, highlight, dimColor) {
+    const nodes = [];
+    let ansiText = '';
+    const flushAnsiText = () => {
+        if (!ansiText)
+            return;
+        nodes.push(_jsx(Text, { dimColor: dimColor, children: ansiText.trim() }, nodes.length));
+        ansiText = '';
+    };
+    for (const token of tokens) {
+        if (token.type === 'table') {
+            flushAnsiText();
+            nodes.push(_jsx(MarkdownTable, { token: token, highlight: highlight }, nodes.length));
+        }
+        else {
+            ansiText += formatToken(token, 0, null, null, highlight);
+        }
+    }
+    flushAnsiText();
+    return nodes;
+}
+/**
+ * 混合渲染 Markdown 内容：表格用带边框的 flexbox 组件，其余内容由
+ * formatToken 生成 ANSI 字符串放入 Text。高亮对象异步就绪后自动刷新。
  */
 export function Markdown({ children, dimColor = false, cacheTokens = true }) {
     const [highlight, setHighlight] = React.useState(null);
     React.useEffect(() => {
-        let alive = true;
+        let mounted = true;
         void getCliHighlightPromise().then((loaded) => {
-            if (alive)
+            if (mounted)
                 setHighlight(loaded);
         });
         return () => {
-            alive = false;
+            mounted = false;
         };
     }, []);
     configureMarked();
-    const elements = React.useMemo(() => {
-        const tokens = cachedLexer(stripPromptXMLTags(children), cacheTokens);
-        const elements = [];
-        let nonTableContent = '';
-        function flushNonTableContent() {
-            if (nonTableContent) {
-                elements.push(_jsx(Text, { dimColor: dimColor, children: nonTableContent.trim() }, elements.length));
-                nonTableContent = '';
-            }
-        }
-        for (const token of tokens) {
-            if (token.type === 'table') {
-                flushNonTableContent();
-                elements.push(_jsx(MarkdownTable, { token: token, highlight: highlight }, elements.length));
-            }
-            else {
-                nonTableContent += formatToken(token, 0, null, null, highlight);
-            }
-        }
-        flushNonTableContent();
-        return elements;
+    const renderedNodes = React.useMemo(() => {
+        const source = stripPromptXMLTags(children);
+        return renderTokensToNodes(lexWithCache(source, cacheTokens), highlight, dimColor);
     }, [children, dimColor, highlight, cacheTokens]);
-    return (_jsx(Box, { flexDirection: "column", gap: 1, children: elements }));
+    return (_jsx(Box, { flexDirection: "column", gap: 1, children: renderedNodes }));
 }

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

@@ -9,7 +9,7 @@ type Props = {
 };
 /**
  * Renders a markdown table with proper column sizing, cell wrapping and box
- * borders (ported from the leak's `MarkdownTable.tsx`). Falls back to a
+ * borders, mirroring Claude Code's `MarkdownTable.tsx`. Falls back to a
  * vertical key-value format on narrow terminals.
  */
 export declare function MarkdownTable({ token, highlight, forceWidth, }: Props): React.ReactNode;

package/lib/types/components/MarkdownTable.js

@@ -5,7 +5,7 @@ import Text from '../ink/components/Text.js';
 import { stringWidth } from '../ink/stringWidth.js';
 import stripAnsi from 'strip-ansi';
 import { formatToken, padAligned } from '../cc/markdown.js';
-/** Accounts for parent indentation and terminal resize races (from the leak). */
+/** Accounts for parent indentation and terminal resize races (from Claude Code). */
 const SAFETY_MARGIN = 4;
 /** Minimum column width to prevent degenerate layouts */
 const MIN_COLUMN_WIDTH = 3;
@@ -39,7 +39,7 @@ function wrapText(text, width, options) {
 }
 /**
  * Renders a markdown table with proper column sizing, cell wrapping and box
- * borders (ported from the leak's `MarkdownTable.tsx`). Falls back to a
+ * borders, mirroring Claude Code's `MarkdownTable.tsx`. Falls back to a
  * vertical key-value format on narrow terminals.
  */
 export function MarkdownTable({ token, highlight, forceWidth, }) {

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

@@ -1,8 +1,8 @@
 import React from 'react';
 import { type ScrollBoxHandle } from '../ui.js';
-import type { ChatRow } from '../channel.js';
+import type { ChatRow } from '../dsh-adapter/channel.js';
 import type { DOMElement } from '../ink/dom.js';
-export declare function MessageList({ rows, expanded, expandedRows, selectedId, onToggleRow, model, showAll, onToggleAll, onLoadOlder, thinkingVisible, registerRowRef, scrollHandle, forceMountRowId, newSinceRowId, onUnseenCount, }: {
+export declare function MessageList({ rows, expanded, expandedRows, selectedId, onToggleRow, model, showAll, onToggleAll, onLoadOlder, thinkingVisible, registerRowRef, scrollHandle, forceMountRowId, newSinceRowId, onUnseenCount, failureHintRowId, failureHint, }: {
     rows: readonly ChatRow[];
     expanded: boolean;
     expandedRows: ReadonlySet<number>;
@@ -26,6 +26,14 @@ export declare function MessageList({ rows, expanded, expandedRows, selectedId,
     newSinceRowId?: number | null;
     /** Reports how many new rows still sit below the viewport bottom edge. */
     onUnseenCount?: (count: number) => void;
+    /**
+     * Row id that should carry the trajectory footnote — the newest unseen
+     * failure, or null. Exactly one row ever carries it: repeating the pointer
+     * under every historical failure is the clutter this design avoids.
+     */
+    failureHintRowId?: number | null;
+    /** Footnote text, e.g. `ctrl+t for the full trajectory`. */
+    failureHint?: string;
 }): React.JSX.Element;
 /**
  * The header block pinned above the transcript: the DeepSeek pixel whale

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,eAAe,CAAA;AACnF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAwC/C,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,WAAW,EACX,KAAK,EACL,OAAO,EACP,WAAW,EACX,WAAW,EACX,eAAsB,EACtB,cAAc,EACd,YAAY,EACZ,eAAe,EACf,aAAa,EACb,aAAa,GACd,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,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;CACxC,qBAyOA;AAiQD;;;;;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,EAAyC,MAAM,2BAA2B,CAAA;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAuC/C,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,WAAW,EACX,KAAK,EACL,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,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,qBAoPA;AAuQD;;;;;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"}

package/lib/types/components/MessageList.js

@@ -3,7 +3,6 @@ import React from 'react';
 import { t } from '../i18n.js';
 import { Box, Text, useTerminalSize } from '../ui.js';
 import { Divider } from './design-system/Divider.js';
-import { KeyboardShortcutHint } from './design-system/KeyboardShortcutHint.js';
 import { UserPromptMessage } from './messages/UserPromptMessage.js';
 import { AssistantTextMessage } from './messages/AssistantTextMessage.js';
 import { AssistantThinkingMessage } from './messages/AssistantThinkingMessage.js';
@@ -38,7 +37,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, showAll, onToggleAll, onLoadOlder, thinkingVisible = true, registerRowRef, scrollHandle, forceMountRowId, newSinceRowId, onUnseenCount, }) {
+export function MessageList({ rows, expanded, expandedRows, selectedId, onToggleRow, model, 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
@@ -78,6 +77,7 @@ export function MessageList({ rows, expanded, expandedRows, selectedId, onToggle
     const localRefs = React.useRef(new Map());
     /** Content-space offset of visibleRows[0] (header + dividers), measured. */
     const baseRef = React.useRef(null);
+    const measureQueuedRef = React.useRef(false);
     const [, setMeasureTick] = React.useState(0);
     const [, setScrollTick] = React.useState(0);
     // A width change reflows every row — all measurements are stale.
@@ -198,8 +198,15 @@ export function MessageList({ rows, expanded, expandedRows, selectedId, onToggle
                 scrollHandle.setClampBounds(min, Math.max(min, base + mountedBottom - viewport));
             }
         }
-        if (changed)
-            setMeasureTick(t => t + 1);
+        if (changed && !measureQueuedRef.current) {
+            // Layout corrections can cascade for many rows. Yield between commits
+            // so React does not count the valid convergence as nested updates.
+            measureQueuedRef.current = true;
+            queueMicrotask(() => {
+                measureQueuedRef.current = false;
+                setMeasureTick(t => t + 1);
+            });
+        }
     });
     // useCallback: the reference feeds MemoRow's shallow compare; a fresh
     // closure per render would defeat every row's memo.
@@ -214,17 +221,17 @@ export function MessageList({ rows, expanded, expandedRows, selectedId, onToggle
     // Computed per render (cheap) but only forwarded to running rows, so
     // settled rows never see a changing prop.
     const nowSec = Math.floor(Date.now() / 1000);
-    return (_jsxs(_Fragment, { children: [rows.some(row => row.folded) && (_jsx(Box, { marginTop: 1, onClick: onLoadOlder, children: _jsx(Divider, { title: t('load-earlier') }) })), !showAll && hiddenCount > 0 && (_jsx(Box, { marginTop: 1, onClick: onToggleAll, children: _jsx(Divider, { title: ` ctrl+e to show ${hiddenCount} previous messages ` }) })), topPad > 0 && _jsx(Box, { height: topPad, flexShrink: 0 }), visibleRows
+    return (_jsxs(_Fragment, { children: [rows.some(row => row.folded) && (_jsx(Box, { marginTop: 1, onClick: onLoadOlder, children: _jsx(Divider, { title: t('load-earlier') }) })), !showAll && hiddenCount > 0 && (_jsx(Box, { marginTop: 1, onClick: onToggleAll, children: _jsx(Divider, { title: t('show-previous-messages', { n: hiddenCount }) }) })), topPad > 0 && _jsx(Box, { height: topPad, flexShrink: 0 }), visibleRows
                 .slice(start, end)
                 .map((row) => {
                 // CC addMargin: pre-pass result keeps windowed rows at full-mount
                 // 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, 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, 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, toolCallView: tool?.callView, toolResultView: tool?.resultView, toolStartedAt: tool?.startedAt, toolDurationMs: tool?.durationMs, nowSec: tool?.status === 'running' ? nowSec : undefined, onToggleRow: onToggleRow, setRowRef: setRowRef }, row.id));
+                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, 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));
             }), bottomPad > 0 && _jsx(Box, { height: bottomPad, flexShrink: 0 })] }));
 }
-function TranscriptRow({ rowId, kind, text, streaming, durationMs, time, addMargin, isSelected, isExpanded, expanded, model, background, toolCallId, toolName, toolArgsText, toolArgsFull, toolStatus, toolResultText, toolResultFull, toolErrorText, toolCallView, toolResultView, toolStartedAt, toolDurationMs, onToggleRow, setRowRef, }) {
+function TranscriptRow({ rowId, kind, text, executionTarget, streaming, durationMs, time, addMargin, isSelected, isExpanded, expanded, model, background, toolCallId, toolName, toolArgsText, toolArgsFull, toolStatus, toolResultText, toolResultFull, toolErrorText, toolFootnote, toolCallView, toolResultView, toolStartedAt, toolDurationMs, onToggleRow, setRowRef, }) {
     const ref = React.useCallback((el) => {
         setRowRef(rowId, el);
     }, [setRowRef, rowId]);
@@ -266,7 +273,7 @@ function TranscriptRow({ rowId, kind, text, streaming, durationMs, time, addMarg
                 startedAt: toolStartedAt,
                 durationMs: toolDurationMs,
             };
-            return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(AssistantToolUseMessage, { tool: tool, addMargin: addMargin, verbose: isExpanded || expanded, isSelected: isSelected, isExpanded: isExpanded }) }));
+            return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(AssistantToolUseMessage, { tool: tool, addMargin: addMargin, verbose: isExpanded || expanded, isSelected: isSelected, isExpanded: isExpanded, footnote: toolFootnote }) }));
         }
         case 'notice':
             return (_jsx(Box, { marginTop: 1, ref: ref, children: _jsx(Divider, { title: ` ${text} ` }) }));
@@ -274,14 +281,14 @@ function TranscriptRow({ rowId, kind, text, streaming, durationMs, time, addMarg
             return (_jsx(Box, { marginTop: 1, ref: ref, children: _jsx(InterruptedByUser, {}) }));
         case 'local':
             // `!` mode command echo, like CC's UserBashInputMessage.
-            return (_jsx(Box, { marginTop: 1, backgroundColor: background, ref: ref, children: _jsxs(Text, { color: "bashBorder", children: ["! ", text] }) }));
+            return (_jsx(Box, { marginTop: 1, backgroundColor: background, ref: ref, children: _jsxs(Text, { color: "bashBorder", children: ["!", executionTarget ? ` [${executionTarget}]` : '', " ", text] }) }));
         case 'local-output':
             return (_jsx(Box, { paddingLeft: 2, backgroundColor: background, ref: ref, children: _jsx(Text, { dimColor: true, children: text }) }));
         case 'compact':
             // The post-compaction summary defaults to a folded one-liner with a
             // 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), ' ', _jsx(KeyboardShortcutHint, { shortcut: "ctrl+o", action: "expand", parens: true })] })) }));
+            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')] })) }));
     }
 }
 /** Folded compact-summary preview: whitespace flattened, capped with an

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

@@ -1,10 +1,13 @@
 import React from 'react';
-import type { LlmModelInfo } from '@deepseek-ai/dsh-llm';
+import type { LlmModelInfo } from '../dsh-adapter/types.js';
 /**
  * Model picker in the CC ModelPicker style: a permission-colored Pane with
  * the model list as Select rows (❯ focus pointer, ✓ on the active model,
  * descriptions), plus the Enter/Esc hint line. The DSH agent's model is
  * fixed at creation time, so a selection notifies "restart to apply".
+ *
+ * 长列表按焦点窗口化（Select 同款）：picker 经 OverlayAbove 浮层挂载后有
+ * maxHeight 裁剪，全量渲染会让焦点行被裁掉（看不到焦点按 Enter）。
  */
 export declare function ModelPicker({ models, focusIndex, currentModel, }: {
     models: readonly LlmModelInfo[];

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

@@ -1 +1 @@
-{"version":3,"file":"ModelPicker.d.ts","sourceRoot":"","sources":["../../../src/components/ModelPicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAMxD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,EAC1B,MAAM,EACN,UAAU,EACV,YAAY,GACb,EAAE;IACD,MAAM,EAAE,SAAS,YAAY,EAAE,CAAA;IAC/B,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB,GAAG,KAAK,CAAC,SAAS,CA4BlB"}
+{"version":3,"file":"ModelPicker.d.ts","sourceRoot":"","sources":["../../../src/components/ModelPicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAM3D;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,EAC1B,MAAM,EACN,UAAU,EACV,YAAY,GACb,EAAE;IACD,MAAM,EAAE,SAAS,YAAY,EAAE,CAAA;IAC/B,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB,GAAG,KAAK,CAAC,SAAS,CAuClB"}

package/lib/types/components/ModelPicker.js

@@ -1,15 +1,27 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Box, Text } from '../ui.js';
+import { t } from '../i18n.js';
+import { Box, Text, useTerminalSize } from '../ui.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';
+import { HintLine } from './design-system/HintLine.js';
+import { listWindow } from './listWindow.js';
 /**
  * Model picker in the CC ModelPicker style: a permission-colored Pane with
  * the model list as Select rows (❯ focus pointer, ✓ on the active model,
  * descriptions), plus the Enter/Esc hint line. The DSH agent's model is
  * fixed at creation time, so a selection notifies "restart to apply".
+ *
+ * 长列表按焦点窗口化（Select 同款）：picker 经 OverlayAbove 浮层挂载后有
+ * maxHeight 裁剪，全量渲染会让焦点行被裁掉（看不到焦点按 Enter）。
  */
 export function ModelPicker({ models, focusIndex, currentModel, }) {
-    return (_jsxs(Pane, { color: "permission", children: [_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "remember", bold: true, children: "Model" }) }), models.map((model, index) => (_jsxs(ListItem, { isFocused: index === focusIndex, isSelected: `${model.provider}/${model.id}` === currentModel, description: model.description, children: [model.provider, " / ", model.name] }, `${model.provider}/${model.id}`)))] }), _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 { 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));
+    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}`));
+                    })] }), _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: t('hint-confirm-exit') }) })] }));
 }