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

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import { type Tip } from '../tips.js';
+import { type UpstreamDriftSummary } from '../dsh-adapter/contract.js';
 /**
  * The header splash: one layout, two phases. The **opening** (~3.4s, once)
  * plays the hand-drawn whale animation (blink → water-spout bloom → tail
@@ -14,7 +15,7 @@ import { type Tip } from '../tips.js';
  * the whale the welcome tagline, centered under the art, in ice
  * blue. Narrow terminals drop the whale and keep the text column.
  */
-export declare function LogoV2({ model, effort, cwd, skipIntro, tip, }: {
+export declare function LogoV2({ model, effort, cwd, skipIntro, tip, whale, drift, }: {
     model: string;
     effort?: string | undefined;
     cwd: string;
@@ -22,5 +23,10 @@ export declare function LogoV2({ model, effort, cwd, skipIntro, tip, }: {
     skipIntro?: boolean;
     /** Test seam: pin the startup tip line (probes need a deterministic tip). */
     tip?: Tip;
+    /** Show the pixel whale art (settings `dsh-tui.whale`); off → text-only header. */
+    whale?: boolean;
+    /** Test seam: pin/suppress the upstream-drift notice (`null` forces it off;
+     * `undefined` — the production default — auto-detects the install). */
+    drift?: UpstreamDriftSummary | null;
 }): React.ReactNode;
 //# sourceMappingURL=LogoV2.d.ts.map

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;AAEzB,OAAO,EAAiB,KAAK,GAAG,EAAE,MAAM,YAAY,CAAA;AAuDpD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,MAAM,CAAC,EACrB,KAAK,EACL,MAAM,EACN,GAAG,EACH,SAAiB,EACjB,GAAG,GACJ,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;IACnB,6EAA6E;IAC7E,GAAG,CAAC,EAAE,GAAG,CAAA;CACV,GAAG,KAAK,CAAC,SAAS,CAqFlB"}
+{"version":3,"file":"LogoV2.d.ts","sourceRoot":"","sources":["../../../src/components/LogoV2.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAiB,KAAK,GAAG,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,EAAoD,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAuDxH;;;;;;;;;;;;;GAaG;AACH,wBAAgB,MAAM,CAAC,EACrB,KAAK,EACL,MAAM,EACN,GAAG,EACH,SAAiB,EACjB,GAAG,EACH,KAAY,EACZ,KAAK,GACN,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;IACnB,6EAA6E;IAC7E,GAAG,CAAC,EAAE,GAAG,CAAA;IACT,mFAAmF;IACnF,KAAK,CAAC,EAAE,OAAO,CAAA;IACf;2EACuE;IACvE,KAAK,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAA;CACpC,GAAG,KAAK,CAAC,SAAS,CAyGlB"}

package/lib/types/components/LogoV2.js

@@ -1,7 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
-import { getLang, t as tr } from '../i18n.js';
+import { getLang, t as tr, tOr } from '../i18n.js';
 import { pickRandomTip } from '../tips.js';
+import { upstreamDriftSummary, UPSTREAM_VALIDATED_VERSION } from '../dsh-adapter/contract.js';
 import { readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -65,7 +66,7 @@ function capitalize(text) {
  * the whale the welcome tagline, centered under the art, in ice
  * blue. Narrow terminals drop the whale and keep the text column.
  */
-export function LogoV2({ model, effort, cwd, skipIntro = false, tip, }) {
+export function LogoV2({ model, effort, cwd, skipIntro = false, tip, whale = true, drift, }) {
     const [step, setStep] = React.useState(skipIntro ? OPENING_SEQUENCE.length : 0);
     const settled = step >= OPENING_SEQUENCE.length;
     // Opening clock: drives the shimmer sweep and big-text highlight only
@@ -89,7 +90,7 @@ export function LogoV2({ model, effort, cwd, skipIntro = false, tip, }) {
     const wordmarkRGB = parseRGB(theme.claude) ?? BRAND;
     const wordmarkShimmerRGB = parseRGB(theme.claudeShimmer) ?? ICE;
     const taglineRGB = parseRGB(theme.claudeBlue_FOR_SYSTEM_SPINNER) ?? ICE;
-    const showWhale = columns >= WHALE_MIN_COLUMNS;
+    const showWhale = whale && columns >= WHALE_MIN_COLUMNS;
     const frameIndex = settled ? STANDARD_FRAME_INDEX : OPENING_SEQUENCE[step].frame;
     // Frozen clock for the settled header: t=0 parks every sweep highlight
     // off-screen, leaving the static gradient behind.
@@ -99,11 +100,19 @@ export function LogoV2({ model, effort, cwd, skipIntro = false, tip, }) {
     // repaint (language switch, terminal resize), or the line would flicker.
     // `tip` is a test seam; production always passes undefined and rolls.
     const [randomTip] = React.useState(() => tip ?? pickRandomTip());
+    // Upstream-drift notice, merged to one line: computed once per mount from
+    // the same memoized contract data the adapter checks (undefined when the
+    // install matches). `drift` is a test seam to pin or suppress it.
+    const [driftLine] = React.useState(() => drift === undefined ? upstreamDriftSummary() : drift);
     // Indent that centers the tagline under the whale art's bounding box.
     const welcomePad = showWhale
         ? Math.max(0, Math.round(WHALE_CENTER - stringWidth(tagline) / 2))
         : 2;
     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: tr('logo-tip-prefix') }), getLang() === 'zh' ? randomTip.zh : randomTip.en, _jsx(Text, { dimColor: true, children: ' · /tips ' + tr('logo-tip-more') })] })] })] }), _jsx(Box, { marginTop: 1, paddingLeft: welcomePad, children: _jsx(Text, { children: sweep(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') }), getLang() === 'zh' ? randomTip.zh : randomTip.en, _jsx(Text, { dimColor: true, children: ' · /tips ' + tr('logo-tip-more') })] }), driftLine != null && (_jsxs(Text, { color: "warning", wrap: "wrap", children: ["\u26A0", ' ', tOr(`logo-drift-${driftLine.kind}`, `The dsh engine (${driftLine.versions.join(' / ')}) does not match the validated ${UPSTREAM_VALIDATED_VERSION}; reinstall via npm i -g @deepseek-ai/dsh@${UPSTREAM_VALIDATED_VERSION}.`, {
+                                        installed: driftLine.versions.join(' / '),
+                                        validated: UPSTREAM_VALIDATED_VERSION,
+                                        primary: UPSTREAM_VALIDATED_VERSION,
+                                    })] }))] })] }), _jsx(Box, { marginTop: 1, paddingLeft: welcomePad, children: _jsx(Text, { children: sweep(tagline, t, taglineRGB, FLASH, 60) }) })] }));
 }

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

@@ -3,7 +3,7 @@ import { type ScrollBoxHandle } from '../ui.js';
 import type { ChatRow } from '../dsh-adapter/channel.js';
 import type { DOMElement } from '../ink/dom.js';
 import type { ToolBackground } from '../tuiDisplayPrefs.js';
-export declare function MessageList({ rows, expanded, expandedRows, selectedId, onToggleRow, model, diffLayout, thinkingFold, toolBackground, showAll, onToggleAll, onLoadOlder, thinkingVisible, registerRowRef, scrollHandle, forceMountRowId, newSinceRowId, onUnseenCount, failureHintRowId, failureHint, }: {
+export declare function MessageList({ rows, expanded, expandedRows, selectedId, onToggleRow, model, diffLayout, thinkingFold, toolBackground, activityFrames, showAll, onToggleAll, onLoadOlder, thinkingVisible, registerRowRef, scrollHandle, forceMountRowId, newSinceRowId, onUnseenCount, failureHintRowId, failureHint, }: {
     rows: readonly ChatRow[];
     expanded: boolean;
     expandedRows: ReadonlySet<number>;
@@ -16,6 +16,9 @@ export declare function MessageList({ rows, expanded, expandedRows, selectedId,
     thinkingFold?: 'preview' | 'full';
     /** Tool-card background treatment from the live channel settings. */
     toolBackground?: ToolBackground;
+    /** Working-activity preset name from the channel; drives the subagent
+     *  card's running glyph so both indicators follow one setting. */
+    activityFrames?: string;
     showAll: boolean;
     onToggleAll: () => void;
     /** Restore folded-away older rows from the session log (CC-style "load
@@ -48,9 +51,10 @@ export declare function MessageList({ rows, expanded, expandedRows, selectedId,
  * welcome line. It scrolls away with the transcript once the conversation
  * fills the viewport (Claude Code shows its ✦ logo in the same slot).
  */
-export declare function LogoHeader({ model, effort, cwd, }: {
+export declare function LogoHeader({ model, effort, cwd, whale, }: {
     model: string;
     effort?: string | undefined;
     cwd: string;
+    whale?: boolean;
 }): React.ReactNode;
 //# sourceMappingURL=MessageList.d.ts.map

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

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

package/lib/types/components/MessageList.js

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

package/lib/types/components/ModelPicker.js

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

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

@@ -49,7 +49,7 @@ export interface PromptInputProps {
  * the input spans multiple lines (history/command selection otherwise); the
  * visible window scrolls to keep the caret row on screen past
  * MAX_VISIBLE_LINES. Enter submits, backspace/delete edit, ←/→ move the
- * cursor, Tab completes the selected command, Ctrl+X opens the draft in the
+ * cursor, Tab completes the selected command, Ctrl+G opens the draft in the
  * external editor ($VISUAL/$EDITOR), Escape clears (or closes the help
  * menu), `?` toggles the help menu. Windows ConPTY pipelines deliver
  * whole lines with the Enter key lost: a trailing CR/LF in the input marks

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

@@ -1 +1 @@
-{"version":3,"file":"PromptInput.d.ts","sourceRoot":"","sources":["../../../src/components/PromptInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAazB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAkDxD;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,IAAI,OAAO,CAAA;IAClB,KAAK,IAAI,IAAI,CAAA;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAA;IAChB,0EAA0E;IAC1E,QAAQ,EAAE,OAAO,CAAA;IACjB,YAAY,IAAI,IAAI,CAAA;IACpB;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACrD,6EAA6E;IAC7E,eAAe,EAAE,OAAO,CAAA;IACxB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,cAAc,CAAC,IAAI,IAAI,CAAA;IACvB,8EAA8E;IAC9E,eAAe,CAAC,IAAI,IAAI,CAAA;IACxB,0EAA0E;IAC1E,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;CACzD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,cAAc,EACd,eAAe,EACf,aAAa,GACd,EAAE,gBAAgB,qBA46BlB"}
+{"version":3,"file":"PromptInput.d.ts","sourceRoot":"","sources":["../../../src/components/PromptInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAazB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAmDxD;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,IAAI,OAAO,CAAA;IAClB,KAAK,IAAI,IAAI,CAAA;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAA;IAChB,0EAA0E;IAC1E,QAAQ,EAAE,OAAO,CAAA;IACjB,YAAY,IAAI,IAAI,CAAA;IACpB;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACrD,6EAA6E;IAC7E,eAAe,EAAE,OAAO,CAAA;IACxB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,cAAc,CAAC,IAAI,IAAI,CAAA;IACvB,8EAA8E;IAC9E,eAAe,CAAC,IAAI,IAAI,CAAA;IACxB,0EAA0E;IAC1E,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;CACzD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,cAAc,EACd,eAAe,EACf,aAAa,GACd,EAAE,gBAAgB,qBAo/BlB"}

package/lib/types/components/PromptInput.js

@@ -12,9 +12,10 @@ import { useDeclaredCursor } from '../ink/hooks/use-declared-cursor.js';
 import { stringWidth } from '../ink/stringWidth.js';
 import { formatClipboardInsert, readClipboard } from '../utils/clipboard.js';
 import { editInExternalEditor } from '../utils/externalEditor.js';
-import { parseCommandName } from '../commands.js';
+import { isHiddenCommandName, parseCommandName } from '../commands.js';
 import { appendHistory } from '../history.js';
 import { mentionAtCaret } from '../utils/mentions.js';
+import { preserveSelection } from '../utils/fileSuggestions.js';
 import { isMod } from '../utils/modifiers.js';
 import { CommandSuggestions } from './CommandSuggestions.js';
 import { FileSuggestions } from './FileSuggestions.js';
@@ -77,7 +78,7 @@ const MAX_VISIBLE_LINES = 5;
  * the input spans multiple lines (history/command selection otherwise); the
  * visible window scrolls to keep the caret row on screen past
  * MAX_VISIBLE_LINES. Enter submits, backspace/delete edit, ←/→ move the
- * cursor, Tab completes the selected command, Ctrl+X opens the draft in the
+ * cursor, Tab completes the selected command, Ctrl+G opens the draft in the
  * external editor ($VISUAL/$EDITOR), Escape clears (or closes the help
  * menu), `?` toggles the help menu. Windows ConPTY pipelines deliver
  * whole lines with the Enter key lost: a trailing CR/LF in the input marks
@@ -140,7 +141,7 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
     const escTimerRef = React.useRef(null);
     /** True while a Ctrl+V clipboard read is in flight (ignore repeat keys). */
     const clipboardBusyRef = React.useRef(false);
-    /** True while the external editor owns the terminal (Ctrl+X round-trip). */
+    /** True while the external editor owns the terminal (Ctrl+G round-trip). */
     const editorBusyRef = React.useRef(false);
     /** Enter dedupe window: cmd pipelines can deliver one Enter as `\r`+`\n`. */
     const lastEnterAtRef = React.useRef(0);
@@ -151,6 +152,11 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
         };
     }, []);
     const { columns, rows: terminalRows } = useTerminalSize();
+    const helpScrollRef = React.useRef(null);
+    // OverlayAbove reserves six terminal rows for the composer/status chrome;
+    // the help block also keeps one row below it. Its own final row is a
+    // persistent navigation hint, leaving the remainder to ScrollBox.
+    const helpViewportHeight = Math.max(3, Math.max(terminalRows - 6, 4) - 1);
     const suggestions = value.startsWith('/') ? channel.commandCompletions(value) : [];
     const overlayOpen = suggestions.length > 0 &&
         !helpOpen &&
@@ -160,29 +166,31 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
     // CARET, so `@` works mid-message (`看看 @src/a.ts 这个`), not only when it
     // is the input's first character. The cwd listing loads when the trigger
     // appears.
-    const [fileList, setFileList] = React.useState([]);
+    const [fileMatches, setFileMatches] = React.useState([]);
     const [fileSelected, setFileSelected] = React.useState(0);
     const mention = mentionAtCaret(value, cursor);
     const atTrigger = mention !== undefined;
+    const fileRequestId = React.useRef(0);
+    const selectedFile = fileMatches[fileSelected];
     React.useEffect(() => {
-        if (atTrigger) {
-            void channel.listFiles().then(setFileList);
-        }
-    }, [atTrigger, channel]);
-    const atRest = (mention?.query ?? '').toLowerCase();
-    // Match the relative path prefix OR the basename (CC's IDE suggestions do
-    // both): `@src/ink` and `@ink` both find `src/ink/Box.js`.
-    const fileMatches = atTrigger
-        ? fileList.filter(file => {
-            const lower = file.toLowerCase();
-            if (lower.startsWith(atRest))
-                return true;
-            if (atRest.includes('/'))
-                return false;
-            const base = lower.split('/').pop() ?? '';
-            return base.startsWith(atRest);
-        })
-        : [];
+        const requestId = ++fileRequestId.current;
+        if (!mention) {
+            setFileMatches([]);
+            setFileSelected(0);
+            return;
+        }
+        const previous = selectedFile;
+        // Deps key on `mention.query` (and trigger on/off) only: cursor movement
+        // within the same token must NOT refetch, and `selectedFile`/`fileSelected`
+        // are read as their render-time values only to seed selection preservation.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        void channel.listFileCandidates(mention.query, { topK: 50 }).then(next => {
+            if (requestId !== fileRequestId.current)
+                return;
+            setFileMatches(next);
+            setFileSelected(preserveSelection(previous, next, fileSelected));
+        });
+    }, [channel, mention?.query, atTrigger]);
     // Esc dismisses the overlay for the token being edited (it reopens once the
     // text changes); it must NOT clear a mid-message input.
     const fileEscRef = React.useRef(-1);
@@ -205,11 +213,12 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
      * directory inserts `@dir/` without a trailing space so completion
      * continues into it; a file completes the token with a space.
      */
-    const acceptFile = (file) => {
+    const acceptFile = (candidate) => {
         if (!mention)
             return;
+        const file = candidate.path;
         const body = /\s/.test(file) ? `@"${file}"` : `@${file}`;
-        const insert = file.endsWith('/') ? body : `${body} `;
+        const insert = candidate.kind === 'directory' ? body : `${body} `;
         const next = value.slice(0, mention.start) + insert + value.slice(mention.end);
         setInput(next, mention.start + insert.length);
         setFileSelected(0);
@@ -317,10 +326,12 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
         channel.notify(t('input-interrupt-immediate'), { timeoutMs: 2500 });
     };
     /**
-     * Execute a slash command (built-in or plugin-registered) when the input
-     * resolves to one: the name parses as the first token so `/plan off`
-     * dispatches `plan` with its argument text, and the merged command list
-     * (locals + registry) decides whether the line is a command at all.
+     * Execute a slash command (built-in, plugin-registered, or hidden) when
+     * the input resolves to one: the name parses as the first token so
+     * `/plan off` dispatches `plan` with its argument text, and the merged
+     * command list (locals + registry) decides whether the line is a command
+     * at all. Hidden commands are recognized even though they are intentionally
+     * absent from the suggestion/help catalogs.
      */
     const tryRunCommand = (text) => {
         if (!text.startsWith('/'))
@@ -328,7 +339,8 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
         const parsed = parseCommandName(text);
         if (parsed === undefined)
             return false;
-        const known = channel.commandList.some(command => command.name === parsed.name);
+        const known = channel.commandList.some(command => command.name === parsed.name)
+            || isHiddenCommandName(parsed.name);
         if (!known)
             return false;
         const handled = onRunCommand(parsed.name, parsed.rawInput);
@@ -451,14 +463,22 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             });
             return;
         }
-        // Ctrl+X / Cmd+X: edit the current draft in $VISUAL/$EDITOR (issue #123,
+        // Help is modal for modified keys and every Enter variant. Ctrl+V above
+        // is the intentional exception: paste closes Help and inserts visibly.
+        // Swallow here before editor/submit/interrupt branches can mutate hidden
+        // composer or working-turn state; plain typing still dismisses Help below.
+        if (helpOpen && !key.escape && (key.ctrl || key.meta || key.super || key.return || input.includes('\n') || input.includes('\r'))) {
+            event.stopImmediatePropagation();
+            return;
+        }
+        // Ctrl+G: edit the current draft in $VISUAL/$EDITOR (issue #123,
         // readline's edit-and-execute-command). The draft is written to a temp
         // file, the terminal is handed to the editor (Ink's alt-screen handoff),
         // and the saved text replaces the input when it differs. The util maps
         // every failure to an outcome, but the catch/finally here is the hard
         // guarantee: a rejected promise must never kill the process, and the
-        // busy flag must always clear or Ctrl+X stays locked forever.
-        if (isMod(key) && input === 'x') {
+        // busy flag must always clear or Ctrl+G stays locked forever.
+        if (key.ctrl && input === 'g') {
             editorBusyRef.current = true;
             void (async () => {
                 try {
@@ -521,10 +541,13 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             }
             if (channel.working && value.trim() !== '') {
                 // CC's immediate-command semantics: /btw is exempt from steering —
-                // the side question never interrupts the running turn. Every other
-                // input keeps the steer behavior so /new /model etc. stay idle-only.
+                // the side question never interrupts the running turn. Hidden
+                // UI-only easter eggs (e.g. /deepseek) are also safe to run while
+                // streaming. Every other input keeps the steer behavior so /new
+                // /model etc. stay idle-only.
                 const parsed = value.startsWith('/') ? parseCommandName(value) : undefined;
-                if (parsed?.name === 'btw' && channel.commandList.some(c => c.name === 'btw')) {
+                if (parsed !== undefined && ((parsed.name === 'btw' && channel.commandList.some(c => c.name === 'btw'))
+                    || isHiddenCommandName(parsed.name))) {
                     tryRunCommand(value);
                     return;
                 }
@@ -583,6 +606,12 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             handleEnter();
             return;
         }
+        // Help is modal over the composer. Backtab must not cycle the session
+        // mode invisibly behind it, and plain Tab has no Help action.
+        if (helpOpen && key.tab) {
+            event.stopImmediatePropagation();
+            return;
+        }
         // Shift+Tab cycles the configured session modes (default: 默认 →
         // 计划模式 → 完全访问; each mode bundles plan/sandbox/approval atoms —
         // see the `modes` config). Must precede the plain-Tab arms — the parser
@@ -609,6 +638,41 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
             queueSend(value);
             return;
         }
+        // Help is a viewport, not prompt history. It deliberately owns every
+        // vertical navigation event while visible; otherwise Up/Down silently
+        // walk the input history and the clipped command rows remain unreachable.
+        if (helpOpen) {
+            const page = Math.max(1, helpViewportHeight - 2);
+            if (key.upArrow || key.wheelUp) {
+                helpScrollRef.current?.scrollBy(key.wheelUp ? -3 : -1);
+                event.stopImmediatePropagation();
+                return;
+            }
+            if (key.downArrow || key.wheelDown) {
+                helpScrollRef.current?.scrollBy(key.wheelDown ? 3 : 1);
+                event.stopImmediatePropagation();
+                return;
+            }
+            if (key.pageUp || key.pageDown) {
+                helpScrollRef.current?.scrollBy(key.pageUp ? -page : page);
+                event.stopImmediatePropagation();
+                return;
+            }
+            if (key.home) {
+                helpScrollRef.current?.scrollTo(0);
+                event.stopImmediatePropagation();
+                return;
+            }
+            if (key.end) {
+                // Use a deliberately oversized absolute target rather than the
+                // sticky-bottom path: compact Help may still be measuring nested
+                // sections in this commit, while ScrollBox's render clamp resolves
+                // the target to the exact current maximum without a follow-up frame.
+                helpScrollRef.current?.scrollTo(Number.MAX_SAFE_INTEGER);
+                event.stopImmediatePropagation();
+                return;
+            }
+        }
         if (key.meta && key.upArrow) {
             // Alt+Up: pull the last pending message back for editing (pi/Codex).
             pullBackLast();
@@ -883,7 +947,7 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
     // 的 style.position，常驻浮层 + 移除普通子节点不会触发 blit 解毒，被
     // 覆盖的转录行会留空（见 Chat.tsx dialogOverlayOpen 注释）。
     const floatersOpen = helpOpen || channel.pending.length > 0 || fileOverlayOpen || overlayOpen;
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [floatersOpen && (_jsxs(OverlayAbove, { maxHeight: Math.max(terminalRows - 6, 4), children: [helpOpen && (_jsx(Box, { marginBottom: 1, children: _jsx(HelpMenu, { commands: channel.commandList }) })), channel.pending.length > 0 && (_jsxs(Box, { flexDirection: "column", paddingLeft: 2, paddingBottom: 1, children: [channel.pending.some(item => item.placement === 'steer') && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["\u26A1 ", t('input-pending-steer-label')] }), channel.pending
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [floatersOpen && (_jsxs(OverlayAbove, { maxHeight: Math.max(terminalRows - 6, 4), children: [helpOpen && (_jsx(Box, { marginBottom: 1, children: _jsx(HelpMenu, { commands: channel.commandList, viewportHeight: helpViewportHeight, viewportWidth: columns, scrollRef: helpScrollRef }) })), !helpOpen && channel.pending.length > 0 && (_jsxs(Box, { flexDirection: "column", paddingLeft: 2, paddingBottom: 1, children: [channel.pending.some(item => item.placement === 'steer') && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["\u26A1 ", t('input-pending-steer-label')] }), channel.pending
                                         .filter(item => item.placement === 'steer')
                                         .map(item => (_jsxs(Text, { dimColor: true, wrap: "truncate", children: ['  ', "\u21B3 ", item.text] }, item.id)))] })), channel.pending.some(item => item.placement === 'followup') && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["\u23F3 ", t('input-pending-queue-label')] }), channel.pending
                                         .filter(item => item.placement === 'followup')

package/lib/types/components/SkillsPicker.js

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

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

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

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

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