@h-rig/rig-extension 0.0.6-alpha.92 → 0.0.6-alpha.94

package/dist/src/extension.js

@@ -3213,8 +3213,20 @@ function startRunProcessStallMonitor(opts) {
 function createRunProcessStopController(journal, stopHost, exit = (code) => {
   process.exitCode = code;
   setTimeout(() => process.exit(code), 0);
-}) {
+}, deps = {}) {
   let stopRequested = null;
+  let finished = false;
+  const finishStopped = async () => {
+    if (finished)
+      return;
+    finished = true;
+    journal?.appendTimeline({ type: "stopped", stage: "stopped", status: "completed", detail: stopRequested?.reason ?? "operator requested stop" });
+    journal?.appendStatus("stopped", { actor: { kind: "operator" }, reason: stopRequested?.reason ?? "operator requested stop", force: true });
+    await stopHost?.("rig stop requested").catch(() => {
+      return;
+    });
+    exit(0);
+  };
   return {
     isStopRequested: () => Boolean(stopRequested),
     requestStop: (reason) => {
@@ -3222,15 +3234,13 @@ function createRunProcessStopController(journal, stopHost, exit = (code) => {
         return;
       stopRequested = { reason };
       journal?.appendTimeline({ type: "stop-requested", stage: "stopped", status: "running", detail: reason ?? "operator requested stop" });
+      if (deps.isIdle?.()) {
+        finishStopped();
+      } else {
+        deps.interrupt?.();
+      }
     },
-    finishStopped: async () => {
-      journal?.appendTimeline({ type: "stopped", stage: "stopped", status: "completed", detail: stopRequested?.reason ?? "operator requested stop" });
-      journal?.appendStatus("stopped", { actor: { kind: "operator" }, reason: stopRequested?.reason ?? "operator requested stop", force: true });
-      await stopHost?.("rig stop requested").catch(() => {
-        return;
-      });
-      exit(0);
-    }
+    finishStopped
   };
 }
 function createRunProcessStopHandlers(runId, stopController) {
@@ -3421,7 +3431,10 @@ async function maybeStartRunProcessAutohost(api, ctx) {
       runRegistry.removeRoom(runRegistryRoomId).catch(() => {});
     }
   };
-  const stopController = createRunProcessStopController(journal, stopHost);
+  const stopController = createRunProcessStopController(journal, stopHost, undefined, {
+    interrupt: () => ctx.abort(),
+    isIdle: () => ctx.isIdle()
+  });
   const stopHandlers = createRunProcessStopHandlers(runId, stopController);
   const stopRunStallMonitor = startRunProcessStallMonitor({
     journal,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/rig-extension",
-  "version": "0.0.6-alpha.92",
+  "version": "0.0.6-alpha.94",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -25,10 +25,10 @@
     ]
   },
   "dependencies": {
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.92",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.92",
-    "@rig/relay-registry": "npm:@h-rig/relay-registry@0.0.6-alpha.92",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.92",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.94",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.94",
+    "@rig/relay-registry": "npm:@h-rig/relay-registry@0.0.6-alpha.94",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.94",
     "@oh-my-pi/pi-coding-agent": "16.0.4",
     "@oh-my-pi/pi-tui": "16.0.4",
     "effect": "4.0.0-beta.78"