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

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

@@ -0,0 +1,19 @@
+import React from 'react';
+import type { Tokens } from 'marked';
+import type { CliHighlight } from '../terminal-utils/cliHighlight.js';
+/**
+ * Which frame engine renders code fences. `typed` is the default;
+ * `DSH_TUI_CODE_FRAME=hybrid` selects the component layout.
+ */
+export declare function codeFrameEngine(): 'typed' | 'hybrid';
+type Props = {
+    token: Tokens.Code;
+    highlight: CliHighlight | null;
+    /** Dim the body (thinking blocks); decorations stay theme-muted. */
+    dimColor?: boolean;
+    /** Override terminal width (useful for testing). */
+    forceWidth?: number;
+};
+export declare function CodeBlockFrame({ token, highlight, dimColor, forceWidth }: Props): React.ReactNode;
+export {};
+//# sourceMappingURL=CodeBlockFrame.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"CodeBlockFrame.d.ts","sourceRoot":"","sources":["../../../src/components/CodeBlockFrame.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AASpC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAqCrE;;;GAGG;AACH,wBAAgB,eAAe,IAAI,OAAO,GAAG,QAAQ,CAEpD;AAED,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC,IAAI,CAAA;IAClB,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;IAC9B,oEAAoE;IACpE,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,oDAAoD;IACpD,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,wBAAgB,cAAc,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,QAAgB,EAAE,UAAU,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CAwFzG"}

package/lib/types/components/CodeBlockFrame.js

@@ -0,0 +1,138 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
+import { Box, NoSelect, Text } from '../ui.js';
+import { useTerminalSize } from '../ink/hooks/use-terminal-size.js';
+import { colorize } from '../ink/colorize.js';
+import { getTheme } from '../theme.js';
+import { useTheme } from './design-system/ThemeProvider.js';
+import { codeLanguageTag, formatCodeBody, formatToken } from '../terminal-utils/markdown.js';
+import { getCodeFrameStyle, subscribeCodeFrameStyle } from '../tuiDisplayPrefs.js';
+/**
+ * A fenced code block rendered as a light frame:
+ *
+ *     ┌─ ts ─────────────────
+ *     │   const answer = await agent.run()
+ *     │   return answer
+ *
+ * The top edge carries only the corner, the language label and a subtle
+ * divider; every body row gets the rail and one column of padding. No
+ * right wall or bottom edge, so a block costs no extra rows.
+ *
+ * Two engines draw the same frame:
+ *
+ * - typed (default): one ink-text leaf. The header row and the per-row
+ *   rail are Text decoration, so a block adds no Yoga nodes and streams
+ *   like a plain ANSI string.
+ * - hybrid (DSH_TUI_CODE_FRAME=hybrid): header and rail as NoSelect boxes
+ *   around the body Text (~7 Yoga nodes per block). Kept as a fallback
+ *   that can be switched on without a code change.
+ *
+ * Header and rail are excluded from selection, the body is selectable.
+ * Below a net body width of 8 the block falls back to the plain ANSI
+ * fence, where a frame would only squeeze the code.
+ */
+/** Same viewport slack MarkdownTable/MermaidDiagram keep for gutters and
+ *  message insets: the content column is the terminal width minus this. */
+const SAFETY_MARGIN = 4;
+/** Content column width that earns the full-width dash header. */
+const WIDE_HEADER_MIN_COLUMNS = 56;
+/** Below this NET body width the frame falls back to the ANSI fence. */
+const MIN_NET_BODY_WIDTH = 8;
+/** Rail column + the single padding column. */
+const FRAME_OVERHEAD = 2;
+/**
+ * Which frame engine renders code fences. `typed` is the default;
+ * `DSH_TUI_CODE_FRAME=hybrid` selects the component layout.
+ */
+export function codeFrameEngine() {
+    return process.env.DSH_TUI_CODE_FRAME === 'hybrid' ? 'hybrid' : 'typed';
+}
+export function CodeBlockFrame({ token, highlight, dimColor = false, forceWidth }) {
+    const { columns } = useTerminalSize();
+    // Live setting (settings `dsh-tui.codeFrameStyle`): read at render
+    // time so settled blocks re-render when the style flips; the store
+    // mirrors both the /settings edit and cordis.yml.
+    const frameStyle = React.useSyncExternalStore(subscribeCodeFrameStyle, getCodeFrameStyle);
+    const [themeName] = useTheme();
+    const theme = getTheme(themeName);
+    // Theme values are raw color strings; the ink-level border props take the
+    // Color type directly (NoSelect is not theme-aware like ThemedBox).
+    const subtle = theme.subtle;
+    const width = Math.max(0, forceWidth ?? columns);
+    const contentWidth = width - SAFETY_MARGIN;
+    const label = codeLanguageTag(token) || 'code';
+    const body = formatCodeBody(token, highlight);
+    // The narrow fallback and the hybrid engine return early, so these
+    // memos run before every branch.
+    const headerText = React.useMemo(() => {
+        // The wide frame keeps one space before the divider run; the narrow
+        // label stays tight (`┌─ ts`), matching the hybrid header's noSelect
+        // columns.
+        const wide = contentWidth >= WIDE_HEADER_MIN_COLUMNS;
+        return colorize('┌─ ' + label + (wide ? ' ' : ''), theme.subtle, 'foreground');
+    }, [label, theme.subtle, contentWidth]);
+    const headerFill = React.useMemo(() => {
+        if (contentWidth < WIDE_HEADER_MIN_COLUMNS)
+            return undefined;
+        return colorize('─', theme.subtle, 'foreground');
+    }, [theme.subtle, contentWidth]);
+    // Keyed on emptiness, not the body: a streaming fence keeps one
+    // decoration object while its text grows.
+    const emptyBody = body === '';
+    const decoration = React.useMemo(() => {
+        if (emptyBody) {
+            // An empty fence shows just the header row.
+            return { header: headerText, headerFill };
+        }
+        return {
+            header: headerText,
+            headerFill,
+            prefix: {
+                // The rail is excluded from selection; the padding column is not.
+                text: colorize('│', theme.subtle, 'foreground') + ' ',
+                width: FRAME_OVERHEAD,
+                noSelect: 1,
+            },
+        };
+    }, [headerText, headerFill, emptyBody, theme.subtle]);
+    if (contentWidth - FRAME_OVERHEAD < MIN_NET_BODY_WIDTH) {
+        // Too narrow to frame: the plain ANSI fence.
+        return _jsx(Text, { dimColor: dimColor, children: formatToken(token, 0, null, null, highlight).trimEnd() });
+    }
+    if (frameStyle === 'full') {
+        // The closed form is structural by nature (the right wall must
+        // follow the content column and stay continuous across wrapped
+        // rows), so it rides the hybrid layout with the wall and bottom
+        // edge added - regardless of the typed/hybrid engine switch.
+        return (_jsx(CodeBlockFrameFull, { contentWidth: contentWidth, label: label, body: body, subtle: subtle, themeSubtle: theme.subtle, dimColor: dimColor }));
+    }
+    if (codeFrameEngine() === 'hybrid') {
+        return (_jsx(CodeBlockFrameHybrid, { contentWidth: contentWidth, label: label, body: body, subtle: subtle, themeSubtle: theme.subtle, dimColor: dimColor }));
+    }
+    // Typed engine: one ink-text leaf whose paint carries the frame.
+    return (_jsx(Text, { dimColor: dimColor, decoration: decoration, children: body }));
+}
+/**
+ * The `full` style: the hybrid layout with the box closed - a right wall
+ * (a layout border, so it stays continuous across wrapped rows and
+ * follows the content column) and a bottom edge under the whole block.
+ * Header/rail/wall/bottom stay NoSelect; the body (and its padding
+ * column) stay selectable - the same copy contract as the light frame.
+ */
+function CodeBlockFrameFull({ contentWidth, label, body, subtle, themeSubtle, dimColor, }) {
+    return (_jsxs(Box, { flexDirection: "column", width: "100%", children: [_jsx(NoSelect, { borderStyle: "single", borderTop: true, borderLeft: true, borderRight: true, borderBottom: false, borderColor: subtle, borderText: {
+                    content: colorize(' ' + label + ' ', themeSubtle, 'foreground'),
+                    position: 'top',
+                    align: 'start',
+                    offset: 1,
+                } }), _jsxs(Box, { flexDirection: "row", children: [_jsx(NoSelect, { borderStyle: "single", borderLeft: true, borderTop: false, borderRight: false, borderBottom: false, borderColor: subtle }), _jsx(Box, { paddingLeft: 1, flexGrow: 1, children: _jsx(Text, { dimColor: dimColor, children: body }) }), _jsx(NoSelect, { borderStyle: "single", borderRight: true, borderTop: false, borderLeft: false, borderBottom: false, borderColor: subtle })] }), _jsx(NoSelect, { borderStyle: "single", borderLeft: true, borderRight: true, borderBottom: true, borderTop: false, borderColor: subtle })] }));
+}
+/** The component layout behind DSH_TUI_CODE_FRAME=hybrid. */
+function CodeBlockFrameHybrid({ contentWidth, label, body, subtle, themeSubtle, dimColor, }) {
+    return (_jsxs(Box, { flexDirection: "column", width: "100%", children: [contentWidth >= WIDE_HEADER_MIN_COLUMNS ? (_jsx(NoSelect, { borderStyle: "single", borderTop: true, borderLeft: true, borderRight: false, borderBottom: false, borderColor: subtle, borderText: {
+                    content: colorize(' ' + label + ' ', themeSubtle, 'foreground'),
+                    position: 'top',
+                    align: 'start',
+                    offset: 1,
+                } })) : (_jsx(NoSelect, { children: _jsx(Text, { color: "subtle", children: '┌─ ' + label }) })), _jsxs(Box, { flexDirection: "row", children: [_jsx(NoSelect, { borderStyle: "single", borderLeft: true, borderTop: false, borderRight: false, borderBottom: false, borderColor: subtle }), _jsx(Box, { paddingLeft: 1, children: _jsx(Text, { dimColor: dimColor, children: body }) })] })] }));
+}

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

@@ -9,14 +9,21 @@ import type { LocalCommand } from '../commands.js';
  *   ╭─ 命令 · 共 12 项 ──────────────────────╮
  *   │ ❯ compact  Summarize earlier turns…  │   ← 选中：❯ + 加粗 + suggestion 色
  *   │   compare  Compare selected messages … │   ← 名字里命中输入的段提亮
+ *   │   new      Start a new conversation   │   ← 灰区整行 subtle，不提亮命中
  *   │ ↑2 · ↓3                                 │   ← 仅当列表被窗口裁剪
  *   ╰─────────────────────────────────────────╯
  *
  * 未选中行整体 dim，唯独名字里匹配当前查询 token 的前缀以正常亮度提亮
  * （bold 与 dim 在终端互斥，故提亮用非 dim 而非加粗）；选中行整行
  * suggestion 色、名字加粗、前置 ❯ 指针。
+ *
+ * issue #1072：回合运行中（`holdFrom` 有值）命令按「对当前对话的影响」分区——
+ * 不影响对话的留在上方用原样式，会被门禁拦下 / 会打断或替换对话 / 会 steer 的
+ * 沉底为灰区（主题 `subtle`，不做命中提亮，但仍可选中执行，该门禁的门禁、
+ * 该 steer 的 steer）。分区只是稳定重排：命令索引空间（`selectedIndex` /
+ * `onPick`）与窗口数学都不变，灰区只靠颜色区分，不额外占显示行。
  */
-export declare function CommandSuggestions({ commands, selectedIndex, columns, query, accent, onPick, onWheelStep, }: {
+export declare function CommandSuggestions({ commands, selectedIndex, columns, query, accent, holdFrom, onPick, onWheelStep, }: {
     commands: readonly (LocalCommand & {
         descriptionKey?: string;
     })[];
@@ -25,6 +32,8 @@ export declare function CommandSuggestions({ commands, selectedIndex, columns, q
     /** 原始 `/…` 输入；其最后一段 token 用于名字前缀高亮。 */
     query?: string;
     accent?: keyof Theme | Color;
+    /** 索引 ≥ 该值的条目属于「影响当前对话」灰区；undefined = 全部正常区。 */
+    holdFrom?: number;
     /** 鼠标点击行（fullscreen）：上报过滤后列表的绝对索引（与键盘
      *  selectedIndex 同一索引空间），接受路径由 PromptInput 复用。 */
     onPick?: (index: number) => void;

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

@@ -1 +1 @@
-{"version":3,"file":"CommandSuggestions.d.ts","sourceRoot":"","sources":["../../../src/components/CommandSuggestions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAMlD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,aAAa,EACb,OAAO,EACP,KAAU,EACV,MAAM,EACN,MAAM,EACN,WAAW,GACZ,EAAE;IACD,QAAQ,EAAE,SAAS,CAAC,YAAY,GAAG;QAAE,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAA;IACjE,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,uCAAuC;IACvC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAC5B;sDACkD;IAClD,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAChC,iCAAiC;IACjC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,CAAA;CACrC,GAAG,KAAK,CAAC,SAAS,CAmFlB"}
+{"version":3,"file":"CommandSuggestions.d.ts","sourceRoot":"","sources":["../../../src/components/CommandSuggestions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAMlD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,aAAa,EACb,OAAO,EACP,KAAU,EACV,MAAM,EACN,QAAQ,EACR,MAAM,EACN,WAAW,GACZ,EAAE;IACD,QAAQ,EAAE,SAAS,CAAC,YAAY,GAAG;QAAE,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAA;IACjE,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,uCAAuC;IACvC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAC5B,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;sDACkD;IAClD,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAChC,iCAAiC;IACjC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,CAAA;CACrC,GAAG,KAAK,CAAC,SAAS,CAkGlB"}

package/lib/types/components/CommandSuggestions.js

@@ -13,14 +13,21 @@ import { SuggestionCard, cardContentWidth, splitQueryMatch } from './SuggestionC
  *   ╭─ 命令 · 共 12 项 ──────────────────────╮
  *   │ ❯ compact  Summarize earlier turns…  │   ← 选中：❯ + 加粗 + suggestion 色
  *   │   compare  Compare selected messages … │   ← 名字里命中输入的段提亮
+ *   │   new      Start a new conversation   │   ← 灰区整行 subtle，不提亮命中
  *   │ ↑2 · ↓3                                 │   ← 仅当列表被窗口裁剪
  *   ╰─────────────────────────────────────────╯
  *
  * 未选中行整体 dim，唯独名字里匹配当前查询 token 的前缀以正常亮度提亮
  * （bold 与 dim 在终端互斥，故提亮用非 dim 而非加粗）；选中行整行
  * suggestion 色、名字加粗、前置 ❯ 指针。
+ *
+ * issue #1072：回合运行中（`holdFrom` 有值）命令按「对当前对话的影响」分区——
+ * 不影响对话的留在上方用原样式，会被门禁拦下 / 会打断或替换对话 / 会 steer 的
+ * 沉底为灰区（主题 `subtle`，不做命中提亮，但仍可选中执行，该门禁的门禁、
+ * 该 steer 的 steer）。分区只是稳定重排：命令索引空间（`selectedIndex` /
+ * `onPick`）与窗口数学都不变，灰区只靠颜色区分，不额外占显示行。
  */
-export function CommandSuggestions({ commands, selectedIndex, columns, query = '', accent, onPick, onWheelStep, }) {
+export function CommandSuggestions({ commands, selectedIndex, columns, query = '', accent, holdFrom, onPick, onWheelStep, }) {
     if (commands.length === 0)
         return null;
     // Cap the command name column at 40% of the card's content width to ensure
@@ -28,6 +35,9 @@ export function CommandSuggestions({ commands, selectedIndex, columns, query = '
     const usable = cardContentWidth(columns);
     const maxNameWidth = Math.floor(usable * 0.4);
     const nameWidth = Math.min(Math.max(...commands.map(c => stringWidth(c.name))) + 5, maxNameWidth);
+    const holdStart = holdFrom === undefined || holdFrom >= commands.length
+        ? commands.length
+        : Math.max(0, holdFrom);
     const maxVisible = 5;
     const startIndex = Math.max(0, Math.min(selectedIndex - Math.floor(maxVisible / 2), commands.length - maxVisible));
     const visible = commands.slice(startIndex, startIndex + maxVisible);
@@ -44,8 +54,10 @@ export function CommandSuggestions({ commands, selectedIndex, columns, query = '
             .filter((part) => part !== null)
             .join(' · ')
         : null;
-    return (_jsx(SuggestionCard, { title: title, columns: columns, accent: accent, footer: footer, onRowPick: onPick ? index => onPick(startIndex + index) : undefined, onWheelStep: onWheelStep, rows: visible.map(command => {
+    return (_jsx(SuggestionCard, { title: title, columns: columns, accent: accent, footer: footer, onRowPick: onPick ? index => onPick(startIndex + index) : undefined, onWheelStep: onWheelStep, rows: visible.map((command, offset) => {
+            const commandIndex = startIndex + offset;
             const isSelected = command.name === commands[selectedIndex]?.name;
+            const isHeld = commandIndex >= holdStart;
             const tagText = command.tag ? `[${command.tag}] ` : '';
             const tagWidth = stringWidth(tagText);
             // 行预算：内容宽 − 前导空格 1 − 指针列 2。
@@ -54,8 +66,13 @@ export function CommandSuggestions({ commands, selectedIndex, columns, query = '
             const description = stringWidth(rawDescription) > descriptionWidth
                 ? truncateToWidth(rawDescription, descriptionWidth - 1) + '…'
                 : rawDescription;
-            const parts = splitQueryMatch(command.name, queryToken);
             const padAfter = Math.max(0, nameWidth - stringWidth(command.name));
+            // 灰区整行一个 `subtle`，且刻意不做查询命中提亮（灰区不该看起来像
+            // 「可用」）。选中行仍走下方通用样式，保证光标始终可见。
+            if (isHeld && !isSelected) {
+                return (_jsx(Text, { color: "subtle", wrap: "truncate", children: `  ${command.name}${' '.repeat(padAfter)}${tagText}${description}` }, command.name));
+            }
+            const parts = isHeld ? null : splitQueryMatch(command.name, queryToken);
             return (_jsxs(Text, { wrap: "truncate", children: [' ', isSelected ? (_jsx(Text, { color: "suggestion", bold: true, children: `${POINTER} ${command.name}${' '.repeat(padAfter)}` })) : parts ? (_jsxs(_Fragment, { children: [_jsx(Text, { dimColor: true, children: `  ${parts.before}` }), _jsx(Text, { children: parts.match }), _jsx(Text, { dimColor: true, children: `${parts.after}${' '.repeat(padAfter)}` })] })) : (_jsx(Text, { dimColor: true, children: `  ${command.name}${' '.repeat(padAfter)}` })), tagText ? _jsx(Text, { dimColor: true, children: tagText }) : null, _jsx(Text, { color: isSelected ? 'suggestion' : undefined, dimColor: !isSelected, children: description })] }, command.name));
         }) }));
 }

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

@@ -21,9 +21,9 @@ import { type ContextSegments } from '../screens/StatusMetrics.js';
  * can react to the pointer, not to restyle it.
  */
 export declare function ContextBarView({ segments, usedTokens, contextWindow, width, colors, onHover, }: {
-    /** Used tokens per content type. */
+    /** Local token estimates per content type, dividing the filled portion only. */
     segments: ContextSegments;
-    /** Total used tokens, driving the usage readout. */
+    /** Measured occupancy, driving both fill length and readout. */
     usedTokens: number;
     /** The context window size in tokens. */
     contextWindow: number;

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

@@ -1 +1 @@
-{"version":3,"file":"ContextBarView.d.ts","sourceRoot":"","sources":["../../../src/components/ContextBarView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAQL,KAAK,eAAe,EACrB,MAAM,6BAA6B,CAAA;AAEpC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,UAAU,EACV,aAAa,EACb,KAAK,EACL,MAAM,EACN,OAAO,GACR,EAAE;IACD,oCAAoC;IACpC,QAAQ,EAAE,eAAe,CAAA;IACzB,oDAAoD;IACpD,UAAU,EAAE,MAAM,CAAA;IAClB,yCAAyC;IACzC,aAAa,EAAE,MAAM,CAAA;IACrB,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAA;IACb,yEAAyE;IACzE,MAAM,CAAC,EAAE;QAAE,QAAQ,EAAE,KAAK,CAAC;QAAC,QAAQ,EAAE,KAAK,CAAA;KAAE,CAAA;IAC7C;+EAC2E;IAC3E,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CACrC,GAAG,KAAK,CAAC,SAAS,CA2DlB"}
+{"version":3,"file":"ContextBarView.d.ts","sourceRoot":"","sources":["../../../src/components/ContextBarView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,EAWL,KAAK,eAAe,EACrB,MAAM,6BAA6B,CAAA;AAEpC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,UAAU,EACV,aAAa,EACb,KAAK,EACL,MAAM,EACN,OAAO,GACR,EAAE;IACD,gFAAgF;IAChF,QAAQ,EAAE,eAAe,CAAA;IACzB,gEAAgE;IAChE,UAAU,EAAE,MAAM,CAAA;IAClB,yCAAyC;IACzC,aAAa,EAAE,MAAM,CAAA;IACrB,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAA;IACb,yEAAyE;IACzE,MAAM,CAAC,EAAE;QAAE,QAAQ,EAAE,KAAK,CAAC;QAAC,QAAQ,EAAE,KAAK,CAAA;KAAE,CAAA;IAC7C;+EAC2E;IAC3E,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CACrC,GAAG,KAAK,CAAC,SAAS,CA6ElB"}

package/lib/types/components/ContextBarView.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Box, Text } from '../ui.js';
-import { FREE_SEGMENT_FILL, FREE_SEGMENT_TEXT, USED_SEGMENTS, allocateBarColumns, contextBarReadout, contextPressureStep, rightAlignBarText, } from '../screens/StatusMetrics.js';
+import { Box, Text, useTheme } from '../ui.js';
+import { getTheme } from '../theme.js';
+import { FREE_SEGMENT_FILL, FREE_SEGMENT_TEXT, USED_SEGMENTS, usedSegmentColor, contextBarColumns, contextBarReadout, contextBarSegmentColors, contextBarUsedColor, contextPressureStep, rightAlignBarText, } from '../screens/StatusMetrics.js';
 /**
  * The hoverable JSX twin of `renderContextBar`: the same segmented context
  * bar (same largest-remainder column split, same free-segment readout),
@@ -21,11 +22,14 @@ import { FREE_SEGMENT_FILL, FREE_SEGMENT_TEXT, USED_SEGMENTS, allocateBarColumns
  * can react to the pointer, not to restyle it.
  */
 export function ContextBarView({ segments, usedTokens, contextWindow, width, colors, onHover, }) {
+    // The five used fills come from the palette (contextBar* keys); only the free
+    // segment still takes an override, since its shading is a light/dark call the
+    // call site already made.
+    const [themeName] = useTheme();
     if (width <= 0 || contextWindow <= 0)
         return null;
-    const freeTokens = Math.max(0, contextWindow - usedTokens);
-    const values = [...USED_SEGMENTS.map(segment => segments[segment.key]), freeTokens];
-    const columns = allocateBarColumns(values, width);
+    const segmentColors = contextBarSegmentColors(getTheme(themeName));
+    const columns = contextBarColumns(segments, usedTokens, contextWindow, width);
     // The readout is the bar's only text, and its one pressure signal: amber
     // from 80% occupancy, red from 95% (the footer's shared thresholds). The
     // theme key wins over the free-text color, which stays for comfortable
@@ -34,15 +38,21 @@ export function ContextBarView({ segments, usedTokens, contextWindow, width, col
     const pressure = contextPressureStep((usedTokens / contextWindow) * 100);
     const nodes = [];
     for (const [index, segment] of USED_SEGMENTS.entries()) {
-        const segmentWidth = columns[index] ?? 0;
+        const segmentWidth = columns.used[index] ?? 0;
         if (segmentWidth <= 0)
             continue;
         // Childless on purpose: the renderer fills a node's own rect with its
         // backgroundColor, so the segment is a pure colored block (render-node-to-
         // output's ownBackgroundColor fill).
-        nodes.push(_jsx(Box, { width: segmentWidth, height: 1, flexShrink: 0, backgroundColor: segment.color }, segment.key));
+        nodes.push(_jsx(Box, { width: segmentWidth, height: 1, flexShrink: 0, backgroundColor: usedSegmentColor({
+                key: segment.key,
+                color: segmentColors[index] ?? segment.fallback,
+            }) }, segment.key));
     }
-    const freeWidth = columns[USED_SEGMENTS.length] ?? 0;
+    if (columns.unclassified > 0) {
+        nodes.push(_jsx(Box, { width: columns.unclassified, height: 1, flexShrink: 0, backgroundColor: contextBarUsedColor(segmentColors) }, "used"));
+    }
+    const freeWidth = columns.free;
     if (freeWidth > 0) {
         nodes.push(_jsx(Box, { width: freeWidth, height: 1, flexShrink: 0, backgroundColor: colors?.freeFill ?? FREE_SEGMENT_FILL, children: _jsx(Text, { color: pressure ?? colors?.freeText ?? FREE_SEGMENT_TEXT, wrap: "truncate", children: rightAlignBarText(readout, freeWidth) }) }, "free"));
     }

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

@@ -2,7 +2,7 @@
  * EffortChargeGlyph — 输入提示前缀 `❯ ` 的最高档强调与充能。
  *
  * 思考强度处于当前路线最高档期间，前缀换为点火强调色（加粗，与点焰波
- * 共用 hues[0]——同一瞬间前缀与波是同一种橙）；切到最高档的瞬间做一次
+ * 共用主题 ignition——同一瞬间前缀与波同色）；切到最高档的瞬间做一次
  * 150ms「充能」渐变（accentRamp 的暗端 → 全值）。冷启动已在最高档时
  * 不充能（充能只属于切换瞬间），离开最高档恢复原样的 dim 行为。
  *

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

@@ -1 +1 @@
-{"version":3,"file":"EffortChargeGlyph.d.ts","sourceRoot":"","sources":["../../../src/components/EffortChargeGlyph.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAsD,MAAM,OAAO,CAAA;AAW1E,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,MAAM,EACN,OAAO,GACR,EAAE;IACD,sCAAsC;IACtC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,4BAA4B;IAC5B,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;IACrC,0BAA0B;IAC1B,OAAO,EAAE,OAAO,CAAA;CACjB,GAAG,KAAK,CAAC,SAAS,CAuDlB"}
+{"version":3,"file":"EffortChargeGlyph.d.ts","sourceRoot":"","sources":["../../../src/components/EffortChargeGlyph.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAsD,MAAM,OAAO,CAAA;AAU1E,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,MAAM,EACN,OAAO,GACR,EAAE;IACD,sCAAsC;IACtC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,4BAA4B;IAC5B,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;IACrC,0BAA0B;IAC1B,OAAO,EAAE,OAAO,CAAA;CACjB,GAAG,KAAK,CAAC,SAAS,CAuDlB"}

package/lib/types/components/EffortChargeGlyph.js

@@ -3,7 +3,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * EffortChargeGlyph — 输入提示前缀 `❯ ` 的最高档强调与充能。
  *
  * 思考强度处于当前路线最高档期间，前缀换为点火强调色（加粗，与点焰波
- * 共用 hues[0]——同一瞬间前缀与波是同一种橙）；切到最高档的瞬间做一次
+ * 共用主题 ignition——同一瞬间前缀与波同色）；切到最高档的瞬间做一次
  * 150ms「充能」渐变（accentRamp 的暗端 → 全值）。冷启动已在最高档时
  * 不充能（充能只属于切换瞬间），离开最高档恢复原样的 dim 行为。
  *
@@ -18,10 +18,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useContext, useEffect, useReducer, useState } from 'react';
 import { Text, useTheme } from '../ui.js';
 import { ClockContext } from '../ink/components/ClockContext.js';
-import { accentRamp } from '../trajectory/effortIgnition.js';
+import { accentRamp, ignitionColors } from '../trajectory/effortIgnition.js';
 import { rgbString } from '../trajectory/motion.js';
 import { interpolateColor } from './Spinner/spinnerUtils.js';
-import { isLightThemeActive } from '../theme.js';
 /** 充能时长（ms）。 */
 const CHARGE_MS = 150;
 export function EffortChargeGlyph({ effort, levels, working, }) {
@@ -57,7 +56,7 @@ export function EffortChargeGlyph({ effort, levels, working, }) {
     }, [charging, clock]);
     if (!topActive)
         return _jsx(Text, { dimColor: working, children: "\u276F " });
-    const ramp = accentRamp(isLightThemeActive(themeName));
+    const ramp = accentRamp(ignitionColors(themeName));
     if (!charging) {
         // Steady state re-derives on every render (two allocations + one blend
         // per keystroke — negligible) instead of caching: a cached colour would

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

@@ -31,13 +31,12 @@ export interface InputBorderLabel {
     /** Chip foreground (theme token or raw color). */
     ink: keyof Theme | Color;
 }
-export declare function EffortInputBorder({ effort, levels, columns, onLight, idleColor, topRightLabel, children, }: {
+export declare function EffortInputBorder({ effort, levels, columns, idleColor, topRightLabel, children, }: {
     /** 当前思考强度档 id；`undefined` 表示路线未声明。 */
     effort: string | undefined;
     /** 当前路线的档位表（低→高，末位为最高档）；未知时传 `undefined`。 */
     levels: readonly string[] | undefined;
     columns: number;
-    onLight: boolean;
     /** 静止边框色（主题 token 名，如 'promptBorder' / 'planMode'）。 */
     idleColor: keyof Theme | Color;
     /** 顶边框右侧的静态标签 chip（会话名标签）；undefined = 不显示。 */

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

@@ -1 +1 @@
-{"version":3,"file":"EffortInputBorder.d.ts","sourceRoot":"","sources":["../../../src/components/EffortInputBorder.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAA8D,MAAM,OAAO,CAAA;AAGlF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAKxC,sEAAsE;AACtE,MAAM,WAAW,gBAAgB;IAC/B,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAA;IACZ,kDAAkD;IAClD,KAAK,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAC1B,kDAAkD;IAClD,GAAG,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;CACzB;AAiDD,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,MAAM,EACN,OAAO,EACP,OAAO,EACP,SAAS,EACT,aAAa,EACb,QAAQ,GACT,EAAE;IACD,sCAAsC;IACtC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,6CAA6C;IAC7C,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,uDAAuD;IACvD,SAAS,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAC9B,8CAA8C;IAC9C,aAAa,CAAC,EAAE,gBAAgB,CAAA;IAChC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B,GAAG,KAAK,CAAC,SAAS,CA0DlB"}
+{"version":3,"file":"EffortInputBorder.d.ts","sourceRoot":"","sources":["../../../src/components/EffortInputBorder.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAA8D,MAAM,OAAO,CAAA;AAGlF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAKxC,sEAAsE;AACtE,MAAM,WAAW,gBAAgB;IAC/B,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAA;IACZ,kDAAkD;IAClD,KAAK,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAC1B,kDAAkD;IAClD,GAAG,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;CACzB;AAiDD,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,MAAM,EACN,OAAO,EACP,SAAS,EACT,aAAa,EACb,QAAQ,GACT,EAAE;IACD,sCAAsC;IACtC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,6CAA6C;IAC7C,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,MAAM,CAAA;IACf,uDAAuD;IACvD,SAAS,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAC9B,8CAA8C;IAC9C,aAAa,CAAC,EAAE,gBAAgB,CAAA;IAChC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B,GAAG,KAAK,CAAC,SAAS,CA6DlB"}

package/lib/types/components/EffortInputBorder.js

@@ -21,10 +21,10 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * 窗口订阅（keepAlive），播完回到零开销静止边框。
  */
 import { useContext, useEffect, useReducer, useState } from 'react';
-import { Box, Text } from '../ui.js';
+import { Box, Text, useTheme } from '../ui.js';
 import { ClockContext } from '../ink/components/ClockContext.js';
 import { stringWidth } from '../ink/stringWidth.js';
-import { IGNITION_TIMELINE, ignitionLineColors } from '../trajectory/effortIgnition.js';
+import { IGNITION_TIMELINE, ignitionColors, ignitionLineColors } from '../trajectory/effortIgnition.js';
 /** 边框行（顶/底共用同一色段序列——同步变色）。顶行可在右圆角前插入
  *  一个静态标签 chip（会话名），占用的列数从色段序列里扣掉，行宽不变。 */
 function BorderRow({ left, right, runs, idleColor, label, }) {
@@ -45,8 +45,11 @@ function BorderRow({ left, right, runs, idleColor, label, }) {
     }
     return (_jsx(Box, { width: "100%", height: 1, flexShrink: 0, overflow: "hidden", children: _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { color: idleColor, children: left }), clipped.map((run, i) => (_jsx(Text, { color: run.color, children: run.glyph }, i))), label !== undefined && (_jsx(Text, { backgroundColor: label.color, color: label.ink, children: ` ${label.text} ` })), label !== undefined && _jsx(Text, { color: idleColor, children: '─'.repeat(labelGap) }), _jsx(Text, { color: idleColor, children: right })] }) }));
 }
-export function EffortInputBorder({ effort, levels, columns, onLight, idleColor, topRightLabel, children, }) {
+export function EffortInputBorder({ effort, levels, columns, idleColor, topRightLabel, children, }) {
     const clock = useContext(ClockContext);
+    // 扫光色取自当前主题（ignition / ignitionDim），与 ─ 底色的取用方式一致；
+    // 缺键的旧主题回落到点火专属的蓝白对。
+    const [themeName] = useTheme();
     const [overlay, setOverlay] = useState(null);
     const [prevEffort, setPrevEffort] = useState(effort);
     const [, forceRender] = useReducer((tick) => tick + 1, 0);
@@ -74,7 +77,7 @@ export function EffortInputBorder({ effort, levels, columns, onLight, idleColor,
     }, [overlay, elapsedMs]);
     const midWidth = Math.max(0, columns - 2);
     const sweepColors = overlay !== null && elapsedMs < IGNITION_TIMELINE.sweepMs && midWidth > 0
-        ? ignitionLineColors({ elapsedMs, width: midWidth, onLight })
+        ? ignitionLineColors({ elapsedMs, width: midWidth, colors: ignitionColors(themeName) })
         : [];
     // 顶/底共用的色段序列（同步）：扫光列取波形色，其余列回主题色。
     const runs = [];

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

@@ -7,10 +7,14 @@ import type { EffortOption } from '../dsh-adapter/channel.js';
  * or Esc just closes it). The current level carries `✓`; the focused level's
  * description renders below the row.
  */
-export declare function EffortSlider({ options, focusIndex, currentId, onPick, }: {
+export declare function EffortSlider({ options, focusIndex, currentId, levelsFallback, onPick, }: {
     options: readonly EffortOption[];
     focusIndex: number;
     currentId: string | undefined;
+    /** True when the ladder is the CLI-standard compatibility offer (the
+     *  model row declares no tiers of its own): the note says so — the
+     *  levels are applied exactly like a model's own list either way. */
+    levelsFallback?: boolean;
     /** Mouse pick (fullscreen): click a tier = move there and live-apply —
      *  the same semantics as the ←/→ keys (the slider IS the control). */
     onPick?: (index: number) => void;

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

@@ -1 +1 @@
-{"version":3,"file":"EffortSlider.d.ts","sourceRoot":"","sources":["../../../src/components/EffortSlider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAE7D;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,EAC3B,OAAO,EACP,UAAU,EACV,SAAS,EACT,MAAM,GACP,EAAE;IACD,OAAO,EAAE,SAAS,YAAY,EAAE,CAAA;IAChC,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B;0EACsE;IACtE,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACjC,GAAG,KAAK,CAAC,SAAS,CA4ClB"}
+{"version":3,"file":"EffortSlider.d.ts","sourceRoot":"","sources":["../../../src/components/EffortSlider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAE7D;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,EAC3B,OAAO,EACP,UAAU,EACV,SAAS,EACT,cAAsB,EACtB,MAAM,GACP,EAAE;IACD,OAAO,EAAE,SAAS,YAAY,EAAE,CAAA;IAChC,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B;;yEAEqE;IACrE,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;0EACsE;IACtE,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACjC,GAAG,KAAK,CAAC,SAAS,CA+ClB"}

package/lib/types/components/EffortSlider.js

@@ -11,9 +11,9 @@ import { HintLine } from './design-system/HintLine.js';
  * or Esc just closes it). The current level carries `✓`; the focused level's
  * description renders below the row.
  */
-export function EffortSlider({ options, focusIndex, currentId, onPick, }) {
+export function EffortSlider({ options, focusIndex, currentId, levelsFallback = false, onPick, }) {
     const focused = options[focusIndex];
     return (_jsx(Pane, { color: "permission", children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "remember", bold: true, children: t('picker-title-effort') }) }), _jsx(Box, { flexDirection: "row", children: options.map((option, index) => (_jsxs(React.Fragment, { children: [index > 0 ? (_jsx(Text, { dimColor: true, children: " \u2500\u2500 " })) : null, _jsx(Box, { onClick: onPick ? () => onPick(index) : undefined, backgroundColor: onPick !== undefined && index !== focusIndex
                                     ? 'userMessageBackgroundHover'
-                                    : undefined, children: _jsx(Text, { inverse: index === focusIndex, bold: index === focusIndex, children: option.name }) }), option.id === currentId ? _jsx(Text, { color: "remember", children: "\u2713" }) : null] }, option.id))) }), focused?.description !== undefined ? (_jsx(Text, { dimColor: true, children: focused.description })) : null, _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: t('hint-adjust-done') }) })] }) }));
+                                    : undefined, children: _jsx(Text, { inverse: index === focusIndex, bold: index === focusIndex, children: option.name }) }), option.id === currentId ? _jsx(Text, { color: "remember", children: "\u2713" }) : null] }, option.id))) }), focused?.description !== undefined ? (_jsx(Text, { dimColor: true, children: focused.description })) : null, levelsFallback ? (_jsx(Text, { dimColor: true, children: t('effort-fallback-tier-note') })) : null, _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: t('hint-adjust-done') }) })] }) }));
 }

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

@@ -11,12 +11,11 @@
  * 复用 Ink core 共享时钟，仅动画窗口订阅（keepAlive），播完归零。
  */
 import React from 'react';
-export declare function EffortTierBadge({ effort, levels, onLight, columns, leadingColumns, }: {
+export declare function EffortTierBadge({ effort, levels, columns, leadingColumns, }: {
     /** 当前思考强度档 id；`undefined` 表示路线未声明。 */
     effort: string | undefined;
     /** 当前路线的档位表（低→高，末位为最高档）；未知时传 `undefined`。 */
     levels: readonly string[] | undefined;
-    onLight: boolean;
     /** 终端列数——居中锚点按终端几何中心计算（纯文本流，不引入嵌套 Box）。 */
     columns: number;
     /** badge 文本流之前该行已被占据的列数（❯ 与块光标等）——居中换算成

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

@@ -1 +1 @@
-{"version":3,"file":"EffortTierBadge.d.ts","sourceRoot":"","sources":["../../../src/components/EffortTierBadge.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAsD,MAAM,OAAO,CAAA;AAc1E,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,MAAM,EACN,OAAO,EACP,OAAO,EACP,cAAc,GACf,EAAE;IACD,sCAAsC;IACtC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,6CAA6C;IAC7C,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,OAAO,CAAA;IAChB,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAA;IACf;qCACiC;IACjC,cAAc,EAAE,MAAM,CAAA;CACvB,GAAG,KAAK,CAAC,SAAS,CAkFlB"}
+{"version":3,"file":"EffortTierBadge.d.ts","sourceRoot":"","sources":["../../../src/components/EffortTierBadge.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAsD,MAAM,OAAO,CAAA;AAc1E,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,MAAM,EACN,OAAO,EACP,cAAc,GACf,EAAE;IACD,sCAAsC;IACtC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,6CAA6C;IAC7C,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;IACrC,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAA;IACf;qCACiC;IACjC,cAAc,EAAE,MAAM,CAAA;CACvB,GAAG,KAAK,CAAC,SAAS,CAqFlB"}

package/lib/types/components/EffortTierBadge.js

@@ -12,16 +12,18 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * 复用 Ink core 共享时钟，仅动画窗口订阅（keepAlive），播完归零。
  */
 import { useContext, useEffect, useReducer, useState } from 'react';
-import { Text } from '../ui.js';
+import { Text, useTheme } from '../ui.js';
 import { ClockContext } from '../ink/components/ClockContext.js';
 import { rgbString } from '../trajectory/motion.js';
-import { IGNITION_TIMELINE, ignitionHues } from '../trajectory/effortIgnition.js';
+import { IGNITION_TIMELINE, ignitionColors } from '../trajectory/effortIgnition.js';
 /** 字母间距聚拢：从 10 个空格减速收敛到 1 个（ease-out，快收慢停）。 */
 const GAP_START = 10;
 const GAP_END = 1;
 const CONVERGE_MS = 500;
-export function EffortTierBadge({ effort, levels, onLight, columns, leadingColumns, }) {
+export function EffortTierBadge({ effort, levels, columns, leadingColumns, }) {
     const clock = useContext(ClockContext);
+    // 字样色与扫光同源（主题 ignition / ignitionDim）。
+    const [themeName] = useTheme();
     const [overlay, setOverlay] = useState(null);
     const [prevEffort, setPrevEffort] = useState(effort);
     const [, forceRender] = useReducer((tick) => tick + 1, 0);
@@ -55,9 +57,10 @@ export function EffortTierBadge({ effort, levels, onLight, columns, leadingColum
     const alpha = brighten * fade;
     if (alpha <= 0)
         return null;
-    const band = onLight ? { r: 240, g: 240, b: 242 } : { r: 27, g: 30, b: 40 };
+    const palette = ignitionColors(themeName);
+    const band = palette.ignitionDim;
     // 明亮蓝：accent 混白 35% 提亮（用户拍板的高亮观感）。
-    const hue = ignitionHues(onLight)[0];
+    const hue = palette.ignition;
     const whiten = (x) => Math.round(x + (255 - x) * 0.35);
     const bright = { r: whiten(hue.r), g: whiten(hue.g), b: whiten(hue.b) };
     const mix = (x, y) => Math.round(x + (y - x) * alpha);

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

@@ -2,7 +2,8 @@ import React from 'react';
 import type { ChannelUi as Channel } from '../adapter/channel/ui-policy.js';
 import type { ChannelGoal } from '../dsh-adapter/channel.js';
 /**
- * Compact goal chip for the status footer: phase glyph + rounds, colored by
+ * Compact goal chip for the status footer: phase glyph + rounds (a goal a
+ * backend budgets by tokens: tokens used / budget instead), colored by
  * phase. `minimal` swaps the glyph for a text form, per the minimal-mode
  * no-emoji contract.
  */
@@ -28,11 +29,23 @@ export declare function GoalStatusChip({ goal, minimal }: {
  * id first appears, frozen on completion) — deliberately not derived from
  * session-event timestamps.
  */
-export declare function GoalTodoPanel({ channel, collapsed, onToggle, }: {
+export declare function GoalTodoPanel({ channel, collapsed, onToggle, variant, visible, maxTodos, wrapWidth, }: {
     channel: Channel;
     /** Fold the whole todo section to its summary header line. */
     collapsed?: boolean;
     /** Toggle the fold (click on the header row; shares the hotkey state). */
     onToggle?: () => void;
+    /** 'panel' = 侧栏 Todo Panel 形态：更紧凑（去外层 padding 与折叠
+     *  提示行），计时走共享动画时钟（visible=false 时零订阅）。 */
+    variant?: 'default' | 'panel';
+    /** 侧栏 visible 契约：非 active Panel 时 false——暂停本地计时，
+     *  store（channel.goal/todos）照常更新，重新打开直接读最新值。 */
+    visible?: boolean;
+    /** 覆盖 MAX_TODOS（panel variant 按宿主高度传入）。 */
+    maxTodos?: number;
+    /** panel variant：todo 行按此宽度折行——单条最多 2 行，超出部分截断
+     *  加省略号；maxTodos 预算按「行」折算，放不下仍走「…N more」。缺省
+     *  （default 形态）不折行，保持单行 truncate 的 chat 页现状。 */
+    wrapWidth?: number;
 }): React.ReactNode;
 //# sourceMappingURL=GoalTodoPanel.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"GoalTodoPanel.d.ts","sourceRoot":"","sources":["../../../src/components/GoalTodoPanel.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAiB,MAAM,2BAA2B,CAAA;AAmC3E;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,EAAE,IAAI,EAAE,OAAe,EAAE,EAAE;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,KAAK,CAAC,SAAS,CAQnH;AA2CD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAAC,EAC5B,OAAO,EACP,SAAiB,EACjB,QAAQ,GACT,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,8DAA8D;IAC9D,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CACtB,GAAG,KAAK,CAAC,SAAS,CAwIlB"}
+{"version":3,"file":"GoalTodoPanel.d.ts","sourceRoot":"","sources":["../../../src/components/GoalTodoPanel.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAiB,MAAM,2BAA2B,CAAA;AAoC3E;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAAE,IAAI,EAAE,OAAe,EAAE,EAAE;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,KAAK,CAAC,SAAS,CASnH;AAsDD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAAC,EAC5B,OAAO,EACP,SAAiB,EACjB,QAAQ,EACR,OAAmB,EACnB,OAAc,EACd,QAAQ,EACR,SAAS,GACV,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,8DAA8D;IAC9D,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB;8CAC0C;IAC1C,OAAO,CAAC,EAAE,SAAS,GAAG,OAAO,CAAA;IAC7B;oDACgD;IAChD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;oDAEgD;IAChD,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,GAAG,KAAK,CAAC,SAAS,CAkMlB"}