@ricsam/r5d-worker 0.0.89 → 0.0.90

package/README.md

@@ -41,6 +41,8 @@ Worker labels are mandatory and unique per user. Choose labels that describe hos
 
 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.
 
+The server registry is the sole heartbeat timeout authority. The worker answers server pings but does not run an independent connection watchdog, because synchronous bounded workspace operations can temporarily occupy its event loop. The server keeps those operations leased for their bounded lifetime and closes genuinely stale connections after the lease ends.
+
 Credential-generation restart fencing protects against stale or accidentally detached descendants. It is not a hostile same-UID sandbox: code running as the worker's OS user can read or tamper with that user's config and auth files, install a persistent user service, or return after reboot. Run untrusted agents in a disposable VM that is reset at the boundary, or use a separately privileged credential broker/service account. When rotating the worker's own local `r5dctl` credential, stop the worker and reboot/reset the host before writing the replacement credential so an old same-UID descendant cannot read the new config.
 
 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.

package/dist/cjs/main.cjs

@@ -63,7 +63,6 @@ var import_node_child_process = require("node:child_process");
 var import_bun_sqlite = require("bun:sqlite");
 var import_cli_update = require("./cli-update.cjs");
 var import_git_process_environment = require("./git-process-environment.cjs");
-var import_heartbeat = require("./heartbeat.cjs");
 var import_process_tree = require("./process-tree.cjs");
 var import_pty_output_coalescer = require("./pty-output-coalescer.cjs");
 var import_port_forward_client = require("./port-forward-client.cjs");
@@ -4501,7 +4500,6 @@ async function startWorker(options) {
           );
         }).finally(() => {
           automaticSyncInFlight = false;
-          heartbeatBusyGrace = (0, import_heartbeat.grantWorkerHeartbeatBusyGrace)(lastServerHeartbeatAt, heartbeatBusyGrace);
           if (pendingAutomaticTrigger && automaticWorkspaceSyncIsCurrentlyAdmitted()) {
             scheduleAutomaticWorkspaceSync(pendingAutomaticTrigger, WORKSPACE_GIT_QUIET_MS);
           }
@@ -5000,10 +4998,6 @@ async function startWorker(options) {
       Authorization: `Bearer ${token}`
     }
   });
-  let lastServerHeartbeatAt = null;
-  let heartbeatBusyGrace = null;
-  let heartbeatTimedOut = false;
-  let heartbeatWatchdog;
   const handleGracefulShutdown = () => {
     if (shutdownAfterClose) return;
     shutdownAfterClose = true;
@@ -5031,23 +5025,8 @@ async function startWorker(options) {
   };
   process.on("SIGTERM", handleGracefulShutdown);
   process.on("SIGINT", handleGracefulShutdown);
-  const stopHeartbeatWatchdog = () => {
-    if (heartbeatWatchdog) {
-      clearInterval(heartbeatWatchdog);
-      heartbeatWatchdog = void 0;
-    }
-  };
   ws.addEventListener("open", () => {
     currentWorkerSocket = ws;
-    heartbeatWatchdog = setInterval(() => {
-      if (heartbeatTimedOut || !(0, import_heartbeat.hasWorkerHeartbeatTimedOutWithBusyGrace)(lastServerHeartbeatAt, heartbeatBusyGrace)) {
-        return;
-      }
-      heartbeatTimedOut = true;
-      stopHeartbeatWatchdog();
-      process.stderr.write("[r5d-worker] server heartbeat timed out; reconnecting\n");
-      ws.terminate();
-    }, import_heartbeat.WORKER_HEARTBEAT_INTERVAL_MS);
     const hello = {
       type: "hello",
       hostInfo: {
@@ -5094,7 +5073,7 @@ async function startWorker(options) {
         sourceSocketIsCurrent: currentWorkerSocket === ws,
         sourceSocketOpen: ws.readyState === WebSocket.OPEN,
         workspaceConfigured,
-        runtimeHealthy: !shutdownAfterClose && !heartbeatTimedOut
+        runtimeHealthy: !shutdownAfterClose
       });
       if (message.type === "connected") {
         return;
@@ -5453,8 +5432,6 @@ async function startWorker(options) {
         return;
       }
       if (message.type === "ping") {
-        lastServerHeartbeatAt = Date.now();
-        heartbeatBusyGrace = null;
         ws.send(JSON.stringify({ type: "pong" }));
         return;
       }
@@ -5868,15 +5845,12 @@ async function startWorker(options) {
     })().catch((error) => {
       process.stderr.write(`[r5d-worker] message handling failed: ${error instanceof Error ? error.message : String(error)}
 `);
-    }).finally(() => {
-      heartbeatBusyGrace = (0, import_heartbeat.grantWorkerHeartbeatBusyGrace)(lastServerHeartbeatAt, heartbeatBusyGrace);
     });
   });
   ws.addEventListener("close", (event) => {
     const processEvents = process;
     processEvents.off("SIGTERM", handleGracefulShutdown);
     processEvents.off("SIGINT", handleGracefulShutdown);
-    stopHeartbeatWatchdog();
     if (workspaceAutomaticTimer) {
       clearTimeout(workspaceAutomaticTimer);
       workspaceAutomaticTimer = void 0;

package/dist/cjs/package.json

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

package/dist/mjs/main.mjs

@@ -7,11 +7,6 @@ import { spawn as spawnChildProcess } from "node:child_process";
 import { Database } from "bun:sqlite";
 import { installCliUpdate, readInstalledCliVersion } from "./cli-update.mjs";
 import { gitTransportSecurityArgs, workerGitProcessEnvironment } from "./git-process-environment.mjs";
-import {
-  grantWorkerHeartbeatBusyGrace,
-  hasWorkerHeartbeatTimedOutWithBusyGrace,
-  WORKER_HEARTBEAT_INTERVAL_MS
-} from "./heartbeat.mjs";
 import { terminateProcessTree } from "./process-tree.mjs";
 import { createPtyOutputCoalescer } from "./pty-output-coalescer.mjs";
 import { openWorkerPortForwardRelay } from "./port-forward-client.mjs";
@@ -4509,7 +4504,6 @@ async function startWorker(options) {
           );
         }).finally(() => {
           automaticSyncInFlight = false;
-          heartbeatBusyGrace = grantWorkerHeartbeatBusyGrace(lastServerHeartbeatAt, heartbeatBusyGrace);
           if (pendingAutomaticTrigger && automaticWorkspaceSyncIsCurrentlyAdmitted()) {
             scheduleAutomaticWorkspaceSync(pendingAutomaticTrigger, WORKSPACE_GIT_QUIET_MS);
           }
@@ -5008,10 +5002,6 @@ async function startWorker(options) {
       Authorization: `Bearer ${token}`
     }
   });
-  let lastServerHeartbeatAt = null;
-  let heartbeatBusyGrace = null;
-  let heartbeatTimedOut = false;
-  let heartbeatWatchdog;
   const handleGracefulShutdown = () => {
     if (shutdownAfterClose) return;
     shutdownAfterClose = true;
@@ -5039,23 +5029,8 @@ async function startWorker(options) {
   };
   process.on("SIGTERM", handleGracefulShutdown);
   process.on("SIGINT", handleGracefulShutdown);
-  const stopHeartbeatWatchdog = () => {
-    if (heartbeatWatchdog) {
-      clearInterval(heartbeatWatchdog);
-      heartbeatWatchdog = void 0;
-    }
-  };
   ws.addEventListener("open", () => {
     currentWorkerSocket = ws;
-    heartbeatWatchdog = setInterval(() => {
-      if (heartbeatTimedOut || !hasWorkerHeartbeatTimedOutWithBusyGrace(lastServerHeartbeatAt, heartbeatBusyGrace)) {
-        return;
-      }
-      heartbeatTimedOut = true;
-      stopHeartbeatWatchdog();
-      process.stderr.write("[r5d-worker] server heartbeat timed out; reconnecting\n");
-      ws.terminate();
-    }, WORKER_HEARTBEAT_INTERVAL_MS);
     const hello = {
       type: "hello",
       hostInfo: {
@@ -5102,7 +5077,7 @@ async function startWorker(options) {
         sourceSocketIsCurrent: currentWorkerSocket === ws,
         sourceSocketOpen: ws.readyState === WebSocket.OPEN,
         workspaceConfigured,
-        runtimeHealthy: !shutdownAfterClose && !heartbeatTimedOut
+        runtimeHealthy: !shutdownAfterClose
       });
       if (message.type === "connected") {
         return;
@@ -5461,8 +5436,6 @@ async function startWorker(options) {
         return;
       }
       if (message.type === "ping") {
-        lastServerHeartbeatAt = Date.now();
-        heartbeatBusyGrace = null;
         ws.send(JSON.stringify({ type: "pong" }));
         return;
       }
@@ -5876,15 +5849,12 @@ async function startWorker(options) {
     })().catch((error) => {
       process.stderr.write(`[r5d-worker] message handling failed: ${error instanceof Error ? error.message : String(error)}
 `);
-    }).finally(() => {
-      heartbeatBusyGrace = grantWorkerHeartbeatBusyGrace(lastServerHeartbeatAt, heartbeatBusyGrace);
     });
   });
   ws.addEventListener("close", (event) => {
     const processEvents = process;
     processEvents.off("SIGTERM", handleGracefulShutdown);
     processEvents.off("SIGINT", handleGracefulShutdown);
-    stopHeartbeatWatchdog();
     if (workspaceAutomaticTimer) {
       clearTimeout(workspaceAutomaticTimer);
       workspaceAutomaticTimer = void 0;

package/dist/mjs/package.json

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

package/package.json

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

package/dist/cjs/heartbeat.cjs

@@ -1,49 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var heartbeat_exports = {};
-__export(heartbeat_exports, {
-  WORKER_HEARTBEAT_INTERVAL_MS: () => WORKER_HEARTBEAT_INTERVAL_MS,
-  WORKER_HEARTBEAT_TIMEOUT_MS: () => WORKER_HEARTBEAT_TIMEOUT_MS,
-  grantWorkerHeartbeatBusyGrace: () => grantWorkerHeartbeatBusyGrace,
-  hasWorkerHeartbeatTimedOut: () => hasWorkerHeartbeatTimedOut,
-  hasWorkerHeartbeatTimedOutWithBusyGrace: () => hasWorkerHeartbeatTimedOutWithBusyGrace
-});
-module.exports = __toCommonJS(heartbeat_exports);
-const WORKER_HEARTBEAT_INTERVAL_MS = 15e3;
-const WORKER_HEARTBEAT_TIMEOUT_MS = 45e3;
-function hasWorkerHeartbeatTimedOut(lastHeartbeatAt, now = Date.now(), timeoutMs = WORKER_HEARTBEAT_TIMEOUT_MS) {
-  return lastHeartbeatAt !== null && now - lastHeartbeatAt >= timeoutMs;
-}
-function grantWorkerHeartbeatBusyGrace(lastHeartbeatAt, currentGrace, now = Date.now(), timeoutMs = WORKER_HEARTBEAT_TIMEOUT_MS, graceMs = WORKER_HEARTBEAT_INTERVAL_MS) {
-  if (!hasWorkerHeartbeatTimedOut(lastHeartbeatAt, now, timeoutMs)) return currentGrace;
-  if (currentGrace?.heartbeatAt === lastHeartbeatAt) return currentGrace;
-  return { heartbeatAt: lastHeartbeatAt, expiresAt: now + graceMs };
-}
-function hasWorkerHeartbeatTimedOutWithBusyGrace(lastHeartbeatAt, busyGrace, now = Date.now(), timeoutMs = WORKER_HEARTBEAT_TIMEOUT_MS) {
-  if (lastHeartbeatAt !== null && busyGrace?.heartbeatAt === lastHeartbeatAt && now < busyGrace.expiresAt) return false;
-  return hasWorkerHeartbeatTimedOut(lastHeartbeatAt, now, timeoutMs);
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  WORKER_HEARTBEAT_INTERVAL_MS,
-  WORKER_HEARTBEAT_TIMEOUT_MS,
-  grantWorkerHeartbeatBusyGrace,
-  hasWorkerHeartbeatTimedOut,
-  hasWorkerHeartbeatTimedOutWithBusyGrace
-});

package/dist/mjs/heartbeat.mjs

@@ -1,21 +0,0 @@
-const WORKER_HEARTBEAT_INTERVAL_MS = 15e3;
-const WORKER_HEARTBEAT_TIMEOUT_MS = 45e3;
-function hasWorkerHeartbeatTimedOut(lastHeartbeatAt, now = Date.now(), timeoutMs = WORKER_HEARTBEAT_TIMEOUT_MS) {
-  return lastHeartbeatAt !== null && now - lastHeartbeatAt >= timeoutMs;
-}
-function grantWorkerHeartbeatBusyGrace(lastHeartbeatAt, currentGrace, now = Date.now(), timeoutMs = WORKER_HEARTBEAT_TIMEOUT_MS, graceMs = WORKER_HEARTBEAT_INTERVAL_MS) {
-  if (!hasWorkerHeartbeatTimedOut(lastHeartbeatAt, now, timeoutMs)) return currentGrace;
-  if (currentGrace?.heartbeatAt === lastHeartbeatAt) return currentGrace;
-  return { heartbeatAt: lastHeartbeatAt, expiresAt: now + graceMs };
-}
-function hasWorkerHeartbeatTimedOutWithBusyGrace(lastHeartbeatAt, busyGrace, now = Date.now(), timeoutMs = WORKER_HEARTBEAT_TIMEOUT_MS) {
-  if (lastHeartbeatAt !== null && busyGrace?.heartbeatAt === lastHeartbeatAt && now < busyGrace.expiresAt) return false;
-  return hasWorkerHeartbeatTimedOut(lastHeartbeatAt, now, timeoutMs);
-}
-export {
-  WORKER_HEARTBEAT_INTERVAL_MS,
-  WORKER_HEARTBEAT_TIMEOUT_MS,
-  grantWorkerHeartbeatBusyGrace,
-  hasWorkerHeartbeatTimedOut,
-  hasWorkerHeartbeatTimedOutWithBusyGrace
-};

package/dist/types/heartbeat.d.ts

@@ -1,10 +0,0 @@
-export declare const WORKER_HEARTBEAT_INTERVAL_MS = 15000;
-export declare const WORKER_HEARTBEAT_TIMEOUT_MS = 45000;
-export declare function hasWorkerHeartbeatTimedOut(lastHeartbeatAt: number | null, now?: number, timeoutMs?: number): boolean;
-export type WorkerHeartbeatBusyGrace = {
-    heartbeatAt: number;
-    expiresAt: number;
-};
-/** Grant one bounded grace period for one actual server-heartbeat generation. */
-export declare function grantWorkerHeartbeatBusyGrace(lastHeartbeatAt: number | null, currentGrace: WorkerHeartbeatBusyGrace | null, now?: number, timeoutMs?: number, graceMs?: number): WorkerHeartbeatBusyGrace | null;
-export declare function hasWorkerHeartbeatTimedOutWithBusyGrace(lastHeartbeatAt: number | null, busyGrace: WorkerHeartbeatBusyGrace | null, now?: number, timeoutMs?: number): boolean;