@h-rig/cli 0.0.6-alpha.60 → 0.0.6-alpha.62

package/dist/src/index.js

@@ -527,10 +527,10 @@ var init_plugin = __esm(() => {
 // packages/cli/src/commands.ts
 init_runner();
 import {
-  existsSync as existsSync16,
+  existsSync as existsSync17,
   readFileSync as readFileSync12
 } from "fs";
-import { resolve as resolve25 } from "path";
+import { resolve as resolve26 } from "path";
 import { readBuildConfig } from "@rig/runtime/build-time-config";
 
 // packages/cli/src/commands/browser.ts
@@ -3617,8 +3617,7 @@ import { resolve as resolve12 } from "path";
 import {
   readAuthorityRun,
   readJsonlFile as readJsonlFile2,
-  resolveAuthorityRunDir,
-  writeJsonFile as writeJsonFile3
+  writeAuthorityRunRecord
 } from "@rig/runtime/control-plane/authority-files";
 var RIG_WORKSPACE_ID = "rig-local-workspace";
 function normalizeRuntimeAdapter(value) {
@@ -3704,7 +3703,7 @@ function upsertAgentAuthorityRun(projectRoot, input) {
   } else if ("errorText" in next) {
     delete next.errorText;
   }
-  writeJsonFile3(resolve12(resolveAuthorityRunDir(projectRoot, input.runId), "run.json"), next);
+  writeAuthorityRunRecord(projectRoot, input.runId, next);
   return next;
 }
 
@@ -4268,7 +4267,7 @@ import { resolve as resolve15 } from "path";
 import {
   listAuthorityRuns,
   readJsonlFile as readJsonlFile3,
-  resolveAuthorityRunDir as resolveAuthorityRunDir2
+  resolveAuthorityRunDir
 } from "@rig/runtime/control-plane/authority-files";
 
 // packages/cli/src/commands/_cli-format.ts
@@ -4666,7 +4665,7 @@ async function listRemoteInboxRecords(context, kind, filters) {
 function listLocalInboxRecords(context, kind, filters) {
   const fileName = kind === "approvals" ? "approvals.jsonl" : "user-input.jsonl";
   const runs = listAuthorityRuns(context.projectRoot).filter((entry) => (!filters.run || entry.runId === filters.run) && (!filters.task || entry.taskId === filters.task));
-  return runs.flatMap((entry) => readJsonlFile3(resolve15(resolveAuthorityRunDir2(context.projectRoot, entry.runId), fileName)).map((record) => ({
+  return runs.flatMap((entry) => readJsonlFile3(resolve15(resolveAuthorityRunDir(context.projectRoot, entry.runId), fileName)).map((record) => ({
     runId: entry.runId,
     taskId: entry.taskId ?? undefined,
     record
@@ -4714,7 +4713,7 @@ async function executeInbox(context, args) {
       if (isRemoteConnectionSelected(context.projectRoot)) {
         throw new CliError2("Remote approval resolution is not available from this CLI yet; use the server UI/API or switch to local state for direct JSONL edits.", 2);
       }
-      const approvalsPath = resolve15(resolveAuthorityRunDir2(context.projectRoot, run.value), "approvals.jsonl");
+      const approvalsPath = resolve15(resolveAuthorityRunDir(context.projectRoot, run.value), "approvals.jsonl");
       const approvals = readJsonlFile3(approvalsPath);
       const resolvedAt = new Date().toISOString();
       const next = approvals.map((entry) => entry.requestId === request.value || entry.id === request.value ? { ...entry, status: "resolved", decision: decision.value, note: note4.value ?? null, resolvedAt } : entry);
@@ -4770,7 +4769,7 @@ async function executeInbox(context, args) {
         const [key, ...restValue] = entry.split("=");
         return [key, restValue.join("=")];
       }));
-      const requestsPath = resolve15(resolveAuthorityRunDir2(context.projectRoot, run.value), "user-input.jsonl");
+      const requestsPath = resolve15(resolveAuthorityRunDir(context.projectRoot, run.value), "user-input.jsonl");
       const requests = readJsonlFile3(requestsPath);
       const resolvedAt = new Date().toISOString();
       const next = requests.map((entry) => entry.requestId === request.value || entry.id === request.value ? { ...entry, status: "resolved", answers: parsedAnswers, respondedAt: resolvedAt, resolvedAt } : entry);
@@ -6237,27 +6236,23 @@ init_runner();
 import { readFileSync as readFileSync8 } from "fs";
 import { resolve as resolve20 } from "path";
 import {
-  appendJsonlRecord as appendJsonlRecord2,
   appendRunLifecycleEvent,
+  appendRunLogEntry,
+  appendRunTimelineEntry,
+  patchAuthorityRunRecord,
   readAuthorityRun as readAuthorityRun2,
-  resolveAuthorityRunDir as resolveAuthorityRunDir3,
-  writeJsonFile as writeJsonFile4
+  resolveAuthorityRunDir as resolveAuthorityRunDir2,
+  writeJsonFile as writeJsonFile3
 } from "@rig/runtime/control-plane/authority-files";
 import { taskLookup } from "@rig/runtime/control-plane/native/task-ops";
 import { readPriorPrProgressPromptSection } from "@rig/runtime/control-plane/prompt-context";
 import { buildProviderTaskRunInstructionLines } from "@rig/runtime/control-plane/provider/runtime-instructions";
 import { loadRigTaskRunSkillBody } from "@rig/runtime/control-plane/provider/rig-task-run-skill";
 function patchAuthorityRun(projectRoot, runId, patch) {
-  const current = readAuthorityRun2(projectRoot, runId);
-  if (!current) {
+  const next = patchAuthorityRunRecord(projectRoot, runId, patch);
+  if (!next) {
     throw new CliError2(`Run not found: ${runId}`, 2);
   }
-  const next = {
-    ...current,
-    ...patch,
-    updatedAt: new Date().toISOString()
-  };
-  writeJsonFile4(resolve20(resolveAuthorityRunDir3(projectRoot, runId), "run.json"), next);
   return next;
 }
 function touchAuthorityRun(projectRoot, runId) {
@@ -6265,21 +6260,21 @@ function touchAuthorityRun(projectRoot, runId) {
   if (!current) {
     return;
   }
-  writeJsonFile4(resolve20(resolveAuthorityRunDir3(projectRoot, runId), "run.json"), {
+  writeJsonFile3(resolve20(resolveAuthorityRunDir2(projectRoot, runId), "run.json"), {
     ...current,
     updatedAt: new Date().toISOString()
   });
 }
 function appendRunTimeline(projectRoot, runId, value) {
-  appendJsonlRecord2(resolve20(resolveAuthorityRunDir3(projectRoot, runId), "timeline.jsonl"), value);
+  appendRunTimelineEntry(projectRoot, runId, value);
   touchAuthorityRun(projectRoot, runId);
 }
 function appendRunLog(projectRoot, runId, value) {
-  appendJsonlRecord2(resolve20(resolveAuthorityRunDir3(projectRoot, runId), "logs.jsonl"), value);
+  appendRunLogEntry(projectRoot, runId, value);
   touchAuthorityRun(projectRoot, runId);
 }
 function appendRunAction(projectRoot, runId, value) {
-  appendJsonlRecord2(resolve20(resolveAuthorityRunDir3(projectRoot, runId), "timeline.jsonl"), {
+  appendRunTimelineEntry(projectRoot, runId, {
     id: value.id,
     type: "action",
     actionType: value.actionType,
@@ -6500,7 +6495,7 @@ import { resolve as resolve21 } from "path";
 import {
   listAuthorityRuns as listAuthorityRuns2,
   readAuthorityRun as readAuthorityRun3,
-  resolveAuthorityRunDir as resolveAuthorityRunDir4,
+  resolveAuthorityRunDir as resolveAuthorityRunDir3,
   resolveTaskArtifactDirs
 } from "@rig/runtime/control-plane/authority-files";
 import { changedFilesForTask } from "@rig/runtime/control-plane/native/task-ops";
@@ -6534,7 +6529,7 @@ async function executeInspect(context, args) {
         }
         return { ok: true, group: "inspect", command, details: { task: requiredTask, runId: serverRun.runId, source: "server", entries } };
       }
-      const logsPath = resolve21(resolveAuthorityRunDir4(context.projectRoot, latestRun.runId), "logs.jsonl");
+      const logsPath = resolve21(resolveAuthorityRunDir3(context.projectRoot, latestRun.runId), "logs.jsonl");
       if (!existsSync13(logsPath)) {
         throw new CliError2(`No logs found for run ${latestRun.runId}.`);
       }
@@ -7264,7 +7259,7 @@ init__parsers();
 import { createInterface as createInterface2 } from "readline/promises";
 import {
   listAuthorityRuns as listAuthorityRuns3,
-  readAuthorityRun as readAuthorityRun4
+  readAuthorityRun as readAuthorityRun5
 } from "@rig/runtime/control-plane/authority-files";
 import {
   cleanupRunState,
@@ -7280,6 +7275,144 @@ import {
 } from "@rig/runtime/control-plane/native/run-ops";
 import { loadRuntimeContextFromEnv } from "@rig/runtime/control-plane/runtime/context";
 
+// packages/cli/src/commands/_run-replay.ts
+import { existsSync as existsSync14, readdirSync as readdirSync2 } from "fs";
+import { join as join2, resolve as resolve22 } from "path";
+import {
+  readAuthorityRun as readAuthorityRun4,
+  readJsonlFile as readJsonlFile4,
+  runLifecycleLogPath
+} from "@rig/runtime/control-plane/authority-files";
+function asRecord(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function text2(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
+function snippet(value, max = 120) {
+  const raw = text2(value);
+  if (!raw)
+    return null;
+  const flat = raw.replace(/\s+/g, " ");
+  return flat.length > max ? `${flat.slice(0, max - 1)}\u2026` : flat;
+}
+function summarizeLifecycleEntry(entry) {
+  const type = text2(entry.type) ?? "event";
+  switch (type) {
+    case "status": {
+      const anchor = text2(entry.sessionId);
+      return [
+        `status \u2192 ${text2(entry.status) ?? "(unknown)"}`,
+        snippet(entry.detail) ? `\u2014 ${snippet(entry.detail)}` : null,
+        anchor ? `[session ${anchor}]` : null
+      ].filter(Boolean).join(" ");
+    }
+    case "timeline-entry": {
+      const payload = asRecord(entry.payload) ?? {};
+      const kind = text2(payload.type) ?? "entry";
+      const body = snippet(payload.title) ?? snippet(payload.text) ?? snippet(payload.detail);
+      const state = text2(payload.state);
+      return [`timeline ${kind}`, body ? `\u2014 ${body}` : null, state ? `(${state})` : null].filter(Boolean).join(" ");
+    }
+    case "log-entry": {
+      const payload = asRecord(entry.payload) ?? {};
+      const title = snippet(payload.title) ?? "log";
+      const detail = snippet(payload.detail);
+      return [`log ${title}`, detail ? `\u2014 ${detail}` : null].filter(Boolean).join(" ");
+    }
+    case "record-patch": {
+      const patch = asRecord(entry.patch) ?? {};
+      const keys = Object.keys(patch);
+      const shown = keys.slice(0, 8).join(", ");
+      return `record-patch {${shown}${keys.length > 8 ? `, +${keys.length - 8} more` : ""}}`;
+    }
+    case "timeline":
+      return "timeline updated (signal)";
+    case "log":
+      return `log signal${snippet(entry.title) ? ` \u2014 ${snippet(entry.title)}` : ""}`;
+    case "completed":
+      return "run completed";
+    case "failed":
+      return `run failed${snippet(entry.error) ? ` \u2014 ${snippet(entry.error)}` : ""}`;
+    default:
+      return type;
+  }
+}
+function summarizeSessionEntry(entry) {
+  const type = text2(entry.type) ?? "entry";
+  const message2 = asRecord(entry.message);
+  const role = text2(message2?.role);
+  const content = message2?.content;
+  let body = null;
+  if (typeof content === "string") {
+    body = snippet(content);
+  } else if (Array.isArray(content)) {
+    body = snippet(content.map((part) => text2(asRecord(part)?.text) ?? "").filter(Boolean).join(" "));
+  }
+  return [
+    `pi ${type}`,
+    role ? `(${role})` : null,
+    body ? `\u2014 ${body}` : null
+  ].filter(Boolean).join(" ");
+}
+function sessionEntryTimestamp(entry) {
+  return text2(entry.timestamp) ?? text2(entry.at) ?? text2(entry.createdAt) ?? null;
+}
+function resolveRunSessionFile(record) {
+  const piSession = record?.piSession ?? null;
+  if (!piSession)
+    return null;
+  const recorded = text2(piSession.sessionFile);
+  if (recorded && existsSync14(recorded)) {
+    return recorded;
+  }
+  const cwd = text2(piSession.cwd);
+  const sessionId = text2(piSession.sessionId);
+  if (!cwd || !sessionId)
+    return null;
+  const sessionDir = resolve22(cwd, ".rig", "session");
+  try {
+    const match = readdirSync2(sessionDir).find((name) => name.endsWith(`_${sessionId}.jsonl`));
+    return match ? join2(sessionDir, match) : null;
+  } catch {
+    return null;
+  }
+}
+function buildRunReplay(projectRoot, runId, options = {}) {
+  const logPath = runLifecycleLogPath(projectRoot, runId);
+  const record = readAuthorityRun4(projectRoot, runId);
+  const lifecycleEntries = readJsonlFile4(logPath).map((entry) => asRecord(entry)).filter((entry) => entry !== null);
+  const merged = lifecycleEntries.map((entry) => ({
+    at: text2(entry.at),
+    source: "run",
+    summary: summarizeLifecycleEntry(entry)
+  }));
+  let sessionFile = null;
+  let sessionEntryCount = 0;
+  if (options.withSession) {
+    sessionFile = resolveRunSessionFile(record);
+    if (sessionFile) {
+      let lastSeenAt = null;
+      const sessionLines = readJsonlFile4(sessionFile).map((entry) => asRecord(entry)).filter((entry) => entry !== null).map((entry) => {
+        lastSeenAt = sessionEntryTimestamp(entry) ?? lastSeenAt;
+        return { at: lastSeenAt, source: "session", summary: summarizeSessionEntry(entry) };
+      });
+      sessionEntryCount = sessionLines.length;
+      merged.push(...sessionLines);
+      merged.sort((left, right) => (left.at ?? "").localeCompare(right.at ?? ""));
+    }
+  }
+  const lines = merged.map((line) => `${line.at ?? "(no timestamp)      "}  ${line.source === "run" ? "run    " : "session"}  ${line.summary}`);
+  return {
+    runId,
+    logPath,
+    sessionFile,
+    entryCount: lifecycleEntries.length,
+    sessionEntryCount,
+    lines
+  };
+}
+
 // packages/cli/src/commands/_operator-surface.ts
 import { createInterface } from "readline";
 import { createInterface as createPromptInterface } from "readline/promises";
@@ -7378,22 +7511,22 @@ function createPiRunStreamRenderer(output = process.stdout) {
       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 text3 = entry.text;
           const previousText = assistantTextById.get(id) ?? "";
-          if (!previousText && text2.trim()) {
+          if (!previousText && text3.trim()) {
             writeLine("[Pi assistant]");
           }
-          if (text2.startsWith(previousText)) {
-            const delta = text2.slice(previousText.length);
+          if (text3.startsWith(previousText)) {
+            const delta = text3.slice(previousText.length);
             if (delta)
               output.write(delta);
-          } else if (text2.trim() && text2 !== previousText) {
+          } else if (text3.trim() && text3 !== previousText) {
             if (previousText)
               writeLine(`
 [Pi assistant]`);
-            output.write(text2);
+            output.write(text3);
           }
-          assistantTextById.set(id, text2);
+          assistantTextById.set(id, text3);
           continue;
         }
         if (seenTimeline.has(id))
@@ -7408,15 +7541,15 @@ function createPiRunStreamRenderer(output = process.stdout) {
           continue;
         }
         if (entry.type === "action") {
-          const text2 = String(entry.detail ?? entry.message ?? entry.title ?? "").trim();
-          if (text2)
-            writeLine(`[Rig action] ${text2}`);
+          const text3 = String(entry.detail ?? entry.message ?? entry.title ?? "").trim();
+          if (text3)
+            writeLine(`[Rig action] ${text3}`);
           continue;
         }
         if (entry.type === "user_message") {
-          const text2 = String(entry.text ?? entry.message ?? entry.detail ?? "").trim();
-          if (text2)
-            writeLine(`[Operator] ${text2}`);
+          const text3 = String(entry.text ?? entry.message ?? entry.detail ?? "").trim();
+          if (text3)
+            writeLine(`[Operator] ${text3}`);
           continue;
         }
         const fallback = String(entry.detail ?? entry.message ?? entry.text ?? entry.title ?? "").trim();
@@ -7496,7 +7629,7 @@ async function promptForTaskSelection(question) {
 // packages/cli/src/commands/_pi-frontend.ts
 import { mkdtempSync, rmSync as rmSync5 } from "fs";
 import { tmpdir } from "os";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 import {
   createAgentSessionFromServices,
   createAgentSessionServices,
@@ -7628,15 +7761,15 @@ class RigRemoteSessionController {
     for (const compaction of this.pendingCompactions.splice(0))
       compaction.reject(new Error("Remote session closed."));
   }
-  async sendPrompt(text2, streamingBehavior) {
-    await this.transport.sendPrompt(this.context, this.runId, text2, streamingBehavior);
+  async sendPrompt(text3, streamingBehavior) {
+    await this.transport.sendPrompt(this.context, this.runId, text3, streamingBehavior);
   }
-  async sendCommand(text2) {
-    const result = await this.transport.runCommand(this.context, this.runId, text2);
+  async sendCommand(text3) {
+    const result = await this.transport.runCommand(this.context, this.runId, text3);
     return typeof result.message === "string" ? result.message : "worker command accepted";
   }
-  async sendShell(text2) {
-    await this.transport.sendShell(this.context, this.runId, text2);
+  async sendShell(text3) {
+    await this.transport.sendShell(this.context, this.runId, text3);
   }
   async abort() {
     await this.transport.abort(this.context, this.runId);
@@ -7788,8 +7921,8 @@ class RigRemoteAgentSession extends PiAgentSession {
   replaceRemoteMessages(messages) {
     this.agent.state.messages = messages;
   }
-  async expandLocalInput(text2) {
-    let current = text2;
+  async expandLocalInput(text3) {
+    let current = text3;
     const runner = this.extensionRunner;
     if (runner.hasHandlers("input")) {
       const result = await runner.emitInput(current, undefined, "interactive");
@@ -7802,8 +7935,8 @@ class RigRemoteAgentSession extends PiAgentSession {
     current = expandPromptTemplate(current, [...this.promptTemplates]);
     return current;
   }
-  async prompt(text2, options) {
-    const trimmed = text2.trim();
+  async prompt(text3, options) {
+    const trimmed = text3.trim();
     if (!trimmed)
       return;
     if (trimmed.startsWith("/")) {
@@ -7832,8 +7965,8 @@ class RigRemoteAgentSession extends PiAgentSession {
     options?.preflightResult?.(true);
     await this.remote.sendPrompt(expanded, behavior);
   }
-  async steer(text2) {
-    const trimmed = text2.trim();
+  async steer(text3) {
+    const trimmed = text3.trim();
     if (trimmed.startsWith("/") && await this._tryExecuteExtensionCommand(trimmed))
       return;
     const expanded = await this.expandLocalInput(trimmed);
@@ -7841,8 +7974,8 @@ class RigRemoteAgentSession extends PiAgentSession {
       return;
     await this.remote.sendPrompt(expanded, "steer");
   }
-  async followUp(text2) {
-    const trimmed = text2.trim();
+  async followUp(text3) {
+    const trimmed = text3.trim();
     if (trimmed.startsWith("/") && await this._tryExecuteExtensionCommand(trimmed))
       return;
     const expanded = await this.expandLocalInput(trimmed);
@@ -7854,8 +7987,8 @@ class RigRemoteAgentSession extends PiAgentSession {
     await this.remote.abort();
   }
   async compact(customInstructions) {
-    const pending = new Promise((resolve22, reject) => {
-      this.remote.registerPendingCompaction({ resolve: resolve22, reject });
+    const pending = new Promise((resolve23, reject) => {
+      this.remote.registerPendingCompaction({ resolve: resolve23, reject });
     });
     await this.remote.sendCommand(`/compact${customInstructions ? ` ${customInstructions}` : ""}`);
     return pending;
@@ -7924,8 +8057,8 @@ class RigRemoteAgentSession extends PiAgentSession {
 function createRemoteBashOperations(controller, excludeFromContext) {
   return {
     exec(command, _cwd, execOptions) {
-      return new Promise((resolve22, reject) => {
-        const pending = { onData: execOptions.onData, resolve: resolve22, reject, sawChunk: false };
+      return new Promise((resolve23, reject) => {
+        const pending = { onData: execOptions.onData, resolve: resolve23, reject, sawChunk: false };
         const cleanup = () => {
           execOptions.signal?.removeEventListener("abort", onAbort);
           if (timer)
@@ -8089,8 +8222,8 @@ function createRigWorkerPiBridgeExtension(options) {
       const prefix = busy ? `${SPINNER_FRAMES[frame]} ` : connected ? "\u25CF " : "\u25CB ";
       ctx.ui.setStatus("rig-worker-pi", `${prefix}${statusText}`);
     };
-    const setStatus = (ctx, text2, isBusy) => {
-      statusText = text2;
+    const setStatus = (ctx, text3, isBusy) => {
+      statusText = text3;
       busy = isBusy;
       renderStatus(ctx);
     };
@@ -8134,7 +8267,7 @@ function createRigWorkerPiBridgeExtension(options) {
         ctx.ui.notify("Initial message sent to the worker Pi daemon.", "info");
       const nativeUi = ctx.ui;
       options.controller.setUiHooks({
-        onStatusText: (text2) => setStatus(ctx, text2, !connected),
+        onStatusText: (text3) => setStatus(ctx, text3, !connected),
         onActivity: (label, detail) => {
           const active = label !== "idle" && !/complete|ready/i.test(label);
           setStatus(ctx, [label, detail].filter(Boolean).join(" \u2014 "), active);
@@ -8191,7 +8324,7 @@ function setTemporaryEnv(updates) {
   };
 }
 async function attachRunBundledPiFrontend(context, input) {
-  const tempSessionDir = mkdtempSync(join2(tmpdir(), "rig-pi-frontend-sessions-"));
+  const tempSessionDir = mkdtempSync(join3(tmpdir(), "rig-pi-frontend-sessions-"));
   const restoreEnv = setTemporaryEnv({
     PI_CODING_AGENT_SESSION_DIR: tempSessionDir,
     PI_SKIP_VERSION_CHECK: "1",
@@ -8511,7 +8644,7 @@ async function executeRun(context, args) {
       if (!runId) {
         throw new CliError2("run show requires a run id.");
       }
-      const record = readAuthorityRun4(context.projectRoot, runId) ?? normalizeRemoteRunDetails2(await getRunDetailsViaServer(context, runId).catch(() => ({})));
+      const record = readAuthorityRun5(context.projectRoot, runId) ?? normalizeRemoteRunDetails2(await getRunDetailsViaServer(context, runId).catch(() => ({})));
       if (!record) {
         throw new CliError2(`Run not found: ${runId}`, 2);
       }
@@ -8549,6 +8682,46 @@ async function executeRun(context, args) {
       }
       return { ok: true, group: "run", command, details: { runId: run.value, events, cursor } };
     }
+    case "replay": {
+      let pending = rest;
+      const run = takeOption(pending, "--run");
+      pending = run.rest;
+      const withSession = takeFlag(pending, "--with-session");
+      pending = withSession.rest;
+      const positionalRunId = pending.length > 0 && pending[0] && !pending[0].startsWith("-") ? pending[0] : undefined;
+      const extra = positionalRunId ? pending.slice(1) : pending;
+      requireNoExtraArgs(extra, "rig run replay <id>|--run <id> [--with-session]");
+      const runId = run.value ?? positionalRunId;
+      if (!runId) {
+        throw new CliError2("run replay requires a run id.", 2);
+      }
+      const replay = buildRunReplay(context.projectRoot, runId, { withSession: withSession.value });
+      if (replay.entryCount === 0 && replay.sessionEntryCount === 0) {
+        throw new CliError2(`No run.jsonl lifecycle log found for ${runId} (looked at ${replay.logPath}).`, 2);
+      }
+      if (context.outputMode === "text") {
+        console.log(`Replay of ${runId} (${replay.entryCount} lifecycle entries${withSession.value ? `, ${replay.sessionEntryCount} session entries` : ""}):`);
+        for (const line of replay.lines) {
+          console.log(line);
+        }
+        if (withSession.value && !replay.sessionFile) {
+          console.log("(no Pi session file resolvable from the run record; showing run.jsonl only)");
+        }
+      }
+      return {
+        ok: true,
+        group: "run",
+        command,
+        details: {
+          runId,
+          logPath: replay.logPath,
+          sessionFile: replay.sessionFile,
+          entryCount: replay.entryCount,
+          sessionEntryCount: replay.sessionEntryCount,
+          lines: replay.lines
+        }
+      };
+    }
     case "attach": {
       let pending = rest;
       const runOption = takeOption(pending, "--run");
@@ -8871,7 +9044,7 @@ async function executeServer(context, args, options) {
 init_runner();
 import { readFileSync as readFileSync10 } from "fs";
 import { spawnSync as spawnSync3 } from "child_process";
-import { resolve as resolve22 } from "path";
+import { resolve as resolve23 } from "path";
 import { cancel as cancel4, confirm as confirm2, isCancel as isCancel4 } from "@clack/prompts";
 import {
   taskArtifactDir,
@@ -9049,6 +9222,7 @@ var PRIMARY_GROUPS = [
       { command: "stop [<run-id>|--run <id>]", description: "Request stop for one run or local active runs.", primary: true },
       { command: "steer <run-id> --message <text>", description: "Queue a steering message into a live worker without attaching." },
       { command: "timeline --run <id> [--follow]", description: "Stream raw run timeline events." },
+      { command: "replay <run-id>|--run <id> [--with-session]", description: "Print the run's consolidated run.jsonl as a merged timeline; --with-session interleaves the Pi session log." },
       { command: "resume", description: "Resume the most recent interrupted local run." },
       { command: "restart", description: "Restart the most recent local run from a clean runtime." },
       { command: "delete|cleanup", description: "Remove completed run records/artifacts." }
@@ -9636,7 +9810,7 @@ async function executeTask(context, args, options) {
       const fileFlag = takeOption(rest.slice(1), "--file");
       let content;
       if (fileFlag.value) {
-        content = readFileSync10(resolve22(context.projectRoot, fileFlag.value), "utf-8");
+        content = readFileSync10(resolve23(context.projectRoot, fileFlag.value), "utf-8");
       } else {
         content = await readStdin();
       }
@@ -9870,8 +10044,8 @@ async function executeTask(context, args, options) {
 
 // packages/cli/src/commands/task-run-driver.ts
 init_runner();
-import { copyFileSync as copyFileSync3, existsSync as existsSync14, mkdirSync as mkdirSync9, readFileSync as readFileSync11, statSync as statSync2, writeFileSync as writeFileSync7 } from "fs";
-import { resolve as resolve23 } from "path";
+import { copyFileSync as copyFileSync3, existsSync as existsSync15, mkdirSync as mkdirSync9, readFileSync as readFileSync11, statSync as statSync2, writeFileSync as writeFileSync7 } from "fs";
+import { resolve as resolve24 } from "path";
 import { spawn as spawn2, spawnSync as spawnSync4 } from "child_process";
 import { createInterface as createLineInterface } from "readline";
 import { loadConfig as loadConfig2 } from "@rig/core/load-config";
@@ -9895,7 +10069,7 @@ import {
   isCodexExecRecord
 } from "@rig/runtime/control-plane/provider/codex-exec-records";
 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 { readAuthorityRun as readAuthorityRun6, readJsonFile as readJsonFile3, resolveTaskArtifactDirs as resolveTaskArtifactDirs2 } from "@rig/runtime/control-plane/authority-files";
 import {
   buildTaskRunLifecycleComment
 } from "@rig/runtime/control-plane/tasks/source-lifecycle";
@@ -9955,12 +10129,12 @@ function copyUntrackedDirtyFiles(sourceRoot, targetRoot) {
     return 0;
   let copied = 0;
   for (const relativePath of listed.stdout.split("\x00").filter(Boolean)) {
-    const sourcePath = resolve23(sourceRoot, relativePath);
-    const targetPath = resolve23(targetRoot, relativePath);
+    const sourcePath = resolve24(sourceRoot, relativePath);
+    const targetPath = resolve24(targetRoot, relativePath);
     try {
       if (!statSync2(sourcePath).isFile())
         continue;
-      mkdirSync9(resolve23(targetPath, ".."), { recursive: true });
+      mkdirSync9(resolve24(targetPath, ".."), { recursive: true });
       copyFileSync3(sourcePath, targetPath);
       copied += 1;
     } catch {}
@@ -9999,7 +10173,7 @@ function buildDirtyBaselineHandshakeEnv(input) {
     return { RIG_BASELINE_MODE: input.baselineMode ?? "head" };
   return {
     RIG_BASELINE_MODE: "dirty-snapshot",
-    RIG_DIRTY_BASELINE_READY_FILE: resolve23(input.projectRoot, ".rig", "runs", input.runId, "dirty-baseline.ready.json")
+    RIG_DIRTY_BASELINE_READY_FILE: resolve24(input.projectRoot, ".rig", "runs", input.runId, "dirty-baseline.ready.json")
   };
 }
 function positiveInt(value, fallback) {
@@ -10104,9 +10278,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((resolve24) => {
-      child.once("error", (error) => resolve24({ exitCode: 1, stderr: error.message }));
-      child.once("close", (code) => resolve24({
+    return await new Promise((resolve25) => {
+      child.once("error", (error) => resolve25({ exitCode: 1, stderr: error.message }));
+      child.once("close", (code) => resolve25({
         exitCode: code ?? 1,
         stdout: Buffer.concat(stdoutChunks).toString("utf8"),
         stderr: Buffer.concat(stderrChunks).toString("utf8")
@@ -10180,7 +10354,7 @@ async function runTaskRunPostValidationLifecycle(input) {
     config,
     sourceTask: input.sourceTask,
     uploadedSnapshot: input.uploadedSnapshot,
-    artifactRoot: resolve23(input.projectRoot, "artifacts", taskId3),
+    artifactRoot: resolve24(input.projectRoot, "artifacts", taskId3),
     command: ghCommand,
     gitCommand,
     steerPi,
@@ -10310,7 +10484,7 @@ function summarizeValidationFailure(projectRoot, taskId3) {
     return null;
   }
   for (const artifactDir of resolveTaskArtifactDirs2(projectRoot, taskId3)) {
-    const summary = readJsonFile3(resolve23(artifactDir, "validation-summary.json"), null);
+    const summary = readJsonFile3(resolve24(artifactDir, "validation-summary.json"), null);
     if (!summary || summary.status !== "fail") {
       continue;
     }
@@ -10391,9 +10565,9 @@ function readTaskRunAcceptedArtifactState(input) {
   if (!input.taskId || !input.workspaceDir) {
     return { accepted: false, reason: null };
   }
-  const artifactDir = resolve23(input.workspaceDir, "artifacts", input.taskId);
-  const reviewStatusPath = resolve23(artifactDir, "review-status.txt");
-  const taskResultPath = resolve23(artifactDir, "task-result.json");
+  const artifactDir = resolve24(input.workspaceDir, "artifacts", input.taskId);
+  const reviewStatusPath = resolve24(artifactDir, "review-status.txt");
+  const taskResultPath = resolve24(artifactDir, "task-result.json");
   const reviewStatus = readTaskRunReviewStatus(reviewStatusPath);
   if (reviewStatus !== "APPROVED") {
     return { accepted: false, reason: null };
@@ -10430,12 +10604,12 @@ function resolveTaskRunRetryContext(input) {
   if (!input.taskId || !input.workspaceDir) {
     return { shouldRetry: false, failureDetail: null, nextPrompt: null };
   }
-  const artifactDir = resolve23(input.workspaceDir, "artifacts", input.taskId);
-  const reviewStatePath = resolve23(artifactDir, "review-state.json");
-  const reviewFeedbackPath = resolve23(artifactDir, "review-feedback.md");
-  const reviewStatusPath = resolve23(artifactDir, "review-status.txt");
-  const failedApproachesPath = resolve23(input.workspaceDir, ".rig", "state", "failed_approaches.md");
-  const validationSummaryPath = resolve23(artifactDir, "validation-summary.json");
+  const artifactDir = resolve24(input.workspaceDir, "artifacts", input.taskId);
+  const reviewStatePath = resolve24(artifactDir, "review-state.json");
+  const reviewFeedbackPath = resolve24(artifactDir, "review-feedback.md");
+  const reviewStatusPath = resolve24(artifactDir, "review-status.txt");
+  const failedApproachesPath = resolve24(input.workspaceDir, ".rig", "state", "failed_approaches.md");
+  const validationSummaryPath = resolve24(artifactDir, "validation-summary.json");
   const reviewState = readJsonFile3(reviewStatePath, null);
   const reviewStatus = readTaskRunReviewStatus(reviewStatusPath);
   const reviewRejected = isTaskRunReviewRejected(reviewState);
@@ -10621,7 +10795,7 @@ function appendToolTimelineFromLog(input) {
   });
 }
 function readTaskRunReviewStatus(reviewStatusPath) {
-  if (!existsSync14(reviewStatusPath)) {
+  if (!existsSync15(reviewStatusPath)) {
     return null;
   }
   try {
@@ -10701,7 +10875,7 @@ async function updateTaskSourceAfterDriverRun(projectRoot, runId, taskId3, sourc
   }
 }
 function readRunSourceTaskContract(projectRoot, runId, taskId3) {
-  const run = readAuthorityRun5(projectRoot, runId);
+  const run = readAuthorityRun6(projectRoot, runId);
   const raw = run?.sourceTask;
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
     return null;
@@ -10742,8 +10916,10 @@ async function executeRigOwnedTaskRun(context, input) {
   process.stderr.on("error", () => {});
   configureRunEventSink(context.projectRoot);
   const runtimeTaskId = input.taskId?.trim() || `adhoc-${input.runId}`;
-  const existingRunRecord = readAuthorityRun5(context.projectRoot, input.runId);
+  const existingRunRecord = readAuthorityRun6(context.projectRoot, input.runId);
   const resumeMode = process.env.RIG_RUN_RESUME === "1";
+  let latestPiSessionId = typeof existingRunRecord?.piSession?.sessionId === "string" && existingRunRecord.piSession.sessionId.trim() ? existingRunRecord.piSession.sessionId : null;
+  const sessionAnchor = () => latestPiSessionId ? { sessionId: latestPiSessionId } : {};
   const resumePreviousStatus = String(existingRunRecord?.status ?? "").toLowerCase();
   const sourceTask = readRunSourceTaskContract(context.projectRoot, input.runId, input.taskId);
   let prompt = buildRunPrompt({
@@ -10816,7 +10992,8 @@ async function executeRigOwnedTaskRun(context, input) {
     type: "status",
     runId: input.runId,
     status: "preparing",
-    detail: input.taskId ?? input.title ?? runtimeTaskId
+    detail: input.taskId ?? input.title ?? runtimeTaskId,
+    ...sessionAnchor()
   });
   appendRunLog(context.projectRoot, input.runId, {
     id: `log:${input.runId}:${resumeMode ? "resume" : "start"}`,
@@ -10842,15 +11019,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 = resolve23("artifacts", runtimeTaskId, "implementation-plan.md");
+  const planningArtifactPath = resolve24("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()
   };
-  mkdirSync9(resolve23(context.projectRoot, ".rig", "runs", input.runId), { recursive: true });
-  writeFileSync7(resolve23(context.projectRoot, ".rig", "runs", input.runId, "planning-classification.json"), `${JSON.stringify(persistedPlanning, null, 2)}
+  mkdirSync9(resolve24(context.projectRoot, ".rig", "runs", input.runId), { recursive: true });
+  writeFileSync7(resolve24(context.projectRoot, ".rig", "runs", input.runId, "planning-classification.json"), `${JSON.stringify(persistedPlanning, null, 2)}
 `, "utf8");
   patchAuthorityRun(context.projectRoot, input.runId, { planning: persistedPlanning });
   prompt = `${prompt}
@@ -10900,7 +11077,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
   let verificationStarted = false;
   let reviewStarted = false;
   let latestRuntimeWorkspace = resumeMode && typeof existingRunRecord?.worktreePath === "string" ? existingRunRecord.worktreePath : null;
-  let latestSessionDir = resumeMode && typeof existingRunRecord?.sessionPath === "string" ? resolve23(existingRunRecord.sessionPath, "..") : null;
+  let latestSessionDir = resumeMode && typeof existingRunRecord?.sessionPath === "string" ? resolve24(existingRunRecord.sessionPath, "..") : null;
   let latestLogsDir = resumeMode && typeof existingRunRecord?.logRoot === "string" ? existingRunRecord.logRoot : null;
   let latestProviderCommand = null;
   let latestRuntimeBranch = resumeMode && typeof existingRunRecord?.branch === "string" ? existingRunRecord.branch : null;
@@ -10937,7 +11114,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
       return;
     verificationStarted = true;
     patchAuthorityRun(context.projectRoot, input.runId, { status: "validating" });
-    emitServerRunEvent({ type: "status", runId: input.runId, status: "validating", detail: detail ?? null });
+    emitServerRunEvent({ type: "status", runId: input.runId, status: "validating", detail: detail ?? null, ...sessionAnchor() });
     verificationAction = startRunAction(context.projectRoot, input.runId, {
       actionId: `action:${input.runId}:completion-verification`,
       actionType: "completion-verification",
@@ -10950,7 +11127,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
       return;
     reviewStarted = true;
     patchAuthorityRun(context.projectRoot, input.runId, { status: "reviewing" });
-    emitServerRunEvent({ type: "status", runId: input.runId, status: "reviewing", detail: detail ?? null });
+    emitServerRunEvent({ type: "status", runId: input.runId, status: "reviewing", detail: detail ?? null, ...sessionAnchor() });
     reviewAction = startRunAction(context.projectRoot, input.runId, {
       actionId: `action:${input.runId}:review-closeout`,
       actionType: "run.review",
@@ -10986,10 +11163,10 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
       patchAuthorityRun(context.projectRoot, input.runId, {
         status: "running",
         worktreePath: latestRuntimeWorkspace,
-        artifactRoot: latestRuntimeWorkspace && input.taskId ? resolve23(latestRuntimeWorkspace, "artifacts", input.taskId) : null,
+        artifactRoot: latestRuntimeWorkspace && input.taskId ? resolve24(latestRuntimeWorkspace, "artifacts", input.taskId) : null,
         logRoot: latestLogsDir,
-        sessionPath: latestSessionDir ? resolve23(latestSessionDir, "session.json") : null,
-        sessionLogPath: latestLogsDir ? resolve23(latestLogsDir, "agent-stdout.log") : null,
+        sessionPath: latestSessionDir ? resolve24(latestSessionDir, "session.json") : null,
+        sessionLogPath: latestLogsDir ? resolve24(latestLogsDir, "agent-stdout.log") : null,
         branch: runtimeId
       });
       if (!dirtyBaselineApplied && input.baselineMode === "dirty-snapshot" && latestRuntimeWorkspace) {
@@ -10997,7 +11174,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) {
-          mkdirSync9(resolve23(readyFile, ".."), { recursive: true });
+          mkdirSync9(resolve24(readyFile, ".."), { recursive: true });
           writeFileSync7(readyFile, `${JSON.stringify({ ...dirty, workspaceDir: latestRuntimeWorkspace, appliedAt: new Date().toISOString() }, null, 2)}
 `, "utf8");
         }
@@ -11040,7 +11217,8 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
         type: "status",
         runId: input.runId,
         status: "running",
-        detail: latestRuntimeWorkspace
+        detail: latestRuntimeWorkspace,
+        ...sessionAnchor()
       });
       return true;
     }
@@ -11123,6 +11301,9 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
           piSessionPrivate: privateMetadata
         });
         const sessionId = typeof publicMetadata?.sessionId === "string" ? publicMetadata.sessionId : typeof privateMetadata.public === "object" && privateMetadata.public && !Array.isArray(privateMetadata.public) ? String(privateMetadata.public.sessionId ?? "") : "";
+        if (sessionId) {
+          latestPiSessionId = sessionId;
+        }
         appendRunLog(context.projectRoot, input.runId, {
           id: `log:${input.runId}:pi-session-ready`,
           title: "Worker Pi session ready",
@@ -11382,7 +11563,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
     let acceptedArtifactObservedAt = null;
     let acceptedArtifactPollTimer = null;
     let acceptedArtifactKillTimer = null;
-    const attemptExit = await new Promise((resolve24) => {
+    const attemptExit = await new Promise((resolve25) => {
       let settled = false;
       const settle = (result) => {
         if (settled)
@@ -11390,7 +11571,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
         settled = true;
         if (acceptedArtifactPollTimer)
           clearInterval(acceptedArtifactPollTimer);
-        resolve24(result);
+        resolve25(result);
       };
       const pollAcceptedArtifacts = () => {
         const artifactState = readTaskRunAcceptedArtifactState({
@@ -11517,7 +11698,8 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
         type: "status",
         runId: input.runId,
         status: "validating",
-        detail: failureDetail
+        detail: failureDetail,
+        ...sessionAnchor()
       });
       emitServerRunEvent({ type: "log", runId: input.runId, title: "Validate failed" });
       emitServerRunEvent({ type: "log", runId: input.runId, title: `Steering Pi to retry validation (attempt ${attempt + 1}/${maxAttempts})` });
@@ -11592,8 +11774,8 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
   }
   if (planningClassification.planningRequired) {
     const planWorkspace = latestRuntimeWorkspace ?? context.projectRoot;
-    const expectedPlanPath = resolve23(planWorkspace, planningArtifactPath);
-    if (!existsSync14(expectedPlanPath)) {
+    const expectedPlanPath = resolve24(planWorkspace, planningArtifactPath);
+    if (!existsSync15(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, {
@@ -11655,7 +11837,7 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
       payload: { runtimeWorkspace: latestRuntimeWorkspace, branch: latestRuntimeBranch }
     });
     emitServerRunEvent({ type: "log", runId: input.runId, title: "Server-owned closeout requested" });
-    emitServerRunEvent({ type: "status", runId: input.runId, status: "reviewing", detail: "Server-owned closeout requested." });
+    emitServerRunEvent({ type: "status", runId: input.runId, status: "reviewing", detail: "Server-owned closeout requested.", ...sessionAnchor() });
     await context.emitEvent("command.finished", {
       command: [
         "rig",
@@ -11763,9 +11945,9 @@ 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((resolve24) => {
-      child.once("error", () => resolve24(1));
-      child.once("close", (code) => resolve24(code ?? 1));
+    const exitCode = await new Promise((resolve25) => {
+      child.once("error", () => resolve25(1));
+      child.once("close", (code) => resolve25(code ?? 1));
     });
     for (const pendingLog of flushPendingClaudeToolUseLogs({
       runId: input.runId,
@@ -11907,8 +12089,8 @@ async function executeTest(context, args) {
 
 // packages/cli/src/commands/setup.ts
 init_runner();
-import { existsSync as existsSync15, mkdirSync as mkdirSync10, readdirSync as readdirSync2, writeFileSync as writeFileSync8 } from "fs";
-import { resolve as resolve24 } from "path";
+import { existsSync as existsSync16, mkdirSync as mkdirSync10, readdirSync as readdirSync3, writeFileSync as writeFileSync8 } from "fs";
+import { resolve as resolve25 } from "path";
 import { createPluginHost } from "@rig/core";
 import {
   isSupportedBunVersion as isSupportedBunVersion2,
@@ -11966,8 +12148,8 @@ function runSetupInit(projectRoot) {
   mkdirSync10(stateDir, { recursive: true });
   mkdirSync10(logsDir, { recursive: true });
   mkdirSync10(artifactsDir, { recursive: true });
-  const failuresPath = resolve24(stateDir, "failed_approaches.md");
-  if (!existsSync15(failuresPath)) {
+  const failuresPath = resolve25(stateDir, "failed_approaches.md");
+  if (!existsSync16(failuresPath)) {
     writeFileSync8(failuresPath, `# Failed Approaches
 
 `, "utf-8");
@@ -11985,19 +12167,19 @@ async function runSetupCheck(projectRoot) {
 }
 async function runSetupPreflight(projectRoot) {
   await runSetupCheck(projectRoot);
-  const validationRoot = resolve24(resolveControlPlaneDefinitionRoot(projectRoot), "validation");
-  if (existsSync15(validationRoot)) {
-    const validators = readdirSync2(validationRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory());
+  const validationRoot = resolve25(resolveControlPlaneDefinitionRoot(projectRoot), "validation");
+  if (existsSync16(validationRoot)) {
+    const validators = readdirSync3(validationRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory());
     for (const validator of validators) {
-      const script = resolve24(validationRoot, validator.name, "validate.sh");
-      if (existsSync15(script)) {
+      const script = resolve25(validationRoot, validator.name, "validate.sh");
+      if (existsSync16(script)) {
         console.log(`OK: validator script ${script}`);
       }
     }
   }
-  const hooksRoot = resolve24(resolveControlPlaneDefinitionRoot(projectRoot), "hooks");
-  if (existsSync15(hooksRoot)) {
-    const hooks = readdirSync2(hooksRoot).filter((name) => name.endsWith(".sh"));
+  const hooksRoot = resolve25(resolveControlPlaneDefinitionRoot(projectRoot), "hooks");
+  if (existsSync16(hooksRoot)) {
+    const hooks = readdirSync3(hooksRoot).filter((name) => name.endsWith(".sh"));
     for (const hook of hooks) {
       console.log(`OK: hook ${hook}`);
     }
@@ -12141,7 +12323,7 @@ var PROJECT_REQUIRED_GROUPS = new Set([
 ]);
 var RIG_CONFIG_FILENAMES = ["rig.config.ts", "rig.config.mts", "rig.config.json"];
 function hasInitializedRigProject(projectRoot) {
-  return RIG_CONFIG_FILENAMES.some((name) => existsSync16(resolve25(projectRoot, name))) || existsSync16(resolve25(projectRoot, ".rig"));
+  return RIG_CONFIG_FILENAMES.some((name) => existsSync17(resolve26(projectRoot, name))) || existsSync17(resolve26(projectRoot, ".rig"));
 }
 function requireInitializedRigProject(context, group) {
   if (hasInitializedRigProject(context.projectRoot)) {
@@ -12194,8 +12376,8 @@ function resolveTopLevelLaunchState(context) {
   let selectedServer = null;
   if (projectInitialized) {
     try {
-      const statePath = resolve25(context.projectRoot, ".rig", "state", "connection.json");
-      if (existsSync16(statePath)) {
+      const statePath = resolve26(context.projectRoot, ".rig", "state", "connection.json");
+      if (existsSync17(statePath)) {
         const parsed = JSON.parse(readFileSync12(statePath, "utf-8"));
         selectedServer = parsed.remoteUrl || parsed.url || parsed.selected || null;
       }
@@ -12375,8 +12557,8 @@ var __testOnly = {
   validateRequiredBugPromptValue
 };
 // packages/cli/src/launcher.ts
-import { existsSync as existsSync17 } from "fs";
-import { basename as basename3, resolve as resolve26 } from "path";
+import { existsSync as existsSync18 } from "fs";
+import { basename as basename3, resolve as resolve27 } from "path";
 import { loadDotEnvSecrets } from "@rig/runtime/baked-secrets";
 import { RIG_DEFINITION_DIRNAME, RIG_STATE_DIRNAME, resolveNearestRigProjectRoot } from "@rig/runtime/layout";
 function parsePolicyMode(value) {
@@ -12389,7 +12571,7 @@ function parsePolicyMode(value) {
   throw new Error(`Invalid --policy-mode value: ${value}. Use off|observe|enforce.`);
 }
 function hasRigProjectMarker(candidate) {
-  return existsSync17(resolve26(candidate, RIG_DEFINITION_DIRNAME)) || existsSync17(resolve26(candidate, RIG_STATE_DIRNAME)) || existsSync17(resolve26(candidate, "rig.config.ts")) || existsSync17(resolve26(candidate, "rig.config.json")) || existsSync17(resolve26(candidate, ".git"));
+  return existsSync18(resolve27(candidate, RIG_DEFINITION_DIRNAME)) || existsSync18(resolve27(candidate, RIG_STATE_DIRNAME)) || existsSync18(resolve27(candidate, "rig.config.ts")) || existsSync18(resolve27(candidate, "rig.config.json")) || existsSync18(resolve27(candidate, ".git"));
 }
 function resolveProjectRoot({
   envProjectRoot,
@@ -12398,19 +12580,19 @@ function resolveProjectRoot({
   cwd = process.cwd()
 }) {
   if (envProjectRoot) {
-    return resolve26(cwd, envProjectRoot);
+    return resolve27(cwd, envProjectRoot);
   }
   const fallbackImportDir = importDir ?? cwd;
   const execName = basename3(execPath).toLowerCase();
-  const execCandidates = execName === "rig" || execName === "rig.exe" ? [resolve26(execPath, "..", "..")] : [];
-  const candidates = [cwd, ...execCandidates, resolve26(fallbackImportDir, "..")];
+  const execCandidates = execName === "rig" || execName === "rig.exe" ? [resolve27(execPath, "..", "..")] : [];
+  const candidates = [cwd, ...execCandidates, resolve27(fallbackImportDir, "..")];
   for (const candidate of candidates) {
     const nearest = resolveNearestRigProjectRoot(candidate);
     if (hasRigProjectMarker(nearest)) {
       return nearest;
     }
   }
-  return resolve26(cwd);
+  return resolve27(cwd);
 }
 function normalizeCliErrorCode(message2, isCliError) {
   if (message2.startsWith("Invalid --policy-mode value:")) {
@@ -12477,7 +12659,7 @@ async function runRigCli(module, options = {}) {
         runId: context.runId,
         outcome,
         eventsFile: context.eventBus.getEventsFile(),
-        policyFile: resolve26(projectRoot, "rig", "policy", "policy.json"),
+        policyFile: resolve27(projectRoot, "rig", "policy", "policy.json"),
         policyMode: context.policyMode ?? policyMode ?? module.loadPolicy(projectRoot).mode
       }, null, 2));
     }