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

package/lib/types/terminal-utils/markdown.js

@@ -23,6 +23,7 @@ import { logForDebugging } from '../utils/debug.js';
 import { createHyperlink } from './hyperlink.js';
 import { fileLinkUrl, linkifyFilePaths, looksLikeFilePath } from '../utils/fileTarget.js';
 import { getMathRendering } from '../tuiDisplayPrefs.js';
+import { noteCodeHighlight, noteFormatToken } from '../ink/render-stats.js';
 import { isMathBlockToken, isMathToken, MATH_MARKDOWN_EXTENSIONS, renderInlineMath, } from './math.js';
 // '\n' is used unconditionally — os.EOL is '\r\n' on Windows, and the stray
 // '\r' breaks the character-to-segment mapping in applyStylesToWrappedText,
@@ -30,6 +31,10 @@ import { isMathBlockToken, isMathToken, MATH_MARKDOWN_EXTENSIONS, renderInlineMa
 const EOL = '\n';
 /** Left one-quarter block (U+258E), the blockquote gutter marker. */
 const QUOTE_BAR = '\u258e';
+/** Left one-eighth block (U+258F): quote levels past the second get the thinner bar. */
+const QUOTE_BAR_DEEP = '\u258f';
+/** The horizontal-rule divider: three light box-drawing dashes. */
+const HR_DIVIDER = '\u2500\u2500\u2500';
 /** Tool-analysis tag blocks that carry no user-facing content; dropped before lexing. */
 const TOOL_ANALYSIS_TAG_BLOCKS = /<(commit_analysis|context|function_analysis|pr_analysis)>.*?<\/\1>\n?/gs;
 /**
@@ -59,11 +64,11 @@ export function stripPromptXMLTags(content) {
 }
 let markedInitialized = false;
 /**
- * Configure the shared `marked` instance once. Strikethrough parsing is
- * disabled so that `~100` renders literally instead of as deleted text —
- * models use `~` far more often for "approximate" than for real
- * strikethrough. LaTeX math becomes `math`/`mathBlock` tokens (see
- * math.ts). Every lexer caller — Markdown and StreamingMarkdown's boundary
+ * Configure the shared `marked` instance once. Strikethrough stays on
+ * marked's built-in del tokenizer, which only matches double-tilde pairs —
+ * single tildes (`~100`, models' "approximate") never pair up and render
+ * literally. LaTeX math becomes `math`/`mathBlock` tokens (see math.ts).
+ * Every lexer caller — Markdown and StreamingMarkdown's boundary
  * lex — must run this first so both agree on block boundaries.
  */
 export function configureMarked() {
@@ -71,11 +76,6 @@ export function configureMarked() {
         return;
     markedInitialized = true;
     marked.use({
-        tokenizer: {
-            del() {
-                return undefined;
-            },
-        },
         extensions: [...MATH_MARKDOWN_EXTENSIONS],
     });
 }
@@ -118,7 +118,7 @@ function linkifyText(text) {
 }
 /** A fresh context for block-level children: list state reset, no parent. */
 function fresh(state) {
-    return { highlight: state.highlight, parent: null, listDepth: 0, ordinal: null };
+    return { highlight: state.highlight, parent: null, listDepth: 0, ordinal: null, quoteDepth: 0, hang: 0 };
 }
 /** Same context, different parent token. */
 function withParent(state, parent) {
@@ -126,7 +126,7 @@ function withParent(state, parent) {
 }
 /** Inline-styled children keep the outer parent but shed list context. */
 function inlineChildren(state) {
-    return { ...state, listDepth: 0, ordinal: null };
+    return { ...state, listDepth: 0, ordinal: null, quoteDepth: 0, hang: 0 };
 }
 /**
  * Render one marked token to ANSI text, recursing into child tokens.
@@ -138,7 +138,14 @@ function inlineChildren(state) {
  * @returns The rendered ANSI string for the token, or '' for unrendered token types.
  */
 export function formatToken(token, listDepth = 0, orderedListNumber = null, parent = null, highlight = null) {
-    return dispatch(token, { highlight, parent, listDepth, ordinal: orderedListNumber });
+    return dispatch(token, {
+        highlight,
+        parent,
+        listDepth,
+        ordinal: orderedListNumber,
+        quoteDepth: 0,
+        hang: 0,
+    });
 }
 /**
  * Render markdown content to ANSI-styled text via the shared `marked` instance.
@@ -153,11 +160,12 @@ export function applyMarkdown(content, highlight = null) {
         parent: null,
         listDepth: 0,
         ordinal: null,
+        quoteDepth: 0,
+        hang: 0,
     };
     return marked
         .lexer(stripPromptXMLTags(content))
-        .map(token => dispatch(token, rootState))
-        .join('')
+        .reduce((out, token) => appendBlockText(out, dispatch(token, rootState)), '')
         // trimEnd only: the input is already trimmed, so leading whitespace in
         // the output is renderer-intended (e.g. the code block's 2-space indent
         // on its first line). A full trim() would eat that first-line indent.
@@ -174,8 +182,11 @@ function isToken(token, kind) {
 }
 /** Fan-out point: narrows the token union, then delegates to the per-type render functions. */
 function dispatch(token, state) {
+    noteFormatToken(token.raw ?? '');
     if (isToken(token, 'blockquote'))
         return renderBlockquote(token, state);
+    if (isToken(token, 'checkbox'))
+        return renderCheckbox(token);
     if (isToken(token, 'code'))
         return renderCodeBlock(token, state);
     if (isToken(token, 'codespan'))
@@ -184,12 +195,14 @@ function dispatch(token, state) {
         return renderEmphasis(token, state);
     if (isToken(token, 'strong'))
         return renderStrong(token, state);
+    if (isToken(token, 'del'))
+        return renderDel(token, state);
     if (isToken(token, 'heading'))
         return renderHeading(token, state);
     if (isToken(token, 'hr'))
-        return '---';
+        return renderHr();
     if (isToken(token, 'image'))
-        return token.href;
+        return renderImage(token, state);
     if (isToken(token, 'link'))
         return renderLink(token, state);
     if (isToken(token, 'list'))
@@ -212,13 +225,15 @@ function dispatch(token, state) {
     // sees blocks nested in list items / blockquotes (or formatToken callers).
     if (isMathBlockToken(token))
         return renderNestedMathBlock(token);
-    if (isToken(token, 'def') || isToken(token, 'del') || isToken(token, 'html')) {
-        // Link definitions, strikethrough, and raw HTML carry no ANSI
-        // representation.
+    if (isToken(token, 'def') || isToken(token, 'html')) {
+        // Link definitions and raw HTML carry no ANSI representation.
         return '';
     }
-    // Unknown / extension token types render as nothing.
-    return '';
+    // Unknown token types (a marked upgrade or extension) echo their raw
+    // source instead of silently dropping it; verify-markdown-token-coverage
+    // fails until the type gets a renderer or an explicit ignore.
+    logForDebugging(`Markdown token without a renderer, echoing raw source: ${token.type}`);
+    return token.raw ?? '';
 }
 /** Inline math as single-line Unicode; the exact source when it has none
  *  or rendering is switched off. */
@@ -234,41 +249,53 @@ function renderNestedMathBlock(token) {
     const rendered = getMathRendering() !== 'source' && !token.pending ? renderInlineMath(token.text) : undefined;
     return (rendered ?? token.raw.trim()) + EOL;
 }
+/**
+ * The gutter for one blockquote level: the first level in the theme's
+ * muted color, the second dimmed, deeper levels the thinner one-eighth
+ * bar, so nesting fades instead of repeating identical rails.
+ */
+function quoteGutter(depth) {
+    if (depth === 0)
+        return colorize(QUOTE_BAR, getActiveTheme().subtle, 'foreground');
+    if (depth === 1)
+        return chalk.dim(QUOTE_BAR);
+    return chalk.dim(QUOTE_BAR_DEEP);
+}
 function renderBlockquote(token, state) {
-    const inner = token.tokens.map(child => dispatch(child, fresh(state))).join('');
-    // Dim gutter bar per line; keep the text italic but at normal brightness —
-    // chalk.dim is nearly invisible on dark themes.
-    const gutter = chalk.dim(QUOTE_BAR);
-    return inner
-        .split(EOL)
-        .map(line => (stripAnsi(line).trim() ? `${gutter} ${chalk.italic(line)}` : line))
+    const depth = state.quoteDepth;
+    // Children keep the quote context (a nested blockquote increments the
+    // depth) but shed list state, exactly like fresh().
+    const childState = { ...fresh(state), quoteDepth: depth + 1 };
+    const inner = token.tokens.map(child => dispatch(child, childState)).join('');
+    // Gutter bar per line; keep the text italic but at normal brightness —
+    // chalk.dim is nearly invisible on dark themes. Blank lines inside the
+    // quote keep a bare gutter so the quote stays visible across paragraph
+    // gaps; only the empty piece after inner's final newline stays empty.
+    const gutter = quoteGutter(depth);
+    const lines = inner.split(EOL);
+    // An empty quote (`>` on its own line) still shows one rail.
+    if (lines.every(line => line === ''))
+        return gutter + EOL;
+    return lines
+        .map((line, index) => {
+        if (line === '' || stripAnsi(line).trim() === '') {
+            return index === lines.length - 1 ? line : gutter;
+        }
+        return `${gutter} ${chalk.italic(line)}`;
+    })
         .join(EOL);
 }
 function renderCodeBlock(token, state) {
     // Kimi Code style: a muted ```lang opening line (language tag + boundary
     // for unhighlighted blocks) + 2-space indent; no closing fence (syntax
     // colors or the indent already mark the end, it only cost vertical space).
+    // This ANSI form serves nested code (inside lists/quotes) and the narrow
+    // fallback of CodeBlockFrame; top-level fences render through the frame
+    // component sharing formatCodeBody below.
     const theme = getActiveTheme();
-    const openFence = colorize('```' + (token.lang ?? ''), theme.subtle, 'foreground');
+    const openFence = colorize('```' + codeLanguageTag(token), theme.subtle, 'foreground');
     const indent = '  ';
-    const renderBody = () => {
-        if (!state.highlight) {
-            return token.text;
-        }
-        let language = 'plaintext';
-        if (token.lang) {
-            if (state.highlight.supportsLanguage(token.lang)) {
-                language = token.lang;
-            }
-            else {
-                logForDebugging(`Language not supported while highlighting code, falling back to plaintext: ${token.lang}`);
-            }
-        }
-        return state.highlight.highlight(token.text, { language, theme: buildSyntaxTheme(theme) });
-    };
-    // Strip ALL trailing newlines: trailing blank lines would otherwise leak a
-    // stray blank line at the end of the block.
-    const body = renderBody().replace(/\n+$/, '');
+    const body = formatCodeBody(token, state.highlight);
     if (body === '') {
         return `${openFence}${EOL}`;
     }
@@ -279,6 +306,52 @@ function renderCodeBlock(token, state) {
             .map(line => (line === '' ? line : indent + line))
             .join(EOL) + EOL);
 }
+/**
+ * The fence info string trimmed to its first word: a fence opening with
+ * "js meta" names js. Everything after the first whitespace run is meta
+ * the renderer never consumes; the full source stays in token.text.
+ */
+export function codeLanguageTag(token) {
+    return (token.lang ?? '').trim().split(/\s+/)[0] ?? '';
+}
+/**
+ * Highlighted (or plain) body of a fenced code block, with trailing blank
+ * lines stripped. Shared by the ANSI fence and CodeBlockFrame so both
+ * surfaces agree on highlighting, language resolution and trimming.
+ *
+ * NEVER throws: cli-highlight feeds highlight.js, which converts to HTML
+ * fragments and can raise synchronously on hostile inputs. Any failure in
+ * the highlighting pipeline degrades to the plain body - the fence and
+ * language label survive - instead of unwinding the React render that
+ * called it.
+ */
+export function formatCodeBody(token, highlight) {
+    const plain = token.text.replace(/\n+$/, '');
+    if (!highlight || plain === '')
+        return plain;
+    try {
+        let language = 'plaintext';
+        const tag = codeLanguageTag(token);
+        if (tag) {
+            if (highlight.supportsLanguage(tag)) {
+                language = tag;
+            }
+            else {
+                logForDebugging(`Language not supported while highlighting code, falling back to plaintext: ${tag}`);
+            }
+        }
+        const theme = getActiveTheme();
+        noteCodeHighlight();
+        const highlighted = highlight.highlight(token.text, { language, theme: buildSyntaxTheme(theme) });
+        // Strip ALL trailing newlines: trailing blank lines would otherwise leak
+        // a stray blank line at the end of the block.
+        return highlighted.replace(/\n+$/, '') || plain;
+    }
+    catch (error) {
+        logForDebugging(`Code highlighting threw, degrading the block to plaintext: ${String(error)}`);
+        return plain;
+    }
+}
 function renderEmphasis(token, state) {
     const inner = token.tokens.map(child => dispatch(child, inlineChildren(state))).join('');
     return chalk.italic(inner);
@@ -287,17 +360,74 @@ function renderStrong(token, state) {
     const inner = token.tokens.map(child => dispatch(child, inlineChildren(state))).join('');
     return chalk.bold(inner);
 }
+/** Double-tilde strikethrough; marked's del tokenizer never pairs single
+ *  tildes, so approximate notation like ~100 stays literal. */
+function renderDel(token, state) {
+    const inner = token.tokens.map(child => dispatch(child, inlineChildren(state))).join('');
+    return chalk.strikethrough(inner);
+}
+/**
+ * The hr divider: three dashes in the theme's muted color.
+ *
+ * No trailing newline: the surrounding space tokens already separate the
+ * blocks, so the divider costs one row. appendBlockText adds the row
+ * break when the next block does not start with one.
+ */
+function renderHr() {
+    return colorize(HR_DIVIDER, getActiveTheme().subtle, 'foreground');
+}
+/**
+ * Append one block token's rendered text to the accumulated run. Every
+ * visible block renderer ends its output with a newline except the hr
+ * divider; when such an unterminated block is followed directly by
+ * content that does not open with its own line break (a rule
+ * immediately before a heading, or two adjacent rules), the row break
+ * is inserted here so the divider never merges into the next block's
+ * first row.
+ */
+export function appendBlockText(accumulated, block) {
+    if (accumulated !== '' && !accumulated.endsWith(EOL) && block !== '' && !block.startsWith(EOL)) {
+        return accumulated + EOL + block;
+    }
+    return accumulated + block;
+}
 function renderHeading(token, state) {
     const text = token.tokens.map(child => dispatch(child, fresh(state))).join('');
-    // Blue-primary progression: H1 gets the mist brand blue + underline, H2 the
-    // lighter border blue, deeper levels stay bold near-text (kimi-style).
+    // Blue-primary ladder (kimi-style): H1 gets the mist brand blue +
+    // underline, H2 the lighter border blue, then H3 bold, H4 bold italic,
+    // H5 italic subtle and H6 subtle, so each level reads one step quieter.
     const theme = getActiveTheme();
     const styled = token.depth === 1
         ? chalk.bold.underline(colorize(text, theme.accent, 'foreground'))
         : token.depth === 2
             ? chalk.bold(colorize(text, theme.permission, 'foreground'))
-            : chalk.bold(text);
-    return styled + EOL + EOL;
+            : token.depth === 3
+                ? chalk.bold(text)
+                : token.depth === 4
+                    ? chalk.bold.italic(text)
+                    : token.depth === 5
+                        ? chalk.italic(colorize(text, theme.subtle, 'foreground'))
+                        : colorize(text, theme.subtle, 'foreground');
+    // One trailing newline: blank rows below a heading come from the
+    // source's own blank lines (the following space token), not from here.
+    return styled + EOL;
+}
+/**
+ * Image reference: `[img]` plus the alt text, linked to the source URL
+ * with OSC 8. Nothing is fetched; the href is only a click target.
+ * Without hyperlink support the plain form shows both the alt and the URL.
+ */
+function renderImage(token, state) {
+    const alt = token.text.replace(/\s+/g, ' ').trim();
+    if (state.parent?.type === 'link') {
+        // Inside a link's OSC 8 wrap a nested sequence would override the real
+        // href; show the alt (or the URL) as plain text, like nested labels.
+        return alt || token.href;
+    }
+    if (!supportsHyperlinks()) {
+        return alt ? `[img] ${alt} (${token.href})` : token.href;
+    }
+    return createHyperlink(token.href, alt ? `[img] ${alt}` : '[img]');
 }
 function renderLink(token, state) {
     // mailto: links are shown as plain email addresses, not clickable links.
@@ -327,29 +457,90 @@ function renderList(token, state) {
         .join('');
 }
 function renderListItem(token, state) {
-    const indent = '  '.repeat(state.listDepth);
-    const childState = withParent({ ...state, listDepth: state.listDepth + 1 }, token);
-    return token.tokens.map(child => indent + dispatch(child, childState)).join('');
+    // Tight task items carry their checkbox as a sibling token AHEAD of the
+    // text token (loose items inline it inside the paragraph). Lift it out
+    // here so it lands between the marker and the body.
+    const isTightTask = token.task === true && token.tokens[0]?.type === 'checkbox';
+    const children = isTightTask ? token.tokens.slice(1) : token.tokens;
+    const taskMark = isTightTask ? renderCheckbox(token.tokens[0]) : '';
+    const indent = ' '.repeat(state.hang);
+    const marker = state.ordinal === null ? '-' : `${formatListMarker(state.listDepth + 1, state.ordinal)}.`;
+    // The body column: soft-break continuations, later paragraphs of loose
+    // items, and nested blocks align one marker width (plus checkbox) past
+    // this item's indent. A nested list gets this as its indent, so each
+    // level steps in by one marker width.
+    const bodyHang = state.hang + marker.length + 1 + stripAnsi(taskMark).length;
+    const childState = withParent({ ...state, listDepth: state.listDepth + 1, hang: bodyHang }, token);
+    // Text/paragraph/blockquote children render unindented lines and the
+    // assembly below pads their continuations to the body column. A nested
+    // list already carries its absolute indent (its items inherit
+    // bodyHang), so its lines pass through untouched.
+    const segments = [];
+    let raw = '';
+    for (const child of children) {
+        const part = dispatch(child, childState);
+        if (child.type === 'list') {
+            if (raw !== '') {
+                segments.push({ text: raw, preindented: false });
+                raw = '';
+            }
+            segments.push({ text: part, preindented: true });
+        }
+        else {
+            // appendBlockText: a text token does not end its own row, and the
+            // next child must start on a fresh line (a plain join would glue
+            // blocks together, a join(EOL) would double blank rows).
+            raw = appendBlockText(raw, part);
+        }
+    }
+    if (raw !== '')
+        segments.push({ text: raw, preindented: false });
+    const tinted = colorize(marker, getActiveTheme().permission, 'foreground');
+    const bodyIndent = ' '.repeat(bodyHang);
+    let out = `${indent}${tinted} ${taskMark}`;
+    let firstLine = true;
+    for (const segment of segments) {
+        const lines = segment.text.split(EOL);
+        for (const line of lines) {
+            if (firstLine) {
+                out += line;
+                firstLine = false;
+                continue;
+            }
+            out += EOL + (line === '' || segment.preindented ? line : bodyIndent + line);
+        }
+    }
+    if (out === '')
+        return '';
+    if (!out.endsWith(EOL))
+        out += EOL;
+    return out;
+}
+/**
+ * Task checkbox as width-safe ASCII: literal [x] / [ ] keeps its state
+ * through display, copy, and ANSI-stripping measurements alike; a styled
+ * glyph pair would not survive every terminal font. The trailing space is
+ * the separator to the item text.
+ */
+function renderCheckbox(token) {
+    const mark = token.checked ? '[x]' : '[ ]';
+    const color = token.checked ? getActiveTheme().success : getActiveTheme().subtle;
+    return colorize(mark, color, 'foreground') + ' ';
 }
 function renderParagraph(token, state) {
     return token.tokens.map(child => dispatch(child, fresh(state))).join('') + EOL;
 }
 function renderText(token, state) {
-    const { parent, listDepth, ordinal } = state;
-    if (parent?.type === 'link') {
+    if (state.parent?.type === 'link') {
         // Already inside a link: the link handler wraps everything in one OSC 8
         // sequence, and a nested one would override the real href. Stay plain.
         return token.text;
     }
-    if (parent?.type === 'list_item') {
-        const bullet = ordinal === null ? '-' : `${formatListMarker(listDepth, ordinal)}.`;
-        const body = token.tokens
-            ? token.tokens.map(child => dispatch(child, withParent(state, token))).join('')
-            : linkifyText(token.text);
-        // Blue bullet marker: list structure gets a tint without loading the
-        // whole item (kimi-style `•` in the accent color).
-        const tinted = colorize(bullet, getActiveTheme().permission, 'foreground');
-        return `${tinted} ${body}${EOL}`;
+    // List markers, checkboxes and indentation belong to renderListItem:
+    // a loose item's paragraph reaches here with a fresh state, and inline
+    // em/strong children recurse through here with the list_item parent.
+    if (token.tokens) {
+        return token.tokens.map(child => dispatch(child, withParent(state, token))).join('');
     }
     return linkifyText(token.text);
 }

package/lib/types/theme.d.ts

@@ -1,13 +1,22 @@
 /**
- * dsh-tui color themes — Gentle Mist Blue (雾蓝) family.
+ * dsh-tui color themes — Gentle Mist Blue (雾蓝) family, plus the Claude
+ * Code orange adaptation.
  *
  * Two truecolor palettes share one identity: mist blues carry brand, focus,
- * and interaction; body text stays neutral. `light` uses white panel
- * surfaces (#FFFFFF) and ink text (#343945) for
- * light terminals; `dark` is its dark-terminal adaptation (warm off-white
- * text, accent-soft blues). `dark-ansi` is the 16-color fallback for
- * terminals without truecolor. The active palette is chosen at startup by
- * querying the terminal background (OSC 11) — see ThemeProvider.
+ * and interaction; body text stays neutral. `light` uses white panel surfaces
+ * (#FFFFFF) and ink text (#343945) for light terminals; `dark` is its
+ * dark-terminal adaptation (warm off-white text, accent-soft blues).
+ * `dark-ansi` is the 16-color fallback for terminals without truecolor.
+ *
+ * The active palette is chosen at startup by querying the terminal background
+ * (OSC 11) — see ThemeProvider.
+ *
+ * `claude` is the Claude Code brand adaptation of `dark` (see
+ * `branding.ts`): warm orange (#E8913F) carries brand/focus, panels and
+ * cards sit on warm browns (#33261C family), while the semantic state
+ * colors (success green / error rose / auto-accept violet / plan sage)
+ * keep their hues. ThemeProvider serves it as the dark default while the
+ * claude brand is active and the user has no explicit theme choice.
  *
  * `auto` is a pseudo-theme, not a palette: it resolves to `light` or `dark`
  * from the terminal background detected via OSC 11 (which tracks the system
@@ -72,6 +81,20 @@ export type Theme = {
     syntaxConstant: string;
     professionalBlue: string;
     chromeYellow: string;
+    contextBarSystem: string;
+    contextBarPrompt: string;
+    contextBarAssistant: string;
+    contextBarThinking: string;
+    contextBarTools: string;
+    /** Effort ignition colour: the wave crest, the charged `❯` and the badge. */
+    ignition: string;
+    /** Where the ignition wave fades out (its resting end), i.e. the band colour. */
+    ignitionDim: string;
+    /**
+     * Prompt-input caret fill. Empty (every built-in) keeps the inverse-video
+     * caret; a declared fill gets the palette ink that contrasts with it.
+     */
+    cursor: string;
     /** Mascot body color. */
     mascotBody: string;
     /** Input/editor background color. */
@@ -113,7 +136,12 @@ export declare function normalizeThemeKey(value: string): keyof Theme | undefine
 /** Whether a key is accepted at a theme input boundary, including aliases. */
 export declare function isThemeColorKey(value: unknown): value is ThemeColorKey;
 /** The built-in theme names, in display order. */
-export declare const THEME_NAMES: readonly ["dark", "dark-ansi", "light"];
+export declare const THEME_NAMES: readonly ["dark", "dark-ansi", "light", "claude-dark", "claude-paper", "codex-lavender", "codex-paper"];
+/**
+ * Whether a name is a built-in palette (THEME_NAMES membership, never the base
+ * roles a theme file may overlay).
+ */
+export declare function isBuiltInThemeName(name: string): boolean;
 /**
  * The `auto` pseudo-theme: not a palette, but a standing request to follow
  * the terminal background (OSC 11, which tracks the system theme in
@@ -165,6 +193,17 @@ export type ThemeResolver = (name: string) => Theme | undefined;
  * lightness signal. Colour-pair variants (effort ignition hues) consume this.
  */
 export declare function isLightThemeActive(themeName: ThemeName): boolean;
+/**
+ * The glyph color for a solid caret block: whichever palette ink (`text` or
+ * `inverseText`) contrasts better with the declared `cursor` fill. The
+ * built-ins declare no fill, so every one of them answers `inverseText` and
+ * keeps the inverse-video caret; a user or plugin theme that paints a light
+ * block (where the near-white inverse ink sits at 2.50:1 and the ink text at
+ * 4.82:1) gets the readable ink instead. A fill or ink the parser cannot read
+ * (any `ansi:*` palette) keeps `inverseText` too: exactly the behavior every
+ * palette had before the caret key existed.
+ */
+export declare function cursorGlyphColor(theme: Theme): 'text' | 'inverseText';
 /**
  * Register the custom-theme resolver. Called once by ThemeProvider; the
  * resolver must return `undefined` for names it does not know so getTheme
@@ -196,6 +235,8 @@ export declare function setActiveThemeName(name: ThemeName): void;
  * Resolve the currently active theme for non-React rendering.
  * @returns The palette of the module-level active theme.
  */
+/** The name of the module-level active theme (mirror of setActiveThemeName). */
+export declare function getActiveThemeName(): ThemeName;
 export declare function getActiveTheme(): Theme;
 export {};
 //# sourceMappingURL=theme.d.ts.map

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":"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"}