atris 3.74.29 → 3.76.0

package/lib/worktree-space.js

@@ -26,8 +26,6 @@ const GB = 1e9;
 // fail (swap, updates, builds), so start refuses to add another copy.
 const DEFAULT_REAP_BELOW_GB = 25;
 const DEFAULT_REFUSE_BELOW_GB = 10;
-const DEPS_CACHE_KEEP = 3;
-const PARTIAL_MAX_AGE_MS = 60 * 60 * 1000;
 const AGENT_COPIES_DIR = '.agent-worktrees';
 const DEPS_DIR = '.deps';
 const CLONE_TIMEOUT_MS = 10 * 60 * 1000;
@@ -224,6 +222,8 @@ function ensureCachedInstall({ workspace, repoName, hash, lockFile, sourceDir, c
   const entry = depsCacheEntry(workspace, repoName, hash);
   const cached = path.join(entry, 'node_modules');
   if (installedMatchesLock(lockFile, cached)) return cached;
+  // A mismatched existing entry may contain local changes. Do not replace it.
+  if (pathExists(entry)) return null;
   if (!sourceDir || !installedMatchesLock(lockFile, sourceDir)) return null;
   const partial = path.join(depsRepoDir(workspace, repoName), `.partial-${hash}-${process.pid}-${Date.now()}`);
   try {
@@ -233,8 +233,6 @@ function ensureCachedInstall({ workspace, repoName, hash, lockFile, sourceDir, c
     // Build caches are not part of the install and only grow the store.
     removeTree(path.join(partial, 'node_modules', '.cache'));
     if (!installedMatchesLock(lockFile, path.join(partial, 'node_modules'))) return null;
-    // An entry that no longer matches its own lockfile was changed by hand.
-    if (pathExists(entry) && !installedMatchesLock(lockFile, cached)) removeTree(entry);
     try {
       fs.renameSync(partial, entry);
     } catch {
@@ -253,49 +251,12 @@ function touch(target) {
   } catch {}
 }
 
-// Keeps the `keep` most recently used installs per repo and drops partial
-// entries a crashed start left behind.
-function pruneDepsCache({ workspace, repoName, keep = DEPS_CACHE_KEEP, now = Date.now() } = {}) {
-  const dir = depsRepoDir(workspace, repoName);
-  let names = [];
-  try {
-    names = fs.readdirSync(dir);
-  } catch {
-    return [];
-  }
-  const removed = [];
-  const entries = [];
-  for (const name of names) {
-    const full = path.join(dir, name);
-    let mtimeMs = 0;
-    try {
-      mtimeMs = fs.statSync(full).mtimeMs;
-    } catch {
-      continue;
-    }
-    if (name.startsWith('.partial-')) {
-      if (now - mtimeMs > PARTIAL_MAX_AGE_MS) {
-        removeTree(full);
-        removed.push(full);
-      }
-      continue;
-    }
-    if (!name.startsWith('.')) entries.push({ full, mtimeMs });
-  }
-  entries.sort((a, b) => b.mtimeMs - a.mtimeMs);
-  for (const old of entries.slice(keep)) {
-    removeTree(old.full);
-    removed.push(old.full);
-  }
-  return removed;
-}
-
 // Gives a new build copy its node_modules as a clone of a matching install,
 // so the agent skips `npm ci`. Looks in the shared store first, then in the
 // main checkout and other copies of the same repo. Never fails the start:
 // any miss returns { status: 'skipped', reason } and the agent installs as
 // before.
-function seedNodeModules({ target, workspace, repoName, sources = [], clone = cloneTree, keep = DEPS_CACHE_KEEP, isIgnored = () => true } = {}) {
+function seedNodeModules({ target, workspace, repoName, sources = [], clone = cloneTree, isIgnored = () => true } = {}) {
   const startedAt = Date.now();
   const result = (status, reason, extra = {}) => ({ status, reason, ms: Date.now() - startedAt, ...extra });
   const lockFile = path.join(target, 'package-lock.json');
@@ -327,14 +288,13 @@ function seedNodeModules({ target, workspace, repoName, sources = [], clone = cl
     }
   }
   if (!cached) return result('skipped', 'no matching install to clone yet; run npm ci, and later copies will clone it', { hash });
-  // Mark the entry used before cloning so a parallel prune keeps it.
+  // Record use of the entry before cloning it.
   touch(path.dirname(cached));
   const cloned = clone(cached, modules);
   if (!cloned.ok || !installedMatchesLock(lockFile, modules)) {
     removeTree(modules);
     return result('skipped', `clone failed: ${cloned.error || 'install did not match after cloning'}`, { hash });
   }
-  pruneDepsCache({ workspace, repoName, keep });
   return result('cloned', '', { hash, method: cloned.method, source: cached });
 }
 
@@ -351,7 +311,6 @@ module.exports = {
   isInside,
   isScratchPath,
   lockHash,
-  pruneDepsCache,
   seedNodeModules,
   spaceLimits,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.74.29",
+  "version": "3.76.0",
   "description": "you say what you want in plain words. atris builds it, checks it, and shows you proof.",
   "mcpName": "io.github.atrislabs/atris",
   "main": "bin/atris.js",