@ricsam/r5d-worker 0.0.101 → 0.0.104

package/dist/mjs/package.json

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

package/dist/mjs/project-mirror-fetch-policy.mjs

@@ -1,16 +1,56 @@
-const PROJECT_MIRROR_FETCH_BACKSTOP_MS = 10 * 6e4;
 function projectMirrorFetchDecision(input) {
   if (!input.skippingEnabled) return { fetch: true, reason: "skipping_disabled" };
   if (input.advertisedToken === void 0) return { fetch: true, reason: "no_advertised_token" };
   if (input.fetchedToken === void 0) return { fetch: true, reason: "never_fetched" };
   if (input.advertisedToken !== input.fetchedToken) return { fetch: true, reason: "token_changed" };
-  const backstopMs = input.backstopMs ?? PROJECT_MIRROR_FETCH_BACKSTOP_MS;
-  if (input.lastFetchAtMs === void 0 || input.nowMs - input.lastFetchAtMs >= backstopMs) {
-    return { fetch: true, reason: "backstop_elapsed" };
-  }
   return { fetch: false, reason: "token_match" };
 }
+function planProjectMirrorObservationFetch(input) {
+  if (!input.skippingEnabled) return { scope: "project", reason: "skipping_disabled" };
+  if (input.advertisedMountTokens === void 0) {
+    const decision = projectMirrorFetchDecision({
+      advertisedToken: input.advertisedProjectToken,
+      fetchedToken: input.fetchedProjectToken,
+      skippingEnabled: true
+    });
+    return decision.fetch ? { scope: "project", reason: decision.reason } : { scope: "none" };
+  }
+  const mounts = [];
+  for (const branchName of [...input.branchNames].sort()) {
+    const decision = projectMirrorFetchDecision({
+      advertisedToken: input.advertisedMountTokens.get(branchName),
+      fetchedToken: input.fetchedMountTokens.get(branchName),
+      skippingEnabled: true
+    });
+    if (decision.fetch) mounts.push({ branchName, reason: decision.reason });
+  }
+  return mounts.length === 0 ? { scope: "none" } : { scope: "mounts", mounts };
+}
+const TOKEN_RE = /^[0-9a-f]{64}$/;
+const GIT_OBJECT_NAME_RE = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/;
+function parseProjectMirrorRefsTokensMessage(message) {
+  const projectTokens = /* @__PURE__ */ new Map();
+  if (message.tokens && typeof message.tokens === "object") {
+    for (const [projectId, token] of Object.entries(message.tokens)) {
+      if (typeof token === "string" && TOKEN_RE.test(token)) projectTokens.set(projectId, token);
+    }
+  }
+  const mountTokens = /* @__PURE__ */ new Map();
+  if (message.mountTokens && typeof message.mountTokens === "object") {
+    for (const [projectId, tokensByBranch] of Object.entries(message.mountTokens)) {
+      if (!tokensByBranch || typeof tokensByBranch !== "object") continue;
+      const perMount = /* @__PURE__ */ new Map();
+      for (const [branchName, token] of Object.entries(tokensByBranch)) {
+        if (typeof token === "string" && TOKEN_RE.test(token)) perMount.set(branchName, token);
+      }
+      mountTokens.set(projectId, perMount);
+    }
+  }
+  const workspaceHead = typeof message.workspaceHead === "string" && GIT_OBJECT_NAME_RE.test(message.workspaceHead) ? message.workspaceHead : void 0;
+  return { projectTokens, mountTokens, workspaceHead };
+}
 export {
-  PROJECT_MIRROR_FETCH_BACKSTOP_MS,
+  parseProjectMirrorRefsTokensMessage,
+  planProjectMirrorObservationFetch,
   projectMirrorFetchDecision
 };

package/dist/mjs/project-mirror-refs-token.mjs

@@ -1,10 +1,24 @@
 import { createHash } from "node:crypto";
+const PROJECT_MIRROR_REFS_TOKEN_NAMESPACES = ["refs/heads/", "refs/r5d/server-synced/"];
 const PROJECT_MIRROR_REF_PREFIX = "refs/r5d/mirror/";
 const PROJECT_SERVER_SYNCED_REF_PREFIX = "refs/r5d/server-synced/";
+const PROJECT_MIRROR_REF_LISTING_FORMAT = "--format=%(objectname) %(refname)";
+const GIT_OBJECT_NAME_RE = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/;
 function hashProjectMirrorRefs(refs) {
   const lines = refs.map(({ objectName, refname }) => `${objectName} ${refname}`).sort((left, right) => left < right ? -1 : left > right ? 1 : 0);
   return createHash("sha256").update(lines.join("\n")).digest("hex");
 }
+function parseProjectMirrorRefListing(output, options = {}) {
+  return output.split(/\r?\n/).filter(Boolean).map((row) => {
+    const separator = row.indexOf(" ");
+    const objectName = separator < 0 ? "" : row.slice(0, separator);
+    const refname = separator < 0 ? "" : row.slice(separator + 1);
+    if (!GIT_OBJECT_NAME_RE.test(objectName) || refname.length === 0 || options.namespaces !== void 0 && !options.namespaces.some((prefix) => refname.startsWith(prefix))) {
+      throw new Error(`Invalid ref listing row: ${row}`);
+    }
+    return { refname, objectName };
+  });
+}
 function canonicalizeLocalProjectMirrorRefs(refs) {
   const canonical = [];
   for (const { refname, objectName } of refs) {
@@ -16,9 +30,24 @@ function canonicalizeLocalProjectMirrorRefs(refs) {
   }
   return canonical;
 }
+function projectMirrorMountRefs(refs, mount) {
+  const headRef = `refs/heads/${mount.branchName}`;
+  const handoffPrefix = `${PROJECT_SERVER_SYNCED_REF_PREFIX}${mount.branchId}/`;
+  return refs.filter(({ refname }) => refname === headRef || refname.startsWith(handoffPrefix));
+}
+function projectMirrorRefsTokens(refs, mounts) {
+  const mountTokens = /* @__PURE__ */ new Map();
+  for (const mount of mounts) mountTokens.set(mount.branchName, hashProjectMirrorRefs(projectMirrorMountRefs(refs, mount)));
+  return { project: hashProjectMirrorRefs(refs), mounts: mountTokens };
+}
 export {
+  PROJECT_MIRROR_REFS_TOKEN_NAMESPACES,
+  PROJECT_MIRROR_REF_LISTING_FORMAT,
   PROJECT_MIRROR_REF_PREFIX,
   PROJECT_SERVER_SYNCED_REF_PREFIX,
   canonicalizeLocalProjectMirrorRefs,
-  hashProjectMirrorRefs
+  hashProjectMirrorRefs,
+  parseProjectMirrorRefListing,
+  projectMirrorMountRefs,
+  projectMirrorRefsTokens
 };

package/dist/mjs/project-worktrees.mjs

@@ -6,9 +6,11 @@ import { gitCredentialUsernameConfigKey, gitTransportSecurityArgs, workerGitProc
 import { validateManagedBranchName } from "./managed-paths.mjs";
 import {
   canonicalizeLocalProjectMirrorRefs,
-  hashProjectMirrorRefs,
+  parseProjectMirrorRefListing,
+  PROJECT_MIRROR_REF_LISTING_FORMAT,
   PROJECT_MIRROR_REF_PREFIX,
-  PROJECT_SERVER_SYNCED_REF_PREFIX
+  PROJECT_SERVER_SYNCED_REF_PREFIX,
+  projectMirrorRefsTokens
 } from "./project-mirror-refs-token.mjs";
 import { mirrorWorkingTree } from "./working-tree-mirror.mjs";
 const PROJECT_WORKTREE_SNAPSHOT_PREFIX = "r5d-project-worktrees-";
@@ -285,6 +287,8 @@ function normalizeSnapshotManifest(value) {
   if (record.state !== "building" && record.state !== "prepared" && record.state !== "restoring" && record.state !== "consumed") {
     throw new Error("Project worktree snapshot manifest has an invalid state");
   }
+  const scope = record.scope === void 0 ? "project" : record.scope;
+  if (scope !== "project" && scope !== "branches") throw new Error("Project worktree snapshot manifest has an invalid scope");
   if (!Number.isSafeInteger(record.ownerProcessId) || record.ownerProcessId <= 0) {
     throw new Error("Project worktree snapshot manifest has an invalid owner process");
   }
@@ -320,6 +324,7 @@ function normalizeSnapshotManifest(value) {
   return {
     version: PROJECT_WORKTREE_SNAPSHOT_MANIFEST_VERSION,
     state: record.state,
+    scope,
     ownerProcessId: record.ownerProcessId,
     ownerSessionId: record.ownerSessionId,
     projectRoot: record.projectRoot,
@@ -356,7 +361,7 @@ function writeSnapshotManifest(snapshotRoot, manifest) {
   return readSnapshotManifest(snapshotRoot);
 }
 function assertSameSnapshotIdentity(expected, actual) {
-  if (expected.ownerProcessId !== actual.ownerProcessId || expected.ownerSessionId !== actual.ownerSessionId || expected.projectRoot !== actual.projectRoot || expected.createdAt !== actual.createdAt || JSON.stringify(expected.branches) !== JSON.stringify(actual.branches)) {
+  if (expected.scope !== actual.scope || expected.ownerProcessId !== actual.ownerProcessId || expected.ownerSessionId !== actual.ownerSessionId || expected.projectRoot !== actual.projectRoot || expected.createdAt !== actual.createdAt || JSON.stringify(expected.branches) !== JSON.stringify(actual.branches)) {
     throw new Error("Project worktree snapshot identity changed");
   }
 }
@@ -423,7 +428,7 @@ function assertNoOutstandingSnapshotForProject(temporaryRoot, projectRoot) {
     }
   }
 }
-function snapshotBranchTrees(projectRoot, branches, temporaryRoot, onProgress) {
+function snapshotBranchTrees(projectRoot, branches, temporaryRoot, onProgress, scope = "project") {
   const resolvedProjectRoot = path.resolve(projectRoot);
   const resolvedTemporaryRoot = path.resolve(temporaryRoot ?? os.tmpdir());
   assertNoOutstandingSnapshotForProject(resolvedTemporaryRoot, resolvedProjectRoot);
@@ -444,6 +449,7 @@ function snapshotBranchTrees(projectRoot, branches, temporaryRoot, onProgress) {
     let manifest = writeSnapshotManifest(root, {
       version: PROJECT_WORKTREE_SNAPSHOT_MANIFEST_VERSION,
       state: "building",
+      scope,
       ownerProcessId: process.pid,
       ownerSessionId: PROJECT_WORKTREE_SNAPSHOT_OWNER_SESSION_ID,
       projectRoot: resolvedProjectRoot,
@@ -550,7 +556,7 @@ function restoreProjectWorktreeSnapshot(snapshotRoot, manifest, onProgress) {
   const presentBranches = current.branches.filter(({ snapshotPresent }) => snapshotPresent);
   const destinationParent = path.dirname(current.projectRoot);
   fs.mkdirSync(destinationParent, { recursive: true });
-  const canMoveWholeSnapshot = presentBranches.length > 0 && (current.state === "restoring" || treesRootStat !== null && treesRootStat.dev === fs.lstatSync(destinationParent).dev);
+  const canMoveWholeSnapshot = current.scope === "project" && presentBranches.length > 0 && (current.state === "restoring" || treesRootStat !== null && treesRootStat.dev === fs.lstatSync(destinationParent).dev);
   if (canMoveWholeSnapshot) {
     if (current.state === "prepared") current = advanceSnapshotState(snapshotRoot, current, "restoring");
     onProgress?.({
@@ -641,8 +647,12 @@ function consumeAndRemoveProjectWorktreeSnapshot(snapshotRoot, manifest) {
   } catch {
   }
 }
-function persistReconciledProjectAndConsumeSnapshot(snapshot, afterProjectTreeFsync) {
-  fsyncTree(snapshot.manifest.projectRoot);
+function persistReconciledProjectAndConsumeSnapshot(snapshot, afterProjectTreeFsync, durabilityPaths) {
+  if (durabilityPaths) {
+    for (const durabilityPath of durabilityPaths) if (fs.existsSync(durabilityPath)) fsyncTree(durabilityPath);
+  } else {
+    fsyncTree(snapshot.manifest.projectRoot);
+  }
   fsyncManagedProjectRootEntry(snapshot.manifest.projectRoot);
   afterProjectTreeFsync?.();
   consumeAndRemoveProjectWorktreeSnapshot(snapshot.root, snapshot.manifest);
@@ -940,8 +950,10 @@ async function reconcileLinkedLayout(input) {
   await configureRepository({ ...input, primaryPath });
   await tryGitAsync(primaryPath, ["worktree", "prune"]);
   await fetchProjectHeads({ ...input, primaryPath });
+  const primaryCommonDir = await commonGitDirectoryAsync(primaryPath);
+  if (!primaryCommonDir) throw new Error("Primary project checkout is unavailable");
   const mirrorHeads = /* @__PURE__ */ new Map();
-  const mutatedBranches = /* @__PURE__ */ new Set();
+  const plan = [];
   for (const branch of input.branches) {
     const checkoutPath = branchPath(input.projectRoot, branch.branchName);
     const resolved = await seedForBranch({
@@ -951,24 +963,30 @@ async function reconcileLinkedLayout(input) {
       requireMirrorHead: input.exactMirrorBranches?.has(branch.branchName)
     });
     mirrorHeads.set(branch.branchName, resolved.mirrorHead);
-    if (branch.branchName === input.primaryBranchName || await commonGitDirectoryAsync(checkoutPath) === await commonGitDirectoryAsync(primaryPath)) {
-      const currentHead = await gitAsync(checkoutPath, ["rev-parse", "HEAD"], `resolve linked worktree head ${branch.branchName}`);
-      if (currentHead === resolved.seed) continue;
-      input.beforeDestructiveMutation();
-      mutatedBranches.add(branch.branchName);
-      await preserveHead(checkoutPath);
-      await gitAsync(checkoutPath, ["reset", "--hard", resolved.seed], `anchor linked worktree ${branch.branchName}`);
+    const linked = branch.branchName === input.primaryBranchName || gitDirectoryKind(checkoutPath) !== null && await commonGitDirectoryAsync(checkoutPath) === primaryCommonDir;
+    if (!linked) {
+      plan.push({ branchName: branch.branchName, checkoutPath, seed: resolved.seed, action: "recreate" });
       continue;
     }
-    input.beforeDestructiveMutation();
-    mutatedBranches.add(branch.branchName);
-    fs.rmSync(checkoutPath, { recursive: true, force: true });
-    await gitAsync(primaryPath, ["branch", "-f", branch.branchName, resolved.seed], `anchor project branch ${branch.branchName}`);
-    fs.mkdirSync(path.dirname(checkoutPath), { recursive: true });
+    const currentHead = await gitAsync(checkoutPath, ["rev-parse", "HEAD"], `resolve linked worktree head ${branch.branchName}`);
+    plan.push({ branchName: branch.branchName, checkoutPath, seed: resolved.seed, action: currentHead === resolved.seed ? "keep" : "reset" });
+  }
+  const mutatedBranches = new Set(plan.filter(({ action }) => action !== "keep").map(({ branchName }) => branchName));
+  if (mutatedBranches.size > 0) input.beforeDestructiveMutation(mutatedBranches);
+  for (const entry of plan) {
+    if (entry.action === "keep") continue;
+    if (entry.action === "reset") {
+      await preserveHead(entry.checkoutPath);
+      await gitAsync(entry.checkoutPath, ["reset", "--hard", entry.seed], `anchor linked worktree ${entry.branchName}`);
+      continue;
+    }
+    fs.rmSync(entry.checkoutPath, { recursive: true, force: true });
+    await gitAsync(primaryPath, ["branch", "-f", entry.branchName, entry.seed], `anchor project branch ${entry.branchName}`);
+    fs.mkdirSync(path.dirname(entry.checkoutPath), { recursive: true });
     await gitAsync(
       primaryPath,
-      ["worktree", "add", "--force", checkoutPath, branch.branchName],
-      `create linked worktree ${branch.branchName}`
+      ["worktree", "add", "--force", entry.checkoutPath, entry.branchName],
+      `create linked worktree ${entry.branchName}`
     );
   }
   return { mirrorHeads, mutatedBranches };
@@ -995,8 +1013,14 @@ async function ensureProjectWorktrees(input) {
   const snapshotStorageRoot = path.resolve(input.snapshotRoot ?? os.tmpdir());
   assertNoOutstandingSnapshotForProject(snapshotStorageRoot, projectRoot);
   let snapshot;
-  const ensureSnapshot = () => {
-    snapshot ??= snapshotBranchTrees(projectRoot, input.branches, snapshotStorageRoot, input.onSnapshotProgress);
+  const ensureSnapshot = (branchNames) => {
+    snapshot ??= snapshotBranchTrees(
+      projectRoot,
+      branchNames ? input.branches.filter(({ branchName }) => branchNames.has(branchName)) : input.branches,
+      snapshotStorageRoot,
+      input.onSnapshotProgress,
+      branchNames ? "branches" : "project"
+    );
     return snapshot;
   };
   try {
@@ -1048,7 +1072,21 @@ async function ensureProjectWorktrees(input) {
       });
     }
     states.sort((left, right) => left.branchName.localeCompare(right.branchName));
-    if (snapshot) persistReconciledProjectAndConsumeSnapshot(snapshot);
+    if (snapshot) {
+      const primaryGitDirectory = path.join(branchPath(projectRoot, input.primaryBranchName), ".git");
+      persistReconciledProjectAndConsumeSnapshot(
+        snapshot,
+        void 0,
+        snapshot.manifest.scope === "branches" ? [
+          ...snapshot.manifest.branches.map(({ branchName }) => branchPath(projectRoot, branchName)),
+          // Branch refs and worktree registrations moved in the shared
+          // administrative directory; objects are fsynced by git itself.
+          path.join(primaryGitDirectory, "refs"),
+          path.join(primaryGitDirectory, "packed-refs"),
+          path.join(primaryGitDirectory, "worktrees")
+        ] : void 0
+      );
+    }
     return states;
   } catch (error) {
     if (!snapshot) throw error;
@@ -1125,8 +1163,12 @@ function createLinkedProjectBranch(input) {
     );
     configureProjectBranchTracking(targetPath, input.branchName, input.branchName);
     assertNoSymlinkBranchPathComponents(input.projectRoot, targetPath);
-    git(targetPath, ["read-tree", sourceHead], `initialize linked worktree index ${input.branchName}`);
-    mirrorWorkingTree({ sourceRoot: sourcePath, targetRoot: targetPath, sourceMode: "git", deletionMode: "git" });
+    if (input.workingTree === "carry") {
+      git(targetPath, ["read-tree", sourceHead], `initialize linked worktree index ${input.branchName}`);
+      mirrorWorkingTree({ sourceRoot: sourcePath, targetRoot: targetPath, sourceMode: "git", deletionMode: "git" });
+    } else {
+      git(targetPath, ["reset", "--hard", sourceHead], `check out linked worktree ${input.branchName}`);
+    }
     return { branchPath: targetPath, baseCommitHash: sourceHead };
   } catch (error) {
     if (branchCreated) {
@@ -1190,6 +1232,53 @@ function createOrRetryLinkedProjectBranch(input) {
   }
   return createLinkedProjectBranch(input);
 }
+function classifyProjectCheckout(input) {
+  const checkoutPath = branchPath(input.projectRoot, input.branchName);
+  let stat;
+  try {
+    stat = fs.lstatSync(checkoutPath);
+  } catch {
+    return "missing";
+  }
+  if (!stat.isDirectory()) return "not_a_worktree";
+  if (input.branchName === input.primaryBranchName) return gitDirectoryKind(checkoutPath) === "directory" ? "linked" : "not_a_worktree";
+  if (gitDirectoryKind(checkoutPath) !== "file") return "not_a_worktree";
+  const gitDirectory = perWorktreeGitDirectory(checkoutPath);
+  if (!gitDirectory) return "not_a_worktree";
+  let registry;
+  let registered;
+  try {
+    registry = fs.realpathSync(path.join(branchPath(input.projectRoot, input.primaryBranchName), ".git", "worktrees"));
+    registered = fs.realpathSync(gitDirectory);
+  } catch {
+    return "not_a_worktree";
+  }
+  const relative = path.relative(registry, registered);
+  if (!relative || relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) return "not_a_worktree";
+  return "linked";
+}
+function inventoryProjectCheckouts(input) {
+  const states = input.branchNames.map((branchName) => ({
+    branchName,
+    checkoutPath: branchPath(input.projectRoot, branchName),
+    state: classifyProjectCheckout({ ...input, branchName })
+  }));
+  const primaryLinked = states.some(({ branchName, state }) => branchName === input.primaryBranchName && state === "linked");
+  const inventory = { linkedBranchNames: [], missingCheckouts: [] };
+  for (const { branchName, checkoutPath, state } of states) {
+    if (primaryLinked && state === "linked") inventory.linkedBranchNames.push(branchName);
+    else inventory.missingCheckouts.push({ branchName, checkoutPath, reason: state === "linked" ? "not_a_worktree" : state });
+  }
+  return inventory;
+}
+const PROJECT_REMOVED_CHECKOUTS_DIRECTORY = ".r5d-removed";
+function moveProjectCheckoutAside(projectRoot, branchName, checkoutPath) {
+  const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  const target = path.join(projectRoot, PROJECT_REMOVED_CHECKOUTS_DIRECTORY, ...`${branchName}-${timestamp}`.split("/"));
+  fs.mkdirSync(path.dirname(target), { recursive: true });
+  fs.renameSync(checkoutPath, target);
+  return target;
+}
 function deleteLinkedProjectBranch(input) {
   validateManagedBranchName(input.primaryBranchName);
   validateManagedBranchName(input.branchName);
@@ -1198,15 +1287,18 @@ function deleteLinkedProjectBranch(input) {
   const checkoutPath = branchPath(input.projectRoot, input.branchName);
   const primaryCommonDir = commonGitDirectory(primaryPath);
   if (!primaryCommonDir) throw new Error("Primary project checkout is unavailable");
+  let movedAsidePath;
   if (fs.existsSync(checkoutPath)) {
-    const checkoutCommonDir = commonGitDirectory(checkoutPath);
+    const checkoutCommonDir = fs.lstatSync(checkoutPath).isDirectory() ? commonGitDirectory(checkoutPath) : null;
     if (checkoutCommonDir !== primaryCommonDir) {
-      throw new Error(`Project branch path ${input.branchName} is not a linked worktree of the configured project`);
-    }
-    if (projectWorktreeOperationInProgress(checkoutPath)) {
-      throw new Error(`Project branch ${input.branchName} has an in-progress Git operation`);
+      movedAsidePath = moveProjectCheckoutAside(input.projectRoot, input.branchName, checkoutPath);
+      tryGit(primaryPath, ["worktree", "prune"]);
+    } else {
+      if (projectWorktreeOperationInProgress(checkoutPath)) {
+        throw new Error(`Project branch ${input.branchName} has an in-progress Git operation`);
+      }
+      git(primaryPath, ["worktree", "remove", "--force", checkoutPath], `remove linked worktree ${input.branchName}`);
     }
-    git(primaryPath, ["worktree", "remove", "--force", checkoutPath], `remove linked worktree ${input.branchName}`);
   } else {
     tryGit(primaryPath, ["worktree", "prune"]);
   }
@@ -1214,7 +1306,7 @@ function deleteLinkedProjectBranch(input) {
   if (tryGit(primaryPath, ["show-ref", "--verify", "--quiet", branchRef])) {
     git(primaryPath, ["branch", "-D", input.branchName], `delete project branch ${input.branchName}`);
   }
-  return { branchName: input.branchName };
+  return { branchName: input.branchName, ...movedAsidePath ? { movedAsidePath } : {} };
 }
 function removeProjectWorktrees(input) {
   const projectRoot = path.resolve(input.projectRoot);
@@ -1316,24 +1408,46 @@ function assertProjectMirrorHeadsPushed(results) {
     throw new Error(`Hidden project mirror publication skipped ${skipped.branchName}${skipped.reason ? ` (${skipped.reason})` : ""}`);
   }
 }
+const PROJECT_MIRROR_FETCH_REFSPECS = ["+refs/heads/*:refs/r5d/mirror/*", "+refs/r5d/server-synced/*:refs/r5d/server-synced/*"];
+function projectMirrorMountFetchRefspecs(branchName, branchId) {
+  validateManagedBranchName(branchName);
+  if (branchId !== void 0 && !/^[A-Za-z0-9][A-Za-z0-9_-]{0,127}$/.test(branchId)) throw new Error(`Invalid branch id for ${branchName}`);
+  return [
+    `+refs/heads/${branchName}:refs/r5d/mirror/${branchName}`,
+    branchId === void 0 ? "+refs/r5d/server-synced/*:refs/r5d/server-synced/*" : `+refs/r5d/server-synced/${branchId}/*:refs/r5d/server-synced/${branchId}/*`
+  ];
+}
+async function fetchProjectMirrorRefs(input) {
+  const fetch = (refspecs) => gitResultAsync(
+    input.primaryPath,
+    [
+      ...gitTransportSecurityArgs(input.mirrorUrl, input.credentialHelper, input.credentialUsername),
+      "fetch",
+      "--no-recurse-submodules",
+      "--prune",
+      input.mirrorUrl,
+      ...refspecs
+    ],
+    PROJECT_GIT_TRANSPORT_TIMEOUT_MS
+  );
+  if (input.fetchOnlyBranches && input.fetchOnlyBranches.size > 0) {
+    const refspecs = [...input.fetchOnlyBranches].sort().flatMap((branchName) => projectMirrorMountFetchRefspecs(branchName, input.branchIds?.get(branchName)));
+    const scoped = await fetch(refspecs);
+    if (scoped.exitCode === 0) return;
+    if (!/(couldn't find remote ref|no such ref)/i.test(`${scoped.stderr}
+${scoped.stdout}`)) {
+      throw new Error(`Refresh project head mirror: ${scoped.stderr || scoped.stdout || `git exited ${scoped.exitCode}`}`);
+    }
+  }
+  const whole = await fetch(PROJECT_MIRROR_FETCH_REFSPECS);
+  if (whole.exitCode !== 0) {
+    throw new Error(`Refresh project head mirror: ${whole.stderr || whole.stdout || `git exited ${whole.exitCode}`}`);
+  }
+}
 async function observeProjectMirrorHeads(input) {
   const primaryPath = branchPath(input.projectRoot, input.primaryBranchName);
-  if (input.refreshRemote !== false) {
-    const fetch = await gitResultAsync(
-      primaryPath,
-      [
-        ...gitTransportSecurityArgs(input.mirrorUrl, input.credentialHelper, input.credentialUsername),
-        "fetch",
-        "--no-recurse-submodules",
-        "--prune",
-        input.mirrorUrl,
-        "+refs/heads/*:refs/r5d/mirror/*",
-        "+refs/r5d/server-synced/*:refs/r5d/server-synced/*"
-      ],
-      PROJECT_GIT_TRANSPORT_TIMEOUT_MS
-    );
-    if (fetch.exitCode !== 0)
-      throw new Error(`Refresh project head mirror: ${fetch.stderr || fetch.stdout || `git exited ${fetch.exitCode}`}`);
+  if (input.refreshRemote !== false && !(input.fetchOnlyBranches && input.fetchOnlyBranches.size === 0)) {
+    await fetchProjectMirrorRefs({ ...input, primaryPath });
   }
   const observations = [];
   for (const branchName of [...input.branchNames].sort()) {
@@ -1380,23 +1494,14 @@ async function observeProjectMirrorHeads(input) {
   }
   return observations;
 }
-async function computeLocalProjectMirrorRefsToken(input) {
+async function computeLocalProjectMirrorRefsTokens(input) {
   const primaryPath = branchPath(input.projectRoot, input.primaryBranchName);
   const rows = await gitAsync(
     primaryPath,
-    ["for-each-ref", "--format=%(objectname) %(refname)", PROJECT_MIRROR_REF_PREFIX, PROJECT_SERVER_SYNCED_REF_PREFIX],
+    ["for-each-ref", PROJECT_MIRROR_REF_LISTING_FORMAT, PROJECT_MIRROR_REF_PREFIX, PROJECT_SERVER_SYNCED_REF_PREFIX],
     "list cached project mirror refs"
   );
-  const refs = rows.split(/\r?\n/).filter(Boolean).map((row) => {
-    const separator = row.indexOf(" ");
-    const objectName = separator < 0 ? "" : row.slice(0, separator);
-    const refname = separator < 0 ? "" : row.slice(separator + 1);
-    if (!/^[0-9a-f]{40,64}$/.test(objectName) || refname.length === 0) {
-      throw new Error(`Invalid cached mirror ref listing row: ${row}`);
-    }
-    return { refname, objectName };
-  });
-  return hashProjectMirrorRefs(canonicalizeLocalProjectMirrorRefs(refs));
+  return projectMirrorRefsTokens(canonicalizeLocalProjectMirrorRefs(parseProjectMirrorRefListing(rows)), input.mounts);
 }
 async function applyObservedProjectMirrorHeads(input) {
   const results = [];
@@ -1460,7 +1565,7 @@ const projectWorktreesTestHarness = {
   commandArgs: gitCommandArgs,
   configureRepository,
   createPreparedSnapshot(input) {
-    return { root: snapshotBranchTrees(input.projectRoot, input.branches, input.temporaryRoot).root };
+    return { root: snapshotBranchTrees(input.projectRoot, input.branches, input.temporaryRoot, void 0, input.scope).root };
   },
   consumeSnapshot(snapshotRoot) {
     const manifest = readSnapshotManifest(snapshotRoot);
@@ -1475,11 +1580,13 @@ const projectWorktreesTestHarness = {
   }
 };
 export {
+  PROJECT_REMOVED_CHECKOUTS_DIRECTORY,
   PROJECT_WORKTREE_SNAPSHOT_PREFIX,
   ProjectBranchCreationRollbackIncompleteError,
   applyObservedProjectMirrorHeads,
   assertProjectMirrorHeadsPushed,
-  computeLocalProjectMirrorRefsToken,
+  classifyProjectCheckout,
+  computeLocalProjectMirrorRefsTokens,
   createLinkedProjectBranch,
   createOrRetryLinkedProjectBranch,
   deleteLinkedProjectBranch,
@@ -1487,6 +1594,7 @@ export {
   ensureProjectWorktrees,
   fastForwardProjectHeadsFromMirror,
   hasLinkedProjectWorktreeLayout,
+  inventoryProjectCheckouts,
   observeProjectMirrorHeads,
   projectBranchMayExistAfterCreateFailure,
   projectOriginBranchName,

package/dist/mjs/workspace-git-sync.mjs

@@ -1352,6 +1352,19 @@ ${result.stdout}`;
   }
   return revParse(workspacePath, `refs/remotes/origin/${WORKSPACE_GIT_BRANCH}`);
 }
+async function resolveWorkspaceRemoteHead(workspacePath, input) {
+  const advertised = input.advertisedRemoteHead;
+  if (advertised && /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/.test(advertised)) {
+    const tracked = await revParseAsync(workspacePath, `refs/remotes/origin/${WORKSPACE_GIT_BRANCH}`);
+    if (tracked === advertised && await tryGitAsync(workspacePath, ["cat-file", "-e", `${tracked}^{commit}`])) {
+      return { head: tracked, fetched: false };
+    }
+  }
+  return {
+    head: await fetchWorkspaceHead(workspacePath, input.remoteUrl, input.credentialHelper, input.credentialUsername),
+    fetched: true
+  };
+}
 async function ensureWorkspaceGitClone(input) {
   const workspacePath = path.resolve(input.workspacePath);
   const workspaceParent = path.dirname(workspacePath);
@@ -1399,7 +1412,8 @@ async function ensureWorkspaceGitClone(input) {
   if (!await revParseAsync(workspacePath, WORKSPACE_GIT_INTEGRATED_REF) && previousRemoteHead && localHeadBeforeFetch && await tryGitAsync(workspacePath, ["merge-base", "--is-ancestor", previousRemoteHead, localHeadBeforeFetch])) {
     await updateIntegratedWorkspaceHead(workspacePath, previousRemoteHead);
   }
-  const remoteHead = await fetchWorkspaceHead(workspacePath, input.remoteUrl, input.credentialHelper, input.credentialUsername);
+  const resolvedRemoteHead = await resolveWorkspaceRemoteHead(workspacePath, input);
+  const remoteHead = resolvedRemoteHead.head;
   let localHead = await revParseAsync(workspacePath, "HEAD");
   if (!localHead && remoteHead) {
     await runWorkspaceCheckoutTransition(workspacePath, async () => {
@@ -1420,7 +1434,7 @@ async function ensureWorkspaceGitClone(input) {
     await updateIntegratedWorkspaceHead(workspacePath, remoteHead);
     localHead = remoteHead;
   }
-  return { localHead, remoteHead };
+  return { localHead, remoteHead, remoteHeadFetched: resolvedRemoteHead.fetched };
 }
 function activeMounts(mounts) {
   const active = [];
@@ -2069,6 +2083,11 @@ async function synchronizeWithFetchedHead(input) {
   return rebased.ok ? { kind: "ready", updated: false, rebased: true } : { kind: "conflict", conflictPaths: rebased.conflictPaths, refs: rebased.refs, error: rebased.error };
 }
 async function synchronizeWorkspaceGit(input) {
+  const remoteHeadFetches = { count: 0 };
+  const result = await runWorkspaceGitSynchronization(input, remoteHeadFetches);
+  return { ...result, remoteHeadFetches: remoteHeadFetches.count };
+}
+async function runWorkspaceGitSynchronization(input, remoteHeadFetches) {
   const workspacePath = path.resolve(input.workspacePath);
   const attemptId = input.attemptId ?? crypto.randomUUID();
   const maxDiffBytes = input.maxDiffBytes ?? MAX_WORKSPACE_GIT_DIFF_BYTES;
@@ -2077,6 +2096,7 @@ async function synchronizeWorkspaceGit(input) {
   const requiredAncestorHeads = requiredWorkspaceAncestorHeads(input.requiredAncestorHeads);
   const preserveResolutionInProgress = input.skipMountMirror === true;
   const initial = await ensureWorkspaceGitClone({ ...input, workspacePath, preserveResolutionInProgress });
+  if (initial.remoteHeadFetched) remoteHeadFetches.count += 1;
   assertWorkspaceRemediationAncestry({
     workspacePath,
     currentHead: initial.localHead,
@@ -2124,11 +2144,22 @@ async function synchronizeWorkspaceGit(input) {
   const classifyMounts = (activeCandidates, additionalSkippedIds = []) => {
     refreshCycleSkippedMounts();
     const skippedIds = /* @__PURE__ */ new Set([...cycleSkippedMountIds, ...projectionSkippedIds, ...additionalSkippedIds]);
+    const activeMountIds = [...new Set(activeCandidates.filter(({ id }) => !skippedIds.has(id)).map(({ id }) => id))].sort();
     return {
-      activeMountIds: [...new Set(activeCandidates.filter(({ id }) => !skippedIds.has(id)).map(({ id }) => id))].sort(),
-      skippedMountIds: [...skippedIds].sort()
+      activeMountIds,
+      skippedMountIds: [...skippedIds].sort(),
+      // An active mount's token is unchanged since capture (a moved token
+      // lands it in cycleSkippedMountIds above), so this is the token its
+      // projected bytes belong to.
+      projectedMutationTokens: Object.fromEntries(
+        activeMountIds.flatMap((id) => {
+          const token = projectionMutationTokens.get(id);
+          return token === void 0 ? [] : [[id, token]];
+        })
+      )
     };
   };
+  const mountProjectionIsCurrent = (mount) => mount.lastProjectedMutationToken !== void 0 && !mount.deleteWhenSourceMissing && mount.preserveLocalOnHydrationBasisChange !== true && projectionBasisHead !== null && workspaceHydrationReceiptMountBasisHead(projectionBasisReceipt, mount) === projectionBasisHead && projectionMutationTokens.get(mount.id) === mount.lastProjectedMutationToken && mount.mutationToken?.() === mount.lastProjectedMutationToken;
   if (!input.skipMountMirror) {
     const mergeProjectionEnabled = process.env.R5D_WORKSPACE_MERGE_PROJECTION !== "0";
     const mergeSupport = mergeProjectionEnabled ? workspaceMergeProjectionSupport() : { supported: false, error: "Workspace merge projection is disabled by R5D_WORKSPACE_MERGE_PROJECTION=0" };
@@ -2267,6 +2298,7 @@ async function synchronizeWorkspaceGit(input) {
     }
   };
   const projectedFastMounts = [];
+  const currentProjectionMounts = [];
   if (!input.skipMountMirror) {
     beginWorkspaceCheckoutTransition(workspacePath);
     try {
@@ -2278,6 +2310,10 @@ async function synchronizeWorkspaceGit(input) {
           cycleSkippedMountIds.add(mount.id);
           continue;
         }
+        if (mountProjectionIsCurrent(mount)) {
+          currentProjectionMounts.push(mount);
+          continue;
+        }
         projectedGitlinks.push(...mirrorMountsToWorkspace(workspacePath, [mount]));
         projectedFastMounts.push(mount);
         await yieldToWorkerEventLoop();
@@ -2311,7 +2347,7 @@ async function synchronizeWorkspaceGit(input) {
     const targetProjectionReceipt = receiptWithMountsAtHead(
       projectionBasisReceipt,
       projectedHead,
-      projectedFastMounts,
+      [...projectedFastMounts, ...currentProjectionMounts],
       allProjectionReceiptMounts
     );
     const currentProjectionReceipt = await readHydratedWorkspaceReceiptAsync(workspacePath);
@@ -2324,7 +2360,9 @@ async function synchronizeWorkspaceGit(input) {
     }
     await completeWorkspaceCheckoutTransition(workspacePath);
   }
-  let remoteHead = await fetchWorkspaceHead(workspacePath, input.remoteUrl, input.credentialHelper, input.credentialUsername);
+  const prePublishRemoteHead = await resolveWorkspaceRemoteHead(workspacePath, input);
+  if (prePublishRemoteHead.fetched) remoteHeadFetches.count += 1;
+  let remoteHead = prePublishRemoteHead.head;
   let rebaseCount = 0;
   let updated = false;
   for (let pushAttempt = 0; pushAttempt < maxPushAttempts; pushAttempt += 1) {
@@ -2481,6 +2519,7 @@ ${push.stdout}`)) {
       throw new Error(`Push workspace main: ${push.stderr || push.stdout || `git exited ${push.exitCode}`}`);
     }
     remoteHead = await fetchWorkspaceHead(workspacePath, input.remoteUrl, input.credentialHelper, input.credentialUsername);
+    remoteHeadFetches.count += 1;
   }
   throw new Error(`Workspace push did not converge after ${maxPushAttempts} attempts`);
 }