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

package/lib/types/components/approvals/ApprovalPanel.js

@@ -1,53 +1,201 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
- * The approval panel — permission prompt for the DSH
- * approval seam (`ctx.approval`). One ask per panel: a permission-colored
- * divider header naming the tool, the gated command recovered from the
- * paired tool call, the asker's reason,
- * "Allow this operation?", and a numbered Yes/No list.
+ * The approval panel — the permission prompt every backend renders
+ * through. One ask per panel: a
+ * permission-colored divider header naming the tool, the gated command, the
+ * asker's reason, "Allow this operation?", and a numbered option list.
  *
- * The protocol's outcome set is closed (allowed-once / rejected /
- * cancelled / unavailable) with no allow-always or feedback channel, so
- * the panel deliberately offers exactly two rows; Esc and Ctrl+C reject
- * (fail closed; Esc cancels the request).
+ * The options come from the request (`approval.options`); a request without
+ * them — every DSH ask — offers exactly the DSH protocol's two rows (allow
+ * once / reject), whose outcome set is closed with no allow-always or
+ * feedback channel. A backend prompt may add an allow-always row (its label
+ * says what would be remembered), hide it (`suppressAlwaysAllow`, a forcing
+ * ask rule), put the rejection first with no one-key approve
+ * (`defaultToNo`), and accept a typed reason with a rejection (`feedback`).
+ * Esc and Ctrl+C reject (fail closed; Esc cancels the request).
+ *
+ * On a prompt that takes a reason, the reason is typed into the rejection
+ * row once it has focus (↓ / Tab): there digits are text, so a reason that
+ * starts with "2" can never pick allow-always, and allow-always is never a
+ * digit shortcut — it takes focus plus Enter. The reason shows as at most
+ * two lines (its tail, where the typing happens); the full text is sent.
+ * A DSH prompt (two rows, no reason) keeps its digit shortcuts unchanged.
+ * Every decision carries the panel key, so a keystroke this panel handles
+ * after its prompt was withdrawn cannot answer the next one.
  */
 import React from 'react';
 import { t } from '../../i18n.js';
-import { Box, Text, useInput } from '../../ui.js';
+import { stringWidth } from '../../ink/stringWidth.js';
+import { Box, Text, useInput, useTerminalSize } from '../../ui.js';
 import { isPlainReturnInput } from '../../utils/modifiers.js';
 import { Divider } from '../design-system/Divider.js';
 import { POINTER } from '../../terminal-utils/figures.js';
-const OUTCOMES = ['allowed-once', 'rejected'];
+import { flattenPasteInline } from '../../channel/sanitize.js';
+import { panelOutcomeOf, visiblePermissionOptions, } from '../../channel/permissions.js';
+/** A feedback reason is a short sentence, not a document. */
+const FEEDBACK_MAX_POINTS = 2000;
+/** Horizontal cells the panel spends outside an option's text: the
+ *  padding (2 + 2) and the focus pointer column. */
+const ROW_CHROME_CELLS = 5;
+/** The reason never takes more than this many rows of the option list. */
+const FEEDBACK_MAX_LINES = 2;
+/** The longest tail of `text` that fits in `cells` display cells. */
+function tailWithin(text, cells) {
+    const points = [...text];
+    let width = 0;
+    let start = points.length;
+    while (start > 0) {
+        const next = stringWidth(points[start - 1]);
+        if (width + next > cells)
+            break;
+        width += next;
+        start -= 1;
+    }
+    return points.slice(start).join('');
+}
+/** Hard-wrap `text` into rows of at most `cells` display cells. */
+function hardWrap(text, cells) {
+    const rows = [];
+    let row = '';
+    let width = 0;
+    for (const point of text) {
+        const next = stringWidth(point);
+        if (width + next > cells && row !== '') {
+            rows.push(row);
+            row = '';
+            width = 0;
+        }
+        row += point;
+        width += next;
+    }
+    if (row !== '' || rows.length === 0)
+        rows.push(row);
+    return rows;
+}
+/**
+ * The rejection row with its reason, as at most two hard-wrapped rows: when
+ * the reason does not fit, its tail (the typing position) is shown after an
+ * ellipsis.
+ */
+export function feedbackRowLines(prefix, label, reason, columns) {
+    const cells = Math.max(8, columns - ROW_CHROME_CELLS);
+    const head = `${prefix}${t('approval-feedback-row', { label, reason: '' })}`;
+    const budget = FEEDBACK_MAX_LINES * cells - stringWidth(head);
+    const shown = stringWidth(reason) <= budget ? reason : `…${tailWithin(reason, Math.max(0, budget - 1))}`;
+    return hardWrap(`${prefix}${t('approval-feedback-row', { label, reason: shown })}`, cells).slice(0, FEEDBACK_MAX_LINES);
+}
+/** The localized label of an option without backend wording. */
+function optionLabel(option) {
+    if (option.label !== undefined && option.label !== '')
+        return option.label;
+    return option.kind === 'allow-once' ? t('approval-yes') : option.kind === 'allow-always' ? t('approval-always') : t('approval-no');
+}
 export function ApprovalPanel({ approval, background = false, onDecide }) {
-    const [focusIndex, setFocusIndex] = React.useState(0);
+    const options = visiblePermissionOptions(approval);
+    const { columns } = useTerminalSize();
+    // `defaultToNo` opens on the rejection (sorted first); otherwise on the
+    // first option, as the DSH panel always has. The ref is the synchronous
+    // source of truth: one stdin chunk can carry a focus move and the typing
+    // after it inside a single React batch.
+    const [focusIndex, setFocusIndexState] = React.useState(0);
+    const focusRef = React.useRef(0);
+    const setFocusIndex = (next) => {
+        focusRef.current = typeof next === 'function' ? next(focusRef.current) : next;
+        setFocusIndexState(focusRef.current);
+    };
     // Hover highlight per decision row (mouse affordance; the click handler
     // below mirrors the keyboard Enter on the focused row).
     const [hoverIndex, setHoverIndex] = React.useState(-1);
+    const acceptsFeedback = approval.feedback === true;
+    const [feedback, setFeedback] = React.useState('');
+    // One stdin chunk can carry several key events inside a single React
+    // batch: the ref is the synchronous source of truth for the handlers.
+    const feedbackRef = React.useRef('');
+    const applyFeedback = (next) => {
+        feedbackRef.current = next;
+        setFeedback(next);
+    };
+    const rejectIndex = options.findIndex(option => option.kind === 'reject');
+    const decide = (index, withFeedback) => {
+        const option = options[index];
+        if (option === undefined)
+            return;
+        const text = withFeedback && option.kind === 'reject' ? feedbackRef.current.trim() : '';
+        onDecide(panelOutcomeOf(option.kind), {
+            optionId: option.id,
+            kind: option.kind,
+            key: approval.key,
+            ...(text === '' ? {} : { feedback: text }),
+        });
+    };
+    /** Esc / Ctrl+C: the plain rejection (a typed reason is not sent). */
+    const reject = () => {
+        if (rejectIndex >= 0)
+            decide(rejectIndex, false);
+        else
+            onDecide('rejected', { optionId: 'reject', kind: 'reject', key: approval.key });
+    };
+    /** The reason field is the focused rejection row of a prompt that takes one. */
+    const reasonFocused = () => acceptsFeedback && rejectIndex >= 0 && focusRef.current === rejectIndex;
+    const appendFeedback = (text) => {
+        const points = [...feedbackRef.current, ...text];
+        applyFeedback(points.slice(0, FEEDBACK_MAX_POINTS).join(''));
+    };
     useInput((input, key) => {
         if (key.escape || (key.ctrl && input === 'c')) {
-            onDecide('rejected');
+            reject();
+            return;
+        }
+        if (key.upArrow || (acceptsFeedback && key.tab && key.shift)) {
+            setFocusIndex(index => (index + options.length - 1) % options.length);
             return;
         }
-        if (key.upArrow) {
-            setFocusIndex(index => (index + OUTCOMES.length - 1) % OUTCOMES.length);
+        if (key.downArrow || (acceptsFeedback && key.tab)) {
+            setFocusIndex(index => (index + 1) % options.length);
             return;
         }
-        if (key.downArrow) {
-            setFocusIndex(index => (index + 1) % OUTCOMES.length);
+        if (isPlainReturnInput(input, key)) {
+            decide(focusRef.current, true);
             return;
         }
-        if (input === '1' || input === '2') {
-            onDecide(OUTCOMES[Number(input) - 1]);
+        if (reasonFocused()) {
+            // The reason field: everything printable is text, digits included.
+            if (key.isPasted === true) {
+                const text = flattenPasteInline(input);
+                if (text.trim() !== '')
+                    appendFeedback(text);
+                return;
+            }
+            if (key.backspace) {
+                applyFeedback([...feedbackRef.current].slice(0, -1).join(''));
+                return;
+            }
+            if (!key.ctrl && !key.meta && input !== '' && !/[\u0000-\u001f\u007f]/u.test(input))
+                appendFeedback(input);
             return;
         }
-        if (isPlainReturnInput(input, key)) {
-            onDecide(OUTCOMES[focusIndex]);
+        // Digits pick an option. With `defaultToNo` no single key approves (only
+        // a rejection may be picked); on a prompt that takes a reason the
+        // persistent allow-always is never a single key either.
+        if (/^[1-9]$/u.test(input)) {
+            const index = Number(input) - 1;
+            const option = options[index];
+            if (option === undefined)
+                return;
+            if (approval.defaultToNo === true && option.kind !== 'reject')
+                return;
+            if (acceptsFeedback && option.kind === 'allow-always')
+                return;
+            decide(index, false);
         }
     }, { isActive: true });
-    const optionLabels = [t('approval-yes'), t('approval-no')];
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, paddingLeft: 2, paddingRight: 2, width: "100%", children: [_jsx(Divider, { color: "permission", title: t('approval-waiting', { tool: approval.toolName }) }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [background && (_jsx(Text, { color: "warning", children: t('approval-background-agent', { id: approval.agentId.slice(0, 8) }) })), approval.external === true && (_jsxs(Text, { color: "warning", wrap: "wrap", children: ["[external] ", t('approval-external-hint')] })), approval.command !== undefined && (_jsx(Box, { flexDirection: "column", paddingX: 2, children: _jsx(Text, { dimColor: true, wrap: "wrap", children: approval.command }) })), approval.reason !== undefined && (_jsx(Text, { dimColor: true, wrap: "wrap", children: approval.reason })), _jsx(Text, { dimColor: true, children: t('approval-proceed') })] }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: optionLabels.map((label, index) => {
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, paddingLeft: 2, paddingRight: 2, width: "100%", children: [_jsx(Divider, { color: "permission", title: t('approval-waiting', { tool: approval.toolName }) }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [background && (_jsx(Text, { color: "warning", children: t('approval-background-agent', { id: approval.agentId.slice(0, 8) }) })), approval.subagentId !== undefined && (_jsx(Text, { color: "warning", children: t('approval-subagent', { id: approval.subagentId.slice(0, 8) }) })), approval.external === true && (_jsxs(Text, { color: "warning", wrap: "wrap", children: ["[external] ", t('approval-external-hint')] })), approval.title !== undefined && (_jsx(Text, { wrap: "wrap", children: approval.title })), approval.command !== undefined && (_jsx(Box, { flexDirection: "column", paddingX: 2, children: _jsx(Text, { dimColor: true, wrap: "wrap", children: approval.command }) })), approval.reason !== undefined && (_jsx(Text, { dimColor: true, wrap: "wrap", children: approval.reason })), approval.blockedPath !== undefined && (_jsx(Text, { color: "warning", wrap: "wrap", children: t('approval-blocked-path', { path: approval.blockedPath }) })), _jsx(Text, { dimColor: true, children: t('approval-proceed') })] }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: options.map((option, index) => {
                     const focused = index === focusIndex;
                     const hovered = index === hoverIndex;
-                    return (_jsxs(Box, { flexDirection: "row", marginTop: focused ? 1 : 0, onClick: () => onDecide(OUTCOMES[index]), onMouseEnter: () => setHoverIndex(index), onMouseLeave: () => setHoverIndex(current => (current === index ? -1 : current)), backgroundColor: hovered && !focused ? 'userMessageBackgroundHover' : undefined, children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: focused ? 'accent' : undefined, bold: focused, children: focused ? POINTER : ' ' }) }), _jsxs(Text, { bold: focused, color: focused ? 'accent' : undefined, wrap: "wrap", children: [index + 1, ". ", label] })] }, label));
-                }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t('approval-hint') }) })] }));
+                    const label = optionLabel(option);
+                    const reasonLines = acceptsFeedback && option.kind === 'reject' && feedback !== ''
+                        ? feedbackRowLines(`${index + 1}. `, label, feedback, columns)
+                        : undefined;
+                    return (_jsxs(Box, { flexDirection: "row", marginTop: focused ? 1 : 0, onClick: () => decide(index, true), onMouseEnter: () => setHoverIndex(index), onMouseLeave: () => setHoverIndex(current => (current === index ? -1 : current)), backgroundColor: hovered && !focused ? 'userMessageBackgroundHover' : undefined, children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: focused ? 'accent' : undefined, bold: focused, children: focused ? POINTER : ' ' }) }), reasonLines === undefined ? (_jsxs(Text, { bold: focused, color: focused ? 'accent' : undefined, wrap: "wrap", children: [index + 1, ". ", label] })) : (_jsx(Box, { flexDirection: "column", children: reasonLines.map((line, row) => (_jsx(Text, { bold: focused, color: focused ? 'accent' : undefined, wrap: "truncate-end", children: line }, row))) }))] }, option.id));
+                }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: acceptsFeedback ? t('approval-hint-feedback') : t('approval-hint') }) })] }));
 }

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

@@ -0,0 +1,18 @@
+/**
+ * Claude 娘精灵表（30 列 × 30 精灵格，半块渲染 → 15 个文本行）。
+ *
+ * 来源：cc-bridge 项目的 `assets/maid.png`（1024×1024 透明底，开发期占位
+ * 素材——授权状态见其 assets/README：自用可，再分发前需确认或替换）。
+ * 由 `.local/claude-asset/convert-claude-girl.mjs` 生成：alpha 感知包围盒 →
+ * 众数降采样（`convert-maid.mjs` 的管线，去掉白底 flood-fill 与修脸步骤）。
+ *
+ * 契约：每行 30 格；`null` = 透明；每格是 [r, g, b]。渲染见 `ClaudeGirl.tsx`
+ * （与 `WhaleGirl.tsx` 同一套半块技法）。改了源图就重跑脚本，不要手改这个文件。
+ */
+/** 精灵格数（列）。 */
+export declare const CLAUDE_GIRL_COLS = 30;
+/** 精灵行数（半块渲染后是 `CLAUDE_GIRL_ROWS / 2` 个文本行）。 */
+export declare const CLAUDE_GIRL_SPRITE_ROWS = 30;
+/** 精灵表：[行][列] = null（透明）或 [r, g, b]。 */
+export declare const CLAUDE_GIRL_SPRITE: readonly (readonly (readonly [number, number, number] | null)[])[];
+//# sourceMappingURL=claudeGirlSprite.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"claudeGirlSprite.d.ts","sourceRoot":"","sources":["../../../src/components/claudeGirlSprite.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,eAAe;AACf,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAClC,gDAAgD;AAChD,eAAO,MAAM,uBAAuB,KAAK,CAAA;AAEzC,wCAAwC;AACxC,eAAO,MAAM,kBAAkB,EAAE,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,EA+BhG,CAAA"}

package/lib/types/components/claudeGirlSprite.js

@@ -0,0 +1,48 @@
+/**
+ * Claude 娘精灵表（30 列 × 30 精灵格，半块渲染 → 15 个文本行）。
+ *
+ * 来源：cc-bridge 项目的 `assets/maid.png`（1024×1024 透明底，开发期占位
+ * 素材——授权状态见其 assets/README：自用可，再分发前需确认或替换）。
+ * 由 `.local/claude-asset/convert-claude-girl.mjs` 生成：alpha 感知包围盒 →
+ * 众数降采样（`convert-maid.mjs` 的管线，去掉白底 flood-fill 与修脸步骤）。
+ *
+ * 契约：每行 30 格；`null` = 透明；每格是 [r, g, b]。渲染见 `ClaudeGirl.tsx`
+ * （与 `WhaleGirl.tsx` 同一套半块技法）。改了源图就重跑脚本，不要手改这个文件。
+ */
+/** 精灵格数（列）。 */
+export const CLAUDE_GIRL_COLS = 30;
+/** 精灵行数（半块渲染后是 `CLAUDE_GIRL_ROWS / 2` 个文本行）。 */
+export const CLAUDE_GIRL_SPRITE_ROWS = 30;
+/** 精灵表：[行][列] = null（透明）或 [r, g, b]。 */
+export const CLAUDE_GIRL_SPRITE = [
+    [null, null, null, null, null, null, [43, 7, 7], [251, 143, 77], [43, 7, 6], [43, 7, 6], [43, 7, 7], null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [null, null, null, null, null, [43, 7, 7], [251, 143, 77], [251, 143, 77], [251, 143, 77], [251, 143, 77], [252, 145, 80], [43, 7, 6], null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [null, null, null, null, [41, 7, 7], [251, 142, 77], [45, 7, 6], [43, 7, 6], null, [43, 7, 6], [252, 145, 80], [251, 143, 77], [45, 7, 6], [47, 8, 7], [251, 143, 77], [43, 7, 7], [225, 85, 46], [43, 7, 7], [43, 7, 7], null, null, null, null, null, null, null, null, null, null, null],
+    [null, null, null, null, [251, 138, 74], [49, 8, 7], null, null, null, [215, 72, 38], [215, 72, 38], [251, 143, 77], [196, 61, 32], [251, 143, 77], [251, 143, 77], [251, 143, 77], [251, 143, 77], [250, 143, 80], [250, 143, 80], [43, 7, 7], null, null, null, null, null, null, null, null, null, null],
+    [null, null, null, null, [215, 72, 38], [43, 7, 7], null, [43, 7, 6], [208, 70, 38], [251, 142, 77], [251, 143, 77], [252, 145, 80], [251, 143, 77], [252, 142, 79], [251, 142, 77], [228, 88, 47], [251, 143, 77], [251, 143, 77], [251, 143, 77], [251, 140, 75], [41, 7, 7], [252, 146, 75], [39, 6, 6], null, null, null, null, null, null, null],
+    [null, null, null, null, null, [41, 7, 7], [47, 8, 7], [251, 140, 75], [252, 142, 79], [251, 142, 77], [228, 88, 47], [251, 142, 77], [251, 143, 77], [252, 142, 79], [251, 143, 77], [251, 143, 77], [251, 143, 77], [251, 143, 77], [251, 143, 77], [252, 144, 74], [252, 146, 75], [252, 144, 74], [251, 141, 72], [252, 146, 75], null, null, null, null, null, null],
+    [null, null, null, null, null, [41, 7, 7], [251, 143, 77], [251, 142, 77], [251, 143, 77], [227, 87, 46], [251, 143, 77], [251, 142, 77], [251, 142, 77], [251, 143, 77], [251, 143, 77], [251, 142, 77], [251, 143, 77], [251, 143, 77], [41, 7, 7], [252, 144, 74], [251, 141, 72], [252, 244, 235], [252, 144, 74], [41, 7, 7], [39, 6, 6], null, null, null, null, null],
+    [null, null, null, null, null, [41, 7, 7], [252, 184, 121], [252, 184, 121], [251, 143, 77], [251, 140, 75], [251, 143, 77], [251, 143, 77], [251, 143, 77], [251, 143, 77], [251, 143, 77], [251, 143, 77], [251, 143, 77], [251, 143, 77], [251, 143, 77], [252, 142, 75], [251, 141, 72], [240, 100, 47], [252, 146, 75], [252, 146, 75], [77, 63, 67], [39, 6, 6], null, null, null, null],
+    [null, null, null, null, [43, 7, 6], [251, 142, 77], [252, 182, 119], [252, 182, 119], [252, 182, 119], [252, 182, 119], [251, 143, 77], [252, 145, 80], [251, 143, 77], [251, 143, 77], [252, 145, 80], [251, 143, 77], [251, 143, 77], [252, 182, 119], [252, 186, 124], [47, 8, 7], [252, 142, 75], [252, 144, 74], [252, 144, 74], [80, 66, 69], [77, 63, 67], [77, 63, 67], [39, 6, 6], null, null, null],
+    [null, null, null, null, [251, 140, 75], [251, 142, 77], [251, 143, 77], [252, 184, 121], [252, 184, 121], [251, 143, 77], [251, 143, 77], [252, 188, 126], [252, 184, 121], [251, 143, 77], [252, 184, 121], [251, 140, 75], [251, 140, 75], [251, 143, 77], [251, 142, 77], [251, 140, 75], [41, 7, 7], [76, 62, 64], [251, 242, 222], [46, 26, 27], [42, 22, 23], [59, 43, 46], null, null, null, null],
+    [null, null, null, [39, 6, 6], [251, 141, 76], [251, 142, 77], [228, 88, 47], [252, 184, 121], [252, 184, 121], [251, 143, 77], [251, 143, 77], [252, 186, 124], [252, 184, 121], [252, 184, 121], [251, 143, 77], [251, 143, 77], [43, 7, 7], [251, 142, 77], [251, 142, 77], [228, 88, 47], [251, 140, 75], [41, 7, 7], [251, 242, 222], [49, 31, 33], [77, 63, 67], [43, 7, 6], null, null, null, null],
+    [null, null, [43, 7, 6], [251, 143, 77], [251, 143, 77], [251, 140, 75], [251, 142, 77], [251, 142, 77], [251, 143, 77], [251, 143, 77], [49, 8, 7], [251, 143, 77], [251, 143, 77], [251, 143, 77], [251, 143, 77], [251, 143, 77], [47, 8, 7], [250, 199, 190], [251, 140, 75], [251, 140, 75], [251, 138, 74], [251, 140, 75], [251, 242, 222], [41, 7, 7], [77, 63, 67], [77, 63, 67], [43, 7, 6], null, null, null],
+    [null, null, [43, 7, 6], [251, 142, 77], [45, 7, 6], [251, 138, 74], [251, 141, 76], [251, 142, 77], [225, 85, 46], [251, 140, 75], [47, 8, 7], [252, 142, 79], [252, 142, 79], [252, 142, 79], [251, 143, 77], [251, 140, 75], [80, 13, 9], [252, 242, 235], [252, 241, 233], [251, 140, 75], [202, 65, 35], [251, 140, 75], [47, 8, 7], [55, 37, 38], [229, 194, 157], [76, 62, 64], [39, 6, 6], null, null, null],
+    [null, null, null, [42, 6, 6], [251, 140, 75], [251, 140, 75], [251, 141, 76], [251, 143, 77], [225, 85, 46], [250, 140, 76], [252, 241, 233], [52, 10, 9], [251, 141, 76], [251, 143, 77], [251, 143, 77], [250, 143, 80], [90, 17, 11], [251, 243, 236], [45, 8, 8], [45, 8, 8], [108, 23, 13], [251, 140, 75], [251, 242, 222], [251, 242, 222], [236, 205, 168], [41, 7, 7], null, null, null, null],
+    [null, null, null, [43, 7, 6], [251, 140, 75], [228, 88, 47], [251, 142, 77], [251, 142, 77], [215, 78, 43], [49, 8, 7], [252, 241, 233], [45, 8, 8], [251, 140, 75], [80, 13, 9], [251, 143, 77], [251, 142, 77], [52, 10, 9], [250, 249, 249], [252, 252, 252], [252, 252, 252], [45, 8, 8], [251, 140, 75], [45, 8, 8], [251, 242, 222], [252, 245, 227], [252, 245, 227], [43, 7, 6], null, null, null],
+    [null, null, [43, 7, 6], [251, 140, 75], [251, 140, 75], [251, 140, 75], [251, 142, 77], [251, 142, 77], [108, 23, 13], [45, 8, 8], [45, 8, 8], [250, 249, 249], [250, 249, 249], [45, 8, 8], [251, 243, 236], [251, 140, 75], [52, 10, 9], [251, 130, 55], [252, 133, 58], [251, 130, 55], [252, 252, 252], [251, 140, 75], [251, 140, 75], [223, 81, 43], [252, 245, 227], [252, 245, 227], [43, 7, 6], null, null, null],
+    [null, null, [251, 140, 75], [225, 83, 44], [192, 60, 32], [251, 141, 76], [228, 88, 47], [251, 142, 77], [251, 143, 77], [45, 8, 8], [252, 252, 252], [251, 130, 55], [251, 130, 55], [251, 243, 236], [252, 242, 235], [252, 242, 235], [251, 243, 236], [252, 252, 252], [253, 150, 77], [253, 150, 77], [52, 10, 9], [251, 138, 73], [251, 139, 75], [251, 140, 75], [190, 56, 30], [45, 8, 8], null, null, null, null],
+    [null, null, null, [43, 7, 6], [251, 140, 75], [251, 142, 77], [228, 88, 47], [251, 141, 76], [251, 140, 75], [252, 252, 252], [252, 252, 252], [253, 150, 77], [253, 150, 77], [252, 242, 235], [252, 242, 235], [252, 242, 235], [252, 242, 235], [252, 242, 235], [252, 241, 233], [252, 226, 218], [251, 231, 222], [57, 10, 7], [251, 137, 74], [251, 138, 74], [190, 56, 30], [251, 138, 74], null, null, null, null],
+    [null, null, null, [43, 7, 6], [251, 140, 75], [192, 60, 32], [251, 138, 74], [192, 60, 32], [196, 61, 32], [49, 8, 7], [252, 252, 252], [253, 150, 77], [45, 8, 8], [45, 8, 8], [45, 8, 8], [251, 138, 73], [252, 241, 233], [252, 242, 235], [252, 241, 233], [252, 226, 218], [252, 226, 218], [251, 138, 73], [251, 139, 75], [186, 55, 30], [186, 55, 30], [251, 138, 74], [43, 7, 6], [41, 7, 7], null, null],
+    [null, null, null, [43, 7, 6], [47, 8, 7], [192, 60, 32], [251, 138, 74], [192, 60, 32], [251, 142, 77], [47, 8, 7], [252, 220, 212], [252, 215, 206], [251, 138, 73], [251, 140, 75], [251, 140, 75], [251, 138, 73], [251, 138, 73], [45, 8, 8], [252, 241, 233], [251, 239, 230], [47, 8, 7], [251, 138, 73], [181, 53, 29], [186, 55, 30], [251, 137, 74], [251, 137, 74], [251, 138, 74], [251, 139, 75], [43, 7, 6], null],
+    [null, null, null, null, [252, 137, 73], [190, 56, 30], [192, 60, 32], [196, 61, 32], [251, 140, 75], [251, 140, 75], [208, 70, 38], [43, 7, 7], [251, 140, 75], [251, 138, 73], [251, 140, 75], [251, 140, 75], [251, 140, 75], [45, 8, 8], [69, 55, 57], [45, 8, 8], [190, 56, 30], [190, 56, 30], [251, 133, 70], [250, 136, 72], [227, 87, 46], [251, 139, 75], [43, 7, 7], [43, 7, 6], null, null],
+    [null, null, null, [43, 7, 6], [251, 138, 74], [251, 138, 73], [250, 136, 72], [225, 85, 46], [186, 55, 30], [231, 93, 48], [41, 7, 7], [251, 140, 75], [251, 140, 75], [251, 140, 75], [251, 140, 75], [251, 140, 75], [38, 6, 6], [251, 243, 236], [251, 243, 236], [252, 242, 235], [45, 8, 8], [226, 84, 45], [228, 88, 47], [227, 87, 46], [227, 87, 46], [251, 138, 74], [251, 138, 74], null, null, null],
+    [null, null, [251, 138, 74], [251, 138, 74], [251, 138, 73], [251, 138, 74], [227, 87, 46], [251, 138, 74], [251, 138, 74], [225, 85, 46], [252, 241, 233], [252, 242, 235], [41, 7, 7], [45, 8, 8], [238, 216, 206], [41, 7, 7], [252, 242, 235], [252, 242, 235], [251, 243, 236], [43, 9, 9], [216, 185, 173], [225, 85, 46], [250, 126, 66], [225, 85, 46], [252, 135, 72], [251, 138, 74], [251, 138, 74], [251, 138, 74], [39, 6, 6], null],
+    [null, [251, 138, 74], [251, 138, 74], [225, 83, 44], [251, 138, 74], [251, 138, 74], [228, 88, 47], [251, 138, 74], [228, 88, 47], [251, 243, 236], [252, 242, 235], [252, 242, 235], [251, 243, 236], [226, 199, 188], [39, 17, 17], [72, 58, 61], [47, 11, 11], [252, 242, 235], [252, 242, 235], [196, 160, 148], [44, 13, 13], [251, 243, 236], [251, 133, 70], [226, 84, 45], [250, 136, 72], [228, 88, 47], [250, 136, 72], [225, 81, 42], [251, 138, 74], null],
+    [null, [251, 138, 74], [223, 81, 43], [181, 53, 29], [252, 179, 115], [227, 87, 46], [228, 88, 47], [251, 138, 74], [45, 8, 8], [251, 244, 238], [196, 160, 148], [252, 242, 235], [43, 9, 9], [75, 60, 62], [76, 62, 64], [72, 58, 61], [252, 140, 64], [43, 9, 9], [192, 153, 141], [251, 243, 236], [251, 244, 238], [251, 243, 236], [225, 83, 44], [252, 137, 73], [251, 138, 74], [251, 138, 74], [250, 136, 72], [192, 60, 32], [43, 7, 6], null],
+    [null, null, [43, 7, 6], [47, 8, 7], [252, 179, 115], [227, 87, 46], [250, 136, 72], [227, 87, 46], [251, 243, 236], [196, 160, 148], [251, 244, 238], [251, 244, 238], [251, 244, 238], [197, 132, 70], [197, 132, 70], [72, 58, 61], [252, 140, 64], [251, 244, 238], [251, 244, 238], [251, 244, 238], [192, 153, 141], [251, 243, 236], [223, 81, 43], [250, 136, 72], [226, 84, 45], [250, 136, 72], [250, 136, 72], [250, 136, 72], null, null],
+    [null, null, null, [43, 7, 7], [251, 138, 73], [250, 136, 72], [227, 87, 46], [225, 85, 46], [52, 10, 9], [251, 243, 236], [196, 160, 148], [251, 244, 238], [47, 11, 11], [72, 58, 61], [233, 209, 198], [42, 22, 23], [47, 11, 11], [44, 13, 13], [251, 243, 236], [251, 243, 236], [251, 243, 236], [241, 221, 211], [222, 76, 39], [225, 83, 44], [225, 85, 46], [250, 136, 72], [251, 137, 74], [250, 136, 72], [45, 7, 6], null],
+    [null, null, [43, 7, 6], [251, 138, 74], [251, 140, 75], [251, 138, 74], [225, 85, 46], [225, 83, 44], [225, 83, 44], [59, 43, 46], [251, 243, 236], [251, 243, 236], [251, 243, 236], [251, 243, 236], [233, 209, 198], [251, 243, 236], [247, 224, 186], [44, 13, 13], [44, 13, 13], [251, 243, 236], [238, 216, 206], [235, 212, 202], [252, 241, 233], [223, 81, 43], [43, 7, 6], [251, 138, 74], [251, 137, 74], [45, 7, 6], null, null],
+    [null, null, null, [251, 140, 75], [251, 140, 75], [47, 8, 7], [251, 138, 74], [47, 8, 7], [75, 60, 62], [47, 19, 19], [252, 242, 235], [235, 212, 202], [251, 243, 236], [233, 209, 198], [251, 244, 238], [251, 244, 238], [247, 224, 186], [247, 224, 186], [75, 60, 62], [76, 62, 64], [39, 17, 17], [39, 17, 17], [43, 9, 9], [43, 7, 6], [43, 7, 6], [43, 7, 7], [43, 7, 6], null, null, null],
+    [null, null, null, null, null, null, [43, 7, 7], [45, 8, 8], [45, 8, 8], [43, 9, 9], [47, 11, 11], [45, 8, 8], [45, 8, 8], [43, 9, 9], [43, 9, 9], [45, 8, 8], [45, 8, 8], [45, 8, 8], [39, 10, 10], [76, 62, 64], [43, 9, 9], [72, 58, 61], [251, 239, 230], [43, 9, 9], null, null, null, null, null, null],
+];

package/lib/types/components/design-system/Divider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Divider.d.ts","sourceRoot":"","sources":["../../../../src/components/design-system/Divider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4C,MAAM,OAAO,CAAA;AAQhE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAE3C,KAAK,YAAY,GAAG;IAClB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,KAAK,CAAA;IAEnB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AASD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,OAAO,CAAC,EACtB,KAAK,EACL,KAAK,EACL,IAAU,EACV,OAAW,EACX,KAAK,EACL,KAAa,GACd,EAAE,YAAY,GAAG,KAAK,CAAC,SAAS,CAoFhC"}
+{"version":3,"file":"Divider.d.ts","sourceRoot":"","sources":["../../../../src/components/design-system/Divider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4C,MAAM,OAAO,CAAA;AAQhE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAE3C,KAAK,YAAY,GAAG;IAClB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,KAAK,CAAA;IAEnB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AASD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,OAAO,CAAC,EACtB,KAAK,EACL,KAAK,EACL,IAAU,EACV,OAAW,EACX,KAAK,EACL,KAAa,GACd,EAAE,YAAY,GAAG,KAAK,CAAC,SAAS,CAyFhC"}

package/lib/types/components/design-system/Divider.js

@@ -5,7 +5,7 @@ import Text from './ThemedText.js';
 import measureElement from '../../ink/measure-element.js';
 import { stringWidth } from '../../ink/stringWidth.js';
 import { useTerminalSize } from '../../ink/hooks/use-terminal-size.js';
-import { usePageInset } from '../PageMargin.js';
+import { useSurfaceEdges } from '../SurfaceEdges.js';
 // Upper bound on distinct measurements applied per terminal-width
 // generation. Converging layouts apply one or two; a non-converging
 // context (content-sized Box, or a sibling negotiating space the same
@@ -35,13 +35,18 @@ const MAX_APPLIED_MEASUREMENTS = 8;
  */
 export function Divider({ width, color, char = '─', padding = 0, title, bleed = false, }) {
     const { columns } = useTerminalSize();
-    const inset = usePageInset();
-    // Full-bleed: the rule spans the terminal columns, shifted left by the
-    // page inset via a negative margin (the box reaches into the margin
-    // area; the parent does not clip). `columns` here is the CONTENT width
-    // (PageMargin narrows TerminalSizeContext), so +2·inset.x = terminal.
-    const bleedX = bleed ? inset.x : 0;
-    const bleedWidth = columns + 2 * bleedX;
+    const edges = useSurfaceEdges();
+    // Full-bleed: the rule spans the SURFACE width, shifted left by the
+    // allowed bleed via a negative margin (the box reaches into the margin
+    // area; the parent does not clip). `columns` here is the SURFACE
+    // content width (PageMargin narrows TerminalSizeContext, the side panel
+    // narrows it again per column), and SurfaceEdges says how far past each
+    // side chrome may run: under PageMargin alone that's {x, x} (the whole
+    // terminal); in the split chat column it's {x, 0} — the rule stops at
+    // the divider instead of painting into the panel.
+    const bleedLeft = bleed ? edges.left : 0;
+    const bleedRight = bleed ? edges.right : 0;
+    const bleedWidth = columns + bleedLeft + bleedRight;
     const [measuredWidth, setMeasuredWidth] = useState(null);
     const boxRef = useRef(null);
     // Measurement feedback guard: the rule width rendered from
@@ -108,7 +113,7 @@ export function Divider({ width, color, char = '─', padding = 0, title, bleed
         text = char.repeat(lineWidth);
     }
     return (_jsx(Box, { ref: boxRef, ...(bleed
-            ? { width: bleedWidth, marginLeft: -bleedX }
+            ? { width: bleedWidth, marginLeft: -bleedLeft }
             : width !== undefined
                 ? { width }
                 : {}), children: _jsx(Text, { dimColor: !color, color: color, wrap: "truncate-end", children: text }) }));

package/lib/types/components/design-system/ThemeProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThemeProvider.d.ts","sourceRoot":"","sources":["../../../../src/components/design-system/ThemeProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyD,MAAM,OAAO,CAAA;AAY7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AA2E/D;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAGrD;AAcD,wBAAgB,aAAa,CAAC,EAC5B,QAAQ,EACR,KAAK,EACL,SAAS,GACV,EAAE;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,qEAAqE;IACrE,SAAS,CAAC,EAAE,YAAY,CAAA;CACzB,GAAG,KAAK,CAAC,SAAS,CA6MlB;AAED;;;GAGG;AACH,wBAAgB,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,CAG9D;AA2BD;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,MAAM,EAAE,CAEpD"}
+{"version":3,"file":"ThemeProvider.d.ts","sourceRoot":"","sources":["../../../../src/components/design-system/ThemeProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+E,MAAM,OAAO,CAAA;AAenG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AA2E/D;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAGrD;AAcD,wBAAgB,aAAa,CAAC,EAC5B,QAAQ,EACR,KAAK,EACL,SAAS,GACV,EAAE;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,qEAAqE;IACrE,SAAS,CAAC,EAAE,YAAY,CAAA;CACzB,GAAG,KAAK,CAAC,SAAS,CA2OlB;AAED;;;GAGG;AACH,wBAAgB,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,CAG9D;AA2BD;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,MAAM,EAAE,CAEpD"}

package/lib/types/components/design-system/ThemeProvider.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React, { createContext, useContext, useEffect, useState } from 'react';
-import { isThemeAvailable, isLightThemeActive, registerCustomThemeResolver, setActiveThemeName, setAutoThemeBase, getAutoThemeBase, AUTO_THEME_NAME, } from '../../theme.js';
+import React, { createContext, useContext, useEffect, useState, useSyncExternalStore } from 'react';
+import { getTheme, isThemeAvailable, isLightThemeActive, registerCustomThemeResolver, setActiveThemeName, setAutoThemeBase, getAutoThemeBase, AUTO_THEME_NAME, THEME_NAMES, } from '../../theme.js';
+import { BRAND_THEMES, getActiveBrand, subscribeActiveBrand } from '../../branding.js';
 import instances from '../../ink/instances.js';
 import { resolveCustomTheme } from '../../customTheme.js';
 import { useRuntimeThemeSnapshot } from '../../hooks/useRuntimeThemeSnapshot.js';
@@ -78,7 +79,7 @@ export function ThemeProvider({ children, theme, themeHost, }) {
             return false;
         if (isThemeAvailable(forced))
             return true;
-        console.warn(`[dsh-tui] theme "${forced}" not found (built-ins: auto, light, dark, dark-ansi; static ~/.dsh-tui/themes/*.json; runtime plugin themes); falling back to auto-detection`);
+        console.warn(`[dsh-tui] theme "${forced}" not found (built-ins: ${AUTO_THEME_NAME}, ${THEME_NAMES.join(', ')}; static ~/.dsh-tui/themes/*.json; runtime plugin themes); falling back to auto-detection`);
         return false;
     });
     // `auto` (like the unforced path) stays null until detection settles, so
@@ -197,6 +198,8 @@ export function ThemeProvider({ children, theme, themeHost, }) {
             return false;
         }
         requestedThemeRef.current = name;
+        // /theme 手选是明确意愿：品牌默认档从此让位（见 renderedTheme 的锁定判定）。
+        brandThemeLockRef.current = true;
         setActive(name);
         if (name === AUTO_THEME_NAME)
             redetectAutoBase();
@@ -221,11 +224,45 @@ export function ThemeProvider({ children, theme, themeHost, }) {
             setActive(requested);
         }
     }, [active, redetectAutoBase, runtimeThemeSnapshot]);
-    const renderedTheme = active === null
-        ? 'dark'
-        : isThemeAvailable(active)
-            ? active
-            : AUTO_THEME_NAME;
+    // ── 品牌默认档（branding.ts）───────────────────────────────────────────
+    // Claude 后端（claude 品牌）时把默认主题档替换成 Claude 双主题（claude-dark
+    // / claude-paper，按解析档深浅自动落位）——启动页
+    // 与对话页跟着后端整体换色。锁定判定（用户表达过明确意愿时不覆盖）：
+    // - 显式 `theme` prop / `DSH_TUI_THEME`：锁；
+    // - 会话内 `/theme` 手选：锁（setTheme 置位）；
+    // - 启动时读到的 `~/.dsh-tui/theme.json` 持久化偏好：**不锁**——那是切换
+    //   品档联动之前的历史选择，压住「选了后端整个主题就变」的联动就再也
+    //   切不过去；想固定外观走 `/theme` 重选或设置项 `dsh-tui.brand`。
+    // 品牌经 useSyncExternalStore 订阅：`/settings` 切品牌 → Chat 调
+    // setActiveBrand → 这里即时换档，不重挂组件。
+    const brand = useSyncExternalStore(subscribeActiveBrand, getActiveBrand);
+    const brandThemeLockRef = React.useRef(theme !== undefined || envThemeOverride() !== undefined);
+    const renderedTheme = (() => {
+        const resolved = active === null
+            ? 'dark'
+            : isThemeAvailable(active)
+                ? active
+                : AUTO_THEME_NAME;
+        const brandThemes = BRAND_THEMES[brand];
+        if (brandThemes === undefined || brandThemeLockRef.current)
+            return resolved;
+        // 品牌双主题按解析档深浅落位：浅色终端（或历史 light 偏好）→ 浅色版，
+        // 深色 → 深色版——同一套品牌强调色，切明暗不丢品牌识别（claude 陶土橙、
+        // codex 薰衣草紫）。
+        const lightness = resolved === 'light' || (resolved === AUTO_THEME_NAME && autoBase === 'light') ? 'light' : 'dark';
+        return brandThemes[lightness];
+    })();
+    // 模块级镜像必须**在渲染期**写入（不是 effect）：markdown 把主题色烤进
+    // ANSI 字符串（链接 accent、行内代码 permission…），而它正是被这次 context
+    // 更新触发重渲染的——放进 effect 会让它读到上一帧的主题名，于是换主题后
+    // 链接颜色要等重启才更新。镜像只服务非 React 渲染（markdown/hyperlink）。
+    // 当前色板的**身份**：运行时主题在同一批里释放并重注册时名字不变，但 resolver
+    // 已经换了一个新色板对象（themes.ts 每次注册都新建并冻结）。context value 必须
+    // 跟着它换，否则消费者（含按色板身份 memo 的 Markdown）完全不重渲染，屏幕停在
+    // 旧色——切走再切回才刷新。放进 value 依赖即可：内置/静态主题的身份稳定，
+    // 不会因此多渲染。
+    const renderedPalette = getTheme(renderedTheme);
+    setActiveThemeName(renderedTheme);
     const value = React.useMemo(() => ({
         theme: renderedTheme,
         autoBase,
@@ -236,11 +273,7 @@ export function ThemeProvider({ children, theme, themeHost, }) {
         // 的终端会报一个跟画面对不上的颜色，那时宁可用纯白（浅色主题）或
         // 纯黑（深色主题）——深色终端上糊一块白底最突兀。
         terminalBackground: hexRgb(imageBackingColor(detectedBackground, renderedTheme)),
-    }), [renderedTheme, autoBase, setTheme, detectedBackground]);
-    useEffect(() => {
-        if (active !== null)
-            setActiveThemeName(renderedTheme);
-    }, [active, renderedTheme]);
+    }), [renderedTheme, renderedPalette, autoBase, setTheme, detectedBackground]);
     // Backdrop shade target: the detected terminal background when OSC 11
     // answered, else black/white by the rendered theme's lightness. `autoBase`
     // is a dependency because `auto` resolves through it.

package/lib/types/components/design-system/ThemedText.d.ts

@@ -50,6 +50,8 @@ export type Props = {
      * parking the native cursor on an inline caret cell).
      */
     readonly ref?: React.Ref<DOMElement>;
+    /** Typed paint metadata; see ink Text's decoration prop. */
+    readonly decoration?: Styles['decoration'];
     readonly children?: React.ReactNode;
 };
 /**
@@ -57,5 +59,5 @@ export type Props = {
  * in the dsh-TUI visual language). This lets components use
  * `color="subtle"`-style theme keys consistently.
  */
-export default function ThemedText({ color, backgroundColor, dimColor, bold, italic, underline, strikethrough, inverse, wrap, ref, children, }: Props): React.ReactNode;
+export default function ThemedText({ color, backgroundColor, dimColor, bold, italic, underline, strikethrough, inverse, wrap, ref, decoration, children, }: Props): React.ReactNode;
 //# sourceMappingURL=ThemedText.d.ts.map

package/lib/types/components/design-system/ThemedText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThemedText.d.ts","sourceRoot":"","sources":["../../../../src/components/design-system/ThemedText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAY,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAGrD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,wCAEtB,CAAA;AAqBZ,MAAM,MAAM,KAAK,GAAG;IAClB;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAEpC;;OAEG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAE9C;;;OAGG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAE3B;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAA;IAEvB;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;IAEzB;;OAEG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAA;IAE5B;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;IAEhC;;OAEG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;IAE1B;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;IAElC;;;OAGG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAEpC,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CACpC,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,KAAK,EACL,eAAe,EACf,QAAgB,EAChB,IAAY,EACZ,MAAc,EACd,SAAiB,EACjB,aAAqB,EACrB,OAAe,EACf,IAAa,EACb,GAAG,EACH,QAAQ,GACT,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CA6BzB"}
+{"version":3,"file":"ThemedText.d.ts","sourceRoot":"","sources":["../../../../src/components/design-system/ThemedText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAY,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAGrD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,wCAEtB,CAAA;AAqBZ,MAAM,MAAM,KAAK,GAAG;IAClB;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAEpC;;OAEG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAE9C;;;OAGG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAE3B;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAA;IAEvB;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;IAEzB;;OAEG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAA;IAE5B;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;IAEhC;;OAEG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;IAE1B;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;IAElC;;;OAGG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAEpC,4DAA4D;IAC5D,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAA;IAE1C,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CACpC,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,KAAK,EACL,eAAe,EACf,QAAgB,EAChB,IAAY,EACZ,MAAc,EACd,SAAiB,EACjB,aAAqB,EACrB,OAAe,EACf,IAAa,EACb,GAAG,EACH,UAAU,EACV,QAAQ,GACT,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CA8BzB"}

package/lib/types/components/design-system/ThemedText.js

@@ -27,7 +27,7 @@ function resolveColor(color, theme) {
  * in the dsh-TUI visual language). This lets components use
  * `color="subtle"`-style theme keys consistently.
  */
-export default function ThemedText({ color, backgroundColor, dimColor = false, bold = false, italic = false, underline = false, strikethrough = false, inverse = false, wrap = 'wrap', ref, children, }) {
+export default function ThemedText({ color, backgroundColor, dimColor = false, bold = false, italic = false, underline = false, strikethrough = false, inverse = false, wrap = 'wrap', ref, decoration, children, }) {
     const [themeName] = useTheme();
     const theme = getTheme(themeName);
     const hoverColor = React.useContext(TextHoverColorContext);
@@ -38,5 +38,5 @@ export default function ThemedText({ color, backgroundColor, dimColor = false, b
             ? theme.inactive
             : resolveColor(color, theme);
     const resolvedBackgroundColor = resolveColor(backgroundColor, theme);
-    return (_jsx(Text, { ref: ref, color: resolvedColor, backgroundColor: resolvedBackgroundColor, bold: bold, italic: italic, underline: underline, strikethrough: strikethrough, inverse: inverse, wrap: wrap, children: children }));
+    return (_jsx(Text, { ref: ref, color: resolvedColor, backgroundColor: resolvedBackgroundColor, bold: bold, italic: italic, underline: underline, strikethrough: strikethrough, inverse: inverse, wrap: wrap, decoration: decoration, children: children }));
 }

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

@@ -0,0 +1,55 @@
+import type { ToolFileDiff } from '../dsh-adapter/channel.js';
+/** The `patch` member of the union. */
+export type ToolPatchDiff = Extract<ToolFileDiff, {
+    readonly patch: string;
+}>;
+/** Whether a file diff carries a unified patch (vs old/new texts). */
+export declare const isPatchDiff: (diff: ToolFileDiff) => diff is ToolPatchDiff;
+/** One line of a hunk with its real file line numbers. */
+export interface PatchLine {
+    readonly kind: 'context' | 'del' | 'add';
+    readonly text: string;
+    /** Line number in the old file (context and removed lines). */
+    readonly oldNo?: number;
+    /** Line number in the new file (context and added lines). */
+    readonly newNo?: number;
+}
+/** One parsed hunk. */
+export interface PatchHunk {
+    readonly oldStart: number;
+    readonly newStart: number;
+    readonly lines: readonly PatchLine[];
+}
+/** One file's parsed patch. */
+export interface ParsedPatch {
+    readonly hunks: readonly PatchHunk[];
+    /** Added / removed line counts over every hunk (the `(+N -M)` stat). */
+    readonly added: number;
+    readonly removed: number;
+    /** The widest line number any hunk shows (gutter width). */
+    readonly maxLineNo: number;
+    /** No hunk could be read: the patch's own lines, shown as-is. */
+    readonly raw?: readonly string[];
+}
+/** Parse one file's patch (cached by its text, path and change kind). */
+export declare function parseFilePatch(diff: ToolPatchDiff): ParsedPatch;
+/**
+ * The header a patch file renders above its hunks. In a multi-file card
+ * every file gets a path row (`path` / `path → moved`, clickable, opening
+ * `target`) followed by a dim `suffix` (` · new file (+3 -0)`). A lone file
+ * already has its path in the card title, so it gets only the dim stat
+ * line (`(+1 -1)`, `new file (+3 -0)`, `→ moved.ts (+1 -1)`).
+ */
+export type PatchHeader = {
+    readonly kind: 'path';
+    readonly path: string;
+    readonly target: string;
+    readonly suffix: string;
+} | {
+    readonly kind: 'stat';
+    readonly text: string;
+};
+export declare function patchHeader(diff: ToolPatchDiff, parsed: ParsedPatch, multiFile: boolean): PatchHeader;
+/** The plain text of a header (split view separators, tests). */
+export declare const patchHeaderText: (header: PatchHeader) => string;
+//# sourceMappingURL=diffPatch.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"diffPatch.d.ts","sourceRoot":"","sources":["../../../src/components/diffPatch.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAG7D,uCAAuC;AACvC,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,YAAY,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAE7E,sEAAsE;AACtE,eAAO,MAAM,WAAW,GAAI,MAAM,YAAY,KAAG,IAAI,IAAI,aAAgC,CAAA;AAEzF,0DAA0D;AAC1D,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,KAAK,GAAG,KAAK,CAAA;IACxC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,+DAA+D;IAC/D,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACvB,6DAA6D;IAC7D,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,uBAAuB;AACvB,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAA;CACrC;AAED,+BAA+B;AAC/B,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAA;IACpC,wEAAwE;IACxE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,iEAAiE;IACjE,QAAQ,CAAC,GAAG,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CACjC;AAyED,yEAAyE;AACzE,wBAAgB,cAAc,CAAC,IAAI,EAAE,aAAa,GAAG,WAAW,CAqB/D;AAUD;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAClG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAEpD,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,GAAG,WAAW,CAarG;AAED,iEAAiE;AACjE,eAAO,MAAM,eAAe,GAAI,QAAQ,WAAW,KAAG,MAAiF,CAAA"}