@x12i/ai-dispatcher 2.4.0 → 3.0.0

package/dist/index.js

@@ -10,6 +10,318 @@ import {
 // src/create-dispatcher.ts
 import { createMetadataPacker } from "@x12i/provider-metadata";
 
+// src/ai-input.ts
+import { AsyncLocalStorage } from "async_hooks";
+import {
+  createCoreClient,
+  isAiInputError,
+  resolveSettings
+} from "@x12i/ai-input/core";
+
+// src/types/providers.ts
+var IMPLEMENTED_AI_PROVIDERS = ["openrouter", "bedrock", "openai", "cloudflare"];
+function isImplementedAiProvider(provider) {
+  return IMPLEMENTED_AI_PROVIDERS.includes(provider);
+}
+
+// src/errors.ts
+var AiDispatcherError = class extends Error {
+  constructor(code, message, details) {
+    super(message);
+    this.code = code;
+    this.details = details;
+    this.name = "AiDispatcherError";
+  }
+  code;
+  details;
+};
+function providerNotImplemented(provider) {
+  const implemented = [...IMPLEMENTED_AI_PROVIDERS];
+  return new AiDispatcherError(
+    "PROVIDER_NOT_IMPLEMENTED",
+    `AI provider "${provider}" is not implemented yet. Supported by @x12i/ai-dispatcher: ${implemented.map((id) => `"${id}"`).join(", ")}.`,
+    {
+      provider,
+      implementedProviders: implemented,
+      operatorHint: `Pass provider: "${implemented[0]}" (or omit provider to use the default).`
+    }
+  );
+}
+
+// src/ai-input.ts
+var GPT_ENCODINGS = /* @__PURE__ */ new Set(["o200k_base", "cl100k_base", "p50k_base", "p50k_edit", "r50k_base"]);
+var inputStorage = new AsyncLocalStorage();
+function mergeAiInput(factory, request) {
+  if (request === false) return false;
+  if (request === void 0) {
+    if (factory === false) return false;
+    return factory ?? {};
+  }
+  const base = typeof factory === "object" ? factory : {};
+  const { approvals: requestApprovals, ...requestRest } = request;
+  return {
+    ...base,
+    ...requestRest,
+    ...requestApprovals !== void 0 ? { approvals: requestApprovals } : base.approvals !== void 0 ? { approvals: base.approvals } : {}
+  };
+}
+function visibleInputResolution(track) {
+  if (!track.enabled) return { enabled: false, changed: false };
+  const baseline = isBaselineCodec(track.codec) && track.representation === "value";
+  if (!track.changed && baseline && !track.surfaced) return void 0;
+  return {
+    enabled: true,
+    ...track.model ? { model: track.model } : {},
+    mode: track.mode,
+    codec: track.codec,
+    representation: track.representation,
+    approvalSource: track.approvalSource,
+    changed: track.changed
+  };
+}
+function wrapToolRegistry(tools) {
+  const wrapped = {};
+  for (const [name, executor] of Object.entries(tools)) {
+    if (!executor) continue;
+    wrapped[name] = wrapProviderExecutor(executor);
+  }
+  return wrapped;
+}
+function wrapProviderExecutor(executor) {
+  return async (args, context) => {
+    const result = await executor(args, context);
+    const track = inputStorage.getStore();
+    if (!track?.enabled || !track.client) return result;
+    return applyEncodedResult(track, result);
+  };
+}
+async function applyAiInput(params) {
+  const requestSetting = params.request.aiInput;
+  delete params.request.aiInput;
+  const settings = mergeAiInput(params.factory, requestSetting);
+  if (settings === false) return disabledTrack();
+  const track = await openTrack(settings, lookupModel(settings.model, params.effectiveModel));
+  await encodeRequestText(params.request, track);
+  wrapRequestTools(params.request, track);
+  return track;
+}
+function disabledTrack() {
+  return {
+    enabled: false,
+    mode: "compact",
+    codec: "text",
+    representation: "value",
+    approvalSource: "baseline",
+    changed: false,
+    surfaced: false
+  };
+}
+async function openTrack(settings, model) {
+  const tokenizer = settings.tokenizer ?? "none";
+  const mode = settings.mode ?? "compact";
+  let tokenCounter;
+  try {
+    tokenCounter = await loadTokenizer(tokenizer);
+    const framing = framingFor(settings);
+    const resolved = resolveSettings({
+      files: [],
+      env: {},
+      factory: {
+        mode,
+        codec: settings.codec ?? "auto",
+        readableFormat: settings.readableFormat ?? "auto",
+        sharing: settings.sharing ?? "auto",
+        tokenizer: tokenCounter?.id ?? "none",
+        framing,
+        ...model ? { model } : {}
+      }
+    });
+    const approvals = settings.approvals;
+    const client = createCoreClient({
+      config: resolved.config,
+      explanation: resolved.explanation,
+      ...approvals && approvals.length > 0 ? { policy: { approvals: [...approvals] } } : {},
+      ...tokenCounter ? { tokenCounter } : {},
+      warn: () => void 0
+    });
+    return {
+      enabled: true,
+      client,
+      ...model ? { model } : {},
+      mode,
+      codec: "text",
+      representation: "value",
+      approvalSource: "baseline",
+      changed: false,
+      surfaced: false
+    };
+  } catch (error) {
+    throw mapAiInputError(error);
+  }
+}
+function lookupModel(override, effectiveModel) {
+  const explicit = override?.trim();
+  const chosen = explicit ? explicit : effectiveModel.trim();
+  return chosen.length > 0 ? chosen : void 0;
+}
+function framingFor(settings) {
+  if (settings.framing) return settings.framing;
+  const tokenizer = settings.tokenizer ?? "none";
+  if (tokenizer !== "none" && (settings.approvals?.length ?? 0) > 0) return "self-describing";
+  return "raw";
+}
+async function loadTokenizer(tokenizer) {
+  if (tokenizer === "none") return void 0;
+  if (!tokenizer.startsWith("gpt:")) {
+    throw new AiDispatcherError("AI_INPUT_FAILED", `Unsupported tokenizer "${tokenizer}".`, {
+      code: "INVALID_CONFIG"
+    });
+  }
+  const encoding = tokenizer.slice("gpt:".length);
+  if (!GPT_ENCODINGS.has(encoding)) {
+    throw new AiDispatcherError("AI_INPUT_FAILED", `Unsupported tokenizer "${tokenizer}".`, {
+      code: "INVALID_CONFIG"
+    });
+  }
+  const gpt = await import("@x12i/ai-input/tokenizers/gpt");
+  return gpt.createGptTokenCounter(encoding);
+}
+async function encodeRequestText(request, track) {
+  if (typeof request.prompt === "string") request.prompt = await encodeString(track, request.prompt);
+  if (typeof request.system === "string") request.system = await encodeString(track, request.system);
+  if (typeof request.instructions === "string") request.instructions = await encodeString(track, request.instructions);
+  if (typeof request.input === "string") {
+    request.input = await encodeString(track, request.input);
+  } else if (Array.isArray(request.input)) {
+    for (let index = 0; index < request.input.length; index += 1) {
+      const item = request.input[index];
+      if (typeof item === "string") {
+        request.input[index] = await encodeString(track, item);
+      } else if (item) {
+        await encodeContentRecord(item, track);
+      }
+    }
+  }
+  if (request.messages) {
+    for (const message of request.messages) {
+      await encodeMessage(message, track);
+    }
+  }
+}
+async function encodeMessage(message, track) {
+  if (typeof message.content === "string") {
+    message.content = await encodeString(track, message.content);
+    return;
+  }
+  for (const part of message.content) {
+    if (part.type === "text") part.text = await encodeString(track, part.text);
+  }
+}
+async function encodeContentRecord(record2, track) {
+  if (typeof record2.content === "string") {
+    record2.content = await encodeString(track, record2.content);
+    return;
+  }
+  if (!Array.isArray(record2.content)) return;
+  for (const part of record2.content) {
+    if (!isRecord(part) || typeof part.text !== "string") continue;
+    if (part.type === "text" || part.type === "input_text") {
+      part.text = await encodeString(track, part.text);
+    }
+  }
+}
+function wrapRequestTools(request, track) {
+  if (!request.functionTools) return;
+  request.functionTools = request.functionTools.map((tool) => {
+    if (!tool.executor) return tool;
+    const executor = tool.executor;
+    return {
+      ...tool,
+      executor: async (args, context) => applyEncodedResult(track, await executor(args, context))
+    };
+  });
+}
+async function encodeString(track, value) {
+  const encoded = await applyEncodedResult(track, value);
+  return typeof encoded === "string" ? encoded : value;
+}
+async function applyEncodedResult(track, value) {
+  if (!track.enabled || !track.client) return value;
+  let prepared;
+  try {
+    prepared = await track.client.prepare(value);
+  } catch (error) {
+    const failure = readPackageFailure(error);
+    if (failure?.code === "UNSUPPORTED_VALUE") return value;
+    throw mapAiInputError(error);
+  }
+  const wire = unframedBaseline(prepared);
+  note(track, prepared, value, wire);
+  if (wire === canonicalWire(value)) return value;
+  return wire;
+}
+function unframedBaseline(prepared) {
+  const baseline = isBaselineCodec(prepared.codec) && prepared.representation === "value";
+  if (!baseline || prepared.framing === "raw") return prepared.text;
+  const newline = prepared.text.indexOf("\n");
+  if (!prepared.text.startsWith("@ai-input/") || newline < 0) return prepared.text;
+  return prepared.text.slice(newline + 1);
+}
+function isBaselineCodec(codec) {
+  return codec === "json" || codec === "text" || codec === "outline";
+}
+function note(track, prepared, source, wire) {
+  const changed = wire !== canonicalWire(source);
+  if (changed) track.changed = true;
+  const alternate = prepared.codec === "toon" || prepared.representation !== "value";
+  if (alternate || !track.surfaced) {
+    track.codec = prepared.codec;
+    track.representation = prepared.representation;
+    track.approvalSource = prepared.receipt.approvalSource;
+    track.mode = prepared.mode;
+  }
+  if (alternate) track.surfaced = true;
+}
+function canonicalWire(value) {
+  if (typeof value === "string") return value;
+  return JSON.stringify(value);
+}
+function mapAiInputError(error) {
+  if (error instanceof AiDispatcherError) return error;
+  const failure = readPackageFailure(error);
+  if (failure) {
+    return new AiDispatcherError("AI_INPUT_FAILED", failure.message, {
+      code: failure.code,
+      ...failure.path !== void 0 ? { path: failure.path } : {},
+      ...failure.details !== void 0 ? { details: failure.details } : {}
+    });
+  }
+  const message = error instanceof Error ? error.message : "Input preparation failed.";
+  return new AiDispatcherError("AI_INPUT_FAILED", message);
+}
+function readPackageFailure(error) {
+  if (isAiInputError(error)) {
+    return {
+      code: error.code,
+      message: error.message,
+      ...error.path !== void 0 ? { path: error.path } : {},
+      ...error.details !== void 0 ? { details: error.details } : {}
+    };
+  }
+  if (!(error instanceof Error) || error.name !== "AiInputError") return void 0;
+  const coded = error;
+  if (typeof coded.code !== "string") return void 0;
+  return {
+    code: coded.code,
+    message: error.message,
+    ...typeof coded.path === "string" ? { path: coded.path } : {},
+    ...coded.details !== void 0 ? { details: coded.details } : {}
+  };
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
 // src/cache-usage.ts
 function readCacheTokens(source) {
   const cached = [];
@@ -58,7 +370,7 @@ function record(value) {
 
 // src/json-pointer.ts
 var UNSAFE_KEYS = /* @__PURE__ */ new Set(["__proto__", "prototype", "constructor"]);
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function unescapeToken(token) {
@@ -85,7 +397,7 @@ function walk(current, tokens) {
     if (index >= current.length) return [];
     return walk(current[index], rest);
   }
-  if (!isRecord(current) || !Object.prototype.hasOwnProperty.call(current, head)) return [];
+  if (!isRecord2(current) || !Object.prototype.hasOwnProperty.call(current, head)) return [];
   return walk(current[head], rest);
 }
 function valuesAtPointer(root, pointer) {
@@ -122,7 +434,7 @@ function collectParents(current, tokens) {
     if (index >= current.length) return [];
     return collectParents(current[index], rest);
   }
-  if (!isRecord(current) || !Object.prototype.hasOwnProperty.call(current, head)) return [];
+  if (!isRecord2(current) || !Object.prototype.hasOwnProperty.call(current, head)) return [];
   return collectParents(current[head], rest);
 }
 function deletePointer(root, pointer) {
@@ -138,27 +450,27 @@ function deletePointer(root, pointer) {
       if (index < parent.length) parent.splice(index, 1);
       continue;
     }
-    if (isRecord(parent) && Object.prototype.hasOwnProperty.call(parent, last)) {
+    if (isRecord2(parent) && Object.prototype.hasOwnProperty.call(parent, last)) {
       delete parent[last];
     }
   }
 }
 
 // src/reasoning-extract.ts
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function textFromValue(value) {
   if (typeof value === "string") return value;
   if (Array.isArray(value)) return value.map(textFromValue).join("");
-  if (!isRecord2(value)) return "";
+  if (!isRecord3(value)) return "";
   if (typeof value.text === "string") return value.text;
   if (typeof value.summary === "string") return value.summary;
   return "";
 }
 function extractStreamReasoningText(event, response) {
   if (response.streamReasoningKeys.length > 0) {
-    if (!isRecord2(event)) return void 0;
+    if (!isRecord3(event)) return void 0;
     for (const key of response.streamReasoningKeys) {
       const text = textFromValue(event[key]);
       if (text) return text;
@@ -256,6 +568,8 @@ function applyResolution(response, prepared) {
   if (prepared.cacheWarnings?.length) {
     result.warnings = [...result.warnings, ...prepared.cacheWarnings];
   }
+  const inputResolution = prepared.inputTrack ? visibleInputResolution(prepared.inputTrack) : void 0;
+  if (inputResolution) result.inputResolution = inputResolution;
   applyCacheUsage(result);
   const directive = prepared.directive;
   if (!directive) return result;
@@ -299,7 +613,7 @@ function applyUsage(response, raw, directive) {
 }
 
 // src/decorate-stream.ts
-function isRecord3(value) {
+function isRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function* decorateStream(prepared, source) {
@@ -357,11 +671,13 @@ async function* decorateStream(prepared, source) {
           };
         }
       }
-      const data = isRecord3(event.data) ? { ...event.data } : {};
+      const data = isRecord4(event.data) ? { ...event.data } : {};
       if (splitter) data.text = splitter.answer;
       if (reasoningText) data.reasoningText = reasoningText;
       if (prepared.resolution) data.reasoningResolution = prepared.resolution;
       if (prepared.cacheResolution) data.cacheResolution = prepared.cacheResolution;
+      const inputResolution = prepared.inputTrack ? visibleInputResolution(prepared.inputTrack) : void 0;
+      if (inputResolution) data.inputResolution = inputResolution;
       yield { ...event, data };
       continue;
     }
@@ -369,18 +685,20 @@ async function* decorateStream(prepared, source) {
   }
 }
 function withResolution(event, prepared) {
-  if (!prepared.resolution && !prepared.cacheResolution) return event;
-  const data = isRecord3(event.data) ? { ...event.data } : {};
+  const inputResolution = prepared.inputTrack ? visibleInputResolution(prepared.inputTrack) : void 0;
+  if (!prepared.resolution && !prepared.cacheResolution && !inputResolution) return event;
+  const data = isRecord4(event.data) ? { ...event.data } : {};
   if (prepared.resolution) data.reasoningResolution = prepared.resolution;
   if (prepared.cacheResolution) data.cacheResolution = prepared.cacheResolution;
+  if (inputResolution) data.inputResolution = inputResolution;
   return { ...event, data };
 }
 function textOf(event) {
-  if (!isRecord3(event.data) || typeof event.data.text !== "string") return "";
+  if (!isRecord4(event.data) || typeof event.data.text !== "string") return "";
   return event.data.text;
 }
 function adjustUsageEvent(event, prepared) {
-  if (!isRecord3(event.data) || !isRecord3(event.data.usage)) return event;
+  if (!isRecord4(event.data) || !isRecord4(event.data.usage)) return event;
   const paths = prepared.directive?.usage?.reasoningTokenPaths;
   const usage = { ...event.data.usage };
   let changed = false;
@@ -409,36 +727,6 @@ function adjustUsageEvent(event, prepared) {
   return { ...event, data: { ...event.data, usage } };
 }
 
-// src/types/providers.ts
-var IMPLEMENTED_AI_PROVIDERS = ["openrouter", "bedrock", "openai", "cloudflare"];
-function isImplementedAiProvider(provider) {
-  return IMPLEMENTED_AI_PROVIDERS.includes(provider);
-}
-
-// src/errors.ts
-var AiDispatcherError = class extends Error {
-  constructor(code, message, details) {
-    super(message);
-    this.code = code;
-    this.details = details;
-    this.name = "AiDispatcherError";
-  }
-  code;
-  details;
-};
-function providerNotImplemented(provider) {
-  const implemented = [...IMPLEMENTED_AI_PROVIDERS];
-  return new AiDispatcherError(
-    "PROVIDER_NOT_IMPLEMENTED",
-    `AI provider "${provider}" is not implemented yet. Supported by @x12i/ai-dispatcher: ${implemented.map((id) => `"${id}"`).join(", ")}.`,
-    {
-      provider,
-      implementedProviders: implemented,
-      operatorHint: `Pass provider: "${implemented[0]}" (or omit provider to use the default).`
-    }
-  );
-}
-
 // src/mcp.ts
 var TOOL_TOKEN = /^[A-Za-z0-9_-]+$/;
 var MAX_EXPOSED_NAME_LENGTH = 64;
@@ -460,7 +748,7 @@ function indexMcpServers(servers) {
   for (const server of servers) {
     assertServer(server, seenServers);
     for (const tool of server.tools) {
-      if (!isRecord4(tool)) {
+      if (!isRecord5(tool)) {
         throw new AiDispatcherError(
           "MCP_TOOL_NAME_INVALID",
           `MCP server "${server.id}" has a tool that is not an object.`
@@ -547,18 +835,17 @@ function applyMcpCatalog(params) {
 function createMcpExecutor(server, rawName) {
   return async (args, context) => {
     const result = await server.callTool(rawName, toArgs(args), context);
-    return flattenMcpResult(result);
+    return mcpModelValue(result);
   };
 }
-function flattenMcpResult(result) {
-  if (typeof result === "string") return result;
-  if (!isRecord4(result)) return stringify(result);
+function mcpModelValue(result) {
+  if (typeof result === "string" || !isRecord5(result)) return result;
   const text = textContent(result.content);
   if (result.isError === true) {
     throw new Error(text ?? stringify(result));
   }
   if (text !== void 0) return text;
-  return stringify(result);
+  return result;
 }
 function resolveAllowlist(filter, tools) {
   if (filter === void 0) return void 0;
@@ -577,7 +864,7 @@ function resolveAllowlist(filter, tools) {
   return new Set(filter);
 }
 function assertServer(server, seen) {
-  if (!isRecord4(server) || typeof server.id !== "string" || server.id.length === 0 || !Array.isArray(server.tools) || typeof server.callTool !== "function") {
+  if (!isRecord5(server) || typeof server.id !== "string" || server.id.length === 0 || !Array.isArray(server.tools) || typeof server.callTool !== "function") {
     throw new AiDispatcherError(
       "MCP_SERVER_INVALID",
       "An MCP server needs an id, a tools array, and a callTool function."
@@ -622,7 +909,7 @@ function toolDescription(tool) {
 }
 function toolParameters(tool) {
   if (tool.inputSchema === void 0) return { ...DEFAULT_PARAMETERS, properties: {} };
-  if (!isRecord4(tool.inputSchema)) {
+  if (!isRecord5(tool.inputSchema)) {
     throw new AiDispatcherError(
       "MCP_TOOL_NAME_INVALID",
       `MCP tool "${tool.name}" inputSchema must be an object.`
@@ -634,14 +921,14 @@ function textContent(content) {
   if (!Array.isArray(content)) return void 0;
   const parts = [];
   for (const part of content) {
-    if (!isRecord4(part) || part.type !== "text" || typeof part.text !== "string") continue;
+    if (!isRecord5(part) || part.type !== "text" || typeof part.text !== "string") continue;
     parts.push(part.text);
   }
   if (!parts.length) return void 0;
   return parts.join("\n");
 }
 function toArgs(args) {
-  if (isRecord4(args)) return args;
+  if (isRecord5(args)) return args;
   return {};
 }
 function listFailed(serverId, error) {
@@ -653,7 +940,7 @@ function stringify(result) {
   const serialized = JSON.stringify(result);
   return serialized === void 0 ? "null" : serialized;
 }
-function isRecord4(value) {
+function isRecord5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -1215,7 +1502,7 @@ function compileCloudflareRequest(request, options, call, streaming) {
   if (call?.finalizeBody) body = call.finalizeBody(body);
   if (endpoint !== "run") body = { ...body, stream: streaming };
   const gateway = mergeGateway(options.gateway, call?.cloudflare?.gateway);
-  const fromBody = isRecord5(body.metadata) ? body.metadata : void 0;
+  const fromBody = isRecord6(body.metadata) ? body.metadata : void 0;
   const packed = packProviderRecord(
     request.metadata,
     request.agentId,
@@ -1469,7 +1756,7 @@ function messagesFromInput(request) {
       messages.push({ role: "user", content: item });
       continue;
     }
-    if (!isRecord5(item)) continue;
+    if (!isRecord6(item)) continue;
     const role = item.role === "assistant" || item.role === "tool" || item.role === "system" ? item.role : "user";
     if (role === "system") continue;
     const content = inputContent(item.content);
@@ -1486,12 +1773,12 @@ function inputContent(content) {
   if (!Array.isArray(content)) return void 0;
   const parts = [];
   for (const part of content) {
-    if (!isRecord5(part)) continue;
+    if (!isRecord6(part)) continue;
     if ((part.type === "text" || part.type === "input_text") && typeof part.text === "string") {
       parts.push({ type: "text", text: part.text });
     } else if (part.type === "image_url" && typeof part.imageUrl === "string") {
       parts.push({ type: "image_url", imageUrl: part.imageUrl });
-    } else if (part.type === "image_url" && isRecord5(part.image_url) && typeof part.image_url.url === "string") {
+    } else if (part.type === "image_url" && isRecord6(part.image_url) && typeof part.image_url.url === "string") {
       parts.push({ type: "image_url", imageUrl: part.image_url.url });
     } else if (part.type === "input_image" && typeof part.image_url === "string") {
       parts.push({ type: "image_url", imageUrl: part.image_url });
@@ -1710,7 +1997,7 @@ function continueMessages(body, response, results) {
   return { ...body, messages };
 }
 function continueRun(body, response, results) {
-  const input = isRecord5(body.input) ? body.input : {};
+  const input = isRecord6(body.input) ? body.input : {};
   const continued = continueChat({ messages: input.messages }, response, results);
   return { ...body, input: { ...input, messages: continued.messages } };
 }
@@ -1799,7 +2086,7 @@ async function* streamCloudflare(request, options, call) {
       throw failure;
     }
     for await (const event of parseSse(response)) {
-      if (!isRecord5(event)) continue;
+      if (!isRecord6(event)) continue;
       const catalogReasoning = call?.extractStreamReasoning?.(event);
       const reasoningText = catalogReasoning || reasoningDelta(event);
       if (reasoningText) yield { type: "stream.reasoning.delta", requestId, data: { text: reasoningText } };
@@ -1862,7 +2149,7 @@ async function sendOnce(compiled, options, timeoutMs) {
     if (!response.ok) throw await readFailure(response);
     const text = await response.text();
     const parsed = text ? JSON.parse(text) : {};
-    if (isRecord5(parsed) && parsed.success === false) {
+    if (isRecord6(parsed) && parsed.success === false) {
       throw new AiDispatcherError(
         "PROVIDER_REQUEST_FAILED",
         messageFrom(parsed) ?? "Cloudflare request failed.",
@@ -1913,7 +2200,7 @@ function isConfigError(code) {
 }
 function asTerminalError(error) {
   if (error instanceof AiDispatcherError && error.code === "PROVIDER_RETRYABLE") {
-    const status = isRecord5(error.details) ? error.details.status : void 0;
+    const status = isRecord6(error.details) ? error.details.status : void 0;
     if (status === 429) return new AiDispatcherError("PROVIDER_RATE_LIMITED", error.message, error.details);
     return new AiDispatcherError("PROVIDER_GATEWAY_UNREACHABLE", error.message, error.details);
   }
@@ -1923,7 +2210,7 @@ function asTerminalError(error) {
 function normalizeCloudflareResponse(params) {
   const payload = unwrap(params.response);
   const calls = params.functionTools ?? extractCalls(params.compiled.endpoint, params.response);
-  const usage = normalizeUsage(payload.usage) ?? normalizeUsage(isRecord5(params.response) ? params.response.usage : void 0);
+  const usage = normalizeUsage(payload.usage) ?? normalizeUsage(isRecord6(params.response) ? params.response.usage : void 0);
   const status = params.status ?? (calls.length ? "requires_action" : "completed");
   return {
     id: typeof payload.id === "string" ? payload.id : params.requestId,
@@ -1956,16 +2243,16 @@ function answerText(response) {
   if (chat) return chat;
   const anthropic = anthropicAnswer(response);
   if (anthropic) return anthropic;
-  if (isRecord5(response.result)) return answerText(response.result);
+  if (isRecord6(response.result)) return answerText(response.result);
   return "";
 }
 function responsesAnswer(response) {
   if (!Array.isArray(response.output)) return "";
   const parts = [];
   for (const item of response.output) {
-    if (!isRecord5(item) || item.type !== "message" || !Array.isArray(item.content)) continue;
+    if (!isRecord6(item) || item.type !== "message" || !Array.isArray(item.content)) continue;
     for (const part of item.content) {
-      if (isRecord5(part) && part.type === "output_text" && typeof part.text === "string") parts.push(part.text);
+      if (isRecord6(part) && part.type === "output_text" && typeof part.text === "string") parts.push(part.text);
     }
   }
   return parts.join("");
@@ -1976,16 +2263,16 @@ function chatAnswer(response) {
   const content = message.content;
   if (typeof content === "string") return content;
   if (!Array.isArray(content)) return "";
-  return content.map((part) => isRecord5(part) && typeof part.text === "string" ? part.text : "").filter(Boolean).join("");
+  return content.map((part) => isRecord6(part) && typeof part.text === "string" ? part.text : "").filter(Boolean).join("");
 }
 function anthropicAnswer(response) {
   if (!Array.isArray(response.content)) return "";
-  return response.content.map((part) => isRecord5(part) && part.type === "text" && typeof part.text === "string" ? part.text : "").filter(Boolean).join("");
+  return response.content.map((part) => isRecord6(part) && part.type === "text" && typeof part.text === "string" ? part.text : "").filter(Boolean).join("");
 }
 function chatAssistantMessage(response) {
-  if (!Array.isArray(response.choices) || !isRecord5(response.choices[0])) return void 0;
+  if (!Array.isArray(response.choices) || !isRecord6(response.choices[0])) return void 0;
   const message = response.choices[0].message;
-  return isRecord5(message) ? message : void 0;
+  return isRecord6(message) ? message : void 0;
 }
 function extractCalls(endpoint, response) {
   const record2 = unwrap(response);
@@ -1997,7 +2284,7 @@ function responsesCalls(response) {
   if (!Array.isArray(response.output)) return [];
   const calls = [];
   for (const item of response.output) {
-    if (!isRecord5(item) || item.type !== "function_call") continue;
+    if (!isRecord6(item) || item.type !== "function_call") continue;
     calls.push(callUsage(
       typeof item.name === "string" ? item.name : "function",
       typeof item.call_id === "string" ? item.call_id : "function",
@@ -2011,7 +2298,7 @@ function chatCalls(response) {
   if (!message || !Array.isArray(message.tool_calls)) return [];
   const calls = [];
   for (const item of message.tool_calls) {
-    if (!isRecord5(item) || !isRecord5(item.function)) continue;
+    if (!isRecord6(item) || !isRecord6(item.function)) continue;
     const name = typeof item.function.name === "string" ? item.function.name : "function";
     calls.push(callUsage(
       name,
@@ -2025,7 +2312,7 @@ function anthropicCalls(response) {
   if (!Array.isArray(response.content)) return [];
   const calls = [];
   for (const item of response.content) {
-    if (!isRecord5(item) || item.type !== "tool_use") continue;
+    if (!isRecord6(item) || item.type !== "tool_use") continue;
     const name = typeof item.name === "string" ? item.name : "function";
     calls.push({
       name,
@@ -2064,7 +2351,7 @@ function emptyToolUsage(calls) {
   };
 }
 function normalizeUsage(usage) {
-  if (!isRecord5(usage)) return void 0;
+  if (!isRecord6(usage)) return void 0;
   const inputTokens = numberValue(usage.input_tokens) ?? numberValue(usage.prompt_tokens);
   const outputTokens = numberValue(usage.output_tokens) ?? numberValue(usage.completion_tokens);
   const totalTokens = numberValue(usage.total_tokens) ?? (inputTokens !== void 0 || outputTokens !== void 0 ? (inputTokens ?? 0) + (outputTokens ?? 0) : void 0);
@@ -2115,7 +2402,7 @@ function errorEvent(requestId, error) {
 }
 function textDelta(event) {
   if (event.type === "response.output_text.delta" && typeof event.delta === "string" && event.delta) return event.delta;
-  if (event.type === "content_block_delta" && isRecord5(event.delta) && event.delta.type === "text_delta" && typeof event.delta.text === "string" && event.delta.text) {
+  if (event.type === "content_block_delta" && isRecord6(event.delta) && event.delta.type === "text_delta" && typeof event.delta.text === "string" && event.delta.text) {
     return event.delta.text;
   }
   const choice = firstChoiceDelta(event);
@@ -2124,7 +2411,7 @@ function textDelta(event) {
 }
 function reasoningDelta(event) {
   if (event.type === "response.reasoning_summary_text.delta" && typeof event.delta === "string" && event.delta) return event.delta;
-  if (event.type === "content_block_delta" && isRecord5(event.delta) && event.delta.type === "thinking_delta" && typeof event.delta.thinking === "string" && event.delta.thinking) {
+  if (event.type === "content_block_delta" && isRecord6(event.delta) && event.delta.type === "thinking_delta" && typeof event.delta.thinking === "string" && event.delta.thinking) {
     return event.delta.thinking;
   }
   const choice = firstChoiceDelta(event);
@@ -2141,13 +2428,13 @@ function toolCallDelta(event) {
       argumentsDelta: event.delta
     };
   }
-  if (event.type === "content_block_delta" && isRecord5(event.delta) && event.delta.type === "input_json_delta" && typeof event.delta.partial_json === "string") {
+  if (event.type === "content_block_delta" && isRecord6(event.delta) && event.delta.type === "input_json_delta" && typeof event.delta.partial_json === "string") {
     return { index: typeof event.index === "number" ? event.index : 0, argumentsDelta: event.delta.partial_json };
   }
   const choice = firstChoiceDelta(event);
-  if (!choice || !Array.isArray(choice.tool_calls) || !isRecord5(choice.tool_calls[0])) return void 0;
+  if (!choice || !Array.isArray(choice.tool_calls) || !isRecord6(choice.tool_calls[0])) return void 0;
   const tool = choice.tool_calls[0];
-  const fn = isRecord5(tool.function) ? tool.function : void 0;
+  const fn = isRecord6(tool.function) ? tool.function : void 0;
   const args = fn && typeof fn.arguments === "string" ? fn.arguments : void 0;
   if (!args && !(fn && typeof fn.name === "string")) return void 0;
   return {
@@ -2157,18 +2444,18 @@ function toolCallDelta(event) {
   };
 }
 function streamUsage(event) {
-  if (event.type === "response.completed" && isRecord5(event.response)) return normalizeUsage(event.response.usage);
-  if (isRecord5(event.usage)) return normalizeUsage(event.usage);
+  if (event.type === "response.completed" && isRecord6(event.response)) return normalizeUsage(event.response.usage);
+  if (isRecord6(event.usage)) return normalizeUsage(event.usage);
   return void 0;
 }
 function firstChoiceDelta(event) {
-  if (!Array.isArray(event.choices) || !isRecord5(event.choices[0])) return void 0;
+  if (!Array.isArray(event.choices) || !isRecord6(event.choices[0])) return void 0;
   const delta = event.choices[0].delta;
-  return isRecord5(delta) ? delta : void 0;
+  return isRecord6(delta) ? delta : void 0;
 }
 function unwrap(response) {
-  if (!isRecord5(response)) return {};
-  if (response.success === true && isRecord5(response.result)) return response.result;
+  if (!isRecord6(response)) return {};
+  if (response.success === true && isRecord6(response.result)) return response.result;
   return response;
 }
 function modelOf(compiled) {
@@ -2176,12 +2463,12 @@ function modelOf(compiled) {
   return "";
 }
 function messageFrom(body) {
-  if (!isRecord5(body)) return void 0;
+  if (!isRecord6(body)) return void 0;
   if (typeof body.message === "string") return body.message;
-  if (isRecord5(body.error) && typeof body.error.message === "string") return body.error.message;
+  if (isRecord6(body.error) && typeof body.error.message === "string") return body.error.message;
   if (Array.isArray(body.errors)) {
     for (const error of body.errors) {
-      if (isRecord5(error) && typeof error.message === "string") return error.message;
+      if (isRecord6(error) && typeof error.message === "string") return error.message;
     }
   }
   return void 0;
@@ -2322,7 +2609,7 @@ function readEnv(name) {
   if (typeof process === "undefined") return void 0;
   return process.env[name];
 }
-function isRecord5(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -2530,7 +2817,7 @@ function settleNested(policy, kind, parentEffort) {
     if (kind === "fusion") next.judgeModel = directive.model;
     else next.model = directive.model;
   }
-  if (isRecord6(directive.body.reasoning)) next.reasoning = directive.body.reasoning;
+  if (isRecord7(directive.body.reasoning)) next.reasoning = directive.body.reasoning;
   return next;
 }
 function applyPromptPrefix(request, prefix) {
@@ -2580,7 +2867,7 @@ function prefixInputItems(items, prefix) {
     }
     if (!Array.isArray(item.content)) continue;
     for (const part of item.content) {
-      if (!isRecord6(part) || typeof part.text !== "string") continue;
+      if (!isRecord7(part) || typeof part.text !== "string") continue;
       if (part.type === "text" || part.type === "input_text") {
         part.text = prefix + part.text;
         return true;
@@ -2641,7 +2928,7 @@ var ROLE_STAMP_FIELDS = ["role", "roleLayer", "roleDigest", "profileChoice"];
 function applyRoleStamp(request) {
   const stamp = request.role;
   delete request.role;
-  if (!isRecord6(stamp)) return;
+  if (!isRecord7(stamp)) return;
   const identity = {};
   for (const field of ROLE_STAMP_FIELDS) {
     const value = stamp[field];
@@ -2656,8 +2943,8 @@ function applyRoleStamp(request) {
 }
 function absorbOverrideMetadata(request) {
   const overrides = request.rawOpenRouterOverrides;
-  if (!isRecord6(overrides) || !Object.prototype.hasOwnProperty.call(overrides, "metadata")) return;
-  if (isRecord6(overrides.metadata)) {
+  if (!isRecord7(overrides) || !Object.prototype.hasOwnProperty.call(overrides, "metadata")) return;
+  if (isRecord7(overrides.metadata)) {
     const current = { ...request.metadata ?? {} };
     const extra = {};
     for (const [key, value] of Object.entries(overrides.metadata)) {
@@ -2696,7 +2983,7 @@ function hasOwnKeys(value) {
 function hasStreamMetadata(directive) {
   return directive.response.streamReasoningKeys.length > 0 || directive.response.streamReasoningPaths.length > 0;
 }
-function isRecord6(value) {
+function isRecord7(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function readEnv2(name) {
@@ -3019,7 +3306,7 @@ async function runOpenAi(request, options, call, requestId) {
   let response;
   for (let iteration = 0; iteration <= maxIterations; iteration += 1) {
     response = await sendWithRetries2(active, options, timeoutFor2(request, options));
-    const calls = functionCalls(isRecord7(response) ? response : {});
+    const calls = functionCalls(isRecord8(response) ? response : {});
     if (!calls.length) break;
     if (!calls.every((item) => resolveExecutor2(item.name, request, options))) {
       return normalizeOpenAiResponse({
@@ -3039,7 +3326,7 @@ async function runOpenAi(request, options, call, requestId) {
       results.push(await executeOpenAiTool(item, request, options));
     }
     functionUsage.push(...results);
-    const record2 = isRecord7(response) ? response : {};
+    const record2 = isRecord8(response) ? response : {};
     active = {
       ...active,
       body: clean2({
@@ -3154,7 +3441,7 @@ async function* streamOpenAi(request, options, call) {
       throw failure;
     }
     for await (const event of parseSse2(response)) {
-      if (!isRecord7(event)) continue;
+      if (!isRecord8(event)) continue;
       if (event.type === "response.output_text.delta" && typeof event.delta === "string" && event.delta) {
         text += event.delta;
         yield { type: "stream.text.delta", requestId, data: { text: event.delta } };
@@ -3173,7 +3460,7 @@ async function* streamOpenAi(request, options, call) {
             argumentsDelta: event.delta
           }
         };
-      } else if (event.type === "response.completed" && isRecord7(event.response)) {
+      } else if (event.type === "response.completed" && isRecord8(event.response)) {
         const usage = normalizeUsage2(event.response.usage);
         if (usage) yield { type: "stream.usage", requestId, data: { usage } };
       } else if (event.type === "error") {
@@ -3267,7 +3554,7 @@ function isConfigError2(code) {
 }
 function asTerminalError2(error) {
   if (error instanceof AiDispatcherError && error.code === "PROVIDER_RETRYABLE") {
-    const status = isRecord7(error.details) ? error.details.status : void 0;
+    const status = isRecord8(error.details) ? error.details.status : void 0;
     if (status === 429) return new AiDispatcherError("PROVIDER_RATE_LIMITED", error.message, error.details);
     return new AiDispatcherError("PROVIDER_GATEWAY_UNREACHABLE", error.message, error.details);
   }
@@ -3275,7 +3562,7 @@ function asTerminalError2(error) {
   return new AiDispatcherError("PROVIDER_REQUEST_FAILED", error instanceof Error ? error.message : String(error));
 }
 function normalizeOpenAiResponse(params) {
-  const record2 = isRecord7(params.response) ? params.response : {};
+  const record2 = isRecord8(params.response) ? params.response : {};
   const text = answerText2(record2);
   const calls = params.functionTools ?? functionCalls(record2);
   const usage = normalizeUsage2(record2.usage);
@@ -3302,9 +3589,9 @@ function answerText2(response) {
   if (Array.isArray(output)) {
     const parts = [];
     for (const item of output) {
-      if (!isRecord7(item) || item.type === "reasoning" || item.type !== "message" || !Array.isArray(item.content)) continue;
+      if (!isRecord8(item) || item.type === "reasoning" || item.type !== "message" || !Array.isArray(item.content)) continue;
       for (const part of item.content) {
-        if (isRecord7(part) && part.type === "output_text" && typeof part.text === "string") parts.push(part.text);
+        if (isRecord8(part) && part.type === "output_text" && typeof part.text === "string") parts.push(part.text);
       }
     }
     if (parts.length > 0) return parts.join("");
@@ -3315,7 +3602,7 @@ function functionCalls(response) {
   if (!Array.isArray(response.output)) return [];
   const calls = [];
   for (const item of response.output) {
-    if (!isRecord7(item) || item.type !== "function_call") continue;
+    if (!isRecord8(item) || item.type !== "function_call") continue;
     const name = typeof item.name === "string" ? item.name : "function";
     const callId = typeof item.call_id === "string" ? item.call_id : name;
     let args = item.arguments;
@@ -3347,7 +3634,7 @@ function toolUsage(calls) {
   };
 }
 function normalizeUsage2(usage) {
-  if (!isRecord7(usage)) return void 0;
+  if (!isRecord8(usage)) return void 0;
   const inputTokens = numberValue2(usage.input_tokens);
   const outputTokens = numberValue2(usage.output_tokens);
   const totalTokens = numberValue2(usage.total_tokens) ?? (inputTokens !== void 0 || outputTokens !== void 0 ? (inputTokens ?? 0) + (outputTokens ?? 0) : void 0);
@@ -3399,16 +3686,16 @@ function modelOf2(compiled) {
   return typeof compiled.body.model === "string" ? compiled.body.model : "";
 }
 function messageFrom2(body) {
-  if (!isRecord7(body)) return void 0;
+  if (!isRecord8(body)) return void 0;
   if (typeof body.message === "string") return body.message;
-  if (isRecord7(body.error) && typeof body.error.message === "string") return body.error.message;
+  if (isRecord8(body.error) && typeof body.error.message === "string") return body.error.message;
   return void 0;
 }
 function numberValue2(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
 function attachProviderMetadata(body, request, packer) {
-  const fromBody = isRecord7(body.metadata) ? body.metadata : void 0;
+  const fromBody = isRecord8(body.metadata) ? body.metadata : void 0;
   const packed = packProviderRecord2(request.metadata, request.agentId, fromBody, packer);
   if (packed.wire) return { body: { ...body, metadata: packed.wire }, ...packed.warning ? { warning: packed.warning } : {} };
   if (body.metadata === void 0) return { body, ...packed.warning ? { warning: packed.warning } : {} };
@@ -3482,7 +3769,7 @@ function readEnv3(name) {
   if (typeof process === "undefined") return void 0;
   return process.env[name];
 }
-function isRecord7(value) {
+function isRecord8(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -3552,6 +3839,7 @@ function createAiDispatcher(options = {}) {
     if (provider === "openrouter") {
       const openrouterOptions = {
         ...options.openrouter,
+        ...options.openrouter?.tools ? { tools: wrapToolRegistry(options.openrouter.tools) } : {},
         metadataPacker: packer,
         ...options.logger && !options.openrouter?.logger ? { logger: options.logger } : {}
       };
@@ -3560,6 +3848,7 @@ function createAiDispatcher(options = {}) {
     if (provider === "bedrock") {
       const bedrockOptions = {
         ...options.bedrock,
+        ...options.bedrock?.tools ? { tools: wrapToolRegistry(options.bedrock.tools) } : {},
         metadataPacker: packer,
         ...options.logger && !options.bedrock?.logger ? { logger: options.logger } : {}
       };
@@ -3568,6 +3857,7 @@ function createAiDispatcher(options = {}) {
     if (provider === "openai") {
       const openaiOptions = {
         ...options.openai,
+        ...options.openai?.tools ? { tools: wrapToolRegistry(options.openai.tools) } : {},
         ...options.logger && !options.openai?.logger ? { logger: options.logger } : {}
       };
       return createOpenAiProviderAdapter(openaiOptions, packer);
@@ -3575,6 +3865,7 @@ function createAiDispatcher(options = {}) {
     if (provider === "cloudflare") {
       const cloudflareOptions = {
         ...options.cloudflare,
+        ...options.cloudflare?.tools ? { tools: wrapToolRegistry(options.cloudflare.tools) } : {},
         ...options.logger && !options.cloudflare?.logger ? { logger: options.logger } : {}
       };
       return createCloudflareProviderAdapter(cloudflareOptions, packer);
@@ -3596,21 +3887,27 @@ function createAiDispatcher(options = {}) {
   return {
     provider: defaultProvider,
     async run(request) {
-      const prepared = prepare(request, true);
+      const prepared = await prepare(request, true);
       log(options, "ai-dispatcher.request.started", prepared, "run", false);
-      const response = await getAdapter(prepared.provider).run(prepared.request, callOf(prepared.call));
+      const response = await inputStorage.run(
+        prepared.inputTrack,
+        () => getAdapter(prepared.provider).run(prepared.request, callOf(prepared.call))
+      );
       return applyResolution(response, prepared);
     },
     executeStreamingChat(request) {
-      const prepared = prepare(request, false);
-      log(options, "ai-dispatcher.request.started", prepared, "executeStreamingChat", true);
-      return decorateStream(
-        prepared,
-        getAdapter(prepared.provider).executeStreamingChat(prepared.request, callOf(prepared.call))
-      );
+      return (async function* () {
+        const prepared = await prepare(request, false);
+        log(options, "ai-dispatcher.request.started", prepared, "executeStreamingChat", true);
+        if (prepared.inputTrack) inputStorage.enterWith(prepared.inputTrack);
+        yield* decorateStream(
+          prepared,
+          getAdapter(prepared.provider).executeStreamingChat(prepared.request, callOf(prepared.call))
+        );
+      })();
     },
-    compile(request) {
-      const prepared = prepare(request, true);
+    async compile(request) {
+      const prepared = await prepare(request, true);
       log(options, "ai-dispatcher.request.compiled", prepared, "compile", false);
       const compiled = getAdapter(prepared.provider).compile(prepared.request, callOf(prepared.call));
       return attachCompileMeta(prepared, compiled);
@@ -3624,7 +3921,7 @@ function createAiDispatcher(options = {}) {
       return pending;
     }
   };
-  function prepare(request, includeMcp) {
+  async function prepare(request, includeMcp) {
     const provider = resolveProvider(request.provider, defaultProvider);
     const prepared = prepareDispatchRequest({ request, provider, options });
     const tools = providerTools(provider, options);
@@ -3634,6 +3931,11 @@ function createAiDispatcher(options = {}) {
       ...tools ? { providerTools: tools } : {},
       includeMcp
     });
+    prepared.inputTrack = await applyAiInput({
+      request: prepared.request,
+      effectiveModel: prepared.effectiveModel,
+      factory: options.aiInput
+    });
     return prepared;
   }
 }
@@ -3651,7 +3953,8 @@ function callOf(call) {
 }
 function attachCompileMeta(prepared, compiled) {
   const record2 = compiled;
-  const headers = isRecord8(record2.headers) ? redactHeaders(record2.headers) : void 0;
+  const headers = isRecord9(record2.headers) ? redactHeaders(record2.headers) : void 0;
+  const inputResolution = prepared.inputTrack ? visibleInputResolution(prepared.inputTrack) : void 0;
   return {
     ...record2,
     ...headers ? { headers } : {},
@@ -3660,6 +3963,7 @@ function attachCompileMeta(prepared, compiled) {
     effectiveModel: prepared.effectiveModel,
     ...prepared.resolution ? { reasoningResolution: prepared.resolution } : {},
     ...prepared.cacheResolution ? { cacheResolution: prepared.cacheResolution } : {},
+    ...inputResolution ? { inputResolution } : {},
     ...prepared.cacheWarnings?.length ? { warnings: [...Array.isArray(record2.warnings) ? record2.warnings : [], ...prepared.cacheWarnings] } : {}
   };
 }
@@ -3685,7 +3989,7 @@ function log(options, event, prepared, entrypoint, streaming) {
   if (event.endsWith("compiled")) options.logger?.debug?.(event, payload);
   else options.logger?.info?.(event, payload);
 }
-function isRecord8(value) {
+function isRecord9(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }