@ricsam/r5d-worker 0.0.163 → 0.0.164

package/dist/cjs/package.json

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

package/dist/mjs/internal-r5dctl.cjs

@@ -20605,7 +20605,7 @@ function resolveEntrypointPath(entrypoint) {
   }
 }
 function getR5dctlVersion() {
-  if (true) return "0.0.163";
+  if (true) return "0.0.164";
   const entrypoint = process.argv[1] ? resolveEntrypointPath(process.argv[1]) : null;
   let current = entrypoint ? import_node_path2.default.dirname(entrypoint) : process.cwd();
   for (let index = 0; index < 12; index += 1) {

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

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

@@ -22,7 +22,7 @@ import {
   gitResult,
   materializeTree,
   noSymlinkAncestors,
-  PLATFORM_COMMIT_EMAIL,
+  PLATFORM_COMMIT_EMAILS,
   privateRoot,
   PROJECT_COMMIT_IDENTITY,
   readHostRegular,
@@ -1251,7 +1251,8 @@ class WorkspaceAuthority {
    * GitHub tip. Hydration peels them so a checkout's history is its own. */
   async platformSnapshot(repo, commit) {
     const header = (await git(repo, ["cat-file", "commit", commit])).toString("utf8").split("\n\n")[0] ?? "";
-    return /^committer .*<workspace@invalid>/m.test(header.replace(PLATFORM_COMMIT_EMAIL, "workspace@invalid"));
+    const committer = /^committer .*<([^>]+)>/m.exec(header)?.[1];
+    return committer !== void 0 && PLATFORM_COMMIT_EMAILS.includes(committer);
   }
   async firstParent(repo, commit) {
     const parents = (await git(repo, ["rev-list", "--parents", "-n", "1", commit])).toString("utf8").trim().split(/\s+/).slice(1);
@@ -1347,11 +1348,18 @@ class WorkspaceAuthority {
     const storage = await this.options.accountStorage(userId);
     const repositoryId = this.accountRepositoryId(userId);
     if (state.blocked?.code === "publication_unknown") {
-      const receipt = await storage.read({ method: "operation.get", lookupId: state.blocked.operationId });
-      if (receipt.state !== "completed" || receipt.result?.head !== state.blocked.commit)
-        throw new WorkspaceError("publication_unknown", "Original workspace publication not proven completed; preserve state for operator review");
-      state.publishedHead = state.blocked.commit;
-      state.head = state.blocked.commit;
+      const { operationId: operationId2, commit } = state.blocked;
+      const receipt = await storage.read({ method: "operation.get", lookupId: operationId2 }).catch((error) => {
+        if (error instanceof WorkspaceError && error.code === "not_found") return null;
+        throw error;
+      });
+      if (receipt?.state === "completed" && receipt.result?.head !== commit)
+        throw new WorkspaceError("invalid_state", "Workspace publication receipt names another head; maintenance required");
+      const published = receipt?.state === "completed" || await this.remoteHead(storage, repositoryId, OUTER_BRANCH) === commit;
+      if (published) {
+        state.publishedHead = commit;
+        state.head = commit;
+      }
       state.blocked = null;
       await this.saveOuter(state);
     }
@@ -1466,7 +1474,7 @@ class WorkspaceAuthority {
       if (error instanceof WorkspaceError && error.rejectedBeforeAdmission) {
         state.blocked = null;
         await this.saveOuter(state);
-        throw new WorkspaceError("mirror_advanced", "The workspace mirror advanced during publication; retried next cycle", true);
+        throw error.code === "conflict" ? new WorkspaceError("mirror_advanced", "The workspace mirror advanced during publication; retried next cycle", true) : error;
       }
       throw error;
     }

package/dist/mjs/runtime/workspace/files.mjs

@@ -100,7 +100,8 @@ async function durableJson(file, value) {
     await dir.close();
   }
 }
-const PLATFORM_COMMIT_EMAIL = "workspace@invalid";
+const PLATFORM_COMMIT_EMAILS = ["workspace@invalid", "migration@r5d.dev"];
+const PLATFORM_COMMIT_EMAIL = PLATFORM_COMMIT_EMAILS[0];
 const PROJECT_COMMIT_IDENTITY = {
   GIT_AUTHOR_NAME: "r5d",
   GIT_AUTHOR_EMAIL: "workspace@r5d.dev",
@@ -439,6 +440,7 @@ async function snapshotTree(repo, cwd, canonicalHead, maxBytes = 128 * 1024 * 10
 }
 export {
   PLATFORM_COMMIT_EMAIL,
+  PLATFORM_COMMIT_EMAILS,
   PROJECT_COMMIT_IDENTITY,
   WORKBENCH_CONFLICT_CODES,
   WORKBENCH_OPERATION_MARKERS,

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

@@ -26,8 +26,11 @@ export type GitOptions = {
      * the platform's: the platform identity marks snapshots that hydration peels. */
     env?: Record<string, string>;
 };
-/** Committer of platform-authored snapshot commits, recognised by hydration. */
-export declare const PLATFORM_COMMIT_EMAIL = "workspace@invalid";
+/** Committers of platform-authored history that hydration peels so a checkout's
+ * history is its own: per-project snapshots, and the one-time legacy import
+ * (`scripts/migration/import-project-files.ts`) that seeded canonical storage. */
+export declare const PLATFORM_COMMIT_EMAILS: readonly string[];
+export declare const PLATFORM_COMMIT_EMAIL: string;
 /** Identity of commits made in a project's own history on the user's behalf. */
 export declare const PROJECT_COMMIT_IDENTITY: {
     readonly GIT_AUTHOR_NAME: "r5d";

package/package.json

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