@north-light/crouter 0.3.168 → 0.3.169

package/scripts/install-runtime.mjs

@@ -25,6 +25,17 @@ function run(command, args, cwd, capture = false, env = process.env) {
   });
 }
 
+/** Capture a probe's stdout even when a candidate process exits during the probe. */
+function probe(command, args, cwd) {
+  return new Promise((resolveRun) => {
+    const child = spawn(command, args, { cwd, stdio: ['ignore', 'pipe', 'ignore'] });
+    let output = '';
+    child.stdout.on('data', (chunk) => { output += chunk; });
+    child.on('error', () => resolveRun(output));
+    child.on('exit', () => resolveRun(output));
+  });
+}
+
 function digest(value) {
   return createHash('sha256').update(value).digest('hex');
 }
@@ -146,32 +157,44 @@ async function pack(archiveDir) {
   return join(archiveDir, packed[0].filename);
 }
 
+/** Generation ids named anywhere in a `ps` or `lsof` dump. */
 function generationIdsIn(text) {
-  return [...text.matchAll(/generations\/([a-f0-9]{64})(?:\/|$)/g)].map((match) => match[1]);
+  return [...text.matchAll(/generations\/([a-f0-9]{64})(?:[/\s]|$)/g)].map((match) => match[1]);
 }
 
+/** Return every generation used by a running process and whether every stable
+ *  selector process exposed its generation lease. */
 async function liveGenerationIds() {
   const output = await run('ps', ['-axww', '-o', 'pid=,command='], RUNTIME_HOME, true);
   const live = new Set(generationIdsIn(output));
   const nodePids = [];
-  let uncertain = false;
+  const opaqueStablePids = new Set();
   for (const line of output.split('\n')) {
     const match = /^\s*(\d+)\s+(.*)$/.exec(line);
     if (!match) continue;
     const [, pid, command] = match;
-    if (/(?:^|\s)\S*\/bin\/(?:crtr|crtrd|crouter)(?:\s|$)/.test(command)) uncertain = true;
+    const stableSelector = /^(?:\S*node\s+)?\S*\/bin\/(?:crtr|crtrd|crouter)(?:\s|$)/.test(command);
+    if (stableSelector && generationIdsIn(command).length === 0) opaqueStablePids.add(pid);
     if (/(?:^|[\s/])(?:node|crtrd?|crouter)(?:[\s]|$)/.test(command)) nodePids.push(pid);
   }
-  // An opaque stable shim means GC will skip regardless, so do not spend
-  // minutes resolving process cwd values that cannot change that decision.
-  if (uncertain || nodePids.length === 0) return { live, uncertain };
+  if (nodePids.length === 0) return { live, uncertain: opaqueStablePids.size > 0 };
 
-  // argv identifies entry modules; cwd covers a node process launched from a
-  // generation directory. Ask lsof for every candidate in ONE invocation:
-  // starting lsof once per process costs ~0.5s on macOS, which turned hundreds
-  // of live agent/tool processes into a multi-minute post-install stall.
-  const cwd = await run('lsof', ['-n', '-P', '-a', '-p', nodePids.join(','), '-d', 'cwd', '-Fn'], RUNTIME_HOME, true);
-  for (const id of generationIdsIn(cwd)) live.add(id);
+  // One lsof invocation resolves cwd references and the runtime entry-file
+  // lease held by each stable CLI process without a per-process startup penalty.
+  const open = await probe('lsof', ['-n', '-P', '-a', '-p', nodePids.join(','), '-Fn'], RUNTIME_HOME);
+  let pid;
+  const exposedStablePids = new Set();
+  for (const line of open.split('\n')) {
+    const processMatch = /^p(\d+)$/.exec(line);
+    if (processMatch) {
+      pid = processMatch[1];
+      continue;
+    }
+    const ids = generationIdsIn(line);
+    for (const id of ids) live.add(id);
+    if (pid !== undefined && ids.length > 0 && opaqueStablePids.has(pid)) exposedStablePids.add(pid);
+  }
+  const uncertain = [...opaqueStablePids].some((stablePid) => !exposedStablePids.has(stablePid));
   return { live, uncertain };
 }
 
@@ -186,7 +209,7 @@ async function pruneGenerations() {
   const selected = await selectedGenerationId();
   const { live, uncertain } = await liveGenerationIds();
   if (uncertain) {
-    process.stderr.write('runtime generation GC skipped: a live stable crouter shim does not expose its generation path\n');
+    process.stderr.write('runtime generation GC skipped: a live stable crouter shim does not expose its generation lease\n');
     return;
   }
   const entries = await readdir(GENERATIONS, { withFileTypes: true });