@ricsam/r5d-worker 0.0.101 → 0.0.104

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

@@ -1389,6 +1389,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 = import_node_path.default.resolve(input.workspacePath);
   const workspaceParent = import_node_path.default.dirname(workspacePath);
@@ -1436,7 +1449,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 () => {
@@ -1457,7 +1471,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 = [];
@@ -2106,6 +2120,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 = import_node_path.default.resolve(input.workspacePath);
   const attemptId = input.attemptId ?? crypto.randomUUID();
   const maxDiffBytes = input.maxDiffBytes ?? MAX_WORKSPACE_GIT_DIFF_BYTES;
@@ -2114,6 +2133,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,
@@ -2161,11 +2181,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 ? (0, import_workspace_merge_projection.workspaceMergeProjectionSupport)() : { supported: false, error: "Workspace merge projection is disabled by R5D_WORKSPACE_MERGE_PROJECTION=0" };
@@ -2304,6 +2335,7 @@ async function synchronizeWorkspaceGit(input) {
     }
   };
   const projectedFastMounts = [];
+  const currentProjectionMounts = [];
   if (!input.skipMountMirror) {
     beginWorkspaceCheckoutTransition(workspacePath);
     try {
@@ -2315,6 +2347,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();
@@ -2348,7 +2384,7 @@ async function synchronizeWorkspaceGit(input) {
     const targetProjectionReceipt = receiptWithMountsAtHead(
       projectionBasisReceipt,
       projectedHead,
-      projectedFastMounts,
+      [...projectedFastMounts, ...currentProjectionMounts],
       allProjectionReceiptMounts
     );
     const currentProjectionReceipt = await readHydratedWorkspaceReceiptAsync(workspacePath);
@@ -2361,7 +2397,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) {
@@ -2518,6 +2556,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/cjs/workspace-mutation-gate.cjs

@@ -50,8 +50,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/cjs/workspace-projection-ledger.cjs

@@ -0,0 +1,81 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var workspace_projection_ledger_exports = {};
+__export(workspace_projection_ledger_exports, {
+  WorkspaceProjectionLedger: () => WorkspaceProjectionLedger
+});
+module.exports = __toCommonJS(workspace_projection_ledger_exports);
+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;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  WorkspaceProjectionLedger
+});

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

@@ -0,0 +1,58 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var workspace_sync_coalescer_exports = {};
+__export(workspace_sync_coalescer_exports, {
+  WorkspaceSyncCoalescer: () => WorkspaceSyncCoalescer
+});
+module.exports = __toCommonJS(workspace_sync_coalescer_exports);
+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;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  WorkspaceSyncCoalescer
+});