@wrongstack/core 0.268.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);
   }
@@ -693,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;
@@ -811,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 = {}) {
@@ -1196,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] ?? "" };
 }
@@ -1214,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,
@@ -1242,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", {
@@ -1786,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({
@@ -4584,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",
@@ -4594,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();
@@ -4605,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,
@@ -4612,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") {
@@ -4844,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))) {
@@ -5426,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