@h-rig/cli 0.0.6-alpha.65 → 0.0.6-alpha.67

package/dist/bin/rig.js

@@ -2923,6 +2923,9 @@ function writeRepoServerProjectRoot(projectRoot, serverProjectRoot) {
     return;
   writeRepoConnection(projectRoot, { ...repo, serverProjectRoot });
 }
+function isRemoteConnectionSelected(projectRoot) {
+  return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
+}
 
 // packages/cli/src/commands/_server-client.ts
 init_runner();
@@ -7849,9 +7852,6 @@ function normalizeRemoteRunDetails(payload) {
   };
 }
 var REMOTE_TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "stopped", "cancelled", "canceled", "closed", "merged"]);
-function isRemoteConnectionSelected(projectRoot) {
-  return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
-}
 async function listRunsForSelectedConnection(context, options = {}) {
   if (isRemoteConnectionSelected(context.projectRoot)) {
     return { runs: await listRunsViaServer(context, options), source: "server" };
@@ -8201,28 +8201,38 @@ async function executeRun(context, args) {
       };
     }
     case "resume": {
-      requireNoExtraArgs(rest, "rig run resume");
+      let pending = rest;
+      const runOpt = takeOption(pending, "--run");
+      pending = runOpt.rest;
+      const positional = pending[0] && !pending[0].startsWith("-") ? pending.shift() : undefined;
+      requireNoExtraArgs(pending, "rig run resume [<run-id>] [--run <id>]");
+      const targetRunId = runOpt.value ?? positional ?? null;
       if (context.dryRun) {
         if (context.outputMode === "text") {
           console.log("[dry-run] rig run resume");
         }
         return { ok: true, group: "run", command };
       }
-      const resumed = await runResume(context.projectRoot, runtimeContext);
+      const resumed = await runResume(context.projectRoot, runtimeContext, targetRunId);
       if (context.outputMode === "text") {
         console.log(`Resumed run: ${resumed.runId}`);
       }
       return { ok: true, group: "run", command, details: resumed };
     }
     case "restart": {
-      requireNoExtraArgs(rest, "rig run restart");
+      let pending = rest;
+      const runOpt = takeOption(pending, "--run");
+      pending = runOpt.rest;
+      const positional = pending[0] && !pending[0].startsWith("-") ? pending.shift() : undefined;
+      requireNoExtraArgs(pending, "rig run restart [<run-id>] [--run <id>]");
+      const targetRunId = runOpt.value ?? positional ?? null;
       if (context.dryRun) {
         if (context.outputMode === "text") {
           console.log("[dry-run] rig run restart");
         }
         return { ok: true, group: "run", command };
       }
-      const restarted = await runRestart(context.projectRoot, runtimeContext);
+      const restarted = await runRestart(context.projectRoot, runtimeContext, targetRunId);
       if (context.outputMode === "text") {
         console.log(`Restarted run: ${restarted.runId}`);
       }
@@ -8517,10 +8527,7 @@ async function executeServer(context, args, options) {
 // packages/cli/src/commands/stats.ts
 init_runner();
 import pc5 from "picocolors";
-import {
-  listAuthorityRuns as listAuthorityRuns3,
-  projectRunFromJournal
-} from "@rig/runtime/control-plane/authority-files";
+import { computeRigStats } from "@rig/runtime/control-plane/native/run-stats";
 
 // packages/cli/src/commands/_help-catalog.ts
 import { intro as intro3, log as log4, note as note4, outro as outro3 } from "@clack/prompts";
@@ -9009,90 +9016,6 @@ function parseSinceOption(value, now = new Date) {
   }
   return new Date(parsed);
 }
-function median(values) {
-  if (values.length === 0)
-    return null;
-  const sorted = [...values].sort((left, right) => left - right);
-  const middle = Math.floor(sorted.length / 2);
-  const upper = sorted[middle];
-  if (sorted.length % 2 === 1)
-    return upper;
-  return (sorted[middle - 1] + upper) / 2;
-}
-function rate(part, total) {
-  if (total === 0)
-    return null;
-  return part / total;
-}
-function parseTimestamp(value) {
-  if (!value)
-    return null;
-  const parsed = Date.parse(value);
-  return Number.isFinite(parsed) ? parsed : null;
-}
-function computeRigStats(projectRoot, options = {}) {
-  const since = options.since ?? null;
-  const sinceMs = since ? since.getTime() : null;
-  const runs = listAuthorityRuns3(projectRoot).filter((run) => {
-    if (sinceMs === null)
-      return true;
-    const createdAt = parseTimestamp(run.createdAt) ?? parseTimestamp(run.updatedAt);
-    return createdAt !== null && createdAt >= sinceMs;
-  });
-  const statusCounts = {};
-  const completionDurations = [];
-  let steeringTotal = 0;
-  let stallTotal = 0;
-  let approvalsApproved = 0;
-  let approvalsRejected = 0;
-  let approvalsPending = 0;
-  for (const run of runs) {
-    const status = run.status ?? "unknown";
-    statusCounts[status] = (statusCounts[status] ?? 0) + 1;
-    if (status === "completed") {
-      const createdAt = parseTimestamp(run.createdAt);
-      const completedAt = parseTimestamp(run.completedAt);
-      if (createdAt !== null && completedAt !== null && completedAt >= createdAt) {
-        completionDurations.push(completedAt - createdAt);
-      }
-    }
-    const projection = projectRunFromJournal(projectRoot, run.runId);
-    if (!projection)
-      continue;
-    steeringTotal += projection.steeringCount;
-    stallTotal += projection.stallCount;
-    approvalsPending += projection.pendingApprovals.length;
-    for (const resolved of projection.resolvedApprovals) {
-      if (resolved.decision === "approve")
-        approvalsApproved += 1;
-      else
-        approvalsRejected += 1;
-    }
-  }
-  const totalRuns = runs.length;
-  const completedRuns = statusCounts["completed"] ?? 0;
-  const failedRuns = statusCounts["failed"] ?? 0;
-  const needsAttentionRuns = statusCounts["needs-attention"] ?? 0;
-  return {
-    since: since ? since.toISOString() : null,
-    totalRuns,
-    statusCounts,
-    completedRuns,
-    failedRuns,
-    needsAttentionRuns,
-    completionRate: rate(completedRuns, totalRuns),
-    failureRate: rate(failedRuns, totalRuns),
-    needsAttentionRate: rate(needsAttentionRuns, totalRuns),
-    medianCompletionMs: median(completionDurations),
-    steeringTotal,
-    steeringPerRun: totalRuns === 0 ? null : steeringTotal / totalRuns,
-    stallTotal,
-    approvalsRequested: approvalsApproved + approvalsRejected + approvalsPending,
-    approvalsApproved,
-    approvalsRejected,
-    approvalsPending
-  };
-}
 function formatPercent(value) {
   if (value === null)
     return "\u2014";
@@ -9150,7 +9073,7 @@ async function executeStats(context, args) {
       const sinceResult = takeOption(pending, "--since");
       requireNoExtraArgs(sinceResult.rest, "rig stats [show] [--since <7d|30d|ISO date>]");
       const since = parseSinceOption(sinceResult.value);
-      const stats = computeRigStats(context.projectRoot, { since });
+      const stats = isRemoteConnectionSelected(context.projectRoot) ? await requestServerJson(context, `/api/stats${since ? `?since=${encodeURIComponent(since.toISOString())}` : ""}`) : computeRigStats(context.projectRoot, { since });
       if (context.outputMode === "text") {
         printFormattedOutput(formatStatsReport(stats));
       }

package/dist/src/commands/_connection-state.js

@@ -125,6 +125,9 @@ function writeRepoServerProjectRoot(projectRoot, serverProjectRoot) {
     return;
   writeRepoConnection(projectRoot, { ...repo, serverProjectRoot });
 }
+function isRemoteConnectionSelected(projectRoot) {
+  return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
+}
 export {
   writeRepoServerProjectRoot,
   writeRepoConnection,
@@ -134,5 +137,6 @@ export {
   resolveRepoConnectionPath,
   resolveGlobalConnectionsPath,
   readRepoConnection,
-  readGlobalConnections
+  readGlobalConnections,
+  isRemoteConnectionSelected
 };

package/dist/src/commands/run.js

@@ -188,6 +188,9 @@ function writeRepoServerProjectRoot(projectRoot, serverProjectRoot) {
     return;
   writeRepoConnection(projectRoot, { ...repo, serverProjectRoot });
 }
+function isRemoteConnectionSelected(projectRoot) {
+  return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
+}
 
 // packages/cli/src/commands/_server-client.ts
 var scopedGitHubBearerTokens = new Map;
@@ -1167,9 +1170,6 @@ function normalizeRemoteRunDetails(payload) {
   };
 }
 var REMOTE_TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "stopped", "cancelled", "canceled", "closed", "merged"]);
-function isRemoteConnectionSelected(projectRoot) {
-  return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
-}
 async function listRunsForSelectedConnection(context, options = {}) {
   if (isRemoteConnectionSelected(context.projectRoot)) {
     return { runs: await listRunsViaServer(context, options), source: "server" };
@@ -1519,28 +1519,38 @@ async function executeRun(context, args) {
       };
     }
     case "resume": {
-      requireNoExtraArgs(rest, "rig run resume");
+      let pending = rest;
+      const runOpt = takeOption(pending, "--run");
+      pending = runOpt.rest;
+      const positional = pending[0] && !pending[0].startsWith("-") ? pending.shift() : undefined;
+      requireNoExtraArgs(pending, "rig run resume [<run-id>] [--run <id>]");
+      const targetRunId = runOpt.value ?? positional ?? null;
       if (context.dryRun) {
         if (context.outputMode === "text") {
           console.log("[dry-run] rig run resume");
         }
         return { ok: true, group: "run", command };
       }
-      const resumed = await runResume(context.projectRoot, runtimeContext);
+      const resumed = await runResume(context.projectRoot, runtimeContext, targetRunId);
       if (context.outputMode === "text") {
         console.log(`Resumed run: ${resumed.runId}`);
       }
       return { ok: true, group: "run", command, details: resumed };
     }
     case "restart": {
-      requireNoExtraArgs(rest, "rig run restart");
+      let pending = rest;
+      const runOpt = takeOption(pending, "--run");
+      pending = runOpt.rest;
+      const positional = pending[0] && !pending[0].startsWith("-") ? pending.shift() : undefined;
+      requireNoExtraArgs(pending, "rig run restart [<run-id>] [--run <id>]");
+      const targetRunId = runOpt.value ?? positional ?? null;
       if (context.dryRun) {
         if (context.outputMode === "text") {
           console.log("[dry-run] rig run restart");
         }
         return { ok: true, group: "run", command };
       }
-      const restarted = await runRestart(context.projectRoot, runtimeContext);
+      const restarted = await runRestart(context.projectRoot, runtimeContext, targetRunId);
       if (context.outputMode === "text") {
         console.log(`Restarted run: ${restarted.runId}`);
       }

package/dist/src/commands/stats.js

@@ -45,10 +45,298 @@ Usage: ${usage}`);
 }
 
 // packages/cli/src/commands/stats.ts
-import {
-  listAuthorityRuns,
-  projectRunFromJournal
-} from "@rig/runtime/control-plane/authority-files";
+import { computeRigStats } from "@rig/runtime/control-plane/native/run-stats";
+
+// packages/cli/src/commands/_connection-state.ts
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { homedir } from "os";
+import { dirname, resolve } from "path";
+function resolveGlobalConnectionsPath(env = process.env) {
+  const explicit = env.RIG_CONNECTIONS_FILE?.trim();
+  if (explicit)
+    return resolve(explicit);
+  const stateDir = env.RIG_GLOBAL_STATE_DIR?.trim();
+  if (stateDir)
+    return resolve(stateDir, "connections.json");
+  return resolve(homedir(), ".rig", "connections.json");
+}
+function resolveRepoConnectionPath(projectRoot) {
+  return resolve(projectRoot, ".rig", "state", "connection.json");
+}
+function readJsonFile(path) {
+  if (!existsSync(path))
+    return null;
+  try {
+    return JSON.parse(readFileSync(path, "utf8"));
+  } catch (error) {
+    throw new CliError(`Invalid Rig connection state at ${path}: ${error instanceof Error ? error.message : String(error)}`, 1, { hint: "Fix or delete that file, then re-select a server with `rig server use <alias|local>`." });
+  }
+}
+function writeJsonFile(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;
+  const record = value;
+  if (record.kind === "local")
+    return { kind: "local", mode: "auto" };
+  if (record.kind === "remote" && typeof record.baseUrl === "string" && record.baseUrl.trim()) {
+    const baseUrl = record.baseUrl.trim().replace(/\/+$/, "");
+    return { kind: "remote", baseUrl };
+  }
+  return null;
+}
+function readGlobalConnections(options = {}) {
+  const path = resolveGlobalConnectionsPath(options.env ?? process.env);
+  const payload = readJsonFile(path);
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
+    return { connections: {} };
+  }
+  const rawConnections = payload.connections;
+  const connections = {};
+  if (rawConnections && typeof rawConnections === "object" && !Array.isArray(rawConnections)) {
+    for (const [alias, raw] of Object.entries(rawConnections)) {
+      const connection = normalizeConnection(raw);
+      if (connection)
+        connections[alias] = connection;
+    }
+  }
+  return { connections };
+}
+function readRepoConnection(projectRoot) {
+  const payload = readJsonFile(resolveRepoConnectionPath(projectRoot));
+  if (!payload || typeof payload !== "object" || Array.isArray(payload))
+    return null;
+  const record = payload;
+  const selected = typeof record.selected === "string" ? record.selected.trim() : "";
+  if (!selected)
+    return null;
+  return {
+    selected,
+    project: typeof record.project === "string" ? record.project : undefined,
+    linkedAt: typeof record.linkedAt === "string" ? record.linkedAt : undefined,
+    serverProjectRoot: typeof record.serverProjectRoot === "string" && record.serverProjectRoot.trim() ? record.serverProjectRoot.trim() : undefined
+  };
+}
+function writeRepoConnection(projectRoot, state) {
+  writeJsonFile(resolveRepoConnectionPath(projectRoot), state);
+}
+function resolveSelectedConnection(projectRoot, options = {}) {
+  const repo = readRepoConnection(projectRoot);
+  if (!repo)
+    return null;
+  if (repo.selected === "local")
+    return { alias: "local", connection: { kind: "local", mode: "auto" }, serverProjectRoot: repo.serverProjectRoot };
+  const global = readGlobalConnections(options);
+  const connection = global.connections[repo.selected];
+  if (!connection) {
+    throw new CliError(`Selected Rig server "${repo.selected}" was not found. Run \`rig server list\` or \`rig server use local\`.`, 1);
+  }
+  return { alias: repo.selected, connection, serverProjectRoot: repo.serverProjectRoot };
+}
+function writeRepoServerProjectRoot(projectRoot, serverProjectRoot) {
+  const repo = readRepoConnection(projectRoot);
+  if (!repo)
+    return;
+  writeRepoConnection(projectRoot, { ...repo, serverProjectRoot });
+}
+function isRemoteConnectionSelected(projectRoot) {
+  return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
+}
+
+// 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();
+  return trimmed ? trimmed : null;
+}
+function readPrivateRemoteSessionToken(projectRoot) {
+  const path = resolve2(projectRoot, ".rig", "state", "github-auth.json");
+  if (!existsSync2(path))
+    return null;
+  try {
+    const parsed = JSON.parse(readFileSync2(path, "utf8"));
+    return cleanToken(typeof parsed.apiSessionToken === "string" ? parsed.apiSessionToken : typeof parsed.sessionToken === "string" ? parsed.sessionToken : undefined);
+  } catch {
+    return null;
+  }
+}
+function readGitHubBearerTokenForRemote(projectRoot) {
+  const scopedKey = resolve2(projectRoot);
+  if (scopedGitHubBearerTokens.has(scopedKey))
+    return scopedGitHubBearerTokens.get(scopedKey) ?? null;
+  const privateSession = readPrivateRemoteSessionToken(projectRoot);
+  if (privateSession)
+    return privateSession;
+  return cleanToken(process.env.RIG_SERVER_AUTH_TOKEN) ?? cleanToken(process.env.RIG_REMOTE_AUTH_TOKEN);
+}
+function readStoredGitHubAuthToken(projectRoot) {
+  const path = resolve2(projectRoot, ".rig", "state", "github-auth.json");
+  if (!existsSync2(path))
+    return null;
+  try {
+    const parsed = JSON.parse(readFileSync2(path, "utf8"));
+    return cleanToken(typeof parsed.token === "string" ? parsed.token : undefined);
+  } catch {
+    return null;
+  }
+}
+function readLocalConnectionFallbackToken(projectRoot) {
+  return readGitHubBearerTokenForRemote(projectRoot) ?? cleanToken(process.env.RIG_GITHUB_TOKEN) ?? readStoredGitHubAuthToken(projectRoot);
+}
+async function ensureServerForCli(projectRoot) {
+  try {
+    const selected = resolveSelectedConnection(projectRoot);
+    if (selected?.connection.kind === "remote") {
+      const authToken = readGitHubBearerTokenForRemote(projectRoot);
+      const serverProjectRoot = selected.serverProjectRoot ?? await backfillRemoteServerProjectRoot(projectRoot, selected.connection.baseUrl, authToken);
+      return {
+        baseUrl: selected.connection.baseUrl,
+        authToken,
+        connectionKind: "remote",
+        serverProjectRoot
+      };
+    }
+    const connection = await ensureLocalRigServerConnection(projectRoot);
+    return {
+      baseUrl: connection.baseUrl,
+      authToken: connection.authToken ?? readLocalConnectionFallbackToken(projectRoot),
+      connectionKind: "local",
+      serverProjectRoot: resolve2(projectRoot)
+    };
+  } catch (error) {
+    if (error instanceof Error) {
+      throw new CliError(error.message, 1);
+    }
+    throw error;
+  }
+}
+async function backfillRemoteServerProjectRoot(projectRoot, baseUrl, authToken) {
+  const repo = readRepoConnection(projectRoot);
+  const slug = repo?.project?.trim();
+  if (!slug)
+    return null;
+  try {
+    const response = await fetch(`${baseUrl}/api/projects/${encodeURIComponent(slug)}`, {
+      headers: mergeHeaders(undefined, authToken)
+    });
+    if (!response.ok)
+      return null;
+    const payload = await response.json();
+    const project = payload.project && typeof payload.project === "object" && !Array.isArray(payload.project) ? payload.project : null;
+    const checkouts = Array.isArray(project?.checkouts) ? project.checkouts : [];
+    const latestCheckout = [...checkouts].reverse().find((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry) && typeof entry.path === "string"));
+    const path = typeof latestCheckout?.path === "string" && latestCheckout.path.trim() ? latestCheckout.path.trim() : null;
+    if (path)
+      writeRepoServerProjectRoot(projectRoot, path);
+    return path;
+  } catch {
+    return null;
+  }
+}
+function mergeHeaders(headers, authToken) {
+  const merged = new Headers(headers);
+  if (authToken) {
+    merged.set("authorization", `Bearer ${authToken}`);
+  }
+  return merged;
+}
+function diagnosticMessage(payload) {
+  if (!payload || typeof payload !== "object" || Array.isArray(payload))
+    return null;
+  const record = payload;
+  const diagnostics = Array.isArray(record.diagnostics) ? record.diagnostics : [];
+  const messages = diagnostics.flatMap((entry) => {
+    if (!entry || typeof entry !== "object" || Array.isArray(entry))
+      return [];
+    const diagnostic = entry;
+    const kind = typeof diagnostic.kind === "string" ? diagnostic.kind : "task-source";
+    const message = typeof diagnostic.message === "string" ? diagnostic.message : null;
+    return message ? [`${kind}: ${message}`] : [];
+  });
+  return messages.length > 0 ? messages.join("; ") : null;
+}
+var serverReachabilityCache = new Map;
+async function probeServerReachability(baseUrl, authToken) {
+  try {
+    const response = await fetch(`${baseUrl.replace(/\/+$/, "")}/api/server/status`, {
+      headers: mergeHeaders(undefined, authToken),
+      signal: AbortSignal.timeout(1500)
+    });
+    return response.ok;
+  } catch {
+    return false;
+  }
+}
+function cachedServerReachability(projectRoot, baseUrl, authToken) {
+  const key = resolve2(projectRoot);
+  const cached = serverReachabilityCache.get(key);
+  if (cached)
+    return cached;
+  const probe = probeServerReachability(baseUrl, authToken);
+  serverReachabilityCache.set(key, probe);
+  return probe;
+}
+function describeSelectedServer(projectRoot, server) {
+  try {
+    const selected = resolveSelectedConnection(projectRoot);
+    if (selected) {
+      return {
+        alias: selected.alias,
+        target: selected.connection.kind === "remote" ? selected.connection.baseUrl : server.baseUrl
+      };
+    }
+  } catch {}
+  return { alias: server.connectionKind === "remote" ? "remote" : "local", target: server.baseUrl };
+}
+async function buildServerFailureContext(projectRoot, server) {
+  const { alias, target } = describeSelectedServer(projectRoot, server);
+  const reachable = await cachedServerReachability(projectRoot, server.baseUrl, server.authToken);
+  const reachability = reachable ? "server is reachable" : "server is unreachable";
+  return {
+    contextLine: `Currently connected to: ${alias} at ${target} (${reachability}).`,
+    hint: "Check the selected server with `rig server status`, or switch with `rig server use <alias|local>`."
+  };
+}
+async function requestServerJson(context, pathname, init = {}) {
+  const server = await ensureServerForCli(context.projectRoot);
+  const headers = mergeHeaders(init.headers, server.authToken);
+  if (server.serverProjectRoot)
+    headers.set("x-rig-project-root", server.serverProjectRoot);
+  let response;
+  try {
+    response = await fetch(`${server.baseUrl}${pathname}`, {
+      ...init,
+      headers
+    });
+  } catch (error) {
+    const failure = await buildServerFailureContext(context.projectRoot, server);
+    throw new CliError(`Rig server request failed: ${error instanceof Error ? error.message : String(error)}
+${failure.contextLine}`, 1, { hint: failure.hint });
+  }
+  const text = await response.text();
+  const payload = text.trim().length > 0 ? (() => {
+    try {
+      return JSON.parse(text);
+    } catch {
+      return null;
+    }
+  })() : null;
+  if (!response.ok) {
+    const diagnostics = diagnosticMessage(payload);
+    const detail = diagnostics ?? (text || 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 });
+  }
+  return payload;
+}
 
 // packages/cli/src/commands/_cli-format.ts
 import { log, note } from "@clack/prompts";
@@ -512,90 +800,6 @@ function parseSinceOption(value, now = new Date) {
   }
   return new Date(parsed);
 }
-function median(values) {
-  if (values.length === 0)
-    return null;
-  const sorted = [...values].sort((left, right) => left - right);
-  const middle = Math.floor(sorted.length / 2);
-  const upper = sorted[middle];
-  if (sorted.length % 2 === 1)
-    return upper;
-  return (sorted[middle - 1] + upper) / 2;
-}
-function rate(part, total) {
-  if (total === 0)
-    return null;
-  return part / total;
-}
-function parseTimestamp(value) {
-  if (!value)
-    return null;
-  const parsed = Date.parse(value);
-  return Number.isFinite(parsed) ? parsed : null;
-}
-function computeRigStats(projectRoot, options = {}) {
-  const since = options.since ?? null;
-  const sinceMs = since ? since.getTime() : null;
-  const runs = listAuthorityRuns(projectRoot).filter((run) => {
-    if (sinceMs === null)
-      return true;
-    const createdAt = parseTimestamp(run.createdAt) ?? parseTimestamp(run.updatedAt);
-    return createdAt !== null && createdAt >= sinceMs;
-  });
-  const statusCounts = {};
-  const completionDurations = [];
-  let steeringTotal = 0;
-  let stallTotal = 0;
-  let approvalsApproved = 0;
-  let approvalsRejected = 0;
-  let approvalsPending = 0;
-  for (const run of runs) {
-    const status = run.status ?? "unknown";
-    statusCounts[status] = (statusCounts[status] ?? 0) + 1;
-    if (status === "completed") {
-      const createdAt = parseTimestamp(run.createdAt);
-      const completedAt = parseTimestamp(run.completedAt);
-      if (createdAt !== null && completedAt !== null && completedAt >= createdAt) {
-        completionDurations.push(completedAt - createdAt);
-      }
-    }
-    const projection = projectRunFromJournal(projectRoot, run.runId);
-    if (!projection)
-      continue;
-    steeringTotal += projection.steeringCount;
-    stallTotal += projection.stallCount;
-    approvalsPending += projection.pendingApprovals.length;
-    for (const resolved of projection.resolvedApprovals) {
-      if (resolved.decision === "approve")
-        approvalsApproved += 1;
-      else
-        approvalsRejected += 1;
-    }
-  }
-  const totalRuns = runs.length;
-  const completedRuns = statusCounts["completed"] ?? 0;
-  const failedRuns = statusCounts["failed"] ?? 0;
-  const needsAttentionRuns = statusCounts["needs-attention"] ?? 0;
-  return {
-    since: since ? since.toISOString() : null,
-    totalRuns,
-    statusCounts,
-    completedRuns,
-    failedRuns,
-    needsAttentionRuns,
-    completionRate: rate(completedRuns, totalRuns),
-    failureRate: rate(failedRuns, totalRuns),
-    needsAttentionRate: rate(needsAttentionRuns, totalRuns),
-    medianCompletionMs: median(completionDurations),
-    steeringTotal,
-    steeringPerRun: totalRuns === 0 ? null : steeringTotal / totalRuns,
-    stallTotal,
-    approvalsRequested: approvalsApproved + approvalsRejected + approvalsPending,
-    approvalsApproved,
-    approvalsRejected,
-    approvalsPending
-  };
-}
 function formatPercent(value) {
   if (value === null)
     return "\u2014";
@@ -653,7 +857,7 @@ async function executeStats(context, args) {
       const sinceResult = takeOption(pending, "--since");
       requireNoExtraArgs(sinceResult.rest, "rig stats [show] [--since <7d|30d|ISO date>]");
       const since = parseSinceOption(sinceResult.value);
-      const stats = computeRigStats(context.projectRoot, { since });
+      const stats = isRemoteConnectionSelected(context.projectRoot) ? await requestServerJson(context, `/api/stats${since ? `?since=${encodeURIComponent(since.toISOString())}` : ""}`) : computeRigStats(context.projectRoot, { since });
       if (context.outputMode === "text") {
         printFormattedOutput(formatStatsReport(stats));
       }

package/dist/src/commands.js

@@ -2730,6 +2730,9 @@ function writeRepoServerProjectRoot(projectRoot, serverProjectRoot) {
     return;
   writeRepoConnection(projectRoot, { ...repo, serverProjectRoot });
 }
+function isRemoteConnectionSelected(projectRoot) {
+  return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
+}
 
 // packages/cli/src/commands/_server-client.ts
 init_runner();
@@ -7656,9 +7659,6 @@ function normalizeRemoteRunDetails(payload) {
   };
 }
 var REMOTE_TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "stopped", "cancelled", "canceled", "closed", "merged"]);
-function isRemoteConnectionSelected(projectRoot) {
-  return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
-}
 async function listRunsForSelectedConnection(context, options = {}) {
   if (isRemoteConnectionSelected(context.projectRoot)) {
     return { runs: await listRunsViaServer(context, options), source: "server" };
@@ -8008,28 +8008,38 @@ async function executeRun(context, args) {
       };
     }
     case "resume": {
-      requireNoExtraArgs(rest, "rig run resume");
+      let pending = rest;
+      const runOpt = takeOption(pending, "--run");
+      pending = runOpt.rest;
+      const positional = pending[0] && !pending[0].startsWith("-") ? pending.shift() : undefined;
+      requireNoExtraArgs(pending, "rig run resume [<run-id>] [--run <id>]");
+      const targetRunId = runOpt.value ?? positional ?? null;
       if (context.dryRun) {
         if (context.outputMode === "text") {
           console.log("[dry-run] rig run resume");
         }
         return { ok: true, group: "run", command };
       }
-      const resumed = await runResume(context.projectRoot, runtimeContext);
+      const resumed = await runResume(context.projectRoot, runtimeContext, targetRunId);
       if (context.outputMode === "text") {
         console.log(`Resumed run: ${resumed.runId}`);
       }
       return { ok: true, group: "run", command, details: resumed };
     }
     case "restart": {
-      requireNoExtraArgs(rest, "rig run restart");
+      let pending = rest;
+      const runOpt = takeOption(pending, "--run");
+      pending = runOpt.rest;
+      const positional = pending[0] && !pending[0].startsWith("-") ? pending.shift() : undefined;
+      requireNoExtraArgs(pending, "rig run restart [<run-id>] [--run <id>]");
+      const targetRunId = runOpt.value ?? positional ?? null;
       if (context.dryRun) {
         if (context.outputMode === "text") {
           console.log("[dry-run] rig run restart");
         }
         return { ok: true, group: "run", command };
       }
-      const restarted = await runRestart(context.projectRoot, runtimeContext);
+      const restarted = await runRestart(context.projectRoot, runtimeContext, targetRunId);
       if (context.outputMode === "text") {
         console.log(`Restarted run: ${restarted.runId}`);
       }
@@ -8324,10 +8334,7 @@ async function executeServer(context, args, options) {
 // packages/cli/src/commands/stats.ts
 init_runner();
 import pc5 from "picocolors";
-import {
-  listAuthorityRuns as listAuthorityRuns3,
-  projectRunFromJournal
-} from "@rig/runtime/control-plane/authority-files";
+import { computeRigStats } from "@rig/runtime/control-plane/native/run-stats";
 
 // packages/cli/src/commands/_help-catalog.ts
 import { intro as intro3, log as log4, note as note4, outro as outro3 } from "@clack/prompts";
@@ -8816,90 +8823,6 @@ function parseSinceOption(value, now = new Date) {
   }
   return new Date(parsed);
 }
-function median(values) {
-  if (values.length === 0)
-    return null;
-  const sorted = [...values].sort((left, right) => left - right);
-  const middle = Math.floor(sorted.length / 2);
-  const upper = sorted[middle];
-  if (sorted.length % 2 === 1)
-    return upper;
-  return (sorted[middle - 1] + upper) / 2;
-}
-function rate(part, total) {
-  if (total === 0)
-    return null;
-  return part / total;
-}
-function parseTimestamp(value) {
-  if (!value)
-    return null;
-  const parsed = Date.parse(value);
-  return Number.isFinite(parsed) ? parsed : null;
-}
-function computeRigStats(projectRoot, options = {}) {
-  const since = options.since ?? null;
-  const sinceMs = since ? since.getTime() : null;
-  const runs = listAuthorityRuns3(projectRoot).filter((run) => {
-    if (sinceMs === null)
-      return true;
-    const createdAt = parseTimestamp(run.createdAt) ?? parseTimestamp(run.updatedAt);
-    return createdAt !== null && createdAt >= sinceMs;
-  });
-  const statusCounts = {};
-  const completionDurations = [];
-  let steeringTotal = 0;
-  let stallTotal = 0;
-  let approvalsApproved = 0;
-  let approvalsRejected = 0;
-  let approvalsPending = 0;
-  for (const run of runs) {
-    const status = run.status ?? "unknown";
-    statusCounts[status] = (statusCounts[status] ?? 0) + 1;
-    if (status === "completed") {
-      const createdAt = parseTimestamp(run.createdAt);
-      const completedAt = parseTimestamp(run.completedAt);
-      if (createdAt !== null && completedAt !== null && completedAt >= createdAt) {
-        completionDurations.push(completedAt - createdAt);
-      }
-    }
-    const projection = projectRunFromJournal(projectRoot, run.runId);
-    if (!projection)
-      continue;
-    steeringTotal += projection.steeringCount;
-    stallTotal += projection.stallCount;
-    approvalsPending += projection.pendingApprovals.length;
-    for (const resolved of projection.resolvedApprovals) {
-      if (resolved.decision === "approve")
-        approvalsApproved += 1;
-      else
-        approvalsRejected += 1;
-    }
-  }
-  const totalRuns = runs.length;
-  const completedRuns = statusCounts["completed"] ?? 0;
-  const failedRuns = statusCounts["failed"] ?? 0;
-  const needsAttentionRuns = statusCounts["needs-attention"] ?? 0;
-  return {
-    since: since ? since.toISOString() : null,
-    totalRuns,
-    statusCounts,
-    completedRuns,
-    failedRuns,
-    needsAttentionRuns,
-    completionRate: rate(completedRuns, totalRuns),
-    failureRate: rate(failedRuns, totalRuns),
-    needsAttentionRate: rate(needsAttentionRuns, totalRuns),
-    medianCompletionMs: median(completionDurations),
-    steeringTotal,
-    steeringPerRun: totalRuns === 0 ? null : steeringTotal / totalRuns,
-    stallTotal,
-    approvalsRequested: approvalsApproved + approvalsRejected + approvalsPending,
-    approvalsApproved,
-    approvalsRejected,
-    approvalsPending
-  };
-}
 function formatPercent(value) {
   if (value === null)
     return "\u2014";
@@ -8957,7 +8880,7 @@ async function executeStats(context, args) {
       const sinceResult = takeOption(pending, "--since");
       requireNoExtraArgs(sinceResult.rest, "rig stats [show] [--since <7d|30d|ISO date>]");
       const since = parseSinceOption(sinceResult.value);
-      const stats = computeRigStats(context.projectRoot, { since });
+      const stats = isRemoteConnectionSelected(context.projectRoot) ? await requestServerJson(context, `/api/stats${since ? `?since=${encodeURIComponent(since.toISOString())}` : ""}`) : computeRigStats(context.projectRoot, { since });
       if (context.outputMode === "text") {
         printFormattedOutput(formatStatsReport(stats));
       }

package/dist/src/index.js

@@ -2919,6 +2919,9 @@ function writeRepoServerProjectRoot(projectRoot, serverProjectRoot) {
     return;
   writeRepoConnection(projectRoot, { ...repo, serverProjectRoot });
 }
+function isRemoteConnectionSelected(projectRoot) {
+  return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
+}
 
 // packages/cli/src/commands/_server-client.ts
 init_runner();
@@ -7845,9 +7848,6 @@ function normalizeRemoteRunDetails(payload) {
   };
 }
 var REMOTE_TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "stopped", "cancelled", "canceled", "closed", "merged"]);
-function isRemoteConnectionSelected(projectRoot) {
-  return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
-}
 async function listRunsForSelectedConnection(context, options = {}) {
   if (isRemoteConnectionSelected(context.projectRoot)) {
     return { runs: await listRunsViaServer(context, options), source: "server" };
@@ -8197,28 +8197,38 @@ async function executeRun(context, args) {
       };
     }
     case "resume": {
-      requireNoExtraArgs(rest, "rig run resume");
+      let pending = rest;
+      const runOpt = takeOption(pending, "--run");
+      pending = runOpt.rest;
+      const positional = pending[0] && !pending[0].startsWith("-") ? pending.shift() : undefined;
+      requireNoExtraArgs(pending, "rig run resume [<run-id>] [--run <id>]");
+      const targetRunId = runOpt.value ?? positional ?? null;
       if (context.dryRun) {
         if (context.outputMode === "text") {
           console.log("[dry-run] rig run resume");
         }
         return { ok: true, group: "run", command };
       }
-      const resumed = await runResume(context.projectRoot, runtimeContext);
+      const resumed = await runResume(context.projectRoot, runtimeContext, targetRunId);
       if (context.outputMode === "text") {
         console.log(`Resumed run: ${resumed.runId}`);
       }
       return { ok: true, group: "run", command, details: resumed };
     }
     case "restart": {
-      requireNoExtraArgs(rest, "rig run restart");
+      let pending = rest;
+      const runOpt = takeOption(pending, "--run");
+      pending = runOpt.rest;
+      const positional = pending[0] && !pending[0].startsWith("-") ? pending.shift() : undefined;
+      requireNoExtraArgs(pending, "rig run restart [<run-id>] [--run <id>]");
+      const targetRunId = runOpt.value ?? positional ?? null;
       if (context.dryRun) {
         if (context.outputMode === "text") {
           console.log("[dry-run] rig run restart");
         }
         return { ok: true, group: "run", command };
       }
-      const restarted = await runRestart(context.projectRoot, runtimeContext);
+      const restarted = await runRestart(context.projectRoot, runtimeContext, targetRunId);
       if (context.outputMode === "text") {
         console.log(`Restarted run: ${restarted.runId}`);
       }
@@ -8513,10 +8523,7 @@ async function executeServer(context, args, options) {
 // packages/cli/src/commands/stats.ts
 init_runner();
 import pc5 from "picocolors";
-import {
-  listAuthorityRuns as listAuthorityRuns3,
-  projectRunFromJournal
-} from "@rig/runtime/control-plane/authority-files";
+import { computeRigStats } from "@rig/runtime/control-plane/native/run-stats";
 
 // packages/cli/src/commands/_help-catalog.ts
 import { intro as intro3, log as log4, note as note4, outro as outro3 } from "@clack/prompts";
@@ -9005,90 +9012,6 @@ function parseSinceOption(value, now = new Date) {
   }
   return new Date(parsed);
 }
-function median(values) {
-  if (values.length === 0)
-    return null;
-  const sorted = [...values].sort((left, right) => left - right);
-  const middle = Math.floor(sorted.length / 2);
-  const upper = sorted[middle];
-  if (sorted.length % 2 === 1)
-    return upper;
-  return (sorted[middle - 1] + upper) / 2;
-}
-function rate(part, total) {
-  if (total === 0)
-    return null;
-  return part / total;
-}
-function parseTimestamp(value) {
-  if (!value)
-    return null;
-  const parsed = Date.parse(value);
-  return Number.isFinite(parsed) ? parsed : null;
-}
-function computeRigStats(projectRoot, options = {}) {
-  const since = options.since ?? null;
-  const sinceMs = since ? since.getTime() : null;
-  const runs = listAuthorityRuns3(projectRoot).filter((run) => {
-    if (sinceMs === null)
-      return true;
-    const createdAt = parseTimestamp(run.createdAt) ?? parseTimestamp(run.updatedAt);
-    return createdAt !== null && createdAt >= sinceMs;
-  });
-  const statusCounts = {};
-  const completionDurations = [];
-  let steeringTotal = 0;
-  let stallTotal = 0;
-  let approvalsApproved = 0;
-  let approvalsRejected = 0;
-  let approvalsPending = 0;
-  for (const run of runs) {
-    const status = run.status ?? "unknown";
-    statusCounts[status] = (statusCounts[status] ?? 0) + 1;
-    if (status === "completed") {
-      const createdAt = parseTimestamp(run.createdAt);
-      const completedAt = parseTimestamp(run.completedAt);
-      if (createdAt !== null && completedAt !== null && completedAt >= createdAt) {
-        completionDurations.push(completedAt - createdAt);
-      }
-    }
-    const projection = projectRunFromJournal(projectRoot, run.runId);
-    if (!projection)
-      continue;
-    steeringTotal += projection.steeringCount;
-    stallTotal += projection.stallCount;
-    approvalsPending += projection.pendingApprovals.length;
-    for (const resolved of projection.resolvedApprovals) {
-      if (resolved.decision === "approve")
-        approvalsApproved += 1;
-      else
-        approvalsRejected += 1;
-    }
-  }
-  const totalRuns = runs.length;
-  const completedRuns = statusCounts["completed"] ?? 0;
-  const failedRuns = statusCounts["failed"] ?? 0;
-  const needsAttentionRuns = statusCounts["needs-attention"] ?? 0;
-  return {
-    since: since ? since.toISOString() : null,
-    totalRuns,
-    statusCounts,
-    completedRuns,
-    failedRuns,
-    needsAttentionRuns,
-    completionRate: rate(completedRuns, totalRuns),
-    failureRate: rate(failedRuns, totalRuns),
-    needsAttentionRate: rate(needsAttentionRuns, totalRuns),
-    medianCompletionMs: median(completionDurations),
-    steeringTotal,
-    steeringPerRun: totalRuns === 0 ? null : steeringTotal / totalRuns,
-    stallTotal,
-    approvalsRequested: approvalsApproved + approvalsRejected + approvalsPending,
-    approvalsApproved,
-    approvalsRejected,
-    approvalsPending
-  };
-}
 function formatPercent(value) {
   if (value === null)
     return "\u2014";
@@ -9146,7 +9069,7 @@ async function executeStats(context, args) {
       const sinceResult = takeOption(pending, "--since");
       requireNoExtraArgs(sinceResult.rest, "rig stats [show] [--since <7d|30d|ISO date>]");
       const since = parseSinceOption(sinceResult.value);
-      const stats = computeRigStats(context.projectRoot, { since });
+      const stats = isRemoteConnectionSelected(context.projectRoot) ? await requestServerJson(context, `/api/stats${since ? `?since=${encodeURIComponent(since.toISOString())}` : ""}`) : computeRigStats(context.projectRoot, { since });
       if (context.outputMode === "text") {
         printFormattedOutput(formatStatsReport(stats));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/cli",
-  "version": "0.0.6-alpha.65",
+  "version": "0.0.6-alpha.67",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -24,13 +24,13 @@
   "dependencies": {
     "@clack/prompts": "^1.2.0",
     "@earendil-works/pi-coding-agent": "0.79.0",
-    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.65",
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.65",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.65",
-    "@rig/pi-rig": "npm:@h-rig/pi-rig@0.0.6-alpha.65",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.65",
-    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.65",
-    "@rig/standard-plugin": "npm:@h-rig/standard-plugin@0.0.6-alpha.65",
+    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.67",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.67",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.67",
+    "@rig/pi-rig": "npm:@h-rig/pi-rig@0.0.6-alpha.67",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.67",
+    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.67",
+    "@rig/standard-plugin": "npm:@h-rig/standard-plugin@0.0.6-alpha.67",
     "effect": "4.0.0-beta.78",
     "picocolors": "^1.1.1"
   }