agent-shim 11.72.0 → 11.72.2

package/dist/cli.cjs

@@ -37387,7 +37387,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.72.0",
+      version: "11.72.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>",
@@ -38399,36 +38399,71 @@ function readUsageLog(fs31, logDir, options = {}) {
     if (sinceMs !== void 0 && segment.endsAt <= sinceMs) {
       continue;
     }
-    const contents = fs31.readFileUtf8(import_node_path26.default.join(logDir, segment.name));
-    if (contents === void 0) {
+    const read = readSegment(fs31, logDir, segment);
+    if (read === void 0) {
       continue;
     }
-    const lines = contents.split("\n");
-    lines.pop();
-    for (const line of lines) {
-      if (line === "") {
-        continue;
-      }
-      let raw;
-      try {
-        raw = JSON.parse(line);
-      } catch {
-        invalidLines += 1;
-        continue;
-      }
-      const parsed = UsageRecordSchema.safeParse(raw);
-      if (!parsed.success) {
-        invalidLines += 1;
-        continue;
-      }
-      if (sinceMs === void 0 || Date.parse(parsed.data.at) >= sinceMs) {
-        records.push(parsed.data);
+    invalidLines += read.invalidLines;
+    for (const record2 of read.records) {
+      if (sinceMs === void 0 || Date.parse(record2.at) >= sinceMs) {
+        records.push(record2);
       }
     }
   }
   records.sort((left, right) => left.at.localeCompare(right.at));
   return { records, invalidLines };
 }
+function readSegment(fs31, logDir, segment) {
+  const contents = fs31.readFileUtf8(import_node_path26.default.join(logDir, segment.name));
+  if (contents === void 0) {
+    return void 0;
+  }
+  const records = [];
+  let invalidLines = 0;
+  const lines = contents.split("\n");
+  lines.pop();
+  for (const line of lines) {
+    if (line === "") {
+      continue;
+    }
+    let raw;
+    try {
+      raw = JSON.parse(line);
+    } catch {
+      invalidLines += 1;
+      continue;
+    }
+    const parsed = UsageRecordSchema.safeParse(raw);
+    if (!parsed.success) {
+      invalidLines += 1;
+      continue;
+    }
+    records.push(parsed.data);
+  }
+  return { records, invalidLines };
+}
+function readRecentUsageRecords(fs31, logDir, count2) {
+  const byDay = /* @__PURE__ */ new Map();
+  for (const segment of listLogSegments(fs31, logDir)) {
+    byDay.set(segment.day, [...byDay.get(segment.day) ?? [], segment]);
+  }
+  const days = [...byDay.values()];
+  let records = [];
+  for (let index = days.length - 1; index >= 0; index -= 1) {
+    const dayRecords = [];
+    for (const segment of days[index] ?? []) {
+      dayRecords.push(...readSegment(fs31, logDir, segment)?.records ?? []);
+    }
+    records = [...dayRecords, ...records];
+    records.sort((left, right) => left.at.localeCompare(right.at));
+    const olderDay = days[index - 1]?.[0];
+    const newestHeld = records[records.length - count2];
+    if (olderDay === void 0 || newestHeld !== void 0 && Date.parse(newestHeld.at) >= olderDay.endsAt) {
+      break;
+    }
+  }
+  return records.slice(-count2);
+}
 function snapshotPath(snapshotsDir, identity) {
   if (!isIdentityName(identity)) {
     throw new Error(`"${identity}" is not a valid identity name.`);
@@ -119889,7 +119924,7 @@ function blendedPricePerMTok(prices, mix) {
 var SEED_LOOKBACK_RECORDS = 500;
 function createTargetObservationStore(fs31, paths) {
   let observations = /* @__PURE__ */ new Map();
-  const seeded = readUsageLog(fs31, paths.usageLogDir, {}).records.slice(-SEED_LOOKBACK_RECORDS);
+  const seeded = readRecentUsageRecords(fs31, paths.usageLogDir, SEED_LOOKBACK_RECORDS);
   for (const record2 of seeded) {
     observations = observeRecord(observations, record2);
   }
@@ -120913,6 +120948,13 @@ function mergeLiveTasks(tree, live) {
 
 // src/frontdoor/rcSessions.ts
 var RC_SESSIONS_PATH_PREFIX = "/v1/code/sessions";
+function pathnameOf(url2) {
+  return new URL(url2 ?? "/", "http://127.0.0.1").pathname;
+}
+function isRcSessionExchange(url2) {
+  const path73 = pathnameOf(url2);
+  return path73 === RC_SESSIONS_PATH_PREFIX || path73.startsWith(`${RC_SESSIONS_PATH_PREFIX}/`);
+}
 var RC_SESSION_ID_PREFIX = "cse_";
 var RC_IDLE_EXPIRY_MS = 45e3;
 var RC_CREATE_RESPONSE_CAP_BYTES = 8192;
@@ -121077,11 +121119,10 @@ function createRcSessionTracker(deps) {
   };
   const observeExchange = (request7) => {
     const method = (request7.method ?? "").toUpperCase();
-    const path73 = new URL(request7.url ?? "/", "http://127.0.0.1").pathname;
-    if (!path73.startsWith(RC_SESSIONS_PATH_PREFIX)) {
+    if (!isRcSessionExchange(request7.url)) {
       return void 0;
     }
-    const tail = path73.slice(RC_SESSIONS_PATH_PREFIX.length);
+    const tail = pathnameOf(request7.url).slice(RC_SESSIONS_PATH_PREFIX.length);
     const facts = {
       oauthAuthorization: oauthAuthorizationOf(request7.headers),
       anthropicVersion: singleHeader(request7.headers, "anthropic-version"),
@@ -134286,6 +134327,10 @@ async function collectBody(body) {
         resolve3(result);
       }
     };
+    if (body.destroyed) {
+      settle2({ kind: "failed" });
+      return;
+    }
     body.on("data", (chunk2) => {
       if (settled) {
         return;
@@ -134309,6 +134354,9 @@ async function collectBody(body) {
     body.on("error", () => {
       settle2({ kind: "failed" });
     });
+    body.on("close", () => {
+      settle2({ kind: "failed" });
+    });
   });
 }
 function requestedModelOf(body) {
@@ -139201,6 +139249,7 @@ function createRcEventFanout() {
 function createRcStreamHub(deps) {
   const attachments = /* @__PURE__ */ new Map();
   let closed = false;
+  const refusedAuthorizations = /* @__PURE__ */ new Map();
   const lastSavedSequenceNums = /* @__PURE__ */ new Map();
   const persistCursor = (sessionId) => {
     if (deps.saveSequenceNum === void 0) {
@@ -139304,7 +139353,6 @@ function createRcStreamHub(deps) {
   };
   const runLoop = async (attachment) => {
     let retriedUnauthorized = false;
-    let refusedAuthorization;
     for (; ; ) {
       if (attachment.isStopped()) {
         return;
@@ -139320,11 +139368,11 @@ function createRcStreamHub(deps) {
         }
         return;
       }
-      if (refusedAuthorization !== void 0 && credential.authorization === refusedAuthorization) {
+      if (credential.authorization === refusedAuthorizations.get(attachment.sessionId)) {
         await deps.sleep(deps.backoffMs);
         continue;
       }
-      refusedAuthorization = void 0;
+      refusedAuthorizations.delete(attachment.sessionId);
       let outcome;
       try {
         outcome = await attempt(attachment, credential);
@@ -139352,7 +139400,7 @@ function createRcStreamHub(deps) {
         continue;
       }
       deps.log?.(`rc stream ${attachment.sessionId}: the client read stream refused the observed Authorization bearer past one retry; waiting for a fresh one`);
-      refusedAuthorization = credential.authorization;
+      refusedAuthorizations.set(attachment.sessionId, credential.authorization);
       await deps.sleep(deps.backoffMs);
       retriedUnauthorized = false;
     }
@@ -139392,6 +139440,7 @@ function createRcStreamHub(deps) {
         attachment.stop();
       }
       attachments.clear();
+      refusedAuthorizations.clear();
     }
   };
 }
@@ -139794,9 +139843,13 @@ function respawnInvocation(paths) {
 function rcObservingResolver(resolve3, tracker, hub) {
   return async (request7) => {
     const resolution = await resolve3(request7);
-    return resolution.ok ? { ...resolution, route: observingRoutedRoute(resolution.route, tracker, hub === void 0 ? void 0 : { onExchangeSettled: () => {
+    if (!resolution.ok) {
+      return resolution;
+    }
+    const observing = observingRoutedRoute(resolution.route, tracker, hub === void 0 ? void 0 : { onExchangeSettled: () => {
       hub.reconcile();
-    } }) } : resolution;
+    } });
+    return { ...resolution, route: isRcSessionExchange(request7.url) ? { ...observing, headroomEligible: false } : observing };
   };
 }
 function realStatOwnExecutable(watchPath) {
@@ -140022,10 +140075,8 @@ function realFrontDoorSupervisorPorts(paths, respawnGeneration, lifecycle, track
   catalogueKeeper.tick();
   everyFreshnessInterval(catalogueKeeper.tick);
   const headroomDecision = createHeadroomDecision(createRoutingSettingReader(paths));
-  const targetObservations = createTargetObservationStore(realFarmFs, paths);
   const recordUsage = (record2) => {
     withQuotaRefresh(usageStore.record, quotaRefresher)(record2);
-    targetObservations.observe(record2);
   };
   const usageMiddleware = createUsageMiddleware({
     // Each finished response also tells the per-session headroom decision when the session's cache was last touched and whether it read from it.

package/dist/index.cjs

@@ -4762,7 +4762,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.72.0",
+      version: "11.72.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>",
@@ -7606,36 +7606,49 @@ function readUsageLog(fs14, logDir, options = {}) {
     if (sinceMs !== void 0 && segment.endsAt <= sinceMs) {
       continue;
     }
-    const contents = fs14.readFileUtf8(import_node_path20.default.join(logDir, segment.name));
-    if (contents === void 0) {
+    const read = readSegment(fs14, logDir, segment);
+    if (read === void 0) {
       continue;
     }
-    const lines = contents.split("\n");
-    lines.pop();
-    for (const line of lines) {
-      if (line === "") {
-        continue;
-      }
-      let raw;
-      try {
-        raw = JSON.parse(line);
-      } catch {
-        invalidLines += 1;
-        continue;
-      }
-      const parsed = UsageRecordSchema.safeParse(raw);
-      if (!parsed.success) {
-        invalidLines += 1;
-        continue;
-      }
-      if (sinceMs === void 0 || Date.parse(parsed.data.at) >= sinceMs) {
-        records.push(parsed.data);
+    invalidLines += read.invalidLines;
+    for (const record of read.records) {
+      if (sinceMs === void 0 || Date.parse(record.at) >= sinceMs) {
+        records.push(record);
       }
     }
   }
   records.sort((left, right) => left.at.localeCompare(right.at));
   return { records, invalidLines };
 }
+function readSegment(fs14, logDir, segment) {
+  const contents = fs14.readFileUtf8(import_node_path20.default.join(logDir, segment.name));
+  if (contents === void 0) {
+    return void 0;
+  }
+  const records = [];
+  let invalidLines = 0;
+  const lines = contents.split("\n");
+  lines.pop();
+  for (const line of lines) {
+    if (line === "") {
+      continue;
+    }
+    let raw;
+    try {
+      raw = JSON.parse(line);
+    } catch {
+      invalidLines += 1;
+      continue;
+    }
+    const parsed = UsageRecordSchema.safeParse(raw);
+    if (!parsed.success) {
+      invalidLines += 1;
+      continue;
+    }
+    records.push(parsed.data);
+  }
+  return { records, invalidLines };
+}
 function snapshotPath(snapshotsDir, identity) {
   if (!isIdentityName(identity)) {
     throw new Error(`"${identity}" is not a valid identity name.`);
@@ -13454,6 +13467,13 @@ function mergeLiveTasks(tree, live) {
 
 // src/frontdoor/rcSessions.ts
 var RC_SESSIONS_PATH_PREFIX = "/v1/code/sessions";
+function pathnameOf(url) {
+  return new URL(url ?? "/", "http://127.0.0.1").pathname;
+}
+function isRcSessionExchange(url) {
+  const path42 = pathnameOf(url);
+  return path42 === RC_SESSIONS_PATH_PREFIX || path42.startsWith(`${RC_SESSIONS_PATH_PREFIX}/`);
+}
 var RC_SESSION_ID_PREFIX = "cse_";
 var RC_IDLE_EXPIRY_MS = 45e3;
 var RC_CREATE_RESPONSE_CAP_BYTES = 8192;
@@ -13618,11 +13638,10 @@ function createRcSessionTracker(deps) {
   };
   const observeExchange = (request4) => {
     const method = (request4.method ?? "").toUpperCase();
-    const path42 = new URL(request4.url ?? "/", "http://127.0.0.1").pathname;
-    if (!path42.startsWith(RC_SESSIONS_PATH_PREFIX)) {
+    if (!isRcSessionExchange(request4.url)) {
       return void 0;
     }
-    const tail = path42.slice(RC_SESSIONS_PATH_PREFIX.length);
+    const tail = pathnameOf(request4.url).slice(RC_SESSIONS_PATH_PREFIX.length);
     const facts = {
       oauthAuthorization: oauthAuthorizationOf(request4.headers),
       anthropicVersion: singleHeader(request4.headers, "anthropic-version"),
@@ -19527,6 +19546,7 @@ function createRcEventFanout() {
 function createRcStreamHub(deps) {
   const attachments = /* @__PURE__ */ new Map();
   let closed = false;
+  const refusedAuthorizations = /* @__PURE__ */ new Map();
   const lastSavedSequenceNums = /* @__PURE__ */ new Map();
   const persistCursor = (sessionId) => {
     if (deps.saveSequenceNum === void 0) {
@@ -19630,7 +19650,6 @@ function createRcStreamHub(deps) {
   };
   const runLoop = async (attachment) => {
     let retriedUnauthorized = false;
-    let refusedAuthorization;
     for (; ; ) {
       if (attachment.isStopped()) {
         return;
@@ -19646,11 +19665,11 @@ function createRcStreamHub(deps) {
         }
         return;
       }
-      if (refusedAuthorization !== void 0 && credential.authorization === refusedAuthorization) {
+      if (credential.authorization === refusedAuthorizations.get(attachment.sessionId)) {
         await deps.sleep(deps.backoffMs);
         continue;
       }
-      refusedAuthorization = void 0;
+      refusedAuthorizations.delete(attachment.sessionId);
       let outcome;
       try {
         outcome = await attempt(attachment, credential);
@@ -19678,7 +19697,7 @@ function createRcStreamHub(deps) {
         continue;
       }
       deps.log?.(`rc stream ${attachment.sessionId}: the client read stream refused the observed Authorization bearer past one retry; waiting for a fresh one`);
-      refusedAuthorization = credential.authorization;
+      refusedAuthorizations.set(attachment.sessionId, credential.authorization);
       await deps.sleep(deps.backoffMs);
       retriedUnauthorized = false;
     }
@@ -19718,6 +19737,7 @@ function createRcStreamHub(deps) {
         attachment.stop();
       }
       attachments.clear();
+      refusedAuthorizations.clear();
     }
   };
 }

package/dist/index.mjs

@@ -4738,7 +4738,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.72.0",
+      version: "11.72.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>",
@@ -7582,36 +7582,49 @@ function readUsageLog(fs14, logDir, options = {}) {
     if (sinceMs !== void 0 && segment.endsAt <= sinceMs) {
       continue;
     }
-    const contents = fs14.readFileUtf8(path20.join(logDir, segment.name));
-    if (contents === void 0) {
+    const read = readSegment(fs14, logDir, segment);
+    if (read === void 0) {
       continue;
     }
-    const lines = contents.split("\n");
-    lines.pop();
-    for (const line of lines) {
-      if (line === "") {
-        continue;
-      }
-      let raw;
-      try {
-        raw = JSON.parse(line);
-      } catch {
-        invalidLines += 1;
-        continue;
-      }
-      const parsed = UsageRecordSchema.safeParse(raw);
-      if (!parsed.success) {
-        invalidLines += 1;
-        continue;
-      }
-      if (sinceMs === void 0 || Date.parse(parsed.data.at) >= sinceMs) {
-        records.push(parsed.data);
+    invalidLines += read.invalidLines;
+    for (const record of read.records) {
+      if (sinceMs === void 0 || Date.parse(record.at) >= sinceMs) {
+        records.push(record);
       }
     }
   }
   records.sort((left, right) => left.at.localeCompare(right.at));
   return { records, invalidLines };
 }
+function readSegment(fs14, logDir, segment) {
+  const contents = fs14.readFileUtf8(path20.join(logDir, segment.name));
+  if (contents === void 0) {
+    return void 0;
+  }
+  const records = [];
+  let invalidLines = 0;
+  const lines = contents.split("\n");
+  lines.pop();
+  for (const line of lines) {
+    if (line === "") {
+      continue;
+    }
+    let raw;
+    try {
+      raw = JSON.parse(line);
+    } catch {
+      invalidLines += 1;
+      continue;
+    }
+    const parsed = UsageRecordSchema.safeParse(raw);
+    if (!parsed.success) {
+      invalidLines += 1;
+      continue;
+    }
+    records.push(parsed.data);
+  }
+  return { records, invalidLines };
+}
 function snapshotPath(snapshotsDir, identity) {
   if (!isIdentityName(identity)) {
     throw new Error(`"${identity}" is not a valid identity name.`);
@@ -13039,6 +13052,13 @@ function mergeLiveTasks(tree, live) {
 
 // src/frontdoor/rcSessions.ts
 var RC_SESSIONS_PATH_PREFIX = "/v1/code/sessions";
+function pathnameOf(url) {
+  return new URL(url ?? "/", "http://127.0.0.1").pathname;
+}
+function isRcSessionExchange(url) {
+  const path42 = pathnameOf(url);
+  return path42 === RC_SESSIONS_PATH_PREFIX || path42.startsWith(`${RC_SESSIONS_PATH_PREFIX}/`);
+}
 var RC_SESSION_ID_PREFIX = "cse_";
 var RC_IDLE_EXPIRY_MS = 45e3;
 var RC_CREATE_RESPONSE_CAP_BYTES = 8192;
@@ -13203,11 +13223,10 @@ function createRcSessionTracker(deps) {
   };
   const observeExchange = (request4) => {
     const method = (request4.method ?? "").toUpperCase();
-    const path42 = new URL(request4.url ?? "/", "http://127.0.0.1").pathname;
-    if (!path42.startsWith(RC_SESSIONS_PATH_PREFIX)) {
+    if (!isRcSessionExchange(request4.url)) {
       return void 0;
     }
-    const tail = path42.slice(RC_SESSIONS_PATH_PREFIX.length);
+    const tail = pathnameOf(request4.url).slice(RC_SESSIONS_PATH_PREFIX.length);
     const facts = {
       oauthAuthorization: oauthAuthorizationOf(request4.headers),
       anthropicVersion: singleHeader(request4.headers, "anthropic-version"),
@@ -19112,6 +19131,7 @@ function createRcEventFanout() {
 function createRcStreamHub(deps) {
   const attachments = /* @__PURE__ */ new Map();
   let closed = false;
+  const refusedAuthorizations = /* @__PURE__ */ new Map();
   const lastSavedSequenceNums = /* @__PURE__ */ new Map();
   const persistCursor = (sessionId) => {
     if (deps.saveSequenceNum === void 0) {
@@ -19215,7 +19235,6 @@ function createRcStreamHub(deps) {
   };
   const runLoop = async (attachment) => {
     let retriedUnauthorized = false;
-    let refusedAuthorization;
     for (; ; ) {
       if (attachment.isStopped()) {
         return;
@@ -19231,11 +19250,11 @@ function createRcStreamHub(deps) {
         }
         return;
       }
-      if (refusedAuthorization !== void 0 && credential.authorization === refusedAuthorization) {
+      if (credential.authorization === refusedAuthorizations.get(attachment.sessionId)) {
         await deps.sleep(deps.backoffMs);
         continue;
       }
-      refusedAuthorization = void 0;
+      refusedAuthorizations.delete(attachment.sessionId);
       let outcome;
       try {
         outcome = await attempt(attachment, credential);
@@ -19263,7 +19282,7 @@ function createRcStreamHub(deps) {
         continue;
       }
       deps.log?.(`rc stream ${attachment.sessionId}: the client read stream refused the observed Authorization bearer past one retry; waiting for a fresh one`);
-      refusedAuthorization = credential.authorization;
+      refusedAuthorizations.set(attachment.sessionId, credential.authorization);
       await deps.sleep(deps.backoffMs);
       retriedUnauthorized = false;
     }
@@ -19303,6 +19322,7 @@ function createRcStreamHub(deps) {
         attachment.stop();
       }
       attachments.clear();
+      refusedAuthorizations.clear();
     }
   };
 }

package/package.json

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