steward-cli 0.16.0 → 0.17.0

package/dist/cli.js

@@ -42222,6 +42222,40 @@ function stringWidth(input, options = {}) {
 // src/tui/engine/cell-layout.ts
 import { appendFileSync } from "node:fs";
 
+// src/theme/figures.ts
+var figures = {
+  blackCircle: "●",
+  bullet: "·",
+  bulletSmall: "∙",
+  teardropAsterisk: "✻",
+  asterisk: "*",
+  threeDots: "∴",
+  treeBranch: "└",
+  treeVertical: "│",
+  pointer: ">",
+  pointerBold: "❯",
+  pointerSmall: "›",
+  tick: "✔",
+  cross: "✖",
+  warning: "⚠",
+  info: "ℹ",
+  ellipsis: "…",
+  arrowUp: "↑",
+  arrowDown: "↓",
+  arrowLeft: "←",
+  arrowRight: "→",
+  blockquoteBar: "▎",
+  horizontalLine: "─",
+  heavyHorizontal: "━",
+  dashedLine: "╌",
+  effortLow: "○",
+  effortMedium: "◐",
+  effortHigh: "●",
+  effortMax: "◉",
+  sliderPointer: "▲",
+  sliderDivider: "┆",
+  spinnerFrames: ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
+};
 // node_modules/chalk/source/utilities.js
 function stringReplaceAll(string, substring, postfix) {
   let index = string.indexOf(substring);
@@ -42770,357 +42804,419 @@ var chalk = createChalk();
 var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
-// src/theme/figures.ts
-import { platform } from "node:os";
-var isDarwin = platform() === "darwin";
-var figures = {
-  blackCircle: "●",
-  bullet: "·",
-  bulletSmall: "∙",
-  teardropAsterisk: "✻",
-  asterisk: "*",
-  threeDots: "∴",
-  treeBranch: "└",
-  treeVertical: "│",
-  pointer: ">",
-  pointerBold: "❯",
-  pointerSmall: "›",
-  tick: "✔",
-  cross: "✖",
-  warning: "⚠",
-  info: "ℹ",
-  ellipsis: "…",
-  arrowUp: "↑",
-  arrowDown: "↓",
-  arrowLeft: "←",
-  arrowRight: "→",
-  blockquoteBar: "▎",
-  horizontalLine: "─",
-  heavyHorizontal: "━",
-  dashedLine: "╌",
-  effortLow: "○",
-  effortMedium: "◐",
-  effortHigh: "●",
-  effortMax: "◉",
-  sliderPointer: "▲",
-  sliderDivider: "┆",
-  spinnerFrames: ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
-};
+// src/theme/apply.ts
+function resolveThemeColor(color, isBg = false) {
+  if (!color || color === "default" || color === "none" || color === "transparent" || color === "ansi(reset)" || color === "ansi(default)") {
+    return (s) => s;
+  }
+  if (color === "dim" || color === "ansi(dim)") {
+    return isBg ? (s) => s : (s) => source_default.dim(s);
+  }
+  if (color.startsWith("ansi(") && color.endsWith(")")) {
+    const name = color.slice(5, -1).trim();
+    if (name === "reset" || name === "none" || name === "transparent" || name === "default") {
+      return (s) => s;
+    }
+    if (name === "dim") {
+      return isBg ? (s) => s : (s) => source_default.dim(s);
+    }
+    if (isBg && !name.startsWith("bg")) {
+      const bgName = `bg${name.charAt(0).toUpperCase()}${name.slice(1)}`;
+      const fn = source_default[bgName];
+      if (typeof fn === "function")
+        return fn;
+    }
+    const fn = source_default[name];
+    if (typeof fn === "function")
+      return fn;
+    return (s) => s;
+  }
+  if (color.startsWith("rgb(")) {
+    const match = color.match(/\d+/g);
+    if (match && match.length >= 3) {
+      const [r, g, b] = [Number(match[0]), Number(match[1]), Number(match[2])];
+      return isBg ? source_default.bgRgb(r, g, b) : source_default.rgb(r, g, b);
+    }
+  }
+  if (color.startsWith("#")) {
+    return isBg ? source_default.bgHex(color) : source_default.hex(color);
+  }
+  return (s) => s;
+}
+
+// src/theme/style.ts
+var _themeVersion = 0;
+function themeVersion() {
+  return _themeVersion;
+}
+function bumpThemeVersion() {
+  _themeVersion++;
+}
+var colorCache = new Map;
+var cachedVersion = -1;
+function getCachedColor(token, isBg) {
+  if (source_default.level === 0) {
+    return (s) => s;
+  }
+  const v = _themeVersion;
+  if (v !== cachedVersion) {
+    colorCache.clear();
+    cachedVersion = v;
+  }
+  const key = `${isBg ? "bg:" : "fg:"}${token}`;
+  let fn = colorCache.get(key);
+  if (!fn) {
+    const theme = getTheme();
+    const colorStr = theme[token];
+    fn = resolveThemeColor(colorStr ?? (isBg ? "default" : "default"), isBg);
+    colorCache.set(key, fn);
+  }
+  return fn;
+}
+var c = new Proxy({}, {
+  get(_target, prop) {
+    return (s) => getCachedColor(prop, false)(s);
+  }
+});
+var bg = new Proxy({}, {
+  get(_target, prop) {
+    return (s) => getCachedColor(prop, true)(s);
+  }
+});
+var bold = (s) => source_default.level === 0 ? s : source_default.bold(s);
+var italic = (s) => source_default.level === 0 ? s : source_default.italic(s);
+var underline = (s) => source_default.level === 0 ? s : source_default.underline(s);
+var strikethrough = (s) => source_default.level === 0 ? s : source_default.strikethrough(s);
+
 // src/theme/colors.ts
 var darkTheme = {
+  text: "rgb(255,255,255)",
+  muted: "rgb(110,110,110)",
+  subtle: "rgb(80,80,80)",
   brand: "rgb(215,119,87)",
-  brandShimmer: "rgb(235,159,127)",
-  permission: "rgb(177,185,249)",
-  permissionDim: "rgb(93,100,128)",
-  permissionShimmer: "rgb(207,215,255)",
-  lavenderHeader: "rgb(129,136,165)",
-  lavenderLight: "rgb(183,184,228)",
-  bashPink: "rgb(253,93,177)",
+  info: "rgb(123,165,218)",
   success: "rgb(78,186,101)",
-  error: "rgb(255,107,128)",
   warning: "rgb(255,193,7)",
-  info: "rgb(123,165,218)",
-  bulletSuccess: "rgb(75,185,99)",
-  bulletError: "rgb(255,107,128)",
-  bulletRunning: "rgb(255,255,255)",
-  text: "rgb(255,255,255)",
-  textMuted: "rgb(110,110,110)",
-  subtle: "rgb(80,80,80)",
-  inactive: "rgb(153,153,153)",
+  error: "rgb(255,107,128)",
+  permission: "rgb(177,185,249)",
+  selected: "rgb(177,185,249)",
+  current: "rgb(255,193,7)",
   promptBorder: "rgb(136,136,136)",
-  userCardBg: "rgb(55,55,55)",
+  rule: "rgb(129,136,165)",
   userChevron: "rgb(82,82,82)",
-  toolHeaderBg: "rgb(35,35,40)",
-  diffAddBG: "rgb(19,54,14)",
-  diffAddFG: "rgb(126,231,135)",
-  diffDeleteBG: "rgb(54,5,9)",
-  diffDeleteFG: "rgb(255,123,114)",
-  dividerRule: "rgb(129,136,165)",
-  dashedRule: "rgb(51,51,51)"
+  userBg: "rgb(55,55,55)",
+  diffAddBg: "rgb(19,54,14)",
+  diffDelBg: "rgb(54,5,9)",
+  diffAddFg: "rgb(126,231,135)",
+  diffDelFg: "rgb(255,123,114)",
+  syntax: {
+    keyword: "#ff7b72",
+    string: "#a5d6ff",
+    number: "#79c0ff",
+    literal: "#79c0ff",
+    comment: "#8b949e",
+    function: "#d2a8ff",
+    type: "#ffa657",
+    variable: "#ffa657",
+    tag: "#7ee787",
+    attr: "#79c0ff",
+    meta: "#79c0ff",
+    addition: "#7ee787",
+    deletion: "#ffa198",
+    default: "#c9d1d9"
+  }
 };
 var lightTheme = {
+  text: "default",
+  muted: "rgb(120,120,120)",
+  subtle: "rgb(175,175,175)",
   brand: "rgb(215,119,87)",
-  brandShimmer: "rgb(245,149,117)",
-  permission: "rgb(87,105,247)",
-  permissionDim: "rgb(140,150,200)",
-  permissionShimmer: "rgb(137,155,255)",
-  lavenderHeader: "rgb(100,110,145)",
-  lavenderLight: "rgb(120,130,190)",
-  bashPink: "rgb(219,39,119)",
+  info: "rgb(40,100,180)",
   success: "rgb(44,122,57)",
-  error: "rgb(171,43,63)",
   warning: "rgb(150,108,30)",
-  info: "rgb(40,100,180)",
-  bulletSuccess: "rgb(44,122,57)",
-  bulletError: "rgb(171,43,63)",
-  bulletRunning: "rgb(20,20,20)",
-  text: "rgb(0,0,0)",
-  textMuted: "rgb(120,120,120)",
-  subtle: "rgb(175,175,175)",
-  inactive: "rgb(102,102,102)",
+  error: "rgb(171,43,63)",
+  permission: "rgb(87,105,247)",
+  selected: "rgb(87,105,247)",
+  current: "rgb(150,108,30)",
   promptBorder: "rgb(153,153,153)",
-  userCardBg: "rgb(240,240,240)",
+  rule: "rgb(120,130,160)",
   userChevron: "rgb(160,160,160)",
-  toolHeaderBg: "rgb(230,230,235)",
-  diffAddBG: "rgb(220,245,220)",
-  diffAddFG: "rgb(30,120,40)",
-  diffDeleteBG: "rgb(255,230,230)",
-  diffDeleteFG: "rgb(180,40,40)",
-  dividerRule: "rgb(120,130,160)",
-  dashedRule: "rgb(200,200,200)"
+  userBg: "rgb(240,240,240)",
+  diffAddBg: "rgb(220,245,220)",
+  diffDelBg: "rgb(255,230,230)",
+  diffAddFg: "rgb(30,120,40)",
+  diffDelFg: "rgb(180,40,40)",
+  syntax: {
+    keyword: "#d73a49",
+    string: "#032f62",
+    number: "#005cc5",
+    literal: "#005cc5",
+    comment: "#6a737d",
+    function: "#6f42c1",
+    type: "#e36209",
+    variable: "#e36209",
+    tag: "#22863a",
+    attr: "#005cc5",
+    meta: "#005cc5",
+    addition: "#22863a",
+    deletion: "#b31d28",
+    default: "default"
+  }
 };
 var draculaTheme = {
+  text: "rgb(248,248,242)",
+  muted: "rgb(98,114,164)",
+  subtle: "rgb(68,71,90)",
   brand: "rgb(255,184,108)",
-  brandShimmer: "rgb(255,200,140)",
-  permission: "rgb(189,147,249)",
-  permissionDim: "rgb(98,114,164)",
-  permissionShimmer: "rgb(255,121,198)",
-  lavenderHeader: "rgb(189,147,249)",
-  lavenderLight: "rgb(215,190,252)",
-  bashPink: "rgb(255,121,198)",
+  info: "rgb(139,233,253)",
   success: "rgb(80,250,123)",
-  error: "rgb(255,85,85)",
   warning: "rgb(255,184,108)",
-  info: "rgb(139,233,253)",
-  bulletSuccess: "rgb(80,250,123)",
-  bulletError: "rgb(255,85,85)",
-  bulletRunning: "rgb(248,248,242)",
-  text: "rgb(248,248,242)",
-  textMuted: "rgb(98,114,164)",
-  subtle: "rgb(68,71,90)",
-  inactive: "rgb(98,114,164)",
+  error: "rgb(255,85,85)",
+  permission: "rgb(189,147,249)",
+  selected: "rgb(189,147,249)",
+  current: "rgb(255,184,108)",
   promptBorder: "rgb(98,114,164)",
-  userCardBg: "rgb(68,71,90)",
+  rule: "rgb(189,147,249)",
   userChevron: "rgb(98,114,164)",
-  toolHeaderBg: "rgb(40,42,54)",
-  diffAddBG: "rgb(12,38,18)",
-  diffAddFG: "rgb(80,250,123)",
-  diffDeleteBG: "rgb(45,15,15)",
-  diffDeleteFG: "rgb(255,85,85)",
-  dividerRule: "rgb(189,147,249)",
-  dashedRule: "rgb(68,71,90)"
+  userBg: "rgb(68,71,90)",
+  diffAddBg: "rgb(12,38,18)",
+  diffDelBg: "rgb(45,15,15)",
+  diffAddFg: "rgb(80,250,123)",
+  diffDelFg: "rgb(255,85,85)",
+  syntax: {
+    keyword: "rgb(255,121,198)",
+    string: "rgb(241,250,140)",
+    number: "rgb(189,147,249)",
+    literal: "rgb(189,147,249)",
+    comment: "rgb(98,114,164)",
+    function: "rgb(80,250,123)",
+    type: "rgb(139,233,253)",
+    variable: "rgb(255,184,108)",
+    tag: "rgb(255,121,198)",
+    attr: "rgb(80,250,123)",
+    meta: "rgb(255,121,198)",
+    addition: "rgb(80,250,123)",
+    deletion: "rgb(255,85,85)",
+    default: "rgb(248,248,242)"
+  }
 };
 var darkAnsiTheme = {
+  text: "default",
+  muted: "dim",
+  subtle: "dim",
   brand: "ansi(yellow)",
-  brandShimmer: "ansi(yellowBright)",
-  permission: "ansi(blue)",
-  permissionDim: "ansi(gray)",
-  permissionShimmer: "ansi(blueBright)",
-  lavenderHeader: "ansi(magenta)",
-  lavenderLight: "ansi(magentaBright)",
-  bashPink: "ansi(magenta)",
+  info: "ansi(cyan)",
   success: "ansi(green)",
-  error: "ansi(red)",
   warning: "ansi(yellow)",
-  info: "ansi(cyan)",
-  bulletSuccess: "ansi(green)",
-  bulletError: "ansi(red)",
-  bulletRunning: "ansi(white)",
-  text: "ansi(white)",
-  textMuted: "ansi(gray)",
-  subtle: "ansi(gray)",
-  inactive: "ansi(gray)",
-  promptBorder: "ansi(gray)",
-  userCardBg: "ansi(bgBlackBright)",
-  userChevron: "ansi(gray)",
-  toolHeaderBg: "ansi(bgBlack)",
-  diffAddBG: "ansi(reset)",
-  diffAddFG: "ansi(green)",
-  diffDeleteBG: "ansi(reset)",
-  diffDeleteFG: "ansi(red)",
-  dividerRule: "ansi(magenta)",
-  dashedRule: "ansi(gray)"
+  error: "ansi(red)",
+  permission: "ansi(blue)",
+  selected: "ansi(blue)",
+  current: "ansi(yellow)",
+  promptBorder: "dim",
+  rule: "dim",
+  userChevron: "dim",
+  userBg: "ansi(bgBlackBright)",
+  diffAddBg: "default",
+  diffDelBg: "default",
+  diffAddFg: "ansi(green)",
+  diffDelFg: "ansi(red)",
+  syntax: {
+    keyword: "ansi(red)",
+    string: "ansi(cyan)",
+    number: "ansi(cyan)",
+    literal: "ansi(cyan)",
+    comment: "ansi(gray)",
+    function: "ansi(magenta)",
+    type: "ansi(yellow)",
+    variable: "ansi(yellow)",
+    tag: "ansi(green)",
+    attr: "ansi(cyan)",
+    meta: "ansi(blue)",
+    addition: "ansi(green)",
+    deletion: "ansi(red)",
+    default: "ansi(white)"
+  }
 };
 var lightAnsiTheme = {
+  text: "default",
+  muted: "dim",
+  subtle: "dim",
   brand: "ansi(yellow)",
-  brandShimmer: "ansi(yellowBright)",
-  permission: "ansi(blue)",
-  permissionDim: "ansi(gray)",
-  permissionShimmer: "ansi(blueBright)",
-  lavenderHeader: "ansi(magenta)",
-  lavenderLight: "ansi(magentaBright)",
-  bashPink: "ansi(magenta)",
+  info: "ansi(blue)",
   success: "ansi(green)",
-  error: "ansi(red)",
   warning: "ansi(yellow)",
-  info: "ansi(blue)",
-  bulletSuccess: "ansi(green)",
-  bulletError: "ansi(red)",
-  bulletRunning: "ansi(black)",
-  text: "ansi(black)",
-  textMuted: "ansi(gray)",
-  subtle: "ansi(gray)",
-  inactive: "ansi(gray)",
-  promptBorder: "ansi(gray)",
-  userCardBg: "ansi(bgWhiteBright)",
-  userChevron: "ansi(gray)",
-  toolHeaderBg: "ansi(bgWhite)",
-  diffAddBG: "ansi(reset)",
-  diffAddFG: "ansi(green)",
-  diffDeleteBG: "ansi(reset)",
-  diffDeleteFG: "ansi(red)",
-  dividerRule: "ansi(magenta)",
-  dashedRule: "ansi(gray)"
-};
-var darkColorblindTheme = {
-  brand: "rgb(86,180,233)",
-  brandShimmer: "rgb(136,200,245)",
-  permission: "rgb(0,114,178)",
-  permissionDim: "rgb(93,100,128)",
-  permissionShimmer: "rgb(86,180,233)",
-  lavenderHeader: "rgb(204,121,167)",
-  lavenderLight: "rgb(220,150,190)",
-  bashPink: "rgb(204,121,167)",
-  success: "rgb(0,158,115)",
-  error: "rgb(213,94,0)",
-  warning: "rgb(230,159,0)",
-  info: "rgb(0,114,178)",
-  bulletSuccess: "rgb(0,158,115)",
-  bulletError: "rgb(213,94,0)",
-  bulletRunning: "rgb(255,255,255)",
-  text: "rgb(255,255,255)",
-  textMuted: "rgb(110,110,110)",
-  subtle: "rgb(80,80,80)",
-  inactive: "rgb(153,153,153)",
-  promptBorder: "rgb(136,136,136)",
-  userCardBg: "rgb(55,55,55)",
-  userChevron: "rgb(82,82,82)",
-  toolHeaderBg: "rgb(35,35,40)",
-  diffAddBG: "rgb(0,35,25)",
-  diffAddFG: "rgb(0,158,115)",
-  diffDeleteBG: "rgb(45,20,0)",
-  diffDeleteFG: "rgb(213,94,0)",
-  dividerRule: "rgb(204,121,167)",
-  dashedRule: "rgb(51,51,51)"
-};
-var lightColorblindTheme = {
-  brand: "rgb(0,114,178)",
-  brandShimmer: "rgb(86,180,233)",
-  permission: "rgb(0,114,178)",
-  permissionDim: "rgb(140,150,200)",
-  permissionShimmer: "rgb(86,180,233)",
-  lavenderHeader: "rgb(204,121,167)",
-  lavenderLight: "rgb(220,150,190)",
-  bashPink: "rgb(204,121,167)",
-  success: "rgb(0,158,115)",
-  error: "rgb(213,94,0)",
-  warning: "rgb(230,159,0)",
-  info: "rgb(0,114,178)",
-  bulletSuccess: "rgb(0,158,115)",
-  bulletError: "rgb(213,94,0)",
-  bulletRunning: "rgb(20,20,20)",
-  text: "rgb(0,0,0)",
-  textMuted: "rgb(120,120,120)",
-  subtle: "rgb(175,175,175)",
-  inactive: "rgb(102,102,102)",
-  promptBorder: "rgb(153,153,153)",
-  userCardBg: "rgb(240,240,240)",
-  userChevron: "rgb(160,160,160)",
-  toolHeaderBg: "rgb(230,230,235)",
-  diffAddBG: "rgb(215,245,235)",
-  diffAddFG: "rgb(0,158,115)",
-  diffDeleteBG: "rgb(255,235,225)",
-  diffDeleteFG: "rgb(213,94,0)",
-  dividerRule: "rgb(204,121,167)",
-  dashedRule: "rgb(200,200,200)"
+  error: "ansi(red)",
+  permission: "ansi(blue)",
+  selected: "ansi(blue)",
+  current: "ansi(yellow)",
+  promptBorder: "dim",
+  rule: "dim",
+  userChevron: "dim",
+  userBg: "ansi(bgWhiteBright)",
+  diffAddBg: "default",
+  diffDelBg: "default",
+  diffAddFg: "ansi(green)",
+  diffDelFg: "ansi(red)",
+  syntax: {
+    keyword: "ansi(red)",
+    string: "ansi(blue)",
+    number: "ansi(blue)",
+    literal: "ansi(blue)",
+    comment: "ansi(gray)",
+    function: "ansi(magenta)",
+    type: "ansi(yellow)",
+    variable: "ansi(yellow)",
+    tag: "ansi(green)",
+    attr: "ansi(blue)",
+    meta: "ansi(blue)",
+    addition: "ansi(green)",
+    deletion: "ansi(red)",
+    default: "default"
+  }
 };
-var THEMES = {
-  dark: {
+var builtInThemes = [
+  {
     name: "dark",
     label: "Dark (Default)",
     description: "Default dark theme with terracotta and purple accents",
-    theme: darkTheme
+    theme: darkTheme,
+    source: "built-in"
   },
-  light: {
+  {
     name: "light",
     label: "Light",
     description: "Clean light palette optimized for light backgrounds",
-    theme: lightTheme
+    theme: lightTheme,
+    source: "built-in"
+  },
+  {
+    name: "dracula",
+    label: "Dracula",
+    description: "Official gothic-inspired vampire color scheme",
+    theme: draculaTheme,
+    source: "built-in"
   },
-  "dark-ansi": {
+  {
     name: "dark-ansi",
     label: "Dark ANSI",
     description: "16-color ANSI palette respecting your terminal theme",
-    theme: darkAnsiTheme
+    theme: darkAnsiTheme,
+    source: "built-in"
   },
-  "light-ansi": {
+  {
     name: "light-ansi",
     label: "Light ANSI",
     description: "16-color ANSI light palette respecting terminal colors",
-    theme: lightAnsiTheme
-  },
-  "dark-colorblind": {
-    name: "dark-colorblind",
-    label: "Dark Colorblind",
-    description: "Okabe–Ito colorblind-accessible dark theme",
-    theme: darkColorblindTheme
-  },
-  "light-colorblind": {
-    name: "light-colorblind",
-    label: "Light Colorblind",
-    description: "Okabe–Ito colorblind-accessible light theme",
-    theme: lightColorblindTheme
-  },
-  dracula: {
-    name: "dracula",
-    label: "Dracula",
-    description: "Official gothic-inspired vampire color scheme",
-    theme: draculaTheme
+    theme: lightAnsiTheme,
+    source: "built-in"
   }
-};
-var activeThemeName = "dark";
-function getActiveThemeName() {
-  return activeThemeName;
-}
-function setActiveTheme(name) {
-  if (name in THEMES) {
-    activeThemeName = name;
-  }
-}
-function getTheme() {
-  return THEMES[activeThemeName]?.theme ?? darkTheme;
+];
+var registry = new Map;
+for (const t of builtInThemes) {
+  registry.set(t.name, t);
 }
+var activeThemeId = "dark";
 function listThemes() {
-  return Object.values(THEMES);
+  return Array.from(registry.values());
 }
-function findTheme2(query) {
+function findTheme(query) {
   const q = query.trim().toLowerCase().replace(/^["']|["']$/g, "");
   if (!q)
     return;
   return listThemes().find((t) => t.name.toLowerCase() === q || t.label.toLowerCase() === q || t.label.toLowerCase().startsWith(q));
 }
+function setActiveTheme(name) {
+  if (registry.has(name)) {
+    activeThemeId = name;
+    bumpThemeVersion();
+    return true;
+  }
+  activeThemeId = "dark";
+  bumpThemeVersion();
+  return false;
+}
+function getActiveThemeName() {
+  return activeThemeId;
+}
+function getTheme() {
+  return registry.get(activeThemeId)?.theme ?? darkTheme;
+}
 // src/theme/logo.ts
 var LOGO_LINES = [" ▄▄▄▄▄ ", "▀▙███▟▀", " ▝   ▘ "];
-var LOGO_WIDTH = Math.max(...LOGO_LINES.map((line) => stringWidth(line)));
-// src/theme/apply.ts
-function resolveThemeColor(color, isBg = false) {
-  if (!color || color === "none" || color === "transparent" || color === "ansi(reset)") {
-    return source_default.visible;
-  }
-  if (color.startsWith("ansi(") && color.endsWith(")")) {
-    const name = color.slice(5, -1).trim();
-    if (name === "reset" || name === "none" || name === "transparent" || name === "default") {
-      return source_default.visible;
-    }
-    if (isBg && !name.startsWith("bg")) {
-      const bgName = `bg${name.charAt(0).toUpperCase()}${name.slice(1)}`;
-      const fn = source_default[bgName];
-      if (typeof fn === "function")
-        return fn;
-    }
-    const fn = source_default[name];
-    if (typeof fn === "function")
-      return fn;
-    return source_default.visible;
+// src/theme/syntax.ts
+function buildHighlightTheme(theme) {
+  const syn = theme.syntax;
+  const kw = resolveThemeColor(syn.keyword);
+  const str = resolveThemeColor(syn.string);
+  const num = resolveThemeColor(syn.number);
+  const lit = resolveThemeColor(syn.literal);
+  const com = resolveThemeColor(syn.comment);
+  const fn = resolveThemeColor(syn.function);
+  const typ = resolveThemeColor(syn.type);
+  const vr = resolveThemeColor(syn.variable);
+  const tg = resolveThemeColor(syn.tag);
+  const at = resolveThemeColor(syn.attr);
+  const mt = resolveThemeColor(syn.meta);
+  const add = resolveThemeColor(syn.addition);
+  const del = resolveThemeColor(syn.deletion);
+  const def = resolveThemeColor(syn.default);
+  return {
+    keyword: kw,
+    built_in: typ,
+    type: typ,
+    literal: lit,
+    number: num,
+    regexp: tg,
+    string: str,
+    subst: def,
+    symbol: tg,
+    class: typ,
+    function: fn,
+    title: fn,
+    params: def,
+    comment: (s) => com(italic(s)),
+    doctag: kw,
+    meta: mt,
+    "meta-keyword": kw,
+    "meta-string": str,
+    section: (s) => mt(bold(s)),
+    tag: tg,
+    name: tg,
+    "builtin-name": typ,
+    attr: at,
+    attribute: at,
+    variable: vr,
+    bullet: vr,
+    code: def,
+    emphasis: (s) => italic(s),
+    strong: (s) => bold(s),
+    formula: tg,
+    link: (s) => str(underline(s)),
+    quote: com,
+    "selector-tag": tg,
+    "selector-id": (s) => mt(bold(s)),
+    "selector-class": at,
+    "selector-attr": at,
+    "selector-pseudo": at,
+    "template-tag": tg,
+    "template-variable": vr,
+    addition: add,
+    deletion: del,
+    default: def
+  };
+}
+var cachedHighlightTheme = null;
+var cachedHighlightVersion = -1;
+function getHighlightTheme() {
+  if (source_default.level === 0) {
+    return { default: (s) => s };
   }
-  if (color.startsWith("rgb(")) {
-    const match = color.match(/\d+/g);
-    if (match && match.length >= 3) {
-      const [r, g, b] = [Number(match[0]), Number(match[1]), Number(match[2])];
-      return isBg ? source_default.bgRgb(r, g, b) : source_default.rgb(r, g, b);
-    }
+  const v = themeVersion();
+  if (!cachedHighlightTheme || v !== cachedHighlightVersion) {
+    cachedHighlightTheme = buildHighlightTheme(getTheme());
+    cachedHighlightVersion = v;
   }
-  return isBg ? source_default.bgHex(color) : source_default.hex(color);
+  return cachedHighlightTheme;
 }
 // node_modules/marked/lib/marked.esm.js
 function A() {
@@ -44502,94 +44598,6 @@ var pn = x.lex;
 // src/utils/highlight.ts
 var import_cli_highlight = __toESM(require_dist(), 1);
 import { extname, basename } from "node:path";
-var githubDarkHighlightTheme = {
-  keyword: source_default.hex("#ff7b72"),
-  built_in: source_default.hex("#ffa657"),
-  type: source_default.hex("#ffa657"),
-  literal: source_default.hex("#79c0ff"),
-  number: source_default.hex("#79c0ff"),
-  regexp: source_default.hex("#7ee787"),
-  string: source_default.hex("#a5d6ff"),
-  subst: source_default.hex("#c9d1d9"),
-  symbol: source_default.hex("#7ee787"),
-  class: source_default.hex("#ffa657"),
-  function: source_default.hex("#d2a8ff"),
-  title: source_default.hex("#d2a8ff"),
-  params: source_default.hex("#c9d1d9"),
-  comment: (str) => source_default.hex("#8b949e")(source_default.italic(str)),
-  doctag: source_default.hex("#ff7b72"),
-  meta: source_default.hex("#79c0ff"),
-  "meta-keyword": source_default.hex("#ff7b72"),
-  "meta-string": source_default.hex("#a5d6ff"),
-  section: source_default.hex("#79c0ff").bold,
-  tag: source_default.hex("#7ee787"),
-  name: source_default.hex("#7ee787"),
-  "builtin-name": source_default.hex("#ffa657"),
-  attr: source_default.hex("#79c0ff"),
-  attribute: source_default.hex("#79c0ff"),
-  variable: source_default.hex("#ffa657"),
-  bullet: source_default.hex("#ffa657"),
-  code: source_default.hex("#c9d1d9"),
-  emphasis: (str) => source_default.italic(str),
-  strong: (str) => source_default.bold(str),
-  formula: source_default.hex("#7ee787"),
-  link: source_default.hex("#a5d6ff").underline,
-  quote: source_default.hex("#8b949e"),
-  "selector-tag": source_default.hex("#7ee787"),
-  "selector-id": source_default.hex("#79c0ff").bold,
-  "selector-class": source_default.hex("#79c0ff"),
-  "selector-attr": source_default.hex("#79c0ff"),
-  "selector-pseudo": source_default.hex("#79c0ff"),
-  "template-tag": source_default.hex("#7ee787"),
-  "template-variable": source_default.hex("#ffa657"),
-  addition: source_default.hex("#7ee787"),
-  deletion: source_default.hex("#ffa198"),
-  default: source_default.hex("#c9d1d9")
-};
-var ansiHighlightTheme = {
-  keyword: source_default.red,
-  built_in: source_default.yellow,
-  type: source_default.yellow,
-  literal: source_default.cyan,
-  number: source_default.cyan,
-  regexp: source_default.green,
-  string: source_default.cyan,
-  subst: source_default.white,
-  symbol: source_default.green,
-  class: source_default.yellow,
-  function: source_default.magenta,
-  title: source_default.magenta,
-  params: source_default.white,
-  comment: (str) => source_default.gray(source_default.italic(str)),
-  doctag: source_default.red,
-  meta: source_default.blue,
-  "meta-keyword": source_default.red,
-  "meta-string": source_default.cyan,
-  section: source_default.blue.bold,
-  tag: source_default.green,
-  name: source_default.green,
-  "builtin-name": source_default.yellow,
-  attr: source_default.cyan,
-  attribute: source_default.cyan,
-  variable: source_default.yellow,
-  bullet: source_default.yellow,
-  code: source_default.white,
-  emphasis: (str) => source_default.italic(str),
-  strong: (str) => source_default.bold(str),
-  formula: source_default.green,
-  link: source_default.cyan.underline,
-  quote: source_default.gray,
-  "selector-tag": source_default.green,
-  "selector-id": source_default.blue.bold,
-  "selector-class": source_default.cyan,
-  "selector-attr": source_default.cyan,
-  "selector-pseudo": source_default.cyan,
-  "template-tag": source_default.green,
-  "template-variable": source_default.yellow,
-  addition: source_default.green,
-  deletion: source_default.red,
-  default: source_default.white
-};
 var EXTENSION_MAP = {
   ".ts": "typescript",
   ".tsx": "typescript",
@@ -44646,23 +44654,9 @@ function detectLanguageFromPath(filePath) {
   }
   return;
 }
-function getHighlightTheme() {
-  if (source_default.level === 0) {
-    return {
-      default: (str) => str
-    };
-  }
-  const activeTheme = getActiveThemeName();
-  if (activeTheme.includes("ansi") || source_default.level === 1) {
-    return ansiHighlightTheme;
-  }
-  return githubDarkHighlightTheme;
-}
 function highlightCode(code, options) {
   if (!code)
     return "";
-  if (source_default.level === 0)
-    return code;
   const lang = options?.language ?? detectLanguageFromPath(options?.filePath);
   try {
     if (lang && import_cli_highlight.supportsLanguage(lang)) {
@@ -44684,9 +44678,6 @@ function highlightCode(code, options) {
 // src/utils/markdown.ts
 var EOL = `
 `;
-function themeColor(color) {
-  return resolveThemeColor(color, false);
-}
 var markedConfigured = false;
 function configureMarked() {
   if (markedConfigured)
@@ -44713,48 +44704,47 @@ function padAligned(content, contentWidth, columnWidth, align) {
   return content + " ".repeat(padding);
 }
 function formatToken(token, listDepth = 0, orderedListNumber = null, parent = null) {
-  const theme = getTheme();
   switch (token.type) {
     case "blockquote": {
       const inner = (token.tokens ?? []).map((t) => formatToken(t, 0, null, null)).join("");
-      const bar = themeColor(theme.subtle)("│");
-      return inner.split(EOL).map((line) => stripAnsi(line).trim() ? `${bar} ${source_default.italic(line)}` : line).join(EOL);
+      const bar = c.subtle("│");
+      return inner.split(EOL).map((line) => stripAnsi(line).trim() ? `${bar} ${italic(line)}` : line).join(EOL);
     }
     case "code": {
       const code = token;
       const highlighted = highlightCode(code.text, { language: code.lang });
-      const gutter = themeColor(theme.subtle)("│");
+      const gutter = c.subtle("│");
       const lines = highlighted.split(EOL);
       const formatted = lines.map((line) => `  ${gutter} ${line}`).join(EOL);
       return formatted + EOL + EOL;
     }
     case "codespan": {
-      return themeColor(theme.permission)(token.text);
+      return c.permission(token.text);
     }
     case "em": {
-      return source_default.italic((token.tokens ?? []).map((t) => formatToken(t, 0, null, parent)).join(""));
+      return italic((token.tokens ?? []).map((t) => formatToken(t, 0, null, parent)).join(""));
     }
     case "strong": {
-      return source_default.bold((token.tokens ?? []).map((t) => formatToken(t, 0, null, parent)).join(""));
+      return bold((token.tokens ?? []).map((t) => formatToken(t, 0, null, parent)).join(""));
     }
     case "heading": {
       const heading = token;
       const text = (heading.tokens ?? []).map((t) => formatToken(t, 0, null, null)).join("");
       if (heading.depth === 1) {
-        return themeColor(theme.brand).bold.underline(text) + EOL + EOL;
+        return underline(bold(c.brand(text))) + EOL + EOL;
       }
       if (heading.depth === 2) {
-        return themeColor(theme.brand).bold(text) + EOL + EOL;
+        return bold(c.brand(text)) + EOL + EOL;
       }
-      return source_default.bold(text) + EOL + EOL;
+      return bold(text) + EOL + EOL;
     }
     case "hr": {
-      return themeColor(theme.dashedRule)("─".repeat(40)) + EOL + EOL;
+      return c.rule("─".repeat(40)) + EOL + EOL;
     }
     case "link": {
       const link = token;
       const linkText = (link.tokens ?? []).map((t) => formatToken(t, 0, null, link)).join("");
-      return linkText ? `${themeColor(theme.info)(linkText)} (${source_default.dim(link.href)})` : link.href;
+      return linkText ? `${c.info(linkText)} (${c.muted(link.href)})` : link.href;
     }
     case "list": {
       const list = token;
@@ -44768,7 +44758,7 @@ function formatToken(token, listDepth = 0, orderedListNumber = null, parent = nu
       const listTokens = item.tokens?.filter((t) => t.type === "list") ?? [];
       const mainContent = nonListTokens.map((t) => formatToken(t, listDepth + 1, orderedListNumber, token)).join("").trim();
       const nestedLists = listTokens.map((t) => formatToken(t, listDepth + 1, null, token)).join("");
-      return `${indent}${themeColor(theme.brand)(prefix)} ${mainContent}${EOL}${nestedLists}`;
+      return `${indent}${c.brand(prefix)} ${mainContent}${EOL}${nestedLists}`;
     }
     case "paragraph": {
       return (token.tokens ?? []).map((t) => formatToken(t, 0, null, null)).join("") + EOL + EOL;
@@ -44793,7 +44783,7 @@ function formatToken(token, listDepth = 0, orderedListNumber = null, parent = nu
           const plain = stripAnsi(raw);
           const align = isHeader ? "center" : tableToken.align?.[i] ?? "left";
           const padded = padAligned(raw, stringWidth(plain), w, align);
-          return isHeader ? ` ${source_default.bold(padded)} ` : ` ${padded} `;
+          return isHeader ? ` ${bold(padded)} ` : ` ${padded} `;
         });
         return D("│") + parts.join(D("│")) + D("│");
       };
@@ -44806,7 +44796,7 @@ function formatToken(token, listDepth = 0, orderedListNumber = null, parent = nu
         }
         return Math.max(maxWidth, 3);
       });
-      const D = themeColor(theme.subtle);
+      const D = (s) => c.subtle(s);
       const hbar = (w) => "─".repeat(w + 2);
       const topBorder = D("┌") + columnWidths.map((w) => D(hbar(w))).join(D("┬")) + D("┐");
       const midBorder = D("├") + columnWidths.map((w) => D(hbar(w))).join(D("┼")) + D("┤");
@@ -44838,12 +44828,9 @@ function applyMarkdown(content) {
 }
 
 // src/tui/utils/format.ts
-function themeColor2(color) {
+function themeColor(color) {
   return resolveThemeColor(color, false);
 }
-function themeBgColor(color) {
-  return resolveThemeColor(color, true);
-}
 function visibleWidth(text) {
   return stringWidth(stripAnsi(text));
 }
@@ -44942,17 +44929,16 @@ function truncateToWidth(styledText, maxWidth) {
   return result.includes("\x1B") && !result.endsWith("\x1B[0m") ? result + "\x1B[0m" : result;
 }
 function getStatusBullet(status, pulse = false) {
-  const theme = getTheme();
   if (status === "completed") {
-    return themeColor2(theme.success)(figures.blackCircle);
+    return c.success(figures.blackCircle);
   }
   if (status === "failed") {
-    return themeColor2(theme.error)(figures.blackCircle);
+    return c.error(figures.blackCircle);
   }
   if (pulse) {
-    return source_default.white.bold(figures.blackCircle);
+    return bold(c.text(figures.blackCircle));
   }
-  return source_default.dim(figures.blackCircle);
+  return c.muted(figures.blackCircle);
 }
 
 // src/tui/engine/cell-layout.ts
@@ -45649,6 +45635,75 @@ class StateRenderer {
   }
 }
 
+// src/tui/utils/tool-detail.ts
+function renderToolDetail(detail) {
+  if (detail.kind === "text") {
+    return detail.text.split(`
+`).map((l) => c.muted(l)).join(`
+`);
+  }
+  if (detail.kind === "code") {
+    const highlighted = highlightCode(detail.text, { filePath: detail.filePath });
+    const contentLines = highlighted.split(/\r?\n/);
+    if (contentLines.length === 0 || contentLines.length === 1 && !contentLines[0]) {
+      return "";
+    }
+    const cap = 50;
+    const shown = contentLines.slice(0, cap);
+    const padWidth = String(contentLines.length).length;
+    const lines = shown.map((l, i) => `${c.muted(String(i + 1).padStart(padWidth))}  ${l}`);
+    if (contentLines.length > cap) {
+      lines.push(c.muted(`   … (${contentLines.length - cap} more lines)`));
+    }
+    return lines.join(`
+`);
+  }
+  if (detail.kind === "diff") {
+    let maxLineNum = 1;
+    for (const hunk of detail.hunks) {
+      for (const line of hunk.lines) {
+        if (line.oldLineNumber)
+          maxLineNum = Math.max(maxLineNum, line.oldLineNumber);
+        if (line.newLineNumber)
+          maxLineNum = Math.max(maxLineNum, line.newLineNumber);
+      }
+    }
+    const padWidth = Math.max(1, String(maxLineNum).length);
+    const diffLines = [];
+    const cap = 30;
+    let count = 0;
+    let overflow = 0;
+    for (const hunk of detail.hunks) {
+      for (const line of hunk.lines) {
+        if (count >= cap) {
+          overflow++;
+          continue;
+        }
+        count++;
+        if (line.kind === "deletion") {
+          const numStr = String(line.oldLineNumber ?? "").padStart(padWidth, " ");
+          const body = line.spans ? "-" + line.spans.map((s) => s.kind === "deletion" ? bold(s.text) : s.text).join("") : `-${line.text}`;
+          diffLines.push(bg.diffDelBg(c.diffDelFg(`${numStr} ${body}`)));
+        } else if (line.kind === "addition") {
+          const numStr = String(line.newLineNumber ?? "").padStart(padWidth, " ");
+          const body = line.spans ? "+" + line.spans.map((s) => s.kind === "addition" ? bold(s.text) : s.text).join("") : `+${line.text}`;
+          diffLines.push(bg.diffAddBg(c.diffAddFg(`${numStr} ${body}`)));
+        } else {
+          const numStr = String(line.newLineNumber ?? line.oldLineNumber ?? "").padStart(padWidth, " ");
+          const highlightedContext = highlightCode(line.text, { filePath: detail.filePath });
+          diffLines.push(`${c.muted(`${numStr} `)} ${highlightedContext}`);
+        }
+      }
+    }
+    if (overflow > 0) {
+      diffLines.push(c.muted(`   … (${overflow} more lines)`));
+    }
+    return diffLines.join(`
+`);
+  }
+  return "";
+}
+
 // src/session/logs/store.ts
 import {
   appendFileSync as appendFileSync2,
@@ -45672,7 +45727,6 @@ import {
   readdirSync,
   readFileSync,
   renameSync,
-  rmSync,
   unlinkSync,
   writeFileSync,
   writeSync
@@ -49339,10 +49393,10 @@ class $ZodRegistry {
     return this._map.has(schema);
   }
 }
-function registry() {
+function registry2() {
   return new $ZodRegistry;
 }
-(_a2 = globalThis).__zod_globalRegistry ?? (_a2.__zod_globalRegistry = registry());
+(_a2 = globalThis).__zod_globalRegistry ?? (_a2.__zod_globalRegistry = registry2());
 var globalRegistry = globalThis.__zod_globalRegistry;
 // node_modules/zod/v4/core/api.js
 function _string(Class, params) {
@@ -52756,9 +52810,7 @@ function buildSessionPresentationProjection(events) {
 
 // src/tui/utils/message-formatter.ts
 function formatUserMessage(content, targetWidth) {
-  const theme = getTheme();
   const termCols = typeof targetWidth === "number" && targetWidth > 0 ? targetWidth : process.stdout.columns || 80;
-  const bg = themeBgColor(theme.userCardBg);
   const pointer = `${figures.pointerBold} `;
   const prefix = pointer;
   const availableTextWidth = Math.max(10, termCols - 2);
@@ -52774,20 +52826,18 @@ function formatUserMessage(content, targetWidth) {
       isFirstRow = false;
       const visibleLen = visibleWidth(p) + visibleWidth(segment);
       const padLen = Math.max(0, termCols - visibleLen);
-      const pStyled = themeColor2(theme.userChevron)(p);
-      const textStyled = source_default.white(segment);
-      const fullRow = bg(`${pStyled}${textStyled}${" ".repeat(padLen)}`);
+      const pStyled = c.userChevron(p);
+      const textStyled = c.text(segment);
+      const fullRow = bg.userBg(`${pStyled}${textStyled}${" ".repeat(padLen)}`);
       lines.push(fullRow);
     }
   }
   return lines;
 }
 function formatSystemMessage(content) {
-  const theme = getTheme();
-  const infoColor = themeColor2(theme.permission);
   const rawLines = content.split(`
 `);
-  return rawLines.map((l, i) => i === 0 ? `  ${source_default.dim("└ ")}${infoColor(l)}` : `    ${infoColor(l)}`);
+  return rawLines.map((l, i) => i === 0 ? `  ${c.muted("└ ")}${c.permission(l)}` : `    ${c.permission(l)}`);
 }
 function formatAssistantMessage(content) {
   const lines = [];
@@ -52812,7 +52862,7 @@ function formatAssistantMessage(content) {
           continue;
         }
         if (i === 0) {
-          const bullet = source_default.white(`${figures.blackCircle} `);
+          const bullet = c.text(`${figures.blackCircle} `);
           lines.push(`${bullet}${l}`);
         } else {
           lines.push(`  ${l}`);
@@ -52824,7 +52874,6 @@ function formatAssistantMessage(content) {
 }
 function formatToolStatus(options) {
   const { toolName, displayName, icon, argsSummary, status, error, targetWidth } = options;
-  const theme = getTheme();
   const fullTermWidth = typeof targetWidth === "number" && targetWidth > 0 ? targetWidth : process.stdout.columns || 80;
   const bullet = getStatusBullet(status);
   const dispName = displayName ?? icon ?? toolName;
@@ -52833,26 +52882,40 @@ function formatToolStatus(options) {
   const truncatedArg = cleanFirstLine.length > maxArgLen ? truncateMiddle(cleanFirstLine, maxArgLen) : cleanFirstLine;
   let mainLine = `${bullet} ${dispName}`;
   if (truncatedArg) {
-    mainLine += `${source_default.dim("(")}${source_default.dim(truncatedArg)}${source_default.dim(")")}`;
+    mainLine += `${c.muted("(")}${c.muted(truncatedArg)}${c.muted(")")}`;
   } else {
-    mainLine += `${source_default.dim("()")}`;
+    mainLine += `${c.muted("()")}`;
   }
   const lines = [mainLine];
-  if (status === "completed" && options.toolOutput) {
-    const cleanOutput = options.toolOutput.trim();
-    if (cleanOutput) {
-      const outputLines = cleanOutput.split(`
+  const summaryVal = options.summary ?? options.toolOutput;
+  if (status === "completed" && summaryVal) {
+    let headline = "";
+    let detailText = "";
+    if (typeof summaryVal === "string") {
+      const outputLines = summaryVal.trim().split(`
+`);
+      headline = outputLines[0]?.trim() ?? "";
+      detailText = outputLines.slice(1).join(`
 `);
-      const summaryText = outputLines[0]?.trim() ?? "";
+    } else {
+      headline = summaryVal.headline;
+      if (summaryVal.detail) {
+        detailText = renderToolDetail(summaryVal.detail);
+      }
+    }
+    if (headline) {
       const maxOutLen = Math.max(10, fullTermWidth - 6);
-      const truncatedSummary = summaryText.length > maxOutLen ? `${summaryText.slice(0, maxOutLen - 1)}…` : summaryText;
-      lines.push(`  ${source_default.dim("└ ")}${source_default.white(truncatedSummary)}`);
-      const maxContentWidth = Math.max(30, Math.min(fullTermWidth - 4, Math.floor(fullTermWidth * 0.85)));
-      for (let i = 1;i < outputLines.length; i++) {
-        const rawLine = outputLines[i] ?? "";
-        const prefixed = `   ${rawLine}`;
-        const wrapped = wrapVisualLine(prefixed, maxContentWidth, "     ");
-        lines.push(...wrapped);
+      const truncatedSummary = headline.length > maxOutLen ? `${headline.slice(0, maxOutLen - 1)}…` : headline;
+      lines.push(`  ${c.muted("└ ")}${c.text(truncatedSummary)}`);
+      if (detailText) {
+        const detailLines = detailText.split(`
+`);
+        const maxContentWidth = Math.max(30, Math.min(fullTermWidth - 4, Math.floor(fullTermWidth * 0.85)));
+        for (const rawLine of detailLines) {
+          const prefixed = `   ${rawLine}`;
+          const wrapped = wrapVisualLine(prefixed, maxContentWidth, "     ");
+          lines.push(...wrapped);
+        }
       }
     }
   }
@@ -52862,25 +52925,23 @@ function formatToolStatus(options) {
 `)[0]?.trim() || rawError;
     const maxErrLen = Math.max(10, fullTermWidth - 6);
     const truncatedErr = firstLineErr.length > maxErrLen ? `${firstLineErr.slice(0, maxErrLen - 1)}…` : firstLineErr;
-    lines.push(`  ${source_default.dim("└ ")}${themeColor2(theme.error)(truncatedErr)}`);
+    lines.push(`  ${c.muted("└ ")}${c.error(truncatedErr)}`);
   }
   return lines;
 }
 function formatErrorBadge(error, retryInfo) {
-  const theme = getTheme();
-  const errColor = themeColor2(theme.error);
-  const ast = errColor(figures.asterisk);
-  const midDot = source_default.dim(` ${figures.bullet} `);
+  const ast = c.error(figures.asterisk);
+  const midDot = c.muted(` ${figures.bullet} `);
   let msg = error.shortMessage;
   if (retryInfo) {
-    const retryStr = source_default.dim(`Retrying in ${retryInfo.countdownSec}s · attempt ${retryInfo.attempt}/${retryInfo.maxAttempts}`);
-    msg = `${errColor(error.shortMessage)}${midDot}${retryStr}`;
+    const retryStr = c.muted(`Retrying in ${retryInfo.countdownSec}s · attempt ${retryInfo.attempt}/${retryInfo.maxAttempts}`);
+    msg = `${c.error(error.shortMessage)}${midDot}${retryStr}`;
   } else {
-    msg = errColor(error.shortMessage);
+    msg = c.error(error.shortMessage);
   }
   const lines = [`${ast} ${msg}`];
   if (error.suggestedAction) {
-    lines.push(`  ${source_default.dim("└ ")}${source_default.dim(error.suggestedAction)}`);
+    lines.push(`  ${c.muted("└ ")}${c.muted(error.suggestedAction)}`);
   }
   return lines;
 }
@@ -52888,8 +52949,8 @@ function formatTurnStatus(durationMs, timestamp = new Date, verb) {
   const selectedVerb = verb ?? chooseTurnStatusVerb();
   const sec = Math.max(1, Math.round(durationMs / 1000));
   const timeStr = timestamp.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
-  const midDot = source_default.dim(` ${figures.bullet} `);
-  return `${source_default.dim(`${figures.asterisk} ${selectedVerb} for ${sec}s`)}${midDot}${source_default.dim(`done ${timeStr}`)}`;
+  const midDot = c.muted(` ${figures.bullet} `);
+  return `${c.muted(`${figures.asterisk} ${selectedVerb} for ${sec}s`)}${midDot}${c.muted(`done ${timeStr}`)}`;
 }
 
 // src/tui/engine/HistoryLayoutCache.ts
@@ -53788,15 +53849,7 @@ function saveVoiceLanguage(languageTag) {
 }
 function getSavedTheme() {
   const settings = loadSettings();
-  if (settings.theme && typeof settings.theme === "string" && [
-    "dark",
-    "light",
-    "dark-ansi",
-    "light-ansi",
-    "dark-colorblind",
-    "light-colorblind",
-    "dracula"
-  ].includes(settings.theme)) {
+  if (settings.theme && typeof settings.theme === "string") {
     return settings.theme;
   }
   return;
@@ -54087,6 +54140,25 @@ async function saveCheckpointManifest(workspaceHash, sessionId, manifest) {
     atomicWriteJson(targetPath, manifest);
   });
 }
+function loadPendingJournal(workspaceHash, sessionId) {
+  const targetPath = getPendingJournalPath(workspaceHash, sessionId);
+  if (!existsSync6(targetPath)) {
+    return null;
+  }
+  try {
+    const raw = readFileSync5(targetPath, "utf-8");
+    const parsed = JSON.parse(raw);
+    const result = PendingJournalSchema.safeParse(parsed);
+    if (result.success) {
+      return result.data;
+    }
+    quarantineCheckpointFile(targetPath);
+    return null;
+  } catch {
+    quarantineCheckpointFile(targetPath);
+    return null;
+  }
+}
 async function savePendingJournal(workspaceHash, sessionId, journal) {
   const key = `${workspaceHash}:${sessionId}`;
   await storeSerializer.run(key, () => {
@@ -54276,7 +54348,7 @@ class MutationCheckpointTracker {
     };
     await savePendingJournal(this.workspaceHash, this.sessionId, journal);
   }
-  async commitTurn(turnId, turnStatus = "complete") {
+  async commitTurn(turnId, _turnStatus = "complete") {
     if (this.activeTurnId !== turnId) {
       return;
     }
@@ -54559,6 +54631,30 @@ async function executeRewind(options) {
     releaseLocks();
   }
 }
+async function recoverPendingCheckpoint(workspaceRoot, sessionId) {
+  const workspaceHash = computeWorkspaceHash(workspaceRoot);
+  const journal = loadPendingJournal(workspaceHash, sessionId);
+  if (!journal)
+    return;
+  if (journal.kind === "rewind") {
+    if (journal.phase === "files-restored" || journal.phase === "files-pending") {
+      for (const file of journal.files) {
+        if (file.post) {
+          const absPath = resolve3(workspaceRoot, file.relativePath);
+          try {
+            restoreFileStateToDisk(workspaceHash, absPath, file.post);
+          } catch {}
+        }
+      }
+    }
+    await deletePendingJournal(workspaceHash, sessionId);
+  } else {
+    const committedFiles = journal.files.filter((f) => f.mutationCommitted);
+    if (committedFiles.length === 0) {
+      await deletePendingJournal(workspaceHash, sessionId);
+    }
+  }
+}
 // node_modules/@ai-sdk/provider/dist/index.js
 var marker = "vercel.ai.error";
 var symbol = Symbol.for(marker);
@@ -71405,6 +71501,72 @@ var originalGenerateCallId6 = createIdGenerator({
 });
 var defaultDownload2 = createDownload();
 
+// src/engine/mode.ts
+var MODES = {
+  normal: {
+    name: "normal",
+    label: "Normal",
+    description: "All tools with file and bash permission prompts",
+    color: "text",
+    allows: ["read", "write", "exec"],
+    autoApproveFiles: false
+  },
+  chat: {
+    name: "chat",
+    label: "Chat",
+    description: "Conversation only — no tool access",
+    color: "info",
+    allows: [],
+    autoApproveFiles: false
+  },
+  review: {
+    name: "review",
+    label: "Review",
+    description: "Read-only tools only — cannot modify files or run commands",
+    color: "warning",
+    allows: ["read"],
+    autoApproveFiles: false
+  },
+  build: {
+    name: "build",
+    label: "Build",
+    description: "All tools, file mutations auto-approved, bash still prompts",
+    color: "success",
+    allows: ["read", "write", "exec"],
+    autoApproveFiles: true
+  }
+};
+var isAllowed = (m, a) => {
+  const modeMeta = MODES[m];
+  if (!modeMeta)
+    return false;
+  return modeMeta.allows.includes(a);
+};
+var MODE_ORDER = ["normal", "chat", "review", "build"];
+var activeMode = "normal";
+function getActiveMode() {
+  return activeMode;
+}
+function setActiveMode(name) {
+  if (name in MODES) {
+    activeMode = name;
+  }
+}
+function cycleMode() {
+  const idx = MODE_ORDER.indexOf(activeMode);
+  activeMode = MODE_ORDER[(idx + 1) % MODE_ORDER.length];
+  return activeMode;
+}
+function listModes() {
+  return Object.values(MODES);
+}
+function findMode(query) {
+  const q = query.trim().toLowerCase();
+  if (!q)
+    return;
+  return listModes().find((m) => m.name === q || m.label.toLowerCase() === q || m.label.toLowerCase().startsWith(q));
+}
+
 // src/tools/catalog.ts
 class ToolCatalog {
   tools = new Map;
@@ -71423,11 +71585,19 @@ class ToolCatalog {
   }
   toAISDKTools(context) {
     const aiTools = {};
+    const mode = context.mode ?? "normal";
     for (const [name, def] of this.tools.entries()) {
+      if (!isAllowed(mode, def.access)) {
+        continue;
+      }
       aiTools[name] = tool({
         description: def.description,
         inputSchema: def.parameters,
         execute: async (args) => {
+          if (!isAllowed(mode, def.access)) {
+            const modeLabel = MODES[mode]?.label ?? mode;
+            throw new Error(`Tool "${name}" is not available in ${modeLabel} mode.`);
+          }
           return def.execute(args, context);
         }
       });
@@ -71496,6 +71666,7 @@ function isBinaryBuffer(buffer) {
 var readFileTool = {
   name: "read_file",
   displayName: "Read",
+  access: "read",
   description: "Reads the contents of a file. Supports reading specific line ranges via offset and limit. Read is read-only and does not mutate or checkpoint.",
   parameters: readFileInputSchema,
   confirmationPolicy: "never",
@@ -71553,82 +71724,6 @@ var readFileTool = {
   }
 };
 
-// src/engine/chat-mode.ts
-var CHAT_MODES = {
-  normal: {
-    name: "normal",
-    label: "Normal",
-    description: "All tools with file and bash permission prompts",
-    themeColorKey: "text"
-  },
-  chat: {
-    name: "chat",
-    label: "Chat",
-    description: "Conversation only — no tool access",
-    themeColorKey: "info"
-  },
-  review: {
-    name: "review",
-    label: "Review",
-    description: "Read-only tools only — cannot modify files or run commands",
-    themeColorKey: "warning"
-  },
-  build: {
-    name: "build",
-    label: "Build",
-    description: "All tools, file mutations auto-approved, bash still prompts",
-    themeColorKey: "success"
-  }
-};
-var MODE_ORDER = ["normal", "chat", "review", "build"];
-var activeMode = "normal";
-function getActiveMode() {
-  return activeMode;
-}
-function setActiveMode(name) {
-  if (name in CHAT_MODES)
-    activeMode = name;
-}
-function cycleMode() {
-  const idx = MODE_ORDER.indexOf(activeMode);
-  activeMode = MODE_ORDER[(idx + 1) % MODE_ORDER.length];
-  return activeMode;
-}
-function listModes() {
-  return Object.values(CHAT_MODES);
-}
-function findMode(query) {
-  const q = query.trim().toLowerCase();
-  if (!q)
-    return;
-  return listModes().find((m) => m.name === q || m.label.toLowerCase() === q || m.label.toLowerCase().startsWith(q));
-}
-var REVIEW_ALLOWED_TOOLS = new Set([
-  "read_file",
-  "glob",
-  "grep",
-  "list_dir",
-  "web_fetch",
-  "web_search",
-  "todo_read",
-  "skill_list",
-  "skill_read",
-  "task_list",
-  "task_read",
-  "sleep"
-]);
-function assertToolAllowed(toolName) {
-  const mode = activeMode;
-  if (mode === "normal" || mode === "build")
-    return;
-  if (mode === "chat") {
-    throw new Error(`Tool "${toolName}" is not available in Chat mode. Chat mode is for conversation only — no tool access. Switch to Normal or Build mode with /mode or Ctrl+B.`);
-  }
-  if (mode === "review" && !REVIEW_ALLOWED_TOOLS.has(toolName)) {
-    throw new Error(`Tool "${toolName}" is not available in Review mode. Review mode only allows read-only operations. Switch to Normal or Build mode with /mode or Ctrl+B.`);
-  }
-}
-
 // src/tools/write-file/index.ts
 import { existsSync as existsSync11, readFileSync as readFileSync9, statSync as statSync3 } from "node:fs";
 
@@ -71688,6 +71783,7 @@ var writeFileInputSchema = object({
 var writeFileTool = {
   name: "write_file",
   displayName: "Write",
+  access: "write",
   description: "Writes or creates a whole file in the workspace. Automatically creates parent directories if needed. Every write mutation participates in checkpointing for /rewind.",
   parameters: writeFileInputSchema,
   confirmationPolicy: "never",
@@ -71695,24 +71791,18 @@ var writeFileTool = {
     const lines = result?.linesWritten ?? 0;
     const filePath = args.file_path;
     const isNew = result?.isNew ?? true;
-    const summary = isNew ? `Created ${filePath} (${lines} line${lines === 1 ? "" : "s"})` : `Wrote ${lines} line${lines === 1 ? "" : "s"} to ${filePath}`;
-    const highlighted = highlightCode(args.content, { filePath: args.file_path });
-    const contentLines = highlighted.split(/\r?\n/);
-    if (contentLines.length === 0 || contentLines.length === 1 && !contentLines[0]) {
-      return summary;
-    }
-    const cap = 50;
-    const shown = contentLines.slice(0, cap);
-    const padWidth = String(contentLines.length).length;
-    const detail = shown.map((l, i) => `${source_default.dim(String(i + 1).padStart(padWidth))}  ${l}`).join(`
-`);
-    const overflow = contentLines.length > cap ? `
-   … (${contentLines.length - cap} more lines)` : "";
-    return `${summary}
-${detail}${overflow}`;
+    const headline = isNew ? `Created ${filePath} (${lines} line${lines === 1 ? "" : "s"})` : `Wrote ${lines} line${lines === 1 ? "" : "s"} to ${filePath}`;
+    return {
+      headline,
+      detail: {
+        kind: "code",
+        filePath: args.file_path,
+        text: args.content,
+        totalLines: lines
+      }
+    };
   },
   execute: async (args, context) => {
-    assertToolAllowed("write_file");
     const { absolutePath: targetPath, relativePath } = resolveDirectMutationPath(context.cwd, args.file_path);
     const isNew = !existsSync11(targetPath);
     const beforeContent = isNew ? null : readFileSync9(targetPath, "utf-8");
@@ -72041,65 +72131,27 @@ function countOccurrences(content, substring) {
 var editFileTool = {
   name: "edit_file",
   displayName: "Edit",
+  access: "write",
   description: "Performs exact string replacements in an existing file. Every edit mutation participates in checkpointing for /rewind.",
   parameters: editFileInputSchema,
   confirmationPolicy: "never",
   summarize: (args, result) => {
     const added = result?.addedLines ?? 0;
     const removed = result?.removedLines ?? 0;
-    const summary = `Added ${added} line${added === 1 ? "" : "s"}, removed ${removed} line${removed === 1 ? "" : "s"}`;
+    const headline = `Added ${added} line${added === 1 ? "" : "s"}, removed ${removed} line${removed === 1 ? "" : "s"}`;
     if (added === 0 && removed === 0)
-      return summary;
+      return { headline };
     const diff = buildUnifiedDiff(args.old_string, args.new_string, 2);
-    const theme = getTheme();
-    const deleteStyle = (str) => themeBgColor(theme.diffDeleteBG)(themeColor2(theme.diffDeleteFG)(str));
-    const addStyle = (str) => themeBgColor(theme.diffAddBG)(themeColor2(theme.diffAddFG)(str));
-    const contextStyle = (str) => source_default.dim(str);
-    let maxLineNum = 1;
-    for (const hunk of diff.hunks) {
-      for (const line of hunk.lines) {
-        if (line.oldLineNumber)
-          maxLineNum = Math.max(maxLineNum, line.oldLineNumber);
-        if (line.newLineNumber)
-          maxLineNum = Math.max(maxLineNum, line.newLineNumber);
-      }
-    }
-    const padWidth = Math.max(1, String(maxLineNum).length);
-    const diffLines = [];
-    const cap = 30;
-    let count = 0;
-    let overflow = 0;
-    for (const hunk of diff.hunks) {
-      for (const line of hunk.lines) {
-        if (count >= cap) {
-          overflow++;
-          continue;
-        }
-        count++;
-        if (line.kind === "deletion") {
-          const numStr = String(line.oldLineNumber ?? "").padStart(padWidth, " ");
-          const body = line.spans ? "-" + line.spans.map((s) => s.kind === "deletion" ? source_default.bold(s.text) : s.text).join("") : `-${line.text}`;
-          diffLines.push(deleteStyle(`${numStr} ${body}`));
-        } else if (line.kind === "addition") {
-          const numStr = String(line.newLineNumber ?? "").padStart(padWidth, " ");
-          const body = line.spans ? "+" + line.spans.map((s) => s.kind === "addition" ? source_default.bold(s.text) : s.text).join("") : `+${line.text}`;
-          diffLines.push(addStyle(`${numStr} ${body}`));
-        } else {
-          const numStr = String(line.newLineNumber ?? line.oldLineNumber ?? "").padStart(padWidth, " ");
-          const highlightedContext = highlightCode(line.text, { filePath: args.file_path });
-          diffLines.push(`${contextStyle(`${numStr} `)} ${highlightedContext}`);
-        }
+    return {
+      headline,
+      detail: {
+        kind: "diff",
+        filePath: args.file_path,
+        hunks: diff.hunks
       }
-    }
-    if (overflow > 0) {
-      diffLines.push(source_default.dim(`   … (${overflow} more lines)`));
-    }
-    return diffLines.length > 0 ? `${summary}
-${diffLines.join(`
-`)}` : summary;
+    };
   },
   execute: async (args, context) => {
-    assertToolAllowed("edit_file");
     const { absolutePath: targetPath, relativePath } = resolveDirectMutationPath(context.cwd, args.file_path);
     if (!existsSync12(targetPath)) {
       throw new Error(`Cannot edit file because it does not exist: "${args.file_path}". Use write_file to create new files.`);
@@ -72239,6 +72291,7 @@ function walkDir(dir, baseDir, matcher, results, limit) {
 var globTool = {
   name: "glob",
   displayName: "Glob",
+  access: "read",
   description: "Finds files matching a glob pattern or file name in the workspace. Read-only search capability with bounded results.",
   parameters: globInputSchema,
   confirmationPolicy: "never",
@@ -72342,6 +72395,7 @@ function searchInDir(dir, baseDir, regex, fileFilter, results, filesWithMatches,
 var grepTool = {
   name: "grep",
   displayName: "Grep",
+  access: "read",
   description: "Searches for text or regex patterns across files in the workspace. Read-only content search with structured match positions.",
   parameters: grepInputSchema,
   confirmationPolicy: "never",
@@ -72421,6 +72475,7 @@ var listDirInputSchema = object({
 var listDirTool = {
   name: "list_dir",
   displayName: "List",
+  access: "read",
   description: "Lists files and folders in a specified directory. Read-only operation.",
   parameters: listDirInputSchema,
   confirmationPolicy: "never",
@@ -72481,6 +72536,7 @@ var sleepInputSchema = object({
 var sleepTool = {
   name: "sleep",
   displayName: "Sleep",
+  access: "read",
   description: "Pauses current agent execution temporarily (between 1 and 300 seconds). Read-only and cancellable.",
   parameters: sleepInputSchema,
   confirmationPolicy: "never",
@@ -72650,7 +72706,7 @@ class ShellExecution {
     };
     child.stdout?.on("data", (chunk) => handleChunk(chunk, false));
     child.stderr?.on("data", (chunk) => handleChunk(chunk, true));
-    const onExit = (code, signal) => {
+    const onExit = (code, _signal) => {
       if (!this.isRunning)
         return;
       this.endedAt = new Date().toISOString();
@@ -73106,6 +73162,7 @@ var bashInputSchema = object({
 var bashTool = {
   name: "bash",
   displayName: "Bash",
+  access: "exec",
   description: "Executes a command in the platform shell. An explanation of what the command does and why it is needed is MANDATORY. Commands that exceed the foreground limit (~12s) automatically continue as background shell tasks. Use task_read, task_send_input, and task_kill to manage background tasks. Note: Bash commands are NOT tracked by the file checkpoint system (/rewind).",
   parameters: bashInputSchema,
   confirmationPolicy: "never",
@@ -73120,7 +73177,6 @@ var bashTool = {
     return `Ran successfully · exit code: ${code}`;
   },
   execute: async (args, context) => {
-    assertToolAllowed("bash");
     const command = typeof args?.command === "string" ? args.command.trim() : "";
     if (!command) {
       throw new Error("Command is required and cannot be empty.");
@@ -73179,6 +73235,7 @@ var taskReadInputSchema = object({
 var taskReadTool = {
   name: "task_read",
   displayName: "Task Read",
+  access: "read",
   description: "Reads current status, exit code, and recent bounded output snapshot of a background shell task. Non-blocking.",
   parameters: taskReadInputSchema,
   confirmationPolicy: "never",
@@ -73213,6 +73270,7 @@ function normalizeStdinInput(rawInput, appendNewline = true) {
 var taskSendInputTool = {
   name: "task_send_input",
   displayName: "Task Send Input",
+  access: "exec",
   description: "Writes input text to the standard input (stdin) of a running background shell task. Automatically appends a newline unless append_newline is set to false.",
   parameters: taskSendInputSchema,
   confirmationPolicy: "never",
@@ -73220,7 +73278,6 @@ var taskSendInputTool = {
     return `Sent input to ${args.task_id} (${args.input.length} chars)`;
   },
   execute: async (args, context) => {
-    assertToolAllowed("task_send_input");
     if (!context.shellTasks) {
       throw new Error("No shell tasks manager available in execution context.");
     }
@@ -73237,6 +73294,7 @@ var taskKillInputSchema = object({
 var taskKillTool = {
   name: "task_kill",
   displayName: "Task Kill",
+  access: "exec",
   description: "Terminates a running background shell task and its descendant process tree.",
   parameters: taskKillInputSchema,
   confirmationPolicy: "never",
@@ -73244,7 +73302,6 @@ var taskKillTool = {
     return `Stopped task ${args.task_id} · status: ${result?.status ?? "killed"}`;
   },
   execute: async (args, context) => {
-    assertToolAllowed("task_kill");
     if (!context.shellTasks) {
       throw new Error("No shell tasks manager available in execution context.");
     }
@@ -73257,6 +73314,7 @@ var taskListInputSchema = object({});
 var taskListTool = {
   name: "task_list",
   displayName: "Task List",
+  access: "read",
   description: "Lists all currently tracked background shell tasks along with their IDs, statuses, commands, and exit codes.",
   parameters: taskListInputSchema,
   confirmationPolicy: "never",
@@ -73278,7 +73336,7 @@ var taskListTool = {
 // package.json
 var package_default = {
   name: "steward-cli",
-  version: "0.16.0",
+  version: "0.17.0",
   description: "Interactive AI engineering assistant for the terminal with human-in-the-loop control across local and frontier models.",
   author: "sapirrior",
   license: "MIT",
@@ -73340,6 +73398,7 @@ function cleanHtmlContent(html) {
 var webFetchTool = {
   name: "web_fetch",
   displayName: "Web",
+  access: "read",
   description: "Fetches text and documentation content from a public web URL. Automatically cleans HTML markup into readable text.",
   parameters: webFetchInputSchema,
   confirmationPolicy: "never",
@@ -73471,6 +73530,7 @@ async function searchDuckDuckGoDirect(query, limit, signal) {
 var webSearchTool = {
   name: "web_search",
   displayName: "Web Search",
+  access: "read",
   description: "Searches the web directly for up-to-date information, documentation, package releases, and technical answers. Returns structured search results with titles, clean URLs, and snippets.",
   parameters: webSearchInputSchema,
   confirmationPolicy: "never",
@@ -73855,6 +73915,7 @@ var todoWriteTool = {
   name: "todo_write",
   displayName: "TodoWrite",
   icon: "\uD83D\uDCDD",
+  access: "write",
   description: "Initializes or replaces the current session todo list with 2 to 10 items. Use this to establish or replace the multi-step execution plan for the session.",
   parameters: todoWriteParamsSchema,
   summarizeArgs(args) {
@@ -73916,6 +73977,7 @@ var todoUpdateTool = {
   name: "todo_update",
   displayName: "TodoUpdate",
   icon: "✓",
+  access: "write",
   description: "Updates a single todo item status or description in the current session. Cannot create new items or update multiple items at once.",
   parameters: todoUpdateParamsSchema,
   summarizeArgs(args) {
@@ -73981,6 +74043,7 @@ var todoReadTool = {
   name: "todo_read",
   displayName: "TodoRead",
   icon: "\uD83D\uDCCB",
+  access: "read",
   description: "Reads the current session todo list without modifying it. Returns an empty result if no todos have been established yet.",
   parameters: todoReadParamsSchema,
   summarizeArgs() {
@@ -74166,6 +74229,7 @@ var skillListTool = {
   name: "skill_list",
   displayName: "SkillList",
   icon: "\uD83D\uDCA1",
+  access: "read",
   description: "Discovers and lists all available specialized skills and their descriptions. Use this when you need specialized domain knowledge or workflows.",
   parameters: skillListParamsSchema,
   summarizeArgs() {
@@ -74198,6 +74262,7 @@ var skillReadTool = {
   name: "skill_read",
   displayName: "SkillRead",
   icon: "\uD83D\uDCD6",
+  access: "read",
   description: "Loads and reads the instructions (SKILL.md) or a relative resource file of a specialized skill by name. Use this when a task requires specialized guidelines.",
   parameters: skillReadParamsSchema,
   summarizeArgs(args) {
@@ -74216,6 +74281,108 @@ var skillReadTool = {
     return `SkillRead: ${target}${len}`;
   }
 };
+// src/tools/summary.ts
+function summarizeToolResult(toolDef, args, result, isError = false) {
+  if (isError)
+    return;
+  if (!toolDef) {
+    if (typeof result === "string") {
+      const firstLine = result.split(`
+`)[0]?.trim();
+      return firstLine ? { headline: firstLine } : undefined;
+    }
+    if (result && typeof result === "object" && typeof result.message === "string") {
+      return { headline: result.message };
+    }
+    return;
+  }
+  if (toolDef.summarize) {
+    const sum = toolDef.summarize(args, result);
+    if (typeof sum === "string") {
+      const [headline, ...rest] = sum.split(`
+`);
+      return {
+        headline: headline ?? "",
+        detail: rest.length > 0 ? { kind: "text", text: rest.join(`
+`) } : undefined
+      };
+    }
+    return sum;
+  }
+  if (typeof result === "string") {
+    const firstLine = result.split(`
+`)[0]?.trim();
+    return { headline: firstLine || toolDef.displayName };
+  }
+  if (result && typeof result === "object" && typeof result.message === "string") {
+    return { headline: result.message };
+  }
+  return { headline: toolDef.displayName };
+}
+function formatPlainToolSummary(summary) {
+  if (!summary)
+    return;
+  if (!summary.detail)
+    return summary.headline;
+  if (summary.detail.kind === "text") {
+    return `${summary.headline}
+${summary.detail.text}`;
+  }
+  if (summary.detail.kind === "code") {
+    const lines = summary.detail.text.split(/\r?\n/);
+    const cap = 50;
+    const shown = lines.slice(0, cap);
+    const padWidth = String(lines.length).length;
+    const detail = shown.map((l, i) => `${String(i + 1).padStart(padWidth)}  ${l}`).join(`
+`);
+    const overflow = lines.length > cap ? `
+   … (${lines.length - cap} more lines)` : "";
+    return `${summary.headline}
+${detail}${overflow}`;
+  }
+  if (summary.detail.kind === "diff") {
+    const diffLines = [];
+    let maxLineNum = 1;
+    for (const hunk of summary.detail.hunks) {
+      for (const line of hunk.lines) {
+        if (line.oldLineNumber)
+          maxLineNum = Math.max(maxLineNum, line.oldLineNumber);
+        if (line.newLineNumber)
+          maxLineNum = Math.max(maxLineNum, line.newLineNumber);
+      }
+    }
+    const padWidth = Math.max(1, String(maxLineNum).length);
+    const cap = 30;
+    let count = 0;
+    let overflow = 0;
+    for (const hunk of summary.detail.hunks) {
+      for (const line of hunk.lines) {
+        if (count >= cap) {
+          overflow++;
+          continue;
+        }
+        count++;
+        if (line.kind === "deletion") {
+          const numStr = String(line.oldLineNumber ?? "").padStart(padWidth, " ");
+          diffLines.push(`${numStr} -${line.text}`);
+        } else if (line.kind === "addition") {
+          const numStr = String(line.newLineNumber ?? "").padStart(padWidth, " ");
+          diffLines.push(`${numStr} +${line.text}`);
+        } else {
+          const numStr = String(line.newLineNumber ?? line.oldLineNumber ?? "").padStart(padWidth, " ");
+          diffLines.push(`${numStr}  ${line.text}`);
+        }
+      }
+    }
+    if (overflow > 0) {
+      diffLines.push(`   … (${overflow} more lines)`);
+    }
+    return diffLines.length > 0 ? `${summary.headline}
+${diffLines.join(`
+`)}` : summary.headline;
+  }
+  return summary.headline;
+}
 
 // src/tools/index.ts
 var builtInTools = [
@@ -118234,8 +118401,7 @@ var PROVIDER_REGISTRY = {
     envVar: "DEEPSEEK_API_KEY",
     apiKey: (c) => c.deepseekApiKey,
     defaultModel: "deepseek-chat",
-    create: (apiKey) => createDeepSeek({ apiKey }),
-    isTaggedReasoning: () => true
+    create: (apiKey) => createDeepSeek({ apiKey })
   },
   openrouter: {
     name: "openrouter",
@@ -118250,8 +118416,7 @@ var PROVIDER_REGISTRY = {
         "HTTP-Referer": "https://github.com/sapirrior/steward",
         "X-Title": "steward"
       }
-    }),
-    isTaggedReasoning: (modelId) => isTaggedReasoningModel(modelId)
+    })
   },
   custom: {
     name: "custom",
@@ -118262,20 +118427,9 @@ var PROVIDER_REGISTRY = {
       name: "custom",
       baseURL: cfg.custom.baseURL,
       apiKey: cfg.custom.apiKey
-    }),
-    isTaggedReasoning: (modelId) => isTaggedReasoningModel(modelId)
+    })
   }
 };
-var DEFAULT_MODELS_BY_PROVIDER = {
-  gemini: PROVIDER_REGISTRY.gemini.defaultModel,
-  anthropic: PROVIDER_REGISTRY.anthropic.defaultModel,
-  openai: PROVIDER_REGISTRY.openai.defaultModel,
-  xai: PROVIDER_REGISTRY.xai.defaultModel,
-  mistral: PROVIDER_REGISTRY.mistral.defaultModel,
-  deepseek: PROVIDER_REGISTRY.deepseek.defaultModel,
-  openrouter: PROVIDER_REGISTRY.openrouter.defaultModel,
-  custom: PROVIDER_REGISTRY.custom.defaultModel
-};
 var DEFAULT_REASONING_EFFORT = "provider-default";
 var REASONING_EFFORT_MAP = {
   0: "provider-default",
@@ -118285,13 +118439,6 @@ var REASONING_EFFORT_MAP = {
   4: "medium",
   5: "high",
   6: "xhigh",
-  "0": "provider-default",
-  "1": "none",
-  "2": "minimal",
-  "3": "low",
-  "4": "medium",
-  "5": "high",
-  "6": "xhigh",
   default: "provider-default",
   "provider-default": "provider-default",
   none: "none",
@@ -118338,7 +118485,7 @@ function resolveActiveModelSelection(requested, config = getEnvConfig()) {
     if (!hasProviderConfig(requested.provider, config)) {
       throw new Error(`Provider "${requested.provider}" was requested, but its credentials are not configured in the environment.`);
     }
-    const modelId = requested.provider === "custom" ? config.custom.modelName || DEFAULT_MODELS_BY_PROVIDER.custom : DEFAULT_MODELS_BY_PROVIDER[requested.provider];
+    const modelId = requested.provider === "custom" ? config.custom.modelName || PROVIDER_REGISTRY.custom.defaultModel : PROVIDER_REGISTRY[requested.provider].defaultModel;
     return {
       provider: requested.provider,
       modelId,
@@ -118368,7 +118515,7 @@ function resolveActiveModelSelection(requested, config = getEnvConfig()) {
   }
   for (const provider of PROVIDER_SELECTION_PRIORITY) {
     if (available.includes(provider)) {
-      const modelId = provider === "custom" ? config.custom.modelName || DEFAULT_MODELS_BY_PROVIDER.custom : DEFAULT_MODELS_BY_PROVIDER[provider];
+      const modelId = provider === "custom" ? config.custom.modelName || PROVIDER_REGISTRY.custom.defaultModel : PROVIDER_REGISTRY[provider].defaultModel;
       return {
         provider,
         modelId,
@@ -118379,7 +118526,7 @@ function resolveActiveModelSelection(requested, config = getEnvConfig()) {
   const fallbackProvider = available[0];
   return {
     provider: fallbackProvider,
-    modelId: DEFAULT_MODELS_BY_PROVIDER[fallbackProvider],
+    modelId: PROVIDER_REGISTRY[fallbackProvider].defaultModel,
     effort
   };
 }
@@ -118393,15 +118540,7 @@ function createModelInstance(selection, config = getEnvConfig()) {
     throw new Error(`${descriptor.envVar} is not configured in the environment.`);
   }
   const modelId = selection.provider === "custom" ? config.custom.modelName || selection.modelId : selection.modelId;
-  const baseModel = descriptor.create(apiKey, config)(modelId);
-  return applyModelMiddlewarePipeline(baseModel, selection, descriptor);
-}
-function applyModelMiddlewarePipeline(model, _selection, _descriptor) {
-  return model;
-}
-function isTaggedReasoningModel(modelId) {
-  const lower = modelId.toLowerCase();
-  return lower.startsWith("deepseek-r1") || lower.includes("/deepseek-r1") || lower.includes("deepseek-reasoner") || lower === "r1" || lower.endsWith("-r1") || lower.startsWith("qwq") || lower.includes("qwen") && lower.includes("think");
+  return descriptor.create(apiKey, config)(modelId);
 }
 function inferProviderFromModelId(modelId) {
   const lower = modelId.toLowerCase();
@@ -118487,22 +118626,29 @@ ${options.userRules.map((rule) => `- ${rule}`).join(`
 ${options.extraInstructions}
 </additional_instructions>`;
   }
-  const modeBlocks = {
-    chat: `
+  if (options.chatMode && options.chatMode !== "normal") {
+    const meta = MODES[options.chatMode];
+    if (meta) {
+      if (options.chatMode === "chat") {
+        prompt += `
+
 <operating_mode>
 Mode: CHAT — You have no tool access. Respond conversationally only. Do not attempt to call any tools.
-</operating_mode>`,
-    review: `
+</operating_mode>`;
+      } else if (options.chatMode === "review") {
+        prompt += `
+
 <operating_mode>
-Mode: REVIEW — You may only use read-only tools: read_file, glob, grep, list_dir, web_fetch, web_search, todo_read, skill_list, skill_read, task_list, task_read. Any attempt to write files, run commands, or mutate state will be blocked by the tool itself.
-</operating_mode>`,
-    build: `
+Mode: REVIEW — You may only use read-only tools. Any attempt to write files, run commands, or mutate state will be blocked.
+</operating_mode>`;
+      } else if (options.chatMode === "build") {
+        prompt += `
+
 <operating_mode>
 Mode: BUILD — You have full tool access. File writes and edits are automatically approved without user confirmation — act decisively and make changes directly. Bash commands still require user approval.
-</operating_mode>`
-  };
-  if (options.chatMode && modeBlocks[options.chatMode]) {
-    prompt += modeBlocks[options.chatMode];
+</operating_mode>`;
+      }
+    }
   }
   return prompt;
 }
@@ -118655,9 +118801,10 @@ class AgentSession {
     });
     await tracker.beginTurn(turnId, this.sessionData.turns.length + 1);
     const mode = getActiveMode();
-    const effectiveFilePermission = mode === "build" ? async (_req) => ({ allowed: true }) : options.requestFilePermission;
+    const effectiveFilePermission = MODES[mode]?.autoApproveFiles ? async (_req) => ({ allowed: true }) : options.requestFilePermission;
     const toolContext = {
       cwd,
+      mode,
       sessionId: this.sessionData.id,
       abortSignal: this.activeAbortController.signal,
       checkpointTracker: tracker,
@@ -118693,7 +118840,8 @@ class AgentSession {
         });
       } else if (event.type === "tool-result") {
         const toolDef = defaultToolCatalog.get(event.toolResult.name);
-        const outputSummary = !event.toolResult.isError && toolDef?.summarize ? toolDef.summarize(event.toolResult.args, event.toolResult.result) : formatToolOutputSummary(event.toolResult.result, event.toolResult.isError);
+        const summaryObj = summarizeToolResult(toolDef, event.toolResult.args, event.toolResult.result, event.toolResult.isError);
+        const outputSummary = formatPlainToolSummary(summaryObj);
         const errorMessage = event.toolResult.isError ? typeof event.toolResult.result === "object" && event.toolResult.result !== null ? event.toolResult.result.message ?? JSON.stringify(event.toolResult.result) : String(event.toolResult.result) : undefined;
         const status = event.toolResult.isError ? "failed" : "completed";
         this.sessionLogWriter?.append({
@@ -119442,7 +119590,7 @@ var themeCommand = {
         }
       };
     }
-    const matched = findTheme2(args.join(" "));
+    const matched = findTheme(args.join(" "));
     if (!matched) {
       const validNames = listThemes().map((t) => t.name).join(", ");
       return {
@@ -119653,27 +119801,25 @@ class TextElement {
     const effWidth = Math.max(1, maxW);
     let styled = rawContent;
     if (this.props.bold)
-      styled = source_default.bold(styled);
-    if (this.props.dim)
-      styled = source_default.dim(styled);
+      styled = bold(styled);
     if (this.props.italic)
-      styled = source_default.italic(styled);
+      styled = italic(styled);
     if (this.props.underline)
-      styled = source_default.underline(styled);
+      styled = underline(styled);
     if (this.props.strikethrough)
-      styled = source_default.strikethrough(styled);
+      styled = strikethrough(styled);
     if (this.props.color) {
       if (typeof this.props.color === "function") {
         styled = this.props.color(styled);
-      } else {
-        styled = themeColor2(this.props.color)(styled);
+      } else if (this.props.color in c) {
+        styled = c[this.props.color](styled);
       }
     }
     if (this.props.bgColor) {
       if (typeof this.props.bgColor === "function") {
         styled = this.props.bgColor(styled);
-      } else {
-        styled = themeBgColor(this.props.bgColor)(styled);
+      } else if (this.props.bgColor in bg) {
+        styled = bg[this.props.bgColor](styled);
       }
     }
     const isWrappable = this.props.wrap ?? true;
@@ -119850,7 +119996,7 @@ class BoxElement {
   applyBorders(lines, totalWidth, border) {
     if (border === "none")
       return lines;
-    const colorFn = typeof this.props.borderColor === "function" ? this.props.borderColor : this.props.borderColor ? themeColor2(this.props.borderColor) : (s) => s;
+    const colorFn = typeof this.props.borderColor === "function" ? this.props.borderColor : this.props.borderColor ? themeColor(this.props.borderColor) : (s) => s;
     if (border === "top-bottom") {
       const rule = colorFn(figures.horizontalLine.repeat(totalWidth));
       return [rule, ...lines, rule];
@@ -119877,34 +120023,30 @@ function Box(props, children) {
 }
 // src/tui/primitives/widgets/ModalBox.ts
 function renderModalBox(options) {
-  const theme = getTheme();
   const termWidth = options.width ?? process.stdout.columns ?? 80;
   const maxCols = Math.max(1, termWidth);
   const dividerWidth = Math.max(1, termWidth);
-  const lavHeader = themeColor2(theme.lavenderHeader);
-  const infoColor = themeColor2(theme.info);
-  const dashRule = themeColor2(theme.dashedRule);
   const elements = [];
-  elements.push(Text(lavHeader(figures.horizontalLine.repeat(dividerWidth)), { clip: true }));
+  elements.push(Text(c.rule(figures.horizontalLine.repeat(dividerWidth)), { clip: true }));
   if (options.subtitle) {
     elements.push(Box({ direction: "row", justify: "space-between", width: maxCols }, [
-      Text(options.title, { color: theme.info }),
-      Text(options.subtitle, { dim: true })
+      Text(options.title, { color: "info" }),
+      Text(options.subtitle, { color: "muted" })
     ]));
   } else {
-    elements.push(Text(options.title, { color: theme.lavenderLight }));
+    elements.push(Text(options.title, { color: "permission" }));
   }
   if (options.queryInput) {
-    const pointer = infoColor(`${figures.pointer} `);
-    const queryDisplay = options.queryInput.query ? source_default.white(options.queryInput.query) : source_default.dim(options.queryInput.placeholder);
+    const pointer = c.info(`${figures.pointer} `);
+    const queryDisplay = options.queryInput.query ? c.text(options.queryInput.query) : c.muted(options.queryInput.placeholder);
     elements.push(Text(`${pointer}${queryDisplay}`));
-    elements.push(Text(dashRule(figures.horizontalLine.repeat(dividerWidth)), { clip: true }));
+    elements.push(Text(c.rule(figures.horizontalLine.repeat(dividerWidth)), { clip: true }));
   }
   for (const child of options.content) {
     elements.push(child);
   }
   if (options.footer) {
-    elements.push(Text(source_default.dim.italic(options.footer)));
+    elements.push(Text(italic(c.muted(options.footer))));
   }
   const modalBox = Box({ direction: "column", width: maxCols, clip: true }, elements);
   return modalBox.render(maxCols);
@@ -120147,12 +120289,10 @@ class Header extends Component {
     return rawPath;
   }
   render(_width) {
-    const theme = getTheme();
     const version = this.props.version ?? DEFAULT_VERSION;
-    const brandColor = themeColor2(theme.brand);
-    const logoL0 = brandColor(LOGO_LINES[0] ?? "");
-    const logoL1 = brandColor(LOGO_LINES[1] ?? "");
-    const logoL2 = brandColor(LOGO_LINES[2] ?? "");
+    const logoL0 = c.brand(LOGO_LINES[0] ?? "");
+    const logoL1 = c.brand(LOGO_LINES[1] ?? "");
+    const logoL2 = c.brand(LOGO_LINES[2] ?? "");
     const modelObj = this.props.model ?? { provider: "anthropic", modelId: "claude-3-7-sonnet" };
     const modelTag = `${modelObj.provider}/${modelObj.modelId}`;
     const cwdFormatted = this.formatCwd(this.props.cwd ?? process.cwd());
@@ -120164,17 +120304,17 @@ class Header extends Component {
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: `${logoL0}  ${source_default.white.bold("Steward")} ${source_default.dim(`v${version}`)}`
+          children: `${logoL0}  ${bold(c.text("Steward"))} ${c.muted(`v${version}`)}`
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: `${logoL1}  ${source_default.dim(modelTag)} ${source_default.dim("·")} ${source_default.dim("API Usage Billing")}`
+          children: `${logoL1}  ${c.muted(modelTag)} ${c.muted("·")} ${c.muted("API Usage Billing")}`
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: `${logoL2}  ${source_default.dim(cwdFormatted)}`
+          children: `${logoL2}  ${c.muted(cwdFormatted)}`
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
@@ -120205,7 +120345,6 @@ class StatusBar extends Component {
     this.state = {
       chatMode: props.chatMode ?? getActiveMode(),
       model: props.model,
-      usage: props.usage,
       isBusy: props.isBusy,
       exitPending: props.exitPending,
       warning: props.warning,
@@ -120280,12 +120419,10 @@ class StatusBar extends Component {
     }
   }
   render(width) {
-    const theme = getTheme();
     const termWidth = width ?? process.stdout.columns ?? 80;
     const maxCols = Math.max(1, termWidth);
     const {
       model,
-      usage,
       isBusy,
       exitPending,
       warning,
@@ -120296,48 +120433,47 @@ class StatusBar extends Component {
     } = this.state;
     let left = "";
     if (warning) {
-      left = themeColor2(theme.warning)(warning);
+      left = c.warning(warning);
     } else if (voiceState && voiceState !== "idle") {
       if (voiceState === "connecting") {
-        left = `${source_default.white.bold("Connecting...")}   ${source_default.dim("Ctrl+T to stop")}`;
+        left = `${bold(c.text("Connecting..."))}   ${c.muted("Ctrl+T to stop")}`;
       } else if (voiceState === "recording") {
         const timeStr = formatVoiceDuration(voiceDurationSec ?? 0);
-        left = `${source_default.white.bold(`Recording... ${timeStr}`)}   ${source_default.dim("Ctrl+T to stop")}`;
+        left = `${bold(c.text(`Recording... ${timeStr}`))}   ${c.muted("Ctrl+T to stop")}`;
       } else if (voiceState === "finishing") {
-        left = source_default.white.bold("Finishing...");
+        left = bold(c.text("Finishing..."));
       }
     } else if (exitPending) {
-      const errColor = themeColor2(theme.error);
-      left = `${errColor("▸ ")}${source_default.dim("Press ")}${errColor("Ctrl+C")}${source_default.dim(" again to exit")}`;
+      left = `${c.error("▸ ")}${c.muted("Press ")}${c.error("Ctrl+C")}${c.muted(" again to exit")}`;
     } else if (updateStatus && updateStatus.state !== "idle") {
       if (updateStatus.state === "checking") {
-        left = source_default.white(updateStatus.message ?? "Checking for updates...");
+        left = c.text(updateStatus.message ?? "Checking for updates...");
       } else if (updateStatus.state === "available") {
-        left = source_default.white(updateStatus.message ?? `Update v${updateStatus.version ?? ""} is available`);
+        left = c.text(updateStatus.message ?? `Update v${updateStatus.version ?? ""} is available`);
       } else if (updateStatus.state === "no-updates") {
-        left = source_default.white(updateStatus.message ?? "Steward is up to date");
+        left = c.text(updateStatus.message ?? "Steward is up to date");
       } else if (updateStatus.state === "error" && updateStatus.message) {
-        left = themeColor2(theme.error)(updateStatus.message);
+        left = c.error(updateStatus.message);
       } else if (isBusy) {
-        left = source_default.dim("esc to interrupt");
+        left = c.muted("esc to interrupt");
       } else {
-        left = source_default.dim("? for shortcuts");
+        left = c.muted("? for shortcuts");
       }
     } else if (isBusy) {
-      left = source_default.dim("esc to interrupt");
+      left = c.muted("esc to interrupt");
     } else {
-      left = source_default.dim("? for shortcuts");
+      left = c.muted("? for shortcuts");
     }
     const mode = chatMode ?? "normal";
-    const modeMeta = CHAT_MODES[mode];
-    const modeColorKey = modeMeta?.themeColorKey ?? "text";
+    const modeMeta = MODES[mode];
+    const modeColorKey = modeMeta?.color ?? "text";
     const modeLabel = modeMeta?.label ?? mode;
     const parts = [];
-    parts.push(themeColor2(theme[modeColorKey])(modeLabel));
+    parts.push(c[modeColorKey](modeLabel));
     const effort = model?.effort ?? "provider-default";
     const effortDisplay = effort === "provider-default" ? "default" : effort;
-    parts.push(source_default.dim(effortDisplay));
-    const right = parts.length > 0 ? parts.join(` ${figures.bullet} `) : "";
+    parts.push(c.muted(effortDisplay));
+    const right = parts.length > 0 ? parts.join(c.muted(` ${figures.bullet} `)) : "";
     const element = /* @__PURE__ */ jsxs(Box, {
       direction: "row",
       justify: "space-between",
@@ -120457,9 +120593,9 @@ class StreamingView extends Component {
       if (targetArg) {
         const maxArgLen = Math.max(10, maxCols - toolName.length - 8);
         const truncatedArg = targetArg.length > maxArgLen ? truncateMiddle(targetArg, maxArgLen) : targetArg;
-        line += `${source_default.dim("(")}${source_default.dim(truncatedArg)}${source_default.dim(")")}`;
+        line += `${c.muted("(")}${c.muted(truncatedArg)}${c.muted(")")}`;
       } else {
-        line += `${source_default.dim("()")}`;
+        line += `${c.muted("()")}`;
       }
       lines.push(line);
       if (activeTool.recentLines && activeTool.recentLines.length > 0) {
@@ -120467,16 +120603,16 @@ class StreamingView extends Component {
         const maxLogLen = Math.max(10, maxCols - 6);
         for (let i = 0;i < toShow.length; i++) {
           const l = toShow[i] ?? "";
-          const p = i === 0 ? `  ${source_default.dim("└ ")}` : "    ";
+          const p = i === 0 ? `  ${c.muted("└ ")}` : "    ";
           const truncatedLog = l.length > maxLogLen ? `${l.slice(0, maxLogLen - 1)}…` : l;
-          lines.push(`${p}${source_default.dim(truncatedLog)}`);
+          lines.push(`${p}${c.muted(truncatedLog)}`);
         }
       } else {
-        lines.push(`  ${source_default.dim("└ Running...")}`);
+        lines.push(`  ${c.muted("└ Running...")}`);
       }
     } else if (isThinking && !text) {
       const bullet = getStatusBullet("running", pulseFrame % 2 === 0);
-      lines.push(`${bullet} ${source_default.bold("Thinking..")}`);
+      lines.push(`${bullet} ${bold(c.text("Thinking.."))}`);
       const elapsedMs = thinkingStartTime ? performance.now() - thinkingStartTime : pulseFrame * 120;
       let subText = "wait...";
       if (elapsedMs < 2000) {
@@ -120488,7 +120624,7 @@ class StreamingView extends Component {
       } else {
         subText = "taking a bit time...";
       }
-      lines.push(`  ${source_default.dim("└ ")}${source_default.dim(subText)}`);
+      lines.push(`  ${c.muted("└ ")}${c.muted(subText)}`);
     }
     if (text) {
       if (lines.length > 0)
@@ -120515,7 +120651,7 @@ class StreamingView extends Component {
             continue;
           }
           if (i === 0) {
-            const bullet = source_default.white(`${figures.blackCircle} `);
+            const bullet = c.text(`${figures.blackCircle} `);
             lines.push(`${bullet}${l}`);
           } else {
             lines.push(`  ${l}`);
@@ -120731,7 +120867,7 @@ class PromptInput extends Component {
         return true;
       }
       const isSlashMode = this.state.value.startsWith("/") && !this.state.value.includes(" ");
-      const matchingCommands = isSlashMode ? defaultCommandRegistry.getAll().filter((c) => `/${c.name}`.toLowerCase().startsWith(this.state.value.toLowerCase())) : [];
+      const matchingCommands = isSlashMode ? defaultCommandRegistry.getAll().filter((c2) => `/${c2.name}`.toLowerCase().startsWith(this.state.value.toLowerCase())) : [];
       if (action.type === "newline") {
         const before = this.state.value.slice(0, this.state.cursorPos);
         const after = this.state.value.slice(this.state.cursorPos);
@@ -120995,7 +121131,6 @@ ${after}`, this.state.cursorPos);
     return this.renderWithCursor(width).lines;
   }
   renderWithCursor(width) {
-    const theme = getTheme();
     const termWidth = width ?? process.stdout.columns ?? 80;
     const maxCols = Math.max(1, termWidth);
     const dividerWidth = maxCols;
@@ -121016,12 +121151,12 @@ ${after}`, this.state.cursorPos);
     const lines = [];
     let cursor = null;
     if (escPending) {
-      lines.push(themeColor2(theme.permission)("Press Esc again to clear"));
+      lines.push(c.permission("Press Esc again to clear"));
     }
-    const borderColor = disabled ? themeColor2(theme.subtle) : themeColor2(theme.promptBorder);
+    const borderColor = disabled ? c.subtle : c.promptBorder;
     if (disabled) {
       lines.push(borderColor(figures.horizontalLine.repeat(dividerWidth)));
-      lines.push(truncateToWidth(`  ${source_default.dim("Esc to stop")}`, maxCols));
+      lines.push(truncateToWidth(`  ${c.muted("Esc to stop")}`, maxCols));
       lines.push(borderColor(figures.horizontalLine.repeat(dividerWidth)));
       return { lines, cursor: null };
     }
@@ -121030,22 +121165,19 @@ ${after}`, this.state.cursorPos);
       const leftDashes = borderColor(figures.horizontalLine.repeat(4));
       const rightLen = Math.max(0, maxCols - (4 + histText.length));
       const rightDashes = borderColor(figures.horizontalLine.repeat(rightLen));
-      lines.push(`${leftDashes}${source_default.white(histText)}${rightDashes}`);
+      lines.push(`${leftDashes}${c.text(histText)}${rightDashes}`);
     } else {
       lines.push(borderColor(figures.horizontalLine.repeat(dividerWidth)));
     }
     const displayData = voiceMode !== "idle" && voiceTranscript ? insertTextAtAnchor(value, voiceAnchor, voiceTranscript) : { value, cursorPos };
     const effectiveValue = displayData.value;
     const effectiveCursorPos = displayData.cursorPos;
-    const chevColor = themeColor2(theme.userChevron);
-    const pointer = chevColor(`${figures.pointerBold} `);
-    const prefixLen = 2;
     if (effectiveValue.length === 0) {
       cursor = {
         logicalLineIndex: lines.length,
-        characterOffsetWithinLine: prefixLen
+        characterOffsetWithinLine: 0
       };
-      lines.push(truncateToWidth(`${pointer}${source_default.dim("Type your message...")}`, maxCols));
+      lines.push(truncateToWidth(c.muted("Type your message..."), maxCols));
     } else {
       const vLines = effectiveValue.split(`
 `);
@@ -121058,37 +121190,35 @@ ${after}`, this.state.cursorPos);
         if (cursor === null && effectiveCursorPos >= currentOffset && (effectiveCursorPos <= lineEndOffset || isLast)) {
           cursor = {
             logicalLineIndex: lines.length,
-            characterOffsetWithinLine: prefixLen + (effectiveCursorPos - currentOffset)
+            characterOffsetWithinLine: effectiveCursorPos - currentOffset
           };
         }
-        const p = i === 0 ? pointer : "  ";
-        lines.push(`${p}${source_default.white(l)}`);
+        lines.push(c.text(l));
         currentOffset = lineEndOffset + 1;
       }
     }
     lines.push(borderColor(figures.horizontalLine.repeat(dividerWidth)));
     const isSlashMode = voiceMode === "idle" && effectiveValue.startsWith("/") && !effectiveValue.includes(" ");
-    const matchingCommands = isSlashMode ? defaultCommandRegistry.getAll().filter((c) => `/${c.name}`.toLowerCase().startsWith(effectiveValue.toLowerCase())) : [];
+    const matchingCommands = isSlashMode ? defaultCommandRegistry.getAll().filter((cmd) => `/${cmd.name}`.toLowerCase().startsWith(effectiveValue.toLowerCase())) : [];
     if (isSlashMode && matchingCommands.length > 0 && effectiveValue !== `/${matchingCommands[0]?.name} `) {
       for (let i = 0;i < matchingCommands.length; i++) {
         const cmd = matchingCommands[i];
         const isSelected = i === paletteIdx;
         const namePadded = `/${cmd.name}`.padEnd(18);
         if (isSelected) {
-          lines.push(truncateToWidth(`${source_default.white.bold(namePadded)}${source_default.white.bold(cmd.description)}`, maxCols));
+          lines.push(truncateToWidth(`${bold(c.text(namePadded))}${bold(c.text(cmd.description))}`, maxCols));
         } else {
-          lines.push(truncateToWidth(`${source_default.dim(namePadded)}${source_default.dim(cmd.description)}`, maxCols));
+          lines.push(truncateToWidth(`${c.muted(namePadded)}${c.muted(cmd.description)}`, maxCols));
         }
       }
     }
     if (voiceMode === "idle" && fileMatches.length > 0) {
-      const infoColor = themeColor2(theme.info);
-      lines.push(source_default.dim("Matching files (@):"));
+      lines.push(c.muted("Matching files (@):"));
       for (let i = 0;i < fileMatches.length; i++) {
         const f = fileMatches[i];
         const isSelected = i === fileSelectIdx;
-        const p = isSelected ? infoColor(`${figures.pointerBold} `) : "  ";
-        const fileText = isSelected ? infoColor(f) : source_default.dim(f);
+        const p = isSelected ? c.info(`${figures.pointerBold} `) : "  ";
+        const fileText = isSelected ? c.info(f) : c.muted(f);
         lines.push(truncateToWidth(`${p}${fileText}`, maxCols));
       }
     }
@@ -121145,19 +121275,14 @@ class TrustGate extends Component {
     }
   }
   render(width) {
-    const theme = getTheme();
     const termWidth = width ?? process.stdout.columns ?? 80;
     const maxCols = Math.max(1, termWidth);
-    const warnColor = themeColor2(theme.warning);
-    const permColor = themeColor2(theme.permission);
-    const mutedColor = themeColor2(theme.textMuted);
-    const dimGuideColor = themeColor2(theme.inactive);
     const { selectedIndex } = this.state;
     const isYesSelected = selectedIndex === 0;
     const isNoSelected = selectedIndex === 1;
     const pointer = figures.pointerBold ?? "❯";
-    const yesOptionText = isYesSelected ? `${permColor(pointer)} ${permColor.bold("1. Yes, I trust this folder")}` : `  ${source_default.white("1. Yes, I trust this folder")}`;
-    const noOptionText = isNoSelected ? `${permColor(pointer)} ${permColor.bold("2. No, exit")}` : `  ${source_default.white("2. No, exit")}`;
+    const yesOptionText = isYesSelected ? `${c.permission(pointer)} ${bold(c.permission("1. Yes, I trust this folder"))}` : `  ${c.text("1. Yes, I trust this folder")}`;
+    const noOptionText = isNoSelected ? `${c.permission(pointer)} ${bold(c.permission("2. No, exit"))}` : `  ${c.text("2. No, exit")}`;
     const safetyCheckText = "You should only proceed if you trust this workspace. Accessing untrusted workspaces may allow malicious code in the repository to compromise security or mislead the assistant.";
     const capabilityText = "Steward can read files and execute commands to investigate, build, and debug with your explicit permission. Pre-mutation checkpoints ensure every edit is reversible via /rewind.";
     const element = /* @__PURE__ */ jsxs(Box, {
@@ -121169,7 +121294,7 @@ class TrustGate extends Component {
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: warnColor.bold("Accessing workspace:")
+          children: bold(c.warning("Accessing workspace:"))
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
@@ -121179,7 +121304,7 @@ class TrustGate extends Component {
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: source_default.white.bold(this.props.cwd)
+          children: bold(c.text(this.props.cwd))
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
@@ -121188,7 +121313,7 @@ class TrustGate extends Component {
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: true,
-          children: source_default.white(safetyCheckText)
+          children: c.text(safetyCheckText)
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
@@ -121197,7 +121322,7 @@ class TrustGate extends Component {
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: true,
-          children: source_default.white(capabilityText)
+          children: c.text(capabilityText)
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
@@ -121207,7 +121332,7 @@ class TrustGate extends Component {
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: dimGuideColor("Security guide")
+          children: c.muted("Security guide")
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
@@ -121232,7 +121357,7 @@ class TrustGate extends Component {
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: mutedColor(source_default.italic("Enter to confirm · Esc to cancel"))
+          children: italic(c.muted("Enter to confirm · Esc to cancel"))
         })
       ]
     });
@@ -121257,12 +121382,9 @@ class ModelPicker extends SelectList {
       onSelect: props.onSelect,
       onCancel: props.onCancel,
       renderItem: (m, isSelected, maxCols) => {
-        const theme = getTheme();
-        const selColor = themeColor2(theme.permission);
-        const yellowColor = themeColor2(theme.warning);
         const isCurrent = m.provider === props.currentModel.provider && m.model_id === props.currentModel.modelId;
-        const pointer = isSelected ? selColor(`${figures.pointer} `) : "  ";
-        const activeBadge = isCurrent ? yellowColor.bold(" (active)") : "";
+        const pointer = isSelected ? c.selected(`${figures.pointer} `) : "  ";
+        const activeBadge = isCurrent ? bold(c.current(" (active)")) : "";
         const providerName = m.provider.toUpperCase();
         const caps = m.capabilities?.reasoning ? "reasoning" : "chat";
         const meta = `${providerName} • ${caps}`;
@@ -121271,14 +121393,14 @@ class ModelPicker extends SelectList {
           width: maxCols,
           children: [
             /* @__PURE__ */ jsx(Text, {
-              color: isSelected ? selColor : isCurrent ? yellowColor : source_default.white,
+              color: isSelected ? "selected" : isCurrent ? "current" : "text",
               wrap: false,
               clip: true,
               ellipsis: true,
               children: `${pointer}${m.model_id}${activeBadge}`
             }),
             /* @__PURE__ */ jsx(Text, {
-              dim: true,
+              color: "muted",
               wrap: false,
               clip: true,
               ellipsis: true,
@@ -121310,12 +121432,9 @@ class ThemePicker extends SelectList {
       onSelect: props.onSelect,
       onCancel: props.onCancel,
       renderItem: (t, isSelected, maxCols) => {
-        const theme = getTheme();
-        const selColor = themeColor2(theme.permission);
-        const yellowColor = themeColor2(theme.warning);
         const isCurrent = t.name === props.currentTheme;
-        const pointer = isSelected ? selColor(`${figures.pointer} `) : "  ";
-        const activeBadge = isCurrent ? yellowColor.bold(" (active)") : "";
+        const pointer = isSelected ? c.selected(`${figures.pointer} `) : "  ";
+        const activeBadge = isCurrent ? bold(c.current(" (active)")) : "";
         const tBrand = resolveThemeColor(t.theme.brand, false)(figures.blackCircle);
         const tSuccess = resolveThemeColor(t.theme.success, false)(figures.blackCircle);
         const tWarning = resolveThemeColor(t.theme.warning, false)(figures.blackCircle);
@@ -121328,14 +121447,14 @@ class ThemePicker extends SelectList {
           width: maxCols,
           children: [
             /* @__PURE__ */ jsx(Text, {
-              color: isSelected ? selColor : isCurrent ? yellowColor : source_default.white,
+              color: isSelected ? "selected" : isCurrent ? "current" : "text",
               wrap: false,
               clip: true,
               ellipsis: true,
               children: `${pointer}${t.label}${activeBadge}`
             }),
             /* @__PURE__ */ jsx(Text, {
-              dim: true,
+              color: "muted",
               wrap: false,
               clip: true,
               ellipsis: true,
@@ -121370,11 +121489,9 @@ class SessionMenu extends SelectList {
       onSelect: props.onSelect,
       onCancel: props.onCancel,
       renderItem: (s, isSelected, maxCols) => {
-        const theme = getTheme();
-        const selColor = themeColor2(theme.permission);
         const rawTitle = s.name || s.turns?.[0]?.userPrompt || "Untitled Session";
         const cleanTitle = rawTitle.replace(/\s+/g, " ").trim();
-        const pointer = isSelected ? selColor(`${figures.pointer} `) : "  ";
+        const pointer = isSelected ? c.selected(`${figures.pointer} `) : "  ";
         const shortId = s.id.slice(0, 8);
         const dateStr = s.date ? s.date.split("T")[0] : "";
         const turnsCount = s.turns?.length ?? 0;
@@ -121389,14 +121506,14 @@ class SessionMenu extends SelectList {
           width: maxCols,
           children: [
             /* @__PURE__ */ jsx(Text, {
-              color: isSelected ? selColor : source_default.white,
+              color: isSelected ? "selected" : "text",
               wrap: false,
               clip: true,
               ellipsis: true,
               children: `${pointer}${cleanTitle}`
             }),
             /* @__PURE__ */ jsx(Text, {
-              dim: true,
+              color: "muted",
               wrap: false,
               clip: true,
               ellipsis: true,
@@ -121452,8 +121569,8 @@ class ShortcutsMenu extends Component {
     ];
     const rows = leftCol.map((left, i) => {
       const right = rightCol[i];
-      const leftFormatted = `  ${source_default.white(left.key.padEnd(11))} ${source_default.dim(left.desc.padEnd(18))}`;
-      const rightFormatted = `${source_default.white(right.key.padEnd(13))} ${source_default.dim(right.desc)}`;
+      const leftFormatted = `  ${c.text(left.key.padEnd(11))} ${c.muted(left.desc.padEnd(18))}`;
+      const rightFormatted = `${c.text(right.key.padEnd(13))} ${c.muted(right.desc)}`;
       return /* @__PURE__ */ jsxs(Box, {
         direction: "row",
         justify: "start",
@@ -121546,12 +121663,8 @@ class EffortPicker extends Component {
     }
   }
   render(width) {
-    const theme = getTheme();
     const termWidth = width ?? process.stdout.columns ?? 80;
     const maxCols = Math.max(1, termWidth);
-    const permColor = themeColor2(theme.permission);
-    const infoColor = themeColor2(theme.info);
-    const trackColor = themeColor2(theme.promptBorder);
     const { selectedIndex } = this.state;
     const activeOption = EFFORT_OPTIONS[selectedIndex] ?? EFFORT_OPTIONS[0];
     const leftPad = 4;
@@ -121561,24 +121674,23 @@ class EffortPicker extends Component {
     const fasterText = "Faster";
     const smarterText = "Smarter";
     const spectrumGap = Math.max(1, totalSliderCols - (fasterText.length + smarterText.length));
-    const spectrumRow = `${" ".repeat(leftPad)}${infoColor.bold(fasterText)}${" ".repeat(spectrumGap)}${permColor.bold(smarterText)}`;
-    const yellowColor = themeColor2(theme.warning);
+    const spectrumRow = `${" ".repeat(leftPad)}${bold(c.info(fasterText))}${" ".repeat(spectrumGap)}${bold(c.permission(smarterText))}`;
     let trackChars = "";
     for (let i = 0;i < EFFORT_OPTIONS.length; i++) {
       const isSelected = i === selectedIndex;
       const opt = EFFORT_OPTIONS[i];
       const isCurrent = opt.id === this.props.currentEffort;
-      const pointerColor = isCurrent ? yellowColor : permColor;
+      const pointerColor = isCurrent ? c.current : c.permission;
       const slotCenter = Math.floor(colWidth / 2);
-      for (let c = 0;c < colWidth; c++) {
-        if (c === slotCenter) {
+      for (let ch = 0;ch < colWidth; ch++) {
+        if (ch === slotCenter) {
           if (isSelected) {
             trackChars += pointerColor(figures.sliderPointer ?? "▲");
           } else {
-            trackChars += trackColor(figures.horizontalLine);
+            trackChars += c.promptBorder(figures.horizontalLine);
           }
         } else {
-          trackChars += trackColor(figures.horizontalLine);
+          trackChars += c.promptBorder(figures.horizontalLine);
         }
       }
     }
@@ -121590,13 +121702,13 @@ class EffortPicker extends Component {
       const isCurrent = opt.id === this.props.currentEffort;
       let labelText = opt.label;
       if (isSelected && isCurrent) {
-        labelText = yellowColor.bold(labelText);
+        labelText = bold(c.current(labelText));
       } else if (isSelected) {
-        labelText = permColor.bold(labelText);
+        labelText = bold(c.permission(labelText));
       } else if (isCurrent) {
-        labelText = yellowColor.bold(labelText);
+        labelText = bold(c.current(labelText));
       } else {
-        labelText = source_default.white(labelText);
+        labelText = c.text(labelText);
       }
       const textLen = opt.label.length;
       const padLeft = Math.floor((colWidth - textLen) / 2);
@@ -121604,7 +121716,7 @@ class EffortPicker extends Component {
       labelCols += `${" ".repeat(Math.max(0, padLeft))}${labelText}${" ".repeat(Math.max(0, padRight))}`;
     }
     const labelsRow = `${" ".repeat(leftPad)}${labelCols}`;
-    const descText = `    ${source_default.white.bold(activeOption.description)}`;
+    const descText = `    ${bold(c.text(activeOption.description))}`;
     const contentElements = [
       /* @__PURE__ */ jsxs(Box, {
         direction: "column",
@@ -121755,30 +121867,28 @@ class RewindMenu extends SelectList {
       onSelect: props.onSelect,
       onCancel: props.onCancel,
       renderItem: (item, isSelected, maxCols) => {
-        const theme = getTheme();
-        const selColor = themeColor2(theme.permission);
-        const pointer = isSelected ? selColor(`${figures.pointer} `) : "  ";
+        const pointer = isSelected ? c.selected(`${figures.pointer} `) : "  ";
         let summaryText;
         if (item.hasCodeChanges) {
-          const filePart = source_default.dim(`${item.changedFileCount} file${item.changedFileCount !== 1 ? "s" : ""} changed`);
+          const filePart = c.muted(`${item.changedFileCount} file${item.changedFileCount !== 1 ? "s" : ""} changed`);
           const diffBadges = [];
           if (item.addedLines > 0) {
-            diffBadges.push(themeColor2(theme.diffAddFG)(`+${item.addedLines}`));
+            diffBadges.push(c.diffAddFg(`+${item.addedLines}`));
           }
           if (item.deletedLines > 0) {
-            diffBadges.push(themeColor2(theme.diffDeleteFG)(`-${item.deletedLines}`));
+            diffBadges.push(c.diffDelFg(`-${item.deletedLines}`));
           }
           const diffStr = diffBadges.length > 0 ? `  ${diffBadges.join(" ")}` : "";
           summaryText = `  ${filePart}${diffStr}`;
         } else {
-          summaryText = `  ${source_default.dim("No code changes")}`;
+          summaryText = `  ${c.muted("No code changes")}`;
         }
         return /* @__PURE__ */ jsxs(Box, {
           direction: "column",
           width: maxCols,
           children: [
             /* @__PURE__ */ jsx(Text, {
-              color: isSelected ? selColor : source_default.white,
+              color: isSelected ? "selected" : "text",
               wrap: false,
               clip: true,
               ellipsis: true,
@@ -121879,18 +121989,14 @@ class BashPermissionDock extends Component {
     return Math.max(0, renderedCmdLines.length - maxVisibleReviewLines);
   }
   render(width) {
-    const theme = getTheme();
     const termWidth = width ?? process.stdout.columns ?? 80;
     const maxCols = Math.max(1, termWidth);
-    const dividerColor = themeColor2(theme.dividerRule);
-    const permColor = themeColor2(theme.permission);
-    const mutedColor = themeColor2(theme.textMuted);
     const { mode, selectedIndex, scrollOffset } = this.state;
     const { command, explanation } = this.props;
     const pointer = figures.pointerBold ?? "❯";
     const isYesSelected = selectedIndex === 0;
     const isNoSelected = selectedIndex === 1;
-    const divider = dividerColor(figures.horizontalLine.repeat(maxCols));
+    const divider = c.rule(figures.horizontalLine.repeat(maxCols));
     if (mode === "REVIEW") {
       const cmdText = new Text(command, { wrap: true, clip: false });
       const renderedCmdLines = cmdText.render(maxCols);
@@ -121918,7 +122024,7 @@ class BashPermissionDock extends Component {
           /* @__PURE__ */ jsx(Text, {
             wrap: false,
             clip: false,
-            children: source_default.white.bold("Bash command (review)")
+            children: bold(c.text("Bash command (review)"))
           }),
           /* @__PURE__ */ jsx(Text, {
             wrap: false,
@@ -121928,7 +122034,7 @@ class BashPermissionDock extends Component {
           visibleCmdLines.map((line) => /* @__PURE__ */ jsx(Text, {
             wrap: false,
             clip: false,
-            children: `    ${source_default.white(line)}`
+            children: `    ${c.text(line)}`
           })),
           /* @__PURE__ */ jsx(Text, {
             wrap: false,
@@ -121938,7 +122044,7 @@ class BashPermissionDock extends Component {
           /* @__PURE__ */ jsx(Text, {
             wrap: false,
             clip: false,
-            children: mutedColor(source_default.italic("↑/↓ scroll · Esc / f to return"))
+            children: italic(c.muted("↑/↓ scroll · Esc / f to return"))
           })
         ]
       });
@@ -121948,8 +122054,8 @@ class BashPermissionDock extends Component {
     const renderedCmdLines = cmdText.render(Math.max(10, maxCols - 4));
     const previewLines = renderedCmdLines.slice(0, 3);
     const hiddenCount = Math.max(0, renderedCmdLines.length - 3);
-    const yesOptionText = isYesSelected ? `${permColor(pointer)} ${permColor.bold("1. Yes")}` : `  ${source_default.white("1. Yes")}`;
-    const noOptionText = isNoSelected ? `${permColor(pointer)} ${permColor.bold("2. No")}` : `  ${source_default.white("2. No")}`;
+    const yesOptionText = isYesSelected ? `${c.permission(pointer)} ${bold(c.permission("1. Yes"))}` : `  ${c.text("1. Yes")}`;
+    const noOptionText = isNoSelected ? `${c.permission(pointer)} ${bold(c.permission("2. No"))}` : `  ${c.text("2. No")}`;
     const element = /* @__PURE__ */ jsxs(Box, {
       direction: "column",
       width: maxCols,
@@ -121969,7 +122075,7 @@ class BashPermissionDock extends Component {
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: source_default.white.bold("Bash command")
+          children: bold(c.text("Bash command"))
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
@@ -121979,12 +122085,12 @@ class BashPermissionDock extends Component {
         previewLines.map((line) => /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: `    ${source_default.white(line)}`
+          children: `    ${c.text(line)}`
         })),
         hiddenCount > 0 && /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: `    ${source_default.dim(`(+${hiddenCount} hidden)`)}`
+          children: `    ${c.muted(`(+${hiddenCount} hidden)`)}`
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
@@ -121993,7 +122099,7 @@ class BashPermissionDock extends Component {
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: true,
-          children: `    ${source_default.dim(explanation)}`
+          children: `    ${c.muted(explanation)}`
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
@@ -122003,7 +122109,7 @@ class BashPermissionDock extends Component {
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: source_default.white("Do you want to proceed?")
+          children: c.text("Do you want to proceed?")
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
@@ -122028,7 +122134,7 @@ class BashPermissionDock extends Component {
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: mutedColor(source_default.italic("Esc to cancel · f to review"))
+          children: italic(c.muted("Esc to cancel · f to review"))
         })
       ]
     });
@@ -122117,13 +122223,8 @@ class FilePermissionDock extends Component {
     return Math.max(0, allContentRows.length - maxVisibleReviewLines);
   }
   renderContentRows(maxCols) {
-    const theme = getTheme();
     const { request } = this.props;
     const { kind, before, after } = request;
-    const diffAdd = themeColor2(theme.diffAddFG);
-    const diffAddBg = themeBgColor(theme.diffAddBG);
-    const diffDelete = themeColor2(theme.diffDeleteFG);
-    const diffDeleteBg = themeBgColor(theme.diffDeleteBG);
     if (kind === "create" || kind === "overwrite") {
       const highlighted = highlightCode(after, { filePath: request.filePath });
       const rawLines = highlighted.split(/\r?\n/);
@@ -122134,7 +122235,7 @@ class FilePermissionDock extends Component {
       for (let i = 0;i < lines.length; i++) {
         const lineNum = i + 1;
         const lineNumStr = String(lineNum).padStart(gutterWidth, " ");
-        const firstPrefix = ` ${source_default.dim(lineNumStr)}  `;
+        const firstPrefix = ` ${c.muted(lineNumStr)}  `;
         const contPrefix = ` ${" ".repeat(gutterWidth)}  `;
         const wrapped = prefixedBlock(firstPrefix, lines[i] ?? "", {
           continuationPrefix: contPrefix,
@@ -122160,30 +122261,30 @@ class FilePermissionDock extends Component {
       for (const line of hunk.lines) {
         if (line.kind === "deletion") {
           const numStr = String(line.oldLineNumber ?? "").padStart(gutterWidth, " ");
-          const firstPrefix = ` ${source_default.dim(numStr)} `;
+          const firstPrefix = ` ${c.muted(numStr)} `;
           const contPrefix = ` ${" ".repeat(gutterWidth)} `;
-          const bodyText = line.spans ? diffDelete("-") + line.spans.map((s) => s.kind === "deletion" ? source_default.bold(diffDelete(s.text)) : diffDelete(s.text)).join("") : diffDelete(`-${line.text}`);
+          const bodyText = line.spans ? c.diffDelFg("-") + line.spans.map((s) => s.kind === "deletion" ? bold(c.diffDelFg(s.text)) : c.diffDelFg(s.text)).join("") : c.diffDelFg(`-${line.text}`);
           const wrapped = prefixedBlock(firstPrefix, bodyText, {
             continuationPrefix: contPrefix,
             width: maxCols,
-            bg: diffDeleteBg
+            bg: bg.diffDelBg
           });
           renderedRows.push(...wrapped);
         } else if (line.kind === "addition") {
           const numStr = String(line.newLineNumber ?? "").padStart(gutterWidth, " ");
-          const firstPrefix = ` ${source_default.dim(numStr)} `;
+          const firstPrefix = ` ${c.muted(numStr)} `;
           const contPrefix = ` ${" ".repeat(gutterWidth)} `;
-          const bodyText = line.spans ? diffAdd("+") + line.spans.map((s) => s.kind === "addition" ? source_default.bold(diffAdd(s.text)) : diffAdd(s.text)).join("") : diffAdd(`+${line.text}`);
+          const bodyText = line.spans ? c.diffAddFg("+") + line.spans.map((s) => s.kind === "addition" ? bold(c.diffAddFg(s.text)) : c.diffAddFg(s.text)).join("") : c.diffAddFg(`+${line.text}`);
           const wrapped = prefixedBlock(firstPrefix, bodyText, {
             continuationPrefix: contPrefix,
             width: maxCols,
-            bg: diffAddBg
+            bg: bg.diffAddBg
           });
           renderedRows.push(...wrapped);
         } else {
           const lineNum = line.newLineNumber ?? line.oldLineNumber ?? "";
           const numStr = String(lineNum).padStart(gutterWidth, " ");
-          const firstPrefix = ` ${source_default.dim(numStr)}  `;
+          const firstPrefix = ` ${c.muted(numStr)}  `;
           const contPrefix = ` ${" ".repeat(gutterWidth)}  `;
           const highlightedLine = highlightCode(line.text, { filePath: request.filePath });
           const wrapped = prefixedBlock(firstPrefix, highlightedLine, {
@@ -122197,19 +122298,15 @@ class FilePermissionDock extends Component {
     return renderedRows;
   }
   render(width) {
-    const theme = getTheme();
     const termWidth = width ?? process.stdout.columns ?? 80;
     const maxCols = Math.max(1, termWidth);
-    const dividerColor = themeColor2(theme.dividerRule);
-    const permColor = themeColor2(theme.permission);
-    const mutedColor = themeColor2(theme.textMuted);
     const { mode, selectedIndex, scrollOffset } = this.state;
     const { request } = this.props;
     const { kind, filePath } = request;
     const pointer = figures.pointerBold ?? "❯";
     const isYesSelected = selectedIndex === 0;
     const isNoSelected = selectedIndex === 1;
-    const divider = dividerColor(figures.horizontalLine.repeat(maxCols));
+    const divider = c.rule(figures.horizontalLine.repeat(maxCols));
     let title = "Edit file";
     let question = `Do you want to make this edit to ${filePath}?`;
     if (kind === "create") {
@@ -122245,12 +122342,12 @@ class FilePermissionDock extends Component {
           /* @__PURE__ */ jsx(Text, {
             wrap: false,
             clip: false,
-            children: source_default.white.bold(`${title} (review)`)
+            children: bold(c.text(`${title} (review)`))
           }),
           /* @__PURE__ */ jsx(Text, {
             wrap: false,
             clip: false,
-            children: `    ${source_default.dim(filePath)}`
+            children: `    ${c.muted(filePath)}`
           }),
           /* @__PURE__ */ jsx(Text, {
             wrap: false,
@@ -122270,7 +122367,7 @@ class FilePermissionDock extends Component {
           /* @__PURE__ */ jsx(Text, {
             wrap: false,
             clip: false,
-            children: mutedColor(source_default.italic("↑/↓ scroll · Esc / f to return"))
+            children: italic(c.muted("↑/↓ scroll · Esc / f to return"))
           })
         ]
       });
@@ -122278,8 +122375,8 @@ class FilePermissionDock extends Component {
     }
     const previewRows = allContentRows.slice(0, 10);
     const hiddenCount = Math.max(0, allContentRows.length - 10);
-    const yesOptionText = isYesSelected ? `${permColor(pointer)} ${permColor.bold("1. Yes")}` : `  ${source_default.white("1. Yes")}`;
-    const noOptionText = isNoSelected ? `${permColor(pointer)} ${permColor.bold("2. No")}` : `  ${source_default.white("2. No")}`;
+    const yesOptionText = isYesSelected ? `${c.permission(pointer)} ${bold(c.permission("1. Yes"))}` : `  ${c.text("1. Yes")}`;
+    const noOptionText = isNoSelected ? `${c.permission(pointer)} ${bold(c.permission("2. No"))}` : `  ${c.text("2. No")}`;
     const element = /* @__PURE__ */ jsxs(Box, {
       direction: "column",
       width: maxCols,
@@ -122299,12 +122396,12 @@ class FilePermissionDock extends Component {
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: source_default.white.bold(title)
+          children: bold(c.text(title))
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: `    ${source_default.dim(filePath)}`
+          children: `    ${c.muted(filePath)}`
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
@@ -122319,7 +122416,7 @@ class FilePermissionDock extends Component {
         hiddenCount > 0 && /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: `    ${source_default.dim(`(+${hiddenCount} hidden)`)}`
+          children: `    ${c.muted(`(+${hiddenCount} hidden)`)}`
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
@@ -122329,7 +122426,7 @@ class FilePermissionDock extends Component {
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: source_default.white(question)
+          children: c.text(question)
         }),
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
@@ -122354,7 +122451,7 @@ class FilePermissionDock extends Component {
         /* @__PURE__ */ jsx(Text, {
           wrap: false,
           clip: false,
-          children: mutedColor(source_default.italic("Esc to cancel · f to review"))
+          children: italic(c.muted("Esc to cancel · f to review"))
         })
       ]
     });
@@ -122493,6 +122590,67 @@ class PermissionQueue {
     }
   }
 }
+
+// src/tui/utils/transcript.ts
+function formatTurnFooter(engine, turnPresentationEnd) {
+  if (!turnPresentationEnd)
+    return;
+  if (turnPresentationEnd.status === "complete") {
+    engine.commit("system", [
+      "",
+      formatTurnStatus(turnPresentationEnd.durationMs, new Date(turnPresentationEnd.finishedAt), turnPresentationEnd.statusVerb)
+    ]);
+    if (turnPresentationEnd.stopReason === "step-limit") {
+      engine.commit("system", formatSystemMessage("Step budget reached. Generation stopped early."));
+    }
+  } else if ((turnPresentationEnd.status === "errored" || turnPresentationEnd.status === "interrupted") && turnPresentationEnd.errorMessage) {
+    const structured = classifyError(new Error(turnPresentationEnd.errorMessage));
+    engine.commit("system", formatErrorBadge(structured));
+  }
+}
+function renderTranscript(engine, sessionData, header) {
+  engine.clearAll();
+  engine.commit("header", header.render());
+  const log = loadSessionLog(sessionData.date, sessionData.id);
+  const projection = log ? buildSessionPresentationProjection(log.events) : null;
+  const items = rehydrateSessionHistory(sessionData, projection);
+  let currentTurnId = undefined;
+  for (const item of items) {
+    if (item.turnId && item.turnId !== currentTurnId) {
+      if (currentTurnId && projection) {
+        const prevTurnPresentation = projection.turns.get(currentTurnId)?.end;
+        formatTurnFooter(engine, prevTurnPresentation);
+      }
+      currentTurnId = item.turnId;
+    }
+    if (item.type === "user") {
+      engine.commitPrompt(item.content);
+    } else if (item.type === "system") {
+      engine.commit("system", formatSystemMessage(item.content));
+    } else if (item.type === "tool" && item.toolData) {
+      const toolData = item.toolData;
+      engine.commit("tool-result", (w) => formatToolStatus({
+        toolName: toolData.toolName,
+        displayName: toolData.displayName,
+        icon: toolData.icon,
+        argsSummary: toolData.argsSummary,
+        status: toolData.status,
+        durationMs: toolData.durationMs,
+        error: toolData.error,
+        toolOutput: toolData.toolOutput,
+        targetWidth: w
+      }), { hangingIndent: 2 });
+    } else if (item.type === "assistant") {
+      engine.commit("assistant-message", formatAssistantMessage(item.content), {
+        hangingIndent: 2
+      });
+    }
+  }
+  if (currentTurnId && projection) {
+    const lastTurnPresentation = projection.turns.get(currentTurnId)?.end;
+    formatTurnFooter(engine, lastTurnPresentation);
+  }
+}
 // src/voice/model.ts
 var VOICE_MODEL_ID = "gemini-3.5-transcribe-live";
 // src/voice/errors.ts
@@ -122591,7 +122749,7 @@ async function defaultCheckParec() {
 }
 async function checkVoicePrerequisites(options = {}) {
   const config = options.config ?? getEnvConfig();
-  const checkRecorder = options.checkParecFn ?? options.checkArecordFn ?? defaultCheckParec;
+  const checkRecorder = options.checkParecFn ?? defaultCheckParec;
   const hasGemini = hasProviderConfig("gemini", config);
   const geminiApiKey = config.geminiApiKey;
   if (!hasGemini || !geminiApiKey) {
@@ -123548,7 +123706,6 @@ class TUIApp {
     });
     this.statusBar = new StatusBar({
       model,
-      usage: this.session.session.totalUsage,
       isBusy: false
     });
     this.voiceController = new VoiceController({
@@ -123832,8 +123989,10 @@ class TUIApp {
       onSelect: (selected) => {
         setActiveTheme(selected.name);
         saveThemeSelection(selected.name);
-        for (const comp of this.engine.components)
-          comp.markDirty();
+        renderTranscript(this.engine, this.session.session, this.header);
+        this.engine.mount(this.streamingView);
+        this.engine.mount(this.promptInput, { keepCursorVisible: true, kind: "input" });
+        this.engine.mount(this.statusBar);
         this.engine.requestFrame(true);
         this.engine.commit("system", formatSystemMessage(`Theme switched to ${selected.label}.`));
         this.closeModal();
@@ -123846,74 +124005,13 @@ class TUIApp {
   }
   switchToSession(selected) {
     this.permissionQueue.clear();
+    recoverPendingCheckpoint(this.cwd, selected.id).catch(() => {});
     this.session.shutdown().catch(() => {});
     this.session = AgentSession.resume(selected);
     const model = this.session.getModel();
     this.header.props.model = model;
-    this.statusBar.update({ model, usage: this.session.session.totalUsage });
-    this.engine.clearAll();
-    this.engine.commit("header", this.header.render());
-    const log = loadSessionLog(selected.date, selected.id);
-    const projection = log ? buildSessionPresentationProjection(log.events) : null;
-    const items = rehydrateSessionHistory(selected, projection);
-    let currentTurnId = undefined;
-    for (const item of items) {
-      if (item.turnId && item.turnId !== currentTurnId) {
-        if (currentTurnId && projection) {
-          const prevTurnPresentation = projection.turns.get(currentTurnId)?.end;
-          if (prevTurnPresentation && prevTurnPresentation.status === "complete") {
-            this.engine.commit("system", [
-              "",
-              formatTurnStatus(prevTurnPresentation.durationMs, new Date(prevTurnPresentation.finishedAt), prevTurnPresentation.statusVerb)
-            ]);
-            if (prevTurnPresentation.stopReason === "step-limit") {
-              this.engine.commit("system", formatSystemMessage("Step budget reached. Generation stopped early."));
-            }
-          } else if (prevTurnPresentation && (prevTurnPresentation.status === "errored" || prevTurnPresentation.status === "interrupted") && prevTurnPresentation.errorMessage) {
-            const structured = classifyError(new Error(prevTurnPresentation.errorMessage));
-            this.engine.commit("system", formatErrorBadge(structured));
-          }
-        }
-        currentTurnId = item.turnId;
-      }
-      if (item.type === "user") {
-        this.engine.commitPrompt(item.content);
-      } else if (item.type === "system") {
-        this.engine.commit("system", formatSystemMessage(item.content));
-      } else if (item.type === "tool" && item.toolData) {
-        const toolData = item.toolData;
-        this.engine.commit("tool-result", (w) => formatToolStatus({
-          toolName: toolData.toolName,
-          displayName: toolData.displayName,
-          icon: toolData.icon,
-          argsSummary: toolData.argsSummary,
-          status: toolData.status,
-          durationMs: toolData.durationMs,
-          error: toolData.error,
-          toolOutput: toolData.toolOutput,
-          targetWidth: w
-        }), { hangingIndent: 2 });
-      } else if (item.type === "assistant") {
-        this.engine.commit("assistant-message", formatAssistantMessage(item.content), {
-          hangingIndent: 2
-        });
-      }
-    }
-    if (currentTurnId && projection) {
-      const lastTurnPresentation = projection.turns.get(currentTurnId)?.end;
-      if (lastTurnPresentation && lastTurnPresentation.status === "complete") {
-        this.engine.commit("system", [
-          "",
-          formatTurnStatus(lastTurnPresentation.durationMs, new Date(lastTurnPresentation.finishedAt), lastTurnPresentation.statusVerb)
-        ]);
-        if (lastTurnPresentation.stopReason === "step-limit") {
-          this.engine.commit("system", formatSystemMessage("Step budget reached. Generation stopped early."));
-        }
-      } else if (lastTurnPresentation && (lastTurnPresentation.status === "errored" || lastTurnPresentation.status === "interrupted") && lastTurnPresentation.errorMessage) {
-        const structured = classifyError(new Error(lastTurnPresentation.errorMessage));
-        this.engine.commit("system", formatErrorBadge(structured));
-      }
-    }
+    this.statusBar.update({ model });
+    renderTranscript(this.engine, selected, this.header);
     this.engine.mount(this.streamingView);
     this.engine.mount(this.promptInput, { keepCursorVisible: true, kind: "input" });
     this.engine.mount(this.statusBar);
@@ -124054,8 +124152,7 @@ class TUIApp {
       const updatedModel = this.session.getModel();
       this.header.props.model = updatedModel;
       this.statusBar.update({
-        model: updatedModel,
-        usage: this.session.session.totalUsage
+        model: updatedModel
       });
       return;
     }
@@ -124111,7 +124208,7 @@ class TUIApp {
               const argsSummary = JSON.stringify(event.toolResult.args);
               const status = event.toolResult.isError ? "failed" : "completed";
               const error = event.toolResult.isError ? typeof event.toolResult.result === "object" && event.toolResult.result !== null ? event.toolResult.result.message ?? JSON.stringify(event.toolResult.result) : String(event.toolResult.result) : undefined;
-              const toolOutput = !event.toolResult.isError && toolDef?.summarize ? toolDef.summarize(event.toolResult.args, event.toolResult.result) : undefined;
+              const summary = summarizeToolResult(toolDef, event.toolResult.args, event.toolResult.result, event.toolResult.isError);
               this.engine.commit("tool-result", (w) => formatToolStatus({
                 toolName,
                 displayName,
@@ -124120,7 +124217,7 @@ class TUIApp {
                 status,
                 durationMs,
                 error,
-                toolOutput,
+                summary,
                 targetWidth: w
               }), { hangingIndent: 2 });
               this.streamingView.setThinking(true);
@@ -124142,9 +124239,6 @@ class TUIApp {
                 "",
                 formatTurnStatus(totalDurationMs, finishedAt, event.summary.statusVerb)
               ]);
-              this.statusBar.update({
-                usage: this.session.session.totalUsage
-              });
               if (event.summary.stopReason === "step-limit") {
                 this.engine.commit("system", formatSystemMessage("Step budget reached. Generation stopped early."));
               }
@@ -124174,9 +124268,6 @@ class TUIApp {
         this.closeModal();
       }
       this.setBusy(false);
-      this.statusBar.update({
-        usage: this.session.session.totalUsage
-      });
     }
   }
   setBusy(busy) {