agent-shim 11.66.0 → 11.66.2

package/dist/cli.cjs

@@ -28806,6 +28806,22 @@ function daemonAdmits(fs31, allowlistFile, recordedHash, required2) {
   const served = parseAllowlistFile(content);
   return recordedHash === hashAllowlistFile(content) && required2.every((upstream) => served.includes(upstream));
 }
+function startSupervisorUnderLock(params) {
+  const { paths, ports } = params;
+  ports.fs.mkdirp(paths.headroomDir);
+  const created = ports.fs.writeFileExclusive(paths.headroomLockFile, `${JSON.stringify({ pid: params.holderPid, at: ports.now() })}
+`);
+  if (created) {
+    ports.spawnSupervisor(paths);
+    return "spawned";
+  }
+  const lock = readStartLock(ports.fs, paths.headroomLockFile);
+  if (lock === void 0 || !ports.isRunning(lock.pid)) {
+    ports.fs.removeRecursive(paths.headroomLockFile);
+    return "cleared-stale-lock";
+  }
+  return "held";
+}
 function ensureHeadroom(params) {
   const { paths, ports } = params;
   let deadline = ports.now() + HEADROOM_START_TIMEOUT_MS;
@@ -28851,21 +28867,11 @@ function ensureHeadroom(params) {
         );
       }
     } else if (!spawnedSupervisor) {
-      ports.fs.mkdirp(paths.headroomDir);
-      const created = ports.fs.writeFileExclusive(
-        paths.headroomLockFile,
-        `${JSON.stringify({ pid: params.launcherPid, at: ports.now() })}
-`
-      );
-      if (created) {
-        ports.spawnSupervisor(paths);
+      const started = startSupervisorUnderLock({ paths, holderPid: params.launcherPid, ports });
+      if (started === "spawned") {
         spawnedSupervisor = true;
-      } else {
-        const lock = readStartLock(ports.fs, paths.headroomLockFile);
-        if (lock === void 0 || !ports.isRunning(lock.pid)) {
-          ports.fs.removeRecursive(paths.headroomLockFile);
-          continue;
-        }
+      } else if (started === "cleared-stale-lock") {
+        continue;
       }
     }
     if (ports.now() >= deadline) {
@@ -37176,7 +37182,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.66.0",
+      version: "11.66.2",
       description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
       license: "MIT",
       author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -119239,6 +119245,50 @@ function showSession(fs31, identitiesDir, identities, query, onlyIdentity) {
 // src/frontdoor/commands.ts
 init_realPorts();
 
+// src/headroom/keeper.ts
+init_ensure();
+init_state2();
+function createHeadroomKeeper(deps) {
+  const { paths, ports, log } = deps;
+  let lastAttemptAt;
+  const releaseOwnLock = () => {
+    if (readStartLock(ports.fs, paths.headroomLockFile)?.pid === deps.ownPid) {
+      ports.fs.removeRecursive(paths.headroomLockFile);
+    }
+  };
+  const tick = () => {
+    const state = resolveServingHeadroomState(ports.fs, { stateFile: paths.headroomStateFile, legacyStateFile: paths.headroomLegacyStateFile }, ports.isRunning)?.state;
+    const supervisorPid = state?.supervisorPid;
+    const orphans = listSessions(ports.fs, paths.headroomSessionsDir).filter((session) => ports.isRunning(session.pid) && !ports.isRunning(session.supervisorPid));
+    if (supervisorPid !== void 0 && ports.isRunning(supervisorPid)) {
+      lastAttemptAt = void 0;
+      releaseOwnLock();
+      for (const session of orphans) {
+        writeSession(ports.fs, paths.headroomSessionsDir, { ...session, supervisorPid });
+      }
+      if (orphans.length > 0) {
+        log(`front door: re-registered ${String(orphans.length)} launcher(s) against headroom supervisor ${String(supervisorPid)}`);
+      }
+      return { kind: "serving", rebound: orphans.map((session) => session.pid) };
+    }
+    if (orphans.length === 0) {
+      return { kind: "idle" };
+    }
+    if (lastAttemptAt !== void 0 && ports.now() - lastAttemptAt < HEADROOM_START_TIMEOUT_MS) {
+      return { kind: "backing-off", waiting: orphans.length };
+    }
+    releaseOwnLock();
+    lastAttemptAt = ports.now();
+    const start = startSupervisorUnderLock({ paths, holderPid: deps.ownPid, ports });
+    log(`front door: headroom supervisor is not running and ${String(orphans.length)} launcher(s) are registered against it (${start})`);
+    return { kind: "starting", start, waiting: orphans.length };
+  };
+  return { tick };
+}
+
+// src/frontdoor/commands.ts
+init_supervisor();
+
 // src/supervise/registry.ts
 var import_node_path36 = __toESM(require("node:path"), 1);
 init_zod();
@@ -139424,6 +139474,21 @@ function realFrontDoorSupervisorPorts(paths, respawnGeneration, lifecycle, track
     timer.unref();
     keeperTimers.push(timer);
   };
+  const headroomKeeper = createHeadroomKeeper({
+    paths,
+    ownPid: process.pid,
+    ports: { fs: realFarmFs, now: () => Date.now(), isRunning: realIsProcessRunning, spawnSupervisor: (layout) => spawnDetachedSupervisor(layout, "__headroom-supervisor", layout.headroomLogPath) },
+    log
+  });
+  const headroomKeeperTimer = setInterval(() => {
+    try {
+      headroomKeeper.tick();
+    } catch (error63) {
+      log(`headroom keeper failed: ${error63 instanceof Error ? error63.message : String(error63)}`);
+    }
+  }, HEADROOM_POLL_MS);
+  headroomKeeperTimer.unref();
+  keeperTimers.push(headroomKeeperTimer);
   everyFreshnessInterval(() => {
     try {
       const pools = readPools(paths);
@@ -140397,18 +140462,18 @@ function sweepStaleRunDirectories(root) {
     }
   }
 }
-function runProgram(runRoot, file2, args, cwd, options = {}) {
-  return options.outputInFile === true ? runWithOutputInFile(runRoot, file2, args, cwd) : runWithPipe(file2, args, cwd);
+function runProgram(runRoot, timeoutMs, file2, args, cwd, options = {}) {
+  return options.outputInFile === true ? runWithOutputInFile(runRoot, timeoutMs, file2, args, cwd) : runWithPipe(timeoutMs, file2, args, cwd);
 }
-function runWithPipe(file2, args, cwd) {
+function runWithPipe(timeoutMs, file2, args, cwd) {
   try {
-    const result = spawnSyncBlocking("a statusline command", file2, args, { cwd, encoding: "utf8", timeout: RUN_TIMEOUT_MS, killSignal: "SIGKILL", maxBuffer: RUN_MAX_OUTPUT_BYTES, stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
+    const result = spawnSyncBlocking("a statusline command", file2, args, { cwd, encoding: "utf8", timeout: timeoutMs, killSignal: "SIGKILL", maxBuffer: RUN_MAX_OUTPUT_BYTES, stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
     return result.error === void 0 && result.status === 0 ? result.stdout : void 0;
   } catch {
     return void 0;
   }
 }
-function runWithOutputInFile(runRoot, file2, args, cwd) {
+function runWithOutputInFile(runRoot, timeoutMs, file2, args, cwd) {
   let directory;
   try {
     sweepStaleRunDirectories(runRoot);
@@ -140417,7 +140482,7 @@ function runWithOutputInFile(runRoot, file2, args, cwd) {
     const descriptor = import_node_fs23.default.openSync(import_node_path56.default.join(directory, "stdout"), "wx+", RUN_FILE_MODE);
     try {
       const limited = process.platform === "win32" ? { command: file2, args } : fileSizeLimitedCommand("/bin/sh", file2, args);
-      const result = spawnSyncBlocking("a statusline command", limited.command, limited.args, { cwd, timeout: RUN_TIMEOUT_MS, killSignal: "SIGKILL", stdio: ["ignore", descriptor, "ignore"], windowsHide: true });
+      const result = spawnSyncBlocking("a statusline command", limited.command, limited.args, { cwd, timeout: timeoutMs, killSignal: "SIGKILL", stdio: ["ignore", descriptor, "ignore"], windowsHide: true });
       return result.error === void 0 && result.status === 0 ? readOutput(descriptor) : void 0;
     } finally {
       import_node_fs23.default.closeSync(descriptor);
@@ -140447,7 +140512,7 @@ function discard(target) {
 function readMemoryUse() {
   const totalBytes = import_node_os12.default.totalmem();
   if (process.platform === "darwin") {
-    const output2 = runWithPipe("/usr/bin/vm_stat", [], process.cwd());
+    const output2 = runWithPipe(RUN_TIMEOUT_MS, "/usr/bin/vm_stat", [], process.cwd());
     const usedBytes = output2 === void 0 ? void 0 : usedBytesFromVmStat(output2);
     return usedBytes === void 0 ? void 0 : { usedBytes, totalBytes };
   }
@@ -140457,7 +140522,7 @@ function readMemoryUse() {
   }
   return { usedBytes: totalBytes - import_node_os12.default.freemem(), totalBytes };
 }
-function realStatuslinePorts(env, stateDirectory) {
+function realStatuslinePorts(env, stateDirectory, runTimeoutMs = RUN_TIMEOUT_MS) {
   const { locale, timeZone } = Intl.DateTimeFormat().resolvedOptions();
   return {
     env,
@@ -140480,7 +140545,7 @@ function realStatuslinePorts(env, stateDirectory) {
         return void 0;
       }
     },
-    run: (file2, args, cwd, options) => runProgram(import_node_path56.default.join(stateDirectory, RUN_DIRECTORY), file2, args, cwd, options),
+    run: (file2, args, cwd, options) => runProgram(import_node_path56.default.join(stateDirectory, RUN_DIRECTORY), runTimeoutMs, file2, args, cwd, options),
     entryKind: (target) => {
       try {
         return import_node_fs23.default.lstatSync(target).isDirectory() ? "directory" : "other";

package/dist/index.cjs

@@ -4751,7 +4751,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.66.0",
+      version: "11.66.2",
       description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
       license: "MIT",
       author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -5241,6 +5241,22 @@ function daemonAdmits(fs14, allowlistFile, recordedHash, required) {
   const served = parseAllowlistFile(content);
   return recordedHash === hashAllowlistFile(content) && required.every((upstream) => served.includes(upstream));
 }
+function startSupervisorUnderLock(params) {
+  const { paths, ports } = params;
+  ports.fs.mkdirp(paths.headroomDir);
+  const created = ports.fs.writeFileExclusive(paths.headroomLockFile, `${JSON.stringify({ pid: params.holderPid, at: ports.now() })}
+`);
+  if (created) {
+    ports.spawnSupervisor(paths);
+    return "spawned";
+  }
+  const lock = readStartLock(ports.fs, paths.headroomLockFile);
+  if (lock === void 0 || !ports.isRunning(lock.pid)) {
+    ports.fs.removeRecursive(paths.headroomLockFile);
+    return "cleared-stale-lock";
+  }
+  return "held";
+}
 function ensureHeadroom(params) {
   const { paths, ports } = params;
   let deadline = ports.now() + HEADROOM_START_TIMEOUT_MS;
@@ -5286,21 +5302,11 @@ function ensureHeadroom(params) {
         );
       }
     } else if (!spawnedSupervisor) {
-      ports.fs.mkdirp(paths.headroomDir);
-      const created = ports.fs.writeFileExclusive(
-        paths.headroomLockFile,
-        `${JSON.stringify({ pid: params.launcherPid, at: ports.now() })}
-`
-      );
-      if (created) {
-        ports.spawnSupervisor(paths);
+      const started = startSupervisorUnderLock({ paths, holderPid: params.launcherPid, ports });
+      if (started === "spawned") {
         spawnedSupervisor = true;
-      } else {
-        const lock = readStartLock(ports.fs, paths.headroomLockFile);
-        if (lock === void 0 || !ports.isRunning(lock.pid)) {
-          ports.fs.removeRecursive(paths.headroomLockFile);
-          continue;
-        }
+      } else if (started === "cleared-stale-lock") {
+        continue;
       }
     }
     if (ports.now() >= deadline) {

package/dist/index.mjs

@@ -4727,7 +4727,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.66.0",
+      version: "11.66.2",
       description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
       license: "MIT",
       author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -5218,6 +5218,22 @@ function daemonAdmits(fs14, allowlistFile, recordedHash, required) {
   const served = parseAllowlistFile(content);
   return recordedHash === hashAllowlistFile(content) && required.every((upstream) => served.includes(upstream));
 }
+function startSupervisorUnderLock(params) {
+  const { paths, ports } = params;
+  ports.fs.mkdirp(paths.headroomDir);
+  const created = ports.fs.writeFileExclusive(paths.headroomLockFile, `${JSON.stringify({ pid: params.holderPid, at: ports.now() })}
+`);
+  if (created) {
+    ports.spawnSupervisor(paths);
+    return "spawned";
+  }
+  const lock = readStartLock(ports.fs, paths.headroomLockFile);
+  if (lock === void 0 || !ports.isRunning(lock.pid)) {
+    ports.fs.removeRecursive(paths.headroomLockFile);
+    return "cleared-stale-lock";
+  }
+  return "held";
+}
 function ensureHeadroom(params) {
   const { paths, ports } = params;
   let deadline = ports.now() + HEADROOM_START_TIMEOUT_MS;
@@ -5263,21 +5279,11 @@ function ensureHeadroom(params) {
         );
       }
     } else if (!spawnedSupervisor) {
-      ports.fs.mkdirp(paths.headroomDir);
-      const created = ports.fs.writeFileExclusive(
-        paths.headroomLockFile,
-        `${JSON.stringify({ pid: params.launcherPid, at: ports.now() })}
-`
-      );
-      if (created) {
-        ports.spawnSupervisor(paths);
+      const started = startSupervisorUnderLock({ paths, holderPid: params.launcherPid, ports });
+      if (started === "spawned") {
         spawnedSupervisor = true;
-      } else {
-        const lock = readStartLock(ports.fs, paths.headroomLockFile);
-        if (lock === void 0 || !ports.isRunning(lock.pid)) {
-          ports.fs.removeRecursive(paths.headroomLockFile);
-          continue;
-        }
+      } else if (started === "cleared-stale-lock") {
+        continue;
       }
     }
     if (ports.now() >= deadline) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-shim",
-  "version": "11.66.0",
+  "version": "11.66.2",
   "description": "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
   "license": "MIT",
   "author": "Joseph Mearman <joseph@mearman.co.uk>",