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

package/dist/src/app/drone-ui.js

@@ -0,0 +1,294 @@
+// @bun
+// packages/cli/src/app/drone-ui.ts
+import { ProcessTerminal, TUI, Text, Input, SelectList, matchesKey } from "@earendil-works/pi-tui";
+
+// packages/cli/src/app/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);
+function bold(text) {
+  return `\x1B[1m${text}\x1B[22m`;
+}
+var DRONE_ART = [
+  "  .-=-.                   .-=-.   ",
+  " ( !!! )                 ( !!! )  ",
+  "  '-=-'._               _.'-=-'   ",
+  "        '._           _.'         ",
+  "           '=$$$$$$$=.'           ",
+  "          =$$$$$$$$$$$=           ",
+  "         $$$@@@@@@@@@@$$$         ",
+  "        $$$@@        @@$$$        ",
+  "        $$@    ?     @$$$         ",
+  "        $$$@   '-'   @$$$         ",
+  "        $$$@@        @@$$$        ",
+  "         $$$@@@@@@@@@@$$$         ",
+  "          =$$$$$$$$$$$=           ",
+  "           '=$$$$$$$=.'           ",
+  "        _.'           '._         ",
+  "  .-=-.'                 '.-=-.   ",
+  " ( !!! )                 ( !!! )  ",
+  "  '-=-'                   '-=-'   "
+];
+var EYE_FRAMES = ["@", "o", "."];
+var DRONE_WIDTH = DRONE_ART[0].length;
+var DRONE_HEIGHT = DRONE_ART.length;
+var MICRO_BLADES = ["---", "\\\\\\", "|||", "///"];
+function microDroneFrame(tick) {
+  const blade = MICRO_BLADES[tick % MICRO_BLADES.length];
+  const eye = EYE_FRAMES[Math.floor(tick / 2) % EYE_FRAMES.length];
+  return `(${blade})${eye}(${blade})`;
+}
+var MICRO_DRONE_FRAMES = Array.from({ length: 12 }, (_, index) => microDroneFrame(index));
+function renderMicroDroneFrame(tick) {
+  const blade = MICRO_BLADES[tick % MICRO_BLADES.length];
+  const eye = EYE_FRAMES[Math.floor(tick / 2) % EYE_FRAMES.length];
+  return `${ink4("(")}${cyan(blade)}${ink4(")")}${bold(accent(eye))}${ink4("(")}${cyan(blade)}${ink4(")")}`;
+}
+
+// packages/cli/src/commands/_spinner.ts
+var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+function createTtySpinner(input) {
+  const output = input.output ?? process.stdout;
+  const isTty = output.isTTY === true;
+  const frames = input.frames && input.frames.length > 0 ? input.frames : SPINNER_FRAMES;
+  let label = input.label;
+  let frame = 0;
+  let paused = false;
+  let stopped = false;
+  let lastPrintedLabel = "";
+  const render = () => {
+    if (stopped || paused)
+      return;
+    if (!isTty) {
+      if (label !== lastPrintedLabel) {
+        output.write(`${label}
+`);
+        lastPrintedLabel = label;
+      }
+      return;
+    }
+    frame = (frame + 1) % frames.length;
+    const glyph = frames[frame] ?? frames[0] ?? "";
+    output.write(`\r\x1B[2K${input.styleFrame ? input.styleFrame(glyph) : glyph} ${label}`);
+  };
+  const clearLine = () => {
+    if (isTty)
+      output.write("\r\x1B[2K");
+  };
+  render();
+  const timer = isTty ? setInterval(render, input.intervalMs ?? 120) : null;
+  return {
+    setLabel(next) {
+      label = next;
+      render();
+    },
+    pause() {
+      paused = true;
+      clearLine();
+    },
+    resume() {
+      if (stopped)
+        return;
+      paused = false;
+      render();
+    },
+    stop(finalLine) {
+      if (stopped)
+        return;
+      stopped = true;
+      if (timer)
+        clearInterval(timer);
+      clearLine();
+      if (finalLine)
+        output.write(`${finalLine}
+`);
+    }
+  };
+}
+
+// packages/cli/src/app/drone-ui.ts
+var isTty = () => Boolean(process.stdout.isTTY);
+function hairline(width = Math.min(process.stdout.columns ?? 80, 100)) {
+  return ink4("\u2500".repeat(Math.max(10, width)));
+}
+function droneIntro(title, subtitle) {
+  console.log("");
+  console.log(` ${accent("\u258D")}${bold(ink(title))}${subtitle ? ink3(` \u2014 ${subtitle}`) : ""}`);
+  console.log(hairline());
+}
+function droneOutro(text) {
+  console.log(hairline());
+  console.log(` ${accent("\u25C6")} ${ink2(text)}`);
+  console.log("");
+}
+function droneNote(message, title) {
+  if (title)
+    console.log(` ${accentDim("\u25C7")} ${bold(ink2(title))}`);
+  for (const line of message.split(`
+`)) {
+    console.log(` ${ink4("\u2502")} ${line}`);
+  }
+}
+function droneStep(text) {
+  console.log(` ${accent("\u203A")} ${ink(text)}`);
+}
+function droneInfo(text) {
+  console.log(` ${cyan("\xB7")} ${ink2(text)}`);
+}
+function droneWarn(text) {
+  console.log(` ${yellow("\u25B2")} ${ink2(text)}`);
+}
+function droneError(text) {
+  console.log(` ${red("\u2716")} ${ink2(text)}`);
+}
+function droneCancel(text) {
+  console.log(` ${red("\u2716")} ${ink3(text)}`);
+}
+function droneSpinner() {
+  let active = null;
+  return {
+    start(message) {
+      active = createTtySpinner({
+        label: message,
+        frames: MICRO_DRONE_FRAMES,
+        styleFrame: (frame) => renderMicroDroneFrame(Math.max(0, MICRO_DRONE_FRAMES.indexOf(frame)))
+      });
+    },
+    stop(message) {
+      active?.stop(message ? ` ${accent("\u25C6")} ${ink2(message)}` : undefined);
+      active = null;
+    },
+    error(message) {
+      active?.stop(message ? ` ${red("\u2716")} ${ink2(message)}` : undefined);
+      active = null;
+    }
+  };
+}
+var SELECT_THEME = {
+  selectedPrefix: (text) => accent(text),
+  selectedText: (text) => bold(ink(text)),
+  description: (text) => ink3(text),
+  scrollInfo: (text) => ink4(text),
+  noMatch: (text) => ink3(text)
+};
+async function runMiniTui(build) {
+  const terminal = new ProcessTerminal;
+  const tui = new TUI(terminal);
+  let settled = false;
+  return await new Promise((resolve) => {
+    const finish = (result) => {
+      if (settled)
+        return;
+      settled = true;
+      tui.stop();
+      resolve(result);
+    };
+    build(tui, finish);
+    tui.start();
+  });
+}
+async function droneSelect(input) {
+  if (!isTty() || input.options.length === 0) {
+    return input.initialValue ?? input.options[0]?.value ?? null;
+  }
+  return runMiniTui((tui, finish) => {
+    tui.addChild(new Text(` ${accent("\u258D")}${bold(ink(input.message))}`));
+    const items = input.options.map((option) => ({
+      value: option.value,
+      label: option.label,
+      ...option.hint ? { description: option.hint } : {}
+    }));
+    const list = new SelectList(items, Math.min(items.length, 12), SELECT_THEME);
+    const initialIndex = input.initialValue ? items.findIndex((item) => item.value === input.initialValue) : -1;
+    if (initialIndex > 0)
+      list.setSelectedIndex(initialIndex);
+    list.onSelect = (item) => finish(item.value);
+    list.onCancel = () => finish(null);
+    tui.addChild(list);
+    tui.addChild(new Text(ink4(" \u2191\u2193 navigate \xB7 enter select \xB7 esc cancel")));
+    tui.setFocus(list);
+    tui.addInputListener((data) => {
+      if (matchesKey(data, "ctrl+c") || matchesKey(data, "escape")) {
+        finish(null);
+        return { consume: true };
+      }
+      return;
+    });
+  });
+}
+async function droneText(input) {
+  if (!isTty())
+    return input.initialValue ?? null;
+  return runMiniTui((tui, finish) => {
+    tui.addChild(new Text(` ${accent("\u258D")}${bold(ink(input.message))}${input.placeholder ? ink4(`  (${input.placeholder})`) : ""}`));
+    const field = new Input;
+    if (input.initialValue)
+      field.setValue(input.initialValue);
+    field.onSubmit = (value) => finish(value);
+    field.onEscape = () => finish(null);
+    tui.addChild(field);
+    tui.addChild(new Text(ink4(" enter submit \xB7 esc cancel")));
+    tui.setFocus(field);
+    tui.addInputListener((data) => {
+      if (matchesKey(data, "ctrl+c")) {
+        finish(null);
+        return { consume: true };
+      }
+      return;
+    });
+  });
+}
+async function droneConfirm(input) {
+  const answer = await droneSelect({
+    message: input.message,
+    options: [
+      { value: "yes", label: "Yes" },
+      { value: "no", label: "No" }
+    ],
+    initialValue: input.initialValue === false ? "no" : "yes"
+  });
+  return answer === null ? null : answer === "yes";
+}
+export {
+  droneWarn,
+  droneText,
+  droneStep,
+  droneSpinner,
+  droneSelect,
+  droneOutro,
+  droneNote,
+  droneIntro,
+  droneInfo,
+  droneError,
+  droneConfirm,
+  droneCancel
+};

package/dist/src/{commands/_tui-theme.js → app/theme.js}

@@ -1,5 +1,5 @@
 // @bun
-// packages/cli/src/commands/_tui-theme.ts
+// packages/cli/src/app/theme.ts
 var RIG_PALETTE = {
   ink: "#f2f3f6",
   ink2: "#aeb0ba",
@@ -114,11 +114,25 @@ function renderDroneFrame(tick) {
 }
 var DRONE_WIDTH = DRONE_ART[0].length;
 var DRONE_HEIGHT = DRONE_ART.length;
+var MICRO_BLADES = ["---", "\\\\\\", "|||", "///"];
+function microDroneFrame(tick) {
+  const blade = MICRO_BLADES[tick % MICRO_BLADES.length];
+  const eye = EYE_FRAMES[Math.floor(tick / 2) % EYE_FRAMES.length];
+  return `(${blade})${eye}(${blade})`;
+}
+var MICRO_DRONE_FRAMES = Array.from({ length: 12 }, (_, index) => microDroneFrame(index));
+function renderMicroDroneFrame(tick) {
+  const blade = MICRO_BLADES[tick % MICRO_BLADES.length];
+  const eye = EYE_FRAMES[Math.floor(tick / 2) % EYE_FRAMES.length];
+  return `${ink4("(")}${cyan(blade)}${ink4(")")}${bold(accent(eye))}${ink4("(")}${cyan(blade)}${ink4(")")}`;
+}
 export {
   yellow,
   statusColor,
+  renderMicroDroneFrame,
   renderDroneFrame,
   red,
+  microDroneFrame,
   ink4,
   ink3,
   ink2,
@@ -130,6 +144,7 @@ export {
   accent,
   RIG_SPINNER_FRAMES,
   RIG_PALETTE,
+  MICRO_DRONE_FRAMES,
   DRONE_WIDTH,
   DRONE_HEIGHT
 };

package/dist/src/commands/_async-ui.js

@@ -91,8 +91,79 @@ var RESUMABLE_RUN_STATUSES = new Set([
   "needs_attention"
 ]);
 
+// packages/cli/src/app/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);
+function bold(text) {
+  return `\x1B[1m${text}\x1B[22m`;
+}
+var DRONE_ART = [
+  "  .-=-.                   .-=-.   ",
+  " ( !!! )                 ( !!! )  ",
+  "  '-=-'._               _.'-=-'   ",
+  "        '._           _.'         ",
+  "           '=$$$$$$$=.'           ",
+  "          =$$$$$$$$$$$=           ",
+  "         $$$@@@@@@@@@@$$$         ",
+  "        $$$@@        @@$$$        ",
+  "        $$@    ?     @$$$         ",
+  "        $$$@   '-'   @$$$         ",
+  "        $$$@@        @@$$$        ",
+  "         $$$@@@@@@@@@@$$$         ",
+  "          =$$$$$$$$$$$=           ",
+  "           '=$$$$$$$=.'           ",
+  "        _.'           '._         ",
+  "  .-=-.'                 '.-=-.   ",
+  " ( !!! )                 ( !!! )  ",
+  "  '-=-'                   '-=-'   "
+];
+var EYE_FRAMES = ["@", "o", "."];
+var DRONE_WIDTH = DRONE_ART[0].length;
+var DRONE_HEIGHT = DRONE_ART.length;
+var MICRO_BLADES = ["---", "\\\\\\", "|||", "///"];
+function microDroneFrame(tick) {
+  const blade = MICRO_BLADES[tick % MICRO_BLADES.length];
+  const eye = EYE_FRAMES[Math.floor(tick / 2) % EYE_FRAMES.length];
+  return `(${blade})${eye}(${blade})`;
+}
+var MICRO_DRONE_FRAMES = Array.from({ length: 12 }, (_, index) => microDroneFrame(index));
+function renderMicroDroneFrame(tick) {
+  const blade = MICRO_BLADES[tick % MICRO_BLADES.length];
+  const eye = EYE_FRAMES[Math.floor(tick / 2) % EYE_FRAMES.length];
+  return `${ink4("(")}${cyan(blade)}${ink4(")")}${bold(accent(eye))}${ink4("(")}${cyan(blade)}${ink4(")")}`;
+}
+
 // packages/cli/src/commands/_async-ui.ts
-var CLACK_SPINNER_FRAMES = ["\u25D2", "\u25D0", "\u25D3", "\u25D1"];
 var DONE_SYMBOL = pc.green("\u25C7");
 var FAIL_SYMBOL = pc.red("\u25A0");
 var activeUpdate = null;
@@ -126,8 +197,8 @@ async function withSpinner(label, work, options = {}) {
   const spinner = createTtySpinner({
     label,
     output,
-    frames: CLACK_SPINNER_FRAMES,
-    styleFrame: (frame) => pc.magenta(frame)
+    frames: MICRO_DRONE_FRAMES,
+    styleFrame: (frame) => renderMicroDroneFrame(Math.max(0, MICRO_DRONE_FRAMES.indexOf(frame)))
   });
   const update = (next) => {
     lastLabel = next;

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

@@ -1,7 +1,88 @@
 // @bun
+// packages/cli/src/app/drone-ui.ts
+import { ProcessTerminal, TUI, Text, Input, SelectList, matchesKey } from "@earendil-works/pi-tui";
+
+// packages/cli/src/app/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);
+function bold(text) {
+  return `\x1B[1m${text}\x1B[22m`;
+}
+var DRONE_ART = [
+  "  .-=-.                   .-=-.   ",
+  " ( !!! )                 ( !!! )  ",
+  "  '-=-'._               _.'-=-'   ",
+  "        '._           _.'         ",
+  "           '=$$$$$$$=.'           ",
+  "          =$$$$$$$$$$$=           ",
+  "         $$$@@@@@@@@@@$$$         ",
+  "        $$$@@        @@$$$        ",
+  "        $$@    ?     @$$$         ",
+  "        $$$@   '-'   @$$$         ",
+  "        $$$@@        @@$$$        ",
+  "         $$$@@@@@@@@@@$$$         ",
+  "          =$$$$$$$$$$$=           ",
+  "           '=$$$$$$$=.'           ",
+  "        _.'           '._         ",
+  "  .-=-.'                 '.-=-.   ",
+  " ( !!! )                 ( !!! )  ",
+  "  '-=-'                   '-=-'   "
+];
+var EYE_FRAMES = ["@", "o", "."];
+var DRONE_WIDTH = DRONE_ART[0].length;
+var DRONE_HEIGHT = DRONE_ART.length;
+var MICRO_BLADES = ["---", "\\\\\\", "|||", "///"];
+function microDroneFrame(tick) {
+  const blade = MICRO_BLADES[tick % MICRO_BLADES.length];
+  const eye = EYE_FRAMES[Math.floor(tick / 2) % EYE_FRAMES.length];
+  return `(${blade})${eye}(${blade})`;
+}
+var MICRO_DRONE_FRAMES = Array.from({ length: 12 }, (_, index) => microDroneFrame(index));
+
+// packages/cli/src/app/drone-ui.ts
+function droneNote(message, title) {
+  if (title)
+    console.log(` ${accentDim("\u25C7")} ${bold(ink2(title))}`);
+  for (const line of message.split(`
+`)) {
+    console.log(` ${ink4("\u2502")} ${line}`);
+  }
+}
+
 // packages/cli/src/commands/_cli-format.ts
-import { log, note } from "@clack/prompts";
 import pc from "picocolors";
+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 +111,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())
@@ -87,27 +168,24 @@ function printFormattedOutput(message, options = {}) {
     console.log(message);
     return;
   }
-  if (options.title)
-    note(message, options.title);
-  else
-    log.message(message);
+  droneNote(message, options.title);
 }
 function formatStatusPill(status) {
   const label = status || "unknown";
   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 +207,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 +256,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 +276,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 +350,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 +358,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 +376,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 +397,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 +420,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(`

package/dist/src/commands/_doctor-checks.js

@@ -311,7 +311,9 @@ ${failure.contextLine}`, 1, { hint: failure.hint });
   })() : null;
   if (!response.ok) {
     const diagnostics = diagnosticMessage(payload);
-    const detail = diagnostics ?? (text || response.statusText);
+    const rawDetail = diagnostics ?? (text || response.statusText);
+    const detail = diagnostics ? rawDetail : rawDetail.split(`
+`).map((line) => line.trim()).find((line) => line.length > 0)?.slice(0, 200) ?? response.statusText;
     const failure = await buildServerFailureContext(context.projectRoot, server);
     throw new CliError(`Rig server request failed (${response.status}): ${detail}
 ${failure.contextLine}`, 1, { hint: failure.hint });