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

package/dist/src/commands/task.js

@@ -1,9 +1,221 @@
 // @bun
 // packages/cli/src/commands/task.ts
-import { readFileSync as readFileSync3 } from "fs";
+import { readFileSync as readFileSync4 } from "fs";
 import { spawnSync } from "child_process";
 import { resolve as resolve3 } from "path";
-import { cancel as cancel2, confirm, isCancel as isCancel2 } 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));
+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 droneNote(message, title) {
+  if (title)
+    console.log(` ${accentDim("\u25C7")} ${bold(ink2(title))}`);
+  for (const line of message.split(`
+`)) {
+    console.log(` ${ink4("\u2502")} ${line}`);
+  }
+}
+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;
+    });
+  });
+}
+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";
+}
 
 // packages/cli/src/runner.ts
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
@@ -413,7 +625,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 });
@@ -786,9 +1000,6 @@ function withMutedConsole(mute, fn) {
   }
 }
 
-// packages/cli/src/commands/_task-picker.ts
-import { cancel, isCancel, select } from "@clack/prompts";
-
 // packages/cli/src/commands/_operator-surface.ts
 import { createInterface } from "readline";
 import { createInterface as createPromptInterface } from "readline/promises";
@@ -1011,8 +1222,8 @@ async function selectTaskWithTextPicker(tasks, io = {}) {
     return null;
   if (tasks.length === 1)
     return tasks[0];
-  const isTty = io.isTty ?? Boolean(process.stdin.isTTY && process.stdout.isTTY);
-  if (!isTty) {
+  const isTty2 = io.isTty ?? Boolean(process.stdin.isTTY && process.stdout.isTTY);
+  if (!isTty2) {
     throw new Error("task run requires an interactive terminal to pick a task; pass --task <id>, --next, or --detach with a task id.");
   }
   if (io.prompt || io.renderer) {
@@ -1036,12 +1247,12 @@ async function selectTaskWithTextPicker(tasks, io = {}) {
     label: `${taskId2(task)} \xB7 ${typeof task.title === "string" && task.title.trim() ? task.title.trim() : "Untitled task"}`,
     hint: typeof task.status === "string" && task.status.trim() ? task.status.trim() : undefined
   }));
-  const answer = await select({
+  const answer = await droneSelect({
     message: "Select Rig task",
     options
   });
-  if (isCancel(answer)) {
-    cancel("No task selected.");
+  if (answer === null) {
+    droneCancel("No task selected.");
     return null;
   }
   const index = Number.parseInt(String(answer), 10);
@@ -1050,70 +1261,6 @@ async function selectTaskWithTextPicker(tasks, io = {}) {
 
 // packages/cli/src/commands/_async-ui.ts
 import pc from "picocolors";
-
-// 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/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;
@@ -1127,9 +1274,9 @@ async function withSpinner(label, work, options = {}) {
     return work(outer);
   }
   const output = options.output ?? process.stderr;
-  const isTty = output.isTTY === true;
+  const isTty2 = output.isTTY === true;
   let lastLabel = label;
-  if (!isTty) {
+  if (!isTty2) {
     output.write(`${label}
 `);
     const update2 = (next) => {
@@ -1147,8 +1294,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;
@@ -1170,8 +1317,8 @@ async function withSpinner(label, work, options = {}) {
 }
 
 // packages/cli/src/commands/_pi-frontend.ts
-import { mkdtempSync, rmSync, writeFileSync as writeFileSync2 } from "fs";
-import { tmpdir } from "os";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, mkdtempSync, readFileSync as readFileSync3, rmSync, writeFileSync as writeFileSync2 } from "fs";
+import { homedir as homedir2, tmpdir } from "os";
 import { join } from "path";
 import { main as runPiMain } from "@earendil-works/pi-coding-agent";
 import createPiRigExtension from "@rig/pi-rig";
@@ -1194,6 +1341,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,
@@ -1203,6 +1351,10 @@ function buildOperatorPiEnv(input) {
 }
 async function prepareOperatorConsole(context, runId, tempSessionDir) {
   const server = await ensureServerForCli(context.projectRoot);
+  const localCwd = join(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`);
@@ -1216,7 +1368,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;
@@ -1228,6 +1380,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 = join(homedir2(), ".pi", "agent");
+    mkdirSync2(agentDir, { recursive: true });
+    const trustPath = join(agentDir, "trust.json");
+    const store = existsSync3(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 = join(homedir2(), ".pi", "agent", "themes");
+    mkdirSync2(themesDir, { recursive: true });
+    const themePath = join(themesDir, "rig.json");
+    const next = `${JSON.stringify(RIG_PI_THEME, null, "\t")}
+`;
+    if (!existsSync3(themePath) || readFileSync3(themePath, "utf8") !== next) {
+      writeFileSync2(themePath, next);
+    }
+  } catch {}
+}
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join(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 });
@@ -1365,66 +1616,7 @@ async function attachRunOperatorView(context, input) {
 }
 
 // packages/cli/src/commands/_cli-format.ts
-import { log, note } from "@clack/prompts";
 import pc2 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 = "") {
@@ -1484,10 +1676,7 @@ function printFormattedOutput(message2, options = {}) {
     console.log(message2);
     return;
   }
-  if (options.title)
-    note(message2, options.title);
-  else
-    log.message(message2);
+  droneNote(message2, options.title);
 }
 function formatStatusPill(status) {
   const label = status || "unknown";
@@ -1632,7 +1821,6 @@ async function printPendingInboxFooter(context) {
 }
 
 // packages/cli/src/commands/_help-catalog.ts
-import { intro, log as log2, note as note2, outro } from "@clack/prompts";
 import pc3 from "picocolors";
 var TOP_LEVEL_SECTIONS = [
   {
@@ -1935,25 +2123,6 @@ var ALL_GROUPS = [...PRIMARY_GROUPS, ...ADVANCED_GROUPS];
 function heading(title) {
   return pc3.bold(pc3.cyan(title));
 }
-function renderRigBanner(version) {
-  const m = (s) => pc3.bold(pc3.magenta(s));
-  const c = (s) => pc3.bold(pc3.cyan(s));
-  const y = (s) => pc3.yellow(s);
-  const d = (s) => pc3.dim(s);
-  const lines = [
-    m("    \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 ") + d("  \u2591\u2592\u2593\u2588 "),
-    m("    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D ") + d("\u2593\u2592\u2591"),
-    c("    \u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2588\u2557") + d("    \u2591\u2592"),
-    c("    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551") + d(" \u2588\u2593\u2591"),
-    y("    \u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2551\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D") + d("   \u2592\u2591"),
-    y("    \u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D "),
-    "",
-    `    ${c("\u25E2\u25E4")} ${pc3.bold("the control rig for autonomous coding agents")} ${m("//")} ${d("you are the operator")}`,
-    version ? `    ${d(`v${version} \xB7 jack in: rig task run --next`)}` : `    ${d("jack in: rig task run --next")}`
-  ];
-  return lines.join(`
-`);
-}
 function commandLine(command, description) {
   const commandColumn = command.length >= 38 ? `${command}  ` : command.padEnd(38);
   return `${pc3.dim("\u2502")} ${pc3.bold(commandColumn)} ${description}`;
@@ -2007,67 +2176,8 @@ function renderGroupHelp(groupName) {
   const group = ALL_GROUPS.find((candidate) => candidate.name === groupName);
   return group ? renderGroup(group) : null;
 }
-function shouldUseClackOutput2() {
-  return Boolean(process.stdout.isTTY) && process.env.RIG_CLI_PLAIN_HELP !== "1";
-}
-function printTopLevelHelp(state = {}) {
-  if (!shouldUseClackOutput2()) {
-    console.log(renderTopLevelHelp());
-    return;
-  }
-  console.log(renderRigBanner(state.version));
-  console.log("");
-  if (state.projectInitialized === false) {
-    intro("no rig project in this directory");
-    note2([
-      commandLine("rig init", "Set this repo up: config, GitHub auth, task source, server, Pi."),
-      commandLine("rig init --yes", "Same, non-interactive, sensible defaults."),
-      commandLine("rig doctor", "Already initialized somewhere else? Check the wiring.")
-    ].join(`
-`), "Get started");
-    outro("After init: rig task run --next puts an agent on your next task.");
-    return;
-  }
-  intro(state.selectedServer ? `server: ${state.selectedServer}` : "rig");
-  for (const section of TOP_LEVEL_SECTIONS) {
-    note2(renderCommandBlock(section.commands), `${section.title} \u2014 ${section.subtitle}`);
-  }
-  log2.info("More: rig help --advanced \xB7 rig <group> --help \xB7 rig --version");
-  note2([
-    commandLine("--project <path>", "Use a project root instead of auto-discovery."),
-    commandLine("--json", "Emit structured output for scripts/agents."),
-    commandLine("--dry-run", "Print the command plan without mutating state.")
-  ].join(`
-`), "Global options");
-  outro("init \u2192 task run \u2192 attach (Pi console: watch + steer live) \u2192 inbox \u2192 merged.");
-}
 function printGroupHelpDocument(groupName) {
-  const rendered = renderGroupHelp(groupName) ?? renderTopLevelHelp();
-  if (!shouldUseClackOutput2()) {
-    console.log(rendered);
-    return;
-  }
-  const group = ALL_GROUPS.find((candidate) => candidate.name === groupName);
-  if (!group) {
-    printTopLevelHelp();
-    return;
-  }
-  intro(`rig ${group.name}`);
-  note2(group.summary, "Purpose");
-  note2(group.usage.join(`
-`), "Usage");
-  note2(group.commands.map((entry) => commandLine(entry.command, entry.description)).join(`
-`), "Commands");
-  if (group.examples?.length)
-    note2(group.examples.map((line) => `$ ${line}`).join(`
-`), "Examples");
-  if (group.next?.length)
-    note2(group.next.map((line) => `\u203A ${line}`).join(`
-`), "Next steps");
-  if (group.advanced?.length)
-    log2.info(group.advanced.join(`
-`));
-  outro("Run with --json when scripts need structured output.");
+  console.log(renderGroupHelp(groupName) ?? renderTopLevelHelp());
 }
 
 // packages/cli/src/commands/task.ts
@@ -2173,12 +2283,12 @@ async function resolveDirtyBaselineForTaskRun(context, explicit) {
   if (explicit)
     return { mode: explicit, state };
   if (context.outputMode === "text" && process.stdin.isTTY && process.stdout.isTTY) {
-    const answer = await confirm({
+    const answer = await droneConfirm({
       message: "Include current uncommitted changes in run baseline?",
       initialValue: false
     });
-    if (isCancel2(answer)) {
-      cancel2("Run cancelled.");
+    if (answer === null) {
+      droneCancel("Run cancelled.");
       throw new CliError("Run cancelled by user.", 1);
     }
     return { mode: answer ? "dirty-snapshot" : "head", state };
@@ -2333,7 +2443,7 @@ async function executeTask(context, args, options) {
       const fileFlag = takeOption(rest.slice(1), "--file");
       let content;
       if (fileFlag.value) {
-        content = readFileSync3(resolve3(context.projectRoot, fileFlag.value), "utf-8");
+        content = readFileSync4(resolve3(context.projectRoot, fileFlag.value), "utf-8");
       } else {
         content = await readStdin();
       }
@@ -2557,5 +2667,6 @@ async function executeTask(context, args, options) {
   }
 }
 export {
+  loadTaskRunProjectDefaults,
   executeTask
 };