@deepseek-harness-tui/dsh-tui 0.11.2 → 0.13.0

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

@@ -2,16 +2,16 @@ 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.
+ * When empty and focused, the caret is an inverse 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,22 @@ 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 恒反显——其它使用方（选择器搜索等）保持不闪。
+     *
+     * 契约（第七版修订）：光标是**压在当前字符身上的反显块**（对那一个字符
+     * 用 inverse；行尾时对反显空格），绝不另起一格、绝不吃掉字符；闪烁是
+     * **纯样式切换**（inverse ↔ 常规——上一版是 inverse ↔ inverse+dim，dim
+     * 相位在部分终端会把反显块里的字形糊到几乎看不见，看起来像"字消失了"），
+     * 不增删任何字符——无头回归读的是视口纯文本，断言不会随相位抖动。
+     */
+    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;AAyD7E;;;;;;;;;;;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;;;;;;;;;OASG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,GAAG,KAAK,CAAC,SAAS,CA2HlB"}

package/lib/types/components/SearchBox.js

@@ -52,23 +52,25 @@ 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.
+ * When empty and focused, the caret is an inverse 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 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;
+    // 空输入的行内光标（第七版重做）：光标压在**占位文本的第一个字符**身上
+    // （对那一个字符 inverse，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 +121,16 @@ 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 });
+            // 第七版重做：光标常在（不再依赖终端焦点事件），压在当前字符身上
+            // （对那一个字符 inverse；行尾时反显空格），闪烁相位只在
+            // inverse ↔ 常规之间切样式——字符常在、文字不位移。
+            content = (_jsxs(_Fragment, { children: [_jsx(Text, { children: win.before }), caretBlink ? _jsx(Text, { inverse: true, children: win.at }) : _jsx(Text, { children: 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
+                            ? _jsx(Text, { inverse: true, children: placeholder.slice(0, 1) })
+                            : placeholder.slice(0, 1), placeholder.slice(1)] })] })) : (_jsxs(Box, { flexDirection: "row", width: "100%", children: [_jsxs(Text, { children: [prefix, " "] }), caretBlink ? _jsx(Text, { inverse: true, children: " " }) : _jsx(Text, { children: " " }), _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/StarPrompt.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import type { StarMilestone } from '../usageStats.js';
+import type { WhaleCouponNotice } from '../dsh-adapter/oauth/bonus.js';
 /** What a star attempt came back with (the modal renders each outcome). */
 export type StarAttempt = {
     readonly kind: 'starred';
@@ -50,4 +51,9 @@ export declare function StarPrompt({ milestone, actions, onClose, initialPhase,
      *  走这条（只演感谢，不再问一次）。 */
     readonly initialPhase?: 'ask' | 'done';
 }): React.ReactNode;
+export declare function WhaleCouponPrompt({ notice, onShown, onClose, }: {
+    readonly notice: WhaleCouponNotice;
+    readonly onShown: (orderId: WhaleCouponNotice['orderId']) => void;
+    readonly onClose: () => void;
+}): React.ReactNode;
 //# sourceMappingURL=StarPrompt.d.ts.map

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;AAWzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAuBrD,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"}
+{"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"}

package/lib/types/components/StarPrompt.js

@@ -6,6 +6,7 @@ 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 { WhaleGirlHappyArt } from './WhaleGirl.js';
 import { useTerminalBackground } from './design-system/ThemeProvider.js';
 import { STANDARD_FRAME_INDEX, WhaleArt } from './Whale.js';
 import { OPENING_SEQUENCES, WHALE_FRAME_INDEX } from './whaleFrames.js';
@@ -151,6 +152,50 @@ export function StarPrompt({ milestone, actions, onClose, initialPhase = 'ask',
                                                 actions.onOpen();
                                             }, children: t('star-modal-open') }), phase === 'failed' && (_jsxs(_Fragment, { children: [_jsx(Box, { height: 1 }), _jsx(Text, { color: "error", wrap: "wrap", children: failure })] })), phase !== 'failed' && (_jsxs(_Fragment, { children: [_jsx(Box, { height: 1 }), _jsx(Divider, { width: textColumns })] })), _jsx(Box, { height: 1 }), _jsx(Text, { dimColor: true, wrap: "wrap", children: _jsx(HintLine, { text: t('star-modal-hint') }) })] }))] })] }) })] }));
 }
+/** The star modal's card and maid art, used only for a confirmed login grant. */
+function couponExpiry(expiresAt) {
+    const date = new Date(expiresAt);
+    if (Number.isNaN(date.getTime()))
+        return null;
+    const parts = new Intl.DateTimeFormat('en-US', {
+        timeZone: 'Asia/Shanghai', month: 'numeric', day: 'numeric',
+        hour: '2-digit', minute: '2-digit', hourCycle: 'h23',
+    }).formatToParts(date);
+    const part = (type) => parts.find(item => item.type === type)?.value;
+    const month = part('month');
+    const day = part('day');
+    const hour = part('hour');
+    const minute = part('minute');
+    return month === undefined || day === undefined || hour === undefined || minute === undefined
+        ? null : { month, day, time: `${hour}:${minute}` };
+}
+export function WhaleCouponPrompt({ notice, onShown, onClose, }) {
+    const lang = React.useSyncExternalStore(subscribeLang, getLang);
+    const { columns, rows } = useTerminalSize();
+    const imagesAvailable = useTerminalImages();
+    const portraits = useMaidPortraits(true);
+    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));
+    const cardColumns = withArt ? 96 : Math.min(columns, textColumns + 6);
+    const cardRows = withArt ? ART_ROWS + 2 : Math.min(rows, 15);
+    const left = Math.max(0, Math.floor((columns - cardColumns) / 2));
+    const bottom = Math.max(0, Math.min(Math.floor((rows - cardRows) / 2), rows - cardRows));
+    const amount = notice.amount.replace(/(\.\d*?)0+$/u, '$1').replace(/\.$/u, '');
+    const unit = lang === 'zh' ? notice.currency === 'CNY' ? '元' : '美元' : notice.currency;
+    const expiry = couponExpiry(notice.expiresAt);
+    React.useEffect(() => {
+        const timer = setTimeout(() => onShown(notice.orderId), 0);
+        return () => { clearTimeout(timer); };
+    }, [notice.orderId, onShown]);
+    useInput((_input, key) => {
+        if (key.return || key.escape)
+            onClose();
+    });
+    return (_jsxs(_Fragment, { children: [_jsx(Box, { position: "absolute", bottom: 0, left: 0, width: "100%", height: rows, flexShrink: 0, backdrop: "dim", onClick: onClose }), _jsx(Box, { position: "absolute", left: left, bottom: bottom, width: cardColumns, height: cardRows, flexDirection: "column", flexShrink: 0, overflow: "hidden", backgroundColor: background, opaque: true, onClick: event => { event.stopImmediatePropagation(); }, children: _jsxs(Box, { flexDirection: "row", gap: 2, alignItems: "center", justifyContent: "center", borderStyle: "round", borderColor: "inactive", paddingX: 2, backgroundColor: background, children: [withArt && (_jsxs(Box, { width: ART_COLUMNS, height: ART_ROWS, flexShrink: 0, flexDirection: "column", alignItems: "center", justifyContent: "center", backgroundColor: background, opaque: true, children: [_jsx(Confetti, { width: ART_COLUMNS }), imagesAvailable && portraits?.happy !== undefined
+                                    ? _jsx(MaidPortrait, { source: portraits.happy, maxColumns: ART_COLUMNS, maxRows: ART_ROWS - CONFETTI_ROWS, presentation: "preview" })
+                                    : _jsx(WhaleGirlHappyArt, { source: portraits?.happy, width: ART_COLUMNS })] })), _jsxs(Box, { flexDirection: "column", width: textColumns, ...(withArt ? { height: ART_ROWS } : {}), children: [_jsx(Text, { color: "accent", bold: true, wrap: "truncate-end", children: t('coupon-modal-title') }), _jsx(Box, { height: 1 }), _jsx(Text, { color: "success", bold: true, wrap: "wrap", children: t('coupon-modal-received', { amount, unit }) }), expiry !== null && (_jsxs(_Fragment, { children: [_jsx(Box, { height: 1 }), _jsx(Text, { wrap: "wrap", children: t('coupon-modal-expiry', expiry) })] })), _jsx(Box, { flexGrow: 1 }), _jsx(Divider, { width: textColumns }), _jsx(Text, { dimColor: true, wrap: "truncate-end", children: _jsx(HintLine, { text: t('coupon-modal-hint') }) })] })] }) })] }));
+}
 /**
  * The card's art column: the raster maid first, the animated pixel whale
  * otherwise. While celebrating it shows the **happy maid** (raster→raster in

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,CAgD/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;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,CAyE/F"}

package/lib/types/components/SubagentCard.js

@@ -1,8 +1,8 @@
 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 } from '../ui.js';
 import { t } from '../i18n.js';
-import { isMinimalMode } from '../minimalMode.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`;
@@ -24,16 +24,31 @@ export function SubagentCard({ subagent, focused, onClick }) {
     // 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 minimal = isMinimalMode();
-    const glyph = running ? (minimal ? '·' : '🟡')
-        : subagent.status === 'unknown' ? (minimal ? '·' : '⚪')
-            : subagent.status === 'failed' || subagent.status === 'cancelled' ? (minimal ? '×' : '🔴')
-                : (minimal ? '✓' : '🟢');
-    const glyphColor = minimal ? undefined
+    const minimalUi = isMinimalUiMode();
+    const glyph = running ? (minimalUi ? '·' : '🟡')
+        : subagent.status === 'unknown' ? (minimalUi ? '·' : '⚪')
+            : subagent.status === 'failed' || subagent.status === 'cancelled' ? (minimalUi ? '×' : '🔴')
+                : (minimalUi ? '✓' : '🟢');
+    const glyphColor = minimalUi ? undefined
         : running ? 'warning'
             : subagent.status === 'unknown' ? 'subtle'
                 : 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}` }), _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}` })] });
+    // 窄宽排版（侧栏 Panel 常态 28~44 列）：meta 按优先级分段降级——
+    // 时长永远在，tools / tokens / model 随宽度依次退出；描述拿剩余预算
+    // truncate-end，绝不在行中间任意折行（38 列面板上描述被拦腰截断、
+    // 统计列挤进第二行的旧渲染就是这么来的）。
+    const { columns } = useTerminalSize();
+    const metaParts = [];
+    if (columns >= 56)
+        metaParts.push(subagent.model ?? subagent.provider ?? 'default');
+    if (elapsed !== undefined)
+        metaParts.push(formatDuration(elapsed));
+    if (columns >= 44)
+        metaParts.push(`${total || '—'} tok`);
+    if (columns >= 34)
+        metaParts.push(`${subagent.toolCalls.length} tools`);
+    const meta = metaParts.join(' · ');
+    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", 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: `${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') }) })), meta !== '' && (_jsx(Box, { flexShrink: 0, marginLeft: 1, children: _jsx(Text, { dimColor: true, wrap: "truncate-end", children: meta }) }))] }), liveLine && _jsx(Text, { dimColor: true, wrap: "truncate", children: `  │ ${liveLine}` })] });
 }

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

@@ -1,10 +1,25 @@
 import React from 'react';
 import type { SubagentState } from '../dsh-adapter/subagents.js';
+import type { SidePanelKeyFlags } from './sidePanel/types.js';
 export interface SubagentDashboardProps {
-    subagents: SubagentState[];
-    onClose: () => void;
+    subagents: readonly SubagentState[];
+    /** 整屏/浮层形态的退出通道（Esc / ✕ 按钮）。panel 形态不传：面板不自己
+     *  关侧栏——Esc 让给宿主（焦点回聊天，见 usePanelInput 契约）。 */
+    onClose?: () => void;
     onSelect?: (agentId: string) => void;
+    /** `panel` 挂在侧栏宿主里（去外层 padding、键盘走 usePanelInput 分发器）；
+     *  default（缺省）与整屏形态逐字节一致。 */
+    variant?: 'default' | 'panel';
+    /** panel 形态：宿主报告焦点/可见性；非 active 时保留状态但收不到键。 */
+    focused?: boolean;
+    visible?: boolean;
 }
+/**
+ * Panel 分发器的 Enter 判定：ink 的 key 对象里这一位叫 `return`，而 v2.1
+ * 的 SidePanelKeyFlags 拼作 `return_`——两个都认，再由共享的 plain-Enter
+ * 守卫拦掉带修饰键的 Enter（那是换行，不是确认）。
+ */
+export declare function isPanelPlainReturn(input: string, key: SidePanelKeyFlags): boolean;
 /** 可点击 ✕ 退出按钮：整屏/浮层场景的鼠标退出通道（Esc 等价）。 */
 export declare function ExitButton({ onClick }: {
     onClick: () => void;
@@ -13,5 +28,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, onClose, onSelect, 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,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,SAAS,aAAa,EAAE,CAAA;IACnC;mDAC+C;IAC/C,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;IACpB,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IACpC;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;;;;GAIG;AACH,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,OAAO,EACP,QAAQ,EACR,OAAmB,EACnB,OAAc,EACd,OAAc,GACf,EAAE,sBAAsB,GAAG,KAAK,CAAC,SAAS,CAmJ1C"}

package/lib/types/components/SubagentDashboard.js

@@ -5,6 +5,20 @@ import { SubagentCard } from './SubagentCard.js';
 import { t } from '../i18n.js';
 import { Divider } from './design-system/Divider.js';
 import { isPlainReturnInput } from '../utils/modifiers.js';
+import { usePanelInput } from './sidePanel/usePanelInput.js';
+/**
+ * Panel 分发器的 Enter 判定：ink 的 key 对象里这一位叫 `return`，而 v2.1
+ * 的 SidePanelKeyFlags 拼作 `return_`——两个都认，再由共享的 plain-Enter
+ * 守卫拦掉带修饰键的 Enter（那是换行，不是确认）。
+ */
+export function isPanelPlainReturn(input, key) {
+    return isPlainReturnInput(input, {
+        return: key.return_ === true || key.return === true,
+        ctrl: key.ctrl,
+        meta: key.meta,
+        shift: key.shift,
+    });
+}
 /** 可点击 ✕ 退出按钮：整屏/浮层场景的鼠标退出通道（Esc 等价）。 */
 export function ExitButton({ onClick }) {
     const [hovered, setHovered] = React.useState(false);
@@ -14,14 +28,17 @@ export function ExitButton({ onClick }) {
  * SubagentDashboard — overlay panel showing all active/recent subagents.
  * Keyboard: up/down to navigate, Enter to view detail, Esc to close.
  */
-export function SubagentDashboard({ subagents, onClose, onSelect }) {
+export function SubagentDashboard({ subagents, onClose, onSelect, variant = 'default', focused = true, visible = true, }) {
+    const panelMode = variant === 'panel';
     const [focusIndex, setFocusIndex] = React.useState(0);
     const scrollRef = React.useRef(null);
     const { rows, columns } = useTerminalSize();
     useInput((input, key, event) => {
+        if (panelMode)
+            return;
         if (key.escape || (key.ctrl && input === 'c')) {
             event.stopImmediatePropagation();
-            onClose();
+            onClose?.();
             return;
         }
         if (key.upArrow) {
@@ -45,14 +62,45 @@ export function SubagentDashboard({ subagents, onClose, onSelect }) {
         }
         // Consume all input while dashboard is open
         event.stopImmediatePropagation();
-    });
+    }, { isActive: !panelMode });
+    // Panel form（v2.1 键盘契约）：业务键先吃，其余让给宿主。Esc/Ctrl+C 返回
+    // false —— 收焦点回聊天是宿主的事（Dashboard 是这一栏的根，没有上一层可
+    // 回），[/]、数字、z、+/- 同样保持可用。
+    const panelKeyHandler = (input, key) => {
+        if (key.escape === true || (key.ctrl === true && input === 'c'))
+            return false;
+        if (key.upArrow === true) {
+            setFocusIndex(i => Math.max(0, i - 1));
+            scrollRef.current?.scrollBy(-3);
+            return true;
+        }
+        if (key.downArrow === true) {
+            setFocusIndex(i => Math.min(subagents.length - 1, i + 1));
+            scrollRef.current?.scrollBy(3);
+            return true;
+        }
+        if (isPanelPlainReturn(input, key)) {
+            const selected = subagents[focusIndex];
+            if (selected !== undefined)
+                onSelect?.(selected.agentId);
+            return true;
+        }
+        return false;
+    };
+    usePanelInput(panelKeyHandler, { active: panelMode && focused && visible });
     const running = subagents.filter(s => s.status === 'running').length;
     const completed = subagents.filter(s => s.status === 'completed').length;
     const failed = subagents.filter(s => s.status === 'failed').length;
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [_jsx(Divider, { color: "accent", title: t('subagent-dashboard-title') }), _jsxs(Box, { flexDirection: "row", gap: 3, marginTop: 1, marginBottom: 1, children: [_jsxs(Text, { children: [_jsx(Text, { color: "accent", children: running }), _jsxs(Text, { dimColor: true, children: [" ", t('subagent-count-running')] })] }), _jsxs(Text, { children: [_jsx(Text, { color: "success", children: completed }), _jsxs(Text, { dimColor: true, children: [" ", t('subagent-count-completed')] })] }), failed > 0 && (_jsxs(Text, { children: [_jsx(Text, { color: "error", children: failed }), _jsxs(Text, { dimColor: true, children: [" ", t('subagent-count-failed')] })] })), _jsx(Box, { flexGrow: 1 }), _jsx(ExitButton, { onClick: onClose })] }), _jsx(Box, { flexDirection: "column", maxHeight: Math.max(10, rows - 10), marginTop: 1, children: _jsx(ScrollBox, { ref: scrollRef, flexDirection: "column", flexGrow: 1, children: subagents.length === 0 ? (_jsxs(Box, { flexDirection: "column", alignItems: "center", marginTop: Math.max(2, Math.floor((rows - 16) / 3)), children: [_jsx(Text, { dimColor: true, children: '○' }), _jsx(Text, { dimColor: true, children: t('subagent-none') }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t('subagent-empty-hint') }) })] })) : (subagents.map((subagent, index) => (_jsxs(Box, { flexDirection: "column", children: [_jsx(SubagentCard, { subagent: subagent, focused: index === focusIndex, onClick: onSelect !== undefined
+    // 外层留白：整屏形态保持原样；侧栏形态只留左右各 1 格（PanelBar 与宿主
+    // 提示行已经承担其余 chrome）。卡片之间的分隔线按 `columns` 算，而
+    // PanelHost 把 TerminalSizeContext 收窄成面板宽度，所以那条公式自动跟随。
+    const outer = panelMode
+        ? { paddingLeft: 1, paddingRight: 1, paddingTop: 0 }
+        : { paddingX: 2, paddingY: 1 };
+    return (_jsxs(Box, { flexDirection: "column", ...outer, children: [_jsx(Divider, { color: "accent", title: t('subagent-dashboard-title') }), _jsxs(Box, { flexDirection: "row", gap: 3, marginTop: 1, marginBottom: 1, children: [_jsxs(Text, { children: [_jsx(Text, { color: "accent", children: running }), _jsxs(Text, { dimColor: true, children: [" ", t('subagent-count-running')] })] }), _jsxs(Text, { children: [_jsx(Text, { color: "success", children: completed }), _jsxs(Text, { dimColor: true, children: [" ", t('subagent-count-completed')] })] }), failed > 0 && (_jsxs(Text, { children: [_jsx(Text, { color: "error", children: failed }), _jsxs(Text, { dimColor: true, children: [" ", t('subagent-count-failed')] })] })), _jsx(Box, { flexGrow: 1 }), !panelMode && onClose !== undefined && _jsx(ExitButton, { onClick: onClose })] }), _jsx(Box, { flexDirection: "column", maxHeight: panelMode ? Math.max(6, rows - 8) : Math.max(10, rows - 10), marginTop: 1, children: _jsx(ScrollBox, { ref: scrollRef, flexDirection: "column", flexGrow: 1, children: subagents.length === 0 ? (_jsxs(Box, { flexDirection: "column", alignItems: "center", marginTop: Math.max(2, Math.floor((rows - 16) / 3)), children: [_jsx(Text, { dimColor: true, children: '○' }), _jsx(Text, { dimColor: true, children: t('subagent-none') }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t('subagent-empty-hint') }) })] })) : (subagents.map((subagent, index) => (_jsxs(Box, { flexDirection: "column", children: [_jsx(SubagentCard, { subagent: subagent, focused: index === focusIndex, onClick: onSelect !== undefined
                                     // Click = view detail, same as Enter on the focused card.
                                     ? () => onSelect(subagent.agentId)
                                     : undefined }), index < subagents.length - 1 && (_jsx(Text, { dimColor: true, children: '─'.repeat(Math.max(20, Math.min(72, columns - 6))) }))] }, subagent.agentId)))) }) }), _jsx(Divider, { color: "subtle", title: "" }), _jsx(Box, { marginTop: 0, children: _jsx(Text, { dimColor: true, children: onSelect
-                        ? t('subagent-dashboard-hint-detail')
+                        ? t(panelMode ? 'subagent-dashboard-hint-panel' : 'subagent-dashboard-hint-detail')
                         : t('subagent-dashboard-hint-basic') }) })] }));
 }

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

@@ -4,6 +4,12 @@ export interface SubagentDetailSceneProps {
     subagent: SubagentState;
     onBack: () => void;
     onInterrupt?: (agentId: string) => void;
+    /** 'panel' 挂在侧栏宿主里（去外层 padding、键盘走 usePanelInput 分发器）；
+     *  default（缺省）与整屏形态逐字节一致。 */
+    variant?: 'default' | 'panel';
+    /** panel 形态：宿主报告焦点/可见性；非 active 时保留状态但收不到键。 */
+    focused?: boolean;
+    visible?: boolean;
 }
 /**
  * SubagentDetailScene — full-screen paged detail view for one subagent.
@@ -12,5 +18,5 @@ export interface SubagentDetailSceneProps {
  * seam only accepts continuable children, and one-shot spawn children are
  * disposed at settlement, so the affordance would be a dead control.
  */
-export declare function SubagentDetailScene({ subagent, onBack, onInterrupt, }: SubagentDetailSceneProps): React.ReactNode;
+export declare function SubagentDetailScene({ subagent, onBack, onInterrupt, variant, focused, visible, }: SubagentDetailSceneProps): React.ReactNode;
 //# sourceMappingURL=SubagentDetailScene.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SubagentDetailScene.d.ts","sourceRoot":"","sources":["../../../src/components/SubagentDetailScene.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAwGhE,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,aAAa,CAAA;IACvB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACxC;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,QAAQ,EACR,MAAM,EACN,WAAW,GACZ,EAAE,wBAAwB,GAAG,KAAK,CAAC,SAAS,CAiN5C"}
+{"version":3,"file":"SubagentDetailScene.d.ts","sourceRoot":"","sources":["../../../src/components/SubagentDetailScene.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAuJpF,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,aAAa,CAAA;IACvB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IACvC;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;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,QAAQ,EACR,MAAM,EACN,WAAW,EACX,OAAmB,EACnB,OAAc,EACd,OAAc,GACf,EAAE,wBAAwB,GAAG,KAAK,CAAC,SAAS,CA8V5C"}