@deepseek-harness-tui/dsh-tui 0.15.0 → 0.16.0

package/lib/types/components/sidePanel/btw/BtwThreadScene.js

@@ -4,7 +4,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * 滚动、composer 追问。Esc 返回侧栏，面板状态原样（mountPolicy=enabled
  * 不卸载，thread 与 draft 都在线程 store）。
  *
- * 键层级：composer 编辑（Esc 收起草稿）> 场景滚动/动作 > Esc 退出场景。
+ * 键层级：composer 编辑（Esc 收起草稿、↑ 上到标题）> 场景动作（↑/↓ 选轮、
+ * s 送聊天/撤回、c 复制）> Esc 退出场景。选中态与侧栏面板同源（线程 store），
+ * 两个形态的键位与落点逐条对齐。
  */
 import React from 'react';
 import { Box, Text, useInput, useTerminalSize } from '../../../ui.js';
@@ -14,7 +16,7 @@ import { btwThreads } from './threads.js';
 import { getBtwContextBudget, getBtwContextTurns } from '../../../tuiDisplayPrefs.js';
 import { BtwComposer, btwComposerKey } from './BtwComposer.js';
 import { BtwThreadView } from './BtwThreadView.js';
-export function BtwThreadScene({ channel, onClose, }) {
+export function BtwThreadScene({ channel, onClose, onFocusChat, }) {
     const { columns, rows } = useTerminalSize();
     const sessionId = String(channel.agentId);
     const thread = React.useSyncExternalStore(btwThreads.subscribe, () => btwThreads.get(sessionId));
@@ -29,11 +31,15 @@ export function BtwThreadScene({ channel, onClose, }) {
     const [notice, setNotice] = React.useState(null);
     const scrollRef = React.useRef(null);
     const busy = thread !== undefined && thread.activeTurnId !== null;
+    // 选中轮与侧栏面板同源（线程 store）：↑/↓ 移动、s 送聊天/撤回、c 复制。
+    const turns = thread?.turns ?? [];
+    const selectedId = thread?.selectedTurnId ?? null;
+    const selectedTurn = turns.find(turn => turn.turnId === selectedId);
     const attachTurn = React.useCallback((turn) => {
         if (turn.phase !== 'completed')
-            return;
+            return false;
         if (typeof channel.attachContext !== 'function')
-            return;
+            return false;
         channel.attachContext({
             source: 'panel',
             sourceId: turn.turnId,
@@ -42,7 +48,42 @@ export function BtwThreadScene({ channel, onClose, }) {
         });
         const staged = channel.attachedContexts.find(entry => entry.sourceId === turn.turnId);
         channel.notify(staged?.truncated === true ? t('btw-thread-answer-truncated') : t('btw-thread-answer-attached'), { color: 'success' });
+        return true;
     }, [channel]);
+    /**
+     * `s` = 送聊天，再按一次 = 撤回（与侧栏面板、jobs/companion 同一契约）。
+     * 送出去之后这个整屏场景就让位：关掉场景 + 焦点交回主输入框——等价于侧栏
+     * 形态里「面板留着、焦点回到输入框」，两种形态的落点一致。
+     */
+    const sendToChat = React.useCallback((turn) => {
+        // oxlint-disable-next-line typescript/no-unnecessary-condition -- runtime guard: partial fixture channels
+        const staged = (channel.attachedContexts ?? []).find(entry => entry.sourceId === turn.turnId);
+        if (staged !== undefined) {
+            if (typeof channel.detachContext === 'function')
+                channel.detachContext(staged.id);
+            channel.notify(t('panel-context-detached'), { color: 'success' });
+            return;
+        }
+        if (!attachTurn(turn))
+            return;
+        onFocusChat?.();
+        onClose();
+    }, [attachTurn, channel, onFocusChat, onClose]);
+    /** 点标题行：选中那一轮并离开编辑层（高亮只在列表态显示）。 */
+    const selectTurn = React.useCallback((turnId) => {
+        btwThreads.select(sessionId, turnId);
+        setComposerFocus(false);
+    }, [sessionId]);
+    const copySelected = React.useCallback(() => {
+        const turn = btwThreads.selectedTurn(sessionId);
+        const answer = turn !== undefined && turn.answer !== ''
+            ? turn.answer
+            : [...(btwThreads.get(sessionId)?.turns ?? [])].reverse().find(candidate => candidate.phase === 'completed')?.answer;
+        if (answer === undefined)
+            return;
+        void setClipboard(answer);
+        channel.notify(t('copied-chars', { n: answer.length }), { timeoutMs: 1500 });
+    }, [sessionId, channel]);
     useInput((input, key, event) => {
         if (composerFocus) {
             const text = btwThreads.get(sessionId)?.draft ?? '';
@@ -80,14 +121,23 @@ export function BtwThreadScene({ channel, onClose, }) {
             onClose();
             return;
         }
+        // ↑/↓ 只挪选中，滚动交给 BtwThreadView 的「最小揭示」（出了视口才滚）。
         if (key.upArrow) {
-            scrollRef.current?.scrollBy(-3);
             event.stopImmediatePropagation();
+            btwThreads.moveSelection(sessionId, -1);
             return;
         }
         if (key.downArrow) {
-            scrollRef.current?.scrollBy(3);
             event.stopImmediatePropagation();
+            const list = btwThreads.get(sessionId)?.turns ?? [];
+            const current = btwThreads.selectedTurn(sessionId);
+            const at = current === undefined ? list.length - 1 : list.findIndex(turn => turn.turnId === current.turnId);
+            // 已在最后一条：↓ 回输入框（与输入框里按 ↑ 上到标题互为往返）。
+            if (list.length === 0 || at === list.length - 1) {
+                setComposerFocus(true);
+                return;
+            }
+            btwThreads.moveSelection(sessionId, 1);
             return;
         }
         if (key.pageUp) {
@@ -114,20 +164,16 @@ export function BtwThreadScene({ channel, onClose, }) {
             return;
         }
         if (input === 's' && !key.ctrl && !key.meta) {
-            const latest = [...(btwThreads.get(sessionId)?.turns ?? [])].reverse().find(turn => turn.phase === 'completed');
-            if (latest !== undefined)
-                attachTurn(latest);
+            const turn = btwThreads.selectedTurn(sessionId);
+            if (turn !== undefined)
+                sendToChat(turn);
             event.stopImmediatePropagation();
             return;
         }
         if (input === 'c' && !key.ctrl && !key.meta) {
-            const latest = [...(btwThreads.get(sessionId)?.turns ?? [])].reverse().find(turn => turn.phase === 'completed');
-            if (latest !== undefined) {
-                void setClipboard(latest.answer);
-                channel.notify(t('copied-chars', { n: latest.answer.length }), { timeoutMs: 1500 });
-            }
+            copySelected();
             event.stopImmediatePropagation();
         }
     });
-    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, paddingX: 1, children: [_jsxs(Box, { flexDirection: "row", width: "100%", height: 1, flexShrink: 0, children: [_jsx(Text, { color: "warning", bold: true, children: t('btw-fullscreen-title') }), _jsx(Text, { dimColor: true, wrap: "truncate", children: '  ' + t('btw-scene-hints') })] }), _jsx(BtwThreadView, { thread: thread, width: columns - 2, height: Math.max(3, rows - 4), alive: true, onAttachTurn: attachTurn, scrollHandleRef: scrollRef }), _jsx(BtwComposer, { state: { text: thread?.draft ?? '', caret }, focused: composerFocus, busy: busy, notice: notice === null ? undefined : notice, onActivate: activateComposer })] }));
+    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, paddingX: 1, children: [_jsxs(Box, { flexDirection: "row", width: "100%", height: 1, flexShrink: 0, children: [_jsx(Text, { color: "warning", bold: true, children: t('btw-fullscreen-title') }), _jsx(Text, { dimColor: true, wrap: "truncate", children: '  ' + t('btw-scene-hints') })] }), _jsx(BtwThreadView, { thread: thread, width: columns - 2, height: Math.max(3, rows - 4), alive: true, selectedTurnId: composerFocus ? undefined : selectedId ?? undefined, onSelectTurn: selectTurn, scrollHandleRef: scrollRef }), _jsx(BtwComposer, { state: { text: thread?.draft ?? '', caret }, focused: composerFocus, busy: busy, notice: notice === null ? undefined : notice, onActivate: activateComposer })] }));
 }

package/lib/types/components/sidePanel/btw/BtwThreadView.d.ts

@@ -7,13 +7,23 @@
  * 跟尾：默认跟随尾部；用户上滚后暂停 follow，
  * 出现「有新回答」跳尾提示（点击回底）。ScrollBox 的 sticky 位就是
  * follow 信号——上滚打破 sticky，scrollToBottom/贴底恢复。
+ *
+ * 消息区不是控件：点它跟点面板其它地方一样，只由宿主把列焦点交给面板
+ * （见 BtwComposer 的点击注释），注入/复制的入口是选中轮 + `s`/`c`。
+ * 选中只看标题那一行：反色只覆盖标题本身的字，终端光标也声明在那儿。
+ * 选中轮滚出视口时只滚到「恰好露出这一行」：往上走贴视口顶、往下走贴视口底；
+ * 已经在视口里就只挪高亮，不动滚动位置。
  */
 import React from 'react';
 import { type ScrollBoxHandle } from '../../../ui.js';
-import type { BtwThreadSnapshot, BtwTurn } from './threads.js';
+import type { BtwThreadSnapshot } from './threads.js';
 export declare function BtwThreadView({ thread, width, height, 
 /** 渲时钟的开关（面板不可见/场景失焦时停表）。 */
-alive, onAttachTurn, 
+alive, 
+/** 当前选中的轮（标题反色 + 光标声明）；undefined = 列表没有选中态。 */
+selectedTurnId, 
+/** 点标题行把选中挪到那一轮（继续冒泡，宿主照旧拿列焦点）。 */
+onSelectTurn, 
 /** 宿主（全屏场景/浮层）接管键盘滚动用的句柄透传。 */
 scrollHandleRef, }: {
     readonly thread: BtwThreadSnapshot | undefined;
@@ -21,8 +31,8 @@ scrollHandleRef, }: {
     /** 滚动区行预算（含滚动区自身；跳尾提示一行另计）。 */
     readonly height: number;
     readonly alive: boolean;
-    /** 点击已完成轮的答案区触发送到聊天（fallback 形态不传 = 无该交互）。 */
-    readonly onAttachTurn?: (turn: BtwTurn) => void;
+    readonly selectedTurnId?: string | undefined;
+    readonly onSelectTurn?: ((turnId: string) => void) | undefined;
     readonly scrollHandleRef?: {
         current: ScrollBoxHandle | null;
     };

package/lib/types/components/sidePanel/btw/BtwThreadView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BtwThreadView.d.ts","sourceRoot":"","sources":["../../../../../src/components/sidePanel/btw/BtwThreadView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAK3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAsB9D,wBAAgB,aAAa,CAAC,EAC5B,MAAM,EACN,KAAK,EACL,MAAM;AACN,6BAA6B;AAC7B,KAAK,EACL,YAAY;AACZ,+BAA+B;AAC/B,eAAe,GAChB,EAAE;IACD,QAAQ,CAAC,MAAM,EAAE,iBAAiB,GAAG,SAAS,CAAA;IAC9C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,+BAA+B;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,8CAA8C;IAC9C,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IAC/C,QAAQ,CAAC,eAAe,CAAC,EAAE;QAAE,OAAO,EAAE,eAAe,GAAG,IAAI,CAAA;KAAE,CAAA;CAC/D,GAAG,KAAK,CAAC,SAAS,CAgHlB"}
+{"version":3,"file":"BtwThreadView.d.ts","sourceRoot":"","sources":["../../../../../src/components/sidePanel/btw/BtwThreadView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAO3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AA2DrD,wBAAgB,aAAa,CAAC,EAC5B,MAAM,EACN,KAAK,EACL,MAAM;AACN,6BAA6B;AAC7B,KAAK;AACL,+CAA+C;AAC/C,cAAc;AACd,mCAAmC;AACnC,YAAY;AACZ,+BAA+B;AAC/B,eAAe,GAChB,EAAE;IACD,QAAQ,CAAC,MAAM,EAAE,iBAAiB,GAAG,SAAS,CAAA;IAC9C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,+BAA+B;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5C,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAA;IAC9D,QAAQ,CAAC,eAAe,CAAC,EAAE;QAAE,OAAO,EAAE,eAAe,GAAG,IAAI,CAAA;KAAE,CAAA;CAC/D,GAAG,KAAK,CAAC,SAAS,CA6JlB"}

package/lib/types/components/sidePanel/btw/BtwThreadView.js

@@ -8,12 +8,19 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * 跟尾：默认跟随尾部；用户上滚后暂停 follow，
  * 出现「有新回答」跳尾提示（点击回底）。ScrollBox 的 sticky 位就是
  * follow 信号——上滚打破 sticky，scrollToBottom/贴底恢复。
+ *
+ * 消息区不是控件：点它跟点面板其它地方一样，只由宿主把列焦点交给面板
+ * （见 BtwComposer 的点击注释），注入/复制的入口是选中轮 + `s`/`c`。
+ * 选中只看标题那一行：反色只覆盖标题本身的字，终端光标也声明在那儿。
+ * 选中轮滚出视口时只滚到「恰好露出这一行」：往上走贴视口顶、往下走贴视口底；
+ * 已经在视口里就只挪高亮，不动滚动位置。
  */
 import React from 'react';
 import { Box, Text, ScrollBox } from '../../../ui.js';
 import { Markdown } from '../../Markdown.js';
 import { SpinnerGlyph } from '../../Spinner/SpinnerGlyph.js';
 import { t } from '../../../i18n.js';
+import { useDeclaredCursor, useNativeCursor } from '../../../ink/hooks/use-declared-cursor.js';
 import { getBtwContextTurns, subscribeBtwContextTurns } from '../../../tuiDisplayPrefs.js';
 /** 80ms spinner 帧（只在有 running 轮且其还没收到首段文本时走时钟）。 */
 const SPINNER_MS = 80;
@@ -21,9 +28,36 @@ const SPINNER_MS = 80;
 function BtwEmptyState({ contextTurns }) {
     return (_jsxs(Box, { flexDirection: "column", flexGrow: 1, paddingX: 1, children: [_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "subtle", wrap: "truncate", children: t('btw-thread-empty') }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "subtle", wrap: "wrap", children: t('btw-empty-lines') }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, italic: true, wrap: "wrap", children: t('btw-thread-context-recent', { n: contextTurns }) }) })] }));
 }
+/**
+ * 一轮的标题行（问题）。选中 = 只反色标题本身的字（不铺满整行），并把终端
+ * 光标声明在这一行上：按 ↑/↓ 时原生光标的拖尾是「在标题之间上下走」，而不是
+ * 掉到屏幕左下角（没有声明时渲染器的兜底位置）。点这一行 = 把高亮挪过来
+ * （`onSelect`），点击继续冒泡，宿主照旧拿到列焦点。
+ */
+function QuestionRow({ turnId, text, selected, onSelect, onRegister }) {
+    const native = useNativeCursor();
+    // 与 ListItem 同款：移动期间可见、静止 500ms 后收起，形状/闪烁归终端。
+    const cursorRef = useDeclaredCursor({ line: 0, column: 0, active: selected, visible: native, hideOnIdle: native });
+    // 组装 ref 时必须把 cursorRef 的 cleanup 转交出去（React 19 用返回值当卸载
+    // 清理），否则这一行被删掉时光标声明会留在原地。
+    const setNode = React.useCallback((node) => {
+        const cleanup = cursorRef(node);
+        onRegister?.(turnId, node);
+        return () => {
+            if (typeof cleanup === 'function')
+                cleanup();
+            onRegister?.(turnId, null);
+        };
+    }, [cursorRef, onRegister, turnId]);
+    return (_jsx(Box, { ref: setNode, onClick: onSelect === undefined ? undefined : () => onSelect(turnId), children: _jsx(Text, { color: "accent", bold: true, inverse: selected, wrap: "wrap", children: text }) }));
+}
 export function BtwThreadView({ thread, width, height, 
 /** 渲时钟的开关（面板不可见/场景失焦时停表）。 */
-alive, onAttachTurn, 
+alive, 
+/** 当前选中的轮（标题反色 + 光标声明）；undefined = 列表没有选中态。 */
+selectedTurnId, 
+/** 点标题行把选中挪到那一轮（继续冒泡，宿主照旧拿列焦点）。 */
+onSelectTurn, 
 /** 宿主（全屏场景/浮层）接管键盘滚动用的句柄透传。 */
 scrollHandleRef, }) {
     const localScrollRef = React.useRef(null);
@@ -77,6 +111,60 @@ scrollHandleRef, }) {
             setPendingJump(true);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [version, answerLengths, follow]);
+    // ── 选中轮的最小滚动揭示 ─────────────────────────────────────────────
+    // 行节点表：QuestionRow 挂载时交进来；滚动位置一律走 ScrollBox 的
+    // scrollToElement（位置在渲染期读元素 Yoga top，不会用到过期数字）。
+    const rowNodes = React.useRef(new Map());
+    const registerRow = React.useCallback((turnId, node) => {
+        if (node === null)
+            rowNodes.current.delete(turnId);
+        else
+            rowNodes.current.set(turnId, node);
+    }, []);
+    /**
+     * 节点在滚动内容里的行号（不含滚动位移）：沿祖先累加 Yoga top，直到撞上滚动
+     * 容器（ScrollBox 的节点上才有 scrollTop）。没撞到（浮层回退等无滚动区形态）
+     * 返回 undefined——宁可不滚，也不要按错误的坐标系乱跳。
+     */
+    const contentRowOf = (node) => {
+        let rows = 0;
+        let current = node;
+        while (current !== undefined && current.parentNode !== undefined) {
+            if (current.parentNode.scrollTop !== undefined)
+                return rows;
+            rows += current.yogaNode?.getComputedTop() ?? 0;
+            current = current.parentNode;
+        }
+        return undefined;
+    };
+    const previousSelectedRef = React.useRef(undefined);
+    React.useLayoutEffect(() => {
+        const previous = previousSelectedRef.current;
+        previousSelectedRef.current = selectedTurnId;
+        // 从编辑层或主输入框回列表时也要揭示：长答案跟尾后，标题可能在视口外。
+        if (selectedTurnId === undefined || previous === selectedTurnId)
+            return;
+        const handle = scrollRef.current;
+        const node = rowNodes.current.get(selectedTurnId);
+        if (handle === null || node === undefined)
+            return;
+        const viewport = handle.getViewportHeight();
+        if (viewport <= 0)
+            return;
+        const rows = Math.max(1, Math.ceil(node.yogaNode?.getComputedHeight() ?? 1));
+        const top = contentRowOf(node);
+        if (top === undefined)
+            return;
+        const scrollTop = handle.getScrollTop();
+        // 用算好的内容行号直接 scrollTo：scrollToElement 读的是元素相对**父节点**的
+        // top，标题盒子嵌在 turn 里，用它会把滚动甩到内容顶部。布局已稳定（只有选中
+        // 变了），这里的数字不会过期。
+        // 往上走出视口 → 贴视口顶；往下走出视口 → 整行贴视口底（恰好露出，不多滚）。
+        if (top < scrollTop)
+            handle.scrollTo(top);
+        else if (top + rows > scrollTop + viewport)
+            handle.scrollTo(top + rows - viewport);
+    }, [selectedTurnId]);
     const jumpTail = React.useCallback(() => {
         scrollRef.current?.scrollToBottom();
         setFollow(true);
@@ -84,10 +172,7 @@ scrollHandleRef, }) {
     }, []);
     if (thread === undefined || thread.turns.length === 0)
         return _jsx(BtwEmptyState, { contextTurns: contextTurns });
-    return (_jsxs(Box, { flexDirection: "column", flexGrow: 1, overflow: "hidden", paddingX: 1, children: [_jsx(ScrollBox, { ref: scrollRef, flexDirection: "column", flexGrow: 1, stickyScroll: true, children: thread.turns.map((turn, index) => (_jsxs(Box, { flexDirection: "column", children: [index > 0 && _jsx(Text, { dimColor: true, children: '┈'.repeat(Math.max(4, width - 2)) }), _jsx(Text, { color: "accent", bold: true, wrap: "wrap", children: turn.question }), _jsxs(Box, { marginLeft: 2, flexDirection: "column", children: [turn.phase === 'completed' ? (_jsx(Box, { onClick: onAttachTurn === undefined ? undefined : event => {
-                                        event.stopImmediatePropagation();
-                                        onAttachTurn(turn);
-                                    }, children: _jsx(Markdown, { cacheTokens: false, children: turn.answer }) })) : turn.phase === 'failed' || turn.phase === 'cancelled' ? (_jsxs(_Fragment, { children: [turn.answer !== '' && _jsx(Markdown, { cacheTokens: false, children: turn.answer }), turn.phase === 'failed'
+    return (_jsxs(Box, { flexDirection: "column", flexGrow: 1, overflow: "hidden", paddingX: 1, children: [_jsx(ScrollBox, { ref: scrollRef, flexDirection: "column", flexGrow: 1, stickyScroll: true, children: thread.turns.map((turn, index) => (_jsxs(Box, { flexDirection: "column", children: [index > 0 && _jsx(Text, { dimColor: true, children: '┈'.repeat(Math.max(4, width - 2)) }), _jsx(QuestionRow, { turnId: turn.turnId, text: turn.question, selected: turn.turnId === selectedTurnId, onSelect: onSelectTurn, onRegister: registerRow }), _jsxs(Box, { marginLeft: 2, flexDirection: "column", children: [turn.phase === 'completed' ? (_jsx(Markdown, { cacheTokens: false, children: turn.answer })) : turn.phase === 'failed' || turn.phase === 'cancelled' ? (_jsxs(_Fragment, { children: [turn.answer !== '' && _jsx(Markdown, { cacheTokens: false, children: turn.answer }), turn.phase === 'failed'
                                             ? _jsxs(Text, { color: "error", wrap: "wrap", children: [t('btw-thread-error'), turn.error === undefined ? '' : ': ' + turn.error] })
                                             : _jsx(Text, { dimColor: true, italic: true, children: t('btw-thread-cancelled') })] })) : turn.answer !== '' ? (_jsx(Markdown, { cacheTokens: false, children: turn.answer })) : (_jsxs(Box, { flexShrink: 0, children: [_jsx(SpinnerGlyph, { frame: frame, messageColor: "warning" }), _jsxs(Text, { color: "warning", children: [" ", t('btw-answering')] })] })), turn.omittedOlderCount > 0 && (_jsx(Text, { dimColor: true, italic: true, wrap: "truncate", children: t('btw-thread-context-omitted', { n: turn.omittedOlderCount }) }))] })] }, turn.turnId))) }), pendingJump && !follow && (_jsx(Box, { flexShrink: 0, onClick: event => { event.stopImmediatePropagation(); jumpTail(); }, children: _jsxs(Text, { color: "permission", children: ["\u2193 ", t('btw-thread-unread')] }) }))] }));
 }

package/lib/types/components/sidePanel/btw/threads.d.ts

@@ -22,6 +22,9 @@ export interface BtwThreadSnapshot {
     readonly turns: readonly BtwTurn[];
     readonly activeTurnId: string | null;
     readonly draft: string;
+    /** 列表选中的轮（`s` 送聊天 / `c` 复制的对象）；null = 跟最后一条。
+     *  与 draft 同理放在 store 里：面板与全屏场景共用同一份选中态。 */
+    readonly selectedTurnId: string | null;
     /** seen-through 标尺之后的完成/失败轮（cancelled 不计：用户自己中止，
      * 不是没看到的新答案）。 */
     readonly unread: {
@@ -55,6 +58,12 @@ export type BtwSubmitResult = {
     readonly ok: false;
     readonly reason: 'empty' | 'busy' | 'congested';
 };
+/**
+ * 有效选中轮：钉住的 id 还在就继续用它，否则跟最后一条（新轮到达自动跟尾、
+ * 轮被清掉/换话题自动落回）。面板与全屏场景共用这一条解析，保证两个形态
+ * 的选中语义逐字一致。
+ */
+export declare function effectiveSelectedTurnId(turns: readonly BtwTurn[], pinned: string | null): string | null;
 /** 钳到 1–8；非有限值取默认 4。 */
 export declare function normalizeRecentTurnsLimit(value: number | undefined): number;
 export interface BtwContextSelection {
@@ -97,6 +106,15 @@ declare class BtwThreadStore {
      */
     newTopic(sessionId: string): boolean;
     setDraft(sessionId: string, text: string): void;
+    /** 指定选中某一轮（点标题行；null = 回到跟最后一条）。 */
+    select(sessionId: string, turnId: string | null): void;
+    /** 当前选中轮（实时解析，不依赖渲染期快照）。 */
+    selectedTurn(sessionId: string): BtwTurn | undefined;
+    /**
+     * ↑/↓ 移动选中：从当前有效选中出发、夹在两端（delta = ±1）。落点即钉住，
+     * 所以移动之后不再跟尾；返回新选中轮（线程为空 = undefined）。
+     */
+    moveSelection(sessionId: string, delta: number): BtwTurn | undefined;
     /** 看到最新线程：把已落定轮全部记为已读（running 轮落定时再见分晓）。 */
     markSeen(sessionId: string): void;
     /** 测试/多夹具隔离用：清空全部线程状态。 */

package/lib/types/components/sidePanel/btw/threads.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"threads.d.ts","sourceRoot":"","sources":["../../../../../src/components/sidePanel/btw/threads.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"threads.d.ts","sourceRoot":"","sources":["../../../../../src/components/sidePanel/btw/threads.ts"],"names":[],"mappings":"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"}

package/lib/types/components/sidePanel/btw/threads.js

@@ -24,6 +24,16 @@ export const BTW_CONTEXT_CHAR_BUDGET = 24_000;
 export const BTW_ANSWER_CHAR_BUDGET = 8_000;
 /** 跨线程并发上限：超过显示忙，不隐式取消。 */
 export const BTW_MAX_CONCURRENT_ASKS = 2;
+/**
+ * 有效选中轮：钉住的 id 还在就继续用它，否则跟最后一条（新轮到达自动跟尾、
+ * 轮被清掉/换话题自动落回）。面板与全屏场景共用这一条解析，保证两个形态
+ * 的选中语义逐字一致。
+ */
+export function effectiveSelectedTurnId(turns, pinned) {
+    if (pinned !== null && turns.some(turn => turn.turnId === pinned))
+        return pinned;
+    return turns.length === 0 ? null : turns[turns.length - 1].turnId;
+}
 /** 钳到 1–8；非有限值取默认 4。 */
 export function normalizeRecentTurnsLimit(value) {
     if (value === undefined || !Number.isFinite(value))
@@ -92,6 +102,7 @@ function buildSnapshot(record) {
         turns: Object.freeze([...record.turns]),
         activeTurnId: active === null ? null : active.turnId,
         draft: record.draft,
+        selectedTurnId: effectiveSelectedTurnId(record.turns, record.selectedTurnId),
         unread: Object.freeze({ count: unreadCount, error: unreadError }),
         version: record.version,
     });
@@ -147,6 +158,8 @@ class BtwThreadStore {
             omittedOlderCount: selection.omittedOlderCount,
         };
         record.turns.push(turn);
+        // 新轮到达回到跟尾：选中态跟的是「最后一条」，上一轮的钉位不再有意义。
+        record.selectedTurnId = null;
         this.bump(record);
         const controller = new AbortController();
         this.controllers.set(turn.turnId, controller);
@@ -230,6 +243,7 @@ class BtwThreadStore {
         record.generation += 1;
         record.turns = [];
         record.draft = '';
+        record.selectedTurnId = null;
         record.seenThroughSeq = this.turnSeq;
         this.bump(record);
         return true;
@@ -241,6 +255,41 @@ class BtwThreadStore {
         record.draft = text;
         this.bump(record);
     }
+    /** 指定选中某一轮（点标题行；null = 回到跟最后一条）。 */
+    select(sessionId, turnId) {
+        const record = this.recordOf(sessionId);
+        if (record.selectedTurnId === turnId)
+            return;
+        record.selectedTurnId = turnId;
+        this.bump(record);
+    }
+    /** 当前选中轮（实时解析，不依赖渲染期快照）。 */
+    selectedTurn(sessionId) {
+        const record = this.threads.get(sessionId);
+        if (record === undefined)
+            return undefined;
+        const id = effectiveSelectedTurnId(record.turns, record.selectedTurnId);
+        return id === null ? undefined : record.turns.find(turn => turn.turnId === id);
+    }
+    /**
+     * ↑/↓ 移动选中：从当前有效选中出发、夹在两端（delta = ±1）。落点即钉住，
+     * 所以移动之后不再跟尾；返回新选中轮（线程为空 = undefined）。
+     */
+    moveSelection(sessionId, delta) {
+        const record = this.recordOf(sessionId);
+        if (record.turns.length === 0)
+            return undefined;
+        const current = effectiveSelectedTurnId(record.turns, record.selectedTurnId);
+        const at = record.turns.findIndex(turn => turn.turnId === current);
+        const from = at === -1 ? record.turns.length - 1 : at;
+        const next = Math.min(record.turns.length - 1, Math.max(0, from + delta));
+        const turnId = record.turns[next].turnId;
+        if (record.selectedTurnId !== turnId) {
+            record.selectedTurnId = turnId;
+            this.bump(record);
+        }
+        return record.turns[next];
+    }
     /** 看到最新线程：把已落定轮全部记为已读（running 轮落定时再见分晓）。 */
     markSeen(sessionId) {
         const record = this.threads.get(sessionId);
@@ -269,6 +318,7 @@ class BtwThreadStore {
                 generation: 0,
                 turns: [],
                 draft: '',
+                selectedTurnId: null,
                 seenThroughSeq: this.turnSeq,
                 version: 0,
                 snapshot: Object.freeze({
@@ -279,6 +329,7 @@ class BtwThreadStore {
                     turns: Object.freeze([]),
                     activeTurnId: null,
                     draft: '',
+                    selectedTurnId: null,
                     unread: Object.freeze({ count: 0, error: false }),
                     version: 0,
                 }),

package/lib/types/components/sidePanel/builtinPanels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builtinPanels.d.ts","sourceRoot":"","sources":["../../../../src/components/sidePanel/builtinPanels.tsx"],"names":[],"mappings":"AA6NA,2BAA2B;AAC3B,wBAAgB,qBAAqB,IAAI,IAAI,CAmG5C"}
+{"version":3,"file":"builtinPanels.d.ts","sourceRoot":"","sources":["../../../../src/components/sidePanel/builtinPanels.tsx"],"names":[],"mappings":"AAiOA,2BAA2B;AAC3B,wBAAgB,qBAAqB,IAAI,IAAI,CAmG5C"}

package/lib/types/components/sidePanel/builtinPanels.js

@@ -141,6 +141,10 @@ function AgentsPanelAdapter({ focused, visible }) {
     React.useEffect(() => {
         const running = subagents.filter(s => s.status === 'running' || s.status === 'starting').length;
         const failedIds = new Set(subagents.filter(s => s.status === 'failed').map(s => s.agentId));
+        // A failed team member is durable; it counts once even beside a failed run.
+        for (const member of channel.team?.members ?? [])
+            if (member.phase === 'failed')
+                failedIds.add(member.id);
         if (visible) {
             seenFailedRef.current = failedIds;
             panelStore.setBadge('agents', running > 0 ? { level: 'info', unread: 0 } : null);
@@ -162,7 +166,7 @@ function AgentsPanelAdapter({ focused, visible }) {
     if (typeof route === 'object' && detail !== undefined) {
         return (_jsx(SubagentDetailScene, { subagent: detail, variant: "panel", focused: focused, visible: visible, onBack: () => setRoute('dashboard'), onInterrupt: (id) => channel.subagentControl?.interrupt(id), ...(channel.subagentControl?.history === undefined ? {} : { loadTranscript: channel.subagentControl.history }), onOpenView: () => agentViewStore.request(detail.agentId, 'agent-detail', true), messages: detailMessages, ...(detailCompose === undefined ? {} : { compose: detailCompose }) }));
     }
-    return (_jsx(SubagentDashboard, { subagents: subagents, variant: "panel", focused: focused, visible: visible, onSelect: (id) => setRoute({ detail: id }), onOpenView: (id) => agentViewStore.request(id, 'agents-dashboard', true), messages: messageControl?.messages() }));
+    return (_jsx(SubagentDashboard, { subagents: subagents, team: channel.team, sessionId: channel.sessionId, variant: "panel", focused: focused, visible: visible, onSelect: (id) => setRoute({ detail: id }), onOpenView: (id) => agentViewStore.request(id, 'agents-dashboard', true), messages: messageControl?.messages() }));
 }
 let registered = false;
 /** 幂等：重复调用（夹具多次挂载）不再注册。 */

package/lib/types/components/sidePanel/companion/SplashMascot.d.ts

@@ -19,13 +19,17 @@
  * 渲染路径（LogoV2 底部块，welcomePad 缩进）。
  */
 import React from 'react';
+import { type SplashImageBox } from '../../splashArtRows.js';
 export type SplashMascotSkin = 'deepy' | 'whaleGirl';
 /** 读 companion.skin（LogoV2 的测试缝 prop 优先）；非吉祥物皮肤返回
  *  undefined（LogoV2 走原鲸鱼/女仆娘路径，零改动）。 */
 export declare function useSplashMascotSkin(pinned?: string): SplashMascotSkin | undefined;
+/** 图片原生尺寸的紧凑槽；仅启动页使用，协议/像元/素材未就绪时保持原回退。 */
+export declare function useSplashMascotBox(skin: SplashMascotSkin | undefined, compact: boolean): SplashImageBox | undefined;
 /** 启动页吉祥物本体：按 skin 渲染动画，点击交互（poke/连点）在内层盒。 */
-export declare function SplashMascot({ skin, active }: {
+export declare function SplashMascot({ skin, active, imageBox }: {
     readonly skin: SplashMascotSkin;
+    readonly imageBox?: SplashImageBox;
     /** 动画许可：false（冻结/落地页 whaleIdle=false）时定格 idle 帧 0、零时钟。 */
     readonly active: boolean;
 }): React.ReactNode;

package/lib/types/components/sidePanel/companion/SplashMascot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SplashMascot.d.ts","sourceRoot":"","sources":["../../../../../src/components/sidePanel/companion/SplashMascot.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,MAAM,OAAO,CAAA;AAiBzB,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,WAAW,CAAA;AAEpD;wCACwC;AACxC,wBAAgB,mBAAmB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAIjF;AAGD,8CAA8C;AAC9C,wBAAgB,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;IAC7C,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAA;IAC/B,0DAA0D;IAC1D,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CACzB,GAAG,KAAK,CAAC,SAAS,CAqElB"}
+{"version":3,"file":"SplashMascot.d.ts","sourceRoot":"","sources":["../../../../../src/components/sidePanel/companion/SplashMascot.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAiB/E,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,WAAW,CAAA;AAEpD;wCACwC;AACxC,wBAAgB,mBAAmB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAIjF;AAGD,2CAA2C;AAC3C,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,GAAG,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS,CAUnH;AAED,8CAA8C;AAC9C,wBAAgB,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE;IACvD,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAA;IAC/B,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;IAClC,0DAA0D;IAC1D,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CACzB,GAAG,KAAK,CAAC,SAAS,CAsElB"}

package/lib/types/components/sidePanel/companion/SplashMascot.js

@@ -20,10 +20,12 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * 渲染路径（LogoV2 底部块，welcomePad 缩进）。
  */
 import React from 'react';
-import { Box } from '../../../ui.js';
+import { Box, useTerminalImages, useTerminalImageCellSize, useTerminalImageProtocol } from '../../../ui.js';
+import { fitSplashImageBox } from '../../splashArtRows.js';
+import { loadWhaleGirlKit } from './deepy.js';
 import { getCompanionSkin, subscribeCompanionSkin } from '../../../tuiDisplayPrefs.js';
 import { TICKLE_MIN_CLICKS, TICKLE_WINDOW_MS } from './mood.js';
-import { DeepySkin, WhaleGirlSkin } from './skins.js';
+import { DeepySkin, WhaleGirlSkin, loadWhaleGirlImageKit } from './skins.js';
 import { initialCompanionPoseState, nextCompanionPoseStep } from './pose.js';
 /** 点击反应档时长：poke 帧表一轮 2100ms，取头段（同 CompanionPanel 的口径）。 */
 const SPLASH_POKE_MS = 1400;
@@ -40,8 +42,20 @@ export function useSplashMascotSkin(pinned) {
     const id = pinned ?? setting;
     return id === 'deepy' || id === 'whaleGirl' ? id : undefined;
 }
+/** 图片原生尺寸的紧凑槽；仅启动页使用，协议/像元/素材未就绪时保持原回退。 */
+export function useSplashMascotBox(skin, compact) {
+    // 高度降级可能暂时撤掉吉祥物，因此能力探测不能只依赖吉祥物挂载。
+    const available = useTerminalImages(compact && skin === 'whaleGirl');
+    const protocol = useTerminalImageProtocol();
+    const cell = useTerminalImageCellSize();
+    const canvas = available && compact && skin === 'whaleGirl' && cell !== undefined
+        && (protocol === 'kitty' || protocol === 'sixel') && loadWhaleGirlKit() !== undefined
+        ? loadWhaleGirlImageKit()?.canvas : undefined;
+    return React.useMemo(() => canvas !== undefined && cell !== undefined
+        ? fitSplashImageBox(canvas, cell, WhaleGirlSkin.cells) : undefined, [canvas, cell]);
+}
 /** 启动页吉祥物本体：按 skin 渲染动画，点击交互（poke/连点）在内层盒。 */
-export function SplashMascot({ skin, active }) {
+export function SplashMascot({ skin, active, imageBox }) {
     const [, setBump] = React.useState(0);
     // 稳态 idle 从挂载起循环；冻结时 now 钉在挂载值 → elapsed 恒 0 → 帧 0。
     const mountedAtRef = React.useRef(Date.now());
@@ -78,6 +92,7 @@ export function SplashMascot({ skin, active }) {
         now,
         width: SPLASH_MASCOT_COLUMNS,
         animationSemantic,
+        ...(imageBox === undefined ? {} : { imageBox }),
     };
     return (_jsx(Box, { flexDirection: "column", alignItems: "center", flexShrink: 0, children: _jsx(Box, { onClick: (event) => {
                 event.stopImmediatePropagation();
@@ -93,7 +108,7 @@ export function SplashMascot({ skin, active }) {
                 overrideRef.current = rapid
                     ? { semantic: 'tickle', since: at, until: at + TICKLE_WINDOW_MS }
                     : {
-                        semantic: event.localCol < SPLASH_MASCOT_COLUMNS / 2 ? 'poke-left' : 'poke-right',
+                        semantic: event.localCol < (imageBox?.columns ?? (skin === 'whaleGirl' ? WhaleGirlSkin.cells.columns : SPLASH_MASCOT_COLUMNS)) / 2 ? 'poke-left' : 'poke-right',
                         since: at,
                         until: at + SPLASH_POKE_MS,
                     };

package/lib/types/components/sidePanel/companion/skins.d.ts

@@ -11,6 +11,7 @@
  * 皮肤 = id + cells + render(pose, ctx)，自定义皮肤走同一接口进入。
  */
 import React from 'react';
+import type { SplashImageBox } from '../../splashArtRows.js';
 import type { I18nKey } from '../../../i18n.js';
 import type { TerminalImageSource } from '../../../ink/terminal-image.js';
 import type { CompanionMood } from './mood.js';
@@ -29,6 +30,8 @@ export interface CompanionSkinRenderInput {
      *  旧调用方（缺省）皮肤退回 pose.mood 分层，属皮肤接口「未支持即
      *  退化」契约。 */
     readonly animationSemantic?: string;
+    /** 启动页专属紧凑图片槽；侧栏不传，保持原来的固定几何。 */
+    readonly imageBox?: SplashImageBox;
 }
 export interface CompanionSkin {
     readonly id: string;
@@ -86,6 +89,11 @@ interface WhaleGirlImageAnimation {
 interface WhaleGirlImageKit {
     /** img/ 目录的绝对路径（帧 PNG 解码用）。 */
     readonly dir: string;
+    /** idle 首帧 PNG 头部声明的稳定画布，不等待像素解码。 */
+    readonly canvas?: {
+        readonly width: number;
+        readonly height: number;
+    };
     readonly byKey: Readonly<Record<string, WhaleGirlImageAnimation>>;
 }
 /** 惰性加载 + 缓存图像 timings；缺失/校验失败返回 undefined（退字母格）。 */

package/lib/types/components/sidePanel/companion/skins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skins.d.ts","sourceRoot":"","sources":["../../../../../src/components/sidePanel/companion/skins.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"skins.d.ts","sourceRoot":"","sources":["../../../../../src/components/sidePanel/companion/skins.tsx"],"names":[],"mappings":"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"}