@ricsam/r5d-worker 0.0.115 → 0.0.117

package/README.md

@@ -52,6 +52,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.
 
+Before every new agent generation (including subagents, queued work that starts a new generation, and resumed sessions), the server requires the connected runtime to be at least the worker release offered in User Settings. This is the server's `packages/VERSION.txt` release, or its configured `MANAGED_DEV_WORKER_PACKAGE_*` override; admission does not query the npm registry. Missing or invalid runtime versions also block starts. The error includes the running and required versions plus the exact update command. Update in User Settings, or install the packages on the worker host and restart `r5d-worker`: a newer package on disk does not update an already connected process. From 0.0.116 onward, a runtime keeps its startup version across reconnections even if the package on disk changes. Existing agent generations are allowed to finish, and connected workers remain available for updates and synchronization. Protocol cutover checks still apply separately when connecting. Publish the matching packages before deploying a server that requires their new version.
+
 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. In-process reconnects retain initialized project configurations alongside those processes, so an unchanged checkout can reconnect while a dev server is running. Changed layouts and checkouts that need initialization still wait for active commands to finish.
 
 The runtime opens its control connection before recovering interrupted project snapshots. During recovery and initial project configuration it remains connected but non-dispatchable, reports its current phase plus branch/byte progress to the server, and prints the same progress locally. Recovery runs in a credential-sanitized helper process so the control loop can continue answering heartbeats. A durable `restoring` transaction state permits same-filesystem snapshots to be restored with one atomic directory move; cross-filesystem layouts retain the copy-and-fsync fallback.

package/dist/cjs/main.cjs

@@ -56,6 +56,7 @@ __export(main_exports, {
   writeWorkerTextFile: () => writeWorkerTextFile
 });
 module.exports = __toCommonJS(main_exports);
+var import_runtime_version = require("./runtime-version.cjs");
 var import_plan_paths = require("./plan-paths.cjs");
 var import_plan_parser = require("./plan-parser.cjs");
 var import_plan_lint = require("./plan-lint.cjs");
@@ -143,7 +144,6 @@ 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}$/;
 const DEFAULT_READ_LIMIT = 2e3;
 const DEFAULT_READ_MAX_BYTES = 5e4;
@@ -452,55 +452,8 @@ Options:
   -h, --help            Show this help
 `);
 }
-function readVersionFile(filePath) {
-  try {
-    const version = import_node_fs.default.readFileSync(filePath, "utf8").trim();
-    return version || null;
-  } catch {
-    return null;
-  }
-}
-function readInstalledPackageVersion(packageJsonPath) {
-  try {
-    const parsed = JSON.parse(import_node_fs.default.readFileSync(packageJsonPath, "utf8"));
-    if (parsed.name === WORKER_PACKAGE_NAME && typeof parsed.version === "string" && parsed.version.trim()) {
-      return parsed.version.trim();
-    }
-  } catch {
-    return null;
-  }
-  return null;
-}
-function resolveEntrypointPath(entrypoint) {
-  const resolved = import_node_path.default.resolve(entrypoint);
-  try {
-    return import_node_fs.default.realpathSync.native(resolved);
-  } catch {
-    return resolved;
-  }
-}
-function getWorkerVersion() {
-  const entrypoint = process.argv[1] ? resolveEntrypointPath(process.argv[1]) : null;
-  let current = entrypoint ? import_node_path.default.dirname(entrypoint) : process.cwd();
-  for (let index = 0; index < 12; index += 1) {
-    const packageVersion = readInstalledPackageVersion(import_node_path.default.join(current, "package.json"));
-    if (packageVersion) {
-      return packageVersion;
-    }
-    const sourceVersion = readVersionFile(import_node_path.default.join(current, "VERSION.txt"));
-    if (sourceVersion && import_node_path.default.basename(current) === "packages") {
-      return sourceVersion;
-    }
-    const parent = import_node_path.default.dirname(current);
-    if (parent === current) {
-      break;
-    }
-    current = parent;
-  }
-  return "unknown";
-}
 function printVersion() {
-  process.stdout.write(`r5d-worker ${getWorkerVersion()}
+  process.stdout.write(`r5d-worker ${import_runtime_version.WORKER_RUNTIME_VERSION}
 `);
 }
 function requireValue(value, message) {
@@ -3670,7 +3623,7 @@ function websocketUrl(baseUrl, label) {
   const url = new URL("/worker/ws", baseUrl);
   url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
   url.searchParams.set("label", label);
-  url.searchParams.set("version", getWorkerVersion());
+  url.searchParams.set("version", import_runtime_version.WORKER_RUNTIME_VERSION);
   return url.toString();
 }
 async function startWorker(options, projectRuntime = {
@@ -5812,7 +5765,7 @@ async function startWorker(options, projectRuntime = {
         platform: process.platform,
         arch: process.arch,
         pid: process.pid,
-        version: getWorkerVersion(),
+        version: import_runtime_version.WORKER_RUNTIME_VERSION,
         r5dctlVersion: (0, import_cli_update.readInstalledCliVersion)("r5dctl"),
         capabilities: {
           updateClis: true,

package/dist/cjs/package.json

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

package/dist/cjs/recovery-store.cjs

@@ -59,6 +59,7 @@ class WorkerRecoveryStore {
       CREATE TABLE IF NOT EXISTS metadata (key TEXT PRIMARY KEY, value TEXT NOT NULL);
       CREATE TABLE IF NOT EXISTS operations (request_id TEXT PRIMARY KEY, run_id TEXT, session_id TEXT, request_type TEXT NOT NULL, digest TEXT NOT NULL, state TEXT NOT NULL, response TEXT);
       CREATE UNIQUE INDEX IF NOT EXISTS operation_run_start ON operations(run_id) WHERE request_type='exec_start';
+      CREATE INDEX IF NOT EXISTS operation_run_state ON operations(run_id,state);
       CREATE TABLE IF NOT EXISTS aliases (request_id TEXT PRIMARY KEY, operation_id TEXT NOT NULL);
       CREATE TABLE IF NOT EXISTS streams (run_id TEXT NOT NULL, stream TEXT NOT NULL, bytes INTEGER NOT NULL DEFAULT 0, acknowledged INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(run_id, stream));
       CREATE TABLE IF NOT EXISTS output (run_id TEXT NOT NULL, stream TEXT NOT NULL, offset INTEGER NOT NULL, bytes INTEGER NOT NULL, data TEXT NOT NULL, PRIMARY KEY(run_id, stream, offset));
@@ -176,7 +177,8 @@ class WorkerRecoveryStore {
   }
   *output(offsets = []) {
     const cursors = new Map(offsets.map((offset) => [offset.runId, offset]));
-    for (const stream of this.db.query("SELECT * FROM streams WHERE NOT EXISTS (SELECT 1 FROM operations WHERE operations.run_id=streams.run_id AND operations.state='unknown') ORDER BY rowid").all()) {
+    const pendingStreamFilter = offsets.length === 0 ? "bytes>acknowledged AND " : "";
+    for (const stream of this.db.query(`SELECT * FROM streams WHERE ${pendingStreamFilter}NOT EXISTS (SELECT 1 FROM operations WHERE operations.run_id=streams.run_id AND operations.state='unknown') ORDER BY rowid`).all()) {
       const supplied = cursors.get(stream.run_id);
       const cursor = supplied ? stream.stream === "stdout" ? supplied.stdoutBytes : supplied.stderrBytes : stream.acknowledged;
       if (cursor >= stream.bytes) continue;

package/dist/cjs/runtime-version.cjs

@@ -0,0 +1,88 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var runtime_version_exports = {};
+__export(runtime_version_exports, {
+  WORKER_RUNTIME_VERSION: () => WORKER_RUNTIME_VERSION
+});
+module.exports = __toCommonJS(runtime_version_exports);
+var import_node_fs = __toESM(require("node:fs"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
+const WORKER_PACKAGE_NAME = "@ricsam/r5d-worker";
+function readVersionFile(filePath) {
+  try {
+    const version = import_node_fs.default.readFileSync(filePath, "utf8").trim();
+    return version || null;
+  } catch {
+    return null;
+  }
+}
+function readInstalledPackageVersion(packageJsonPath) {
+  try {
+    const parsed = JSON.parse(import_node_fs.default.readFileSync(packageJsonPath, "utf8"));
+    if (parsed.name === WORKER_PACKAGE_NAME && typeof parsed.version === "string" && parsed.version.trim()) {
+      return parsed.version.trim();
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
+function resolveEntrypointPath(entrypoint) {
+  const resolved = import_node_path.default.resolve(entrypoint);
+  try {
+    return import_node_fs.default.realpathSync.native(resolved);
+  } catch {
+    return resolved;
+  }
+}
+function readWorkerVersion() {
+  const entrypoint = process.argv[1] ? resolveEntrypointPath(process.argv[1]) : null;
+  let current = entrypoint ? import_node_path.default.dirname(entrypoint) : process.cwd();
+  for (let index = 0; index < 12; index += 1) {
+    const packageVersion = readInstalledPackageVersion(import_node_path.default.join(current, "package.json"));
+    if (packageVersion) {
+      return packageVersion;
+    }
+    const sourceVersion = readVersionFile(import_node_path.default.join(current, "VERSION.txt"));
+    if (sourceVersion && import_node_path.default.basename(current) === "packages") {
+      return sourceVersion;
+    }
+    const parent = import_node_path.default.dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+  return "unknown";
+}
+const WORKER_RUNTIME_VERSION = readWorkerVersion();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  WORKER_RUNTIME_VERSION
+});

package/dist/mjs/main.mjs

@@ -1,4 +1,5 @@
 #!/usr/bin/env bun
+import { WORKER_RUNTIME_VERSION } from "./runtime-version.mjs";
 import { getWorkerPlanPath, getWorkerPlansPath, validatePlanId } from "./plan-paths.mjs";
 import { createPlanMarkdown, updateTaskCheckbox } from "./plan-parser.mjs";
 import { lintPlans, formatPlanLintErrors } from "./plan-lint.mjs";
@@ -162,7 +163,6 @@ 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}$/;
 const DEFAULT_READ_LIMIT = 2e3;
 const DEFAULT_READ_MAX_BYTES = 5e4;
@@ -471,55 +471,8 @@ Options:
   -h, --help            Show this help
 `);
 }
-function readVersionFile(filePath) {
-  try {
-    const version = fs.readFileSync(filePath, "utf8").trim();
-    return version || null;
-  } catch {
-    return null;
-  }
-}
-function readInstalledPackageVersion(packageJsonPath) {
-  try {
-    const parsed = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
-    if (parsed.name === WORKER_PACKAGE_NAME && typeof parsed.version === "string" && parsed.version.trim()) {
-      return parsed.version.trim();
-    }
-  } catch {
-    return null;
-  }
-  return null;
-}
-function resolveEntrypointPath(entrypoint) {
-  const resolved = path.resolve(entrypoint);
-  try {
-    return fs.realpathSync.native(resolved);
-  } catch {
-    return resolved;
-  }
-}
-function getWorkerVersion() {
-  const entrypoint = process.argv[1] ? resolveEntrypointPath(process.argv[1]) : null;
-  let current = entrypoint ? path.dirname(entrypoint) : process.cwd();
-  for (let index = 0; index < 12; index += 1) {
-    const packageVersion = readInstalledPackageVersion(path.join(current, "package.json"));
-    if (packageVersion) {
-      return packageVersion;
-    }
-    const sourceVersion = readVersionFile(path.join(current, "VERSION.txt"));
-    if (sourceVersion && path.basename(current) === "packages") {
-      return sourceVersion;
-    }
-    const parent = path.dirname(current);
-    if (parent === current) {
-      break;
-    }
-    current = parent;
-  }
-  return "unknown";
-}
 function printVersion() {
-  process.stdout.write(`r5d-worker ${getWorkerVersion()}
+  process.stdout.write(`r5d-worker ${WORKER_RUNTIME_VERSION}
 `);
 }
 function requireValue(value, message) {
@@ -3689,7 +3642,7 @@ function websocketUrl(baseUrl, label) {
   const url = new URL("/worker/ws", baseUrl);
   url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
   url.searchParams.set("label", label);
-  url.searchParams.set("version", getWorkerVersion());
+  url.searchParams.set("version", WORKER_RUNTIME_VERSION);
   return url.toString();
 }
 async function startWorker(options, projectRuntime = {
@@ -5831,7 +5784,7 @@ async function startWorker(options, projectRuntime = {
         platform: process.platform,
         arch: process.arch,
         pid: process.pid,
-        version: getWorkerVersion(),
+        version: WORKER_RUNTIME_VERSION,
         r5dctlVersion: readInstalledCliVersion("r5dctl"),
         capabilities: {
           updateClis: true,

package/dist/mjs/package.json

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

package/dist/mjs/recovery-store.mjs

@@ -25,6 +25,7 @@ class WorkerRecoveryStore {
       CREATE TABLE IF NOT EXISTS metadata (key TEXT PRIMARY KEY, value TEXT NOT NULL);
       CREATE TABLE IF NOT EXISTS operations (request_id TEXT PRIMARY KEY, run_id TEXT, session_id TEXT, request_type TEXT NOT NULL, digest TEXT NOT NULL, state TEXT NOT NULL, response TEXT);
       CREATE UNIQUE INDEX IF NOT EXISTS operation_run_start ON operations(run_id) WHERE request_type='exec_start';
+      CREATE INDEX IF NOT EXISTS operation_run_state ON operations(run_id,state);
       CREATE TABLE IF NOT EXISTS aliases (request_id TEXT PRIMARY KEY, operation_id TEXT NOT NULL);
       CREATE TABLE IF NOT EXISTS streams (run_id TEXT NOT NULL, stream TEXT NOT NULL, bytes INTEGER NOT NULL DEFAULT 0, acknowledged INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(run_id, stream));
       CREATE TABLE IF NOT EXISTS output (run_id TEXT NOT NULL, stream TEXT NOT NULL, offset INTEGER NOT NULL, bytes INTEGER NOT NULL, data TEXT NOT NULL, PRIMARY KEY(run_id, stream, offset));
@@ -142,7 +143,8 @@ class WorkerRecoveryStore {
   }
   *output(offsets = []) {
     const cursors = new Map(offsets.map((offset) => [offset.runId, offset]));
-    for (const stream of this.db.query("SELECT * FROM streams WHERE NOT EXISTS (SELECT 1 FROM operations WHERE operations.run_id=streams.run_id AND operations.state='unknown') ORDER BY rowid").all()) {
+    const pendingStreamFilter = offsets.length === 0 ? "bytes>acknowledged AND " : "";
+    for (const stream of this.db.query(`SELECT * FROM streams WHERE ${pendingStreamFilter}NOT EXISTS (SELECT 1 FROM operations WHERE operations.run_id=streams.run_id AND operations.state='unknown') ORDER BY rowid`).all()) {
       const supplied = cursors.get(stream.run_id);
       const cursor = supplied ? stream.stream === "stdout" ? supplied.stdoutBytes : supplied.stderrBytes : stream.acknowledged;
       if (cursor >= stream.bytes) continue;

package/dist/mjs/runtime-version.mjs

@@ -0,0 +1,54 @@
+import fs from "node:fs";
+import path from "node:path";
+const WORKER_PACKAGE_NAME = "@ricsam/r5d-worker";
+function readVersionFile(filePath) {
+  try {
+    const version = fs.readFileSync(filePath, "utf8").trim();
+    return version || null;
+  } catch {
+    return null;
+  }
+}
+function readInstalledPackageVersion(packageJsonPath) {
+  try {
+    const parsed = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+    if (parsed.name === WORKER_PACKAGE_NAME && typeof parsed.version === "string" && parsed.version.trim()) {
+      return parsed.version.trim();
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
+function resolveEntrypointPath(entrypoint) {
+  const resolved = path.resolve(entrypoint);
+  try {
+    return fs.realpathSync.native(resolved);
+  } catch {
+    return resolved;
+  }
+}
+function readWorkerVersion() {
+  const entrypoint = process.argv[1] ? resolveEntrypointPath(process.argv[1]) : null;
+  let current = entrypoint ? path.dirname(entrypoint) : process.cwd();
+  for (let index = 0; index < 12; index += 1) {
+    const packageVersion = readInstalledPackageVersion(path.join(current, "package.json"));
+    if (packageVersion) {
+      return packageVersion;
+    }
+    const sourceVersion = readVersionFile(path.join(current, "VERSION.txt"));
+    if (sourceVersion && path.basename(current) === "packages") {
+      return sourceVersion;
+    }
+    const parent = path.dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+  return "unknown";
+}
+const WORKER_RUNTIME_VERSION = readWorkerVersion();
+export {
+  WORKER_RUNTIME_VERSION
+};

package/dist/types/runtime-version.d.ts

@@ -0,0 +1 @@
+export declare const WORKER_RUNTIME_VERSION: string;

package/package.json

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