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

package/dist/src/commands/run.js

@@ -382,7 +382,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 });
@@ -807,8 +809,8 @@ function createOperatorSurface(options = {}) {
 }
 
 // packages/cli/src/commands/_pi-frontend.ts
-import { mkdtempSync, rmSync, writeFileSync as writeFileSync2 } from "fs";
-import { tmpdir } from "os";
+import { existsSync as existsSync4, mkdirSync as mkdirSync2, mkdtempSync, readFileSync as readFileSync3, rmSync, writeFileSync as writeFileSync2 } from "fs";
+import { homedir as homedir2, tmpdir } from "os";
 import { join as join2 } from "path";
 import { main as runPiMain } from "@earendil-works/pi-coding-agent";
 import createPiRigExtension from "@rig/pi-rig";
@@ -877,8 +879,79 @@ function createTtySpinner(input) {
   };
 }
 
+// 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 (text2) => `\x1B[38;2;${r};${g};${b}m${text2}\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(text2) {
+  return `\x1B[1m${text2}\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;
@@ -912,8 +985,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;
@@ -954,6 +1027,7 @@ function buildOperatorPiEnv(input) {
   return {
     PI_CODING_AGENT_SESSION_DIR: input.sessionDir,
     PI_SKIP_VERSION_CHECK: "1",
+    PI_HIDDEN_COMMANDS: "import,fork,clone,tree,new,resume,trust",
     RIG_PI_OPERATOR_SESSION: "1",
     RIG_RUN_ID: input.runId,
     RIG_SERVER_URL: input.serverUrl,
@@ -963,6 +1037,10 @@ function buildOperatorPiEnv(input) {
 }
 async function prepareOperatorConsole(context, runId, tempSessionDir) {
   const server = await ensureServerForCli(context.projectRoot);
+  const localCwd = join2(homedir2(), ".rig", "drones", runId.slice(0, 8));
+  mkdirSync2(localCwd, { recursive: true });
+  trustDroneCwd(localCwd);
+  installRigPiTheme();
   let sessionFileArg = [];
   try {
     const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}/session-file`);
@@ -976,7 +1054,7 @@ async function prepareOperatorConsole(context, runId, tempSessionDir) {
         try {
           const header = JSON.parse(line);
           if (header.type === "session" && typeof header.cwd === "string") {
-            return JSON.stringify({ ...header, cwd: process.cwd() });
+            return JSON.stringify({ ...header, cwd: localCwd });
           }
         } catch {}
         return line;
@@ -988,6 +1066,105 @@ async function prepareOperatorConsole(context, runId, tempSessionDir) {
   } catch {}
   return { server, sessionFileArg };
 }
+var RIG_PI_THEME = {
+  $schema: "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  name: "rig",
+  vars: {
+    acid: "#ccff4d",
+    acidDim: "#a9d63f",
+    cyan: "#56d8ff",
+    red: "#ff5d5d",
+    yellow: "#ffd24d",
+    ink: "#f2f3f6",
+    ink2: "#aeb0ba",
+    ink3: "#6c6e79",
+    ink4: "#44464f",
+    panel: "#101115",
+    panelUser: "#14161b",
+    toolPending: "#0e1013",
+    toolSuccess: "#10150c",
+    toolError: "#1a0f0f",
+    customMsg: "#0f1410"
+  },
+  colors: {
+    accent: "acid",
+    border: "ink4",
+    borderAccent: "acid",
+    borderMuted: "ink4",
+    success: "acid",
+    error: "red",
+    warning: "yellow",
+    muted: "ink3",
+    dim: "ink4",
+    text: "ink",
+    thinkingText: "ink3",
+    selectedBg: "panel",
+    userMessageBg: "panelUser",
+    userMessageText: "ink",
+    customMessageBg: "customMsg",
+    customMessageText: "ink2",
+    customMessageLabel: "acidDim",
+    toolPendingBg: "toolPending",
+    toolSuccessBg: "toolSuccess",
+    toolErrorBg: "toolError",
+    toolTitle: "ink",
+    toolOutput: "ink3",
+    mdHeading: "acid",
+    mdLink: "cyan",
+    mdLinkUrl: "ink4",
+    mdCode: "acidDim",
+    mdCodeBlock: "ink2",
+    mdCodeBlockBorder: "ink4",
+    mdQuote: "ink3",
+    mdQuoteBorder: "ink4",
+    mdHr: "ink4",
+    mdListBullet: "acid",
+    toolDiffAdded: "acid",
+    toolDiffRemoved: "red",
+    toolDiffContext: "ink3",
+    syntaxComment: "ink3",
+    syntaxKeyword: "cyan",
+    syntaxFunction: "acid",
+    syntaxVariable: "ink",
+    syntaxString: "acidDim",
+    syntaxNumber: "yellow",
+    syntaxType: "cyan",
+    syntaxOperator: "ink2",
+    syntaxPunctuation: "ink3",
+    thinkingOff: "ink4",
+    thinkingMinimal: "ink3",
+    thinkingLow: "ink2",
+    thinkingMedium: "cyan",
+    thinkingHigh: "acidDim",
+    thinkingXhigh: "acid",
+    bashMode: "cyan"
+  }
+};
+function trustDroneCwd(localCwd) {
+  try {
+    const agentDir = join2(homedir2(), ".pi", "agent");
+    mkdirSync2(agentDir, { recursive: true });
+    const trustPath = join2(agentDir, "trust.json");
+    const store = existsSync4(trustPath) ? JSON.parse(readFileSync3(trustPath, "utf8")) : {};
+    if (store[localCwd] !== true) {
+      store[localCwd] = true;
+      writeFileSync2(trustPath, `${JSON.stringify(store, null, "\t")}
+`);
+    }
+  } catch {}
+}
+function installRigPiTheme() {
+  try {
+    const themesDir = join2(homedir2(), ".pi", "agent", "themes");
+    mkdirSync2(themesDir, { recursive: true });
+    const themePath = join2(themesDir, "rig.json");
+    const next = `${JSON.stringify(RIG_PI_THEME, null, "\t")}
+`;
+    if (!existsSync4(themePath) || readFileSync3(themePath, "utf8") !== next) {
+      writeFileSync2(themePath, next);
+    }
+  } catch {}
+}
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join2(tmpdir(), "rig-pi-frontend-sessions-"));
   const { server, sessionFileArg } = await withSpinner(`Opening Pi console for run ${input.runId}\u2026`, () => prepareOperatorConsole(context, input.runId, tempSessionDir), { outputMode: context.outputMode });
@@ -1124,9 +1301,21 @@ async function attachRunOperatorView(context, input) {
   return { ...snapshot, steered, detached };
 }
 
+// packages/cli/src/app/drone-ui.ts
+import { ProcessTerminal, TUI, Text, Input, SelectList, matchesKey } from "@earendil-works/pi-tui";
+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 pc2 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;
@@ -1147,15 +1336,15 @@ function pad(value, width) {
 }
 function statusColor(status) {
   const normalized = status.toLowerCase();
-  if (["completed", "merged", "closed", "done", "accepted", "pass", "selected", "approved"].includes(normalized))
-    return pc2.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 pc2.red;
-  if (["running", "reviewing", "validating", "in_progress", "in-progress", "remote"].includes(normalized))
-    return pc2.cyan;
-  if (["ready", "open", "queued", "created", "preparing", "local", "pending"].includes(normalized))
-    return pc2.yellow;
-  return pc2.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())
@@ -1190,33 +1379,30 @@ 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 `${pc2.bold(pc2.cyan("\u25C6"))} ${pc2.bold(title)}${subtitle ? pc2.dim(` \u2014 ${subtitle}`) : ""}`;
+  return `${pc2.bold(accent("\u25C6"))} ${pc2.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]) => `${pc2.dim("\u2502")} ${pc2.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 [pc2.bold("Next"), ...steps.map((step) => `${pc2.dim("\u203A")} ${step}`)];
+  return [pc2.bold("Next"), ...steps.map((step) => `${accent("\u203A")} ${step}`)];
 }
 function formatRunList(runs, options = {}) {
   if (runs.length === 0) {
     return [
       formatSection("Runs", "none recorded"),
-      options.source === "server" ? pc2.dim("No runs recorded on the selected Rig server.") : pc2.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(`
@@ -1236,7 +1422,7 @@ function formatRunList(runs, options = {}) {
   const body = rows.map((row) => [
     pc2.bold(pad(truncate(row.runId, idWidth), idWidth)),
     statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
-    `${row.title}${row.runtime ? pc2.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(`
 `);
@@ -1289,7 +1475,7 @@ function formatRunStatus(summary, options = {}) {
   const lines = [formatSection("Run status", options.source === "server" ? "selected server" : "local state")];
   lines.push("", pc2.bold(`Active runs (${activeRuns.length})`));
   if (activeRuns.length === 0) {
-    lines.push(pc2.dim("No active runs."));
+    lines.push(themeDim("No active runs."));
   } else {
     for (const run of activeRuns) {
       lines.push(formatRunSummaryLine(run));
@@ -1297,7 +1483,7 @@ function formatRunStatus(summary, options = {}) {
   }
   lines.push("", pc2.bold(`Recent runs (${recentRuns.length})`));
   if (recentRuns.length === 0) {
-    lines.push(pc2.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));
@@ -1315,7 +1501,7 @@ function formatRunSummaryLine(run) {
   const title = runTitleOf(record);
   const runtime = firstString(record, ["runtimeAdapter", "runtime", "adapter"]);
   const descriptor = [taskId, title].filter(Boolean).join(" \xB7 ");
-  return `${pc2.dim("\u2502")} ${pc2.bold(runId)} ${formatStatusPill(status)} ${descriptor}${runtime ? pc2.dim(`  ${runtime}`) : ""}`;
+  return `${themeFaint("\u2502")} ${pc2.bold(runId)} ${formatStatusPill(status)} ${descriptor}${runtime ? themeDim(`  ${runtime}`) : ""}`;
 }
 
 // packages/cli/src/commands/inbox.ts

package/dist/src/commands/server.js

@@ -69,8 +69,133 @@ function normalizeRuntimeAdapter(value) {
   return "claude-code";
 }
 
-// packages/cli/src/commands/connect.ts
-import { cancel, isCancel, select } from "@clack/prompts";
+// 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
+var isTty = () => Boolean(process.stdout.isTTY);
+function droneCancel(text) {
+  console.log(` ${red("\u2716")} ${ink3(text)}`);
+}
+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;
+    });
+  });
+}
 
 // packages/cli/src/commands/_connection-state.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
@@ -182,8 +307,9 @@ function writeRepoServerProjectRoot(projectRoot, serverProjectRoot) {
 }
 
 // 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 truncate(value, width) {
   if (value.length <= width)
     return value;
@@ -196,32 +322,32 @@ 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 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 formatConnectionList(connections) {
   const rows = [["local", { kind: "local", mode: "auto" }], ...Object.entries(connections)];
@@ -239,9 +365,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(`
@@ -286,13 +412,13 @@ async function promptForConnectionAlias(context) {
       hint: connection.kind === "remote" ? connection.baseUrl : "local"
     }))
   ].filter((option, index, all) => all.findIndex((candidate) => candidate.value === option.value) === index);
-  const answer = await select({
+  const answer = await droneSelect({
     message: "Select Rig server for this repo",
     initialValue: repo?.selected ?? "local",
     options
   });
-  if (isCancel(answer)) {
-    cancel("No server selected.");
+  if (answer === null) {
+    droneCancel("No server selected.");
     throw new CliError("No server selected.", 3);
   }
   return String(answer);
@@ -546,7 +672,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 });