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

package/lib/types/components/EffortTierBadge.js

@@ -0,0 +1,97 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * EffortTierBadge — 输入行尾的档位字样徽标：三幕点焰的第二幕载体
+ * （与 EffortInputBorder 的双框扫光同一时间轴、同一触发），切到最高
+ * 思考强度档时光带行至中段，输入行居中浮现档名（当前档名大写，字母间距从
+ * 10 个空格减速聚拢到 1 个——连续位置逐字母取整保证帧帧有移动，
+ * 明亮蓝加粗，由暗渐亮），随后随图层整体渐隐让位——行数恒定，静
+ * 止时完全不渲染；输入行有文字时不显示（绝不遮挡内容）。
+ *
+ * 触发判定在渲染期做（props-变化-调整模式，与边框/充能组件同模
+ * 式）；冷启动恢复偏好/单档表/无档位表/无共享时钟均不触发。时钟
+ * 复用 Ink core 共享时钟，仅动画窗口订阅（keepAlive），播完归零。
+ */
+import { useContext, useEffect, useReducer, useState } from 'react';
+import { Text } from '../ui.js';
+import { ClockContext } from '../ink/components/ClockContext.js';
+import { rgbString } from '../trajectory/motion.js';
+import { IGNITION_TIMELINE, ignitionHues } 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, }) {
+    const clock = useContext(ClockContext);
+    const [overlay, setOverlay] = useState(null);
+    const [prevEffort, setPrevEffort] = useState(effort);
+    const [, forceRender] = useReducer((tick) => tick + 1, 0);
+    // 渲染期触发（与边框/充能同模式）：effort 变化的首帧就以新状态渲染。
+    if (effort !== prevEffort) {
+        setPrevEffort(effort);
+        if (clock !== null &&
+            effort !== undefined &&
+            levels !== undefined &&
+            levels.length > 1 &&
+            effort === levels[levels.length - 1]) {
+            setOverlay({ label: effort.toUpperCase(), startedAtMs: clock.now() });
+        }
+    }
+    const elapsedMs = overlay === null ? Infinity : Math.max(0, (clock?.now() ?? Date.now()) - overlay.startedAtMs);
+    useEffect(() => {
+        if (overlay === null || clock === null)
+            return;
+        return clock.subscribe(() => forceRender(), /* keepAlive */ true);
+    }, [overlay, clock]);
+    useEffect(() => {
+        if (overlay !== null && elapsedMs >= IGNITION_TIMELINE.fadeEndMs)
+            setOverlay(null);
+    }, [overlay, elapsedMs]);
+    if (overlay === null || elapsedMs < IGNITION_TIMELINE.labelStartMs)
+        return null;
+    const brighten = Math.min(1, (elapsedMs - IGNITION_TIMELINE.labelStartMs) / IGNITION_TIMELINE.labelBrightenMs);
+    const fade = elapsedMs < IGNITION_TIMELINE.fadeStartMs
+        ? 1
+        : Math.max(0, 1 - (elapsedMs - IGNITION_TIMELINE.fadeStartMs) / (IGNITION_TIMELINE.fadeEndMs - IGNITION_TIMELINE.fadeStartMs));
+    const alpha = brighten * fade;
+    if (alpha <= 0)
+        return null;
+    const band = onLight ? { r: 240, g: 240, b: 242 } : { r: 27, g: 30, b: 40 };
+    // 明亮蓝：accent 混白 35% 提亮（用户拍板的高亮观感）。
+    const hue = ignitionHues(onLight)[0];
+    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);
+    const color = rgbString({ r: mix(band.r, bright.r), g: mix(band.g, bright.g), b: mix(band.b, bright.b) });
+    // 字母间距聚拢（Codex 的 converge 语义）：间距是连续浮点，字母位置
+    // 以**行中心为锚**对称收缩——pos_i = center + (i-(n-1)/2)·(1+gap)，
+    // 左右字母各向中心移动一半（奇数档名的居中字母原位不动），两侧速
+    // 度天然均衡；每字母独立按连续位置取整落列，不同字母在不同帧跨
+    // 格，每帧至少一个在动（把间距整体取整会让 ease-out 慢末段上百毫
+    // 秒才跨一格，看起来就是卡顿）。曲线混入 15% 线性做末段保底速度。
+    const progress = Math.min(1, Math.max(0, (elapsedMs - IGNITION_TIMELINE.labelStartMs) / CONVERGE_MS));
+    // 跳变间隔均匀化：离散格子上「减速」若靠曲线导数趋零实现，末段会
+    // 出现几十帧不动一格的长停顿再突跳（卡感来源）。改为 90% 线性 +
+    // 10% easeOutQuad 的轻缓收尾——跳变间隔全程近似恒定（约 55ms/格），
+    // 仅末端轻微放慢，终端上的观感是均匀顺滑的聚拢。
+    const eased = 1 - progress;
+    const easedWithFloor = 0.9 * eased + 0.1 * (1 - progress * progress);
+    const gapF = GAP_END + (GAP_START - GAP_END) * easedWithFloor;
+    const letterCount = overlay.label.length;
+    // 锚点是**终端几何中心**（不是 ❯/光标之后可用区的中心——那会整体
+    // 偏右约 1.5 格；可用区起点在左，其"中点"不含左部占位）。左右字母
+    // 严格镜像——Math.round 对 .5 恒向上，正负方向舍入不对称会让跨格
+    // 时刻错开；左字母的落列由右字母的舍入结果镜像得出（2C − col），
+    // M/X 每次同帧反向同跳，全程对称于终端中心。
+    const C = Math.round((columns - 1) / 2) - leadingColumns;
+    let spaced = '';
+    let column = 0;
+    for (let i = 0; i < letterCount; i++) {
+        const off = (i - (letterCount - 1) / 2) * (1 + gapF);
+        const at = off >= 0
+            ? Math.round(C + off)
+            : 2 * C - Math.round(C - off);
+        spaced += ' '.repeat(Math.max(0, at - column)) + overlay.label[i];
+        column = at + 1;
+    }
+    return (_jsx(Text, { bold: true, color: color, children: spaced }));
+}

package/lib/types/components/LoadedContextPanel.js

@@ -26,5 +26,5 @@ export function LoadedContextPanel({ context, open, onToggle, }) {
     const summary = summarizeLoadedContext(context);
     if (summary === '')
         return null;
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: [_jsx(Box, { paddingX: 1, backgroundColor: open ? 'userMessageBackground' : undefined, children: _jsxs(Text, { bold: open, wrap: "truncate", children: [open ? '▼' : '▶', " ", _jsxs(Text, { dimColor: true, children: ["\uFF08Ctrl+P", open ? t('context-panel-collapse') : t('context-panel-expand'), "\uFF09"] }), " ", t('context-loaded'), " \u00B7 ", summary] }) }), open && (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingTop: 1, children: [context.sections.length > 0 && (_jsx(Group, { title: t('context-panel-sections', { n: context.sections.length }), children: context.sections.map(section => (_jsx(Entry, { entry: section }, section.name))) })), context.files.length > 0 && (_jsx(Group, { title: t('context-panel-files', { n: context.files.length }), children: context.files.map(file => (_jsx(Text, { dimColor: true, children: file.displayPath }, file.displayPath))) })), context.contexts.length > 0 && (_jsx(Group, { title: t('context-panel-runtime', { n: context.contexts.length }), children: context.contexts.map(entry => (_jsx(Entry, { entry: entry }, entry.name))) })), context.skills.length > 0 && (_jsx(Group, { title: t('context-panel-skills', { n: context.skills.length }), children: context.skills.map(skill => (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, dimColor: true, children: skill.name }), _jsx(Text, { dimColor: true, wrap: "wrap", children: skill.description })] }, skill.name))) })), context.tools.length > 0 && (_jsx(Group, { title: t('context-panel-tools', { n: context.tools.length }), children: context.tools.map(tool => (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, dimColor: true, children: tool.name }), _jsx(Text, { dimColor: true, wrap: "wrap", children: truncateContextText(tool.description, 160) })] }, tool.name))) })), _jsx(Text, { dimColor: true, children: "\u00B7 /context" })] }))] }));
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: [_jsx(Box, { paddingX: 1, backgroundColor: open ? 'userMessageBackgroundHover' : undefined, children: _jsxs(Text, { bold: open, wrap: "truncate", children: [open ? '▼' : '▶', " ", _jsxs(Text, { dimColor: true, children: ["\uFF08Ctrl+P", open ? t('context-panel-collapse') : t('context-panel-expand'), "\uFF09"] }), " ", t('context-loaded'), " \u00B7 ", summary] }) }), open && (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingTop: 1, children: [context.sections.length > 0 && (_jsx(Group, { title: t('context-panel-sections', { n: context.sections.length }), children: context.sections.map(section => (_jsx(Entry, { entry: section }, section.name))) })), context.files.length > 0 && (_jsx(Group, { title: t('context-panel-files', { n: context.files.length }), children: context.files.map(file => (_jsx(Text, { dimColor: true, children: file.displayPath }, file.displayPath))) })), context.contexts.length > 0 && (_jsx(Group, { title: t('context-panel-runtime', { n: context.contexts.length }), children: context.contexts.map(entry => (_jsx(Entry, { entry: entry }, entry.name))) })), context.skills.length > 0 && (_jsx(Group, { title: t('context-panel-skills', { n: context.skills.length }), children: context.skills.map(skill => (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, dimColor: true, children: skill.name }), _jsx(Text, { dimColor: true, wrap: "wrap", children: skill.description })] }, skill.name))) })), context.tools.length > 0 && (_jsx(Group, { title: t('context-panel-tools', { n: context.tools.length }), children: context.tools.map(tool => (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, dimColor: true, children: tool.name }), _jsx(Text, { dimColor: true, wrap: "wrap", children: truncateContextText(tool.description, 160) })] }, tool.name))) })), _jsx(Text, { dimColor: true, children: "\u00B7 /context" })] }))] }));
 }

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

@@ -2,7 +2,8 @@ import React from 'react';
 import { type ScrollBoxHandle } from '../ui.js';
 import type { ChatRow } from '../dsh-adapter/channel.js';
 import type { DOMElement } from '../ink/dom.js';
-export declare function MessageList({ rows, expanded, expandedRows, selectedId, onToggleRow, model, diffLayout, thinkingFold, showAll, onToggleAll, onLoadOlder, thinkingVisible, registerRowRef, scrollHandle, forceMountRowId, newSinceRowId, onUnseenCount, failureHintRowId, failureHint, }: {
+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, }: {
     rows: readonly ChatRow[];
     expanded: boolean;
     expandedRows: ReadonlySet<number>;
@@ -13,6 +14,8 @@ export declare function MessageList({ rows, expanded, expandedRows, selectedId,
     diffLayout?: 'auto' | 'split' | 'unified';
     /** Thinking-block display mode from channel (`preview`/`full`). */
     thinkingFold?: 'preview' | 'full';
+    /** Tool-card background treatment from the live channel settings. */
+    toolBackground?: ToolBackground;
     showAll: boolean;
     onToggleAll: () => void;
     /** Restore folded-away older rows from the session log (CC-style "load

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;AAuC/C,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,WAAW,EACX,KAAK,EACL,UAAmB,EACnB,YAAwB,EACxB,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,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,qBA6VA;AAmRD;;;;;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,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"}

package/lib/types/components/MessageList.js

@@ -17,7 +17,7 @@ import { truncateToWidth } from '../ink/truncateToWidth.js';
 /**
  * Transcript rows rendered in the Claude Code visual language: user prompts
  * on a grey bubble with a `❯` pointer, assistant text with a `●` bullet and
- * markdown, thinking folded to `∴ Thinking (ctrl+o to expand)`, tool calls as
+ * markdown, thinking folded to `⚓ Thinking (ctrl+o to expand)`, tool calls as
  * status-dot cards. `expanded` (Ctrl+O) shows full reasoning + full tool
  * args/results; `expandedRows` (message-selection mode, Enter) expands single
  * rows; `selectedId` highlights the selected row.
@@ -37,7 +37,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', 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', 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
@@ -54,14 +54,12 @@ export function MessageList({ rows, expanded, expandedRows, selectedId, onToggle
             prev = row.kind;
         }
     }
-    // CC's expanded rows keep a persistent hover-grey background (VirtualItem:
-    // `expanded ? userMessageBackgroundHover : undefined`).
+    // Selection keeps its highlight; expanded rows render with no fill (the
+    // diff line tints inside cards are the only backgrounds in the transcript).
     const rowBackground = (rowId) => {
         const isSelected = selectedId === rowId;
         if (isSelected)
             return 'messageActionsBackground';
-        if (expandedRows.has(rowId))
-            return 'userMessageBackgroundHover';
         return undefined;
     };
     // --- layout virtualization ---------------------------------------------
@@ -334,10 +332,10 @@ 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, 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));
+                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));
             }), bottomPad > 0 && _jsx(Box, { height: bottomPad, flexShrink: 0 })] }));
 }
-function TranscriptRow({ rowId, kind, text, executionTarget, streaming, durationMs, time, addMargin, isSelected, isExpanded, expanded, model, diffLayout, thinkingFold, 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, background, toolCallId, toolName, toolArgsText, toolArgsFull, toolStatus, toolResultText, toolResultFull, toolErrorText, toolFootnote, toolCallView, toolResultView, toolStartedAt, toolDurationMs, onToggleRow, setRowRef, }) {
     const ref = React.useCallback((el) => {
         setRowRef(rowId, el);
     }, [setRowRef, rowId]);
@@ -346,11 +344,11 @@ function TranscriptRow({ rowId, kind, text, executionTarget, streaming, duration
     }, [onToggleRow, rowId]);
     switch (kind) {
         case 'user':
-            return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(UserPromptMessage, { text: text, addMargin: addMargin, isSelected: isSelected, isExpanded: isExpanded, onClick: onClick }) }));
+            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 })] }));
         case 'reasoning':
-            return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(AssistantThinkingMessage, { thinking: text, addMargin: addMargin, preview: streaming &&
+            return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(AssistantThinkingMessage, { thinking: text, addMargin: addMargin, streaming: streaming, preview: streaming &&
                         thinkingFold === 'preview' &&
                         !expanded &&
                         !isExpanded, 
@@ -382,7 +380,7 @@ function TranscriptRow({ rowId, kind, text, executionTarget, streaming, duration
                 startedAt: toolStartedAt,
                 durationMs: toolDurationMs,
             };
-            return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(AssistantToolUseMessage, { tool: tool, addMargin: addMargin, verbose: isExpanded || expanded, isSelected: isSelected, isExpanded: isExpanded, footnote: toolFootnote, diffLayout: diffLayout }) }));
+            return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(AssistantToolUseMessage, { tool: tool, addMargin: addMargin, verbose: isExpanded || expanded, isSelected: isSelected, isExpanded: isExpanded, footnote: toolFootnote, diffLayout: diffLayout, toolBackground: toolBackground }) }));
         }
         case 'notice':
             return (_jsx(Box, { marginTop: 1, ref: ref, children: _jsx(Divider, { title: ` ${text} ` }) }));

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;AASzB,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,qBA25BlB"}
+{"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"}

package/lib/types/components/PromptInput.js

@@ -1,9 +1,13 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { readFile, unlink } from 'node:fs/promises';
 import { basename } from 'node:path';
 import { t } from '../i18n.js';
-import { Box, Text, useInput, useTerminalSize } from '../ui.js';
+import { Box, Text, useInput, useTerminalSize, useTheme } from '../ui.js';
+import { EffortChargeGlyph } from './EffortChargeGlyph.js';
+import { EffortInputBorder } from './EffortInputBorder.js';
+import { EffortTierBadge } from './EffortTierBadge.js';
+import { isLightThemeActive } from '../theme.js';
 import { useDeclaredCursor } from '../ink/hooks/use-declared-cursor.js';
 import { stringWidth } from '../ink/stringWidth.js';
 import { formatClipboardInsert, readClipboard } from '../utils/clipboard.js';
@@ -89,6 +93,7 @@ const MAX_VISIBLE_LINES = 5;
  * aborts the turn and sends the current input immediately.
  */
 export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, selectionActive, fillText, onFillConsumed, onRewindRequest, controllerRef, }) {
+    const [themeName] = useTheme();
     const [value, setValue] = React.useState('');
     const [cursor, setCursor] = React.useState(0);
     const valueRef = React.useRef(value);
@@ -882,7 +887,7 @@ export function PromptInput({ channel, helpOpen, onToggleHelp, onRunCommand, sel
                                         .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')
-                                        .map(item => (_jsxs(Text, { dimColor: true, wrap: "truncate", children: ['  ', "\u21B3 ", item.text] }, item.id)))] })), _jsxs(Text, { dimColor: true, children: ["Alt+\u2191 ", t('input-pending-actions-hint')] })] })), fileOverlayOpen && (_jsx(Box, { paddingLeft: 2, paddingBottom: 1, children: _jsx(FileSuggestions, { files: fileMatches, selectedIndex: fileSelected, columns: columns }) })), overlayOpen && (_jsx(Box, { paddingLeft: 2, paddingBottom: 1, children: _jsx(CommandSuggestions, { commands: suggestions, selectedIndex: selectedCommand, columns: columns }) }))] })), lastNotification && (_jsx(Box, { position: "absolute", marginTop: -1, height: 1, width: "100%", paddingLeft: 2, paddingRight: 1, flexDirection: "column", justifyContent: "flex-end", overflow: "hidden", children: _jsx(Box, { justifyContent: "flex-end", children: _jsx(Text, { color: lastNotification.color, dimColor: !lastNotification.color, wrap: "truncate", children: lastNotification.text }) }) })), _jsx(Box, { flexDirection: "column", alignItems: "flex-start", justifyContent: "flex-start", borderColor: channel.mode.plan === true ? 'planMode' : 'promptBorder', borderStyle: "round", borderLeft: false, borderRight: false, borderBottom: true, width: "100%", children: _jsxs(Box, { flexDirection: "row", alignItems: "flex-start", width: "100%", children: [_jsx(Text, { dimColor: channel.working, children: "\u276F " }), _jsx(Box, { ref: valueBoxRef, flexGrow: 1, flexShrink: 1, children: value.length === 0 ? (_jsx(Text, { inverse: true, children: " " })) : (_jsx(Box, { flexDirection: "column", children: rendered })) })] }) })] }));
+                                        .map(item => (_jsxs(Text, { dimColor: true, wrap: "truncate", children: ['  ', "\u21B3 ", item.text] }, item.id)))] })), _jsxs(Text, { dimColor: true, children: ["Alt+\u2191 ", t('input-pending-actions-hint')] })] })), fileOverlayOpen && (_jsx(Box, { paddingLeft: 2, paddingBottom: 1, children: _jsx(FileSuggestions, { files: fileMatches, selectedIndex: fileSelected, columns: columns }) })), overlayOpen && (_jsx(Box, { paddingLeft: 2, paddingBottom: 1, children: _jsx(CommandSuggestions, { commands: suggestions, selectedIndex: selectedCommand, columns: columns }) }))] })), lastNotification && (_jsx(Box, { position: "absolute", marginTop: -1, height: 1, width: "100%", paddingLeft: 2, paddingRight: 1, flexDirection: "column", justifyContent: "flex-end", overflow: "hidden", children: _jsx(Box, { justifyContent: "flex-end", children: _jsx(Text, { color: lastNotification.color, dimColor: !lastNotification.color, wrap: "truncate", children: lastNotification.text }) }) })), _jsx(EffortInputBorder, { effort: channel.reasoningEffort, levels: channel.effortLevels, columns: columns, onLight: isLightThemeActive(themeName), idleColor: channel.mode.plan === true ? 'planMode' : 'promptBorder', children: _jsxs(Box, { flexDirection: "row", alignItems: "flex-start", width: "100%", children: [_jsx(EffortChargeGlyph, { effort: channel.reasoningEffort, levels: channel.effortLevels, working: channel.working }), _jsx(Box, { ref: valueBoxRef, flexGrow: 1, flexShrink: 1, children: value.length === 0 ? (_jsxs(_Fragment, { children: [_jsx(Text, { inverse: true, children: " " }), _jsx(EffortTierBadge, { effort: channel.reasoningEffort, levels: channel.effortLevels, onLight: isLightThemeActive(themeName), columns: columns, leadingColumns: 3 })] })) : (_jsx(Box, { flexDirection: "column", children: rendered })) })] }) })] }));
 }
 /**
  * Hard-wrap text into visual rows of at most `width` columns (CJK-aware via

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

@@ -1,10 +1,8 @@
 import React from 'react';
 import type { ToolFileDiff } from '../dsh-adapter/channel.js';
 import { type CliHighlight } from '../cc/cliHighlight.js';
-/** chalk style for one raw theme value. Accepts every form the theme
- *  loader documents: #rgb, #rrggbb, #rrggbbaa (alpha stripped), rgb() with
- *  or without spaces, ansi256(n), ansi:name (issue #250, P2-5). */
-export declare function chalkFromToken(token: string): (text: string) => string;
+export { chalkFromToken } from '../cc/syntaxTheme.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),
@@ -17,12 +15,13 @@ export declare function highlightLines(text: string, language: string | undefine
     text: string;
     color?: string;
 }[][] | undefined;
-export declare function SplitDiffView({ diffs, width, maxRows, verbose, }: {
+export declare function SplitDiffView({ diffs, width, maxRows, verbose, toolBackground, }: {
     readonly diffs: readonly ToolFileDiff[];
     /** Content width available to the whole two-pane block (divider included). */
     readonly width: number;
     /** Row budget when not verbose; overflow folds into one hint row. */
     readonly maxRows: number;
     readonly verbose: boolean;
+    readonly toolBackground?: ToolBackground;
 }): React.ReactNode;
 //# sourceMappingURL=SplitDiffView.d.ts.map

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;AAwFjF;;mEAEmE;AACnE,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAmBtE;AAUD;;;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;AA6ND,wBAAgB,aAAa,CAAC,EAC5B,KAAK,EACL,KAAK,EACL,OAAO,EACP,OAAO,GACR,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;CAC1B,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;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"}

package/lib/types/components/SplitDiffView.js

@@ -2,73 +2,19 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { Box, Text } from '../ui.js';
 import * as JsDiff from 'diff';
-import chalk from 'chalk';
 import { extname } from 'node:path';
 import { getCliHighlightPromise } from '../cc/cliHighlight.js';
+import { SYNTAX_CLASS_TO_TOKEN, chalkFromToken } from '../cc/syntaxTheme.js';
+// Backward-compatible re-export: repro scripts import chalkFromToken from
+// this module's old home.
+export { chalkFromToken } from '../cc/syntaxTheme.js';
 import { getTheme } from '../theme.js';
 import { useTheme } from './design-system/ThemeProvider.js';
 /** Replace tabs so width math and alignment hold (pi convention). */
 const expandTabs = (text) => text.replaceAll('\t', '   ');
 // --- syntax highlighting ----------------------------------------------------
-/** highlight.js token classes → theme syntax tokens. `default` catches
- *  every unmapped class so cli-highlight's own yellow never leaks through
- *  (issue #250, P2-6). */
-const SYNTAX_CLASS_TO_TOKEN = {
-    keyword: 'syntaxKeyword',
-    built_in: 'syntaxKeyword',
-    literal: 'syntaxKeyword',
-    string: 'syntaxString',
-    subst: 'syntaxString',
-    quote: 'syntaxString',
-    comment: 'syntaxComment',
-    number: 'syntaxNumber',
-    title: 'syntaxFunction',
-    'title.function_': 'syntaxFunction',
-    function: 'syntaxFunction',
-    'title.class_': 'syntaxType',
-    type: 'syntaxType',
-    class: 'syntaxType',
-    tag: 'syntaxType',
-    name: 'syntaxType',
-    attr: 'syntaxVariable',
-    attribute: 'syntaxVariable',
-    variable: 'syntaxVariable',
-    'template-variable': 'syntaxVariable',
-    params: 'syntaxVariable',
-    operator: 'syntaxOperator',
-    punctuation: 'syntaxPunctuation',
-    meta: 'syntaxPunctuation',
-    symbol: 'syntaxConstant',
-    regexp: 'syntaxConstant',
-    default: 'syntaxVariable',
-};
-/** chalk style for one raw theme value. Accepts every form the theme
- *  loader documents: #rgb, #rrggbb, #rrggbbaa (alpha stripped), rgb() with
- *  or without spaces, ansi256(n), ansi:name (issue #250, P2-5). */
-export function chalkFromToken(token) {
-    let match = /^#([0-9a-fA-F]{3})$/.exec(token);
-    if (match !== null) {
-        const [r, g, b] = match[1].split('').map(c => parseInt(c + c, 16));
-        return chalk.rgb(r, g, b);
-    }
-    match = /^#([0-9a-fA-F]{6})(?:[0-9a-fA-F]{2})?$/.exec(token);
-    if (match !== null)
-        return chalk.hex(`#${match[1]}`);
-    match = /^rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/.exec(token);
-    if (match !== null)
-        return chalk.rgb(Number(match[1]), Number(match[2]), Number(match[3]));
-    match = /^ansi256\((\d+)\)$/.exec(token);
-    if (match !== null)
-        return chalk.ansi256(Number(match[1]));
-    match = /^ansi:(\w+)$/.exec(token);
-    if (match !== null) {
-        const name = match[1] === 'blackBright' ? 'gray' : match[1];
-        const style = chalk[name];
-        if (style !== undefined)
-            return style;
-    }
-    return (text) => text;
-}
+// The hljs-class → theme-token map and chalkFromToken live in
+// ../cc/syntaxTheme.ts (shared with the markdown code-block renderer).
 /** ANSI 16-color SGR codes → rgb() strings (the dark-ansi palette path). */
 const ANSI16 = {
     30: 'rgb(0,0,0)', 31: 'rgb(128,0,0)', 32: 'rgb(0,128,0)', 33: 'rgb(128,128,0)',
@@ -327,9 +273,16 @@ function alignFileDiff(fileIndex, oldText, newText) {
     return rows;
 }
 // --- rendering --------------------------------------------------------------
-function PaneLine({ side, kind, width, tone, padLeft = false, }) {
+function PaneLine({ side, kind, width, tone, toolBackground, padLeft = false, }) {
+    const ordinaryBackground = toolBackground === 'subtle'
+        ? 'toolCardBackgroundDim'
+        : toolBackground === 'strong'
+            ? 'toolCardBackground'
+            : undefined;
+    // Additions/removals keep their semantic tint; unchanged and empty panes
+    // inherit the configured ordinary tool-card surface.
     const backgroundColor = kind === 'context'
-        ? 'toolCardBackground'
+        ? ordinaryBackground
         : tone === 'old'
             ? 'diffRemovedDimmed'
             : 'diffAddedDimmed';
@@ -340,7 +293,7 @@ function PaneLine({ side, kind, width, tone, padLeft = false, }) {
     const prefix = padLeft ? ` ${marker}` : marker;
     return (_jsxs(Box, { width: width, flexShrink: 0, backgroundColor: backgroundColor, children: [_jsx(Text, { dimColor: true, backgroundColor: backgroundColor, children: `${prefix} ` }), side === undefined ? (_jsx(Text, { backgroundColor: backgroundColor, children: " " })) : (_jsx(Text, { wrap: "truncate", backgroundColor: backgroundColor, children: side.segments.map((segment, index) => segment.changed ? (_jsx(Text, { color: wordColor, bold: true, backgroundColor: backgroundColor, children: segment.text }, index)) : (_jsx(Text, { color: segment.color, backgroundColor: backgroundColor, children: segment.text }, index))) }))] }));
 }
-export function SplitDiffView({ diffs, width, maxRows, verbose, }) {
+export function SplitDiffView({ diffs, width, maxRows, verbose, toolBackground = 'none', }) {
     const [hl, setHl] = React.useState(null);
     React.useEffect(() => {
         let mounted = true;
@@ -399,7 +352,7 @@ export function SplitDiffView({ diffs, width, maxRows, verbose, }) {
             next: highlightLines(expandTabs(diff.newText), language, hl, chTheme, themeSig),
         };
     });
-    return (_jsxs(Box, { flexDirection: "column", width: paneWidth * 2 + 1, backgroundColor: "toolCardBackgroundDim", children: [visible.map((row, index) => {
+    return (_jsxs(Box, { flexDirection: "column", width: paneWidth * 2 + 1, children: [visible.map((row, index) => {
                 if ('separator' in row) {
                     return (_jsx(Box, { width: paneWidth * 2 + 1, children: _jsx(Text, { dimColor: true, wrap: "truncate", children: row.separator === '⋯' ? '⋯' : `  ${row.separator}` }) }, index));
                 }
@@ -412,6 +365,6 @@ export function SplitDiffView({ diffs, width, maxRows, verbose, }) {
                 const newSide = row.newWords === undefined
                     ? undefined
                     : { segments: newRuns !== undefined ? mergeRuns(newRuns, row.newWords) : row.newWords };
-                return (_jsxs(Box, { flexDirection: "row", children: [_jsx(PaneLine, { side: oldSide, kind: row.kind === 'add' ? 'context' : row.kind, tone: "old", width: paneWidth }), _jsx(Box, { width: 1, flexShrink: 0, backgroundColor: "toolCardBackgroundDim", children: _jsx(Text, { dimColor: true, children: "\u2502" }) }), _jsx(PaneLine, { side: newSide, kind: row.kind === 'del' ? 'context' : row.kind, tone: "new", width: paneWidth, padLeft: true })] }, index));
+                return (_jsxs(Box, { flexDirection: "row", children: [_jsx(PaneLine, { side: oldSide, kind: row.kind === 'add' ? 'context' : row.kind, tone: "old", width: paneWidth, toolBackground: toolBackground }), _jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { dimColor: true, children: "\u2502" }) }), _jsx(PaneLine, { side: newSide, kind: row.kind === 'del' ? 'context' : row.kind, tone: "new", width: paneWidth, toolBackground: toolBackground, padLeft: true })] }, index));
             }), hidden > 0 && (_jsx(Text, { dimColor: true, children: `… +${hidden} lines (ctrl+o to expand)` }))] }));
 }

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

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

package/lib/types/components/StreamingMarkdown.js

@@ -76,6 +76,14 @@ export function StreamingMarkdown({ children, dimColor = false, }) {
         prefixRef.current = stripped.substring(0, boundary + advance);
     }
     const stablePrefix = prefixRef.current;
-    const unstableSuffix = clipSuffixTail(stripped.substring(stablePrefix.length), cutRef);
-    return (_jsxs(Box, { flexDirection: "column", gap: 1, children: [stablePrefix && _jsx(Markdown, { dimColor: dimColor, children: stablePrefix }), unstableSuffix && _jsx(Markdown, { dimColor: dimColor, cacheTokens: false, children: unstableSuffix })] }));
+    const suffixSource = stripped.substring(stablePrefix.length);
+    const unstableSuffix = clipSuffixTail(suffixSource, cutRef);
+    // A lexer boundary must be strictly outside the stable prefix. If marked
+    // reports a raw span that ends at the current cursor (possible around an
+    // unfinished fence/table while deltas arrive), rendering both branches can
+    // paint the same tail twice. Keep the suffix authoritative and never render
+    // an overlapping empty/duplicate boundary.
+    const hasDistinctSuffix = unstableSuffix !== '' &&
+        (stablePrefix === '' || !unstableSuffix.startsWith(stablePrefix));
+    return (_jsxs(Box, { flexDirection: "column", gap: 1, children: [stablePrefix && _jsx(Markdown, { dimColor: dimColor, children: stablePrefix }), hasDistinctSuffix && _jsx(Markdown, { dimColor: dimColor, cacheTokens: false, children: unstableSuffix })] }));
 }

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

@@ -1,31 +1,10 @@
 /**
- * Working-activity indicator presets, ported from the pi
- * working-activity extension (`FRAME_PRESETS`). The TUI renders the current
- * frame next to the live working line, tinted by the activity phase.
- * `\uFE0E` forces text rendering so Windows never paints the glyphs as
- * color emoji (the green-block problem).
+ * Working-activity indicator presets — thin re-export of the single source
+ * of truth in the `dsh-working-activity` package (`src/frames.ts`). The TUI
+ * keeps this shim so existing importers (`/activity` picker, status line,
+ * channel, activity prefs) resolve the same names without moving; all preset
+ * data (the pi-extension union, 35 presets) lives upstream.
+ * @module dsh-tui/components/activityFrames
  */
-/** One working-activity preset: the frame sequence and the per-frame interval. */
-export interface FramePreset {
-    readonly frames: readonly string[];
-    readonly intervalMs: number;
-}
-/** Named working-activity frame presets, keyed by preset name (`claude`, `moon`, `sand`, ...). */
-export declare const FRAME_PRESETS: Record<string, FramePreset>;
-/** The pi extension's default preset. */
-export declare const DEFAULT_PRESET = "moon8";
-/** Every selectable preset name, `random` first (the pi selector order). */
-export declare const PRESET_NAMES: readonly string[];
-/**
- * Whether `name` selects a known preset or `random`.
- * @param name - Candidate preset name.
- * @returns True when the name resolves to a preset.
- */
-export declare function isPresetName(name: string): boolean;
-/**
- * Resolve a preset name (`random` picks one per process).
- * @param name - Preset name, or undefined for the default.
- * @returns The matching preset; unknown or absent names fall back to the default.
- */
-export declare function resolvePreset(name: string | undefined): FramePreset;
+export * from 'dsh-working-activity/frames';
 //# sourceMappingURL=activityFrames.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"activityFrames.d.ts","sourceRoot":"","sources":["../../../src/components/activityFrames.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,kFAAkF;AAClF,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;IAClC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;CAC5B;AAED,kGAAkG;AAClG,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CA0DrD,CAAA;AAED,yCAAyC;AACzC,eAAO,MAAM,cAAc,UAAU,CAAA;AAErC,4EAA4E;AAC5E,eAAO,MAAM,YAAY,EAAE,SAAS,MAAM,EAA8C,CAAA;AAExF;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,CASnE"}
+{"version":3,"file":"activityFrames.d.ts","sourceRoot":"","sources":["../../../src/components/activityFrames.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,cAAc,6BAA6B,CAAA"}

package/lib/types/components/activityFrames.js

@@ -1,96 +1,9 @@
 /**
- * Working-activity indicator presets, ported from the pi
- * working-activity extension (`FRAME_PRESETS`). The TUI renders the current
- * frame next to the live working line, tinted by the activity phase.
- * `\uFE0E` forces text rendering so Windows never paints the glyphs as
- * color emoji (the green-block problem).
+ * Working-activity indicator presets — thin re-export of the single source
+ * of truth in the `dsh-working-activity` package (`src/frames.ts`). The TUI
+ * keeps this shim so existing importers (`/activity` picker, status line,
+ * channel, activity prefs) resolve the same names without moving; all preset
+ * data (the pi-extension union, 35 presets) lives upstream.
+ * @module dsh-tui/components/activityFrames
  */
-/** Text-variant selector: keep symbols monochrome on Windows. */
-const TE = '\uFE0E';
-/** Named working-activity frame presets, keyed by preset name (`claude`, `moon`, `sand`, ...). */
-export const FRAME_PRESETS = {
-    // Claude Code's real sequence: · ✢ * ✶ ✻ ✽ forward + backward.
-    claude: {
-        frames: ['·', `✢${TE}`, '*', `✶${TE}`, `✻${TE}`, `✽${TE}`, `✻${TE}`, `✶${TE}`, '*', `✢${TE}`],
-        intervalMs: 150,
-    },
-    star2: { frames: [`✶${TE}`, `✸${TE}`, `✹${TE}`, `✺${TE}`, `✹${TE}`, `✷${TE}`], intervalMs: 140 },
-    sand: {
-        frames: ['⠁', '⠂', '⠄', '⡀', '⡈', '⡐', '⡠', '⣀', '⣁', '⣂', '⣄', '⣌', '⣔', '⣤', '⣥', '⣦', '⣮', '⣶', '⣷', '⣿', '⡿', '⠿', '⢟', '⠟', '⡛', '⠛', '⠫', '⢋', '⠋', '⠍', '⡉', '⠉', '⠑', '⠡', '⢁'],
-        intervalMs: 120,
-    },
-    triangle: { frames: ['◢', '◣', '◤', '◥'], intervalMs: 180 },
-    box: { frames: ['▖', '▘', '▝', '▗'], intervalMs: 180 },
-    box2: { frames: ['▌', '▀', '▐', '▄'], intervalMs: 180 },
-    corners: { frames: ['◰', '◳', '◲', '◱'], intervalMs: 190 },
-    point: { frames: ['∙∙∙', '●∙∙', '∙●∙', '∙∙●', '∙∙∙'], intervalMs: 190 },
-    layer: { frames: ['-', '=', '≡'], intervalMs: 220 },
-    flip: { frames: ['_', '_', '_', '-', '`', '`', "'", '´', '-', '_', '_', '_'], intervalMs: 140 },
-    aesthetic: {
-        frames: ['▰▱▱▱▱▱▱', '▰▰▱▱▱▱▱', '▰▰▰▱▱▱▱', '▰▰▰▰▱▱▱', '▰▰▰▰▰▱▱', '▰▰▰▰▰▰▱', '▰▰▰▰▰▰▰', '▰▱▱▱▱▱▱'],
-        intervalMs: 140,
-    },
-    hamburger: { frames: ['☱', '☲', '☴'], intervalMs: 220 },
-    moon: { frames: ['◐', '◓', '◑', '◒'], intervalMs: 240 },
-    // kimi-code MoonLoader 同款：8 帧 emoji 月相，120ms 一帧，比半圆版更丝滑。
-    // 不带 \uFE0E：保留彩色 emoji 渲染（Windows Terminal 等现代终端效果最佳）。
-    moon8: { frames: ['🌑', '🌒', '🌓', '🌔', '🌕', '🌖', '🌗', '🌘'], intervalMs: 120 },
-    // 鲸鱼喷水：🐳 固定，水柱升起（· → | → ║）再回落，顶珠 ° 模拟水花（对齐 pi 版）。
-    'whale-spout': {
-        frames: ['🐳  ', '🐳° ', '🐳|°', '🐳║°', '🐳|°', '🐳° ', '🐳  '],
-        intervalMs: 160,
-    },
-    // 鲸鱼转圈：🐳 + 环绕方向指示（逆时针转圈语义，对齐 pi 版）。
-    'whale-spin': {
-        frames: ['🐳→', '🐳↘', '🐳↓', '🐳↙', '🐳←', '🐳↖', '🐳↑', '🐳↗'],
-        intervalMs: 150,
-    },
-    comet: {
-        frames: ['●    ', ' ●   ', '  ●  ', '   ● ', '    ●', '   ● ', '  ●  ', ' ●   '],
-        intervalMs: 160,
-    },
-    breathe: { frames: ['▁', '▃', '▅', '▇', '▅', '▃'], intervalMs: 210 },
-    dots: { frames: ['⣾', '⣷', '⣯', '⣟', '⡿', '⢿', '⣻', '⣽'], intervalMs: 140 },
-    arrow: { frames: ['←', '↖', '↑', '↗', '→', '↘', '↓', '↙'], intervalMs: 160 },
-    spark: { frames: ['·', '∘', '°', '✧', '°', '∘'], intervalMs: 240 },
-    bar: { frames: ['▏', '▎', '▍', '▌', '▋', '▊', '▉', '█', '▉', '▊', '▋', '▌', '▍', '▎'], intervalMs: 120 },
-    braille: { frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'], intervalMs: 120 },
-    arc: { frames: ['◜', '◠', '◝', '◞', '◡', '◟'], intervalMs: 160 },
-    circle: { frames: ['◴', '◷', '◶', '◵'], intervalMs: 190 },
-    grow: { frames: ['.', 'o', 'O', '0', 'O', 'o'], intervalMs: 210 },
-    noise: { frames: ['▓', '▒', '░', '▒'], intervalMs: 160 },
-    bounce: { frames: ['⠁', '⠂', '⠄', '⡀', '⢀', '⠠', '⠐', '⠈'], intervalMs: 140 },
-    rainbow: {
-        frames: ['▁', '▂', '▃', '▄', '▅', '▆', '▇', '█', '▇', '▆', '▅', '▄', '▃', '▂'],
-        intervalMs: 120,
-    },
-    dqpb: { frames: ['d', 'q', 'p', 'b'], intervalMs: 210 },
-    toggle: { frames: ['⊶', '⊷'], intervalMs: 300 },
-};
-/** The pi extension's default preset. */
-export const DEFAULT_PRESET = 'moon8';
-/** Every selectable preset name, `random` first (the pi selector order). */
-export const PRESET_NAMES = ['random', ...Object.keys(FRAME_PRESETS)];
-/**
- * Whether `name` selects a known preset or `random`.
- * @param name - Candidate preset name.
- * @returns True when the name resolves to a preset.
- */
-export function isPresetName(name) {
-    return name === 'random' || Object.hasOwn(FRAME_PRESETS, name);
-}
-/**
- * Resolve a preset name (`random` picks one per process).
- * @param name - Preset name, or undefined for the default.
- * @returns The matching preset; unknown or absent names fall back to the default.
- */
-export function resolvePreset(name) {
-    if (name === 'random') {
-        const names = Object.keys(FRAME_PRESETS);
-        // FRAME_PRESETS is non-empty by construction, so any random index is in
-        // range and the lookup always lands on a preset.
-        const pick = names[Math.floor(Math.random() * names.length)];
-        return FRAME_PRESETS[pick];
-    }
-    return FRAME_PRESETS[name ?? ''] ?? FRAME_PRESETS[DEFAULT_PRESET];
-}
+export * from 'dsh-working-activity/frames';