@wrongstack/core 0.267.0 → 0.268.0

package/dist/types/index.js

@@ -575,6 +575,41 @@ function truncate(s, max) {
   return s.length <= max ? s : `${s.slice(0, max - 1)}\u2026`;
 }
 
+// src/utils/tool-subject.ts
+var GLOB_METACHARACTERS = /[*?[\]]/g;
+function escapeGlobSubject(value) {
+  return value.replace(GLOB_METACHARACTERS, (char) => `\\${char}`);
+}
+function normalizePathSubject(value) {
+  return escapeGlobSubject(value.replace(/\\/g, "/"));
+}
+function isPathSubjectKey(subjectKey) {
+  return subjectKey === "path" || subjectKey === "file" || subjectKey === "files";
+}
+function subjectForToolInput(toolName, input, subjectKey) {
+  if (!input || typeof input !== "object") return void 0;
+  const obj = input;
+  if (subjectKey) {
+    const value = obj[subjectKey];
+    if (typeof value === "string") {
+      return isPathSubjectKey(subjectKey) ? normalizePathSubject(value) : escapeGlobSubject(value);
+    }
+  }
+  if (toolName === "bash" && typeof obj.command === "string") {
+    return escapeGlobSubject(obj.command);
+  }
+  if (typeof obj.path === "string") {
+    return normalizePathSubject(obj.path);
+  }
+  if (typeof obj.url === "string") {
+    return escapeGlobSubject(obj.url);
+  }
+  if (typeof obj.name === "string") {
+    return escapeGlobSubject(obj.name);
+  }
+  return void 0;
+}
+
 // src/utils/tool-wire-compact.ts
 var TOOL_DESCRIPTION_MAX_CHARS = 640;
 var SCHEMA_DESCRIPTION_MAX_CHARS = 180;
@@ -2373,11 +2408,10 @@ var DefaultTokenCounter = class {
     const price = model ? this.priceCache.get(model) : void 0;
     if (price) {
       this.applyPrice(usage, price);
-      this.events?.emit("token.accounted", {
-        usage: this.total(),
-        cost: { input: this.costInput, output: this.costOutput, total: this.costInput + this.costOutput }
-      });
-    } else if (this.registry && this.providerId && model) {
+      this.emitAccounted();
+      return;
+    }
+    if (this.registry && this.providerId && model) {
       if (this.priceCache.size >= PRICE_CACHE_MAX_SIZE) {
         const keys = [...this.priceCache.keys()];
         this.priceCache.delete(keys[0] ?? "");
@@ -2387,16 +2421,16 @@ var DefaultTokenCounter = class {
           const p = priceFromModel(m);
           this.priceCache.set(model, p);
           this.applyPrice(usage, p);
-          this.events?.emit("token.accounted", {
-            usage: this.total(),
-            cost: { input: this.costInput, output: this.costOutput, total: this.costInput + this.costOutput }
-          });
         }
+        this.emitAccounted();
       }).catch(() => {
         this.events?.emit("token.cost_estimate_unavailable", { model: model ?? "<unknown>" });
+        this.emitAccounted();
         return void 0;
       });
+      return;
     }
+    this.emitAccounted();
   }
   /** Synchronous variant for code paths that have already resolved the model. */
   accountWithModel(usage, resolved) {
@@ -2413,10 +2447,7 @@ var DefaultTokenCounter = class {
     }
     this.priceCache.set(resolved.modelId, price);
     this.applyPrice(usage, price);
-    this.events?.emit("token.accounted", {
-      usage: this.total(),
-      cost: { input: this.costInput, output: this.costOutput, total: this.costInput + this.costOutput }
-    });
+    this.emitAccounted();
   }
   total() {
     return {
@@ -2449,6 +2480,12 @@ var DefaultTokenCounter = class {
   invalidateCache() {
     this.priceCache.clear();
   }
+  emitAccounted() {
+    this.events?.emit("token.accounted", {
+      usage: this.total(),
+      cost: { input: this.costInput, output: this.costOutput, total: this.costInput + this.costOutput }
+    });
+  }
   reset() {
     this.input = 0;
     this.output = 0;
@@ -2456,6 +2493,9 @@ var DefaultTokenCounter = class {
     this.cacheWrite = 0;
     this.costInput = 0;
     this.costOutput = 0;
+    this.lastInput = 0;
+    this.lastCacheRead = 0;
+    this.emitAccounted();
   }
   applyPrice(usage, price) {
     if (price.input) this.costInput += usage.input / 1e6 * price.input;
@@ -2463,8 +2503,14 @@ var DefaultTokenCounter = class {
     if (usage.cacheRead && price.cacheRead) {
       this.costInput += usage.cacheRead / 1e6 * price.cacheRead;
     }
-    if (usage.cacheWrite && price.cacheWrite) {
-      this.costInput += usage.cacheWrite / 1e6 * price.cacheWrite;
+    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);
     }
   }
 };
@@ -2473,7 +2519,9 @@ function priceFromModel(m) {
     input: m.cost?.input,
     output: m.cost?.output,
     cacheRead: m.cost?.cache_read,
-    cacheWrite: m.cost?.cache_write
+    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) {
@@ -3605,10 +3653,11 @@ var DefaultModelsRegistry = class {
       capabilities: {
         tools: model.tool_call ?? false,
         vision: Boolean(model.modalities?.input?.includes("image")),
-        reasoning: model.reasoning ?? false,
+        reasoning: model.reasoning ?? model.reasoningConfig !== void 0,
         maxContext: model.limit?.context ?? 0,
         maxOutput: model.limit?.output,
-        knowledge: model.knowledge
+        knowledge: model.knowledge,
+        reasoningConfig: model.reasoningConfig
       },
       cost: model.cost
     };
@@ -4489,7 +4538,7 @@ ${errorDetails}`,
             return { result, tool, durationMs: Date.now() - start };
           }
         } else {
-          const suggestedPattern = this.subjectFor(tool.name, use.input, tool.subjectKey) ?? tool.name;
+          const suggestedPattern = subjectForToolInput(tool.name, use.input, tool.subjectKey) ?? tool.name;
           const pending = {
             type: "tool_confirm_pending",
             toolUseId: use.id,
@@ -4768,38 +4817,6 @@ ${excerpt}`;
   budgetForString(content, budget) {
     return Math.max(0, budget - Buffer.byteLength(content, "utf8"));
   }
-  /**
-   * Compute the suggestedPattern string for a tool+input pair.
-   * Matches the logic in DefaultPermissionPolicy so the TUI shows the
-   * same subject that the trust file would use.
-   */
-  subjectFor(toolName, input, subjectKey) {
-    if (!input || typeof input !== "object") return void 0;
-    const obj = input;
-    const globChars = /[*?[\]]/g;
-    const escapeGlob = (s) => s.replace(globChars, (c) => `\\${c}`);
-    const normalizePath = (s) => escapeGlob(s.replace(/\\/g, "/"));
-    if (subjectKey) {
-      const v = obj[subjectKey];
-      if (typeof v === "string") {
-        const isPathKey = subjectKey === "path" || subjectKey === "file" || subjectKey === "files";
-        return isPathKey ? normalizePath(v) : escapeGlob(v);
-      }
-    }
-    if (toolName === "bash" && typeof obj.command === "string") {
-      return escapeGlob(obj.command);
-    }
-    if (typeof obj.path === "string") {
-      return normalizePath(obj.path);
-    }
-    if (typeof obj.url === "string") {
-      return escapeGlob(obj.url);
-    }
-    if (typeof obj.name === "string") {
-      return escapeGlob(obj.name);
-    }
-    return void 0;
-  }
 };
 function clampTimeoutMs(timeoutMs, maxTimeoutMs) {
   const fallback = 3e5;