@ricsam/r5d-worker 0.0.179 → 0.0.181

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.179",
+  "version": "0.0.181",
   "type": "commonjs"
 }

package/dist/mjs/internal-r5dctl.cjs

@@ -20605,7 +20605,7 @@ function resolveEntrypointPath(entrypoint) {
   }
 }
 function getR5dctlVersion() {
-  if (true) return "0.0.179";
+  if (true) return "0.0.181";
   const entrypoint = process.argv[1] ? resolveEntrypointPath(process.argv[1]) : null;
   let current = entrypoint ? import_node_path2.default.dirname(entrypoint) : process.cwd();
   for (let index = 0; index < 12; index += 1) {

package/dist/mjs/main.mjs

@@ -7,7 +7,7 @@ import { startManagerRpc } from "./runtime/releases/rpc-main.mjs";
 import { ManagerRpcConfig } from "./runtime/releases/rpc-protocol.mjs";
 const args = process.argv.slice(2);
 if (args.includes("--version")) {
-  console.log(`r5d-worker ${true ? "0.0.179" : "development"}`);
+  console.log(`r5d-worker ${true ? "0.0.181" : "development"}`);
 } else if (!args.length || args.includes("--help")) {
   console.log(
     "Usage: r5d-worker start --label <label> [--root <dir>] [--base-url <url>] [--token <worker-token>] [--initial-sync merge|reset]\n       r5d-worker executor /absolute/private/config.json\n       r5d-worker manager /absolute/private/config.json\n\nRun independently supervised durable runtime services. Provision configuration with r5dinfra."
@@ -15,7 +15,7 @@ if (args.includes("--version")) {
 } else if (args[0] === "start") {
   const runtime = await startPersonalWorker(
     parsePersonalWorkerOptions(args.slice(1)),
-    true ? "0.0.179" : "development"
+    true ? "0.0.181" : "development"
   );
   console.log(`Worker connected: ${runtime.resourceId}`);
   let closing = false;
@@ -24,7 +24,12 @@ if (args.includes("--version")) {
     closing = true;
     void runtime.close().then(
       () => process.exit(0),
-      () => process.exit(1)
+      (error) => {
+        const code = error?.code;
+        process.stderr.write(`[r5d-worker] stop did not complete cleanly: ${typeof code === "string" ? code : error instanceof Error ? error.message : String(error)}
+`);
+        process.exit(1);
+      }
     );
   };
   process.once("SIGTERM", close);

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.179",
+  "version": "0.0.181",
   "type": "module"
 }

package/dist/mjs/personal/client.mjs

@@ -254,11 +254,17 @@ async function startPersonalWorker(options, version) {
     root,
     async close() {
       stopped = true;
-      await terminalStream.close();
-      await loop;
-      await scheduler.drain();
-      await runtime.close();
-      ledger.close();
+      try {
+        await terminalStream.close();
+        await loop;
+        await scheduler.drain();
+      } finally {
+        try {
+          await runtime.close();
+        } finally {
+          ledger.close();
+        }
+      }
     }
   };
 }

package/dist/mjs/personal/runtime.mjs

@@ -509,10 +509,18 @@ exec ${quote(executable)} ${quote(cli)} "$@"
       async close() {
         closing = true;
         clearInterval(publicationTimer);
-        await publication;
-        await tcp.close();
-        await authority.close();
-        await daemon.close();
+        try {
+          await publication;
+        } catch (error) {
+          process.stderr.write(`[r5d-worker] final publication cycle failed: ${error instanceof WorkspaceError ? error.code : "publication_failed"}
+`);
+        }
+        try {
+          await tcp.close();
+          await authority.close();
+        } finally {
+          await daemon.close();
+        }
       }
     };
   } catch (error) {

package/dist/mjs/runtime/executor.mjs

@@ -327,7 +327,10 @@ class HostExecutor {
         if (pty) {
           pty.onData((data) => this.output(run2, "stdout", Buffer.from(data)));
           pty.onExit(({ exitCode, signal }) => {
-            if (exitCode === -1) receipt2.reason = "pty_helper_lost";
+            if (exitCode === -1) {
+              receipt2.reason = "pty_helper_lost";
+              run2.cancelled = true;
+            }
             onExit(exitCode, signal ? String(signal) : null);
           });
         } else {
@@ -467,7 +470,7 @@ class HostExecutor {
     if (run.finishing) return run.finishing;
     run.finishing = (async () => {
       clearTimeout(run.timer);
-      let cleanupFailed = run.receipt.reason === "pty_helper_lost";
+      let cleanupFailed = false;
       try {
         if (run.process.pid) await terminateProcessTree(run.process, { graceMs: 200, forceKillWaitMs: 1e3 });
         await Promise.race([

package/dist/mjs/runtime/pty.mjs

@@ -10,6 +10,10 @@ function preflightNativePty() {
 }
 class PtySession {
   pid = 0;
+  /** The helper process that owns the terminal, for tests that end it the way a stop signal would. */
+  get helperPid() {
+    return this.child.pid ?? 0;
+  }
   sequence = 0;
   pending = /* @__PURE__ */ new Map();
   child;

package/dist/mjs/runtime/workspace/authority.mjs

@@ -2031,6 +2031,7 @@ class WorkspaceAuthority {
     await Promise.allSettled([...this.actions]);
     await Promise.allSettled([...this.queues.values()]);
     for (const b of this.benches.values()) await this.refresh(b);
+    await this.drainLiveRuns();
     if ([...this.benches.values()].some(
       (b) => b.state.blocked || Object.values(b.state.runs).some((r) => !["completed", "cancelled", "rejected_capacity"].includes(r.state))
     ))
@@ -2043,6 +2044,32 @@ class WorkspaceAuthority {
     await fs.rm(path.join(this.config.root, ".sync-lock"), { recursive: true });
     this.closed = true;
   }
+  /** A stop ends what the keeper tracks. Live runs (an open shell, an agent
+   * command) are cancelled through the executor and waited for, the way a
+   * supervisor drain would, so that an orderly stop leaves cancelled receipts
+   * behind rather than a lock nobody can release: the process is going away
+   * either way. Outcomes that stay unknown after the drain still retain the
+   * lock for review. */
+  async drainLiveRuns() {
+    const live = (b) => Object.entries(b.state.runs).filter(([, run]) => !["completed", "cancelled", "rejected_capacity", "unknown"].includes(run.state));
+    if (![...this.benches.values()].some((b) => live(b).length)) return;
+    for (const b of this.benches.values()) {
+      for (const [operationId, run] of live(b)) {
+        try {
+          const identity = { userId: b.config.userId, sessionId: run.sessionId ?? b.config.sessionId };
+          const route = await this.route(b, identity);
+          await route.client.cancel({ ...identity, operationId, fence: route.workerFence }, `drain-${this.lockId.slice(0, 8)}-${sha256(operationId).slice(0, 16)}`);
+        } catch {
+        }
+      }
+    }
+    const deadline = Date.now() + 15e3;
+    for (; ; ) {
+      for (const b of this.benches.values()) await this.refresh(b);
+      if (![...this.benches.values()].some((b) => live(b).length) || Date.now() >= deadline) return;
+      await new Promise((resolve) => setTimeout(resolve, 200));
+    }
+  }
 }
 export {
   WorkspaceAuthority

package/dist/types/runtime/pty.d.ts

@@ -2,6 +2,8 @@ export declare function preflightNativePty(): void;
 /** Node native FD keeper is a daemon child; replacing adapters cannot signal it. */
 export declare class PtySession {
     pid: number;
+    /** The helper process that owns the terminal, for tests that end it the way a stop signal would. */
+    get helperPid(): number;
     private sequence;
     private readonly pending;
     private readonly child;

package/dist/types/runtime/workspace/authority.d.ts

@@ -500,4 +500,11 @@ export declare class WorkspaceAuthority {
     cancel(identity: WorkspaceIdentity, run: RunIdentity, actionId: string): Promise<import("..").ActionReceipt>;
     close(): Promise<void>;
     private finishClose;
+    /** A stop ends what the keeper tracks. Live runs (an open shell, an agent
+     * command) are cancelled through the executor and waited for, the way a
+     * supervisor drain would, so that an orderly stop leaves cancelled receipts
+     * behind rather than a lock nobody can release: the process is going away
+     * either way. Outcomes that stay unknown after the drain still retain the
+     * lock for review. */
+    private drainLiveRuns;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.179",
+  "version": "0.0.181",
   "type": "module",
   "main": "./dist/mjs/main.mjs",
   "module": "./dist/mjs/main.mjs",
@@ -21,7 +21,7 @@
     "r5d-worker": "dist/mjs/main.mjs"
   },
   "dependencies": {
-    "@ricsam/r5d-api": "^0.0.179",
+    "@ricsam/r5d-api": "^0.0.181",
     "node-pty": "1.1.0",
     "zod": "^4.1.13",
     "picomatch": "^4.0.3"