@h-rig/cli 0.0.6-alpha.71 → 0.0.6-alpha.73

package/dist/bin/rig.js

@@ -7860,7 +7860,7 @@ async function promptForTaskSelection(question) {
 }
 
 // packages/cli/src/commands/_pi-frontend.ts
-import { mkdtempSync, rmSync as rmSync5 } from "fs";
+import { mkdtempSync, rmSync as rmSync5, writeFileSync as writeFileSync6 } from "fs";
 import { tmpdir } from "os";
 import { join as join3 } from "path";
 import { main as runPiMain } from "@earendil-works/pi-coding-agent";
@@ -7894,6 +7894,29 @@ function buildOperatorPiEnv(input) {
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join3(tmpdir(), "rig-pi-frontend-sessions-"));
   const server = await ensureServerForCli(context.projectRoot);
+  let sessionFileArg = [];
+  try {
+    const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(input.runId)}/session-file`);
+    if (payload?.ok && typeof payload.content === "string" && payload.content.trim()) {
+      const fileName = typeof payload.fileName === "string" && payload.fileName.trim() ? payload.fileName.replace(/[^A-Za-z0-9._-]/g, "_") : `rig-run-${input.runId}.jsonl`;
+      const localSessionPath = join3(tempSessionDir, fileName);
+      const content = payload.content.split(`
+`).map((line, index) => {
+        if (index > 0 || !line.trim())
+          return line;
+        try {
+          const header = JSON.parse(line);
+          if (header.type === "session" && typeof header.cwd === "string") {
+            return JSON.stringify({ ...header, cwd: process.cwd() });
+          }
+        } catch {}
+        return line;
+      }).join(`
+`);
+      writeFileSync6(localSessionPath, content);
+      sessionFileArg = ["--session", localSessionPath];
+    }
+  } catch {}
   const restoreEnv = setTemporaryEnv(buildOperatorPiEnv({
     runId: input.runId,
     serverUrl: server.baseUrl,
@@ -7910,7 +7933,8 @@ async function attachRunBundledPiFrontend(context, input) {
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
-      "--no-context-files"
+      "--no-context-files",
+      ...sessionFileArg
     ], {
       extensionFactories: [piRigExtensionFactory]
     });
@@ -7981,7 +8005,7 @@ async function attachRunOperatorView(context, input) {
     await withSpinner("Queueing steering message\u2026", () => sendRunPiPromptViaServer(context, input.runId, attachMessage, "steer").catch(() => steerRunViaServer(context, input.runId, attachMessage)), { outputMode: context.outputMode });
     steered = true;
   }
-  if (input.follow && !input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
+  if (!input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
     return attachRunBundledPiFrontend(context, {
       runId: input.runId,
       steered
@@ -9843,7 +9867,7 @@ async function executeTask(context, args, options) {
 
 // packages/cli/src/commands/task-run-driver.ts
 init_runner();
-import { copyFileSync as copyFileSync3, existsSync as existsSync15, mkdirSync as mkdirSync9, readFileSync as readFileSync11, statSync as statSync2, writeFileSync as writeFileSync6 } from "fs";
+import { copyFileSync as copyFileSync3, existsSync as existsSync15, mkdirSync as mkdirSync9, readFileSync as readFileSync11, statSync as statSync2, writeFileSync as writeFileSync7 } from "fs";
 import { resolve as resolve23 } from "path";
 import { spawn as spawn2, spawnSync as spawnSync4 } from "child_process";
 import { createInterface as createLineInterface } from "readline";
@@ -10826,7 +10850,7 @@ async function executeRigOwnedTaskRun(context, input) {
     classifiedAt: new Date().toISOString()
   };
   mkdirSync9(resolve23(context.projectRoot, ".rig", "runs", input.runId), { recursive: true });
-  writeFileSync6(resolve23(context.projectRoot, ".rig", "runs", input.runId, "planning-classification.json"), `${JSON.stringify(persistedPlanning, null, 2)}
+  writeFileSync7(resolve23(context.projectRoot, ".rig", "runs", input.runId, "planning-classification.json"), `${JSON.stringify(persistedPlanning, null, 2)}
 `, "utf8");
   patchAuthorityRun(context.projectRoot, input.runId, { planning: persistedPlanning });
   prompt = `${prompt}
@@ -10974,7 +10998,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
         const readyFile = childEnv.RIG_DIRTY_BASELINE_READY_FILE;
         if (readyFile) {
           mkdirSync9(resolve23(readyFile, ".."), { recursive: true });
-          writeFileSync6(readyFile, `${JSON.stringify({ ...dirty, workspaceDir: latestRuntimeWorkspace, appliedAt: new Date().toISOString() }, null, 2)}
+          writeFileSync7(readyFile, `${JSON.stringify({ ...dirty, workspaceDir: latestRuntimeWorkspace, appliedAt: new Date().toISOString() }, null, 2)}
 `, "utf8");
         }
         appendRunLog(context.projectRoot, input.runId, {
@@ -11884,7 +11908,7 @@ async function executeTest(context, args) {
 
 // packages/cli/src/commands/setup.ts
 init_runner();
-import { existsSync as existsSync16, mkdirSync as mkdirSync10, readdirSync as readdirSync3, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync10, readdirSync as readdirSync3, writeFileSync as writeFileSync8 } from "fs";
 import { resolve as resolve24 } from "path";
 import { createPluginHost } from "@rig/core";
 import {
@@ -11945,7 +11969,7 @@ function runSetupInit(projectRoot) {
   mkdirSync10(artifactsDir, { recursive: true });
   const failuresPath = resolve24(stateDir, "failed_approaches.md");
   if (!existsSync16(failuresPath)) {
-    writeFileSync7(failuresPath, `# Failed Approaches
+    writeFileSync8(failuresPath, `# Failed Approaches
 
 `, "utf-8");
   }

package/dist/src/commands/_operator-view.js

@@ -569,7 +569,7 @@ function createOperatorSurface(options = {}) {
 }
 
 // packages/cli/src/commands/_pi-frontend.ts
-import { mkdtempSync, rmSync } from "fs";
+import { mkdtempSync, rmSync, writeFileSync as writeFileSync2 } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
 import { main as runPiMain } from "@earendil-works/pi-coding-agent";
@@ -603,6 +603,29 @@ function buildOperatorPiEnv(input) {
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join(tmpdir(), "rig-pi-frontend-sessions-"));
   const server = await ensureServerForCli(context.projectRoot);
+  let sessionFileArg = [];
+  try {
+    const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(input.runId)}/session-file`);
+    if (payload?.ok && typeof payload.content === "string" && payload.content.trim()) {
+      const fileName = typeof payload.fileName === "string" && payload.fileName.trim() ? payload.fileName.replace(/[^A-Za-z0-9._-]/g, "_") : `rig-run-${input.runId}.jsonl`;
+      const localSessionPath = join(tempSessionDir, fileName);
+      const content = payload.content.split(`
+`).map((line, index) => {
+        if (index > 0 || !line.trim())
+          return line;
+        try {
+          const header = JSON.parse(line);
+          if (header.type === "session" && typeof header.cwd === "string") {
+            return JSON.stringify({ ...header, cwd: process.cwd() });
+          }
+        } catch {}
+        return line;
+      }).join(`
+`);
+      writeFileSync2(localSessionPath, content);
+      sessionFileArg = ["--session", localSessionPath];
+    }
+  } catch {}
   const restoreEnv = setTemporaryEnv(buildOperatorPiEnv({
     runId: input.runId,
     serverUrl: server.baseUrl,
@@ -619,7 +642,8 @@ async function attachRunBundledPiFrontend(context, input) {
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
-      "--no-context-files"
+      "--no-context-files",
+      ...sessionFileArg
     ], {
       extensionFactories: [piRigExtensionFactory]
     });
@@ -811,7 +835,7 @@ async function attachRunOperatorView(context, input) {
     await withSpinner("Queueing steering message\u2026", () => sendRunPiPromptViaServer(context, input.runId, attachMessage, "steer").catch(() => steerRunViaServer(context, input.runId, attachMessage)), { outputMode: context.outputMode });
     steered = true;
   }
-  if (input.follow && !input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
+  if (!input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
     return attachRunBundledPiFrontend(context, {
       runId: input.runId,
       steered

package/dist/src/commands/_pi-frontend.js

@@ -1,6 +1,6 @@
 // @bun
 // packages/cli/src/commands/_pi-frontend.ts
-import { mkdtempSync, rmSync } from "fs";
+import { mkdtempSync, rmSync, writeFileSync as writeFileSync2 } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
 import { main as runPiMain } from "@earendil-works/pi-coding-agent";
@@ -366,6 +366,29 @@ function buildOperatorPiEnv(input) {
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join(tmpdir(), "rig-pi-frontend-sessions-"));
   const server = await ensureServerForCli(context.projectRoot);
+  let sessionFileArg = [];
+  try {
+    const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(input.runId)}/session-file`);
+    if (payload?.ok && typeof payload.content === "string" && payload.content.trim()) {
+      const fileName = typeof payload.fileName === "string" && payload.fileName.trim() ? payload.fileName.replace(/[^A-Za-z0-9._-]/g, "_") : `rig-run-${input.runId}.jsonl`;
+      const localSessionPath = join(tempSessionDir, fileName);
+      const content = payload.content.split(`
+`).map((line, index) => {
+        if (index > 0 || !line.trim())
+          return line;
+        try {
+          const header = JSON.parse(line);
+          if (header.type === "session" && typeof header.cwd === "string") {
+            return JSON.stringify({ ...header, cwd: process.cwd() });
+          }
+        } catch {}
+        return line;
+      }).join(`
+`);
+      writeFileSync2(localSessionPath, content);
+      sessionFileArg = ["--session", localSessionPath];
+    }
+  } catch {}
   const restoreEnv = setTemporaryEnv(buildOperatorPiEnv({
     runId: input.runId,
     serverUrl: server.baseUrl,
@@ -382,7 +405,8 @@ async function attachRunBundledPiFrontend(context, input) {
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
-      "--no-context-files"
+      "--no-context-files",
+      ...sessionFileArg
     ], {
       extensionFactories: [piRigExtensionFactory]
     });

package/dist/src/commands/run.js

@@ -807,7 +807,7 @@ function createOperatorSurface(options = {}) {
 }
 
 // packages/cli/src/commands/_pi-frontend.ts
-import { mkdtempSync, rmSync } from "fs";
+import { mkdtempSync, rmSync, writeFileSync as writeFileSync2 } from "fs";
 import { tmpdir } from "os";
 import { join as join2 } from "path";
 import { main as runPiMain } from "@earendil-works/pi-coding-agent";
@@ -841,6 +841,29 @@ function buildOperatorPiEnv(input) {
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join2(tmpdir(), "rig-pi-frontend-sessions-"));
   const server = await ensureServerForCli(context.projectRoot);
+  let sessionFileArg = [];
+  try {
+    const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(input.runId)}/session-file`);
+    if (payload?.ok && typeof payload.content === "string" && payload.content.trim()) {
+      const fileName = typeof payload.fileName === "string" && payload.fileName.trim() ? payload.fileName.replace(/[^A-Za-z0-9._-]/g, "_") : `rig-run-${input.runId}.jsonl`;
+      const localSessionPath = join2(tempSessionDir, fileName);
+      const content = payload.content.split(`
+`).map((line, index) => {
+        if (index > 0 || !line.trim())
+          return line;
+        try {
+          const header = JSON.parse(line);
+          if (header.type === "session" && typeof header.cwd === "string") {
+            return JSON.stringify({ ...header, cwd: process.cwd() });
+          }
+        } catch {}
+        return line;
+      }).join(`
+`);
+      writeFileSync2(localSessionPath, content);
+      sessionFileArg = ["--session", localSessionPath];
+    }
+  } catch {}
   const restoreEnv = setTemporaryEnv(buildOperatorPiEnv({
     runId: input.runId,
     serverUrl: server.baseUrl,
@@ -857,7 +880,8 @@ async function attachRunBundledPiFrontend(context, input) {
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
-      "--no-context-files"
+      "--no-context-files",
+      ...sessionFileArg
     ], {
       extensionFactories: [piRigExtensionFactory]
     });
@@ -1049,7 +1073,7 @@ async function attachRunOperatorView(context, input) {
     await withSpinner("Queueing steering message\u2026", () => sendRunPiPromptViaServer(context, input.runId, attachMessage, "steer").catch(() => steerRunViaServer(context, input.runId, attachMessage)), { outputMode: context.outputMode });
     steered = true;
   }
-  if (input.follow && !input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
+  if (!input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
     return attachRunBundledPiFrontend(context, {
       runId: input.runId,
       steered

package/dist/src/commands/task.js

@@ -1170,7 +1170,7 @@ async function withSpinner(label, work, options = {}) {
 }
 
 // packages/cli/src/commands/_pi-frontend.ts
-import { mkdtempSync, rmSync } from "fs";
+import { mkdtempSync, rmSync, writeFileSync as writeFileSync2 } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
 import { main as runPiMain } from "@earendil-works/pi-coding-agent";
@@ -1204,6 +1204,29 @@ function buildOperatorPiEnv(input) {
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join(tmpdir(), "rig-pi-frontend-sessions-"));
   const server = await ensureServerForCli(context.projectRoot);
+  let sessionFileArg = [];
+  try {
+    const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(input.runId)}/session-file`);
+    if (payload?.ok && typeof payload.content === "string" && payload.content.trim()) {
+      const fileName = typeof payload.fileName === "string" && payload.fileName.trim() ? payload.fileName.replace(/[^A-Za-z0-9._-]/g, "_") : `rig-run-${input.runId}.jsonl`;
+      const localSessionPath = join(tempSessionDir, fileName);
+      const content = payload.content.split(`
+`).map((line, index) => {
+        if (index > 0 || !line.trim())
+          return line;
+        try {
+          const header = JSON.parse(line);
+          if (header.type === "session" && typeof header.cwd === "string") {
+            return JSON.stringify({ ...header, cwd: process.cwd() });
+          }
+        } catch {}
+        return line;
+      }).join(`
+`);
+      writeFileSync2(localSessionPath, content);
+      sessionFileArg = ["--session", localSessionPath];
+    }
+  } catch {}
   const restoreEnv = setTemporaryEnv(buildOperatorPiEnv({
     runId: input.runId,
     serverUrl: server.baseUrl,
@@ -1220,7 +1243,8 @@ async function attachRunBundledPiFrontend(context, input) {
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
-      "--no-context-files"
+      "--no-context-files",
+      ...sessionFileArg
     ], {
       extensionFactories: [piRigExtensionFactory]
     });
@@ -1291,7 +1315,7 @@ async function attachRunOperatorView(context, input) {
     await withSpinner("Queueing steering message\u2026", () => sendRunPiPromptViaServer(context, input.runId, attachMessage, "steer").catch(() => steerRunViaServer(context, input.runId, attachMessage)), { outputMode: context.outputMode });
     steered = true;
   }
-  if (input.follow && !input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
+  if (!input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
     return attachRunBundledPiFrontend(context, {
       runId: input.runId,
       steered

package/dist/src/commands.js

@@ -7667,7 +7667,7 @@ async function promptForTaskSelection(question) {
 }
 
 // packages/cli/src/commands/_pi-frontend.ts
-import { mkdtempSync, rmSync as rmSync5 } from "fs";
+import { mkdtempSync, rmSync as rmSync5, writeFileSync as writeFileSync6 } from "fs";
 import { tmpdir } from "os";
 import { join as join3 } from "path";
 import { main as runPiMain } from "@earendil-works/pi-coding-agent";
@@ -7701,6 +7701,29 @@ function buildOperatorPiEnv(input) {
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join3(tmpdir(), "rig-pi-frontend-sessions-"));
   const server = await ensureServerForCli(context.projectRoot);
+  let sessionFileArg = [];
+  try {
+    const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(input.runId)}/session-file`);
+    if (payload?.ok && typeof payload.content === "string" && payload.content.trim()) {
+      const fileName = typeof payload.fileName === "string" && payload.fileName.trim() ? payload.fileName.replace(/[^A-Za-z0-9._-]/g, "_") : `rig-run-${input.runId}.jsonl`;
+      const localSessionPath = join3(tempSessionDir, fileName);
+      const content = payload.content.split(`
+`).map((line, index) => {
+        if (index > 0 || !line.trim())
+          return line;
+        try {
+          const header = JSON.parse(line);
+          if (header.type === "session" && typeof header.cwd === "string") {
+            return JSON.stringify({ ...header, cwd: process.cwd() });
+          }
+        } catch {}
+        return line;
+      }).join(`
+`);
+      writeFileSync6(localSessionPath, content);
+      sessionFileArg = ["--session", localSessionPath];
+    }
+  } catch {}
   const restoreEnv = setTemporaryEnv(buildOperatorPiEnv({
     runId: input.runId,
     serverUrl: server.baseUrl,
@@ -7717,7 +7740,8 @@ async function attachRunBundledPiFrontend(context, input) {
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
-      "--no-context-files"
+      "--no-context-files",
+      ...sessionFileArg
     ], {
       extensionFactories: [piRigExtensionFactory]
     });
@@ -7788,7 +7812,7 @@ async function attachRunOperatorView(context, input) {
     await withSpinner("Queueing steering message\u2026", () => sendRunPiPromptViaServer(context, input.runId, attachMessage, "steer").catch(() => steerRunViaServer(context, input.runId, attachMessage)), { outputMode: context.outputMode });
     steered = true;
   }
-  if (input.follow && !input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
+  if (!input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
     return attachRunBundledPiFrontend(context, {
       runId: input.runId,
       steered
@@ -9650,7 +9674,7 @@ 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 mkdirSync8, readFileSync as readFileSync11, statSync as statSync2, writeFileSync as writeFileSync6 } from "fs";
+import { copyFileSync as copyFileSync3, existsSync as existsSync14, mkdirSync as mkdirSync8, readFileSync as readFileSync11, statSync as statSync2, writeFileSync as writeFileSync7 } from "fs";
 import { resolve as resolve22 } from "path";
 import { spawn as spawn2, spawnSync as spawnSync4 } from "child_process";
 import { createInterface as createLineInterface } from "readline";
@@ -10633,7 +10657,7 @@ async function executeRigOwnedTaskRun(context, input) {
     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)}
+  writeFileSync7(resolve22(context.projectRoot, ".rig", "runs", input.runId, "planning-classification.json"), `${JSON.stringify(persistedPlanning, null, 2)}
 `, "utf8");
   patchAuthorityRun(context.projectRoot, input.runId, { planning: persistedPlanning });
   prompt = `${prompt}
@@ -10781,7 +10805,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
         const readyFile = childEnv.RIG_DIRTY_BASELINE_READY_FILE;
         if (readyFile) {
           mkdirSync8(resolve22(readyFile, ".."), { recursive: true });
-          writeFileSync6(readyFile, `${JSON.stringify({ ...dirty, workspaceDir: latestRuntimeWorkspace, appliedAt: new Date().toISOString() }, null, 2)}
+          writeFileSync7(readyFile, `${JSON.stringify({ ...dirty, workspaceDir: latestRuntimeWorkspace, appliedAt: new Date().toISOString() }, null, 2)}
 `, "utf8");
         }
         appendRunLog(context.projectRoot, input.runId, {
@@ -11691,7 +11715,7 @@ async function executeTest(context, args) {
 
 // packages/cli/src/commands/setup.ts
 init_runner();
-import { existsSync as existsSync15, mkdirSync as mkdirSync9, readdirSync as readdirSync3, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync9, readdirSync as readdirSync3, writeFileSync as writeFileSync8 } from "fs";
 import { resolve as resolve23 } from "path";
 import { createPluginHost } from "@rig/core";
 import {
@@ -11752,7 +11776,7 @@ function runSetupInit(projectRoot) {
   mkdirSync9(artifactsDir, { recursive: true });
   const failuresPath = resolve23(stateDir, "failed_approaches.md");
   if (!existsSync15(failuresPath)) {
-    writeFileSync7(failuresPath, `# Failed Approaches
+    writeFileSync8(failuresPath, `# Failed Approaches
 
 `, "utf-8");
   }

package/dist/src/index.js

@@ -7856,7 +7856,7 @@ async function promptForTaskSelection(question) {
 }
 
 // packages/cli/src/commands/_pi-frontend.ts
-import { mkdtempSync, rmSync as rmSync5 } from "fs";
+import { mkdtempSync, rmSync as rmSync5, writeFileSync as writeFileSync6 } from "fs";
 import { tmpdir } from "os";
 import { join as join3 } from "path";
 import { main as runPiMain } from "@earendil-works/pi-coding-agent";
@@ -7890,6 +7890,29 @@ function buildOperatorPiEnv(input) {
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join3(tmpdir(), "rig-pi-frontend-sessions-"));
   const server = await ensureServerForCli(context.projectRoot);
+  let sessionFileArg = [];
+  try {
+    const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(input.runId)}/session-file`);
+    if (payload?.ok && typeof payload.content === "string" && payload.content.trim()) {
+      const fileName = typeof payload.fileName === "string" && payload.fileName.trim() ? payload.fileName.replace(/[^A-Za-z0-9._-]/g, "_") : `rig-run-${input.runId}.jsonl`;
+      const localSessionPath = join3(tempSessionDir, fileName);
+      const content = payload.content.split(`
+`).map((line, index) => {
+        if (index > 0 || !line.trim())
+          return line;
+        try {
+          const header = JSON.parse(line);
+          if (header.type === "session" && typeof header.cwd === "string") {
+            return JSON.stringify({ ...header, cwd: process.cwd() });
+          }
+        } catch {}
+        return line;
+      }).join(`
+`);
+      writeFileSync6(localSessionPath, content);
+      sessionFileArg = ["--session", localSessionPath];
+    }
+  } catch {}
   const restoreEnv = setTemporaryEnv(buildOperatorPiEnv({
     runId: input.runId,
     serverUrl: server.baseUrl,
@@ -7906,7 +7929,8 @@ async function attachRunBundledPiFrontend(context, input) {
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
-      "--no-context-files"
+      "--no-context-files",
+      ...sessionFileArg
     ], {
       extensionFactories: [piRigExtensionFactory]
     });
@@ -7977,7 +8001,7 @@ async function attachRunOperatorView(context, input) {
     await withSpinner("Queueing steering message\u2026", () => sendRunPiPromptViaServer(context, input.runId, attachMessage, "steer").catch(() => steerRunViaServer(context, input.runId, attachMessage)), { outputMode: context.outputMode });
     steered = true;
   }
-  if (input.follow && !input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
+  if (!input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
     return attachRunBundledPiFrontend(context, {
       runId: input.runId,
       steered
@@ -9839,7 +9863,7 @@ async function executeTask(context, args, options) {
 
 // packages/cli/src/commands/task-run-driver.ts
 init_runner();
-import { copyFileSync as copyFileSync3, existsSync as existsSync15, mkdirSync as mkdirSync9, readFileSync as readFileSync11, statSync as statSync2, writeFileSync as writeFileSync6 } from "fs";
+import { copyFileSync as copyFileSync3, existsSync as existsSync15, mkdirSync as mkdirSync9, readFileSync as readFileSync11, statSync as statSync2, writeFileSync as writeFileSync7 } from "fs";
 import { resolve as resolve23 } from "path";
 import { spawn as spawn2, spawnSync as spawnSync4 } from "child_process";
 import { createInterface as createLineInterface } from "readline";
@@ -10822,7 +10846,7 @@ async function executeRigOwnedTaskRun(context, input) {
     classifiedAt: new Date().toISOString()
   };
   mkdirSync9(resolve23(context.projectRoot, ".rig", "runs", input.runId), { recursive: true });
-  writeFileSync6(resolve23(context.projectRoot, ".rig", "runs", input.runId, "planning-classification.json"), `${JSON.stringify(persistedPlanning, null, 2)}
+  writeFileSync7(resolve23(context.projectRoot, ".rig", "runs", input.runId, "planning-classification.json"), `${JSON.stringify(persistedPlanning, null, 2)}
 `, "utf8");
   patchAuthorityRun(context.projectRoot, input.runId, { planning: persistedPlanning });
   prompt = `${prompt}
@@ -10970,7 +10994,7 @@ ${planningClassification.planningRequired ? `Before implementing, write a concis
         const readyFile = childEnv.RIG_DIRTY_BASELINE_READY_FILE;
         if (readyFile) {
           mkdirSync9(resolve23(readyFile, ".."), { recursive: true });
-          writeFileSync6(readyFile, `${JSON.stringify({ ...dirty, workspaceDir: latestRuntimeWorkspace, appliedAt: new Date().toISOString() }, null, 2)}
+          writeFileSync7(readyFile, `${JSON.stringify({ ...dirty, workspaceDir: latestRuntimeWorkspace, appliedAt: new Date().toISOString() }, null, 2)}
 `, "utf8");
         }
         appendRunLog(context.projectRoot, input.runId, {
@@ -11880,7 +11904,7 @@ async function executeTest(context, args) {
 
 // packages/cli/src/commands/setup.ts
 init_runner();
-import { existsSync as existsSync16, mkdirSync as mkdirSync10, readdirSync as readdirSync3, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync10, readdirSync as readdirSync3, writeFileSync as writeFileSync8 } from "fs";
 import { resolve as resolve24 } from "path";
 import { createPluginHost } from "@rig/core";
 import {
@@ -11941,7 +11965,7 @@ function runSetupInit(projectRoot) {
   mkdirSync10(artifactsDir, { recursive: true });
   const failuresPath = resolve24(stateDir, "failed_approaches.md");
   if (!existsSync16(failuresPath)) {
-    writeFileSync7(failuresPath, `# Failed Approaches
+    writeFileSync8(failuresPath, `# Failed Approaches
 
 `, "utf-8");
   }

package/package.json

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