@h-rig/cli 0.0.6-alpha.24 → 0.0.6-alpha.26

package/dist/src/commands/server.js

@@ -60,10 +60,8 @@ function normalizeRuntimeAdapter(value) {
   return "claude-code";
 }
 
-// packages/cli/src/commands/_server-client.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
-import { resolve as resolve2 } from "path";
-import { ensureLocalRigServerConnection } from "@rig/runtime/local-server";
+// packages/cli/src/commands/connect.ts
+import { cancel, isCancel, select } from "@clack/prompts";
 
 // packages/cli/src/commands/_connection-state.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
@@ -90,6 +88,11 @@ function readJsonFile(path) {
     throw new CliError2(`Invalid Rig connection state at ${path}: ${error instanceof Error ? error.message : String(error)}`, 1);
   }
 }
+function writeJsonFile2(path, value) {
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, `${JSON.stringify(value, null, 2)}
+`, "utf8");
+}
 function normalizeConnection(value) {
   if (!value || typeof value !== "object" || Array.isArray(value))
     return null;
@@ -119,6 +122,18 @@ function readGlobalConnections(options = {}) {
   }
   return { connections };
 }
+function writeGlobalConnections(state, options = {}) {
+  writeJsonFile2(resolveGlobalConnectionsPath(options.env ?? process.env), state);
+}
+function upsertGlobalConnection(alias, connection, options = {}) {
+  const cleanAlias = alias.trim();
+  if (!cleanAlias)
+    throw new CliError2("Connection alias is required.", 1);
+  const state = readGlobalConnections(options);
+  state.connections[cleanAlias] = connection;
+  writeGlobalConnections(state, options);
+  return state;
+}
 function readRepoConnection(projectRoot) {
   const payload = readJsonFile(resolveRepoConnectionPath(projectRoot));
   if (!payload || typeof payload !== "object" || Array.isArray(payload))
@@ -133,6 +148,9 @@ function readRepoConnection(projectRoot) {
     linkedAt: typeof record.linkedAt === "string" ? record.linkedAt : undefined
   };
 }
+function writeRepoConnection(projectRoot, state) {
+  writeJsonFile2(resolveRepoConnectionPath(projectRoot), state);
+}
 function resolveSelectedConnection(projectRoot, options = {}) {
   const repo = readRepoConnection(projectRoot);
   if (!repo)
@@ -147,7 +165,184 @@ function resolveSelectedConnection(projectRoot, options = {}) {
   return { alias: repo.selected, connection };
 }
 
+// packages/cli/src/commands/_cli-format.ts
+import pc from "picocolors";
+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", "pass", "selected"].includes(normalized))
+    return pc.green;
+  if (["failed", "needs_attention", "needs-attention", "blocked", "error"].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"].includes(normalized))
+    return pc.yellow;
+  return pc.dim;
+}
+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}`) : ""}`;
+}
+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(9))} ${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}`)];
+}
+function formatConnectionList(connections) {
+  const rows = [["local", { kind: "local", mode: "auto" }], ...Object.entries(connections)];
+  const aliasWidth = Math.min(24, Math.max(5, ...rows.map(([alias]) => alias.length)));
+  const lines = rows.map(([alias, connection]) => [
+    pc.bold(pad(truncate(alias, aliasWidth), aliasWidth)),
+    formatStatusPill(connection.kind),
+    connection.kind === "remote" ? connection.baseUrl ?? "" : connection.mode ?? "local"
+  ].join("  "));
+  return [formatSection("Rig servers", `${rows.length} available`), `${pc.bold(pad("ALIAS", aliasWidth))}  ${pc.bold("KIND")}  ${pc.bold("TARGET")}`, ...lines, "", ...formatNextSteps(["Select one: `rig server use <alias|local>`"])].join(`
+`);
+}
+function formatConnectionStatus(selected, connections) {
+  const connection = selected === "local" ? { kind: "local", mode: "auto" } : connections[selected];
+  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"}`,
+    "",
+    ...formatNextSteps(["Change: `rig server use <alias|local>`", "List saved servers: `rig server list`"])
+  ].join(`
+`);
+}
+
+// packages/cli/src/commands/connect.ts
+function usageName(options) {
+  return `rig ${options.group}`;
+}
+function parseConnection(alias, value, options) {
+  if (alias === "local" && !value)
+    return { kind: "local", mode: "auto" };
+  if (!value)
+    throw new CliError2(`Missing remote server URL. Usage: ${usageName(options)} add <alias> <url>`, 1);
+  let parsed;
+  try {
+    parsed = new URL(value);
+  } catch {
+    throw new CliError2(`Invalid Rig server URL: ${value}`, 1);
+  }
+  if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
+    throw new CliError2("Rig remote server URL must be http(s).", 1);
+  }
+  return { kind: "remote", baseUrl: parsed.toString().replace(/\/+$/, "") };
+}
+function printJsonOrText(context, payload, text) {
+  if (context.outputMode === "json") {
+    console.log(JSON.stringify(payload, null, 2));
+  } else {
+    console.log(text);
+  }
+}
+async function promptForConnectionAlias(context) {
+  const state = readGlobalConnections();
+  const repo = readRepoConnection(context.projectRoot);
+  const options = [
+    { value: "local", label: "local", hint: "Use/start a local Rig server" },
+    ...Object.entries(state.connections).map(([alias, connection]) => ({
+      value: alias,
+      label: alias,
+      hint: connection.kind === "remote" ? connection.baseUrl : "local"
+    }))
+  ].filter((option, index, all) => all.findIndex((candidate) => candidate.value === option.value) === index);
+  const answer = await select({
+    message: "Select Rig server for this repo",
+    initialValue: repo?.selected ?? "local",
+    options
+  });
+  if (isCancel(answer)) {
+    cancel("No server selected.");
+    throw new CliError2("No server selected.", 3);
+  }
+  return String(answer);
+}
+async function executeConnectionCommand(context, args, options) {
+  const [command, ...rest] = args;
+  switch (command ?? "status") {
+    case "list": {
+      requireNoExtraArgs(rest, `${usageName(options)} list`);
+      const state = readGlobalConnections();
+      printJsonOrText(context, state, formatConnectionList(state.connections));
+      return { ok: true, group: options.group, command: "list", details: state };
+    }
+    case "add": {
+      const [alias, url, ...extra] = rest;
+      if (!alias)
+        throw new CliError2(`Missing alias. Usage: ${usageName(options)} add <alias> <url>`, 1);
+      requireNoExtraArgs(extra, `${usageName(options)} add <alias> <url>`);
+      const connection = parseConnection(alias, url, options);
+      const state = upsertGlobalConnection(alias, connection);
+      printJsonOrText(context, { alias, connection }, formatSuccessCard("Rig server saved", [
+        ["alias", alias],
+        ["target", connection.kind === "remote" ? connection.baseUrl : "local"],
+        ["next", `${usageName(options)} use ${alias}`]
+      ]));
+      return { ok: true, group: options.group, command: "add", details: { alias, connection, count: Object.keys(state.connections).length } };
+    }
+    case "use": {
+      let [alias, ...extra] = rest;
+      requireNoExtraArgs(extra, `${usageName(options)} use <alias|local>`);
+      if (!alias && options.interactiveUse && context.outputMode === "text" && process.stdin.isTTY) {
+        alias = await promptForConnectionAlias(context);
+      }
+      if (!alias)
+        throw new CliError2(`Missing alias. Usage: ${usageName(options)} use <alias|local>`, 1);
+      if (alias !== "local") {
+        const state = readGlobalConnections();
+        if (!state.connections[alias])
+          throw new CliError2(`Unknown Rig server: ${alias}`, 1);
+      }
+      const repoState = { selected: alias, linkedAt: new Date().toISOString() };
+      writeRepoConnection(context.projectRoot, repoState);
+      printJsonOrText(context, repoState, formatSuccessCard("Rig server selected", [
+        ["selected", alias],
+        ["scope", "this repo"],
+        ["next", "rig task list"]
+      ]));
+      return { ok: true, group: options.group, command: "use", details: repoState };
+    }
+    case "status": {
+      requireNoExtraArgs(rest, `${usageName(options)} status`);
+      const repo = readRepoConnection(context.projectRoot);
+      const global = readGlobalConnections();
+      const details = { selected: repo?.selected ?? "local", repo, connections: global.connections };
+      printJsonOrText(context, details, formatConnectionStatus(details.selected, global.connections));
+      return { ok: true, group: options.group, command: "status", details };
+    }
+    default:
+      throw new CliError2(`Unknown ${options.group} command: ${String(command)}
+Usage: ${usageName(options)} <list|add|use|status>`, 1);
+  }
+}
+
 // packages/cli/src/commands/_server-client.ts
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
+import { resolve as resolve2 } from "path";
+import { ensureLocalRigServerConnection } from "@rig/runtime/local-server";
 var scopedGitHubBearerTokens = new Map;
 function cleanToken(value) {
   const trimmed = value?.trim();
@@ -273,7 +468,10 @@ async function submitTaskRunViaServer(context, input) {
 
 // packages/cli/src/commands/server.ts
 async function executeServer(context, args, options) {
-  const [command = "start", ...rest] = args;
+  const [command = "status", ...rest] = args;
+  if (["status", "list", "add", "use"].includes(command)) {
+    return executeConnectionCommand(context, [command, ...rest], { group: "server", interactiveUse: true });
+  }
   switch (command) {
     case "start": {
       let pending = rest;
@@ -285,7 +483,7 @@ async function executeServer(context, args, options) {
       pending = pollResult.rest;
       const authTokenResult = takeOption(pending, "--auth-token");
       pending = authTokenResult.rest;
-      requireNoExtraArgs(pending, "bun run rig server start [--host <host>] [--port <n>] [--poll-ms <n>] [--auth-token <token>]");
+      requireNoExtraArgs(pending, "rig server start [--host <host>] [--port <n>] [--poll-ms <n>] [--auth-token <token>]");
       const commandParts = ["rig-server", "start"];
       if (hostResult.value) {
         commandParts.push("--host", hostResult.value);
@@ -308,7 +506,7 @@ async function executeServer(context, args, options) {
       let pending = rest;
       const eventResult = takeOption(pending, "--event");
       pending = eventResult.rest;
-      requireNoExtraArgs(pending, "bun run rig server notify-test [--event <type>]");
+      requireNoExtraArgs(pending, "rig server notify-test [--event <type>]");
       const commandParts = ["rig-server", "notify-test"];
       if (eventResult.value) {
         commandParts.push("--event", eventResult.value);
@@ -336,7 +534,7 @@ async function executeServer(context, args, options) {
       pending = dirtyBaselineResult.rest;
       const prResult = takeOption(pending, "--pr");
       pending = prResult.rest;
-      requireNoExtraArgs(pending, "bun run rig --run-id <run-id> server task-run [--task <id>] [--title <text>] [--runtime-adapter claude-code|codex|pi] [--model <model>] [--runtime-mode <mode>] [--interaction-mode <mode>] [--initial-prompt <text>] [--dirty-baseline head|dirty-snapshot] [--pr auto|ask|off]");
+      requireNoExtraArgs(pending, "rig --run-id <run-id> server task-run [--task <id>] [--title <text>] [--runtime-adapter claude-code|codex|pi] [--model <model>] [--runtime-mode <mode>] [--interaction-mode <mode>] [--initial-prompt <text>] [--dirty-baseline head|dirty-snapshot] [--pr auto|ask|off]");
       if (!taskResult.value && !initialPromptResult.value && !titleResult.value) {
         throw new CliError2("server task-run requires either --task <id> or --initial-prompt/--title for an ad hoc run.", 2);
       }

package/dist/src/commands/task.js

@@ -1647,21 +1647,39 @@ function pad(value, width) {
 }
 function statusColor(status) {
   const normalized = status.toLowerCase();
-  if (["completed", "merged", "closed", "done", "accepted"].includes(normalized))
+  if (["completed", "merged", "closed", "done", "accepted", "pass", "selected"].includes(normalized))
     return pc.green;
-  if (["failed", "needs_attention", "needs-attention", "blocked"].includes(normalized))
+  if (["failed", "needs_attention", "needs-attention", "blocked", "error"].includes(normalized))
     return pc.red;
-  if (["running", "reviewing", "validating", "in_progress", "in-progress"].includes(normalized))
+  if (["running", "reviewing", "validating", "in_progress", "in-progress", "remote"].includes(normalized))
     return pc.cyan;
-  if (["ready", "open", "queued", "created", "preparing"].includes(normalized))
+  if (["ready", "open", "queued", "created", "preparing", "local"].includes(normalized))
     return pc.yellow;
   return pc.dim;
 }
+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}`) : ""}`;
+}
+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(9))} ${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}`)];
+}
 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(`
+`);
+  if (tasks.length === 0)
+    return [formatSection("Tasks", "none found"), ...formatNextSteps(["Try `rig server status` to confirm the selected server.", "Relax filters or run `rig task run --title ... --initial-prompt ...` for ad hoc work."])].join(`
 `);
   const rows = tasks.map((task) => {
     const raw = rawObject(task);
@@ -1684,18 +1702,22 @@ function formatTaskList(tasks, options = {}) {
       `${row.title}${labels}${source}`
     ].join("  ");
   });
-  return [pc.bold("Rig tasks"), header, ...body].join(`
+  return [formatSection("Tasks", `${rows.length} shown`), header, ...body, "", ...formatNextSteps(["Run one: `rig task run <id>` or `rig task run --next`", "Attach later: `rig run attach <run-id> --follow`"])].join(`
 `);
 }
 function formatSubmittedRun(input) {
-  const lines = [`${pc.green("Run submitted")}: ${pc.bold(input.runId)}`];
+  const rows = [["run", 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}`);
+    rows.push(["task", `${pc.bold(id)} ${formatStatusPill(status)} ${title}`]);
   }
-  return lines.join(`
+  return [
+    formatSuccessCard("Run submitted", rows),
+    "",
+    ...formatNextSteps([`Attach: \`rig run attach ${input.runId} --follow\``, `Inspect: \`rig run show --run ${input.runId}\``])
+  ].join(`
 `);
 }