agent-shim 10.0.1 → 10.1.0

package/dist/cli.cjs

@@ -27535,6 +27535,8 @@ var init_state2 = __esm({
       settingsHash: external_exports.string().optional(),
       /** The install spec the running install was last installed from, so a `source` config change is detected as drift. */
       installedSource: external_exports.string().optional(),
+      /** The install spec the supervisor is installing right now, present only while `uv tool install` runs, so a launcher that finds a live supervisor with no daemon yet keeps waiting for the install instead of counting it against its start bound. Cleared by the write that follows the install, whatever its outcome. */
+      installing: external_exports.string().optional(),
       /** The last fatal error, kept across shutdowns so `headroom status` can explain a daemon that is not running. */
       lastError: external_exports.string().optional()
     });
@@ -27634,7 +27636,7 @@ function daemonAdmits(fs22, allowlistFile, recordedHash, required2) {
 }
 function ensureHeadroom(params) {
   const { paths, ports } = params;
-  const deadline = ports.now() + HEADROOM_START_TIMEOUT_MS;
+  let deadline = ports.now() + HEADROOM_START_TIMEOUT_MS;
   let spawnedSupervisor = false;
   migrateHeadroomState(ports.fs, { stateFile: paths.headroomStateFile, legacyStateFile: paths.headroomLegacyStateFile }, ports.isRunning);
   const commandLines = /* @__PURE__ */ new Map();
@@ -27648,6 +27650,9 @@ function ensureHeadroom(params) {
     let awaiting;
     const state = resolveServingHeadroomState(ports.fs, { stateFile: paths.headroomStateFile, legacyStateFile: paths.headroomLegacyStateFile }, ports.isRunning)?.state;
     if (state?.supervisorPid !== void 0 && ports.isRunning(state.supervisorPid)) {
+      if (state.installing !== void 0) {
+        deadline = ports.now() + HEADROOM_START_TIMEOUT_MS;
+      }
       const daemonUp = state.socketPath !== void 0 && state.headroomPid !== void 0 && ports.isRunning(state.headroomPid);
       if (daemonUp && state.socketPath !== void 0 && state.headroomPid !== void 0) {
         const required2 = params.requiredUpstreams?.();
@@ -28249,15 +28254,16 @@ async function runSupervisor(initialConfig, ports, options = {}) {
     const commitOk = pinned === void 0 || ports.installedCommit() === pinned;
     if (versionOk && commitOk && (installedSource === void 0 || installedSource === config2.source)) {
       installedSource = config2.source;
-      return true;
+      return void 0;
     }
     ports.log(`agent-shim headroom supervisor: installing headroom from ${config2.source}`);
+    writeOwnState({ supervisorPid: ports.ownPid, installedSource, installing: config2.source });
     const result = ports.install(config2.source);
     if (!result.ok) {
-      return false;
+      return `could not install headroom from ${config2.source}: ${result.error ?? "install failed"}`;
     }
     installedSource = config2.source;
-    return true;
+    return void 0;
   };
   const socket = prepareHeadroomSocket(fs22, ports.socketTrust, paths, ports.ownPid);
   if (socket.refused !== void 0) {
@@ -28266,8 +28272,9 @@ async function runSupervisor(initialConfig, ports, options = {}) {
   const { socketPath } = socket;
   pruneStaleHeadroomSockets(fs22, paths, ports.isRunning);
   pruneStaleAllowlistTemporaries(fs22, paths.headroomAllowlistFile, ports.isRunning);
-  if (!ensureInstalled()) {
-    return fail(`could not install headroom from ${config2.source}: install failed (is uv installed and on PATH?)`);
+  const installFailure = ensureInstalled();
+  if (installFailure !== void 0) {
+    return fail(installFailure);
   }
   const version2 = ports.headroomVersion() ?? "unknown";
   writeOwnState({ supervisorPid: ports.ownPid, version: version2, installedSource });
@@ -28342,8 +28349,9 @@ async function runSupervisor(initialConfig, ports, options = {}) {
           `headroom failed to become ready ${String(consecutiveFailures)} times in a row; giving up` + (lastExitOutput === void 0 ? "" : `; the last attempt exited before it was ready, and its log ends: ${lastExitOutput}`)
         );
       }
-      if (installedSource !== config2.source && !ensureInstalled()) {
-        return fail(`could not install headroom from ${config2.source}: install failed (is uv installed and on PATH?)`);
+      const restartInstallFailure = installedSource !== config2.source ? ensureInstalled() : void 0;
+      if (restartInstallFailure !== void 0) {
+        return fail(restartInstallFailure);
       }
       const logOffset = ports.daemonLogSize();
       const pid = ports.spawnHeadroom(socketPath, paths.headroomAllowlistFile, config2.settings);
@@ -33355,6 +33363,8 @@ var init_schema2 = __esm({
       sessionId: external_exports.string().optional(),
       /** The project the launch ran in (its git repository root), when the launch sent one: headroom launches do. */
       project: external_exports.string().optional(),
+      /** Whether the request crossed headroom on its way upstream. Absent on a record written before the door recorded it, and false when the request went direct. */
+      viaHeadroom: external_exports.boolean().optional(),
       /** The front-door route that served the request. */
       route: external_exports.string(),
       method: external_exports.string(),
@@ -33959,7 +33969,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "10.0.1",
+      version: "10.1.0",
       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>",
@@ -34578,6 +34588,7 @@ function buildRecord(event, context) {
     provider,
     ...sessionId === void 0 ? {} : { sessionId },
     ...projectId === void 0 ? {} : { project: projectId },
+    viaHeadroom: event.viaHeadroom,
     route: event.route,
     method: event.method,
     endpoint,
@@ -126375,7 +126386,7 @@ function createRoutedResponse(response, context) {
     start: (status, headers) => {
       for (const observe of deps.responseObservers) {
         try {
-          const body = observe({ session, route, method: request7.method, path: request7.path, receivedAt: request7.receivedAt, status, headers });
+          const body = observe({ session, route, method: request7.method, path: request7.path, receivedAt: request7.receivedAt, viaHeadroom: request7.viaHeadroom, status, headers });
           if (body !== void 0) {
             bodyObservers.push(body);
           }
@@ -126416,7 +126427,7 @@ function createRoutedResponse(response, context) {
   };
 }
 async function serveRouted(request7, deps) {
-  const observed = { method: request7.method, path: pathOf(request7.url), receivedAt: deps.now() };
+  const observed = { method: request7.method, path: pathOf(request7.url), receivedAt: deps.now(), viaHeadroom: false };
   const identified = identifyRequest(request7.headers);
   const admission = deps.admit({ url: request7.url, headers: request7.headers, forwardable: identified.forwardableHeaders });
   if (!admission.ok) {
@@ -126442,9 +126453,10 @@ async function serveRouted(request7, deps) {
     response2.end();
     return;
   }
-  const response = createRoutedResponse(request7.response, { deps, session: identified.session, route: resolution.route.name, request: observed });
+  const viaHeadroom = identified.session.headroom && resolution.route.headroomEligible && deps.headroom !== void 0;
+  const response = createRoutedResponse(request7.response, { deps, session: identified.session, route: resolution.route.name, request: { ...observed, viaHeadroom } });
   try {
-    if (identified.session.headroom && resolution.route.headroomEligible && deps.headroom !== void 0) {
+    if (viaHeadroom) {
       await applyHeadroomHop(routed, response, resolution.route.headroomUpstream, deps.headroom);
     } else {
       await resolution.route.serve(routed, response);
@@ -141247,6 +141259,7 @@ function formatHeadroomStatus(status) {
 }
 var ownedHeadroom = /* @__PURE__ */ new Map();
 var exitedHeadroom = /* @__PURE__ */ new Set();
+var HEADROOM_INSTALL_TIMEOUT_MS = 6e5;
 var READY_FETCH_TIMEOUT_MS = 2e3;
 function headroomPidRunning(pid) {
   return !exitedHeadroom.has(pid) && realIsProcessRunning(pid);
@@ -141375,9 +141388,13 @@ function realSupervisorPorts(paths) {
     },
     ready: readyOverSocket,
     install: (spec) => {
-      const result = (0, import_node_child_process7.spawnSync)("uv", ["tool", "install", spec], { encoding: "utf8" });
+      const result = (0, import_node_child_process7.spawnSync)("uv", ["tool", "install", spec], { encoding: "utf8", timeout: HEADROOM_INSTALL_TIMEOUT_MS });
       if (result.error !== void 0) {
-        return { ok: false, error: `uv is not installed or not on PATH (${result.error.message})` };
+        const timedOut = "code" in result.error && result.error.code === "ETIMEDOUT";
+        return {
+          ok: false,
+          error: timedOut ? `uv tool install did not finish within ${String(HEADROOM_INSTALL_TIMEOUT_MS)}ms and was stopped` : `uv is not installed or not on PATH (${result.error.message})`
+        };
       }
       if (result.stdout !== "") {
         import_node_fs20.default.appendFileSync(paths.headroomLogPath, result.stdout);

package/dist/index.cjs

@@ -2758,7 +2758,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "10.0.1",
+      version: "10.1.0",
       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>",
@@ -3134,6 +3134,8 @@ var init_state2 = __esm({
       settingsHash: import_zod8.z.string().optional(),
       /** The install spec the running install was last installed from, so a `source` config change is detected as drift. */
       installedSource: import_zod8.z.string().optional(),
+      /** The install spec the supervisor is installing right now, present only while `uv tool install` runs, so a launcher that finds a live supervisor with no daemon yet keeps waiting for the install instead of counting it against its start bound. Cleared by the write that follows the install, whatever its outcome. */
+      installing: import_zod8.z.string().optional(),
       /** The last fatal error, kept across shutdowns so `headroom status` can explain a daemon that is not running. */
       lastError: import_zod8.z.string().optional()
     });
@@ -3233,7 +3235,7 @@ function daemonAdmits(fs12, allowlistFile, recordedHash, required) {
 }
 function ensureHeadroom(params) {
   const { paths, ports } = params;
-  const deadline = ports.now() + HEADROOM_START_TIMEOUT_MS;
+  let deadline = ports.now() + HEADROOM_START_TIMEOUT_MS;
   let spawnedSupervisor = false;
   migrateHeadroomState(ports.fs, { stateFile: paths.headroomStateFile, legacyStateFile: paths.headroomLegacyStateFile }, ports.isRunning);
   const commandLines = /* @__PURE__ */ new Map();
@@ -3247,6 +3249,9 @@ function ensureHeadroom(params) {
     let awaiting;
     const state = resolveServingHeadroomState(ports.fs, { stateFile: paths.headroomStateFile, legacyStateFile: paths.headroomLegacyStateFile }, ports.isRunning)?.state;
     if (state?.supervisorPid !== void 0 && ports.isRunning(state.supervisorPid)) {
+      if (state.installing !== void 0) {
+        deadline = ports.now() + HEADROOM_START_TIMEOUT_MS;
+      }
       const daemonUp = state.socketPath !== void 0 && state.headroomPid !== void 0 && ports.isRunning(state.headroomPid);
       if (daemonUp && state.socketPath !== void 0 && state.headroomPid !== void 0) {
         const required = params.requiredUpstreams?.();
@@ -3686,15 +3691,16 @@ async function runSupervisor(initialConfig, ports, options = {}) {
     const commitOk = pinned === void 0 || ports.installedCommit() === pinned;
     if (versionOk && commitOk && (installedSource === void 0 || installedSource === config.source)) {
       installedSource = config.source;
-      return true;
+      return void 0;
     }
     ports.log(`agent-shim headroom supervisor: installing headroom from ${config.source}`);
+    writeOwnState({ supervisorPid: ports.ownPid, installedSource, installing: config.source });
     const result = ports.install(config.source);
     if (!result.ok) {
-      return false;
+      return `could not install headroom from ${config.source}: ${result.error ?? "install failed"}`;
     }
     installedSource = config.source;
-    return true;
+    return void 0;
   };
   const socket = prepareHeadroomSocket(fs12, ports.socketTrust, paths, ports.ownPid);
   if (socket.refused !== void 0) {
@@ -3703,8 +3709,9 @@ async function runSupervisor(initialConfig, ports, options = {}) {
   const { socketPath } = socket;
   pruneStaleHeadroomSockets(fs12, paths, ports.isRunning);
   pruneStaleAllowlistTemporaries(fs12, paths.headroomAllowlistFile, ports.isRunning);
-  if (!ensureInstalled()) {
-    return fail(`could not install headroom from ${config.source}: install failed (is uv installed and on PATH?)`);
+  const installFailure = ensureInstalled();
+  if (installFailure !== void 0) {
+    return fail(installFailure);
   }
   const version = ports.headroomVersion() ?? "unknown";
   writeOwnState({ supervisorPid: ports.ownPid, version, installedSource });
@@ -3779,8 +3786,9 @@ async function runSupervisor(initialConfig, ports, options = {}) {
           `headroom failed to become ready ${String(consecutiveFailures)} times in a row; giving up` + (lastExitOutput === void 0 ? "" : `; the last attempt exited before it was ready, and its log ends: ${lastExitOutput}`)
         );
       }
-      if (installedSource !== config.source && !ensureInstalled()) {
-        return fail(`could not install headroom from ${config.source}: install failed (is uv installed and on PATH?)`);
+      const restartInstallFailure = installedSource !== config.source ? ensureInstalled() : void 0;
+      if (restartInstallFailure !== void 0) {
+        return fail(restartInstallFailure);
       }
       const logOffset = ports.daemonLogSize();
       const pid = ports.spawnHeadroom(socketPath, paths.headroomAllowlistFile, config.settings);
@@ -4616,6 +4624,8 @@ var init_schema2 = __esm({
       sessionId: import_zod10.z.string().optional(),
       /** The project the launch ran in (its git repository root), when the launch sent one: headroom launches do. */
       project: import_zod10.z.string().optional(),
+      /** Whether the request crossed headroom on its way upstream. Absent on a record written before the door recorded it, and false when the request went direct. */
+      viaHeadroom: import_zod10.z.boolean().optional(),
       /** The front-door route that served the request. */
       route: import_zod10.z.string(),
       method: import_zod10.z.string(),

package/dist/index.mjs

@@ -2734,7 +2734,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "10.0.1",
+      version: "10.1.0",
       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>",
@@ -3110,6 +3110,8 @@ var init_state2 = __esm({
       settingsHash: z8.string().optional(),
       /** The install spec the running install was last installed from, so a `source` config change is detected as drift. */
       installedSource: z8.string().optional(),
+      /** The install spec the supervisor is installing right now, present only while `uv tool install` runs, so a launcher that finds a live supervisor with no daemon yet keeps waiting for the install instead of counting it against its start bound. Cleared by the write that follows the install, whatever its outcome. */
+      installing: z8.string().optional(),
       /** The last fatal error, kept across shutdowns so `headroom status` can explain a daemon that is not running. */
       lastError: z8.string().optional()
     });
@@ -3209,7 +3211,7 @@ function daemonAdmits(fs12, allowlistFile, recordedHash, required) {
 }
 function ensureHeadroom(params) {
   const { paths, ports } = params;
-  const deadline = ports.now() + HEADROOM_START_TIMEOUT_MS;
+  let deadline = ports.now() + HEADROOM_START_TIMEOUT_MS;
   let spawnedSupervisor = false;
   migrateHeadroomState(ports.fs, { stateFile: paths.headroomStateFile, legacyStateFile: paths.headroomLegacyStateFile }, ports.isRunning);
   const commandLines = /* @__PURE__ */ new Map();
@@ -3223,6 +3225,9 @@ function ensureHeadroom(params) {
     let awaiting;
     const state = resolveServingHeadroomState(ports.fs, { stateFile: paths.headroomStateFile, legacyStateFile: paths.headroomLegacyStateFile }, ports.isRunning)?.state;
     if (state?.supervisorPid !== void 0 && ports.isRunning(state.supervisorPid)) {
+      if (state.installing !== void 0) {
+        deadline = ports.now() + HEADROOM_START_TIMEOUT_MS;
+      }
       const daemonUp = state.socketPath !== void 0 && state.headroomPid !== void 0 && ports.isRunning(state.headroomPid);
       if (daemonUp && state.socketPath !== void 0 && state.headroomPid !== void 0) {
         const required = params.requiredUpstreams?.();
@@ -3662,15 +3667,16 @@ async function runSupervisor(initialConfig, ports, options = {}) {
     const commitOk = pinned === void 0 || ports.installedCommit() === pinned;
     if (versionOk && commitOk && (installedSource === void 0 || installedSource === config.source)) {
       installedSource = config.source;
-      return true;
+      return void 0;
     }
     ports.log(`agent-shim headroom supervisor: installing headroom from ${config.source}`);
+    writeOwnState({ supervisorPid: ports.ownPid, installedSource, installing: config.source });
     const result = ports.install(config.source);
     if (!result.ok) {
-      return false;
+      return `could not install headroom from ${config.source}: ${result.error ?? "install failed"}`;
     }
     installedSource = config.source;
-    return true;
+    return void 0;
   };
   const socket = prepareHeadroomSocket(fs12, ports.socketTrust, paths, ports.ownPid);
   if (socket.refused !== void 0) {
@@ -3679,8 +3685,9 @@ async function runSupervisor(initialConfig, ports, options = {}) {
   const { socketPath } = socket;
   pruneStaleHeadroomSockets(fs12, paths, ports.isRunning);
   pruneStaleAllowlistTemporaries(fs12, paths.headroomAllowlistFile, ports.isRunning);
-  if (!ensureInstalled()) {
-    return fail(`could not install headroom from ${config.source}: install failed (is uv installed and on PATH?)`);
+  const installFailure = ensureInstalled();
+  if (installFailure !== void 0) {
+    return fail(installFailure);
   }
   const version = ports.headroomVersion() ?? "unknown";
   writeOwnState({ supervisorPid: ports.ownPid, version, installedSource });
@@ -3755,8 +3762,9 @@ async function runSupervisor(initialConfig, ports, options = {}) {
           `headroom failed to become ready ${String(consecutiveFailures)} times in a row; giving up` + (lastExitOutput === void 0 ? "" : `; the last attempt exited before it was ready, and its log ends: ${lastExitOutput}`)
         );
       }
-      if (installedSource !== config.source && !ensureInstalled()) {
-        return fail(`could not install headroom from ${config.source}: install failed (is uv installed and on PATH?)`);
+      const restartInstallFailure = installedSource !== config.source ? ensureInstalled() : void 0;
+      if (restartInstallFailure !== void 0) {
+        return fail(restartInstallFailure);
       }
       const logOffset = ports.daemonLogSize();
       const pid = ports.spawnHeadroom(socketPath, paths.headroomAllowlistFile, config.settings);
@@ -4590,6 +4598,8 @@ var init_schema2 = __esm({
       sessionId: z10.string().optional(),
       /** The project the launch ran in (its git repository root), when the launch sent one: headroom launches do. */
       project: z10.string().optional(),
+      /** Whether the request crossed headroom on its way upstream. Absent on a record written before the door recorded it, and false when the request went direct. */
+      viaHeadroom: z10.boolean().optional(),
       /** The front-door route that served the request. */
       route: z10.string(),
       method: z10.string(),

package/dist/types/index.d.ts

@@ -5206,6 +5206,7 @@ declare const UsageRecordSchema: z.ZodObject<{
     provider: z.ZodString;
     sessionId: z.ZodOptional<z.ZodString>;
     project: z.ZodOptional<z.ZodString>;
+    viaHeadroom: z.ZodOptional<z.ZodBoolean>;
     route: z.ZodString;
     method: z.ZodString;
     endpoint: z.ZodString;

package/package.json

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