@cruxy/cli 0.11.0 → 0.13.0

package/dist/onboarding/steps.js

@@ -1,6 +1,6 @@
 import { writeFileSync } from "node:fs";
 import { join } from "node:path";
-import pc from "picocolors";
+import { themeForColor } from "../theme/index.js";
 import { CREATE_KEY_URL } from "../constants.js";
 import { loadProjectInstructions } from "../config/index.js";
 /**
@@ -9,7 +9,7 @@ import { loadProjectInstructions } from "../config/index.js";
  * or logged. Rendering is gated on `io.color` so output respects NO_COLOR / pipes.
  */
 const MAX_KEY_ATTEMPTS = 3;
-const c = (io) => pc.createColors(io.color);
+const c = (io) => themeForColor(io.color);
 /**
  * Acquire and persist a provider key: print the create-key URL, read it masked,
  * validate it live, and **only then** write it to the credentials store. Loops on
@@ -17,23 +17,23 @@ const c = (io) => pc.createColors(io.color);
  */
 export async function acquireKeyStep(io, deps, provider) {
     const col = c(io);
-    io.write(`\nYou'll need a Cruxy API key. Create one at ${col.cyan(CREATE_KEY_URL)}\n`);
+    io.write(`\nYou'll need a Cruxy API key. Create one at ${col.accent(CREATE_KEY_URL)}\n`);
     for (let attempt = 1; attempt <= MAX_KEY_ATTEMPTS; attempt++) {
-        io.write(col.bold("Paste your API key: "));
+        io.write(col.strong("Paste your API key: "));
         const key = (await io.readSecret()).trim();
         if (key === "") {
             // Empty / Ctrl-C / EOF — treat as an abort of the mandatory step.
             return { status: "aborted" };
         }
-        io.write(col.dim("validating…\n"));
+        io.write(col.muted("validating…\n"));
         const outcome = await deps.validateKey(provider, key);
         if (outcome === "valid") {
             deps.writeCredential(provider, key);
-            io.write(`${col.green("✓")} key validated and saved to ~/.cruxy\n`);
+            io.write(`${col.success(col.glyph.success)} key validated and saved to ~/.cruxy\n`);
             return { status: "ok", apiKey: key };
         }
         if (outcome === "unreachable") {
-            io.write(`${col.red("✗")} couldn't reach the gateway to validate the key.\n`);
+            io.write(`${col.danger(col.glyph.failure)} couldn't reach the gateway to validate the key.\n`);
             return {
                 status: "failed",
                 message: "network unreachable — try again with `cruxy login`",
@@ -41,7 +41,7 @@ export async function acquireKeyStep(io, deps, provider) {
         }
         // invalid
         const left = MAX_KEY_ATTEMPTS - attempt;
-        io.write(`${col.red("✗")} that key was rejected${left > 0 ? ` (${left} ${left === 1 ? "try" : "tries"} left)` : ""}.\n`);
+        io.write(`${col.danger(col.glyph.failure)} that key was rejected${left > 0 ? ` (${left} ${left === 1 ? "try" : "tries"} left)` : ""}.\n`);
     }
     return { status: "failed", message: "key rejected after 3 attempts" };
 }
@@ -71,14 +71,14 @@ export async function scaffoldStep(io, cwd) {
     if (loadProjectInstructions(cwd) !== null) {
         return { status: "skipped" };
     }
-    io.write(`\nScaffold a ${col.bold("CRUXY.md")} to guide cruxy in this project? ${col.dim("[y/N]")} `);
+    io.write(`\nScaffold a ${col.strong("CRUXY.md")} to guide cruxy in this project? ${col.muted("[y/N]")} `);
     const key = (await io.readKey()).toLowerCase();
     io.write("\n");
     if (key !== "y")
         return { status: "skipped" };
     const file = join(cwd, "CRUXY.md");
     writeFileSync(file, CRUXY_MD_TEMPLATE, "utf8");
-    io.write(`${col.green("✓")} wrote ${col.bold("CRUXY.md")}\n`);
+    io.write(`${col.success(col.glyph.success)} wrote ${col.strong("CRUXY.md")}\n`);
     return { status: "ok" };
 }
 const FIRST_WIN_PROMPT = "Give me a concise 3-sentence summary of what this repository does, based on its README and structure.";
@@ -90,7 +90,7 @@ export async function firstWinStep(io, deps) {
     const col = c(io);
     if (!deps.runTask)
         return { status: "skipped" };
-    io.write(`\nRun a quick demo now — let cruxy summarize this repo? ${col.dim("[Y/n]")} `);
+    io.write(`\nRun a quick demo now — let cruxy summarize this repo? ${col.muted("[Y/n]")} `);
     const key = (await io.readKey()).toLowerCase();
     io.write("\n");
     if (key === "n")

package/dist/plan/approve.js

@@ -1,4 +1,4 @@
-import pc from "picocolors";
+import { themeForColor } from "../theme/index.js";
 import { renderPlan } from "./render.js";
 /**
  * The plan-approval prompt (C.31). Renders the plan and reads a single-key,
@@ -9,11 +9,11 @@ import { renderPlan } from "./render.js";
  * Default-deny: EOF / Ctrl-C / any unrecognized key → `abort`.
  */
 export async function promptPlanDecision(plan, io) {
-    const c = pc.createColors(io.color);
+    const t = themeForColor(io.color);
     io.write(renderPlan(plan, io.color));
     io.write("\n\n");
-    io.write(`  ${c.dim("Approving consents to the shape of the work — every action still asks before it runs.")}\n`);
-    io.write(`  ${c.dim("[a] approve ·")} [g] approve ${c.bold("+ allow the read/mutate steps")} this run ${c.dim("(destructive still confirms)")} ${c.dim("· [e] reject & revise")} `);
+    io.write(`  ${t.muted("Approving consents to the shape of the work — every action still asks before it runs.")}\n`);
+    io.write(`  ${t.muted(`[a] approve ${t.glyph.sep}`)} [g] approve ${t.strong("+ allow the read/mutate steps")} this run ${t.muted("(destructive still confirms)")} ${t.muted(`${t.glyph.sep} [e] reject & revise`)} `);
     const key = (await io.readKey()).toLowerCase();
     io.write("\n");
     switch (key) {
@@ -38,8 +38,8 @@ export async function promptPlanDecision(plan, io) {
  * the run. Default-deny → abort (the safe choice: stop on failure).
  */
 export async function promptContinueAfterFailure(io) {
-    const c = pc.createColors(io.color);
-    io.write(`  ${c.red("step failed.")} ${c.dim("[c] continue with the remaining steps · [any other key] abort")} `);
+    const t = themeForColor(io.color);
+    io.write(`  ${t.danger("step failed.")} ${t.muted(`[c] continue with the remaining steps ${t.glyph.sep} [any other key] abort`)} `);
     const key = (await io.readKey()).toLowerCase();
     io.write("\n");
     return key === "c";

package/dist/plan/render.js

@@ -1,47 +1,55 @@
-import pc from "picocolors";
+import { themeForColor } from "../theme/index.js";
+/**
+ * Plan rendering (C.31): data → string so it's testable and color is gated on a
+ * boolean (NO_COLOR / non-TTY aware, passed in by the caller). Used both for the
+ * approval prompt and for live status during execution. Glyphs and colors are
+ * sourced from the theme (U.1); status is carried by the glyph (○/◐/✓/✗) and
+ * risk by the `[read]/[mutate]/[destructive]` label, so meaning survives
+ * NO_COLOR.
+ */
 /** Status glyph, colored when enabled. */
-function statusMark(status, c) {
+function statusMark(status, t) {
     switch (status) {
         case "pending":
-            return c.dim("○");
+            return t.muted(t.glyph.pending);
         case "running":
-            return c.cyan("◐");
+            return t.accent(t.glyph.running);
         case "done":
-            return c.green("✓");
+            return t.success(t.glyph.success);
         case "failed":
-            return c.red("✗");
+            return t.danger(t.glyph.failure);
     }
 }
 /** A short tag for the step's risk estimate. */
-function kindTag(kind, c) {
+function kindTag(kind, t) {
     switch (kind) {
         case "read":
-            return c.dim("[read]");
+            return t.muted("[read]");
         case "mutate":
-            return c.yellow("[mutate]");
+            return t.warning("[mutate]");
         case "destructive":
-            return c.red(c.bold("[destructive]"));
+            return t.danger(t.strong("[destructive]"));
     }
 }
-function renderStep(step, c) {
-    const head = `  ${statusMark(step.status, c)} ${c.bold(step.id + ".")} ${step.title} ${kindTag(step.kind, c)}`;
+function renderStep(step, t) {
+    const head = `  ${statusMark(step.status, t)} ${t.strong(step.id + ".")} ${step.title} ${kindTag(step.kind, t)}`;
     const why = step.rationale.trim()
-        ? `\n      ${c.dim(step.rationale.trim())}`
+        ? `\n      ${t.muted(step.rationale.trim())}`
         : "";
     return head + why;
 }
 /** Render the whole plan as a block (header + one line per step + rationale). */
 export function renderPlan(plan, color) {
-    const c = pc.createColors(color);
+    const t = themeForColor(color);
     const lines = [
-        c.bold(`Plan — ${plan.steps.length} step${plan.steps.length === 1 ? "" : "s"}:`),
+        t.heading(`Plan — ${plan.steps.length} step${plan.steps.length === 1 ? "" : "s"}:`),
     ];
     for (const step of plan.steps)
-        lines.push(renderStep(step, c));
+        lines.push(renderStep(step, t));
     return lines.join("\n");
 }
 /** A one-line status update for a single step (used during execution). */
 export function renderStepStatus(step, color) {
-    const c = pc.createColors(color);
-    return `${statusMark(step.status, c)} ${c.bold(step.id + ".")} ${step.title}`;
+    const t = themeForColor(color);
+    return `${statusMark(step.status, t)} ${t.strong(step.id + ".")} ${step.title}`;
 }

package/dist/render/capabilities.js

@@ -1,4 +1,5 @@
 import { shouldUseColor } from "../errors/index.js";
+import { detectUnicode } from "../theme/index.js";
 /**
  * Probe the environment once and reduce it to {@link RenderCapabilities}. Pure
  * given its inputs (stream + env are injectable), so every row of the
@@ -20,6 +21,9 @@ export function detectCapabilities(stream = process.stdout, env = process.env) {
         // Same set-and-non-empty convention as NO_COLOR: any value disables.
         spinner: cursor &&
             !(env.CRUXY_NO_SPINNER !== undefined && env.CRUXY_NO_SPINNER !== ""),
+        // Unicode glyph safety (U.1) — independent of color. dumb / CRUXY_ASCII →
+        // ASCII glyphs; everything else (incl. pipes) keeps unicode.
+        unicode: detectUnicode(env),
         width: typeof stream.columns === "number" && stream.columns > 0
             ? stream.columns
             : 80,

package/dist/render/diff.d.ts

@@ -1,14 +1,13 @@
-import pc from "picocolors";
 import type { ActionPreview } from "../tools/types.js";
+import type { Theme } from "../theme/index.js";
 /**
  * The one diff/action-preview renderer (U.2). The approval prompt, PR preview,
  * and the streaming render path all draw diffs through here — there is no
- * second implementation to drift. Pure data → string; color is gated on a
- * picocolors instance, so NO_COLOR/non-TTY callers get symbol-only `+`/`-`
- * lines from the exact same code path.
+ * second implementation to drift. Pure data → string; color is sourced from
+ * the resolved {@link Theme} (U.1), so NO_COLOR/non-TTY callers get symbol-only
+ * `+`/`-` lines from the exact same code path. Diff add/remove intentionally
+ * reuse the `success`/`danger` hues (green/red), as before.
  */
-/** The picocolors instance type (colorless or not), from createColors. */
-export type Colors = ReturnType<typeof pc.createColors>;
 /** Cap on rendered preview lines before collapsing the rest. */
 export declare const PREVIEW_MAX_LINES = 40;
 /**
@@ -16,4 +15,4 @@ export declare const PREVIEW_MAX_LINES = 40;
  * patches, a create/overwrite listing for writes, the publish plan for PRs.
  * Long previews collapse past {@link PREVIEW_MAX_LINES}.
  */
-export declare function renderActionPreview(preview: ActionPreview | undefined, c: Colors): string;
+export declare function renderActionPreview(preview: ActionPreview | undefined, c: Theme): string;

package/dist/render/diff.js

@@ -1,24 +1,32 @@
+/**
+ * The one diff/action-preview renderer (U.2). The approval prompt, PR preview,
+ * and the streaming render path all draw diffs through here — there is no
+ * second implementation to drift. Pure data → string; color is sourced from
+ * the resolved {@link Theme} (U.1), so NO_COLOR/non-TTY callers get symbol-only
+ * `+`/`-` lines from the exact same code path. Diff add/remove intentionally
+ * reuse the `success`/`danger` hues (green/red), as before.
+ */
 /** Cap on rendered preview lines before collapsing the rest. */
 export const PREVIEW_MAX_LINES = 40;
 function diffLines(oldStr, newStr, c) {
-    const removed = oldStr.split("\n").map((l) => c.red(`- ${l}`));
-    const added = newStr.split("\n").map((l) => c.green(`+ ${l}`));
+    const removed = oldStr.split("\n").map((l) => c.danger(`- ${l}`));
+    const added = newStr.split("\n").map((l) => c.success(`+ ${l}`));
     return [...removed, ...added];
 }
 function renderPatchFiles(files, c) {
     const out = [];
     for (const file of files) {
         if (file.op === "delete") {
-            out.push(c.red(`delete ${file.path}`));
+            out.push(c.danger(`delete ${file.path}`));
         }
         else if (file.op === "create") {
-            out.push(c.green(`create ${file.path}`));
-            out.push(...file.lines.map((l) => c.green(`+ ${l}`)));
+            out.push(c.success(`create ${file.path}`));
+            out.push(...file.lines.map((l) => c.success(`+ ${l}`)));
             if (file.omittedLines > 0)
-                out.push(c.dim(`  ...${file.omittedLines} more lines`));
+                out.push(c.muted(`  ...${file.omittedLines} more lines`));
         }
         else {
-            out.push(c.yellow(`update ${file.path}`));
+            out.push(c.warning(`update ${file.path}`));
             for (const hunk of file.hunks)
                 out.push(...diffLines(hunk.oldStr, hunk.newStr, c));
         }
@@ -28,16 +36,16 @@ function renderPatchFiles(files, c) {
 /** Render a `vcs` pull-request publish plan: branch, commit, and PR body. */
 function renderPrPreview(preview, c) {
     const out = [];
-    out.push(`${c.bold("branch")}  ${c.green(preview.branch)} → ${preview.base}`);
+    out.push(`${c.strong("branch")}  ${c.success(preview.branch)} ${c.glyph.arrow} ${preview.base}`);
     out.push("");
-    out.push(c.bold("commit"));
+    out.push(c.strong("commit"));
     out.push(`  ${preview.commitSubject}`);
     for (const line of bodyLines(preview.commitBody))
-        out.push(c.dim(`  ${line}`));
+        out.push(c.muted(`  ${line}`));
     out.push("");
-    out.push(`${c.bold("pull request")}  ${preview.prTitle}`);
+    out.push(`${c.strong("pull request")}  ${preview.prTitle}`);
     for (const line of bodyLines(preview.prBody))
-        out.push(c.dim(`  ${line}`));
+        out.push(c.muted(`  ${line}`));
     return out;
 }
 /**
@@ -48,17 +56,17 @@ function renderPrPreview(preview, c) {
  */
 function renderRollbackPreview(preview, c) {
     const out = [];
-    out.push(`${c.bold("restore checkpoint")} ${c.cyan(preview.checkpointId)} ${c.dim(`(${preview.createdAt})`)}`);
+    out.push(`${c.strong("restore checkpoint")} ${c.accent(preview.checkpointId)} ${c.muted(`(${preview.createdAt})`)}`);
     if (preview.runSummary)
-        out.push(c.dim(`run: ${preview.runSummary}`));
-    out.push(c.dim("working-tree files only — commits, pushes, and PRs made during the run are not undone"));
+        out.push(c.muted(`run: ${preview.runSummary}`));
+    out.push(c.muted("working-tree files only — commits, pushes, and PRs made during the run are not undone"));
     if (preview.externalPaths.length > 0) {
-        out.push(c.red(c.bold("changed outside this run — rollback will overwrite these too:")));
+        out.push(c.danger(c.strong("changed outside this run — rollback will overwrite these too:")));
         for (const p of preview.externalPaths)
-            out.push(c.red(`! ${p}`));
+            out.push(c.danger(`! ${p}`));
     }
     if (preview.attributionUnknown) {
-        out.push(c.yellow("this run executed shell commands; some changes below may not have been made by the run"));
+        out.push(c.warning("this run executed shell commands; some changes below may not have been made by the run"));
     }
     out.push("");
     out.push(...renderPatchFiles(preview.files, c));
@@ -92,16 +100,19 @@ export function renderActionPreview(preview, c) {
     }
     else {
         const header = preview.exists
-            ? c.yellow("OVERWRITE existing")
-            : c.green("create");
+            ? c.warning("OVERWRITE existing")
+            : c.success("create");
         const body = preview.lines.map((l) => `  ${l}`);
         if (preview.omittedLines > 0)
-            body.push(c.dim(`  ...${preview.omittedLines} more lines`));
+            body.push(c.muted(`  ...${preview.omittedLines} more lines`));
         lines = [header, ...body];
     }
     if (lines.length > PREVIEW_MAX_LINES) {
         const hidden = lines.length - PREVIEW_MAX_LINES;
-        lines = [...lines.slice(0, PREVIEW_MAX_LINES), c.dim(`...${hidden} more`)];
+        lines = [
+            ...lines.slice(0, PREVIEW_MAX_LINES),
+            c.muted(`...${hidden} more`),
+        ];
     }
     return lines.map((l) => `  ${l}`).join("\n");
 }

package/dist/render/highlight.d.ts

@@ -1,4 +1,4 @@
-import type { Colors } from "./diff.js";
+import type { Theme } from "../theme/index.js";
 /**
  * Best-effort, bounded syntax highlighting for fenced code blocks in streamed
  * markdown (U.2). Priorities, in order: never crash the stream, never hold the
@@ -38,10 +38,10 @@ export interface StreamHighlighter {
  * Create the per-segment streaming highlighter. `highlightLine` is injectable
  * for tests (e.g. to prove a throwing tokenizer degrades to plain text).
  */
-export declare function createStreamHighlighter(c: Colors, highlightLine?: LineHighlighter): StreamHighlighter;
+export declare function createStreamHighlighter(theme: Theme, highlightLine?: LineHighlighter): StreamHighlighter;
 /**
  * Build the default per-line tokenizer over `c`. A plain left-to-right scan:
  * comments dim, strings green, keywords magenta, numbers yellow, everything
  * else untouched. Unknown language → identity.
  */
-export declare function defaultLineHighlighter(c: Colors): LineHighlighter;
+export declare function defaultLineHighlighter(theme: Theme): LineHighlighter;

package/dist/render/highlight.js

@@ -7,7 +7,7 @@ const FENCE_PLAUSIBLE = /^(?:`{1,2}|`{3,}[\w+#.-]*\s*)$/;
  * Create the per-segment streaming highlighter. `highlightLine` is injectable
  * for tests (e.g. to prove a throwing tokenizer degrades to plain text).
  */
-export function createStreamHighlighter(c, highlightLine = defaultLineHighlighter(c)) {
+export function createStreamHighlighter(theme, highlightLine = defaultLineHighlighter(theme)) {
     let mode = "prose";
     let atLineStart = true;
     let lineBuf = "";
@@ -45,7 +45,7 @@ export function createStreamHighlighter(c, highlightLine = defaultLineHighlighte
                         lang = m[2] ? m[2].toLowerCase() : null;
                         carry = FRESH_CARRY;
                         mode = "code";
-                        out += c.dim(lineBuf) + "\n";
+                        out += theme.muted(lineBuf) + "\n";
                     }
                     else {
                         mode = "prose";
@@ -70,7 +70,7 @@ export function createStreamHighlighter(c, highlightLine = defaultLineHighlighte
                 if (ch === "\n") {
                     if (/^`{3,}\s*$/.test(lineBuf)) {
                         mode = "prose";
-                        out += c.dim(lineBuf) + "\n";
+                        out += theme.muted(lineBuf) + "\n";
                     }
                     else {
                         out += styleCodeLine(lineBuf) + "\n";
@@ -165,7 +165,7 @@ const WORD = /[A-Za-z0-9_$]/;
  * comments dim, strings green, keywords magenta, numbers yellow, everything
  * else untouched. Unknown language → identity.
  */
-export function defaultLineHighlighter(c) {
+export function defaultLineHighlighter(theme) {
     return (line, lang, carry) => {
         const def = lang ? LANGS[lang] : undefined;
         if (!def)
@@ -179,37 +179,37 @@ export function defaultLineHighlighter(c) {
         if (next.blockComment && def.blockComment) {
             const close = line.indexOf(def.blockComment[1]);
             if (close === -1)
-                return { text: c.dim(line), carry: next };
+                return { text: theme.syntax.comment(line), carry: next };
             const end = close + def.blockComment[1].length;
-            out += c.dim(line.slice(0, end));
+            out += theme.syntax.comment(line.slice(0, end));
             i = end;
             next.blockComment = false;
         }
         else if (next.stringDelim) {
             const close = findStringEnd(line, 0, next.stringDelim);
             if (close === -1)
-                return { text: c.green(line), carry: next };
-            out += c.green(line.slice(0, close));
+                return { text: theme.syntax.string(line), carry: next };
+            out += theme.syntax.string(line.slice(0, close));
             i = close;
             next.stringDelim = null;
         }
         while (i < line.length) {
             const rest = line.slice(i);
             if (def.lineComment && rest.startsWith(def.lineComment)) {
-                out += c.dim(rest);
+                out += theme.syntax.comment(rest);
                 i = line.length;
                 break;
             }
             if (def.blockComment && rest.startsWith(def.blockComment[0])) {
                 const close = line.indexOf(def.blockComment[1], i + def.blockComment[0].length);
                 if (close === -1) {
-                    out += c.dim(rest);
+                    out += theme.syntax.comment(rest);
                     next = { ...next, blockComment: true };
                     i = line.length;
                     break;
                 }
                 const end = close + def.blockComment[1].length;
-                out += c.dim(line.slice(i, end));
+                out += theme.syntax.comment(line.slice(i, end));
                 i = end;
                 continue;
             }
@@ -217,13 +217,13 @@ export function defaultLineHighlighter(c) {
             if (quote) {
                 const close = findStringEnd(line, i + quote.length, quote);
                 if (close === -1) {
-                    out += c.green(rest);
+                    out += theme.syntax.string(rest);
                     if (def.multiline.includes(quote))
                         next = { ...next, stringDelim: quote };
                     i = line.length;
                     break;
                 }
-                out += c.green(line.slice(i, close));
+                out += theme.syntax.string(line.slice(i, close));
                 i = close;
                 continue;
             }
@@ -234,9 +234,9 @@ export function defaultLineHighlighter(c) {
                     j++;
                 const word = line.slice(i, j);
                 if (def.keywords.has(word))
-                    out += c.magenta(word);
+                    out += theme.syntax.keyword(word);
                 else if (/^\d/.test(word))
-                    out += c.yellow(word);
+                    out += theme.syntax.number(word);
                 else
                     out += word;
                 i = j;

package/dist/render/index.d.ts

@@ -2,7 +2,7 @@ import type { RenderStream, StreamRenderer } from "./types.js";
 export type { ProgressState, RenderCapabilities, RenderPhase, RenderStream, StreamRenderer, TokenUsage, ToolLifecycleEvent, } from "./types.js";
 export { detectCapabilities } from "./capabilities.js";
 export { composeStatusLine, describePhase, ELAPSED_AFTER_MS, formatElapsed, formatTokens, phaseIdentity, } from "./state.js";
-export { renderActionPreview, PREVIEW_MAX_LINES, type Colors } from "./diff.js";
+export { renderActionPreview, PREVIEW_MAX_LINES } from "./diff.js";
 export { createStreamHighlighter, defaultLineHighlighter, type HighlightCarry, type LineHighlighter, type StreamHighlighter, } from "./highlight.js";
 export { PlainRenderer } from "./plain-renderer.js";
 export { TtyRenderer } from "./tty-renderer.js";

package/dist/render/plain-renderer.d.ts

@@ -1,4 +1,5 @@
 import type { ActionPreview } from "../tools/types.js";
+import { type Theme } from "../theme/index.js";
 import type { RenderCapabilities, RenderStream, StreamRenderer, ToolLifecycleEvent } from "./types.js";
 /**
  * The append-only renderer for pipes, CI, and cursor-less terminals. Emits no
@@ -15,7 +16,7 @@ export declare class PlainRenderer implements StreamRenderer {
     readonly caps: RenderCapabilities;
     private readonly out;
     private readonly err;
-    private readonly colors;
+    readonly theme: Theme;
     /** Per-turn leading-newline trim; also tells endSegment whether to newline. */
     private print;
     private wroteInSegment;

package/dist/render/plain-renderer.js

@@ -1,4 +1,4 @@
-import pc from "picocolors";
+import { resolveTheme } from "../theme/index.js";
 import { createStreamPrinter } from "../cli/stream-print.js";
 import { renderActionPreview } from "./diff.js";
 import { ELAPSED_AFTER_MS, formatElapsed } from "./state.js";
@@ -17,7 +17,7 @@ export class PlainRenderer {
     caps;
     out;
     err;
-    colors;
+    theme;
     /** Per-turn leading-newline trim; also tells endSegment whether to newline. */
     print;
     wroteInSegment = false;
@@ -27,7 +27,7 @@ export class PlainRenderer {
         this.caps = caps;
         this.out = out;
         this.err = err;
-        this.colors = pc.createColors(caps.color);
+        this.theme = resolveTheme(caps);
         this.print = this.newPrinter();
     }
     newPrinter() {
@@ -49,10 +49,10 @@ export class PlainRenderer {
         this.wroteInSegment = false;
     }
     note(text) {
-        this.err.write(this.colors.dim(text) + "\n");
+        this.err.write(this.theme.muted(text) + "\n");
     }
     preview(preview) {
-        const block = renderActionPreview(preview, this.colors);
+        const block = renderActionPreview(preview, this.theme);
         if (block)
             this.out.write(block + "\n");
     }
@@ -77,7 +77,8 @@ export class PlainRenderer {
         this.toolStart = null;
         const elapsed = started === null ? 0 : Date.now() - started.at;
         const suffix = elapsed >= ELAPSED_AFTER_MS ? ` (${formatElapsed(elapsed)})` : "";
-        this.note(`${event.ok ? "✓" : "✗"} ${event.label}${suffix}`);
+        const mark = event.ok ? this.theme.glyph.success : this.theme.glyph.failure;
+        this.note(`${mark} ${event.label}${suffix}`);
     }
     promptResolved() {
         // No live region to restore.

package/dist/render/state.d.ts

@@ -1,9 +1,14 @@
+import { type ThemeGlyphs } from "../theme/index.js";
 import type { ProgressState, RenderPhase } from "./types.js";
 /**
  * The U.4 state→text mapping: pure data → string, like plan/render.ts and
  * diff.ts, so both renderers (and tests) share one composition with no
  * terminal in sight. Color is deliberately absent — the live line is drawn
  * dim as a whole by the TTY renderer; state text is content, not chrome.
+ *
+ * Glyphs (ellipsis, token arrows, the ` · ` joiner) come from the theme (U.1);
+ * they default to the unicode table so colorless/test callers are unchanged,
+ * and the TTY renderer passes its capability-resolved set for ASCII fallback.
  */
 /**
  * Threshold before elapsed time appears on a live state or a committed tool
@@ -16,7 +21,7 @@ export declare function formatTokens(n: number): string;
 /** `37s`, `2m08s` — durations at status-line width. */
 export declare function formatElapsed(ms: number): string;
 /** The live-line text for a phase. `awaiting-approval` never renders (the line hides). */
-export declare function describePhase(phase: RenderPhase): string;
+export declare function describePhase(phase: RenderPhase, glyph?: ThemeGlyphs): string;
 /**
  * Identity key for the elapsed clock: the clock resets when the phase becomes
  * a *different activity*, not on every payload update — a thinking phase that
@@ -28,4 +33,4 @@ export declare function phaseIdentity(phase: RenderPhase | null): string;
  * Elapsed appears only past {@link ELAPSED_AFTER_MS} — callers pass it only
  * when they can keep it ticking honestly (no timer → no frozen number).
  */
-export declare function composeStatusLine(progress: ProgressState | null, phase: RenderPhase | null, elapsedMs?: number): string;
+export declare function composeStatusLine(progress: ProgressState | null, phase: RenderPhase | null, elapsedMs?: number, glyph?: ThemeGlyphs): string;

package/dist/render/state.js

@@ -1,8 +1,13 @@
+import { UNICODE_GLYPHS } from "../theme/index.js";
 /**
  * The U.4 state→text mapping: pure data → string, like plan/render.ts and
  * diff.ts, so both renderers (and tests) share one composition with no
  * terminal in sight. Color is deliberately absent — the live line is drawn
  * dim as a whole by the TTY renderer; state text is content, not chrome.
+ *
+ * Glyphs (ellipsis, token arrows, the ` · ` joiner) come from the theme (U.1);
+ * they default to the unicode table so colorless/test callers are unchanged,
+ * and the TTY renderer passes its capability-resolved set for ASCII fallback.
  */
 /**
  * Threshold before elapsed time appears on a live state or a committed tool
@@ -28,23 +33,24 @@ export function formatElapsed(ms) {
     return `${minutes}m${String(seconds % 60).padStart(2, "0")}s`;
 }
 /** The live-line text for a phase. `awaiting-approval` never renders (the line hides). */
-export function describePhase(phase) {
+export function describePhase(phase, glyph = UNICODE_GLYPHS) {
+    const e = glyph.ellipsis;
     switch (phase.kind) {
         case "thinking": {
             const t = phase.tokens;
             // Honest numbers only: no usage yet → no figure at all.
             return t && t.input + t.output > 0
-                ? `thinking… · tokens ↑${formatTokens(t.input)} ↓${formatTokens(t.output)}`
-                : "thinking…";
+                ? `thinking${e} ${glyph.sep} tokens ${glyph.caretUp}${formatTokens(t.input)} ${glyph.caretDown}${formatTokens(t.output)}`
+                : `thinking${e}`;
         }
         case "calling-tool":
-            return `${phase.label}…`;
+            return `${phase.label}${e}`;
         case "awaiting-approval":
-            return "awaiting approval…";
+            return `awaiting approval${e}`;
         case "executing-step":
-            return "working…";
+            return `working${e}`;
         case "subagent":
-            return `subagent: ${phase.label}…`;
+            return `subagent: ${phase.label}${e}`;
     }
 }
 /**
@@ -69,13 +75,13 @@ export function phaseIdentity(phase) {
  * Elapsed appears only past {@link ELAPSED_AFTER_MS} — callers pass it only
  * when they can keep it ticking honestly (no timer → no frozen number).
  */
-export function composeStatusLine(progress, phase, elapsedMs) {
+export function composeStatusLine(progress, phase, elapsedMs, glyph = UNICODE_GLYPHS) {
     const parts = [];
     if (progress)
         parts.push(`[${progress.step}/${progress.of}] ${progress.title}`);
     if (phase)
-        parts.push(describePhase(phase));
-    const line = parts.join(" · ");
+        parts.push(describePhase(phase, glyph));
+    const line = parts.join(` ${glyph.sep} `);
     if (elapsedMs !== undefined && elapsedMs >= ELAPSED_AFTER_MS) {
         return `${line} (${formatElapsed(elapsedMs)})`;
     }