@ricsam/r5d-worker 0.0.155 → 0.0.156

package/dist/cjs/package.json

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

package/dist/mjs/internal-r5dctl.cjs

@@ -20605,7 +20605,7 @@ function resolveEntrypointPath(entrypoint) {
   }
 }
 function getR5dctlVersion() {
-  if (true) return "0.0.155";
+  if (true) return "0.0.156";
   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.155" : "development"}`);
+  console.log(`r5d-worker ${true ? "0.0.156" : "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.155" : "development"
+    true ? "0.0.156" : "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.155",
+  "version": "0.0.156",
   "type": "module"
 }

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

@@ -781,7 +781,7 @@ class WorkspaceAuthority {
       return result;
     });
   }
-  async installGitPolicy(b, head, initialVisibleHead = b.config.baseCommitHash ?? head) {
+  async installGitPolicy(b, head, initialVisibleHead = b.config.baseCommitHash ?? head, remoteTrackingHead = b.config.baseCommitHash) {
     delete b.state.publishedMetadata;
     if (this.linkedWorkbench(b)) {
       const destination2 = path.join(b.config.cwd, ".git");
@@ -809,8 +809,8 @@ class WorkspaceAuthority {
         await git(b.repo, ["config", "--local", "--remove-section", "remote.canonical"]);
       await git(b.repo, ["config", "--local", "--replace-all", `branch.${b.config.branch}.remote`, "origin"]);
       await git(b.repo, ["config", "--local", "--replace-all", `branch.${b.config.branch}.merge`, `refs/heads/${b.config.branch}`]);
-      if (b.config.baseCommitHash)
-        await git(b.repo, ["update-ref", `refs/remotes/origin/${b.config.branch}`, b.config.baseCommitHash]);
+      if (remoteTrackingHead)
+        await git(b.repo, ["update-ref", `refs/remotes/origin/${b.config.branch}`, remoteTrackingHead]);
       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]);
@@ -980,7 +980,7 @@ class WorkspaceAuthority {
     return this.serial(b, () => this.productAction(b, input.id, { method: "import", url: input.url, branch: input.defaultBranch }, async () => {
       await git(b.repo, ["-c", "protocol.https.allow=always", "fetch", "--no-tags", "--no-recurse-submodules", "--", input.url, `refs/heads/${input.defaultBranch}`], void 0, void 0, { token: input.token });
       const head = GitOid.parse((await git(b.repo, ["rev-parse", "FETCH_HEAD"])).toString().trim());
-      return this.importCommit(b, head, input.id, identity);
+      return this.importCommit(b, head, input.id, identity, head);
     }, async () => {
       await this.assertAvailable(b);
       if (b.state.initialized || (await fs.readdir(b.config.cwd)).length) throw new WorkspaceError("nonempty_workbench", "Import requires a new empty workbench");
@@ -1028,7 +1028,7 @@ class WorkspaceAuthority {
       if (target.state.initialized || (await fs.readdir(target.config.cwd)).length) throw new WorkspaceError("nonempty_workbench", "Branch already has a workbench");
     }));
   }
-  async importCommit(b, head, id, identity) {
+  async importCommit(b, head, id, identity, remoteTrackingHead) {
     const visibleHead = b.config.baseCommitHash ?? head;
     const entries = await selectedTree(b.repo, head);
     const staged = path.join(b.directory, `import-${randomUUID()}`);
@@ -1073,7 +1073,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, visibleHead);
+    await this.installGitPolicy(b, head, visibleHead, remoteTrackingHead);
     b.state.initialized = true;
     b.state.head = head;
     b.state.blocked = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.155",
+  "version": "0.0.156",
   "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.155",
+    "@ricsam/r5d-api": "^0.0.156",
     "node-pty": "1.1.0",
     "zod": "^4.1.13",
     "picomatch": "^4.0.3"