@ricsam/r5d-worker 0.0.152 → 0.0.154

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.152" : "development"}`);
+  console.log(`r5d-worker ${true ? "0.0.154" : "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.152" : "development"
+    true ? "0.0.154" : "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.152",
+  "version": "0.0.154",
   "type": "module"
 }

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

@@ -6,6 +6,16 @@ function packageMain(moduleUrl) {
   const module = fileURLToPath(moduleUrl);
   return path.join(path.dirname(module), path.extname(module) === ".cjs" ? "main.cjs" : "main.mjs");
 }
+function internalMain(moduleUrl) {
+  return path.join(path.dirname(fileURLToPath(moduleUrl)), "..", "internal-r5dctl.cjs");
+}
+async function inspectInternal(candidate) {
+  const entrypoint = await fs.realpath(candidate);
+  const stat = await fs.lstat(entrypoint);
+  if (!stat.isFile() || stat.nlink !== 1 || stat.mode & 2 || ![0, process.getuid?.()].includes(stat.uid))
+    throw new Error("Untrusted internal r5dctl entrypoint");
+  return entrypoint;
+}
 async function inspectPackage(candidate) {
   const entrypoint = await fs.realpath(candidate);
   const entrypointStat = await fs.lstat(entrypoint);
@@ -39,13 +49,19 @@ async function resolvePersonalCliEntrypoint(explicit, workerVersion, dependencie
     source = "explicit";
     candidate = explicit;
   } else {
+    const bundled = dependencies.bundled ?? internalMain(import.meta.url);
     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");
+      return { entrypoint: await inspectInternal(bundled), version: workerVersion, source: "bundled" };
+    } catch (error) {
+      if (error.code !== "ENOENT" || workerVersion !== "development") throw error;
+      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");

package/dist/mjs/personal/runtime.mjs

@@ -12,7 +12,7 @@ import { privateDirectory, readPrivateJson } from "../runtime/storage.mjs";
 import { WorkspaceAuthority } from "../runtime/workspace/authority.mjs";
 import { ApprovedWorkbench, WorkspaceError } from "../runtime/workspace/contracts.mjs";
 import { WorkspaceStorageClient } from "../runtime/workspace/storage-client.mjs";
-import { BranchName, StorageId } from "../runtime/workspace/storage-wire.mjs";
+import { BranchName, GitOid, StorageId } from "../runtime/workspace/storage-wire.mjs";
 const PersonalWorkerGrant = z.object({
   installationId: RuntimeId,
   userId: RuntimeId,
@@ -30,7 +30,8 @@ const Workbench = z.object({
   sessionId: RuntimeId,
   rootProfile: z.enum(["account", "project"]).default("project"),
   namespace: z.string().regex(/^[A-Za-z0-9][A-Za-z0-9._-]{0,99}$/).optional(),
-  projectName: z.string().regex(/^[A-Za-z0-9][A-Za-z0-9._-]{0,99}$/).optional()
+  projectName: z.string().regex(/^[A-Za-z0-9][A-Za-z0-9._-]{0,99}$/).optional(),
+  baseCommitHash: GitOid.optional()
 }).strict();
 const PersonalWorkspaceRequest = z.object({
   protocol: z.literal(1),
@@ -105,12 +106,13 @@ async function openPersonalWorkerRuntime(options) {
     let cliDirectory;
     if (options.cliEntrypoint) {
       const cli = await fs.realpath(options.cliEntrypoint), executable = await fs.realpath(process.execPath), stat = await fs.lstat(cli);
-      if (!stat.isFile() || stat.mode & 18 || ![0, process.getuid?.()].includes(stat.uid))
+      if (!stat.isFile() || stat.nlink !== 1 || stat.mode & 2 || ![0, process.getuid?.()].includes(stat.uid))
         throw new Error("Untrusted installed r5dctl entrypoint");
       cliDirectory = path.join(root, "bin");
       privateDirectory(cliDirectory);
       const quote = (value) => "'" + value.replace(/'/g, "'\\''") + "'";
       const wrapper = `#!/bin/sh
+export BUN_RUNTIME_TRANSPILER_CACHE_PATH=0
 exec ${quote(executable)} ${quote(cli)} "$@"
 `;
       const file = path.join(cliDirectory, "r5dctl"), temporary = `${file}.${randomBytes(8).toString("hex")}.next`;
@@ -212,7 +214,7 @@ exec ${quote(executable)} ${quote(cli)} "$@"
       });
       const previous = manifests.get(input.id);
       const stable = (value) => {
-        const { sessionId: _sessionId, sharedSessionId: _sharedSessionId, ...binding } = value;
+        const { sessionId: _sessionId, sharedSessionId: _sharedSessionId, baseCommitHash: _baseCommitHash, ...binding } = value;
         return binding;
       };
       if (previous && canonicalJson(stable(previous)) !== canonicalJson(stable(row))) throw new Error("Personal workbench identity changed");

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

@@ -30,6 +30,7 @@ import {
   sourceBytes,
   verifyIgnore
 } from "./files.mjs";
+const GITHUB_CREDENTIAL_HELPER = '!f() { if [ "$1" = get ] && [ -n "$R5D_GIT_CREDENTIAL" ]; then git credential-store --file="$R5D_GIT_CREDENTIAL" get; else return 0; fi; }; f';
 class WorkspaceAuthority {
   constructor(options) {
     this.options = options;
@@ -54,7 +55,7 @@ class WorkspaceAuthority {
     return path.join(workspaceRoot, "workbenches", config.id);
   }
   stableBinding(config) {
-    const { sessionId: _sessionId, sharedSessionId: _sharedSessionId, ...binding } = config;
+    const { sessionId: _sessionId, sharedSessionId: _sharedSessionId, baseCommitHash: _baseCommitHash, ...binding } = config;
     return binding;
   }
   repositoryPath(config, directory) {
@@ -99,6 +100,9 @@ class WorkspaceAuthority {
       throw new WorkspaceError("invalid_config", "Project checkout is missing its GitHub repository identity");
     return `https://github.com/${b.config.namespace}/${b.config.projectName}.git`;
   }
+  canonicalRef(b) {
+    return `refs/r5d/canonical/${b.config.branch}`;
+  }
   resolveHostPath(value) {
     const expanded = value === "~" ? os.homedir() : value.startsWith("~/") ? path.join(os.homedir(), value.slice(2)) : value;
     if (!path.isAbsolute(expanded) || expanded.includes("\0")) throw new WorkspaceError("unsafe_path", "Host path must be absolute or home-relative");
@@ -443,8 +447,9 @@ class WorkspaceAuthority {
       throw new WorkspaceError("dirty_workbench", "Source differs from its canonical base; preserve and publish or reconcile edits first");
     if (this.linkedWorkbench(b)) {
       const localHead2 = (await git(b.config.cwd, ["rev-parse", "HEAD"])).toString().trim();
-      if (localHead2 !== expectedBase || (await git(b.config.cwd, ["write-tree"])).toString().trim() !== expectedTree)
-        throw new WorkspaceError("dirty_workbench", "Local branch or index changed; preserve and reconcile it before refreshing");
+      const localTree = (await git(b.repo, ["rev-parse", `${localHead2}^{tree}`])).toString().trim();
+      if ((await git(b.config.cwd, ["write-tree"])).toString().trim() !== localTree)
+        throw new WorkspaceError("dirty_workbench", "Staged Git changes are retained; preserve or reconcile them before refreshing");
       return;
     }
     const metadata = path.join(b.config.cwd, ".git");
@@ -565,8 +570,9 @@ class WorkspaceAuthority {
       await this.installGitPolicy(b, head);
     } else if (this.linkedWorkbench(b)) {
       await this.cleanRefreshBase(b, expectedBase);
-      await git(b.repo, ["update-ref", `refs/heads/${b.config.branch}`, head, expectedBase]);
+      const visibleHead = (await git(b.config.cwd, ["rev-parse", "HEAD"])).toString().trim();
       await git(b.config.cwd, ["reset", "--hard", head]);
+      await git(b.config.cwd, ["reset", "--mixed", visibleHead]);
       await fs.rm(staged, { recursive: true });
     } else {
       await this.cleanRefreshBase(b, expectedBase);
@@ -775,7 +781,7 @@ class WorkspaceAuthority {
       return result;
     });
   }
-  async installGitPolicy(b, head) {
+  async installGitPolicy(b, head, initialVisibleHead = b.config.baseCommitHash ?? head) {
     delete b.state.publishedMetadata;
     if (this.linkedWorkbench(b)) {
       const destination2 = path.join(b.config.cwd, ".git");
@@ -783,10 +789,17 @@ class WorkspaceAuthority {
         if (error.code === "ENOENT") return false;
         throw error;
       });
-      await git(b.repo, ["update-ref", `refs/heads/${b.config.branch}`, head]);
+      await git(b.repo, ["update-ref", this.canonicalRef(b), head]);
       if (!exists) {
         if ((await fs.readdir(b.config.cwd)).length) throw new WorkspaceError("nonempty_workbench", "Linked worktree destination must be empty");
+        const visibleHead = initialVisibleHead;
+        await git(b.repo, ["cat-file", "-e", `${visibleHead}^{commit}`]);
+        await git(b.repo, ["update-ref", `refs/heads/${b.config.branch}`, visibleHead]);
         await git(b.repo, ["worktree", "add", "--force", b.config.cwd, b.config.branch]);
+        if (visibleHead !== head) {
+          await git(b.config.cwd, ["reset", "--hard", head]);
+          await git(b.config.cwd, ["reset", "--mixed", visibleHead]);
+        }
       }
       const origin = this.githubOrigin(b);
       await git(b.repo, ["config", "--local", "--replace-all", "remote.origin.url", origin]);
@@ -798,6 +811,7 @@ class WorkspaceAuthority {
       await git(b.repo, ["config", "--local", "--replace-all", `branch.${b.config.branch}.merge`, `refs/heads/${b.config.branch}`]);
       await git(b.repo, ["config", "--local", "--replace-all", "push.default", "upstream"]);
       await git(b.repo, ["config", "--local", "--replace-all", "credential.helper", ""]);
+      await git(b.repo, ["config", "--local", "--add", "credential.helper", GITHUB_CREDENTIAL_HELPER]);
       await git(b.repo, ["config", "--local", "--replace-all", "credential.useHttpPath", "false"]);
       await git(b.repo, ["config", "protocol.allow", "never"]);
       await git(b.repo, ["config", "protocol.https.allow", "always"]);
@@ -1013,6 +1027,7 @@ class WorkspaceAuthority {
     }));
   }
   async importCommit(b, head, id, identity) {
+    const visibleHead = b.config.baseCommitHash ?? head;
     const entries = await selectedTree(b.repo, head);
     const staged = path.join(b.directory, `import-${randomUUID()}`);
     await fs.mkdir(staged, { mode: 448 });
@@ -1042,9 +1057,9 @@ ${DEFAULT_WORKSPACE_IGNORE}`, { mode: 384 });
       existing = { head: null };
     }
     if (existing.head) throw new WorkspaceError("conflict", "Branch already exists in canonical storage");
-    await git(b.repo, ["update-ref", `refs/heads/${b.config.branch}`, head]);
+    await git(b.repo, ["update-ref", this.canonicalRef(b), head]);
     const file = path.join(b.directory, `publish-${randomUUID()}.bundle`);
-    await git(b.repo, ["bundle", "create", file, `refs/heads/${b.config.branch}`]);
+    await git(b.repo, ["bundle", "create", file, this.canonicalRef(b)]);
     const bytes = await readRegular(file, STORAGE_LIMITS.blobBytes), blobId = operationId;
     b.state.blocked = { code: "publication_unknown", operationId, commit: head, message: "Inspect the original import publication receipt" };
     await this.save(b);
@@ -1056,7 +1071,7 @@ ${DEFAULT_WORKSPACE_IGNORE}`, { mode: 384 });
     if (result.head !== head) throw new WorkspaceError("invalid_receipt", "Import receipt does not match selected commit");
     if (this.linkedWorkbench(b)) await fs.rm(staged, { recursive: true });
     else for (const name of await fs.readdir(staged)) await fs.rename(path.join(staged, name), path.join(b.config.cwd, name));
-    await this.installGitPolicy(b, head);
+    await this.installGitPolicy(b, head, visibleHead);
     b.state.initialized = true;
     b.state.head = head;
     b.state.blocked = null;
@@ -1069,7 +1084,6 @@ ${DEFAULT_WORKSPACE_IGNORE}`, { mode: 384 });
     return this.serial(b, () => this.productAction(b, input.id, { method: "commit", expectedHead: input.expectedHead, message: input.message }, async () => {
       const result = await this.publishIdle(b, identity, input.message);
       if (this.linkedWorkbench(b)) {
-        await git(b.config.cwd, ["reset", "--mixed", result.head]);
         return { ...result, treeHash: (await git(b.repo, ["rev-parse", `${result.head}^{tree}`])).toString().trim() };
       }
       const metadata = path.join(b.config.cwd, ".git");
@@ -1180,9 +1194,9 @@ ${DEFAULT_WORKSPACE_IGNORE}`, { mode: 384 });
       return { head: b.state.head, unchanged: true };
     const commit = (await git(b.repo, ["commit-tree", tree, ...b.state.head ? ["-p", b.state.head] : []], `${message}
 `)).toString().trim();
-    await git(b.repo, ["update-ref", `refs/heads/${b.config.branch}`, commit]);
+    await git(b.repo, ["update-ref", this.canonicalRef(b), commit]);
     const bundleFile = path.join(b.directory, `${randomUUID()}.bundle`);
-    await git(b.repo, ["bundle", "create", bundleFile, `refs/heads/${b.config.branch}`]);
+    await git(b.repo, ["bundle", "create", bundleFile, this.canonicalRef(b)]);
     const bytes = await readRegular(bundleFile, STORAGE_LIMITS.blobBytes);
     const operationId = `ws-${randomUUID()}`, blobId = `ws-${randomUUID()}`;
     try {
@@ -1236,10 +1250,6 @@ ${DEFAULT_WORKSPACE_IGNORE}`, { mode: 384 });
     });
     if (result.head !== commit)
       throw new WorkspaceError("invalid_response", "Publication receipt head mismatch; inspect original operation");
-    if (this.linkedWorkbench(b) && await fs.lstat(path.join(b.config.cwd, ".git")).then(() => true, (error) => {
-      if (error.code === "ENOENT") return false;
-      throw error;
-    })) await git(b.config.cwd, ["reset", "--mixed", commit]);
     b.state.head = commit;
     b.state.blocked = null;
     await this.save(b);

package/dist/mjs/runtime/workspace/contracts.mjs

@@ -1,7 +1,7 @@
 import path from "node:path";
 import { z } from "zod";
 import { RuntimeId } from "@ricsam/r5d-api/runtime-protocol";
-import { BranchName, StorageId } from "./storage-wire.mjs";
+import { BranchName, GitOid, StorageId } from "./storage-wire.mjs";
 const ApprovedWorkbench = z.object({
   id: StorageId,
   userId: RuntimeId,
@@ -13,6 +13,8 @@ const ApprovedWorkbench = z.object({
   rootProfile: z.enum(["account", "project"]).default("project"),
   namespace: z.string().regex(/^[A-Za-z0-9][A-Za-z0-9._-]{0,99}$/).optional(),
   projectName: z.string().regex(/^[A-Za-z0-9][A-Za-z0-9._-]{0,99}$/).optional(),
+  /** GitHub/local branch tip; canonical workspace snapshots never replace it. */
+  baseCommitHash: GitOid.optional(),
   // Supervisor-owned exact argv approvals, NOT an agent-supplied read-only flag.
   // Approved servers must keep generated/cache files ignored and never write source.
   nonmutatingArgv: z.array(z.array(z.string()).min(1)).max(20).default([])
@@ -50,6 +52,7 @@ dist/
 build/
 coverage/
 .cache/
+.bun/
 *.pem
 *.key
 `;

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

@@ -1,4 +1,5 @@
 type ResolutionDependencies = {
+    bundled?: string;
     resolvePackage?: (specifier: string) => string;
     which?: (command: string) => string | null;
 };

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

@@ -52,6 +52,7 @@ export declare const PersonalWorkspaceRequest: z.ZodObject<{
         }>>;
         namespace: z.ZodOptional<z.ZodString>;
         projectName: z.ZodOptional<z.ZodString>;
+        baseCommitHash: z.ZodOptional<z.ZodString>;
     }, z.core.$strict>;
     sourceWorkbench: z.ZodOptional<z.ZodObject<{
         id: z.ZodString;
@@ -64,6 +65,7 @@ export declare const PersonalWorkspaceRequest: z.ZodObject<{
         }>>;
         namespace: z.ZodOptional<z.ZodString>;
         projectName: z.ZodOptional<z.ZodString>;
+        baseCommitHash: z.ZodOptional<z.ZodString>;
     }, z.core.$strict>>;
     sharedWorkbenches: z.ZodOptional<z.ZodArray<z.ZodObject<{
         id: z.ZodString;
@@ -76,6 +78,7 @@ export declare const PersonalWorkspaceRequest: z.ZodObject<{
         }>>;
         namespace: z.ZodOptional<z.ZodString>;
         projectName: z.ZodOptional<z.ZodString>;
+        baseCommitHash: z.ZodOptional<z.ZodString>;
     }, z.core.$strict>>>;
     kind: z.ZodEnum<{
         inspect: "inspect";

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

@@ -34,6 +34,7 @@ export declare class WorkspaceAuthority {
     private assertNonOverlappingCheckout;
     private linkedWorkbench;
     private githubOrigin;
+    private canonicalRef;
     private resolveHostPath;
     static open(options: WorkspaceAuthorityOptions): Promise<WorkspaceAuthority>;
     private readonly registrations;
@@ -223,6 +224,7 @@ export declare class WorkspaceAuthority {
             sharedSessionId?: string | undefined;
             namespace?: string | undefined;
             projectName?: string | undefined;
+            baseCommitHash?: string | undefined;
         };
     }>;
     private cleanRefreshBase;

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

@@ -15,6 +15,7 @@ export declare const ApprovedWorkbench: z.ZodObject<{
     }>>;
     namespace: z.ZodOptional<z.ZodString>;
     projectName: z.ZodOptional<z.ZodString>;
+    baseCommitHash: z.ZodOptional<z.ZodString>;
     nonmutatingArgv: z.ZodDefault<z.ZodArray<z.ZodArray<z.ZodString>>>;
 }, z.core.$strict>;
 export type ApprovedWorkbench = z.input<typeof ApprovedWorkbench>;
@@ -36,6 +37,7 @@ export declare const WorkspaceConfig: z.ZodObject<{
         }>>;
         namespace: z.ZodOptional<z.ZodString>;
         projectName: z.ZodOptional<z.ZodString>;
+        baseCommitHash: z.ZodOptional<z.ZodString>;
         nonmutatingArgv: z.ZodDefault<z.ZodArray<z.ZodArray<z.ZodString>>>;
     }, z.core.$strict>>;
     dynamicWorkbenches: z.ZodOptional<z.ZodBoolean>;
@@ -85,4 +87,4 @@ export type WorkspaceState = {
         completedAt?: string;
     }>;
 };
-export declare const DEFAULT_WORKSPACE_IGNORE = "# Required destination workbench exclusions; keep these rules effective.\n.env\n.env.*\n!.env.example\nnode_modules/\n.r5d/\n.r5d-next/\n.ssh/\n.kube/\nsecrets/\ncredentials/\n.next/\ndist/\nbuild/\ncoverage/\n.cache/\n*.pem\n*.key\n";
+export declare const DEFAULT_WORKSPACE_IGNORE = "# Required destination workbench exclusions; keep these rules effective.\n.env\n.env.*\n!.env.example\nnode_modules/\n.r5d/\n.r5d-next/\n.ssh/\n.kube/\nsecrets/\ncredentials/\n.next/\ndist/\nbuild/\ncoverage/\n.cache/\n.bun/\n*.pem\n*.key\n";

package/package.json

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