omnigateway 0.4.11 → 0.4.13

package/bin/omni.js

@@ -1931,16 +1931,51 @@ function hasVendorCacheControl(req) {
   const anthropic2 = req.vendor?.anthropic;
   return typeof anthropic2 === "object" && anthropic2 !== null && "cache_control" in anthropic2;
 }
-function addAutoCacheBreakpoint(body, req, note2) {
+var CACHEABLE_WIRE_BLOCKS = new Set(["text", "image", "tool_use", "tool_result", "document"]);
+function lastCacheableHistoryBlock(messages) {
+  for (let m = messages.length - 1;m >= 0; m--) {
+    const message = messages[m];
+    if (!isRecord(message) || !Array.isArray(message.content))
+      continue;
+    for (let b = message.content.length - 1;b >= 0; b--) {
+      const block = message.content[b];
+      if (!isRecord(block))
+        continue;
+      if (typeof block.type === "string" && CACHEABLE_WIRE_BLOCKS.has(block.type))
+        return block;
+    }
+  }
+  return;
+}
+function addAutoCacheBreakpoints(body, req, note2) {
   if (estimateCachedInputTokens(req) !== 0 || hasVendorCacheControl(req))
     return;
-  if (estimateInputTokens({ ...req, messages: [] }) < AUTO_CACHE_MIN_TOKENS)
+  let markedPrefix = 0;
+  const worthAMarker = (prefix) => prefix - markedPrefix >= AUTO_CACHE_MIN_TOKENS;
+  let stablePrefixMarked = false;
+  const toolsPrefix = estimateInputTokens({ ...req, messages: [], system: [] });
+  const lastTool = body.tools?.at(-1);
+  if (lastTool !== undefined && worthAMarker(toolsPrefix)) {
+    lastTool.cache_control = { type: "ephemeral" };
+    markedPrefix = toolsPrefix;
+    stablePrefixMarked = true;
+  }
+  const systemPrefix = estimateInputTokens({ ...req, messages: [] });
+  const lastSystem = body.system?.at(-1);
+  if (lastSystem !== undefined && worthAMarker(systemPrefix)) {
+    lastSystem.cache_control = { type: "ephemeral" };
+    markedPrefix = systemPrefix;
+    stablePrefixMarked = true;
+  }
+  if (stablePrefixMarked)
+    note2("anthropic:cache-breakpoint-added");
+  if (!worthAMarker(estimateInputTokens(req)))
     return;
-  const target = body.system?.at(-1) ?? body.tools?.at(-1);
-  if (target === undefined)
+  const lastHistory = lastCacheableHistoryBlock(body.messages);
+  if (lastHistory === undefined)
     return;
-  target.cache_control = { type: "ephemeral" };
-  note2("anthropic:cache-breakpoint-added");
+  lastHistory.cache_control = { type: "ephemeral" };
+  note2("anthropic:history-cache-breakpoint-added");
 }
 function toWire(req, model, opts) {
   const cloak = opts.cloak ?? null;
@@ -1992,7 +2027,7 @@ function toWire(req, model, opts) {
   if (req.toolChoice !== undefined)
     body.tool_choice = encodeToolChoice(req.toolChoice, cloak);
   if (opts.autoCache === true)
-    addAutoCacheBreakpoint(body, req, note2);
+    addAutoCacheBreakpoints(body, req, note2);
   if (req.reasoning !== undefined) {
     switch (req.reasoning.mode) {
       case "adaptive":
@@ -2105,13 +2140,31 @@ var anthropicAdapter = {
     };
   }
 };
-// packages/providers/src/kimi/decode.ts
-var FINISH = {
+// packages/providers/src/custom/decode.ts
+var CHAT_FINISH = {
   stop: "endTurn",
   length: "maxTokens",
   tool_calls: "toolUse",
   content_filter: "contentFilter"
 };
+function reasoningText(delta) {
+  if (typeof delta.reasoning === "string" && delta.reasoning.length > 0)
+    return delta.reasoning;
+  if (typeof delta.reasoning_content === "string" && delta.reasoning_content.length > 0) {
+    return delta.reasoning_content;
+  }
+  if (!Array.isArray(delta.reasoning_details))
+    return "";
+  return delta.reasoning_details.flatMap((entry) => {
+    if (entry === null || typeof entry !== "object")
+      return [];
+    if (typeof entry.text === "string" && entry.text.length > 0)
+      return [entry.text];
+    if (typeof entry.summary === "string" && entry.summary.length > 0)
+      return [entry.summary];
+    return [];
+  }).join("");
+}
 function json2(data) {
   try {
     const v = JSON.parse(data);
@@ -2120,7 +2173,7 @@ function json2(data) {
     return null;
   }
 }
-async function* decodeChat(messages) {
+async function* decodeCustomChat(messages) {
   let started = false;
   let done = false;
   let stopReason = "endTurn";
@@ -2149,6 +2202,21 @@ async function* decodeChat(messages) {
     if (!choice)
       continue;
     const delta = choice.delta ?? {};
+    const reasoning = reasoningText(delta);
+    if (reasoning.length > 0) {
+      if (openKind !== "thinking") {
+        if (openKind !== undefined)
+          yield { type: "blockEnd", index: openIndex };
+        openKind = "thinking";
+        openIndex = nextIndex++;
+        yield { type: "blockStart", index: openIndex, block: { type: "thinking" } };
+      }
+      yield {
+        type: "blockDelta",
+        index: openIndex,
+        delta: { type: "thinking", text: reasoning }
+      };
+    }
     if (typeof delta.content === "string" && delta.content.length > 0) {
       if (openKind !== "text") {
         if (openKind !== undefined)
@@ -2189,7 +2257,7 @@ async function* decodeChat(messages) {
       }
     }
     if (typeof choice.finish_reason === "string") {
-      stopReason = FINISH[choice.finish_reason] ?? "endTurn";
+      stopReason = CHAT_FINISH[choice.finish_reason] ?? "endTurn";
     }
   }
   if (done) {
@@ -2205,110 +2273,7 @@ async function* decodeChat(messages) {
     };
   }
 }
-
-// packages/providers/src/kimi/wire.ts
-function encodeToolChoice2(c) {
-  switch (c.type) {
-    case "auto":
-      return "auto";
-    case "any":
-      return "required";
-    case "none":
-      return "none";
-    case "tool":
-      return { type: "function", function: { name: c.name } };
-  }
-}
-function toChatWire(req, model, vendor = "kimi") {
-  const degradations = [];
-  const note2 = (d) => {
-    if (!degradations.includes(d))
-      degradations.push(d);
-  };
-  if (req.betas?.includes(CONTEXT_1M_BETA))
-    note2("kimi:context-1m-dropped");
-  const messages = [];
-  const system = req.system?.flatMap((b) => b.type === "text" ? [b.text] : []).join(`
-
-`);
-  if (system !== undefined && system.length > 0)
-    messages.push({ role: "system", content: system });
-  for (const message of req.messages) {
-    const text = [];
-    const toolCalls = [];
-    for (const block of message.content) {
-      switch (block.type) {
-        case "text":
-          text.push(block.text);
-          break;
-        case "image":
-          note2("kimi:images-dropped");
-          break;
-        case "thinking":
-          note2("kimi:thinking-dropped");
-          break;
-        case "toolUse":
-          toolCalls.push({
-            id: block.id,
-            type: "function",
-            function: { name: block.name, arguments: JSON.stringify(block.input) }
-          });
-          break;
-        case "toolResult":
-          messages.push({
-            role: "tool",
-            tool_call_id: block.toolUseId,
-            content: block.content
-          });
-          break;
-        case "anthropicNative":
-          note2("kimi:anthropic-native-block-dropped");
-          break;
-      }
-    }
-    if (toolCalls.length > 0) {
-      messages.push({
-        role: message.role,
-        content: text.length > 0 ? text.join(`
-`) : null,
-        tool_calls: toolCalls
-      });
-    } else if (text.length > 0) {
-      messages.push({ role: message.role, content: text.join(`
-`) });
-    }
-  }
-  const body = {
-    model,
-    messages,
-    stream: req.stream,
-    stream_options: { include_usage: true }
-  };
-  if (req.maxTokens !== undefined)
-    body.max_tokens = req.maxTokens;
-  if (req.temperature !== undefined)
-    body.temperature = req.temperature;
-  if (req.stopSequences !== undefined)
-    body.stop = req.stopSequences;
-  if (req.tools !== undefined) {
-    const custom = req.tools.filter((t) => t.provider === "custom");
-    if (custom.length !== req.tools.length)
-      note2("kimi:anthropic-tool-dropped");
-    body.tools = custom.map((t) => ({
-      type: "function",
-      function: { name: t.name, description: t.description, parameters: t.inputSchema }
-    }));
-  }
-  if (req.toolChoice !== undefined)
-    body.tool_choice = encodeToolChoice2(req.toolChoice);
-  if (req.reasoning !== undefined)
-    note2("kimi:reasoning-dropped");
-  Object.assign(body, req.vendor?.[vendor] ?? {});
-  return { body, degradations };
-}
-
-// packages/providers/src/openai/decode.ts
-var ERROR_CODE = {
+var RESPONSES_ERROR_CODE = {
   rate_limit_exceeded: "RATE_LIMIT",
   insufficient_quota: "QUOTA_EXHAUSTED",
   invalid_api_key: "AUTH",
@@ -2316,15 +2281,7 @@ var ERROR_CODE = {
   context_length_exceeded: "BAD_REQUEST",
   content_policy_violation: "CONTENT_FILTER"
 };
-function json3(data) {
-  try {
-    const v = JSON.parse(data);
-    return typeof v === "object" && v !== null ? v : null;
-  } catch {
-    return null;
-  }
-}
-async function* decodeResponses(messages) {
+async function* decodeCustomResponses(messages) {
   const indices = new Map;
   let next = 0;
   const irIndex = (outputIndex, contentIndex = 0) => {
@@ -2340,7 +2297,7 @@ async function* decodeResponses(messages) {
   let terminal = false;
   const ownsBlock = new Set;
   for await (const msg of messages) {
-    const d = json3(msg.data);
+    const d = json2(msg.data);
     if (d === null)
       continue;
     switch (msg.event) {
@@ -2432,7 +2389,7 @@ async function* decodeResponses(messages) {
       case "error": {
         terminal = true;
         const err = d.response?.error ?? d.error ?? {};
-        const code = ERROR_CODE[String(err.code ?? err.type)] ?? "UPSTREAM";
+        const code = RESPONSES_ERROR_CODE[String(err.code ?? err.type)] ?? "UPSTREAM";
         yield {
           type: "error",
           code,
@@ -2455,8 +2412,20 @@ async function* decodeResponses(messages) {
   }
 }
 
-// packages/providers/src/openai/wire.ts
-function encodeToolChoice3(c) {
+// packages/providers/src/custom/wire.ts
+function encodeChatToolChoice(c) {
+  switch (c.type) {
+    case "auto":
+      return "auto";
+    case "any":
+      return "required";
+    case "none":
+      return "none";
+    case "tool":
+      return { type: "function", function: { name: c.name } };
+  }
+}
+function encodeResponsesToolChoice(c) {
   switch (c.type) {
     case "auto":
       return "auto";
@@ -2468,20 +2437,115 @@ function encodeToolChoice3(c) {
       return { type: "function", name: c.name };
   }
 }
-function toResponsesWire(req, model, opts = { oauth: false }) {
+function customEffort(reasoning) {
+  if (reasoning === undefined || reasoning.mode !== "adaptive")
+    return;
+  return reasoning.effort ?? "medium";
+}
+function toCustomChatWire(req, model) {
   const degradations = [];
-  const input = [];
   const note2 = (d) => {
     if (!degradations.includes(d))
       degradations.push(d);
   };
   if (req.betas?.includes(CONTEXT_1M_BETA))
-    note2("openai:context-1m-dropped");
+    note2("custom:context-1m-dropped");
+  const messages = [];
+  const system = req.system?.flatMap((b) => b.type === "text" ? [b.text] : []).join(`
+
+`);
+  if (system !== undefined && system.length > 0)
+    messages.push({ role: "system", content: system });
+  for (const message of req.messages) {
+    const text = [];
+    const toolCalls = [];
+    for (const block of message.content) {
+      switch (block.type) {
+        case "text":
+          text.push(block.text);
+          break;
+        case "image":
+          note2("custom:images-dropped");
+          break;
+        case "thinking":
+          note2("custom:thinking-dropped");
+          break;
+        case "toolUse":
+          toolCalls.push({
+            id: block.id,
+            type: "function",
+            function: { name: block.name, arguments: JSON.stringify(block.input) }
+          });
+          break;
+        case "toolResult":
+          messages.push({
+            role: "tool",
+            tool_call_id: block.toolUseId,
+            content: block.content
+          });
+          break;
+        case "anthropicNative":
+          note2("custom:anthropic-native-block-dropped");
+          break;
+      }
+    }
+    if (toolCalls.length > 0) {
+      messages.push({
+        role: message.role,
+        content: text.length > 0 ? text.join(`
+`) : null,
+        tool_calls: toolCalls
+      });
+    } else if (text.length > 0) {
+      messages.push({ role: message.role, content: text.join(`
+`) });
+    }
+  }
+  const body = {
+    model,
+    messages,
+    stream: req.stream,
+    stream_options: { include_usage: true }
+  };
+  if (req.maxTokens !== undefined)
+    body.max_tokens = req.maxTokens;
+  if (req.temperature !== undefined)
+    body.temperature = req.temperature;
+  if (req.stopSequences !== undefined)
+    body.stop = req.stopSequences;
+  if (req.tools !== undefined) {
+    const portable = req.tools.filter((t) => t.provider === "custom");
+    if (portable.length !== req.tools.length)
+      note2("custom:anthropic-tool-dropped");
+    body.tools = portable.map((t) => ({
+      type: "function",
+      function: { name: t.name, description: t.description, parameters: t.inputSchema }
+    }));
+  }
+  if (req.toolChoice !== undefined)
+    body.tool_choice = encodeChatToolChoice(req.toolChoice);
+  const effort = customEffort(req.reasoning);
+  if (effort !== undefined)
+    body.reasoning_effort = effort;
+  else if (req.reasoning?.mode === "budget")
+    note2("custom:reasoning-budget-dropped");
+  Object.assign(body, req.vendor?.openai ?? {});
+  return { body, degradations };
+}
+function toCustomResponsesWire(req, model) {
+  const degradations = [];
+  const note2 = (d) => {
+    if (!degradations.includes(d))
+      degradations.push(d);
+  };
+  const input = [];
+  if (req.betas?.includes(CONTEXT_1M_BETA))
+    note2("custom:context-1m-dropped");
   for (const message of req.messages) {
     const parts = [];
     const inlined = message.role === "system";
     if (inlined)
-      note2("openai:system-turn-inlined");
+      note2("custom:system-turn-inlined");
     const role = inlined ? "user" : message.role;
     const flush = () => {
       if (parts.length === 0)
@@ -2506,9 +2570,7 @@ ${block.text}
           });
           break;
         case "thinking":
-          if (!degradations.includes("openai:thinking-dropped")) {
-            note2("openai:thinking-dropped");
-          }
+          note2("custom:thinking-dropped");
           break;
         case "toolUse":
           flush();
@@ -2528,7 +2590,7 @@ ${block.text}
           });
           break;
         case "anthropicNative":
-          note2("openai:anthropic-native-block-dropped");
+          note2("custom:anthropic-native-block-dropped");
           break;
       }
     }
@@ -2540,23 +2602,15 @@ ${block.text}
 `);
   if (instructions !== undefined && instructions.length > 0)
     body.instructions = instructions;
-  if (req.maxTokens !== undefined) {
-    if (opts.oauth)
-      note2("openai:max-tokens-dropped");
-    else
-      body.max_output_tokens = req.maxTokens;
-  }
-  if (req.temperature !== undefined) {
-    if (opts.oauth)
-      note2("openai:temperature-dropped");
-    else
-      body.temperature = req.temperature;
-  }
+  if (req.maxTokens !== undefined)
+    body.max_output_tokens = req.maxTokens;
+  if (req.temperature !== undefined)
+    body.temperature = req.temperature;
   if (req.tools !== undefined) {
-    const custom = req.tools.filter((t) => t.provider === "custom");
-    if (custom.length !== req.tools.length)
-      note2("openai:anthropic-tool-dropped");
-    body.tools = custom.map((t) => ({
+    const portable = req.tools.filter((t) => t.provider === "custom");
+    if (portable.length !== req.tools.length)
+      note2("custom:anthropic-tool-dropped");
+    body.tools = portable.map((t) => ({
       type: "function",
       name: t.name,
       description: t.description,
@@ -2564,20 +2618,12 @@ ${block.text}
     }));
   }
   if (req.toolChoice !== undefined)
-    body.tool_choice = encodeToolChoice3(req.toolChoice);
-  if (req.reasoning !== undefined && req.reasoning.mode !== "off") {
-    const effort = req.reasoning.mode === "adaptive" ? req.reasoning.effort ?? "medium" : "medium";
-    if (effort === "xhigh" || effort === "max") {
-      degradations.push("openai:reasoning-effort-clamped");
-    }
-    body.reasoning = {
-      effort: effort === "xhigh" || effort === "max" ? "high" : effort,
-      summary: "auto"
-    };
-    if (req.reasoning.mode === "budget") {
-      degradations.push("openai:reasoning-budget-dropped");
-    }
-  }
+    body.tool_choice = encodeResponsesToolChoice(req.toolChoice);
+  const effort = customEffort(req.reasoning);
+  if (effort !== undefined)
+    body.reasoning = { effort, summary: "auto" };
+  else if (req.reasoning?.mode === "budget")
+    note2("custom:reasoning-budget-dropped");
   Object.assign(body, req.vendor?.openai ?? {});
   return { body, degradations };
 }
@@ -2588,7 +2634,13 @@ function metadata(data) {
   if (typeof origin !== "string" || protocol !== "chat_completions" && protocol !== "responses") {
     throw new GatewayError("BAD_REQUEST", "custom credential has invalid endpoint metadata");
   }
-  return { origin, protocol };
+  const basePath = typeof data.basePath === "string" ? data.basePath : "";
+  return { origin, basePath, protocol };
+}
+function endpointUrl(origin, basePath, protocol) {
+  const suffix = protocol === "chat_completions" ? "chat/completions" : "responses";
+  const base = `${origin}${basePath}`.replace(/\/+$/, "");
+  return base.endsWith("/v1") ? `${base}/${suffix}` : `${base}/v1/${suffix}`;
 }
 var customAdapter = {
   id: "custom",
@@ -2598,15 +2650,15 @@ var customAdapter = {
     if (apiKey === null) {
       throw new GatewayError("AUTH", "custom credential has no API key", { provider: "custom" });
     }
-    const { origin, protocol } = metadata(req.credentials.providerData);
-    const encoded = protocol === "chat_completions" ? toChatWire(req.request, req.model, "openai") : toResponsesWire(req.request, req.model);
+    const { origin, basePath, protocol } = metadata(req.credentials.providerData);
+    const encoded = protocol === "chat_completions" ? toCustomChatWire(req.request, req.model) : toCustomResponsesWire(req.request, req.model);
     const headers = [
       ["Content-Type", "application/json"],
       ["Authorization", `Bearer ${apiKey}`]
     ];
     const res = await req.http({
       provider: "custom",
-      url: `${origin}/v1/${protocol === "chat_completions" ? "chat/completions" : "responses"}`,
+      url: endpointUrl(origin, basePath, protocol),
       method: "POST",
       headers,
       body: JSON.stringify({ ...encoded.body, stream: true }),
@@ -2618,8 +2670,8 @@ var customAdapter = {
       throw new GatewayError("UPSTREAM", "empty response body", { provider: "custom" });
     }
     return {
-      events: protocol === "chat_completions" ? decodeChat(parseSse(res.body)) : decodeResponses(parseSse(res.body)),
-      degradations: encoded.degradations.map((value) => value.replace(protocol === "chat_completions" ? /^kimi:/ : /^openai:/, "custom:"))
+      events: protocol === "chat_completions" ? decodeCustomChat(parseSse(res.body)) : decodeCustomResponses(parseSse(res.body)),
+      degradations: encoded.degradations
     };
   }
 };
@@ -2638,7 +2690,7 @@ function grokDeviceHeaders(providerData) {
 import { createHash as createHash2 } from "crypto";
 
 // packages/providers/src/grok/decode.ts
-var ERROR_CODE2 = {
+var ERROR_CODE = {
   rate_limit_exceeded: "RATE_LIMIT",
   insufficient_quota: "QUOTA_EXHAUSTED",
   invalid_api_key: "AUTH",
@@ -2672,7 +2724,7 @@ var KNOWN_EVENTS2 = new Set([
   "response.failed",
   "error"
 ]);
-function json4(data) {
+function json3(data) {
   try {
     const v = JSON.parse(data);
     return typeof v === "object" && v !== null ? v : null;
@@ -2707,7 +2759,7 @@ async function* decodeGrokResponses(messages) {
       };
       return;
     }
-    const d = json4(msg.data);
+    const d = json3(msg.data);
     if (d === null)
       continue;
     switch (msg.event) {
@@ -2800,7 +2852,7 @@ async function* decodeGrokResponses(messages) {
       case "error": {
         terminal = true;
         const err = d.response?.error ?? d.error ?? {};
-        const code = ERROR_CODE2[String(err.code ?? err.type)] ?? "UPSTREAM";
+        const code = ERROR_CODE[String(err.code ?? err.type)] ?? "UPSTREAM";
         yield {
           type: "error",
           code,
@@ -2826,7 +2878,7 @@ async function* decodeGrokResponses(messages) {
 // packages/providers/src/grok/wire.ts
 import { createHash } from "crypto";
 var MAX_TOOLS = 200;
-function encodeToolChoice4(c) {
+function encodeToolChoice2(c) {
   switch (c.type) {
     case "auto":
       return "auto";
@@ -2937,12 +2989,14 @@ ${block.text}
     }));
   }
   if (req.toolChoice !== undefined)
-    body.tool_choice = encodeToolChoice4(req.toolChoice);
+    body.tool_choice = encodeToolChoice2(req.toolChoice);
   if (req.reasoning !== undefined && req.reasoning.mode !== "off") {
-    const effort = req.reasoning.mode === "adaptive" ? req.reasoning.effort ?? "medium" : "medium";
-    body.reasoning = { effort, summary: "concise" };
-    if (req.reasoning.mode === "budget")
+    if (req.reasoning.mode === "budget") {
       note2("grok:reasoning-budget-dropped");
+    } else {
+      const effort = req.reasoning.effort ?? "medium";
+      body.reasoning = { effort, summary: "concise" };
+    }
   }
   Object.assign(body, req.vendor?.grok ?? {});
   return { body, degradations };
@@ -3100,13 +3154,13 @@ function hasHeader(req, lowerName) {
   return req.headers.some(([name]) => name.toLowerCase() === lowerName);
 }
 // packages/providers/src/kilo/decode.ts
-var FINISH2 = {
+var FINISH = {
   stop: "endTurn",
   length: "maxTokens",
   tool_calls: "toolUse",
   content_filter: "contentFilter"
 };
-function reasoningText(delta) {
+function reasoningText2(delta) {
   if (typeof delta.reasoning === "string" && delta.reasoning.length > 0)
     return delta.reasoning;
   if (typeof delta.reasoning_content === "string" && delta.reasoning_content.length > 0) {
@@ -3124,7 +3178,7 @@ function reasoningText(delta) {
     return [];
   }).join("");
 }
-function json5(data) {
+function json4(data) {
   try {
     const v = JSON.parse(data);
     return typeof v === "object" && v !== null ? v : null;
@@ -3146,7 +3200,7 @@ async function* decodeKiloChat(messages) {
       done = true;
       break;
     }
-    const d = json5(msg.data);
+    const d = json4(msg.data);
     if (d === null)
       continue;
     if (!started && (d.id !== undefined || d.model !== undefined)) {
@@ -3161,7 +3215,7 @@ async function* decodeKiloChat(messages) {
     if (!choice)
       continue;
     const delta = choice.delta ?? {};
-    const reasoning = reasoningText(delta);
+    const reasoning = reasoningText2(delta);
     if (reasoning.length > 0) {
       if (openKind !== "thinking") {
         if (openKind !== undefined)
@@ -3217,7 +3271,7 @@ async function* decodeKiloChat(messages) {
       }
     }
     if (typeof choice.finish_reason === "string") {
-      stopReason = FINISH2[choice.finish_reason] ?? "endTurn";
+      stopReason = FINISH[choice.finish_reason] ?? "endTurn";
     }
   }
   if (done) {
@@ -3235,7 +3289,7 @@ async function* decodeKiloChat(messages) {
 }
 
 // packages/providers/src/kilo/wire.ts
-function encodeToolChoice5(c) {
+function encodeToolChoice3(c) {
   switch (c.type) {
     case "auto":
       return "auto";
@@ -3348,15 +3402,12 @@ function toKiloWire(req, model) {
     }));
   }
   if (req.toolChoice !== undefined)
-    body.tool_choice = encodeToolChoice5(req.toolChoice);
+    body.tool_choice = encodeToolChoice3(req.toolChoice);
   if (req.reasoning !== undefined && req.reasoning.mode !== "off") {
     if (req.reasoning.mode === "budget") {
       body.reasoning = { max_tokens: req.reasoning.budgetTokens };
     } else {
-      const effort = req.reasoning.effort ?? "medium";
-      if (effort === "xhigh" || effort === "max")
-        note2("kilo:reasoning-effort-clamped");
-      body.reasoning = { effort: effort === "xhigh" || effort === "max" ? "high" : effort };
+      body.reasoning = { effort: req.reasoning.effort ?? "medium" };
     }
   }
   Object.assign(body, req.vendor?.kilo ?? {});
@@ -3426,40 +3477,512 @@ function kimiDeviceHeaders(providerData) {
     ["X-Msh-Os-Version", str(providerData.osVersion)]
   ];
 }
-// packages/providers/src/kimi/index.ts
-var BASE_URL2 = "https://api.kimi.com/coding/v1/chat/completions";
-var kimiAdapter = {
-  id: "kimi",
-  capabilities: PROVIDER_CAPABILITIES.kimi,
-  async send(req) {
-    const { body, degradations } = toChatWire(req.request, req.model);
-    const token = req.credentials.accessToken ?? req.credentials.apiKey;
-    if (token === null) {
-      throw new GatewayError("AUTH", "kimi credential has no token", { provider: "kimi" });
+// packages/providers/src/kimi/decode.ts
+var FINISH2 = {
+  stop: "endTurn",
+  length: "maxTokens",
+  tool_calls: "toolUse",
+  content_filter: "contentFilter"
+};
+function json5(data) {
+  try {
+    const v = JSON.parse(data);
+    return typeof v === "object" && v !== null ? v : null;
+  } catch {
+    return null;
+  }
+}
+async function* decodeChat(messages) {
+  let started = false;
+  let done = false;
+  let stopReason = "endTurn";
+  let usage = { inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0 };
+  const toolIndex = new Map;
+  let nextIndex = 0;
+  let openKind;
+  let openIndex = 0;
+  for await (const msg of messages) {
+    if (msg.data === "[DONE]") {
+      done = true;
+      break;
+    }
+    const d = json5(msg.data);
+    if (d === null)
+      continue;
+    if (!started && (d.id !== undefined || d.model !== undefined)) {
+      started = true;
+      yield { type: "start", id: String(d.id ?? ""), model: String(d.model ?? "") };
+    }
+    if (d.usage) {
+      const details = d.usage.prompt_tokens_details;
+      usage = usageFromPromptTotal(d.usage.prompt_tokens ?? 0, d.usage.completion_tokens ?? 0, details?.cached_tokens ?? d.usage.prompt_cache_hit_tokens ?? 0, details?.cache_creation_tokens ?? details?.cache_write_tokens ?? 0);
+    }
+    const choice = d.choices?.[0];
+    if (!choice)
+      continue;
+    const delta = choice.delta ?? {};
+    if (typeof delta.content === "string" && delta.content.length > 0) {
+      if (openKind !== "text") {
+        if (openKind !== undefined)
+          yield { type: "blockEnd", index: openIndex };
+        openKind = "text";
+        openIndex = nextIndex++;
+        yield { type: "blockStart", index: openIndex, block: { type: "text" } };
+      }
+      yield {
+        type: "blockDelta",
+        index: openIndex,
+        delta: { type: "text", text: delta.content }
+      };
+    }
+    for (const call of delta.tool_calls ?? []) {
+      const wireIndex = call.index ?? 0;
+      let index = toolIndex.get(wireIndex);
+      if (index === undefined) {
+        if (openKind !== undefined)
+          yield { type: "blockEnd", index: openIndex };
+        index = nextIndex++;
+        toolIndex.set(wireIndex, index);
+        openKind = "tool";
+        openIndex = index;
+        yield {
+          type: "blockStart",
+          index,
+          block: {
+            type: "toolUse",
+            id: String(call.id ?? `call_${wireIndex}`),
+            name: String(call.function?.name ?? "")
+          }
+        };
+      }
+      const args = call.function?.arguments;
+      if (typeof args === "string" && args.length > 0) {
+        yield { type: "blockDelta", index, delta: { type: "toolJson", partial: args } };
+      }
+    }
+    if (typeof choice.finish_reason === "string") {
+      stopReason = FINISH2[choice.finish_reason] ?? "endTurn";
     }
-    const protocol = [
-      ["Content-Type", "application/json"],
-      ["Accept", "text/event-stream"],
-      ["Authorization", `Bearer ${token}`],
-      ...kimiDeviceHeaders(req.credentials.providerData)
-    ];
-    const profile = PROFILES.kimi;
-    const headers = orderHeaders(mergeHeaders(profile.headers, protocol), profile.order);
-    const res = await req.http({
-      provider: "kimi",
-      url: BASE_URL2,
-      method: "POST",
-      headers,
-      body: JSON.stringify(orderFields({ ...body, stream: true }, BODY_ORDER.kimi)),
-      signal: req.signal
-    });
-    if (res.status < 200 || res.status >= 300)
-      throw await httpError(res, "kimi");
-    if (res.body === null)
-      throw new GatewayError("UPSTREAM", "empty response body", { provider: "kimi" });
-    return { events: decodeChat(parseSse(res.body)), degradations };
   }
-};
+  if (done) {
+    if (openKind !== undefined)
+      yield { type: "blockEnd", index: openIndex };
+    yield { type: "end", stopReason, usage };
+  } else {
+    yield {
+      type: "error",
+      code: "UPSTREAM",
+      message: "upstream stream ended before [DONE]",
+      retryable: RETRYABLE.UPSTREAM
+    };
+  }
+}
+
+// packages/providers/src/kimi/wire.ts
+function encodeToolChoice4(c) {
+  switch (c.type) {
+    case "auto":
+      return "auto";
+    case "any":
+      return "required";
+    case "none":
+      return "none";
+    case "tool":
+      return { type: "function", function: { name: c.name } };
+  }
+}
+function toChatWire(req, model, vendor = "kimi") {
+  const degradations = [];
+  const note2 = (d) => {
+    if (!degradations.includes(d))
+      degradations.push(d);
+  };
+  if (req.betas?.includes(CONTEXT_1M_BETA))
+    note2("kimi:context-1m-dropped");
+  const messages = [];
+  const system = req.system?.flatMap((b) => b.type === "text" ? [b.text] : []).join(`
+
+`);
+  if (system !== undefined && system.length > 0)
+    messages.push({ role: "system", content: system });
+  for (const message of req.messages) {
+    const text = [];
+    const toolCalls = [];
+    for (const block of message.content) {
+      switch (block.type) {
+        case "text":
+          text.push(block.text);
+          break;
+        case "image":
+          note2("kimi:images-dropped");
+          break;
+        case "thinking":
+          note2("kimi:thinking-dropped");
+          break;
+        case "toolUse":
+          toolCalls.push({
+            id: block.id,
+            type: "function",
+            function: { name: block.name, arguments: JSON.stringify(block.input) }
+          });
+          break;
+        case "toolResult":
+          messages.push({
+            role: "tool",
+            tool_call_id: block.toolUseId,
+            content: block.content
+          });
+          break;
+        case "anthropicNative":
+          note2("kimi:anthropic-native-block-dropped");
+          break;
+      }
+    }
+    if (toolCalls.length > 0) {
+      messages.push({
+        role: message.role,
+        content: text.length > 0 ? text.join(`
+`) : null,
+        tool_calls: toolCalls
+      });
+    } else if (text.length > 0) {
+      messages.push({ role: message.role, content: text.join(`
+`) });
+    }
+  }
+  const body = {
+    model,
+    messages,
+    stream: req.stream,
+    stream_options: { include_usage: true }
+  };
+  if (req.maxTokens !== undefined)
+    body.max_tokens = req.maxTokens;
+  if (req.temperature !== undefined)
+    body.temperature = req.temperature;
+  if (req.stopSequences !== undefined)
+    body.stop = req.stopSequences;
+  if (req.tools !== undefined) {
+    const custom = req.tools.filter((t) => t.provider === "custom");
+    if (custom.length !== req.tools.length)
+      note2("kimi:anthropic-tool-dropped");
+    body.tools = custom.map((t) => ({
+      type: "function",
+      function: { name: t.name, description: t.description, parameters: t.inputSchema }
+    }));
+  }
+  if (req.toolChoice !== undefined)
+    body.tool_choice = encodeToolChoice4(req.toolChoice);
+  if (req.reasoning !== undefined)
+    note2("kimi:reasoning-dropped");
+  Object.assign(body, req.vendor?.[vendor] ?? {});
+  return { body, degradations };
+}
+
+// packages/providers/src/kimi/index.ts
+var BASE_URL2 = "https://api.kimi.com/coding/v1/chat/completions";
+var kimiAdapter = {
+  id: "kimi",
+  capabilities: PROVIDER_CAPABILITIES.kimi,
+  async send(req) {
+    const { body, degradations } = toChatWire(req.request, req.model);
+    const token = req.credentials.accessToken ?? req.credentials.apiKey;
+    if (token === null) {
+      throw new GatewayError("AUTH", "kimi credential has no token", { provider: "kimi" });
+    }
+    const protocol = [
+      ["Content-Type", "application/json"],
+      ["Accept", "text/event-stream"],
+      ["Authorization", `Bearer ${token}`],
+      ...kimiDeviceHeaders(req.credentials.providerData)
+    ];
+    const profile = PROFILES.kimi;
+    const headers = orderHeaders(mergeHeaders(profile.headers, protocol), profile.order);
+    const res = await req.http({
+      provider: "kimi",
+      url: BASE_URL2,
+      method: "POST",
+      headers,
+      body: JSON.stringify(orderFields({ ...body, stream: true }, BODY_ORDER.kimi)),
+      signal: req.signal
+    });
+    if (res.status < 200 || res.status >= 300)
+      throw await httpError(res, "kimi");
+    if (res.body === null)
+      throw new GatewayError("UPSTREAM", "empty response body", { provider: "kimi" });
+    return { events: decodeChat(parseSse(res.body)), degradations };
+  }
+};
+// packages/providers/src/openai/decode.ts
+var ERROR_CODE2 = {
+  rate_limit_exceeded: "RATE_LIMIT",
+  insufficient_quota: "QUOTA_EXHAUSTED",
+  invalid_api_key: "AUTH",
+  server_error: "UPSTREAM",
+  context_length_exceeded: "BAD_REQUEST",
+  content_policy_violation: "CONTENT_FILTER"
+};
+function json6(data) {
+  try {
+    const v = JSON.parse(data);
+    return typeof v === "object" && v !== null ? v : null;
+  } catch {
+    return null;
+  }
+}
+async function* decodeResponses(messages) {
+  const indices = new Map;
+  let next = 0;
+  const irIndex = (outputIndex, contentIndex = 0) => {
+    const key = `${outputIndex}:${contentIndex}`;
+    const existing = indices.get(key);
+    if (existing !== undefined)
+      return existing;
+    const assigned = next++;
+    indices.set(key, assigned);
+    return assigned;
+  };
+  let sawToolCall = false;
+  let terminal = false;
+  const ownsBlock = new Set;
+  for await (const msg of messages) {
+    const d = json6(msg.data);
+    if (d === null)
+      continue;
+    switch (msg.event) {
+      case "response.created":
+        yield {
+          type: "start",
+          id: String(d.response?.id ?? ""),
+          model: String(d.response?.model ?? "")
+        };
+        break;
+      case "response.output_item.added": {
+        const item = d.item ?? {};
+        if (item.type === "reasoning") {
+          ownsBlock.add(d.output_index ?? 0);
+          yield {
+            type: "blockStart",
+            index: irIndex(d.output_index ?? 0),
+            block: { type: "thinking" }
+          };
+        } else if (item.type === "function_call") {
+          sawToolCall = true;
+          ownsBlock.add(d.output_index ?? 0);
+          yield {
+            type: "blockStart",
+            index: irIndex(d.output_index ?? 0),
+            block: { type: "toolUse", id: String(item.call_id), name: String(item.name) }
+          };
+        }
+        break;
+      }
+      case "response.content_part.added":
+        if (d.part?.type === "output_text") {
+          yield {
+            type: "blockStart",
+            index: irIndex(d.output_index ?? 0, d.content_index ?? 0),
+            block: { type: "text" }
+          };
+        }
+        break;
+      case "response.output_text.delta":
+        yield {
+          type: "blockDelta",
+          index: irIndex(d.output_index ?? 0, d.content_index ?? 0),
+          delta: { type: "text", text: String(d.delta ?? "") }
+        };
+        break;
+      case "response.reasoning_summary_text.delta":
+        yield {
+          type: "blockDelta",
+          index: irIndex(d.output_index ?? 0),
+          delta: { type: "thinking", text: String(d.delta ?? "") }
+        };
+        break;
+      case "response.function_call_arguments.delta":
+        yield {
+          type: "blockDelta",
+          index: irIndex(d.output_index ?? 0),
+          delta: { type: "toolJson", partial: String(d.delta ?? "") }
+        };
+        break;
+      case "response.content_part.done":
+        yield { type: "blockEnd", index: irIndex(d.output_index ?? 0, d.content_index ?? 0) };
+        break;
+      case "response.output_item.done": {
+        const outputIndex = d.output_index ?? 0;
+        if (ownsBlock.delete(outputIndex)) {
+          yield { type: "blockEnd", index: irIndex(outputIndex) };
+        }
+        break;
+      }
+      case "response.completed":
+      case "response.incomplete": {
+        terminal = true;
+        const r = d.response ?? {};
+        const reason = r.incomplete_details?.reason;
+        let stopReason = sawToolCall ? "toolUse" : "endTurn";
+        if (reason === "max_output_tokens")
+          stopReason = "maxTokens";
+        else if (reason === "content_filter")
+          stopReason = "contentFilter";
+        yield {
+          type: "end",
+          stopReason,
+          usage: usageFromPromptTotal(r.usage?.input_tokens ?? 0, r.usage?.output_tokens ?? 0, r.usage?.input_tokens_details?.cached_tokens ?? r.usage?.prompt_tokens_details?.cached_tokens ?? 0)
+        };
+        break;
+      }
+      case "response.failed":
+      case "error": {
+        terminal = true;
+        const err = d.response?.error ?? d.error ?? {};
+        const code = ERROR_CODE2[String(err.code ?? err.type)] ?? "UPSTREAM";
+        yield {
+          type: "error",
+          code,
+          message: String(err.message ?? "upstream error"),
+          retryable: RETRYABLE[code]
+        };
+        break;
+      }
+      default:
+        break;
+    }
+  }
+  if (!terminal) {
+    yield {
+      type: "error",
+      code: "UPSTREAM",
+      message: "upstream stream ended before response completion",
+      retryable: RETRYABLE.UPSTREAM
+    };
+  }
+}
+
+// packages/providers/src/openai/wire.ts
+function encodeToolChoice5(c) {
+  switch (c.type) {
+    case "auto":
+      return "auto";
+    case "any":
+      return "required";
+    case "none":
+      return "none";
+    case "tool":
+      return { type: "function", name: c.name };
+  }
+}
+function toResponsesWire(req, model, opts = { oauth: false }) {
+  const degradations = [];
+  const input = [];
+  const note2 = (d) => {
+    if (!degradations.includes(d))
+      degradations.push(d);
+  };
+  if (req.betas?.includes(CONTEXT_1M_BETA))
+    note2("openai:context-1m-dropped");
+  for (const message of req.messages) {
+    const parts = [];
+    const inlined = message.role === "system";
+    if (inlined)
+      note2("openai:system-turn-inlined");
+    const role = inlined ? "user" : message.role;
+    const flush = () => {
+      if (parts.length === 0)
+        return;
+      input.push({ type: "message", role, content: [...parts] });
+      parts.length = 0;
+    };
+    for (const block of message.content) {
+      switch (block.type) {
+        case "text":
+          parts.push({
+            type: role === "assistant" ? "output_text" : "input_text",
+            text: inlined ? `<system-reminder>
+${block.text}
+</system-reminder>` : block.text
+          });
+          break;
+        case "image":
+          parts.push({
+            type: "input_image",
+            image_url: `data:${block.mediaType};base64,${block.data}`
+          });
+          break;
+        case "thinking":
+          if (!degradations.includes("openai:thinking-dropped")) {
+            note2("openai:thinking-dropped");
+          }
+          break;
+        case "toolUse":
+          flush();
+          input.push({
+            type: "function_call",
+            call_id: block.id,
+            name: block.name,
+            arguments: JSON.stringify(block.input)
+          });
+          break;
+        case "toolResult":
+          flush();
+          input.push({
+            type: "function_call_output",
+            call_id: block.toolUseId,
+            output: block.content
+          });
+          break;
+        case "anthropicNative":
+          note2("openai:anthropic-native-block-dropped");
+          break;
+      }
+    }
+    flush();
+  }
+  const body = { model, input, stream: req.stream, store: false };
+  const instructions = req.system?.flatMap((b) => b.type === "text" ? [b.text] : []).join(`
+
+`);
+  if (instructions !== undefined && instructions.length > 0)
+    body.instructions = instructions;
+  if (req.maxTokens !== undefined) {
+    if (opts.oauth)
+      note2("openai:max-tokens-dropped");
+    else
+      body.max_output_tokens = req.maxTokens;
+  }
+  if (req.temperature !== undefined) {
+    if (opts.oauth)
+      note2("openai:temperature-dropped");
+    else
+      body.temperature = req.temperature;
+  }
+  if (req.tools !== undefined) {
+    const custom = req.tools.filter((t) => t.provider === "custom");
+    if (custom.length !== req.tools.length)
+      note2("openai:anthropic-tool-dropped");
+    body.tools = custom.map((t) => ({
+      type: "function",
+      name: t.name,
+      description: t.description,
+      parameters: t.inputSchema
+    }));
+  }
+  if (req.toolChoice !== undefined)
+    body.tool_choice = encodeToolChoice5(req.toolChoice);
+  if (req.reasoning !== undefined && req.reasoning.mode !== "off") {
+    if (req.reasoning.mode === "budget") {
+      degradations.push("openai:reasoning-budget-dropped");
+    } else {
+      const effort = req.reasoning.effort ?? "medium";
+      body.reasoning = { effort, summary: "auto" };
+    }
+  }
+  Object.assign(body, req.vendor?.openai ?? {});
+  return { body, degradations };
+}
+
 // packages/providers/src/openai/index.ts
 var OAUTH_URL2 = "https://chatgpt.com/backend-api/codex/responses";
 var API_URL3 = "https://api.openai.com/v1/responses";
@@ -3862,7 +4385,7 @@ __export(exports_external, {
   ipv4: () => ipv42,
   ipv6: () => ipv62,
   iso: () => exports_iso,
-  json: () => json6,
+  json: () => json7,
   jwt: () => jwt,
   keyof: () => keyof,
   ksuid: () => ksuid2,
@@ -15303,29 +15826,29 @@ var formatMap = {
   regex: ""
 };
 var stringProcessor = (schema, ctx, _json, _params) => {
-  const json6 = _json;
-  json6.type = "string";
+  const json7 = _json;
+  json7.type = "string";
   const { minimum, maximum, format, patterns, contentEncoding } = schema._zod.bag;
   if (typeof minimum === "number")
-    json6.minLength = minimum;
+    json7.minLength = minimum;
   if (typeof maximum === "number")
-    json6.maxLength = maximum;
+    json7.maxLength = maximum;
   if (format) {
-    json6.format = formatMap[format] ?? format;
-    if (json6.format === "")
-      delete json6.format;
+    json7.format = formatMap[format] ?? format;
+    if (json7.format === "")
+      delete json7.format;
     if (format === "time") {
-      delete json6.format;
+      delete json7.format;
     }
   }
   if (contentEncoding)
-    json6.contentEncoding = contentEncoding;
+    json7.contentEncoding = contentEncoding;
   if (patterns && patterns.size > 0) {
     const regexes = [...patterns];
     if (regexes.length === 1)
-      json6.pattern = regexes[0].source;
+      json7.pattern = regexes[0].source;
     else if (regexes.length > 1) {
-      json6.allOf = [
+      json7.allOf = [
         ...regexes.map((regex) => ({
           ...ctx.target === "draft-07" || ctx.target === "draft-04" || ctx.target === "openapi-3.0" ? { type: "string" } : {},
           pattern: regex.source
@@ -15335,40 +15858,40 @@ var stringProcessor = (schema, ctx, _json, _params) => {
   }
 };
 var numberProcessor = (schema, ctx, _json, _params) => {
-  const json6 = _json;
+  const json7 = _json;
   const { minimum, maximum, format, multipleOf, exclusiveMaximum, exclusiveMinimum } = schema._zod.bag;
   if (typeof format === "string" && format.includes("int"))
-    json6.type = "integer";
+    json7.type = "integer";
   else
-    json6.type = "number";
+    json7.type = "number";
   const exMin = typeof exclusiveMinimum === "number" && exclusiveMinimum >= (minimum ?? Number.NEGATIVE_INFINITY);
   const exMax = typeof exclusiveMaximum === "number" && exclusiveMaximum <= (maximum ?? Number.POSITIVE_INFINITY);
   const legacy = ctx.target === "draft-04" || ctx.target === "openapi-3.0";
   if (exMin) {
     if (legacy) {
-      json6.minimum = exclusiveMinimum;
-      json6.exclusiveMinimum = true;
+      json7.minimum = exclusiveMinimum;
+      json7.exclusiveMinimum = true;
     } else {
-      json6.exclusiveMinimum = exclusiveMinimum;
+      json7.exclusiveMinimum = exclusiveMinimum;
     }
   } else if (typeof minimum === "number") {
-    json6.minimum = minimum;
+    json7.minimum = minimum;
   }
   if (exMax) {
     if (legacy) {
-      json6.maximum = exclusiveMaximum;
-      json6.exclusiveMaximum = true;
+      json7.maximum = exclusiveMaximum;
+      json7.exclusiveMaximum = true;
     } else {
-      json6.exclusiveMaximum = exclusiveMaximum;
+      json7.exclusiveMaximum = exclusiveMaximum;
     }
   } else if (typeof maximum === "number") {
-    json6.maximum = maximum;
+    json7.maximum = maximum;
   }
   if (typeof multipleOf === "number")
-    json6.multipleOf = multipleOf;
+    json7.multipleOf = multipleOf;
 };
-var booleanProcessor = (_schema, _ctx, json6, _params) => {
-  json6.type = "boolean";
+var booleanProcessor = (_schema, _ctx, json7, _params) => {
+  json7.type = "boolean";
 };
 var bigintProcessor = (_schema, ctx, _json, _params) => {
   if (ctx.unrepresentable === "throw") {
@@ -15380,13 +15903,13 @@ var symbolProcessor = (_schema, ctx, _json, _params) => {
     throw new Error("Symbols cannot be represented in JSON Schema");
   }
 };
-var nullProcessor = (_schema, ctx, json6, _params) => {
+var nullProcessor = (_schema, ctx, json7, _params) => {
   if (ctx.target === "openapi-3.0") {
-    json6.type = "string";
-    json6.nullable = true;
-    json6.enum = [null];
+    json7.type = "string";
+    json7.nullable = true;
+    json7.enum = [null];
   } else {
-    json6.type = "null";
+    json7.type = "null";
   }
 };
 var undefinedProcessor = (_schema, ctx, _json, _params) => {
@@ -15399,8 +15922,8 @@ var voidProcessor = (_schema, ctx, _json, _params) => {
     throw new Error("Void cannot be represented in JSON Schema");
   }
 };
-var neverProcessor = (_schema, _ctx, json6, _params) => {
-  json6.not = {};
+var neverProcessor = (_schema, _ctx, json7, _params) => {
+  json7.not = {};
 };
 var anyProcessor = (_schema, _ctx, _json, _params) => {};
 var unknownProcessor = (_schema, _ctx, _json, _params) => {};
@@ -15409,16 +15932,16 @@ var dateProcessor = (_schema, ctx, _json, _params) => {
     throw new Error("Date cannot be represented in JSON Schema");
   }
 };
-var enumProcessor = (schema, _ctx, json6, _params) => {
+var enumProcessor = (schema, _ctx, json7, _params) => {
   const def = schema._zod.def;
   const values = getEnumValues(def.entries);
   if (values.every((v) => typeof v === "number"))
-    json6.type = "number";
+    json7.type = "number";
   if (values.every((v) => typeof v === "string"))
-    json6.type = "string";
-  json6.enum = values;
+    json7.type = "string";
+  json7.enum = values;
 };
-var literalProcessor = (schema, ctx, json6, _params) => {
+var literalProcessor = (schema, ctx, json7, _params) => {
   const def = schema._zod.def;
   const vals = [];
   for (const val of def.values) {
@@ -15438,22 +15961,22 @@ var literalProcessor = (schema, ctx, json6, _params) => {
   }
   if (vals.length === 0) {} else if (vals.length === 1) {
     const val = vals[0];
-    json6.type = val === null ? "null" : typeof val;
+    json7.type = val === null ? "null" : typeof val;
     if (ctx.target === "draft-04" || ctx.target === "openapi-3.0") {
-      json6.enum = [val];
+      json7.enum = [val];
     } else {
-      json6.const = val;
+      json7.const = val;
     }
   } else {
     if (vals.every((v) => typeof v === "number"))
-      json6.type = "number";
+      json7.type = "number";
     if (vals.every((v) => typeof v === "string"))
-      json6.type = "string";
+      json7.type = "string";
     if (vals.every((v) => typeof v === "boolean"))
-      json6.type = "boolean";
+      json7.type = "boolean";
     if (vals.every((v) => v === null))
-      json6.type = "null";
-    json6.enum = vals;
+      json7.type = "null";
+    json7.enum = vals;
   }
 };
 var nanProcessor = (_schema, ctx, _json, _params) => {
@@ -15461,16 +15984,16 @@ var nanProcessor = (_schema, ctx, _json, _params) => {
     throw new Error("NaN cannot be represented in JSON Schema");
   }
 };
-var templateLiteralProcessor = (schema, _ctx, json6, _params) => {
-  const _json = json6;
+var templateLiteralProcessor = (schema, _ctx, json7, _params) => {
+  const _json = json7;
   const pattern = schema._zod.pattern;
   if (!pattern)
     throw new Error("Pattern not found in template literal");
   _json.type = "string";
   _json.pattern = pattern.source;
 };
-var fileProcessor = (schema, _ctx, json6, _params) => {
-  const _json = json6;
+var fileProcessor = (schema, _ctx, json7, _params) => {
+  const _json = json7;
   const file = {
     type: "string",
     format: "binary",
@@ -15493,8 +16016,8 @@ var fileProcessor = (schema, _ctx, json6, _params) => {
     Object.assign(_json, file);
   }
 };
-var successProcessor = (_schema, _ctx, json6, _params) => {
-  json6.type = "boolean";
+var successProcessor = (_schema, _ctx, json7, _params) => {
+  json7.type = "boolean";
 };
 var customProcessor = (_schema, ctx, _json, _params) => {
   if (ctx.unrepresentable === "throw") {
@@ -15522,27 +16045,27 @@ var setProcessor = (_schema, ctx, _json, _params) => {
   }
 };
 var arrayProcessor = (schema, ctx, _json, params) => {
-  const json6 = _json;
+  const json7 = _json;
   const def = schema._zod.def;
   const { minimum, maximum } = schema._zod.bag;
   if (typeof minimum === "number")
-    json6.minItems = minimum;
+    json7.minItems = minimum;
   if (typeof maximum === "number")
-    json6.maxItems = maximum;
-  json6.type = "array";
-  json6.items = process2(def.element, ctx, {
+    json7.maxItems = maximum;
+  json7.type = "array";
+  json7.items = process2(def.element, ctx, {
     ...params,
     path: [...params.path, "items"]
   });
 };
 var objectProcessor = (schema, ctx, _json, params) => {
-  const json6 = _json;
+  const json7 = _json;
   const def = schema._zod.def;
-  json6.type = "object";
-  json6.properties = {};
+  json7.type = "object";
+  json7.properties = {};
   const shape = def.shape;
   for (const key in shape) {
-    json6.properties[key] = process2(shape[key], ctx, {
+    json7.properties[key] = process2(shape[key], ctx, {
       ...params,
       path: [...params.path, "properties", key]
     });
@@ -15557,21 +16080,21 @@ var objectProcessor = (schema, ctx, _json, params) => {
     }
   }));
   if (requiredKeys.size > 0) {
-    json6.required = Array.from(requiredKeys);
+    json7.required = Array.from(requiredKeys);
   }
   if (def.catchall?._zod.def.type === "never") {
-    json6.additionalProperties = false;
+    json7.additionalProperties = false;
   } else if (!def.catchall) {
     if (ctx.io === "output")
-      json6.additionalProperties = false;
+      json7.additionalProperties = false;
   } else if (def.catchall) {
-    json6.additionalProperties = process2(def.catchall, ctx, {
+    json7.additionalProperties = process2(def.catchall, ctx, {
       ...params,
       path: [...params.path, "additionalProperties"]
     });
   }
 };
-var unionProcessor = (schema, ctx, json6, params) => {
+var unionProcessor = (schema, ctx, json7, params) => {
   const def = schema._zod.def;
   const isExclusive = def.inclusive === false;
   const options = def.options.map((x, i) => process2(x, ctx, {
@@ -15579,12 +16102,12 @@ var unionProcessor = (schema, ctx, json6, params) => {
     path: [...params.path, isExclusive ? "oneOf" : "anyOf", i]
   }));
   if (isExclusive) {
-    json6.oneOf = options;
+    json7.oneOf = options;
   } else {
-    json6.anyOf = options;
+    json7.anyOf = options;
   }
 };
-var intersectionProcessor = (schema, ctx, json6, params) => {
+var intersectionProcessor = (schema, ctx, json7, params) => {
   const def = schema._zod.def;
   const a = process2(def.left, ctx, {
     ...params,
@@ -15599,12 +16122,12 @@ var intersectionProcessor = (schema, ctx, json6, params) => {
     ...isSimpleIntersection(a) ? a.allOf : [a],
     ...isSimpleIntersection(b) ? b.allOf : [b]
   ];
-  json6.allOf = allOf;
+  json7.allOf = allOf;
 };
 var tupleProcessor = (schema, ctx, _json, params) => {
-  const json6 = _json;
+  const json7 = _json;
   const def = schema._zod.def;
-  json6.type = "array";
+  json7.type = "array";
   const prefixPath = ctx.target === "draft-2020-12" ? "prefixItems" : "items";
   const restPath = ctx.target === "draft-2020-12" ? "items" : ctx.target === "openapi-3.0" ? "items" : "additionalItems";
   const prefixItems = def.items.map((x, i) => process2(x, ctx, {
@@ -15616,37 +16139,37 @@ var tupleProcessor = (schema, ctx, _json, params) => {
     path: [...params.path, restPath, ...ctx.target === "openapi-3.0" ? [def.items.length] : []]
   }) : null;
   if (ctx.target === "draft-2020-12") {
-    json6.prefixItems = prefixItems;
+    json7.prefixItems = prefixItems;
     if (rest) {
-      json6.items = rest;
+      json7.items = rest;
     }
   } else if (ctx.target === "openapi-3.0") {
-    json6.items = {
+    json7.items = {
       anyOf: prefixItems
     };
     if (rest) {
-      json6.items.anyOf.push(rest);
+      json7.items.anyOf.push(rest);
     }
-    json6.minItems = prefixItems.length;
+    json7.minItems = prefixItems.length;
     if (!rest) {
-      json6.maxItems = prefixItems.length;
+      json7.maxItems = prefixItems.length;
     }
   } else {
-    json6.items = prefixItems;
+    json7.items = prefixItems;
     if (rest) {
-      json6.additionalItems = rest;
+      json7.additionalItems = rest;
     }
   }
   const { minimum, maximum } = schema._zod.bag;
   if (typeof minimum === "number")
-    json6.minItems = minimum;
+    json7.minItems = minimum;
   if (typeof maximum === "number")
-    json6.maxItems = maximum;
+    json7.maxItems = maximum;
 };
 var recordProcessor = (schema, ctx, _json, params) => {
-  const json6 = _json;
+  const json7 = _json;
   const def = schema._zod.def;
-  json6.type = "object";
+  json7.type = "object";
   const keyType = def.keyType;
   const keyBag = keyType._zod.bag;
   const patterns = keyBag?.patterns;
@@ -15655,18 +16178,18 @@ var recordProcessor = (schema, ctx, _json, params) => {
       ...params,
       path: [...params.path, "patternProperties", "*"]
     });
-    json6.patternProperties = {};
+    json7.patternProperties = {};
     for (const pattern of patterns) {
-      json6.patternProperties[pattern.source] = valueSchema;
+      json7.patternProperties[pattern.source] = valueSchema;
     }
   } else {
     if (ctx.target === "draft-07" || ctx.target === "draft-2020-12") {
-      json6.propertyNames = process2(def.keyType, ctx, {
+      json7.propertyNames = process2(def.keyType, ctx, {
         ...params,
         path: [...params.path, "propertyNames"]
       });
     }
-    json6.additionalProperties = process2(def.valueType, ctx, {
+    json7.additionalProperties = process2(def.valueType, ctx, {
       ...params,
       path: [...params.path, "additionalProperties"]
     });
@@ -15675,19 +16198,19 @@ var recordProcessor = (schema, ctx, _json, params) => {
   if (keyValues) {
     const validKeyValues = [...keyValues].filter((v) => typeof v === "string" || typeof v === "number");
     if (validKeyValues.length > 0) {
-      json6.required = validKeyValues;
+      json7.required = validKeyValues;
     }
   }
 };
-var nullableProcessor = (schema, ctx, json6, params) => {
+var nullableProcessor = (schema, ctx, json7, params) => {
   const def = schema._zod.def;
   const inner = process2(def.innerType, ctx, params);
   const seen = ctx.seen.get(schema);
   if (ctx.target === "openapi-3.0") {
     seen.ref = def.innerType;
-    json6.nullable = true;
+    json7.nullable = true;
   } else {
-    json6.anyOf = [inner, { type: "null" }];
+    json7.anyOf = [inner, { type: "null" }];
   }
 };
 var nonoptionalProcessor = (schema, ctx, _json, params) => {
@@ -15696,22 +16219,22 @@ var nonoptionalProcessor = (schema, ctx, _json, params) => {
   const seen = ctx.seen.get(schema);
   seen.ref = def.innerType;
 };
-var defaultProcessor = (schema, ctx, json6, params) => {
+var defaultProcessor = (schema, ctx, json7, params) => {
   const def = schema._zod.def;
   process2(def.innerType, ctx, params);
   const seen = ctx.seen.get(schema);
   seen.ref = def.innerType;
-  json6.default = JSON.parse(JSON.stringify(def.defaultValue));
+  json7.default = JSON.parse(JSON.stringify(def.defaultValue));
 };
-var prefaultProcessor = (schema, ctx, json6, params) => {
+var prefaultProcessor = (schema, ctx, json7, params) => {
   const def = schema._zod.def;
   process2(def.innerType, ctx, params);
   const seen = ctx.seen.get(schema);
   seen.ref = def.innerType;
   if (ctx.io === "input")
-    json6._prefault = JSON.parse(JSON.stringify(def.defaultValue));
+    json7._prefault = JSON.parse(JSON.stringify(def.defaultValue));
 };
-var catchProcessor = (schema, ctx, json6, params) => {
+var catchProcessor = (schema, ctx, json7, params) => {
   const def = schema._zod.def;
   process2(def.innerType, ctx, params);
   const seen = ctx.seen.get(schema);
@@ -15722,7 +16245,7 @@ var catchProcessor = (schema, ctx, json6, params) => {
   } catch {
     throw new Error("Dynamic catch values are not supported in JSON Schema");
   }
-  json6.default = catchValue;
+  json7.default = catchValue;
 };
 var pipeProcessor = (schema, ctx, _json, params) => {
   const def = schema._zod.def;
@@ -15732,12 +16255,12 @@ var pipeProcessor = (schema, ctx, _json, params) => {
   const seen = ctx.seen.get(schema);
   seen.ref = innerType;
 };
-var readonlyProcessor = (schema, ctx, json6, params) => {
+var readonlyProcessor = (schema, ctx, json7, params) => {
   const def = schema._zod.def;
   process2(def.innerType, ctx, params);
   const seen = ctx.seen.get(schema);
   seen.ref = def.innerType;
-  json6.readOnly = true;
+  json7.readOnly = true;
 };
 var promiseProcessor = (schema, ctx, _json, params) => {
   const def = schema._zod.def;
@@ -16007,7 +16530,7 @@ __export(exports_schemas2, {
   invertCodec: () => invertCodec,
   ipv4: () => ipv42,
   ipv6: () => ipv62,
-  json: () => json6,
+  json: () => json7,
   jwt: () => jwt,
   keyof: () => keyof,
   ksuid: () => ksuid2,
@@ -16358,7 +16881,7 @@ var ZodType = /* @__PURE__ */ $constructor("ZodType", (inst, def) => {
 var _ZodString = /* @__PURE__ */ $constructor("_ZodString", (inst, def) => {
   $ZodString.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => stringProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => stringProcessor(inst, ctx, json7, params);
   const bag = inst._zod.bag;
   inst.format = bag.format ?? null;
   inst.minLength = bag.minimum ?? null;
@@ -16629,7 +17152,7 @@ function hash2(alg, params) {
 var ZodNumber = /* @__PURE__ */ $constructor("ZodNumber", (inst, def) => {
   $ZodNumber.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => numberProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => numberProcessor(inst, ctx, json7, params);
   _installLazyMethods(inst, "ZodNumber", {
     gt(value, params) {
       return this.check(_gt(value, params));
@@ -16709,7 +17232,7 @@ function uint32(params) {
 var ZodBoolean = /* @__PURE__ */ $constructor("ZodBoolean", (inst, def) => {
   $ZodBoolean.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => booleanProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => booleanProcessor(inst, ctx, json7, params);
 });
 function boolean2(params) {
   return _boolean(ZodBoolean, params);
@@ -16717,7 +17240,7 @@ function boolean2(params) {
 var ZodBigInt = /* @__PURE__ */ $constructor("ZodBigInt", (inst, def) => {
   $ZodBigInt.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => bigintProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => bigintProcessor(inst, ctx, json7, params);
   inst.gte = (value, params) => inst.check(_gte(value, params));
   inst.min = (value, params) => inst.check(_gte(value, params));
   inst.gt = (value, params) => inst.check(_gt(value, params));
@@ -16752,7 +17275,7 @@ function uint64(params) {
 var ZodSymbol = /* @__PURE__ */ $constructor("ZodSymbol", (inst, def) => {
   $ZodSymbol.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => symbolProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => symbolProcessor(inst, ctx, json7, params);
 });
 function symbol(params) {
   return _symbol(ZodSymbol, params);
@@ -16760,7 +17283,7 @@ function symbol(params) {
 var ZodUndefined = /* @__PURE__ */ $constructor("ZodUndefined", (inst, def) => {
   $ZodUndefined.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => undefinedProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => undefinedProcessor(inst, ctx, json7, params);
 });
 function _undefined3(params) {
   return _undefined2(ZodUndefined, params);
@@ -16768,7 +17291,7 @@ function _undefined3(params) {
 var ZodNull = /* @__PURE__ */ $constructor("ZodNull", (inst, def) => {
   $ZodNull.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => nullProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => nullProcessor(inst, ctx, json7, params);
 });
 function _null3(params) {
   return _null2(ZodNull, params);
@@ -16776,7 +17299,7 @@ function _null3(params) {
 var ZodAny = /* @__PURE__ */ $constructor("ZodAny", (inst, def) => {
   $ZodAny.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => anyProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => anyProcessor(inst, ctx, json7, params);
 });
 function any() {
   return _any(ZodAny);
@@ -16784,7 +17307,7 @@ function any() {
 var ZodUnknown = /* @__PURE__ */ $constructor("ZodUnknown", (inst, def) => {
   $ZodUnknown.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => unknownProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => unknownProcessor(inst, ctx, json7, params);
 });
 function unknown() {
   return _unknown(ZodUnknown);
@@ -16792,7 +17315,7 @@ function unknown() {
 var ZodNever = /* @__PURE__ */ $constructor("ZodNever", (inst, def) => {
   $ZodNever.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => neverProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => neverProcessor(inst, ctx, json7, params);
 });
 function never(params) {
   return _never(ZodNever, params);
@@ -16800,7 +17323,7 @@ function never(params) {
 var ZodVoid = /* @__PURE__ */ $constructor("ZodVoid", (inst, def) => {
   $ZodVoid.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => voidProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => voidProcessor(inst, ctx, json7, params);
 });
 function _void2(params) {
   return _void(ZodVoid, params);
@@ -16808,7 +17331,7 @@ function _void2(params) {
 var ZodDate = /* @__PURE__ */ $constructor("ZodDate", (inst, def) => {
   $ZodDate.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => dateProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => dateProcessor(inst, ctx, json7, params);
   inst.min = (value, params) => inst.check(_gte(value, params));
   inst.max = (value, params) => inst.check(_lte(value, params));
   const c = inst._zod.bag;
@@ -16821,7 +17344,7 @@ function date3(params) {
 var ZodArray = /* @__PURE__ */ $constructor("ZodArray", (inst, def) => {
   $ZodArray.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => arrayProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => arrayProcessor(inst, ctx, json7, params);
   inst.element = def.element;
   _installLazyMethods(inst, "ZodArray", {
     min(n, params) {
@@ -16851,7 +17374,7 @@ function keyof(schema) {
 var ZodObject = /* @__PURE__ */ $constructor("ZodObject", (inst, def) => {
   $ZodObjectJIT.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => objectProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => objectProcessor(inst, ctx, json7, params);
   exports_util.defineLazy(inst, "shape", () => {
     return def.shape;
   });
@@ -16924,7 +17447,7 @@ function looseObject(shape, params) {
 var ZodUnion = /* @__PURE__ */ $constructor("ZodUnion", (inst, def) => {
   $ZodUnion.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => unionProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => unionProcessor(inst, ctx, json7, params);
   inst.options = def.options;
 });
 function union(options, params) {
@@ -16937,7 +17460,7 @@ function union(options, params) {
 var ZodXor = /* @__PURE__ */ $constructor("ZodXor", (inst, def) => {
   ZodUnion.init(inst, def);
   $ZodXor.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => unionProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => unionProcessor(inst, ctx, json7, params);
   inst.options = def.options;
 });
 function xor(options, params) {
@@ -16963,7 +17486,7 @@ function discriminatedUnion(discriminator, options, params) {
 var ZodIntersection = /* @__PURE__ */ $constructor("ZodIntersection", (inst, def) => {
   $ZodIntersection.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => intersectionProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => intersectionProcessor(inst, ctx, json7, params);
 });
 function intersection(left, right) {
   return new ZodIntersection({
@@ -16975,7 +17498,7 @@ function intersection(left, right) {
 var ZodTuple = /* @__PURE__ */ $constructor("ZodTuple", (inst, def) => {
   $ZodTuple.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => tupleProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => tupleProcessor(inst, ctx, json7, params);
   inst.rest = (rest) => inst.clone({
     ...inst._zod.def,
     rest
@@ -16995,7 +17518,7 @@ function tuple(items, _paramsOrRest, _params) {
 var ZodRecord = /* @__PURE__ */ $constructor("ZodRecord", (inst, def) => {
   $ZodRecord.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => recordProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => recordProcessor(inst, ctx, json7, params);
   inst.keyType = def.keyType;
   inst.valueType = def.valueType;
 });
@@ -17037,7 +17560,7 @@ function looseRecord(keyType, valueType, params) {
 var ZodMap = /* @__PURE__ */ $constructor("ZodMap", (inst, def) => {
   $ZodMap.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => mapProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => mapProcessor(inst, ctx, json7, params);
   inst.keyType = def.keyType;
   inst.valueType = def.valueType;
   inst.min = (...args) => inst.check(_minSize(...args));
@@ -17056,7 +17579,7 @@ function map(keyType, valueType, params) {
 var ZodSet = /* @__PURE__ */ $constructor("ZodSet", (inst, def) => {
   $ZodSet.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => setProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => setProcessor(inst, ctx, json7, params);
   inst.min = (...args) => inst.check(_minSize(...args));
   inst.nonempty = (params) => inst.check(_minSize(1, params));
   inst.max = (...args) => inst.check(_maxSize(...args));
@@ -17072,7 +17595,7 @@ function set(valueType, params) {
 var ZodEnum = /* @__PURE__ */ $constructor("ZodEnum", (inst, def) => {
   $ZodEnum.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => enumProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => enumProcessor(inst, ctx, json7, params);
   inst.enum = def.entries;
   inst.options = Object.values(def.entries);
   const keys = new Set(Object.keys(def.entries));
@@ -17125,7 +17648,7 @@ function nativeEnum(entries, params) {
 var ZodLiteral = /* @__PURE__ */ $constructor("ZodLiteral", (inst, def) => {
   $ZodLiteral.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => literalProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => literalProcessor(inst, ctx, json7, params);
   inst.values = new Set(def.values);
   Object.defineProperty(inst, "value", {
     get() {
@@ -17146,7 +17669,7 @@ function literal(value, params) {
 var ZodFile = /* @__PURE__ */ $constructor("ZodFile", (inst, def) => {
   $ZodFile.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => fileProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => fileProcessor(inst, ctx, json7, params);
   inst.min = (size, params) => inst.check(_minSize(size, params));
   inst.max = (size, params) => inst.check(_maxSize(size, params));
   inst.mime = (types2, params) => inst.check(_mime(Array.isArray(types2) ? types2 : [types2], params));
@@ -17157,7 +17680,7 @@ function file(params) {
 var ZodTransform = /* @__PURE__ */ $constructor("ZodTransform", (inst, def) => {
   $ZodTransform.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => transformProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => transformProcessor(inst, ctx, json7, params);
   inst._zod.parse = (payload, _ctx) => {
     if (_ctx.direction === "backward") {
       throw new $ZodEncodeError(inst.constructor.name);
@@ -17197,7 +17720,7 @@ function transform(fn) {
 var ZodOptional = /* @__PURE__ */ $constructor("ZodOptional", (inst, def) => {
   $ZodOptional.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => optionalProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => optionalProcessor(inst, ctx, json7, params);
   inst.unwrap = () => inst._zod.def.innerType;
 });
 function optional(innerType) {
@@ -17209,7 +17732,7 @@ function optional(innerType) {
 var ZodExactOptional = /* @__PURE__ */ $constructor("ZodExactOptional", (inst, def) => {
   $ZodExactOptional.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => optionalProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => optionalProcessor(inst, ctx, json7, params);
   inst.unwrap = () => inst._zod.def.innerType;
 });
 function exactOptional(innerType) {
@@ -17221,7 +17744,7 @@ function exactOptional(innerType) {
 var ZodNullable = /* @__PURE__ */ $constructor("ZodNullable", (inst, def) => {
   $ZodNullable.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => nullableProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => nullableProcessor(inst, ctx, json7, params);
   inst.unwrap = () => inst._zod.def.innerType;
 });
 function nullable(innerType) {
@@ -17236,7 +17759,7 @@ function nullish2(innerType) {
 var ZodDefault = /* @__PURE__ */ $constructor("ZodDefault", (inst, def) => {
   $ZodDefault.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => defaultProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => defaultProcessor(inst, ctx, json7, params);
   inst.unwrap = () => inst._zod.def.innerType;
   inst.removeDefault = inst.unwrap;
 });
@@ -17252,7 +17775,7 @@ function _default2(innerType, defaultValue) {
 var ZodPrefault = /* @__PURE__ */ $constructor("ZodPrefault", (inst, def) => {
   $ZodPrefault.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => prefaultProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => prefaultProcessor(inst, ctx, json7, params);
   inst.unwrap = () => inst._zod.def.innerType;
 });
 function prefault(innerType, defaultValue) {
@@ -17267,7 +17790,7 @@ function prefault(innerType, defaultValue) {
 var ZodNonOptional = /* @__PURE__ */ $constructor("ZodNonOptional", (inst, def) => {
   $ZodNonOptional.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => nonoptionalProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => nonoptionalProcessor(inst, ctx, json7, params);
   inst.unwrap = () => inst._zod.def.innerType;
 });
 function nonoptional(innerType, params) {
@@ -17280,7 +17803,7 @@ function nonoptional(innerType, params) {
 var ZodSuccess = /* @__PURE__ */ $constructor("ZodSuccess", (inst, def) => {
   $ZodSuccess.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => successProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => successProcessor(inst, ctx, json7, params);
   inst.unwrap = () => inst._zod.def.innerType;
 });
 function success(innerType) {
@@ -17292,7 +17815,7 @@ function success(innerType) {
 var ZodCatch = /* @__PURE__ */ $constructor("ZodCatch", (inst, def) => {
   $ZodCatch.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => catchProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => catchProcessor(inst, ctx, json7, params);
   inst.unwrap = () => inst._zod.def.innerType;
   inst.removeCatch = inst.unwrap;
 });
@@ -17306,7 +17829,7 @@ function _catch2(innerType, catchValue) {
 var ZodNaN = /* @__PURE__ */ $constructor("ZodNaN", (inst, def) => {
   $ZodNaN.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => nanProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => nanProcessor(inst, ctx, json7, params);
 });
 function nan(params) {
   return _nan(ZodNaN, params);
@@ -17314,7 +17837,7 @@ function nan(params) {
 var ZodPipe = /* @__PURE__ */ $constructor("ZodPipe", (inst, def) => {
   $ZodPipe.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => pipeProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => pipeProcessor(inst, ctx, json7, params);
   inst.in = def.in;
   inst.out = def.out;
 });
@@ -17355,7 +17878,7 @@ var ZodPreprocess = /* @__PURE__ */ $constructor("ZodPreprocess", (inst, def) =>
 var ZodReadonly = /* @__PURE__ */ $constructor("ZodReadonly", (inst, def) => {
   $ZodReadonly.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => readonlyProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => readonlyProcessor(inst, ctx, json7, params);
   inst.unwrap = () => inst._zod.def.innerType;
 });
 function readonly(innerType) {
@@ -17367,7 +17890,7 @@ function readonly(innerType) {
 var ZodTemplateLiteral = /* @__PURE__ */ $constructor("ZodTemplateLiteral", (inst, def) => {
   $ZodTemplateLiteral.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => templateLiteralProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => templateLiteralProcessor(inst, ctx, json7, params);
 });
 function templateLiteral(parts, params) {
   return new ZodTemplateLiteral({
@@ -17379,7 +17902,7 @@ function templateLiteral(parts, params) {
 var ZodLazy = /* @__PURE__ */ $constructor("ZodLazy", (inst, def) => {
   $ZodLazy.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => lazyProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => lazyProcessor(inst, ctx, json7, params);
   inst.unwrap = () => inst._zod.def.getter();
 });
 function lazy(getter) {
@@ -17391,7 +17914,7 @@ function lazy(getter) {
 var ZodPromise = /* @__PURE__ */ $constructor("ZodPromise", (inst, def) => {
   $ZodPromise.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => promiseProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => promiseProcessor(inst, ctx, json7, params);
   inst.unwrap = () => inst._zod.def.innerType;
 });
 function promise(innerType) {
@@ -17403,7 +17926,7 @@ function promise(innerType) {
 var ZodFunction = /* @__PURE__ */ $constructor("ZodFunction", (inst, def) => {
   $ZodFunction.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => functionProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => functionProcessor(inst, ctx, json7, params);
 });
 function _function(params) {
   return new ZodFunction({
@@ -17415,7 +17938,7 @@ function _function(params) {
 var ZodCustom = /* @__PURE__ */ $constructor("ZodCustom", (inst, def) => {
   $ZodCustom.init(inst, def);
   ZodType.init(inst, def);
-  inst._zod.processJSONSchema = (ctx, json6, params) => customProcessor(inst, ctx, json6, params);
+  inst._zod.processJSONSchema = (ctx, json7, params) => customProcessor(inst, ctx, json7, params);
 });
 function check(fn) {
   const ch = new $ZodCheck({
@@ -17462,7 +17985,7 @@ var stringbool = (...args) => _stringbool({
   Boolean: ZodBoolean,
   String: ZodString
 }, ...args);
-function json6(params) {
+function json7(params) {
   const jsonSchema = lazy(() => {
     return union([string2(params), number2(), boolean2(), _null3(), array(jsonSchema), record(string2(), jsonSchema)]);
   });
@@ -18714,10 +19237,10 @@ function prepareArtifact(input) {
     attempts,
     error: error51.value
   };
-  const json7 = JSON.stringify(bounded);
-  const size = encoder2.encode(json7).length;
+  const json8 = JSON.stringify(bounded);
+  const size = encoder2.encode(json8).length;
   if (size <= MAX_ARTIFACT_BYTES)
-    return { artifact: bounded, json: json7 };
+    return { artifact: bounded, json: json8 };
   const marker = omission(size);
   const omitted = omitBodies(bounded, marker);
   const omittedJson = JSON.stringify(omitted);
@@ -18727,8 +19250,8 @@ function prepareArtifact(input) {
   const stripped = { ...omitted, error: marker };
   return { artifact: stripped, json: JSON.stringify(stripped) };
 }
-async function sealArtifact(key, json7) {
-  const bytes = encoder2.encode(await encrypt(key, json7));
+async function sealArtifact(key, json8) {
+  const bytes = encoder2.encode(await encrypt(key, json8));
   return { bytes, sha256: await sha256Hex(bytes) };
 }
 async function readArtifact(key, dir, relPath, expectedSha256) {
@@ -20824,13 +21347,15 @@ function customProviderData(input) {
   } catch {
     throw new GatewayError("BAD_REQUEST", "origin: must be a valid URL");
   }
-  if (url2.protocol !== "http:" && url2.protocol !== "https:" || url2.hostname.length === 0 || url2.username.length > 0 || url2.password.length > 0 || url2.pathname !== "" && url2.pathname !== "/" || url2.search.length > 0 || url2.hash.length > 0) {
+  if (url2.protocol !== "http:" && url2.protocol !== "https:" || url2.hostname.length === 0 || url2.username.length > 0 || url2.password.length > 0 || url2.search.length > 0 || url2.hash.length > 0) {
     throw new GatewayError("BAD_REQUEST", "origin: must be an HTTP(S) server origin");
   }
-  return { endpointId, endpointLabel, origin: url2.origin, protocol: input.protocol };
+  const basePath = url2.pathname.replace(/\/+$/, "");
+  return { endpointId, endpointLabel, origin: url2.origin, basePath, protocol: input.protocol };
 }
 function sameCustomEndpoint(a, b) {
-  return a.endpointId === b.endpointId && a.endpointLabel === b.endpointLabel && a.origin === b.origin && a.protocol === b.protocol;
+  const basePath = typeof a.basePath === "string" ? a.basePath : "";
+  return a.endpointId === b.endpointId && a.endpointLabel === b.endpointLabel && a.origin === b.origin && basePath === b.basePath && a.protocol === b.protocol;
 }
 async function createApiKeyCredential(store, input, logger2 = noopLogger) {
   const provider = parseOrThrow(providerIdSchema, input.provider);
@@ -22471,10 +22996,10 @@ function emailFromIdToken(idToken) {
   if (parts.length !== 3 || payload === undefined || payload.length === 0)
     return null;
   try {
-    const json7 = JSON.parse(Buffer.from(payload, "base64url").toString("utf8"));
-    if (!isRecord2(json7))
+    const json8 = JSON.parse(Buffer.from(payload, "base64url").toString("utf8"));
+    if (!isRecord2(json8))
       return null;
-    return typeof json7.email === "string" && json7.email.trim().length > 0 ? json7.email : null;
+    return typeof json8.email === "string" && json8.email.trim().length > 0 ? json8.email : null;
   } catch {
     return null;
   }
@@ -22877,12 +23402,12 @@ function decodeClaims(idToken) {
     return { email: null, accountId: null };
   }
   try {
-    const json7 = JSON.parse(Buffer.from(payload, "base64url").toString("utf8"));
-    if (!isRecord5(json7))
+    const json8 = JSON.parse(Buffer.from(payload, "base64url").toString("utf8"));
+    if (!isRecord5(json8))
       return { email: null, accountId: null };
-    const auth = json7["https://api.openai.com/auth"];
+    const auth = json8["https://api.openai.com/auth"];
     return {
-      email: typeof json7.email === "string" ? json7.email : null,
+      email: typeof json8.email === "string" ? json8.email : null,
       accountId: isRecord5(auth) ? nonBlankStringOrNull(auth.chatgpt_account_id) : null
     };
   } catch {
@@ -24126,13 +24651,14 @@ var credentialsAddKey = {
     const store = await ctx.store();
     const endpointId = stringFlag(args.values, "endpoint-id");
     const existingEndpoint = providerId === "custom" && endpointId !== undefined ? (await listCredentials(store)).find((credential) => credential.provider === "custom" && credential.providerData.endpointId === endpointId.trim()) : undefined;
+    const existingOrigin = existingEndpoint === undefined ? undefined : `${String(existingEndpoint.providerData.origin)}${typeof existingEndpoint.providerData.basePath === "string" ? existingEndpoint.providerData.basePath : ""}`;
     const created = await createApiKeyCredential(store, {
       provider: providerId,
       apiKey: key,
       label: stringFlag(args.values, "label"),
       endpointId,
       endpointLabel: stringFlag(args.values, "endpoint-label") ?? existingEndpoint?.providerData.endpointLabel,
-      origin: stringFlag(args.values, "origin") ?? existingEndpoint?.providerData.origin,
+      origin: stringFlag(args.values, "origin") ?? existingOrigin,
       protocol: protocol ?? existingEndpoint?.providerData.protocol
     });
     emit(ctx, writer, { id: created.id, provider: created.provider }, () => `stored ${created.provider} api key as ${created.id}`);