@wrongstack/core 0.267.0 → 0.269.0

package/dist/utils/index.d.ts

@@ -1,8 +1,8 @@
-import { C as Context, w as ContextEvidenceState, k as ToolOutputMetadata, J as JSONSchema, M as Message, t as TodoItem } from '../context-dT5Ueund.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-Du3pYYln.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';
@@ -87,6 +87,20 @@ declare const color: {
 };
 declare function stripAnsi(s: string): string;
 
+type JsonObject = Record<string, unknown>;
+type JsonPathSegment = string | number;
+type JsonPath = readonly JsonPathSegment[];
+declare function readJsonObjectFile(filePath: string): Promise<JsonObject>;
+declare function jsonObjectFileExists(filePath: string): Promise<boolean>;
+declare function writeJsonObjectFile(filePath: string, value: JsonObject): Promise<void>;
+declare function updateJsonObjectFile(filePath: string, mutator: (config: JsonObject) => void | JsonObject | Promise<void | JsonObject>): Promise<JsonObject>;
+declare function getJsonPath(root: unknown, path: JsonPath): unknown;
+declare function setJsonPath(root: JsonObject, path: JsonPath, value: unknown): JsonObject;
+declare function removeJsonPath(root: JsonObject, path: JsonPath): boolean;
+declare function setJsonPathInFile(filePath: string, path: JsonPath, value: unknown): Promise<JsonObject>;
+declare function removeJsonPathInFile(filePath: string, path: JsonPath): Promise<JsonObject>;
+declare function isJsonObject(value: unknown): value is JsonObject;
+
 declare function createContextEvidenceState(): ContextEvidenceState;
 interface RecordToolOutputEvidenceInput {
     toolUseId: string;
@@ -529,6 +543,11 @@ declare function writeErr(s: string, stream?: NodeJS.WriteStream): boolean;
  */
 declare function formatTodosList(todos: TodoItem[]): string;
 
+declare function escapeGlobSubject(value: string): string;
+declare function normalizePathSubject(value: string): string;
+declare function isPathSubjectKey(subjectKey: string): boolean;
+declare function subjectForToolInput(toolName: string, input: unknown, subjectKey?: string): string | undefined;
+
 /**
  * Estimate tokens for a tool_use block input.
  * Caches the stringified result keyed by the stable string representation
@@ -688,4 +707,4 @@ interface CompactWireToolDefinition {
 declare function compactToolDefinitionForWire(tool: ToolWireDefinitionLike, opts?: CompactToolDefinitionForWireOptions): CompactWireToolDefinition;
 declare function compactSchemaDescriptions(schema: unknown, maxDescriptionChars?: number): Record<string, unknown>;
 
-export { type AtomicWriteOptions, type BuildChildEnvOptions, type CompactToolDefinitionForWireOptions, type CompactWireToolDefinition, type CompileFail, type CompileResult, type DeepMergeOptions, FORBIDDEN_PROTO_KEYS, type FileLockOptions, type MessageRepairReport, type MessageRepairResult, type NewlineStyle, type OutputLineGuard, type RecordToolOutputEvidenceInput, type RequestTokenBreakdown, type SafeParseResult, type ToolOutputSerializerOptions, type ToolWireDefinitionLike, type UnifiedDiffOptions, type ValidationError, type ValidationResult, assertNever, assertNotPrivateHost, atomicWrite, buildChildEnv, buildContextEvidenceDigest, color, compactSchemaDescriptions, compactToolDefinitionForWire, compileGlob, compileUserRegex, completePartialObject, computeMessageTokens, createContextEvidenceState, createToolOutputSerializer, deepMerge, detectNewlineStyle, ensureDir, estimateMessageTokens, estimateRequestTokens, estimateRequestTokensCalibrated, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, expandGlob, expandIPv6, formatTodosList, getCalibrationState, getTermSize, isInteractive, isPrimitiveArray, isPrivateIPv4, isPrivateIPv6, isStdinTTY, isStdoutTTY, markAssistantReferencedEvidence, matchAny, matchGlob, mergeCustomModelDefs, mergeModelsPayload, normalizeToLf, onResize, recordActualUsage, recordToolOutputEvidence, recordUserIntentEvidence, repairToolUseAdjacency, repeatedReadPressure, resetCalibration, safeParse, safeStringify, sanitizeJsonString, setOutputLineGuard, setRawMode, sleep, stripAnsi, toStyle, truncate, unifiedDiff, validateAgainstSchema, withFileLock, writeErr, writeOut };
+export { type AtomicWriteOptions, type BuildChildEnvOptions, type CompactToolDefinitionForWireOptions, type CompactWireToolDefinition, type CompileFail, type CompileResult, type DeepMergeOptions, FORBIDDEN_PROTO_KEYS, type FileLockOptions, type JsonObject, type JsonPath, type JsonPathSegment, type MessageRepairReport, type MessageRepairResult, type NewlineStyle, type OutputLineGuard, type RecordToolOutputEvidenceInput, type RequestTokenBreakdown, type SafeParseResult, type ToolOutputSerializerOptions, type ToolWireDefinitionLike, type UnifiedDiffOptions, type ValidationError, type ValidationResult, assertNever, assertNotPrivateHost, atomicWrite, buildChildEnv, buildContextEvidenceDigest, color, compactSchemaDescriptions, compactToolDefinitionForWire, compileGlob, compileUserRegex, completePartialObject, computeMessageTokens, createContextEvidenceState, createToolOutputSerializer, deepMerge, detectNewlineStyle, ensureDir, escapeGlobSubject, estimateMessageTokens, estimateRequestTokens, estimateRequestTokensCalibrated, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, expandGlob, expandIPv6, formatTodosList, getCalibrationState, getJsonPath, getTermSize, isInteractive, isJsonObject, isPathSubjectKey, isPrimitiveArray, isPrivateIPv4, isPrivateIPv6, isStdinTTY, isStdoutTTY, jsonObjectFileExists, markAssistantReferencedEvidence, matchAny, matchGlob, mergeCustomModelDefs, mergeModelsPayload, normalizePathSubject, normalizeToLf, onResize, readJsonObjectFile, recordActualUsage, recordToolOutputEvidence, recordUserIntentEvidence, removeJsonPath, removeJsonPathInFile, repairToolUseAdjacency, repeatedReadPressure, resetCalibration, safeParse, safeStringify, sanitizeJsonString, setJsonPath, setJsonPathInFile, setOutputLineGuard, setRawMode, sleep, stripAnsi, subjectForToolInput, toStyle, truncate, unifiedDiff, updateJsonObjectFile, validateAgainstSchema, withFileLock, writeErr, writeJsonObjectFile, writeOut };

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,110 @@ 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 {
+    const parsed = JSON.parse(await fs.readFile(filePath, "utf8"));
+    return isJsonObject(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+async function jsonObjectFileExists(filePath) {
+  try {
+    await fs.access(filePath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function writeJsonObjectFile(filePath, value) {
+  await atomicWrite(filePath, JSON.stringify(value, null, 2), { mode: 384 });
+}
+async function updateJsonObjectFile(filePath, mutator) {
+  const config = await readJsonObjectFile(filePath);
+  const maybeNext = await mutator(config);
+  const next = maybeNext && isJsonObject(maybeNext) ? maybeNext : config;
+  await writeJsonObjectFile(filePath, next);
+  return next;
+}
+function getJsonPath(root, path4) {
+  let current = root;
+  for (const segment of path4) {
+    if (typeof segment === "number") {
+      if (!Array.isArray(current)) return void 0;
+      current = current[segment];
+      continue;
+    }
+    if (!isJsonObject(current)) return void 0;
+    current = current[segment];
+  }
+  return current;
+}
+function setJsonPath(root, path4, value) {
+  if (path4.length === 0) {
+    if (!isJsonObject(value)) throw new Error("Root config value must be an object");
+    return value;
+  }
+  const parent = ensureJsonParent(root, path4);
+  const leaf = lastPathSegment(path4);
+  if (typeof leaf === "number") {
+    if (!Array.isArray(parent)) throw new Error(`Cannot set numeric segment ${leaf} on non-array parent`);
+    parent[leaf] = value;
+  } else {
+    if (!isJsonObject(parent)) throw new Error(`Cannot set property ${leaf} on non-object parent`);
+    parent[leaf] = value;
+  }
+  return root;
+}
+function removeJsonPath(root, path4) {
+  if (path4.length === 0) return false;
+  const parent = getJsonPath(root, path4.slice(0, -1));
+  const leaf = lastPathSegment(path4);
+  if (typeof leaf === "number") {
+    if (!Array.isArray(parent) || leaf < 0 || leaf >= parent.length) return false;
+    parent.splice(leaf, 1);
+    return true;
+  }
+  if (!isJsonObject(parent) || !(leaf in parent)) return false;
+  delete parent[leaf];
+  return true;
+}
+async function setJsonPathInFile(filePath, path4, value) {
+  return updateJsonObjectFile(filePath, (config) => setJsonPath(config, path4, value));
+}
+async function removeJsonPathInFile(filePath, path4) {
+  return updateJsonObjectFile(filePath, (config) => {
+    removeJsonPath(config, path4);
+  });
+}
+function isJsonObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function lastPathSegment(path4) {
+  const segment = path4[path4.length - 1];
+  if (segment === void 0) throw new Error("Invalid empty JSON path");
+  return segment;
+}
+function ensureJsonParent(root, path4) {
+  let current = root;
+  for (let i = 0; i < path4.length - 1; i += 1) {
+    const segment = path4[i];
+    const nextSegment = path4[i + 1];
+    if (segment === void 0) throw new Error("Invalid empty JSON path segment");
+    const nextContainer = typeof nextSegment === "number" ? [] : {};
+    if (typeof segment === "number") {
+      if (!Array.isArray(current)) throw new Error(`Cannot traverse numeric segment ${segment} on non-array parent`);
+      if (!isJsonObject(current[segment]) && !Array.isArray(current[segment])) current[segment] = nextContainer;
+      current = current[segment];
+    } else {
+      if (!isJsonObject(current)) throw new Error(`Cannot traverse property ${segment} on non-object parent`);
+      if (!isJsonObject(current[segment]) && !Array.isArray(current[segment])) current[segment] = nextContainer;
+      current = current[segment];
+    }
+  }
+  return current;
 }
 var MAX_TOOL_CALLS = 80;
 var MAX_FACTS = 40;
@@ -1114,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] ?? "");
@@ -1483,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);
   }
@@ -1491,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);
   }
@@ -1818,6 +1917,41 @@ function formatTodosList(todos) {
   return lines.join("\n");
 }
 
+// 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;
@@ -1902,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;
@@ -2045,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();
@@ -2064,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 = {}) {
@@ -2449,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] ?? "" };
 }
@@ -2467,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,
@@ -2495,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", {
@@ -2753,6 +2925,6 @@ function resolveWstackPaths(opts) {
   };
 }
 
-export { FORBIDDEN_PROTO_KEYS, assertNever, assertNotPrivateHost, atomicWrite, buildChildEnv, buildContextEvidenceDigest, color, compactSchemaDescriptions, compactToolDefinitionForWire, compileGlob, compileUserRegex, completePartialObject, computeMessageTokens, computeTaskItemProgress, createContextEvidenceState, createToolOutputSerializer, deepMerge, detectNewlineStyle, ensureDir, estimateMessageTokens, estimateRequestTokens, estimateRequestTokensCalibrated, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, expandGlob, expandIPv6, expectDefined, formatTaskList, formatTaskProgress, formatTodosList, getCalibrationState, getTermSize, isInteractive, isPrimitiveArray, isPrivateIPv4, isPrivateIPv6, isStdinTTY, isStdoutTTY, markAssistantReferencedEvidence, matchAny, matchGlob, mergeCustomModelDefs, mergeModelsPayload, normalizeToLf, onResize, projectHash, projectSlug, recordActualUsage, recordToolOutputEvidence, recordUserIntentEvidence, repairToolUseAdjacency, repeatedReadPressure, resetCalibration, resolveWstackPaths, safeParse, safeStringify, sanitizeJsonString, setOutputLineGuard, setRawMode, sleep, stripAnsi, toErrorMessage, toStyle, truncate, unifiedDiff, validateAgainstSchema, withFileLock, writeErr, writeOut, wstackGlobalRoot };
+export { FORBIDDEN_PROTO_KEYS, assertNever, assertNotPrivateHost, atomicWrite, buildChildEnv, buildContextEvidenceDigest, color, compactSchemaDescriptions, compactToolDefinitionForWire, compileGlob, compileUserRegex, completePartialObject, computeMessageTokens, computeTaskItemProgress, createContextEvidenceState, createToolOutputSerializer, deepMerge, detectNewlineStyle, ensureDir, escapeGlobSubject, estimateMessageTokens, estimateRequestTokens, estimateRequestTokensCalibrated, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, expandGlob, expandIPv6, expectDefined, formatTaskList, formatTaskProgress, formatTodosList, getCalibrationState, getJsonPath, getTermSize, isInteractive, isJsonObject, isPathSubjectKey, isPrimitiveArray, isPrivateIPv4, isPrivateIPv6, isStdinTTY, isStdoutTTY, jsonObjectFileExists, markAssistantReferencedEvidence, matchAny, matchGlob, mergeCustomModelDefs, mergeModelsPayload, normalizePathSubject, normalizeToLf, onResize, projectHash, projectSlug, readJsonObjectFile, recordActualUsage, recordToolOutputEvidence, recordUserIntentEvidence, removeJsonPath, removeJsonPathInFile, repairToolUseAdjacency, repeatedReadPressure, resetCalibration, resolveWstackPaths, safeParse, safeStringify, sanitizeJsonString, setJsonPath, setJsonPathInFile, setOutputLineGuard, setRawMode, sleep, stripAnsi, subjectForToolInput, toErrorMessage, toStyle, truncate, unifiedDiff, updateJsonObjectFile, validateAgainstSchema, withFileLock, writeErr, writeJsonObjectFile, writeOut, wstackGlobalRoot };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map