mixdog 1.2.2 → 1.2.3

package/src/runtime/agent/orchestrator/providers/lib/claude-bridge-schema.mjs

@@ -0,0 +1,388 @@
+// Claude tool input schemas on the Antigravity gateway.
+//
+// The gateway's Claude bridge forwards `parametersJsonSchema` as an Anthropic
+// `custom.input_schema`: JSON Schema draft 2020-12 with an object root and no
+// root anyOf/oneOf/allOf/not. Following the MCP spec, a schema without
+// `$schema` is 2020-12 and a declared dialect is honoured: draft-07 is
+// translated to 2020-12 by the standard keyword mapping only (tuple `items` ->
+// `prefixItems`, `additionalItems` -> `items`, `definitions` -> `$defs` with
+// local refs rewritten, `dependencies` -> dependentRequired/dependentSchemas,
+// keywords beside `$ref` dropped as draft-07 ignores them);
+// any other dialect is unsupported. The result is checked with Ajv's 2020-12
+// meta-schema and ref resolution, then against the provider's root rule. A
+// schema that fails is invalid: nothing is rewritten to make it fit.
+import Ajv2020 from 'ajv/dist/2020.js';
+
+const DRAFT07 = { dropRefSiblings: true, renameDefs: true };
+const MAP_KEYS = ['properties', 'patternProperties', '$defs', 'definitions', 'dependentSchemas'];
+const NODE_KEYS = [
+  'items',
+  'additionalProperties',
+  'unevaluatedItems',
+  'unevaluatedProperties',
+  'contains',
+  'propertyNames',
+  'not',
+  'if',
+  'then',
+  'else',
+  'contentSchema',
+];
+const LIST_KEYS = ['prefixItems', 'allOf', 'anyOf', 'oneOf'];
+const ROOT_FORBIDDEN_KEYS = ['anyOf', 'oneOf', 'allOf', 'not'];
+
+const isPlainObject = (value) => value !== null && typeof value === 'object' && !Array.isArray(value);
+export const escapePointer = (segment) => String(segment).replace(/~/g, '~0').replace(/\//g, '~1');
+const put = (target, key, value) => {
+  Object.defineProperty(target, key, { value, enumerable: true, writable: true, configurable: true });
+};
+
+class SchemaProblem extends Error {
+  constructor(pointer, reason) {
+    super(reason);
+    this.pointer = pointer;
+  }
+}
+
+// ---- dialect -----------------------------------------------------------------
+
+function dialectOf(schema) {
+  if (schema.$schema === undefined) return '2020-12';
+  const declared =
+    typeof schema.$schema === 'string' ? schema.$schema.replace(/^https?:\/\//, '').replace(/#$/, '') : '';
+  if (declared === 'json-schema.org/draft/2020-12/schema') return '2020-12';
+  if (declared === 'json-schema.org/draft-07/schema') return 'draft-07';
+  throw new SchemaProblem(
+    '/$schema',
+    `unsupported JSON Schema dialect ${JSON.stringify(schema.$schema)} (supported: 2020-12, draft-07)`
+  );
+}
+
+// ---- draft-07 -> 2020-12 -------------------------------------------------------
+
+const isResourceId = (node) => typeof node.$id === 'string' && !node.$id.startsWith('#');
+const rewriteRef = (ref) =>
+  ref.replace('#/definitions', (match, offset, whole) => {
+    const next = whole[offset + match.length];
+    return next === undefined || next === '/' ? '#/$defs' : match;
+  });
+
+function translateMap(map, ptr, ctx) {
+  const out = {};
+  for (const [name, child] of Object.entries(map))
+    put(out, name, translateDraft07(child, `${ptr}/${escapePointer(name)}`, false, ctx));
+  return out;
+}
+
+function translateDraft07(node, ptr, isRoot, ctx) {
+  if (!isPlainObject(node)) return structuredClone(node);
+  const resource = isRoot || isResourceId(node);
+  const tuple = Array.isArray(node.items);
+  const out = {};
+  let legacyDefs;
+  // Draft-07 ignores every keyword beside `$ref`; 2020-12 evaluates them. Only
+  // the reference (and `definitions`, which a pointer ref may still resolve
+  // into) is kept, so the translated schema accepts what the original did.
+  const isRef = ctx.dropRefSiblings && typeof node.$ref === 'string';
+  for (const [key, value] of Object.entries(node)) {
+    if (isRef && key !== '$ref' && key !== 'definitions') continue;
+    const at = `${ptr}/${escapePointer(key)}`;
+    // Draft-04 boolean bounds: `minimum: n, exclusiveMinimum: true` is
+    // 2020-12's `exclusiveMinimum: n`; `false` is the default.
+    if ((key === 'exclusiveMinimum' || key === 'exclusiveMaximum') && typeof value === 'boolean') {
+      const bound = key === 'exclusiveMinimum' ? 'minimum' : 'maximum';
+      if (value && typeof node[bound] === 'number') put(out, key, node[bound]);
+      continue;
+    }
+    if (
+      typeof value === 'number' &&
+      ((key === 'minimum' && node.exclusiveMinimum === true) || (key === 'maximum' && node.exclusiveMaximum === true))
+    ) {
+      continue;
+    }
+    if (key === 'items' && tuple) {
+      if (Object.hasOwn(node, 'prefixItems'))
+        throw new SchemaProblem(at, 'tuple "items" array conflicts with "prefixItems"');
+      put(
+        out,
+        'prefixItems',
+        value.map((child, i) => translateDraft07(child, `${at}/${i}`, false, ctx))
+      );
+    } else if (key === 'additionalItems' && tuple) {
+      put(out, 'items', translateDraft07(value, at, false, ctx));
+    } else if (key === 'dependencies' && isPlainObject(value)) {
+      if (Object.hasOwn(node, 'dependentRequired') || Object.hasOwn(node, 'dependentSchemas')) {
+        throw new SchemaProblem(at, '"dependencies" conflicts with dependentRequired/dependentSchemas');
+      }
+      for (const [name, dep] of Object.entries(value)) {
+        const target = Array.isArray(dep) ? 'dependentRequired' : 'dependentSchemas';
+        if (!Object.hasOwn(out, target)) put(out, target, {});
+        put(
+          out[target],
+          name,
+          Array.isArray(dep) ? structuredClone(dep) : translateDraft07(dep, `${at}/${escapePointer(name)}`, false, ctx)
+        );
+      }
+    } else if (key === 'definitions' && resource && ctx.renameDefs && isPlainObject(value)) {
+      legacyDefs = { value: translateMap(value, at, ctx), at };
+    } else if (key === '$ref' && typeof value === 'string') {
+      put(out, key, ctx.renameDefs ? rewriteRef(value) : value);
+    } else if (MAP_KEYS.includes(key) && isPlainObject(value)) {
+      put(out, key, translateMap(value, at, ctx));
+    } else if (NODE_KEYS.includes(key)) {
+      put(out, key, translateDraft07(value, at, false, ctx));
+    } else if (LIST_KEYS.includes(key) && Array.isArray(value)) {
+      put(
+        out,
+        key,
+        value.map((child, i) => translateDraft07(child, `${at}/${i}`, false, ctx))
+      );
+    } else {
+      put(out, key, structuredClone(value));
+    }
+  }
+  if (legacyDefs) {
+    if (Object.hasOwn(out, '$defs'))
+      throw new SchemaProblem(legacyDefs.at, '"definitions" and "$defs" are both present');
+    put(out, '$defs', legacyDefs.value);
+  }
+  return out;
+}
+
+// ---- validation ----------------------------------------------------------------
+
+// Where a `$ref` the validator could not resolve is written (diagnostics only).
+function refPointer(node, matches, ptr = '') {
+  if (Array.isArray(node)) {
+    for (const [i, child] of node.entries()) {
+      const found = refPointer(child, matches, `${ptr}/${i}`);
+      if (found !== undefined) return found;
+    }
+  } else if (isPlainObject(node)) {
+    if (typeof node.$ref === 'string' && matches(node.$ref)) return `${ptr}/$ref`;
+    for (const [key, child] of Object.entries(node)) {
+      const found = refPointer(child, matches, `${ptr}/${escapePointer(key)}`);
+      if (found !== undefined) return found;
+    }
+  }
+  return undefined;
+}
+
+function assertValidDraft202012(schema) {
+  const ajv = new Ajv2020({ strict: false, validateFormats: false, validateSchema: false });
+  // Draft-04 `id` is an annotation providers ignore; Ajv would refuse it.
+  ajv.removeKeyword('id');
+  ajv.addKeyword('id');
+  if (!ajv.validateSchema(schema)) {
+    const [error] = ajv.errors;
+    throw new SchemaProblem(error.instancePath, `not a valid JSON Schema 2020-12 schema: ${error.message}`);
+  }
+  try {
+    ajv.compile(schema);
+  } catch (error) {
+    if (!error.missingRef) throw new SchemaProblem('', error.message);
+    const pointer = refPointer(schema, (ref) => error.missingRef === ref || error.missingRef.endsWith(ref)) ?? '';
+    throw new SchemaProblem(pointer, `unresolvable $ref "${error.missingRef}"`);
+  }
+}
+
+// `rule`: 'anthropic' (object root, no root combinators), 'openai' (object
+// root) or 'gemini' (object root, or no type at all).
+function assertObjectRoot(schema, rule) {
+  const label = rule === 'anthropic' ? 'Anthropic input_schema root' : 'the input schema root';
+  if (rule === 'gemini' && schema.type === undefined) return;
+  if (schema.type !== 'object') throw new SchemaProblem('/type', `${label} must have type "object"`);
+  if (rule !== 'anthropic') return;
+  for (const key of ROOT_FORBIDDEN_KEYS) {
+    if (Object.hasOwn(schema, key)) {
+      throw new SchemaProblem(`/${key}`, `Anthropic input_schema does not allow a root "${key}"`);
+    }
+  }
+}
+
+function buildSchema(inputSchema) {
+  if (!isPlainObject(inputSchema)) throw new SchemaProblem('', 'the input schema must be a JSON object schema');
+  const { $schema, ...rest } = inputSchema;
+  const schema = dialectOf(inputSchema) === 'draft-07' ? translateDraft07(rest, '', true, DRAFT07) : structuredClone(rest);
+  assertValidDraft202012(schema);
+  assertObjectRoot(schema, 'anthropic');
+  return schema;
+}
+
+// ---- per-wire normalization -----------------------------------------------------
+//
+// A schema the wire accepts as written is sent as written (byte-identical, so
+// the prompt cache holds). Only a schema that fails validation is repaired --
+// draft-07/04 constructs lowered to 2020-12 (tuple `items`, `definitions`,
+// `dependencies`, boolean exclusive bounds, keywords beside `$ref`), a missing
+// root `type` filled in -- and re-validated; what still fails is excluded.
+
+function repairRoot(schema) {
+  const { type } = schema;
+  if (Array.isArray(type) && type.includes('object')) return { ...schema, type: 'object' };
+  if (type !== undefined || Object.hasOwn(schema, '$ref')) return schema;
+  const out = { type: 'object', ...schema };
+  if (!Object.hasOwn(out, 'properties') && !ROOT_FORBIDDEN_KEYS.some((k) => Object.hasOwn(out, k)))
+    out.properties = {};
+  return out;
+}
+
+// Whether any `$ref` points into a draft-07 `#/definitions` table.
+function refsIntoDefinitions(node) {
+  if (Array.isArray(node)) return node.some(refsIntoDefinitions);
+  if (!isPlainObject(node)) return false;
+  return Object.entries(node).some(
+    ([key, value]) => (key === '$ref' && typeof value === 'string' && /^#\/definitions(\/|$)/.test(value)) || refsIntoDefinitions(value)
+  );
+}
+
+// Only a schema that declares draft-07/04 gets draft-07 `$ref` semantics
+// (keywords beside `$ref` ignored); otherwise siblings are real constraints.
+const declaresLegacyDraft = ($schema) => typeof $schema === 'string' && /draft-0[4-7]/.test($schema);
+
+/** The lowered copy of a tool input schema for `rule`, or null when it cannot
+ *  be lowered. Fixes only what validation rejects: tuple `items`, boolean
+ *  exclusive bounds, `dependencies`, draft-07 `definitions` refs and the root
+ *  `type`. Never mutates `inputSchema`. */
+export function repairedToolInputSchema(inputSchema, rule) {
+  if (!isPlainObject(inputSchema)) return null;
+  const { $schema, ...rest } = inputSchema;
+  try {
+    const lowered = translateDraft07(rest, '', true, {
+      dropRefSiblings: declaresLegacyDraft($schema),
+      renameDefs: refsIntoDefinitions(rest),
+    });
+    return rule === 'gemini' ? lowered : repairRoot(lowered);
+  } catch (error) {
+    if (error instanceof SchemaProblem) return null;
+    throw error;
+  }
+}
+
+const wireProblems = new Map();
+
+/** Why `schema` is not accepted as written on a `rule` wire, as `{ pointer,
+ *  reason }`, or null. `$schema` is not validated against (the provider reads
+ *  the keywords, not the dialect). */
+function wireProblem(schema, rule) {
+  let key;
+  try {
+    key = `${rule}\0${JSON.stringify(schema) ?? 'undefined'}`;
+  } catch {
+    key = null;
+  }
+  if (key !== null && wireProblems.has(key)) return wireProblems.get(key);
+  let problem = null;
+  try {
+    if (!isPlainObject(schema)) throw new SchemaProblem('', 'the input schema must be a JSON object schema');
+    const { $schema, ...rest } = schema;
+    assertValidDraft202012(rest);
+    assertObjectRoot(rest, rule);
+  } catch (error) {
+    if (!(error instanceof SchemaProblem)) throw error;
+    problem = { pointer: error.pointer, reason: error.message };
+  }
+  if (key !== null) {
+    if (wireProblems.size >= CACHE_LIMIT) wireProblems.clear();
+    wireProblems.set(key, problem);
+  }
+  return problem;
+}
+
+/** The schema to send for a tool on a `rule` wire: `{ schema }` (the same
+ *  object when it is accepted as written, else its lowered copy), or `{
+ *  pointer, reason }` when it is broken even after lowering. */
+export function wireInputSchema(inputSchema, rule) {
+  const problem = wireProblem(inputSchema, rule);
+  if (!problem) return { schema: inputSchema };
+  const repaired = repairedToolInputSchema(inputSchema, rule);
+  const remaining = repaired ? wireProblem(repaired, rule) : problem;
+  return remaining || { schema: repaired };
+}
+
+/** `tools` with each unacceptable one left out (reported through
+ *  `onToolExcluded`) and each repairable one carrying its lowered schema; the
+ *  same array when nothing changed. A tool without a schema is sent as
+ *  written, as is any tool `isExempt` names (no JSON schema on the wire). */
+export function acceptedWireTools(tools, rule, onToolExcluded, source, isExempt = () => false) {
+  let changed = false;
+  const out = [];
+  tools.forEach((tool, index) => {
+    const schema = tool?.inputSchema;
+    if (schema == null || isExempt(tool)) {
+      out.push(tool);
+      return;
+    }
+    const result = wireInputSchema(schema, rule);
+    if (!result.schema) {
+      reportInvalidTool(tool.name, index, result, onToolExcluded, source);
+      changed = true;
+    } else if (result.schema !== schema) {
+      out.push({ ...tool, inputSchema: result.schema });
+      changed = true;
+    } else out.push(tool);
+  });
+  return changed ? out : tools;
+}
+
+const cache = new Map();
+const CACHE_LIMIT = 256;
+
+/** The draft 2020-12 `parametersJsonSchema` for a Claude tool declaration:
+ *  `{ schema }`, or `{ pointer, reason }` (a JSON pointer into the tool's own
+ *  input schema) when the schema is invalid under its dialect or for the
+ *  provider. Never mutates `inputSchema`. */
+export function claudeBridgeInputSchema(inputSchema) {
+  let key;
+  try {
+    key = JSON.stringify(inputSchema) ?? 'undefined';
+  } catch {
+    key = null;
+  }
+  let result = key === null ? undefined : cache.get(key);
+  if (!result) {
+    try {
+      result = { schema: buildSchema(inputSchema) };
+    } catch (error) {
+      if (!(error instanceof SchemaProblem)) throw error;
+      // Not valid as written: lower undeclared draft-07/04 constructs and
+      // fill the root type; only a schema still broken is excluded.
+      const repaired = repairedToolInputSchema(inputSchema, 'anthropic');
+      result = repaired && !wireProblem(repaired, 'anthropic') ? { schema: repaired } : { pointer: error.pointer, reason: error.message };
+    }
+    if (key !== null) {
+      if (cache.size >= CACHE_LIMIT) cache.clear();
+      cache.set(key, result);
+    }
+  }
+  return result.schema ? { schema: structuredClone(result.schema) } : result;
+}
+
+/** Why `schema` is not a valid Gemini `parametersJsonSchema` (a JSON Schema
+ *  2020-12 schema with an object root), as `{ pointer, reason }` into the
+ *  schema, or null when it is valid. Never mutates `schema`. */
+export const geminiJsonSchemaProblem = (schema) => wireProblem(schema, 'gemini');
+
+const warned = new Set();
+
+/** An invalid tool is left out of the request and reported with its name,
+ *  index, pointer and reason: to `onToolExcluded({ name, index, pointer,
+ *  reason, message })` when given (the agent loop records it for the session),
+ *  otherwise once per distinct problem on console.warn. `source` prefixes the
+ *  console message (which route and kind of tool). */
+export function reportInvalidTool(
+  toolName,
+  index,
+  { pointer, reason },
+  onToolExcluded,
+  source = '[antigravity] Claude tool'
+) {
+  const at = pointer || '/';
+  const message = `${source} "${toolName}" (tools[${index}]) excluded: invalid input schema at "${at}": ${reason}`;
+  if (typeof onToolExcluded === 'function') {
+    return onToolExcluded({ name: toolName, index, pointer: at, reason, message });
+  }
+  if (warned.has(message)) return undefined;
+  warned.add(message);
+  return console.warn(message);
+}

package/src/runtime/agent/orchestrator/providers/lib/inclusive-usage.mjs

@@ -0,0 +1,54 @@
+// Anthropic Messages usage reports input EXCLUDING cache read/write. A gateway
+// provider whose ledger convention is inclusive input (OpenCode Go, Command
+// Code, OpenRouter, DeepSeek — registry inputExcludesCache:false) reports its
+// Messages route in that inclusive form, so every wire of one provider counts
+// prompt volume the same way.
+import { currentUsageContext } from '../../../../shared/llm/usage-context.mjs';
+
+// Usage objects already converted to the inclusive convention; a converted
+// object passing through another normalization (nested send) stays as is,
+// and one source object always converts to the same object, so an abandoned
+// attempt and the error that later carries it stay one record.
+const inclusiveUsage = new WeakSet();
+const convertedUsage = new WeakMap();
+
+export function toInclusiveUsage(usage) {
+  if (!usage || inclusiveUsage.has(usage)) return usage;
+  if (convertedUsage.has(usage)) return convertedUsage.get(usage);
+  const input = Number(usage.inputTokens) || 0;
+  const cached = Number(usage.cachedTokens) || 0;
+  const cacheWrite = Number(usage.cacheWriteTokens) || 0;
+  const inclusiveInput = input + cached + cacheWrite;
+  const converted = {
+    ...usage,
+    inputTokens: inclusiveInput,
+    promptTokens: Math.max(Number(usage.promptTokens) || 0, inclusiveInput),
+  };
+  inclusiveUsage.add(converted);
+  convertedUsage.set(usage, converted);
+  return converted;
+}
+
+export function toInclusiveUsageError(error) {
+  if (error && typeof error === 'object') {
+    if (error.usage) error.usage = toInclusiveUsage(error.usage);
+    if (error.partialUsage) error.partialUsage = toInclusiveUsage(error.partialUsage);
+  }
+  return error;
+}
+
+/**
+ * Run one Messages-wire send of an inclusive-input provider: the success
+ * usage, a failure's usage/partial usage and every abandoned attempt the
+ * inner Anthropic transport notes are all reported inclusive.
+ */
+export async function withInclusiveUsage(send) {
+  const identity = currentUsageContext();
+  if (identity) identity.normalizeAbandonedUsage = toInclusiveUsage;
+  try {
+    const result = await send();
+    return result?.usage ? { ...result, usage: toInclusiveUsage(result.usage) } : result;
+  } catch (error) {
+    throw toInclusiveUsageError(error);
+  }
+}

package/src/runtime/agent/orchestrator/providers/lib/origin-bound-fetch.mjs

@@ -0,0 +1,16 @@
+// A fetch bound to one gateway origin: anything outside `origin` is refused
+// before the credential leaves the process, and redirects are never followed
+// (any 3xx is an error), so a gateway credential can only reach its gateway.
+export function originBoundFetch(origin, fetchImpl, label) {
+  return async (input, init) => {
+    const url = new URL(String(input?.url ?? input));
+    if (url.origin !== origin) {
+      throw new Error(`[${label}] refusing to send the API key to ${url.host}`);
+    }
+    const res = await (fetchImpl || globalThis.fetch)(input, { ...init, redirect: 'manual' });
+    if (res.status >= 300 && res.status < 400) {
+      throw new Error(`[${label}] refusing to follow a redirect from ${url.host}`);
+    }
+    return res;
+  };
+}

package/src/runtime/agent/orchestrator/providers/lib/responses-terminal-fields.mjs

@@ -23,6 +23,17 @@ export function incompleteReasonFromEvent(event) {
   return String(reasonObj?.reason || event?.response?.status || 'incomplete');
 }
 
+// A function/custom/tool_search call item the server cut off (status
+// 'incomplete'): its arguments or input are truncated, so it is never a call
+// to run or replay. The stream keeps it tracked as a tool still in flight, so
+// the terminal frame reads as a pending-tool cutoff.
+export function isIncompleteToolItem(item) {
+  return (
+    item?.status === 'incomplete' &&
+    (item.type === 'function_call' || item.type === 'custom_tool_call' || item.type === 'tool_search_call')
+  );
+}
+
 export function isMaxOutputIncompleteReason(reason) {
   return /^(?:max_output_tokens|max_tokens|length|output_token_limit)$/i.test(String(reason || '').trim());
 }

package/src/runtime/agent/orchestrator/providers/lib/usage-primitives.mjs

@@ -19,6 +19,14 @@ export function round(value, digits = 4) {
   return Math.round(n * scale) / scale;
 }
 
+// Provider-reported USD cost. null/empty/non-finite/negative is "not
+// reported" (undefined), never a reported $0.
+export function reportedCostUsd(value) {
+  if (value == null || (typeof value === 'string' && value.trim() === '')) return undefined;
+  const n = Number(value);
+  return Number.isFinite(n) && n >= 0 ? n : undefined;
+}
+
 export function cleanString(value) {
   const s = typeof value === 'string' ? value.trim() : '';
   return s || null;

package/src/runtime/agent/orchestrator/providers/lib/wire-pairing.mjs

@@ -25,10 +25,19 @@ function isObject(value) {
   return value !== null && typeof value === 'object' && !Array.isArray(value);
 }
 
+// A server-executed tool search (execution:'server', or call_id null) is
+// answered by the server inside the same response. It is never a client call
+// awaiting a client output, so the guard neither pairs nor synthesizes it.
+function isServerToolSearch(item) {
+  return (item.type === 'tool_search_call' || item.type === 'tool_search_output') &&
+    (item.execution === 'server' || item.call_id === null);
+}
+
 function responsesCallId(item) {
   if (!isObject(item)) return null;
   if (item.type !== 'function_call' && item.type !== 'custom_tool_call' && item.type !== 'tool_search_call')
     return null;
+  if (isServerToolSearch(item)) return null;
   const id = item.call_id || item.id || '';
   return typeof id === 'string' && id ? id : null;
 }
@@ -41,6 +50,7 @@ function responsesOutputId(item) {
     item.type !== 'tool_search_output'
   )
     return null;
+  if (isServerToolSearch(item)) return null;
   const id = item.call_id || item.id || '';
   return typeof id === 'string' && id ? id : null;
 }
@@ -50,7 +60,6 @@ function syntheticResponsesOutput(call) {
     return {
       type: 'custom_tool_call_output',
       call_id: call.call_id || call.id || '',
-      ...(typeof call.name === 'string' && call.name ? { name: call.name } : {}),
       output: WIRE_PAIRING_STUB,
     };
   }
@@ -117,33 +126,50 @@ function chatResultId(message) {
 }
 
 /**
- * Ensure every chat assistant `tool_calls` entry has a following tool
- * message. Returns the original array when already paired, otherwise a new
- * array with synthetic tool messages inserted right after their assistant
- * message (providers require the results to follow the call message).
+ * Ensure every chat assistant `tool_calls` entry is answered by a tool
+ * message in the run immediately following that assistant message (OpenAI
+ * function calling / Meta chat contract), and that no tool message exists
+ * anywhere else. A result after an intervening user/assistant message, or one
+ * answering another occurrence of the same id, does not pair the call; the
+ * call gets a synthetic stub right after its assistant message and the
+ * misplaced tool message is DROPPED (Chat Completions rejects a tool message
+ * that does not follow its tool_calls block; a late result is not relocated).
+ * Within the run, results for ids the block did not call and repeated results
+ * for one id are dropped too. Returns the original array when already valid.
  */
 export function ensureChatToolPairs(messages) {
   if (!Array.isArray(messages) || messages.length === 0) return messages;
-  const resultIds = new Set();
-  for (const message of messages) {
-    const id = chatResultId(message);
-    if (id) resultIds.add(id);
-  }
-  let missing = 0;
-  for (const message of messages) {
-    for (const id of chatToolCallIds(message)) {
-      if (!resultIds.has(id)) missing += 1;
-    }
-  }
-  if (missing === 0) return messages;
   const out = [];
-  for (const message of messages) {
+  let changed = false;
+  for (let i = 0; i < messages.length; i += 1) {
+    const message = messages[i];
+    if (isObject(message) && message.role === 'tool') {
+      changed = true;
+      continue;
+    }
     out.push(message);
-    for (const id of chatToolCallIds(message)) {
-      if (resultIds.has(id)) continue;
+    const callIds = chatToolCallIds(message);
+    if (!callIds.length) continue;
+    let end = i + 1;
+    while (end < messages.length && isObject(messages[end]) && messages[end].role === 'tool') end += 1;
+    const answered = new Set();
+    const kept = [];
+    for (const result of messages.slice(i + 1, end)) {
+      const id = chatResultId(result);
+      if (id && callIds.includes(id) && !answered.has(id)) {
+        answered.add(id);
+        kept.push(result);
+      } else {
+        changed = true;
+      }
+    }
+    for (const id of callIds) {
+      if (answered.has(id)) continue;
+      changed = true;
       out.push({ role: 'tool', tool_call_id: id, content: WIRE_PAIRING_STUB });
-      resultIds.add(id);
     }
+    out.push(...kept);
+    i = end - 1;
   }
-  return out;
+  return changed ? out : messages;
 }