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

package/lib/types/screens/Settings.js

@@ -46,6 +46,7 @@ export function Settings({ channel, onClose, }) {
     const [sections, setSections] = React.useState(() => channel.settingsSections());
     const [mode, setMode] = React.useState('list');
     const [editing, setEditing] = React.useState(null);
+    const [activeGroup, setActiveGroup] = React.useState(null);
     const [focusIndex, setFocusIndex] = React.useState(0);
     const [notice, setNotice] = React.useState(undefined);
     /** Configured status of every secret field's credential ref. */
@@ -100,8 +101,26 @@ export function Settings({ channel, onClose, }) {
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [host, sections, secretProbe]);
-    /** Focusable rows in display order: every field of every section. */
-    const focusable = sections.flatMap(section => section.fields.map(field => ({ ns: section.ns, field })));
+    const activeSection = activeGroup === null ? undefined : sections.find(section => section.ns === activeGroup.ns);
+    const activeGroupSpec = activeSection?.groups?.find(group => group.id === activeGroup?.id);
+    React.useEffect(() => {
+        if (activeGroup !== null && activeGroupSpec === undefined) {
+            setActiveGroup(null);
+            setFocusIndex(0);
+            setWindowStart(0);
+        }
+    }, [activeGroup, activeGroupSpec]);
+    /** Focusable rows in display order for the current page. */
+    const focusable = activeSection !== undefined && activeGroupSpec !== undefined
+        ? activeSection.fields
+            .filter(field => field.group === activeGroupSpec.id)
+            .map(field => ({ kind: 'field', ns: activeSection.ns, field }))
+        : sections.flatMap(section => [
+            ...section.fields
+                .filter(field => field.group === undefined)
+                .map(field => ({ kind: 'field', ns: section.ns, field })),
+            ...(section.groups ?? []).map(group => ({ kind: 'group', ns: section.ns, group })),
+        ]);
     const effFocus = Math.min(focusIndex, Math.max(0, focusable.length - 1));
     const focused = focusable.length === 0 ? undefined : focusable[effFocus];
     const focusedForm = focused === undefined ? undefined : forms.get(focused.ns);
@@ -173,6 +192,12 @@ export function Settings({ channel, onClose, }) {
             setFocusIndex(Math.min(Math.max(0, focusable.length - 1), effFocus + 1));
         }
         else if (isPlainReturn(key) && focused !== undefined) {
+            if (focused.kind === 'group') {
+                setActiveGroup({ ns: focused.ns, id: focused.group.id });
+                setFocusIndex(0);
+                setWindowStart(0);
+                return;
+            }
             // A save in flight owns the section's drafts; starting an edit mid-write
             // is exactly the lost-draft race the staged model exists to prevent.
             if (focusedForm === undefined || !focusedForm.available || focusedForm.saving)
@@ -196,11 +221,17 @@ export function Settings({ channel, onClose, }) {
             bump();
         }
         else if (key.escape) {
-            // Esc backs out one layer at a time: staged drafts first — ANY dirty
-            // section, not just the focused one, so leaving never silently drops
-            // an edit made two sections ago — the screen second. A save in flight
-            // cannot be undone from here; let it settle instead of discarding
-            // around it.
+            if (activeGroupSpec !== undefined) {
+                // Group navigation never settles drafts; the root page owns discard/exit.
+                setActiveGroup(null);
+                setFocusIndex(0);
+                setWindowStart(0);
+                return;
+            }
+            // At the root, Esc backs out one layer at a time: staged drafts first —
+            // ANY dirty section, not just the focused one — then the screen itself.
+            // A save in flight cannot be undone from here; let it settle instead of
+            // discarding around it.
             const dirty = [...forms.values()].filter(form => form.shell().dirty);
             if (dirty.length > 0) {
                 if (dirty.some(form => form.saving))
@@ -219,7 +250,7 @@ export function Settings({ channel, onClose, }) {
         const ns = section.ns;
         const form = forms.get(ns);
         const state = form?.field(field) ?? { text: '', overridden: false, invalid: false };
-        const isFocused = focused !== undefined && focused.ns === ns && focused.field === field;
+        const isFocused = focused?.kind === 'field' && focused.ns === ns && focused.field === field;
         const isEditing = isFocused && mode === 'edit' && editing !== null;
         const label = pick(field.label, field.descriptions);
         const hint = field.hint !== undefined ? pick(field.hint, field.hintDescriptions) : undefined;
@@ -248,58 +279,82 @@ export function Settings({ channel, onClose, }) {
         return (_jsxs(Box, { children: [_jsx(Text, { color: isFocused ? 'suggestion' : undefined, children: isFocused ? '❯ ' : '  ' }), _jsx(Text, { bold: isFocused, children: label }), _jsx(Box, { flexGrow: 1 }), state.invalid && _jsxs(Text, { color: "error", children: [t('settings-field-invalid'), " "] }), state.overridden && _jsxs(Text, { dimColor: true, children: ["[", t('settings-badge-override'), "] "] }), form?.isStaged(field) === true && !isEditing && _jsx(Text, { color: "suggestion", children: "* " }), _jsx(Text, { color: isEditing || isFocused ? 'suggestion' : undefined, dimColor: !isFocused && !isEditing && state.text === '', children: value }), hint !== undefined && isFocused && (_jsxs(Text, { dimColor: true, children: ['\n    ', hint] }))] }));
     };
     // ── Layout: a flat entry list with accounted line heights, windowed so the
-    // focused field is always on screen no matter how long the list gets. ────
+    // focused row is always on screen no matter how long the current page gets. ─
     const entries = [];
     let focusCursor = 0;
-    sections.forEach((section, sectionIndex) => {
-        const form = forms.get(section.ns);
-        const view = form?.namespace;
-        const shell = form?.shell();
+    const addField = (section, field) => {
+        const isFocused = focused?.kind === 'field' && focused.ns === section.ns && focused.field === field;
+        const index = focusCursor;
+        focusCursor += 1;
         entries.push({
-            key: `section:${section.ns}`,
-            lines: sectionIndex === 0 ? 1 : 2,
-            node: (_jsxs(Box, { flexDirection: "column", children: [sectionIndex > 0 && _jsx(Text, { children: " " }), _jsxs(Box, { children: [_jsx(Text, { bold: true, color: "permission", children: pick(section.title, section.descriptions) }), _jsxs(Text, { dimColor: true, children: [" (", section.ns, ")"] }), view?.applies === 'restart' && _jsxs(Text, { color: "warning", children: [" [", t('settings-badge-restart'), "]"] }), view === undefined && _jsxs(Text, { color: "warning", children: [" [", t('settings-section-unavailable'), "]"] }), shell?.dirty === true && _jsxs(Text, { color: "suggestion", children: [" [", t('settings-badge-dirty'), "]"] }), shell?.saving === true && _jsxs(Text, { dimColor: true, children: [" [", t('settings-badge-saving'), "]"] }), shell?.failed === true && _jsxs(Text, { color: "error", children: [" [", t('settings-badge-failed'), "]"] })] })] })),
+            key: `field:${section.ns}:${field.path.join('.')}`,
+            lines: field.hint !== undefined && isFocused ? 2 : 1,
+            focus: index,
+            node: renderField(section, field),
         });
-        for (const field of section.fields) {
-            const isFocused = focused !== undefined && focused.ns === section.ns && focused.field === field;
-            const hasHint = field.hint !== undefined && isFocused;
-            const index = focusCursor;
-            focusCursor += 1;
+    };
+    if (activeSection !== undefined && activeGroupSpec !== undefined) {
+        const groupFields = activeSection.fields.filter(field => field.group === activeGroupSpec.id);
+        for (const field of groupFields)
+            addField(activeSection, field);
+        if (groupFields.length === 0) {
+            entries.push({ key: 'group:empty', lines: 1, node: _jsx(Text, { dimColor: true, children: t('settings-group-empty') }) });
+        }
+    }
+    else {
+        sections.forEach((section, sectionIndex) => {
+            const form = forms.get(section.ns);
+            const view = form?.namespace;
+            const shell = form?.shell();
             entries.push({
-                key: `field:${section.ns}:${field.path.join('.')}`,
-                lines: hasHint ? 2 : 1,
-                focus: index,
-                node: renderField(section, field),
+                key: `section:${section.ns}`,
+                lines: sectionIndex === 0 ? 1 : 2,
+                node: (_jsxs(Box, { flexDirection: "column", children: [sectionIndex > 0 && _jsx(Text, { children: " " }), _jsxs(Box, { children: [_jsx(Text, { bold: true, color: "permission", children: pick(section.title, section.descriptions) }), _jsxs(Text, { dimColor: true, children: [" (", section.ns, ")"] }), view?.applies === 'restart' && _jsxs(Text, { color: "warning", children: [" [", t('settings-badge-restart'), "]"] }), view === undefined && _jsxs(Text, { color: "warning", children: [" [", t('settings-section-unavailable'), "]"] }), shell?.dirty === true && _jsxs(Text, { color: "suggestion", children: [" [", t('settings-badge-dirty'), "]"] }), shell?.saving === true && _jsxs(Text, { dimColor: true, children: [" [", t('settings-badge-saving'), "]"] }), shell?.failed === true && _jsxs(Text, { color: "error", children: [" [", t('settings-badge-failed'), "]"] })] })] })),
             });
-        }
-    });
-    const registeredNs = new Set(sections.map(section => section.ns));
-    const readonlyNamespaces = namespaces.filter(entry => !registeredNs.has(entry.ns));
-    if (readonlyNamespaces.length > 0) {
-        entries.push({
-            key: 'readonly:heading',
-            lines: 2,
-            node: (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: " " }), _jsx(Text, { bold: true, dimColor: true, children: t('settings-readonly-heading') })] })),
+            for (const field of section.fields) {
+                if (field.group === undefined)
+                    addField(section, field);
+            }
+            for (const group of section.groups ?? []) {
+                const isFocused = focused?.kind === 'group' && focused.ns === section.ns && focused.group === group;
+                const index = focusCursor;
+                focusCursor += 1;
+                entries.push({
+                    key: `group:${section.ns}:${group.id}`,
+                    lines: 1,
+                    focus: index,
+                    node: (_jsxs(Box, { children: [_jsx(Text, { color: isFocused ? 'suggestion' : undefined, children: isFocused ? '❯ ' : '  ' }), _jsx(Text, { bold: isFocused, children: pick(group.title, group.descriptions) }), _jsx(Box, { flexGrow: 1 }), _jsx(Text, { color: isFocused ? 'suggestion' : undefined, children: "\u203A" })] })),
+                });
+            }
         });
-        for (const entry of readonlyNamespaces) {
+        const registeredNs = new Set(sections.map(section => section.ns));
+        const readonlyNamespaces = namespaces.filter(entry => !registeredNs.has(entry.ns));
+        if (readonlyNamespaces.length > 0) {
+            entries.push({
+                key: 'readonly:heading',
+                lines: 2,
+                node: (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: " " }), _jsx(Text, { bold: true, dimColor: true, children: t('settings-readonly-heading') })] })),
+            });
+            for (const entry of readonlyNamespaces) {
+                entries.push({
+                    key: `readonly:${entry.ns}`,
+                    lines: 1,
+                    node: (_jsxs(Box, { children: [_jsxs(Text, { children: ['  ', entry.ns] }), entry.applies === 'restart' && _jsxs(Text, { color: "warning", children: [" [", t('settings-badge-restart'), "]"] }), _jsxs(Text, { dimColor: true, children: ['  ', valuePreview(entry.value, 60)] })] })),
+                });
+            }
             entries.push({
-                key: `readonly:${entry.ns}`,
+                key: 'readonly:hint',
                 lines: 1,
-                node: (_jsxs(Box, { children: [_jsxs(Text, { children: ['  ', entry.ns] }), entry.applies === 'restart' && _jsxs(Text, { color: "warning", children: [" [", t('settings-badge-restart'), "]"] }), _jsxs(Text, { dimColor: true, children: ['  ', valuePreview(entry.value, 60)] })] })),
+                node: _jsxs(Text, { dimColor: true, children: ['  ', t('settings-readonly-hint', { path: '~/.dsh/settings.yaml' })] }),
+            });
+        }
+        if (sections.length === 0 && readonlyNamespaces.length === 0) {
+            entries.push({
+                key: 'empty',
+                lines: 1,
+                node: _jsx(Text, { dimColor: true, children: t('settings-empty') }),
             });
         }
-        entries.push({
-            key: 'readonly:hint',
-            lines: 1,
-            node: _jsxs(Text, { dimColor: true, children: ['  ', t('settings-readonly-hint', { path: '~/.dsh/settings.yaml' })] }),
-        });
-    }
-    if (sections.length === 0 && readonlyNamespaces.length === 0) {
-        entries.push({
-            key: 'empty',
-            lines: 1,
-            node: _jsx(Text, { dimColor: true, children: t('settings-empty') }),
-        });
     }
     // Focus-follow window: keep the focused entry fully inside the viewport.
     let totalLines = 0;
@@ -329,5 +384,9 @@ export function Settings({ channel, onClose, }) {
         entryOffset += entry.lines;
         return start >= windowStart && start + entry.lines <= windowStart + viewport;
     });
-    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: t('settings-title') }), _jsx(Box, { flexGrow: 1 }), host === undefined && _jsx(Text, { color: "warning", children: t('settings-unavailable') })] }), _jsx(Divider, {}), visible.map(entry => (_jsx(React.Fragment, { children: entry.node }, entry.key))), _jsx(Box, { flexGrow: 1 }), notice !== undefined && (_jsx(Text, { color: notice.tone === 'error' ? 'error' : 'success', children: notice.text })), _jsx(Divider, {}), _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: mode === 'edit' ? t('settings-hint-edit') : t('settings-hint-list') }) })] }));
+    const title = activeSection !== undefined && activeGroupSpec !== undefined
+        ? `${t('settings-title')} › ${pick(activeSection.title, activeSection.descriptions)} › ${pick(activeGroupSpec.title, activeGroupSpec.descriptions)}`
+        : t('settings-title');
+    const navigationHint = activeGroupSpec === undefined ? t('settings-hint-list') : t('settings-hint-group');
+    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: title }), _jsx(Box, { flexGrow: 1 }), host === undefined && _jsx(Text, { color: "warning", children: t('settings-unavailable') })] }), _jsx(Divider, {}), visible.map(entry => (_jsx(React.Fragment, { children: entry.node }, entry.key))), _jsx(Box, { flexGrow: 1 }), notice !== undefined && (_jsx(Text, { color: notice.tone === 'error' ? 'error' : 'success', children: notice.text })), _jsx(Divider, {}), _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: mode === 'edit' ? t('settings-hint-edit') : navigationHint }) })] }));
 }

package/lib/types/screens/StatusLine.d.ts

@@ -28,4 +28,12 @@ export declare function StatusLine({ channel, selectionActive, helpOpen, wake, }
         tick: number;
     };
 }): React.JSX.Element;
+type UsageSnapshot = {
+    input: number;
+    cacheRead: number;
+    cacheWrite: number;
+};
+/** Return the prompt-cache hit rate, or nothing when usage is unavailable. */
+export declare function formatCacheHitRate(usage: UsageSnapshot | undefined): string | undefined;
+export {};
 //# sourceMappingURL=StatusLine.d.ts.map

package/lib/types/screens/StatusLine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StatusLine.d.ts","sourceRoot":"","sources":["../../../src/screens/StatusLine.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAGxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAQvD;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,EACzB,OAAO,EACP,eAAuB,EACvB,QAAgB,EAChB,IAAI,GACL,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CACvD,qBA2MA"}
+{"version":3,"file":"StatusLine.d.ts","sourceRoot":"","sources":["../../../src/screens/StatusLine.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAGxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAQvD;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,EACzB,OAAO,EACP,eAAuB,EACvB,QAAgB,EAChB,IAAI,GACL,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CACvD,qBAsPA;AAED,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAKvF"}

package/lib/types/screens/StatusLine.js

@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text, useTerminalSize, useTheme } from '../ui.js';
 import { formatTokens } from '../cc/format.js';
 import { t } from '../i18n.js';
+import { formatContextUsage, normalizeStatusBar } from '../tuiDisplayPrefs.js';
 import { Byline } from '../components/design-system/Byline.js';
 import { ActivityLine, contextPressurePct } from '../components/ActivityLine.js';
 import { modeDisplayName } from '../sessionModes.js';
@@ -18,30 +19,32 @@ import { renderContextBar, renderTpsGauge, renderTpsSparkline, speedColor, } fro
 export function StatusLine({ channel, selectionActive = false, helpOpen = false, wake, }) {
     const { columns } = useTerminalSize();
     const [themeName] = useTheme();
+    const statusBar = normalizeStatusBar(channel.statusBar);
     const usage = channel.lastUsage;
+    const contextUsed = usage === undefined
+        ? undefined
+        : usage.input + usage.cacheRead + usage.cacheWrite;
     const contextParts = [];
-    // Session-mode marker (Shift+Tab cycle): hidden on the unmarked base
-    // mode (index 0); sage while a plan-declaring mode is in force.
-    if (channel.modeIndex > 0) {
-        contextParts.push(_jsx(Text, { color: channel.mode.plan === true ? 'planMode' : 'warning', children: modeDisplayName(channel.mode) }, "mode"));
-    }
-    if (channel.reasoningEffort !== undefined) {
+    if (statusBar.thinking && channel.reasoningEffort !== undefined) {
         contextParts.push(_jsx(Text, { color: "inactiveShimmer", children: channel.reasoningEffort }, "effort"));
     }
-    if (usage !== undefined && usage.cacheRead > 0) {
-        // Cache hit rate of the context fed to the model (read / total), one
-        // decimal — the absolute read count lives in the context bar's system
-        // segment, the rate is the glanceable health signal.
-        const total = usage.input + usage.cacheRead + usage.cacheWrite;
-        const rate = total > 0 ? (usage.cacheRead / total) * 100 : 0;
-        contextParts.push(_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: t('status-cache-label') }), _jsxs(Text, { color: "inactiveShimmer", children: [rate.toFixed(1), "%"] })] }, "cache"));
+    if (statusBar.mode && channel.modeIndex > 0) {
+        contextParts.push(_jsx(Text, { color: channel.mode.plan === true ? 'planMode' : 'warning', children: modeDisplayName(channel.mode) }, "mode"));
+    }
+    const formattedContext = statusBar.contextUsage
+        ? formatContextUsage(contextUsed, channel.contextWindow, statusBar.compact)
+        : undefined;
+    const contextUsagePart = formattedContext === undefined
+        ? undefined
+        : (_jsxs(Text, { color: "inactiveShimmer", children: [_jsx(Text, { dimColor: true, children: "ctx " }), formattedContext] }, "context"));
+    if (statusBar.cache) {
+        const cacheRate = formatCacheHitRate(usage);
+        if (cacheRate !== undefined) {
+            contextParts.push(_jsxs(Text, { color: "inactiveShimmer", children: [_jsx(Text, { dimColor: true, children: t('status-cache-label') }), cacheRate] }, "cache"));
+        }
     }
-    // TPS readout sits right after the model so a crowded footer truncates
-    // the trailing fields (tokens/think/cache), never the speedometer. One
-    // number only: the live value (gauge while streaming, sparkline of past
-    // turns once samples exist) — no μ/p95 clutter.
     const tpsParts = [];
-    if (channel.tps !== undefined) {
+    if (statusBar.tps && channel.tps !== undefined) {
         if (channel.working && channel.tpsSamples.length === 0) {
             tpsParts.push(_jsxs(Text, { children: [renderTpsGauge(channel.tps, channel.tps), ' ', _jsxs(Text, { dimColor: true, children: [Math.round(channel.tps), " tps"] })] }, "tps"));
         }
@@ -55,57 +58,77 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
             tpsParts.push(_jsxs(Text, { dimColor: true, children: [Math.round(channel.tps), " t/s"] }, "tps"));
         }
     }
-    // Left group: every field sits at soft white (inactiveShimmer) instead of
-    // the previous uniform dim grey — readable against dark terminals.
     const leftParts = [
-        _jsx(Text, { color: "inactiveShimmer", children: channel.model }, "model"),
+        ...(statusBar.model
+            ? [_jsx(Text, { color: "inactiveShimmer", children: channel.model }, "model")]
+            : []),
         ...tpsParts,
         ...contextParts,
-        _jsxs(Text, { color: "inactiveShimmer", children: [formatTokens(channel.tokens.input), "\u2192", formatTokens(channel.tokens.output)] }, "tokens"),
+        ...(statusBar.tokens
+            ? [
+                _jsxs(Text, { color: "inactiveShimmer", children: [formatTokens(channel.tokens.input), "\u2192", formatTokens(channel.tokens.output)] }, "tokens"),
+            ]
+            : []),
     ];
-    // Right group: git branch in muted steel blue, cwd a soft white, the
-    // session title dimmest (it truncates first anyway).
     const rightParts = [
-        ...(channel.gitBranch
+        ...(statusBar.gitBranch && channel.gitBranch
             ? [
                 _jsx(Text, { color: "professionalBlue", children: channel.gitBranch }, "git"),
             ]
             : []),
-        _jsx(Text, { color: "inactiveShimmer", children: basename(channel.displayCwd) }, "cwd"),
-        ...(channel.sessionTitle
+        ...(statusBar.cwd
+            ? [
+                _jsx(Text, { color: "inactiveShimmer", children: statusBar.compact ? basename(channel.displayCwd) : channel.displayCwd }, "cwd"),
+            ]
+            : []),
+        ...(statusBar.sessionTitle && channel.sessionTitle
             ? [
                 _jsx(Text, { dimColor: true, children: channel.sessionTitle }, "title"),
             ]
             : []),
     ];
-    // Row 3: the mode hint — and, while idle, the working-activity turn
-    // summary (the live working line itself moves to the spinner slot above
-    // the input while a turn runs, so the two never duplicate).
     const hint = selectionActive
         ? t('statusline-hint-select')
         : channel.working
             ? t('statusline-hint-working')
-            : !helpOpen
+            : statusBar.shortcutHint && !helpOpen
                 ? t('statusline-hint-shortcuts')
                 : '';
     const activity = channel.workingActivity;
-    const showActivity = !channel.working &&
+    const showActivity = statusBar.activity &&
+        !channel.working &&
         activity !== undefined &&
         activity.line !== '' &&
         activity.phase !== 'idle';
+    const showTrajectory = statusBar.trajectory && wake !== undefined;
     const barWidth = columns - 4;
     let bar = null;
-    // Theme-aware free segment: the light palette's near-white fill (#E8E8E8)
-    // reads as a glaring white band on dark terminals — swap it for a deep
-    // blue-gray there while keeping the light palette as-is (dark-ansi carries
-    // `ansi:` color names, so map by theme name rather than palette tokens).
     const barColors = themeName === 'light'
         ? undefined
         : { freeFill: '#2E3440', freeText: '#8D95A6' };
-    if (channel.contextBarEnabled && barWidth >= 14 && channel.contextWindow !== undefined) {
-        bar = renderContextBar(channel.contextSegments, usage !== undefined ? usage.input + usage.cacheRead + usage.cacheWrite : 0, channel.contextWindow, barWidth, barColors);
+    if (statusBar.contextBar &&
+        channel.contextBarEnabled &&
+        barWidth >= 14 &&
+        usage !== undefined &&
+        channel.contextWindow !== undefined) {
+        bar = renderContextBar(channel.contextSegments, contextUsed ?? 0, channel.contextWindow, barWidth, barColors);
     }
-    return (_jsx(Box, { paddingX: 1, width: columns, flexShrink: 0, children: _jsxs(Box, { flexDirection: "column", width: "100%", children: [bar ? _jsx(Text, { children: bar }) : null, _jsxs(Box, { flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsx(Text, { wrap: "truncate", children: _jsx(Byline, { children: leftParts }) }), _jsx(Box, { justifyContent: "flex-end", flexShrink: 2, children: _jsx(Text, { wrap: "truncate", children: _jsx(Byline, { children: rightParts }) }) })] }), _jsxs(Box, { height: 1, overflow: "hidden", flexDirection: "row", justifyContent: "space-between", gap: 2, children: [showActivity && activity !== undefined ? (_jsx(ActivityLine, { activity: activity, activityFrames: channel.activityFrames, warnPct: contextPressurePct(usage, channel.contextWindow), warnDanger: (contextPressurePct(usage, channel.contextWindow) ?? 0) >= 95 })) : hint ? (_jsx(Text, { color: "inactiveShimmer", children: hint })) : null, showActivity && hint ? (_jsx(Text, { color: "inactiveShimmer", wrap: "truncate", children: hint })) : null, wake !== undefined ? (_jsx(MiniWake, { band: wake.band, hint: wake.hint, tick: wake.tick })) : null] })] }) }));
+    const compactLeftParts = [...leftParts, ...rightParts];
+    const fullLeftParts = contextUsagePart === undefined
+        ? leftParts
+        : [...leftParts, contextUsagePart];
+    const hasStatusFields = compactLeftParts.length > 0 || contextUsagePart !== undefined;
+    const showSupplementalRow = hint !== '' || showActivity || showTrajectory;
+    return (_jsx(Box, { paddingX: 1, width: columns, flexShrink: 0, children: _jsxs(Box, { flexDirection: "column", width: "100%", children: [bar ? _jsx(Text, { children: bar }) : null, hasStatusFields ? statusBar.compact ? (_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, children: _jsx(Text, { wrap: "truncate", children: _jsx(Byline, { children: compactLeftParts }) }) }), contextUsagePart ? (_jsx(Box, { flexShrink: 0, children: _jsx(Text, { wrap: "truncate", children: _jsx(Byline, { children: [contextUsagePart] }) }) })) : null] })) : (_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, children: _jsx(Text, { wrap: "truncate", children: _jsx(Byline, { children: fullLeftParts }) }) }), _jsx(Box, { justifyContent: "flex-end", flexShrink: 2, children: _jsx(Text, { wrap: "truncate", children: _jsx(Byline, { children: rightParts }) }) })] })) : null, showSupplementalRow ? _jsxs(Box, { height: 1, overflow: "hidden", flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsxs(Box, { flexDirection: "row", flexGrow: 1, justifyContent: showActivity && hint ? 'space-between' : 'flex-start', gap: 2, children: [showActivity && activity !== undefined ? (_jsx(ActivityLine, { activity: activity, activityFrames: channel.activityFrames, warnPct: contextPressurePct(usage, channel.contextWindow), warnDanger: (contextPressurePct(usage, channel.contextWindow) ?? 0) >= 95 })) : hint ? (_jsx(Text, { color: "inactiveShimmer", children: hint })) : null, showActivity && hint ? (_jsx(Text, { color: "inactiveShimmer", wrap: "truncate", children: hint })) : null] }), showTrajectory && wake !== undefined ? (_jsx(MiniWake, { band: wake.band, hint: wake.hint, tick: wake.tick })) : null] }) : null] }) }));
+}
+/** Return the prompt-cache hit rate, or nothing when usage is unavailable. */
+export function formatCacheHitRate(usage) {
+    if (usage === undefined)
+        return undefined;
+    const total = usage.input + usage.cacheRead + usage.cacheWrite;
+    if (!Number.isFinite(total) || total <= 0)
+        return undefined;
+    return `${((usage.cacheRead / total) * 100).toFixed(1)}%`;
 }
 function basename(path) {
     const parts = path.split(/[\\/]/);

package/lib/types/settings-sections.d.ts

@@ -1,4 +1,4 @@
 export { name, TuiSettingsSectionsRuntime } from './dsh-adapter/settings-sections.js';
-export type { TuiSettingsFieldKind, TuiSettingsFieldOption, TuiSettingsFieldWrite, TuiSettingsField, TuiSettingsSection, } from './dsh-adapter/settings-sections.js';
+export type { TuiSettingsFieldKind, TuiSettingsFieldOption, TuiSettingsGroup, TuiSettingsFieldWrite, TuiSettingsField, TuiSettingsSection, } from './dsh-adapter/settings-sections.js';
 export { default } from './dsh-adapter/settings-sections.js';
 //# sourceMappingURL=settings-sections.d.ts.map

package/lib/types/settings-sections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-sections.d.ts","sourceRoot":"","sources":["../../src/settings-sections.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAA;AACrF,YAAY,EACV,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA"}
+{"version":3,"file":"settings-sections.d.ts","sourceRoot":"","sources":["../../src/settings-sections.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAA;AACrF,YAAY,EACV,oBAAoB,EACpB,sBAAsB,EACtB,gBAAgB,EAChB,qBAAqB,EACrB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA"}

package/lib/types/theme.d.ts

@@ -19,6 +19,8 @@ export type Theme = {
     autoAccept: string;
     bashBorder: string;
     claude: string;
+    toolNameMutate: string;
+    toolNameExec: string;
     claudeShimmer: string;
     claudeBlue_FOR_SYSTEM_SPINNER: string;
     claudeBlueShimmer_FOR_SYSTEM_SPINNER: string;
@@ -135,6 +137,16 @@ export type ThemeName = string;
  *   (light/dark), unknown names fall back to `dark`.
  */
 export declare function getTheme(themeName: ThemeName): Theme;
+/**
+ * Whether the active theme's RESOLVED palette renders on a light background.
+ * Keyed off the resolved palette's IDENTITY for the built-ins (auto resolves
+ * to the shared light/dark instance, so this covers auto-with-light-terminal
+ * that theme-NAME comparisons miss) and off the ink-text luminance for
+ * custom themes (light palettes pair with dark ink). The palette's
+ * `background` field is a badge fill, not the terminal background — never a
+ * lightness signal. Colour-pair variants (effort ignition hues) consume this.
+ */
+export declare function isLightThemeActive(themeName: ThemeName): boolean;
 /**
  * Register the custom-theme resolver. Called once by ThemeProvider; the
  * resolver must return `undefined` for names it does not know so getTheme

package/lib/types/theme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../src/theme.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../src/theme.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,MAAM,KAAK,GAAG;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,6BAA6B,EAAE,MAAM,CAAA;IACrC,oCAAoC,EAAE,MAAM,CAAA;IAC5C,UAAU,EAAE,MAAM,CAAA;IAClB,iBAAiB,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,MAAM,CAAA;IACX,YAAY,EAAE,MAAM,CAAA;IACpB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAElB,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,MAAM,CAAA;IAEtB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;IACzB,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IAGvB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,qBAAqB,EAAE,MAAM,CAAA;IAE7B,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IAEnB,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,MAAM,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,iBAAiB,EAAE,MAAM,CAAA;IACzB,cAAc,EAAE,MAAM,CAAA;IAEtB,sBAAsB,EAAE,MAAM,CAAA;IAC9B,uBAAuB,EAAE,MAAM,CAAA;IAC/B,wBAAwB,EAAE,MAAM,CAAA;IAChC,yBAAyB,EAAE,MAAM,CAAA;IACjC,yBAAyB,EAAE,MAAM,CAAA;IACjC,yBAAyB,EAAE,MAAM,CAAA;IACjC,uBAAuB,EAAE,MAAM,CAAA;IAC/B,uBAAuB,EAAE,MAAM,CAAA;IAE/B,gBAAgB,EAAE,MAAM,CAAA;IAExB,YAAY,EAAE,MAAM,CAAA;IAEpB,UAAU,EAAE,MAAM,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,0BAA0B,EAAE,MAAM,CAAA;IAClC,wBAAwB,EAAE,MAAM,CAAA;IAChC,WAAW,EAAE,MAAM,CAAA;IACnB,0BAA0B,EAAE,MAAM,CAAA;IAClC,qBAAqB,EAAE,MAAM,CAAA;IAC7B,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;IACvB,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,CAAA;IACxB,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,MAAM,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,sBAAsB,EAAE,MAAM,CAAA;IAC9B,sBAAsB,EAAE,MAAM,CAAA;IAC9B,qBAAqB,EAAE,MAAM,CAAA;IAC7B,oBAAoB,EAAE,MAAM,CAAA;IAC5B,sBAAsB,EAAE,MAAM,CAAA;IAC9B,sBAAsB,EAAE,MAAM,CAAA;CAC/B,CAAA;AAED,kDAAkD;AAClD,eAAO,MAAM,WAAW,yCAA0C,CAAA;AAElE;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,SAAS,CAAA;AAWrC;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAE7D;AAED,oEAAoE;AACpE,wBAAgB,gBAAgB,IAAI,OAAO,GAAG,MAAM,CAEnD;AAED;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAA;AA2S9B;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,KAAK,CAiBpD;AASD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAWhE;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,GAAG,SAAS,GAC5C,IAAI,CAEN;AASD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAExD;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,KAAK,CAEtC"}

package/lib/types/theme.js

@@ -58,6 +58,8 @@ const darkTheme = {
     autoAccept: rgb('#B3A0D4'), // Soft violet
     bashBorder: rgb('#D194AE'), // Mist rose
     claude: rgb('#7DA1DE'), // Accent Soft — mist brand blue
+    toolNameMutate: rgb('#E5C07B'), // soft gold — Edit/Write (warm accent)
+    toolNameExec: rgb('#56B6C2'), // mist cyan — Bash/exec tools
     claudeShimmer: rgb('#ABC2EC'), // Border Blue for shimmer effect
     claudeBlue_FOR_SYSTEM_SPINNER: rgb('#7DA1DE'),
     claudeBlueShimmer_FOR_SYSTEM_SPINNER: rgb('#ABC2EC'),
@@ -93,16 +95,16 @@ const darkTheme = {
     toolDotWrite: rgb('#B3A0D4'), // soft violet — edit/write
     toolDotWeb: rgb('#7DA1DE'), // mist blue — web search/fetch
     toolDotTask: rgb('#D194AE'), // mist rose — subagent/jobs
-    syntaxKeyword: rgb('#8FA8E8'), // mist blue
-    syntaxString: rgb('#9FBF8F'), // soft sage
+    syntaxKeyword: rgb('#82AAFF'), // vivid blue (theme anchor)
+    syntaxString: rgb('#E5C07B'), // gold - echoes the user-message gold accent
     syntaxComment: rgb('#6B7280'), // neutral grey
-    syntaxNumber: rgb('#D9A97E'), // warm tan
-    syntaxFunction: rgb('#82B8C7'), // cyan blue
-    syntaxType: rgb('#B39DDB'), // soft violet
+    syntaxNumber: rgb('#D19A66'), // warm orange
+    syntaxFunction: rgb('#56B6C2'), // vivid cyan
+    syntaxType: rgb('#C678DD'), // vivid violet
     syntaxVariable: rgb('#C9D1D9'), // near-text
     syntaxOperator: rgb('#93A1B0'), // blue grey
     syntaxPunctuation: rgb('#7A8694'), // dim blue grey
-    syntaxConstant: rgb('#D98C9B'), // soft rose
+    syntaxConstant: rgb('#E48A9B'), // soft rose
     red_FOR_SUBAGENTS_ONLY: rgb('#D4685E'),
     blue_FOR_SUBAGENTS_ONLY: rgb('#7496D6'),
     green_FOR_SUBAGENTS_ONLY: rgb('#66B285'),
@@ -115,8 +117,8 @@ const darkTheme = {
     chromeYellow: rgb('#D8B270'),
     clawd_body: rgb('#D98A63'), // Warm mascot orange
     clawd_background: rgb('#000000'),
-    userMessageBackground: rgb('#292D36'),
-    userMessageBackgroundHover: rgb('#343945'),
+    userMessageBackground: '', // user turn: no fill, gold bold text only (Kimi style)
+    userMessageBackgroundHover: rgb('#3B5BDB'), // hover/expand: blue block with gold text
     messageActionsBackground: rgb('#2E333D'),
     selectionBg: rgb('#3B4A66'), // Mist-blue tint on dark
     bashMessageBackgroundColor: rgb('#2C3038'),
@@ -125,7 +127,7 @@ const darkTheme = {
     rate_limit_empty: rgb('#3C414B'),
     fastMode: rgb('#E09A58'),
     fastModeShimmer: rgb('#EAB478'),
-    briefLabelYou: rgb('#ABC2EC'),
+    briefLabelYou: rgb('#FFDF80'),
     briefLabelClaude: rgb('#7DA1DE'),
     rainbow_red: rgb('#D98F8A'),
     rainbow_orange: rgb('#D9A97E'),
@@ -152,6 +154,8 @@ const lightTheme = {
     autoAccept: rgb('#9B86B8'), // Muted violet (from surface-alt pink-mist)
     bashBorder: rgb('#C07A93'), // Muted rose (from surface-alt pink-mist)
     claude: rgb('#3F6CC4'), // Primary Blue — brand
+    toolNameMutate: rgb('#8A6A00'), // deep gold - Edit/Write (warm accent)
+    toolNameExec: rgb('#0F7A8A'), // deep cyan - Bash/exec tools
     claudeShimmer: rgb('#5E88CC'), // Accent Blue for shimmer effect
     claudeBlue_FOR_SYSTEM_SPINNER: rgb('#3F6CC4'),
     claudeBlueShimmer_FOR_SYSTEM_SPINNER: rgb('#5E88CC'),
@@ -187,16 +191,16 @@ const lightTheme = {
     toolDotWrite: rgb('#7A5CA8'),
     toolDotWeb: rgb('#4A63A8'),
     toolDotTask: rgb('#B04A5A'),
-    syntaxKeyword: rgb('#4A63A8'),
-    syntaxString: rgb('#4E7A4E'),
+    syntaxKeyword: rgb('#2557C7'),
+    syntaxString: rgb('#8A6A00'),
     syntaxComment: rgb('#8A8F98'),
-    syntaxNumber: rgb('#A96B32'),
-    syntaxFunction: rgb('#3F7E8F'),
-    syntaxType: rgb('#7A5CA8'),
+    syntaxNumber: rgb('#B25E1E'),
+    syntaxFunction: rgb('#0F7A8A'),
+    syntaxType: rgb('#8A3FC7'),
     syntaxVariable: rgb('#343945'),
     syntaxOperator: rgb('#5B6672'),
     syntaxPunctuation: rgb('#9AA0A8'),
-    syntaxConstant: rgb('#B04A5A'),
+    syntaxConstant: rgb('#C2186B'),
     red_FOR_SUBAGENTS_ONLY: rgb('#BE5A52'),
     blue_FOR_SUBAGENTS_ONLY: rgb('#3F6CC4'),
     green_FOR_SUBAGENTS_ONLY: rgb('#4E9675'),
@@ -209,8 +213,8 @@ const lightTheme = {
     chromeYellow: rgb('#C99A3F'),
     clawd_body: rgb('#D98A63'), // Warm mascot orange
     clawd_background: rgb('#F6F3ED'),
-    userMessageBackground: rgb('#EEE5D2'), // Surface
-    userMessageBackgroundHover: rgb('#E4D9E5'), // Surface Alt
+    userMessageBackground: '', // user turn: no fill in light mode, gold text only
+    userMessageBackgroundHover: rgb('#DCE4FB'), // subtle blue tint on hover/expand
     messageActionsBackground: rgb('#E4D9E5'),
     selectionBg: rgb('#D5DEF2'), // Mist-blue tint on warm white
     bashMessageBackgroundColor: rgb('#EAE1D3'),
@@ -219,7 +223,7 @@ const lightTheme = {
     rate_limit_empty: rgb('#DDD5C7'),
     fastMode: rgb('#D98E4A'),
     fastModeShimmer: rgb('#E2A465'),
-    briefLabelYou: rgb('#5E88CC'),
+    briefLabelYou: rgb('#A67600'),
     briefLabelClaude: rgb('#3F6CC4'),
     rainbow_red: rgb('#D98888'),
     rainbow_orange: rgb('#D9A276'),
@@ -248,6 +252,8 @@ const darkAnsiTheme = {
     autoAccept: 'ansi:magentaBright',
     bashBorder: 'ansi:magentaBright',
     claude: 'ansi:blueBright',
+    toolNameMutate: 'ansi:yellowBright',
+    toolNameExec: 'ansi:cyanBright',
     claudeShimmer: 'ansi:blueBright',
     claudeBlue_FOR_SYSTEM_SPINNER: 'ansi:blueBright',
     claudeBlueShimmer_FOR_SYSTEM_SPINNER: 'ansi:blueBright',
@@ -305,8 +311,8 @@ const darkAnsiTheme = {
     chromeYellow: 'ansi:yellowBright',
     clawd_body: 'ansi:redBright',
     clawd_background: 'ansi:black',
-    userMessageBackground: 'ansi:blackBright',
-    userMessageBackgroundHover: 'ansi:white',
+    userMessageBackground: '',
+    userMessageBackgroundHover: 'ansi:blue',
     messageActionsBackground: 'ansi:blackBright',
     selectionBg: 'ansi:blue',
     bashMessageBackgroundColor: 'ansi:black',
@@ -315,7 +321,7 @@ const darkAnsiTheme = {
     rate_limit_empty: 'ansi:white',
     fastMode: 'ansi:redBright',
     fastModeShimmer: 'ansi:redBright',
-    briefLabelYou: 'ansi:blueBright',
+    briefLabelYou: 'ansi:yellowBright',
     briefLabelClaude: 'ansi:blueBright',
     rainbow_red: 'ansi:red',
     rainbow_orange: 'ansi:redBright',
@@ -363,6 +369,30 @@ export function getTheme(themeName) {
  * (markdown inline code) resolves user themes through getActiveTheme().
  */
 let customThemeResolver;
+/**
+ * Whether the active theme's RESOLVED palette renders on a light background.
+ * Keyed off the resolved palette's IDENTITY for the built-ins (auto resolves
+ * to the shared light/dark instance, so this covers auto-with-light-terminal
+ * that theme-NAME comparisons miss) and off the ink-text luminance for
+ * custom themes (light palettes pair with dark ink). The palette's
+ * `background` field is a badge fill, not the terminal background — never a
+ * lightness signal. Colour-pair variants (effort ignition hues) consume this.
+ */
+export function isLightThemeActive(themeName) {
+    const theme = getTheme(themeName);
+    if (theme === lightTheme)
+        return true;
+    if (theme === darkTheme || theme === darkAnsiTheme)
+        return false;
+    // 自定义主题：按文本墨色亮度判定——浅底配深墨（ink）、深底配亮墨。
+    // 调色板的 background 字段是徽标填充色而非终端背景，不能作判据。
+    const ink = theme.text;
+    const rgb = /^rgb\((\d+),(\d+),(\d+)\)$/.exec(ink);
+    if (rgb === null)
+        return false;
+    const [r, g, b] = [Number(rgb[1]), Number(rgb[2]), Number(rgb[3])];
+    return 0.299 * r + 0.587 * g + 0.114 * b < 140;
+}
 /**
  * Register the custom-theme resolver. Called once by ThemeProvider; the
  * resolver must return `undefined` for names it does not know so getTheme