@ricsam/r5d-worker 0.0.39 → 0.0.40

package/README.md

@@ -27,6 +27,8 @@ Worker labels are mandatory and unique per user. Choose labels that describe hos
 
 `r5d-worker start` keeps a lightweight supervisor process attached to the launching terminal or service. When both r5d CLIs are updated from User Settings, the connected runtime verifies the installed versions, exits with a reload signal, and the supervisor reconnects using the new worker package. Updates only run while the worker has no active commands or shells.
 
+The supervisor also reconnects automatically after server rollouts and transient network failures. A brief bounded delay prevents a tight retry loop while the server is unavailable. Pressing Ctrl+C still stops the worker, and agent-managed processes retain their existing in-process recovery path while disconnected.
+
 One-click updates use the current user's global npm prefix and never invoke `sudo`. If that prefix is not writable, User Settings provides the exact command to run manually.
 
 The agent runs commands through the virtual shell command:

package/dist/cjs/main.cjs

@@ -59,6 +59,9 @@ var import_supervisor = require("./supervisor.cjs");
 var import_managed_paths = require("./managed-paths.cjs");
 var import_workspace_sync = require("./workspace-sync.cjs");
 const import_meta = {};
+class WorkerServerUnavailableError extends Error {
+  name = "WorkerServerUnavailableError";
+}
 const DEFAULT_BASE_URL = "https://r5d.dev";
 const WORKER_PACKAGE_NAME = "@ricsam/r5d-worker";
 const LABEL_RE = /^[A-Za-z0-9][A-Za-z0-9_.-]{0,62}$/;
@@ -559,7 +562,7 @@ async function verifyR5dctlAuth(baseUrl, token) {
       }
     });
   } catch (error) {
-    throw new Error(`Could not reach ${baseUrl}: ${error instanceof Error ? error.message : String(error)}`);
+    throw new WorkerServerUnavailableError(`Could not reach ${baseUrl}: ${error instanceof Error ? error.message : String(error)}`);
   }
   if (response.ok) {
     return;
@@ -574,6 +577,9 @@ async function verifyR5dctlAuth(baseUrl, token) {
   } catch {
   }
   const detail = serverMessage ? `: ${serverMessage}` : "";
+  if ((0, import_supervisor.isRetryableWorkerServerStatus)(response.status)) {
+    throw new WorkerServerUnavailableError(`Server unavailable at ${baseUrl} (${response.status})${detail}`);
+  }
   throw new Error(
     `Authentication failed against ${baseUrl} (${response.status})${detail}. Run \`r5dctl auth login --base-url ${baseUrl}\` or pass --token/--api-key for this server.`
   );
@@ -2595,9 +2601,8 @@ async function startWorker(options) {
       process.exit(import_supervisor.WORKER_RELOAD_EXIT_CODE);
     }
     if (activeProcesses.size > 0 || pendingProcessTerminals.size > 0) {
-      const delayMs = 2e3;
       process.stderr.write(
-        `[r5d-worker] ${activeProcesses.size} process(es) active and ${pendingProcessTerminals.size} terminal report(s) pending; reconnecting in ${delayMs}ms
+        `[r5d-worker] ${activeProcesses.size} process(es) active and ${pendingProcessTerminals.size} terminal report(s) pending; reconnecting in ${import_supervisor.WORKER_RECONNECT_DELAY_MS}ms
 `
       );
       const reconnect = () => {
@@ -2605,16 +2610,16 @@ async function startWorker(options) {
           process.stderr.write(`[r5d-worker] reconnect failed: ${error instanceof Error ? error.message : String(error)}
 `);
           if (activeProcesses.size > 0 || pendingProcessTerminals.size > 0) {
-            setTimeout(reconnect, delayMs);
+            setTimeout(reconnect, import_supervisor.WORKER_RECONNECT_DELAY_MS);
             return;
           }
-          process.exit(1);
+          process.exit(error instanceof WorkerServerUnavailableError ? import_supervisor.WORKER_RECONNECT_EXIT_CODE : 1);
         });
       };
-      setTimeout(reconnect, delayMs);
+      setTimeout(reconnect, import_supervisor.WORKER_RECONNECT_DELAY_MS);
       return;
     }
-    process.exit(event.code === 1e3 ? 0 : 1);
+    process.exit(import_supervisor.WORKER_RECONNECT_EXIT_CODE);
   });
   ws.addEventListener("error", (event) => {
     const message = "message" in event && typeof event.message === "string" && event.message.trim() ? `: ${event.message.trim()}` : "";
@@ -2636,7 +2641,16 @@ async function main() {
   }
   if (process.env[import_supervisor.WORKER_RUNTIME_ENV] === "1") {
     delete process.env[import_supervisor.WORKER_RUNTIME_ENV];
-    await startWorker(parsed.options);
+    try {
+      await startWorker(parsed.options);
+    } catch (error) {
+      if (error instanceof WorkerServerUnavailableError) {
+        process.stderr.write(`[r5d-worker] ${error.message}
+`);
+        process.exit(import_supervisor.WORKER_RECONNECT_EXIT_CODE);
+      }
+      throw error;
+    }
     return;
   }
   const exitCode = await (0, import_supervisor.superviseWorkerRuntime)(process.argv.slice(2));

package/dist/cjs/package.json

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

package/dist/cjs/supervisor.cjs

@@ -18,17 +18,28 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var supervisor_exports = {};
 __export(supervisor_exports, {
+  WORKER_RECONNECT_DELAY_MS: () => WORKER_RECONNECT_DELAY_MS,
+  WORKER_RECONNECT_EXIT_CODE: () => WORKER_RECONNECT_EXIT_CODE,
   WORKER_RELOAD_EXIT_CODE: () => WORKER_RELOAD_EXIT_CODE,
   WORKER_RUNTIME_ENV: () => WORKER_RUNTIME_ENV,
+  isRetryableWorkerServerStatus: () => isRetryableWorkerServerStatus,
   superviseWorkerRuntime: () => superviseWorkerRuntime
 });
 module.exports = __toCommonJS(supervisor_exports);
 const WORKER_RUNTIME_ENV = "R5D_WORKER_INTERNAL_RUNTIME";
 const WORKER_RELOAD_EXIT_CODE = 75;
+const WORKER_RECONNECT_EXIT_CODE = 76;
+const WORKER_RECONNECT_DELAY_MS = 2e3;
 function defaultRuntimeSpawner(argv, options) {
   return Bun.spawn(argv, options);
 }
-async function superviseWorkerRuntime(argv, env = process.env, spawnRuntime = defaultRuntimeSpawner) {
+function defaultRuntimeDelay(delayMs) {
+  return new Promise((resolve) => setTimeout(resolve, delayMs));
+}
+function isRetryableWorkerServerStatus(status) {
+  return status === 408 || status === 429 || status >= 500;
+}
+async function superviseWorkerRuntime(argv, env = process.env, spawnRuntime = defaultRuntimeSpawner, waitBeforeReconnect = defaultRuntimeDelay) {
   if (!process.argv[1]) {
     throw new Error("Cannot locate the r5d-worker entrypoint");
   }
@@ -47,12 +58,21 @@ async function superviseWorkerRuntime(argv, env = process.env, spawnRuntime = de
       process.stdout.write("[r5d-worker] activating updated worker runtime\n");
       continue;
     }
+    if (exitCode === WORKER_RECONNECT_EXIT_CODE) {
+      process.stderr.write(`[r5d-worker] reconnecting in ${WORKER_RECONNECT_DELAY_MS}ms
+`);
+      await waitBeforeReconnect(WORKER_RECONNECT_DELAY_MS);
+      continue;
+    }
     return exitCode;
   }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  WORKER_RECONNECT_DELAY_MS,
+  WORKER_RECONNECT_EXIT_CODE,
   WORKER_RELOAD_EXIT_CODE,
   WORKER_RUNTIME_ENV,
+  isRetryableWorkerServerStatus,
   superviseWorkerRuntime
 });

package/dist/mjs/main.mjs

@@ -8,7 +8,14 @@ import { installCliUpdate, readInstalledCliVersion } from "./cli-update.mjs";
 import { configureVisibleGitIdentity } from "./git-identity.mjs";
 import { hasWorkerHeartbeatTimedOut, WORKER_HEARTBEAT_INTERVAL_MS } from "./heartbeat.mjs";
 import { terminateProcessTree } from "./process-tree.mjs";
-import { superviseWorkerRuntime, WORKER_RELOAD_EXIT_CODE, WORKER_RUNTIME_ENV } from "./supervisor.mjs";
+import {
+  isRetryableWorkerServerStatus,
+  superviseWorkerRuntime,
+  WORKER_RECONNECT_DELAY_MS,
+  WORKER_RECONNECT_EXIT_CODE,
+  WORKER_RELOAD_EXIT_CODE,
+  WORKER_RUNTIME_ENV
+} from "./supervisor.mjs";
 import { managedProjectRoot, migrateLegacyProjectRoots, validateManagedBranchName } from "./managed-paths.mjs";
 import {
   WORKSPACE_PERIODIC_SCAN_INTERVAL_MS,
@@ -16,6 +23,9 @@ import {
   calculateWorkspaceDiffFingerprint,
   synchronizeWorkspace
 } from "./workspace-sync.mjs";
+class WorkerServerUnavailableError extends Error {
+  name = "WorkerServerUnavailableError";
+}
 const DEFAULT_BASE_URL = "https://r5d.dev";
 const WORKER_PACKAGE_NAME = "@ricsam/r5d-worker";
 const LABEL_RE = /^[A-Za-z0-9][A-Za-z0-9_.-]{0,62}$/;
@@ -516,7 +526,7 @@ async function verifyR5dctlAuth(baseUrl, token) {
       }
     });
   } catch (error) {
-    throw new Error(`Could not reach ${baseUrl}: ${error instanceof Error ? error.message : String(error)}`);
+    throw new WorkerServerUnavailableError(`Could not reach ${baseUrl}: ${error instanceof Error ? error.message : String(error)}`);
   }
   if (response.ok) {
     return;
@@ -531,6 +541,9 @@ async function verifyR5dctlAuth(baseUrl, token) {
   } catch {
   }
   const detail = serverMessage ? `: ${serverMessage}` : "";
+  if (isRetryableWorkerServerStatus(response.status)) {
+    throw new WorkerServerUnavailableError(`Server unavailable at ${baseUrl} (${response.status})${detail}`);
+  }
   throw new Error(
     `Authentication failed against ${baseUrl} (${response.status})${detail}. Run \`r5dctl auth login --base-url ${baseUrl}\` or pass --token/--api-key for this server.`
   );
@@ -2552,9 +2565,8 @@ async function startWorker(options) {
       process.exit(WORKER_RELOAD_EXIT_CODE);
     }
     if (activeProcesses.size > 0 || pendingProcessTerminals.size > 0) {
-      const delayMs = 2e3;
       process.stderr.write(
-        `[r5d-worker] ${activeProcesses.size} process(es) active and ${pendingProcessTerminals.size} terminal report(s) pending; reconnecting in ${delayMs}ms
+        `[r5d-worker] ${activeProcesses.size} process(es) active and ${pendingProcessTerminals.size} terminal report(s) pending; reconnecting in ${WORKER_RECONNECT_DELAY_MS}ms
 `
       );
       const reconnect = () => {
@@ -2562,16 +2574,16 @@ async function startWorker(options) {
           process.stderr.write(`[r5d-worker] reconnect failed: ${error instanceof Error ? error.message : String(error)}
 `);
           if (activeProcesses.size > 0 || pendingProcessTerminals.size > 0) {
-            setTimeout(reconnect, delayMs);
+            setTimeout(reconnect, WORKER_RECONNECT_DELAY_MS);
             return;
           }
-          process.exit(1);
+          process.exit(error instanceof WorkerServerUnavailableError ? WORKER_RECONNECT_EXIT_CODE : 1);
         });
       };
-      setTimeout(reconnect, delayMs);
+      setTimeout(reconnect, WORKER_RECONNECT_DELAY_MS);
       return;
     }
-    process.exit(event.code === 1e3 ? 0 : 1);
+    process.exit(WORKER_RECONNECT_EXIT_CODE);
   });
   ws.addEventListener("error", (event) => {
     const message = "message" in event && typeof event.message === "string" && event.message.trim() ? `: ${event.message.trim()}` : "";
@@ -2593,7 +2605,16 @@ async function main() {
   }
   if (process.env[WORKER_RUNTIME_ENV] === "1") {
     delete process.env[WORKER_RUNTIME_ENV];
-    await startWorker(parsed.options);
+    try {
+      await startWorker(parsed.options);
+    } catch (error) {
+      if (error instanceof WorkerServerUnavailableError) {
+        process.stderr.write(`[r5d-worker] ${error.message}
+`);
+        process.exit(WORKER_RECONNECT_EXIT_CODE);
+      }
+      throw error;
+    }
     return;
   }
   const exitCode = await superviseWorkerRuntime(process.argv.slice(2));

package/dist/mjs/package.json

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

package/dist/mjs/supervisor.mjs

@@ -1,9 +1,17 @@
 const WORKER_RUNTIME_ENV = "R5D_WORKER_INTERNAL_RUNTIME";
 const WORKER_RELOAD_EXIT_CODE = 75;
+const WORKER_RECONNECT_EXIT_CODE = 76;
+const WORKER_RECONNECT_DELAY_MS = 2e3;
 function defaultRuntimeSpawner(argv, options) {
   return Bun.spawn(argv, options);
 }
-async function superviseWorkerRuntime(argv, env = process.env, spawnRuntime = defaultRuntimeSpawner) {
+function defaultRuntimeDelay(delayMs) {
+  return new Promise((resolve) => setTimeout(resolve, delayMs));
+}
+function isRetryableWorkerServerStatus(status) {
+  return status === 408 || status === 429 || status >= 500;
+}
+async function superviseWorkerRuntime(argv, env = process.env, spawnRuntime = defaultRuntimeSpawner, waitBeforeReconnect = defaultRuntimeDelay) {
   if (!process.argv[1]) {
     throw new Error("Cannot locate the r5d-worker entrypoint");
   }
@@ -22,11 +30,20 @@ async function superviseWorkerRuntime(argv, env = process.env, spawnRuntime = de
       process.stdout.write("[r5d-worker] activating updated worker runtime\n");
       continue;
     }
+    if (exitCode === WORKER_RECONNECT_EXIT_CODE) {
+      process.stderr.write(`[r5d-worker] reconnecting in ${WORKER_RECONNECT_DELAY_MS}ms
+`);
+      await waitBeforeReconnect(WORKER_RECONNECT_DELAY_MS);
+      continue;
+    }
     return exitCode;
   }
 }
 export {
+  WORKER_RECONNECT_DELAY_MS,
+  WORKER_RECONNECT_EXIT_CODE,
   WORKER_RELOAD_EXIT_CODE,
   WORKER_RUNTIME_ENV,
+  isRetryableWorkerServerStatus,
   superviseWorkerRuntime
 };

package/dist/types/supervisor.d.ts

@@ -1,5 +1,7 @@
 export declare const WORKER_RUNTIME_ENV = "R5D_WORKER_INTERNAL_RUNTIME";
 export declare const WORKER_RELOAD_EXIT_CODE = 75;
+export declare const WORKER_RECONNECT_EXIT_CODE = 76;
+export declare const WORKER_RECONNECT_DELAY_MS = 2000;
 type RuntimeProcess = {
     exited: Promise<number>;
 };
@@ -9,5 +11,7 @@ export type RuntimeSpawner = (argv: string[], options: {
     stderr: "inherit";
     env: Record<string, string | undefined>;
 }) => RuntimeProcess;
-export declare function superviseWorkerRuntime(argv: string[], env?: Record<string, string | undefined>, spawnRuntime?: RuntimeSpawner): Promise<number>;
+export type RuntimeDelay = (delayMs: number) => Promise<void>;
+export declare function isRetryableWorkerServerStatus(status: number): boolean;
+export declare function superviseWorkerRuntime(argv: string[], env?: Record<string, string | undefined>, spawnRuntime?: RuntimeSpawner, waitBeforeReconnect?: RuntimeDelay): Promise<number>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.39",
+  "version": "0.0.40",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",