@wrongstack/core 0.291.1 → 0.292.0

package/dist/infrastructure/index.js

@@ -330,6 +330,7 @@ var DefaultTokenCounter = class {
   cacheWrite = 0;
   costInput = 0;
   costOutput = 0;
+  cacheSaved = 0;
   registry;
   providerId;
   events;
@@ -348,7 +349,7 @@ var DefaultTokenCounter = class {
   setSessionId(sessionId) {
     this.sessionId = sessionId;
   }
-  account(usage, model) {
+  account(usage, model, providerId = this.currentProviderId()) {
     const eventSessionId = this.currentSessionId();
     this.input += usage.input;
     this.output += usage.output;
@@ -357,35 +358,36 @@ var DefaultTokenCounter = class {
     this.lastInput = usage.input;
     this.lastCacheRead = usage.cacheRead ?? 0;
     this.lastCacheWrite = usage.cacheWrite ?? 0;
-    const price = model ? this.priceCache.get(model) : void 0;
+    const priceKey = providerId && model ? `${providerId}\0${model}` : void 0;
+    const price = priceKey ? this.priceCache.get(priceKey) : void 0;
     if (price) {
       this.applyPrice(usage, price);
-      this.emitAccounted(eventSessionId, model);
+      this.emitAccounted(eventSessionId, model, providerId, usage);
       return;
     }
-    if (this.registry && this.providerId && model) {
+    if (this.registry && providerId && model) {
       if (this.priceCache.size >= PRICE_CACHE_MAX_SIZE) {
         const keys = [...this.priceCache.keys()];
         this.priceCache.delete(keys[0] ?? "");
       }
-      void this.registry.getModel(this.providerId, model).then((m) => {
+      void this.registry.getModel(providerId, model).then((m) => {
         if (m) {
           const p = priceFromModel(m);
-          this.priceCache.set(model, p);
+          this.priceCache.set(priceKey, p);
           this.applyPrice(usage, p);
         }
-        this.emitAccounted(eventSessionId, model);
+        this.emitAccounted(eventSessionId, model, providerId, usage);
       }).catch(() => {
         this.events?.emit("token.cost_estimate_unavailable", {
           ...eventSessionId ? { sessionId: eventSessionId } : {},
           model: model ?? "<unknown>"
         });
-        this.emitAccounted(eventSessionId, model);
+        this.emitAccounted(eventSessionId, model, providerId, usage);
         return void 0;
       });
       return;
     }
-    this.emitAccounted(eventSessionId, model);
+    this.emitAccounted(eventSessionId, model, providerId, usage);
   }
   /** Synchronous variant for code paths that have already resolved the model. */
   accountWithModel(usage, resolved) {
@@ -402,9 +404,9 @@ var DefaultTokenCounter = class {
       const keys = [...this.priceCache.keys()];
       this.priceCache.delete(keys[0] ?? "");
     }
-    this.priceCache.set(resolved.modelId, price);
+    this.priceCache.set(`${resolved.providerId}\0${resolved.modelId}`, price);
     this.applyPrice(usage, price);
-    this.emitAccounted(eventSessionId, resolved.modelId);
+    this.emitAccounted(eventSessionId, resolved.modelId, resolved.providerId, usage);
   }
   total() {
     return {
@@ -435,19 +437,21 @@ var DefaultTokenCounter = class {
     return {
       readTokens: this.cacheRead,
       writeTokens: this.cacheWrite,
-      hitRatio: denom === 0 ? 0 : this.cacheRead / denom
+      hitRatio: denom === 0 ? 0 : this.cacheRead / denom,
+      savedUsd: round4(this.cacheSaved)
     };
   }
   /** Invalidate cached prices so the next account() call fetches fresh data. */
   invalidateCache() {
     this.priceCache.clear();
   }
-  emitAccounted(sessionId = this.currentSessionId(), model) {
+  emitAccounted(sessionId = this.currentSessionId(), model, providerId = this.currentProviderId(), deltaUsage) {
     this.events?.emit("token.accounted", {
       ...sessionId ? { sessionId } : {},
       usage: this.total(),
+      ...deltaUsage ? { deltaUsage: { ...deltaUsage } } : {},
       cost: { input: this.costInput, output: this.costOutput, total: this.costInput + this.costOutput },
-      ...this.providerId ? { provider: this.providerId } : {},
+      ...providerId ? { provider: providerId } : {},
       ...model ? { model } : {}
     });
   }
@@ -455,6 +459,10 @@ var DefaultTokenCounter = class {
     const value = typeof this.sessionId === "function" ? this.sessionId() : this.sessionId;
     return typeof value === "string" && value.length > 0 ? value : void 0;
   }
+  currentProviderId() {
+    const value = typeof this.providerId === "function" ? this.providerId() : this.providerId;
+    return typeof value === "string" && value.length > 0 ? value : void 0;
+  }
   reset() {
     this.input = 0;
     this.output = 0;
@@ -462,10 +470,16 @@ var DefaultTokenCounter = class {
     this.cacheWrite = 0;
     this.costInput = 0;
     this.costOutput = 0;
+    this.cacheSaved = 0;
     this.lastInput = 0;
     this.lastCacheRead = 0;
     this.lastCacheWrite = 0;
-    this.emitAccounted();
+    this.emitAccounted(void 0, void 0, void 0, {
+      input: 0,
+      output: 0,
+      cacheRead: 0,
+      cacheWrite: 0
+    });
   }
   applyPrice(usage, price) {
     if (price.input) this.costInput += usage.input / 1e6 * price.input;
@@ -473,6 +487,9 @@ var DefaultTokenCounter = class {
     if (usage.cacheRead && price.cacheRead) {
       this.costInput += usage.cacheRead / 1e6 * price.cacheRead;
     }
+    if (usage.cacheRead && price.input !== void 0) {
+      this.cacheSaved += usage.cacheRead / 1e6 * (price.input - (price.cacheRead ?? 0));
+    }
     const hasCacheWriteSplit = usage.cacheWrite5m !== void 0 || usage.cacheWrite1h !== void 0;
     const cacheWrite5m = usage.cacheWrite5m ?? (hasCacheWriteSplit ? 0 : usage.cacheWrite);
     const cacheWrite1h = usage.cacheWrite1h ?? 0;