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

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

@@ -52,11 +52,13 @@ import {
 import { readFileSync } from "fs";
 import { resolve as resolve3 } from "path";
 import {
-  appendJsonlRecord,
   appendRunLifecycleEvent,
+  appendRunLogEntry,
+  appendRunTimelineEntry,
+  patchAuthorityRunRecord,
   readAuthorityRun as readAuthorityRun2,
-  resolveAuthorityRunDir as resolveAuthorityRunDir2,
-  writeJsonFile as writeJsonFile2
+  resolveAuthorityRunDir,
+  writeJsonFile
 } 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";
@@ -69,8 +71,7 @@ import { resolve as resolve2 } from "path";
 import {
   readAuthorityRun,
   readJsonlFile,
-  resolveAuthorityRunDir,
-  writeJsonFile
+  writeAuthorityRunRecord
 } from "@rig/runtime/control-plane/authority-files";
 
 // packages/cli/src/commands/_paths.ts
@@ -168,22 +169,16 @@ function upsertAgentAuthorityRun(projectRoot, input) {
   } else if ("errorText" in next) {
     delete next.errorText;
   }
-  writeJsonFile(resolve2(resolveAuthorityRunDir(projectRoot, input.runId), "run.json"), next);
+  writeAuthorityRunRecord(projectRoot, input.runId, next);
   return next;
 }
 
 // packages/cli/src/commands/_run-driver-helpers.ts
 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()
-  };
-  writeJsonFile2(resolve3(resolveAuthorityRunDir2(projectRoot, runId), "run.json"), next);
   return next;
 }
 function touchAuthorityRun(projectRoot, runId) {
@@ -191,21 +186,21 @@ function touchAuthorityRun(projectRoot, runId) {
   if (!current) {
     return;
   }
-  writeJsonFile2(resolve3(resolveAuthorityRunDir2(projectRoot, runId), "run.json"), {
+  writeJsonFile(resolve3(resolveAuthorityRunDir(projectRoot, runId), "run.json"), {
     ...current,
     updatedAt: new Date().toISOString()
   });
 }
 function appendRunTimeline(projectRoot, runId, value) {
-  appendJsonlRecord(resolve3(resolveAuthorityRunDir2(projectRoot, runId), "timeline.jsonl"), value);
+  appendRunTimelineEntry(projectRoot, runId, value);
   touchAuthorityRun(projectRoot, runId);
 }
 function appendRunLog(projectRoot, runId, value) {
-  appendJsonlRecord(resolve3(resolveAuthorityRunDir2(projectRoot, runId), "logs.jsonl"), value);
+  appendRunLogEntry(projectRoot, runId, value);
   touchAuthorityRun(projectRoot, runId);
 }
 function appendRunAction(projectRoot, runId, value) {
-  appendJsonlRecord(resolve3(resolveAuthorityRunDir2(projectRoot, runId), "timeline.jsonl"), {
+  appendRunTimelineEntry(projectRoot, runId, {
     id: value.id,
     type: "action",
     actionType: value.actionType,
@@ -449,7 +444,7 @@ function readJsonFile(path) {
     throw new CliError2(`Invalid Rig connection state at ${path}: ${error instanceof Error ? error.message : String(error)}`, 1);
   }
 }
-function writeJsonFile3(path, value) {
+function writeJsonFile2(path, value) {
   mkdirSync(dirname(path), { recursive: true });
   writeFileSync(path, `${JSON.stringify(value, null, 2)}
 `, "utf8");
@@ -499,7 +494,7 @@ function readRepoConnection(projectRoot) {
   };
 }
 function writeRepoConnection(projectRoot, state) {
-  writeJsonFile3(resolveRepoConnectionPath(projectRoot), state);
+  writeJsonFile2(resolveRepoConnectionPath(projectRoot), state);
 }
 function resolveSelectedConnection(projectRoot, options = {}) {
   const repo = readRepoConnection(projectRoot);
@@ -1530,6 +1525,8 @@ async function executeRigOwnedTaskRun(context, input) {
   const runtimeTaskId = input.taskId?.trim() || `adhoc-${input.runId}`;
   const existingRunRecord = readAuthorityRun3(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({
@@ -1602,7 +1599,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"}`,
@@ -1723,7 +1721,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",
@@ -1736,7 +1734,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",
@@ -1826,7 +1824,8 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
         type: "status",
         runId: input.runId,
         status: "running",
-        detail: latestRuntimeWorkspace
+        detail: latestRuntimeWorkspace,
+        ...sessionAnchor()
       });
       return true;
     }
@@ -1909,6 +1908,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",
@@ -2303,7 +2305,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})` });
@@ -2441,7 +2444,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",

package/dist/src/commands/task.js

@@ -78,8 +78,7 @@ import {
 import {
   readAuthorityRun,
   readJsonlFile,
-  resolveAuthorityRunDir,
-  writeJsonFile
+  writeAuthorityRunRecord
 } from "@rig/runtime/control-plane/authority-files";
 
 // packages/cli/src/commands/_paths.ts
@@ -128,7 +127,7 @@ function readJsonFile(path) {
     throw new CliError2(`Invalid Rig connection state at ${path}: ${error instanceof Error ? error.message : String(error)}`, 1);
   }
 }
-function writeJsonFile2(path, value) {
+function writeJsonFile(path, value) {
   mkdirSync(dirname(path), { recursive: true });
   writeFileSync(path, `${JSON.stringify(value, null, 2)}
 `, "utf8");
@@ -178,7 +177,7 @@ function readRepoConnection(projectRoot) {
   };
 }
 function writeRepoConnection(projectRoot, state) {
-  writeJsonFile2(resolveRepoConnectionPath(projectRoot), state);
+  writeJsonFile(resolveRepoConnectionPath(projectRoot), state);
 }
 function resolveSelectedConnection(projectRoot, options = {}) {
   const repo = readRepoConnection(projectRoot);
@@ -2156,6 +2155,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." }