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

package/dist/src/index.js

@@ -101,12 +101,13 @@ async function runCommand(context, parts) {
   const envMode = process.env.RIG_BASH_MODE;
   const effectiveMode = context.policyMode || (envMode === "off" || envMode === "observe" || envMode === "enforce" ? envMode : loadPolicy(context.projectRoot).mode);
   const controlledPath = `${resolve(context.projectRoot, ".rig", "bin")}:${context.projectRoot}/rig/tools:${process.env.PATH ?? ""}`;
-  const controlledBash = await ensureAgentShellBinary(context.projectRoot);
+  const usesInfrastructureBinary = parts[0] === "rig-server";
+  const controlledBash = usesInfrastructureBinary ? null : await ensureAgentShellBinary(context.projectRoot);
   const commandEnv = [
     "env",
     `PATH=${controlledPath}`,
     `PROJECT_RIG_ROOT=${context.projectRoot}`,
-    `BASH=${controlledBash}`,
+    ...controlledBash ? [`BASH=${controlledBash}`] : [],
     `RIG_BASH_MODE=${effectiveMode}`,
     `RIG_POLICY_FILE=${resolve(context.projectRoot, "rig/policy/policy.json")}`,
     ...context.eventBus.getEventsFile() ? [`RIG_EVENTS_FILE=${context.eventBus.getEventsFile()}`] : []
@@ -2666,17 +2667,17 @@ function resolveSelectedConnection(projectRoot, options = {}) {
 }
 
 // packages/cli/src/commands/_server-client.ts
-import { spawnSync } from "child_process";
 import { existsSync as existsSync5, readFileSync as readFileSync3 } from "fs";
 import { resolve as resolve9 } from "path";
 import { ensureLocalRigServerConnection } from "@rig/runtime/local-server";
-var cachedGitHubBearerToken;
+var scopedGitHubBearerTokens = new Map;
 function cleanToken(value) {
   const trimmed = value?.trim();
   return trimmed ? trimmed : null;
 }
-function setGitHubBearerTokenForCurrentProcess(token) {
-  cachedGitHubBearerToken = cleanToken(token ?? undefined);
+function setGitHubBearerTokenForCurrentProcess(token, projectRoot) {
+  const scopedKey = resolve9(projectRoot ?? process.cwd());
+  scopedGitHubBearerTokens.set(scopedKey, cleanToken(token ?? undefined));
 }
 function readPrivateRemoteSessionToken(projectRoot) {
   const path = resolve9(projectRoot, ".rig", "state", "github-auth.json");
@@ -2690,25 +2691,13 @@ function readPrivateRemoteSessionToken(projectRoot) {
   }
 }
 function readGitHubBearerTokenForRemote(projectRoot) {
-  if (cachedGitHubBearerToken !== undefined)
-    return cachedGitHubBearerToken;
+  const scopedKey = resolve9(projectRoot);
+  if (scopedGitHubBearerTokens.has(scopedKey))
+    return scopedGitHubBearerTokens.get(scopedKey) ?? null;
   const privateSession = readPrivateRemoteSessionToken(projectRoot);
-  if (privateSession) {
-    cachedGitHubBearerToken = privateSession;
-    return cachedGitHubBearerToken;
-  }
-  const envToken = cleanToken(process.env.RIG_GITHUB_TOKEN) ?? cleanToken(process.env.GITHUB_TOKEN) ?? cleanToken(process.env.GH_TOKEN);
-  if (envToken) {
-    cachedGitHubBearerToken = envToken;
-    return cachedGitHubBearerToken;
-  }
-  const result = spawnSync("gh", ["auth", "token"], {
-    encoding: "utf8",
-    timeout: 5000,
-    stdio: ["ignore", "pipe", "ignore"]
-  });
-  cachedGitHubBearerToken = result.status === 0 ? cleanToken(result.stdout) : null;
-  return cachedGitHubBearerToken;
+  if (privateSession)
+    return privateSession;
+  return cleanToken(process.env.RIG_SERVER_AUTH_TOKEN) ?? cleanToken(process.env.RIG_REMOTE_AUTH_TOKEN);
 }
 async function ensureServerForCli(projectRoot) {
   try {
@@ -2846,16 +2835,36 @@ async function registerProjectViaServer(context, input) {
 function sleep(ms) {
   return new Promise((resolve10) => setTimeout(resolve10, ms));
 }
+function isRetryableProjectRootSwitchError(error) {
+  if (!(error instanceof Error))
+    return false;
+  const message = error.message.toLowerCase();
+  return message.includes("rig server request failed (401): auth-required") || message.includes("rig server request failed (401): github-token-required") || message.includes("rig server request failed (502)") || message.includes("rig server request failed (503)") || message.includes("bad gateway") || message.includes("fetch failed") || message.includes("econnrefused") || message.includes("connection refused");
+}
 async function switchServerProjectRootViaServer(context, projectRoot, options = {}) {
-  const switched = await requestServerJson(context, "/api/server/project-root", {
-    method: "POST",
-    headers: { "content-type": "application/json" },
-    body: JSON.stringify({ projectRoot })
-  });
   const timeoutMs = options.timeoutMs ?? 30000;
   const pollMs = options.pollMs ?? 1000;
   const deadline = Date.now() + timeoutMs;
   let lastError;
+  let switched = null;
+  while (Date.now() < deadline) {
+    try {
+      switched = await requestServerJson(context, "/api/server/project-root", {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ projectRoot })
+      });
+      break;
+    } catch (error) {
+      lastError = error;
+      if (!isRetryableProjectRootSwitchError(error))
+        throw error;
+      await sleep(pollMs);
+    }
+  }
+  if (!switched) {
+    throw new CliError2(`Rig server did not accept project-root switch to ${projectRoot} before timeout (${lastError instanceof Error ? lastError.message : String(lastError ?? "no response")}).`, 1);
+  }
   while (Date.now() < deadline) {
     try {
       const status = await requestServerJson(context, "/api/server/status");
@@ -2873,6 +2882,14 @@ async function switchServerProjectRootViaServer(context, projectRoot, options =
   }
   throw new CliError2(`Rig server did not switch to ${projectRoot} before timeout (${lastError instanceof Error ? lastError.message : String(lastError ?? "no status")}).`, 1);
 }
+async function listRunsViaServer(context, options = {}) {
+  const url = new URL("http://rig.local/api/runs");
+  if (options.limit !== undefined)
+    url.searchParams.set("limit", String(options.limit));
+  const payload = await requestServerJson(context, `${url.pathname}${url.search}`);
+  const runs = Array.isArray(payload) ? payload : payload && typeof payload === "object" && !Array.isArray(payload) && Array.isArray(payload.runs) ? payload.runs : [];
+  return runs.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry)));
+}
 async function getRunDetailsViaServer(context, runId) {
   const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}`);
   return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
@@ -2886,6 +2903,37 @@ async function getRunLogsViaServer(context, runId, options = {}) {
   const payload = await requestServerJson(context, `${url.pathname}${url.search}`);
   return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { entries: [] };
 }
+async function getRunTimelineViaServer(context, runId, options = {}) {
+  const url = new URL(`http://rig.local/api/runs/${encodeURIComponent(runId)}/timeline`);
+  if (options.limit !== undefined)
+    url.searchParams.set("limit", String(options.limit));
+  if (options.cursor)
+    url.searchParams.set("cursor", options.cursor);
+  const payload = await requestServerJson(context, `${url.pathname}${url.search}`);
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { entries: [] };
+}
+async function ensureTaskLabelsViaServer(context) {
+  const payload = await requestServerJson(context, "/api/workspace/task-labels", { method: "POST" });
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
+}
+async function listGitHubProjectsViaServer(context, owner) {
+  const url = new URL("http://rig.local/api/github/projects");
+  url.searchParams.set("owner", owner);
+  const payload = await requestServerJson(context, `${url.pathname}${url.search}`);
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { projects: [] };
+}
+async function getGitHubProjectStatusFieldViaServer(context, projectId) {
+  const payload = await requestServerJson(context, `/api/github/projects/${encodeURIComponent(projectId)}/status-field`);
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
+}
+async function updateWorkspaceTaskViaServer(context, input) {
+  const payload = await requestServerJson(context, "/api/tasks/update", {
+    method: "POST",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify(input)
+  });
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { ok: true };
+}
 async function stopRunViaServer(context, runId) {
   const payload = await requestServerJson(context, "/api/runs/stop", {
     method: "POST",
@@ -2938,7 +2986,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';
 `;
@@ -2966,7 +3015,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) {
@@ -3082,7 +3131,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;
@@ -3165,6 +3214,9 @@ function permissionAllowsPr(payload) {
   }
   return null;
 }
+function isNotFoundError(error) {
+  return /\b(404|not found)\b/i.test(message(error));
+}
 function projectCheckoutReady(payload) {
   if (!payload || typeof payload !== "object" || Array.isArray(payload))
     return null;
@@ -3197,19 +3249,33 @@ async function runFastTaskRunPreflight(context, options = {}) {
   const checks = [];
   const request = options.requestJson ?? ((pathname, init) => requestServerJson(context, pathname, init));
   const taskId = options.taskId?.trim() || null;
+  const requiresCurrentRunApi = Boolean(taskId);
+  const selectedServer = options.requestJson ? null : await ensureServerForCli(context.projectRoot).catch(() => null);
+  const allowLocalLegacyTaskRunCompatibility = selectedServer?.connectionKind === "local";
+  let legacyServerCompatibility = false;
   try {
     await request("/api/server/status");
     checks.push(preflightCheck("server", "Rig server reachable", "pass"));
   } catch (error) {
-    checks.push(preflightCheck("server", "Rig server reachable", "fail", message(error), "Start or select a reachable Rig server."));
+    if (isNotFoundError(error)) {
+      try {
+        await request("/health");
+        legacyServerCompatibility = !requiresCurrentRunApi || allowLocalLegacyTaskRunCompatibility;
+        checks.push(requiresCurrentRunApi && !allowLocalLegacyTaskRunCompatibility ? preflightCheck("server", "Rig server reachable", "fail", "legacy /health endpoint only; current task-run APIs are required", "Upgrade/select the Rig server before launching a task run.") : preflightCheck("server", "Rig server reachable", "pass", allowLocalLegacyTaskRunCompatibility ? "local legacy /health endpoint; submit endpoint will be authoritative" : "legacy /health endpoint"));
+      } catch (healthError) {
+        checks.push(preflightCheck("server", "Rig server reachable", "fail", message(healthError), "Start or select a reachable Rig server."));
+      }
+    } else {
+      checks.push(preflightCheck("server", "Rig server reachable", "fail", message(error), "Start or select a reachable Rig server."));
+    }
   }
   const repo = readRepoConnection(context.projectRoot);
-  checks.push(repo ? preflightCheck("project-link", "project linked to Rig connection", repo.project ? "pass" : "warn", `${repo.selected}${repo.project ? ` -> ${repo.project}` : ""}`, "Run `rig init --yes --repo owner/repo` to record the GitHub repo slug.") : preflightCheck("project-link", "project linked to Rig connection", "fail", "missing .rig/state/connection.json", "Run `rig init` or `rig connect use <alias|local>`."));
+  checks.push(repo ? preflightCheck("project-link", "project linked to Rig connection", repo.project ? "pass" : "warn", `${repo.selected}${repo.project ? ` -> ${repo.project}` : ""}`, "Run `rig init --yes --repo owner/repo` to record the GitHub repo slug.") : preflightCheck("project-link", "project linked to Rig connection", legacyServerCompatibility ? "warn" : "fail", "missing .rig/state/connection.json", "Run `rig init` or `rig connect use <alias|local>`."));
   try {
     const auth = await request("/api/github/auth/status");
-    checks.push(isAuthenticated(auth) ? preflightCheck("github-auth", "GitHub auth valid", "pass") : preflightCheck("github-auth", "GitHub auth valid", "fail", "not authenticated", "Run `rig github auth import-gh` or `rig github auth token --token <token>`."));
+    checks.push(isAuthenticated(auth) ? preflightCheck("github-auth", "GitHub auth valid", "pass") : preflightCheck("github-auth", "GitHub auth valid", legacyServerCompatibility ? "warn" : "fail", "not authenticated", "Run `rig github auth import-gh` or `rig github auth token --token <token>`."));
   } catch (error) {
-    checks.push(preflightCheck("github-auth", "GitHub auth valid", "fail", message(error), "Fix GitHub auth on the selected Rig server."));
+    checks.push(preflightCheck("github-auth", "GitHub auth valid", legacyServerCompatibility ? "warn" : "fail", message(error), "Fix GitHub auth on the selected Rig server."));
   }
   try {
     const projection = await request("/api/workspace/task-projection");
@@ -3237,9 +3303,9 @@ async function runFastTaskRunPreflight(context, options = {}) {
     try {
       const tasks = await request(`/api/workspace/tasks?limit=200&refresh=1`);
       const found = Array.isArray(tasks) && tasks.some((task) => taskMatchesId(task, taskId));
-      checks.push(found ? preflightCheck("issue", "task/issue accessible", "pass", taskId) : preflightCheck("issue", "task/issue accessible", "fail", taskId, "Confirm the issue exists and matches the configured task filters."));
+      checks.push(found ? preflightCheck("issue", "task/issue accessible", "pass", taskId) : preflightCheck("issue", "task/issue accessible", legacyServerCompatibility ? "warn" : "fail", taskId, "Confirm the issue exists and matches the configured task filters."));
     } catch (error) {
-      checks.push(preflightCheck("issue", "task/issue accessible", "fail", message(error), "Fix the task source before launching a run."));
+      checks.push(preflightCheck("issue", "task/issue accessible", legacyServerCompatibility ? "warn" : "fail", message(error), "Fix the task source before launching a run."));
     }
     try {
       const runs = await request("/api/runs?limit=200");
@@ -3442,6 +3508,7 @@ function upsertAgentAuthorityRun(projectRoot, input) {
   const runtimeAdapter = normalizeRuntimeAdapter(input.runtimeAdapter ?? existing?.runtimeAdapter ?? "claude-code");
   const title = resolveTaskTitleForAuthorityRun(projectRoot, input.taskId) ?? input.taskId;
   const next = {
+    ...existing ?? {},
     runId: input.runId,
     projectRoot,
     workspaceId: existing?.workspaceId ?? RIG_WORKSPACE_ID,
@@ -4150,9 +4217,10 @@ async function executeInbox(context, args) {
 
 // packages/cli/src/commands/init.ts
 import { appendFileSync as appendFileSync2, existsSync as existsSync10, mkdirSync as mkdirSync7, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
-import { spawnSync as spawnSync2 } from "child_process";
+import { spawnSync } from "child_process";
 import { resolve as resolve17 } from "path";
 import { buildRigInitConfigSource } from "@rig/core";
+import { listGitHubProjects as listGitHubProjectsDirect, resolveProjectStatusField as resolveProjectStatusFieldDirect } from "@rig/server";
 
 // packages/cli/src/commands/_snapshot-upload.ts
 import { mkdir, readdir, readFile, writeFile } from "fs/promises";
@@ -4466,6 +4534,7 @@ function countDoctorFailures(checks) {
 
 // packages/cli/src/commands/init.ts
 var RIG_CONFIG_PACKAGE_DIST_TAG = "latest";
+var DEFAULT_REMOTE_RIG_URL = "https://where.rig-does.work";
 var RIG_CONFIG_DEV_DEPENDENCIES = {
   "@rig/core": `npm:@h-rig/core@${RIG_CONFIG_PACKAGE_DIST_TAG}`,
   "@rig/standard-plugin": `npm:@h-rig/standard-plugin@${RIG_CONFIG_PACKAGE_DIST_TAG}`
@@ -4476,7 +4545,7 @@ function parseRepoSlugFromRemote(remoteUrl) {
   return gitHubMatch ? `${gitHubMatch[1]}/${gitHubMatch[2]}` : null;
 }
 function detectOriginRepoSlug(projectRoot) {
-  const result = spawnSync2("git", ["-C", projectRoot, "remote", "get-url", "origin"], { encoding: "utf8" });
+  const result = spawnSync("git", ["-C", projectRoot, "remote", "get-url", "origin"], { encoding: "utf8" });
   if (result.status !== 0)
     return null;
   return parseRepoSlugFromRemote(result.stdout.trim());
@@ -4532,11 +4601,14 @@ function applyGitHubProjectConfig(source, options) {
     return source;
   const projectId = JSON.stringify(options.githubProject);
   const statusFieldId = JSON.stringify(options.githubProjectStatusField ?? "Status");
+  const statuses = options.githubProjectStatuses && Object.keys(options.githubProjectStatuses).length > 0 ? `
+      statuses: ${JSON.stringify(options.githubProjectStatuses, null, 8).replace(/\n/g, `
+      `)},` : "";
   return source.replace(`    projects: { enabled: false },`, [
     `    projects: {`,
     `      enabled: true,`,
     `      projectId: ${projectId},`,
-    `      statusFieldId: ${statusFieldId},`,
+    `      statusFieldId: ${statusFieldId},${statuses}`,
     `    },`
   ].join(`
 `));
@@ -4557,21 +4629,41 @@ function checkoutForInit(projectRoot, serverKind, strategy) {
   }
 }
 function detectGhLogin() {
-  const result = spawnSync2("gh", ["api", "user", "--jq", ".login"], { encoding: "utf8", timeout: 5000, stdio: ["ignore", "pipe", "ignore"] });
+  const result = spawnSync("gh", ["api", "user", "--jq", ".login"], { encoding: "utf8", timeout: 5000, stdio: ["ignore", "pipe", "ignore"] });
   return result.status === 0 && result.stdout.trim() ? result.stdout.trim() : null;
 }
 function readGhAuthToken() {
-  const result = spawnSync2("gh", ["auth", "token"], { encoding: "utf8" });
+  const result = spawnSync("gh", ["auth", "token"], { encoding: "utf8" });
   if (result.status !== 0 || !result.stdout.trim()) {
     throw new CliError2(result.stderr.trim() || "Could not read GitHub token from `gh auth token`.", result.status || 1);
   }
   return result.stdout.trim();
 }
+function refreshGhProjectScopesAndReadToken() {
+  const result = spawnSync("gh", ["auth", "refresh", "--scopes", "read:project"], {
+    encoding: "utf8",
+    stdio: ["inherit", "pipe", "pipe"]
+  });
+  if (result.status !== 0)
+    return null;
+  try {
+    return readGhAuthToken();
+  } catch {
+    return null;
+  }
+}
 async function loadClackPrompts() {
   return await import("@clack/prompts");
 }
+function clackTextOptions(options) {
+  return {
+    message: options.message,
+    ...options.placeholder ? { placeholder: options.placeholder } : {},
+    ...(options.initialValue ?? options.defaultValue)?.trim() ? { initialValue: (options.initialValue ?? options.defaultValue).trim() } : {}
+  };
+}
 async function promptRequiredText(prompts, options) {
-  const value = await prompts.text(options);
+  const value = await prompts.text(clackTextOptions(options));
   if (prompts.isCancel(value))
     throw new CliError2("Init cancelled.", 1);
   const text2 = String(value ?? "").trim();
@@ -4580,7 +4672,7 @@ async function promptRequiredText(prompts, options) {
   return text2;
 }
 async function promptOptionalText(prompts, options) {
-  const value = await prompts.text(options);
+  const value = await prompts.text(clackTextOptions(options));
   if (prompts.isCancel(value))
     throw new CliError2("Init cancelled.", 1);
   return String(value ?? "").trim();
@@ -4591,6 +4683,164 @@ async function promptSelect(prompts, options) {
     throw new CliError2("Init cancelled.", 1);
   return String(value);
 }
+function repoOwnerFromSlug(repoSlug) {
+  return repoSlug.trim().match(/^([^/]+)\/[^/]+$/)?.[1] ?? null;
+}
+function recordArray(value, key) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return [];
+  const raw = value[key];
+  return Array.isArray(raw) ? raw.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
+}
+async function listGitHubProjectsForInit(context, owner, token) {
+  if (token?.trim()) {
+    try {
+      return { ok: true, projects: await listGitHubProjectsDirect({ owner, token: token.trim() }) };
+    } catch (directError) {
+      const serverPayload = await listGitHubProjectsViaServer(context, owner).catch(() => null);
+      if (recordArray(serverPayload, "projects").length > 0)
+        return serverPayload;
+      return { ok: false, error: directError instanceof Error ? directError.message : String(directError), projects: [] };
+    }
+  }
+  return listGitHubProjectsViaServer(context, owner);
+}
+async function getGitHubProjectStatusFieldForInit(context, projectId, token) {
+  if (token?.trim()) {
+    try {
+      return { ok: true, field: await resolveProjectStatusFieldDirect({ projectId, token: token.trim() }) };
+    } catch (directError) {
+      const serverPayload = await getGitHubProjectStatusFieldViaServer(context, projectId).catch(() => null);
+      if (serverPayload && typeof serverPayload === "object" && !Array.isArray(serverPayload) && "field" in serverPayload) {
+        return serverPayload;
+      }
+      return { ok: false, error: directError instanceof Error ? directError.message : String(directError) };
+    }
+  }
+  return getGitHubProjectStatusFieldViaServer(context, projectId);
+}
+var PROJECT_STATUS_PROMPTS = {
+  running: "Running/In progress",
+  prOpen: "PR open/review",
+  ciFixing: "CI/review fixing",
+  merging: "Merging",
+  done: "Done",
+  needsAttention: "Needs attention"
+};
+var DEFAULT_PROJECT_STATUS_OPTIONS = {
+  running: "In Progress",
+  prOpen: "In Review",
+  ciFixing: "In Review",
+  merging: "Merging",
+  done: "Done",
+  needsAttention: "Needs Attention"
+};
+async function promptManualProjectStatusMapping(prompts) {
+  const statuses = {};
+  for (const [key, label] of Object.entries(PROJECT_STATUS_PROMPTS)) {
+    const defaultLabel = DEFAULT_PROJECT_STATUS_OPTIONS[key] ?? label;
+    const value = await promptOptionalText(prompts, {
+      message: `Project status option id/name for ${label} (blank for ${defaultLabel})`,
+      placeholder: defaultLabel
+    });
+    statuses[key] = value || defaultLabel;
+  }
+  return statuses;
+}
+function projectScopeError(value) {
+  const text2 = typeof value === "string" ? value : JSON.stringify(value ?? "");
+  return /INSUFFICIENT_SCOPES|read:project|required scopes/i.test(text2);
+}
+function optionName(option) {
+  return String(option.name ?? option.label ?? option.id ?? "").trim();
+}
+function autoProjectStatusValue(options, key, label) {
+  const candidates = [DEFAULT_PROJECT_STATUS_OPTIONS[key], label].filter((value) => Boolean(value)).map((value) => value.trim().toLowerCase());
+  const match = options.find((option) => candidates.includes(optionName(option).toLowerCase()));
+  if (!match)
+    return null;
+  return String(match.id ?? match.name);
+}
+async function promptGitHubProjectConfig(context, prompts, repoSlug, githubToken, refreshProjectToken) {
+  const projectChoice = await promptSelect(prompts, {
+    message: "GitHub Projects status sync",
+    initialValue: "select",
+    options: [
+      { value: "select", label: "Select accessible ProjectV2" },
+      { value: "off", label: "Off" },
+      { value: "manual", label: "Enter ProjectV2 ids manually" }
+    ]
+  });
+  if (projectChoice === "off")
+    return { githubProject: "off" };
+  if (projectChoice === "manual") {
+    return {
+      githubProject: await promptRequiredText(prompts, { message: "GitHub ProjectV2 id", placeholder: "PVT_..." }),
+      githubProjectStatusField: await promptRequiredText(prompts, { message: "Project Status field id", placeholder: "field_status" }),
+      githubProjectStatuses: await promptManualProjectStatusMapping(prompts)
+    };
+  }
+  const owner = repoOwnerFromSlug(repoSlug);
+  if (!owner)
+    throw new CliError2(`Cannot derive GitHub owner from repo slug ${repoSlug}.`, 1);
+  let activeToken = githubToken?.trim() || null;
+  let projectsPayload = await listGitHubProjectsForInit(context, owner, activeToken).catch((error) => ({ ok: false, error: error instanceof Error ? error.message : String(error), projects: [] }));
+  let projects = recordArray(projectsPayload, "projects");
+  if (projects.length === 0 && projectScopeError(projectsPayload.error) && refreshProjectToken) {
+    prompts.outro?.("GitHub token is missing read:project; refreshing gh auth scopes and retrying Projects.");
+    const refreshedToken = refreshProjectToken();
+    if (refreshedToken) {
+      activeToken = refreshedToken;
+      projectsPayload = await listGitHubProjectsForInit(context, owner, activeToken).catch((error) => ({ ok: false, error: error instanceof Error ? error.message : String(error), projects: [] }));
+      projects = recordArray(projectsPayload, "projects");
+    }
+  }
+  if (projects.length === 0) {
+    const error = typeof projectsPayload.error === "string" ? ` (${String(projectsPayload.error).replace(/\s+/g, " ").slice(0, 240)})` : "";
+    prompts.outro?.(`No accessible GitHub Projects were returned${error}; continuing with GitHub Projects status sync off.`);
+    return { githubProject: "off", ...activeToken ? { githubToken: activeToken } : {} };
+  }
+  const selectedProjectId = await promptSelect(prompts, {
+    message: "GitHub ProjectV2 project",
+    options: [
+      ...projects.map((project) => ({
+        value: String(project.id),
+        label: `${String(project.title ?? "Untitled project")} (#${String(project.number ?? "?")})`,
+        hint: typeof project.url === "string" ? project.url : undefined
+      })),
+      { value: "manual", label: "Enter ProjectV2 id manually" }
+    ]
+  });
+  const projectId = selectedProjectId === "manual" ? await promptRequiredText(prompts, { message: "GitHub ProjectV2 id", placeholder: "PVT_..." }) : selectedProjectId;
+  const fieldPayload = await getGitHubProjectStatusFieldForInit(context, projectId, activeToken).catch((error) => ({ ok: false, error: error instanceof Error ? error.message : String(error) }));
+  const fieldPayloadRecord = fieldPayload && typeof fieldPayload === "object" && !Array.isArray(fieldPayload) ? fieldPayload : {};
+  const rawField = fieldPayloadRecord.field;
+  const field = rawField && typeof rawField === "object" && !Array.isArray(rawField) ? rawField : null;
+  const fieldId = typeof field?.id === "string" && field.id.trim() ? field.id : await promptRequiredText(prompts, { message: "Project Status field id", placeholder: "field_status" });
+  const options = Array.isArray(field?.options) ? field.options.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
+  if (options.length === 0) {
+    return {
+      githubProject: projectId,
+      githubProjectStatusField: fieldId,
+      githubProjectStatuses: await promptManualProjectStatusMapping(prompts),
+      ...activeToken ? { githubToken: activeToken } : {}
+    };
+  }
+  const statuses = {};
+  for (const [key, label] of Object.entries(PROJECT_STATUS_PROMPTS)) {
+    const auto = autoProjectStatusValue(options, key, label);
+    statuses[key] = auto ?? await promptSelect(prompts, {
+      message: `Project status option for ${label}`,
+      options: options.map((option) => ({ value: String(option.id ?? option.name), label: optionName(option) }))
+    });
+  }
+  return {
+    githubProject: projectId,
+    githubProjectStatusField: fieldId,
+    githubProjectStatuses: Object.keys(statuses).length > 0 ? statuses : undefined,
+    ...activeToken ? { githubToken: activeToken } : {}
+  };
+}
 function sleep2(ms) {
   return new Promise((resolve18) => setTimeout(resolve18, ms));
 }
@@ -4604,12 +4854,29 @@ function apiSessionTokenFrom(payload) {
   const token = payload.apiSessionToken;
   return typeof token === "string" && token.trim() ? token.trim() : null;
 }
+function cleanPayloadString(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+function remoteGitHubAuthMetadata(payload) {
+  if (!payload)
+    return {};
+  const userNamespace = payload.userNamespace && typeof payload.userNamespace === "object" && !Array.isArray(payload.userNamespace) ? payload.userNamespace : null;
+  return {
+    ...cleanPayloadString(payload.login) ? { login: cleanPayloadString(payload.login) } : {},
+    ...cleanPayloadString(payload.userId) ? { userId: cleanPayloadString(payload.userId) } : {},
+    ...cleanPayloadString(userNamespace?.key) ? { userNamespaceKey: cleanPayloadString(userNamespace?.key) } : {},
+    ...cleanPayloadString(userNamespace?.root) ? { userNamespaceRoot: cleanPayloadString(userNamespace?.root) } : {},
+    ...cleanPayloadString(userNamespace?.checkoutBaseDir) ? { checkoutBaseDir: cleanPayloadString(userNamespace?.checkoutBaseDir) } : {},
+    ...cleanPayloadString(userNamespace?.snapshotBaseDir) ? { snapshotBaseDir: cleanPayloadString(userNamespace?.snapshotBaseDir) } : {}
+  };
+}
 function writeRemoteGitHubAuthState(projectRoot, input) {
   writeFileSync5(resolve17(projectRoot, ".rig", "state", "github-auth.json"), `${JSON.stringify({
     authenticated: true,
     source: input.source,
     storedOnServer: true,
     selectedRepo: input.selectedRepo,
+    ...remoteGitHubAuthMetadata(input.authPayload ?? null),
     ...input.apiSessionToken ? { apiSessionToken: input.apiSessionToken } : {},
     updatedAt: new Date().toISOString()
   }, null, 2)}
@@ -4702,12 +4969,13 @@ async function runControlPlaneInit(context, options) {
   if (token) {
     githubAuth = await postGitHubTokenViaServer(context, token, { selectedRepo: repo.slug });
     const apiSessionToken = apiSessionTokenFrom(githubAuth);
-    setGitHubBearerTokenForCurrentProcess(apiSessionToken ?? token);
+    setGitHubBearerTokenForCurrentProcess(apiSessionToken ?? token, projectRoot);
     if (serverKind === "remote") {
       writeRemoteGitHubAuthState(projectRoot, {
         source: authMethod === "gh" ? "gh" : "init-token",
         selectedRepo: repo.slug,
-        apiSessionToken
+        apiSessionToken,
+        authPayload: githubAuth
       });
     }
   } else if (authMethod === "device") {
@@ -4726,9 +4994,9 @@ async function runControlPlaneInit(context, options) {
     if (completed) {
       const apiSessionToken = apiSessionTokenFrom(completed);
       if (apiSessionToken) {
-        setGitHubBearerTokenForCurrentProcess(apiSessionToken);
+        setGitHubBearerTokenForCurrentProcess(apiSessionToken, projectRoot);
         if (serverKind === "remote") {
-          writeRemoteGitHubAuthState(projectRoot, { source: "device", selectedRepo: repo.slug, apiSessionToken });
+          writeRemoteGitHubAuthState(projectRoot, { source: "device", selectedRepo: repo.slug, apiSessionToken, authPayload: completed });
         }
       }
       deviceAuth = { ...deviceAuth, poll: completed, completed: completed.status === "signed-in" };
@@ -4746,19 +5014,25 @@ async function runControlPlaneInit(context, options) {
       Object.assign(checkout, preparedCheckout);
     }
   }
+  const checkoutPath = typeof checkout.path === "string" ? checkout.path : null;
+  if (serverKind === "remote" && checkoutPath && token) {
+    githubAuth = await postGitHubTokenViaServer(context, token, { selectedRepo: repo.slug, projectRoot: checkoutPath });
+    const apiSessionToken = apiSessionTokenFrom(githubAuth);
+    setGitHubBearerTokenForCurrentProcess(apiSessionToken ?? token, projectRoot);
+    writeRemoteGitHubAuthState(projectRoot, { source: authMethod === "gh" ? "gh" : "init-token", selectedRepo: repo.slug, apiSessionToken, authPayload: githubAuth });
+  }
   const registered = await registerProjectViaServer(context, {
     repoSlug: repo.slug,
     checkout
   });
-  const checkoutPath = typeof checkout.path === "string" ? checkout.path : null;
   const serverRootSwitch = serverKind === "remote" && checkoutPath ? await switchServerProjectRootViaServer(context, checkoutPath) : null;
-  if (serverRootSwitch && token) {
-    githubAuth = await postGitHubTokenViaServer(context, token, { selectedRepo: repo.slug, projectRoot: checkoutPath ?? undefined });
-    const apiSessionToken = apiSessionTokenFrom(githubAuth);
-    setGitHubBearerTokenForCurrentProcess(apiSessionToken ?? token);
-    writeRemoteGitHubAuthState(projectRoot, { source: authMethod === "gh" ? "gh" : "init-token", selectedRepo: repo.slug, apiSessionToken });
-  }
   const activeProjectRegistration = serverRootSwitch ? await registerProjectViaServer(context, { repoSlug: repo.slug, checkout }) : null;
+  const labelSetup = await ensureTaskLabelsViaServer(context).catch((error) => ({
+    ok: false,
+    ready: false,
+    labelsReady: false,
+    error: error instanceof Error ? error.message : String(error)
+  }));
   const pi = serverKind === "remote" ? await ensureRemotePiRigInstalled({ requestJson: (pathname, init) => requestServerJson(context, pathname, init) }).catch((error) => ({
     remote: true,
     pi: { ok: false, label: "pi", hint: error instanceof Error ? error.message : String(error) },
@@ -4789,6 +5063,7 @@ async function runControlPlaneInit(context, options) {
     githubAuth,
     deviceAuth,
     githubAuthWarning: remoteGhTokenWarning,
+    labelSetup,
     pi,
     doctor
   };
@@ -4895,12 +5170,13 @@ async function runInteractiveControlPlaneInit(context, prompts) {
   });
   const serverChoice = await promptSelect(prompts, {
     message: "Rig server",
+    initialValue: "remote",
     options: [
-      { value: "local", label: "Local server", hint: "run on this machine" },
-      { value: "remote", label: "Remote server", hint: "connect to an HTTPS Rig server" }
+      { value: "remote", label: "Remote server", hint: "connect to an HTTPS Rig server" },
+      { value: "local", label: "Local server", hint: "run on this machine" }
     ]
   });
-  const remoteUrl = serverChoice === "remote" ? await promptRequiredText(prompts, { message: "Remote Rig server URL", placeholder: "https://rig.example.com" }) : undefined;
+  const remoteUrl = serverChoice === "remote" ? await promptRequiredText(prompts, { message: "Remote Rig server URL", placeholder: DEFAULT_REMOTE_RIG_URL, initialValue: DEFAULT_REMOTE_RIG_URL }) : undefined;
   let remoteCheckout;
   if (serverChoice === "remote") {
     const checkout = await promptSelect(prompts, {
@@ -4932,38 +5208,35 @@ async function runInteractiveControlPlaneInit(context, prompts) {
       { value: "skip", label: "Skip for now" }
     ]
   });
+  let remoteGhTokenConfirmed = false;
   if (serverChoice === "remote" && authMethod === "gh") {
     if (!prompts.confirm)
       throw new CliError2("Remote gh-token import requires explicit confirmation.", 1);
     const confirmed = await prompts.confirm({
       message: `This sends a GitHub token from this machine to ${remoteUrl}. Continue?`,
-      initialValue: false
+      initialValue: true
     });
     if (prompts.isCancel(confirmed) || confirmed !== true) {
       throw new CliError2("Remote gh-token import cancelled.", 1);
     }
+    remoteGhTokenConfirmed = true;
   }
-  const githubToken = authMethod === "token" ? await promptRequiredText(prompts, { message: "GitHub token", placeholder: "ghp_..." }) : undefined;
-  const projectChoice = await promptSelect(prompts, {
-    message: "GitHub Projects status sync",
-    options: [
-      { value: "off", label: "Off" },
-      { value: "configure", label: "Configure ProjectV2 status field" }
-    ]
-  });
-  const githubProject = projectChoice === "configure" ? await promptRequiredText(prompts, { message: "GitHub ProjectV2 id", placeholder: "PVT_..." }) : "off";
-  const githubProjectStatusField = projectChoice === "configure" ? await promptRequiredText(prompts, { message: "Project Status field id", placeholder: "field_status" }) : undefined;
+  const githubToken = authMethod === "token" ? await promptRequiredText(prompts, { message: "GitHub token", placeholder: "ghp_..." }) : authMethod === "gh" ? readGhAuthToken() : undefined;
+  const projectConfig = await promptGitHubProjectConfig(context, prompts, repoSlug, githubToken, authMethod === "gh" ? refreshGhProjectScopesAndReadToken : undefined);
+  const effectiveGithubToken = projectConfig.githubToken ?? githubToken;
   const result = await runControlPlaneInit(context, {
     server: serverChoice,
     remoteUrl,
     repoSlug,
-    githubToken,
+    githubToken: effectiveGithubToken,
     githubAuthMethod: authMethod,
-    githubProject,
-    githubProjectStatusField,
+    githubProject: projectConfig.githubProject,
+    githubProjectStatusField: projectConfig.githubProjectStatusField,
+    githubProjectStatuses: projectConfig.githubProjectStatuses,
     remoteCheckout,
     repair,
-    privateStateOnly
+    privateStateOnly,
+    yes: remoteGhTokenConfirmed || undefined
   });
   const details = result.details && typeof result.details === "object" && !Array.isArray(result.details) ? result.details : {};
   const deviceAuth = details.deviceAuth && typeof details.deviceAuth === "object" && !Array.isArray(details.deviceAuth) ? details.deviceAuth : null;
@@ -5059,7 +5332,7 @@ Usage: rig connect <list|add|use|status>`, 1);
 }
 
 // packages/cli/src/commands/github.ts
-import { spawnSync as spawnSync3 } from "child_process";
+import { spawnSync as spawnSync2 } from "child_process";
 function printPayload(context, payload, fallback) {
   if (context.outputMode === "json")
     console.log(JSON.stringify(payload, null, 2));
@@ -5067,7 +5340,7 @@ function printPayload(context, payload, fallback) {
     console.log(fallback);
 }
 function readGhToken() {
-  const result = spawnSync3("gh", ["auth", "token"], { encoding: "utf8" });
+  const result = spawnSync2("gh", ["auth", "token"], { encoding: "utf8" });
   if (result.status !== 0) {
     const detail = result.stderr?.trim() || result.stdout?.trim() || "gh auth token failed";
     throw new CliError2(`Could not import GitHub token from gh: ${detail}`, 1);
@@ -6099,14 +6372,10 @@ async function executeRemote(context, args) {
 }
 
 // packages/cli/src/commands/run.ts
-import { existsSync as existsSync12, readFileSync as readFileSync9 } from "fs";
-import { resolve as resolve20 } from "path";
 import { createInterface as createInterface2 } from "readline/promises";
 import {
   listAuthorityRuns as listAuthorityRuns3,
-  readAuthorityRun as readAuthorityRun4,
-  readJsonlFile as readJsonlFile4,
-  resolveAuthorityRunDir as resolveAuthorityRunDir5
+  readAuthorityRun as readAuthorityRun4
 } from "@rig/runtime/control-plane/authority-files";
 import {
   cleanupRunState,
@@ -6114,6 +6383,7 @@ import {
   listOpenEpics,
   resolveDefaultEpic,
   runResume,
+  runRestart,
   runStatus,
   runStop,
   startRun,
@@ -6121,9 +6391,9 @@ import {
 } from "@rig/runtime/control-plane/native/run-ops";
 import { loadRuntimeContextFromEnv as loadRuntimeContextFromEnv2 } from "@rig/runtime/control-plane/runtime/context";
 
-// packages/cli/src/commands/_operator-view.ts
+// packages/cli/src/commands/_operator-surface.ts
 import { createInterface } from "readline";
-var TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "stopped", "cancelled", "canceled", "closed", "merged", "needs_attention", "needs-attention"]);
+import { createInterface as createPromptInterface } from "readline/promises";
 var CANONICAL_STAGES = [
   "Connect",
   "GitHub/task sync",
@@ -6138,18 +6408,188 @@ var CANONICAL_STAGES = [
   "Merge",
   "Complete"
 ];
+function logDetail(log3) {
+  return typeof log3.detail === "string" ? log3.detail.trim() : "";
+}
+function parseProviderProtocolLog(title, detail) {
+  if (title.trim().toLowerCase() !== "agent output")
+    return null;
+  if (!detail.startsWith("{") || !detail.endsWith("}"))
+    return null;
+  try {
+    const record = JSON.parse(detail);
+    if (!record || typeof record !== "object" || Array.isArray(record))
+      return null;
+    const type = record.type;
+    return typeof type === "string" && [
+      "assistant",
+      "message_start",
+      "message_update",
+      "message_end",
+      "stream_event",
+      "tool_result",
+      "tool_execution_start",
+      "tool_execution_update",
+      "tool_execution_end",
+      "turn_start",
+      "turn_end"
+    ].includes(type) ? record : null;
+  } catch {
+    return null;
+  }
+}
+function renderProviderProtocolLog(record) {
+  const type = typeof record.type === "string" ? record.type : "";
+  if (type === "tool_execution_start" || type === "tool_execution_update" || type === "tool_execution_end") {
+    const toolName = String(record.toolName ?? record.name ?? "tool");
+    const status = type === "tool_execution_start" ? "started" : type === "tool_execution_end" ? record.isError === true || record.result && typeof record.result === "object" && !Array.isArray(record.result) && record.result.isError === true ? "failed" : "completed" : "running";
+    return `[Pi tool] ${toolName} ${status}`;
+  }
+  return null;
+}
+function entryId(entry, fallback) {
+  return typeof entry.id === "string" && entry.id.trim() ? entry.id : fallback;
+}
 function renderOperatorSnapshot(snapshot) {
   const run = snapshot.run.run && typeof snapshot.run.run === "object" ? snapshot.run.run : snapshot.run;
   const runId = String(run.runId ?? run.id ?? "run");
   const status = String(run.status ?? "unknown");
   const logs = snapshot.logs ?? [];
+  const latestByStage = new Map;
+  for (const log3 of logs) {
+    const title = String(log3.title ?? "").toLowerCase();
+    const stageName = String(log3.stage ?? "").toLowerCase();
+    const stage = CANONICAL_STAGES.find((candidate) => candidate.toLowerCase() === title || candidate.toLowerCase() === stageName);
+    if (stage)
+      latestByStage.set(stage, log3);
+  }
   const stageLines = CANONICAL_STAGES.flatMap((stage) => {
-    const match = logs.find((log3) => String(log3.title ?? "").toLowerCase() === stage.toLowerCase() || String(log3.stage ?? "").toLowerCase() === stage.toLowerCase());
-    return match ? [`${stage}: ${String(match.status ?? status)}`] : [];
+    const match = latestByStage.get(stage);
+    return match ? [`${stage}: ${String(match.status ?? status)}${logDetail(match) ? ` \u2014 ${logDetail(match)}` : ""}`] : [];
   });
   return [`Rig run ${runId}: ${status}`, ...stageLines].join(`
 `);
 }
+function createPiRunStreamRenderer(output = process.stdout) {
+  let lastSnapshot = "";
+  const assistantTextById = new Map;
+  const seenTimeline = new Set;
+  const seenLogs = new Set;
+  const writeLine = (line) => output.write(`${line}
+`);
+  return {
+    renderSnapshot(snapshot) {
+      const rendered = renderOperatorSnapshot(snapshot);
+      if (rendered && rendered !== lastSnapshot) {
+        writeLine(rendered);
+        lastSnapshot = rendered;
+      }
+    },
+    renderTimeline(entries) {
+      for (const [index, entry] of entries.entries()) {
+        const id = entryId(entry, `timeline:${index}:${String(entry.cursor ?? "")}`);
+        if (entry.type === "assistant_message" && typeof entry.text === "string") {
+          const text2 = entry.text;
+          const previousText = assistantTextById.get(id) ?? "";
+          if (!previousText && text2.trim()) {
+            writeLine("[Pi assistant]");
+          }
+          if (text2.startsWith(previousText)) {
+            const delta = text2.slice(previousText.length);
+            if (delta)
+              output.write(delta);
+          } else if (text2.trim() && text2 !== previousText) {
+            if (previousText)
+              writeLine(`
+[Pi assistant]`);
+            output.write(text2);
+          }
+          assistantTextById.set(id, text2);
+          continue;
+        }
+        if (seenTimeline.has(id))
+          continue;
+        seenTimeline.add(id);
+        if (entry.type === "tool_execution_start" || entry.type === "tool_execution_update" || entry.type === "tool_execution_end" || entry.type === "mcp_tool_call") {
+          writeLine(`[Pi tool] ${String(entry.toolName ?? entry.name ?? entry.title ?? entry.type)} ${String(entry.status ?? entry.state ?? "")}`.trim());
+          continue;
+        }
+        if (entry.type === "timeline_warning") {
+          writeLine(`[Rig timeline] ${String(entry.detail ?? entry.message ?? "timeline unavailable")}`);
+        }
+      }
+    },
+    renderLogs(entries) {
+      for (const [index, entry] of entries.entries()) {
+        const id = entryId(entry, `log:${index}:${String(entry.createdAt ?? "")}:${String(entry.title ?? "")}`);
+        if (seenLogs.has(id))
+          continue;
+        seenLogs.add(id);
+        const title = String(entry.title ?? "");
+        if (CANONICAL_STAGES.some((stage) => stage.toLowerCase() === title.toLowerCase()))
+          continue;
+        const detail = logDetail(entry);
+        if (!detail)
+          continue;
+        const protocolRecord = parseProviderProtocolLog(title, detail);
+        if (protocolRecord) {
+          const protocolLine = renderProviderProtocolLog(protocolRecord);
+          if (protocolLine)
+            writeLine(protocolLine);
+          continue;
+        }
+        writeLine(`[${title || "Rig log"}] ${detail}`);
+      }
+    }
+  };
+}
+function createOperatorSurface(options = {}) {
+  const input = options.input ?? process.stdin;
+  const output = options.output ?? process.stdout;
+  const errorOutput = options.errorOutput ?? process.stderr;
+  const renderer = createPiRunStreamRenderer(output);
+  const writeLine = (line) => output.write(`${line}
+`);
+  return {
+    mode: "pi-compatible-text",
+    ...renderer,
+    info: writeLine,
+    error: (message2) => errorOutput.write(`${message2}
+`),
+    attachCommandInput(handler) {
+      if (options.interactive === false || !input.isTTY)
+        return null;
+      const rl = createInterface({ input, output: process.stdout, terminal: false });
+      rl.on("line", (line) => {
+        Promise.resolve(handler(line)).catch((error) => writeLine(`Operator command failed: ${error instanceof Error ? error.message : String(error)}`));
+      });
+      return { close: () => rl.close() };
+    }
+  };
+}
+function taskId(task) {
+  return typeof task.id === "string" && task.id.trim() ? task.id : "<unknown>";
+}
+function taskTitle(task) {
+  return typeof task.title === "string" && task.title.trim() ? task.title : "Untitled task";
+}
+function taskStatus(task) {
+  return typeof task.status === "string" && task.status.trim() ? task.status : "unknown";
+}
+function renderTaskPickerRows(tasks) {
+  return tasks.map((task, index) => `${index + 1}. ${taskId(task)} \xB7 ${taskStatus(task)} \xB7 ${taskTitle(task)}`);
+}
+async function promptForTaskSelection(question) {
+  const rl = createPromptInterface({ input: process.stdin, output: process.stdout });
+  try {
+    return await rl.question(question);
+  } finally {
+    rl.close();
+  }
+}
+
+// packages/cli/src/commands/_operator-view.ts
+var TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "stopped", "cancelled", "canceled", "closed", "merged", "needs_attention", "needs-attention"]);
 function runStatusFromPayload(payload) {
   const run = payload.run && typeof payload.run === "object" && !Array.isArray(payload.run) ? payload.run : payload;
   return String(run.status ?? "unknown").toLowerCase();
@@ -6171,11 +6611,22 @@ async function applyOperatorCommand(context, input, deps = {}) {
   await (deps.steer ?? steerRunViaServer)(context, input.runId, userMessage);
   return { action: "continue", message: "Steering message queued." };
 }
-async function readOperatorSnapshot(context, runId) {
+async function readOperatorSnapshot(context, runId, options = {}) {
   const run = await getRunDetailsViaServer(context, runId);
   const logsPage = await getRunLogsViaServer(context, runId, { limit: 100 });
-  const entries = Array.isArray(logsPage.entries) ? logsPage.entries.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
-  return { run, logs: entries, rendered: renderOperatorSnapshot({ run, logs: entries }) };
+  const timelinePage = await getRunTimelineViaServer(context, runId, { limit: 200, ...options.timelineCursor ? { cursor: options.timelineCursor } : {} }).catch((error) => ({
+    entries: [{
+      id: `timeline-unavailable:${runId}`,
+      type: "timeline_warning",
+      detail: `Selected Rig server did not provide run timeline events: ${error instanceof Error ? error.message : String(error)}`,
+      createdAt: new Date().toISOString()
+    }],
+    nextCursor: options.timelineCursor ?? null
+  }));
+  const logs = Array.isArray(logsPage.entries) ? logsPage.entries.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))).toReversed() : [];
+  const timeline = Array.isArray(timelinePage.entries) ? timelinePage.entries.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
+  const timelineCursor = typeof timelinePage.nextCursor === "string" ? timelinePage.nextCursor : options.timelineCursor ?? null;
+  return { run, logs, timeline, timelineCursor, rendered: renderOperatorSnapshot({ run, logs, timeline }) };
 }
 async function attachRunOperatorView(context, input) {
   let steered = false;
@@ -6183,45 +6634,266 @@ async function attachRunOperatorView(context, input) {
     await steerRunViaServer(context, input.runId, input.message.trim());
     steered = true;
   }
+  const surface = createOperatorSurface({ interactive: input.interactive !== false });
   let snapshot = await readOperatorSnapshot(context, input.runId);
   if (context.outputMode === "text") {
-    console.log(snapshot.rendered);
+    surface.renderSnapshot(snapshot);
+    surface.renderTimeline(snapshot.timeline);
+    surface.renderLogs(snapshot.logs);
     if (steered)
-      console.log("Steering message queued.");
+      surface.info("Steering message queued.");
   }
   let detached = false;
-  let rl = null;
+  let commandInput = null;
   if (input.follow && !input.once && context.outputMode === "text") {
     if (input.interactive !== false && process.stdin.isTTY) {
-      console.log("Controls: /user <message>, /stop, /detach");
-      rl = createInterface({ input: process.stdin, output: process.stdout, terminal: false });
-      rl.on("line", (line) => {
-        applyOperatorCommand(context, { runId: input.runId, line }).then((result) => {
-          if (result.message)
-            console.log(result.message);
-          if (result.action === "detach" || result.action === "stopped") {
-            detached = true;
-            rl?.close();
-          }
-        }).catch((error) => console.log(`Operator command failed: ${error instanceof Error ? error.message : String(error)}`));
+      surface.info("Controls: /user <message>, /stop, /detach");
+      commandInput = surface.attachCommandInput(async (line) => {
+        const result = await applyOperatorCommand(context, { runId: input.runId, line });
+        if (result.message)
+          surface.info(result.message);
+        if (result.action === "detach" || result.action === "stopped") {
+          detached = true;
+          commandInput?.close();
+        }
       });
     }
-    let lastRendered = snapshot.rendered;
     const pollMs = Math.max(250, Math.trunc(input.pollMs ?? 2000));
+    let timelineCursor = snapshot.timelineCursor;
     while (!detached && !TERMINAL_RUN_STATUSES.has(runStatusFromPayload(snapshot.run))) {
       await Bun.sleep(pollMs);
-      snapshot = await readOperatorSnapshot(context, input.runId);
-      if (snapshot.rendered !== lastRendered) {
-        console.log(snapshot.rendered);
-        lastRendered = snapshot.rendered;
-      }
+      snapshot = await readOperatorSnapshot(context, input.runId, { timelineCursor });
+      timelineCursor = snapshot.timelineCursor;
+      surface.renderSnapshot(snapshot);
+      surface.renderTimeline(snapshot.timeline);
+      surface.renderLogs(snapshot.logs);
     }
-    rl?.close();
+    commandInput?.close();
   }
   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;
+  if (!run || typeof run !== "object" || Array.isArray(run))
+    return null;
+  return {
+    ...run,
+    ...Array.isArray(payload.timeline) ? { timeline: payload.timeline } : {},
+    ...Array.isArray(payload.approvals) ? { approvals: payload.approvals } : {},
+    ...Array.isArray(payload.userInputs) ? { userInputs: payload.userInputs } : {}
+  };
+}
+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" };
+  }
+  return { runs: listAuthorityRuns3(context.projectRoot), source: "local" };
+}
+function runStringField(run, key, fallback = "") {
+  const value = run[key];
+  return typeof value === "string" && value.trim() ? value : fallback;
+}
+function runDisplayTitle(run) {
+  return runStringField(run, "title", runStringField(run, "taskId", "(untitled)"));
+}
+function buildServerRunStatus(runs) {
+  const activeRuns = runs.filter((run) => !REMOTE_TERMINAL_RUN_STATUSES.has(runStringField(run, "status").toLowerCase()));
+  const recentRuns = runs.filter((run) => REMOTE_TERMINAL_RUN_STATUSES.has(runStringField(run, "status").toLowerCase()));
+  return { activeRuns, recentRuns, runs };
+}
 function shouldPromptForEpicSelection(context, command, promptEpic, noEpicPrompt) {
   if (noEpicPrompt) {
     return false;
@@ -6287,17 +6959,11 @@ async function executeRun(context, args) {
   switch (command) {
     case "list": {
       requireNoExtraArgs(rest, "bun run rig run list");
-      const runs = listAuthorityRuns3(context.projectRoot);
+      const { runs, source } = await listRunsForSelectedConnection(context, { limit: 100 });
       if (context.outputMode === "text") {
-        if (runs.length === 0) {
-          console.log("No runs recorded in .rig/runs.");
-        } else {
-          for (const run of runs) {
-            console.log(`- ${run.runId} \xB7 ${run.status} \xB7 ${run.title}`);
-          }
-        }
+        console.log(formatRunList(runs, { source }));
       }
-      return { ok: true, group: "run", command, details: { runs } };
+      return { ok: true, group: "run", command, details: { runs, source } };
     }
     case "delete": {
       let pending = rest;
@@ -6360,7 +7026,7 @@ async function executeRun(context, args) {
       if (!run.value) {
         throw new CliError2("run show requires --run <id>.");
       }
-      const record = readAuthorityRun4(context.projectRoot, run.value);
+      const record = readAuthorityRun4(context.projectRoot, run.value) ?? normalizeRemoteRunDetails(await getRunDetailsViaServer(context, run.value).catch(() => ({})));
       if (!record) {
         throw new CliError2(`Run not found: ${run.value}`, 2);
       }
@@ -6379,34 +7045,24 @@ async function executeRun(context, args) {
       if (!run.value) {
         throw new CliError2("run timeline requires --run <id>.");
       }
-      const timelinePath = resolve20(resolveAuthorityRunDir5(context.projectRoot, run.value), "timeline.jsonl");
-      const printEvents = () => {
-        const events2 = readJsonlFile4(timelinePath);
-        if (context.outputMode === "text") {
-          for (const event of events2) {
-            console.log(JSON.stringify(event));
-          }
-        }
-        return events2;
-      };
-      const events = printEvents();
+      const renderer = createPiRunStreamRenderer();
+      let cursor = null;
+      const page = await getRunTimelineViaServer(context, run.value, { limit: 500 });
+      const events = Array.isArray(page.entries) ? page.entries.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
+      cursor = typeof page.nextCursor === "string" ? page.nextCursor : null;
+      if (context.outputMode === "text") {
+        renderer.renderTimeline(events);
+      }
       if (follow.value && context.outputMode === "text") {
-        let lastLength = existsSync12(timelinePath) ? readFileSync9(timelinePath, "utf8").length : 0;
         while (true) {
           await Bun.sleep(1000);
-          if (!existsSync12(timelinePath))
-            continue;
-          const next = readFileSync9(timelinePath, "utf8");
-          if (next.length <= lastLength)
-            continue;
-          const delta = next.slice(lastLength);
-          lastLength = next.length;
-          for (const line of delta.split(/\r?\n/).map((entry) => entry.trim()).filter(Boolean)) {
-            console.log(line);
-          }
+          const nextPage = await getRunTimelineViaServer(context, run.value, { limit: 500, ...cursor ? { cursor } : {} });
+          const nextEvents = Array.isArray(nextPage.entries) ? nextPage.entries.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
+          cursor = typeof nextPage.nextCursor === "string" ? nextPage.nextCursor : cursor;
+          renderer.renderTimeline(nextEvents);
         }
       }
-      return { ok: true, group: "run", command, details: { runId: run.value, events } };
+      return { ok: true, group: "run", command, details: { runId: run.value, events, cursor } };
     }
     case "attach": {
       let pending = rest;
@@ -6427,14 +7083,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");
@@ -6444,17 +7112,19 @@ async function executeRun(context, args) {
         }
         return { ok: true, group: "run", command };
       }
-      const summary = runStatus(context.projectRoot, runtimeContext);
+      const summary = isRemoteConnectionSelected(context.projectRoot) ? buildServerRunStatus(await listRunsViaServer(context, { limit: 100 })) : runStatus(context.projectRoot, runtimeContext);
+      const activeRuns = Array.isArray(summary.activeRuns) ? summary.activeRuns.filter((run) => Boolean(run && typeof run === "object" && !Array.isArray(run))) : [];
+      const recentRuns = Array.isArray(summary.recentRuns) ? summary.recentRuns.filter((run) => Boolean(run && typeof run === "object" && !Array.isArray(run))) : [];
       if (context.outputMode === "text") {
-        console.log(`Active runs: ${summary.activeRuns.length}`);
-        for (const run of summary.activeRuns) {
-          console.log(`- ${run.runId} \xB7 ${run.status} \xB7 ${run.taskId ?? run.title}`);
+        console.log(`Active runs: ${activeRuns.length}`);
+        for (const run of activeRuns) {
+          console.log(`- ${runStringField(run, "runId", "(unknown-run)")} \xB7 ${runStringField(run, "status", "unknown")} \xB7 ${runStringField(run, "taskId", runDisplayTitle(run))}`);
         }
-        if (summary.recentRuns.length > 0) {
+        if (recentRuns.length > 0) {
           console.log("");
           console.log("Recent runs:");
-          for (const run of summary.recentRuns) {
-            console.log(`- ${run.runId} \xB7 ${run.status} \xB7 ${run.taskId ?? run.title}`);
+          for (const run of recentRuns) {
+            console.log(`- ${runStringField(run, "runId", "(unknown-run)")} \xB7 ${runStringField(run, "status", "unknown")} \xB7 ${runStringField(run, "taskId", runDisplayTitle(run))}`);
           }
         }
       }
@@ -6541,6 +7211,20 @@ async function executeRun(context, args) {
       }
       return { ok: true, group: "run", command, details: resumed };
     }
+    case "restart": {
+      requireNoExtraArgs(rest, "bun run rig run restart");
+      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);
+      if (context.outputMode === "text") {
+        console.log(`Restarted run: ${restarted.runId}`);
+      }
+      return { ok: true, group: "run", command, details: restarted };
+    }
     case "stop": {
       const runOption = takeOption(rest, "--run");
       const positionalRunId = runOption.rest.length > 0 ? runOption.rest[0] : undefined;
@@ -6598,7 +7282,7 @@ async function executeServer(context, args, options) {
       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>]");
-      const commandParts = ["bun", "run", "packages/server/src/server.ts", "start"];
+      const commandParts = ["rig-server", "start"];
       if (hostResult.value) {
         commandParts.push("--host", hostResult.value);
       }
@@ -6621,7 +7305,7 @@ async function executeServer(context, args, options) {
       const eventResult = takeOption(pending, "--event");
       pending = eventResult.rest;
       requireNoExtraArgs(pending, "bun run rig server notify-test [--event <type>]");
-      const commandParts = ["bun", "run", "packages/server/src/server.ts", "notify-test"];
+      const commandParts = ["rig-server", "notify-test"];
       if (eventResult.value) {
         commandParts.push("--event", eventResult.value);
       }
@@ -6682,10 +7366,10 @@ async function executeServer(context, args, options) {
 }
 
 // packages/cli/src/commands/task.ts
-import { readFileSync as readFileSync10 } from "fs";
-import { spawnSync as spawnSync4 } from "child_process";
-import { createInterface as createInterface4 } from "readline/promises";
-import { resolve as resolve21 } from "path";
+import { readFileSync as readFileSync9 } from "fs";
+import { spawnSync as spawnSync3 } from "child_process";
+import { resolve as resolve20 } from "path";
+import { cancel as cancel3, confirm as confirm2, isCancel as isCancel3 } from "@clack/prompts";
 import {
   taskArtifactDir,
   taskArtifacts,
@@ -6703,19 +7387,10 @@ import {
 } from "@rig/runtime/control-plane/native/task-ops";
 
 // packages/cli/src/commands/_task-picker.ts
-import { createInterface as createInterface3 } from "readline/promises";
-function taskId(task) {
+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>";
 }
-function taskTitle(task) {
-  return typeof task.title === "string" && task.title.trim() ? task.title : "Untitled task";
-}
-function taskStatus(task) {
-  return typeof task.status === "string" && task.status.trim() ? task.status : "unknown";
-}
-function renderTaskPickerRows(tasks) {
-  return tasks.map((task, index) => `${index + 1}. ${taskId(task)} \xB7 ${taskStatus(task)} \xB7 ${taskTitle(task)}`);
-}
 async function selectTaskWithTextPicker(tasks, io = {}) {
   if (tasks.length === 0)
     return null;
@@ -6725,25 +7400,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 ?? (async (question) => {
-    const rl = createInterface3({ input: process.stdin, output: process.stdout });
-    try {
-      return await rl.question(question);
-    } finally {
-      rl.close();
+  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 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
   });
-  console.log("Select Rig task:");
-  for (const row of renderTaskPickerRows(tasks))
-    console.log(`  ${row}`);
-  const answer = (await prompt(`Task [1-${tasks.length}] or id: `)).trim();
-  if (!answer)
+  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) => taskId(task) === answer) ?? null;
+  const index = Number.parseInt(String(answer), 10);
+  return Number.isFinite(index) ? tasks[index] ?? null : null;
 }
 
 // packages/cli/src/commands/task.ts
@@ -6821,7 +7508,7 @@ function normalizePrMode(value) {
   throw new CliError2("--pr must be auto, ask, or off.", 2);
 }
 function detectLocalDirtyState(projectRoot) {
-  const result = spawnSync4("git", ["-C", projectRoot, "status", "--porcelain"], { encoding: "utf8", timeout: 5000 });
+  const result = spawnSync3("git", ["-C", projectRoot, "status", "--porcelain"], { encoding: "utf8", timeout: 5000 });
   if (result.status !== 0)
     return { dirty: false, modified: 0, untracked: 0, lines: [] };
   const lines = result.stdout.split(/\r?\n/).map((line) => line.trimEnd()).filter(Boolean);
@@ -6855,13 +7542,15 @@ async function resolveDirtyBaselineForTaskRun(context, explicit) {
   if (explicit)
     return { mode: explicit, state };
   if (context.outputMode === "text" && process.stdin.isTTY && process.stdout.isTTY) {
-    const rl = createInterface4({ 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 };
 }
@@ -6896,10 +7585,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(() => {
@@ -6917,16 +7603,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,
@@ -6940,12 +7618,12 @@ async function executeTask(context, args, options) {
       const positional = taskOption.rest.length > 0 && taskOption.rest[0] && !taskOption.rest[0].startsWith("-") ? taskOption.rest[0] : undefined;
       const remaining = positional ? taskOption.rest.slice(1) : taskOption.rest;
       requireNoExtraArgs(remaining, "bun run rig task show <id>|--task <id>");
-      const taskId2 = normalizeTaskRunTaskId(taskOption.value ?? positional);
-      if (!taskId2)
+      const taskId3 = normalizeTaskRunTaskId(taskOption.value ?? positional);
+      if (!taskId3)
         throw new CliError2("task show requires a task id.", 2);
-      const task = await getWorkspaceTaskViaServer(context, taskId2);
+      const task = await getWorkspaceTaskViaServer(context, taskId3);
       if (!task)
-        throw new CliError2(`Task not found: ${taskId2}`, 3);
+        throw new CliError2(`Task not found: ${taskId3}`, 3);
       const summary = summarizeTask(task, { raw: true });
       if (context.outputMode === "text")
         console.log(JSON.stringify(summary, null, 2));
@@ -7016,7 +7694,7 @@ async function executeTask(context, args, options) {
       const fileFlag = takeOption(rest.slice(1), "--file");
       let content;
       if (fileFlag.value) {
-        content = readFileSync10(resolve21(context.projectRoot, fileFlag.value), "utf-8");
+        content = readFileSync9(resolve20(context.projectRoot, fileFlag.value), "utf-8");
       } else {
         content = await readStdin();
       }
@@ -7145,16 +7823,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,
@@ -7237,9 +7922,9 @@ async function executeTask(context, args, options) {
 }
 
 // packages/cli/src/commands/task-run-driver.ts
-import { copyFileSync as copyFileSync3, existsSync as existsSync13, mkdirSync as mkdirSync8, readFileSync as readFileSync11, statSync as statSync2, writeFileSync as writeFileSync6 } from "fs";
-import { resolve as resolve22 } from "path";
-import { spawn as spawn2, spawnSync as spawnSync5 } from "child_process";
+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 spawn3, spawnSync as spawnSync4 } from "child_process";
 import { createInterface as createLineInterface } from "readline";
 import { loadConfig as loadConfig2 } from "@rig/core/load-config";
 import {
@@ -7264,15 +7949,31 @@ import {
 import { resolvePreferredShellBinary } from "@rig/runtime/control-plane/native/run-ops";
 import { readAuthorityRun as readAuthorityRun5, readJsonFile as readJsonFile3, resolveTaskArtifactDirs as resolveTaskArtifactDirs2 } from "@rig/runtime/control-plane/authority-files";
 import {
-  buildTaskRunLifecycleComment,
-  updateConfiguredTaskSourceTask
+  buildTaskRunLifecycleComment
 } from "@rig/runtime/control-plane/tasks/source-lifecycle";
 import {
   closeIssueAfterMergedPr,
   commitRunChanges,
   runPrAutomation
 } from "@rig/runtime/control-plane/native/pr-automation";
+function looksLikeGitHubToken(value) {
+  const token = value?.trim();
+  if (!token)
+    return false;
+  return /^(gh[opusr]_|github_pat_)/.test(token);
+}
+function githubBridgeEnv(token) {
+  const clean = token?.trim();
+  if (!clean)
+    return {};
+  return {
+    RIG_GITHUB_TOKEN: clean,
+    GITHUB_TOKEN: clean,
+    GH_TOKEN: clean
+  };
+}
 function buildPiRigBridgeEnv(input) {
+  const githubToken = input.githubToken?.trim() || (looksLikeGitHubToken(input.authToken) ? input.authToken.trim() : "");
   return {
     RIG_PROJECT_ROOT: input.projectRoot,
     PROJECT_RIG_ROOT: input.projectRoot,
@@ -7282,11 +7983,11 @@ function buildPiRigBridgeEnv(input) {
     RIG_RUNTIME_ADAPTER: "pi",
     ...input.serverUrl ? { RIG_SERVER_URL: input.serverUrl } : {},
     ...input.authToken ? { RIG_AUTH_TOKEN: input.authToken } : {},
-    ...input.githubToken ? { RIG_GITHUB_TOKEN: input.githubToken } : {}
+    ...githubBridgeEnv(githubToken)
   };
 }
 function runGitSync(cwd, args, input) {
-  const result = spawnSync5("git", [...args], {
+  const result = spawnSync4("git", [...args], {
     cwd,
     input,
     encoding: "utf8",
@@ -7304,12 +8005,12 @@ function copyUntrackedDirtyFiles(sourceRoot, targetRoot) {
     return 0;
   let copied = 0;
   for (const relativePath of listed.stdout.split("\x00").filter(Boolean)) {
-    const sourcePath = resolve22(sourceRoot, relativePath);
-    const targetPath = resolve22(targetRoot, relativePath);
+    const sourcePath = resolve21(sourceRoot, relativePath);
+    const targetPath = resolve21(targetRoot, relativePath);
     try {
       if (!statSync2(sourcePath).isFile())
         continue;
-      mkdirSync8(resolve22(targetPath, ".."), { recursive: true });
+      mkdirSync8(resolve21(targetPath, ".."), { recursive: true });
       copyFileSync3(sourcePath, targetPath);
       copied += 1;
     } catch {}
@@ -7348,7 +8049,7 @@ function buildDirtyBaselineHandshakeEnv(input) {
     return { RIG_BASELINE_MODE: input.baselineMode ?? "head" };
   return {
     RIG_BASELINE_MODE: "dirty-snapshot",
-    RIG_DIRTY_BASELINE_READY_FILE: resolve22(input.projectRoot, ".rig", "runs", input.runId, "dirty-baseline.ready.json")
+    RIG_DIRTY_BASELINE_READY_FILE: resolve21(input.projectRoot, ".rig", "runs", input.runId, "dirty-baseline.ready.json")
   };
 }
 function positiveInt(value, fallback) {
@@ -7356,7 +8057,7 @@ function positiveInt(value, fallback) {
 }
 function resolveTaskRunAutomationLimits(config, env = process.env) {
   const configuredValidationAttempts = positiveInt(config?.automation?.maxValidationAttempts, 30);
-  const configuredPrFixIterations = positiveInt(config?.automation?.maxPrFixIterations, 30);
+  const configuredPrFixIterations = positiveInt(config?.automation?.maxPrFixIterations, 100500);
   return {
     maxValidationAttempts: parsePositiveInt2(env.RIG_TASK_RUN_MAX_ATTEMPTS, "RIG_TASK_RUN_MAX_ATTEMPTS", configuredValidationAttempts),
     maxPrFixIterations: configuredPrFixIterations
@@ -7451,7 +8152,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"]
     });
@@ -7459,9 +8160,9 @@ function createCommandRunner(binary) {
     const stderrChunks = [];
     child.stdout.on("data", (chunk) => stdoutChunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk))));
     child.stderr.on("data", (chunk) => stderrChunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk))));
-    return await new Promise((resolve23) => {
-      child.once("error", (error) => resolve23({ exitCode: 1, stderr: error.message }));
-      child.once("close", (code) => resolve23({
+    return await new Promise((resolve22) => {
+      child.once("error", (error) => resolve22({ exitCode: 1, stderr: error.message }));
+      child.once("close", (code) => resolve22({
         exitCode: code ?? 1,
         stdout: Buffer.concat(stdoutChunks).toString("utf8"),
         stderr: Buffer.concat(stderrChunks).toString("utf8")
@@ -7481,12 +8182,13 @@ async function resolvePostValidationBranch(input) {
   return input.configuredBranch;
 }
 async function runTaskRunPostValidationLifecycle(input) {
-  const taskId2 = input.taskId?.trim();
-  if (!taskId2) {
+  const taskId3 = input.taskId?.trim();
+  if (!taskId3) {
     return { status: "skipped" };
   }
-  const config = input.config ?? {};
-  const prMode = config.pr?.mode ?? "auto";
+  const configInput = input.config ?? null;
+  const config = configInput ?? {};
+  const prMode = configInput ? configInput.pr?.mode ?? "auto" : "off";
   if (prMode === "off" || prMode === "ask") {
     input.appendStage?.("Open PR", prMode === "off" ? "PR automation disabled by pr.mode=off." : "PR creation awaiting operator approval by pr.mode=ask.", "skipped", "info");
     input.appendStage?.("Complete", "Validation completed; no PR was opened and the issue was left open.", "completed", "info");
@@ -7502,7 +8204,7 @@ async function runTaskRunPostValidationLifecycle(input) {
     gitCommand
   });
   const prAutomation = input.prAutomation ?? runPrAutomation;
-  const updateTaskSource = input.updateTaskSource ?? updateConfiguredTaskSourceTask;
+  const updateTaskSource = input.updateTaskSource ?? updateTaskSourceWithProjectSync;
   const stage = input.appendStage ?? (() => {
     return;
   });
@@ -7520,7 +8222,7 @@ async function runTaskRunPostValidationLifecycle(input) {
   stage("Commit", `Committing changes in ${workspace}.`, "running", "tool");
   const commit = await commitRunChanges({
     cwd: workspace,
-    message: `rig: complete task ${taskId2}`,
+    message: `rig: complete task ${taskId3}`,
     command: gitCommand
   });
   stage("Commit", commit.committed ? "Committed run workspace changes." : "No workspace changes to commit.", "completed", "tool");
@@ -7528,13 +8230,15 @@ async function runTaskRunPostValidationLifecycle(input) {
   stage("Open PR", `Opening PR from ${branch}.`, "running", "tool");
   const pr = await prAutomation({
     projectRoot: workspace,
-    taskId: taskId2,
+    taskId: taskId3,
     runId: input.runId,
     branch,
     config,
     sourceTask: input.sourceTask,
     uploadedSnapshot: input.uploadedSnapshot,
+    artifactRoot: resolve21(input.projectRoot, "artifacts", taskId3),
     command: ghCommand,
+    gitCommand,
     steerPi,
     lifecycle: {
       onPrOpened: async ({ prUrl }) => {
@@ -7542,7 +8246,7 @@ async function runTaskRunPostValidationLifecycle(input) {
         try {
           if (shouldWriteDriverIssueUpdate(config, "under_review")) {
             await updateTaskSource(input.projectRoot, {
-              taskId: taskId2,
+              taskId: taskId3,
               sourceTask: runSourceTaskIdentity(input.sourceTask),
               update: {
                 status: "under_review",
@@ -7572,7 +8276,7 @@ async function runTaskRunPostValidationLifecycle(input) {
 `), "reviewing", "error");
         if (shouldWriteDriverIssueUpdate(config, "ci_fixing")) {
           await updateTaskSource(input.projectRoot, {
-            taskId: taskId2,
+            taskId: taskId3,
             sourceTask: runSourceTaskIdentity(input.sourceTask),
             update: {
               status: "ci_fixing",
@@ -7583,8 +8287,6 @@ async function runTaskRunPostValidationLifecycle(input) {
                 runtimeWorkspace: input.runtimeWorkspace ?? null
               })
             }
-          }).catch(() => {
-            return;
           });
         }
       },
@@ -7592,7 +8294,7 @@ async function runTaskRunPostValidationLifecycle(input) {
         stage("Merge", prUrl, "running", "tool");
         if (shouldWriteDriverIssueUpdate(config, "merging")) {
           await updateTaskSource(input.projectRoot, {
-            taskId: taskId2,
+            taskId: taskId3,
             sourceTask: runSourceTaskIdentity(input.sourceTask),
             update: {
               status: "merging",
@@ -7603,8 +8305,6 @@ async function runTaskRunPostValidationLifecycle(input) {
                 runtimeWorkspace: input.runtimeWorkspace ?? null
               })
             }
-          }).catch(() => {
-            return;
           });
         }
       },
@@ -7621,7 +8321,7 @@ async function runTaskRunPostValidationLifecycle(input) {
     stage("Needs attention", detail, "needs_attention", "error");
     if (shouldWriteDriverIssueUpdate(config, "needs_attention")) {
       await updateTaskSource(input.projectRoot, {
-        taskId: taskId2,
+        taskId: taskId3,
         sourceTask: runSourceTaskIdentity(input.sourceTask),
         update: {
           status: "needs_attention",
@@ -7633,8 +8333,17 @@ async function runTaskRunPostValidationLifecycle(input) {
             errorText: detail
           })
         }
-      }).catch(() => {
-        return;
+      }).catch((error) => {
+        try {
+          appendRunLog(input.projectRoot, input.runId, {
+            id: `log:${input.runId}:task-source-needs-attention-update`,
+            title: "Task source needs-attention update failed",
+            detail: error instanceof Error ? error.message : String(error),
+            tone: "error",
+            status: "needs_attention",
+            createdAt: new Date().toISOString()
+          });
+        } catch {}
       });
     }
     return { status: "needs_attention", pr };
@@ -7642,7 +8351,7 @@ async function runTaskRunPostValidationLifecycle(input) {
   if (shouldWriteDriverIssueUpdate(config, "closed")) {
     await closeIssueAfterMergedPr({
       projectRoot: input.projectRoot,
-      taskId: taskId2,
+      taskId: taskId3,
       runId: input.runId,
       prUrl: pr.prUrl,
       sourceTask: input.sourceTask,
@@ -7652,12 +8361,12 @@ async function runTaskRunPostValidationLifecycle(input) {
   stage("Complete", `PR merged and issue closed: ${pr.prUrl}`, "completed", "info");
   return { status: "completed", pr };
 }
-function summarizeValidationFailure(projectRoot, taskId2) {
-  if (!taskId2) {
+function summarizeValidationFailure(projectRoot, taskId3) {
+  if (!taskId3) {
     return null;
   }
-  for (const artifactDir of resolveTaskArtifactDirs2(projectRoot, taskId2)) {
-    const summary = readJsonFile3(resolve22(artifactDir, "validation-summary.json"), null);
+  for (const artifactDir of resolveTaskArtifactDirs2(projectRoot, taskId3)) {
+    const summary = readJsonFile3(resolve21(artifactDir, "validation-summary.json"), null);
     if (!summary || summary.status !== "fail") {
       continue;
     }
@@ -7738,9 +8447,9 @@ function readTaskRunAcceptedArtifactState(input) {
   if (!input.taskId || !input.workspaceDir) {
     return { accepted: false, reason: null };
   }
-  const artifactDir = resolve22(input.workspaceDir, "artifacts", input.taskId);
-  const reviewStatusPath = resolve22(artifactDir, "review-status.txt");
-  const taskResultPath = resolve22(artifactDir, "task-result.json");
+  const artifactDir = resolve21(input.workspaceDir, "artifacts", input.taskId);
+  const reviewStatusPath = resolve21(artifactDir, "review-status.txt");
+  const taskResultPath = resolve21(artifactDir, "task-result.json");
   const reviewStatus = readTaskRunReviewStatus(reviewStatusPath);
   if (reviewStatus !== "APPROVED") {
     return { accepted: false, reason: null };
@@ -7777,12 +8486,12 @@ function resolveTaskRunRetryContext(input) {
   if (!input.taskId || !input.workspaceDir) {
     return { shouldRetry: false, failureDetail: null, nextPrompt: null };
   }
-  const artifactDir = resolve22(input.workspaceDir, "artifacts", input.taskId);
-  const reviewStatePath = resolve22(artifactDir, "review-state.json");
-  const reviewFeedbackPath = resolve22(artifactDir, "review-feedback.md");
-  const reviewStatusPath = resolve22(artifactDir, "review-status.txt");
-  const failedApproachesPath = resolve22(input.workspaceDir, ".rig", "state", "failed_approaches.md");
-  const validationSummaryPath = resolve22(artifactDir, "validation-summary.json");
+  const artifactDir = resolve21(input.workspaceDir, "artifacts", input.taskId);
+  const reviewStatePath = resolve21(artifactDir, "review-state.json");
+  const reviewFeedbackPath = resolve21(artifactDir, "review-feedback.md");
+  const reviewStatusPath = resolve21(artifactDir, "review-status.txt");
+  const failedApproachesPath = resolve21(input.workspaceDir, ".rig", "state", "failed_approaches.md");
+  const validationSummaryPath = resolve21(artifactDir, "validation-summary.json");
   const reviewState = readJsonFile3(reviewStatePath, null);
   const reviewStatus = readTaskRunReviewStatus(reviewStatusPath);
   const reviewRejected = isTaskRunReviewRejected(reviewState);
@@ -7836,12 +8545,80 @@ function summarizeTaskRunReviewFailure(reviewState) {
   }
   return "Completion verification rejected the task. Read review-feedback.md for required fixes.";
 }
+function appendAssistantTimelineFromRecord(input) {
+  let nextAssistantText = input.assistantText;
+  if (input.record.type === "message_update") {
+    const assistantMessageEvent = input.record.assistantMessageEvent && typeof input.record.assistantMessageEvent === "object" ? input.record.assistantMessageEvent : null;
+    if (assistantMessageEvent?.type === "text_delta" && typeof assistantMessageEvent.delta === "string") {
+      nextAssistantText += assistantMessageEvent.delta;
+    }
+  } else if (input.record.type === "stream_event") {
+    const event = input.record.event && typeof input.record.event === "object" ? input.record.event : null;
+    const delta = event?.delta && typeof event.delta === "object" ? event.delta : null;
+    if (delta?.type === "text_delta" && typeof delta.text === "string") {
+      nextAssistantText += delta.text;
+    }
+  } else if (input.record.type === "assistant") {
+    const message2 = input.record.message && typeof input.record.message === "object" ? input.record.message : input.record;
+    const content = Array.isArray(message2.content) ? message2.content : [];
+    const fullText = content.map((entry) => entry && typeof entry === "object" && entry.type === "text" ? String(entry.text ?? "") : "").join("");
+    if (fullText.length > nextAssistantText.length)
+      nextAssistantText = fullText;
+  }
+  if (nextAssistantText !== input.assistantText) {
+    appendRunTimeline(input.projectRoot, input.runId, {
+      id: input.messageId,
+      type: "assistant_message",
+      text: nextAssistantText,
+      state: "streaming",
+      createdAt: new Date().toISOString()
+    });
+  }
+  return nextAssistantText;
+}
+function appendPiToolTimelineFromRecord(input) {
+  const type = typeof input.record.type === "string" ? input.record.type : "";
+  if (type !== "tool_execution_start" && type !== "tool_execution_update" && type !== "tool_execution_end")
+    return false;
+  const toolCallId = typeof input.record.toolCallId === "string" && input.record.toolCallId.trim() ? input.record.toolCallId.trim() : `${Date.now()}`;
+  const toolName = typeof input.record.toolName === "string" && input.record.toolName.trim() ? input.record.toolName.trim() : "tool";
+  const result = input.record.result && typeof input.record.result === "object" && !Array.isArray(input.record.result) ? input.record.result : null;
+  appendRunTimeline(input.projectRoot, input.runId, {
+    id: `tool:${toolCallId}:${type}`,
+    type,
+    toolName,
+    status: type === "tool_execution_end" ? input.record.isError === true || result?.isError === true ? "failed" : "completed" : "running",
+    createdAt: new Date().toISOString()
+  });
+  return true;
+}
+function isNonRenderablePiProtocolRecord(record) {
+  const type = typeof record.type === "string" ? record.type : "";
+  return type === "message_start" || type === "message_end" || type === "turn_start" || type === "turn_end" || type === "tool_result" || type === "message_update" && (!record.assistantMessageEvent || typeof record.assistantMessageEvent !== "object" || Array.isArray(record.assistantMessageEvent) || record.assistantMessageEvent.type !== "text_delta");
+}
+function appendToolTimelineFromLog(input) {
+  const title = typeof input.log.title === "string" ? input.log.title : "";
+  if (title !== "Tool activity")
+    return;
+  const payload = input.log.payload && typeof input.log.payload === "object" && !Array.isArray(input.log.payload) ? input.log.payload : {};
+  const toolName = typeof payload.toolName === "string" && payload.toolName.trim() ? payload.toolName.trim() : typeof payload.tool_name === "string" && payload.tool_name.trim() ? payload.tool_name.trim() : null;
+  const logId = typeof input.log.id === "string" && input.log.id.trim() ? input.log.id.trim() : `${Date.now()}`;
+  appendRunTimeline(input.projectRoot, input.runId, {
+    id: `tool:${logId}`,
+    type: "tool_execution_update",
+    toolName,
+    status: typeof input.log.status === "string" ? input.log.status : "running",
+    detail: typeof input.log.detail === "string" ? input.log.detail : null,
+    payload,
+    createdAt: typeof input.log.createdAt === "string" ? input.log.createdAt : new Date().toISOString()
+  });
+}
 function readTaskRunReviewStatus(reviewStatusPath) {
-  if (!existsSync13(reviewStatusPath)) {
+  if (!existsSync12(reviewStatusPath)) {
     return null;
   }
   try {
-    const status = readFileSync11(reviewStatusPath, "utf8").trim().toUpperCase();
+    const status = readFileSync10(reviewStatusPath, "utf8").trim().toUpperCase();
     return status === "APPROVED" || status === "REJECTED" ? status : null;
   } catch {
     return null;
@@ -7859,14 +8636,45 @@ function isTaskRunReviewRejected(reviewState) {
 function runSourceTaskIdentity(sourceTask) {
   return sourceTask;
 }
-async function updateTaskSourceAfterDriverRun(projectRoot, runId, taskId2, sourceTask, status, summary, input, updateTaskSource = updateConfiguredTaskSourceTask) {
-  if (!taskId2)
+function sourceTaskIssueNodeId(sourceTask) {
+  if (!sourceTask || typeof sourceTask !== "object" || Array.isArray(sourceTask))
+    return null;
+  const record = sourceTask;
+  const direct = typeof record.issueNodeId === "string" ? record.issueNodeId : typeof record.nodeId === "string" ? record.nodeId : typeof record.node_id === "string" ? record.node_id : null;
+  if (direct?.trim())
+    return direct.trim();
+  const raw = record.raw && typeof record.raw === "object" && !Array.isArray(record.raw) ? record.raw : null;
+  return typeof raw?.id === "string" && raw.id.trim() ? raw.id.trim() : null;
+}
+var updateTaskSourceWithProjectSync = async (projectRoot, input) => {
+  const serverResult = await updateWorkspaceTaskViaServer({ projectRoot }, {
+    id: input.taskId,
+    ...input.update.status ? { status: input.update.status } : {},
+    ...input.update.comment ? { comment: input.update.comment } : {},
+    ...input.update.title ? { title: input.update.title } : {},
+    ...typeof input.update.body === "string" ? { body: input.update.body } : {},
+    issueNodeId: sourceTaskIssueNodeId(input.sourceTask)
+  });
+  if (serverResult.ok === false) {
+    throw new Error(typeof serverResult.error === "string" ? serverResult.error : "Rig server task update failed.");
+  }
+  return {
+    updated: serverResult.ok !== false,
+    taskId: input.taskId,
+    status: input.update.status,
+    source: "server",
+    sourceKind: "server",
+    projectSync: serverResult.projectSync
+  };
+};
+async function updateTaskSourceAfterDriverRun(projectRoot, runId, taskId3, sourceTask, status, summary, input, updateTaskSource = updateTaskSourceWithProjectSync) {
+  if (!taskId3)
     return;
   const config = await loadTaskRunAutomationConfig(projectRoot);
   if (!shouldWriteDriverIssueUpdate(config, status))
     return;
   const result = await updateTaskSource(projectRoot, {
-    taskId: taskId2,
+    taskId: taskId3,
     sourceTask: runSourceTaskIdentity(sourceTask),
     update: {
       status,
@@ -7885,14 +8693,14 @@ async function updateTaskSourceAfterDriverRun(projectRoot, runId, taskId2, sourc
     throw new Error(`Configured task source${result.sourceKind ? ` (${result.sourceKind})` : ""} did not accept lifecycle update for ${result.taskId}.`);
   }
 }
-function readRunSourceTaskContract(projectRoot, runId, taskId2) {
+function readRunSourceTaskContract(projectRoot, runId, taskId3) {
   const run = readAuthorityRun5(projectRoot, runId);
   const raw = run?.sourceTask;
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
     return null;
   }
   const record = raw;
-  const id = typeof record.id === "string" && record.id.trim() ? record.id.trim() : taskId2?.trim();
+  const id = typeof record.id === "string" && record.id.trim() ? record.id.trim() : taskId3?.trim();
   if (!id) {
     return null;
   }
@@ -7924,6 +8732,9 @@ function stringArrayField(record, key) {
 }
 async function executeRigOwnedTaskRun(context, input) {
   const runtimeTaskId = input.taskId?.trim() || `adhoc-${input.runId}`;
+  const existingRunRecord = readAuthorityRun5(context.projectRoot, input.runId);
+  const resumeMode = process.env.RIG_RUN_RESUME === "1";
+  const resumePreviousStatus = String(existingRunRecord?.status ?? "").toLowerCase();
   const sourceTask = readRunSourceTaskContract(context.projectRoot, input.runId, input.taskId);
   let prompt = buildRunPrompt({
     projectRoot: context.projectRoot,
@@ -7979,14 +8790,14 @@ async function executeRigOwnedTaskRun(context, input) {
     taskId: runtimeTaskId,
     createdAt: startedAt,
     runtimeAdapter: input.runtimeAdapter,
-    status: "created"
+    status: resumeMode ? "preparing" : "created"
   });
   patchAuthorityRun(context.projectRoot, input.runId, {
     status: "preparing",
     startedAt,
     completedAt: null,
     errorText: null,
-    artifactRoot: null,
+    artifactRoot: resumeMode ? existingRunRecord?.artifactRoot ?? null : null,
     runtimeAdapter: input.runtimeAdapter,
     runtimeMode: input.runtimeMode,
     interactionMode: input.interactionMode,
@@ -8002,9 +8813,9 @@ async function executeRigOwnedTaskRun(context, input) {
     detail: input.taskId ?? input.title ?? runtimeTaskId
   });
   appendRunLog(context.projectRoot, input.runId, {
-    id: `log:${input.runId}:start`,
-    title: "Rig task run started",
-    detail: input.taskId ?? input.title ?? runtimeTaskId,
+    id: `log:${input.runId}:${resumeMode ? "resume" : "start"}`,
+    title: resumeMode ? "Rig task run resumed" : "Rig task run started",
+    detail: resumeMode ? `Continuing the same run lifecycle for ${input.taskId ?? input.title ?? runtimeTaskId}.` : input.taskId ?? input.title ?? runtimeTaskId,
     tone: "info",
     status: "preparing",
     createdAt: startedAt
@@ -8025,15 +8836,15 @@ async function executeRigOwnedTaskRun(context, input) {
   const loadedAutomationConfig = await loadTaskRunAutomationConfig(context.projectRoot);
   const automationConfig = input.prMode ? { ...loadedAutomationConfig ?? {}, pr: { ...loadedAutomationConfig?.pr ?? {}, mode: input.prMode } } : loadedAutomationConfig;
   const planningClassification = classifyPlanningNeed({ config: automationConfig, sourceTask });
-  const planningArtifactPath = resolve22("artifacts", runtimeTaskId, "implementation-plan.md");
+  const planningArtifactPath = resolve21("artifacts", runtimeTaskId, "implementation-plan.md");
   const persistedPlanning = {
     ...planningClassification,
     classifier: input.runtimeAdapter === "pi" ? "pi-rig-structured-policy" : "rig-structured-policy",
     artifactPath: planningClassification.planningRequired ? planningArtifactPath : null,
     classifiedAt: new Date().toISOString()
   };
-  mkdirSync8(resolve22(context.projectRoot, ".rig", "runs", input.runId), { recursive: true });
-  writeFileSync6(resolve22(context.projectRoot, ".rig", "runs", input.runId, "planning-classification.json"), `${JSON.stringify(persistedPlanning, null, 2)}
+  mkdirSync8(resolve21(context.projectRoot, ".rig", "runs", input.runId), { recursive: true });
+  writeFileSync6(resolve21(context.projectRoot, ".rig", "runs", input.runId, "planning-classification.json"), `${JSON.stringify(persistedPlanning, null, 2)}
 `, "utf8");
   patchAuthorityRun(context.projectRoot, input.runId, { planning: persistedPlanning });
   prompt = `${prompt}
@@ -8082,11 +8893,11 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
   let reviewAction;
   let verificationStarted = false;
   let reviewStarted = false;
-  let latestRuntimeWorkspace = null;
-  let latestSessionDir = null;
-  let latestLogsDir = null;
+  let latestRuntimeWorkspace = resumeMode && typeof existingRunRecord?.worktreePath === "string" ? existingRunRecord.worktreePath : null;
+  let latestSessionDir = resumeMode && typeof existingRunRecord?.sessionPath === "string" ? resolve21(existingRunRecord.sessionPath, "..") : null;
+  let latestLogsDir = resumeMode && typeof existingRunRecord?.logRoot === "string" ? existingRunRecord.logRoot : null;
   let latestProviderCommand = null;
-  let latestRuntimeBranch = null;
+  let latestRuntimeBranch = resumeMode && typeof existingRunRecord?.branch === "string" ? existingRunRecord.branch : null;
   let snapshotSidecarPromise = null;
   let dirtyBaselineApplied = false;
   const childEnv = {
@@ -8104,7 +8915,11 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
       RIG_RUNTIME_ADAPTER: input.runtimeAdapter,
       RIG_SERVER_RUN_ID: input.runId
     },
-    ...sourceTask ? { RIG_SOURCE_TASK_JSON: JSON.stringify(sourceTask) } : {}
+    ...sourceTask ? { RIG_SOURCE_TASK_JSON: JSON.stringify(sourceTask) } : {},
+    ...resumeMode ? {
+      RIG_RUN_RESUME: "1",
+      RIG_RUNTIME_ARTIFACT_CLEANUP: "preserve"
+    } : {}
   };
   Object.assign(childEnv, buildTaskRunReviewEnv(automationConfig));
   Object.assign(childEnv, buildDirtyBaselineHandshakeEnv({ projectRoot: context.projectRoot, runId: input.runId, baselineMode: input.baselineMode }));
@@ -8162,10 +8977,10 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
       patchAuthorityRun(context.projectRoot, input.runId, {
         status: "running",
         worktreePath: latestRuntimeWorkspace,
-        artifactRoot: latestRuntimeWorkspace && input.taskId ? resolve22(latestRuntimeWorkspace, "artifacts", input.taskId) : null,
+        artifactRoot: latestRuntimeWorkspace && input.taskId ? resolve21(latestRuntimeWorkspace, "artifacts", input.taskId) : null,
         logRoot: latestLogsDir,
-        sessionPath: latestSessionDir ? resolve22(latestSessionDir, "session.json") : null,
-        sessionLogPath: latestLogsDir ? resolve22(latestLogsDir, "agent-stdout.log") : null,
+        sessionPath: latestSessionDir ? resolve21(latestSessionDir, "session.json") : null,
+        sessionLogPath: latestLogsDir ? resolve21(latestLogsDir, "agent-stdout.log") : null,
         branch: runtimeId
       });
       if (!dirtyBaselineApplied && input.baselineMode === "dirty-snapshot" && latestRuntimeWorkspace) {
@@ -8173,7 +8988,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
         const dirty = applyDirtyBaselineSnapshot({ sourceRoot: context.projectRoot, targetRoot: latestRuntimeWorkspace });
         const readyFile = childEnv.RIG_DIRTY_BASELINE_READY_FILE;
         if (readyFile) {
-          mkdirSync8(resolve22(readyFile, ".."), { recursive: true });
+          mkdirSync8(resolve21(readyFile, ".."), { recursive: true });
           writeFileSync6(readyFile, `${JSON.stringify({ ...dirty, workspaceDir: latestRuntimeWorkspace, appliedAt: new Date().toISOString() }, null, 2)}
 `, "utf8");
         }
@@ -8306,6 +9121,10 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
     try {
       const record = JSON.parse(trimmed);
       const liveLogStatus = reviewStarted ? "reviewing" : verificationStarted ? "validating" : "running";
+      if (input.runtimeAdapter === "pi" && appendPiToolTimelineFromRecord({ projectRoot: context.projectRoot, runId: input.runId, record })) {
+        emitServerRunEvent({ type: "timeline", runId: input.runId });
+        return;
+      }
       const providerLogs = input.runtimeAdapter === "codex" ? buildCodexLogsFromRecord({
         runId: input.runId,
         record,
@@ -8322,7 +9141,10 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
       if (providerLogs.length > 0) {
         for (const providerLog of providerLogs) {
           appendRunLog(context.projectRoot, input.runId, providerLog);
+          appendToolTimelineFromLog({ projectRoot: context.projectRoot, runId: input.runId, log: providerLog });
           emitServerRunEvent({ type: "log", runId: input.runId, title: providerLog.title });
+          if (providerLog.title === "Tool activity")
+            emitServerRunEvent({ type: "timeline", runId: input.runId });
         }
       }
       if (input.runtimeAdapter === "codex") {
@@ -8374,6 +9196,9 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
           return;
         }
       }
+      if (input.runtimeAdapter === "pi" && isNonRenderablePiProtocolRecord(record)) {
+        return;
+      }
       if (record.type === "assistant") {
         const message2 = record.message && typeof record.message === "object" ? record.message : record;
         const content = Array.isArray(message2.content) ? message2.content : [];
@@ -8410,9 +9235,38 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
   let reviewFailureDetail = null;
   const stderrLines = [];
   const piAcceptedArtifactExitGraceMs = resolvePiAcceptedArtifactExitGraceMs(childEnv);
-  for (let attempt = 1;attempt <= maxAttempts; attempt += 1) {
+  if (resumeMode && ["validating", "reviewing"].includes(resumePreviousStatus)) {
+    appendRunLog(context.projectRoot, input.runId, {
+      id: `log:${input.runId}:resume-closeout-phase`,
+      title: "Resume continuing from closeout phase",
+      detail: `Previous run status was ${resumePreviousStatus}; skipping agent relaunch and continuing validation/PR/merge closeout for the same run.`,
+      tone: "info",
+      status: resumePreviousStatus,
+      createdAt: new Date().toISOString()
+    });
+    emitServerRunEvent({ type: "log", runId: input.runId, title: "Resume continuing from closeout phase" });
+    exit = { code: 0, signal: null };
+  } else if (resumeMode && latestRuntimeWorkspace) {
+    const acceptedArtifactState = readTaskRunAcceptedArtifactState({
+      taskId: input.taskId ?? runtimeTaskId,
+      workspaceDir: latestRuntimeWorkspace
+    });
+    if (acceptedArtifactState.accepted) {
+      appendRunLog(context.projectRoot, input.runId, {
+        id: `log:${input.runId}:resume-accepted-artifacts`,
+        title: "Resume found accepted artifacts; continuing closeout",
+        detail: acceptedArtifactState.reason ?? "Accepted task artifacts are present from the previous run process.",
+        tone: "info",
+        status: "validating",
+        createdAt: new Date().toISOString()
+      });
+      emitServerRunEvent({ type: "log", runId: input.runId, title: "Resume found accepted artifacts; continuing closeout" });
+      exit = { code: 0, signal: null };
+    }
+  }
+  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"]
@@ -8451,7 +9305,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
     let acceptedArtifactObservedAt = null;
     let acceptedArtifactPollTimer = null;
     let acceptedArtifactKillTimer = null;
-    const attemptExit = await new Promise((resolve23) => {
+    const attemptExit = await new Promise((resolve22) => {
       let settled = false;
       const settle = (result) => {
         if (settled)
@@ -8459,7 +9313,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
         settled = true;
         if (acceptedArtifactPollTimer)
           clearInterval(acceptedArtifactPollTimer);
-        resolve23(result);
+        resolve22(result);
       };
       const pollAcceptedArtifacts = () => {
         const artifactState = readTaskRunAcceptedArtifactState({
@@ -8532,7 +9386,10 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
     });
     for (const pendingLog of pendingLogs) {
       appendRunLog(context.projectRoot, input.runId, pendingLog);
+      appendToolTimelineFromLog({ projectRoot: context.projectRoot, runId: input.runId, log: pendingLog });
       emitServerRunEvent({ type: "log", runId: input.runId, title: pendingLog.title });
+      if (pendingLog.title === "Tool activity")
+        emitServerRunEvent({ type: "timeline", runId: input.runId });
     }
     process.off("SIGTERM", forwardSigterm);
     if (attemptExit.error) {
@@ -8658,8 +9515,8 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
   }
   if (planningClassification.planningRequired) {
     const planWorkspace = latestRuntimeWorkspace ?? context.projectRoot;
-    const expectedPlanPath = resolve22(planWorkspace, planningArtifactPath);
-    if (!existsSync13(expectedPlanPath)) {
+    const expectedPlanPath = resolve21(planWorkspace, planningArtifactPath);
+    if (!existsSync12(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, {
@@ -8679,6 +9536,65 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
       throw new CliError2(failureDetail, 1);
     }
   }
+  if (process.env.RIG_SERVER_OWNS_CLOSEOUT === "1") {
+    appendPiStageLog({
+      projectRoot: context.projectRoot,
+      runId: input.runId,
+      stage: "Validate",
+      detail: "Rig validation accepted the task run; server will continue PR/review/merge closeout.",
+      status: "completed"
+    });
+    if (verificationAction && !reviewStarted) {
+      verificationAction.complete("Completion verification checks finished.");
+    }
+    if (!reviewAction) {
+      promoteToReviewing("Server-owned closeout is queued.");
+    }
+    if (reviewAction) {
+      reviewAction.complete("Provider work accepted; server-owned closeout requested.");
+    }
+    const requestedAt = new Date().toISOString();
+    patchAuthorityRun(context.projectRoot, input.runId, {
+      status: "reviewing",
+      completedAt: null,
+      errorText: null,
+      serverCloseout: {
+        status: "pending",
+        phase: "queued",
+        requestedAt,
+        updatedAt: requestedAt,
+        runtimeWorkspace: latestRuntimeWorkspace,
+        branch: latestRuntimeBranch,
+        taskId: input.taskId ?? runtimeTaskId
+      }
+    });
+    appendRunLog(context.projectRoot, input.runId, {
+      id: `log:${input.runId}:server-closeout-requested`,
+      title: "Server-owned closeout requested",
+      detail: "The CLI provider worker finished validation and handed commit/PR/review/merge closeout back to the Rig server.",
+      tone: "info",
+      status: "reviewing",
+      createdAt: requestedAt,
+      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." });
+    await context.emitEvent("command.finished", {
+      command: [
+        "rig",
+        "server",
+        "task-run",
+        ...input.taskId ? ["--task", input.taskId] : [],
+        ...input.title ? ["--title", input.title] : []
+      ],
+      formattedCommand: input.taskId ? `rig server task-run --task ${input.taskId}` : `rig server task-run --title ${JSON.stringify(input.title ?? `Run ${input.runId}`)}`,
+      exitCode: 0,
+      durationMs: 0,
+      startedAt,
+      finishedAt: requestedAt
+    });
+    return;
+  }
   const runPiPrFeedbackFix = async (message2) => {
     appendPiStageLog({
       projectRoot: context.projectRoot,
@@ -8697,7 +9613,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"]
@@ -8706,11 +9622,45 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
       child.stdin.write(message2);
     }
     child.stdin.end();
+    const feedbackAssistantMessageId = `message:${input.runId}:pr-feedback:${Date.now()}:assistant`;
+    let feedbackAssistantText = "";
+    const feedbackPendingToolUses = new Map;
     const stdout = createLineInterface({ input: child.stdout });
     stdout.on("line", (line) => {
       const trimmed = line.trim();
       if (!trimmed)
         return;
+      try {
+        const record = JSON.parse(trimmed);
+        const providerLogs = buildClaudeLogsFromRecord({
+          runId: input.runId,
+          record,
+          createdAtFallback: new Date().toISOString(),
+          status: "reviewing",
+          pendingToolUses: feedbackPendingToolUses
+        });
+        for (const providerLog of providerLogs) {
+          appendRunLog(context.projectRoot, input.runId, providerLog);
+          appendToolTimelineFromLog({ projectRoot: context.projectRoot, runId: input.runId, log: providerLog });
+          emitServerRunEvent({ type: "log", runId: input.runId, title: providerLog.title });
+          if (providerLog.title === "Tool activity")
+            emitServerRunEvent({ type: "timeline", runId: input.runId });
+        }
+        const nextFeedbackAssistantText = appendAssistantTimelineFromRecord({
+          projectRoot: context.projectRoot,
+          runId: input.runId,
+          messageId: feedbackAssistantMessageId,
+          record,
+          assistantText: feedbackAssistantText
+        });
+        const hadAssistantDelta = nextFeedbackAssistantText !== feedbackAssistantText;
+        if (hadAssistantDelta) {
+          feedbackAssistantText = nextFeedbackAssistantText;
+          emitServerRunEvent({ type: "timeline", runId: input.runId });
+        }
+        if (providerLogs.length > 0 || hadAssistantDelta)
+          return;
+      } catch {}
       appendRunLog(context.projectRoot, input.runId, {
         id: nextRunLogId(),
         title: "Pi PR feedback fix output",
@@ -8736,10 +9686,31 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
       });
       emitServerRunEvent({ type: "log", runId: input.runId, title: "Pi PR feedback fix stderr" });
     });
-    const exitCode = await new Promise((resolve23) => {
-      child.once("error", () => resolve23(1));
-      child.once("close", (code) => resolve23(code ?? 1));
+    const exitCode = await new Promise((resolve22) => {
+      child.once("error", () => resolve22(1));
+      child.once("close", (code) => resolve22(code ?? 1));
     });
+    for (const pendingLog of flushPendingClaudeToolUseLogs({
+      runId: input.runId,
+      status: exitCode === 0 ? "completed" : "failed",
+      pendingToolUses: feedbackPendingToolUses
+    })) {
+      appendRunLog(context.projectRoot, input.runId, pendingLog);
+      appendToolTimelineFromLog({ projectRoot: context.projectRoot, runId: input.runId, log: pendingLog });
+      emitServerRunEvent({ type: "log", runId: input.runId, title: pendingLog.title });
+      emitServerRunEvent({ type: "timeline", runId: input.runId });
+    }
+    if (feedbackAssistantText.trim()) {
+      appendRunTimeline(context.projectRoot, input.runId, {
+        id: feedbackAssistantMessageId,
+        type: "assistant_message",
+        text: feedbackAssistantText,
+        state: "completed",
+        createdAt: new Date().toISOString(),
+        completedAt: new Date().toISOString()
+      });
+      emitServerRunEvent({ type: "timeline", runId: input.runId });
+    }
     if (exitCode !== 0) {
       throw new Error(`Pi PR feedback fix failed with exit code ${exitCode}.`);
     }
@@ -8857,8 +9828,8 @@ async function executeTest(context, args) {
 }
 
 // packages/cli/src/commands/setup.ts
-import { existsSync as existsSync14, mkdirSync as mkdirSync9, readdirSync as readdirSync2, writeFileSync as writeFileSync7 } from "fs";
-import { resolve as resolve23 } from "path";
+import { existsSync as existsSync13, mkdirSync as mkdirSync9, readdirSync as readdirSync2, writeFileSync as writeFileSync7 } from "fs";
+import { resolve as resolve22 } from "path";
 import { createPluginHost } from "@rig/core";
 import {
   isSupportedBunVersion as isSupportedBunVersion2,
@@ -8921,8 +9892,8 @@ function runSetupInit(projectRoot) {
   mkdirSync9(stateDir, { recursive: true });
   mkdirSync9(logsDir, { recursive: true });
   mkdirSync9(artifactsDir, { recursive: true });
-  const failuresPath = resolve23(stateDir, "failed_approaches.md");
-  if (!existsSync14(failuresPath)) {
+  const failuresPath = resolve22(stateDir, "failed_approaches.md");
+  if (!existsSync13(failuresPath)) {
     writeFileSync7(failuresPath, `# Failed Approaches
 
 `, "utf-8");
@@ -8940,18 +9911,18 @@ async function runSetupCheck(projectRoot) {
 }
 async function runSetupPreflight(projectRoot) {
   await runSetupCheck(projectRoot);
-  const validationRoot = resolve23(resolveControlPlaneDefinitionRoot(projectRoot), "validation");
-  if (existsSync14(validationRoot)) {
+  const validationRoot = resolve22(resolveControlPlaneDefinitionRoot(projectRoot), "validation");
+  if (existsSync13(validationRoot)) {
     const validators = readdirSync2(validationRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory());
     for (const validator of validators) {
-      const script = resolve23(validationRoot, validator.name, "validate.sh");
-      if (existsSync14(script)) {
+      const script = resolve22(validationRoot, validator.name, "validate.sh");
+      if (existsSync13(script)) {
         console.log(`OK: validator script ${script}`);
       }
     }
   }
-  const hooksRoot = resolve23(resolveControlPlaneDefinitionRoot(projectRoot), "hooks");
-  if (existsSync14(hooksRoot)) {
+  const hooksRoot = resolve22(resolveControlPlaneDefinitionRoot(projectRoot), "hooks");
+  if (existsSync13(hooksRoot)) {
     const hooks = readdirSync2(hooksRoot).filter((name) => name.endsWith(".sh"));
     for (const hook of hooks) {
       console.log(`OK: hook ${hook}`);
@@ -9345,8 +10316,8 @@ var __testOnly = {
   validateRequiredBugPromptValue
 };
 // packages/cli/src/launcher.ts
-import { existsSync as existsSync15 } from "fs";
-import { resolve as resolve24 } from "path";
+import { existsSync as existsSync14 } from "fs";
+import { basename as basename2, resolve as resolve23 } from "path";
 import { loadDotEnvSecrets } from "@rig/runtime/baked-secrets";
 import { RIG_DEFINITION_DIRNAME, RIG_STATE_DIRNAME, resolveNearestRigProjectRoot } from "@rig/runtime/layout";
 function parsePolicyMode(value) {
@@ -9359,7 +10330,7 @@ function parsePolicyMode(value) {
   throw new Error(`Invalid --policy-mode value: ${value}. Use off|observe|enforce.`);
 }
 function hasRigProjectMarker(candidate) {
-  return existsSync15(resolve24(candidate, RIG_DEFINITION_DIRNAME)) || existsSync15(resolve24(candidate, RIG_STATE_DIRNAME)) || existsSync15(resolve24(candidate, "rig.config.ts")) || existsSync15(resolve24(candidate, "rig.config.json"));
+  return existsSync14(resolve23(candidate, RIG_DEFINITION_DIRNAME)) || existsSync14(resolve23(candidate, RIG_STATE_DIRNAME)) || existsSync14(resolve23(candidate, "rig.config.ts")) || existsSync14(resolve23(candidate, "rig.config.json")) || existsSync14(resolve23(candidate, ".git"));
 }
 function resolveProjectRoot({
   envProjectRoot,
@@ -9368,17 +10339,19 @@ function resolveProjectRoot({
   cwd = process.cwd()
 }) {
   if (envProjectRoot) {
-    return resolve24(cwd, envProjectRoot);
+    return resolve23(cwd, envProjectRoot);
   }
   const fallbackImportDir = importDir ?? cwd;
-  const candidates = [cwd, resolve24(execPath, "..", ".."), resolve24(fallbackImportDir, "..")];
+  const execName = basename2(execPath).toLowerCase();
+  const execCandidates = execName === "rig" || execName === "rig.exe" ? [resolve23(execPath, "..", "..")] : [];
+  const candidates = [cwd, ...execCandidates, resolve23(fallbackImportDir, "..")];
   for (const candidate of candidates) {
     const nearest = resolveNearestRigProjectRoot(candidate);
     if (hasRigProjectMarker(nearest)) {
       return nearest;
     }
   }
-  return resolve24(cwd);
+  return resolve23(cwd);
 }
 function normalizeCliErrorCode(message2, isCliError) {
   if (message2.startsWith("Invalid --policy-mode value:")) {
@@ -9445,7 +10418,7 @@ async function runRigCli(module, options = {}) {
         runId: context.runId,
         outcome,
         eventsFile: context.eventBus.getEventsFile(),
-        policyFile: resolve24(projectRoot, "rig", "policy", "policy.json"),
+        policyFile: resolve23(projectRoot, "rig", "policy", "policy.json"),
         policyMode: context.policyMode ?? policyMode ?? module.loadPolicy(projectRoot).mode
       }, null, 2));
     }