agent-shim 11.8.1 → 11.8.2

package/dist/cli.cjs

@@ -34007,7 +34007,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.8.1",
+      version: "11.8.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>",
@@ -114184,6 +114184,13 @@ function watchedInstallEntry(resolvedOwnExecutablePath, siblingExists) {
   const sibling = import_node_path44.default.join(parsed.dir, `agent-shim${parsed.ext}`);
   return siblingExists(sibling) ? sibling : resolvedOwnExecutablePath;
 }
+var AWAIT_PID_POLL_MS = 50;
+async function awaitPidExit(pid, boundMs, ports) {
+  const deadline = ports.now() + boundMs;
+  while (ports.isRunning(pid) && ports.now() < deadline) {
+    await ports.sleep(AWAIT_PID_POLL_MS);
+  }
+}
 var FRONTDOOR_SUPERVISOR_STILL_RUNNING = -1;
 var FRONTDOOR_POLL_MS = 1e3;
 var MS_PER_MINUTE3 = 6e4;
@@ -131081,15 +131088,20 @@ function createRcStreamHub(deps) {
 
 // src/frontdoor/watchdog.ts
 var import_node_worker_threads2 = require("node:worker_threads");
+init_schema();
 init_ensure2();
 init_probe();
 var DOOR_STALL_BOUND_MS = 2 * FRONTDOOR_PROBE_ATTEMPTS * PROBE_TIMEOUT_MS;
+var MS_PER_MINUTE4 = 6e4;
+var DOOR_RESPAWN_MIN_SERVING_MS = FRONTDOOR_DEFAULT_IDLE_SHUTDOWN_MINUTES * MS_PER_MINUTE4;
+var DOOR_AWAIT_PID_ENV = "AGENT_SHIM_FRONTDOOR_AWAIT_PID";
 var CHECKS_PER_PROBE_DEADLINE = 2;
 var DOOR_WATCHDOG_CHECK_MS = PROBE_TIMEOUT_MS / CHECKS_PER_PROBE_DEADLINE;
 var WATCHDOG_SOURCE = `
 const { workerData, parentPort } = require("node:worker_threads");
 const fs = require("node:fs");
-const { shared, boundMs, checkEveryMs, stateFile, ownPid, action } = workerData;
+const { shared, boundMs, checkEveryMs, stateFile, ownPid, action, logFile, respawn, respawnAfterServingMs, awaitPidEnv } = workerData;
+const startedAt = Date.now();
 const counter = new Int32Array(shared);
 let lastValue = Atomics.load(counter, 0);
 let lastChangeAt = Date.now();
@@ -131106,6 +131118,31 @@ const record = (message) => {
     // The state file is a courtesy to whoever looks next; the process still has to end.
   }
 };
+const log = (line) => {
+  if (logFile === undefined) return;
+  try {
+    fs.appendFileSync(logFile, new Date().toISOString() + " frontdoor " + String(ownPid) + ": " + line + "\\n");
+  } catch (error) {
+    // Nowhere left to report a failed log write to; the process still has to end.
+  }
+};
+const spawnReplacement = () => {
+  if (respawn === undefined || logFile === undefined) return;
+  const servedMs = Date.now() - startedAt;
+  if (servedMs < respawnAfterServingMs) {
+    log("the door served for " + String(servedMs) + "ms before stalling, less than the " + String(respawnAfterServingMs) + "ms it must have served to be replaced; leaving the next launch to start one");
+    return;
+  }
+  try {
+    const out = fs.openSync(logFile, "a");
+    const child = require("node:child_process").spawn(respawn.command, respawn.args, { detached: true, stdio: ["ignore", out, out], env: Object.assign({}, respawn.env, { [awaitPidEnv]: String(ownPid) }) });
+    child.unref();
+    fs.closeSync(out);
+    log("started replacement door " + String(child.pid) + ", which binds once this process is gone");
+  } catch (error) {
+    log("could not start a replacement door: " + (error instanceof Error ? error.message : String(error)));
+  }
+};
 const timer = setInterval(() => {
   if (stopped) return;
   const now = Date.now();
@@ -131120,6 +131157,8 @@ const timer = setInterval(() => {
   if (now - lastChangeAt >= boundMs) {
     const message = "the front door's event loop did not run for " + String(now - lastChangeAt) + "ms; its watchdog ended the process so the next launch starts a fresh door on the same ports";
     record(message);
+    log(message);
+    spawnReplacement();
     stopped = true;
     clearInterval(timer);
     if (action === "kill-process") {
@@ -131142,7 +131181,7 @@ function startThreadWatchdog(params) {
   const counter = new Int32Array(shared);
   const worker = new import_node_worker_threads2.Worker(WATCHDOG_SOURCE, {
     eval: true,
-    workerData: { shared, boundMs: params.boundMs, checkEveryMs: params.checkEveryMs, stateFile: params.stateFile, ownPid: params.ownPid, action: params.action }
+    workerData: { shared, boundMs: params.boundMs, checkEveryMs: params.checkEveryMs, stateFile: params.stateFile, ownPid: params.ownPid, action: params.action, logFile: params.logFile, respawn: params.respawn, respawnAfterServingMs: params.respawnAfterServingMs, awaitPidEnv: DOOR_AWAIT_PID_ENV }
   });
   worker.unref();
   worker.on("message", (message) => {
@@ -131270,6 +131309,13 @@ function createRealQuotaRefresher(params) {
 
 // src/frontdoor/commands.ts
 init_store2();
+function respawnInvocation(paths) {
+  const env = {};
+  for (const [name, value2] of Object.entries({ ...process.env, AGENT_SHIM_HOME: paths.root })) {
+    env[name] = value2;
+  }
+  return { ...selfInvocation(["__frontdoor-supervisor"]), env };
+}
 function appendLog(paths, line) {
   import_node_fs19.default.mkdirSync(paths.logsDir, { recursive: true });
   import_node_fs19.default.appendFileSync(paths.frontdoorLogPath, `${(/* @__PURE__ */ new Date()).toISOString()} ${line}
@@ -131663,7 +131709,16 @@ function realFrontDoorSupervisorPorts(paths) {
       return { port: handle.port, close: handle.close };
     },
     closeRcStreamHub: rcHub.close,
-    startWatchdog: () => startThreadWatchdog({ stateFile: paths.frontdoorStateFile, ownPid: process.pid, boundMs: DOOR_STALL_BOUND_MS, checkEveryMs: DOOR_WATCHDOG_CHECK_MS, action: "kill-process" }),
+    startWatchdog: () => startThreadWatchdog({
+      stateFile: paths.frontdoorStateFile,
+      ownPid: process.pid,
+      boundMs: DOOR_STALL_BOUND_MS,
+      checkEveryMs: DOOR_WATCHDOG_CHECK_MS,
+      action: "kill-process",
+      logFile: paths.frontdoorLogPath,
+      respawn: respawnInvocation(paths),
+      respawnAfterServingMs: DOOR_RESPAWN_MIN_SERVING_MS
+    }),
     // The launch lifecycle publisher over the same backbone the typed API serves: the tick's registry facts go in here, and the door's own register, prune and end moments come out as source-tagged events.
     observeLaunchRegistry: createLaunchEventPublisher(doorEvents, () => Date.now()).observe,
     doorHealth,
@@ -131708,14 +131763,24 @@ function registerFrontDoorCommand(program2, deps) {
   registerRcCommand(frontdoor, paths);
   program2.command("__frontdoor-supervisor", { hidden: true }).description("Internal: serve the front-door routing listeners. Started by the launcher; never run by hand.").allowUnknownOption().action(async () => {
     const idleShutdownMinutes = readGlobalConfig(paths)?.frontdoor?.idleShutdownMinutes ?? FRONTDOOR_DEFAULT_IDLE_SHUTDOWN_MINUTES;
-    process.on("SIGTERM", () => {
-      deps.exit(0);
-    });
-    process.on("SIGINT", () => {
-      deps.exit(0);
-    });
+    const supervisorPorts = realFrontDoorSupervisorPorts(paths);
+    const ownPid = process.pid;
+    process.on("exit", (code) => {
+      supervisorPorts.log(`frontdoor ${String(ownPid)}: exiting with code ${String(code)}`);
+    });
+    for (const signal of ["SIGTERM", "SIGINT"]) {
+      process.on(signal, () => {
+        supervisorPorts.log(`frontdoor ${String(ownPid)}: received ${signal}; exiting`);
+        deps.exit(0);
+      });
+    }
+    const awaited = Number(process.env[DOOR_AWAIT_PID_ENV]);
+    Reflect.deleteProperty(process.env, DOOR_AWAIT_PID_ENV);
+    if (Number.isInteger(awaited) && awaited > 0) {
+      await awaitPidExit(awaited, DOOR_STALL_BOUND_MS, supervisorPorts);
+    }
     declareThisProcessTheFrontDoor();
-    deps.exit(await runFrontDoorSupervisor(idleShutdownMinutes, realFrontDoorSupervisorPorts(paths)));
+    deps.exit(await runFrontDoorSupervisor(idleShutdownMinutes, supervisorPorts));
   });
 }
 

package/dist/index.cjs

@@ -2787,7 +2787,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.8.1",
+      version: "11.8.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>",

package/dist/index.mjs

@@ -2763,7 +2763,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.8.1",
+      version: "11.8.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>",

package/dist/types/index.d.ts

@@ -1332,8 +1332,8 @@ declare const HeadroomGlobalConfigSchema: z.ZodObject<{
     targetRatio: z.ZodOptional<z.ZodNumber>;
     ccr: z.ZodOptional<z.ZodEnum<{
         default: "default";
-        lossless: "lossless";
         none: "none";
+        lossless: "lossless";
     }>>;
     rolloutChannel: z.ZodOptional<z.ZodEnum<{
         beta: "beta";
@@ -1460,8 +1460,8 @@ declare const GlobalConfigSchema: z.ZodObject<{
         targetRatio: z.ZodOptional<z.ZodNumber>;
         ccr: z.ZodOptional<z.ZodEnum<{
             default: "default";
-            lossless: "lossless";
             none: "none";
+            lossless: "lossless";
         }>>;
         rolloutChannel: z.ZodOptional<z.ZodEnum<{
             beta: "beta";
@@ -4163,12 +4163,12 @@ declare const CheckReportJsonSchema: z.ZodObject<{
     identity: z.ZodObject<{
         name: z.ZodNullable<z.ZodString>;
         source: z.ZodEnum<{
-            env: "env";
-            none: "none";
             "config-dir-escape-hatch": "config-dir-escape-hatch";
             argv: "argv";
+            env: "env";
             "directory-pin": "directory-pin";
             "active-identity-file": "active-identity-file";
+            none: "none";
         }>;
     }, z.core.$strict>;
     pool: z.ZodOptional<z.ZodObject<{
@@ -4246,11 +4246,11 @@ declare const CheckReportJsonSchema: z.ZodObject<{
             "category-default": "category-default";
         }>;
         category: z.ZodNullable<z.ZodEnum<{
+            secret: "secret";
             runtime: "runtime";
             history: "history";
             knowledge: "knowledge";
             settings: "settings";
-            secret: "secret";
         }>>;
         rule: z.ZodOptional<z.ZodObject<{
             key: z.ZodString;
@@ -6964,9 +6964,9 @@ declare function createLifecycleApiRouter(deps: LifecycleApiDeps): {
             current: zod.ZodString;
             latest: zod.ZodString;
             action: zod.ZodEnum<{
-                updated: "updated";
                 current: "current";
                 available: "available";
+                updated: "updated";
             }>;
         }, zod_v4_core.$strict>, MergedErrorMap<$ErrorMap, TErrorMap>>;
     };
@@ -7213,12 +7213,12 @@ declare function createLaunchApiRouter(deps: LaunchApiDeps): {
             decision: zod.ZodObject<{
                 identity: zod.ZodOptional<zod.ZodString>;
                 identitySource: zod.ZodEnum<{
-                    env: "env";
-                    none: "none";
                     "config-dir-escape-hatch": "config-dir-escape-hatch";
                     argv: "argv";
+                    env: "env";
                     "directory-pin": "directory-pin";
                     "active-identity-file": "active-identity-file";
+                    none: "none";
                 }>;
                 pool: zod.ZodOptional<zod.ZodObject<{
                     name: zod.ZodString;
@@ -7813,12 +7813,12 @@ declare function createControlApiRouter(deps: ControlApiDeps): {
             identity: zod.ZodObject<{
                 name: zod.ZodNullable<zod.ZodString>;
                 source: zod.ZodEnum<{
-                    env: "env";
-                    none: "none";
                     "config-dir-escape-hatch": "config-dir-escape-hatch";
                     argv: "argv";
+                    env: "env";
                     "directory-pin": "directory-pin";
                     "active-identity-file": "active-identity-file";
+                    none: "none";
                 }>;
             }, zod_v4_core.$strict>;
             pool: zod.ZodOptional<zod.ZodObject<{
@@ -7896,11 +7896,11 @@ declare function createControlApiRouter(deps: ControlApiDeps): {
                     "category-default": "category-default";
                 }>;
                 category: zod.ZodNullable<zod.ZodEnum<{
+                    secret: "secret";
                     runtime: "runtime";
                     history: "history";
                     knowledge: "knowledge";
                     settings: "settings";
-                    secret: "secret";
                 }>>;
                 rule: zod.ZodOptional<zod.ZodObject<{
                     key: zod.ZodString;
@@ -8119,11 +8119,10 @@ declare function createControlApiRouter(deps: ControlApiDeps): {
                     "global-config": "global-config";
                     "config-profile": "config-profile";
                     identity: "identity";
-                    keychain: "keychain";
                     provider: "provider";
-                    headroom: "headroom";
                     frontdoor: "frontdoor";
                     pool: "pool";
+                    keychain: "keychain";
                     "ambient-credential": "ambient-credential";
                     "binary-discovery": "binary-discovery";
                     "claude-shim": "claude-shim";
@@ -8133,6 +8132,7 @@ declare function createControlApiRouter(deps: ControlApiDeps): {
                     "directory-rules": "directory-rules";
                     "categories-local": "categories-local";
                     "active-identity": "active-identity";
+                    headroom: "headroom";
                 }>;
                 subject: zod.ZodOptional<zod.ZodString>;
                 severity: zod.ZodEnum<{
@@ -8325,12 +8325,12 @@ declare function createDoorApiRouter(deps: DoorApiDeps): {
             decision: zod.ZodObject<{
                 identity: zod.ZodOptional<zod.ZodString>;
                 identitySource: zod.ZodEnum<{
-                    env: "env";
-                    none: "none";
                     "config-dir-escape-hatch": "config-dir-escape-hatch";
                     argv: "argv";
+                    env: "env";
                     "directory-pin": "directory-pin";
                     "active-identity-file": "active-identity-file";
+                    none: "none";
                 }>;
                 pool: zod.ZodOptional<zod.ZodObject<{
                     name: zod.ZodString;
@@ -9706,9 +9706,9 @@ declare function createDoorApiRouter(deps: DoorApiDeps): {
             current: zod.ZodString;
             latest: zod.ZodString;
             action: zod.ZodEnum<{
-                updated: "updated";
                 current: "current";
                 available: "available";
+                updated: "updated";
             }>;
         }, zod_v4_core.$strict>, MergedErrorMap<$ErrorMap, TErrorMap>>;
     };
@@ -9907,12 +9907,12 @@ declare function createDoorApiRouter(deps: DoorApiDeps): {
             identity: zod.ZodObject<{
                 name: zod.ZodNullable<zod.ZodString>;
                 source: zod.ZodEnum<{
-                    env: "env";
-                    none: "none";
                     "config-dir-escape-hatch": "config-dir-escape-hatch";
                     argv: "argv";
+                    env: "env";
                     "directory-pin": "directory-pin";
                     "active-identity-file": "active-identity-file";
+                    none: "none";
                 }>;
             }, zod_v4_core.$strict>;
             pool: zod.ZodOptional<zod.ZodObject<{
@@ -9990,11 +9990,11 @@ declare function createDoorApiRouter(deps: DoorApiDeps): {
                     "category-default": "category-default";
                 }>;
                 category: zod.ZodNullable<zod.ZodEnum<{
+                    secret: "secret";
                     runtime: "runtime";
                     history: "history";
                     knowledge: "knowledge";
                     settings: "settings";
-                    secret: "secret";
                 }>>;
                 rule: zod.ZodOptional<zod.ZodObject<{
                     key: zod.ZodString;
@@ -10213,11 +10213,10 @@ declare function createDoorApiRouter(deps: DoorApiDeps): {
                     "global-config": "global-config";
                     "config-profile": "config-profile";
                     identity: "identity";
-                    keychain: "keychain";
                     provider: "provider";
-                    headroom: "headroom";
                     frontdoor: "frontdoor";
                     pool: "pool";
+                    keychain: "keychain";
                     "ambient-credential": "ambient-credential";
                     "binary-discovery": "binary-discovery";
                     "claude-shim": "claude-shim";
@@ -10227,6 +10226,7 @@ declare function createDoorApiRouter(deps: DoorApiDeps): {
                     "directory-rules": "directory-rules";
                     "categories-local": "categories-local";
                     "active-identity": "active-identity";
+                    headroom: "headroom";
                 }>;
                 subject: zod.ZodOptional<zod.ZodString>;
                 severity: zod.ZodEnum<{
@@ -12059,11 +12059,10 @@ declare const DoctorFindingSchema: z.ZodObject<{
         "global-config": "global-config";
         "config-profile": "config-profile";
         identity: "identity";
-        keychain: "keychain";
         provider: "provider";
-        headroom: "headroom";
         frontdoor: "frontdoor";
         pool: "pool";
+        keychain: "keychain";
         "ambient-credential": "ambient-credential";
         "binary-discovery": "binary-discovery";
         "claude-shim": "claude-shim";
@@ -12073,6 +12072,7 @@ declare const DoctorFindingSchema: z.ZodObject<{
         "directory-rules": "directory-rules";
         "categories-local": "categories-local";
         "active-identity": "active-identity";
+        headroom: "headroom";
     }>;
     subject: z.ZodOptional<z.ZodString>;
     severity: z.ZodEnum<{
@@ -12090,11 +12090,10 @@ declare const DoctorRunOutputSchema: z.ZodObject<{
             "global-config": "global-config";
             "config-profile": "config-profile";
             identity: "identity";
-            keychain: "keychain";
             provider: "provider";
-            headroom: "headroom";
             frontdoor: "frontdoor";
             pool: "pool";
+            keychain: "keychain";
             "ambient-credential": "ambient-credential";
             "binary-discovery": "binary-discovery";
             "claude-shim": "claude-shim";
@@ -12104,6 +12103,7 @@ declare const DoctorRunOutputSchema: z.ZodObject<{
             "directory-rules": "directory-rules";
             "categories-local": "categories-local";
             "active-identity": "active-identity";
+            headroom: "headroom";
         }>;
         subject: z.ZodOptional<z.ZodString>;
         severity: z.ZodEnum<{
@@ -12124,9 +12124,9 @@ declare const UpdateCheckOutputSchema: z.ZodObject<{
     current: z.ZodString;
     latest: z.ZodString;
     action: z.ZodEnum<{
-        updated: "updated";
         current: "current";
         available: "available";
+        updated: "updated";
     }>;
 }, z.core.$strict>;
 /** The Sign in with ChatGPT login's state as `codex status` reports it: no sign-in yet, signed in (with who, whether the plan scope was granted, and when the access token lapses), or a file that cannot be read. */
@@ -12176,12 +12176,12 @@ declare const LaunchResolveOutputSchema: z.ZodObject<{
     decision: z.ZodObject<{
         identity: z.ZodOptional<z.ZodString>;
         identitySource: z.ZodEnum<{
-            env: "env";
-            none: "none";
             "config-dir-escape-hatch": "config-dir-escape-hatch";
             argv: "argv";
+            env: "env";
             "directory-pin": "directory-pin";
             "active-identity-file": "active-identity-file";
+            none: "none";
         }>;
         pool: z.ZodOptional<z.ZodObject<{
             name: z.ZodString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-shim",
-  "version": "11.8.1",
+  "version": "11.8.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>",