@wrongstack/core 0.268.0 → 0.269.0

package/dist/utils/index.d.ts

@@ -1,8 +1,8 @@
-import { C as Context, z as ContextEvidenceState, k as ToolOutputMetadata, J as JSONSchema, M as Message, w as TodoItem } from '../context-C0U8B9NF.js';
+import { C as Context, z as ContextEvidenceState, k as ToolOutputMetadata, J as JSONSchema, M as Message, w as TodoItem } from '../context-Dp87Bcaq.js';
 export { H as HttpDispatcher, a as HttpsAgentAsDispatcher } from '../dispatcher-types.d-BBeXBQgS.js';
 export { toErrorMessage } from './error.js';
 export { expectDefined } from './expect-defined.js';
-import { v as CustomModelDefinition, a as ModelsDevPayload } from '../config-VKfOZ-6X.js';
+import { v as CustomModelDefinition, a as ModelsDevPayload } from '../config-C_ae2k86.js';
 export { T as TaskItem, c as computeTaskItemProgress, f as formatTaskList, a as formatTaskProgress } from '../task-format-vGOIftmK.js';
 export { a as WstackPathOptions, W as WstackPaths, p as projectHash, b as projectSlug, r as resolveWstackPaths, w as wstackGlobalRoot } from '../wstack-paths-hOpNLmvf.js';
 export { a as TaskPriority, b as TaskStatus, T as TaskType } from '../task-graph-u1q9Jkyk.js';

package/dist/utils/index.js

@@ -256,7 +256,7 @@ function onResize(cb, stream = process.stdout) {
   };
 }
 function setRawMode(input, mode) {
-  if (!input || input.isTTY !== true) return false;
+  if (input?.isTTY !== true) return false;
   if (typeof input.setRawMode !== "function") return false;
   input.setRawMode(mode);
   return true;
@@ -316,11 +316,7 @@ var color = {
   bgGreen: wrap("42", "49")
 };
 function stripAnsi(s) {
-  return s.replace(
-    // biome-ignore lint/suspicious/noControlCharactersInRegex: ANSI escape regex
-    /\x1b\[[0-9;]*[A-Za-z]/g,
-    ""
-  );
+  return s.replace(/\x1b\[[0-9;]*[A-Za-z]/g, "");
 }
 async function readJsonObjectFile(filePath) {
   try {
@@ -1217,7 +1213,7 @@ function expandIPv6(addr) {
   };
   if (parts.length === 1) {
     const groups = parseGroups(parts[0] ?? "");
-    if (!groups || groups.length !== 8) return null;
+    if (groups?.length !== 8) return null;
     return groups;
   }
   const head = parseGroups(parts[0] ?? "");
@@ -1586,7 +1582,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);
   }
@@ -1594,7 +1590,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);
   }
@@ -2040,8 +2036,19 @@ function calState(key) {
   return state;
 }
 var MIN_SAMPLES_FOR_CALIBRATION = 3;
+var MODEL_FAMILY_RATIO = {
+  // Anthropic: ~3.8-4.0 chars/token depending on model
+  claude: 3.8,
+  // OpenAI: ~4.0 chars/token
+  "gpt-4": 4,
+  "gpt-3.5": 4,
+  // Google: ~3.5 chars/token
+  gemini: 3.5,
+  // DeepSeek: ~3.5 chars/token
+  deepseek: 3.5
+};
 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;
@@ -2183,8 +2190,24 @@ function estimateRequestTokensCalibrated(messages, systemPrompt, tools, calibrat
       total: Math.round(result.total * safeRatio)
     };
   }
+  const fallbackRatio = getModelFamilyRatio(calibrationKey);
+  if (fallbackRatio !== null) {
+    return {
+      messages: Math.round(result.messages * fallbackRatio),
+      systemPrompt: Math.round(result.systemPrompt * fallbackRatio),
+      tools: Math.round(result.tools * fallbackRatio),
+      total: Math.round(result.total * fallbackRatio)
+    };
+  }
   return result;
 }
+function getModelFamilyRatio(calibrationKey) {
+  const lower = calibrationKey.toLowerCase();
+  for (const [family, ratio] of Object.entries(MODEL_FAMILY_RATIO)) {
+    if (lower.includes(family)) return ratio / 3.5;
+  }
+  return null;
+}
 function resetCalibration(calibrationKey) {
   if (calibrationKey === void 0) {
     _cals.clear();
@@ -2202,6 +2225,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 = {}) {
@@ -2587,7 +2611,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] ?? "" };
 }
@@ -2605,22 +2629,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,
@@ -2633,17 +2655,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", {