agent-shim 11.71.1 → 11.72.1

package/dist/cli.cjs

@@ -37387,7 +37387,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.71.1",
+      version: "11.72.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>",
@@ -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);
   }
@@ -134286,6 +134321,10 @@ async function collectBody(body) {
         resolve3(result);
       }
     };
+    if (body.destroyed) {
+      settle2({ kind: "failed" });
+      return;
+    }
     body.on("data", (chunk2) => {
       if (settled) {
         return;
@@ -134309,6 +134348,9 @@ async function collectBody(body) {
     body.on("error", () => {
       settle2({ kind: "failed" });
     });
+    body.on("close", () => {
+      settle2({ kind: "failed" });
+    });
   });
 }
 function requestedModelOf(body) {
@@ -135223,6 +135265,9 @@ function createAntigravityRelay(params) {
   let currentBlockIndex = -1;
   let sawToolUse = false;
   let finished = false;
+  let stopReason = "end_turn";
+  const content = [];
+  let activeText;
   let usage = {
     input_tokens: 0,
     cache_creation_input_tokens: 0,
@@ -135284,6 +135329,8 @@ function createAntigravityRelay(params) {
             closeActiveBlock();
             currentBlockIndex += 1;
             activeBlockType = "text";
+            activeText = { type: "text", text: "" };
+            content.push(activeText);
             frames.push({
               event: "content_block_start",
               data: {
@@ -135293,6 +135340,9 @@ function createAntigravityRelay(params) {
               }
             });
           }
+          if (activeText !== void 0) {
+            activeText.text += part.text;
+          }
           frames.push({
             event: "content_block_delta",
             data: {
@@ -135309,6 +135359,7 @@ function createAntigravityRelay(params) {
           const callName = part.functionCall.name;
           const originalName = params.toolNames.get(callName) ?? callName;
           const callId = params.fallbackId();
+          content.push({ type: "tool_use", id: callId, name: originalName, input: part.functionCall.args });
           if (typeof part.thoughtSignature === "string") {
             rememberToolCallSignature(callId, part.thoughtSignature);
           }
@@ -135342,7 +135393,7 @@ function createAntigravityRelay(params) {
       }
     }
     if (candidate?.finishReason !== void 0) {
-      const stopReason = sawToolUse ? "tool_use" : candidate.finishReason === "MAX_TOKENS" ? "max_tokens" : "end_turn";
+      stopReason = sawToolUse ? "tool_use" : candidate.finishReason === "MAX_TOKENS" ? "max_tokens" : "end_turn";
       closeActiveBlock();
       frames.push({
         event: "message_delta",
@@ -135365,7 +135416,7 @@ function createAntigravityRelay(params) {
     if (!finished) {
       ensureStarted();
       closeActiveBlock();
-      const stopReason = sawToolUse ? "tool_use" : "end_turn";
+      stopReason = sawToolUse ? "tool_use" : "end_turn";
       frames.push({
         event: "message_delta",
         data: {
@@ -135382,7 +135433,8 @@ function createAntigravityRelay(params) {
     }
     return { frames: [...frames], done: true };
   };
-  return { pushChunk, finish };
+  const message = () => ({ id: messageId, type: "message", role: "assistant", model: params.servedModel, content: [...content], stop_reason: stopReason, stop_sequence: null, usage });
+  return { pushChunk, finish, message };
 }
 
 // src/antigravity/route.ts
@@ -135701,12 +135753,12 @@ function createAntigravityRoute(ports) {
       nowMs,
       model: translated.model
     });
-    const stream = async function* () {
+    const frames = async function* () {
       try {
         if (firstResult.done !== true) {
           const step2 = relay.pushChunk(firstResult.value);
           for (const frame of step2.frames) {
-            yield renderSseFrame2(frame);
+            yield frame;
           }
           if (!step2.done) {
             for (; ; ) {
@@ -135719,7 +135771,7 @@ function createAntigravityRoute(ports) {
               }
               const nextStep = relay.pushChunk(nextResult.value);
               for (const frame of nextStep.frames) {
-                yield renderSseFrame2(frame);
+                yield frame;
               }
               if (nextStep.done) {
                 break;
@@ -135729,30 +135781,40 @@ function createAntigravityRoute(ports) {
         }
         const finalStep = relay.finish();
         for (const frame of finalStep.frames) {
-          yield renderSseFrame2(frame);
+          yield frame;
         }
       } catch (error63) {
         if (!request7.signal.aborted) {
           const errMsg = error63 instanceof Error ? error63.message : String(error63);
-          yield renderSseFrame2({
-            event: "error",
-            data: { type: "error", error: { type: "api_error", message: errMsg } }
-          });
+          yield { event: "error", data: { type: "error", error: { type: "api_error", message: errMsg } } };
         }
       }
     };
-    return {
-      status: HTTP_STATUS.ok,
-      headers: {
-        "Content-Type": "text/event-stream",
-        "Cache-Control": "no-cache",
-        Connection: "keep-alive",
-        ...quotaHeaders2
-      },
-      body: stream(),
-      // The tier alias the session asked for, whenever the translation resolved it to a different model: the front door's mount turns it into the model choice the usage record keeps.
-      ...requestedModel !== translated.model ? { requestedModel } : {}
-    };
+    const served = requestedModel !== translated.model ? { requestedModel } : {};
+    if (parsed.data.stream === true) {
+      const rendered = async function* () {
+        for await (const frame of frames()) {
+          yield renderSseFrame2(frame);
+        }
+      };
+      return {
+        status: HTTP_STATUS.ok,
+        headers: {
+          "Content-Type": "text/event-stream",
+          "Cache-Control": "no-cache",
+          Connection: "keep-alive",
+          ...quotaHeaders2
+        },
+        body: rendered(),
+        ...served
+      };
+    }
+    for await (const frame of frames()) {
+      if (frame.event === "error") {
+        return { status: HTTP_STATUS.badGateway, headers: { "Content-Type": "application/json" }, body: JSON.stringify(frame.data) };
+      }
+    }
+    return { status: HTTP_STATUS.ok, headers: { "Content-Type": "application/json", ...quotaHeaders2 }, body: JSON.stringify(relay.message()), ...served };
   };
 }
 
@@ -139181,6 +139243,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) {
@@ -139284,7 +139347,6 @@ function createRcStreamHub(deps) {
   };
   const runLoop = async (attachment) => {
     let retriedUnauthorized = false;
-    let refusedAuthorization;
     for (; ; ) {
       if (attachment.isStopped()) {
         return;
@@ -139300,11 +139362,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);
@@ -139332,7 +139394,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;
     }
@@ -139372,6 +139434,7 @@ function createRcStreamHub(deps) {
         attachment.stop();
       }
       attachments.clear();
+      refusedAuthorizations.clear();
     }
   };
 }
@@ -140002,10 +140065,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.71.1",
+      version: "11.72.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>",
@@ -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.`);
@@ -19527,6 +19540,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 +19644,6 @@ function createRcStreamHub(deps) {
   };
   const runLoop = async (attachment) => {
     let retriedUnauthorized = false;
-    let refusedAuthorization;
     for (; ; ) {
       if (attachment.isStopped()) {
         return;
@@ -19646,11 +19659,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 +19691,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 +19731,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.71.1",
+      version: "11.72.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>",
@@ -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.`);
@@ -19112,6 +19125,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 +19229,6 @@ function createRcStreamHub(deps) {
   };
   const runLoop = async (attachment) => {
     let retriedUnauthorized = false;
-    let refusedAuthorization;
     for (; ; ) {
       if (attachment.isStopped()) {
         return;
@@ -19231,11 +19244,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 +19276,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 +19316,7 @@ function createRcStreamHub(deps) {
         attachment.stop();
       }
       attachments.clear();
+      refusedAuthorizations.clear();
     }
   };
 }