agent-shim 8.0.0 → 8.0.1

package/dist/cli.cjs

@@ -61039,7 +61039,7 @@ function registerIdentityCommand(program2, deps) {
 // package.json
 var package_default = {
   name: "agent-shim",
-  version: "8.0.0",
+  version: "8.0.1",
   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>",
@@ -68037,13 +68037,231 @@ function registerDoctorCommand(program2, deps) {
 }
 
 // src/headroom/commands.ts
-var import_node_fs15 = __toESM(require("node:fs"), 1);
+var import_node_fs16 = __toESM(require("node:fs"), 1);
 var import_node_http2 = __toESM(require("node:http"), 1);
-var import_node_path35 = __toESM(require("node:path"), 1);
+var import_node_path36 = __toESM(require("node:path"), 1);
 var import_node_child_process5 = require("node:child_process");
 
-// src/headroom/settings.ts
+// src/frontdoor/realFrontDoorPort.ts
+var import_node_fs15 = __toESM(require("node:fs"), 1);
+
+// src/frontdoor/ensure.ts
 var import_node_crypto12 = require("node:crypto");
+var FRONTDOOR_START_TIMEOUT_MS = 3e4;
+var FRONTDOOR_LAUNCHER_POLL_MS = 100;
+var FrontDoorStartError = class extends CliError {
+  constructor(message) {
+    super(message);
+    this.name = "FrontDoorStartError";
+  }
+};
+function ensureFrontDoor(params) {
+  const { paths, ports } = params;
+  const deadline = ports.now() + FRONTDOOR_START_TIMEOUT_MS;
+  let spawned = false;
+  let replaced = false;
+  const distrusted = /* @__PURE__ */ new Set();
+  let lastRejection;
+  for (; ; ) {
+    const state = readFrontDoorState(ports.fs, paths.frontdoorStateFile);
+    const supervisorPid = state?.supervisorPid;
+    if (supervisorPid !== void 0 && !distrusted.has(supervisorPid) && ports.isRunning(supervisorPid)) {
+      if (state?.port !== void 0 && state.connectPort !== void 0) {
+        const verdict = ports.verifyListener(state.port);
+        if (verdict.ok && (state.protocol ?? 0) < FRONT_DOOR_PROTOCOL && !replaced) {
+          ports.stopSupervisor(supervisorPid);
+          while (ports.isRunning(supervisorPid)) {
+            if (ports.now() >= deadline) {
+              throw new FrontDoorStartError(`agent-shim: the front door (pid ${String(supervisorPid)}, protocol ${String(state.protocol ?? 0)}) is older than this launcher (protocol ${String(FRONT_DOOR_PROTOCOL)}) and did not exit when asked. Daemon log: ${paths.frontdoorLogPath}`);
+            }
+            ports.sleep(FRONTDOOR_LAUNCHER_POLL_MS);
+          }
+          replaced = true;
+          continue;
+        }
+        if (verdict.ok) {
+          const token = (0, import_node_crypto12.randomUUID)();
+          writeFrontDoorSession(ports.fs, paths.frontdoorSessionsDir, { pid: params.launcherPid, startedAt: ports.now(), token });
+          return { port: state.port, connectPort: state.connectPort, token };
+        }
+        lastRejection = `the listener on 127.0.0.1:${String(state.port)} (recorded for pid ${String(supervisorPid)}) failed authentication: ${verdict.reason}`;
+        if (spawned) {
+          throw new FrontDoorStartError(`agent-shim: ${lastRejection}; refusing to send this session's credentials to it. Daemon log: ${paths.frontdoorLogPath}`);
+        }
+        distrusted.add(supervisorPid);
+        continue;
+      }
+      if (state?.lastError !== void 0) {
+        throw new FrontDoorStartError(`agent-shim: the front door reported a fatal error and is not serving: ${state.lastError} (daemon log: ${paths.frontdoorLogPath})`);
+      }
+    } else if (!spawned) {
+      ports.fs.mkdirp(paths.frontdoorDir);
+      const created = ports.fs.writeFileExclusive(paths.frontdoorLockFile, `${JSON.stringify({ pid: params.launcherPid, at: ports.now() })}
+`);
+      if (created) {
+        ports.spawnSupervisor(paths);
+        spawned = true;
+      } else {
+        const lock = readStartLock(ports.fs, paths.frontdoorLockFile);
+        if (lock === void 0 || !ports.isRunning(lock.pid)) {
+          ports.fs.removeRecursive(paths.frontdoorLockFile);
+          continue;
+        }
+      }
+    }
+    if (ports.now() >= deadline) {
+      const lastError = state?.lastError;
+      throw new FrontDoorStartError(
+        `agent-shim: the front door did not become ready within ${String(FRONTDOOR_START_TIMEOUT_MS)}ms` + (lastError === void 0 ? "" : ` (last error: ${lastError})`) + (lastRejection === void 0 ? "" : ` (${lastRejection})`) + `. Daemon log: ${paths.frontdoorLogPath}`
+      );
+    }
+    ports.sleep(FRONTDOOR_LAUNCHER_POLL_MS);
+  }
+}
+
+// src/frontdoor/probe.ts
+var import_node_worker_threads = require("node:worker_threads");
+var PROBE_TIMEOUT_MS = 2e3;
+var PROBE_WAIT_MARGIN_MS = 1e3;
+var REASON_BYTES = 1024;
+var HEADER_SLOTS = 2;
+var INT32_BYTES = 4;
+var VERDICT_PENDING = 0;
+var VERDICT_OK = 1;
+var VERDICT_FAILED = 2;
+var PROBE_SOURCE = `
+const { workerData } = require("node:worker_threads");
+const https = require("node:https");
+const { port, ca, timeoutMs, shared, ok, failed, headerSlots } = workerData;
+const header = new Int32Array(shared, 0, headerSlots);
+const reason = new Uint8Array(shared, headerSlots * 4);
+let done = false;
+const finish = (verdict, message) => {
+  if (done) return;
+  done = true;
+  const bytes = Buffer.from(String(message), "utf8").subarray(0, reason.length);
+  reason.set(bytes);
+  Atomics.store(header, 1, bytes.length);
+  Atomics.store(header, 0, verdict);
+  Atomics.notify(header, 0);
+};
+const request = https.get({ host: "127.0.0.1", port, path: "/healthz", ca: [ca], agent: false }, (response) => {
+  let body = "";
+  response.setEncoding("utf8");
+  response.on("data", (chunk) => { body += chunk; });
+  response.on("end", () => {
+    if (response.statusCode === 200 && body === "ok") finish(ok, "");
+    else finish(failed, "the listener answered its health probe with HTTP " + String(response.statusCode));
+  });
+  response.on("error", (error) => finish(failed, error.message));
+});
+// A hard deadline over the whole exchange, handshake included: a listener that accepts the connection and then says nothing must still fail the probe.
+setTimeout(() => { request.destroy(new Error("no answer within " + String(timeoutMs) + "ms")); }, timeoutMs);
+request.on("error", (error) => finish(failed, (error.code ? error.code + ": " : "") + error.message));
+`;
+function probeFrontDoorSync(port, caPem) {
+  const shared = new SharedArrayBuffer(HEADER_SLOTS * INT32_BYTES + REASON_BYTES);
+  const header = new Int32Array(shared, 0, HEADER_SLOTS);
+  const worker = new import_node_worker_threads.Worker(PROBE_SOURCE, {
+    eval: true,
+    workerData: { port, ca: caPem, timeoutMs: PROBE_TIMEOUT_MS, shared, ok: VERDICT_OK, failed: VERDICT_FAILED, headerSlots: HEADER_SLOTS }
+  });
+  worker.unref();
+  try {
+    const waited = Atomics.wait(header, 0, VERDICT_PENDING, PROBE_TIMEOUT_MS + PROBE_WAIT_MARGIN_MS);
+    const verdict = Atomics.load(header, 0);
+    if (waited === "timed-out" || verdict === VERDICT_PENDING) {
+      return { ok: false, reason: `the probe did not finish within ${String(PROBE_TIMEOUT_MS + PROBE_WAIT_MARGIN_MS)}ms` };
+    }
+    if (verdict === VERDICT_OK) {
+      return { ok: true };
+    }
+    const length = Atomics.load(header, 1);
+    return { ok: false, reason: Buffer.from(new Uint8Array(shared, HEADER_SLOTS * INT32_BYTES, length)).toString("utf8") };
+  } finally {
+    void worker.terminate();
+  }
+}
+
+// src/frontdoor/trust.ts
+var import_node_crypto13 = require("node:crypto");
+var import_node_path35 = __toESM(require("node:path"), 1);
+var BUNDLE_NAME_HEX_DIGITS = 16;
+function resolveTrustBundle(params) {
+  const { caCertFile, bundlesDir, variable, inherited, fs: fs19 } = params;
+  if (inherited === void 0 || inherited === "" || import_node_path35.default.resolve(inherited) === import_node_path35.default.resolve(caCertFile)) {
+    return { path: caCertFile };
+  }
+  const caPem = fs19.readFileUtf8(caCertFile);
+  let inheritedPem;
+  try {
+    inheritedPem = fs19.readFileUtf8(inherited);
+  } catch (error62) {
+    return {
+      path: caCertFile,
+      warning: `agent-shim: ${variable} names ${inherited}, which could not be read (${error62 instanceof Error ? error62.message : String(error62)}); the child trusts agent-shim's front-door CA on top of the system store, and nothing from that file`
+    };
+  }
+  if (inheritedPem.includes(caPem.trim())) {
+    return { path: inherited };
+  }
+  const combined = `${inheritedPem.trimEnd()}
+${caPem}`;
+  const bundle = import_node_path35.default.join(bundlesDir, `${(0, import_node_crypto13.createHash)("sha256").update(combined).digest("hex").slice(0, BUNDLE_NAME_HEX_DIGITS)}.pem`);
+  if (!fs19.exists(bundle)) {
+    fs19.mkdirp(bundlesDir);
+    fs19.writeFileAtomic(bundle, combined);
+  }
+  return { path: bundle };
+}
+
+// src/frontdoor/realFrontDoorPort.ts
+var realTrustBundleFs = {
+  readFileUtf8: (file2) => import_node_fs15.default.readFileSync(file2, "utf8"),
+  exists: (file2) => import_node_fs15.default.existsSync(file2),
+  mkdirp: (dir) => {
+    import_node_fs15.default.mkdirSync(dir, { recursive: true });
+  },
+  writeFileAtomic: (file2, contents) => {
+    realFarmFs.writeFilePrivate(file2, contents);
+  }
+};
+function realFrontDoorPort(paths, spawnDaemon) {
+  return {
+    ensure: (inheritedExtraCaCerts) => {
+      const up = ensureFrontDoor({
+        paths,
+        launcherPid: process.pid,
+        ports: {
+          fs: realFarmFs,
+          isRunning: realIsProcessRunning,
+          now: () => Date.now(),
+          sleep: realSleepSync,
+          spawnSupervisor: (layout) => spawnDaemon(layout, "__frontdoor-supervisor", layout.frontdoorLogPath),
+          stopSupervisor: (pid) => {
+            process.kill(pid, "SIGTERM");
+          },
+          // Read fresh for each probe: a replacement supervisor may have regenerated an unparseable CA, and the probe must trust exactly what the serving door's leaf chains to.
+          verifyListener: (port) => probeFrontDoorSync(port, import_node_fs15.default.readFileSync(paths.frontdoorCaCertFile, "utf8"))
+        }
+      });
+      const trust = resolveTrustBundle({ caCertFile: paths.frontdoorCaCertFile, bundlesDir: paths.frontdoorCaBundlesDir, variable: "NODE_EXTRA_CA_CERTS", inherited: inheritedExtraCaCerts, fs: realTrustBundleFs });
+      return {
+        port: up.port,
+        connectPort: up.connectPort,
+        trustBundlePath: trust.path,
+        ...trust.warning === void 0 ? {} : { trustWarning: trust.warning },
+        sessionToken: up.token
+      };
+    },
+    release: () => {
+      removeFrontDoorSession(realFarmFs, paths.frontdoorSessionsDir, process.pid);
+    }
+  };
+}
+
+// src/headroom/settings.ts
+var import_node_crypto14 = require("node:crypto");
 function settingsOf(config2) {
   return {
     ...config2.mode === void 0 ? {} : { mode: config2.mode },
@@ -68068,7 +68286,7 @@ function settingsEnv(settings2) {
   return settings2.rolloutChannel === void 0 ? {} : { HEADROOM_ROLLOUT_CHANNEL: settings2.rolloutChannel };
 }
 function hashSettings(settings2) {
-  return (0, import_node_crypto12.createHash)("sha256").update(JSON.stringify([...settingsArgs(settings2), JSON.stringify(settingsEnv(settings2))])).digest("hex");
+  return (0, import_node_crypto14.createHash)("sha256").update(JSON.stringify([...settingsArgs(settings2), JSON.stringify(settingsEnv(settings2))])).digest("hex");
 }
 
 // src/headroom/supervisor.ts
@@ -68413,7 +68631,14 @@ var READY_FETCH_TIMEOUT_MS = 2e3;
 function headroomPidRunning(pid) {
   return !exitedHeadroom.has(pid) && realIsProcessRunning(pid);
 }
-function headroomSpawnEnv(parentEnv, allowlist, settings2, caBundle) {
+var HEADROOM_CA_BUNDLE = "HEADROOM_CA_BUNDLE";
+function resolveHeadroomTrustBundle(params) {
+  if (!params.fs.exists(params.caCertFile)) {
+    return void 0;
+  }
+  return resolveTrustBundle({ ...params, variable: HEADROOM_CA_BUNDLE });
+}
+function headroomSpawnEnv(parentEnv, allowlist, settings2, trustBundlePath) {
   const inherited = { ...parentEnv };
   delete inherited.HEADROOM_HOST;
   delete inherited.HEADROOM_PORT;
@@ -68421,8 +68646,8 @@ function headroomSpawnEnv(parentEnv, allowlist, settings2, caBundle) {
     ...inherited,
     HEADROOM_ALLOWED_BASE_URLS: allowlist.join(","),
     HEADROOM_HTTP2: parentEnv.HEADROOM_HTTP2 ?? "0",
-    // A transparent-interception deployment redirects the API host's address machine-wide, so headroom's own Python dials reach the front door's leaf instead of the origin's public certificate, and Python trusts only the system store: point its two trust variables (urllib3/httpx read both) at the door's combined bundle, which carries the system-equivalent anchors alongside the door's CA. An explicit value in the parent environment always wins, exactly like HEADROOM_HTTP2.
-    ...caBundle === void 0 || parentEnv.REQUESTS_CA_BUNDLE !== void 0 || parentEnv.SSL_CERT_FILE !== void 0 ? {} : { REQUESTS_CA_BUNDLE: caBundle, SSL_CERT_FILE: caBundle },
+    // The bundle already holds any inherited HEADROOM_CA_BUNDLE's certificates, so replacing the variable loses nothing. An inherited SSL_CERT_FILE or REQUESTS_CA_BUNDLE passes through untouched and, by headroom's own precedence, still replaces everything: an explicit choice in the parent environment wins.
+    ...trustBundlePath === void 0 ? {} : { [HEADROOM_CA_BUNDLE]: trustBundlePath },
     ...settingsEnv(settings2)
   };
 }
@@ -68449,12 +68674,12 @@ function readInstalledHeadroomCommit() {
   if (toolDir.status !== 0) {
     return void 0;
   }
-  const libDir = import_node_path35.default.join(toolDir.stdout.trim(), HEADROOM_TOOL_NAME, "lib");
+  const libDir = import_node_path36.default.join(toolDir.stdout.trim(), HEADROOM_TOOL_NAME, "lib");
   for (const python of realFarmFs.readdir(libDir)) {
-    const sitePackages = import_node_path35.default.join(libDir, python, "site-packages");
+    const sitePackages = import_node_path36.default.join(libDir, python, "site-packages");
     for (const entry of realFarmFs.readdir(sitePackages)) {
       if (entry.startsWith("headroom_ai-") && entry.endsWith(".dist-info")) {
-        const directUrl = realFarmFs.readFileUtf8(import_node_path35.default.join(sitePackages, entry, "direct_url.json"));
+        const directUrl = realFarmFs.readFileUtf8(import_node_path36.default.join(sitePackages, entry, "direct_url.json"));
         return directUrl === void 0 ? void 0 : parseInstalledCommit(directUrl);
       }
     }
@@ -68477,14 +68702,18 @@ function realSupervisorPorts(paths) {
     socketTrust: realHeadroomSocketTrust,
     readConfig: () => resolveSupervisorConfig(readGlobalConfig(paths)?.headroom ?? {}),
     spawnHeadroom: (socketPath, allowlist, settings2) => {
-      const caBundle = import_node_fs15.default.existsSync(paths.frontdoorCaCertFile) ? import_node_fs15.default.readFileSync(paths.frontdoorCaCertFile, "utf8") : void 0;
-      import_node_fs15.default.mkdirSync(paths.logsDir, { recursive: true });
-      const logFd = import_node_fs15.default.openSync(paths.headroomLogPath, "a");
+      const trust = resolveHeadroomTrustBundle({ caCertFile: paths.frontdoorCaCertFile, bundlesDir: paths.frontdoorCaBundlesDir, inherited: process.env[HEADROOM_CA_BUNDLE], fs: realTrustBundleFs });
+      import_node_fs16.default.mkdirSync(paths.logsDir, { recursive: true });
+      if (trust?.warning !== void 0) {
+        import_node_fs16.default.appendFileSync(paths.headroomLogPath, `${(/* @__PURE__ */ new Date()).toISOString()} ${trust.warning}
+`);
+      }
+      const logFd = import_node_fs16.default.openSync(paths.headroomLogPath, "a");
       try {
         const child = (0, import_node_child_process5.spawn)("headroom", headroomProxyArgs(socketPath, settings2), {
           detached: true,
           stdio: ["ignore", logFd, logFd],
-          env: headroomSpawnEnv(process.env, allowlist, settings2, caBundle)
+          env: headroomSpawnEnv(process.env, allowlist, settings2, trust?.path)
         });
         if (child.pid === void 0) {
           throw new Error("spawning headroom returned no pid");
@@ -68494,12 +68723,12 @@ function realSupervisorPorts(paths) {
         child.once("exit", (code, signal) => {
           ownedHeadroom.delete(pid);
           exitedHeadroom.add(pid);
-          import_node_fs15.default.appendFileSync(paths.headroomLogPath, `${(/* @__PURE__ */ new Date()).toISOString()} agent-shim headroom supervisor: headroom exited (${signal ?? `code ${String(code)}`})
+          import_node_fs16.default.appendFileSync(paths.headroomLogPath, `${(/* @__PURE__ */ new Date()).toISOString()} agent-shim headroom supervisor: headroom exited (${signal ?? `code ${String(code)}`})
 `);
         });
         return pid;
       } finally {
-        import_node_fs15.default.closeSync(logFd);
+        import_node_fs16.default.closeSync(logFd);
       }
     },
     stopProcess: (pid) => {
@@ -68512,7 +68741,7 @@ function realSupervisorPorts(paths) {
         now: () => Date.now()
       });
       if (outcome === "still-running") {
-        import_node_fs15.default.appendFileSync(
+        import_node_fs16.default.appendFileSync(
           paths.headroomLogPath,
           `${(/* @__PURE__ */ new Date()).toISOString()} agent-shim headroom supervisor: pid ${String(pid)} survived SIGKILL within its grace; it is stuck uninterruptibly
 `
@@ -68526,10 +68755,10 @@ function realSupervisorPorts(paths) {
         return { ok: false, error: `uv is not installed or not on PATH (${result.error.message})` };
       }
       if (result.stdout !== "") {
-        import_node_fs15.default.appendFileSync(paths.headroomLogPath, result.stdout);
+        import_node_fs16.default.appendFileSync(paths.headroomLogPath, result.stdout);
       }
       if (result.stderr !== "") {
-        import_node_fs15.default.appendFileSync(paths.headroomLogPath, result.stderr);
+        import_node_fs16.default.appendFileSync(paths.headroomLogPath, result.stderr);
       }
       return result.status === 0 ? { ok: true } : { ok: false, error: `uv tool install exited ${String(result.status)}` };
     },
@@ -68539,8 +68768,8 @@ function realSupervisorPorts(paths) {
     },
     installedCommit: readInstalledHeadroomCommit,
     log: (line) => {
-      import_node_fs15.default.mkdirSync(paths.logsDir, { recursive: true });
-      import_node_fs15.default.appendFileSync(paths.headroomLogPath, `${(/* @__PURE__ */ new Date()).toISOString()} ${line}
+      import_node_fs16.default.mkdirSync(paths.logsDir, { recursive: true });
+      import_node_fs16.default.appendFileSync(paths.headroomLogPath, `${(/* @__PURE__ */ new Date()).toISOString()} ${line}
 `);
     }
   };
@@ -69253,224 +69482,6 @@ function buildProgram(deps) {
 var import_node_os8 = __toESM(require("node:os"), 1);
 var import_node_crypto16 = require("node:crypto");
 
-// src/frontdoor/realFrontDoorPort.ts
-var import_node_fs16 = __toESM(require("node:fs"), 1);
-
-// src/frontdoor/ensure.ts
-var import_node_crypto13 = require("node:crypto");
-var FRONTDOOR_START_TIMEOUT_MS = 3e4;
-var FRONTDOOR_LAUNCHER_POLL_MS = 100;
-var FrontDoorStartError = class extends CliError {
-  constructor(message) {
-    super(message);
-    this.name = "FrontDoorStartError";
-  }
-};
-function ensureFrontDoor(params) {
-  const { paths, ports } = params;
-  const deadline = ports.now() + FRONTDOOR_START_TIMEOUT_MS;
-  let spawned = false;
-  let replaced = false;
-  const distrusted = /* @__PURE__ */ new Set();
-  let lastRejection;
-  for (; ; ) {
-    const state = readFrontDoorState(ports.fs, paths.frontdoorStateFile);
-    const supervisorPid = state?.supervisorPid;
-    if (supervisorPid !== void 0 && !distrusted.has(supervisorPid) && ports.isRunning(supervisorPid)) {
-      if (state?.port !== void 0 && state.connectPort !== void 0) {
-        const verdict = ports.verifyListener(state.port);
-        if (verdict.ok && (state.protocol ?? 0) < FRONT_DOOR_PROTOCOL && !replaced) {
-          ports.stopSupervisor(supervisorPid);
-          while (ports.isRunning(supervisorPid)) {
-            if (ports.now() >= deadline) {
-              throw new FrontDoorStartError(`agent-shim: the front door (pid ${String(supervisorPid)}, protocol ${String(state.protocol ?? 0)}) is older than this launcher (protocol ${String(FRONT_DOOR_PROTOCOL)}) and did not exit when asked. Daemon log: ${paths.frontdoorLogPath}`);
-            }
-            ports.sleep(FRONTDOOR_LAUNCHER_POLL_MS);
-          }
-          replaced = true;
-          continue;
-        }
-        if (verdict.ok) {
-          const token = (0, import_node_crypto13.randomUUID)();
-          writeFrontDoorSession(ports.fs, paths.frontdoorSessionsDir, { pid: params.launcherPid, startedAt: ports.now(), token });
-          return { port: state.port, connectPort: state.connectPort, token };
-        }
-        lastRejection = `the listener on 127.0.0.1:${String(state.port)} (recorded for pid ${String(supervisorPid)}) failed authentication: ${verdict.reason}`;
-        if (spawned) {
-          throw new FrontDoorStartError(`agent-shim: ${lastRejection}; refusing to send this session's credentials to it. Daemon log: ${paths.frontdoorLogPath}`);
-        }
-        distrusted.add(supervisorPid);
-        continue;
-      }
-      if (state?.lastError !== void 0) {
-        throw new FrontDoorStartError(`agent-shim: the front door reported a fatal error and is not serving: ${state.lastError} (daemon log: ${paths.frontdoorLogPath})`);
-      }
-    } else if (!spawned) {
-      ports.fs.mkdirp(paths.frontdoorDir);
-      const created = ports.fs.writeFileExclusive(paths.frontdoorLockFile, `${JSON.stringify({ pid: params.launcherPid, at: ports.now() })}
-`);
-      if (created) {
-        ports.spawnSupervisor(paths);
-        spawned = true;
-      } else {
-        const lock = readStartLock(ports.fs, paths.frontdoorLockFile);
-        if (lock === void 0 || !ports.isRunning(lock.pid)) {
-          ports.fs.removeRecursive(paths.frontdoorLockFile);
-          continue;
-        }
-      }
-    }
-    if (ports.now() >= deadline) {
-      const lastError = state?.lastError;
-      throw new FrontDoorStartError(
-        `agent-shim: the front door did not become ready within ${String(FRONTDOOR_START_TIMEOUT_MS)}ms` + (lastError === void 0 ? "" : ` (last error: ${lastError})`) + (lastRejection === void 0 ? "" : ` (${lastRejection})`) + `. Daemon log: ${paths.frontdoorLogPath}`
-      );
-    }
-    ports.sleep(FRONTDOOR_LAUNCHER_POLL_MS);
-  }
-}
-
-// src/frontdoor/probe.ts
-var import_node_worker_threads = require("node:worker_threads");
-var PROBE_TIMEOUT_MS = 2e3;
-var PROBE_WAIT_MARGIN_MS = 1e3;
-var REASON_BYTES = 1024;
-var HEADER_SLOTS = 2;
-var INT32_BYTES = 4;
-var VERDICT_PENDING = 0;
-var VERDICT_OK = 1;
-var VERDICT_FAILED = 2;
-var PROBE_SOURCE = `
-const { workerData } = require("node:worker_threads");
-const https = require("node:https");
-const { port, ca, timeoutMs, shared, ok, failed, headerSlots } = workerData;
-const header = new Int32Array(shared, 0, headerSlots);
-const reason = new Uint8Array(shared, headerSlots * 4);
-let done = false;
-const finish = (verdict, message) => {
-  if (done) return;
-  done = true;
-  const bytes = Buffer.from(String(message), "utf8").subarray(0, reason.length);
-  reason.set(bytes);
-  Atomics.store(header, 1, bytes.length);
-  Atomics.store(header, 0, verdict);
-  Atomics.notify(header, 0);
-};
-const request = https.get({ host: "127.0.0.1", port, path: "/healthz", ca: [ca], agent: false }, (response) => {
-  let body = "";
-  response.setEncoding("utf8");
-  response.on("data", (chunk) => { body += chunk; });
-  response.on("end", () => {
-    if (response.statusCode === 200 && body === "ok") finish(ok, "");
-    else finish(failed, "the listener answered its health probe with HTTP " + String(response.statusCode));
-  });
-  response.on("error", (error) => finish(failed, error.message));
-});
-// A hard deadline over the whole exchange, handshake included: a listener that accepts the connection and then says nothing must still fail the probe.
-setTimeout(() => { request.destroy(new Error("no answer within " + String(timeoutMs) + "ms")); }, timeoutMs);
-request.on("error", (error) => finish(failed, (error.code ? error.code + ": " : "") + error.message));
-`;
-function probeFrontDoorSync(port, caPem) {
-  const shared = new SharedArrayBuffer(HEADER_SLOTS * INT32_BYTES + REASON_BYTES);
-  const header = new Int32Array(shared, 0, HEADER_SLOTS);
-  const worker = new import_node_worker_threads.Worker(PROBE_SOURCE, {
-    eval: true,
-    workerData: { port, ca: caPem, timeoutMs: PROBE_TIMEOUT_MS, shared, ok: VERDICT_OK, failed: VERDICT_FAILED, headerSlots: HEADER_SLOTS }
-  });
-  worker.unref();
-  try {
-    const waited = Atomics.wait(header, 0, VERDICT_PENDING, PROBE_TIMEOUT_MS + PROBE_WAIT_MARGIN_MS);
-    const verdict = Atomics.load(header, 0);
-    if (waited === "timed-out" || verdict === VERDICT_PENDING) {
-      return { ok: false, reason: `the probe did not finish within ${String(PROBE_TIMEOUT_MS + PROBE_WAIT_MARGIN_MS)}ms` };
-    }
-    if (verdict === VERDICT_OK) {
-      return { ok: true };
-    }
-    const length = Atomics.load(header, 1);
-    return { ok: false, reason: Buffer.from(new Uint8Array(shared, HEADER_SLOTS * INT32_BYTES, length)).toString("utf8") };
-  } finally {
-    void worker.terminate();
-  }
-}
-
-// src/frontdoor/trust.ts
-var import_node_crypto14 = require("node:crypto");
-var import_node_path36 = __toESM(require("node:path"), 1);
-var BUNDLE_NAME_HEX_DIGITS = 16;
-function resolveTrustBundle(params) {
-  const { caCertFile, bundlesDir, inherited, fs: fs19 } = params;
-  if (inherited === void 0 || inherited === "" || import_node_path36.default.resolve(inherited) === import_node_path36.default.resolve(caCertFile)) {
-    return { path: caCertFile };
-  }
-  const caPem = fs19.readFileUtf8(caCertFile);
-  let inheritedPem;
-  try {
-    inheritedPem = fs19.readFileUtf8(inherited);
-  } catch (error62) {
-    return {
-      path: caCertFile,
-      warning: `agent-shim: NODE_EXTRA_CA_CERTS names ${inherited}, which could not be read (${error62 instanceof Error ? error62.message : String(error62)}); the child trusts agent-shim's front-door CA on top of the system store, and nothing from that file`
-    };
-  }
-  if (inheritedPem.includes(caPem.trim())) {
-    return { path: inherited };
-  }
-  const combined = `${inheritedPem.trimEnd()}
-${caPem}`;
-  const bundle = import_node_path36.default.join(bundlesDir, `${(0, import_node_crypto14.createHash)("sha256").update(combined).digest("hex").slice(0, BUNDLE_NAME_HEX_DIGITS)}.pem`);
-  if (!fs19.exists(bundle)) {
-    fs19.mkdirp(bundlesDir);
-    fs19.writeFileAtomic(bundle, combined);
-  }
-  return { path: bundle };
-}
-
-// src/frontdoor/realFrontDoorPort.ts
-var realTrustBundleFs = {
-  readFileUtf8: (file2) => import_node_fs16.default.readFileSync(file2, "utf8"),
-  exists: (file2) => import_node_fs16.default.existsSync(file2),
-  mkdirp: (dir) => {
-    import_node_fs16.default.mkdirSync(dir, { recursive: true });
-  },
-  writeFileAtomic: (file2, contents) => {
-    realFarmFs.writeFilePrivate(file2, contents);
-  }
-};
-function realFrontDoorPort(paths, spawnDaemon) {
-  return {
-    ensure: (inheritedExtraCaCerts) => {
-      const up = ensureFrontDoor({
-        paths,
-        launcherPid: process.pid,
-        ports: {
-          fs: realFarmFs,
-          isRunning: realIsProcessRunning,
-          now: () => Date.now(),
-          sleep: realSleepSync,
-          spawnSupervisor: (layout) => spawnDaemon(layout, "__frontdoor-supervisor", layout.frontdoorLogPath),
-          stopSupervisor: (pid) => {
-            process.kill(pid, "SIGTERM");
-          },
-          // Read fresh for each probe: a replacement supervisor may have regenerated an unparseable CA, and the probe must trust exactly what the serving door's leaf chains to.
-          verifyListener: (port) => probeFrontDoorSync(port, import_node_fs16.default.readFileSync(paths.frontdoorCaCertFile, "utf8"))
-        }
-      });
-      const trust = resolveTrustBundle({ caCertFile: paths.frontdoorCaCertFile, bundlesDir: paths.frontdoorCaBundlesDir, inherited: inheritedExtraCaCerts, fs: realTrustBundleFs });
-      return {
-        port: up.port,
-        connectPort: up.connectPort,
-        trustBundlePath: trust.path,
-        ...trust.warning === void 0 ? {} : { trustWarning: trust.warning },
-        sessionToken: up.token
-      };
-    },
-    release: () => {
-      removeFrontDoorSession(realFarmFs, paths.frontdoorSessionsDir, process.pid);
-    }
-  };
-}
-
 // src/launcher.ts
 var import_node_crypto15 = require("node:crypto");
 var import_node_path38 = __toESM(require("node:path"), 1);

package/dist/index.cjs

@@ -8142,7 +8142,7 @@ var import_node_crypto10 = require("node:crypto");
 var import_node_path28 = __toESM(require("node:path"), 1);
 var BUNDLE_NAME_HEX_DIGITS = 16;
 function resolveTrustBundle(params) {
-  const { caCertFile, bundlesDir, inherited, fs: fs12 } = params;
+  const { caCertFile, bundlesDir, variable, inherited, fs: fs12 } = params;
   if (inherited === void 0 || inherited === "" || import_node_path28.default.resolve(inherited) === import_node_path28.default.resolve(caCertFile)) {
     return { path: caCertFile };
   }
@@ -8153,7 +8153,7 @@ function resolveTrustBundle(params) {
   } catch (error) {
     return {
       path: caCertFile,
-      warning: `agent-shim: NODE_EXTRA_CA_CERTS names ${inherited}, which could not be read (${error instanceof Error ? error.message : String(error)}); the child trusts agent-shim's front-door CA on top of the system store, and nothing from that file`
+      warning: `agent-shim: ${variable} names ${inherited}, which could not be read (${error instanceof Error ? error.message : String(error)}); the child trusts agent-shim's front-door CA on top of the system store, and nothing from that file`
     };
   }
   if (inheritedPem.includes(caPem.trim())) {
@@ -8199,7 +8199,7 @@ function realFrontDoorPort(paths, spawnDaemon) {
           verifyListener: (port) => probeFrontDoorSync(port, import_node_fs10.default.readFileSync(paths.frontdoorCaCertFile, "utf8"))
         }
       });
-      const trust = resolveTrustBundle({ caCertFile: paths.frontdoorCaCertFile, bundlesDir: paths.frontdoorCaBundlesDir, inherited: inheritedExtraCaCerts, fs: realTrustBundleFs });
+      const trust = resolveTrustBundle({ caCertFile: paths.frontdoorCaCertFile, bundlesDir: paths.frontdoorCaBundlesDir, variable: "NODE_EXTRA_CA_CERTS", inherited: inheritedExtraCaCerts, fs: realTrustBundleFs });
       return {
         port: up.port,
         connectPort: up.connectPort,

package/dist/index.mjs

@@ -7976,7 +7976,7 @@ import { createHash as createHash5 } from "node:crypto";
 import path28 from "node:path";
 var BUNDLE_NAME_HEX_DIGITS = 16;
 function resolveTrustBundle(params) {
-  const { caCertFile, bundlesDir, inherited, fs: fs12 } = params;
+  const { caCertFile, bundlesDir, variable, inherited, fs: fs12 } = params;
   if (inherited === void 0 || inherited === "" || path28.resolve(inherited) === path28.resolve(caCertFile)) {
     return { path: caCertFile };
   }
@@ -7987,7 +7987,7 @@ function resolveTrustBundle(params) {
   } catch (error) {
     return {
       path: caCertFile,
-      warning: `agent-shim: NODE_EXTRA_CA_CERTS names ${inherited}, which could not be read (${error instanceof Error ? error.message : String(error)}); the child trusts agent-shim's front-door CA on top of the system store, and nothing from that file`
+      warning: `agent-shim: ${variable} names ${inherited}, which could not be read (${error instanceof Error ? error.message : String(error)}); the child trusts agent-shim's front-door CA on top of the system store, and nothing from that file`
     };
   }
   if (inheritedPem.includes(caPem.trim())) {
@@ -8033,7 +8033,7 @@ function realFrontDoorPort(paths, spawnDaemon) {
           verifyListener: (port) => probeFrontDoorSync(port, fs11.readFileSync(paths.frontdoorCaCertFile, "utf8"))
         }
       });
-      const trust = resolveTrustBundle({ caCertFile: paths.frontdoorCaCertFile, bundlesDir: paths.frontdoorCaBundlesDir, inherited: inheritedExtraCaCerts, fs: realTrustBundleFs });
+      const trust = resolveTrustBundle({ caCertFile: paths.frontdoorCaCertFile, bundlesDir: paths.frontdoorCaBundlesDir, variable: "NODE_EXTRA_CA_CERTS", inherited: inheritedExtraCaCerts, fs: realTrustBundleFs });
       return {
         port: up.port,
         connectPort: up.connectPort,

package/dist/types/index.d.ts

@@ -686,7 +686,7 @@ interface LayoutPaths {
     readonly frontdoorCaCertFile: string;
     /** Path to the front door's CA private key, mode 0600: whoever can read it can impersonate the door to every routed child. */
     readonly frontdoorCaKeyFile: string;
-    /** Directory of combined CA bundles: a parent environment's own NODE_EXTRA_CA_CERTS file plus the front door's CA, one file per distinct combination, for children that must keep trusting both. */
+    /** Directory of combined CA bundles: a parent environment's own NODE_EXTRA_CA_CERTS (for a routed child) or HEADROOM_CA_BUNDLE (for the headroom daemon) file plus the front door's CA, one file per distinct combination, for processes that must keep trusting both. */
     readonly frontdoorCaBundlesDir: string;
     /** Path to the front door's state.json: its supervisor pid, its port, and the sticky port it last served on. */
     readonly frontdoorStateFile: string;
@@ -1470,7 +1470,7 @@ declare function mintLeaf(ca: CaMaterial, names: readonly string[], now: Readonl
 /** Mints each host's leaf once from the CA and reuses it, because generating a 2048-bit RSA keypair costs noticeable time and nothing about the certificate changes between sessions. */
 declare function createLeafCache(ca: CaMaterial, now: () => Date): (host: string) => LeafCert;
 /**
- * Persistence for the CA: generated once on the machine's first headroom start and reused forever after, because regenerating it would invalidate every child's `NODE_EXTRA_CA_CERTS` pointing at the old file. The real implementation writes the key with mode 0600; injected fakes keep it in memory.
+ * Persistence for the CA: generated once on the machine's first front-door start and reused forever after, because regenerating it would invalidate every child's `NODE_EXTRA_CA_CERTS` pointing at the old file. The real implementation writes the key with mode 0600; injected fakes keep it in memory.
  */
 interface ConnectCertStore {
     /** The persisted CA, or undefined when none exists yet (or only half of it does: a cert without its key can sign nothing, so it counts as absent). */

package/package.json

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