agent-shim 10.1.0 → 11.1.0

package/dist/cli.cjs

@@ -33969,7 +33969,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "10.1.0",
+      version: "11.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>",
@@ -62734,7 +62734,7 @@ function resolveLaunchFlags(params) {
     skipPermissions: params.flags?.skipPermissions ?? parseEnvBool("AGENT_SHIM_SKIP_PERMISSIONS", params.env.AGENT_SHIM_SKIP_PERMISSIONS) ?? params.cascade?.skipPermissions ?? false,
     remoteControl: params.flags?.remoteControl ?? parseEnvBool("AGENT_SHIM_REMOTE_CONTROL", params.env.AGENT_SHIM_REMOTE_CONTROL) ?? params.cascade?.remoteControl ?? false,
     headroom: params.flags?.headroom ?? parseEnvBool("AGENT_SHIM_HEADROOM", params.env.AGENT_SHIM_HEADROOM) ?? params.cascade?.headroom ?? false,
-    trackUsage: params.flags?.trackUsage ?? parseEnvBool("AGENT_SHIM_TRACK_USAGE", params.env.AGENT_SHIM_TRACK_USAGE) ?? params.cascade?.trackUsage ?? params.trackUsageDefault ?? false
+    trackUsage: params.flags?.trackUsage ?? parseEnvBool("AGENT_SHIM_TRACK_USAGE", params.env.AGENT_SHIM_TRACK_USAGE) ?? params.cascade?.trackUsage ?? true
   };
 }
 function buildFlagArgs(flags) {
@@ -63237,8 +63237,6 @@ function decideLaunch(params, readOnly) {
   const discovered = params.resolveClaudeBinary(pinnedVersion === void 0 ? void 0 : { version: pinnedVersion.version });
   const flags = resolveLaunchFlags({
     env,
-    // A pool pick reads the usage the front door records, so a pool launch records its own unless something says otherwise.
-    ...poolExplanation === void 0 ? {} : { trackUsageDefault: true },
     ...cascadeLaunch === void 0 ? {} : { cascade: cascadeLaunch },
     flags: {
       ...parsedArgv.skipPermissions === void 0 ? {} : { skipPermissions: parsedArgv.skipPermissions },
@@ -113455,6 +113453,7 @@ function createDoorPipelines(deps) {
       responseObservers: deps.responseObservers,
       admit: admitLaunch(deps.isLiveToken),
       headroom: { headroomSocket: deps.headroomSocket, hopSecret: deps.hopSecret, custody: deps.custody, log: deps.log },
+      headroomDecision: deps.headroomDecision,
       now: deps.now,
       log: deps.log
     },
@@ -113462,12 +113461,45 @@ function createDoorPipelines(deps) {
       resolveRoute: deps.resolveRoute,
       responseObservers: [],
       admit: admitHop(deps.hopSecret, deps.custody),
+      headroomDecision: deps.headroomDecision,
       now: deps.now,
       log: deps.log
     }
   };
 }
 
+// src/frontdoor/headroomDecision.ts
+init_pick();
+function createHeadroomDecision() {
+  const sessions = /* @__PURE__ */ new Map();
+  return {
+    decide: (sessionId, wanted, nowMs) => {
+      if (sessionId === void 0) {
+        return wanted;
+      }
+      const state = sessions.get(sessionId);
+      const atBoundary = state === void 0 || nowMs - state.lastEndedAtMs > PROMPT_CACHE_TTL_MS || state.cacheReadInputTokens === 0;
+      const viaHeadroom = atBoundary ? wanted : state.viaHeadroom;
+      sessions.set(sessionId, { viaHeadroom, lastEndedAtMs: state?.lastEndedAtMs ?? nowMs, cacheReadInputTokens: state?.cacheReadInputTokens ?? 0 });
+      return viaHeadroom;
+    },
+    observe: ({ sessionId, endedAtMs, cacheReadInputTokens }) => {
+      if (sessionId === void 0 || cacheReadInputTokens === void 0) {
+        return;
+      }
+      const state = sessions.get(sessionId);
+      if (state !== void 0) {
+        sessions.set(sessionId, { ...state, lastEndedAtMs: endedAtMs, cacheReadInputTokens });
+      }
+      for (const [id2, held] of sessions) {
+        if (endedAtMs - held.lastEndedAtMs > PROMPT_CACHE_TTL_MS) {
+          sessions.delete(id2);
+        }
+      }
+    }
+  };
+}
+
 // src/frontdoor/commands.ts
 init_capability();
 init_capture();
@@ -126453,7 +126485,8 @@ async function serveRouted(request7, deps) {
     response2.end();
     return;
   }
-  const viaHeadroom = identified.session.headroom && resolution.route.headroomEligible && deps.headroom !== void 0;
+  const wantsHeadroom = deps.headroomDecision.decide(identified.session.sessionId, identified.session.headroom, deps.now());
+  const viaHeadroom = wantsHeadroom && 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 (viaHeadroom) {
@@ -130627,8 +130660,14 @@ function realFrontDoorSupervisorPorts(paths) {
       log(`job keeper failed: ${error63 instanceof Error ? error63.message : String(error63)}`);
     }
   }, ANTHROPIC_USAGE_FRESHNESS_MS).unref();
+  const headroomDecision = createHeadroomDecision();
+  const recordUsage = withQuotaRefresh(usageStore.record, quotaRefresher);
   const usageMiddleware = createUsageMiddleware({
-    record: withQuotaRefresh(usageStore.record, quotaRefresher),
+    // Each finished response also tells the per-session headroom decision when the session's cache was last touched and whether it read from it.
+    record: (record2) => {
+      headroomDecision.observe({ sessionId: record2.sessionId, endedAtMs: Date.parse(record2.at) + record2.durationMs, cacheReadInputTokens: record2.usage?.cacheReadInputTokens });
+      recordUsage(record2);
+    },
     defer: (task) => {
       setImmediate(task);
     },
@@ -130643,6 +130682,7 @@ function realFrontDoorSupervisorPorts(paths) {
     headroomSocket: () => headroomSocketTarget(realFarmFs, realHeadroomSocketTrust, paths),
     // The per-generation capability the direct listener demands: held only in this process's memory, so a loopback process that discovers the direct port still cannot use it.
     hopSecret: (0, import_node_crypto20.randomUUID)(),
+    headroomDecision,
     custody: createCredentialCustody(() => (0, import_node_crypto20.randomUUID)()),
     log
   });

package/dist/index.cjs

@@ -2758,7 +2758,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "10.1.0",
+      version: "11.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>",
@@ -7145,7 +7145,7 @@ function resolveLaunchFlags(params) {
     skipPermissions: params.flags?.skipPermissions ?? parseEnvBool("AGENT_SHIM_SKIP_PERMISSIONS", params.env.AGENT_SHIM_SKIP_PERMISSIONS) ?? params.cascade?.skipPermissions ?? false,
     remoteControl: params.flags?.remoteControl ?? parseEnvBool("AGENT_SHIM_REMOTE_CONTROL", params.env.AGENT_SHIM_REMOTE_CONTROL) ?? params.cascade?.remoteControl ?? false,
     headroom: params.flags?.headroom ?? parseEnvBool("AGENT_SHIM_HEADROOM", params.env.AGENT_SHIM_HEADROOM) ?? params.cascade?.headroom ?? false,
-    trackUsage: params.flags?.trackUsage ?? parseEnvBool("AGENT_SHIM_TRACK_USAGE", params.env.AGENT_SHIM_TRACK_USAGE) ?? params.cascade?.trackUsage ?? params.trackUsageDefault ?? false
+    trackUsage: params.flags?.trackUsage ?? parseEnvBool("AGENT_SHIM_TRACK_USAGE", params.env.AGENT_SHIM_TRACK_USAGE) ?? params.cascade?.trackUsage ?? true
   };
 }
 function buildFlagArgs(flags) {
@@ -7648,8 +7648,6 @@ function decideLaunch(params, readOnly) {
   const discovered = params.resolveClaudeBinary(pinnedVersion === void 0 ? void 0 : { version: pinnedVersion.version });
   const flags = resolveLaunchFlags({
     env,
-    // A pool pick reads the usage the front door records, so a pool launch records its own unless something says otherwise.
-    ...poolExplanation === void 0 ? {} : { trackUsageDefault: true },
     ...cascadeLaunch === void 0 ? {} : { cascade: cascadeLaunch },
     flags: {
       ...parsedArgv.skipPermissions === void 0 ? {} : { skipPermissions: parsedArgv.skipPermissions },

package/dist/index.mjs

@@ -2734,7 +2734,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "10.1.0",
+      version: "11.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>",
@@ -7119,7 +7119,7 @@ function resolveLaunchFlags(params) {
     skipPermissions: params.flags?.skipPermissions ?? parseEnvBool("AGENT_SHIM_SKIP_PERMISSIONS", params.env.AGENT_SHIM_SKIP_PERMISSIONS) ?? params.cascade?.skipPermissions ?? false,
     remoteControl: params.flags?.remoteControl ?? parseEnvBool("AGENT_SHIM_REMOTE_CONTROL", params.env.AGENT_SHIM_REMOTE_CONTROL) ?? params.cascade?.remoteControl ?? false,
     headroom: params.flags?.headroom ?? parseEnvBool("AGENT_SHIM_HEADROOM", params.env.AGENT_SHIM_HEADROOM) ?? params.cascade?.headroom ?? false,
-    trackUsage: params.flags?.trackUsage ?? parseEnvBool("AGENT_SHIM_TRACK_USAGE", params.env.AGENT_SHIM_TRACK_USAGE) ?? params.cascade?.trackUsage ?? params.trackUsageDefault ?? false
+    trackUsage: params.flags?.trackUsage ?? parseEnvBool("AGENT_SHIM_TRACK_USAGE", params.env.AGENT_SHIM_TRACK_USAGE) ?? params.cascade?.trackUsage ?? true
   };
 }
 function buildFlagArgs(flags) {
@@ -7623,8 +7623,6 @@ function decideLaunch(params, readOnly) {
   const discovered = params.resolveClaudeBinary(pinnedVersion === void 0 ? void 0 : { version: pinnedVersion.version });
   const flags = resolveLaunchFlags({
     env,
-    // A pool pick reads the usage the front door records, so a pool launch records its own unless something says otherwise.
-    ...poolExplanation === void 0 ? {} : { trackUsageDefault: true },
     ...cascadeLaunch === void 0 ? {} : { cascade: cascadeLaunch },
     flags: {
       ...parsedArgv.skipPermissions === void 0 ? {} : { skipPermissions: parsedArgv.skipPermissions },

package/package.json

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