@ricsam/r5d-worker 0.0.145 → 0.0.146

package/README.md

@@ -8,3 +8,5 @@ r5d-worker manager /absolute/private/manager-config.json
 ```
 
 The executor retains processes and durable receipts independently of application releases. The manager authenticates the approved workspace keeper and retains old adapters until their delivery receipts are settled. Configuration and host roots belong exclusively to one installation. Never share an executor's state directory, credentials or workspace root between environments.
+
+The published worker has an exact-version dependency on `@ricsam/r5dctl`. A personal worker resolves that bundled CLI before the host `PATH`, verifies that its package version equals the running worker version, and exposes it to agent shells through a private worker-owned wrapper. Each worker remains bound to one server origin and installation, so stage, production, and review workers cannot accidentally select another environment's global CLI or credentials.

package/dist/cjs/package.json

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

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.145" : "development"}`);
+  console.log(`r5d-worker ${true ? "0.0.146" : "development"}`);
 } else if (!args.length || args.includes("--help")) {
   console.log(
     "Usage: r5d-worker start --label <label> [--root <dir>] [--base-url <url>] [--token <worker-token>]\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.145" : "development"
+    true ? "0.0.146" : "development"
   );
   console.log(`Worker connected: ${runtime.resourceId}`);
   let closing = false;

package/dist/mjs/package.json

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

package/dist/mjs/personal/cli-entrypoint.mjs

@@ -0,0 +1,59 @@
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { promises as fs } from "node:fs";
+const PACKAGE_NAME = "@ricsam/r5dctl";
+function packageMain(moduleUrl) {
+  const module = fileURLToPath(moduleUrl);
+  return path.join(path.dirname(module), path.extname(module) === ".cjs" ? "main.cjs" : "main.mjs");
+}
+async function inspectPackage(candidate) {
+  const entrypoint = await fs.realpath(candidate);
+  const entrypointStat = await fs.lstat(entrypoint);
+  if (!entrypointStat.isFile() || entrypointStat.nlink !== 1 || entrypointStat.mode & 18 || ![0, process.getuid?.()].includes(entrypointStat.uid))
+    throw new Error("Untrusted installed r5dctl entrypoint");
+  let directory = path.dirname(entrypoint);
+  for (let depth = 0; depth < 6; depth += 1) {
+    const manifest = path.join(directory, "package.json");
+    try {
+      const stat = await fs.lstat(manifest);
+      if (!stat.isFile() || stat.nlink !== 1 || stat.mode & 18 || ![0, process.getuid?.()].includes(stat.uid))
+        throw new Error("Untrusted installed r5dctl package manifest");
+      const parsed = JSON.parse(await fs.readFile(manifest, "utf8"));
+      if (parsed?.name === PACKAGE_NAME) {
+        if (typeof parsed.version !== "string" || !/^\d+\.\d+\.\d+(?:-[a-zA-Z0-9.-]+)?$/.test(parsed.version))
+          throw new Error("Invalid installed r5dctl package version");
+        return { entrypoint, version: parsed.version };
+      }
+    } catch (error) {
+      if (error.code !== "ENOENT") throw error;
+    }
+    const parent = path.dirname(directory);
+    if (parent === directory) break;
+    directory = parent;
+  }
+  throw new Error("Resolved r5dctl entrypoint is not inside an @ricsam/r5dctl package");
+}
+async function resolvePersonalCliEntrypoint(explicit, workerVersion, dependencies = {}) {
+  let source, candidate;
+  if (explicit) {
+    source = "explicit";
+    candidate = explicit;
+  } else {
+    try {
+      const resolvePackage = dependencies.resolvePackage ?? ((specifier) => import.meta.resolve(specifier));
+      candidate = packageMain(resolvePackage(`${PACKAGE_NAME}/cli`));
+      source = "bundled";
+    } catch {
+      source = "path";
+      candidate = (dependencies.which ?? Bun.which)("r5dctl");
+    }
+  }
+  if (!candidate) throw new Error("Install @ricsam/r5dctl before starting this worker");
+  const inspected = await inspectPackage(candidate);
+  if (workerVersion !== "development" && inspected.version !== workerVersion)
+    throw new Error(`r5d-worker ${workerVersion} requires its bundled r5dctl ${workerVersion}; resolved ${inspected.version}`);
+  return { ...inspected, source };
+}
+export {
+  resolvePersonalCliEntrypoint
+};

package/dist/mjs/personal/client.mjs

@@ -1,5 +1,4 @@
 import path from "node:path";
-import { fileURLToPath } from "node:url";
 import os from "node:os";
 import { createHash, randomUUID } from "node:crypto";
 import { promises as fs, openSync, closeSync } from "node:fs";
@@ -7,9 +6,10 @@ import { Database } from "bun:sqlite";
 import { canonicalJson } from "@ricsam/r5d-api/runtime-protocol";
 import { privateDirectory, readPrivateJson } from "../runtime/storage.mjs";
 import { openPersonalWorkerRuntime, PersonalWorkerGrant } from "./runtime.mjs";
-import { installCliUpdate, readInstalledCliVersion } from "../cli-update.mjs";
+import { installCliUpdate } from "../cli-update.mjs";
 import { WorkspaceError } from "../runtime/workspace/contracts.mjs";
 import { PersonalActionScheduler } from "./action-scheduler.mjs";
+import { resolvePersonalCliEntrypoint } from "./cli-entrypoint.mjs";
 class PersonalResponseError extends Error {
   constructor(code, status, rejectedBeforeAdmission) {
     super(`Personal worker request failed (${status})`);
@@ -95,9 +95,11 @@ async function startPersonalWorker(options, version) {
     }
     return data;
   }
+  const cli = await resolvePersonalCliEntrypoint(options.cliEntrypoint, version);
   const metadata = () => ({
     version,
-    r5dctlVersion: readInstalledCliVersion("r5dctl"),
+    r5dctlVersion: cli.version,
+    r5dctlSource: cli.source,
     platform: process.platform,
     arch: process.arch,
     hostname: os.hostname(),
@@ -106,18 +108,9 @@ async function startPersonalWorker(options, version) {
   const grant = PersonalWorkerGrant.parse(
     await request("/api/personal/resources/register", { kind: "worker", ...identity, label: options.label, metadata: metadata() })
   );
-  let cliEntrypoint = options.cliEntrypoint ?? Bun.which("r5dctl");
-  if (!cliEntrypoint) {
-    try {
-      const module = fileURLToPath(import.meta.resolve("@ricsam/r5dctl/cli"));
-      cliEntrypoint = path.join(path.dirname(module), path.extname(module) === ".cjs" ? "main.cjs" : "main.mjs");
-    } catch {
-    }
-  }
-  if (!cliEntrypoint) throw new Error("Install @ricsam/r5dctl before starting this worker");
   const runtime = await openPersonalWorkerRuntime({
     root,
-    cliEntrypoint,
+    cliEntrypoint: cli.entrypoint,
     grant,
     storage: (sessionId) => async (storageRequest) => {
       try {

package/dist/types/personal/cli-entrypoint.d.ts

@@ -0,0 +1,13 @@
+type ResolutionDependencies = {
+    resolvePackage?: (specifier: string) => string;
+    which?: (command: string) => string | null;
+};
+export type PersonalCliEntrypoint = {
+    entrypoint: string;
+    version: string;
+    source: "explicit" | "bundled" | "path";
+};
+/** Resolve the CLI that agent shells receive. Published workers always prefer
+ * their exact npm dependency; PATH is only a development/source fallback. */
+export declare function resolvePersonalCliEntrypoint(explicit: string | undefined, workerVersion: string, dependencies?: ResolutionDependencies): Promise<PersonalCliEntrypoint>;
+export {};

package/package.json

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