@opengeni/runtime 6.5.2-canary.41607687019001 → 6.7.0

package/dist/{chunk-AE7DWNDQ.js → chunk-FNAYH3SN.js}

@@ -47,14 +47,14 @@ function toolCallIdFromSdkItem(item) {
   if (!item || typeof item !== "object" || Array.isArray(item)) {
     return void 0;
   }
-  const record3 = item;
-  if (typeof record3.callId === "string" && record3.callId.length > 0) {
-    return record3.callId;
+  const record4 = item;
+  if (typeof record4.callId === "string" && record4.callId.length > 0) {
+    return record4.callId;
   }
-  if (typeof record3.call_id === "string" && record3.call_id.length > 0) {
-    return record3.call_id;
+  if (typeof record4.call_id === "string" && record4.call_id.length > 0) {
+    return record4.call_id;
   }
-  const provider = record3.providerData;
+  const provider = record4.providerData;
   if (provider && typeof provider === "object") {
     if (typeof provider.call_id === "string" && provider.call_id.length > 0) {
       return provider.call_id;
@@ -363,12 +363,12 @@ function projectRejectedProviderArtifactsFromSerializedRunState(serialized) {
 }
 function hasOpaqueProviderArtifact(item) {
   if (!item || typeof item !== "object") return false;
-  const record3 = item;
-  if (record3.type !== "reasoning" && record3.type !== "compaction") return false;
-  if (typeof record3.encrypted_content === "string" && record3.encrypted_content.length > 0) {
+  const record4 = item;
+  if (record4.type !== "reasoning" && record4.type !== "compaction") return false;
+  if (typeof record4.encrypted_content === "string" && record4.encrypted_content.length > 0) {
     return true;
   }
-  const providerData = record3.providerData && typeof record3.providerData === "object" ? record3.providerData : null;
+  const providerData = record4.providerData && typeof record4.providerData === "object" ? record4.providerData : null;
   return Boolean(
     providerData && (typeof providerData.encrypted_content === "string" && providerData.encrypted_content.length > 0 || typeof providerData.encryptedContent === "string" && providerData.encryptedContent.length > 0)
   );
@@ -409,11 +409,11 @@ function normalizeComputerCallActions(items) {
 }
 function normalizeComputerCallAction(item) {
   if (itemType(item) !== "computer_call") return item;
-  const record3 = item;
-  const hasAction = record3.action !== void 0 && record3.action !== null;
-  const hasActions = Array.isArray(record3.actions) && record3.actions.length > 0;
+  const record4 = item;
+  const hasAction = record4.action !== void 0 && record4.action !== null;
+  const hasActions = Array.isArray(record4.actions) && record4.actions.length > 0;
   if (!hasAction || !hasActions) return item;
-  const { action: _droppedAction, ...rest } = record3;
+  const { action: _droppedAction, ...rest } = record4;
   return rest;
 }
 function rewriteComputerCallsToActionsOnly(body) {
@@ -429,22 +429,22 @@ function rewriteComputerCallsToActionsOnly(body) {
     if (!item || typeof item !== "object") {
       continue;
     }
-    const record3 = item;
-    if (record3.type !== "computer_call") {
+    const record4 = item;
+    if (record4.type !== "computer_call") {
       continue;
     }
-    const existingActions = Array.isArray(record3.actions) && record3.actions.length > 0 ? record3.actions : void 0;
-    const actions = existingActions ?? (record3.action !== void 0 && record3.action !== null ? [record3.action] : void 0);
+    const existingActions = Array.isArray(record4.actions) && record4.actions.length > 0 ? record4.actions : void 0;
+    const actions = existingActions ?? (record4.action !== void 0 && record4.action !== null ? [record4.action] : void 0);
     if (actions === void 0) {
       continue;
     }
-    const hadAction = "action" in record3;
+    const hadAction = "action" in record4;
     const actionsAlreadyExact = existingActions !== void 0 && !hadAction;
     if (actionsAlreadyExact) {
       continue;
     }
-    delete record3.action;
-    record3.actions = actions;
+    delete record4.action;
+    record4.actions = actions;
     changed = true;
   }
   return changed;
@@ -462,11 +462,11 @@ function rewriteEmptyComputerCallOutputImageUrls(body) {
     if (!item || typeof item !== "object") {
       continue;
     }
-    const record3 = item;
-    if (record3.type !== "computer_call_output") {
+    const record4 = item;
+    if (record4.type !== "computer_call_output") {
       continue;
     }
-    const output = record3.output;
+    const output = record4.output;
     if (!output || typeof output !== "object") {
       continue;
     }
@@ -1223,13 +1223,13 @@ var MAX_NATIVE_IMAGE_TOKENS = 36e3;
 function finitePositiveInteger(value) {
   return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : null;
 }
-function dimensionsFromRecord(record3) {
-  const width = finitePositiveInteger(record3.width);
-  const height = finitePositiveInteger(record3.height);
+function dimensionsFromRecord(record4) {
+  const width = finitePositiveInteger(record4.width);
+  const height = finitePositiveInteger(record4.height);
   if (width && height) return [width, height];
-  if (Array.isArray(record3.dimensions) && record3.dimensions.length >= 2) {
-    const dimensionsWidth = finitePositiveInteger(record3.dimensions[0]);
-    const dimensionsHeight = finitePositiveInteger(record3.dimensions[1]);
+  if (Array.isArray(record4.dimensions) && record4.dimensions.length >= 2) {
+    const dimensionsWidth = finitePositiveInteger(record4.dimensions[0]);
+    const dimensionsHeight = finitePositiveInteger(record4.dimensions[1]);
     if (dimensionsWidth && dimensionsHeight) return [dimensionsWidth, dimensionsHeight];
   }
   return null;
@@ -1319,11 +1319,11 @@ function dimensionsFromImageSource(source) {
     return bytes ? dimensionsFromImageBytes(bytes) : null;
   }
   if (!source || typeof source !== "object") return null;
-  const record3 = source;
-  const rawData = record3.data;
-  const mediaType = record3.mediaType ?? record3.media_type;
+  const record4 = source;
+  const rawData = record4.data;
+  const mediaType = record4.mediaType ?? record4.media_type;
   const rawDataDimensions = rawData instanceof Uint8Array ? dimensionsFromImageBytes(rawData) : typeof rawData === "string" && typeof mediaType === "string" && mediaType.toLowerCase().startsWith("image/") ? dimensionsFromImageBytes(base64BytesPrefix(rawData) ?? new Uint8Array()) : null;
-  return dimensionsFromRecord(record3) ?? rawDataDimensions ?? dimensionsFromImageSource(record3.url) ?? dimensionsFromImageSource(rawData);
+  return dimensionsFromRecord(record4) ?? rawDataDimensions ?? dimensionsFromImageSource(record4.url) ?? dimensionsFromImageSource(rawData);
 }
 function patchImageTokens(width, height) {
   return Math.min(
@@ -1371,10 +1371,10 @@ function countModelInputImages(value) {
     for (const entry of value) count2 += countModelInputImages(entry);
     return count2;
   }
-  const record3 = value;
-  if (typeof record3.type === "string" && NATIVE_IMAGE_PART_TYPES.has(record3.type)) return 1;
+  const record4 = value;
+  if (typeof record4.type === "string" && NATIVE_IMAGE_PART_TYPES.has(record4.type)) return 1;
   let count = 0;
-  for (const [key, entry] of Object.entries(record3)) {
+  for (const [key, entry] of Object.entries(record4)) {
     if (typeof entry === "string") {
       if (key === "output" && entry.startsWith("data:image/")) count += 1;
     } else {
@@ -1383,19 +1383,19 @@ function countModelInputImages(value) {
   }
   return count;
 }
-function imageDescriptor(record3) {
-  const type = typeof record3.type === "string" ? record3.type : "";
+function imageDescriptor(record4) {
+  const type = typeof record4.type === "string" ? record4.type : "";
   if (!NATIVE_IMAGE_PART_TYPES.has(type)) {
     return null;
   }
-  const imageUrl = record3.image_url;
+  const imageUrl = record4.image_url;
   const nestedImageUrl = imageUrl && typeof imageUrl === "object" ? imageUrl.url : imageUrl;
-  const source = record3.image ?? record3.imageUrl ?? nestedImageUrl ?? record3.data ?? record3.url ?? record3.fileId ?? record3.file_id ?? record3.artifact ?? record3.artifactReference;
+  const source = record4.image ?? record4.imageUrl ?? nestedImageUrl ?? record4.data ?? record4.url ?? record4.fileId ?? record4.file_id ?? record4.artifact ?? record4.artifactReference;
   const nestedDetail = imageUrl && typeof imageUrl === "object" ? imageUrl.detail : void 0;
-  const dimensions = dimensionsFromRecord(record3) ?? (source && typeof source === "object" ? dimensionsFromRecord(source) : null);
+  const dimensions = dimensionsFromRecord(record4) ?? (source && typeof source === "object" ? dimensionsFromRecord(source) : null);
   return {
     source,
-    detail: typeof record3.detail === "string" ? record3.detail : typeof nestedDetail === "string" ? nestedDetail : "auto",
+    detail: typeof record4.detail === "string" ? record4.detail : typeof nestedDetail === "string" ? nestedDetail : "auto",
     width: dimensions?.[0] ?? null,
     height: dimensions?.[1] ?? null
   };
@@ -1422,8 +1422,8 @@ function projectNativeImages(value, seen) {
     seen.delete(value);
     return { value: projected2, imageTokens: imageTokens2, imageCount: imageCount2, imageFallbackCount: imageFallbackCount2 };
   }
-  const record3 = value;
-  const descriptor = imageDescriptor(record3);
+  const record4 = value;
+  const descriptor = imageDescriptor(record4);
   if (descriptor) {
     const estimate = estimateNativeImageTokens(descriptor);
     const projected2 = {};
@@ -1438,7 +1438,7 @@ function projectNativeImages(value, seen) {
       "artifact",
       "artifactReference"
     ]);
-    for (const [key, entry] of Object.entries(record3)) {
+    for (const [key, entry] of Object.entries(record4)) {
       projected2[key] = payloadKeys.has(key) ? "[native image]" : entry;
     }
     projected2.image_estimate = {
@@ -1459,7 +1459,7 @@ function projectNativeImages(value, seen) {
   let imageCount = 0;
   let imageFallbackCount = 0;
   const projected = {};
-  for (const [key, entry] of Object.entries(record3)) {
+  for (const [key, entry] of Object.entries(record4)) {
     const result = projectNativeImages(entry, seen);
     projected[key] = result.value;
     imageTokens += result.imageTokens;
@@ -1479,13 +1479,13 @@ function estimateOpaqueEncryptedTokens(encodedLen) {
 }
 function opaqueEncryptedContentLength(item) {
   if (!item || typeof item !== "object") return null;
-  const record3 = item;
-  const type = typeof record3.type === "string" ? record3.type : "";
-  if ((type === "compaction" || type === "context_compaction" || type === "reasoning") && typeof record3.encrypted_content === "string" && record3.encrypted_content.length > 0) {
-    return record3.encrypted_content.length;
+  const record4 = item;
+  const type = typeof record4.type === "string" ? record4.type : "";
+  if ((type === "compaction" || type === "context_compaction" || type === "reasoning") && typeof record4.encrypted_content === "string" && record4.encrypted_content.length > 0) {
+    return record4.encrypted_content.length;
   }
   if (type === "reasoning") {
-    const providerData = record3.providerData && typeof record3.providerData === "object" ? record3.providerData : null;
+    const providerData = record4.providerData && typeof record4.providerData === "object" ? record4.providerData : null;
     const nested = providerData && typeof providerData.encrypted_content === "string" ? providerData.encrypted_content : providerData && typeof providerData.encryptedContent === "string" ? providerData.encryptedContent : null;
     if (nested && nested.length > 0) return nested.length;
   }
@@ -1775,8 +1775,8 @@ function findCompactionNeededError(error, seen = /* @__PURE__ */ new WeakSet())
     return null;
   }
   seen.add(error);
-  const record3 = error;
-  return findCompactionNeededError(record3.cause, seen) ?? findCompactionNeededError(record3.error, seen);
+  const record4 = error;
+  return findCompactionNeededError(record4.cause, seen) ?? findCompactionNeededError(record4.error, seen);
 }
 function buildCompactionPromptInput(items) {
   return [
@@ -1848,9 +1848,9 @@ function remoteCompactionShellOutputIsMinimal(output) {
   if (!Array.isArray(output) || output.length !== 1) return false;
   const result = output[0];
   if (!result || typeof result !== "object" || Array.isArray(result)) return false;
-  const record3 = result;
-  const outcome = record3.outcome;
-  return record3.stdout === "" && record3.stderr === REMOTE_COMPACTION_TOOL_RESULT_OMISSION && outcome !== null && typeof outcome === "object" && !Array.isArray(outcome) && outcome.type === "exit" && outcome.exitCode === null && Object.keys(record3).length === 3 && Object.keys(outcome).length === 2;
+  const record4 = result;
+  const outcome = record4.outcome;
+  return record4.stdout === "" && record4.stderr === REMOTE_COMPACTION_TOOL_RESULT_OMISSION && outcome !== null && typeof outcome === "object" && !Array.isArray(outcome) && outcome.type === "exit" && outcome.exitCode === null && Object.keys(record4).length === 3 && Object.keys(outcome).length === 2;
 }
 function omitOpaqueArtifactsFromPortableCompactionHistory(items) {
   let changed = false;
@@ -2141,8 +2141,8 @@ function rebuildAroundCheckpoint(items, checkpoint, options) {
 }
 function isRemoteCompactionItem(item) {
   if (!item || typeof item !== "object") return false;
-  const record3 = item;
-  return record3.type === "compaction" && typeof record3.encrypted_content === "string" && record3.encrypted_content.length > 0;
+  const record4 = item;
+  return record4.type === "compaction" && typeof record4.encrypted_content === "string" && record4.encrypted_content.length > 0;
 }
 function isRetainedRemoteV2Message(item) {
   if (isCompactionSummary(item) || isAttachmentCatalog(item) || itemType2(item) === "compaction") {
@@ -2261,8 +2261,8 @@ function extractRemoteCompactionV2OutputItem(response) {
       reason: "no_response"
     });
   }
-  const record3 = response;
-  const output = Array.isArray(record3.output) ? record3.output : [];
+  const record4 = response;
+  const output = Array.isArray(record4.output) ? record4.output : [];
   const compactionItems = output.filter(isRemoteCompactionItem);
   if (compactionItems.length !== 1) {
     throw new EmptyCompactionSummaryError({
@@ -2402,12 +2402,12 @@ function messageText2(item) {
   if (Array.isArray(content)) {
     return content.map((part) => {
       if (part && typeof part === "object") {
-        const record3 = part;
-        if (typeof record3.text === "string") {
-          return record3.text;
+        const record4 = part;
+        if (typeof record4.text === "string") {
+          return record4.text;
         }
-        if (typeof record3.content === "string") {
-          return record3.content;
+        if (typeof record4.content === "string") {
+          return record4.content;
         }
       }
       return "";
@@ -3211,11 +3211,11 @@ function mergeQueryParamsIntoURL(url, query) {
   }
 }
 function ensureResponsesWebSocketPath(pathname) {
-  const normalizedPath = pathname.replace(/\/+$/, "");
-  if (normalizedPath === "/responses" || normalizedPath.endsWith("/responses")) {
-    return normalizedPath;
+  const normalizedPath2 = pathname.replace(/\/+$/, "");
+  if (normalizedPath2 === "/responses" || normalizedPath2.endsWith("/responses")) {
+    return normalizedPath2;
   }
-  return `${normalizedPath}/responses`;
+  return `${normalizedPath2}/responses`;
 }
 
 // ../../node_modules/.bun/@openai+agents-openai@0.14.3+933c5e7db4cd33c2/node_modules/@openai/agents-openai/dist/utils/providerData.mjs
@@ -4372,10 +4372,10 @@ function getProviderDataField(providerData, keys) {
   if (!providerData || typeof providerData !== "object" || Array.isArray(providerData)) {
     return void 0;
   }
-  const record3 = providerData;
+  const record4 = providerData;
   for (const key of keys) {
-    if (typeof record3[key] !== "undefined") {
-      return record3[key];
+    if (typeof record4[key] !== "undefined") {
+      return record4[key];
     }
   }
   return void 0;
@@ -8010,11 +8010,11 @@ function stripConversationPersistenceMetadata(items) {
     if (Array.isArray(item) || item === null || typeof item !== "object") {
       return [item];
     }
-    const record3 = item;
-    if (isUnpersistableReasoningItem(record3)) {
+    const record4 = item;
+    if (isUnpersistableReasoningItem(record4)) {
       return [];
     }
-    const { providerData: _providerData, provider_data: _provider_data, ...rest } = record3;
+    const { providerData: _providerData, provider_data: _provider_data, ...rest } = record4;
     if (rest.type !== "reasoning") {
       delete rest.id;
     }
@@ -8028,11 +8028,11 @@ function stripAssistantReplayMetadata(item) {
   if (Array.isArray(item) || item === null || typeof item !== "object") {
     return item;
   }
-  const record3 = item;
-  if (record3.type !== "message" || record3.role !== "assistant") {
+  const record4 = item;
+  if (record4.type !== "message" || record4.role !== "assistant") {
     return item;
   }
-  const { id: _id, providerData, provider_data: _provider_data, ...rest } = record3;
+  const { id: _id, providerData, provider_data: _provider_data, ...rest } = record4;
   if (typeof rest.phase === "undefined" && providerData && typeof providerData === "object" && !Array.isArray(providerData) && typeof providerData.phase !== "undefined") {
     rest.phase = providerData.phase;
   }
@@ -9532,6 +9532,25 @@ async function* streamWithPreemption(request, preemption, open) {
   }
 }
 
+// src/mcp-model-tool-name.ts
+import { createHash as createHash4 } from "crypto";
+import { prefixedMcpToolName as plainPrefixedMcpToolName } from "@opengeni/contracts";
+var ALIASED_MCP_TOOL_LEAF_LENGTH = 34;
+var ALIASED_MCP_TOOL_NAME = /^mcp_[0-9a-f]{24}__/;
+function prefixedMcpToolName(registryId, toolName) {
+  const name = plainPrefixedMcpToolName(registryId, toolName);
+  if (name.length <= 64 && /^[A-Za-z0-9_]+$/.test(name)) return name;
+  const digest2 = legacyMcpToolDigest(registryId, toolName).slice(0, 24);
+  const leaf = toolName.replace(/[^A-Za-z0-9_]/g, "_").slice(0, ALIASED_MCP_TOOL_LEAF_LENGTH) || "tool";
+  return `mcp_${digest2}__${leaf}`;
+}
+function legacyMcpToolDigest(registryId, toolName) {
+  return createHash4("sha256").update(JSON.stringify([registryId, toolName])).digest("hex");
+}
+function isAliasedMcpToolName(name) {
+  return ALIASED_MCP_TOOL_NAME.test(name);
+}
+
 // src/provider-history-adapter.ts
 import { collapseRepeatedSessionGoalContexts as collapseRepeatedSessionGoalContexts2 } from "@opengeni/contracts";
 
@@ -9544,9 +9563,9 @@ function primaryChatChoice(value) {
   return Array.isArray(choices) ? choices.map(object).find((choice) => choice?.index === 0) : void 0;
 }
 function chatReasoning(value) {
-  const record3 = object(value);
+  const record4 = object(value);
   for (const field2 of ["reasoning_content", "reasoning"]) {
-    const text2 = record3?.[field2];
+    const text2 = record4?.[field2];
     if (typeof text2 === "string" && text2.length > 0) return { field: field2, text: text2 };
   }
   return void 0;
@@ -9700,8 +9719,211 @@ function joinChatReasoningMessages(messages) {
   return result.length === messages.length ? messages : result;
 }
 
+// src/provider-tool-names.ts
+import { createHash as createHash5 } from "crypto";
+import { SECRET_VALUE_MASK_MIN_CHARS } from "@opengeni/contracts";
+var PROVIDER_TOOL_NAME = /^[a-zA-Z0-9_-]{1,64}$/;
+var VALID_NAME_PART = /^[a-zA-Z0-9_-]*$/;
+var DOTTED_NAME = /^[a-zA-Z0-9_.-]+$/;
+var TOOL_NAME_SEPARATOR = "__";
+var ALIAS_READABLE_LENGTH = 40;
+var ALIAS_DIGEST_LENGTH = 16;
+var TOOL_DISCLOSURE_KEY_PREFIX = "opengeni.tool_disclosure";
+var MASKING_LABEL = /\{\{secret:[^{}]*\}\}|\[opengeni credential:[^\]]*\]|\[masked [^\]]*\]|\[redacted:[^\]]*\]|\[secret\]/g;
+function isProviderToolName(name) {
+  return PROVIDER_TOOL_NAME.test(name);
+}
+function providerToolNameAlias(name) {
+  const readable = name.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, ALIAS_READABLE_LENGTH);
+  const digest2 = createHash5("sha256").update(name).digest("hex").slice(0, ALIAS_DIGEST_LENGTH);
+  return `${readable}_${digest2}`;
+}
+function escapeRegExp(text2) {
+  return text2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function uniqueMatch(candidates, matches) {
+  let match = null;
+  for (const candidate of candidates) {
+    if (!matches(candidate)) continue;
+    if (match !== null && match !== candidate) return null;
+    match = candidate;
+  }
+  return match;
+}
+function knownToolNameFor(name, known) {
+  const valid = known.filter(isProviderToolName);
+  if (name.includes(".") && DOTTED_NAME.test(name)) {
+    const dotted = name.replaceAll(".", TOOL_NAME_SEPARATOR);
+    if (valid.includes(dotted)) return dotted;
+    const published = name.replace(/[^a-zA-Z0-9_]/g, "_");
+    return uniqueMatch(valid, (candidate) => {
+      const separator = candidate.lastIndexOf(TOOL_NAME_SEPARATOR);
+      if (separator < 0) return false;
+      const leaf = candidate.slice(separator + TOOL_NAME_SEPARATOR.length);
+      return leaf === published || isAliasedMcpToolName(candidate) && leaf === published.slice(0, ALIASED_MCP_TOOL_LEAF_LENGTH);
+    });
+  }
+  if (!name.match(MASKING_LABEL)) return null;
+  const parts = name.split(MASKING_LABEL);
+  if (!parts.every((part) => VALID_NAME_PART.test(part))) return null;
+  if (parts.every((part) => part.length === 0)) return null;
+  const pattern = new RegExp(
+    `^${parts.map(escapeRegExp).join(`[a-zA-Z0-9_-]{${SECRET_VALUE_MASK_MIN_CHARS},}`)}$`
+  );
+  return uniqueMatch(valid, (candidate) => pattern.test(candidate));
+}
+function requestFunctionToolNames(tools) {
+  const names = [];
+  for (const tool2 of tools ?? []) {
+    if (isRecord6(tool2) && tool2.type === "function" && typeof tool2.name === "string") {
+      names.push(tool2.name);
+    }
+  }
+  return names;
+}
+function isRecord6(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+var NAMED_CALL_TYPES = /* @__PURE__ */ new Set([
+  "function_call",
+  "function_call_result",
+  "custom_tool_call"
+]);
+function hasNamespace(record4) {
+  return typeof record4.namespace === "string" && record4.namespace.length > 0;
+}
+function rewriteNamed(record4, visit, scoped) {
+  if (!isRecord6(record4)) return record4;
+  const isNamespace = record4.type === "namespace";
+  const nameScoped = scoped || isNamespace || hasNamespace(record4);
+  let next = null;
+  if (typeof record4.name === "string") {
+    const definition = record4.type === "function" ? record4 : void 0;
+    const valid = visit(record4.name, nameScoped ? "scoped" : "flat", definition);
+    if (valid !== record4.name) next = { ...record4, name: valid };
+  }
+  if (typeof record4.namespace === "string") {
+    const valid = visit(record4.namespace, "scoped");
+    if (valid !== record4.namespace) next = { ...next ?? record4, namespace: valid };
+  }
+  if (Array.isArray(record4.tools)) {
+    const tools = rewriteDefinitions(record4.tools, visit, scoped || isNamespace);
+    if (tools !== record4.tools) next = { ...next ?? record4, tools };
+  }
+  return next ?? record4;
+}
+function rewriteDefinitions(tools, visit, scoped) {
+  let changed = false;
+  const rewritten = tools.map((tool2) => {
+    const next = rewriteNamed(tool2, visit, scoped);
+    if (next !== tool2) changed = true;
+    return next;
+  });
+  if (!changed) return tools;
+  const seen = /* @__PURE__ */ new Set();
+  return rewritten.filter((tool2) => {
+    if (!isRecord6(tool2) || typeof tool2.name !== "string") return true;
+    if (seen.has(tool2.name)) return false;
+    seen.add(tool2.name);
+    return true;
+  });
+}
+function withRewrittenTools(record4, visit) {
+  if (!Array.isArray(record4.tools)) return record4;
+  const tools = rewriteDefinitions(record4.tools, visit, false);
+  return tools === record4.tools ? record4 : { ...record4, tools };
+}
+function declaresTools(providerData) {
+  return providerData.type === "additional_tools" || providerData.type === "tool_search_output";
+}
+function rewriteItem(item, visit) {
+  if (!isRecord6(item)) return item;
+  const type = typeof item.type === "string" ? item.type : "";
+  if (NAMED_CALL_TYPES.has(type)) return rewriteNamed(item, visit, false);
+  let next = type === "tool_search_output" ? withRewrittenTools(item, visit) : item;
+  if (isRecord6(next.providerData)) {
+    const providerData = next.providerData;
+    let data = declaresTools(providerData) ? withRewrittenTools(providerData, visit) : providerData;
+    for (const [key, value] of Object.entries(providerData)) {
+      if (!key.startsWith(TOOL_DISCLOSURE_KEY_PREFIX) || !isRecord6(value)) continue;
+      const rewritten = withRewrittenTools(value, visit);
+      if (rewritten !== value) data = { ...data, [key]: rewritten };
+    }
+    if (data !== providerData) next = { ...next, providerData: data };
+  }
+  return next;
+}
+function invalidHistoryToolNames(items) {
+  const names = /* @__PURE__ */ new Set();
+  const collect = (name) => {
+    if (!isProviderToolName(name)) names.add(name);
+    return name;
+  };
+  for (const item of items) rewriteItem(item, collect);
+  return [...names];
+}
+function stableJson(value) {
+  if (Array.isArray(value)) return `[${value.map(stableJson).join(",")}]`;
+  if (isRecord6(value)) {
+    return `{${Object.keys(value).sort().map((key) => `${JSON.stringify(key)}:${stableJson(value[key])}`).join(",")}}`;
+  }
+  return JSON.stringify(value) ?? "null";
+}
+var rewrittenItems = /* @__PURE__ */ new WeakMap();
+function withProviderValidToolNames(items, catalog = { names: [] }) {
+  const known = new Set(catalog.names);
+  const flat = /* @__PURE__ */ new Set();
+  const scoped = /* @__PURE__ */ new Set();
+  const storedParameters = /* @__PURE__ */ new Map();
+  const collect = (name, position, definition) => {
+    if (isProviderToolName(name) || known.has(name)) return name;
+    (position === "flat" ? flat : scoped).add(name);
+    if (position === "flat" && isRecord6(definition) && definition.parameters !== void 0) {
+      const stored = storedParameters.get(name) ?? /* @__PURE__ */ new Set();
+      stored.add(stableJson(definition.parameters));
+      storedParameters.set(name, stored);
+    }
+    return name;
+  };
+  for (const item of items) rewriteItem(item, collect);
+  if (flat.size === 0 && scoped.size === 0) return items;
+  const aliasUnbound = catalog.aliasUnbound !== false;
+  const flatNames = /* @__PURE__ */ new Map();
+  for (const name of flat) {
+    let denoted = catalog.denote ? knownToolNameFor(name, catalog.names) : null;
+    const stored = storedParameters.get(name);
+    if (denoted !== null && stored && catalog.parametersOf) {
+      const parameters = catalog.parametersOf(denoted);
+      if (parameters !== void 0 && [...stored].some((json) => json !== stableJson(parameters)))
+        denoted = null;
+    }
+    flatNames.set(name, denoted ?? (aliasUnbound ? providerToolNameAlias(name) : name));
+  }
+  const rewrite = (name, position) => {
+    if (isProviderToolName(name) || known.has(name)) return name;
+    if (position === "flat") return flatNames.get(name) ?? providerToolNameAlias(name);
+    return aliasUnbound ? providerToolNameAlias(name) : name;
+  };
+  const mapping = JSON.stringify([[...flatNames], [...scoped], aliasUnbound]);
+  let changed = false;
+  const next = items.map((item) => {
+    if (item === null || typeof item !== "object") return item;
+    const cached = rewrittenItems.get(item);
+    let rewritten;
+    if (cached?.mapping === mapping) {
+      rewritten = cached.item;
+    } else {
+      rewritten = rewriteItem(item, rewrite);
+      if (rewritten !== item) rewrittenItems.set(item, { mapping, item: rewritten });
+    }
+    if (rewritten !== item) changed = true;
+    return rewritten;
+  });
+  return changed ? next : items;
+}
+
 // src/provider-history-adapter.ts
-var CHAT_FUNCTION_NAME = /^[a-zA-Z0-9_-]+$/;
+var CHAT_FUNCTION_NAME = /^[a-zA-Z0-9_-]{1,64}$/;
 var HISTORICAL_FACT_MAX_CHARS = 32e3;
 var TOOL_DISCLOSURE_KEY = "opengeni.tool_disclosure.v1";
 var TOOL_DISCLOSURE_TEXT_WITH_INVOKE = "These tools are now available. Call one by its name, or through tool_invoke with its name and a nested arguments object. Definitions:";
@@ -9861,7 +10083,9 @@ function projectHistoryForProvider(items, providerApi, options = {}) {
     })
   );
   const input = projected.every((item, index) => item === items[index]) ? items : projected;
-  return projectWireHistory(withWireValidFunctionCallArguments(input), providerApi, options);
+  const wireValid = withWireValidFunctionCallArguments(input);
+  const named = providerApi === "chat" ? wireValid : withProviderValidToolNames(wireValid, { names: options.knownToolNames ?? [] });
+  return projectWireHistory(named, providerApi, options);
 }
 function withoutClaudeCitationMetadata(item) {
   if (item.type !== "message" || item.role !== "assistant" || !Array.isArray(item.content))
@@ -9995,10 +10219,10 @@ function splitStableSystemPromptPrefix(instructions) {
 }
 
 // src/anthropic-messages.ts
-import { createHash as createHash5, randomUUID as randomUUID3 } from "crypto";
+import { createHash as createHash7, randomUUID as randomUUID3 } from "crypto";
 
 // src/claude-code-identity.ts
-import { createHash as createHash4, randomUUID as randomUUID2 } from "crypto";
+import { createHash as createHash6, randomUUID as randomUUID2 } from "crypto";
 var CLAUDE_CODE_HEADERS = {
   "user-agent": "claude-cli/2.1.285 (external, sdk-ts, agent-sdk/0.3.276)",
   "x-app": "cli",
@@ -10021,7 +10245,7 @@ function claudeCodeFingerprint(input) {
   const first = typeof content === "string" ? content : Array.isArray(content) ? content.find((block) => block.type === "input_text" || String(block.type) === "text") : void 0;
   const prompt = typeof first === "string" ? first : first && "text" in first ? String(first.text) : "";
   const sample = [4, 7, 20].map((index) => prompt[index] || "0").join("");
-  return createHash4("sha256").update(`59cf53e54c78${sample}2.1.285`).digest("hex").slice(0, 3);
+  return createHash6("sha256").update(`59cf53e54c78${sample}2.1.285`).digest("hex").slice(0, 3);
 }
 function applyClaudeCodeIdentity(body, headers, url, request, account, identity) {
   url.searchParams.set("beta", "true");
@@ -10188,12 +10412,12 @@ async function readErrorDetail(body, timeoutMs, signal) {
 function anthropicToolUseId(id) {
   if (/^[a-zA-Z0-9_-]+$/.test(id)) return id;
   const readable = id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64);
-  return `${readable}_${createHash5("sha256").update(id).digest("hex").slice(0, 16)}`;
+  return `${readable}_${createHash7("sha256").update(id).digest("hex").slice(0, 16)}`;
 }
 function anthropicToolName(name, namespace) {
   if (!namespace && /^[a-zA-Z0-9_-]{1,64}$/.test(name)) return name;
   const identity = JSON.stringify([namespace ?? null, name]);
-  return "og_" + createHash5("sha256").update(identity).digest("hex").slice(0, 60);
+  return "og_" + createHash7("sha256").update(identity).digest("hex").slice(0, 60);
 }
 function toolNames(request) {
   const names = /* @__PURE__ */ new Map();
@@ -10521,7 +10745,9 @@ function buildAnthropicRequest(request, model, provider, stream) {
       );
     return matches[0][0];
   };
-  const input = typeof request.input === "string" ? request.input : projectHistoryForProvider(request.input, "anthropic-messages");
+  const input = typeof request.input === "string" ? request.input : projectHistoryForProvider(request.input, "anthropic-messages", {
+    knownToolNames: requestFunctionToolNames(request.tools)
+  });
   const webSearch = request.tools.some(isHostedWebSearchTool);
   let messages = anthropicMessages(input, {
     webSearch,
@@ -12291,21 +12517,21 @@ function hostedToolRoute(type) {
   if (type === "image_generation") return "image_generation.openai_hosted";
   return null;
 }
-function isRecord6(value) {
+function isRecord7(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function clientExecutedTool(tool2) {
-  if (!isRecord6(tool2)) return false;
+  if (!isRecord7(tool2)) return false;
   const type = tool2.type;
   if (type === void 0) {
-    return typeof tool2.name === "string" && isRecord6(tool2.input_schema);
+    return typeof tool2.name === "string" && isRecord7(tool2.input_schema);
   }
   if (typeof type !== "string") return false;
   if (["function", "custom", "local_shell", "apply_patch"].includes(type)) return true;
   if (/^(computer|bash_|text_editor_|memory_)/u.test(type)) return true;
   if (type === "tool_search") return tool2.execution === "client";
   if (type === "shell") {
-    return tool2.environment === void 0 || tool2.environment === null || isRecord6(tool2.environment) && tool2.environment.type === "local";
+    return tool2.environment === void 0 || tool2.environment === null || isRecord7(tool2.environment) && tool2.environment.type === "local";
   }
   if (type === "namespace") {
     return Array.isArray(tool2.tools) && tool2.tools.every(clientExecutedTool);
@@ -12313,7 +12539,7 @@ function clientExecutedTool(tool2) {
   return false;
 }
 function toolLabel(tool2) {
-  if (!isRecord6(tool2)) return "tool";
+  if (!isRecord7(tool2)) return "tool";
   if (typeof tool2.type === "string") return tool2.type;
   const [key] = Object.keys(tool2);
   return key ?? "tool";
@@ -12582,12 +12808,12 @@ function projectTextParts(parts, textType) {
   let changed = false;
   const projected = parts.map((part) => {
     if (!part || typeof part !== "object" || Array.isArray(part)) return part;
-    const record3 = part;
-    if (record3.type !== textType || typeof record3.text !== "string") return part;
-    const text2 = escapeGeminiFunctionResponseRefKeys(record3.text);
-    if (text2 === record3.text) return part;
+    const record4 = part;
+    if (record4.type !== textType || typeof record4.text !== "string") return part;
+    const text2 = escapeGeminiFunctionResponseRefKeys(record4.text);
+    if (text2 === record4.text) return part;
     changed = true;
-    return { ...record3, text: text2 };
+    return { ...record4, text: text2 };
   });
   return changed ? projected : parts;
 }
@@ -12603,14 +12829,14 @@ var geminiFunctionResponseRefPolicy = ({ body }) => {
     let changed = false;
     const input = body.input.map((item) => {
       if (!item || typeof item !== "object" || Array.isArray(item)) return item;
-      const record3 = item;
-      if (typeof record3.type !== "string" || !RESPONSES_TOOL_OUTPUT_TYPES.has(record3.type)) {
+      const record4 = item;
+      if (typeof record4.type !== "string" || !RESPONSES_TOOL_OUTPUT_TYPES.has(record4.type)) {
         return item;
       }
-      const output = projectToolResultValue(record3.output, "input_text");
-      if (output === record3.output) return item;
+      const output = projectToolResultValue(record4.output, "input_text");
+      if (output === record4.output) return item;
       changed = true;
-      return { ...record3, output };
+      return { ...record4, output };
     });
     return changed ? { body: { ...body, input } } : void 0;
   }
@@ -12618,12 +12844,12 @@ var geminiFunctionResponseRefPolicy = ({ body }) => {
     let changed = false;
     const messages = body.messages.map((message) => {
       if (!message || typeof message !== "object" || Array.isArray(message)) return message;
-      const record3 = message;
-      if (record3.role !== "tool") return message;
-      const content = projectToolResultValue(record3.content, "text");
-      if (content === record3.content) return message;
+      const record4 = message;
+      if (record4.role !== "tool") return message;
+      const content = projectToolResultValue(record4.content, "text");
+      if (content === record4.content) return message;
       changed = true;
-      return { ...record3, content };
+      return { ...record4, content };
     });
     return changed ? { body: { ...body, messages } } : void 0;
   }
@@ -12759,10 +12985,10 @@ function azureModelRequestProjection({
     return projectedBody === body ? void 0 : { body: projectedBody };
   const projectedInput = input.map((item) => {
     if (!item || typeof item !== "object" || Array.isArray(item)) return item;
-    const record3 = item;
-    if (record3.type === "computer_call") return { ...record3 };
-    if (record3.type === "computer_call_output" && record3.output && typeof record3.output === "object" && !Array.isArray(record3.output)) {
-      return { ...record3, output: { ...record3.output } };
+    const record4 = item;
+    if (record4.type === "computer_call") return { ...record4 };
+    if (record4.type === "computer_call_output" && record4.output && typeof record4.output === "object" && !Array.isArray(record4.output)) {
+      return { ...record4, output: { ...record4.output } };
     }
     return item;
   });
@@ -12900,10 +13126,10 @@ var chatModelRequestPolicy = ({ path, body }) => {
     let retainedDetails = chatReasoningDetails(message);
     const content = message.content.map((part) => {
       if (!part || typeof part !== "object" || Array.isArray(part)) return part;
-      const record3 = part;
-      if (record3.type !== "text" && record3.type !== "refusal") return part;
-      retainedReasoning ??= chatReasoning(record3);
-      retainedDetails ??= chatReasoningDetails(record3);
+      const record4 = part;
+      if (record4.type !== "text" && record4.type !== "refusal") return part;
+      retainedReasoning ??= chatReasoning(record4);
+      retainedDetails ??= chatReasoningDetails(record4);
       const outputOnlyKeys = [
         "annotations",
         "logprobs",
@@ -12915,10 +13141,10 @@ var chatModelRequestPolicy = ({ path, body }) => {
         "reasoning_content",
         "reasoning_details",
         "tools",
-        ...record3.type === "text" ? ["refusal"] : ["content"]
+        ...record4.type === "text" ? ["refusal"] : ["content"]
       ];
-      if (!outputOnlyKeys.some((key) => Object.hasOwn(record3, key))) return part;
-      const projected = { ...record3 };
+      if (!outputOnlyKeys.some((key) => Object.hasOwn(record4, key))) return part;
+      const projected = { ...record4 };
       for (const key of outputOnlyKeys) delete projected[key];
       contentChanged = true;
       return projected;
@@ -12992,7 +13218,7 @@ function isModelCallFetch(input) {
 
 // src/prompt-cache-fingerprint.ts
 import { AsyncLocalStorage as AsyncLocalStorage6 } from "async_hooks";
-import { createHash as createHash6 } from "crypto";
+import { createHash as createHash8 } from "crypto";
 import {
   PROMPT_CACHE_DIGEST_HEX_LENGTH
 } from "@opengeni/contracts";
@@ -13047,15 +13273,15 @@ function messageHistoryUnits(messages) {
 }
 function promptCacheRequestFingerprint(body) {
   if (!body || typeof body !== "object" || Array.isArray(body)) return null;
-  const record3 = body;
-  const history = Array.isArray(record3.messages) ? messageHistoryUnits(record3.messages) : Array.isArray(record3.input) ? record3.input : typeof record3.input === "string" ? [record3.input] : null;
+  const record4 = body;
+  const history = Array.isArray(record4.messages) ? messageHistoryUnits(record4.messages) : Array.isArray(record4.input) ? record4.input : typeof record4.input === "string" ? [record4.input] : null;
   if (!history) return null;
-  const system = Array.isArray(record3.system) ? record3.system.filter((block) => !isBillingBlock(block)) : typeof record3.system === "string" ? record3.system.startsWith(BILLING_HEADER_PREFIX) ? "" : record3.system : record3.instructions ?? null;
+  const system = Array.isArray(record4.system) ? record4.system.filter((block) => !isBillingBlock(block)) : typeof record4.system === "string" ? record4.system.startsWith(BILLING_HEADER_PREFIX) ? "" : record4.system : record4.instructions ?? null;
   const checkpoints = [];
-  const chain = createHash6("sha256");
+  const chain = createHash8("sha256");
   let next = 1;
   history.forEach((item, index) => {
-    chain.update(createHash6("sha256").update(canonical(item)).digest());
+    chain.update(createHash8("sha256").update(canonical(item)).digest());
     const count = index + 1;
     if (count === next || count === history.length) {
       checkpoints.push([count, digest(chain.copy())]);
@@ -13064,8 +13290,8 @@ function promptCacheRequestFingerprint(body) {
   });
   return {
     v: 1,
-    tools: digest(createHash6("sha256").update(canonical(record3.tools ?? null))),
-    system: digest(createHash6("sha256").update(canonical(system))),
+    tools: digest(createHash8("sha256").update(canonical(record4.tools ?? null))),
+    system: digest(createHash8("sha256").update(canonical(system))),
     items: history.length,
     history: checkpoints
   };
@@ -13407,12 +13633,12 @@ function errorTexts(value, out, seen) {
   }
   if (!value || typeof value !== "object" || seen.has(value)) return;
   seen.add(value);
-  const record3 = value;
+  const record4 = value;
   for (const key of ["message", "code", "type", "name", "param"]) {
-    const field2 = record3[key];
+    const field2 = record4[key];
     if (typeof field2 === "string" && field2.length > 0) out.push(field2);
   }
-  for (const key of ["error", "cause", "response", "data"]) errorTexts(record3[key], out, seen);
+  for (const key of ["error", "cause", "response", "data"]) errorTexts(record4[key], out, seen);
 }
 function headerValue(headers, name) {
   if (!headers || typeof headers !== "object") return null;
@@ -13510,7 +13736,7 @@ import {
   isDirectOpenAiApiBaseUrl,
   opperMaxOutputTokens
 } from "@opengeni/config";
-import { createHash as createHash7 } from "crypto";
+import { createHash as createHash9 } from "crypto";
 import {
   CODEX_RESPONSE_SDK_OUTER_TIMEOUT_MS,
   CODEX_PROVIDER_BASE_URL,
@@ -13533,6 +13759,50 @@ import {
   XAI_RESPONSE_SDK_OUTER_TIMEOUT_MS,
   xaiSubscriptionFetch
 } from "@opengeni/xai-subscription";
+
+// src/provider-invalid-request.ts
+var MAX_BODY_CHARACTERS = 64 * 1024;
+var MAX_PATH_CHARACTERS = 96;
+var PATH_CHARACTERS = /^[A-Za-z_][A-Za-z0-9_.[\]*]*$/;
+var CODE = /^[A-Za-z][A-Za-z0-9_.-]{0,63}$/;
+var EMBEDDED_PATH = /\b((?:input|messages|tools|contents|system|instructions)(?:\[\d+\]|\.\d+|\.[A-Za-z_]\w*)+)/;
+function record2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
+}
+function normalizedPath(raw) {
+  const path = raw.trim().replace(/\[\d+\]/g, "[]").replace(/\.\d+(?=\.|\[|$)/g, "[]").replace(/\.properties\.[A-Za-z0-9_-]+/g, ".properties.*");
+  return path.length <= MAX_PATH_CHARACTERS && PATH_CHARACTERS.test(path) ? path : null;
+}
+function errorCode(error) {
+  for (const candidate of [error.code, error.type]) {
+    if (typeof candidate === "string" && CODE.test(candidate)) return candidate;
+  }
+  return "unknown";
+}
+function invalidRequestSignature(body) {
+  const envelope = record2(body);
+  const error = record2(envelope?.error) ?? envelope ?? {};
+  const message = typeof error.message === "string" ? error.message : "";
+  const raw = typeof error.param === "string" && error.param || EMBEDDED_PATH.exec(message)?.[1] || null;
+  return { path: raw && normalizedPath(raw) || "unknown", code: errorCode(error) };
+}
+async function invalidRequestSignatureOfResponse(response) {
+  try {
+    const text2 = await response.clone().text();
+    if (text2.length > MAX_BODY_CHARACTERS) return { path: "unknown", code: "unknown" };
+    let body;
+    try {
+      body = JSON.parse(text2);
+    } catch {
+      body = { message: text2 };
+    }
+    return invalidRequestSignature(body);
+  } catch {
+    return null;
+  }
+}
+
+// src/model-provider-client.ts
 var runtimeMetricsHooks = null;
 function configureRuntimeMetricsHooks(hooks) {
   runtimeMetricsHooks = hooks ?? null;
@@ -13669,8 +13939,8 @@ function providerClientCacheKey(provider, settings, gatewayPolicies, opperOutput
   const sortedRecord = (value) => value ? Object.fromEntries(
     Object.entries(value).sort(([left], [right]) => left.localeCompare(right))
   ) : null;
-  const apiKeyDigest = provider.apiKey ? createHash7("sha256").update(provider.apiKey, "utf8").digest("hex") : null;
-  const digest2 = createHash7("sha256").update(
+  const apiKeyDigest = provider.apiKey ? createHash9("sha256").update(provider.apiKey, "utf8").digest("hex") : null;
+  const digest2 = createHash9("sha256").update(
     canonicalCacheJson({
       provider: {
         id: provider.id,
@@ -13707,7 +13977,7 @@ function providerClientCacheKey(provider, settings, gatewayPolicies, opperOutput
           clientId: settings.azureClientId,
           federatedTokenFile: settings.azureFederatedTokenFile,
           authorityHost: settings.azureAuthorityHost,
-          clientSecretDigest: settings.azureClientSecret ? createHash7("sha256").update(settings.azureClientSecret).digest("hex") : null
+          clientSecretDigest: settings.azureClientSecret ? createHash9("sha256").update(settings.azureClientSecret).digest("hex") : null
         }
       } : null
     }),
@@ -14094,6 +14364,7 @@ function instrumentedModelFetch(provider, inner, transportReportsDispatch = fals
         }
       }
       recordModelCallMetric(provider, response.ok ? "completed" : "failed", started);
+      if (response.status === 400) recordModelInvalidRequestMetric(provider, response);
       return response;
     } catch (error) {
       capture.cancel();
@@ -14114,6 +14385,17 @@ function recordModelCallMetric(provider, outcome, started) {
   } catch {
   }
 }
+function recordModelInvalidRequestMetric(provider, response) {
+  const hook = runtimeMetricsHooks?.onModelInvalidRequest;
+  if (!hook) return;
+  void invalidRequestSignatureOfResponse(response).then((signature) => {
+    if (!signature) return;
+    try {
+      hook({ provider, ...signature });
+    } catch {
+    }
+  });
+}
 function azureDeploymentBaseUrl(settings) {
   const endpoint = settings.azureOpenaiEndpoint?.replace(/\/+$/, "");
   if (!endpoint || !settings.azureOpenaiDeployment) {
@@ -14241,11 +14523,11 @@ function normalizeMcpResult(value) {
     reason: "schema_mismatch",
     issues: String(parsed.error.issues.length)
   });
-  const record3 = isPlainRecord(safe) ? safe : null;
-  const { _meta: _resultMeta, ...visible } = record3 ?? {};
+  const record4 = isPlainRecord(safe) ? safe : null;
+  const { _meta: _resultMeta, ...visible } = record4 ?? {};
   return {
-    content: [{ type: "text", text: JSON.stringify(record3 ? visible : safe) ?? "null" }],
-    ...record3?.isError === true ? { isError: true } : {}
+    content: [{ type: "text", text: JSON.stringify(record4 ? visible : safe) ?? "null" }],
+    ...record4?.isError === true ? { isError: true } : {}
   };
 }
 function typeName(value) {
@@ -14779,25 +15061,6 @@ var ToolSearchIndex = class {
   }
 };
 
-// src/mcp-model-tool-name.ts
-import { createHash as createHash8 } from "crypto";
-import { prefixedMcpToolName as plainPrefixedMcpToolName } from "@opengeni/contracts";
-var ALIASED_MCP_TOOL_LEAF_LENGTH = 34;
-var ALIASED_MCP_TOOL_NAME = /^mcp_[0-9a-f]{24}__/;
-function prefixedMcpToolName(registryId, toolName) {
-  const name = plainPrefixedMcpToolName(registryId, toolName);
-  if (name.length <= 64 && /^[A-Za-z0-9_]+$/.test(name)) return name;
-  const digest2 = legacyMcpToolDigest(registryId, toolName).slice(0, 24);
-  const leaf = toolName.replace(/[^A-Za-z0-9_]/g, "_").slice(0, ALIASED_MCP_TOOL_LEAF_LENGTH) || "tool";
-  return `mcp_${digest2}__${leaf}`;
-}
-function legacyMcpToolDigest(registryId, toolName) {
-  return createHash8("sha256").update(JSON.stringify([registryId, toolName])).digest("hex");
-}
-function isAliasedMcpToolName(name) {
-  return ALIASED_MCP_TOOL_NAME.test(name);
-}
-
 // src/codex-tool-search.ts
 var DEFAULT_SEARCH_LIMIT = 8;
 var MAX_SEARCH_LIMIT = 20;
@@ -15181,7 +15444,7 @@ function createToolSelector(model, options = {}) {
 }
 
 // src/tool-discovery-meaning.ts
-import { createHash as createHash9 } from "crypto";
+import { createHash as createHash10 } from "crypto";
 var TOOL_MEANING_POLICY = {
   /** A ranking still unanswered after this is skipped for keywords alone. */
   deadlineMs: 1500,
@@ -15241,7 +15504,7 @@ function createEmbeddingToolRanker(embedder, options = {}) {
   let computing;
   let pausedUntil = 0;
   let dimensions;
-  const keyOf = (text2) => createHash9("sha256").update(embedder.space).update("\0").update(text2).digest("base64url");
+  const keyOf = (text2) => createHash10("sha256").update(embedder.space).update("\0").update(text2).digest("base64url");
   const pause2 = (error) => {
     pausedUntil = now() + TOOL_MEANING_POLICY.retryAfterMs;
     options.onError?.(error);
@@ -15378,7 +15641,7 @@ function toolGroups(tools, serverIds) {
 }
 
 // src/deferred-tool-arguments.ts
-import { isRecord as isRecord7 } from "@opengeni/contracts/values";
+import { isRecord as isRecord8 } from "@opengeni/contracts/values";
 var NON_STRING_TYPES = /* @__PURE__ */ new Set(["integer", "number", "boolean", "null", "array", "object"]);
 var MAX_DEPTH = 8;
 function parseFiniteJson(text2) {
@@ -15390,7 +15653,7 @@ function parseFiniteJson(text2) {
   });
 }
 function declaredTypes(schema) {
-  if (!isRecord7(schema)) return null;
+  if (!isRecord8(schema)) return null;
   const types = /* @__PURE__ */ new Set();
   const type = schema.type;
   if (typeof type === "string") types.add(type);
@@ -15438,11 +15701,11 @@ function coerceValue(value, schema, depth) {
     }
     return matchesAny(parsed, types) ? parsed : value;
   }
-  if (isRecord7(value)) return coerceObject(value, schema, depth + 1);
+  if (isRecord8(value)) return coerceObject(value, schema, depth + 1);
   return value;
 }
 function coerceObject(value, schema, depth) {
-  if (!isRecord7(schema) || !isRecord7(schema.properties)) return value;
+  if (!isRecord8(schema) || !isRecord8(schema.properties)) return value;
   const properties = schema.properties;
   let changed = false;
   const next = /* @__PURE__ */ Object.create(null);
@@ -15461,13 +15724,13 @@ function restoreDeferredToolArgumentTypes(argumentsText, parameters) {
   } catch {
     return null;
   }
-  if (!isRecord7(parsed)) return null;
+  if (!isRecord8(parsed)) return null;
   const coerced = coerceObject(parsed, parameters, 0);
   return coerced === parsed ? null : JSON.stringify(coerced);
 }
 
 // src/lazy-tool-transport.ts
-import { isRecord as isRecord8 } from "@opengeni/contracts/values";
+import { isRecord as isRecord9 } from "@opengeni/contracts/values";
 var TOOL_SEARCH_NAME = "tool_search";
 var TOOL_LIST_NAME = "tool_list";
 var TOOL_INVOKE_NAME = "tool_invoke";
@@ -15523,8 +15786,8 @@ var INTERNAL_REGISTRATION_TOOL_MARKER_KEY = "opengeni.internal_lazy_registration
 var OPENING_TOOL_LOAD_MARKER_KEY = "opengeni.opening_tool_load.v1";
 var OPENING_TOOL_LOAD_CALL_ID = "call_opening_tools";
 function isOpeningToolLoadResponse(value) {
-  const response = isRecord8(value) && value.type === "response_done" && isRecord8(value.response) ? value.response : value;
-  return isRecord8(response) && isRecord8(response.providerData) && response.providerData[OPENING_TOOL_LOAD_MARKER_KEY] === true;
+  const response = isRecord9(value) && value.type === "response_done" && isRecord9(value.response) ? value.response : value;
+  return isRecord9(response) && isRecord9(response.providerData) && response.providerData[OPENING_TOOL_LOAD_MARKER_KEY] === true;
 }
 var INTERNAL_DISPATCH_REGISTRATION_CALL_PREFIX = "opengeni:lazy-dispatch:register:";
 var SEARCH_DESCRIPTION = "Find currently authorized tools by capability. Describe the action and resource you need; separate independent tasks with semicolons and include useful context. Loads the strongest match and returns compact alternatives; ranking is not certainty, so check the match. If a decision model is configured, it can select tools for ambiguous searches. With schemasLoaded:true, only tools have loaded schemas; suggestions are unloaded alternatives. With schemasLoaded:false, load chosen exact names with query:'' before invoking. Known exact names bypass ranking and inference. Call loaded tools by name or through tool_invoke. Search is not exhaustive: tool_list view:'groups' shows available groups. Discovery never grants access.";
@@ -15618,22 +15881,22 @@ function alreadyAvailableNotice(names) {
   return names.length === 1 ? `${names[0]} is already in your tool list; call it directly.` : `${names.join(", ")} are already in your tool list; call them directly.`;
 }
 function connectableIntegrationsFromCatalogResult(result) {
-  const content = Array.isArray(result) ? result : isRecord8(result) && Array.isArray(result.content) ? result.content : [];
-  if (isRecord8(result) && result.isError === true) return [];
+  const content = Array.isArray(result) ? result : isRecord9(result) && Array.isArray(result.content) ? result.content : [];
+  if (isRecord9(result) && result.isError === true) return [];
   const found = [];
   for (const block of content) {
-    if (!isRecord8(block) || block.type !== "text" || typeof block.text !== "string") continue;
+    if (!isRecord9(block) || block.type !== "text" || typeof block.text !== "string") continue;
     let parsed;
     try {
       parsed = JSON.parse(block.text);
     } catch {
       continue;
     }
-    if (!isRecord8(parsed) || !Array.isArray(parsed.matches)) continue;
+    if (!isRecord9(parsed) || !Array.isArray(parsed.matches)) continue;
     for (const match of parsed.matches) {
-      if (!isRecord8(match) || match.approximate === true) continue;
-      const setup = isRecord8(match.setup) ? match.setup : null;
-      const next = setup && isRecord8(setup.nextAction) ? setup.nextAction : null;
+      if (!isRecord9(match) || match.approximate === true) continue;
+      const setup = isRecord9(match.setup) ? match.setup : null;
+      const next = setup && isRecord9(setup.nextAction) ? setup.nextAction : null;
       if (next?.toolName !== "capability_authorization_request") continue;
       if (setup.action === "enable") continue;
       if (typeof match.capabilityId !== "string" || typeof match.name !== "string") continue;
@@ -15662,7 +15925,7 @@ function isFunctionTool(tool2) {
 function parseJsonObject(value) {
   try {
     const parsed = JSON.parse(value);
-    return isRecord8(parsed) ? parsed : null;
+    return isRecord9(parsed) ? parsed : null;
   } catch {
     return null;
   }
@@ -15678,7 +15941,7 @@ function modelVisibleToolDefinition(tool2) {
   };
 }
 function unavailableToolResult(input) {
-  const name = isRecord8(input) && typeof input.name === "string" ? input.name : null;
+  const name = isRecord9(input) && typeof input.name === "string" ? input.name : null;
   return JSON.stringify({
     ok: false,
     error: {
@@ -15859,6 +16122,10 @@ var LazyToolRuntime = class {
   resolveFunctionTool(name) {
     return this.functionTools.get(name);
   }
+  /** Model names of every authorized function tool, deferred ones included. */
+  knownFunctionToolNames() {
+    return [...this.functionTools.keys()];
+  }
   /** True for a tool disclosed through search rather than sent on every request. */
   isDeferredFunctionTool(name) {
     return this.searchableToolNames.has(name);
@@ -16481,7 +16748,7 @@ ${result.notice}`
       strict: false,
       execute: async (input) => {
         await this.ensurePrepared();
-        const args = isRecord8(input) ? input : {};
+        const args = isRecord9(input) ? input : {};
         const prefix = typeof args.namePrefix === "string" ? args.namePrefix : "";
         const group = typeof args.group === "string" ? args.group : void 0;
         const serverIds = this.modelMcpServerIds();
@@ -16641,7 +16908,7 @@ ${result.notice}`
 function createResolveMissingFunctionTool(runtime) {
   return async ({ name, toolCall }) => {
     const names = [name];
-    if (isRecord8(toolCall) && typeof toolCall.name === "string" && toolCall.name !== name) {
+    if (isRecord9(toolCall) && typeof toolCall.name === "string" && toolCall.name !== name) {
       names.push(toolCall.name);
     }
     for (const candidate of names) {
@@ -16709,7 +16976,7 @@ function installLazyToolRuntimeOnAgent(agent, runtime) {
   }
 }
 function restoredProviderData(providerData) {
-  if (!isRecord8(providerData)) return void 0;
+  if (!isRecord9(providerData)) return void 0;
   const restored = { ...providerData };
   delete restored[DISPATCH_MARKER_KEY];
   delete restored[SEARCH_MARKER_KEY];
@@ -16732,13 +16999,13 @@ function restoreGenericDispatchHistory(input) {
   return changed ? restoredInput : input;
 }
 function restoreGenericDispatchHistoryItem(candidate) {
-  if (!isRecord8(candidate) || candidate.type !== "function_call" && candidate.type !== "tool_search_call")
+  if (!isRecord9(candidate) || candidate.type !== "function_call" && candidate.type !== "tool_search_call")
     return candidate;
-  const providerData = isRecord8(candidate.providerData) ? candidate.providerData : void 0;
+  const providerData = isRecord9(candidate.providerData) ? candidate.providerData : void 0;
   const marker = providerData?.[DISPATCH_MARKER_KEY];
-  const hasDispatchMarker = isRecord8(marker) && marker.version === 1 && typeof marker.arguments === "string";
+  const hasDispatchMarker = isRecord9(marker) && marker.version === 1 && typeof marker.arguments === "string";
   const searchMarker = providerData?.[SEARCH_MARKER_KEY];
-  const hasSearchMarker = isRecord8(searchMarker) && (searchMarker.version === 1 || searchMarker.version === 2) && typeof searchMarker.output === "string";
+  const hasSearchMarker = isRecord9(searchMarker) && (searchMarker.version === 1 || searchMarker.version === 2) && typeof searchMarker.output === "string";
   const hasFamilyMarker = providerData !== void 0 && FAMILY_DISCLOSURE_MARKER_KEY in providerData;
   if (!hasDispatchMarker && !hasSearchMarker && !hasFamilyMarker) {
     return candidate;
@@ -16756,11 +17023,11 @@ function restoreGenericDispatchHistoryItem(candidate) {
 function callId2(candidate) {
   if (typeof candidate.callId === "string") return candidate.callId;
   if (typeof candidate.call_id === "string") return candidate.call_id;
-  const providerData = isRecord8(candidate.providerData) ? candidate.providerData : null;
+  const providerData = isRecord9(candidate.providerData) ? candidate.providerData : null;
   return providerData && typeof providerData.call_id === "string" ? providerData.call_id : null;
 }
 function isInternalGenericDispatchRegistrationItem(candidate) {
-  if (!isRecord8(candidate)) return false;
+  if (!isRecord9(candidate)) return false;
   if (candidate.type !== "tool_search_call" && candidate.type !== "tool_search_output")
     return false;
   return callId2(candidate)?.startsWith(INTERNAL_DISPATCH_REGISTRATION_CALL_PREFIX) ?? false;
@@ -16769,17 +17036,17 @@ function restoreGenericSearchResults(input) {
   if (!Array.isArray(input)) return input;
   const disclosures = /* @__PURE__ */ new Map();
   for (const candidate of input) {
-    if (!isRecord8(candidate) || candidate.type !== "function_call") continue;
+    if (!isRecord9(candidate) || candidate.type !== "function_call") continue;
     const id = callId2(candidate);
-    const marker = isRecord8(candidate.providerData) ? candidate.providerData[SEARCH_MARKER_KEY] : void 0;
-    if (id && isRecord8(marker) && (marker.version === 1 || marker.version === 2) && typeof marker.output === "string") {
+    const marker = isRecord9(candidate.providerData) ? candidate.providerData[SEARCH_MARKER_KEY] : void 0;
+    if (id && isRecord9(marker) && (marker.version === 1 || marker.version === 2) && typeof marker.output === "string") {
       disclosures.set(id, marker.output);
     }
   }
   if (disclosures.size === 0) return input;
   let changed = false;
   const restored = input.map((candidate) => {
-    if (!isRecord8(candidate) || candidate.type !== "function_call_result") {
+    if (!isRecord9(candidate) || candidate.type !== "function_call_result") {
       return candidate;
     }
     const id = callId2(candidate);
@@ -16794,9 +17061,9 @@ function restoreGenericDispatchHistoryItems(input) {
   return restoreGenericDispatchHistory(input);
 }
 function transformGenericDispatchCall(candidate, runtime, preparedSearch) {
-  if (!isRecord8(candidate) || candidate.type !== "function_call") return [candidate];
+  if (!isRecord9(candidate) || candidate.type !== "function_call") return [candidate];
   if (candidate.name === TOOL_SEARCH_NAME && typeof candidate.arguments === "string") {
-    const providerData2 = isRecord8(candidate.providerData) ? candidate.providerData : {};
+    const providerData2 = isRecord9(candidate.providerData) ? candidate.providerData : {};
     if (SEARCH_MARKER_KEY in providerData2) {
       throw new Error("Provider function call collided with lazy-search metadata");
     }
@@ -16821,10 +17088,10 @@ function transformGenericDispatchCall(candidate, runtime, preparedSearch) {
   const name = dispatch2 && typeof dispatch2.name === "string" ? dispatch2.name : null;
   const args = dispatch2?.arguments;
   const originalCallId = callId2(candidate);
-  if (!name || !isRecord8(args) || !runtime.resolveFunctionTool(name) || !originalCallId) {
+  if (!name || !isRecord9(args) || !runtime.resolveFunctionTool(name) || !originalCallId) {
     return [candidate];
   }
-  const providerData = isRecord8(candidate.providerData) ? candidate.providerData : {};
+  const providerData = isRecord9(candidate.providerData) ? candidate.providerData : {};
   if (DISPATCH_MARKER_KEY in providerData) {
     throw new Error("Provider function call collided with lazy-dispatch metadata");
   }
@@ -16854,8 +17121,8 @@ function restoreDirectDeferredCallArgumentTypes(candidate, runtime) {
   return restored === null ? candidate : { ...candidate, arguments: restored };
 }
 async function transformResponseItem(item, runtime, signal) {
-  if (isRecord8(item) && item.type === "tool_search_call") {
-    const providerData = isRecord8(item.providerData) ? item.providerData : {};
+  if (isRecord9(item) && item.type === "tool_search_call") {
+    const providerData = isRecord9(item.providerData) ? item.providerData : {};
     if ((item.execution ?? providerData.execution) === "client") {
       if (SEARCH_MARKER_KEY in providerData)
         throw new Error("Provider tool-search call collided with lazy-search metadata");
@@ -16874,12 +17141,12 @@ async function transformResponseItem(item, runtime, signal) {
   if (runtime.transport !== "generic_dispatch") {
     return [
       withFamilyDisclosure(
-        isRecord8(item) && item.type === "function_call" ? restoreDirectDeferredCallArgumentTypes(item, runtime) : item,
+        isRecord9(item) && item.type === "function_call" ? restoreDirectDeferredCallArgumentTypes(item, runtime) : item,
         runtime
       )
     ];
   }
-  const search = isRecord8(item) && item.type === "function_call" && item.name === TOOL_SEARCH_NAME && typeof item.arguments === "string";
+  const search = isRecord9(item) && item.type === "function_call" && item.name === TOOL_SEARCH_NAME && typeof item.arguments === "string";
   const items = transformGenericDispatchCall(
     item,
     runtime,
@@ -16893,11 +17160,11 @@ async function transformResponseOutput(output, runtime, signal) {
   return unchanged ? output : transformed;
 }
 function withFamilyDisclosure(candidate, runtime) {
-  if (!isRecord8(candidate) || candidate.type !== "function_call") return candidate;
+  if (!isRecord9(candidate) || candidate.type !== "function_call") return candidate;
   if (typeof candidate.name !== "string" || !isInteractionEntryToolName(candidate.name)) {
     return candidate;
   }
-  const providerData = isRecord8(candidate.providerData) ? candidate.providerData : {};
+  const providerData = isRecord9(candidate.providerData) ? candidate.providerData : {};
   if (FAMILY_DISCLOSURE_MARKER_KEY in providerData) return candidate;
   const tools = runtime.familyDisclosure(candidate.name);
   if (tools.length === 0) return candidate;
@@ -16914,18 +17181,18 @@ function withFamilyDisclosure(candidate, runtime) {
   };
 }
 function familyDisclosure(candidate) {
-  const providerData = isRecord8(candidate.providerData) ? candidate.providerData : null;
+  const providerData = isRecord9(candidate.providerData) ? candidate.providerData : null;
   const marker = providerData?.[FAMILY_DISCLOSURE_MARKER_KEY];
-  if (!isRecord8(marker) || marker.version !== 1 || !Array.isArray(marker.tools)) return null;
+  if (!isRecord9(marker) || marker.version !== 1 || !Array.isArray(marker.tools)) return null;
   const tools = marker.tools.filter(
-    (tool2) => isRecord8(tool2) && typeof tool2.name === "string"
+    (tool2) => isRecord9(tool2) && typeof tool2.name === "string"
   );
   return tools.length > 0 ? { tools, viaToolInvoke: marker.viaToolInvoke === true } : null;
 }
 function disclosedToolNames(tools) {
   if (!Array.isArray(tools)) return [];
   return tools.flatMap(
-    (tool2) => isRecord8(tool2) && typeof tool2.name === "string" ? [tool2.name] : []
+    (tool2) => isRecord9(tool2) && typeof tool2.name === "string" ? [tool2.name] : []
   );
 }
 function genericSearchOutputNames(output) {
@@ -16967,15 +17234,15 @@ function expandInteractionFamilyDisclosures(input) {
   for (let index = 0; index < input.length; index += 1) {
     const original = input[index];
     const candidate = original;
-    const result = isRecord8(candidate) && STEP_RESULT_ITEM_TYPES.has(String(candidate.type));
+    const result = isRecord9(candidate) && STEP_RESULT_ITEM_TYPES.has(String(candidate.type));
     if (!result) flush(index);
     expanded?.push(original);
-    if (!isRecord8(candidate)) continue;
+    if (!isRecord9(candidate)) continue;
     if (candidate.type === "tool_search_call") {
-      const providerData = isRecord8(candidate.providerData) ? candidate.providerData : null;
+      const providerData = isRecord9(candidate.providerData) ? candidate.providerData : null;
       const searchMarker = providerData?.[SEARCH_MARKER_KEY];
       const id2 = callId2(candidate);
-      if (id2 && isRecord8(searchMarker) && typeof searchMarker.notice === "string")
+      if (id2 && isRecord9(searchMarker) && typeof searchMarker.notice === "string")
         pendingNotices.set(id2, searchMarker.notice);
       continue;
     }
@@ -16991,15 +17258,15 @@ function expandInteractionFamilyDisclosures(input) {
       continue;
     }
     if (candidate.type === "function_call") {
-      const providerData = isRecord8(candidate.providerData) ? candidate.providerData : null;
+      const providerData = isRecord9(candidate.providerData) ? candidate.providerData : null;
       const searchMarker = providerData?.[SEARCH_MARKER_KEY];
-      if (isRecord8(searchMarker) && typeof searchMarker.output === "string") {
+      if (isRecord9(searchMarker) && typeof searchMarker.output === "string") {
         if (searchMarker.version === 1) {
           for (const name of genericSearchOutputNames(searchMarker.output)) disclosed.add(name);
         } else if (searchMarker.version === 2 && Array.isArray(searchMarker.tools)) {
           const id3 = callId2(candidate);
           if (id3)
-            pending.set(id3, { tools: searchMarker.tools.filter(isRecord8), viaToolInvoke: true });
+            pending.set(id3, { tools: searchMarker.tools.filter(isRecord9), viaToolInvoke: true });
         }
       }
       const id2 = callId2(candidate);
@@ -17053,19 +17320,39 @@ function prepareLazyToolRequest(request, runtime) {
     tools: request.tools.filter((tool2) => !runtime.shouldHideSerializedTool(tool2))
   };
 }
+async function withAuthorizedHistoryToolNames(request, runtime) {
+  if (typeof request.input === "string") return request;
+  if (invalidHistoryToolNames(request.input).length === 0) return request;
+  let complete = true;
+  try {
+    await runtime.ensurePrepared();
+  } catch {
+    complete = false;
+  }
+  const input = withProviderValidToolNames(request.input, {
+    names: runtime.knownFunctionToolNames(),
+    denote: complete,
+    aliasUnbound: false,
+    parametersOf: (name) => {
+      const tool2 = runtime.resolveFunctionTool(name);
+      return tool2 && isFunctionTool(tool2) ? tool2.parameters : void 0;
+    }
+  });
+  return input === request.input ? request : { ...request, input };
+}
 function startsTurn(input) {
   if (typeof input === "string") return true;
   const items = input;
   let lastUser = -1;
   items.forEach((item, index) => {
-    if (isRecord8(item) && item.role === "user") lastUser = index;
+    if (isRecord9(item) && item.role === "user") lastUser = index;
   });
-  return lastUser >= 0 && items.slice(lastUser + 1).every((item) => isRecord8(item) && (item.role === "developer" || item.role === "system"));
+  return lastUser >= 0 && items.slice(lastUser + 1).every((item) => isRecord9(item) && (item.role === "developer" || item.role === "system"));
 }
 function holdsOpeningToolLoad(input) {
   if (typeof input === "string") return false;
   const items = input;
-  return items.some((item) => isRecord8(item) && callId2(item) === OPENING_TOOL_LOAD_CALL_ID);
+  return items.some((item) => isRecord9(item) && callId2(item) === OPENING_TOOL_LOAD_CALL_ID);
 }
 var LazyToolModel = class {
   constructor(inner, runtime) {
@@ -17076,7 +17363,10 @@ var LazyToolModel = class {
     const opening = await this.openingToolLoad(request);
     if (opening) return opening;
     await beforeModelRequest("model_entry");
-    const prepared = prepareLazyToolRequest(request, this.runtime);
+    const prepared = prepareLazyToolRequest(
+      await withAuthorizedHistoryToolNames(request, this.runtime),
+      this.runtime
+    );
     rememberPreparedModelRequest(prepared);
     void notifyModelRequestCapture(prepared);
     const response = await this.inner.getResponse(prepared);
@@ -17104,7 +17394,10 @@ var LazyToolModel = class {
       return;
     }
     await beforeModelRequest("model_entry");
-    const prepared = prepareLazyToolRequest(request, this.runtime);
+    const prepared = prepareLazyToolRequest(
+      await withAuthorizedHistoryToolNames(request, this.runtime),
+      this.runtime
+    );
     rememberPreparedModelRequest(prepared);
     void notifyModelRequestCapture(prepared);
     let responseStartedPreparation = false;
@@ -17158,7 +17451,7 @@ var LazyToolModel = class {
 };
 function responseRequiresToolPreparation(response, runtime) {
   return response.output.some(
-    (item) => isRecord8(item) && item.type === "function_call" && typeof item.name === "string" && runtime.requiresPreparationForFunctionCall(item.name)
+    (item) => isRecord9(item) && item.type === "function_call" && typeof item.name === "string" && runtime.requiresPreparationForFunctionCall(item.name)
   );
 }
 var LazyToolModelProvider = class {
@@ -17194,21 +17487,21 @@ var CLIENT_TOOL_CALL_ITEM_TYPES = /* @__PURE__ */ new Set([
 ]);
 function isClientToolWork(item) {
   if (!item || typeof item !== "object") return false;
-  const record3 = item;
-  if (record3.type === "tool_search_call") {
-    return (record3.execution ?? record3.providerData?.execution) !== "server";
+  const record4 = item;
+  if (record4.type === "tool_search_call") {
+    return (record4.execution ?? record4.providerData?.execution) !== "server";
   }
-  return CLIENT_TOOL_CALL_ITEM_TYPES.has(String(record3.type));
+  return CLIENT_TOOL_CALL_ITEM_TYPES.has(String(record4.type));
 }
 function isAssistantMessageItem(item) {
   if (!item || typeof item !== "object") return false;
-  const record3 = item;
-  return record3.type === "message" && (record3.role === void 0 || record3.role === "assistant");
+  const record4 = item;
+  return record4.type === "message" && (record4.role === void 0 || record4.role === "assistant");
 }
 function declaredAssistantMessagePhase(item) {
   if (!item || typeof item !== "object") return void 0;
-  const record3 = item;
-  const phase = record3.phase ?? record3.providerData?.phase;
+  const record4 = item;
+  const phase = record4.phase ?? record4.providerData?.phase;
   return phase === "commentary" || phase === "final_answer" ? phase : void 0;
 }
 function providerMessageId(item) {
@@ -17356,38 +17649,38 @@ function imageDataByteLength(data) {
     return data.every((value) => typeof value === "number") ? data.length : null;
   }
   if (!data || typeof data !== "object") return null;
-  const record3 = data;
-  if (record3.type === "Buffer" && Array.isArray(record3.data)) {
-    return record3.data.every((value) => typeof value === "number") ? record3.data.length : null;
+  const record4 = data;
+  if (record4.type === "Buffer" && Array.isArray(record4.data)) {
+    return record4.data.every((value) => typeof value === "number") ? record4.data.length : null;
   }
-  const keys = Object.keys(record3);
-  return keys.length > 0 && keys.every((key) => /^\d+$/.test(key) && typeof record3[key] === "number") ? keys.length : null;
+  const keys = Object.keys(record4);
+  return keys.length > 0 && keys.every((key) => /^\d+$/.test(key) && typeof record4[key] === "number") ? keys.length : null;
 }
 function toolOutputMediaPreview(value) {
   if (typeof value === "string") {
     return sessionEventMediaPreviewFromDataUrl(value);
   }
   if (!value || typeof value !== "object" || Array.isArray(value)) return null;
-  const record3 = value;
-  if (record3.type === "input_image") {
-    const source = record3.image ?? record3.image_url ?? record3.imageUrl;
+  const record4 = value;
+  if (record4.type === "input_image") {
+    const source = record4.image ?? record4.image_url ?? record4.imageUrl;
     const url = typeof source === "string" ? source : source && typeof source === "object" ? source.url : null;
     if (typeof url !== "string" || url.length === 0) return null;
     return sessionEventMediaPreviewFromDataUrl(url) ?? sessionEventMediaPreview("image/*", null);
   }
-  if ((record3.type === "image" || record3.type === "audio") && typeof record3.data === "string") {
-    const mediaType2 = typeof record3.mimeType === "string" && record3.mimeType.length > 0 ? record3.mimeType : record3.type === "audio" ? "audio/*" : "image/png";
-    return sessionEventMediaPreviewFromDataUrl(record3.data) ?? sessionEventMediaPreview(mediaType2, base64DecodedByteLength(record3.data));
+  if ((record4.type === "image" || record4.type === "audio") && typeof record4.data === "string") {
+    const mediaType2 = typeof record4.mimeType === "string" && record4.mimeType.length > 0 ? record4.mimeType : record4.type === "audio" ? "audio/*" : "image/png";
+    return sessionEventMediaPreviewFromDataUrl(record4.data) ?? sessionEventMediaPreview(mediaType2, base64DecodedByteLength(record4.data));
   }
-  if (record3.type === "resource" && record3.resource && typeof record3.resource === "object") {
-    const resource = record3.resource;
+  if (record4.type === "resource" && record4.resource && typeof record4.resource === "object") {
+    const resource = record4.resource;
     if (typeof resource.blob === "string") {
       const mediaType2 = typeof resource.mimeType === "string" && resource.mimeType.length > 0 ? resource.mimeType : "application/octet-stream";
       return sessionEventMediaPreviewFromDataUrl(resource.blob) ?? sessionEventMediaPreview(mediaType2, base64DecodedByteLength(resource.blob));
     }
   }
-  if (record3.type !== "image" || !record3.image || typeof record3.image !== "object") return null;
-  const image = record3.image;
+  if (record4.type !== "image" || !record4.image || typeof record4.image !== "object") return null;
+  const image = record4.image;
   const mediaType = typeof image.mediaType === "string" && image.mediaType.length > 0 ? image.mediaType : "image/png";
   if (typeof image.url === "string" && image.url.length > 0) {
     return sessionEventMediaPreviewFromDataUrl(image.url) ?? sessionEventMediaPreview(mediaType, null);
@@ -17411,11 +17704,11 @@ function normalizeToolOutputForEvent(output) {
     return normalized;
   }
   if (output && typeof output === "object") {
-    const record3 = output;
-    if (Array.isArray(record3.content)) {
+    const record4 = output;
+    if (Array.isArray(record4.content)) {
       return {
-        ...record3,
-        content: record3.content.map((el) => toolOutputMediaPreview(el) ?? el)
+        ...record4,
+        content: record4.content.map((el) => toolOutputMediaPreview(el) ?? el)
       };
     }
   }
@@ -17637,9 +17930,9 @@ function webSearchRequestsFromResponse(response) {
   let count = 0;
   for (const item of output) {
     if (!item || typeof item !== "object") continue;
-    const record3 = item;
-    const searchCall = record3.type === "web_search_call" || record3.type === "hosted_tool_call" && record3.name === "web_search_call";
-    if (searchCall && record3.status !== "failed") count += 1;
+    const record4 = item;
+    const searchCall = record4.type === "web_search_call" || record4.type === "hosted_tool_call" && record4.name === "web_search_call";
+    if (searchCall && record4.status !== "failed") count += 1;
   }
   return count > 0 ? Math.min(count, MAX_WEB_SEARCH_REQUESTS) : void 0;
 }
@@ -17650,9 +17943,9 @@ function gatewayBillingFromResponse(response) {
   if (!response || typeof response !== "object" || Array.isArray(response)) {
     return null;
   }
-  const record3 = response;
-  const providerData = record3.providerData && typeof record3.providerData === "object" && !Array.isArray(record3.providerData) ? record3.providerData : null;
-  const metadataCandidate = record3.provider_metadata ?? record3.providerMetadata ?? providerData?.provider_metadata ?? providerData?.providerMetadata;
+  const record4 = response;
+  const providerData = record4.providerData && typeof record4.providerData === "object" && !Array.isArray(record4.providerData) ? record4.providerData : null;
+  const metadataCandidate = record4.provider_metadata ?? record4.providerMetadata ?? providerData?.provider_metadata ?? providerData?.providerMetadata;
   if (!metadataCandidate || typeof metadataCandidate !== "object" || Array.isArray(metadataCandidate)) {
     return null;
   }
@@ -17700,12 +17993,12 @@ function modelResponseServiceTierFromResponse(response) {
   if (!response || typeof response !== "object") {
     return null;
   }
-  const record3 = response;
-  const direct = record3.service_tier ?? record3.serviceTier;
+  const record4 = response;
+  const direct = record4.service_tier ?? record4.serviceTier;
   if (typeof direct === "string" && direct.length > 0) {
     return direct;
   }
-  const providerData = record3.providerData && typeof record3.providerData === "object" ? record3.providerData : null;
+  const providerData = record4.providerData && typeof record4.providerData === "object" ? record4.providerData : null;
   const nested = providerData?.service_tier ?? providerData?.serviceTier;
   return typeof nested === "string" && nested.length > 0 ? nested : null;
 }
@@ -17729,11 +18022,11 @@ function usageFromResponse(response) {
   if (!raw || typeof raw !== "object") {
     return null;
   }
-  const record3 = raw;
+  const record4 = raw;
   const chatDetails = response?.providerData?.usage?.prompt_tokens_details;
   const usage = {
     ...numberProp(
-      record3,
+      record4,
       "inputTokens",
       "inputTokens",
       "input_tokens",
@@ -17741,19 +18034,19 @@ function usageFromResponse(response) {
       "prompt_tokens"
     ),
     ...numberProp(
-      record3,
+      record4,
       "outputTokens",
       "outputTokens",
       "output_tokens",
       "completionTokens",
       "completion_tokens"
     ),
-    ...numberProp(record3, "totalTokens", "totalTokens", "total_tokens"),
+    ...numberProp(record4, "totalTokens", "totalTokens", "total_tokens"),
     ...inputTokenDetailsProp(
-      chatDetails === void 0 ? record3 : { prompt_tokens_details: chatDetails }
+      chatDetails === void 0 ? record4 : { prompt_tokens_details: chatDetails }
     ),
-    ...outputTokenDetailsProp(record3),
-    ...requestUsageEntriesProp(record3)
+    ...outputTokenDetailsProp(record4),
+    ...requestUsageEntriesProp(record4)
   };
   return Object.keys(usage).length > 0 ? usage : null;
 }
@@ -18051,9 +18344,9 @@ function responsesOutputText(response) {
   return text2;
 }
 function responsesFinishReason(response) {
-  const record3 = response;
-  if (record3?.status !== "incomplete") return "stop";
-  return record3.incomplete_details?.reason === "content_filter" ? "content_filter" : "length";
+  const record4 = response;
+  if (record4?.status !== "incomplete") return "stop";
+  return record4.incomplete_details?.reason === "content_filter" ? "content_filter" : "length";
 }
 async function runResponsesCall(client, provider, modelId, request, options) {
   if (request.stop?.length) {
@@ -18510,10 +18803,10 @@ function totalCoversKnownComponents(total, inputTokens, outputTokens) {
 function rejectInconsistentRequestTotals(requestEntries, rejectedFields) {
   let inconsistent = false;
   for (const [index, entry] of requestEntries.entries()) {
-    const record3 = entry;
-    const selectedInput = firstPresentEntry(record3, ["inputTokens", "input_tokens"]);
-    const selectedOutput = firstPresentEntry(record3, ["outputTokens", "output_tokens"]);
-    const selectedTotal = firstPresentEntry(record3, ["totalTokens", "total_tokens"]);
+    const record4 = entry;
+    const selectedInput = firstPresentEntry(record4, ["inputTokens", "input_tokens"]);
+    const selectedOutput = firstPresentEntry(record4, ["outputTokens", "output_tokens"]);
+    const selectedTotal = firstPresentEntry(record4, ["totalTokens", "total_tokens"]);
     if (!selectedInput || !selectedOutput || !selectedTotal) continue;
     const inputTokens = modelUsageTokenCountOrNull(selectedInput.value);
     const outputTokens = modelUsageTokenCountOrNull(selectedOutput.value);
@@ -18593,10 +18886,10 @@ function detailRecords(details, path, rejectedFields) {
   }
   return { records, complete };
 }
-function firstPresentEntry(record3, keys) {
+function firstPresentEntry(record4, keys) {
   for (const key of keys) {
-    if (Object.prototype.hasOwnProperty.call(record3, key) && record3[key] !== void 0) {
-      return { key, value: record3[key] };
+    if (Object.prototype.hasOwnProperty.call(record4, key) && record4[key] !== void 0) {
+      return { key, value: record4[key] };
     }
   }
   return null;
@@ -18643,7 +18936,7 @@ function boundedField(value, maxBytes) {
   while (end > 0 && (bytes[end] & 192) === 128) end -= 1;
   return `${new TextDecoder().decode(bytes.subarray(0, end))}${TRUNCATION_MARKER}`;
 }
-function record2(value) {
+function record3(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
 var SAFETY_CODES = /* @__PURE__ */ new Set([
@@ -18690,7 +18983,7 @@ var ResponsesStreamingTerminalError = class extends Error {
     super(`Responses request terminated unsuccessfully (${eventType}).`);
     this.eventType = eventType;
     this.name = "ResponsesStreamingTerminalError";
-    const error = record2(source);
+    const error = record3(source);
     this.code = boundedField(error?.code, FIELD_MAX_BYTES);
     this.type = boundedField(error?.type, FIELD_MAX_BYTES);
     this.detail = boundedField(error?.message ?? source, DIAGNOSTIC_MAX_BYTES) ?? this.message;
@@ -18719,13 +19012,13 @@ var ResponsesStreamingTerminalError = class extends Error {
   category;
 };
 function responsesStreamingTerminalError(event, headers) {
-  const value = record2(event);
+  const value = record3(event);
   if (value?.type !== "response.failed" && value?.type !== "response.error" && value?.type !== "error") {
     return void 0;
   }
   return new ResponsesStreamingTerminalError(
     value.type,
-    value.error ?? record2(value.response)?.error ?? value,
+    value.error ?? record3(value.response)?.error ?? value,
     headers
   );
 }
@@ -19100,7 +19393,8 @@ var OpenGeniResponsesModel = class extends AppendOnlyOpenAIResponsesModel {
     let outcome = "completed";
     try {
       const input = typeof request.input === "string" ? request.input : projectHistoryForProvider(request.input, "responses", {
-        declaresAdditionalTools: responsesRouteDeclaresAdditionalTools(this.provider.kind)
+        declaresAdditionalTools: responsesRouteDeclaresAdditionalTools(this.provider.kind),
+        knownToolNames: requestFunctionToolNames(request.tools)
       });
       return super._buildResponsesCreateRequest(
         input === request.input ? request : { ...request, input },
@@ -19348,6 +19642,8 @@ export {
   isPreemptedModelResponse,
   preemptedResponseCutOffText,
   preemptedResponseDone,
+  prefixedMcpToolName,
+  legacyMcpToolDigest,
   ProviderHistoryIncompatibleError,
   projectHistoryForProvider,
   recordStableSystemPromptPrefix,
@@ -19437,8 +19733,6 @@ export {
   nextMcpInputRequiredStep,
   MCP_INPUT_PENDING_RESULT,
   withAccountLine,
-  prefixedMcpToolName,
-  legacyMcpToolDigest,
   HARNESS_CONTROL_MCP_SERVER_ID,
   HARNESS_CONTROL_FIRST_PARTY_TOOLS,
   isHarnessControlMcpToolName,
@@ -19479,4 +19773,4 @@ export {
   resolveTurnModel,
   MultiProviderModelProvider
 };
-//# sourceMappingURL=chunk-AE7DWNDQ.js.map
+//# sourceMappingURL=chunk-FNAYH3SN.js.map