@wrongstack/core 0.313.1 → 0.316.2

package/dist/infrastructure/index.d.ts

@@ -1,8 +1,8 @@
+export { assertProjectRootOutsideStateDir, type BootConfigOptions, type BootConfigResult, bootConfig, flagsToConfigPatch, } from '../boot.js';
+export { CONTEXT_MANAGER_TOOL_NAME, type ContextManagerAction, type ContextManagerInput, type ContextManagerResult, type ContextManagerToolOptions, contextManagerTool, createContextManagerTool, } from './context-manager.js';
 export { DefaultLogger, type DefaultLoggerOptions, type LogFormat } from './logger.js';
+export { allServers, awsServer, blockServer, braveSearchServer, context7Server, everArtServer, filesystemServer, githubServer, googleMapsServer, miniMaxVisionServer, playwrightServer, sentinelServer, slackServer, sshManagerServer, zaiVisionServer, } from './mcp-servers.js';
 export { DefaultPathResolver } from './path-resolver.js';
-export { DefaultTokenCounter } from './token-counter.js';
 export { ProviderCacheLedger } from './provider-cache-ledger.js';
-export { filesystemServer, githubServer, context7Server, braveSearchServer, blockServer, everArtServer, slackServer, awsServer, googleMapsServer, sentinelServer, zaiVisionServer, miniMaxVisionServer, playwrightServer, sshManagerServer, allServers, } from './mcp-servers.js';
-export { contextManagerTool, createContextManagerTool, type ContextManagerInput, type ContextManagerResult, type ContextManagerAction, type ContextManagerToolOptions, } from './context-manager.js';
-export { assertProjectRootOutsideStateDir, bootConfig, flagsToConfigPatch, type BootConfigOptions, type BootConfigResult, } from '../boot.js';
+export { DefaultTokenCounter } from './token-counter.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/infrastructure/index.js

@@ -4,9 +4,9 @@ import {
   assertProjectRootOutsideStateDir,
   bootConfig,
   flagsToConfigPatch
-} from "../chunk-JTHKOYWU.js";
-import "../chunk-IQ35HMQL.js";
-import "../chunk-6AKOTGLM.js";
+} from "../chunk-MJPHJRAL.js";
+import "../chunk-5YPSXQXM.js";
+import "../chunk-CU546ESW.js";
 import {
   allServers,
   awsServer,
@@ -28,272 +28,30 @@ import "../chunk-YY6APYUM.js";
 import {
   DefaultLogger
 } from "../chunk-WBPVKEEE.js";
-import "../chunk-H5E77KUJ.js";
-import "../chunk-ZZ4V3WIZ.js";
-import {
-  promptCacheHitRatio
-} from "../chunk-NFAYHPRH.js";
-import "../chunk-CQQL4ZOQ.js";
-import "../chunk-RPOA7IAE.js";
-import "../chunk-DEIQMBD2.js";
+import "../chunk-ZT7JNIGX.js";
+import "../chunk-W5VITDM2.js";
+import "../chunk-B7F4WVP4.js";
+import "../chunk-6FHWXLPT.js";
 import {
   repairToolUseAdjacency
-} from "../chunk-M2WF6AXG.js";
-import "../chunk-4XV6IR37.js";
+} from "../chunk-LSMMOS2Z.js";
 import "../chunk-4VWO3ZXL.js";
+import "../chunk-HI3JGZR2.js";
 import {
   estimateMessageTokens,
   estimateRequestTokens
-} from "../chunk-FSWCWSTS.js";
-import "../chunk-7ZHZE5EO.js";
-import "../chunk-YNCVSFGF.js";
+} from "../chunk-HMLIGAU7.js";
+import "../chunk-OSGLYW5J.js";
+import "../chunk-SAFHACFA.js";
+import "../chunk-DLHHXUAM.js";
+import {
+  promptCacheHitRatio
+} from "../chunk-3ECENVHL.js";
 import "../chunk-KJ2ZTQSL.js";
 import "../chunk-B4AMLZPB.js";
-import "../chunk-WOEZV3Q4.js";
-import "../chunk-TBRL2RCC.js";
 import "../chunk-PFZO3C6H.js";
-
-// src/infrastructure/token-counter.ts
-var PRICE_CACHE_MAX_SIZE = 100;
-var DefaultTokenCounter = class {
-  input = 0;
-  output = 0;
-  cacheRead = 0;
-  cacheWrite = 0;
-  cacheWrite5m = 0;
-  cacheWrite1h = 0;
-  costInput = 0;
-  costOutput = 0;
-  cacheSaved = 0;
-  cacheByProvider = /* @__PURE__ */ new Map();
-  registry;
-  providerId;
-  events;
-  sessionId;
-  priceCache = /* @__PURE__ */ new Map();
-  /** Most recently accounted request's tokens. Used for per-request context pressure. */
-  lastInput = 0;
-  lastCacheRead = 0;
-  lastCacheWrite = 0;
-  constructor(opts = {}) {
-    this.registry = opts.registry;
-    this.providerId = opts.providerId;
-    this.events = opts.events;
-    this.sessionId = opts.sessionId;
-  }
-  setSessionId(sessionId) {
-    this.sessionId = sessionId;
-  }
-  account(usage, model, providerId = this.currentProviderId()) {
-    const eventSessionId = this.currentSessionId();
-    this.input += usage.input;
-    this.output += usage.output;
-    this.cacheRead += usage.cacheRead ?? 0;
-    const ttlAggregate = usage.cacheWrite5m !== void 0 || usage.cacheWrite1h !== void 0 ? (usage.cacheWrite5m ?? 0) + (usage.cacheWrite1h ?? 0) : 0;
-    const cacheWriteTotal = usage.cacheWrite ?? ttlAggregate;
-    this.cacheWrite += cacheWriteTotal;
-    this.cacheWrite5m += usage.cacheWrite5m ?? 0;
-    this.cacheWrite1h += usage.cacheWrite1h ?? 0;
-    this.recordProviderCache(usage, providerId, cacheWriteTotal);
-    this.lastInput = usage.input;
-    this.lastCacheRead = usage.cacheRead ?? 0;
-    this.lastCacheWrite = cacheWriteTotal;
-    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, providerId, usage);
-      return;
-    }
-    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(providerId, model).then((m) => {
-        if (m) {
-          const p = priceFromModel(m);
-          this.priceCache.set(priceKey, p);
-          this.applyPrice(usage, p);
-        }
-        this.emitAccounted(eventSessionId, model, providerId, usage);
-      }).catch(() => {
-        this.events?.emit("token.cost_estimate_unavailable", {
-          ...eventSessionId ? { sessionId: eventSessionId } : {},
-          model: model ?? "<unknown>"
-        });
-        this.emitAccounted(eventSessionId, model, providerId, usage);
-        return void 0;
-      });
-      return;
-    }
-    this.emitAccounted(eventSessionId, model, providerId, usage);
-  }
-  /** Synchronous variant for code paths that have already resolved the model. */
-  accountWithModel(usage, resolved) {
-    const eventSessionId = this.currentSessionId();
-    this.input += usage.input;
-    this.output += usage.output;
-    this.cacheRead += usage.cacheRead ?? 0;
-    const ttlAggregate = usage.cacheWrite5m !== void 0 || usage.cacheWrite1h !== void 0 ? (usage.cacheWrite5m ?? 0) + (usage.cacheWrite1h ?? 0) : 0;
-    const cacheWriteTotal = usage.cacheWrite ?? ttlAggregate;
-    this.cacheWrite += cacheWriteTotal;
-    this.cacheWrite5m += usage.cacheWrite5m ?? 0;
-    this.cacheWrite1h += usage.cacheWrite1h ?? 0;
-    this.recordProviderCache(usage, resolved.providerId, cacheWriteTotal);
-    this.lastInput = usage.input;
-    this.lastCacheRead = usage.cacheRead ?? 0;
-    this.lastCacheWrite = cacheWriteTotal;
-    const price = priceFromModel(resolved);
-    if (this.priceCache.size >= PRICE_CACHE_MAX_SIZE) {
-      const keys = [...this.priceCache.keys()];
-      this.priceCache.delete(keys[0] ?? "");
-    }
-    this.priceCache.set(`${resolved.providerId}\0${resolved.modelId}`, price);
-    this.applyPrice(usage, price);
-    this.emitAccounted(eventSessionId, resolved.modelId, resolved.providerId, usage);
-  }
-  total() {
-    return {
-      input: this.input,
-      output: this.output,
-      cacheRead: this.cacheRead,
-      cacheWrite: this.cacheWrite
-    };
-  }
-  currentRequestTokens() {
-    return {
-      input: this.lastInput,
-      cacheRead: this.lastCacheRead,
-      cacheWrite: this.lastCacheWrite
-    };
-  }
-  setCurrentRequestTokens(input, cacheRead, cacheWrite) {
-    this.lastInput = input;
-    this.lastCacheRead = cacheRead ?? 0;
-    this.lastCacheWrite = cacheWrite ?? 0;
-  }
-  estimateCost() {
-    return {
-      input: round4(this.costInput),
-      output: round4(this.costOutput),
-      total: round4(this.costInput + this.costOutput),
-      currency: "USD"
-    };
-  }
-  cacheStats() {
-    const exposeTtlSplit = this.cacheWrite5m > 0 || this.cacheWrite1h > 0;
-    return {
-      readTokens: this.cacheRead,
-      writeTokens: this.cacheWrite,
-      ...exposeTtlSplit ? { cacheWrite5m: this.cacheWrite5m, cacheWrite1h: this.cacheWrite1h } : {},
-      hitRatio: promptCacheHitRatio({
-        input: this.input,
-        output: this.output,
-        cacheRead: this.cacheRead,
-        cacheWrite: this.cacheWrite
-      }),
-      savedUsd: round4(this.cacheSaved),
-      providers: [...this.cacheByProvider.entries()].map(([provider, usage]) => ({
-        provider,
-        input: usage.input,
-        cacheRead: usage.cacheRead,
-        cacheWrite: usage.cacheWrite,
-        ...usage.cacheWrite5m > 0 || usage.cacheWrite1h > 0 ? { cacheWrite5m: usage.cacheWrite5m, cacheWrite1h: usage.cacheWrite1h } : {},
-        hitRatio: promptCacheHitRatio({ ...usage, output: 0 })
-      })).sort((a, b) => b.cacheRead - a.cacheRead)
-    };
-  }
-  /** Invalidate cached prices so the next account() call fetches fresh data. */
-  invalidateCache() {
-    this.priceCache.clear();
-  }
-  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
-      },
-      ...providerId ? { provider: providerId } : {},
-      ...model ? { model } : {}
-    });
-  }
-  currentSessionId() {
-    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;
-    this.cacheRead = 0;
-    this.cacheWrite = 0;
-    this.cacheWrite5m = 0;
-    this.cacheWrite1h = 0;
-    this.costInput = 0;
-    this.costOutput = 0;
-    this.cacheSaved = 0;
-    this.cacheByProvider.clear();
-    this.lastInput = 0;
-    this.lastCacheRead = 0;
-    this.lastCacheWrite = 0;
-    this.emitAccounted(void 0, void 0, void 0, {
-      input: 0,
-      output: 0,
-      cacheRead: 0,
-      cacheWrite: 0
-    });
-  }
-  recordProviderCache(usage, providerId, derivedCacheWrite) {
-    const key = providerId ?? "unknown";
-    const current = this.cacheByProvider.get(key) ?? { input: 0, cacheRead: 0, cacheWrite: 0, cacheWrite5m: 0, cacheWrite1h: 0 };
-    current.input += usage.input;
-    current.cacheRead += usage.cacheRead ?? 0;
-    current.cacheWrite += derivedCacheWrite;
-    current.cacheWrite5m += usage.cacheWrite5m ?? 0;
-    current.cacheWrite1h += usage.cacheWrite1h ?? 0;
-    this.cacheByProvider.set(key, current);
-  }
-  applyPrice(usage, price) {
-    if (price.input) this.costInput += usage.input / 1e6 * price.input;
-    if (price.output) this.costOutput += usage.output / 1e6 * price.output;
-    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;
-    if (cacheWrite5m && (price.cacheWrite5m ?? price.cacheWrite)) {
-      this.costInput += cacheWrite5m / 1e6 * (price.cacheWrite5m ?? price.cacheWrite ?? 0);
-    }
-    if (cacheWrite1h && (price.cacheWrite1h ?? price.cacheWrite)) {
-      this.costInput += cacheWrite1h / 1e6 * (price.cacheWrite1h ?? price.cacheWrite ?? 0);
-    }
-  }
-};
-function priceFromModel(m) {
-  return {
-    input: m.cost?.input,
-    output: m.cost?.output,
-    cacheRead: m.cost?.cache_read,
-    cacheWrite: m.cost?.cache_write,
-    cacheWrite5m: m.cost?.cache_write_5m ?? m.cost?.cache_write,
-    cacheWrite1h: m.cost?.cache_write_1h ?? (m.cost?.input !== void 0 ? m.cost.input * 2 : void 0)
-  };
-}
-function round4(n) {
-  return Math.round(n * 1e4) / 1e4;
-}
+import "../chunk-25LSLC3G.js";
+import "../chunk-TBRL2RCC.js";
 
 // src/infrastructure/context-manager.ts
 var CONTEXT_MANAGER_TOOL_NAME = "context_manager";
@@ -554,7 +312,270 @@ function createContextManagerTool(opts = {}) {
   };
 }
 var contextManagerTool = createContextManagerTool();
+
+// src/infrastructure/token-counter.ts
+var PRICE_CACHE_MAX_SIZE = 100;
+var DefaultTokenCounter = class {
+  input = 0;
+  output = 0;
+  cacheRead = 0;
+  cacheWrite = 0;
+  cacheWrite5m = 0;
+  cacheWrite1h = 0;
+  costInput = 0;
+  costOutput = 0;
+  cacheSaved = 0;
+  cacheByProvider = /* @__PURE__ */ new Map();
+  registry;
+  providerId;
+  events;
+  sessionId;
+  /**
+   * Agent this counter belongs to, stamped onto every `token.accounted`.
+   * Undefined for the leader. Subagent counters are constructed with the HOST
+   * session id (so live cost UIs stay on one row), which makes this the only
+   * thing separating a subagent's tokens from the leader's downstream.
+   */
+  agentId;
+  priceCache = /* @__PURE__ */ new Map();
+  /** Most recently accounted request's tokens. Used for per-request context pressure. */
+  lastInput = 0;
+  lastCacheRead = 0;
+  lastCacheWrite = 0;
+  constructor(opts = {}) {
+    this.registry = opts.registry;
+    this.providerId = opts.providerId;
+    this.events = opts.events;
+    this.sessionId = opts.sessionId;
+    this.agentId = opts.agentId;
+  }
+  setSessionId(sessionId) {
+    this.sessionId = sessionId;
+  }
+  account(usage, model, providerId = this.currentProviderId()) {
+    const eventSessionId = this.currentSessionId();
+    this.input += usage.input;
+    this.output += usage.output;
+    this.cacheRead += usage.cacheRead ?? 0;
+    const ttlAggregate = usage.cacheWrite5m !== void 0 || usage.cacheWrite1h !== void 0 ? (usage.cacheWrite5m ?? 0) + (usage.cacheWrite1h ?? 0) : 0;
+    const cacheWriteTotal = usage.cacheWrite ?? ttlAggregate;
+    this.cacheWrite += cacheWriteTotal;
+    this.cacheWrite5m += usage.cacheWrite5m ?? 0;
+    this.cacheWrite1h += usage.cacheWrite1h ?? 0;
+    this.recordProviderCache(usage, providerId, cacheWriteTotal);
+    this.lastInput = usage.input;
+    this.lastCacheRead = usage.cacheRead ?? 0;
+    this.lastCacheWrite = cacheWriteTotal;
+    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, providerId, usage);
+      return;
+    }
+    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(providerId, model).then((m) => {
+        if (m) {
+          const p = priceFromModel(m);
+          this.priceCache.set(priceKey, p);
+          this.applyPrice(usage, p);
+        }
+        this.emitAccounted(eventSessionId, model, providerId, usage);
+      }).catch(() => {
+        this.events?.emit("token.cost_estimate_unavailable", {
+          ...eventSessionId ? { sessionId: eventSessionId } : {},
+          model: model ?? "<unknown>"
+        });
+        this.emitAccounted(eventSessionId, model, providerId, usage);
+        return void 0;
+      });
+      return;
+    }
+    this.emitAccounted(eventSessionId, model, providerId, usage);
+  }
+  /** Synchronous variant for code paths that have already resolved the model. */
+  accountWithModel(usage, resolved) {
+    const eventSessionId = this.currentSessionId();
+    this.input += usage.input;
+    this.output += usage.output;
+    this.cacheRead += usage.cacheRead ?? 0;
+    const ttlAggregate = usage.cacheWrite5m !== void 0 || usage.cacheWrite1h !== void 0 ? (usage.cacheWrite5m ?? 0) + (usage.cacheWrite1h ?? 0) : 0;
+    const cacheWriteTotal = usage.cacheWrite ?? ttlAggregate;
+    this.cacheWrite += cacheWriteTotal;
+    this.cacheWrite5m += usage.cacheWrite5m ?? 0;
+    this.cacheWrite1h += usage.cacheWrite1h ?? 0;
+    this.recordProviderCache(usage, resolved.providerId, cacheWriteTotal);
+    this.lastInput = usage.input;
+    this.lastCacheRead = usage.cacheRead ?? 0;
+    this.lastCacheWrite = cacheWriteTotal;
+    const price = priceFromModel(resolved);
+    if (this.priceCache.size >= PRICE_CACHE_MAX_SIZE) {
+      const keys = [...this.priceCache.keys()];
+      this.priceCache.delete(keys[0] ?? "");
+    }
+    this.priceCache.set(`${resolved.providerId}\0${resolved.modelId}`, price);
+    this.applyPrice(usage, price);
+    this.emitAccounted(eventSessionId, resolved.modelId, resolved.providerId, usage);
+  }
+  total() {
+    return {
+      input: this.input,
+      output: this.output,
+      cacheRead: this.cacheRead,
+      cacheWrite: this.cacheWrite
+    };
+  }
+  currentRequestTokens() {
+    return {
+      input: this.lastInput,
+      cacheRead: this.lastCacheRead,
+      cacheWrite: this.lastCacheWrite
+    };
+  }
+  setCurrentRequestTokens(input, cacheRead, cacheWrite) {
+    this.lastInput = input;
+    this.lastCacheRead = cacheRead ?? 0;
+    this.lastCacheWrite = cacheWrite ?? 0;
+  }
+  estimateCost() {
+    return {
+      input: round4(this.costInput),
+      output: round4(this.costOutput),
+      total: round4(this.costInput + this.costOutput),
+      currency: "USD"
+    };
+  }
+  cacheStats() {
+    const exposeTtlSplit = this.cacheWrite5m > 0 || this.cacheWrite1h > 0;
+    return {
+      readTokens: this.cacheRead,
+      writeTokens: this.cacheWrite,
+      ...exposeTtlSplit ? { cacheWrite5m: this.cacheWrite5m, cacheWrite1h: this.cacheWrite1h } : {},
+      hitRatio: promptCacheHitRatio({
+        input: this.input,
+        output: this.output,
+        cacheRead: this.cacheRead,
+        cacheWrite: this.cacheWrite
+      }),
+      savedUsd: round4(this.cacheSaved),
+      providers: [...this.cacheByProvider.entries()].map(([provider, usage]) => ({
+        provider,
+        input: usage.input,
+        cacheRead: usage.cacheRead,
+        cacheWrite: usage.cacheWrite,
+        ...usage.cacheWrite5m > 0 || usage.cacheWrite1h > 0 ? { cacheWrite5m: usage.cacheWrite5m, cacheWrite1h: usage.cacheWrite1h } : {},
+        hitRatio: promptCacheHitRatio({ ...usage, output: 0 })
+      })).sort((a, b) => b.cacheRead - a.cacheRead)
+    };
+  }
+  /** Invalidate cached prices so the next account() call fetches fresh data. */
+  invalidateCache() {
+    this.priceCache.clear();
+  }
+  emitAccounted(sessionId = this.currentSessionId(), model, providerId = this.currentProviderId(), deltaUsage) {
+    const agentId = this.currentAgentId();
+    this.events?.emit("token.accounted", {
+      ...sessionId ? { sessionId } : {},
+      ...agentId ? { agentId } : {},
+      usage: this.total(),
+      ...deltaUsage ? { deltaUsage: { ...deltaUsage } } : {},
+      cost: {
+        input: this.costInput,
+        output: this.costOutput,
+        total: this.costInput + this.costOutput
+      },
+      ...providerId ? { provider: providerId } : {},
+      ...model ? { model } : {}
+    });
+  }
+  currentSessionId() {
+    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;
+  }
+  currentAgentId() {
+    const value = typeof this.agentId === "function" ? this.agentId() : this.agentId;
+    return typeof value === "string" && value.length > 0 ? value : void 0;
+  }
+  reset() {
+    this.input = 0;
+    this.output = 0;
+    this.cacheRead = 0;
+    this.cacheWrite = 0;
+    this.cacheWrite5m = 0;
+    this.cacheWrite1h = 0;
+    this.costInput = 0;
+    this.costOutput = 0;
+    this.cacheSaved = 0;
+    this.cacheByProvider.clear();
+    this.lastInput = 0;
+    this.lastCacheRead = 0;
+    this.lastCacheWrite = 0;
+    this.emitAccounted(void 0, void 0, void 0, {
+      input: 0,
+      output: 0,
+      cacheRead: 0,
+      cacheWrite: 0
+    });
+  }
+  recordProviderCache(usage, providerId, derivedCacheWrite) {
+    const key = providerId ?? "unknown";
+    const current = this.cacheByProvider.get(key) ?? {
+      input: 0,
+      cacheRead: 0,
+      cacheWrite: 0,
+      cacheWrite5m: 0,
+      cacheWrite1h: 0
+    };
+    current.input += usage.input;
+    current.cacheRead += usage.cacheRead ?? 0;
+    current.cacheWrite += derivedCacheWrite;
+    current.cacheWrite5m += usage.cacheWrite5m ?? 0;
+    current.cacheWrite1h += usage.cacheWrite1h ?? 0;
+    this.cacheByProvider.set(key, current);
+  }
+  applyPrice(usage, price) {
+    if (price.input) this.costInput += usage.input / 1e6 * price.input;
+    if (price.output) this.costOutput += usage.output / 1e6 * price.output;
+    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;
+    if (cacheWrite5m && (price.cacheWrite5m ?? price.cacheWrite)) {
+      this.costInput += cacheWrite5m / 1e6 * (price.cacheWrite5m ?? price.cacheWrite ?? 0);
+    }
+    if (cacheWrite1h && (price.cacheWrite1h ?? price.cacheWrite)) {
+      this.costInput += cacheWrite1h / 1e6 * (price.cacheWrite1h ?? price.cacheWrite ?? 0);
+    }
+  }
+};
+function priceFromModel(m) {
+  return {
+    input: m.cost?.input,
+    output: m.cost?.output,
+    cacheRead: m.cost?.cache_read,
+    cacheWrite: m.cost?.cache_write,
+    cacheWrite5m: m.cost?.cache_write_5m ?? m.cost?.cache_write,
+    cacheWrite1h: m.cost?.cache_write_1h ?? (m.cost?.input !== void 0 ? m.cost.input * 2 : void 0)
+  };
+}
+function round4(n) {
+  return Math.round(n * 1e4) / 1e4;
+}
 export {
+  CONTEXT_MANAGER_TOOL_NAME,
   DefaultLogger,
   DefaultPathResolver,
   DefaultTokenCounter,

package/dist/infrastructure/token-counter.d.ts

@@ -22,6 +22,13 @@ export declare class DefaultTokenCounter implements TokenCounter {
     private readonly providerId?;
     private readonly events?;
     private sessionId?;
+    /**
+     * Agent this counter belongs to, stamped onto every `token.accounted`.
+     * Undefined for the leader. Subagent counters are constructed with the HOST
+     * session id (so live cost UIs stay on one row), which makes this the only
+     * thing separating a subagent's tokens from the leader's downstream.
+     */
+    private readonly agentId?;
     private priceCache;
     /** Most recently accounted request's tokens. Used for per-request context pressure. */
     private lastInput;
@@ -32,6 +39,7 @@ export declare class DefaultTokenCounter implements TokenCounter {
         providerId?: string | (() => string | undefined) | undefined;
         events?: EventBus | undefined;
         sessionId?: string | (() => string | undefined) | undefined;
+        agentId?: string | (() => string | undefined) | undefined;
     });
     setSessionId(sessionId: string | (() => string | undefined) | undefined): void;
     account(usage: Usage, model?: string, providerId?: string | undefined): void;
@@ -56,6 +64,7 @@ export declare class DefaultTokenCounter implements TokenCounter {
     private emitAccounted;
     private currentSessionId;
     private currentProviderId;
+    private currentAgentId;
     reset(): void;
     private recordProviderCache;
     private applyPrice;