@wrongstack/core 0.9.19 → 0.10.0

package/dist/utils/index.d.ts

@@ -1,5 +1,6 @@
-import { N as TodoItem, M as Message, J as JSONSchema } from '../context-BRNbHmRM.js';
-export { W as WstackPathOptions, a as WstackPaths, p as projectHash, r as resolveWstackPaths } from '../wstack-paths-BCgmTNlG.js';
+import { N as TodoItem, M as Message, J as JSONSchema } from '../context-7u93AcGD.js';
+export { W as WstackPathOptions, a as WstackPaths, p as projectHash, r as resolveWstackPaths } from '../wstack-paths-eMXnY1_X.js';
+import { M as ModelsDevPayload } from '../models-registry-BcYJDKLm.js';
 
 interface AtomicWriteOptions {
     mode?: number;
@@ -255,13 +256,44 @@ declare function compileUserRegex(pattern: string, flags: string): CompileResult
 
 /**
  * Attempt to close an incomplete JSON object string by auto-closing braces
- * and completing any unclosed double-quoted string values. This handles the
- * common streaming truncation case where the JSON stream ends mid-object
- * (e.g. `{"old_string": "line1\nline2` without the closing `"}` and `}`).
+ * and completing any unclosed double-quoted string values.
  *
- * Returns the completed string on best-effort, or the original if no useful
- * salvage was possible.
+ * Strategy:
+ * 1. Compute origOpen from the ORIGINAL input (how many braces are unclosed).
+ * 2. Add that many closing braces. If result is now valid JSON → return it.
+ * 3. If still invalid: trim trailing whitespace, strip trailing backslash.
+ * 4. Walk backwards to detect an unclosed string value.
+ *    - Quote followed by `:` → key-name, skip
+ *    - Quote followed by `,` `}` or end-of-string → toggle in/out of string
+ * 5. If we end INSIDE a string (unclosed opening `"`), append `"` + origOpen `}`.
+ *
+ * Known limitations:
+ * - Strings whose content ends with a `"` character cannot be repaired
+ *   (algorithm can't distinguish content-`"` from string-terminator `"`).
+ * - Input ending in bare `:` (incomplete value expression) can't be meaningfully repaired.
+ * - Bare `{` returns unchanged.
+ * - If origOpen=0 (braces balanced) but string is unclosed, repair is skipped
+ *   (the input would be valid JSON per JSON.parse, so it's returned as-is).
  */
 declare function completePartialObject(s: string): string;
 
-export { type AtomicWriteOptions, type BuildChildEnvOptions, type CompileFail, type CompileResult, type MessageRepairReport, type MessageRepairResult, type NewlineStyle, type RequestTokenBreakdown, type SafeParseResult, type ToolOutputSerializerOptions, type UnifiedDiffOptions, type ValidationError, type ValidationResult, atomicWrite, buildChildEnv, color, compileGlob, compileUserRegex, completePartialObject, createToolOutputSerializer, detectNewlineStyle, ensureDir, estimateRequestTokens, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, formatTodosList, matchAny, matchGlob, normalizeToLf, repairToolUseAdjacency, safeParse, safeStringify, sanitizeJsonString, stripAnsi, toStyle, unifiedDiff, validateAgainstSchema };
+/**
+ * Deep-merge a curated `overlay` payload on top of a `base` payload (both in
+ * the models.dev `api.json` shape). The overlay always wins: it can add
+ * providers/models the base lacks and override fields the base gets wrong.
+ *
+ * Precedence rules:
+ *  - Provider present in both → scalar fields (`name`, `npm`, `api`, `env`,
+ *    `doc`) come from the overlay when set; `models` maps merge by model id.
+ *  - Provider only in the overlay → added wholesale.
+ *  - Model present in both → overlay model fields override base model fields
+ *    (`{ ...base, ...overlay }`), with the nested `limit` / `cost` /
+ *    `modalities` objects merged one level deeper so an overlay can fix just
+ *    `limit.context` without restating the rest of the model.
+ *  - Model only in the overlay → added.
+ *
+ * Pure: never mutates its inputs.
+ */
+declare function mergeModelsPayload(base: ModelsDevPayload, overlay: ModelsDevPayload): ModelsDevPayload;
+
+export { type AtomicWriteOptions, type BuildChildEnvOptions, type CompileFail, type CompileResult, type MessageRepairReport, type MessageRepairResult, type NewlineStyle, type RequestTokenBreakdown, type SafeParseResult, type ToolOutputSerializerOptions, type UnifiedDiffOptions, type ValidationError, type ValidationResult, atomicWrite, buildChildEnv, color, compileGlob, compileUserRegex, completePartialObject, createToolOutputSerializer, detectNewlineStyle, ensureDir, estimateRequestTokens, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, formatTodosList, matchAny, matchGlob, mergeModelsPayload, normalizeToLf, repairToolUseAdjacency, safeParse, safeStringify, sanitizeJsonString, stripAnsi, toStyle, unifiedDiff, validateAgainstSchema };

package/dist/utils/index.js

@@ -498,9 +498,11 @@ function resolveWstackPaths(opts) {
     globalPrompts: path2.join(globalRoot, "prompts"),
     cacheDir: path2.join(globalRoot, "cache"),
     modelsCache: path2.join(globalRoot, "cache", "models.dev.json"),
+    modelsOverlayCache: path2.join(globalRoot, "cache", "models-overlay.json"),
     historyFile: path2.join(globalRoot, "history"),
     logFile: path2.join(globalRoot, "logs", "wrongstack.log"),
     projectDir,
+    projectCodebaseIndex: path2.join(projectDir, "codebase-index"),
     projectMemory: path2.join(projectDir, "memory.md"),
     projectSessions: path2.join(projectDir, "sessions"),
     projectTrust: path2.join(projectDir, "trust.json"),
@@ -959,80 +961,85 @@ function compileUserRegex(pattern, flags) {
 
 // src/utils/json-repair.ts
 function completePartialObject(s) {
-  let result = s;
-  const trimmed = result.trim();
-  if (!trimmed.startsWith("{")) return s;
-  for (let pass = 0; pass < 3; pass++) {
-    let braceDepth = 0;
-    let inString2 = false;
-    let escaped2 = false;
-    let foundClose = false;
-    for (const ch of result) {
-      if (escaped2) {
-        escaped2 = false;
+  if (!s.trim().startsWith("{")) return s;
+  if (tryParse(s).ok) return s;
+  const stack = [];
+  let inString = false;
+  let escaped = false;
+  let sawKey = false;
+  let prevSig = "";
+  let contentEnd = 0;
+  let stringBraceDepth = 0;
+  for (let i = 0; i < s.length; i++) {
+    const ch = s[i];
+    if (inString) {
+      contentEnd = i + 1;
+      if (escaped) {
+        escaped = false;
         continue;
       }
       if (ch === "\\") {
-        escaped2 = true;
+        escaped = true;
         continue;
       }
       if (ch === '"') {
-        inString2 = !inString2;
+        inString = false;
+        prevSig = '"';
+        stringBraceDepth = 0;
         continue;
       }
-      if (inString2) continue;
-      if (ch === "{") {
-        braceDepth++;
-        foundClose = false;
-      } else if (ch === "}") {
-        braceDepth--;
-        if (braceDepth === 0) foundClose = true;
-      }
-    }
-    if (foundClose || braceDepth <= 0) break;
-    result += "}".repeat(braceDepth);
-  }
-  if (tryParse(result).ok) return result;
-  let inString = false;
-  let escaped = false;
-  for (let i = result.length - 1; i >= 0; i--) {
-    const ch = result[i];
-    if (escaped) {
-      escaped = false;
-      continue;
-    }
-    if (ch === "\\") {
-      escaped = true;
+      if (ch === "{") stringBraceDepth++;
+      else if (ch === "}" && stringBraceDepth > 0) stringBraceDepth--;
       continue;
     }
+    if (ch === " " || ch === "	" || ch === "\n" || ch === "\r") continue;
+    contentEnd = i + 1;
     if (ch === '"') {
-      let nextNonWs;
-      for (let j = i + 1; j < result.length; j++) {
-        const nc = result[j];
-        if (nc === " " || nc === "	" || nc === "\n" || nc === "\r") continue;
-        nextNonWs = result[j];
-        break;
-      }
-      if (nextNonWs === ":") {
-        continue;
-      } else {
-        inString = !inString;
-        continue;
-      }
+      inString = true;
+      sawKey = true;
+      stringBraceDepth = 0;
+      prevSig = '"';
+    } else if (ch === "{" || ch === "[") {
+      stack.push(ch);
+      prevSig = ch;
+    } else if (ch === "}" || ch === "]") {
+      stack.pop();
+      prevSig = ch;
+    } else {
+      prevSig = ch;
     }
   }
+  if (!sawKey && !inString) return s;
+  let result = s.slice(0, contentEnd);
   if (inString) {
-    result = result.trimEnd();
-    if (result.endsWith("\\")) result = result.slice(0, -1);
-    let depth = 0;
-    for (const ch of result) {
-      if (ch === "{") depth++;
-      else if (ch === "}") depth = Math.max(0, depth - 1);
+    if (escaped) {
+      result = result.slice(0, -1);
+    } else if (endsWithInvalidEscape(result)) {
+      result = result.slice(0, -2);
     }
-    result += '"' + "}".repeat(Math.max(1, depth));
+    if (stringBraceDepth > 0) result += "}".repeat(stringBraceDepth);
+    result += '"';
+  } else if (prevSig === ":") {
+    result += "null";
+  }
+  for (let k = stack.length - 1; k >= 0; k--) {
+    result += stack[k] === "{" ? "}" : "]";
+  }
+  if (!tryParse(result).ok) {
+    const patched = result.replace(/:(\s*)([}\]])/g, ":null$2");
+    if (tryParse(patched).ok) result = patched;
   }
   return result;
 }
+var VALID_ESCAPE = /* @__PURE__ */ new Set(['"', "\\", "/", "b", "f", "n", "r", "t", "u"]);
+function endsWithInvalidEscape(str) {
+  const last = str[str.length - 1];
+  if (str[str.length - 2] !== "\\" || last === void 0) return false;
+  if (VALID_ESCAPE.has(last)) return false;
+  let backslashes = 0;
+  for (let k = str.length - 2; k >= 0 && str[k] === "\\"; k--) backslashes++;
+  return backslashes % 2 === 1;
+}
 function tryParse(s) {
   try {
     return { ok: true, value: JSON.parse(s) };
@@ -1041,6 +1048,69 @@ function tryParse(s) {
   }
 }
 
-export { atomicWrite, buildChildEnv, color, compileGlob, compileUserRegex, completePartialObject, createToolOutputSerializer, detectNewlineStyle, ensureDir, estimateRequestTokens, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, formatTodosList, matchAny, matchGlob, normalizeToLf, projectHash, repairToolUseAdjacency, resolveWstackPaths, safeParse, safeStringify, sanitizeJsonString, stripAnsi, toStyle, unifiedDiff, validateAgainstSchema };
+// src/utils/merge-models-payload.ts
+function mergeModelsPayload(base, overlay) {
+  const out = {};
+  for (const [id, provider] of Object.entries(base)) {
+    out[id] = cloneProvider(provider);
+  }
+  for (const [id, ovProvider] of Object.entries(overlay)) {
+    const existing = out[id];
+    out[id] = existing ? mergeProvider(existing, ovProvider) : cloneProvider(ovProvider);
+  }
+  return out;
+}
+function mergeProvider(base, overlay) {
+  const models = {};
+  for (const [mid, m] of Object.entries(base.models ?? {})) {
+    models[mid] = { ...m };
+  }
+  for (const [mid, ovModel] of Object.entries(overlay.models ?? {})) {
+    const existing = models[mid];
+    models[mid] = existing ? mergeModel(existing, ovModel) : { ...ovModel };
+  }
+  return {
+    ...base,
+    // Overlay scalar fields win when explicitly provided; otherwise keep base.
+    ...stripUndefined({
+      id: overlay.id,
+      name: overlay.name,
+      npm: overlay.npm,
+      api: overlay.api,
+      env: overlay.env,
+      doc: overlay.doc
+    }),
+    models
+  };
+}
+function mergeModel(base, overlay) {
+  const merged = { ...base, ...overlay };
+  if (base.limit || overlay.limit) {
+    merged.limit = { ...base.limit, ...overlay.limit };
+  }
+  if (base.cost || overlay.cost) {
+    merged.cost = { ...base.cost, ...overlay.cost };
+  }
+  if (base.modalities || overlay.modalities) {
+    merged.modalities = { ...base.modalities, ...overlay.modalities };
+  }
+  return merged;
+}
+function cloneProvider(p) {
+  const models = {};
+  for (const [mid, m] of Object.entries(p.models ?? {})) {
+    models[mid] = { ...m };
+  }
+  return { ...p, models };
+}
+function stripUndefined(obj) {
+  const out = {};
+  for (const [k, v] of Object.entries(obj)) {
+    if (v !== void 0) out[k] = v;
+  }
+  return out;
+}
+
+export { atomicWrite, buildChildEnv, color, compileGlob, compileUserRegex, completePartialObject, createToolOutputSerializer, detectNewlineStyle, ensureDir, estimateRequestTokens, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, formatTodosList, matchAny, matchGlob, mergeModelsPayload, normalizeToLf, projectHash, repairToolUseAdjacency, resolveWstackPaths, safeParse, safeStringify, sanitizeJsonString, stripAnsi, toStyle, unifiedDiff, validateAgainstSchema };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map