@ykurilov/agent-chat-core 0.65.0 → 0.66.0

package/dist/{chunk-SA3DXJYB.js → chunk-WMP5AKDU.js}

@@ -2215,8 +2215,8 @@ function cutForgedBlocks(text, formats, options2 = {}) {
   const scanner = createForgedBlockScanner(formats, options2);
   const pieces = [...scanner.push(text), ...scanner.end()];
   return {
-    text: pieces.map((piece) => piece.kind === "text" ? piece.text : "").join(""),
-    blocks: pieces.flatMap((piece) => piece.kind === "block" ? [piece.name] : [])
+    text: pieces.map((piece2) => piece2.kind === "text" ? piece2.text : "").join(""),
+    blocks: pieces.flatMap((piece2) => piece2.kind === "block" ? [piece2.name] : [])
   };
 }
 var hasWords = (text) => /[\p{L}\p{N}]/u.test(text);
@@ -2286,16 +2286,16 @@ function createForgedBlockGuard(formats) {
     };
     const deltaOf = (id, pieces, controller) => {
       let delta = "";
-      for (const piece of pieces) {
-        if (piece.kind === "text" && hasWords(piece.text)) {
+      for (const piece2 of pieces) {
+        if (piece2.kind === "text" && hasWords(piece2.text)) {
           worded = true;
           if (held) settle(false, controller);
         }
-        if (piece.kind === "text" && !held) delta += piece.text;
+        if (piece2.kind === "text" && !held) delta += piece2.text;
         else if (worded) {
-          if (piece.kind === "block") cut.push(piece.name);
+          if (piece2.kind === "block") cut.push(piece2.name);
         } else {
-          (held ??= []).push({ id, name: piece.kind === "block" ? piece.name : "", text: piece.text });
+          (held ??= []).push({ id, name: piece2.kind === "block" ? piece2.name : "", text: piece2.text });
         }
       }
       return delta;
@@ -2512,6 +2512,230 @@ function contentFor(value, images) {
   return value.some(isImage) ? [...kept, { type: "text", text: NO_IMAGE_NOTE }] : kept;
 }
 
+// src/agent-run/json-repair.ts
+var VALID_JSON_ESCAPES = /* @__PURE__ */ new Set(['"', "\\", "/", "b", "f", "n", "r", "t"]);
+function isControlCharacter(char) {
+  const codePoint = char.codePointAt(0);
+  return codePoint !== void 0 && codePoint >= 0 && codePoint <= 31;
+}
+function escapeControlCharacter(char) {
+  switch (char) {
+    case "\b":
+      return "\\b";
+    case "\f":
+      return "\\f";
+    case "\n":
+      return "\\n";
+    case "\r":
+      return "\\r";
+    case "	":
+      return "\\t";
+    default:
+      return `\\u${char.codePointAt(0)?.toString(16).padStart(4, "0") ?? "0000"}`;
+  }
+}
+function repairJson(json) {
+  let repaired = "";
+  let inString = false;
+  for (let index = 0; index < json.length; index++) {
+    const char = json[index];
+    if (!inString) {
+      repaired += char;
+      if (char === '"') inString = true;
+      continue;
+    }
+    if (char === '"') {
+      repaired += char;
+      inString = false;
+      continue;
+    }
+    if (char === "\\") {
+      const nextChar = json[index + 1];
+      if (nextChar === void 0) {
+        repaired += "\\\\";
+        continue;
+      }
+      if (nextChar === "u") {
+        const unicodeDigits = json.slice(index + 2, index + 6);
+        if (/^[0-9a-fA-F]{4}$/.test(unicodeDigits)) {
+          repaired += `\\u${unicodeDigits}`;
+          index += 5;
+          continue;
+        }
+      }
+      if (VALID_JSON_ESCAPES.has(nextChar)) {
+        repaired += `\\${nextChar}`;
+        index += 1;
+        continue;
+      }
+      repaired += "\\\\";
+      continue;
+    }
+    repaired += isControlCharacter(char) ? escapeControlCharacter(char) : char;
+  }
+  return repaired;
+}
+
+// src/agent-run/missing-closers.ts
+var MAX_MISSING_CLOSERS = 3;
+var CLOSER = { "{": "}", "[": "]" };
+function addMissingClosers(json) {
+  const open = [];
+  let text = "";
+  let added = 0;
+  let last = "none";
+  let inString = false;
+  let stringIsKey = false;
+  for (let index = 0; index < json.length; index++) {
+    const char = json[index];
+    if (inString) {
+      text += char;
+      if (char === "\\") {
+        if (index + 1 >= json.length) return void 0;
+        text += json[index + 1];
+        index += 1;
+      } else if (char === '"') {
+        inString = false;
+        last = stringIsKey ? "key" : "string";
+      }
+      continue;
+    }
+    if (/\s/.test(char)) {
+      text += char;
+      continue;
+    }
+    if (char === "}" || char === "]") {
+      const depth = open.lastIndexOf(char === "}" ? "{" : "[");
+      if (depth === -1) return void 0;
+      const missing = open.length - 1 - depth;
+      if (missing > 0) {
+        if (last !== "string" && last !== "bare" && last !== "close") return void 0;
+        for (let skipped = 0; skipped < missing; skipped++) text += CLOSER[open.pop()];
+        added += missing;
+      }
+      open.pop();
+      last = "close";
+    } else if (char === "{" || char === "[") {
+      open.push(char);
+      last = "open";
+    } else if (char === '"') {
+      inString = true;
+      stringIsKey = open.at(-1) === "{" && (last === "open" || last === "comma");
+    } else if (char === ",") {
+      last = "comma";
+    } else if (char === ":") {
+      last = "colon";
+    } else {
+      last = "bare";
+    }
+    text += char;
+  }
+  if (inString || last !== "string" && last !== "close") return void 0;
+  added += open.length;
+  while (open.length > 0) text += CLOSER[open.pop()];
+  return added > 0 && added <= MAX_MISSING_CLOSERS ? { text, added } : void 0;
+}
+
+// src/agent-run/premature-closer.ts
+function dropPrematureCloser(json) {
+  const open = [];
+  let inString = false;
+  for (let index = 0; index < json.length; index++) {
+    const char = json[index];
+    if (inString) {
+      if (char === "\\") index += 1;
+      else if (char === '"') inString = false;
+      continue;
+    }
+    if (char === '"') inString = true;
+    else if (char === "{" || char === "[") open.push(char);
+    else if (char === "}" || char === "]") {
+      if (open.at(-1) !== (char === "}" ? "{" : "[")) return void 0;
+      open.pop();
+      if (open.length === 0) {
+        const rest = json.slice(index + 1);
+        if (!/^\s*,/.test(rest) || index === 0) return void 0;
+        return { text: json.slice(0, index) + rest };
+      }
+    }
+  }
+  return void 0;
+}
+
+// src/agent-run/stray-closers.ts
+var MAX_STRAY_CLOSERS = 2;
+function dropStrayClosers(json) {
+  const open = [];
+  let text = "";
+  let inside = 0;
+  let end = 0;
+  let inString = false;
+  let started = false;
+  for (let index = 0; index < json.length; index++) {
+    const char = json[index];
+    if (inString) {
+      text += char;
+      if (char === "\\") {
+        text += json[index + 1] ?? "";
+        index += 1;
+      } else if (char === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    const finished = started && open.length === 0;
+    if (char === "}" || char === "]") {
+      if (open.at(-1) === (char === "}" ? "{" : "[")) {
+        open.pop();
+        text += char;
+      } else if (finished) {
+        end += 1;
+      } else if (open.length > 0) {
+        inside += 1;
+      } else {
+        return void 0;
+      }
+      continue;
+    }
+    if (finished && !/\s/.test(char)) return void 0;
+    if (char === "{" || char === "[") {
+      open.push(char);
+      started = true;
+    } else if (char === '"') {
+      inString = true;
+    }
+    text += char;
+  }
+  const dropped = inside + end;
+  if (dropped === 0 || dropped > MAX_STRAY_CLOSERS || inString || open.length > 0) return void 0;
+  return { text, inside, end };
+}
+
+// src/agent-run/tool-arguments-repair.ts
+function parseArgumentsLoosely(json) {
+  const none = { inside: 0, end: 0 };
+  const attempts = [
+    { text: json, strayClosers: none, missingClosers: 0 },
+    ...optional(dropStrayClosers(json), (fix) => ({ text: fix.text, strayClosers: { inside: fix.inside, end: fix.end }, missingClosers: 0 })),
+    ...optional(addMissingClosers(json), (fix) => ({ text: fix.text, strayClosers: none, missingClosers: fix.added })),
+    ...optional(dropPrematureCloser(json), (fix) => ({ text: fix.text, strayClosers: { inside: 1, end: 0 }, missingClosers: 0 }))
+  ];
+  for (const { text, ...rest } of attempts) {
+    try {
+      return { value: JSON.parse(text), ...rest };
+    } catch {
+    }
+  }
+  return void 0;
+}
+function repairToolArguments(text) {
+  const parsed = parseArgumentsLoosely(repairJson(text));
+  return parsed === void 0 ? void 0 : JSON.stringify(parsed.value);
+}
+function optional(fix, toAttempt) {
+  return fix === void 0 ? [] : [toAttempt(fix)];
+}
+
 // src/storage/chat-storage.ts
 var RELEASED_ANSWER_ALIVE_AT = (/* @__PURE__ */ new Date(0)).toISOString();
 function aliveAtByLocalClock(mark) {
@@ -4169,9 +4393,9 @@ function createStepCacheMarks(mark) {
       const carried = previous;
       const unmarked = carried ? messages.map((message) => message === carried.marked ? carried.original : message) : messages;
       const original = unmarked[unmarked.length - 1];
-      const marked = withCacheMark(original, mark);
-      previous = { marked, original };
-      return [...unmarked.slice(0, -1), marked];
+      const marked2 = withCacheMark(original, mark);
+      previous = { marked: marked2, original };
+      return [...unmarked.slice(0, -1), marked2];
     }
   };
 }
@@ -4327,7 +4551,7 @@ function undeliveredIdsOf(messages) {
       for (const [path, value] of Object.entries(set)) {
         if (path.startsWith(prefix) && value === true) ids.add(path.slice(prefix.length));
         else if (path === UNDELIVERED_STATE_KEY && typeof value === "object" && value !== null) {
-          for (const [id, marked] of Object.entries(value)) if (marked === true) ids.add(id);
+          for (const [id, marked2] of Object.entries(value)) if (marked2 === true) ids.add(id);
         }
       }
     }
@@ -5061,252 +5285,127 @@ function checkProviderFallback(setting, catalog) {
 // src/agent-run/repair-tool-call.ts
 import { InvalidToolInputError, asSchema as asSchema2 } from "ai";
 
-// src/agent-run/json-repair.ts
-var VALID_JSON_ESCAPES = /* @__PURE__ */ new Set(['"', "\\", "/", "b", "f", "n", "r", "t"]);
-function isControlCharacter(char) {
-  const codePoint = char.codePointAt(0);
-  return codePoint !== void 0 && codePoint >= 0 && codePoint <= 31;
-}
-function escapeControlCharacter(char) {
-  switch (char) {
-    case "\b":
-      return "\\b";
-    case "\f":
-      return "\\f";
-    case "\n":
-      return "\\n";
-    case "\r":
-      return "\\r";
-    case "	":
-      return "\\t";
-    default:
-      return `\\u${char.codePointAt(0)?.toString(16).padStart(4, "0") ?? "0000"}`;
-  }
-}
-function repairJson(json) {
-  let repaired = "";
-  let inString = false;
-  for (let index = 0; index < json.length; index++) {
-    const char = json[index];
-    if (!inString) {
-      repaired += char;
-      if (char === '"') inString = true;
-      continue;
-    }
-    if (char === '"') {
-      repaired += char;
-      inString = false;
-      continue;
-    }
-    if (char === "\\") {
-      const nextChar = json[index + 1];
-      if (nextChar === void 0) {
-        repaired += "\\\\";
-        continue;
-      }
-      if (nextChar === "u") {
-        const unicodeDigits = json.slice(index + 2, index + 6);
-        if (/^[0-9a-fA-F]{4}$/.test(unicodeDigits)) {
-          repaired += `\\u${unicodeDigits}`;
-          index += 5;
-          continue;
-        }
-      }
-      if (VALID_JSON_ESCAPES.has(nextChar)) {
-        repaired += `\\${nextChar}`;
-        index += 1;
-        continue;
-      }
-      repaired += "\\\\";
-      continue;
-    }
-    repaired += isControlCharacter(char) ? escapeControlCharacter(char) : char;
-  }
-  return repaired;
-}
-
-// src/agent-run/missing-closers.ts
-var MAX_MISSING_CLOSERS = 3;
-var CLOSER = { "{": "}", "[": "]" };
-function addMissingClosers(json) {
-  const open = [];
-  let text = "";
-  let added = 0;
-  let last = "none";
-  let inString = false;
-  let stringIsKey = false;
-  for (let index = 0; index < json.length; index++) {
-    const char = json[index];
-    if (inString) {
-      text += char;
-      if (char === "\\") {
-        if (index + 1 >= json.length) return void 0;
-        text += json[index + 1];
-        index += 1;
-      } else if (char === '"') {
-        inString = false;
-        last = stringIsKey ? "key" : "string";
-      }
-      continue;
-    }
-    if (/\s/.test(char)) {
-      text += char;
-      continue;
-    }
-    if (char === "}" || char === "]") {
-      const depth = open.lastIndexOf(char === "}" ? "{" : "[");
-      if (depth === -1) return void 0;
-      const missing = open.length - 1 - depth;
-      if (missing > 0) {
-        if (last !== "string" && last !== "bare" && last !== "close") return void 0;
-        for (let skipped = 0; skipped < missing; skipped++) text += CLOSER[open.pop()];
-        added += missing;
-      }
-      open.pop();
-      last = "close";
-    } else if (char === "{" || char === "[") {
-      open.push(char);
-      last = "open";
-    } else if (char === '"') {
-      inString = true;
-      stringIsKey = open.at(-1) === "{" && (last === "open" || last === "comma");
-    } else if (char === ",") {
-      last = "comma";
-    } else if (char === ":") {
-      last = "colon";
-    } else {
-      last = "bare";
-    }
-    text += char;
-  }
-  if (inString || last !== "string" && last !== "close") return void 0;
-  added += open.length;
-  while (open.length > 0) text += CLOSER[open.pop()];
-  return added > 0 && added <= MAX_MISSING_CLOSERS ? { text, added } : void 0;
-}
-
-// src/agent-run/stray-closers.ts
-var MAX_STRAY_CLOSERS = 2;
-function dropStrayClosers(json) {
-  const open = [];
-  let text = "";
-  let inside = 0;
-  let end = 0;
-  let inString = false;
-  let started = false;
-  for (let index = 0; index < json.length; index++) {
-    const char = json[index];
-    if (inString) {
-      text += char;
-      if (char === "\\") {
-        text += json[index + 1] ?? "";
-        index += 1;
-      } else if (char === '"') {
-        inString = false;
-      }
-      continue;
-    }
-    const finished = started && open.length === 0;
-    if (char === "}" || char === "]") {
-      if (open.at(-1) === (char === "}" ? "{" : "[")) {
-        open.pop();
-        text += char;
-      } else if (finished) {
-        end += 1;
-      } else if (open.length > 0) {
-        inside += 1;
-      } else {
-        return void 0;
-      }
-      continue;
-    }
-    if (finished && !/\s/.test(char)) return void 0;
-    if (char === "{" || char === "[") {
-      open.push(char);
-      started = true;
-    } else if (char === '"') {
-      inString = true;
-    }
-    text += char;
-  }
-  const dropped = inside + end;
-  if (dropped === 0 || dropped > MAX_STRAY_CLOSERS || inString || open.length > 0) return void 0;
-  return { text, inside, end };
+// src/agent-run/unreadable-tool-input.ts
+import { JSONParseError, TypeValidationError } from "ai";
+var MAX_PIECE = 30;
+var MAX_ISSUES = 3;
+var MAX_ISSUE_LENGTH = 120;
+var RETRY_NOTE = "\u043F\u0440\u0438\u0448\u043B\u0438 \u0432\u044B\u0437\u043E\u0432 \u0437\u0430\u043D\u043E\u0432\u043E";
+function describeUnreadableToolInput(error, input) {
+  const cause = error instanceof Error ? error.cause : void 0;
+  if (JSONParseError.isInstance(cause)) return describeBrokenJson(cause, input);
+  if (TypeValidationError.isInstance(cause)) return describeSchemaMismatch(cause);
+  return `\u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B \u043D\u0435 \u043F\u043E\u0434\u0445\u043E\u0434\u044F\u0442 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0443; ${RETRY_NOTE}`;
+}
+function describeBrokenJson(error, input) {
+  const reason = error.cause instanceof Error ? error.cause.message : "";
+  const position = /position (\d+)/.exec(reason)?.[1];
+  if (position === void 0) {
+    return `\u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B \u043D\u0435 \u0440\u0430\u0437\u0431\u0438\u0440\u0430\u044E\u0442\u0441\u044F \u043A\u0430\u043A JSON: \u0442\u0435\u043A\u0441\u0442 \u043E\u0431\u043E\u0440\u0432\u0430\u043D \u043D\u0430 \u043F\u043E\u0437\u0438\u0446\u0438\u0438 ${input.length} (\u2026${piece(input, input.length)}); ${RETRY_NOTE}`;
+  }
+  const at = Number(position);
+  const char = input[at];
+  const what = char === "}" || char === "]" ? `\u043B\u0438\u0448\u043D\u044F\u044F \`${char}\`` : "\u043E\u0448\u0438\u0431\u043A\u0430";
+  return `\u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B \u043D\u0435 \u0440\u0430\u0437\u0431\u0438\u0440\u0430\u044E\u0442\u0441\u044F \u043A\u0430\u043A JSON: ${what} \u043E\u043A\u043E\u043B\u043E \u043F\u043E\u0437\u0438\u0446\u0438\u0438 ${at} (\u2026${piece(input, at)}\u2026); ${RETRY_NOTE}`;
+}
+function piece(input, at) {
+  const start = Math.max(0, at - MAX_PIECE / 2);
+  return JSON.stringify(input.slice(start, start + MAX_PIECE)).slice(1, -1);
+}
+function describeSchemaMismatch(error) {
+  const issues = error.cause?.issues;
+  if (!Array.isArray(issues) || issues.length === 0) {
+    const text = error.cause instanceof Error ? error.cause.message : "\u043D\u0435 \u043F\u043E\u0434\u0445\u043E\u0434\u044F\u0442 \u043F\u043E \u0441\u0445\u0435\u043C\u0435";
+    return `\u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B \u043D\u0435 \u043F\u043E\u0434\u0445\u043E\u0434\u044F\u0442 \u043F\u043E \u0441\u0445\u0435\u043C\u0435: ${text.slice(0, MAX_ISSUE_LENGTH)}; ${RETRY_NOTE}`;
+  }
+  const listed = issues.slice(0, MAX_ISSUES).map(describeIssue).join("; ");
+  const rest = issues.length > MAX_ISSUES ? ` (\u0438 \u0435\u0449\u0451 ${issues.length - MAX_ISSUES})` : "";
+  return `\u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B \u043D\u0435 \u043F\u043E\u0434\u0445\u043E\u0434\u044F\u0442 \u043F\u043E \u0441\u0445\u0435\u043C\u0435 \u2014 ${listed}${rest}; ${RETRY_NOTE}, \u043F\u043E\u043F\u0440\u0430\u0432\u0438\u0432 \u044D\u0442\u0438 \u043F\u043E\u043B\u044F`;
+}
+function describeIssue(issue) {
+  const { path, message } = issue;
+  const where = Array.isArray(path) && path.length > 0 ? path.join(".") : "\u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B";
+  return `${where}: ${String(message ?? "\u043D\u0435\u0432\u0435\u0440\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435").slice(0, MAX_ISSUE_LENGTH)}`;
 }
 
 // src/agent-run/repair-tool-call.ts
 function createRepairToolCall(options2 = {}) {
   return async ({ toolCall, tools, error, inputSchema }) => {
     if (!InvalidToolInputError.isInstance(error)) return null;
-    const escaped = repairJson(toolCall.input);
-    const parsed = parseWithClosers(escaped);
-    if (!parsed) return null;
     const schema = await inputSchema({ toolName: toolCall.toolName });
-    const coerced = coerceBySchema(parsed.value, schema);
-    const input = JSON.stringify(coerced);
-    if (options2.onRepaired && await passesSchema(tools[toolCall.toolName]?.inputSchema, coerced)) {
-      options2.onRepaired({
+    const toolSchema = tools[toolCall.toolName]?.inputSchema;
+    const attempt = async (text, byApp) => {
+      const escaped = repairJson(text);
+      const parsed = parseArgumentsLoosely(escaped);
+      if (!parsed) return void 0;
+      const tally = { inside: parsed.strayClosers.inside, end: parsed.strayClosers.end, missing: parsed.missingClosers, nested: false, types: false };
+      const coerced = coerceBySchema(parsed.value, schema, tally);
+      if (!await passesSchema(toolSchema, coerced)) return void 0;
+      options2.onRepaired?.({
         toolName: toolCall.toolName,
         inputLength: toolCall.input.length,
-        strayClosers: parsed.strayClosers,
-        missingClosers: parsed.missingClosers,
-        strings: escaped !== toolCall.input,
-        types: input !== JSON.stringify(parsed.value)
+        strayClosers: { inside: tally.inside, end: tally.end },
+        missingClosers: tally.missing,
+        nestedJson: tally.nested,
+        byApp,
+        strings: escaped !== text,
+        types: tally.types
       });
-    }
-    return { ...toolCall, input };
+      return JSON.stringify(coerced);
+    };
+    const builtIn = await attempt(toolCall.input, false);
+    if (builtIn !== void 0) return { ...toolCall, input: builtIn };
+    const fromApp = await askApp(options2.repairToolInput, { toolName: toolCall.toolName, text: toolCall.input, error });
+    const repaired = fromApp === void 0 ? void 0 : await attempt(fromApp, true);
+    if (repaired !== void 0) return { ...toolCall, input: repaired };
+    error.message = `Invalid input for tool ${toolCall.toolName}: ${describeUnreadableToolInput(error, toolCall.input)}`;
+    return null;
   };
 }
+async function askApp(repair, call) {
+  if (!repair) return void 0;
+  try {
+    const text = await repair(call);
+    return typeof text === "string" ? text : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function describeToolInputRepair(repair, where) {
   const fixes = [
     ...repair.strayClosers.inside > 0 ? [`\u043B\u0438\u0448\u043D\u0438\u0435 \u0441\u043A\u043E\u0431\u043A\u0438 \u0432\u043D\u0443\u0442\u0440\u0438 \xD7${repair.strayClosers.inside}`] : [],
     ...repair.strayClosers.end > 0 ? [`\u043B\u0438\u0448\u043D\u0438\u0435 \u0441\u043A\u043E\u0431\u043A\u0438 \u0432 \u043A\u043E\u043D\u0446\u0435 \xD7${repair.strayClosers.end}`] : [],
     ...repair.missingClosers > 0 ? [`\u0434\u043E\u043F\u0438\u0441\u0430\u043D\u044B \u0441\u043A\u043E\u0431\u043A\u0438 \xD7${repair.missingClosers}`] : [],
+    ...repair.nestedJson ? ["JSON \u0438\u0437 \u0441\u0442\u0440\u043E\u043A\u0438"] : [],
     ...repair.strings ? ["\u0437\u0430\u043F\u0438\u0441\u0438 \u0432 \u0441\u0442\u0440\u043E\u043A\u0430\u0445"] : [],
-    ...repair.types ? ["\u0442\u0438\u043F\u044B \u043F\u043E \u0441\u0445\u0435\u043C\u0435"] : []
+    ...repair.types ? ["\u0442\u0438\u043F\u044B \u043F\u043E \u0441\u0445\u0435\u043C\u0435"] : [],
+    ...repair.byApp ? ["\u043F\u0440\u0430\u0432\u043A\u0430 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F"] : []
   ];
   return `[\u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B \u043F\u043E\u0447\u0438\u043D\u0435\u043D\u044B] \u0447\u0430\u0442=${where.chatId} \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442=${repair.toolName} \u043C\u043E\u0434\u0435\u043B\u044C=${where.modelId} \u043F\u0440\u043E\u0432\u0430\u0439\u0434\u0435\u0440=${where.providerId} \u043F\u0440\u0430\u0432\u043A\u0430=${fixes.join(", ")} \u0434\u043B\u0438\u043D\u0430=${repair.inputLength}`;
 }
-function parseWithClosers(json) {
-  const none = { inside: 0, end: 0 };
-  const attempts = [
-    { text: json, strayClosers: none, missingClosers: 0 },
-    ...optional(dropStrayClosers(json), (fix) => ({ text: fix.text, strayClosers: { inside: fix.inside, end: fix.end }, missingClosers: 0 })),
-    ...optional(addMissingClosers(json), (fix) => ({ text: fix.text, strayClosers: none, missingClosers: fix.added }))
-  ];
-  for (const { text, ...rest } of attempts) {
-    try {
-      return { value: JSON.parse(text), ...rest };
-    } catch {
-    }
-  }
-  return void 0;
-}
-function optional(fix, toAttempt) {
-  return fix === void 0 ? [] : [toAttempt(fix)];
-}
 async function passesSchema(schema, value) {
   if (schema === void 0) return false;
   const validate = asSchema2(schema).validate;
   return validate ? (await validate(value)).success : true;
 }
-function coerceBySchema(value, schema) {
+function coerceBySchema(value, schema, tally) {
   if (typeof schema !== "object") return value;
   const types = Array.isArray(schema.type) ? schema.type : schema.type ? [schema.type] : [];
   if (typeof value === "string") {
     if (types.includes("string")) return value;
-    if (types.includes("integer") || types.includes("number")) return numberFrom(value, types.includes("number")) ?? value;
-    if (types.includes("boolean")) return value === "true" ? true : value === "false" ? false : value;
+    if (types.includes("integer") || types.includes("number")) return marked(numberFrom(value, types.includes("number")), value, tally);
+    if (types.includes("boolean")) return marked(value === "true" ? true : value === "false" ? false : void 0, value, tally);
+    if (types.includes("array") || types.includes("object")) return parseNestedJson(value, schema, tally);
     return value;
   }
   if (Array.isArray(value)) {
     const items = Array.isArray(schema.items) ? void 0 : schema.items;
-    return value.map((item) => coerceBySchema(item, items));
+    return value.map((item) => coerceBySchema(item, items, tally));
   }
   if (typeof value === "object" && value !== null) {
     const properties = schema.properties ?? {};
     return Object.fromEntries(
-      Object.entries(value).map(([key, property]) => [key, coerceBySchema(property, properties[key])])
+      Object.entries(value).map(([key, property]) => [key, coerceBySchema(property, properties[key], tally)])
     );
   }
   return value;
@@ -5317,6 +5416,21 @@ function numberFrom(text, allowFraction) {
   if (!Number.isFinite(number)) return void 0;
   return allowFraction || Number.isInteger(number) ? number : void 0;
 }
+function marked(coerced, original, tally) {
+  if (coerced === void 0) return original;
+  tally.types = true;
+  return coerced;
+}
+function parseNestedJson(text, schema, tally) {
+  if (!/^\s*[[{]/.test(text)) return text;
+  const parsed = parseArgumentsLoosely(repairJson(text));
+  if (!parsed) return text;
+  tally.nested = true;
+  tally.inside += parsed.strayClosers.inside;
+  tally.end += parsed.strayClosers.end;
+  tally.missing += parsed.missingClosers;
+  return coerceBySchema(parsed.value, schema, tally);
+}
 
 // src/agent-run/run-agent-turn.ts
 import { stepCountIs, streamText } from "ai";
@@ -5465,6 +5579,8 @@ function createAnswerSaver(storage, messageId, durations, usage, onTakenOver, ex
   let lastWriteAt = Date.now();
   let lastSignAt = lastWriteAt;
   let unsaved = false;
+  let changes = 0;
+  let savedChanges = 0;
   let closed = false;
   let writing = null;
   let lastFence = 0;
@@ -5484,6 +5600,7 @@ function createAnswerSaver(storage, messageId, durations, usage, onTakenOver, ex
   }
   async function write() {
     unsaved = false;
+    const writtenChanges = changes;
     lastWriteAt = Date.now();
     lastSignAt = lastWriteAt;
     const parts = latest;
@@ -5497,6 +5614,7 @@ function createAnswerSaver(storage, messageId, durations, usage, onTakenOver, ex
     } catch (failure) {
       noteFailure(failure);
     }
+    savedChanges = Math.max(savedChanges, writtenChanges);
     callsWritten(parts);
   }
   async function markAlive() {
@@ -5574,7 +5692,7 @@ function createAnswerSaver(storage, messageId, durations, usage, onTakenOver, ex
             reachedFence = fence;
             reachFence(fence);
           } else {
-            unsaved = true;
+            noteChange();
             scheduleWrite();
           }
         }
@@ -5588,13 +5706,18 @@ function createAnswerSaver(storage, messageId, durations, usage, onTakenOver, ex
     if (waiting) waiting.push(chunk);
     else feed.enqueue(chunk);
   }
+  function noteChange() {
+    changes++;
+    unsaved = true;
+  }
   async function writeNow() {
+    const target = changes;
     for (; ; ) {
       clearTimeout(timer);
       timer = void 0;
       if (writing) await writing;
-      else if (unsaved && !closed) startWrite();
-      else return;
+      else if (savedChanges < target && !closed) startWrite();
+      else return scheduleWrite();
     }
   }
   async function settleAssembly() {
@@ -5632,7 +5755,7 @@ function createAnswerSaver(storage, messageId, durations, usage, onTakenOver, ex
         const held = waiting;
         waiting = null;
         for (const chunk of held) feed.enqueue(chunk);
-        unsaved = true;
+        noteChange();
         await writeNow();
       };
       const current = erase().finally(() => {
@@ -5651,7 +5774,7 @@ function createAnswerSaver(storage, messageId, durations, usage, onTakenOver, ex
       clearTimeout(aliveTimer);
       await rewinding?.catch(() => {
       });
-      unsaved = true;
+      noteChange();
       await settleAssembly();
       await writeNow();
     },
@@ -6218,9 +6341,9 @@ function trackToolErrors(tools, options2 = {}) {
   const thrownByTools = /* @__PURE__ */ new WeakSet();
   const scrub = (text) => scrubSecrets(text, secrets);
   function remember(error) {
-    const marked = withoutSecrets(typeof error === "object" && error !== null ? error : new Error(String(error)), scrub);
-    thrownByTools.add(marked);
-    throw marked;
+    const marked2 = withoutSecrets(typeof error === "object" && error !== null ? error : new Error(String(error)), scrub);
+    thrownByTools.add(marked2);
+    throw marked2;
   }
   const tracked = {};
   for (const [name, original] of Object.entries(tools ?? {})) {
@@ -7346,6 +7469,7 @@ async function openAttempt(input, attempt, attemptSignal) {
     memory: _memory,
     resume: _resume,
     toolTimeout: _toolTimeout,
+    repairToolInput: _repairToolInput,
     sequentialTools: _sequentialTools,
     now: _now,
     usageSource: _usageSource,
@@ -7473,6 +7597,7 @@ async function openAttempt(input, attempt, attemptSignal) {
     abortSignal: attemptSignal,
     // Кривые аргументы чинятся по схеме без обращения к модели; каждая починка — строкой в журнал.
     repairToolCall: createRepairToolCall({
+      ...input.repairToolInput && { repairToolInput: input.repairToolInput },
       onRepaired: (repair) => logError(describeToolInputRepair(repair, { chatId: input.chatId, modelId: found.profile.id, providerId }))
     }),
     // Размер контекста после ответа — по последнему шагу: у прежних шагов тот же префикс, сумма считала бы его много раз.
@@ -7628,6 +7753,7 @@ function helperRunContext(input, toolQueue, logError) {
     logError,
     ...input.toolResultLimit && { toolResultLimit: input.toolResultLimit },
     ...input.toolTimeout && { toolTimeout: input.toolTimeout },
+    ...input.repairToolInput && { repairToolInput: input.repairToolInput },
     ...input.sequentialTools && { sequentialTools: input.sequentialTools },
     ...input.providerFallback !== void 0 && { providerFallback: input.providerFallback },
     ...input.providerOutages && { providerOutages: input.providerOutages },
@@ -7993,6 +8119,7 @@ async function helperStep(input) {
     maxRetries: 0,
     abortSignal: input.abortSignal,
     repairToolCall: createRepairToolCall({
+      ...context.repairToolInput && { repairToolInput: context.repairToolInput },
       onRepaired: (repair) => context.logError(describeToolInputRepair(repair, { chatId: context.chatId, modelId: helper.model.modelId, providerId }))
     })
   });
@@ -12127,6 +12254,7 @@ function createChatService(input) {
     providerFallback,
     cacheMissLog,
     toolTimeoutMs: toolTimeoutSetting,
+    repairToolInput,
     sequentialTools: sequentialToolsSetting,
     timeZone: timeZoneSetting,
     modelSilenceTimeout,
@@ -12514,8 +12642,8 @@ function createChatService(input) {
       const ids = pendingUndelivered.get(chatId);
       pendingUndelivered.delete(chatId);
       if (!ids || !await storage.getChat(chatId)) return;
-      const marked = undeliveredIdsOf(await currentBranch(chatId));
-      const fresh = [...ids].filter((id) => !marked.has(id));
+      const marked2 = undeliveredIdsOf(await currentBranch(chatId));
+      const fresh = [...ids].filter((id) => !marked2.has(id));
       if (fresh.length === 0) return;
       const state = await readBranchState(storage, chatId);
       await storage.insertMessage(stateMessage({ chatId, parentId: state.atMessageId, record: undeliveredRecord(...fresh) }));
@@ -12841,6 +12969,7 @@ function createChatService(input) {
           ...staff && { staff },
           toolResultLimit,
           toolTimeout,
+          ...repairToolInput && { repairToolInput },
           sequentialTools,
           toolQueue,
           stepContextTimeoutMs,
@@ -14172,6 +14301,7 @@ function createChatService(input) {
           usageSource: "background",
           toolResultLimit,
           toolTimeout,
+          ...repairToolInput && { repairToolInput },
           sequentialTools,
           modelSilence,
           logError,
@@ -14355,6 +14485,7 @@ export {
   cutForgedBlocks,
   toolImageFallbackText,
   modelMaySeeToolResultImages,
+  repairToolArguments,
   RELEASED_ANSWER_ALIVE_AT,
   aliveAtByLocalClock,
   silenceBoundaryByLocalClock,
@@ -14454,4 +14585,4 @@ export {
   InvalidWidgetAnswerError,
   createChatService
 };
-//# sourceMappingURL=chunk-SA3DXJYB.js.map
+//# sourceMappingURL=chunk-WMP5AKDU.js.map