@ricsam/r5d-worker 0.0.100 → 0.0.103

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

@@ -91,6 +91,22 @@ async function gitAsync(cwd, args, action) {
   if (result.exitCode !== 0) throw new Error(`${action}: ${result.stderr || result.stdout || `git exited ${result.exitCode}`}`);
   return result.stdout;
 }
+async function gitOutputAsync(cwd, args, action, input) {
+  const subprocess = Bun.spawn(gitCommandArgs(args), {
+    cwd,
+    stdin: input ?? "ignore",
+    stdout: "pipe",
+    stderr: "pipe",
+    env: workerGitProcessEnvironment()
+  });
+  const [stdout, stderr, exitCode] = await Promise.all([
+    new Response(subprocess.stdout).arrayBuffer(),
+    new Response(subprocess.stderr).text(),
+    subprocess.exited
+  ]);
+  if (exitCode !== 0) throw new Error(`${action}: ${stderr.trim() || `git exited ${exitCode}`}`);
+  return Buffer.from(stdout);
+}
 async function tryGitAsync(cwd, args) {
   return (await gitResultAsync(cwd, args)).exitCode === 0;
 }
@@ -1102,7 +1118,13 @@ function beginHydrationTransaction(workspacePath, mounts, targetReceipt) {
           candidate: outerPath,
           label: `Workspace mount ${mount.id} outer source`
         });
-        const plan = planWorkingTreeMirror({ sourceRoot: outerPath, targetRoot: sourcePath, sourceMode: "all", deletionMode: "git" });
+        const plan = planWorkingTreeMirror({
+          sourceRoot: outerPath,
+          targetRoot: sourcePath,
+          sourceMode: "all",
+          deletionMode: "git",
+          sourceGitlinks: outerSubtreeGitlinks(workspacePath, mount)
+        });
         scope = captureWorkingTreeMirrorPlan({
           plan,
           targetRoot: sourcePath,
@@ -1330,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);
@@ -1377,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 () => {
@@ -1398,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 = [];
@@ -1413,6 +1449,7 @@ function activeMounts(mounts) {
   return { active, tombstones, skipped };
 }
 function mirrorMountsToWorkspace(workspacePath, mounts) {
+  const projected = [];
   for (const mount of mounts) {
     assertManagedDirectoryPath({
       trustedRoot: mount.durabilityRootPath,
@@ -1424,13 +1461,61 @@ function mirrorMountsToWorkspace(workspacePath, mounts) {
       candidate: path.join(workspacePath, ...mount.workspaceRelativePath.replace(/\\/g, "/").split("/")),
       label: `Workspace mount ${mount.id} outer target`
     });
-    mirrorWorkingTree({
+    const mirrored = mirrorWorkingTree({
       sourceRoot: mount.sourcePath,
       targetRoot: path.join(workspacePath, ...mount.workspaceRelativePath.replace(/\\/g, "/").split("/")),
       sourceMode: mount.sourceMode,
       deletionMode: "all"
     });
+    projected.push({ mount, gitlinks: mirrored.gitlinks });
   }
+  return projected;
+}
+async function stageWorkspaceGitlinks(workspacePath, projected) {
+  if (projected.length === 0) return;
+  const mountPaths = projected.map(({ mount }) => normalizedWorkspaceMountPath(mount.workspaceRelativePath));
+  const desired = /* @__PURE__ */ new Map();
+  projected.forEach(({ gitlinks }, index) => {
+    for (const gitlink of gitlinks) desired.set(`${mountPaths[index]}/${gitlink.relativePath}`, gitlink.objectId);
+  });
+  const desiredRoots = new Set(desired.keys());
+  const listed = await gitOutputAsync(
+    workspacePath,
+    ["ls-files", "-z", "--stage", "--", ...mountPaths.map((mountPath) => `:(literal)${mountPath}`)],
+    "inspect staged workspace mount entries"
+  );
+  const feed = [];
+  const current = /* @__PURE__ */ new Map();
+  const drop = (objectId, relativePath) => {
+    feed.push(Buffer.concat([Buffer.from(`0 ${"0".repeat(objectId.length)}	`), Buffer.from(relativePath), Buffer.from([0])]));
+  };
+  for (const record of listed.toString().split("\0")) {
+    const match = /^([0-7]{6}) ([0-9a-f]{40,64}) [0-3]\t(.+)$/su.exec(record);
+    if (!match) continue;
+    const mode = match[1];
+    const objectId = match[2];
+    const relativePath = match[3];
+    if (mode === "160000") {
+      current.set(relativePath, objectId);
+      if (!desired.has(relativePath)) drop(objectId, relativePath);
+      continue;
+    }
+    if (desired.has(relativePath) || hasAncestorIn(relativePath, desiredRoots)) drop(objectId, relativePath);
+  }
+  for (const [relativePath, objectId] of desired) {
+    if (current.get(relativePath) === objectId) continue;
+    feed.push(Buffer.concat([Buffer.from(`160000 ${objectId}	`), Buffer.from(relativePath), Buffer.from([0])]));
+  }
+  if (feed.length === 0) return;
+  await gitOutputAsync(workspacePath, ["update-index", "-z", "--index-info"], "stage workspace gitlinks", Buffer.concat(feed));
+}
+function hasAncestorIn(relativePath, ancestors) {
+  let parent = path.posix.dirname(relativePath);
+  while (parent !== ".") {
+    if (ancestors.has(parent)) return true;
+    parent = path.posix.dirname(parent);
+  }
+  return false;
 }
 function removeWorkspaceMounts(workspacePath, mounts) {
   for (const mount of mounts) {
@@ -1470,6 +1555,24 @@ function restoreDeferredWorkspaceMountsFromHead(workspacePath, mounts) {
 function workspaceMountOuterPath(workspacePath, mount) {
   return path.join(workspacePath, ...mount.workspaceRelativePath.replace(/\\/g, "/").split("/"));
 }
+function outerSubtreeGitlinks(workspacePath, mount) {
+  const gitlinks = /* @__PURE__ */ new Map();
+  const head = revParse(workspacePath, "HEAD");
+  if (!head) return gitlinks;
+  const subtree = `${head}:${normalizedWorkspaceMountPath(mount.workspaceRelativePath)}`;
+  const listed = Bun.spawnSync(gitCommandArgs(["ls-tree", "-r", "-z", subtree]), {
+    cwd: workspacePath,
+    stdout: "pipe",
+    stderr: "pipe",
+    env: workerGitProcessEnvironment()
+  });
+  if (listed.exitCode !== 0) return gitlinks;
+  for (const record of Buffer.from(listed.stdout).toString().split("\0")) {
+    const match = /^160000 commit ([0-9a-f]{40,64})\t(.+)$/su.exec(record);
+    if (match) gitlinks.set(match[2], match[1]);
+  }
+  return gitlinks;
+}
 function hydrateWorkspaceGitMountsRaw(workspacePath, mounts, options = {}) {
   const hydratedMountIds = [];
   const skippedMountIds = [];
@@ -1513,6 +1616,9 @@ function hydrateWorkspaceGitMountsRaw(workspacePath, mounts, options = {}) {
       sourceRoot,
       targetRoot: mount.sourcePath,
       sourceMode: "all",
+      // The outer worktree shows a submodule as an empty directory; the tree
+      // carries its pointer, which a Git checkout applies to its index (D4).
+      sourceGitlinks: outerSubtreeGitlinks(workspacePath, mount),
       // A missing checkout has no Git index to define git-only deletions. Its
       // newly created directory is empty, so all-mode is equivalent and lets
       // bootstrap hydration preserve the fetched tree before Git initializes.
@@ -1528,7 +1634,7 @@ async function selectMountsWithUnchangedOuterSubtree(workspacePath, receipt, hea
     return basisHead && basisHead !== head ? [{ mount, basisHead }] : [];
   });
   if (candidates.length === 0) return /* @__PURE__ */ new Set();
-  const objects = await resolveGitObjectIdsAsync(
+  const objects = await resolveGitObjectsAsync(
     workspacePath,
     candidates.flatMap(({ mount, basisHead }) => [
       workspaceTreeObjectName(basisHead, mount.workspaceRelativePath),
@@ -1537,8 +1643,8 @@ async function selectMountsWithUnchangedOuterSubtree(workspacePath, receipt, hea
   );
   const unchanged = /* @__PURE__ */ new Set();
   for (const { mount, basisHead } of candidates) {
-    const before = objects.get(workspaceTreeObjectName(basisHead, mount.workspaceRelativePath)) ?? null;
-    const after = objects.get(workspaceTreeObjectName(head, mount.workspaceRelativePath)) ?? null;
+    const before = objects.get(workspaceTreeObjectName(basisHead, mount.workspaceRelativePath))?.objectId ?? null;
+    const after = objects.get(workspaceTreeObjectName(head, mount.workspaceRelativePath))?.objectId ?? null;
     if (before === after) unchanged.add(mount.id);
   }
   return unchanged;
@@ -1804,7 +1910,7 @@ async function diffSizeBytes(workspacePath, baseRevision, headRevision, limit, p
   if (exitCode !== 0) throw new Error(`Measure workspace diff: ${stderr || `git exited ${exitCode}`}`);
   return total;
 }
-async function resolveGitObjectIdsAsync(workspacePath, names) {
+async function resolveGitObjectsAsync(workspacePath, names) {
   const resolved = /* @__PURE__ */ new Map();
   const unique = [...new Set(names)];
   if (unique.length === 0) return resolved;
@@ -1827,21 +1933,43 @@ async function resolveGitObjectIdsAsync(workspacePath, names) {
     throw new Error(`Resolve workspace objects: expected ${unique.length} results, received ${lines.length}`);
   }
   unique.forEach((name, index) => {
-    const match = /^([0-9a-f]{40,64}) \S+ \d+$/.exec(lines[index]);
-    resolved.set(name, match ? match[1] : null);
+    const match = /^([0-9a-f]{40,64}) (\S+) \d+$/.exec(lines[index]);
+    resolved.set(name, match ? { objectId: match[1], type: match[2] } : null);
   });
   return resolved;
 }
 function workspaceTreeObjectName(revision, workspaceRelativePath) {
   return `${revision}:${normalizedWorkspaceMountPath(workspaceRelativePath)}`;
 }
+async function pathsReplacedByGitlinks(workspacePath, baseRevision, headRevision) {
+  const base = baseRevision ?? emptyTreeHash(workspacePath);
+  const raw = await gitOutputAsync(
+    workspacePath,
+    ["diff", "--raw", "--no-renames", "-z", base, headRevision],
+    "inspect workspace gitlink changes"
+  );
+  const records = raw.toString().split("\0");
+  const addedGitlinks = [];
+  for (let index = 0; index + 1 < records.length; index += 2) {
+    if (/^:[0-7]{6} 160000 \S+ \S+ A$/u.test(records[index])) addedGitlinks.push(records[index + 1]);
+  }
+  if (addedGitlinks.length === 0) return [];
+  const objects = await resolveGitObjectsAsync(
+    workspacePath,
+    addedGitlinks.map((relativePath) => `${base}:${relativePath}`)
+  );
+  return addedGitlinks.filter((relativePath) => objects.get(`${base}:${relativePath}`)?.type === "tree").sort();
+}
+function gitlinkMigrationPathspecs(paths) {
+  return paths.map((relativePath) => `:(exclude,literal)${relativePath}`);
+}
 async function measureInitialPublicationDiffSize(input) {
   const candidates = input.mounts.filter(
     (mount) => typeof mount.initialPublicationSourceRelativePath === "string"
   );
   if (candidates.length === 0) return null;
   const revisions = [input.localHead, ...input.remoteHead ? [input.remoteHead] : []];
-  const objects = await resolveGitObjectIdsAsync(
+  const objects = await resolveGitObjectsAsync(
     input.workspacePath,
     candidates.flatMap(
       (mount) => revisions.flatMap((revision) => [
@@ -1850,7 +1978,7 @@ async function measureInitialPublicationDiffSize(input) {
       ])
     )
   );
-  const lookup = (revision, workspaceRelativePath) => revision ? objects.get(workspaceTreeObjectName(revision, workspaceRelativePath)) ?? null : null;
+  const lookup = (revision, workspaceRelativePath) => revision ? objects.get(workspaceTreeObjectName(revision, workspaceRelativePath))?.objectId ?? null : null;
   const initialPublications = candidates.flatMap((mount) => {
     const published = lookup(input.localHead, mount.workspaceRelativePath);
     if (!published || lookup(input.remoteHead, mount.workspaceRelativePath)) return [];
@@ -1858,16 +1986,14 @@ async function measureInitialPublicationDiffSize(input) {
     return [{ mount, published, source }];
   });
   if (initialPublications.length === 0) return null;
-  let size = await input.measure(
-    input.workspacePath,
-    input.remoteHead,
-    input.localHead,
-    input.limit,
-    initialPublications.map(({ mount }) => `:(exclude,literal)${normalizedWorkspaceMountPath(mount.workspaceRelativePath)}`)
-  );
+  let size = await input.measure(input.workspacePath, input.remoteHead, input.localHead, input.limit, [
+    ...initialPublications.map(({ mount }) => `:(exclude,literal)${normalizedWorkspaceMountPath(mount.workspaceRelativePath)}`),
+    ...input.excludePathspecs ?? []
+  ]);
   for (const { published, source } of initialPublications) {
     if (size > input.limit) break;
-    size += await input.measure(input.workspacePath, source, published, input.limit - size);
+    const migrations = source ? await pathsReplacedByGitlinks(input.workspacePath, source, published) : [];
+    size += await input.measure(input.workspacePath, source, published, input.limit - size, gitlinkMigrationPathspecs(migrations));
   }
   return { size, mountIds: initialPublications.map(({ mount }) => mount.id).sort() };
 }
@@ -1957,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;
@@ -1965,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,
@@ -2012,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" };
@@ -2131,10 +2274,12 @@ async function synchronizeWorkspaceGit(input) {
     return classifyMounts([...selected.active, ...selected.tombstones], hydration.skippedMountIds);
   };
   let newlyStagedPaths = [];
+  const projectedGitlinks = [];
   const stageAndCommitWorkspace = async () => {
     if (workspaceResolutionInProgress(workspacePath) || await workspaceHasUnmergedEntries(workspacePath)) {
       throw new Error("Outer workspace clone has an unfinished merge/rebase; finish or abort it before synchronizing");
     }
+    await stageWorkspaceGitlinks(workspacePath, projectedGitlinks);
     await gitAsync(workspacePath, ["add", "-A", "--", "."], "stage workspace working trees");
     newlyStagedPaths = await stagedPaths(workspacePath);
     if (newlyStagedPaths.length > 0) {
@@ -2153,6 +2298,7 @@ async function synchronizeWorkspaceGit(input) {
     }
   };
   const projectedFastMounts = [];
+  const currentProjectionMounts = [];
   if (!input.skipMountMirror) {
     beginWorkspaceCheckoutTransition(workspacePath);
     try {
@@ -2164,7 +2310,11 @@ async function synchronizeWorkspaceGit(input) {
           cycleSkippedMountIds.add(mount.id);
           continue;
         }
-        mirrorMountsToWorkspace(workspacePath, [mount]);
+        if (mountProjectionIsCurrent(mount)) {
+          currentProjectionMounts.push(mount);
+          continue;
+        }
+        projectedGitlinks.push(...mirrorMountsToWorkspace(workspacePath, [mount]));
         projectedFastMounts.push(mount);
         await yieldToWorkerEventLoop();
       }
@@ -2197,7 +2347,7 @@ async function synchronizeWorkspaceGit(input) {
     const targetProjectionReceipt = receiptWithMountsAtHead(
       projectionBasisReceipt,
       projectedHead,
-      projectedFastMounts,
+      [...projectedFastMounts, ...currentProjectionMounts],
       allProjectionReceiptMounts
     );
     const currentProjectionReceipt = await readHydratedWorkspaceReceiptAsync(workspacePath);
@@ -2210,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) {
@@ -2263,7 +2415,9 @@ async function synchronizeWorkspaceGit(input) {
     }
     const paths = await changedPaths(workspacePath, remoteHead, localHead);
     const measureDiffSize = input.measureDiffSize ?? diffSizeBytes;
-    let size = paths.length > 0 ? await measureDiffSize(workspacePath, remoteHead, localHead, maxDiffBytes) : 0;
+    const gitlinkMigrations = paths.length > 0 ? await pathsReplacedByGitlinks(workspacePath, remoteHead, localHead) : [];
+    const gitlinkMigrationExcludes = gitlinkMigrationPathspecs(gitlinkMigrations);
+    let size = paths.length > 0 ? await measureDiffSize(workspacePath, remoteHead, localHead, maxDiffBytes, gitlinkMigrationExcludes) : 0;
     input.assertStillAdmitted?.();
     let initialPublicationMountIds;
     if (paths.length > 0 && size > maxDiffBytes && !input.allowLargeDiff) {
@@ -2273,7 +2427,8 @@ async function synchronizeWorkspaceGit(input) {
         localHead,
         mounts: input.mounts,
         limit: maxDiffBytes,
-        measure: measureDiffSize
+        measure: measureDiffSize,
+        excludePathspecs: gitlinkMigrationExcludes
       });
       input.assertStillAdmitted?.();
       if (initialPublication && initialPublication.size <= maxDiffBytes) {
@@ -2281,6 +2436,11 @@ async function synchronizeWorkspaceGit(input) {
         initialPublicationMountIds = initialPublication.mountIds;
       }
     }
+    let gitlinkMigrationConfirmed = false;
+    if (gitlinkMigrations.length > 0 && size <= maxDiffBytes && !input.allowLargeDiff) {
+      gitlinkMigrationConfirmed = await measureDiffSize(workspacePath, remoteHead, localHead, maxDiffBytes) > maxDiffBytes;
+      input.assertStillAdmitted?.();
+    }
     if (paths.length > 0 && size > maxDiffBytes && !input.allowLargeDiff) {
       const classifiedMounts = classifyMounts([...selected.active, ...selected.tombstones]);
       return {
@@ -2325,7 +2485,7 @@ async function synchronizeWorkspaceGit(input) {
       "push",
       "--no-recurse-submodules"
     ];
-    if (input.allowLargeDiff || initialPublicationMountIds) {
+    if (input.allowLargeDiff || initialPublicationMountIds || gitlinkMigrationConfirmed) {
       pushArgs.push(`--push-option=${WORKSPACE_GIT_CONFIRMED_LARGE_DIFF_PUSH_OPTION}`);
     }
     pushArgs.push("origin", `HEAD:refs/heads/${WORKSPACE_GIT_BRANCH}`);
@@ -2359,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`);
 }

package/dist/mjs/workspace-merge-projection.mjs

@@ -170,14 +170,6 @@ function indexMode(entry) {
 function indexInfoRecord(mode, objectId, relativePath) {
   return Buffer.concat([Buffer.from(`${mode} ${objectId}	`), Buffer.from(relativePath), Buffer.from([0])]);
 }
-function basisGitlinks(workspacePath, basis) {
-  const listed = gitResult(workspacePath, ["ls-tree", "-r", "-z", `${basis.basisHead}:${basis.workspaceRelativePath}`]);
-  if (listed.exitCode !== 0) return [];
-  return nulRecords(listed.stdout).flatMap((record) => {
-    const match = /^160000 commit ([0-9a-f]{40,64})\t(.+)$/su.exec(record.toString());
-    return match ? [{ objectId: match[1], relativePath: match[2] }] : [];
-  });
-}
 function synthesizeMountTree(input) {
   const sourceRoot = path.resolve(input.sourcePath);
   const entries = inspectWorkingTree(sourceRoot, input.sourceMode);
@@ -188,19 +180,14 @@ function synthesizeMountTree(input) {
     const records = [];
     for (const [relativePath, entry] of [...entries.entries()].sort(([left], [right]) => left.localeCompare(right))) {
       if (entry.kind === "directory") continue;
+      if (entry.kind === "gitlink") {
+        records.push(indexInfoRecord("160000", entry.objectId, relativePath));
+        continue;
+      }
       const sourcePath = sourceEntryPath(sourceRoot, relativePath);
       const objectId = entry.kind === "file" ? hashRegularFile(input.workspacePath, sourcePath, entry) : hashSymlink(input.workspacePath, sourcePath, entry);
       records.push(indexInfoRecord(indexMode(entry), objectId, relativePath));
     }
-    if (input.gitlinkBasis && input.sourceMode === "git") {
-      for (const gitlink of basisGitlinks(input.workspacePath, input.gitlinkBasis)) {
-        const populatedPrefix = `${gitlink.relativePath}/`;
-        const populated = [...entries.keys()].some((relativePath) => relativePath.startsWith(populatedPrefix));
-        if (entries.get(gitlink.relativePath)?.kind === "directory" && !populated) {
-          records.push(indexInfoRecord("160000", gitlink.objectId, gitlink.relativePath));
-        }
-      }
-    }
     if (records.length > 0) {
       git(input.workspacePath, ["update-index", "-z", "--index-info"], "populate workspace projection index", {
         environment,
@@ -265,8 +252,7 @@ function synthesizeOursCommit(input) {
   const mountTree = synthesizeMountTree({
     workspacePath: input.workspacePath,
     sourcePath: input.mount.sourcePath,
-    sourceMode: input.mount.sourceMode,
-    gitlinkBasis: { basisHead: input.basisHead, workspaceRelativePath: input.workspaceRelativePath }
+    sourceMode: input.mount.sourceMode
   });
   const rootTree = graftMountTree({
     workspacePath: input.workspacePath,

package/dist/mjs/workspace-mutation-gate.mjs

@@ -27,8 +27,43 @@ class WorkspaceMutationGate {
       release();
     }
   }
+  /** A worktree create/delete lease; see the branch lane in the class comment. */
+  acquireBranchMutation() {
+    return new Promise((resolve) => {
+      this.waiters.push({ kind: "branch", resolve });
+      this.drain();
+    });
+  }
+  async runBranchMutation(operation) {
+    const release = await this.acquireBranchMutation();
+    try {
+      return await operation();
+    } finally {
+      release();
+    }
+  }
+  /**
+   * Operations a branch mutation requested now would wait for: the running
+   * sync, if any, plus branch mutations queued behind it. Zero means it runs
+   * at once. Ordinary waiters are not counted because the branch lane admits
+   * ahead of them.
+   */
+  branchMutationQueuePosition() {
+    if (!this.syncActive) return 0;
+    return 1 + this.waiters.filter((waiter) => waiter.kind === "branch").length;
+  }
   drain() {
     if (this.syncActive || this.waiters.length === 0) return;
+    for (let index = 0; index < this.waiters.length; ) {
+      const waiter = this.waiters[index];
+      if (waiter?.kind !== "branch") {
+        index += 1;
+        continue;
+      }
+      this.waiters.splice(index, 1);
+      this.activeMutations += 1;
+      waiter.resolve(this.releaseMutation());
+    }
     const first = this.waiters[0];
     if (first?.kind === "sync") {
       if (this.activeMutations > 0) return;

package/dist/mjs/workspace-projection-ledger.mjs

@@ -0,0 +1,57 @@
+const RETAINED_OUTCOMES = /* @__PURE__ */ new Set(["no_change", "updated", "published", "large_diff_blocked"]);
+class WorkspaceProjectionLedger {
+  projectedTokens = /* @__PURE__ */ new Map();
+  lastCycle = null;
+  static recordKey(mount) {
+    return `${mount.hydrationIncarnationKey}\0${mount.id}`;
+  }
+  get lastCycleResult() {
+    return this.lastCycle;
+  }
+  lastProjectedToken(mount) {
+    return this.projectedTokens.get(WorkspaceProjectionLedger.recordKey(mount));
+  }
+  /**
+   * Record a completed cycle. `projectedMutationTokens` names the token each
+   * active mount carried when the cycle projected it; a mount absent from it
+   * keeps its earlier record. Any outcome that leaves the outer clone without
+   * a trustworthy projection clears the ledger.
+   */
+  recordCycle(input) {
+    if (!RETAINED_OUTCOMES.has(input.result.outcome)) {
+      this.reset();
+      return;
+    }
+    const mountsById = new Map(input.mounts.map((mount) => [mount.id, mount]));
+    for (const [mountId, token] of Object.entries(input.projectedMutationTokens ?? {})) {
+      const mount = mountsById.get(mountId);
+      if (mount) this.projectedTokens.set(WorkspaceProjectionLedger.recordKey(mount), token);
+    }
+    this.lastCycle = input.result;
+  }
+  reset() {
+    this.projectedTokens.clear();
+    this.lastCycle = null;
+  }
+  /**
+   * The previous cycle's result when every request targets a configured
+   * mount and no mount's token moved since its recorded projection. A request
+   * without a target (a workspace-rooted command may touch any checkout), a
+   * mount without a token (a pending deletion), or pending deletion work all
+   * require a real cycle.
+   */
+  answerFromLastCycle(input) {
+    if (!this.lastCycle || input.pendingDeletions || input.targetMountIds.length === 0) return null;
+    const mountIds = new Set(input.mounts.map(({ id }) => id));
+    if (!input.targetMountIds.every((mountId) => mountId !== null && mountIds.has(mountId))) return null;
+    for (const mount of input.mounts) {
+      if (!mount.mutationToken) return null;
+      const recorded = this.projectedTokens.get(WorkspaceProjectionLedger.recordKey(mount));
+      if (recorded === void 0 || recorded !== mount.mutationToken()) return null;
+    }
+    return this.lastCycle;
+  }
+}
+export {
+  WorkspaceProjectionLedger
+};

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

@@ -0,0 +1,34 @@
+class WorkspaceSyncCoalescer {
+  constructor(options) {
+    this.options = options;
+  }
+  options;
+  pendingBatch = null;
+  batchesStarted = 0;
+  /** Requests attached to the batch that has not started yet. */
+  get queuedRequestCount() {
+    return this.pendingBatch?.requests.length ?? 0;
+  }
+  /** Batches whose body has been entered, whether or not they ran a cycle. */
+  get startedBatchCount() {
+    return this.batchesStarted;
+  }
+  request(request) {
+    const queued = this.pendingBatch;
+    if (queued) {
+      queued.requests.push(request);
+      return queued.settlement;
+    }
+    const batch = { requests: [request], settlement: Promise.resolve() };
+    this.pendingBatch = batch;
+    batch.settlement = this.options.runExclusive(async () => {
+      if (this.pendingBatch === batch) this.pendingBatch = null;
+      this.batchesStarted += 1;
+      return await this.options.runBatch(batch.requests);
+    });
+    return batch.settlement;
+  }
+}
+export {
+  WorkspaceSyncCoalescer
+};