@h-rig/cli 0.0.6-alpha.87 → 0.0.6-alpha.88

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

@@ -1008,6 +1008,29 @@ function installRigPiTheme() {
     }
   } catch {}
 }
+async function runWithProcessExitGuard(body) {
+  const realExit = process.exit;
+  let exitCode = 0;
+  let signalQuit = () => {};
+  const quit = new Promise((resolve3) => {
+    signalQuit = resolve3;
+  });
+  const guardedExit = (code) => {
+    exitCode = typeof code === "number" ? code : 0;
+    signalQuit();
+    return;
+  };
+  process.exit = guardedExit;
+  try {
+    await Promise.race([Promise.resolve().then(body), quit]);
+  } finally {
+    process.exit = realExit;
+  }
+  return exitCode;
+}
+function runPiMainReturningOnQuit(args, options) {
+  return runWithProcessExitGuard(() => runPiMain(args, options));
+}
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join(tmpdir(), "rig-pi-frontend-sessions-"));
   const { server, sessionFileArg } = await withSpinner(`Opening Pi console for run ${input.runId}\u2026`, () => prepareOperatorConsole(context, input.runId, tempSessionDir), { outputMode: context.outputMode });
@@ -1023,16 +1046,20 @@ async function attachRunBundledPiFrontend(context, input) {
   };
   let detached = false;
   try {
-    await runPiMain([
+    const piArgs = [
       "--offline",
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
       "--no-context-files",
       ...sessionFileArg
-    ], {
-      extensionFactories: [piRigExtensionFactory]
-    });
+    ];
+    const piOptions = { extensionFactories: [piRigExtensionFactory] };
+    if (input.returnOnQuit) {
+      await runPiMainReturningOnQuit(piArgs, piOptions);
+    } else {
+      await runPiMain(piArgs, piOptions);
+    }
     detached = true;
   } finally {
     restoreEnv();

package/dist/src/commands/_pi-frontend.d.ts

@@ -22,8 +22,33 @@ export declare function buildOperatorPiEnv(input: {
 }): Record<string, string>;
 export declare function shouldRequireOperatorTranscript(status: unknown): boolean;
 export declare function missingOperatorTranscriptMessage(runId: string, status: unknown): string;
+/** Run Pi's `main()` in-process but RETURN to the caller when Pi quits, instead
+ * of letting it terminate the process. Pi's interactive quit calls
+ * `process.exit(...)` (interactive-mode.js); when the OpenTUI shell hands Pi the
+ * terminal IN-PROCESS (the eject), that would kill the whole rig process. We
+ * temporarily intercept `process.exit` for the duration of the Pi session,
+ * convert the exit into a thrown sentinel that unwinds back here, then restore
+ * the real `process.exit`. The OpenTUI store + React tree are still alive (the
+ * renderer was only suspended), so the caller resumes the shell at the same
+ * state/screen. Returns Pi's intended exit code. */
+/** Run `body` in-process while RETURNING (instead of terminating) when it calls
+ * `process.exit`. Used to run Pi's `main()` from the OpenTUI shell so Pi's
+ * interactive quit (which calls `process.exit`, interactive-mode.js) returns
+ * control to the shell rather than killing the whole rig process.
+ *
+ * We replace `process.exit` with a guard that resolves a `quit` promise — raced
+ * against `body` — instead of terminating, then restore the real `process.exit`.
+ * We deliberately do NOT throw from the guard: Pi's `process.exit` calls are
+ * terminal (the last statement of their quit path, after Pi has already stopped
+ * its render loop and disposed), and Pi often calls exit from a detached input
+ * callback where a throw would escape to the event loop (the bug that first
+ * shipped — the shell hung). Resolving `quit` synchronously returns control
+ * whichever path the exit takes. Returns the intended exit code. Exported for
+ * unit testing both exit paths. */
+export declare function runWithProcessExitGuard(body: () => Promise<unknown>): Promise<number>;
 export declare function attachRunBundledPiFrontend(context: Pick<RunnerContext, "projectRoot" | "outputMode">, input: {
     readonly runId: string;
     readonly steered?: boolean;
+    readonly returnOnQuit?: boolean;
 }): Promise<AttachResult>;
 export {};

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

@@ -774,6 +774,29 @@ function installRigPiTheme() {
     }
   } catch {}
 }
+async function runWithProcessExitGuard(body) {
+  const realExit = process.exit;
+  let exitCode = 0;
+  let signalQuit = () => {};
+  const quit = new Promise((resolve3) => {
+    signalQuit = resolve3;
+  });
+  const guardedExit = (code) => {
+    exitCode = typeof code === "number" ? code : 0;
+    signalQuit();
+    return;
+  };
+  process.exit = guardedExit;
+  try {
+    await Promise.race([Promise.resolve().then(body), quit]);
+  } finally {
+    process.exit = realExit;
+  }
+  return exitCode;
+}
+function runPiMainReturningOnQuit(args, options) {
+  return runWithProcessExitGuard(() => runPiMain(args, options));
+}
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join(tmpdir(), "rig-pi-frontend-sessions-"));
   const { server, sessionFileArg } = await withSpinner(`Opening Pi console for run ${input.runId}\u2026`, () => prepareOperatorConsole(context, input.runId, tempSessionDir), { outputMode: context.outputMode });
@@ -789,16 +812,20 @@ async function attachRunBundledPiFrontend(context, input) {
   };
   let detached = false;
   try {
-    await runPiMain([
+    const piArgs = [
       "--offline",
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
       "--no-context-files",
       ...sessionFileArg
-    ], {
-      extensionFactories: [piRigExtensionFactory]
-    });
+    ];
+    const piOptions = { extensionFactories: [piRigExtensionFactory] };
+    if (input.returnOnQuit) {
+      await runPiMainReturningOnQuit(piArgs, piOptions);
+    } else {
+      await runPiMain(piArgs, piOptions);
+    }
     detached = true;
   } finally {
     restoreEnv();
@@ -820,6 +847,7 @@ async function attachRunBundledPiFrontend(context, input) {
 }
 export {
   shouldRequireOperatorTranscript,
+  runWithProcessExitGuard,
   missingOperatorTranscriptMessage,
   buildOperatorPiEnv,
   attachRunBundledPiFrontend

package/dist/src/commands/run.js

@@ -1246,6 +1246,29 @@ function installRigPiTheme() {
     }
   } catch {}
 }
+async function runWithProcessExitGuard(body) {
+  const realExit = process.exit;
+  let exitCode = 0;
+  let signalQuit = () => {};
+  const quit = new Promise((resolve4) => {
+    signalQuit = resolve4;
+  });
+  const guardedExit = (code) => {
+    exitCode = typeof code === "number" ? code : 0;
+    signalQuit();
+    return;
+  };
+  process.exit = guardedExit;
+  try {
+    await Promise.race([Promise.resolve().then(body), quit]);
+  } finally {
+    process.exit = realExit;
+  }
+  return exitCode;
+}
+function runPiMainReturningOnQuit(args, options) {
+  return runWithProcessExitGuard(() => runPiMain(args, options));
+}
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join2(tmpdir(), "rig-pi-frontend-sessions-"));
   const { server, sessionFileArg } = await withSpinner(`Opening Pi console for run ${input.runId}\u2026`, () => prepareOperatorConsole(context, input.runId, tempSessionDir), { outputMode: context.outputMode });
@@ -1261,16 +1284,20 @@ async function attachRunBundledPiFrontend(context, input) {
   };
   let detached = false;
   try {
-    await runPiMain([
+    const piArgs = [
       "--offline",
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
       "--no-context-files",
       ...sessionFileArg
-    ], {
-      extensionFactories: [piRigExtensionFactory]
-    });
+    ];
+    const piOptions = { extensionFactories: [piRigExtensionFactory] };
+    if (input.returnOnQuit) {
+      await runPiMainReturningOnQuit(piArgs, piOptions);
+    } else {
+      await runPiMain(piArgs, piOptions);
+    }
     detached = true;
   } finally {
     restoreEnv();

package/dist/src/commands/task.js

@@ -1551,6 +1551,29 @@ function installRigPiTheme() {
     }
   } catch {}
 }
+async function runWithProcessExitGuard(body) {
+  const realExit = process.exit;
+  let exitCode = 0;
+  let signalQuit = () => {};
+  const quit = new Promise((resolve3) => {
+    signalQuit = resolve3;
+  });
+  const guardedExit = (code) => {
+    exitCode = typeof code === "number" ? code : 0;
+    signalQuit();
+    return;
+  };
+  process.exit = guardedExit;
+  try {
+    await Promise.race([Promise.resolve().then(body), quit]);
+  } finally {
+    process.exit = realExit;
+  }
+  return exitCode;
+}
+function runPiMainReturningOnQuit(args, options) {
+  return runWithProcessExitGuard(() => runPiMain(args, options));
+}
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join(tmpdir(), "rig-pi-frontend-sessions-"));
   const { server, sessionFileArg } = await withSpinner(`Opening Pi console for run ${input.runId}\u2026`, () => prepareOperatorConsole(context, input.runId, tempSessionDir), { outputMode: context.outputMode });
@@ -1566,16 +1589,20 @@ async function attachRunBundledPiFrontend(context, input) {
   };
   let detached = false;
   try {
-    await runPiMain([
+    const piArgs = [
       "--offline",
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
       "--no-context-files",
       ...sessionFileArg
-    ], {
-      extensionFactories: [piRigExtensionFactory]
-    });
+    ];
+    const piOptions = { extensionFactories: [piRigExtensionFactory] };
+    if (input.returnOnQuit) {
+      await runPiMainReturningOnQuit(piArgs, piOptions);
+    } else {
+      await runPiMain(piArgs, piOptions);
+    }
     detached = true;
   } finally {
     restoreEnv();

package/dist/src/commands.js

@@ -2691,6 +2691,29 @@ function installRigPiTheme() {
     }
   } catch {}
 }
+async function runWithProcessExitGuard(body) {
+  const realExit = process.exit;
+  let exitCode = 0;
+  let signalQuit = () => {};
+  const quit = new Promise((resolve22) => {
+    signalQuit = resolve22;
+  });
+  const guardedExit = (code) => {
+    exitCode = typeof code === "number" ? code : 0;
+    signalQuit();
+    return;
+  };
+  process.exit = guardedExit;
+  try {
+    await Promise.race([Promise.resolve().then(body), quit]);
+  } finally {
+    process.exit = realExit;
+  }
+  return exitCode;
+}
+function runPiMainReturningOnQuit(args, options) {
+  return runWithProcessExitGuard(() => runPiMain(args, options));
+}
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join3(tmpdir(), "rig-pi-frontend-sessions-"));
   const { server, sessionFileArg } = await withSpinner(`Opening Pi console for run ${input.runId}\u2026`, () => prepareOperatorConsole(context, input.runId, tempSessionDir), { outputMode: context.outputMode });
@@ -2706,16 +2729,20 @@ async function attachRunBundledPiFrontend(context, input) {
   };
   let detached = false;
   try {
-    await runPiMain([
+    const piArgs = [
       "--offline",
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
       "--no-context-files",
       ...sessionFileArg
-    ], {
-      extensionFactories: [piRigExtensionFactory]
-    });
+    ];
+    const piOptions = { extensionFactories: [piRigExtensionFactory] };
+    if (input.returnOnQuit) {
+      await runPiMainReturningOnQuit(piArgs, piOptions);
+    } else {
+      await runPiMain(piArgs, piOptions);
+    }
     detached = true;
   } finally {
     restoreEnv();

package/dist/src/index.js

@@ -2880,6 +2880,29 @@ function installRigPiTheme() {
     }
   } catch {}
 }
+async function runWithProcessExitGuard(body) {
+  const realExit = process.exit;
+  let exitCode = 0;
+  let signalQuit = () => {};
+  const quit = new Promise((resolve23) => {
+    signalQuit = resolve23;
+  });
+  const guardedExit = (code) => {
+    exitCode = typeof code === "number" ? code : 0;
+    signalQuit();
+    return;
+  };
+  process.exit = guardedExit;
+  try {
+    await Promise.race([Promise.resolve().then(body), quit]);
+  } finally {
+    process.exit = realExit;
+  }
+  return exitCode;
+}
+function runPiMainReturningOnQuit(args, options) {
+  return runWithProcessExitGuard(() => runPiMain(args, options));
+}
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join3(tmpdir(), "rig-pi-frontend-sessions-"));
   const { server, sessionFileArg } = await withSpinner(`Opening Pi console for run ${input.runId}\u2026`, () => prepareOperatorConsole(context, input.runId, tempSessionDir), { outputMode: context.outputMode });
@@ -2895,16 +2918,20 @@ async function attachRunBundledPiFrontend(context, input) {
   };
   let detached = false;
   try {
-    await runPiMain([
+    const piArgs = [
       "--offline",
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
       "--no-context-files",
       ...sessionFileArg
-    ], {
-      extensionFactories: [piRigExtensionFactory]
-    });
+    ];
+    const piOptions = { extensionFactories: [piRigExtensionFactory] };
+    if (input.returnOnQuit) {
+      await runPiMainReturningOnQuit(piArgs, piOptions);
+    } else {
+      await runPiMain(piArgs, piOptions);
+    }
     detached = true;
   } finally {
     restoreEnv();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/cli",
-  "version": "0.0.6-alpha.87",
+  "version": "0.0.6-alpha.88",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -28,13 +28,13 @@
     "@earendil-works/pi-tui": "^0.79.0",
     "@opentui/core": "^0.4.1",
     "@opentui/react": "0.4.1",
-    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.87",
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.87",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.87",
-    "@rig/pi-rig": "npm:@h-rig/pi-rig@0.0.6-alpha.87",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.87",
-    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.87",
-    "@rig/standard-plugin": "npm:@h-rig/standard-plugin@0.0.6-alpha.87",
+    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.88",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.88",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.88",
+    "@rig/pi-rig": "npm:@h-rig/pi-rig@0.0.6-alpha.88",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.88",
+    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.88",
+    "@rig/standard-plugin": "npm:@h-rig/standard-plugin@0.0.6-alpha.88",
     "@xterm/headless": "^6.0.0",
     "effect": "4.0.0-beta.78",
     "picocolors": "^1.1.1",