fraim 2.0.351 → 2.0.352

package/dist/src/cli/utils/managed-agent-paths.js

@@ -227,6 +227,7 @@ function buildPathWithManagedAgentBins(basePath) {
 // launches already inherit the registry-composed PATH, so this returns null immediately on
 // win32 rather than attempting a login-shell equivalent that doesn't exist.
 const LOGIN_SHELL_PATH_TIMEOUT_MS = 3000;
+const LOGIN_SHELL_PATH_CACHE_TTL_MS = 60_000;
 function defaultResolveLoginShellPath() {
     if (process.platform === 'win32')
         return null;
@@ -279,18 +280,20 @@ let loginShellPathResolverOverride = null;
  */
 function __setLoginShellPathResolverForTests(resolver) {
     loginShellPathResolverOverride = resolver;
-    cachedLoginShellPath = undefined;
-    cachedNpmGlobalBinDirsForRecovery.clear();
+    __clearLoginShellPathCacheForTests();
 }
 let cachedLoginShellPath;
+let cachedLoginShellPathAtMs = 0;
 /**
- * Resolves and memoizes the PATH the user's own login shell would produce. Computed at most
- * once per process (AC-A5: bounded, fixed cost) — this feeds every agent-resolution call, so
- * recomputing per call would multiply one shell spawn by the number of agents probed.
+ * Resolves the user's login PATH at most once per minute, including failed reads. A
+ * running Hub can discover later installations without spawning a shell per agent probe.
  */
 function resolveLoginShellPathCached() {
-    if (cachedLoginShellPath !== undefined)
+    const nowMs = Date.now();
+    const ageMs = nowMs - cachedLoginShellPathAtMs;
+    if (cachedLoginShellPath !== undefined && ageMs >= 0 && ageMs < LOGIN_SHELL_PATH_CACHE_TTL_MS) {
         return cachedLoginShellPath;
+    }
     const resolver = loginShellPathResolverOverride ?? defaultResolveLoginShellPath;
     // AC-A5: a resolver failing must degrade to "no recovery", never propagate. The default
     // resolver already guards its own spawnSync internally; this also protects against an
@@ -301,13 +304,20 @@ function resolveLoginShellPathCached() {
     catch {
         cachedLoginShellPath = null;
     }
+    cachedLoginShellPathAtMs = nowMs;
+    // npm's configured global prefix can change even when the recovered PATH does not.
+    // Refresh both tiers together so an old prefix cannot outlive login-PATH recovery.
+    cachedNpmGlobalBinDirsForRecovery.clear();
     return cachedLoginShellPath;
 }
 /** Test seam only. Clears the memoized login-shell PATH so the next call recomputes. */
 function __clearLoginShellPathCacheForTests() {
     cachedLoginShellPath = undefined;
+    cachedLoginShellPathAtMs = 0;
+    cachedNpmGlobalBinDirsForRecovery.clear();
 }
 const cachedNpmGlobalBinDirsForRecovery = new Map();
+const NPM_GLOBAL_RECOVERY_CACHE_MAX_ENTRIES = 64;
 /**
  * Memoized wrapper around resolveNpmGlobalBinDirs(), scoped to buildRecoveredAgentPath()'s
  * own use only — NOT a change to resolveNpmGlobalBinDirs() itself, which fraim doctor and the
@@ -321,8 +331,8 @@ const cachedNpmGlobalBinDirsForRecovery = new Map();
  * and because each call sits inside a Promise executor that runs synchronously up to its own
  * spawnSync, the "concurrent" probes actually serialized behind it — up to 5 agents × 5s of
  * blocking spawnSync is exactly the event-loop-freezing regression issue #1010 eliminated,
- * reintroduced one layer deeper. Memoizing once per process (like resolveLoginShellPathCached
- * above) restores the bound this repo's own #1010 postmortem requires.
+ * reintroduced one layer deeper. Memoizing between login-PATH refreshes keeps repeated
+ * probes in the same round from duplicating that work.
  *
  * Keyed by `basePath` (not a single scalar): `resolveManagedCommand()` also routes through this
  * cache now, and unlike `detectEmployeesAsync()`'s repeated same-ambient-PATH probing, its
@@ -330,7 +340,8 @@ const cachedNpmGlobalBinDirsForRecovery = new Map();
  * isolated tests that swap `FRAIM_USER_DIR`/`PATH` per test case). A single scalar cache would
  * let the FIRST basePath's answer silently leak into every later, differently-scoped lookup —
  * concretely, a real machine's actual npm-global `codex` shadowing a test's own isolated managed
- * shim. Per-basePath keys keep the "once per distinct PATH" bound without that cross-contamination.
+ * shim. Per-basePath keys avoid that cross-contamination; a size limit bounds memory when
+ * callers supply many distinct PATHs before the next refresh.
  */
 function resolveNpmGlobalBinDirsCached(basePath) {
     const cached = cachedNpmGlobalBinDirsForRecovery.get(basePath);
@@ -343,6 +354,11 @@ function resolveNpmGlobalBinDirsCached(basePath) {
     catch {
         dirs = [];
     }
+    if (cachedNpmGlobalBinDirsForRecovery.size >= NPM_GLOBAL_RECOVERY_CACHE_MAX_ENTRIES) {
+        const oldestKey = cachedNpmGlobalBinDirsForRecovery.keys().next().value;
+        if (oldestKey !== undefined)
+            cachedNpmGlobalBinDirsForRecovery.delete(oldestKey);
+    }
     cachedNpmGlobalBinDirsForRecovery.set(basePath, dirs);
     return dirs;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim",
-  "version": "2.0.351",
+  "version": "2.0.352",
   "description": "FRAIM core CLI and MCP package.",
   "main": "index.js",
   "bin": {