@stage-labs/metro 0.1.0-beta.251 → 0.1.0-beta.253

package/runtime/node_modules/@metro-labs/daemon/src/gateway/usage.ts

@@ -3,7 +3,7 @@ import { stringOf } from '@metro-labs/http/api-http';
 
 type Key = string;
 
-interface UsageWindow {
+export interface UsageWindow {
   label: string;
   used: number | null;
   resetAt: string | null;
@@ -28,14 +28,32 @@ export interface ProviderUsage {
 export type Reported = Omit<ProviderUsage, 'tally'>;
 
 const latest = new Map<Key, Reported>();
+const stamps = new Map<Key, Map<string, number>>();
 const tallies = new Map<Key, Tally>();
 const probed = new Map<Key, number>();
 const answers = new Map<Key, Reported>();
 
 export const noteUsage = (key: Key, usage: Reported): void => {
   latest.set(key, usage);
+  stamps.set(key, new Map(usage.windows.map((w) => [w.label, Date.parse(usage.at)])));
 };
 
+export function mergeUsage(key: Key, usage: Reported): void {
+  const seen = latest.get(key);
+  const marks = stamps.get(key);
+  if (seen === undefined || marks === undefined) {
+    noteUsage(key, usage);
+    return;
+  }
+  const at = Date.parse(usage.at);
+  const newer = new Map(usage.windows.filter((w) => (marks.get(w.label) ?? Number.NEGATIVE_INFINITY) <= at).map((w) => [w.label, w]));
+  for (const label of newer.keys()) marks.set(label, at);
+  const kept = seen.windows.map((w) => newer.get(w.label) ?? w);
+  const added = [...newer.values()].filter((w) => !seen.windows.some((old) => old.label === w.label));
+  const later = Date.parse(seen.at) <= at;
+  latest.set(key, { windows: [...kept, ...added], note: later ? usage.note : seen.note, at: later ? usage.at : seen.at });
+}
+
 export function usageSeen(): Record<Key, ProviderUsage> {
   const out: Record<Key, ProviderUsage> = {};
   for (const key of new Set<Key>([...latest.keys(), ...tallies.keys()])) {
@@ -50,17 +68,20 @@ export const usageOf = (key: Key): Reported | undefined => latest.get(key);
 
 export const forgetOne = (key: Key): void => {
   latest.delete(key);
+  stamps.delete(key);
   tallies.delete(key);
   probed.delete(key);
 };
 
 export const forgetReported = (key: Key): void => {
   latest.delete(key);
+  stamps.delete(key);
   probed.delete(key);
 };
 
 export const forgetUsage = (): void => {
   latest.clear();
+  stamps.clear();
   tallies.clear();
   probed.clear();
   answers.clear();
@@ -178,13 +199,15 @@ function anthropicUnified(headers: Headers, now: Date): { windows: UsageWindow[]
   return { windows, note };
 }
 
+export const PER_MINUTE = 'Tokens per minute';
+
 function anthropicKeyed(headers: Headers, now: Date): UsageWindow[] {
   const limit = Number(headers.get('anthropic-ratelimit-tokens-limit'));
   const remaining = Number(headers.get('anthropic-ratelimit-tokens-remaining'));
   if (!Number.isFinite(limit) || !Number.isFinite(remaining) || limit <= 0) return [];
   return [
     {
-      label: 'Tokens per minute',
+      label: PER_MINUTE,
       used: clamp(1 - remaining / limit),
       resetAt: whenFrom(headers.get('anthropic-ratelimit-tokens-reset'), now),
       detail: `${remaining.toLocaleString('en-US')} of ${limit.toLocaleString('en-US')} left`,
@@ -315,7 +338,9 @@ export function claudeLoginUsage(limits: unknown, now = new Date()): Reported |
 
 export function noteUsageHeaders(kind: 'anthropic' | 'codex', key: Key, headers: Headers, now = new Date()): void {
   const usage = kind === 'anthropic' ? anthropicUsage(headers, now) : codexUsage(headers, now);
-  if (usage !== null) noteUsage(key, usage);
+  if (usage === null) return;
+  if (kind === 'anthropic') mergeUsage(key, usage);
+  else noteUsage(key, usage);
 }
 
 const dollars = (value: number): string => `$${value.toFixed(2)}`;

package/runtime/node_modules/@metro-labs/discord-bot/package.json

@@ -17,7 +17,7 @@
     "discord.js": "^14.26.4"
   },
   "devDependencies": {
-    "@stage-labs/config": "0.1.0-beta.2",
+    "@stage-labs/config": "0.1.0-beta.3",
     "eslint": "^10.3.0",
     "knip": "^6.15.0",
     "madge": "^8.0.0",

package/runtime/node_modules/@metro-labs/gmail/package.json

@@ -16,7 +16,7 @@
     "@metro-labs/core": "workspace:*"
   },
   "devDependencies": {
-    "@stage-labs/config": "0.1.0-beta.2",
+    "@stage-labs/config": "0.1.0-beta.3",
     "eslint": "^10.3.0",
     "knip": "^6.15.0",
     "madge": "^8.0.0",

package/runtime/node_modules/@metro-labs/http/package.json

@@ -21,7 +21,7 @@
     "@metro-labs/core": "workspace:*"
   },
   "devDependencies": {
-    "@stage-labs/config": "0.1.0-beta.2",
+    "@stage-labs/config": "0.1.0-beta.3",
     "eslint": "^10.3.0",
     "knip": "^6.15.0",
     "madge": "^8.0.0",

package/runtime/node_modules/@metro-labs/outlook/package.json

@@ -16,7 +16,7 @@
     "@metro-labs/core": "workspace:*"
   },
   "devDependencies": {
-    "@stage-labs/config": "0.1.0-beta.2",
+    "@stage-labs/config": "0.1.0-beta.3",
     "eslint": "^10.3.0",
     "knip": "^6.15.0",
     "madge": "^8.0.0",

package/runtime/node_modules/@metro-labs/telegram/package.json

@@ -17,7 +17,7 @@
     "@mtcute/bun": "0.30.1"
   },
   "devDependencies": {
-    "@stage-labs/config": "0.1.0-beta.2",
+    "@stage-labs/config": "0.1.0-beta.3",
     "eslint": "^10.3.0",
     "knip": "^6.15.0",
     "madge": "^8.0.0",

package/runtime/node_modules/@metro-labs/telegram-bot/package.json

@@ -16,7 +16,7 @@
     "@metro-labs/core": "workspace:*"
   },
   "devDependencies": {
-    "@stage-labs/config": "0.1.0-beta.2",
+    "@stage-labs/config": "0.1.0-beta.3",
     "eslint": "^10.3.0",
     "knip": "^6.15.0",
     "madge": "^8.0.0",

package/runtime/node_modules/@metro-labs/threema/package.json

@@ -17,7 +17,7 @@
     "tweetnacl": "^1.0.3"
   },
   "devDependencies": {
-    "@stage-labs/config": "0.1.0-beta.2",
+    "@stage-labs/config": "0.1.0-beta.3",
     "eslint": "^10.3.0",
     "knip": "^6.15.0",
     "madge": "^8.0.0",

package/runtime/node_modules/@metro-labs/webhook/package.json

@@ -14,7 +14,7 @@
     "@metro-labs/core": "workspace:*"
   },
   "devDependencies": {
-    "@stage-labs/config": "0.1.0-beta.2",
+    "@stage-labs/config": "0.1.0-beta.3",
     "eslint": "^10.3.0",
     "knip": "^6.15.0",
     "madge": "^8.0.0",

package/runtime/node_modules/@metro-labs/whatsapp/package.json

@@ -17,7 +17,7 @@
     "baileys": "7.0.0-rc14"
   },
   "devDependencies": {
-    "@stage-labs/config": "0.1.0-beta.2",
+    "@stage-labs/config": "0.1.0-beta.3",
     "eslint": "^10.3.0",
     "knip": "^6.15.0",
     "madge": "^8.0.0",

package/runtime/node_modules/@metro-labs/xmtp/package.json

@@ -25,7 +25,7 @@
     "viem": "^2.52.2"
   },
   "devDependencies": {
-    "@stage-labs/config": "0.1.0-beta.2",
+    "@stage-labs/config": "0.1.0-beta.3",
     "eslint": "^10.3.0",
     "knip": "^6.15.0",
     "madge": "^8.0.0",

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.251"
+  "version": "0.1.0-beta.253"
 }