@ricsam/r5d-worker 0.0.104 → 0.0.105

package/dist/cjs/main.cjs

@@ -3986,6 +3986,7 @@ async function startWorker(options) {
     )
   ].sort();
   const ensureConfiguredProjects = async (onProgress) => {
+    const reconciledProjectIds = /* @__PURE__ */ new Set();
     const projects = [...projectConfigById.values()];
     for (const [projectIndex, project] of projects.entries()) {
       onProgress?.({
@@ -4051,6 +4052,7 @@ async function startWorker(options) {
         });
         readyProjectIds.add(project.projectId);
         reconciledProjectConfigFingerprints.set(project.projectId, configFingerprint);
+        reconciledProjectIds.add(project.projectId);
         for (const state of states) {
           pendingCheckouts.delete(projectBranchKey(project.projectId, state.branchName));
           const key = projectBranchKey(project.projectId, state.branchName);
@@ -4088,26 +4090,37 @@ async function startWorker(options) {
         totalItems: projects.length
       });
     }
+    return reconciledProjectIds;
   };
-  const collectAheadOfOriginBranches = async () => {
+  const ORIGIN_DIVERGENCE_REFRESH_INTERVAL_MS = 5 * 60 * 1e3;
+  const lastOriginDivergenceFetchMs = /* @__PURE__ */ new Map();
+  const collectAheadOfOriginBranches = async (refetchOriginProjectIds) => {
     const aheadBranches = [];
+    for (const projectId of [...lastOriginDivergenceFetchMs.keys()]) {
+      if (!projectConfigById.has(projectId)) lastOriginDivergenceFetchMs.delete(projectId);
+    }
     for (const project of projectConfigById.values()) {
       if (project.executionDisabled || !readyProjectIds.has(project.projectId) || project.branches.length === 0) continue;
       const connection = projectConnection(project);
       const primaryPath = configuredProjectBranchPath(projectsRoot, project, primaryProjectBranch(project));
-      if (!await tryGitAsync(
-        [
-          ...(0, import_git_process_environment.gitTransportSecurityArgs)(connection.originUrl, connection.credentialHelper, connection.originCredentialUsername),
-          "fetch",
-          "--no-recurse-submodules",
-          "--prune",
-          "origin",
-          "+refs/heads/*:refs/remotes/origin/*"
-        ],
-        { cwd: primaryPath }
-      )) {
-        process.stderr.write(`[r5d-worker] could not refresh origin divergence for ${project.projectPath}
+      const lastFetchedAtMs = lastOriginDivergenceFetchMs.get(project.projectId);
+      if (refetchOriginProjectIds.has(project.projectId) || lastFetchedAtMs === void 0 || Date.now() - lastFetchedAtMs >= ORIGIN_DIVERGENCE_REFRESH_INTERVAL_MS) {
+        if (await tryGitAsync(
+          [
+            ...(0, import_git_process_environment.gitTransportSecurityArgs)(connection.originUrl, connection.credentialHelper, connection.originCredentialUsername),
+            "fetch",
+            "--no-recurse-submodules",
+            "--prune",
+            "origin",
+            "+refs/heads/*:refs/remotes/origin/*"
+          ],
+          { cwd: primaryPath }
+        )) {
+          lastOriginDivergenceFetchMs.set(project.projectId, Date.now());
+        } else {
+          process.stderr.write(`[r5d-worker] could not refresh origin divergence for ${project.projectPath}
 `);
+        }
       }
       for (const branch of project.branches) {
         const branchPath = configuredProjectBranchPath(projectsRoot, project, branch.branchName);
@@ -5238,7 +5251,7 @@ async function startWorker(options) {
           // checkout initialization from erasing synchronized dirt.
           { ignoreBusy: true, hydrationHooks: workspaceHydrationTransactionHooks }
         );
-        await ensureConfiguredProjects((progress) => {
+        const reconciledProjectIds = await ensureConfiguredProjects((progress) => {
           sendLifecycleProgress({ phase: "configuring", operationId: configurationOperationId, ...progress });
           process.stdout.write(
             `[r5d-worker] ${progress.detail ?? "Configuring workspace"}${progress.completedBytes === void 0 ? "" : `: ${progress.completedBytes}/${progress.totalBytes ?? "?"} bytes`}${progress.completedItems === void 0 ? "" : `, ${progress.completedItems}/${progress.totalItems ?? "?"} item(s)`}
@@ -5294,7 +5307,7 @@ async function startWorker(options) {
         const pending = [...pendingCheckouts.values()].sort(
           (left, right) => left.projectId.localeCompare(right.projectId) || left.branchName.localeCompare(right.branchName)
         );
-        return { result, pending, aheadOfOriginBranches: await collectAheadOfOriginBranches() };
+        return { result, pending, aheadOfOriginBranches: await collectAheadOfOriginBranches(reconciledProjectIds) };
       });
     } catch (error) {
       if (receiptGeneration !== workspaceConfigurationReceiptGeneration) {

package/dist/cjs/package.json

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

package/dist/cjs/project-worktrees.cjs

@@ -1006,11 +1006,12 @@ async function reconcileLinkedLayout(input) {
   const plan = [];
   for (const branch of input.branches) {
     const checkoutPath = branchPath(input.projectRoot, branch.branchName);
+    const exactMirror = input.exactMirrorBranches?.has(branch.branchName) === true;
     const resolved = await seedForBranch({
       ...input,
       primaryPath,
       branch,
-      requireMirrorHead: input.exactMirrorBranches?.has(branch.branchName)
+      requireMirrorHead: exactMirror
     });
     mirrorHeads.set(branch.branchName, resolved.mirrorHead);
     const linked = branch.branchName === input.primaryBranchName || gitDirectoryKind(checkoutPath) !== null && await commonGitDirectoryAsync(checkoutPath) === primaryCommonDir;
@@ -1019,7 +1020,8 @@ async function reconcileLinkedLayout(input) {
       continue;
     }
     const currentHead = await gitAsync(checkoutPath, ["rev-parse", "HEAD"], `resolve linked worktree head ${branch.branchName}`);
-    plan.push({ branchName: branch.branchName, checkoutPath, seed: resolved.seed, action: currentHead === resolved.seed ? "keep" : "reset" });
+    const keep = currentHead === resolved.seed || !exactMirror && await tryGitAsync(checkoutPath, ["merge-base", "--is-ancestor", resolved.seed, currentHead]);
+    plan.push({ branchName: branch.branchName, checkoutPath, seed: resolved.seed, action: keep ? "keep" : "reset" });
   }
   const mutatedBranches = new Set(plan.filter(({ action }) => action !== "keep").map(({ branchName }) => branchName));
   if (mutatedBranches.size > 0) input.beforeDestructiveMutation(mutatedBranches);

package/dist/mjs/main.mjs

@@ -3997,6 +3997,7 @@ async function startWorker(options) {
     )
   ].sort();
   const ensureConfiguredProjects = async (onProgress) => {
+    const reconciledProjectIds = /* @__PURE__ */ new Set();
     const projects = [...projectConfigById.values()];
     for (const [projectIndex, project] of projects.entries()) {
       onProgress?.({
@@ -4062,6 +4063,7 @@ async function startWorker(options) {
         });
         readyProjectIds.add(project.projectId);
         reconciledProjectConfigFingerprints.set(project.projectId, configFingerprint);
+        reconciledProjectIds.add(project.projectId);
         for (const state of states) {
           pendingCheckouts.delete(projectBranchKey(project.projectId, state.branchName));
           const key = projectBranchKey(project.projectId, state.branchName);
@@ -4099,26 +4101,37 @@ async function startWorker(options) {
         totalItems: projects.length
       });
     }
+    return reconciledProjectIds;
   };
-  const collectAheadOfOriginBranches = async () => {
+  const ORIGIN_DIVERGENCE_REFRESH_INTERVAL_MS = 5 * 60 * 1e3;
+  const lastOriginDivergenceFetchMs = /* @__PURE__ */ new Map();
+  const collectAheadOfOriginBranches = async (refetchOriginProjectIds) => {
     const aheadBranches = [];
+    for (const projectId of [...lastOriginDivergenceFetchMs.keys()]) {
+      if (!projectConfigById.has(projectId)) lastOriginDivergenceFetchMs.delete(projectId);
+    }
     for (const project of projectConfigById.values()) {
       if (project.executionDisabled || !readyProjectIds.has(project.projectId) || project.branches.length === 0) continue;
       const connection = projectConnection(project);
       const primaryPath = configuredProjectBranchPath(projectsRoot, project, primaryProjectBranch(project));
-      if (!await tryGitAsync(
-        [
-          ...gitTransportSecurityArgs(connection.originUrl, connection.credentialHelper, connection.originCredentialUsername),
-          "fetch",
-          "--no-recurse-submodules",
-          "--prune",
-          "origin",
-          "+refs/heads/*:refs/remotes/origin/*"
-        ],
-        { cwd: primaryPath }
-      )) {
-        process.stderr.write(`[r5d-worker] could not refresh origin divergence for ${project.projectPath}
+      const lastFetchedAtMs = lastOriginDivergenceFetchMs.get(project.projectId);
+      if (refetchOriginProjectIds.has(project.projectId) || lastFetchedAtMs === void 0 || Date.now() - lastFetchedAtMs >= ORIGIN_DIVERGENCE_REFRESH_INTERVAL_MS) {
+        if (await tryGitAsync(
+          [
+            ...gitTransportSecurityArgs(connection.originUrl, connection.credentialHelper, connection.originCredentialUsername),
+            "fetch",
+            "--no-recurse-submodules",
+            "--prune",
+            "origin",
+            "+refs/heads/*:refs/remotes/origin/*"
+          ],
+          { cwd: primaryPath }
+        )) {
+          lastOriginDivergenceFetchMs.set(project.projectId, Date.now());
+        } else {
+          process.stderr.write(`[r5d-worker] could not refresh origin divergence for ${project.projectPath}
 `);
+        }
       }
       for (const branch of project.branches) {
         const branchPath = configuredProjectBranchPath(projectsRoot, project, branch.branchName);
@@ -5249,7 +5262,7 @@ async function startWorker(options) {
           // checkout initialization from erasing synchronized dirt.
           { ignoreBusy: true, hydrationHooks: workspaceHydrationTransactionHooks }
         );
-        await ensureConfiguredProjects((progress) => {
+        const reconciledProjectIds = await ensureConfiguredProjects((progress) => {
           sendLifecycleProgress({ phase: "configuring", operationId: configurationOperationId, ...progress });
           process.stdout.write(
             `[r5d-worker] ${progress.detail ?? "Configuring workspace"}${progress.completedBytes === void 0 ? "" : `: ${progress.completedBytes}/${progress.totalBytes ?? "?"} bytes`}${progress.completedItems === void 0 ? "" : `, ${progress.completedItems}/${progress.totalItems ?? "?"} item(s)`}
@@ -5305,7 +5318,7 @@ async function startWorker(options) {
         const pending = [...pendingCheckouts.values()].sort(
           (left, right) => left.projectId.localeCompare(right.projectId) || left.branchName.localeCompare(right.branchName)
         );
-        return { result, pending, aheadOfOriginBranches: await collectAheadOfOriginBranches() };
+        return { result, pending, aheadOfOriginBranches: await collectAheadOfOriginBranches(reconciledProjectIds) };
       });
     } catch (error) {
       if (receiptGeneration !== workspaceConfigurationReceiptGeneration) {

package/dist/mjs/package.json

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

package/dist/mjs/project-worktrees.mjs

@@ -956,11 +956,12 @@ async function reconcileLinkedLayout(input) {
   const plan = [];
   for (const branch of input.branches) {
     const checkoutPath = branchPath(input.projectRoot, branch.branchName);
+    const exactMirror = input.exactMirrorBranches?.has(branch.branchName) === true;
     const resolved = await seedForBranch({
       ...input,
       primaryPath,
       branch,
-      requireMirrorHead: input.exactMirrorBranches?.has(branch.branchName)
+      requireMirrorHead: exactMirror
     });
     mirrorHeads.set(branch.branchName, resolved.mirrorHead);
     const linked = branch.branchName === input.primaryBranchName || gitDirectoryKind(checkoutPath) !== null && await commonGitDirectoryAsync(checkoutPath) === primaryCommonDir;
@@ -969,7 +970,8 @@ async function reconcileLinkedLayout(input) {
       continue;
     }
     const currentHead = await gitAsync(checkoutPath, ["rev-parse", "HEAD"], `resolve linked worktree head ${branch.branchName}`);
-    plan.push({ branchName: branch.branchName, checkoutPath, seed: resolved.seed, action: currentHead === resolved.seed ? "keep" : "reset" });
+    const keep = currentHead === resolved.seed || !exactMirror && await tryGitAsync(checkoutPath, ["merge-base", "--is-ancestor", resolved.seed, currentHead]);
+    plan.push({ branchName: branch.branchName, checkoutPath, seed: resolved.seed, action: keep ? "keep" : "reset" });
   }
   const mutatedBranches = new Set(plan.filter(({ action }) => action !== "keep").map(({ branchName }) => branchName));
   if (mutatedBranches.size > 0) input.beforeDestructiveMutation(mutatedBranches);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.104",
+  "version": "0.0.105",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",