@ricsam/r5d-worker 0.0.100 → 0.0.101

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

@@ -128,6 +128,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: (0, import_git_process_environment.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;
 }
@@ -1139,7 +1155,13 @@ function beginHydrationTransaction(workspacePath, mounts, targetReceipt) {
           candidate: outerPath,
           label: `Workspace mount ${mount.id} outer source`
         });
-        const plan = (0, import_working_tree_mirror.planWorkingTreeMirror)({ sourceRoot: outerPath, targetRoot: sourcePath, sourceMode: "all", deletionMode: "git" });
+        const plan = (0, import_working_tree_mirror.planWorkingTreeMirror)({
+          sourceRoot: outerPath,
+          targetRoot: sourcePath,
+          sourceMode: "all",
+          deletionMode: "git",
+          sourceGitlinks: outerSubtreeGitlinks(workspacePath, mount)
+        });
         scope = (0, import_working_tree_mirror.captureWorkingTreeMirrorPlan)({
           plan,
           targetRoot: sourcePath,
@@ -1450,6 +1472,7 @@ function activeMounts(mounts) {
   return { active, tombstones, skipped };
 }
 function mirrorMountsToWorkspace(workspacePath, mounts) {
+  const projected = [];
   for (const mount of mounts) {
     (0, import_workspace_mount_boundary.assertManagedDirectoryPath)({
       trustedRoot: mount.durabilityRootPath,
@@ -1461,13 +1484,61 @@ function mirrorMountsToWorkspace(workspacePath, mounts) {
       candidate: import_node_path.default.join(workspacePath, ...mount.workspaceRelativePath.replace(/\\/g, "/").split("/")),
       label: `Workspace mount ${mount.id} outer target`
     });
-    (0, import_working_tree_mirror.mirrorWorkingTree)({
+    const mirrored = (0, import_working_tree_mirror.mirrorWorkingTree)({
       sourceRoot: mount.sourcePath,
       targetRoot: import_node_path.default.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 = import_node_path.default.posix.dirname(relativePath);
+  while (parent !== ".") {
+    if (ancestors.has(parent)) return true;
+    parent = import_node_path.default.posix.dirname(parent);
+  }
+  return false;
 }
 function removeWorkspaceMounts(workspacePath, mounts) {
   for (const mount of mounts) {
@@ -1507,6 +1578,24 @@ function restoreDeferredWorkspaceMountsFromHead(workspacePath, mounts) {
 function workspaceMountOuterPath(workspacePath, mount) {
   return import_node_path.default.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: (0, import_git_process_environment.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 = [];
@@ -1550,6 +1639,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.
@@ -1565,7 +1657,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),
@@ -1574,8 +1666,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;
@@ -1841,7 +1933,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;
@@ -1864,21 +1956,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) => [
@@ -1887,7 +2001,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 [];
@@ -1895,16 +2009,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() };
 }
@@ -2168,10 +2280,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) {
@@ -2201,7 +2315,7 @@ async function synchronizeWorkspaceGit(input) {
           cycleSkippedMountIds.add(mount.id);
           continue;
         }
-        mirrorMountsToWorkspace(workspacePath, [mount]);
+        projectedGitlinks.push(...mirrorMountsToWorkspace(workspacePath, [mount]));
         projectedFastMounts.push(mount);
         await yieldToWorkerEventLoop();
       }
@@ -2300,7 +2414,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) {
@@ -2310,7 +2426,8 @@ async function synchronizeWorkspaceGit(input) {
         localHead,
         mounts: input.mounts,
         limit: maxDiffBytes,
-        measure: measureDiffSize
+        measure: measureDiffSize,
+        excludePathspecs: gitlinkMigrationExcludes
       });
       input.assertStillAdmitted?.();
       if (initialPublication && initialPublication.size <= maxDiffBytes) {
@@ -2318,6 +2435,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 {
@@ -2362,7 +2484,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}`);

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

@@ -206,14 +206,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 = import_node_path.default.resolve(input.sourcePath);
   const entries = (0, import_working_tree_mirror.inspectWorkingTree)(sourceRoot, input.sourceMode);
@@ -224,19 +216,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,
@@ -301,8 +288,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/package.json

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