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

package/lib/types/activityPrefs.d.ts

@@ -7,6 +7,7 @@
  * unknown preset left behind by an older version) just falls back to the
  * default preset.
  */
+import { type WorkingActivityConfig } from 'dsh-working-activity/config';
 /**
  * Parse a persisted `{ frames }` value; anything else yields undefined.
  * @param text - Raw file contents.
@@ -19,6 +20,15 @@ export declare function parseActivityFrames(text: string): string | undefined;
  * @returns The persisted preset name, if any.
  */
 export declare function readActivityFrames(dir?: string): string | undefined;
+/**
+ * Read the full pi-style working-activity config (frames / mode / features /
+ * customPhrases / customActions / narrate / thresholds) from the same JSON
+ * file the `/activity` command writes, parsed by the wa package. Best-effort:
+ * a missing or corrupt file yields undefined (callers use their defaults).
+ * @param dir - Prefs directory (injectable for tests).
+ * @returns The parsed config, or undefined when unreadable.
+ */
+export declare function readActivityConfig(dir?: string): WorkingActivityConfig | undefined;
 /**
  * Persist the chosen indicator preset (best effort).
  * @param name - Preset name to persist.

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

@@ -1 +1 @@
-{"version":3,"file":"activityPrefs.d.ts","sourceRoot":"","sources":["../../src/activityPrefs.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AASH;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CASpE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,GAAE,MAAkB,GAAG,MAAM,GAAG,SAAS,CAM9E;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAE,MAAkB,GAAG,OAAO,CAQlF"}
+{"version":3,"file":"activityPrefs.d.ts","sourceRoot":"","sources":["../../src/activityPrefs.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,OAAO,EAA8B,KAAK,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAKpG;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CASpE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,GAAE,MAAkB,GAAG,MAAM,GAAG,SAAS,CAM9E;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,GAAE,MAAkB,GAAG,qBAAqB,GAAG,SAAS,CAM7F;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAE,MAAkB,GAAG,OAAO,CAQlF"}

package/lib/types/activityPrefs.js

@@ -10,6 +10,7 @@
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { isPresetName } from './components/activityFrames.js';
+import { parseWorkingActivityConfig } from 'dsh-working-activity/config';
 import { DATA_DIR } from './utils/paths.js';
 const PREFS_DIR = DATA_DIR;
 /**
@@ -42,6 +43,22 @@ export function readActivityFrames(dir = PREFS_DIR) {
         return undefined;
     }
 }
+/**
+ * Read the full pi-style working-activity config (frames / mode / features /
+ * customPhrases / customActions / narrate / thresholds) from the same JSON
+ * file the `/activity` command writes, parsed by the wa package. Best-effort:
+ * a missing or corrupt file yields undefined (callers use their defaults).
+ * @param dir - Prefs directory (injectable for tests).
+ * @returns The parsed config, or undefined when unreadable.
+ */
+export function readActivityConfig(dir = PREFS_DIR) {
+    try {
+        return parseWorkingActivityConfig(readFileSync(join(dir, 'working-activity.json'), 'utf8')).config;
+    }
+    catch {
+        return undefined;
+    }
+}
 /**
  * Persist the chosen indicator preset (best effort).
  * @param name - Preset name to persist.

package/lib/types/cc/figures.d.ts

@@ -67,4 +67,11 @@ export declare const BRIDGE_SPINNER_FRAMES: string[];
 export declare const BRIDGE_READY_INDICATOR = "\u00B7\u2714\uFE0E\u00B7";
 /** Bridge failed indicator (`×`). */
 export declare const BRIDGE_FAILED_INDICATOR = "\u00D7";
+export declare const THINKING_SPINNER_FRAMES: string[];
+export declare const THINKING_SPINNER_INTERVAL_MS = 80;
+/** Thinking settled marker: anchor (`⚓`) — the static end-state glyph after
+ *  the reasoning block stops streaming. U+2693 is Emoji_Presentation in
+ *  ink/stringWidth, so it measures 2 columns; the braille spinner frames
+ *  above are padded to the same width to keep the label stationary. */
+export declare const THINKING_SETTLED_MARKER = "\u2693";
 //# sourceMappingURL=figures.d.ts.map

package/lib/types/cc/figures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"figures.d.ts","sourceRoot":"","sources":["../../../src/cc/figures.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,uEAAuE;AACvE,eAAO,MAAM,YAAY,QAA4C,CAAA;AAGrE,kDAAkD;AAClD,eAAO,MAAM,OAAO,WAAW,CAAA;AAC/B,+BAA+B;AAC/B,eAAO,MAAM,IAAI,WAAW,CAAA;AAC5B,gDAAgD;AAChD,eAAO,MAAM,eAAe,WAAW,CAAA;AACvC,qEAAqE;AACrE,eAAO,MAAM,MAAM,WAAW,CAAA;AAC9B,gCAAgC;AAChC,eAAO,MAAM,gBAAgB,WAAW,CAAA;AACxC,uDAAuD;AACvD,eAAO,MAAM,iBAAiB,WAAW,CAAA;AACzC,iDAAiD;AACjD,eAAO,MAAM,cAAc,WAAW,CAAA;AAGtC,sBAAsB;AACtB,eAAO,MAAM,QAAQ,WAAW,CAAA;AAChC,wBAAwB;AACxB,eAAO,MAAM,UAAU,WAAW,CAAA;AAClC,2CAA2C;AAC3C,eAAO,MAAM,aAAa,WAAW,CAAA;AACrC,qDAAqD;AACrD,eAAO,MAAM,cAAc,WAAW,CAAA;AAGtC,qCAAqC;AACrC,eAAO,MAAM,UAAU,WAAW,CAAA;AAClC,+CAA+C;AAC/C,eAAO,MAAM,aAAa,WAAW,CAAA;AACrC,wCAAwC;AACxC,eAAO,MAAM,WAAW,WAAW,CAAA;AACnC,sCAAsC;AACtC,eAAO,MAAM,UAAU,WAAW,CAAA;AAGlC,0BAA0B;AAC1B,eAAO,MAAM,SAAS,WAAW,CAAA;AACjC,2BAA2B;AAC3B,eAAO,MAAM,UAAU,WAAW,CAAA;AAGlC,uDAAuD;AACvD,eAAO,MAAM,aAAa,WAAW,CAAA;AACrC,wCAAwC;AACxC,eAAO,MAAM,UAAU,WAAW,CAAA;AAGlC,mDAAmD;AACnD,eAAO,MAAM,YAAY,WAAW,CAAA;AACpC,qDAAqD;AACrD,eAAO,MAAM,cAAc,WAAW,CAAA;AACtC,iDAAiD;AACjD,eAAO,MAAM,cAAc,WAAW,CAAA;AAGtC,wCAAwC;AACxC,eAAO,MAAM,SAAS,WAAW,CAAA;AACjC,oDAAoD;AACpD,eAAO,MAAM,cAAc,WAAW,CAAA;AACtC,mCAAmC;AACnC,eAAO,MAAM,gBAAgB,WAAW,CAAA;AAGxC,4DAA4D;AAC5D,eAAO,MAAM,qBAAqB,UAKjC,CAAA;AACD,uCAAuC;AACvC,eAAO,MAAM,sBAAsB,6BAA6B,CAAA;AAChE,qCAAqC;AACrC,eAAO,MAAM,uBAAuB,WAAW,CAAA"}
+{"version":3,"file":"figures.d.ts","sourceRoot":"","sources":["../../../src/cc/figures.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,uEAAuE;AACvE,eAAO,MAAM,YAAY,QAA4C,CAAA;AAGrE,kDAAkD;AAClD,eAAO,MAAM,OAAO,WAAW,CAAA;AAC/B,+BAA+B;AAC/B,eAAO,MAAM,IAAI,WAAW,CAAA;AAC5B,gDAAgD;AAChD,eAAO,MAAM,eAAe,WAAW,CAAA;AACvC,qEAAqE;AACrE,eAAO,MAAM,MAAM,WAAW,CAAA;AAC9B,gCAAgC;AAChC,eAAO,MAAM,gBAAgB,WAAW,CAAA;AACxC,uDAAuD;AACvD,eAAO,MAAM,iBAAiB,WAAW,CAAA;AACzC,iDAAiD;AACjD,eAAO,MAAM,cAAc,WAAW,CAAA;AAGtC,sBAAsB;AACtB,eAAO,MAAM,QAAQ,WAAW,CAAA;AAChC,wBAAwB;AACxB,eAAO,MAAM,UAAU,WAAW,CAAA;AAClC,2CAA2C;AAC3C,eAAO,MAAM,aAAa,WAAW,CAAA;AACrC,qDAAqD;AACrD,eAAO,MAAM,cAAc,WAAW,CAAA;AAGtC,qCAAqC;AACrC,eAAO,MAAM,UAAU,WAAW,CAAA;AAClC,+CAA+C;AAC/C,eAAO,MAAM,aAAa,WAAW,CAAA;AACrC,wCAAwC;AACxC,eAAO,MAAM,WAAW,WAAW,CAAA;AACnC,sCAAsC;AACtC,eAAO,MAAM,UAAU,WAAW,CAAA;AAGlC,0BAA0B;AAC1B,eAAO,MAAM,SAAS,WAAW,CAAA;AACjC,2BAA2B;AAC3B,eAAO,MAAM,UAAU,WAAW,CAAA;AAGlC,uDAAuD;AACvD,eAAO,MAAM,aAAa,WAAW,CAAA;AACrC,wCAAwC;AACxC,eAAO,MAAM,UAAU,WAAW,CAAA;AAGlC,mDAAmD;AACnD,eAAO,MAAM,YAAY,WAAW,CAAA;AACpC,qDAAqD;AACrD,eAAO,MAAM,cAAc,WAAW,CAAA;AACtC,iDAAiD;AACjD,eAAO,MAAM,cAAc,WAAW,CAAA;AAGtC,wCAAwC;AACxC,eAAO,MAAM,SAAS,WAAW,CAAA;AACjC,oDAAoD;AACpD,eAAO,MAAM,cAAc,WAAW,CAAA;AACtC,mCAAmC;AACnC,eAAO,MAAM,gBAAgB,WAAW,CAAA;AAGxC,4DAA4D;AAC5D,eAAO,MAAM,qBAAqB,UAKjC,CAAA;AACD,uCAAuC;AACvC,eAAO,MAAM,sBAAsB,6BAA6B,CAAA;AAChE,qCAAqC;AACrC,eAAO,MAAM,uBAAuB,WAAW,CAAA;AAO/C,eAAO,MAAM,uBAAuB,UAWnC,CAAA;AACD,eAAO,MAAM,4BAA4B,KAAK,CAAA;AAC9C;;;uEAGuE;AACvE,eAAO,MAAM,uBAAuB,WAAW,CAAA"}

package/lib/types/cc/figures.js

@@ -80,3 +80,26 @@ export const BRIDGE_SPINNER_FRAMES = [
 export const BRIDGE_READY_INDICATOR = '\u00b7\u2714\ufe0e\u00b7';
 /** Bridge failed indicator (`×`). */
 export const BRIDGE_FAILED_INDICATOR = '\u00d7';
+// Thinking spinner (Kimi Code style braille cycle, shown while reasoning
+// streams; the static anchor takes over once the step settles). Each frame
+// is padded to 2 columns so it matches the settled ⚓ anchor exactly — a
+// 1-col frame would shift the whole label right by one column the moment
+// the step settles.
+export const THINKING_SPINNER_FRAMES = [
+    '\u280b ', // ⠋
+    '\u2819 ', // ⠙
+    '\u2839 ', // ⠹
+    '\u2838 ', // ⠸
+    '\u283c ', // ⠼
+    '\u2834 ', // ⠴
+    '\u2826 ', // ⠦
+    '\u2827 ', // ⠧
+    '\u2807 ', // ⠇
+    '\u280f ', // ⠏
+];
+export const THINKING_SPINNER_INTERVAL_MS = 80;
+/** Thinking settled marker: anchor (`⚓`) — the static end-state glyph after
+ *  the reasoning block stops streaming. U+2693 is Emoji_Presentation in
+ *  ink/stringWidth, so it measures 2 columns; the braille spinner frames
+ *  above are padded to the same width to keep the label stationary. */
+export const THINKING_SETTLED_MARKER = '\u2693'; // ⚓

package/lib/types/cc/markdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../../src/cc/markdown.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAA4B,KAAK,KAAK,EAAe,MAAM,QAAQ,CAAA;AAM1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AA4BrD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE1D;AAID;;;;;GAKG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAWtC;AAuCD;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,KAAK,EACZ,SAAS,SAAI,EACb,iBAAiB,GAAE,MAAM,GAAG,IAAW,EACvC,MAAM,GAAE,KAAK,GAAG,IAAW,EAC3B,SAAS,GAAE,YAAY,GAAG,IAAW,GACpC,MAAM,CAER;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,SAAS,GAAE,YAAY,GAAG,IAAW,GACpC,MAAM,CAaR;AA2QD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GACpD,MAAM,CAUR"}
+{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../../src/cc/markdown.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAA4B,KAAK,KAAK,EAAe,MAAM,QAAQ,CAAA;AAO1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AA4BrD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE1D;AAID;;;;;GAKG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAWtC;AAuCD;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,KAAK,EACZ,SAAS,SAAI,EACb,iBAAiB,GAAE,MAAM,GAAG,IAAW,EACvC,MAAM,GAAE,KAAK,GAAG,IAAW,EAC3B,SAAS,GAAE,YAAY,GAAG,IAAW,GACpC,MAAM,CAER;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,SAAS,GAAE,YAAY,GAAG,IAAW,GACpC,MAAM,CAgBR;AA2SD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GACpD,MAAM,CAUR"}

package/lib/types/cc/markdown.js

@@ -18,6 +18,7 @@ import { stringWidth } from '../ink/stringWidth.js';
 import { supportsHyperlinks } from '../ink/supports-hyperlinks.js';
 import { colorize } from '../ink/colorize.js';
 import { getActiveTheme } from '../theme.js';
+import { buildSyntaxTheme } from './syntaxTheme.js';
 import { logForDebugging } from '../utils/debug.js';
 import { createHyperlink } from './hyperlink.js';
 // '\n' is used unconditionally — os.EOL is '\r\n' on Windows, and the stray
@@ -112,7 +113,10 @@ export function applyMarkdown(content, highlight = null) {
         .lexer(stripPromptXMLTags(content))
         .map(token => dispatch(token, rootState))
         .join('')
-        .trim();
+        // 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.
+        .trimEnd();
 }
 /**
  * Type guard that narrows to the concrete marked token of `kind`.
@@ -176,19 +180,39 @@ function renderBlockquote(token, state) {
         .join(EOL);
 }
 function renderCodeBlock(token, state) {
-    if (!state.highlight) {
-        return token.text + EOL;
-    }
-    let language = 'plaintext';
-    if (token.lang) {
-        if (state.highlight.supportsLanguage(token.lang)) {
-            language = token.lang;
+    // 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).
+    const theme = getActiveTheme();
+    const openFence = colorize('```' + (token.lang ?? ''), theme.subtle, 'foreground');
+    const indent = '  ';
+    const renderBody = () => {
+        if (!state.highlight) {
+            return token.text;
         }
-        else {
-            logForDebugging(`Language not supported while highlighting code, falling back to plaintext: ${token.lang}`);
+        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+$/, '');
+    if (body === '') {
+        return `${openFence}${EOL}`;
     }
-    return state.highlight.highlight(token.text, { language }) + EOL;
+    return (openFence +
+        EOL +
+        body
+            .split(EOL)
+            .map(line => (line === '' ? line : indent + line))
+            .join(EOL) + EOL);
 }
 function renderEmphasis(token, state) {
     const inner = token.tokens.map(child => dispatch(child, inlineChildren(state))).join('');
@@ -200,8 +224,14 @@ function renderStrong(token, state) {
 }
 function renderHeading(token, state) {
     const text = token.tokens.map(child => dispatch(child, fresh(state))).join('');
-    // H1 gets the full banner treatment; every deeper level shares the bold style.
-    const styled = token.depth === 1 ? chalk.bold.italic.underline(text) : chalk.bold(text);
+    // Blue-primary progression: H1 gets the mist brand blue + underline, H2 the
+    // lighter border blue, deeper levels stay bold near-text (kimi-style).
+    const theme = getActiveTheme();
+    const styled = token.depth === 1
+        ? chalk.bold.underline(colorize(text, theme.claude, 'foreground'))
+        : token.depth === 2
+            ? chalk.bold(colorize(text, theme.permission, 'foreground'))
+            : chalk.bold(text);
     return styled + EOL + EOL;
 }
 function renderLink(token, state) {
@@ -251,7 +281,10 @@ function renderText(token, state) {
         const body = token.tokens
             ? token.tokens.map(child => dispatch(child, withParent(state, token))).join('')
             : linkifyIssueReferences(token.text);
-        return `${bullet} ${body}${EOL}`;
+        // 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}`;
     }
     return linkifyIssueReferences(token.text);
 }

package/lib/types/cc/syntaxTheme.d.ts

@@ -0,0 +1,12 @@
+import type { Theme } from '../theme.js';
+/** highlight.js token classes -> theme syntax tokens. `default` catches
+ *  every unmapped class so cli-highlight's own yellow never leaks through
+ *  (issue #250, P2-6). */
+export declare const SYNTAX_CLASS_TO_TOKEN: Record<string, string>;
+/** chalk style for one raw theme value. Accepts every form the theme
+ *  loader documents: #rgb, #rrggbb, #rrggbbaa (alpha stripped), rgb() with
+ *  or without spaces, ansi256(n), ansi:name (issue #250, P2-5). */
+export declare function chalkFromToken(token: string): (text: string) => string;
+/** Build the cli-highlight `theme` option from an active theme palette. */
+export declare function buildSyntaxTheme(theme: Theme): Record<string, (text: string) => string>;
+//# sourceMappingURL=syntaxTheme.d.ts.map

package/lib/types/cc/syntaxTheme.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"syntaxTheme.d.ts","sourceRoot":"","sources":["../../../src/cc/syntaxTheme.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAQxC;;0BAE0B;AAC1B,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CA4BxD,CAAA;AAED;;mEAEmE;AACnE,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAmBtE;AAED,2EAA2E;AAC3E,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,KAAK,GACX,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,CAQ1C"}

package/lib/types/cc/syntaxTheme.js

@@ -0,0 +1,76 @@
+import chalk from 'chalk';
+// --- syntax highlighting theme bridge ----------------------------------------
+// Shared by SplitDiffView (diff panes) and the markdown renderer (fenced
+// code blocks). Both feed cli-highlight's `theme` option so code colors come
+// from the active dsh-tui theme instead of cli-highlight's own sparse
+// default palette.
+/** highlight.js token classes -> theme syntax tokens. `default` catches
+ *  every unmapped class so cli-highlight's own yellow never leaks through
+ *  (issue #250, P2-6). */
+export const SYNTAX_CLASS_TO_TOKEN = {
+    keyword: 'syntaxKeyword',
+    built_in: 'syntaxKeyword',
+    literal: 'syntaxKeyword',
+    string: 'syntaxString',
+    subst: 'syntaxString',
+    quote: 'syntaxString',
+    comment: 'syntaxComment',
+    number: 'syntaxNumber',
+    title: 'syntaxFunction',
+    'title.function_': 'syntaxFunction',
+    function: 'syntaxFunction',
+    'title.class_': 'syntaxType',
+    type: 'syntaxType',
+    class: 'syntaxType',
+    tag: 'syntaxType',
+    name: 'syntaxType',
+    attr: 'syntaxVariable',
+    attribute: 'syntaxVariable',
+    variable: 'syntaxVariable',
+    'template-variable': 'syntaxVariable',
+    params: 'syntaxVariable',
+    operator: 'syntaxOperator',
+    punctuation: 'syntaxPunctuation',
+    meta: 'syntaxPunctuation',
+    symbol: 'syntaxConstant',
+    regexp: 'syntaxConstant',
+    default: 'syntaxVariable',
+};
+/** chalk style for one raw theme value. Accepts every form the theme
+ *  loader documents: #rgb, #rrggbb, #rrggbbaa (alpha stripped), rgb() with
+ *  or without spaces, ansi256(n), ansi:name (issue #250, P2-5). */
+export function chalkFromToken(token) {
+    let match = /^#([0-9a-fA-F]{3})$/.exec(token);
+    if (match !== null) {
+        const [r, g, b] = match[1].split('').map(c => parseInt(c + c, 16));
+        return chalk.rgb(r, g, b);
+    }
+    match = /^#([0-9a-fA-F]{6})(?:[0-9a-fA-F]{2})?$/.exec(token);
+    if (match !== null)
+        return chalk.hex(`#${match[1]}`);
+    match = /^rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/.exec(token);
+    if (match !== null)
+        return chalk.rgb(Number(match[1]), Number(match[2]), Number(match[3]));
+    match = /^ansi256\((\d+)\)$/.exec(token);
+    if (match !== null)
+        return chalk.ansi256(Number(match[1]));
+    match = /^ansi:(\w+)$/.exec(token);
+    if (match !== null) {
+        const name = match[1] === 'blackBright' ? 'gray' : match[1];
+        const style = chalk[name];
+        if (style !== undefined)
+            return style;
+    }
+    return (text) => text;
+}
+/** Build the cli-highlight `theme` option from an active theme palette. */
+export function buildSyntaxTheme(theme) {
+    const palette = theme;
+    const out = {};
+    for (const [tokenClass, tokenKey] of Object.entries(SYNTAX_CLASS_TO_TOKEN)) {
+        const value = palette[tokenKey];
+        if (value !== undefined)
+            out[tokenClass] = chalkFromToken(value);
+    }
+    return out;
+}

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

@@ -0,0 +1,26 @@
+/**
+ * EffortChargeGlyph — 输入提示前缀 `❯ ` 的最高档强调与充能。
+ *
+ * 思考强度处于当前路线最高档期间，前缀换为点火强调色（加粗，与点焰波
+ * 共用 hues[0]——同一瞬间前缀与波是同一种橙）；切到最高档的瞬间做一次
+ * 150ms「充能」渐变（accentRamp 的暗端 → 全值）。冷启动已在最高档时
+ * 不充能（充能只属于切换瞬间），离开最高档恢复原样的 dim 行为。
+ *
+ * 触发判定在渲染期做（React 官方的「props 变化即调整 state」模式，
+ * 与 EffortInputBorder 同一模式）——放 effect 会晚一帧，effort 变化
+ * 的首帧以全亮闪现、下一帧才跌回暗端重来。充能只动颜色，glyph 恒为
+ * `❯ `，SGR-only 规则天然成立。
+ *
+ * 时钟复用 Ink core 共享时钟，且只在充能未满的那 150ms 内订阅；稳态
+ * 零定时器、零重渲染，前缀色取记忆化常量。
+ */
+import React from 'react';
+export declare function EffortChargeGlyph({ effort, levels, working, }: {
+    /** 当前思考强度档 id；`undefined` 表示路线未声明。 */
+    effort: string | undefined;
+    /** 当前路线的档位表（低→高，末位为最高档）。 */
+    levels: readonly string[] | undefined;
+    /** 模型工作中时前缀照旧压暗（既有语义）。 */
+    working: boolean;
+}): React.ReactNode;
+//# sourceMappingURL=EffortChargeGlyph.d.ts.map

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

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

package/lib/types/components/EffortChargeGlyph.js

@@ -0,0 +1,70 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * EffortChargeGlyph — 输入提示前缀 `❯ ` 的最高档强调与充能。
+ *
+ * 思考强度处于当前路线最高档期间，前缀换为点火强调色（加粗，与点焰波
+ * 共用 hues[0]——同一瞬间前缀与波是同一种橙）；切到最高档的瞬间做一次
+ * 150ms「充能」渐变（accentRamp 的暗端 → 全值）。冷启动已在最高档时
+ * 不充能（充能只属于切换瞬间），离开最高档恢复原样的 dim 行为。
+ *
+ * 触发判定在渲染期做（React 官方的「props 变化即调整 state」模式，
+ * 与 EffortInputBorder 同一模式）——放 effect 会晚一帧，effort 变化
+ * 的首帧以全亮闪现、下一帧才跌回暗端重来。充能只动颜色，glyph 恒为
+ * `❯ `，SGR-only 规则天然成立。
+ *
+ * 时钟复用 Ink core 共享时钟，且只在充能未满的那 150ms 内订阅；稳态
+ * 零定时器、零重渲染，前缀色取记忆化常量。
+ */
+import { useContext, useEffect, useReducer, useState } from 'react';
+import { Text, useTheme } from '../ui.js';
+import { ClockContext } from '../ink/components/ClockContext.js';
+import { accentRamp } from '../trajectory/effortIgnition.js';
+import { rgbString } from '../trajectory/motion.js';
+import { interpolateColor } from './Spinner/spinnerUtils.js';
+import { isLightThemeActive } from '../theme.js';
+/** 充能时长（ms）。 */
+const CHARGE_MS = 150;
+export function EffortChargeGlyph({ effort, levels, working, }) {
+    const clock = useContext(ClockContext);
+    const [themeName] = useTheme();
+    const [chargeStartedAt, setChargeStartedAt] = useState(null);
+    const [prevEffort, setPrevEffort] = useState(effort);
+    const [, forceRender] = useReducer((tick) => tick + 1, 0);
+    const topActive = effort !== undefined && levels !== undefined && levels.length > 1 && effort === levels[levels.length - 1];
+    // Render-phase trigger (same pattern as EffortInputBorder): switching from
+    // an existing tier onto the top tier starts the charge NOW, not one effect
+    // later — the first frame of the new effort must not flash fully lit.
+    // Cold mounts enter the steady state directly; without a shared clock
+    // (headless embeds) there is no charge either — no frames would ever arrive.
+    if (effort !== prevEffort) {
+        setPrevEffort(effort);
+        if (topActive && clock !== null) {
+            setChargeStartedAt(clock.now());
+        }
+    }
+    // Only the 150ms charge window subscribes to the shared clock; steady
+    // state has zero timers and zero re-renders.
+    const chargeElapsed = chargeStartedAt === null
+        ? Infinity
+        : // Clamp at zero: the shared clock can hand back a stale tickTime for
+            // one frame after waking from pause.
+            Math.max(0, (clock?.now() ?? Date.now()) - chargeStartedAt);
+    const charging = chargeElapsed < CHARGE_MS;
+    useEffect(() => {
+        if (!charging || clock === null)
+            return;
+        return clock.subscribe(() => forceRender(), /* keepAlive */ true);
+    }, [charging, clock]);
+    if (!topActive)
+        return _jsx(Text, { dimColor: working, children: "\u276F " });
+    const ramp = accentRamp(isLightThemeActive(themeName));
+    if (!charging) {
+        // Steady state re-derives on every render (two allocations + one blend
+        // per keystroke — negligible) instead of caching: a cached colour would
+        // go stale across a light/dark theme flip while the tier stays active.
+        const color = rgbString(ramp.full);
+        return (_jsxs(Text, { bold: true, color: color, dimColor: working, children: ["\u276F", ' '] }));
+    }
+    const charge = Math.min(1, chargeElapsed / CHARGE_MS);
+    return (_jsxs(Text, { bold: true, color: rgbString(interpolateColor(ramp.dim, ramp.full, charge)), dimColor: working, children: ["\u276F", ' '] }));
+}

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

@@ -0,0 +1,36 @@
+/**
+ * EffortInputBorder — 输入框层上的三幕点焰叠加（对齐 Codex 的完整
+ * 语义：光扫过、档位字样浮现、整体渐隐）。
+ *
+ * 输入框只有顶/底两条横边框（round、无左右）——本组件自绘这两行，
+ * **同步**承载动画；档位字样由输入行尾的 EffortTierBadge 短暂显示
+ * （见 PromptInput），动画全程行数恒定。切到最高思考强度档时：
+ *
+ *   1. 扫光 [0, 1s)——一段高亮彩色光带沿顶/底边框同步自左向右扫过
+ *      （wave 波形逐列变色），期间输入框完全正常可用；
+ *   2. 档位字样 [600ms, ~1.1s)——光带行至中段时，输入行居中浮现
+ *      档名大写（由暗渐亮加粗、间距聚拢，见 EffortTierBadge）；
+ *   3. 渐隐 [1.5s, 2s)——字样连同光色一起向主题色淡出，末帧归零：
+ *      静止时顶/底边框就是原主题色，内容区无任何附加物。
+ *
+ * glyph 变化仅限字样行的出现/让位（一次性）；其余帧间变化全部是既
+ * 有 `─` 的前景色。触发判定在渲染期做（props-变化-调整模式）；从
+ * 「已有档位」切到档位表末位最高档才触发，冷启动恢复偏好/单档表/
+ * 无档位表/无共享时钟均不触发。时钟复用 Ink core 共享时钟，仅动画
+ * 窗口订阅（keepAlive），播完回到零开销静止边框。
+ */
+import React from 'react';
+import type { Color } from '../ink/styles.js';
+import type { Theme } from '../theme.js';
+export declare function EffortInputBorder({ effort, levels, columns, onLight, idleColor, children, }: {
+    /** 当前思考强度档 id；`undefined` 表示路线未声明。 */
+    effort: string | undefined;
+    /** 当前路线的档位表（低→高，末位为最高档）；未知时传 `undefined`。 */
+    levels: readonly string[] | undefined;
+    columns: number;
+    onLight: boolean;
+    /** 静止边框色（主题 token 名，如 'promptBorder' / 'planMode'）。 */
+    idleColor: keyof Theme | Color;
+    children: React.ReactNode;
+}): React.ReactNode;
+//# sourceMappingURL=EffortInputBorder.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"EffortInputBorder.d.ts","sourceRoot":"","sources":["../../../src/components/EffortInputBorder.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAA8D,MAAM,OAAO,CAAA;AAGlF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AA8BxC,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,MAAM,EACN,OAAO,EACP,OAAO,EACP,SAAS,EACT,QAAQ,GACT,EAAE;IACD,sCAAsC;IACtC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,6CAA6C;IAC7C,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,uDAAuD;IACvD,SAAS,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAC9B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B,GAAG,KAAK,CAAC,SAAS,CA0DlB"}

package/lib/types/components/EffortInputBorder.js

@@ -0,0 +1,73 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * EffortInputBorder — 输入框层上的三幕点焰叠加（对齐 Codex 的完整
+ * 语义：光扫过、档位字样浮现、整体渐隐）。
+ *
+ * 输入框只有顶/底两条横边框（round、无左右）——本组件自绘这两行，
+ * **同步**承载动画；档位字样由输入行尾的 EffortTierBadge 短暂显示
+ * （见 PromptInput），动画全程行数恒定。切到最高思考强度档时：
+ *
+ *   1. 扫光 [0, 1s)——一段高亮彩色光带沿顶/底边框同步自左向右扫过
+ *      （wave 波形逐列变色），期间输入框完全正常可用；
+ *   2. 档位字样 [600ms, ~1.1s)——光带行至中段时，输入行居中浮现
+ *      档名大写（由暗渐亮加粗、间距聚拢，见 EffortTierBadge）；
+ *   3. 渐隐 [1.5s, 2s)——字样连同光色一起向主题色淡出，末帧归零：
+ *      静止时顶/底边框就是原主题色，内容区无任何附加物。
+ *
+ * glyph 变化仅限字样行的出现/让位（一次性）；其余帧间变化全部是既
+ * 有 `─` 的前景色。触发判定在渲染期做（props-变化-调整模式）；从
+ * 「已有档位」切到档位表末位最高档才触发，冷启动恢复偏好/单档表/
+ * 无档位表/无共享时钟均不触发。时钟复用 Ink core 共享时钟，仅动画
+ * 窗口订阅（keepAlive），播完回到零开销静止边框。
+ */
+import { useContext, useEffect, useReducer, useState } from 'react';
+import { Box, Text } from '../ui.js';
+import { ClockContext } from '../ink/components/ClockContext.js';
+import { IGNITION_TIMELINE, ignitionLineColors } from '../trajectory/effortIgnition.js';
+/** 边框行（顶/底共用同一色段序列——同步变色）。 */
+function BorderRow({ left, right, runs, idleColor, }) {
+    return (_jsxs(Text, { children: [_jsx(Text, { color: idleColor, children: left }), runs.map((run, i) => (_jsx(Text, { color: run.color, children: run.glyph }, i))), _jsx(Text, { color: idleColor, children: right })] }));
+}
+export function EffortInputBorder({ effort, levels, columns, onLight, idleColor, children, }) {
+    const clock = useContext(ClockContext);
+    const [overlay, setOverlay] = useState(null);
+    const [prevEffort, setPrevEffort] = useState(effort);
+    const [, forceRender] = useReducer((tick) => tick + 1, 0);
+    // 渲染期触发：effort 变化的首帧就以新状态渲染（effect 会晚一帧）。
+    if (effort !== prevEffort) {
+        setPrevEffort(effort);
+        if (clock !== null &&
+            effort !== undefined &&
+            levels !== undefined &&
+            levels.length > 1 &&
+            effort === levels[levels.length - 1]) {
+            setOverlay({ label: effort.toUpperCase(), startedAtMs: clock.now() });
+        }
+    }
+    // 仅动画窗口订阅共享时钟；静止边框零定时器零重渲染。
+    const elapsedMs = overlay === null ? Infinity : Math.max(0, (clock?.now() ?? Date.now()) - overlay.startedAtMs);
+    useEffect(() => {
+        if (overlay === null || clock === null)
+            return;
+        return clock.subscribe(() => forceRender(), /* keepAlive */ true);
+    }, [overlay, clock]);
+    useEffect(() => {
+        if (overlay !== null && elapsedMs >= IGNITION_TIMELINE.fadeEndMs)
+            setOverlay(null);
+    }, [overlay, elapsedMs]);
+    const midWidth = Math.max(0, columns - 2);
+    const sweepColors = overlay !== null && elapsedMs < IGNITION_TIMELINE.sweepMs && midWidth > 0
+        ? ignitionLineColors({ elapsedMs, width: midWidth, onLight })
+        : [];
+    // 顶/底共用的色段序列（同步）：扫光列取波形色，其余列回主题色。
+    const runs = [];
+    for (let index = 0; index < midWidth; index++) {
+        const color = sweepColors[index] ?? idleColor;
+        const last = runs[runs.length - 1];
+        if (last !== undefined && last.color === color)
+            last.glyph += '─';
+        else
+            runs.push({ glyph: '─', color });
+    }
+    return (_jsxs(Box, { flexDirection: "column", alignItems: "flex-start", justifyContent: "flex-start", width: "100%", flexShrink: 0, children: [_jsx(BorderRow, { left: "\u256D", right: "\u256E", runs: runs, idleColor: idleColor }), children, _jsx(BorderRow, { left: "\u2570", right: "\u256F", runs: runs, idleColor: idleColor })] }));
+}

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

@@ -0,0 +1,26 @@
+/**
+ * EffortTierBadge — 输入行尾的档位字样徽标：三幕点焰的第二幕载体
+ * （与 EffortInputBorder 的双框扫光同一时间轴、同一触发），切到最高
+ * 思考强度档时光带行至中段，输入行居中浮现档名（当前档名大写，字母间距从
+ * 10 个空格减速聚拢到 1 个——连续位置逐字母取整保证帧帧有移动，
+ * 明亮蓝加粗，由暗渐亮），随后随图层整体渐隐让位——行数恒定，静
+ * 止时完全不渲染；输入行有文字时不显示（绝不遮挡内容）。
+ *
+ * 触发判定在渲染期做（props-变化-调整模式，与边框/充能组件同模
+ * 式）；冷启动恢复偏好/单档表/无档位表/无共享时钟均不触发。时钟
+ * 复用 Ink core 共享时钟，仅动画窗口订阅（keepAlive），播完归零。
+ */
+import React from 'react';
+export declare function EffortTierBadge({ effort, levels, onLight, columns, leadingColumns, }: {
+    /** 当前思考强度档 id；`undefined` 表示路线未声明。 */
+    effort: string | undefined;
+    /** 当前路线的档位表（低→高，末位为最高档）；未知时传 `undefined`。 */
+    levels: readonly string[] | undefined;
+    onLight: boolean;
+    /** 终端列数——居中锚点按终端几何中心计算（纯文本流，不引入嵌套 Box）。 */
+    columns: number;
+    /** badge 文本流之前该行已被占据的列数（❯ 与块光标等）——居中换算成
+     *  badge 流内列时要扣掉，否则整体偏右一个前缀宽。 */
+    leadingColumns: number;
+}): React.ReactNode;
+//# sourceMappingURL=EffortTierBadge.d.ts.map

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

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