@ricsam/r5d-worker 0.0.96 → 0.0.99

package/dist/mjs/working-tree-mirror.mjs

@@ -151,14 +151,55 @@ function addParentDirectories(entries, root) {
     }
   }
 }
-function inspectWorkingTree(root, mode) {
+function gitlinkPaths(root) {
+  const result = Bun.spawnSync(
+    [
+      "git",
+      "-c",
+      "submodule.recurse=false",
+      "-c",
+      "fetch.recurseSubmodules=false",
+      "-c",
+      "push.recurseSubmodules=false",
+      "ls-files",
+      "-z",
+      "--stage",
+      "--",
+      "."
+    ],
+    {
+      cwd: root,
+      stdout: "pipe",
+      stderr: "pipe",
+      env: workerGitProcessEnvironment()
+    }
+  );
+  if (result.exitCode !== 0) {
+    throw new Error(`Inspect Git index gitlinks: ${result.stderr.toString().trim() || `git exited ${result.exitCode}`}`);
+  }
+  const gitlinks = /* @__PURE__ */ new Set();
+  for (const record of result.stdout.toString().split("\0")) {
+    const match = /^160000 [0-9a-f]+ [0-3]\t(.+)$/su.exec(record);
+    if (!match) continue;
+    const normalized = normalizeRelativePath(match[1]);
+    if (normalized) gitlinks.add(normalized);
+  }
+  return gitlinks;
+}
+function directoryIsEmpty(root, relativePath) {
+  const inspected = inspectRelativePathWithoutFollowingAncestors(root, relativePath);
+  return inspected.kind === "entry" && inspected.stat.isDirectory() && fs.readdirSync(inspected.absolutePath).length === 0;
+}
+function inspectWorkingTree(root, mode, options = {}) {
   const entries = /* @__PURE__ */ new Map();
   root = path.resolve(root);
   if (!inspectDirectoryRoot(root, { allowMissing: true, label: "Working-tree root" })) return entries;
   if (mode === "all") {
     for (const child of fs.readdirSync(root).sort()) addEntry(entries, root, child, true);
   } else {
+    const omittedGitlinks = options.omitUnpopulatedGitlinks ? gitlinkPaths(root) : null;
     for (const relativePath of gitEligibleRoots(root)) {
+      if (omittedGitlinks?.has(relativePath) && directoryIsEmpty(root, relativePath)) continue;
       addEntry(entries, root, relativePath, true);
     }
   }
@@ -332,7 +373,9 @@ function mirrorWorkingTree(input) {
   }
   inspectDirectoryRoot(targetRoot, { allowMissing: false, label: "Working-tree target root" });
   const desired = inspectWorkingTree(sourceRoot, input.sourceMode);
-  const existing = inspectWorkingTree(targetRoot, input.deletionMode === "git" ? "git" : "all");
+  const existing = inspectWorkingTree(targetRoot, input.deletionMode === "git" ? "git" : "all", {
+    omitUnpopulatedGitlinks: input.deletionMode === "git"
+  });
   for (const relativePath of [...existing.keys()].sort((left, right) => right.split("/").length - left.split("/").length)) {
     if (!desired.has(relativePath)) removeEntry(targetRoot, relativePath);
   }
@@ -343,8 +386,212 @@ function mirrorWorkingTree(input) {
   }
   return { paths: [...desired.keys()].filter((relativePath) => desired.get(relativePath)?.kind !== "directory").sort() };
 }
+function normalizeWorkingTreeRelativePath(value) {
+  return normalizeRelativePath(value);
+}
+const MIRROR_TEMPORARY_FILE_PATTERN = /^\.r5d-working-tree-mirror-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\.tmp$/u;
+function relativeDepth(relativePath) {
+  return relativePath.split("/").length;
+}
+function shallowestFirst(left, right) {
+  return relativeDepth(left) - relativeDepth(right) || left.localeCompare(right);
+}
+function deepestFirst(left, right) {
+  return relativeDepth(right) - relativeDepth(left) || left.localeCompare(right);
+}
+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 treeEntryFromStat(stat, absolutePath) {
+  if (stat.isSymbolicLink()) return { kind: "symlink", mode: stat.mode, target: fs.readlinkSync(absolutePath) };
+  if (stat.isFile()) return { kind: "file", mode: stat.mode, size: stat.size };
+  if (stat.isDirectory()) return { kind: "directory", mode: stat.mode };
+  return null;
+}
+function fsyncPath(targetPath, flags) {
+  const descriptor = fs.openSync(targetPath, flags);
+  try {
+    fs.fsyncSync(descriptor);
+  } finally {
+    fs.closeSync(descriptor);
+  }
+}
+function planWorkingTreeMirror(input) {
+  const sourceRoot = path.resolve(input.sourceRoot);
+  const targetRoot = path.resolve(input.targetRoot);
+  const desired = inspectWorkingTree(sourceRoot, input.sourceMode);
+  const existing = inspectWorkingTree(targetRoot, input.deletionMode === "git" ? "git" : "all", {
+    omitUnpopulatedGitlinks: input.deletionMode === "git"
+  });
+  const replaced = /* @__PURE__ */ new Map();
+  const absent = [];
+  for (const [relativePath, entry] of existing) {
+    if (!desired.has(relativePath)) replaced.set(relativePath, entry);
+  }
+  for (const [relativePath, entry] of desired) {
+    const target = inspectRelativePathWithoutFollowingAncestors(targetRoot, relativePath);
+    if (target.kind !== "entry") {
+      absent.push(relativePath);
+      continue;
+    }
+    const { absolutePath, stat } = target;
+    if (entry.kind === "directory") {
+      if (stat.isDirectory()) continue;
+    } else if (entry.kind === "symlink") {
+      if (stat.isSymbolicLink() && fs.readlinkSync(absolutePath) === entry.target) continue;
+    } else if (stat.isFile() && filesEqual(path.join(sourceRoot, ...relativePath.split("/")), absolutePath, entry)) {
+      continue;
+    }
+    const current = treeEntryFromStat(stat, absolutePath);
+    if (current) replaced.set(relativePath, current);
+    else absent.push(relativePath);
+  }
+  const replacedDirectories = new Set(
+    [...replaced].filter(([, entry]) => entry.kind === "directory").map(([relativePath]) => relativePath)
+  );
+  for (const relativePath of [...replaced.keys()]) {
+    if (hasAncestorIn(relativePath, replacedDirectories)) replaced.delete(relativePath);
+  }
+  return {
+    desired,
+    replaced,
+    absent: absent.filter((relativePath) => !hasAncestorIn(relativePath, replacedDirectories)).sort(shallowestFirst)
+  };
+}
+function captureWorkingTreeMirrorPlan(input) {
+  const targetRoot = path.resolve(input.targetRoot);
+  const snapshotRoot = path.resolve(input.snapshotRoot);
+  const durability = input.durability ?? "per_entry";
+  inspectDirectoryRoot(targetRoot, { allowMissing: false, label: "Working-tree target root" });
+  if (!inspectDirectoryRoot(snapshotRoot, { allowMissing: true, label: "Working-tree snapshot root" })) {
+    fs.mkdirSync(snapshotRoot, { recursive: true });
+  }
+  const trees = [];
+  for (const [relativePath, entry] of [...input.plan.replaced.entries()].sort(([left], [right]) => shallowestFirst(left, right))) {
+    if (entry.kind !== "directory") {
+      copyEntry(targetRoot, snapshotRoot, relativePath, entry, durability);
+      continue;
+    }
+    const source = inspectRelativePathWithoutFollowingAncestors(targetRoot, relativePath);
+    if (source.kind !== "entry" || !source.stat.isDirectory()) {
+      throw new Error(`Working-tree source changed while it was being mirrored: ${path.join(targetRoot, ...relativePath.split("/"))}`);
+    }
+    ensureDirectory(snapshotRoot, relativePath, entry.mode);
+    mirrorWorkingTree({
+      sourceRoot: source.absolutePath,
+      targetRoot: path.join(snapshotRoot, ...relativePath.split("/")),
+      sourceMode: "all",
+      deletionMode: "all",
+      durability
+    });
+    trees.push(relativePath);
+  }
+  return { absent: [...input.plan.absent].sort(shallowestFirst), trees: trees.sort(shallowestFirst) };
+}
+function restoreWorkingTreeMirrorScope(input) {
+  const snapshotRoot = path.resolve(input.snapshotRoot);
+  const targetRoot = path.resolve(input.targetRoot);
+  inspectDirectoryRoot(snapshotRoot, { allowMissing: false, label: "Working-tree snapshot root" });
+  if (!inspectDirectoryRoot(targetRoot, { allowMissing: true, label: "Working-tree target root" })) {
+    fs.mkdirSync(targetRoot, { recursive: true });
+  }
+  const normalize = (relativePath) => {
+    const normalized = normalizeRelativePath(relativePath);
+    if (!normalized) throw new Error(`Invalid working-tree scope path: ${relativePath}`);
+    return normalized;
+  };
+  const absent = input.scope.absent.map(normalize);
+  const trees = new Set(input.scope.trees.map(normalize));
+  const captured = inspectWorkingTree(snapshotRoot, "all");
+  for (const tree of trees) {
+    if (captured.get(tree)?.kind !== "directory") {
+      throw new Error(`Working-tree snapshot does not hold the captured directory: ${tree}`);
+    }
+  }
+  const touched = /* @__PURE__ */ new Set();
+  for (const relativePath of [...absent].sort(deepestFirst)) {
+    const inspected = inspectRelativePathWithoutFollowingAncestors(targetRoot, relativePath);
+    if (inspected.kind === "entry") fs.rmSync(inspected.absolutePath, { recursive: true, force: true });
+    touched.add(relativePath);
+  }
+  const writtenDirectories = /* @__PURE__ */ new Set();
+  for (const relativePath of absent) writtenDirectories.add(path.posix.dirname(relativePath));
+  for (const [relativePath, entry] of captured) {
+    if (entry.kind !== "directory" && !hasAncestorIn(relativePath, trees)) writtenDirectories.add(path.posix.dirname(relativePath));
+  }
+  for (const directory of writtenDirectories) {
+    let absoluteDirectory = targetRoot;
+    if (directory !== ".") {
+      const inspected = inspectRelativePathWithoutFollowingAncestors(targetRoot, directory);
+      if (inspected.kind !== "entry" || !inspected.stat.isDirectory()) continue;
+      absoluteDirectory = inspected.absolutePath;
+    }
+    for (const name of fs.readdirSync(absoluteDirectory)) {
+      if (!MIRROR_TEMPORARY_FILE_PATTERN.test(name)) continue;
+      const temporaryPath = path.join(absoluteDirectory, name);
+      if (!fs.lstatSync(temporaryPath).isFile()) continue;
+      fs.rmSync(temporaryPath, { force: true });
+      touched.add(directory === "." ? name : path.posix.join(directory, name));
+    }
+  }
+  for (const [relativePath, entry] of [...captured.entries()].sort(([left], [right]) => shallowestFirst(left, right))) {
+    touched.add(relativePath);
+    if (hasAncestorIn(relativePath, trees)) continue;
+    if (!trees.has(relativePath)) {
+      copyEntry(snapshotRoot, targetRoot, relativePath, entry, "per_entry");
+      continue;
+    }
+    const current = inspectRelativePathWithoutFollowingAncestors(targetRoot, relativePath);
+    if (current.kind === "blocked") {
+      throw new Error(`Refusing to restore a working-tree directory through a symlink or non-directory: ${current.blockingPath}`);
+    }
+    if (current.kind === "entry" && !current.stat.isDirectory()) {
+      fs.rmSync(current.absolutePath, { recursive: true, force: true });
+    }
+    ensureDirectory(targetRoot, relativePath, entry.mode);
+    mirrorWorkingTree({
+      sourceRoot: path.join(snapshotRoot, ...relativePath.split("/")),
+      targetRoot: path.join(targetRoot, ...relativePath.split("/")),
+      sourceMode: "all",
+      deletionMode: "all"
+    });
+  }
+  return { paths: [...touched].sort(shallowestFirst) };
+}
+function fsyncWorkingTreePaths(root, relativePaths) {
+  root = path.resolve(root);
+  inspectDirectoryRoot(root, { allowMissing: false, label: "Working-tree root" });
+  const directories = /* @__PURE__ */ new Set(["."]);
+  for (const relativePath of relativePaths) {
+    const normalized = normalizeRelativePath(relativePath);
+    if (!normalized) throw new Error(`Invalid working-tree path: ${relativePath}`);
+    directories.add(path.posix.dirname(normalized));
+    const inspected = inspectRelativePathWithoutFollowingAncestors(root, normalized);
+    if (inspected.kind !== "entry") continue;
+    if (inspected.stat.isDirectory()) directories.add(normalized);
+    else if (inspected.stat.isFile()) fsyncPath(inspected.absolutePath, fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW);
+  }
+  for (const directory of directories) {
+    if (directory === ".") {
+      fsyncPath(root, fs.constants.O_RDONLY);
+      continue;
+    }
+    const inspected = inspectRelativePathWithoutFollowingAncestors(root, directory);
+    if (inspected.kind === "entry" && inspected.stat.isDirectory()) fsyncPath(inspected.absolutePath, fs.constants.O_RDONLY);
+  }
+}
 export {
   assertWorkingTreeHasNoPortableGitMetadataAliases,
+  captureWorkingTreeMirrorPlan,
+  fsyncWorkingTreePaths,
   inspectWorkingTree,
-  mirrorWorkingTree
+  mirrorWorkingTree,
+  normalizeWorkingTreeRelativePath,
+  planWorkingTreeMirror,
+  restoreWorkingTreeMirrorScope
 };

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

@@ -6,7 +6,15 @@ import {
   mergeWorkspaceProjectionMount,
   workspaceMergeProjectionSupport
 } from "./workspace-merge-projection.mjs";
-import { mirrorWorkingTree } from "./working-tree-mirror.mjs";
+import {
+  captureWorkingTreeMirrorPlan,
+  fsyncWorkingTreePaths,
+  inspectWorkingTree,
+  mirrorWorkingTree,
+  normalizeWorkingTreeRelativePath,
+  planWorkingTreeMirror,
+  restoreWorkingTreeMirrorScope
+} from "./working-tree-mirror.mjs";
 import { assertManagedDirectoryPath } from "./workspace-mount-boundary.mjs";
 const WORKSPACE_GIT_BRANCH = "main";
 const MAX_WORKSPACE_GIT_DIFF_BYTES = 5 * 1024 * 1024;
@@ -909,7 +917,7 @@ function parseHydrationTransactionManifest(transactionPath) {
     throw new Error(`Workspace hydration transaction manifest is invalid: ${manifestPath}`);
   }
   const candidate = parsed;
-  if (candidate.version !== 2 && candidate.version !== 3 || !Array.isArray(candidate.mounts)) {
+  if (candidate.version !== 2 && candidate.version !== 3 && candidate.version !== 4 || !Array.isArray(candidate.mounts)) {
     throw new Error(`Workspace hydration transaction manifest is invalid: ${manifestPath}`);
   }
   const parseReceipt = (rawReceipt) => {
@@ -922,6 +930,25 @@ function parseHydrationTransactionManifest(transactionPath) {
   };
   const targetReceipt = parseReceipt(candidate.targetReceipt);
   const receiptBefore = parseReceipt(candidate.receiptBefore);
+  const parseScope = (rawScope, existed) => {
+    if (rawScope === void 0) return void 0;
+    if (candidate.version !== 4 || !existed || !rawScope || typeof rawScope !== "object") {
+      throw new Error(`Workspace hydration transaction manifest is invalid: ${manifestPath}`);
+    }
+    const parsePaths = (rawPaths) => {
+      if (!Array.isArray(rawPaths)) throw new Error(`Workspace hydration transaction manifest is invalid: ${manifestPath}`);
+      const seen = /* @__PURE__ */ new Set();
+      return rawPaths.map((rawPath) => {
+        if (typeof rawPath !== "string" || normalizeWorkingTreeRelativePath(rawPath) !== rawPath || seen.has(rawPath)) {
+          throw new Error(`Workspace hydration transaction manifest is invalid: ${manifestPath}`);
+        }
+        seen.add(rawPath);
+        return rawPath;
+      });
+    };
+    const { absent, trees } = rawScope;
+    return { absent: parsePaths(absent), trees: parsePaths(trees) };
+  };
   const seenIds = /* @__PURE__ */ new Set();
   const seenSnapshots = /* @__PURE__ */ new Set();
   const mounts = candidate.mounts.map((rawMount) => {
@@ -938,10 +965,20 @@ function parseHydrationTransactionManifest(transactionPath) {
     }
     seenIds.add(mount.id);
     seenSnapshots.add(mount.snapshotName);
-    return mount;
+    const scope = parseScope(rawMount.scope, mount.existed);
+    return {
+      id: mount.id,
+      incarnationKey: mount.incarnationKey,
+      sourcePath: mount.sourcePath,
+      durabilityRootPath: mount.durabilityRootPath,
+      workspaceRelativePath: mount.workspaceRelativePath,
+      existed: mount.existed,
+      snapshotName: mount.snapshotName,
+      ...scope ? { scope } : {}
+    };
   });
   return {
-    version: 3,
+    version: candidate.version === 4 ? 4 : 3,
     targetReceipt,
     receiptBefore,
     mounts
@@ -963,6 +1000,7 @@ function hydrationTransactionCommitted(transactionPath) {
 }
 function restoreHydrationTransaction(workspacePath, manifest) {
   const transactionPath = hydrationTransactionPath(workspacePath);
+  const durabilityScopes = /* @__PURE__ */ new Map();
   for (const mount of manifest.mounts) {
     assertManagedDirectoryPath({
       trustedRoot: mount.durabilityRootPath,
@@ -978,6 +1016,11 @@ function restoreHydrationTransaction(workspacePath, manifest) {
     if (!snapshotStatus.isDirectory() || snapshotStatus.isSymbolicLink()) {
       throw new Error(`Workspace hydration snapshot is not a regular directory: ${snapshotPath}`);
     }
+    if (mount.scope) {
+      const restored = restoreWorkingTreeMirrorScope({ snapshotRoot: snapshotPath, targetRoot: mount.sourcePath, scope: mount.scope });
+      durabilityScopes.set(mount.id, restored.paths);
+      continue;
+    }
     mirrorWorkingTree({ sourceRoot: snapshotPath, targetRoot: mount.sourcePath, sourceMode: "all", deletionMode: "all" });
   }
   fsyncHydratedWorkspaceMounts(
@@ -986,7 +1029,8 @@ function restoreHydrationTransaction(workspacePath, manifest) {
       hydrationIncarnationKey: mount.incarnationKey,
       sourceMode: "all",
       hydrateDeletionMode: "all"
-    }))
+    })),
+    durabilityScopes
   );
 }
 function recoverPendingHydrationTransaction(workspacePath) {
@@ -1030,57 +1074,80 @@ function beginHydrationTransaction(workspacePath, mounts, targetReceipt) {
   const transactionPath = hydrationTransactionPath(workspacePath);
   const stagingPath = path.join(stateDirectory, `.workspace-hydration-transaction.${process.pid}.${crypto.randomUUID()}.tmp`);
   fs.mkdirSync(stagingPath, { mode: 448 });
+  const durabilityScopes = /* @__PURE__ */ new Map();
   try {
     const snapshotRoot = path.join(stagingPath, "mounts");
     fs.mkdirSync(snapshotRoot, { mode: 448 });
-    const manifest = {
-      version: 3,
-      targetReceipt,
-      receiptBefore: readHydratedWorkspaceReceipt(workspacePath),
-      mounts: mounts.map((mount, index) => {
-        const sourcePath = path.resolve(mount.sourcePath);
-        const durabilityRootPath = path.resolve(mount.durabilityRootPath);
+    const receiptBefore = readHydratedWorkspaceReceipt(workspacePath);
+    const manifestMounts = mounts.map((mount, index) => {
+      const sourcePath = path.resolve(mount.sourcePath);
+      const durabilityRootPath = path.resolve(mount.durabilityRootPath);
+      assertManagedDirectoryPath({
+        trustedRoot: durabilityRootPath,
+        candidate: sourcePath,
+        label: `Workspace hydration snapshot mount ${mount.id}`
+      });
+      const sourceStatus = lstatIfExists(sourcePath);
+      if (sourceStatus && (!sourceStatus.isDirectory() || sourceStatus.isSymbolicLink())) {
+        throw new Error(`Workspace hydration snapshot source is not a regular directory: ${sourcePath}`);
+      }
+      const snapshotName = String(index);
+      const snapshotPath = path.join(snapshotRoot, snapshotName);
+      fs.mkdirSync(snapshotPath, { mode: 448 });
+      let scope;
+      if (sourceStatus && mount.hydrateDeletionMode === "git") {
+        const outerPath = workspaceMountOuterPath(workspacePath, mount);
         assertManagedDirectoryPath({
-          trustedRoot: durabilityRootPath,
-          candidate: sourcePath,
-          label: `Workspace hydration snapshot mount ${mount.id}`
+          trustedRoot: workspacePath,
+          candidate: outerPath,
+          label: `Workspace mount ${mount.id} outer source`
         });
-        const sourceStatus = lstatIfExists(sourcePath);
-        if (sourceStatus && (!sourceStatus.isDirectory() || sourceStatus.isSymbolicLink())) {
-          throw new Error(`Workspace hydration snapshot source is not a regular directory: ${sourcePath}`);
-        }
-        const snapshotName = String(index);
-        const snapshotPath = path.join(snapshotRoot, snapshotName);
-        fs.mkdirSync(snapshotPath, { mode: 448 });
-        if (sourceStatus) {
-          mirrorWorkingTree({
-            sourceRoot: sourcePath,
-            targetRoot: snapshotPath,
-            sourceMode: "all",
-            deletionMode: "all",
-            // This tree is still private and the source authority is untouched.
-            // The single recursive barrier below makes the complete snapshot
-            // durable before its directory entry is published or hydration starts.
-            durability: "deferred_private_staging"
-          });
-        }
-        return {
-          id: mount.id,
-          incarnationKey: mount.hydrationIncarnationKey,
-          sourcePath,
-          durabilityRootPath,
-          workspaceRelativePath: mount.workspaceRelativePath,
-          existed: Boolean(sourceStatus),
-          snapshotName
-        };
-      })
+        const plan = planWorkingTreeMirror({ sourceRoot: outerPath, targetRoot: sourcePath, sourceMode: "all", deletionMode: "git" });
+        scope = captureWorkingTreeMirrorPlan({
+          plan,
+          targetRoot: sourcePath,
+          snapshotRoot: snapshotPath,
+          // Same private-staging deferral as the complete snapshot below.
+          durability: "deferred_private_staging"
+        });
+        durabilityScopes.set(mount.id, [...plan.desired.keys()]);
+      } else if (sourceStatus) {
+        mirrorWorkingTree({
+          sourceRoot: sourcePath,
+          targetRoot: snapshotPath,
+          sourceMode: "all",
+          deletionMode: "all",
+          // This tree is still private and the source authority is untouched.
+          // The single recursive barrier below makes the complete snapshot
+          // durable before its directory entry is published or hydration starts.
+          durability: "deferred_private_staging"
+        });
+      }
+      return {
+        id: mount.id,
+        incarnationKey: mount.hydrationIncarnationKey,
+        sourcePath,
+        durabilityRootPath,
+        workspaceRelativePath: mount.workspaceRelativePath,
+        existed: Boolean(sourceStatus),
+        snapshotName,
+        ...scope ? { scope } : {}
+      };
+    });
+    const manifest = {
+      // Older workers reject version 4, so a scoped snapshot can never be
+      // replayed as a complete copy after a downgrade.
+      version: manifestMounts.some((mount) => mount.scope) ? 4 : 3,
+      targetReceipt,
+      receiptBefore,
+      mounts: manifestMounts
     };
     writePrivateFileDurably(path.join(stagingPath, "manifest.json"), `${JSON.stringify(manifest)}
 `);
     fsyncTree(stagingPath);
     fs.renameSync(stagingPath, transactionPath);
     fsyncDirectory(stateDirectory);
-    return manifest;
+    return { manifest, durabilityScopes };
   } catch (error) {
     fs.rmSync(stagingPath, { recursive: true, force: true });
     fsyncDirectory(stateDirectory);
@@ -1092,7 +1159,11 @@ function markHydrationTransactionDurable(workspacePath) {
   writePrivateFileDurably(path.join(transactionPath, "committed"), "committed\n");
   fsyncDirectory(transactionPath);
 }
-function fsyncHydratedWorkspaceMount(mount) {
+function gitVisibleDurabilityPaths(mount, sourcePath, sourceStatus) {
+  if (mount.hydrateDeletionMode !== "git" || !sourceStatus.isDirectory() || !lstatIfExists(path.join(sourcePath, ".git"))) return null;
+  return [...inspectWorkingTree(sourcePath, "git").keys()];
+}
+function fsyncHydratedWorkspaceMount(mount, scope) {
   assertManagedDirectoryPath({
     trustedRoot: mount.durabilityRootPath,
     candidate: mount.sourcePath,
@@ -1117,7 +1188,17 @@ function fsyncHydratedWorkspaceMount(mount) {
       fs.closeSync(descriptor);
     }
   };
-  if (fs.existsSync(mount.sourcePath)) syncEntry(mount.sourcePath, true);
+  const sourcePath = path.resolve(mount.sourcePath);
+  const sourceStatus = lstatIfExists(sourcePath);
+  if (sourceStatus) {
+    const paths = scope ?? gitVisibleDurabilityPaths(mount, sourcePath, sourceStatus);
+    if (paths) {
+      if (!sourceStatus.isDirectory()) throw new Error(`Workspace mount ${mount.id} source is not a regular directory: ${sourcePath}`);
+      fsyncWorkingTreePaths(sourcePath, paths);
+    } else {
+      syncEntry(sourcePath, true);
+    }
+  }
   const durabilityRoot = path.resolve(mount.durabilityRootPath);
   let boundaryParent = path.dirname(path.resolve(mount.sourcePath));
   while (true) {
@@ -1136,8 +1217,8 @@ function fsyncHydratedWorkspaceMount(mount) {
     boundaryParent = nextParent;
   }
 }
-function fsyncHydratedWorkspaceMounts(mounts) {
-  for (const mount of mounts) fsyncHydratedWorkspaceMount(mount);
+function fsyncHydratedWorkspaceMounts(mounts, scopes = /* @__PURE__ */ new Map()) {
+  for (const mount of mounts) fsyncHydratedWorkspaceMount(mount, scopes.get(mount.id));
 }
 function workspaceIsShallow(workspacePath) {
   return gitResult(workspacePath, ["rev-parse", "--is-shallow-repository"]).stdout === "true";
@@ -1386,6 +1467,9 @@ function restoreDeferredWorkspaceMountsFromHead(workspacePath, mounts) {
     }
   }
 }
+function workspaceMountOuterPath(workspacePath, mount) {
+  return path.join(workspacePath, ...mount.workspaceRelativePath.replace(/\\/g, "/").split("/"));
+}
 function hydrateWorkspaceGitMountsRaw(workspacePath, mounts, options = {}) {
   const hydratedMountIds = [];
   const skippedMountIds = [];
@@ -1394,7 +1478,7 @@ function hydrateWorkspaceGitMountsRaw(workspacePath, mounts, options = {}) {
       skippedMountIds.push(mount.id);
       continue;
     }
-    const sourceRoot = path.join(workspacePath, ...mount.workspaceRelativePath.replace(/\\/g, "/").split("/"));
+    const sourceRoot = workspaceMountOuterPath(workspacePath, mount);
     assertManagedDirectoryPath({
       trustedRoot: workspacePath,
       candidate: sourceRoot,
@@ -1500,14 +1584,14 @@ async function hydrateWorkspaceGitMountsTransactionally(input) {
   }
   const selection = computeSelection();
   const { hydrationMounts, advancedDurabilityMounts, targetReceipt } = selection;
-  const manifest = beginHydrationTransaction(workspacePath, hydrationMounts, targetReceipt);
+  const { manifest, durabilityScopes } = beginHydrationTransaction(workspacePath, hydrationMounts, targetReceipt);
   try {
     const hydration = hydrateWorkspaceGitMountsRaw(workspacePath, hydrationMounts, { ignoreBusy: true });
     const expectedHydratedIds = hydrationMounts.map(({ id }) => id).sort();
     if (hydration.skippedMountIds.length > 0 || hydration.hydratedMountIds.length !== expectedHydratedIds.length || hydration.hydratedMountIds.some((id, index) => id !== expectedHydratedIds[index])) {
       throw new Error("Workspace hydration did not include every required mount");
     }
-    fsyncHydratedWorkspaceMounts(advancedDurabilityMounts);
+    fsyncHydratedWorkspaceMounts(advancedDurabilityMounts, durabilityScopes);
     markHydrationTransactionDurable(workspacePath);
     if (targetReceipt) updateHydratedWorkspaceReceipt(workspacePath, targetReceipt);
     removeHydrationTransaction(workspacePath);

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

@@ -170,6 +170,14 @@ 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);
@@ -184,6 +192,15 @@ function synthesizeMountTree(input) {
       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,
@@ -248,7 +265,8 @@ function synthesizeOursCommit(input) {
   const mountTree = synthesizeMountTree({
     workspacePath: input.workspacePath,
     sourcePath: input.mount.sourcePath,
-    sourceMode: input.mount.sourceMode
+    sourceMode: input.mount.sourceMode,
+    gitlinkBasis: { basisHead: input.basisHead, workspaceRelativePath: input.workspaceRelativePath }
   });
   const rootTree = graftMountTree({
     workspacePath: input.workspacePath,