@yemi33/minions 0.1.2383 → 0.1.2385

package/engine/worktree-gc.js

@@ -41,6 +41,32 @@ function _managedSpawn() {
 
 const _noopLog = () => {};
 
+function _collectAnchoredCwds(listManagedSpecs, listKeepProcessCwds) {
+  const out = [];
+  try {
+    for (const rec of (listManagedSpecs() || [])) {
+      if (!rec || typeof rec.cwd !== 'string' || !rec.cwd) continue;
+      try { out.push(shared.realPathForComparison(rec.cwd)); } catch {}
+    }
+  } catch {}
+  try {
+    for (const cwd of (listKeepProcessCwds() || [])) {
+      if (typeof cwd !== 'string' || !cwd) continue;
+      try { out.push(shared.realPathForComparison(cwd)); } catch {}
+    }
+  } catch {}
+  return out;
+}
+
+function _isWorktreeCwdAnchored(worktreePath, anchoredCwds) {
+  for (const cwd of anchoredCwds) {
+    try {
+      if (shared.isPathInsideOrEqual(cwd, worktreePath)) return true;
+    } catch {}
+  }
+  return false;
+}
+
 // ── Stuck-dir escalation (Layer 4 of W-mq5o6bvy000x7191) ─────────────────────
 // In-memory ring of paths that have failed removal N consecutive times. After
 // escalation we (a) write a dedup'd inbox note, (b) suppress repeat per-tick
@@ -608,13 +634,11 @@ function shouldGcDispatchWorktree(opts) {
       ? listManagedSpecs
       : _managedSpawn().listManagedSpecs;
     const specs = fn() || [];
-    const wtAbs = path.resolve(worktreePath);
-    const wtPrefix = wtAbs + path.sep;
     for (const rec of specs) {
       if (!rec || typeof rec.cwd !== 'string' || rec.cwd.length === 0) continue;
-      let cwdAbs;
-      try { cwdAbs = path.resolve(rec.cwd); } catch { continue; }
-      if (cwdAbs === wtAbs || cwdAbs.startsWith(wtPrefix)) {
+      let anchored = false;
+      try { anchored = shared.isPathInsideOrEqual(rec.cwd, worktreePath); } catch {}
+      if (anchored) {
         return { gc: false, reason: 'managed-spawn-anchored' };
       }
     }
@@ -744,6 +768,12 @@ function pruneOrphanWorktrees(opts) {
       try { return _managedSpawn().listManagedSpecs(); }
       catch (_e) { return []; }
     });
+  const _listKeepProcessCwds = typeof opts.listKeepProcessCwds === 'function'
+    ? opts.listKeepProcessCwds
+    : (() => {
+      try { return _keepProcessSweep().getActiveKeepProcessCwds(); }
+      catch (_e) { return []; }
+    });
 
   // Pool-known paths (idle + borrowed + any stale entry still on disk). The
   // worktree-pool's own pruneStale() runs FIRST in cli boot so this snapshot
@@ -768,7 +798,11 @@ function pruneOrphanWorktrees(opts) {
   // review — Issue 2)
   const globalLiveDirNames = new Set();
   for (const d of [...(dispatchSnap.active || []), ...(dispatchSnap.pending || [])]) {
-    if (!d || !d.id || !d.meta || !d.meta.branch) continue;
+    if (!d || !d.id) continue;
+    if (d.worktreePath) {
+      try { globalLiveDirNames.add(path.basename(path.resolve(d.worktreePath))); } catch {}
+    }
+    if (!d.meta || !d.meta.branch) continue;
     const dispatchProject = typeof d.meta.project === 'string'
       ? d.meta.project
       : (d.meta.project?.name || 'default');
@@ -781,17 +815,7 @@ function pruneOrphanWorktrees(opts) {
     } catch (_e) { /* defensive */ }
   }
 
-  // Resolved managed-spawn cwds (per-cwd → resolved abs path). Used to
-  // reject GC of any dir that contains (or equals) a live service's cwd.
-  // (PR #2627 review — Issue 1)
-  const managedSpawnCwds = [];
-  try {
-    for (const rec of (_listManagedSpecs() || [])) {
-      if (!rec || typeof rec.cwd !== 'string' || rec.cwd.length === 0) continue;
-      try { managedSpawnCwds.push(path.resolve(rec.cwd)); }
-      catch (_e) { /* malformed cwd — skip */ }
-    }
-  } catch (_e) { /* optional */ }
+  const anchoredCwds = _collectAnchoredCwds(_listManagedSpecs, _listKeepProcessCwds);
 
   const result = { scanned: 0, kept: 0, evicted: 0, failed: 0, perProject: {} };
 
@@ -836,18 +860,10 @@ function pruneOrphanWorktrees(opts) {
         projStats.kept++; result.kept++;
         continue;
       }
-      // 3. managed_spawn cwd anchor protection.
-      if (managedSpawnCwds.length > 0) {
-        const wtPathNorm = path.resolve(wtPath);
-        const wtPrefix = wtPathNorm + path.sep;
-        let anchored = false;
-        for (const cwd of managedSpawnCwds) {
-          if (cwd === wtPathNorm || cwd.startsWith(wtPrefix)) { anchored = true; break; }
-        }
-        if (anchored) {
-          projStats.kept++; result.kept++;
-          continue;
-        }
+      // 3. managed_spawn / keep_processes cwd anchor protection.
+      if (_isWorktreeCwdAnchored(wtPath, anchoredCwds)) {
+        projStats.kept++; result.kept++;
+        continue;
       }
 
       // P-c7e2b405 — route the slow-retry gate, ownership-marker gate (now
@@ -938,6 +954,12 @@ function pruneOrphanWorktreesFromGitRegistry(opts) {
       try { return _managedSpawn().listManagedSpecs(); }
       catch (_e) { return []; }
     });
+  const _listKeepProcessCwds = typeof opts.listKeepProcessCwds === 'function'
+    ? opts.listKeepProcessCwds
+    : (() => {
+      try { return _keepProcessSweep().getActiveKeepProcessCwds(); }
+      catch (_e) { return []; }
+    });
   const _execSilent = typeof opts.execSilent === 'function'
     ? opts.execSilent
     : shared.execSilent;
@@ -986,15 +1008,7 @@ function pruneOrphanWorktreesFromGitRegistry(opts) {
     for (const p of opts.extraPoolPaths) poolPaths.add(worktreePool._normalizePath(p));
   }
 
-  // managed_spawn cwds.
-  const managedSpawnCwds = [];
-  try {
-    for (const rec of (_listManagedSpecs() || [])) {
-      if (!rec || typeof rec.cwd !== 'string' || rec.cwd.length === 0) continue;
-      try { managedSpawnCwds.push(path.resolve(rec.cwd)); }
-      catch (_e) { /* malformed cwd — skip */ }
-    }
-  } catch (_e) { /* optional */ }
+  const anchoredCwds = _collectAnchoredCwds(_listManagedSpecs, _listKeepProcessCwds);
 
   const result = { scanned: 0, kept: 0, evicted: 0, failed: 0, prunedRegistry: 0, perProject: {} };
   const _seenAbs = new Set(); // dedup across projects sharing a parent
@@ -1058,14 +1072,9 @@ function pruneOrphanWorktreesFromGitRegistry(opts) {
       if (poolPaths.has(normPath)) {
         projStats.kept++; result.kept++; continue;
       }
-      // managed_spawn anchor protection
-      if (managedSpawnCwds.length > 0) {
-        const wtPrefix = wtAbs + path.sep;
-        let anchored = false;
-        for (const cwd of managedSpawnCwds) {
-          if (cwd === wtAbs || cwd.startsWith(wtPrefix)) { anchored = true; break; }
-        }
-        if (anchored) { projStats.kept++; result.kept++; continue; }
+      // managed_spawn / keep_processes cwd anchor protection.
+      if (_isWorktreeCwdAnchored(wtAbs, anchoredCwds)) {
+        projStats.kept++; result.kept++; continue;
       }
 
       // P-c7e2b405 — ownership-marker gate, slow-retry gate, remove, escalate,