agent-shim 11.49.0 → 11.49.1

package/dist/cli.cjs

@@ -35927,7 +35927,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.49.0",
+      version: "11.49.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>",
@@ -131106,50 +131106,70 @@ function quotaHeaders(upstream) {
   }
   return headers;
 }
-var EXHAUSTED_PERCENT = "100";
+var EXHAUSTED_PERCENT = 100;
+var FULL_PERCENT = 100;
+var MINUTES_PER_HOUR3 = 60;
+var FIVE_HOUR_WINDOW_HOURS2 = 5;
+var HOURS_PER_DAY7 = 24;
+var DAYS_PER_WEEK3 = 7;
+var FIVE_HOUR_MINUTES = FIVE_HOUR_WINDOW_HOURS2 * MINUTES_PER_HOUR3;
+var SEVEN_DAY_MINUTES = DAYS_PER_WEEK3 * HOURS_PER_DAY7 * MINUTES_PER_HOUR3;
+function windowReadings(upstream, exhausted, quotaError) {
+  let fiveHour;
+  let sevenDay;
+  for (const slot of ["primary", "secondary"]) {
+    const minutes = Number(upstream.get(`x-codex-${slot}-window-minutes`));
+    const used = upstream.get(`x-codex-${slot}-used-percent`);
+    const reset = upstream.get(`x-codex-${slot}-reset-at`);
+    if (used === null || used === "" || reset === null || reset === "") {
+      continue;
+    }
+    const reading = { usedPercent: Number(used), resetAt: reset };
+    if (minutes === FIVE_HOUR_MINUTES) {
+      fiveHour = reading;
+    } else if (minutes === SEVEN_DAY_MINUTES) {
+      sevenDay = reading;
+    }
+  }
+  if (fiveHour === void 0 && sevenDay === void 0 && exhausted) {
+    const reset = upstream.get("x-codex-primary-reset-at") ?? (quotaError?.resets_at === void 0 ? null : String(quotaError.resets_at));
+    if (reset !== null && reset !== "") {
+      sevenDay = { usedPercent: EXHAUSTED_PERCENT, resetAt: reset };
+    }
+  }
+  return { fiveHour, sevenDay };
+}
 function unifiedQuotaHeaders(upstream, rejected, quotaError) {
   const headers = { "anthropic-ratelimit-unified-status": rejected ? "rejected" : "allowed" };
-  const used7d = upstream.get("x-codex-primary-used-percent") ?? (rejected ? EXHAUSTED_PERCENT : null);
-  const reset7d = upstream.get("x-codex-primary-reset-at") ?? (quotaError?.resets_at === void 0 ? null : String(quotaError.resets_at));
-  if (used7d !== null && reset7d !== null) {
-    headers["anthropic-ratelimit-unified-7d-utilization"] = used7d;
-    headers["anthropic-ratelimit-unified-7d-reset"] = reset7d;
-    headers["anthropic-ratelimit-unified-reset"] = reset7d;
-  }
-  if (Number(upstream.get("x-codex-secondary-window-minutes")) > 0) {
-    const used5h = upstream.get("x-codex-secondary-used-percent");
-    const reset5h = upstream.get("x-codex-secondary-reset-at");
-    if (used5h !== null && used5h !== "" && reset5h !== null && reset5h !== "") {
-      headers["anthropic-ratelimit-unified-5h-utilization"] = used5h;
-      headers["anthropic-ratelimit-unified-5h-reset"] = reset5h;
-      const overall = headers["anthropic-ratelimit-unified-reset"];
-      if (overall !== void 0) {
-        headers["anthropic-ratelimit-unified-reset"] = String(Math.min(Number(overall), Number(reset5h)));
-      }
+  const { fiveHour, sevenDay } = windowReadings(upstream, rejected, quotaError);
+  const resets = [];
+  for (const [name, reading] of [["7d", sevenDay], ["5h", fiveHour]]) {
+    if (reading !== void 0) {
+      headers[`anthropic-ratelimit-unified-${name}-utilization`] = String(reading.usedPercent / FULL_PERCENT);
+      headers[`anthropic-ratelimit-unified-${name}-reset`] = reading.resetAt;
+      resets.push(Number(reading.resetAt));
     }
   }
+  if (resets.length > 0) {
+    headers["anthropic-ratelimit-unified-reset"] = String(Math.min(...resets));
+  }
   return headers;
 }
 var MS_PER_SECOND11 = 1e3;
+function snapshotWindow(reading) {
+  return reading === void 0 ? void 0 : { used_percentage: reading.usedPercent, resets_at: new Date(Number(reading.resetAt) * MS_PER_SECOND11).toISOString() };
+}
 function buildUsageSnapshot(upstream, quotaError, nowMs) {
-  const used7 = upstream.get("x-codex-primary-used-percent") ?? (quotaError === void 0 ? null : EXHAUSTED_PERCENT);
-  const reset7 = upstream.get("x-codex-primary-reset-at") ?? (quotaError?.resets_at === void 0 ? null : String(quotaError.resets_at));
-  const sevenDay = used7 !== null && reset7 !== null ? { used_percentage: Number(used7), resets_at: new Date(Number(reset7) * MS_PER_SECOND11).toISOString() } : void 0;
-  let fiveHour;
-  if (Number(upstream.get("x-codex-secondary-window-minutes")) > 0) {
-    const used5 = upstream.get("x-codex-secondary-used-percent");
-    const reset5 = upstream.get("x-codex-secondary-reset-at");
-    if (used5 !== null && reset5 !== null) {
-      fiveHour = { used_percentage: Number(used5), resets_at: new Date(Number(reset5) * MS_PER_SECOND11).toISOString() };
-    }
-  }
-  if (sevenDay === void 0 && fiveHour === void 0) {
+  const { fiveHour, sevenDay } = windowReadings(upstream, quotaError !== void 0, quotaError);
+  const fiveHourWindow = snapshotWindow(fiveHour);
+  const sevenDayWindow = snapshotWindow(sevenDay);
+  if (sevenDayWindow === void 0 && fiveHourWindow === void 0) {
     return void 0;
   }
   return {
     updated_at: new Date(nowMs).toISOString(),
-    ...sevenDay === void 0 ? {} : { seven_day: sevenDay },
-    ...fiveHour === void 0 ? {} : { five_hour: fiveHour }
+    ...sevenDayWindow === void 0 ? {} : { seven_day: sevenDayWindow },
+    ...fiveHourWindow === void 0 ? {} : { five_hour: fiveHourWindow }
   };
 }
 function retryAfterSeconds2(upstream, quotaError) {
@@ -136469,7 +136489,7 @@ var realHeadroomGet = async (target, requestPath, timeoutMs) => {
 
 // src/statusline/enrich.ts
 init_quota();
-var FULL_PERCENT = 100;
+var FULL_PERCENT2 = 100;
 var MS_PER_SECOND16 = 1e3;
 function identityOf(env) {
   const headers = env.ANTHROPIC_CUSTOM_HEADERS;
@@ -136491,7 +136511,16 @@ function identityOf(env) {
   }
   return void 0;
 }
-function windowsOf(states) {
+function livePercentOf(window, nowMs) {
+  if (window?.utilization === void 0 || !Number.isFinite(window.utilization)) {
+    return void 0;
+  }
+  if (window.resetsAt !== void 0 && Date.parse(window.resetsAt) <= nowMs) {
+    return void 0;
+  }
+  return Math.round(Math.min(1, Math.max(0, window.utilization)) * FULL_PERCENT2);
+}
+function windowsOf(states, nowMs) {
   let fiveHourUsed;
   let fiveHourResetAt;
   let sevenDayUsed;
@@ -136501,14 +136530,12 @@ function windowsOf(states) {
     if (unified === void 0) {
       continue;
     }
-    const fiveWindow = unified.fiveHour === void 0 ? void 0 : unified.fiveHour.utilization;
-    const five = typeof fiveWindow === "number" && Number.isFinite(fiveWindow) ? Math.round(Math.min(1, Math.max(0, fiveWindow)) * FULL_PERCENT) : void 0;
+    const five = livePercentOf(unified.fiveHour, nowMs);
     if (five !== void 0 && (fiveHourUsed === void 0 || five > fiveHourUsed)) {
       fiveHourUsed = five;
       fiveHourResetAt = unified.fiveHour?.resetsAt;
     }
-    const sevenWindow = unified.sevenDay === void 0 ? void 0 : unified.sevenDay.utilization;
-    const seven = typeof sevenWindow === "number" && Number.isFinite(sevenWindow) ? Math.round(Math.min(1, Math.max(0, sevenWindow)) * FULL_PERCENT) : void 0;
+    const seven = livePercentOf(unified.sevenDay, nowMs);
     if (seven !== void 0 && (sevenDayUsed === void 0 || seven > sevenDayUsed)) {
       sevenDayUsed = seven;
       sevenDayResetAt = unified.sevenDay?.resetsAt;
@@ -136526,7 +136553,7 @@ function payloadWindow(rateLimits, key) {
   }
   const resetsAt = window.resets_at;
   return {
-    used: Math.min(FULL_PERCENT, Math.max(0, window.used_percentage)),
+    used: Math.min(FULL_PERCENT2, Math.max(0, window.used_percentage)),
     resetAt: typeof resetsAt === "number" && Number.isFinite(resetsAt) ? new Date(resetsAt * MS_PER_SECOND16).toISOString() : void 0
   };
 }
@@ -136554,7 +136581,7 @@ function antigravityQuotaMapOf(payload) {
 }
 function bucketView(bucket, nowMs) {
   return {
-    used: bucket?.remaining_fraction === void 0 || !Number.isFinite(bucket.remaining_fraction) ? void 0 : (1 - Math.min(1, Math.max(0, bucket.remaining_fraction))) * FULL_PERCENT,
+    used: bucket?.remaining_fraction === void 0 || !Number.isFinite(bucket.remaining_fraction) ? void 0 : (1 - Math.min(1, Math.max(0, bucket.remaining_fraction))) * FULL_PERCENT2,
     resetAt: bucket?.reset_in_seconds === void 0 || !Number.isFinite(bucket.reset_in_seconds) ? void 0 : new Date(nowMs + bucket.reset_in_seconds * MS_PER_SECOND16).toISOString()
   };
 }
@@ -136572,7 +136599,7 @@ function antigravityWindowsOf(payload, nowMs) {
 function quotaFamiliesOf(buckets, nowMs) {
   return antigravityFamilyBuckets(buckets).flatMap(({ label, bucket }) => {
     const { used, resetAt } = bucketView(bucket, nowMs);
-    return used === void 0 ? [] : [{ measures: label, utilization: used / FULL_PERCENT, resetsAt: resetAt }];
+    return used === void 0 ? [] : [{ measures: label, utilization: used / FULL_PERCENT2, resetsAt: resetAt }];
   });
 }
 function enrichStatuslinePayload(params) {
@@ -136634,7 +136661,7 @@ function enrichStatuslinePayload(params) {
         }
       ])
     );
-    summary = { ...summary, ...windowsOf(states), providerAccountEmail: email3, providerAccountSub: sub, providerPlan: plan, providerQuotaWindows, quotaFamilies: quotaFamiliesOf(providerBuckets, params.nowMs) };
+    summary = { ...summary, ...windowsOf(states, params.nowMs), providerAccountEmail: email3, providerAccountSub: sub, providerPlan: plan, providerQuotaWindows, quotaFamilies: quotaFamiliesOf(providerBuckets, params.nowMs) };
   }
   if (summary.provider === void 0) {
     const agyBuckets = antigravityQuotaMapOf(params.payload);
@@ -136758,7 +136785,7 @@ function layoutBarGrid(groups, maxWidth, separator, baseBarCells) {
 // src/statusline/render.ts
 var BAR_WIDTH = 10;
 var SECONDS_PER_MINUTE2 = 60;
-var MINUTES_PER_HOUR3 = 60;
+var MINUTES_PER_HOUR4 = 60;
 var SECONDS_PER_DAY = 86400;
 var THOUSAND = 1e3;
 var MILLION = 1e6;
@@ -136766,7 +136793,7 @@ var TEN = 10;
 var TWENTY = 20;
 var RESERVED_COLUMNS = 4;
 var SEPARATOR2 = " | ";
-var FULL_PERCENT2 = 100;
+var FULL_PERCENT3 = 100;
 var ONE_PERCENT = 1;
 var USED_RED_AT = 0.9;
 var USED_YELLOW_AT = 0.7;
@@ -136809,8 +136836,8 @@ function formatDuration(seconds) {
     return "available";
   }
   const days = Math.floor(seconds / SECONDS_PER_DAY);
-  const hours = Math.floor(seconds % SECONDS_PER_DAY / (MINUTES_PER_HOUR3 * SECONDS_PER_MINUTE2));
-  const minutes = Math.floor(seconds % (MINUTES_PER_HOUR3 * SECONDS_PER_MINUTE2) / SECONDS_PER_MINUTE2);
+  const hours = Math.floor(seconds % SECONDS_PER_DAY / (MINUTES_PER_HOUR4 * SECONDS_PER_MINUTE2));
+  const minutes = Math.floor(seconds % (MINUTES_PER_HOUR4 * SECONDS_PER_MINUTE2) / SECONDS_PER_MINUTE2);
   if (days > 0) {
     return `${String(days)}d ${String(hours)}h`;
   }
@@ -136833,7 +136860,7 @@ function headroomText(stats) {
 }
 function cacheHitText(hitFraction) {
   const clamped = Math.max(0, Math.min(1, hitFraction));
-  return ` (Cache: ${statusColor(clamped, false)}${(clamped * FULL_PERCENT2).toFixed(0)}%${RESET})`;
+  return ` (Cache: ${statusColor(clamped, false)}${(clamped * FULL_PERCENT3).toFixed(0)}%${RESET})`;
 }
 function cacheShareText(view) {
   const hitRatio = view.cacheHitRatio;
@@ -136990,7 +137017,7 @@ function renderStatuslineBlock(summary, view, terminalWidth, nowMs) {
   }
   const contextGroup = [];
   if (view.contextUsedPercentage !== void 0) {
-    const fraction = Math.max(0, Math.min(1, view.contextUsedPercentage / FULL_PERCENT2));
+    const fraction = Math.max(0, Math.min(1, view.contextUsedPercentage / FULL_PERCENT3));
     const color = statusColor(fraction, true);
     const percent2 = `${color}${view.contextUsedPercentage.toFixed(1)}%${RESET}`;
     const tokens = view.contextTotalTokens !== void 0 && view.contextWindowTokens !== void 0 ? `${formatTokens(view.contextTotalTokens)}/${formatTokens(view.contextWindowTokens)} ` : "";
@@ -137001,7 +137028,7 @@ function renderStatuslineBlock(summary, view, terminalWidth, nowMs) {
   const drawWindow = (label, fraction, resetsAt) => {
     const clamped = Math.max(0, Math.min(1, fraction));
     const color = statusColor(clamped, true);
-    quotaGroup.push(barCell(`${label} `, ` ${color}${(fraction * FULL_PERCENT2).toFixed(1)}%${RESET} (${formatDuration(secondsUntil(resetsAt, nowMs))})`, clamped));
+    quotaGroup.push(barCell(`${label} `, ` ${color}${(fraction * FULL_PERCENT3).toFixed(1)}%${RESET} (${formatDuration(secondsUntil(resetsAt, nowMs))})`, clamped));
   };
   if (summary.quotaFamilies.length > 0) {
     for (const window of summary.quotaFamilies) {
@@ -137009,10 +137036,10 @@ function renderStatuslineBlock(summary, view, terminalWidth, nowMs) {
     }
   } else {
     if (summary.fiveHourUsed !== void 0) {
-      drawWindow("5h", summary.fiveHourUsed / FULL_PERCENT2, summary.fiveHourResetAt);
+      drawWindow("5h", summary.fiveHourUsed / FULL_PERCENT3, summary.fiveHourResetAt);
     }
     if (summary.sevenDayUsed !== void 0) {
-      drawWindow("Wk", summary.sevenDayUsed / FULL_PERCENT2, summary.sevenDayResetAt);
+      drawWindow("Wk", summary.sevenDayUsed / FULL_PERCENT3, summary.sevenDayResetAt);
     }
     if (summary.fiveHourUsed === void 0 && summary.sevenDayUsed === void 0) {
       for (const window of summary.providerQuotaWindows) {

package/dist/index.cjs

@@ -4191,7 +4191,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.49.0",
+      version: "11.49.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>",

package/dist/index.mjs

@@ -4167,7 +4167,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.49.0",
+      version: "11.49.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>",

package/package.json

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