@wrongstack/core 0.267.0 → 0.269.0

package/dist/types/index.js

@@ -29,6 +29,16 @@ function asText(content) {
   if (typeof content === "string") return content;
   return content.filter((b) => b.type === "text").map((b) => b.text).join("");
 }
+
+// src/types/tool.ts
+var ToolErrorCategory = /* @__PURE__ */ ((ToolErrorCategory2) => {
+  ToolErrorCategory2["TRANSIENT"] = "transient";
+  ToolErrorCategory2["NOT_FOUND"] = "not_found";
+  ToolErrorCategory2["PERMISSION"] = "permission";
+  ToolErrorCategory2["VALIDATION"] = "validation";
+  ToolErrorCategory2["FATAL"] = "fatal";
+  return ToolErrorCategory2;
+})(ToolErrorCategory || {});
 async function atomicWrite(targetPath, content, opts = {}) {
   const dir = path6.dirname(targetPath);
   await fs.mkdir(dir, { recursive: true });
@@ -504,7 +514,7 @@ function hasToolResult(msg) {
 }
 function toolUseIds(msg) {
   const ids = /* @__PURE__ */ new Set();
-  if (!msg || msg.role !== "assistant") return ids;
+  if (msg?.role !== "assistant") return ids;
   for (const block of contentBlocks(msg)) {
     if (block.type === "tool_use") ids.add(block.id);
   }
@@ -512,7 +522,7 @@ function toolUseIds(msg) {
 }
 function toolResultIds(msg) {
   const ids = /* @__PURE__ */ new Set();
-  if (!msg || msg.role !== "user") return ids;
+  if (msg?.role !== "user") return ids;
   for (const block of contentBlocks(msg)) {
     if (block.type === "tool_result") ids.add(block.tool_use_id);
   }
@@ -575,6 +585,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;
@@ -658,7 +703,7 @@ function calState(key) {
   return state;
 }
 var ESTIMATE_CACHE = /* @__PURE__ */ new Map();
-var ESTIMATE_CACHE_MAX_SIZE = 1e4;
+var ESTIMATE_CACHE_MAX_SIZE = 5e4;
 function getCachedEstimate(key, compute) {
   const existing = ESTIMATE_CACHE.get(key);
   if (existing !== void 0) return existing;
@@ -776,6 +821,7 @@ var GREP_MATCHES_PER_FILE = 3;
 var DIFF_INLINE_LINE_LIMIT = 260;
 var DIFF_HUNK_LIMIT = 8;
 var DIFF_HUNK_CONTEXT = 14;
+var GREP_LINE_RE = /^(.+?):(\d+):(.*)$/;
 function createToolOutputSerializer(opts = {}) {
   const capBytes = opts.perIterationOutputCapBytes ?? 1e5;
   function serialize(value, context = {}) {
@@ -1161,7 +1207,7 @@ ${renderStringList(passthrough, "", 50)}`);
   return sections.join("\n");
 }
 function parseGrepContentLine(line) {
-  const match = /^(.+?):(\d+):(.*)$/.exec(line);
+  const match = GREP_LINE_RE.exec(line);
   if (!match?.[1] || !match[2]) return void 0;
   return { file: match[1], line: match[2], text: match[3] ?? "" };
 }
@@ -1179,22 +1225,20 @@ function compactDiff(diff) {
   const hunks = lines.filter((line) => line.startsWith("@@")).length;
   const added = lines.filter((line) => line.startsWith("+") && !line.startsWith("+++")).length;
   const removed = lines.filter((line) => line.startsWith("-") && !line.startsWith("---")).length;
-  const selected = /* @__PURE__ */ new Set();
+  const intervals = [];
   let hunkCount = 0;
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i] ?? "";
     if (line.startsWith("diff --git") || line.startsWith("--- ") || line.startsWith("+++ ")) {
-      selected.add(i);
+      intervals.push([i, i]);
       continue;
     }
     if (!line.startsWith("@@")) continue;
     if (hunkCount >= DIFF_HUNK_LIMIT) continue;
     hunkCount++;
-    for (let j = i; j <= Math.min(lines.length - 1, i + DIFF_HUNK_CONTEXT); j++) {
-      selected.add(j);
-    }
+    intervals.push([i, Math.min(lines.length - 1, i + DIFF_HUNK_CONTEXT)]);
   }
-  if (selected.size === 0) {
+  if (intervals.length === 0) {
     return joinSections([
       renderHeader("diff_summary", {
         files: fileCount,
@@ -1207,17 +1251,29 @@ function compactDiff(diff) {
       `[serializer omitted ${Math.max(0, lines.length - DIFF_INLINE_LINE_LIMIT)} diff line(s)]`
     ]);
   }
+  const merged = [intervals[0]];
+  for (let i = 1; i < intervals.length; i++) {
+    const last = merged[merged.length - 1];
+    const current = intervals[i];
+    if (current[0] <= last[1] + 1) {
+      last[1] = Math.max(last[1], current[1]);
+    } else {
+      merged.push(current);
+    }
+  }
   const excerpt = [];
-  let previous = -1;
-  for (const index of [...selected].sort((a, b) => a - b)) {
-    if (index > previous + 1) {
-      const omitted = previous === -1 ? index : index - previous - 1;
+  let prevLine = -1;
+  for (const [start, end] of merged) {
+    if (start > prevLine + 1) {
+      const omitted = prevLine === -1 ? start : start - prevLine - 1;
       excerpt.push(`[serializer omitted ${omitted} diff line(s)]`);
     }
-    excerpt.push(lines[index] ?? "");
-    previous = index;
+    for (let j = start; j <= end; j++) {
+      excerpt.push(lines[j] ?? "");
+    }
+    prevLine = end;
   }
-  const trailing = lines.length - previous - 1;
+  const trailing = lines.length - prevLine - 1;
   if (trailing > 0) excerpt.push(`[serializer omitted ${trailing} trailing diff line(s)]`);
   return joinSections([
     renderHeader("diff_summary", {
@@ -1751,6 +1807,17 @@ function normalizeTokenSavingTier(val) {
   ]);
   return validTiers.has(val) ? val : "off";
 }
+var DEFAULT_TUI_THINKING_WORD = "thinking";
+var MAX_TUI_THINKING_WORD_LENGTH = 16;
+function normalizeTuiThinkingWord(value) {
+  if (typeof value !== "string") return DEFAULT_TUI_THINKING_WORD;
+  const word = value.trim();
+  if (word.length === 0 || word.length > MAX_TUI_THINKING_WORD_LENGTH) {
+    return DEFAULT_TUI_THINKING_WORD;
+  }
+  if (!/^[\p{L}\p{N}_-]+$/u.test(word)) return DEFAULT_TUI_THINKING_WORD;
+  return word;
+}
 
 // src/types/default-config.ts
 var DEFAULT_TOOLS_CONFIG = Object.freeze({
@@ -2373,11 +2440,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 +2453,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 +2479,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 +2512,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 +2525,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 +2535,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 +2551,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 +3685,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 +4570,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,
@@ -4535,6 +4616,7 @@ ${post.additionalContext}`;
       } catch (err) {
         const msg = toErrorMessage(err);
         const scrubbed = this.opts.secretScrubber.scrub(msg);
+        const { category, retryable, detail } = classifyToolError(err);
         this.opts.renderer?.writeToolResult(tool.name, scrubbed, true);
         const result = {
           type: "tool_result",
@@ -4545,6 +4627,9 @@ ${post.additionalContext}`;
         budget = this.budgetForString(result.content, budget);
         if (err instanceof Error) span?.recordError(err);
         span?.setAttribute("tool.is_error", true);
+        span?.setAttribute("tool.error_category", category);
+        span?.setAttribute("tool.error_retryable", retryable);
+        if (detail) span?.setAttribute("tool.error_detail", detail);
         return { result, tool, durationMs: Date.now() - start };
       } finally {
         span?.end();
@@ -4556,6 +4641,9 @@ ${post.additionalContext}`;
       } catch (err) {
         const msg = toErrorMessage(err);
         const scrubbed = this.opts.secretScrubber.scrub(msg);
+        const { category, retryable, detail } = classifyToolError(err);
+        const tool = this.registry.get(use.name);
+        this.opts.renderer?.writeToolResult(tool?.name ?? use.name, scrubbed, true);
         const result = {
           type: "tool_result",
           tool_use_id: use.id,
@@ -4563,7 +4651,7 @@ ${post.additionalContext}`;
           is_error: true
         };
         budget = this.budgetForString(result.content, budget);
-        return { result, tool: this.registry.get(use.name), durationMs: 0 };
+        return { result, tool, durationMs: 0 };
       }
     };
     if (strategy === "sequential") {
@@ -4768,38 +4856,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;
@@ -4827,6 +4883,58 @@ function extractMalformedRaw(input) {
   }
 }
 var TOOL_OUTPUT_ARTIFACT_THRESHOLD_BYTES = 64 * 1024;
+function classifyToolError(err) {
+  if (err instanceof Error && err.name === "AbortError") {
+    return { category: "fatal" /* FATAL */, retryable: false, detail: "aborted" };
+  }
+  if (err instanceof Error && "code" in err) {
+    const code = err.code;
+    switch (code) {
+      case "ETIMEDOUT":
+      case "ECONNRESET":
+      case "ECONNREFUSED":
+      case "ENETUNREACH":
+      case "EHOSTUNREACH":
+        return { category: "transient" /* TRANSIENT */, retryable: true, detail: code };
+      case "ENOENT":
+      case "ENOTDIR":
+        return { category: "not_found" /* NOT_FOUND */, retryable: false, detail: code };
+      case "EACCES":
+      case "EPERM":
+        return { category: "permission" /* PERMISSION */, retryable: false, detail: code };
+      case "EBUSY":
+      case "EMFILE":
+      case "ENFILE":
+        return { category: "transient" /* TRANSIENT */, retryable: true, detail: code };
+    }
+  }
+  if (err instanceof Error && "response" in err) {
+    const response = err.response;
+    const status = response?.status;
+    if (status !== void 0) {
+      if (status === 429 || status === 503 || status === 502 || status === 504) {
+        return { category: "transient" /* TRANSIENT */, retryable: true, detail: `HTTP ${status}` };
+      }
+      if (status === 404 || status === 410) {
+        return { category: "not_found" /* NOT_FOUND */, retryable: false, detail: `HTTP ${status}` };
+      }
+      if (status === 401 || status === 403) {
+        return { category: "permission" /* PERMISSION */, retryable: false, detail: `HTTP ${status}` };
+      }
+      if (status === 400) {
+        return { category: "validation" /* VALIDATION */, retryable: false, detail: `HTTP ${status}` };
+      }
+    }
+  }
+  if (err instanceof Error && err.message.includes("validation")) {
+    return { category: "validation" /* VALIDATION */, retryable: false, detail: "validation" };
+  }
+  return {
+    category: "fatal" /* FATAL */,
+    retryable: false,
+    detail: err instanceof Error ? err.message.slice(0, 100) : String(err).slice(0, 100)
+  };
+}
 async function maybePersistLargeToolOutput(toolName, content, budget) {
   const bytes = Buffer.byteLength(content, "utf8");
   if (bytes <= Math.min(TOOL_OUTPUT_ARTIFACT_THRESHOLD_BYTES, Math.max(0, budget))) {
@@ -5409,6 +5517,6 @@ function renderPlainText(meta, events) {
   return lines.join("\n");
 }
 
-export { AgentError, CONTEXT_WINDOW_MODES, ConfigError, Context, DEFAULT_AUTONOMY_CONFIG, DEFAULT_CIRCUIT_BREAKER_CONFIG, DEFAULT_CONTEXT_CONFIG, DEFAULT_CONTEXT_WINDOW_MODE_ID, DEFAULT_MODES, DEFAULT_RECOVERY_STRATEGIES, DEFAULT_SESSION_LOGGING_CONFIG, DEFAULT_SESSION_PRUNE_DAYS, DEFAULT_SPEC_TEMPLATE, DEFAULT_TOOLS_CONFIG, DefaultErrorHandler, DefaultLogger, DefaultModelsRegistry, DefaultPathResolver, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultTokenCounter, ERROR_CODES, FsError, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, MEMORY_TYPE_LABELS, PluginError, ProviderError, SddError, SessionError, StreamHangError, ToolError, ToolExecutor, WrongStackError, asBlocks, asText, buildRecoveryStrategies, classifyFamily, computeTaskProgress, createMessage, decryptConfigSecrets, encryptConfigSecrets, findCriticalPath, formatContextWindowModeList, getContextWindowMode, isAgentError, isConfigError, isContextWindowModeId, isFsError, isImageBlock, isPluginError, isSddError, isSecretField, isSessionError, isTextBlock, isThinkingBlock, isToolError, isToolResultBlock, isToolUseBlock, isWrongStackError, listContextWindowModes, migratePlaintextSecrets, noOpLogger, normalizeTokenSavingTier, resolveContextWindowPolicy, rewriteConfigEncrypted, rotateConfigKeys, toWrongStackError, topologicalSort };
+export { AgentError, CONTEXT_WINDOW_MODES, ConfigError, Context, DEFAULT_AUTONOMY_CONFIG, DEFAULT_CIRCUIT_BREAKER_CONFIG, DEFAULT_CONTEXT_CONFIG, DEFAULT_CONTEXT_WINDOW_MODE_ID, DEFAULT_MODES, DEFAULT_RECOVERY_STRATEGIES, DEFAULT_SESSION_LOGGING_CONFIG, DEFAULT_SESSION_PRUNE_DAYS, DEFAULT_SPEC_TEMPLATE, DEFAULT_TOOLS_CONFIG, DEFAULT_TUI_THINKING_WORD, DefaultErrorHandler, DefaultLogger, DefaultModelsRegistry, DefaultPathResolver, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultTokenCounter, ERROR_CODES, FsError, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, MAX_TUI_THINKING_WORD_LENGTH, MEMORY_TYPE_LABELS, PluginError, ProviderError, SddError, SessionError, StreamHangError, ToolError, ToolErrorCategory, ToolExecutor, WrongStackError, asBlocks, asText, buildRecoveryStrategies, classifyFamily, computeTaskProgress, createMessage, decryptConfigSecrets, encryptConfigSecrets, findCriticalPath, formatContextWindowModeList, getContextWindowMode, isAgentError, isConfigError, isContextWindowModeId, isFsError, isImageBlock, isPluginError, isSddError, isSecretField, isSessionError, isTextBlock, isThinkingBlock, isToolError, isToolResultBlock, isToolUseBlock, isWrongStackError, listContextWindowModes, migratePlaintextSecrets, noOpLogger, normalizeTokenSavingTier, normalizeTuiThinkingWord, resolveContextWindowPolicy, rewriteConfigEncrypted, rotateConfigKeys, toWrongStackError, topologicalSort };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map