@h-rig/cli 0.0.6-alpha.19 → 0.0.6-alpha.20

package/dist/bin/rig.js

@@ -2990,7 +2990,8 @@ async function submitTaskRunViaServer(context, input) {
 import { existsSync as existsSync6, readFileSync as readFileSync4, rmSync as rmSync3 } from "fs";
 import { homedir as homedir3 } from "os";
 import { resolve as resolve10 } from "path";
-var PI_RIG_PACKAGE_NAME = "@rig/pi-rig";
+var PI_RIG_PACKAGE_NAME = "@h-rig/pi-rig";
+var LEGACY_PI_RIG_PACKAGE_NAME = "@rig/pi-rig";
 var LEGACY_PI_RIG_MARKER = `// Managed by Rig. Source package: @rig/pi-rig.
 export { default } from '@rig/pi-rig';
 `;
@@ -3018,7 +3019,7 @@ function resolvePiHomeDir(inputHomeDir) {
 function piListContainsPiRig(output) {
   return output.split(/\r?\n/).some((line) => {
     const normalized = line.trim();
-    return normalized.includes(PI_RIG_PACKAGE_NAME) || /(?:^|[\\/])packages[\\/]pi-rig(?:$|\s)/.test(normalized);
+    return normalized.includes(PI_RIG_PACKAGE_NAME) || normalized.includes(LEGACY_PI_RIG_PACKAGE_NAME) || /(?:^|[\\/])packages[\\/]pi-rig(?:$|\s)/.test(normalized);
   });
 }
 async function safeRun(runner, command, options) {
@@ -3134,7 +3135,7 @@ async function ensureRemotePiRigInstalled(input) {
   const payload = await input.requestJson("/api/pi-rig/install", {
     method: "POST",
     headers: { "content-type": "application/json" },
-    body: JSON.stringify({ package: "@rig/pi-rig", scope: "global" })
+    body: JSON.stringify({ package: PI_RIG_PACKAGE_NAME, scope: "global" })
   });
   const record = payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
   const piOk = record.piOk === true || record.ok === true;
@@ -6676,6 +6677,193 @@ async function attachRunOperatorView(context, input) {
   return { ...snapshot, steered, detached };
 }
 
+// packages/cli/src/commands/_cli-format.ts
+import pc3 from "picocolors";
+function stringField(record, key, fallback = "") {
+  const value = record[key];
+  return typeof value === "string" && value.trim() ? value.trim() : fallback;
+}
+function arrayField(record, key) {
+  const value = record[key];
+  return Array.isArray(value) ? value.flatMap((entry) => typeof entry === "string" && entry.trim() ? [entry.trim()] : []) : [];
+}
+function rawObject(record) {
+  const raw = record.raw;
+  return raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
+}
+function truncate(value, width) {
+  if (value.length <= width)
+    return value;
+  if (width <= 1)
+    return "\u2026";
+  return `${value.slice(0, width - 1)}\u2026`;
+}
+function pad(value, width) {
+  return value.length >= width ? value : `${value}${" ".repeat(width - value.length)}`;
+}
+function statusColor(status) {
+  const normalized = status.toLowerCase();
+  if (["completed", "merged", "closed", "done", "accepted"].includes(normalized))
+    return pc3.green;
+  if (["failed", "needs_attention", "needs-attention", "blocked"].includes(normalized))
+    return pc3.red;
+  if (["running", "reviewing", "validating", "in_progress", "in-progress"].includes(normalized))
+    return pc3.cyan;
+  if (["ready", "open", "queued", "created", "preparing"].includes(normalized))
+    return pc3.yellow;
+  return pc3.dim;
+}
+function formatTaskList(tasks, options = {}) {
+  if (tasks.length === 0)
+    return pc3.dim("No matching tasks.");
+  if (options.raw)
+    return tasks.map((task) => JSON.stringify(task)).join(`
+`);
+  const rows = tasks.map((task) => {
+    const raw = rawObject(task);
+    const id = stringField(task, "id", "<unknown>");
+    const status = stringField(task, "status", "unknown");
+    const title = stringField(task, "title", "Untitled task");
+    const source = stringField(task, "source", stringField(raw, "source", ""));
+    const labels = arrayField(task, "labels").length > 0 ? arrayField(task, "labels") : arrayField(raw, "labels");
+    return { id, status, title, source, labels };
+  });
+  const idWidth = Math.min(18, Math.max(4, ...rows.map((row) => row.id.length)));
+  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}`) : "";
+    return [
+      pc3.bold(pad(truncate(row.id, idWidth), idWidth)),
+      statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
+      `${row.title}${labels}${source}`
+    ].join("  ");
+  });
+  return [pc3.bold("Rig tasks"), header, ...body].join(`
+`);
+}
+function formatRunList(runs, options = {}) {
+  if (runs.length === 0) {
+    return pc3.dim(options.source === "server" ? "No runs recorded on the selected Rig server." : "No runs recorded in .rig/runs.");
+  }
+  const rows = runs.map((run) => {
+    const runId = stringField(run, "runId", stringField(run, "id", "(unknown-run)"));
+    const status = stringField(run, "status", "unknown");
+    const taskId2 = stringField(run, "taskId", "");
+    const title = stringField(run, "title", taskId2 || "(untitled)");
+    const runtime = stringField(run, "runtimeAdapter", "");
+    return { runId, status, title, runtime };
+  });
+  const idWidth = Math.min(36, Math.max(6, ...rows.map((row) => row.runId.length)));
+  const statusWidth = Math.min(16, Math.max(6, ...rows.map((row) => row.status.length)));
+  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}`) : ""}`
+  ].join("  "));
+  return [pc3.bold(options.source === "server" ? "Rig runs (server)" : "Rig runs"), header, ...body].join(`
+`);
+}
+function formatSubmittedRun(input) {
+  const lines = [`${pc3.green("Run submitted")}: ${pc3.bold(input.runId)}`];
+  if (input.task) {
+    const id = stringField(input.task, "id", "<unknown>");
+    const status = stringField(input.task, "status", "unknown");
+    const title = stringField(input.task, "title", "Untitled task");
+    lines.push(`${pc3.dim("task")} ${pc3.bold(id)} ${statusColor(status)(status)} ${title}`);
+  }
+  return lines.join(`
+`);
+}
+
+// packages/cli/src/commands/_pi-session.ts
+import { spawn as spawn2 } from "child_process";
+function buildPiRigSessionEnv(input) {
+  return {
+    RIG_PROJECT_ROOT: input.projectRoot,
+    PROJECT_RIG_ROOT: input.projectRoot,
+    RIG_RUN_ID: input.runId,
+    RIG_SERVER_RUN_ID: input.runId,
+    RIG_RUNTIME_ADAPTER: "pi",
+    RIG_SERVER_URL: input.serverUrl,
+    RIG_SERVER_BASE_URL: input.serverUrl,
+    RIG_STEERING_POLL_MS: process.env.RIG_STEERING_POLL_MS?.trim() || "1000",
+    RIG_PI_OPERATOR_SESSION: "1",
+    ...input.taskId ? { RIG_TASK_ID: input.taskId } : {},
+    ...input.authToken ? { RIG_AUTH_TOKEN: input.authToken } : {}
+  };
+}
+function shellBinary(name) {
+  const explicit = process.env.RIG_PI_BINARY?.trim();
+  if (explicit)
+    return explicit;
+  return Bun.which(name) || name;
+}
+function buildPiRigSessionCommand(input) {
+  const configuredExtension = input.extensionSource ?? process.env.RIG_PI_RIG_EXTENSION_SOURCE?.trim();
+  const extensionSource = configuredExtension && configuredExtension.length > 0 ? configuredExtension : resolvePiRigPackageSource(input.projectRoot);
+  const initialCommand = `/rig attach ${input.runId}`;
+  return [
+    shellBinary("pi"),
+    "--no-extensions",
+    "--extension",
+    extensionSource,
+    initialCommand
+  ];
+}
+async function launchPiRigSession(context, input) {
+  if (context.outputMode !== "text" || !process.stdin.isTTY || !process.stdout.isTTY) {
+    return { launched: false, exitCode: null, command: [] };
+  }
+  if (process.env.RIG_DISABLE_PI_LAUNCH === "1") {
+    return { launched: false, exitCode: null, command: [] };
+  }
+  const server = await ensureServerForCli(context.projectRoot);
+  const command = buildPiRigSessionCommand({ ...input, projectRoot: context.projectRoot });
+  const env = {
+    ...process.env,
+    ...buildPiRigSessionEnv({
+      projectRoot: context.projectRoot,
+      runId: input.runId,
+      taskId: input.taskId,
+      serverUrl: server.baseUrl,
+      authToken: server.authToken
+    })
+  };
+  process.stdout.write(`Launching Pi for Rig run ${input.runId}\u2026
+`);
+  process.stdout.write(`Pi command: ${formatCommand(command)}
+`);
+  const launchedAt = Date.now();
+  const child = spawn2(command[0], command.slice(1), {
+    cwd: context.projectRoot,
+    env,
+    stdio: "inherit"
+  });
+  const launchError = await new Promise((resolve20) => {
+    child.once("error", (error) => {
+      resolve20({ error: error.message });
+    });
+    child.once("close", (code) => resolve20({ code }));
+  });
+  if ("error" in launchError) {
+    process.stderr.write(`Failed to launch Pi; falling back to Rig attach view: ${launchError.error}
+`);
+    return { launched: false, exitCode: null, command, error: launchError.error };
+  }
+  const exitCode = launchError.code;
+  const elapsedMs = Date.now() - launchedAt;
+  if (typeof exitCode === "number" && exitCode !== 0 && elapsedMs < 5000) {
+    const error = `Pi exited during startup with code ${exitCode}.`;
+    process.stderr.write(`${error} Falling back to Rig attach view.
+`);
+    return { launched: false, exitCode, command, error };
+  }
+  return { launched: true, exitCode, command };
+}
+
 // packages/cli/src/commands/run.ts
 function normalizeRemoteRunDetails(payload) {
   const run = payload.run;
@@ -6777,13 +6965,7 @@ async function executeRun(context, args) {
       requireNoExtraArgs(rest, "bun run rig run list");
       const { runs, source } = await listRunsForSelectedConnection(context, { limit: 100 });
       if (context.outputMode === "text") {
-        if (runs.length === 0) {
-          console.log(source === "server" ? "No runs recorded on the selected Rig server." : "No runs recorded in .rig/runs.");
-        } else {
-          for (const run of runs) {
-            console.log(`- ${runStringField(run, "runId", "(unknown-run)")} \xB7 ${runStringField(run, "status", "unknown")} \xB7 ${runDisplayTitle(run)}`);
-          }
-        }
+        console.log(formatRunList(runs, { source }));
       }
       return { ok: true, group: "run", command, details: { runs, source } };
     }
@@ -6905,14 +7087,26 @@ async function executeRun(context, args) {
       if (!runId) {
         throw new CliError2("run attach requires a run id.", 2);
       }
+      let steered = false;
+      const shouldTryPiAttach = context.outputMode === "text" && follow.value && !once.value && Boolean(process.stdin.isTTY && process.stdout.isTTY) && process.env.RIG_DISABLE_PI_LAUNCH !== "1";
+      if (shouldTryPiAttach && messageOption.value?.trim()) {
+        await steerRunViaServer(context, runId, messageOption.value.trim());
+        steered = true;
+      }
+      if (shouldTryPiAttach) {
+        const piSession = await launchPiRigSession(context, { runId });
+        if (piSession.launched) {
+          return { ok: true, group: "run", command, details: { runId, steered, mode: "pi", ...piSession } };
+        }
+      }
       const attached = await attachRunOperatorView(context, {
         runId,
-        message: messageOption.value ?? null,
+        message: shouldTryPiAttach ? null : messageOption.value ?? null,
         once: once.value,
         follow: follow.value,
         pollMs: parsePositiveInt(pollMs.value, "--poll-ms", 2000)
       });
-      return { ok: true, group: "run", command, details: attached };
+      return { ok: true, group: "run", command, details: { ...attached, steered: attached.steered || steered } };
     }
     case "status": {
       requireNoExtraArgs(rest, "bun run rig run status");
@@ -7178,8 +7372,8 @@ async function executeServer(context, args, options) {
 // packages/cli/src/commands/task.ts
 import { readFileSync as readFileSync9 } from "fs";
 import { spawnSync as spawnSync3 } from "child_process";
-import { createInterface as createInterface3 } from "readline/promises";
 import { resolve as resolve20 } from "path";
+import { cancel as cancel3, confirm as confirm2, isCancel as isCancel3 } from "@clack/prompts";
 import {
   taskArtifactDir,
   taskArtifacts,
@@ -7197,6 +7391,7 @@ import {
 } from "@rig/runtime/control-plane/native/task-ops";
 
 // packages/cli/src/commands/_task-picker.ts
+import { cancel as cancel2, isCancel as isCancel2, select as select2 } from "@clack/prompts";
 function taskId2(task) {
   return typeof task.id === "string" && task.id.trim() ? task.id : "<unknown>";
 }
@@ -7209,20 +7404,37 @@ async function selectTaskWithTextPicker(tasks, io = {}) {
   if (!isTty) {
     throw new Error("task run requires an interactive terminal to pick a task; pass --task <id>, --next, or --detach with a task id.");
   }
-  const prompt = io.prompt ?? promptForTaskSelection;
-  const renderer = io.renderer ?? { writeLine: (line) => process.stdout.write(`${line}
+  if (io.prompt || io.renderer) {
+    const prompt = io.prompt ?? promptForTaskSelection;
+    const renderer = io.renderer ?? { writeLine: (line) => process.stdout.write(`${line}
 `) };
-  renderer.writeLine("Select Rig task:");
-  for (const row of renderTaskPickerRows(tasks))
-    renderer.writeLine(`  ${row}`);
-  const answer = (await prompt(`Task [1-${tasks.length}] or id: `)).trim();
-  if (!answer)
+    renderer.writeLine("Select Rig task:");
+    for (const row of renderTaskPickerRows(tasks))
+      renderer.writeLine(`  ${row}`);
+    const answer2 = (await prompt(`Task [1-${tasks.length}] or id: `)).trim();
+    if (!answer2)
+      return null;
+    if (/^\d+$/.test(answer2)) {
+      const index2 = Number.parseInt(answer2, 10) - 1;
+      return tasks[index2] ?? null;
+    }
+    return tasks.find((task) => taskId2(task) === answer2) ?? null;
+  }
+  const options = tasks.map((task, index2) => ({
+    value: `${index2}`,
+    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 select2({
+    message: "Select Rig task",
+    options
+  });
+  if (isCancel2(answer)) {
+    cancel2("No task selected.");
     return null;
-  if (/^\d+$/.test(answer)) {
-    const index = Number.parseInt(answer, 10) - 1;
-    return tasks[index] ?? null;
   }
-  return tasks.find((task) => taskId2(task) === answer) ?? null;
+  const index = Number.parseInt(String(answer), 10);
+  return Number.isFinite(index) ? tasks[index] ?? null : null;
 }
 
 // packages/cli/src/commands/task.ts
@@ -7334,13 +7546,15 @@ async function resolveDirtyBaselineForTaskRun(context, explicit) {
   if (explicit)
     return { mode: explicit, state };
   if (context.outputMode === "text" && process.stdin.isTTY && process.stdout.isTTY) {
-    const rl = createInterface3({ input: process.stdin, output: process.stdout });
-    try {
-      const answer = (await rl.question("Include current uncommitted changes in run baseline? [y/N] ")).trim().toLowerCase();
-      return { mode: answer === "y" || answer === "yes" ? "dirty-snapshot" : "head", state };
-    } finally {
-      rl.close();
+    const answer = await confirm2({
+      message: "Include current uncommitted changes in run baseline?",
+      initialValue: false
+    });
+    if (isCancel3(answer)) {
+      cancel3("Run cancelled.");
+      throw new CliError2("Run cancelled by user.", 1);
     }
+    return { mode: answer ? "dirty-snapshot" : "head", state };
   }
   return { mode: "head", state };
 }
@@ -7375,10 +7589,7 @@ function summarizeTask(task, options = {}) {
   };
 }
 function printTaskSummary(task) {
-  const id = readTaskId(task) ?? "<unknown>";
-  const title = readTaskString(task, "title") ?? "Untitled task";
-  const status = readTaskString(task, "status") ?? "unknown";
-  console.log(`- ${id} \xB7 ${status} \xB7 ${title}`);
+  console.log(formatTaskList([task]));
 }
 async function validatorRegistryForTaskCommands(projectRoot) {
   return buildPluginHostContext(projectRoot).then((ctx) => ctx?.validatorRegistry ?? undefined).catch(() => {
@@ -7396,16 +7607,8 @@ async function executeTask(context, args, options) {
       requireNoExtraArgs(remaining, "bun run rig task list [--raw] [--assignee <login|@me>] [--assigned-to <login|me|@me>] [--state open|closed] [--status <status>] [--limit <n>]");
       const tasks = await listWorkspaceTasksViaServer(context, filters);
       if (context.outputMode === "text") {
-        if (tasks.length === 0) {
-          console.log("No matching tasks.");
-        } else {
-          for (const task of tasks) {
-            if (rawResult.value)
-              console.log(JSON.stringify(summarizeTask(task, { raw: true })));
-            else
-              printTaskSummary(task);
-          }
-        }
+        const renderedTasks = rawResult.value ? tasks.map((task) => summarizeTask(task, { raw: true })) : tasks.map((task) => summarizeTask(task));
+        console.log(formatTaskList(renderedTasks, { raw: rawResult.value }));
       }
       return {
         ok: true,
@@ -7624,16 +7827,23 @@ async function executeTask(context, args, options) {
       });
       let attachDetails = null;
       if (!detachResult.value && context.outputMode === "text") {
-        console.log(`Run submitted: ${submitted.runId}`);
-        if (selectedTask) {
-          printTaskSummary(selectedTask);
+        console.log(formatSubmittedRun({ runId: submitted.runId, task: selectedTask ? summarizeTask(selectedTask) : null }));
+        if (runtimeAdapter === "pi") {
+          const piSession = await launchPiRigSession(context, {
+            runId: submitted.runId,
+            taskId: selectedTaskId,
+            title: titleResult.value ?? readTaskString(selectedTask ?? {}, "title"),
+            runtimeAdapter
+          });
+          attachDetails = { mode: "pi", ...piSession };
+          if (!piSession.launched) {
+            attachDetails = await attachRunOperatorView(context, { runId: submitted.runId, follow: true });
+          }
+        } else {
+          attachDetails = await attachRunOperatorView(context, { runId: submitted.runId, follow: true });
         }
-        attachDetails = await attachRunOperatorView(context, { runId: submitted.runId, follow: true });
       } else if (context.outputMode === "text") {
-        console.log(`Run submitted: ${submitted.runId}`);
-        if (selectedTask) {
-          printTaskSummary(selectedTask);
-        }
+        console.log(formatSubmittedRun({ runId: submitted.runId, task: selectedTask ? summarizeTask(selectedTask) : null }));
       }
       return {
         ok: true,
@@ -7718,7 +7928,7 @@ async function executeTask(context, args, options) {
 // packages/cli/src/commands/task-run-driver.ts
 import { copyFileSync as copyFileSync3, existsSync as existsSync12, mkdirSync as mkdirSync8, readFileSync as readFileSync10, statSync as statSync2, writeFileSync as writeFileSync6 } from "fs";
 import { resolve as resolve21 } from "path";
-import { spawn as spawn2, spawnSync as spawnSync4 } from "child_process";
+import { spawn as spawn3, spawnSync as spawnSync4 } from "child_process";
 import { createInterface as createLineInterface } from "readline";
 import { loadConfig as loadConfig2 } from "@rig/core/load-config";
 import {
@@ -7946,7 +8156,7 @@ async function runCheckedCommand(command, args, cwd, label = "git") {
 }
 function createCommandRunner(binary) {
   return async (args, options) => {
-    const child = spawn2(binary, [...args], {
+    const child = spawn3(binary, [...args], {
       cwd: options?.cwd,
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -9060,7 +9270,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
   }
   for (let attempt = 1;!exit && attempt <= maxAttempts; attempt += 1) {
     const attemptHostAgentCommand = buildHostAgentCommand(currentPrompt);
-    const child = spawn2(attemptHostAgentCommand[0], attemptHostAgentCommand.slice(1), {
+    const child = spawn3(attemptHostAgentCommand[0], attemptHostAgentCommand.slice(1), {
       cwd: context.projectRoot,
       env: childEnv,
       stdio: ["pipe", "pipe", "pipe"]
@@ -9407,7 +9617,7 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
     });
     emitServerRunEvent({ type: "log", runId: input.runId, title: "Steering Pi from PR feedback" });
     const feedbackCommand = buildHostAgentCommand(message2);
-    const child = spawn2(feedbackCommand[0], feedbackCommand.slice(1), {
+    const child = spawn3(feedbackCommand[0], feedbackCommand.slice(1), {
       cwd: latestRuntimeWorkspace ?? context.projectRoot,
       env: childEnv,
       stdio: ["pipe", "pipe", "pipe"]

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

@@ -0,0 +1,106 @@
+// @bun
+// packages/cli/src/commands/_cli-format.ts
+import pc from "picocolors";
+function stringField(record, key, fallback = "") {
+  const value = record[key];
+  return typeof value === "string" && value.trim() ? value.trim() : fallback;
+}
+function arrayField(record, key) {
+  const value = record[key];
+  return Array.isArray(value) ? value.flatMap((entry) => typeof entry === "string" && entry.trim() ? [entry.trim()] : []) : [];
+}
+function rawObject(record) {
+  const raw = record.raw;
+  return raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
+}
+function truncate(value, width) {
+  if (value.length <= width)
+    return value;
+  if (width <= 1)
+    return "\u2026";
+  return `${value.slice(0, width - 1)}\u2026`;
+}
+function pad(value, width) {
+  return value.length >= width ? value : `${value}${" ".repeat(width - value.length)}`;
+}
+function statusColor(status) {
+  const normalized = status.toLowerCase();
+  if (["completed", "merged", "closed", "done", "accepted"].includes(normalized))
+    return pc.green;
+  if (["failed", "needs_attention", "needs-attention", "blocked"].includes(normalized))
+    return pc.red;
+  if (["running", "reviewing", "validating", "in_progress", "in-progress"].includes(normalized))
+    return pc.cyan;
+  if (["ready", "open", "queued", "created", "preparing"].includes(normalized))
+    return pc.yellow;
+  return pc.dim;
+}
+function formatTaskList(tasks, options = {}) {
+  if (tasks.length === 0)
+    return pc.dim("No matching tasks.");
+  if (options.raw)
+    return tasks.map((task) => JSON.stringify(task)).join(`
+`);
+  const rows = tasks.map((task) => {
+    const raw = rawObject(task);
+    const id = stringField(task, "id", "<unknown>");
+    const status = stringField(task, "status", "unknown");
+    const title = stringField(task, "title", "Untitled task");
+    const source = stringField(task, "source", stringField(raw, "source", ""));
+    const labels = arrayField(task, "labels").length > 0 ? arrayField(task, "labels") : arrayField(raw, "labels");
+    return { id, status, title, source, labels };
+  });
+  const idWidth = Math.min(18, Math.max(4, ...rows.map((row) => row.id.length)));
+  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}`) : "";
+    return [
+      pc.bold(pad(truncate(row.id, idWidth), idWidth)),
+      statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
+      `${row.title}${labels}${source}`
+    ].join("  ");
+  });
+  return [pc.bold("Rig tasks"), header, ...body].join(`
+`);
+}
+function formatRunList(runs, options = {}) {
+  if (runs.length === 0) {
+    return pc.dim(options.source === "server" ? "No runs recorded on the selected Rig server." : "No runs recorded in .rig/runs.");
+  }
+  const rows = runs.map((run) => {
+    const runId = stringField(run, "runId", stringField(run, "id", "(unknown-run)"));
+    const status = stringField(run, "status", "unknown");
+    const taskId = stringField(run, "taskId", "");
+    const title = stringField(run, "title", taskId || "(untitled)");
+    const runtime = stringField(run, "runtimeAdapter", "");
+    return { runId, status, title, runtime };
+  });
+  const idWidth = Math.min(36, Math.max(6, ...rows.map((row) => row.runId.length)));
+  const statusWidth = Math.min(16, Math.max(6, ...rows.map((row) => row.status.length)));
+  const header = `${pc.bold(pad("RUN", idWidth))}  ${pc.bold(pad("STATUS", statusWidth))}  ${pc.bold("TITLE")}`;
+  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}`) : ""}`
+  ].join("  "));
+  return [pc.bold(options.source === "server" ? "Rig runs (server)" : "Rig runs"), header, ...body].join(`
+`);
+}
+function formatSubmittedRun(input) {
+  const lines = [`${pc.green("Run submitted")}: ${pc.bold(input.runId)}`];
+  if (input.task) {
+    const id = stringField(input.task, "id", "<unknown>");
+    const status = stringField(input.task, "status", "unknown");
+    const title = stringField(input.task, "title", "Untitled task");
+    lines.push(`${pc.dim("task")} ${pc.bold(id)} ${statusColor(status)(status)} ${title}`);
+  }
+  return lines.join(`
+`);
+}
+export {
+  formatTaskList,
+  formatSubmittedRun,
+  formatRunList
+};

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

@@ -209,7 +209,8 @@ async function loadRigConfigOrNull(projectRoot) {
 import { existsSync as existsSync3, readFileSync as readFileSync3, rmSync } from "fs";
 import { homedir as homedir2 } from "os";
 import { resolve as resolve3 } from "path";
-var PI_RIG_PACKAGE_NAME = "@rig/pi-rig";
+var PI_RIG_PACKAGE_NAME = "@h-rig/pi-rig";
+var LEGACY_PI_RIG_PACKAGE_NAME = "@rig/pi-rig";
 async function defaultCommandRunner(command, options = {}) {
   const proc = Bun.spawn(command, { cwd: options.cwd, stdout: "pipe", stderr: "pipe" });
   const [stdout, stderr, exitCode] = await Promise.all([
@@ -228,7 +229,7 @@ function resolvePiHomeDir(inputHomeDir) {
 function piListContainsPiRig(output) {
   return output.split(/\r?\n/).some((line) => {
     const normalized = line.trim();
-    return normalized.includes(PI_RIG_PACKAGE_NAME) || /(?:^|[\\/])packages[\\/]pi-rig(?:$|\s)/.test(normalized);
+    return normalized.includes(PI_RIG_PACKAGE_NAME) || normalized.includes(LEGACY_PI_RIG_PACKAGE_NAME) || /(?:^|[\\/])packages[\\/]pi-rig(?:$|\s)/.test(normalized);
   });
 }
 async function safeRun(runner, command, options) {

package/dist/src/commands/_pi-install.js

@@ -3,7 +3,8 @@
 import { existsSync, readFileSync, rmSync } from "fs";
 import { homedir } from "os";
 import { resolve } from "path";
-var PI_RIG_PACKAGE_NAME = "@rig/pi-rig";
+var PI_RIG_PACKAGE_NAME = "@h-rig/pi-rig";
+var LEGACY_PI_RIG_PACKAGE_NAME = "@rig/pi-rig";
 var LEGACY_PI_RIG_MARKER = `// Managed by Rig. Source package: @rig/pi-rig.
 export { default } from '@rig/pi-rig';
 `;
@@ -31,7 +32,7 @@ function resolvePiHomeDir(inputHomeDir) {
 function piListContainsPiRig(output) {
   return output.split(/\r?\n/).some((line) => {
     const normalized = line.trim();
-    return normalized.includes(PI_RIG_PACKAGE_NAME) || /(?:^|[\\/])packages[\\/]pi-rig(?:$|\s)/.test(normalized);
+    return normalized.includes(PI_RIG_PACKAGE_NAME) || normalized.includes(LEGACY_PI_RIG_PACKAGE_NAME) || /(?:^|[\\/])packages[\\/]pi-rig(?:$|\s)/.test(normalized);
   });
 }
 async function safeRun(runner, command, options) {
@@ -147,7 +148,7 @@ async function ensureRemotePiRigInstalled(input) {
   const payload = await input.requestJson("/api/pi-rig/install", {
     method: "POST",
     headers: { "content-type": "application/json" },
-    body: JSON.stringify({ package: "@rig/pi-rig", scope: "global" })
+    body: JSON.stringify({ package: PI_RIG_PACKAGE_NAME, scope: "global" })
   });
   const record = payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
   const piOk = record.piOk === true || record.ok === true;