@h-rig/cli 0.0.6-alpha.76 → 0.0.6-alpha.77

package/dist/bin/rig.js

@@ -1119,6 +1119,125 @@ var init__server_client = __esm(() => {
   ]);
 });
 
+// packages/cli/src/commands/_tui-theme.ts
+function hexToRgb(hex) {
+  const value = hex.replace("#", "");
+  return [
+    Number.parseInt(value.slice(0, 2), 16),
+    Number.parseInt(value.slice(2, 4), 16),
+    Number.parseInt(value.slice(4, 6), 16)
+  ];
+}
+function fg(hex) {
+  const [r, g, b] = hexToRgb(hex);
+  return (text2) => `\x1B[38;2;${r};${g};${b}m${text2}\x1B[39m`;
+}
+function bold(text2) {
+  return `\x1B[1m${text2}\x1B[22m`;
+}
+function statusColor(status) {
+  switch (status) {
+    case "running":
+      return accent;
+    case "preparing":
+    case "created":
+    case "validating":
+    case "reviewing":
+    case "closing-out":
+      return cyan;
+    case "needs-attention":
+    case "needs_attention":
+      return yellow;
+    case "failed":
+      return red;
+    default:
+      return ink3;
+  }
+}
+function droneCharColor(char) {
+  if (char === "$" || char === "@")
+    return accent;
+  if (char === "=" || char === "%")
+    return accentDim;
+  if (char === "\\" || char === "/")
+    return ink3;
+  return ink4;
+}
+function renderDroneFrame(tick) {
+  const blade = BLADE_FRAMES[Math.floor(tick / 4) % BLADE_FRAMES.length];
+  const pulse = Math.sin(tick * 0.07);
+  const eye = pulse > 0.45 ? EYE_FRAMES[0] : pulse > -0.1 ? EYE_FRAMES[1] : EYE_FRAMES[2];
+  return DRONE_ART.map((line) => {
+    let out = "";
+    let index = 0;
+    while (index < line.length) {
+      if (line.startsWith("!!!", index)) {
+        out += cyan(blade);
+        index += 3;
+        continue;
+      }
+      const char = line[index];
+      if (char === "?") {
+        out += bold(cyan(eye));
+      } else if (char !== " ") {
+        out += droneCharColor(char)(char);
+      } else {
+        out += " ";
+      }
+      index += 1;
+    }
+    return out;
+  });
+}
+var RIG_PALETTE, ink, ink2, ink3, ink4, accent, accentDim, cyan, red, yellow, RIG_SPINNER_FRAMES, DRONE_ART, BLADE_FRAMES, EYE_FRAMES, DRONE_WIDTH, DRONE_HEIGHT;
+var init__tui_theme = __esm(() => {
+  RIG_PALETTE = {
+    ink: "#f2f3f6",
+    ink2: "#aeb0ba",
+    ink3: "#6c6e79",
+    ink4: "#44464f",
+    accent: "#ccff4d",
+    accentDim: "#a9d63f",
+    cyan: "#56d8ff",
+    red: "#ff5d5d",
+    yellow: "#ffd24d"
+  };
+  ink = fg(RIG_PALETTE.ink);
+  ink2 = fg(RIG_PALETTE.ink2);
+  ink3 = fg(RIG_PALETTE.ink3);
+  ink4 = fg(RIG_PALETTE.ink4);
+  accent = fg(RIG_PALETTE.accent);
+  accentDim = fg(RIG_PALETTE.accentDim);
+  cyan = fg(RIG_PALETTE.cyan);
+  red = fg(RIG_PALETTE.red);
+  yellow = fg(RIG_PALETTE.yellow);
+  RIG_SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+  DRONE_ART = [
+    "  .-=-.                   .-=-.   ",
+    " ( !!! )                 ( !!! )  ",
+    "  '-=-'._               _.'-=-'   ",
+    "        '._           _.'         ",
+    "           '=$$$$$$$=.'           ",
+    "          =$$$$$$$$$$$=           ",
+    "         $$$@@@@@@@@@@$$$         ",
+    "        $$$@@        @@$$$        ",
+    "        $$@    ?     @$$$         ",
+    "        $$$@   '-'   @$$$         ",
+    "        $$$@@        @@$$$        ",
+    "         $$$@@@@@@@@@@$$$         ",
+    "          =$$$$$$$$$$$=           ",
+    "           '=$$$$$$$=.'           ",
+    "        _.'           '._         ",
+    "  .-=-.'                 '.-=-.   ",
+    " ( !!! )                 ( !!! )  ",
+    "  '-=-'                   '-=-'   "
+  ];
+  BLADE_FRAMES = ["---", "\\\\\\", "|||", "///"];
+  EYE_FRAMES = ["@", "o", "."];
+  DRONE_WIDTH = DRONE_ART[0].length;
+  DRONE_HEIGHT = DRONE_ART.length;
+});
+
 // packages/cli/src/commands/_cli-format.ts
 import { log as log3, note as note3 } from "@clack/prompts";
 import pc3 from "picocolors";
@@ -1148,17 +1267,17 @@ function truncate(value, width) {
 function pad(value, width) {
   return value.length >= width ? value : `${value}${" ".repeat(width - value.length)}`;
 }
-function statusColor(status) {
+function statusColor2(status) {
   const normalized = status.toLowerCase();
-  if (["completed", "merged", "closed", "done", "accepted", "pass", "selected", "approved"].includes(normalized))
-    return pc3.green;
+  if (["completed", "merged", "closed", "done", "accepted", "pass", "selected", "approved", "running"].includes(normalized))
+    return accent;
   if (["failed", "needs_attention", "needs-attention", "blocked", "error", "rejected"].includes(normalized))
-    return pc3.red;
-  if (["running", "reviewing", "validating", "in_progress", "in-progress", "remote"].includes(normalized))
-    return pc3.cyan;
-  if (["ready", "open", "queued", "created", "preparing", "local", "pending"].includes(normalized))
-    return pc3.yellow;
-  return pc3.dim;
+    return red;
+  if (["reviewing", "validating", "in_progress", "in-progress", "remote", "preparing", "closing-out"].includes(normalized))
+    return cyan;
+  if (["ready", "open", "queued", "created", "local", "pending"].includes(normalized))
+    return yellow;
+  return themeDim;
 }
 function compactDate(value) {
   if (!value.trim())
@@ -1214,20 +1333,20 @@ function printFormattedOutput(message2, options = {}) {
 }
 function formatStatusPill(status) {
   const label = status || "unknown";
-  return statusColor(label)(`\u25CF ${label}`);
+  return statusColor2(label)(`\u25CF ${label}`);
 }
 function formatSection(title, subtitle) {
-  return `${pc3.bold(pc3.cyan("\u25C6"))} ${pc3.bold(title)}${subtitle ? pc3.dim(` \u2014 ${subtitle}`) : ""}`;
+  return `${pc3.bold(accent("\u25C6"))} ${pc3.bold(title)}${subtitle ? themeDim(` \u2014 ${subtitle}`) : ""}`;
 }
 function formatSuccessCard(title, rows = []) {
-  const body = rows.filter(([, value]) => value !== undefined && value !== null && String(value).length > 0).map(([key, value]) => `${pc3.dim("\u2502")} ${pc3.dim(key.padEnd(12))} ${value}`);
+  const body = rows.filter(([, value]) => value !== undefined && value !== null && String(value).length > 0).map(([key, value]) => `${themeFaint("\u2502")} ${themeDim(key.padEnd(12))} ${value}`);
   return [formatSection(title), ...body].join(`
 `);
 }
 function formatNextSteps(steps) {
   if (steps.length === 0)
     return [];
-  return [pc3.bold("Next"), ...steps.map((step) => `${pc3.dim("\u203A")} ${step}`)];
+  return [pc3.bold("Next"), ...steps.map((step) => `${accent("\u203A")} ${step}`)];
 }
 function formatTaskList(tasks, options = {}) {
   if (options.raw)
@@ -1249,11 +1368,11 @@ function formatTaskList(tasks, options = {}) {
   const statusWidth = Math.min(16, Math.max(6, ...rows.map((row) => row.status.length)));
   const header = `${pc3.bold(pad("TASK", idWidth))}  ${pc3.bold(pad("STATUS", statusWidth))}  ${pc3.bold("TITLE")}`;
   const body = rows.map((row) => {
-    const labels = row.labels.length > 0 ? pc3.dim(`  ${row.labels.slice(0, 4).map((label) => `#${label}`).join(" ")}`) : "";
-    const source = row.source ? pc3.dim(`  ${row.source}`) : "";
+    const labels = row.labels.length > 0 ? themeDim(`  ${row.labels.slice(0, 4).map((label) => `#${label}`).join(" ")}`) : "";
+    const source = row.source ? themeDim(`  ${row.source}`) : "";
     return [
       pc3.bold(pad(truncate(row.id, idWidth), idWidth)),
-      statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
+      statusColor2(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
       `${row.title}${labels}${source}`
     ].join("  ");
   });
@@ -1298,7 +1417,7 @@ function formatRunList(runs, options = {}) {
   if (runs.length === 0) {
     return [
       formatSection("Runs", "none recorded"),
-      options.source === "server" ? pc3.dim("No runs recorded on the selected Rig server.") : pc3.dim("No runs recorded in .rig/runs."),
+      options.source === "server" ? themeDim("No runs recorded on the selected Rig server.") : themeDim("No runs recorded in .rig/runs."),
       "",
       ...formatNextSteps(["Start one: `rig task run --next`", "Check server: `rig server status`"])
     ].join(`
@@ -1317,8 +1436,8 @@ function formatRunList(runs, options = {}) {
   const header = `${pc3.bold(pad("RUN", idWidth))}  ${pc3.bold(pad("STATUS", statusWidth))}  ${pc3.bold("TITLE")}`;
   const body = rows.map((row) => [
     pc3.bold(pad(truncate(row.runId, idWidth), idWidth)),
-    statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
-    `${row.title}${row.runtime ? pc3.dim(`  ${row.runtime}`) : ""}`
+    statusColor2(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
+    `${row.title}${row.runtime ? themeDim(`  ${row.runtime}`) : ""}`
   ].join("  "));
   return [formatSection("Runs", options.source === "server" ? "selected server" : "local state"), header, ...body, "", ...formatNextSteps(["Follow live: `rig run attach <run-id> --follow`", "Details: `rig run show <run-id>`"])].join(`
 `);
@@ -1392,7 +1511,7 @@ function formatRunStatus(summary, options = {}) {
   const lines = [formatSection("Run status", options.source === "server" ? "selected server" : "local state")];
   lines.push("", pc3.bold(`Active runs (${activeRuns.length})`));
   if (activeRuns.length === 0) {
-    lines.push(pc3.dim("No active runs."));
+    lines.push(themeDim("No active runs."));
   } else {
     for (const run of activeRuns) {
       lines.push(formatRunSummaryLine(run));
@@ -1400,7 +1519,7 @@ function formatRunStatus(summary, options = {}) {
   }
   lines.push("", pc3.bold(`Recent runs (${recentRuns.length})`));
   if (recentRuns.length === 0) {
-    lines.push(pc3.dim("No recent terminal runs."));
+    lines.push(themeDim("No recent terminal runs."));
   } else {
     for (const run of recentRuns.slice(0, 10)) {
       lines.push(formatRunSummaryLine(run));
@@ -1418,14 +1537,14 @@ function formatRunSummaryLine(run) {
   const title = runTitleOf(record);
   const runtime = firstString(record, ["runtimeAdapter", "runtime", "adapter"]);
   const descriptor = [taskId, title].filter(Boolean).join(" \xB7 ");
-  return `${pc3.dim("\u2502")} ${pc3.bold(runId)} ${formatStatusPill(status)} ${descriptor}${runtime ? pc3.dim(`  ${runtime}`) : ""}`;
+  return `${themeFaint("\u2502")} ${pc3.bold(runId)} ${formatStatusPill(status)} ${descriptor}${runtime ? themeDim(`  ${runtime}`) : ""}`;
 }
 function formatInboxList(kind, entries) {
   const title = kind === "approvals" ? "Approval inbox" : "Input inbox";
   if (entries.length === 0) {
     return [
       formatSection(title, "empty"),
-      pc3.dim(kind === "approvals" ? "No pending approvals." : "No pending user-input requests."),
+      themeDim(kind === "approvals" ? "No pending approvals." : "No pending user-input requests."),
       "",
       ...formatNextSteps(["Check runs: `rig run status`", "Start work: `rig task run --next`"])
     ].join(`
@@ -1439,8 +1558,8 @@ function formatInboxList(kind, entries) {
     const requestId = requestIdOf(record);
     const status = firstString(record, ["status", "state"], "pending");
     const prompt = firstString(record, ["prompt", "message", "reason", "title", "summary"], kind === "approvals" ? "Approval requested" : "Input requested");
-    lines.push(`${pc3.dim("\u2502")} ${pc3.bold(requestId)} ${formatStatusPill(status)} ${prompt}`);
-    lines.push(`${pc3.dim("\u2502")} ${pc3.dim("run      ")} ${runId || "(unknown-run)"}${taskId ? pc3.dim(`  task ${taskId}`) : ""}`);
+    lines.push(`${themeFaint("\u2502")} ${pc3.bold(requestId)} ${formatStatusPill(status)} ${prompt}`);
+    lines.push(`${themeFaint("\u2502")} ${themeDim("run      ")} ${runId || "(unknown-run)"}${taskId ? themeDim(`  task ${taskId}`) : ""}`);
   }
   lines.push("", ...formatNextSteps(kind === "approvals" ? ["Resolve: `rig inbox approve --run <run-id> --request <request-id> --decision approve|reject`", "Rejoin: `rig run attach <run-id> --follow`"] : ["Respond: `rig inbox respond --run <run-id> --request <request-id> --answer key=value`", "Rejoin: `rig run attach <run-id> --follow`"]));
   return lines.join(`
@@ -1462,15 +1581,18 @@ function formatConnectionStatus(selected, connections) {
   const target = !connection ? "not configured" : connection.kind === "remote" ? connection.baseUrl : "local";
   return [
     formatSection("Rig server", "selected for this repo"),
-    `${pc3.dim("\u2502")} ${pc3.dim("selected ")} ${pc3.bold(selected)}`,
-    `${pc3.dim("\u2502")} ${pc3.dim("kind     ")} ${formatStatusPill(connection?.kind ?? "unknown")}`,
-    `${pc3.dim("\u2502")} ${pc3.dim("target   ")} ${target ?? "not configured"}`,
+    `${themeFaint("\u2502")} ${themeDim("selected ")} ${pc3.bold(selected)}`,
+    `${themeFaint("\u2502")} ${themeDim("kind     ")} ${formatStatusPill(connection?.kind ?? "unknown")}`,
+    `${themeFaint("\u2502")} ${themeDim("target   ")} ${target ?? "not configured"}`,
     "",
     ...formatNextSteps(["Change: `rig server use <alias|local>`", "List saved servers: `rig server list`"])
   ].join(`
 `);
 }
-var init__cli_format = () => {};
+var themeDim = (value) => ink3(value), themeFaint = (value) => ink4(value);
+var init__cli_format = __esm(() => {
+  init__tui_theme();
+});
 
 // packages/cli/src/commands/_spinner.ts
 function createTtySpinner(input) {
@@ -1920,125 +2042,6 @@ var init__pi_frontend = __esm(() => {
   init__async_ui();
 });
 
-// packages/cli/src/commands/_tui-theme.ts
-function hexToRgb(hex) {
-  const value = hex.replace("#", "");
-  return [
-    Number.parseInt(value.slice(0, 2), 16),
-    Number.parseInt(value.slice(2, 4), 16),
-    Number.parseInt(value.slice(4, 6), 16)
-  ];
-}
-function fg(hex) {
-  const [r, g, b] = hexToRgb(hex);
-  return (text3) => `\x1B[38;2;${r};${g};${b}m${text3}\x1B[39m`;
-}
-function bold(text3) {
-  return `\x1B[1m${text3}\x1B[22m`;
-}
-function statusColor2(status) {
-  switch (status) {
-    case "running":
-      return accent;
-    case "preparing":
-    case "created":
-    case "validating":
-    case "reviewing":
-    case "closing-out":
-      return cyan;
-    case "needs-attention":
-    case "needs_attention":
-      return yellow;
-    case "failed":
-      return red;
-    default:
-      return ink3;
-  }
-}
-function droneCharColor(char) {
-  if (char === "$" || char === "@")
-    return accent;
-  if (char === "=" || char === "%")
-    return accentDim;
-  if (char === "\\" || char === "/")
-    return ink3;
-  return ink4;
-}
-function renderDroneFrame(tick) {
-  const blade = BLADE_FRAMES[Math.floor(tick / 4) % BLADE_FRAMES.length];
-  const pulse = Math.sin(tick * 0.07);
-  const eye = pulse > 0.45 ? EYE_FRAMES[0] : pulse > -0.1 ? EYE_FRAMES[1] : EYE_FRAMES[2];
-  return DRONE_ART.map((line) => {
-    let out = "";
-    let index = 0;
-    while (index < line.length) {
-      if (line.startsWith("!!!", index)) {
-        out += cyan(blade);
-        index += 3;
-        continue;
-      }
-      const char = line[index];
-      if (char === "?") {
-        out += bold(cyan(eye));
-      } else if (char !== " ") {
-        out += droneCharColor(char)(char);
-      } else {
-        out += " ";
-      }
-      index += 1;
-    }
-    return out;
-  });
-}
-var RIG_PALETTE, ink, ink2, ink3, ink4, accent, accentDim, cyan, red, yellow, RIG_SPINNER_FRAMES, DRONE_ART, BLADE_FRAMES, EYE_FRAMES, DRONE_WIDTH, DRONE_HEIGHT;
-var init__tui_theme = __esm(() => {
-  RIG_PALETTE = {
-    ink: "#f2f3f6",
-    ink2: "#aeb0ba",
-    ink3: "#6c6e79",
-    ink4: "#44464f",
-    accent: "#ccff4d",
-    accentDim: "#a9d63f",
-    cyan: "#56d8ff",
-    red: "#ff5d5d",
-    yellow: "#ffd24d"
-  };
-  ink = fg(RIG_PALETTE.ink);
-  ink2 = fg(RIG_PALETTE.ink2);
-  ink3 = fg(RIG_PALETTE.ink3);
-  ink4 = fg(RIG_PALETTE.ink4);
-  accent = fg(RIG_PALETTE.accent);
-  accentDim = fg(RIG_PALETTE.accentDim);
-  cyan = fg(RIG_PALETTE.cyan);
-  red = fg(RIG_PALETTE.red);
-  yellow = fg(RIG_PALETTE.yellow);
-  RIG_SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
-  DRONE_ART = [
-    "  .-=-.                   .-=-.   ",
-    " ( !!! )                 ( !!! )  ",
-    "  '-=-'._               _.'-=-'   ",
-    "        '._           _.'         ",
-    "           '=$$$$$$$=.'           ",
-    "          =$$$$$$$$$$$=           ",
-    "         $$$@@@@@@@@@@$$$         ",
-    "        $$$@@        @@$$$        ",
-    "        $$@    ?     @$$$         ",
-    "        $$$@   '-'   @$$$         ",
-    "        $$$@@        @@$$$        ",
-    "         $$$@@@@@@@@@@$$$         ",
-    "          =$$$$$$$$$$$=           ",
-    "           '=$$$$$$$=.'           ",
-    "        _.'           '._         ",
-    "  .-=-.'                 '.-=-.   ",
-    " ( !!! )                 ( !!! )  ",
-    "  '-=-'                   '-=-'   "
-  ];
-  BLADE_FRAMES = ["---", "\\\\\\", "|||", "///"];
-  EYE_FRAMES = ["@", "o", "."];
-  DRONE_WIDTH = DRONE_ART[0].length;
-  DRONE_HEIGHT = DRONE_ART.length;
-});
-
 // packages/cli/src/commands/_operator-board.ts
 var exports__operator_board = {};
 __export(exports__operator_board, {
@@ -2109,9 +2112,9 @@ class RunsList {
     const lines = visible.map((run, index) => {
       const absolute = start + index;
       const isSelected = absolute === this.selected;
-      const dot = statusColor2(run.status)(isSelected ? "\u25CF" : "\xB7");
+      const dot = statusColor(run.status)(isSelected ? "\u25CF" : "\xB7");
       const id = run.runId.slice(0, 8);
-      const status = statusColor2(run.status)(run.status.padEnd(16));
+      const status = statusColor(run.status)(run.status.padEnd(16));
       const title = truncateToWidth(run.title, Math.max(8, width - 36));
       const row = ` ${dot} ${isSelected ? bold(ink(id)) : ink3(id)}  ${status} ${isSelected ? ink(title) : ink2(title)}`;
       return isSelected ? accent("\u258C") + row : " " + row;

package/dist/src/commands/_cli-format.js

@@ -2,6 +2,66 @@
 // packages/cli/src/commands/_cli-format.ts
 import { log, note } from "@clack/prompts";
 import pc from "picocolors";
+
+// packages/cli/src/commands/_tui-theme.ts
+var RIG_PALETTE = {
+  ink: "#f2f3f6",
+  ink2: "#aeb0ba",
+  ink3: "#6c6e79",
+  ink4: "#44464f",
+  accent: "#ccff4d",
+  accentDim: "#a9d63f",
+  cyan: "#56d8ff",
+  red: "#ff5d5d",
+  yellow: "#ffd24d"
+};
+function hexToRgb(hex) {
+  const value = hex.replace("#", "");
+  return [
+    Number.parseInt(value.slice(0, 2), 16),
+    Number.parseInt(value.slice(2, 4), 16),
+    Number.parseInt(value.slice(4, 6), 16)
+  ];
+}
+function fg(hex) {
+  const [r, g, b] = hexToRgb(hex);
+  return (text) => `\x1B[38;2;${r};${g};${b}m${text}\x1B[39m`;
+}
+var ink = fg(RIG_PALETTE.ink);
+var ink2 = fg(RIG_PALETTE.ink2);
+var ink3 = fg(RIG_PALETTE.ink3);
+var ink4 = fg(RIG_PALETTE.ink4);
+var accent = fg(RIG_PALETTE.accent);
+var accentDim = fg(RIG_PALETTE.accentDim);
+var cyan = fg(RIG_PALETTE.cyan);
+var red = fg(RIG_PALETTE.red);
+var yellow = fg(RIG_PALETTE.yellow);
+var DRONE_ART = [
+  "  .-=-.                   .-=-.   ",
+  " ( !!! )                 ( !!! )  ",
+  "  '-=-'._               _.'-=-'   ",
+  "        '._           _.'         ",
+  "           '=$$$$$$$=.'           ",
+  "          =$$$$$$$$$$$=           ",
+  "         $$$@@@@@@@@@@$$$         ",
+  "        $$$@@        @@$$$        ",
+  "        $$@    ?     @$$$         ",
+  "        $$$@   '-'   @$$$         ",
+  "        $$$@@        @@$$$        ",
+  "         $$$@@@@@@@@@@$$$         ",
+  "          =$$$$$$$$$$$=           ",
+  "           '=$$$$$$$=.'           ",
+  "        _.'           '._         ",
+  "  .-=-.'                 '.-=-.   ",
+  " ( !!! )                 ( !!! )  ",
+  "  '-=-'                   '-=-'   "
+];
+var DRONE_WIDTH = DRONE_ART[0].length;
+var DRONE_HEIGHT = DRONE_ART.length;
+
+// packages/cli/src/commands/_cli-format.ts
+var themeDim = (value) => ink3(value);
+var themeFaint = (value) => ink4(value);
 function stringField(record, key, fallback = "") {
   const value = record[key];
   return typeof value === "string" && value.trim() ? value.trim() : fallback;
@@ -30,15 +90,15 @@ function pad(value, width) {
 }
 function statusColor(status) {
   const normalized = status.toLowerCase();
-  if (["completed", "merged", "closed", "done", "accepted", "pass", "selected", "approved"].includes(normalized))
-    return pc.green;
+  if (["completed", "merged", "closed", "done", "accepted", "pass", "selected", "approved", "running"].includes(normalized))
+    return accent;
   if (["failed", "needs_attention", "needs-attention", "blocked", "error", "rejected"].includes(normalized))
-    return pc.red;
-  if (["running", "reviewing", "validating", "in_progress", "in-progress", "remote"].includes(normalized))
-    return pc.cyan;
-  if (["ready", "open", "queued", "created", "preparing", "local", "pending"].includes(normalized))
-    return pc.yellow;
-  return pc.dim;
+    return red;
+  if (["reviewing", "validating", "in_progress", "in-progress", "remote", "preparing", "closing-out"].includes(normalized))
+    return cyan;
+  if (["ready", "open", "queued", "created", "local", "pending"].includes(normalized))
+    return yellow;
+  return themeDim;
 }
 function compactDate(value) {
   if (!value.trim())
@@ -97,17 +157,17 @@ function formatStatusPill(status) {
   return statusColor(label)(`\u25CF ${label}`);
 }
 function formatSection(title, subtitle) {
-  return `${pc.bold(pc.cyan("\u25C6"))} ${pc.bold(title)}${subtitle ? pc.dim(` \u2014 ${subtitle}`) : ""}`;
+  return `${pc.bold(accent("\u25C6"))} ${pc.bold(title)}${subtitle ? themeDim(` \u2014 ${subtitle}`) : ""}`;
 }
 function formatSuccessCard(title, rows = []) {
-  const body = rows.filter(([, value]) => value !== undefined && value !== null && String(value).length > 0).map(([key, value]) => `${pc.dim("\u2502")} ${pc.dim(key.padEnd(12))} ${value}`);
+  const body = rows.filter(([, value]) => value !== undefined && value !== null && String(value).length > 0).map(([key, value]) => `${themeFaint("\u2502")} ${themeDim(key.padEnd(12))} ${value}`);
   return [formatSection(title), ...body].join(`
 `);
 }
 function formatNextSteps(steps) {
   if (steps.length === 0)
     return [];
-  return [pc.bold("Next"), ...steps.map((step) => `${pc.dim("\u203A")} ${step}`)];
+  return [pc.bold("Next"), ...steps.map((step) => `${accent("\u203A")} ${step}`)];
 }
 function formatTaskList(tasks, options = {}) {
   if (options.raw)
@@ -129,8 +189,8 @@ function formatTaskList(tasks, options = {}) {
   const statusWidth = Math.min(16, Math.max(6, ...rows.map((row) => row.status.length)));
   const header = `${pc.bold(pad("TASK", idWidth))}  ${pc.bold(pad("STATUS", statusWidth))}  ${pc.bold("TITLE")}`;
   const body = rows.map((row) => {
-    const labels = row.labels.length > 0 ? pc.dim(`  ${row.labels.slice(0, 4).map((label) => `#${label}`).join(" ")}`) : "";
-    const source = row.source ? pc.dim(`  ${row.source}`) : "";
+    const labels = row.labels.length > 0 ? themeDim(`  ${row.labels.slice(0, 4).map((label) => `#${label}`).join(" ")}`) : "";
+    const source = row.source ? themeDim(`  ${row.source}`) : "";
     return [
       pc.bold(pad(truncate(row.id, idWidth), idWidth)),
       statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
@@ -178,7 +238,7 @@ function formatRunList(runs, options = {}) {
   if (runs.length === 0) {
     return [
       formatSection("Runs", "none recorded"),
-      options.source === "server" ? pc.dim("No runs recorded on the selected Rig server.") : pc.dim("No runs recorded in .rig/runs."),
+      options.source === "server" ? themeDim("No runs recorded on the selected Rig server.") : themeDim("No runs recorded in .rig/runs."),
       "",
       ...formatNextSteps(["Start one: `rig task run --next`", "Check server: `rig server status`"])
     ].join(`
@@ -198,7 +258,7 @@ function formatRunList(runs, options = {}) {
   const body = rows.map((row) => [
     pc.bold(pad(truncate(row.runId, idWidth), idWidth)),
     statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
-    `${row.title}${row.runtime ? pc.dim(`  ${row.runtime}`) : ""}`
+    `${row.title}${row.runtime ? themeDim(`  ${row.runtime}`) : ""}`
   ].join("  "));
   return [formatSection("Runs", options.source === "server" ? "selected server" : "local state"), header, ...body, "", ...formatNextSteps(["Follow live: `rig run attach <run-id> --follow`", "Details: `rig run show <run-id>`"])].join(`
 `);
@@ -272,7 +332,7 @@ function formatRunStatus(summary, options = {}) {
   const lines = [formatSection("Run status", options.source === "server" ? "selected server" : "local state")];
   lines.push("", pc.bold(`Active runs (${activeRuns.length})`));
   if (activeRuns.length === 0) {
-    lines.push(pc.dim("No active runs."));
+    lines.push(themeDim("No active runs."));
   } else {
     for (const run of activeRuns) {
       lines.push(formatRunSummaryLine(run));
@@ -280,7 +340,7 @@ function formatRunStatus(summary, options = {}) {
   }
   lines.push("", pc.bold(`Recent runs (${recentRuns.length})`));
   if (recentRuns.length === 0) {
-    lines.push(pc.dim("No recent terminal runs."));
+    lines.push(themeDim("No recent terminal runs."));
   } else {
     for (const run of recentRuns.slice(0, 10)) {
       lines.push(formatRunSummaryLine(run));
@@ -298,14 +358,14 @@ function formatRunSummaryLine(run) {
   const title = runTitleOf(record);
   const runtime = firstString(record, ["runtimeAdapter", "runtime", "adapter"]);
   const descriptor = [taskId, title].filter(Boolean).join(" \xB7 ");
-  return `${pc.dim("\u2502")} ${pc.bold(runId)} ${formatStatusPill(status)} ${descriptor}${runtime ? pc.dim(`  ${runtime}`) : ""}`;
+  return `${themeFaint("\u2502")} ${pc.bold(runId)} ${formatStatusPill(status)} ${descriptor}${runtime ? themeDim(`  ${runtime}`) : ""}`;
 }
 function formatInboxList(kind, entries) {
   const title = kind === "approvals" ? "Approval inbox" : "Input inbox";
   if (entries.length === 0) {
     return [
       formatSection(title, "empty"),
-      pc.dim(kind === "approvals" ? "No pending approvals." : "No pending user-input requests."),
+      themeDim(kind === "approvals" ? "No pending approvals." : "No pending user-input requests."),
       "",
       ...formatNextSteps(["Check runs: `rig run status`", "Start work: `rig task run --next`"])
     ].join(`
@@ -319,8 +379,8 @@ function formatInboxList(kind, entries) {
     const requestId = requestIdOf(record);
     const status = firstString(record, ["status", "state"], "pending");
     const prompt = firstString(record, ["prompt", "message", "reason", "title", "summary"], kind === "approvals" ? "Approval requested" : "Input requested");
-    lines.push(`${pc.dim("\u2502")} ${pc.bold(requestId)} ${formatStatusPill(status)} ${prompt}`);
-    lines.push(`${pc.dim("\u2502")} ${pc.dim("run      ")} ${runId || "(unknown-run)"}${taskId ? pc.dim(`  task ${taskId}`) : ""}`);
+    lines.push(`${themeFaint("\u2502")} ${pc.bold(requestId)} ${formatStatusPill(status)} ${prompt}`);
+    lines.push(`${themeFaint("\u2502")} ${themeDim("run      ")} ${runId || "(unknown-run)"}${taskId ? themeDim(`  task ${taskId}`) : ""}`);
   }
   lines.push("", ...formatNextSteps(kind === "approvals" ? ["Resolve: `rig inbox approve --run <run-id> --request <request-id> --decision approve|reject`", "Rejoin: `rig run attach <run-id> --follow`"] : ["Respond: `rig inbox respond --run <run-id> --request <request-id> --answer key=value`", "Rejoin: `rig run attach <run-id> --follow`"]));
   return lines.join(`
@@ -342,9 +402,9 @@ function formatConnectionStatus(selected, connections) {
   const target = !connection ? "not configured" : connection.kind === "remote" ? connection.baseUrl : "local";
   return [
     formatSection("Rig server", "selected for this repo"),
-    `${pc.dim("\u2502")} ${pc.dim("selected ")} ${pc.bold(selected)}`,
-    `${pc.dim("\u2502")} ${pc.dim("kind     ")} ${formatStatusPill(connection?.kind ?? "unknown")}`,
-    `${pc.dim("\u2502")} ${pc.dim("target   ")} ${target ?? "not configured"}`,
+    `${themeFaint("\u2502")} ${themeDim("selected ")} ${pc.bold(selected)}`,
+    `${themeFaint("\u2502")} ${themeDim("kind     ")} ${formatStatusPill(connection?.kind ?? "unknown")}`,
+    `${themeFaint("\u2502")} ${themeDim("target   ")} ${target ?? "not configured"}`,
     "",
     ...formatNextSteps(["Change: `rig server use <alias|local>`", "List saved servers: `rig server list`"])
   ].join(`