@deepseek-harness-tui/dsh-tui 0.12.0 → 0.14.0

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

@@ -0,0 +1,44 @@
+import React from 'react';
+/**
+ * The SDK install wizard (the kernel picker's dim Claude row, Enter): one
+ * pane, one step machine. The phase lives in Chat — it is async process
+ * state, which stays out of the overlay union by design (chatOverlay.ts
+ * note 3); this component renders it and never touches useInput, exactly
+ * like the pickers. Keys (Chat): Enter confirms / returns, Esc backs out to
+ * the kernel picker, `r` retries a failed install.
+ */
+export type SdkInstallPhase = {
+    readonly kind: 'idle';
+} | {
+    readonly kind: 'confirm';
+    readonly dir: string;
+    readonly version: string;
+    readonly specifier: string;
+} | {
+    readonly kind: 'checking';
+} | {
+    readonly kind: 'running';
+} | {
+    readonly kind: 'done';
+} | {
+    readonly kind: 'failed';
+    readonly exitCode: number;
+    readonly tail: readonly string[];
+    readonly dir: string;
+    readonly version: string;
+    readonly specifier: string;
+} | {
+    readonly kind: 'pnpm-missing';
+    readonly dir: string;
+    readonly version: string;
+    readonly specifier: string;
+} | {
+    readonly kind: 'cancelled';
+} | {
+    readonly kind: 'no-target';
+    readonly reason: 'standalone' | 'no-profile';
+};
+export declare function SdkInstallWizard({ phase }: {
+    phase: SdkInstallPhase;
+}): React.ReactNode;
+//# sourceMappingURL=SdkInstallWizard.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SdkInstallWizard.d.ts","sourceRoot":"","sources":["../../../src/components/SdkInstallWizard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB;;;;;;;GAOG;AACH,MAAM,MAAM,eAAe,GACvB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzB;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACxG;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;CAAE,GAC7B;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,GAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzB;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACpK;IAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC7G;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;CAAE,GAC9B;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAAA;CAAE,CAAA;AAUhF,wBAAgB,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,eAAe,CAAA;CAAE,GAAG,KAAK,CAAC,SAAS,CA2DvF"}

package/lib/types/components/SdkInstallWizard.js

@@ -0,0 +1,18 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { t } from '../i18n.js';
+import { Box, Text } from '../ui.js';
+import { HintLine } from './design-system/HintLine.js';
+import { LoadingState } from './design-system/LoadingState.js';
+import { Pane } from './design-system/Pane.js';
+/** The pnpm output tail we show on failure — enough to identify the error,
+ *  not enough to push the pane past OverlayAbove's height budget. */
+const TAIL_LINES = 6;
+function manualLine(dir, specifier) {
+    return `cd ${dir} && pnpm add ${specifier}`;
+}
+export function SdkInstallWizard({ phase }) {
+    return (_jsxs(Pane, { color: "permission", children: [_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "remember", bold: true, children: t('sdk-install-title') }) }), phase.kind === 'confirm' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: t('sdk-install-confirm-what', { version: phase.version }) }), _jsx(Text, { children: t('sdk-install-confirm-where', { dir: phase.dir }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t('sdk-install-confirm-note') }) })] })), (phase.kind === 'checking' || phase.kind === 'running') && (_jsx(Box, { flexDirection: "column", children: _jsx(LoadingState, { message: phase.kind === 'checking' ? t('sdk-install-checking') : t('sdk-install-running'), subtitle: phase.kind === 'running' ? t('sdk-install-running-sub') : undefined }) })), phase.kind === 'done' && _jsx(Text, { children: t('sdk-install-done') }), phase.kind === 'failed' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: t('sdk-install-failed', { code: String(phase.exitCode) }) }), _jsx(Text, { dimColor: true, children: t('sdk-install-manual', { command: manualLine(phase.dir, phase.specifier) }) }), phase.tail.slice(-TAIL_LINES).map((line, index) => (_jsx(Text, { dimColor: true, wrap: "truncate-end", children: line }, index)))] })), phase.kind === 'pnpm-missing' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: t('sdk-install-pnpm-missing') }), _jsx(Text, { dimColor: true, children: t('sdk-install-manual', { command: manualLine(phase.dir, phase.specifier) }) })] })), phase.kind === 'cancelled' && _jsx(Text, { children: t('sdk-install-cancelled') }), phase.kind === 'no-target' && (_jsx(Text, { children: t(phase.reason === 'standalone' ? 'sdk-install-no-target-standalone' : 'sdk-install-no-target-no-profile') }))] }), _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: phase.kind === 'confirm' ? t('sdk-install-confirm-hint')
+                        : phase.kind === 'done' ? t('sdk-install-done-hint')
+                            : phase.kind === 'failed' ? t('sdk-install-failed-hint')
+                                : t('sdk-install-exit-hint') }) })] }));
+}

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

@@ -1,17 +1,17 @@
 import React from 'react';
 /**
  * A single-line search input in a round-bordered box: `⌕ ` prefix, block
- * cursor at `cursorOffset` (inverse cell).
- * When empty and focused, a solid block caret sits at the start and the
- * placeholder is right-aligned (dimmed) — kept off the caret's cell so the
- * terminal-painted IME preedit (pinyin) can never be overlaid on it during
- * CJK composition.
+ * cursor at `cursorOffset` (theme cursor fill, or inverse cell when unset).
+ * When empty and focused, the caret is a block **on the first
+ * character of the placeholder** (opencode style, 2026-10 第七版) — it never
+ * occupies a cell of its own, so text never shifts; the terminal-painted IME
+ * preedit (pinyin) still lands at the declared native cursor next to it.
  *
  * The query row is strictly single-line: an overlong query is windowed
  * around the caret (horizontal scroll) instead of wrapping, so the native
  * cursor declaration below stays exact for any query length.
  */
-export declare function SearchBox({ query, placeholder, isFocused, isTerminalFocused, prefix, width, cursorOffset, borderless, }: {
+export declare function SearchBox({ query, placeholder, isFocused, isTerminalFocused, prefix, width, cursorOffset, borderless, caretBlink, placeholderAlign, }: {
     query: string;
     placeholder?: string;
     isFocused: boolean;
@@ -20,5 +20,21 @@ export declare function SearchBox({ query, placeholder, isFocused, isTerminalFoc
     width?: number | string;
     cursorOffset?: number;
     borderless?: boolean;
+    /**
+     * 空输入 + 焦点态那一行里占位文案的对齐（2026-10 落地页第四版新增）：
+     * `right`（缺省，历史行为）贴框右缘；`left` 紧跟 `前缀 + 块状光标` 之后。
+     * 共享组件——聊天页/选择器不传此 prop，渲染与从前逐字节一致。
+     */
+    placeholderAlign?: 'left' | 'right';
+    /**
+     * 光标闪烁相位（true = 光标样式、false = 常规）。落地页传入（约 550ms 一相位）；
+     * 缺省 true 恒显示光标——其它使用方（选择器搜索等）保持不闪。
+     *
+     * 契约（第七版修订）：光标是**压在当前字符身上的块**（主题 cursor 填充，
+     * 未声明时用 inverse；行尾时为空格），绝不另起一格、绝不吃掉字符；闪烁是
+     * **纯样式切换**（光标 ↔ 常规），
+     * 不增删任何字符——无头回归读的是视口纯文本，断言不会随相位抖动。
+     */
+    caretBlink?: boolean;
 }): React.ReactNode;
 //# sourceMappingURL=SearchBox.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SearchBox.d.ts","sourceRoot":"","sources":["../../../src/components/SearchBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyD,MAAM,OAAO,CAAA;AAyD7E;;;;;;;;;;;GAWG;AACH,wBAAgB,SAAS,CAAC,EACxB,KAAK,EACL,WAAuB,EACvB,SAAS,EACT,iBAAiB,EACjB,MAAY,EACZ,KAAK,EACL,YAAY,EACZ,UAAkB,GACnB,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,OAAO,CAAA;IAClB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,GAAG,KAAK,CAAC,SAAS,CA0GlB"}
+{"version":3,"file":"SearchBox.d.ts","sourceRoot":"","sources":["../../../src/components/SearchBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyD,MAAM,OAAO,CAAA;AA4D7E;;;;;;;;;;;GAWG;AACH,wBAAgB,SAAS,CAAC,EACxB,KAAK,EACL,WAAuB,EACvB,SAAS,EACT,iBAAiB,EACjB,MAAY,EACZ,KAAK,EACL,YAAY,EACZ,UAAkB,EAClB,UAAiB,EACjB,gBAA0B,GAC3B,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,OAAO,CAAA;IAClB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;IACnC;;;;;;;;OAQG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,GAAG,KAAK,CAAC,SAAS,CAkIlB"}

package/lib/types/components/SearchBox.js

@@ -2,6 +2,8 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { useCallback, useLayoutEffect, useRef, useState } from 'react';
 import Box from './design-system/ThemedBox.js';
 import Text from './design-system/ThemedText.js';
+import { useTheme } from './design-system/ThemeProvider.js';
+import { cursorGlyphColor, getTheme } from '../theme.js';
 import measureElement from '../ink/measure-element.js';
 import { useDeclaredCursor } from '../ink/hooks/use-declared-cursor.js';
 import { useTerminalSize } from '../ink/hooks/use-terminal-size.js';
@@ -51,24 +53,35 @@ function windowQuery(query, offset, avail) {
 }
 /**
  * A single-line search input in a round-bordered box: `⌕ ` prefix, block
- * cursor at `cursorOffset` (inverse cell).
- * When empty and focused, a solid block caret sits at the start and the
- * placeholder is right-aligned (dimmed) — kept off the caret's cell so the
- * terminal-painted IME preedit (pinyin) can never be overlaid on it during
- * CJK composition.
+ * cursor at `cursorOffset` (theme cursor fill, or inverse cell when unset).
+ * When empty and focused, the caret is a block **on the first
+ * character of the placeholder** (opencode style, 2026-10 第七版) — it never
+ * occupies a cell of its own, so text never shifts; the terminal-painted IME
+ * preedit (pinyin) still lands at the declared native cursor next to it.
  *
  * The query row is strictly single-line: an overlong query is windowed
  * around the caret (horizontal scroll) instead of wrapping, so the native
  * cursor declaration below stays exact for any query length.
  */
-export function SearchBox({ query, placeholder = 'Search…', isFocused, isTerminalFocused, prefix = '⌕', width, cursorOffset, borderless = false, }) {
+export function SearchBox({ query, placeholder = 'Search…', isFocused, isTerminalFocused, prefix = '⌕', width, cursorOffset, borderless = false, caretBlink = true, placeholderAlign = 'right', }) {
+    const [themeName] = useTheme();
+    const cursorTheme = getTheme(themeName);
+    const cursorColor = cursorTheme.cursor ?? '';
+    const cursorGlyph = cursorGlyphColor(cursorTheme);
+    const caretCell = (text) => !caretBlink
+        ? _jsx(Text, { children: text })
+        : cursorColor === ''
+            ? _jsx(Text, { inverse: true, children: text })
+            : _jsx(Text, { backgroundColor: cursorColor, color: cursorGlyph, children: text });
     const offset = cursorOffset ?? query.length;
     const borderStyle = borderless ? undefined : 'round';
     const borderColor = isFocused ? 'suggestion' : undefined;
     const borderDimColor = !isFocused;
-    // Focused + empty + terminal focused: inline caret row (block caret at the
-    // start, placeholder right-aligned) instead of the inline placeholder.
-    const inlineCaret = isFocused && query === '' && isTerminalFocused;
+    // 空输入的行内光标（第七版重做）：光标压在**占位文本的第一个字符**身上
+    // （只对那一个字符着光标样式，opencode 式）——绝不自己占一格、绝不把文字往右
+    // 挤。不再拿终端焦点（DECSET 1004 focus 事件）当开关：只要这个输入框是
+    // 本屏的焦点目标，光标就常在（用户原话「光标永远不消失 哪怕焦点没了」）。
+    const inlineCaret = isFocused && query === '';
     // Content width of the box in display cells. Measured from yoga after
     // layout (resize re-layouts without any prop/state change, so measure on
     // every commit — the setState is a no-op when the width is unchanged);
@@ -119,14 +132,14 @@ export function SearchBox({ query, placeholder = 'Search…', isFocused, isTermi
     let content;
     if (isFocused) {
         if (query) {
-            content = isTerminalFocused ? (_jsxs(_Fragment, { children: [_jsx(Text, { children: win.before }), _jsx(Text, { inverse: true, children: win.at }), win.after !== '' && _jsx(Text, { children: win.after })] })) : (_jsx(Text, { children: query }));
-        }
-        else if (!isTerminalFocused) {
-            content = _jsx(Text, { dimColor: true, children: placeholder });
+            // 第七版重做：光标常在（不再依赖终端焦点事件），压在当前字符身上
+            // （对那一个字符着光标样式；行尾时为空格），闪烁相位只在
+            // 光标 ↔ 常规之间切样式——字符常在、文字不位移。
+            content = (_jsxs(_Fragment, { children: [_jsx(Text, { children: win.before }), caretCell(win.at), win.after !== '' && _jsx(Text, { children: win.after })] }));
         }
     }
     else {
         content = query ? _jsx(Text, { children: query }) : _jsx(Text, { children: placeholder });
     }
-    return (_jsx(Box, { ref: boxRef, flexShrink: 0, borderStyle: borderStyle, borderColor: borderColor, borderDimColor: borderDimColor, paddingX: borderless ? 0 : 1, width: width, children: inlineCaret ? (_jsxs(Box, { flexDirection: "row", width: "100%", children: [_jsxs(Text, { children: [prefix, " "] }), _jsx(Text, { inverse: true, children: " " }), _jsx(Box, { flexGrow: 1 }), _jsx(Text, { dimColor: true, wrap: "truncate", children: placeholder })] })) : (_jsxs(Text, { dimColor: !isFocused, wrap: "truncate-end", children: [prefix, " ", content] })) }));
+    return (_jsx(Box, { ref: boxRef, flexShrink: 0, borderStyle: borderStyle, borderColor: borderColor, borderDimColor: borderDimColor, paddingX: borderless ? 0 : 1, width: width, children: inlineCaret ? (placeholderAlign === 'left' ? (_jsxs(Box, { flexDirection: "row", width: "100%", children: [_jsxs(Text, { children: [prefix, " "] }), _jsxs(Text, { dimColor: true, wrap: "truncate", children: [caretBlink ? caretCell(placeholder.slice(0, 1)) : placeholder.slice(0, 1), placeholder.slice(1)] })] })) : (_jsxs(Box, { flexDirection: "row", width: "100%", children: [_jsxs(Text, { children: [prefix, " "] }), caretCell(' '), _jsx(Box, { flexGrow: 1 }), _jsx(Text, { dimColor: true, wrap: "truncate", children: placeholder })] }))) : (_jsxs(Text, { dimColor: !isFocused, wrap: "truncate-end", children: [prefix, " ", content] })) }));
 }

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;AAIzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAO7D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACjE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAI/E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAyR3D,wBAAgB,aAAa,CAAC,EAC5B,KAAK,EACL,KAAK,EACL,OAAO,EACP,OAAO,EACP,cAAuB,EACvB,MAAM,GACP,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;IACxC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAC3C,GAAG,KAAK,CAAC,SAAS,CAwFlB"}
+{"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,kCAAkC,CAAA;AACjE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAI/E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AA4W3D,wBAAgB,aAAa,CAAC,EAC5B,KAAK,EACL,KAAK,EACL,OAAO,EACP,OAAO,EACP,cAAuB,EACvB,MAAM,GACP,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;IACxC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAC3C,GAAG,KAAK,CAAC,SAAS,CAmHlB"}

package/lib/types/components/SplitDiffView.js

@@ -14,6 +14,7 @@ import { t } from '../i18n.js';
 import { useTheme } from './design-system/ThemeProvider.js';
 import { revealLinesOf } from './smoothReveal.js';
 import { primaryComboString } from '../utils/keymap.js';
+import { isPatchDiff, parseFilePatch, patchHeader, patchHeaderText } from './diffPatch.js';
 /** Replace tabs so width math and alignment hold (pi convention). */
 const expandTabs = (text) => text.replaceAll('\t', '   ');
 /**
@@ -192,8 +193,85 @@ function alignFileDiff(fileIndex, oldText, newText) {
     }
     return rows;
 }
+/** A patch file's hunks aligned into rows (the same pairing rules as
+ *  {@link alignFileDiff}, applied per removed+added block of each hunk),
+ *  plus the old / new side texts the rows index (syntax highlighting reads
+ *  them like a whole file's texts). A patch with no readable hunk aligns
+ *  its raw lines by their marker, unnumbered. */
+function alignPatchFile(fileIndex, parsed) {
+    const rows = [];
+    const oldSide = [];
+    const newSide = [];
+    const hunks = parsed.raw === undefined
+        ? parsed.hunks.map(hunk => hunk.lines)
+        : [parsed.raw.map((line) => line.startsWith('-') ? { kind: 'del', text: line.slice(1) } : line.startsWith('+') ? { kind: 'add', text: line.slice(1) } : { kind: 'context', text: line })];
+    hunks.forEach((lines, hunkIndex) => {
+        if (hunkIndex > 0)
+            rows.push({ separator: '⋯' });
+        let at = 0;
+        while (at < lines.length) {
+            const line = lines[at];
+            if (line.kind === 'context') {
+                const text = expandTabs(line.text);
+                rows.push({
+                    kind: 'context',
+                    fileIndex,
+                    oldIndex: oldSide.push(text) - 1,
+                    newIndex: newSide.push(text) - 1,
+                    oldWords: plainSegments(text),
+                    newWords: plainSegments(text),
+                    ...(line.oldNo === undefined ? {} : { oldNo: line.oldNo }),
+                    ...(line.newNo === undefined ? {} : { newNo: line.newNo }),
+                });
+                at += 1;
+                continue;
+            }
+            const removed = [];
+            while (at < lines.length && lines[at].kind === 'del')
+                removed.push(lines[at++]);
+            const added = [];
+            while (at < lines.length && lines[at].kind === 'add')
+                added.push(lines[at++]);
+            const oldTexts = removed.map(item => expandTabs(item.text));
+            const newTexts = added.map(item => expandTabs(item.text));
+            const pairs = oldTexts.length === newTexts.length
+                ? oldTexts.map((_, index) => [index, index])
+                : lcsPairs(oldTexts, newTexts);
+            const events = [];
+            let oi = 0;
+            let ai = 0;
+            for (const [o, a] of pairs) {
+                while (oi < o)
+                    events.push({ kind: 'del', o: oi++ });
+                while (ai < a)
+                    events.push({ kind: 'add', a: ai++ });
+                events.push({ kind: 'change', o: oi++, a: ai++ });
+            }
+            while (oi < oldTexts.length)
+                events.push({ kind: 'del', o: oi++ });
+            while (ai < newTexts.length)
+                events.push({ kind: 'add', a: ai++ });
+            for (const event of events) {
+                const oldNo = event.o === undefined ? undefined : removed[event.o].oldNo;
+                const newNo = event.a === undefined ? undefined : added[event.a].newNo;
+                const numbers = { ...(oldNo === undefined ? {} : { oldNo }), ...(newNo === undefined ? {} : { newNo }) };
+                if (event.kind === 'change') {
+                    const segments = wordSegments(oldTexts[event.o], newTexts[event.a]);
+                    rows.push({ kind: 'change', fileIndex, oldIndex: oldSide.push(oldTexts[event.o]) - 1, newIndex: newSide.push(newTexts[event.a]) - 1, oldWords: segments.old, newWords: segments.new, ...numbers });
+                }
+                else if (event.kind === 'del') {
+                    rows.push({ kind: 'del', fileIndex, oldIndex: oldSide.push(oldTexts[event.o]) - 1, oldWords: plainSegments(oldTexts[event.o]), ...numbers });
+                }
+                else {
+                    rows.push({ kind: 'add', fileIndex, newIndex: newSide.push(newTexts[event.a]) - 1, newWords: plainSegments(newTexts[event.a]), ...numbers });
+                }
+            }
+        }
+    });
+    return { rows, oldSide, newSide };
+}
 // --- rendering --------------------------------------------------------------
-function PaneLine({ side, kind, width, tone, toolBackground, padLeft = false, }) {
+function PaneLine({ side, kind, width, tone, toolBackground, padLeft = false, lineNo, lineNoWidth = 0, }) {
     const ordinaryBackground = toolBackground === 'subtle'
         ? 'toolCardBackgroundDim'
         : toolBackground === 'strong'
@@ -210,7 +288,8 @@ function PaneLine({ side, kind, width, tone, toolBackground, padLeft = false, })
     // Status gutter instead of line numbers: ToolFileDiff has no file
     // offsets, and an invented number misleads (issue #250, P2-3).
     const marker = kind === 'context' ? ' ' : tone === 'old' ? '−' : '+';
-    const prefix = padLeft ? ` ${marker}` : marker;
+    const numbered = lineNoWidth > 0 ? `${(lineNo === undefined || side === undefined ? '' : String(lineNo)).padStart(lineNoWidth)} ${marker}` : marker;
+    const prefix = padLeft ? ` ${numbered}` : numbered;
     return (_jsxs(Box, { width: width, flexShrink: 0, backgroundColor: backgroundColor, children: [_jsx(Text, { dimColor: true, backgroundColor: backgroundColor, children: `${prefix} ` }), side === undefined ? (_jsx(Text, { backgroundColor: backgroundColor, children: " " })) : (_jsx(Text, { wrap: "truncate", backgroundColor: backgroundColor, children: side.segments.map((segment, index) => segment.changed ? (_jsx(Text, { color: wordColor, bold: true, backgroundColor: backgroundColor, children: segment.text }, index)) : (_jsx(Text, { color: segment.color, backgroundColor: backgroundColor, children: segment.text }, index))) }))] }));
 }
 export function SplitDiffView({ diffs, width, maxRows, verbose, toolBackground = 'none', reveal, }) {
@@ -226,13 +305,30 @@ 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 syntaxTheme = React.useMemo(() => getTheme(themeName), [themeName]);
+    // 按当次渲染的色板身份读，**不按名字 memo**：名字不变而色板换掉（auto 翻转、
+    // 运行时同名重注册）时，按名字缓存会让签名一直算出旧值。
+    const syntaxTheme = getTheme(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 = [];
+    /** Patch files: their side texts (syntax lookup) and number gutter width. */
+    const patchFiles = new Map();
     let prevPath;
     diffs.forEach((diff, fileIndex) => {
+        if (isPatchDiff(diff)) {
+            const parsed = parseFilePatch(diff);
+            rows.push({ separator: patchHeaderText(patchHeader(diff, parsed, diffs.length > 1)) });
+            const aligned = alignPatchFile(fileIndex, parsed);
+            rows.push(...aligned.rows);
+            patchFiles.set(fileIndex, {
+                old: aligned.oldSide.join('\n'),
+                next: aligned.newSide.join('\n'),
+                lineNoWidth: parsed.raw === undefined ? String(parsed.maxLineNo).length : 0,
+            });
+            prevPath = diff.path;
+            return;
+        }
         if (diffs.length > 1) {
             if (diff.path !== prevPath)
                 rows.push({ separator: diff.path });
@@ -255,8 +351,18 @@ export function SplitDiffView({ diffs, width, maxRows, verbose, toolBackground =
     const paneWidth = Math.max(20, Math.floor((width - 1) / 2));
     // Whole-hunk highlight per file (multi-line lexer state preserved);
     // only the visible rows merge syntax runs with word flags below.
-    const fileSyntax = diffs.map(diff => {
-        const language = extname(diff.path).replace(/^\./, '') || undefined;
+    const fileSyntax = diffs.map((diff, fileIndex) => {
+        const language = extname(isPatchDiff(diff) ? diff.movePath ?? diff.path : diff.path).replace(/^\./, '') || undefined;
+        const patch = patchFiles.get(fileIndex);
+        if (patch !== undefined) {
+            // Side texts are already tab-expanded (alignPatchFile).
+            return {
+                old: highlightLines(patch.old, language, hl, syntaxTheme, themeSig),
+                next: highlightLines(patch.next, language, hl, syntaxTheme, themeSig),
+            };
+        }
+        if (isPatchDiff(diff))
+            return { old: undefined, next: undefined };
         return {
             old: highlightLines(expandTabs(diff.oldText ?? ''), language, hl, syntaxTheme, themeSig),
             next: highlightLines(expandTabs(diff.newText), language, hl, syntaxTheme, themeSig),
@@ -275,6 +381,7 @@ export function SplitDiffView({ diffs, width, maxRows, verbose, toolBackground =
                 const newSide = row.newWords === undefined
                     ? undefined
                     : { segments: newRuns !== undefined ? mergeRuns(newRuns, row.newWords) : row.newWords };
-                return (_jsxs(Box, { flexDirection: "row", children: [_jsx(PaneLine, { side: oldSide, kind: row.kind === 'add' ? 'context' : row.kind, tone: "old", width: paneWidth, toolBackground: toolBackground }), _jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { dimColor: true, children: "\u2502" }) }), _jsx(PaneLine, { side: newSide, kind: row.kind === 'del' ? 'context' : row.kind, tone: "new", width: paneWidth, toolBackground: toolBackground, padLeft: true })] }, index));
+                const lineNoWidth = patchFiles.get(row.fileIndex)?.lineNoWidth ?? 0;
+                return (_jsxs(Box, { flexDirection: "row", children: [_jsx(PaneLine, { side: oldSide, kind: row.kind === 'add' ? 'context' : row.kind, tone: "old", width: paneWidth, toolBackground: toolBackground, lineNo: row.oldNo, lineNoWidth: lineNoWidth }), _jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { dimColor: true, children: "\u2502" }) }), _jsx(PaneLine, { side: newSide, kind: row.kind === 'del' ? 'context' : row.kind, tone: "new", width: paneWidth, toolBackground: toolBackground, padLeft: true, lineNo: row.newNo, lineNoWidth: lineNoWidth })] }, index));
             }), hidden > 0 && (_jsx(Text, { dimColor: true, children: t('lines-folded-expand', { n: hidden, key: primaryComboString('transcript') }) }))] }));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"StarPrompt.d.ts","sourceRoot":"","sources":["../../../src/components/StarPrompt.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAYzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAuBtE,2EAA2E;AAC3E,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,GAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAChD;IAAE,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GACrD;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAE9E;;0DAE0D;AAC1D,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;IAChD,MAAM,EAAE,MAAM,IAAI,CAAA;CACnB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,UAAU,CAAC,EACzB,SAAS,EACT,OAAO,EACP,OAAO,EACP,YAAoB,GACrB,EAAE;IACD,yEAAyE;IACzE,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAA;IACjC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAA;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;IAC5B;2BACuB;IACvB,QAAQ,CAAC,YAAY,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;CACvC,GAAG,KAAK,CAAC,SAAS,CAsOlB;AAmBD,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,OAAO,EACP,OAAO,GACR,EAAE;IACD,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAA;IAClC,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,KAAK,IAAI,CAAA;IACjE,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAC7B,GAAG,KAAK,CAAC,SAAS,CA6DlB"}
+{"version":3,"file":"StarPrompt.d.ts","sourceRoot":"","sources":["../../../src/components/StarPrompt.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAazB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAuBtE,2EAA2E;AAC3E,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,GAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAChD;IAAE,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GACrD;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAE9E;;0DAE0D;AAC1D,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;IAChD,MAAM,EAAE,MAAM,IAAI,CAAA;CACnB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,UAAU,CAAC,EACzB,SAAS,EACT,OAAO,EACP,OAAO,EACP,YAAoB,GACrB,EAAE;IACD,yEAAyE;IACzE,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAA;IACjC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAA;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;IAC5B;2BACuB;IACvB,QAAQ,CAAC,YAAY,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;CACvC,GAAG,KAAK,CAAC,SAAS,CAuOlB;AAmBD,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,OAAO,EACP,OAAO,GACR,EAAE;IACD,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAA;IAClC,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,KAAK,IAAI,CAAA;IACjE,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAC7B,GAAG,KAAK,CAAC,SAAS,CA6DlB"}

package/lib/types/components/StarPrompt.js

@@ -5,7 +5,8 @@ import { getLang, subscribeLang, t } from '../i18n.js';
 import { Divider } from './design-system/Divider.js';
 import { HintLine } from './design-system/HintLine.js';
 import { ListItem } from './design-system/ListItem.js';
-import { MaidPortrait, useMaidPortraits } from './maidPortrait.js';
+import { CLAUDE_GIRL_ASSETS, MAID_ASSETS, MaidPortrait, useMaidPortraits } from './maidPortrait.js';
+import { getActiveBrand } from '../branding.js';
 import { WhaleGirlHappyArt } from './WhaleGirl.js';
 import { useTerminalBackground } from './design-system/ThemeProvider.js';
 import { STANDARD_FRAME_INDEX, WhaleArt } from './Whale.js';
@@ -54,7 +55,8 @@ export function StarPrompt({ milestone, actions, onClose, initialPhase = 'ask',
     React.useSyncExternalStore(subscribeLang, getLang);
     const { columns, rows } = useTerminalSize();
     const imagesAvailable = useTerminalImages();
-    const portraits = useMaidPortraits(imagesAvailable);
+    // 立绘跟品牌档走（branding.ts）：claude 内核的橙界面里放鲸鱼娘会跳戏。
+    const portraits = useMaidPortraits(imagesAvailable, getActiveBrand() === 'claude' ? CLAUDE_GIRL_ASSETS : MAID_ASSETS);
     const maidSource = portraits?.normal;
     // 卡片底色用**终端真底色**（OSC 11）而不是主题的卡片色：后者是一整块
     // 与终端背景无关的实色板，压在带背景图的终端上很僵硬；用真底色时卡片
@@ -173,7 +175,7 @@ export function WhaleCouponPrompt({ notice, onShown, onClose, }) {
     const lang = React.useSyncExternalStore(subscribeLang, getLang);
     const { columns, rows } = useTerminalSize();
     const imagesAvailable = useTerminalImages();
-    const portraits = useMaidPortraits(true);
+    const portraits = useMaidPortraits(true, getActiveBrand() === 'claude' ? CLAUDE_GIRL_ASSETS : MAID_ASSETS);
     const background = useTerminalBackground();
     const withArt = columns >= MIN_ART_COLUMNS && rows >= MIN_ART_ROWS;
     const textColumns = withArt ? TEXT_COLUMNS : Math.max(1, Math.min(TEXT_COLUMNS, columns - 6));

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

@@ -1 +1 @@
-{"version":3,"file":"StreamingMarkdown.d.ts","sourceRoot":"","sources":["../../../src/components/StreamingMarkdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAwMzB,wBAAgB,iBAAiB,CAAC,EAChC,QAAQ,EACR,QAAgB,GACjB,EAAE;IACD,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CAAC,SAAS,CA2JlB"}
+{"version":3,"file":"StreamingMarkdown.d.ts","sourceRoot":"","sources":["../../../src/components/StreamingMarkdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AA0MzB,wBAAgB,iBAAiB,CAAC,EAChC,QAAQ,EACR,QAAgB,GACjB,EAAE;IACD,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CAAC,SAAS,CA2JlB"}

package/lib/types/components/StreamingMarkdown.js

@@ -57,11 +57,13 @@ const UNSAFE_BOUNDARY = {
 /**
  * Token types whose formatted output is provably blank, taken from
  * the markdown dispatcher's table: `space`/`br` emit a single newline,
- * `def`/`del`/`html` emit nothing. Kept in step with `analyzeSuffixStart`,
- * which splits the same set into "newline" and "empty" halves.
+ * `def`/`html` emit nothing (`del` renders visible strikethrough text and
+ * is formatted dynamically like any text token). Kept in step with
+ * `analyzeSuffixStart`, which splits the same set into "newline" and
+ * "empty" halves.
  */
 function isBlankTokenType(type) {
-    return type === 'space' || type === 'br' || type === 'def' || type === 'del' || type === 'html';
+    return type === 'space' || type === 'br' || type === 'def' || type === 'html';
 }
 /** Newlines contributed by a blank token: one for `space`/`br`, none otherwise. */
 function blankTokenNewlines(type) {
@@ -151,7 +153,7 @@ function analyzeSuffixStart(tokens, startIndex) {
             leadingNewlines += 1;
             continue;
         }
-        if (token.type === 'def' || token.type === 'del' || token.type === 'html')
+        if (token.type === 'def' || token.type === 'html')
             continue;
         return { kind: 'text', leadingNewlines };
     }

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

@@ -5,6 +5,7 @@ export interface SubagentCardProps {
     subagent: SubagentState;
     focused?: boolean;
     onClick?(event: ClickEvent): void;
+    variant?: 'default' | 'panel';
 }
-export declare function SubagentCard({ subagent, focused, onClick }: SubagentCardProps): React.ReactNode;
+export declare function SubagentCard({ subagent, focused, onClick, variant }: SubagentCardProps): React.ReactNode;
 //# sourceMappingURL=SubagentCard.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SubagentCard.d.ts","sourceRoot":"","sources":["../../../src/components/SubagentCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAEvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAGhE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AAO9D,MAAM,WAAW,iBAAiB;IAAG,QAAQ,EAAE,aAAa,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;CAAE;AAEpH,wBAAgB,YAAY,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,iBAAiB,GAAG,KAAK,CAAC,SAAS,CAsD/F"}
+{"version":3,"file":"SubagentCard.d.ts","sourceRoot":"","sources":["../../../src/components/SubagentCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAEvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAIhE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AAO9D,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,aAAa,CAAA;IACvB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;IACjC,OAAO,CAAC,EAAE,SAAS,GAAG,OAAO,CAAA;CAC9B;AAED,wBAAgB,YAAY,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAmB,EAAE,EAAE,iBAAiB,GAAG,KAAK,CAAC,SAAS,CAiFpH"}

package/lib/types/components/SubagentCard.js

@@ -1,28 +1,28 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
-import { Box, Text } from '../ui.js';
+import { Box, Text, useTerminalSize, useAnimationFrame } from '../ui.js';
 import { t } from '../i18n.js';
+import { jobOutputRows } from './Chat/JobCard.js';
 import { isMinimalUiMode } from '../minimalUiMode.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 }) {
+export function SubagentCard({ subagent, focused, onClick, variant = 'default' }) {
+    const panelMode = variant === 'panel';
     const running = subagent.status === 'running' || subagent.status === 'starting';
-    // Only a live run ticks; discovered history (`unknown`) has no end time to
-    // count from, so it must not accumulate a fake growing duration.
+    const [clockRef] = useAnimationFrame(running ? 1000 : null);
+    // Unknown rows have no completion time, so they do not get a fabricated duration.
     const elapsed = running
         ? Date.now() - subagent.startedAt
         : subagent.completedAt !== undefined ? subagent.completedAt - subagent.startedAt : undefined;
+    // Prefer backend-reported totals; fall back to the locally observed records.
+    const toolsCount = subagent.reportedToolUses ?? subagent.toolCalls.length;
+    const shownDuration = subagent.reportedDurationMs ?? elapsed;
     const total = subagent.tokens?.total ?? ((subagent.tokens?.input ?? 0) + (subagent.tokens?.output ?? 0) || 0);
     // Mouse affordance: clickable cards tint on hover; the keyboard-focused
     // card keeps its brand-color header (no double highlight).
     const [hovered, setHovered] = useState(false);
-    // 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. Deliberately NOT revived on hover: an extra line would grow
-    // the card mid-gesture and reshuffle the whole dashboard list (user
-    // feedback: hover must never change layout). The hover tint stays.
     const liveLine = running ? subagent.output[subagent.output.length - 1] : undefined;
     const minimalUi = isMinimalUiMode();
     const glyph = running ? (minimalUi ? '·' : '🟡')
@@ -35,5 +35,27 @@ export function SubagentCard({ subagent, focused, onClick }) {
                 : subagent.status === 'failed' || subagent.status === 'cancelled' ? 'error'
                     : 'success';
     const hoverTint = onClick !== undefined && hovered && !focused;
-    return _jsxs(Box, { flexDirection: "column", paddingLeft: 1, marginBottom: 1, onClick: onClick, onMouseEnter: onClick !== undefined ? () => setHovered(true) : undefined, onMouseLeave: onClick !== undefined ? () => setHovered(false) : undefined, backgroundColor: hoverTint ? 'userMessageBackgroundHover' : undefined, children: [_jsxs(Box, { flexDirection: "row", gap: 1, children: [_jsx(Text, { color: glyphColor, children: glyph }), _jsx(Text, { bold: true, color: focused ? 'accent' : undefined, children: `${t('subagent-card-prefix')}${subagent.description}` }), subagent.mode === 'continuable' && (_jsx(Text, { color: focused ? 'accent' : 'warning', children: t('subagent-mode-continuable') })), subagent.mode === 'one-shot' && (_jsx(Text, { dimColor: true, children: t('subagent-mode-one-shot') })), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: ' · ' }), _jsx(Text, { children: subagent.model ?? subagent.provider ?? 'default' }), _jsxs(Text, { dimColor: true, children: [elapsed !== undefined ? ` · ${formatDuration(elapsed)} · ` : ' · ', total || '—', " tok \u00B7 ", subagent.toolCalls.length, " tools"] })] })] }), liveLine && _jsx(Text, { dimColor: true, wrap: "truncate", children: `  │ ${liveLine}` })] });
+    // Keep the description on one row; narrower panels progressively drop metadata.
+    const { columns } = useTerminalSize();
+    const previewRows = panelMode && running
+        ? jobOutputRows(subagent.output.map(text => ({ text })), Math.max(1, columns - 5), 2)
+        : [];
+    const metaParts = [];
+    if (columns >= 56)
+        metaParts.push(subagent.model ?? subagent.provider ?? 'default');
+    if (shownDuration !== undefined)
+        metaParts.push(formatDuration(shownDuration));
+    if (columns >= 44)
+        metaParts.push(`${total || '—'} tok`);
+    if (columns >= 34 && (!panelMode || toolsCount > 0))
+        metaParts.push(`${toolsCount} tools`);
+    const meta = metaParts.join(' · ');
+    const panelMeta = [
+        subagent.model ?? subagent.provider,
+        subagent.effort,
+        shownDuration === undefined ? undefined : formatDuration(shownDuration),
+    ].filter(part => part !== undefined && part !== '').join(' · ');
+    return _jsxs(Box, { ref: clockRef, flexDirection: "column", paddingLeft: 1, marginBottom: panelMode ? 0 : 1, onClick: onClick, onMouseEnter: onClick !== undefined ? () => setHovered(true) : undefined, onMouseLeave: onClick !== undefined ? () => setHovered(false) : undefined, backgroundColor: hoverTint ? 'userMessageBackgroundHover' : undefined, children: [_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { flexShrink: 0, marginRight: 1, children: _jsx(Text, { color: glyphColor, children: glyph }) }), _jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", children: _jsx(Text, { bold: true, color: focused ? 'accent' : undefined, wrap: "truncate-end", children: panelMode ? subagent.description : `${t('subagent-card-prefix')}${subagent.description}` }) }), subagent.mode === 'continuable' && (_jsx(Box, { flexShrink: 0, marginLeft: 1, children: _jsx(Text, { color: focused ? 'accent' : 'warning', children: t('subagent-mode-continuable') }) })), subagent.mode === 'one-shot' && (_jsx(Box, { flexShrink: 0, marginLeft: 1, children: _jsx(Text, { dimColor: true, children: t('subagent-mode-one-shot') }) })), !panelMode && meta !== '' && (_jsx(Box, { flexShrink: 0, marginLeft: 1, children: _jsx(Text, { dimColor: true, wrap: "truncate-end", children: meta }) }))] }), panelMode && panelMeta !== '' && _jsx(Box, { paddingLeft: 3, children: _jsx(Text, { dimColor: true, wrap: "wrap", children: panelMeta }) }), panelMode
+                ? previewRows.map(row => _jsx(Text, { dimColor: true, wrap: "truncate", children: `  ${row.text}` }, row.key))
+                : liveLine !== undefined && _jsx(Text, { dimColor: true, wrap: "truncate", children: `  │ ${liveLine}` })] });
 }

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

@@ -1,10 +1,29 @@
 import React from 'react';
 import type { SubagentState } from '../dsh-adapter/subagents.js';
+import type { SidePanelKeyFlags } from './sidePanel/types.js';
+import type { AgentMessageView, AgentIdentity } from './messages/agentTeam.js';
 export interface SubagentDashboardProps {
-    subagents: SubagentState[];
-    onClose: () => void;
+    subagents: readonly SubagentState[];
+    /** Optional cross-session agents, kept separate from this session children. */
+    readonly peers?: readonly AgentIdentity[];
+    /** 整屏/浮层形态的退出通道（Esc / ✕ 按钮）。panel 形态不传：面板不自己
+     *  关侧栏——Esc 让给宿主（焦点回聊天，见 usePanelInput 契约）。 */
+    onClose?: () => void;
     onSelect?: (agentId: string) => void;
+    /** 打开主屏只读 Agent View：行点击/Enter 仍进 Detail，这是另一个专用
+     *  动作（'v' 键或行内 ⤢）。 */
+    onOpenView?: (agentId: string) => void;
+    /** 代理↔代理消息流：每张卡下显示最后一条 from → to 摘要。 */
+    messages?: readonly AgentMessageView[];
+    /** `panel` 挂在侧栏宿主里（去外层 padding、键盘走 usePanelInput 分发器）；
+     *  default（缺省）与整屏形态逐字节一致。 */
+    variant?: 'default' | 'panel';
+    /** panel 形态：宿主报告焦点/可见性；非 active 时保留状态但收不到键。 */
+    focused?: boolean;
+    visible?: boolean;
 }
+/** Accept Ink's Enter flag and the panel dispatcher's normalized alias. */
+export declare function isPanelPlainReturn(input: string, key: SidePanelKeyFlags): boolean;
 /** 可点击 ✕ 退出按钮：整屏/浮层场景的鼠标退出通道（Esc 等价）。 */
 export declare function ExitButton({ onClick }: {
     onClick: () => void;
@@ -13,5 +32,5 @@ export declare function ExitButton({ onClick }: {
  * 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;
+export declare function SubagentDashboard({ subagents, peers, onClose, onSelect, onOpenView, messages, variant, focused, visible, }: SubagentDashboardProps): React.ReactNode;
 //# sourceMappingURL=SubagentDashboard.d.ts.map

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

@@ -1 +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,yCAAyC;AACzC,wBAAgB,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,GAAG,KAAK,CAAC,SAAS,CAWhF;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,SAAS,EACT,OAAO,EACP,QAAQ,EACT,EAAE,sBAAsB,GAAG,KAAK,CAAC,SAAS,CA0G1C"}
+{"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,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAE7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAE9E,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,SAAS,aAAa,EAAE,CAAA;IACnC,+EAA+E;IAC/E,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,aAAa,EAAE,CAAA;IACzC;mDAC+C;IAC/C,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;IACpB,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IACpC;0BACsB;IACtB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IACtC,wCAAwC;IACxC,QAAQ,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAA;IACtC;iCAC6B;IAC7B,OAAO,CAAC,EAAE,SAAS,GAAG,OAAO,CAAA;IAC7B,+CAA+C;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,2EAA2E;AAC3E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAOjF;AAED,yCAAyC;AACzC,wBAAgB,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,GAAG,KAAK,CAAC,SAAS,CAWhF;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,SAAS,EACT,KAAK,EACL,OAAO,EACP,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,OAAmB,EACnB,OAAc,EACd,OAAc,GACf,EAAE,sBAAsB,GAAG,KAAK,CAAC,SAAS,CA+M1C"}