@h-rig/cli 0.0.6-alpha.64 → 0.0.6-alpha.66

package/dist/src/commands/task-report-bug.js

@@ -7,10 +7,19 @@ import pc from "picocolors";
 
 // packages/cli/src/runner.ts
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
-import { CliError } from "@rig/runtime/control-plane/errors";
+import { CliError as RuntimeCliError } from "@rig/runtime/control-plane/errors";
 import { evaluate, loadPolicy, resolveAction } from "@rig/runtime/control-plane/runtime/guard";
 import { buildBinary } from "@rig/runtime/control-plane/runtime/isolation";
-import { CliError as CliError2 } from "@rig/runtime/control-plane/errors";
+
+class CliError extends RuntimeCliError {
+  hint;
+  constructor(message, exitCode = 1, options = {}) {
+    super(message, exitCode);
+    if (options.hint?.trim()) {
+      this.hint = options.hint.trim();
+    }
+  }
+}
 function formatCommand(parts) {
   return parts.map((part) => /[^a-zA-Z0-9_./:-]/.test(part) ? JSON.stringify(part) : part).join(" ");
 }
@@ -34,7 +43,7 @@ function takeOption(args, option) {
     if (current === option) {
       const next = args[index + 1];
       if (!next || next.startsWith("-")) {
-        throw new CliError(`Missing value for ${option}`);
+        throw new CliError(`Missing value for ${option}`, 1, { hint: `Provide a value after ${option}, e.g. \`${option} <value>\`.` });
       }
       value = next;
       index += 1;
@@ -342,7 +351,7 @@ async function executeTaskReportBug(context, args) {
   const noBrowserFlag = takeFlag(pending, "--no-browser");
   pending = noBrowserFlag.rest;
   if (browserFlag.value && noBrowserFlag.value) {
-    throw new CliError2("Pass only one of --browser or --no-browser.");
+    throw new CliError("Pass only one of --browser or --no-browser.", 1, { hint: "Re-run `rig task report-bug` with just one of the flags." });
   }
   const overwriteFlag = takeFlag(pending, "--overwrite");
   pending = overwriteFlag.rest;
@@ -426,7 +435,7 @@ async function executeTaskReportBug(context, args) {
   const shouldPrompt = !noPromptFlag.value;
   if (shouldPrompt) {
     if (context.outputMode !== "text" || !process.stdin.isTTY || !process.stdout.isTTY) {
-      throw new CliError2("Interactive bug reporting requires a TTY in text mode. Pass --no-prompt with flags for automation.");
+      throw new CliError("Interactive bug reporting requires a TTY in text mode. Pass --no-prompt with flags for automation.");
     }
     draft = await promptForBugReportDetails(draft);
   }
@@ -530,7 +539,7 @@ function validateBugReportInputFiles(input) {
   for (const { path, label } of files.map((item) => ({ ...item, path: item.path.trim() })).filter((item) => item.path)) {
     const source = resolve3(input.projectRoot, path);
     if (!existsSync2(source)) {
-      throw new CliError2(`${label} does not exist: ${source}`);
+      throw new CliError(`${label} does not exist: ${source}`, 1, { hint: "Check the path and re-run `rig task report-bug` with an existing file." });
     }
   }
 }
@@ -570,7 +579,7 @@ function createBugReportBeadsTask(monorepoRoot, input, draft) {
   const issue = tryRunBrJson(monorepoRoot, command);
   if (!issue.ok) {
     if (!isRecoverableBeadsJsonlFailure(issue.error)) {
-      throw new CliError2(issue.error);
+      throw new CliError(issue.error);
     }
     return {
       issueId: generateBugReportIssueId(monorepoRoot, input.title),
@@ -581,7 +590,7 @@ function createBugReportBeadsTask(monorepoRoot, input, draft) {
   }
   const issueId = issue.value.id?.trim();
   if (!issueId) {
-    throw new CliError2("br create did not return an issue id.");
+    throw new CliError("br create did not return an issue id.", 1, { hint: "Re-run `rig task report-bug`; if it persists, file the bug via your task source directly." });
   }
   return {
     issueId,
@@ -688,12 +697,12 @@ ${serializedEntry}
   }
   const insertAt = raw.lastIndexOf("}");
   if (insertAt < 0) {
-    throw new CliError2(`Invalid task config JSON object: ${taskConfigPath}`);
+    throw new CliError(`Invalid task config JSON object: ${taskConfigPath}`, 1, { hint: "Fix or reset that file (it must be a JSON object), then re-run `rig task report-bug`." });
   }
   const before = raw.slice(0, insertAt).replace(/\s*$/, "");
   const after = raw.slice(insertAt + 1).trim();
   if (after) {
-    throw new CliError2(`Invalid trailing content in task config: ${taskConfigPath}`);
+    throw new CliError(`Invalid trailing content in task config: ${taskConfigPath}`, 1, { hint: "Remove the trailing content so the file is a single JSON object, then retry." });
   }
   const comma = before.trim() === "{" ? "" : ",";
   writeFileSync2(taskConfigPath, `${before}${comma}
@@ -761,7 +770,7 @@ function generateBugReportIssueId(monorepoRoot, title) {
       return id;
     }
   }
-  throw new CliError2("Could not generate a unique bug task id.");
+  throw new CliError("Could not generate a unique bug task id.", 1, { hint: "Re-run `rig task report-bug`; pass an explicit title to vary the generated id." });
 }
 function isRecoverableBeadsJsonlFailure(message) {
   return /Invalid JSON|missing field|JSONL is newer than DB|stale database/i.test(message);
@@ -769,7 +778,7 @@ function isRecoverableBeadsJsonlFailure(message) {
 function runBrJson(cwd, command) {
   const result = tryRunBrJson(cwd, command);
   if (!result.ok) {
-    throw new CliError2(result.error);
+    throw new CliError(result.error);
   }
   return result.value;
 }
@@ -967,7 +976,7 @@ async function promptBugSelect(message, options, initialValue) {
 function unwrapClackPrompt(result) {
   if (clack.isCancel(result)) {
     clack.cancel("Bug report cancelled.");
-    throw new CliError2("Bug report cancelled by user.");
+    throw new CliError("Bug report cancelled by user.");
   }
   return result;
 }
@@ -977,7 +986,7 @@ function normalizeBugEnvironmentChoice(environment) {
 function requireReportBugValue(value, option) {
   const normalized = value?.trim();
   if (!normalized) {
-    throw new CliError2(`Missing ${option}. Run interactively or pass ${option} <value>.`);
+    throw new CliError(`Missing ${option}. Run interactively or pass ${option} <value>.`);
   }
   return normalized;
 }
@@ -1058,7 +1067,7 @@ function takeRepeatedOption(args, option) {
     if (current === option) {
       const next = args[index + 1];
       if (!next || next.startsWith("-")) {
-        throw new CliError2(`Missing value for ${option}`);
+        throw new CliError(`Missing value for ${option}`, 1, { hint: `Provide a value after ${option}, e.g. \`${option} <value>\`.` });
       }
       values.push(next);
       index += 1;

package/dist/src/commands/task-run-driver.js

@@ -7,10 +7,19 @@ import { createInterface as createLineInterface } from "readline";
 
 // packages/cli/src/runner.ts
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
-import { CliError } from "@rig/runtime/control-plane/errors";
+import { CliError as RuntimeCliError } from "@rig/runtime/control-plane/errors";
 import { evaluate, loadPolicy, resolveAction } from "@rig/runtime/control-plane/runtime/guard";
 import { buildBinary } from "@rig/runtime/control-plane/runtime/isolation";
-import { CliError as CliError2 } from "@rig/runtime/control-plane/errors";
+
+class CliError extends RuntimeCliError {
+  hint;
+  constructor(message, exitCode = 1, options = {}) {
+    super(message, exitCode);
+    if (options.hint?.trim()) {
+      this.hint = options.hint.trim();
+    }
+  }
+}
 function formatCommand(parts) {
   return parts.map((part) => /[^a-zA-Z0-9_./:-]/.test(part) ? JSON.stringify(part) : part).join(" ");
 }
@@ -52,12 +61,13 @@ import {
 import { readFileSync } from "fs";
 import { resolve as resolve3 } from "path";
 import {
-  appendRunLifecycleEvent,
+  appendRunJournalEvent,
   appendRunLogEntry,
   appendRunTimelineEntry,
   patchAuthorityRunRecord,
   readAuthorityRun as readAuthorityRun2,
   resolveAuthorityRunDir,
+  setAuthorityRunStatus,
   writeJsonFile
 } from "@rig/runtime/control-plane/authority-files";
 import { taskLookup } from "@rig/runtime/control-plane/native/task-ops";
@@ -177,7 +187,17 @@ function upsertAgentAuthorityRun(projectRoot, input) {
 function patchAuthorityRun(projectRoot, runId, patch) {
   const next = patchAuthorityRunRecord(projectRoot, runId, patch);
   if (!next) {
-    throw new CliError2(`Run not found: ${runId}`, 2);
+    throw new CliError(`Run not found: ${runId}`, 2, { hint: "Run `rig run list` to see recorded runs." });
+  }
+  return next;
+}
+function setRunStatusOrFail(projectRoot, runId, to, options = {}) {
+  const next = setAuthorityRunStatus(projectRoot, runId, to, {
+    ...options,
+    actor: { kind: "agent" }
+  });
+  if (!next) {
+    throw new CliError(`Run not found: ${runId}`, 2, { hint: "Run `rig run list` to see recorded runs." });
   }
   return next;
 }
@@ -282,7 +302,12 @@ function emitServerRunEvent(event) {
   console.log(`__RIG_RUN_EVENT__${JSON.stringify({ ...event, at: new Date().toISOString() })}`);
   if (runEventSinkProjectRoot) {
     try {
-      appendRunLifecycleEvent(runEventSinkProjectRoot, event.runId, { ...event });
+      if (event.type === "status" || event.type === "completed" || event.type === "failed") {
+        appendRunJournalEvent(runEventSinkProjectRoot, event.runId, {
+          type: "timeline-entry",
+          payload: { kind: "driver-event", ...event }
+        });
+      }
     } catch {}
     ringServerRunDoorbell(event.runId);
   }
@@ -441,7 +466,7 @@ function readJsonFile(path) {
   try {
     return JSON.parse(readFileSync2(path, "utf8"));
   } catch (error) {
-    throw new CliError2(`Invalid Rig connection state at ${path}: ${error instanceof Error ? error.message : String(error)}`, 1);
+    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 writeJsonFile2(path, value) {
@@ -505,7 +530,7 @@ function resolveSelectedConnection(projectRoot, options = {}) {
   const global = readGlobalConnections(options);
   const connection = global.connections[repo.selected];
   if (!connection) {
-    throw new CliError2(`Selected Rig server "${repo.selected}" was not found. Run \`rig server list\` or \`rig server use local\`.`, 1);
+    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 };
 }
@@ -578,7 +603,7 @@ async function ensureServerForCli(projectRoot) {
     };
   } catch (error) {
     if (error instanceof Error) {
-      throw new CliError2(error.message, 1);
+      throw new CliError(error.message, 1);
     }
     throw error;
   }
@@ -628,15 +653,64 @@ function diagnosticMessage(payload) {
   });
   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 = resolve5(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);
-  const response = await fetch(`${server.baseUrl}${pathname}`, {
-    ...init,
-    headers
-  });
+  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 {
@@ -648,7 +722,9 @@ async function requestServerJson(context, pathname, init = {}) {
   if (!response.ok) {
     const diagnostics = diagnosticMessage(payload);
     const detail = diagnostics ?? (text || response.statusText);
-    throw new CliError2(`Rig server request failed (${response.status}): ${detail}`, 1);
+    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;
 }
@@ -1164,7 +1240,7 @@ function parsePositiveInt(value, option, fallback) {
   }
   const parsed = Number.parseInt(value, 10);
   if (!Number.isFinite(parsed) || parsed <= 0) {
-    throw new CliError2(`Invalid ${option} value: ${value}`);
+    throw new CliError(`Invalid ${option} value: ${value}`, 1, { hint: `Pass a positive integer, e.g. \`${option} 10\`.` });
   }
   return parsed;
 }
@@ -1581,8 +1657,8 @@ async function executeRigOwnedTaskRun(context, input) {
     runtimeAdapter: input.runtimeAdapter,
     status: resumeMode ? "preparing" : "created"
   });
+  setRunStatusOrFail(context.projectRoot, input.runId, "preparing", { reason: "driver-start" });
   patchAuthorityRun(context.projectRoot, input.runId, {
-    status: "preparing",
     startedAt,
     completedAt: null,
     errorText: null,
@@ -1720,7 +1796,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
     if (verificationStarted)
       return;
     verificationStarted = true;
-    patchAuthorityRun(context.projectRoot, input.runId, { status: "validating" });
+    setRunStatusOrFail(context.projectRoot, input.runId, "validating");
     emitServerRunEvent({ type: "status", runId: input.runId, status: "validating", detail: detail ?? null, ...sessionAnchor() });
     verificationAction = startRunAction(context.projectRoot, input.runId, {
       actionId: `action:${input.runId}:completion-verification`,
@@ -1733,7 +1809,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
     if (reviewStarted)
       return;
     reviewStarted = true;
-    patchAuthorityRun(context.projectRoot, input.runId, { status: "reviewing" });
+    setRunStatusOrFail(context.projectRoot, input.runId, "reviewing");
     emitServerRunEvent({ type: "status", runId: input.runId, status: "reviewing", detail: detail ?? null, ...sessionAnchor() });
     reviewAction = startRunAction(context.projectRoot, input.runId, {
       actionId: `action:${input.runId}:review-closeout`,
@@ -1767,8 +1843,8 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
         logsDir: latestLogsDir,
         contextFile: payload.contextFile ?? null
       });
+      setRunStatusOrFail(context.projectRoot, input.runId, "running");
       patchAuthorityRun(context.projectRoot, input.runId, {
-        status: "running",
         worktreePath: latestRuntimeWorkspace,
         artifactRoot: latestRuntimeWorkspace && input.taskId ? resolve6(latestRuntimeWorkspace, "artifacts", input.taskId) : null,
         logRoot: latestLogsDir,
@@ -2258,7 +2334,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
     }
     process.off("SIGTERM", forwardSigterm);
     if (attemptExit.error) {
-      throw new CliError2(`Task run failed to start: ${attemptExit.error.message}`, 1);
+      throw new CliError(`Task run failed to start: ${attemptExit.error.message}`, 1);
     }
     const retryContext = resolveTaskRunRetryContext({
       projectRoot: context.projectRoot,
@@ -2280,8 +2356,8 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
       currentPrompt = [retryContext.nextPrompt, "", "Rig Pi steering message:", retrySteering].join(`
 `);
       reviewFailureDetail = failureDetail;
+      setRunStatusOrFail(context.projectRoot, input.runId, "validating", { reason: "validation-retry" });
       patchAuthorityRun(context.projectRoot, input.runId, {
-        status: "validating",
         completedAt: null,
         errorText: null
       });
@@ -2317,10 +2393,10 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
     break;
   }
   if (!exit) {
-    throw new CliError2(`Task run for ${runtimeTaskId} exhausted ${maxAttempts} attempts without a terminal result.`, 1);
+    throw new CliError(`Task run for ${runtimeTaskId} exhausted ${maxAttempts} attempts without a terminal result.`, 1);
   }
   if (exit.error) {
-    throw new CliError2(`Task run failed to start: ${exit.error.message}`, 1);
+    throw new CliError(`Task run failed to start: ${exit.error.message}`, 1);
   }
   if (assistantText.trim()) {
     appendRunTimeline(context.projectRoot, input.runId, {
@@ -2347,9 +2423,9 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
       reviewAction.fail(failureDetail);
     }
     let terminalFailureDetail = failureDetail;
-    const terminalRunStatus = reviewFailureDetail ? "needs_attention" : "failed";
+    const terminalRunStatus = reviewFailureDetail ? "needs-attention" : "failed";
     try {
-      await updateTaskSourceAfterDriverRun(context.projectRoot, input.runId, input.taskId, sourceTask, "failed", terminalRunStatus === "needs_attention" ? "Rig task run needs attention." : "Rig task run failed.", {
+      await updateTaskSourceAfterDriverRun(context.projectRoot, input.runId, input.taskId, sourceTask, "failed", terminalRunStatus === "needs-attention" ? "Rig task run needs attention." : "Rig task run failed.", {
         latestRuntimeWorkspace,
         latestLogsDir,
         latestSessionDir,
@@ -2359,14 +2435,14 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
       terminalFailureDetail = `${failureDetail}
 Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${error instanceof Error ? error.message : String(error)}`;
     }
-    patchAuthorityRun(context.projectRoot, input.runId, {
-      status: terminalRunStatus,
-      completedAt: failedAt,
+    setRunStatusOrFail(context.projectRoot, input.runId, terminalRunStatus, {
+      reason: "driver-terminal-failure",
       errorText: terminalFailureDetail
     });
+    patchAuthorityRun(context.projectRoot, input.runId, { completedAt: failedAt });
     appendRunLog(context.projectRoot, input.runId, {
       id: `log:${input.runId}:${terminalRunStatus}`,
-      title: terminalRunStatus === "needs_attention" ? "Task run needs attention" : "Task run failed",
+      title: terminalRunStatus === "needs-attention" ? "Task run needs attention" : "Task run failed",
       detail: terminalFailureDetail,
       tone: "error",
       status: terminalRunStatus,
@@ -2377,7 +2453,7 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
       runId: input.runId,
       error: terminalFailureDetail
     });
-    throw new CliError2(terminalFailureDetail, exit.code ?? 1);
+    throw new CliError(terminalFailureDetail, exit.code ?? 1);
   }
   if (planningClassification.planningRequired) {
     const planWorkspace = latestRuntimeWorkspace ?? context.projectRoot;
@@ -2385,11 +2461,11 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
     if (!existsSync4(expectedPlanPath)) {
       const failedAt = new Date().toISOString();
       const failureDetail = `Planning was required (${planningClassification.reason}) but ${planningArtifactPath} was not written before implementation completed.`;
-      patchAuthorityRun(context.projectRoot, input.runId, {
-        status: "needs_attention",
-        completedAt: failedAt,
+      setRunStatusOrFail(context.projectRoot, input.runId, "needs-attention", {
+        reason: "plan-artifact-missing",
         errorText: failureDetail
       });
+      patchAuthorityRun(context.projectRoot, input.runId, { completedAt: failedAt });
       appendRunLog(context.projectRoot, input.runId, {
         id: `log:${input.runId}:plan-artifact-missing`,
         title: "Required plan artifact missing",
@@ -2399,7 +2475,7 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
         createdAt: failedAt
       });
       emitServerRunEvent({ type: "failed", runId: input.runId, error: failureDetail });
-      throw new CliError2(failureDetail, 1);
+      throw new CliError(failureDetail, 1);
     }
   }
   if (process.env.RIG_SERVER_OWNS_CLOSEOUT === "1") {
@@ -2420,14 +2496,13 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
       reviewAction.complete("Provider work accepted; server-owned closeout requested.");
     }
     const requestedAt = new Date().toISOString();
+    setRunStatusOrFail(context.projectRoot, input.runId, "closing-out", { reason: "server-closeout-requested" });
     patchAuthorityRun(context.projectRoot, input.runId, {
-      status: "reviewing",
       completedAt: null,
       errorText: null,
       serverCloseout: {
         status: "pending",
         phase: "queued",
-        requestedAt,
         updatedAt: requestedAt,
         runtimeWorkspace: latestRuntimeWorkspace,
         branch: latestRuntimeBranch,
@@ -2444,7 +2519,7 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
       payload: { runtimeWorkspace: latestRuntimeWorkspace, branch: latestRuntimeBranch }
     });
     emitServerRunEvent({ type: "log", runId: input.runId, title: "Server-owned closeout requested" });
-    emitServerRunEvent({ type: "status", runId: input.runId, status: "reviewing", detail: "Server-owned closeout requested.", ...sessionAnchor() });
+    emitServerRunEvent({ type: "status", runId: input.runId, status: "closing-out", detail: "Server-owned closeout requested.", ...sessionAnchor() });
     await context.emitEvent("command.finished", {
       command: [
         "rig",
@@ -2612,25 +2687,25 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
       const failureDetail = postValidation.pr?.actionableFeedback.join(`
 `) || "PR automation needs attention.";
       const failedAt = new Date().toISOString();
-      patchAuthorityRun(context.projectRoot, input.runId, {
-        status: "needs_attention",
-        completedAt: failedAt,
+      setRunStatusOrFail(context.projectRoot, input.runId, "needs-attention", {
+        reason: "pr-automation-needs-attention",
         errorText: failureDetail
       });
+      patchAuthorityRun(context.projectRoot, input.runId, { completedAt: failedAt });
       emitServerRunEvent({ type: "failed", runId: input.runId, error: failureDetail });
-      throw new CliError2(failureDetail, 1);
+      throw new CliError(failureDetail, 1);
     }
   } catch (error) {
-    if (error instanceof CliError2) {
+    if (error instanceof CliError) {
       throw error;
     }
     const failureDetail = `Failed to complete PR/issue closeout for ${input.taskId ?? runtimeTaskId}: ${error instanceof Error ? error.message : String(error)}`;
     const failedAt = new Date().toISOString();
-    patchAuthorityRun(context.projectRoot, input.runId, {
-      status: "failed",
-      completedAt: failedAt,
+    setRunStatusOrFail(context.projectRoot, input.runId, "failed", {
+      reason: "pr-closeout-failed",
       errorText: failureDetail
     });
+    patchAuthorityRun(context.projectRoot, input.runId, { completedAt: failedAt });
     appendRunLog(context.projectRoot, input.runId, {
       id: `log:${input.runId}:pr-closeout-failed`,
       title: "PR/issue closeout failed",
@@ -2640,7 +2715,7 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
       createdAt: failedAt
     });
     emitServerRunEvent({ type: "failed", runId: input.runId, error: failureDetail });
-    throw new CliError2(failureDetail, 1);
+    throw new CliError(failureDetail, 1);
   }
   if (verificationAction && !reviewStarted) {
     verificationAction.complete("Completion verification checks finished.");
@@ -2651,10 +2726,7 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
   if (reviewAction) {
     reviewAction.complete("Run marked completed.");
   }
-  patchAuthorityRun(context.projectRoot, input.runId, {
-    status: "completed",
-    completedAt: new Date().toISOString()
-  });
+  setRunStatusOrFail(context.projectRoot, input.runId, "completed", { reason: "driver-completed" });
   emitServerRunEvent({ type: "completed", runId: input.runId });
   await context.emitEvent("command.finished", {
     command: [