@earendil-works/pi-ai 1.4.0 → 1.5.0

package/dist/providers/compat-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compat-schema.d.ts","sourceRoot":"","sources":["../../src/providers/compat-schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compat-schema.d.ts","sourceRoot":"","sources":["../../src/providers/compat-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAQN,KAAK,MAAM,EAGX,MAAM,2BAA2B,CAAC;AAQnC,eAAO,MAAM,2BAA2B,0FAEtC,CAAC;AAeH,eAAO,MAAM,8BAA8B,oHAGzC,CAAC;AAEH,eAAO,MAAM,4BAA4B;;;SAavC,CAAC;AAWH,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuFnC,CAAC;AAEF,eAAO,MAAM,0BAA0B;;;EAkBtC,CAAC;AAEF,eAAO,MAAM,mCAAmC;;;;;;;;;;;;;;;;EAO/C,CAAC;AAuKF,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIxC,CAAC;AA+DH,eAAO,MAAM,2BAA2B;;;;;;;;;;;;EAGtC,CAAC;AAqFH,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGxC,CAAC;AASH,eAAO,MAAM,mBAAmB;;EAG9B,CAAC;AAUH,eAAO,MAAM,gCAAgC;;EAG3C,CAAC;AAeH,eAAO,MAAM,qBAAqB;;;EAGhC,CAAC;AAiFH,sGAAsG;AACtG,eAAO,MAAM,kBAAkB;aAC9B,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aACpB,kBAAkB;;;;;;;;;;;;;aAClB,wBAAwB;;;;;;;;;;;;;aACxB,wBAAwB;;;;;;;;;;;;;aACxB,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aACpB,yBAAyB;;;aACzB,uBAAuB;;;aACvB,qBAAqB;;;;aACrB,kCAAkC;;;;CACzB,CAAC;AAcX,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAG/B,CAAC;AAEH,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,OAAO,4BAA4B,CAAC,CAAC;AACjF,4FAA4F;AAC5F,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACjE,yFAAyF;AACzF,MAAM,MAAM,wBAAwB,GAAG,MAAM,CAAC,OAAO,8BAA8B,CAAC,CAAC;AACrF,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAC/E,+CAA+C;AAC/C,MAAM,WAAW,iBAAkB,SAAQ,MAAM,CAAC,OAAO,uBAAuB,CAAC;CAAG;AACpF,6CAA6C;AAC7C,MAAM,WAAW,oBAAqB,SAAQ,MAAM,CAAC,OAAO,0BAA0B,CAAC;CAAG;AAC1F,mFAAmF;AACnF,MAAM,WAAW,6BAA8B,SAAQ,MAAM,CAAC,OAAO,mCAAmC,CAAC;CAAG;AAE5G,qEAAqE;AACrE,MAAM,WAAW,uBAAwB,SAAQ,MAAM,CAAC,OAAO,6BAA6B,CAAC;CAAG;AAChG,wDAAwD;AACxD,MAAM,WAAW,qBAAsB,SAAQ,MAAM,CAAC,OAAO,2BAA2B,CAAC;CAAG;AAC5F,qEAAqE;AACrE,MAAM,WAAW,uBAAwB,SAAQ,MAAM,CAAC,OAAO,6BAA6B,CAAC;CAAG;AAChG,wDAAwD;AACxD,MAAM,WAAW,aAAc,SAAQ,MAAM,CAAC,OAAO,mBAAmB,CAAC;CAAG;AAC5E,uDAAuD;AACvD,MAAM,WAAW,0BAA2B,SAAQ,MAAM,CAAC,OAAO,gCAAgC,CAAC;CAAG;AACtG,6DAA6D;AAC7D,MAAM,WAAW,eAAgB,SAAQ,MAAM,CAAC,OAAO,qBAAqB,CAAC;CAAG"}

package/dist/providers/compat-schema.js

@@ -1,66 +1,71 @@
-import { Type } from "typebox";
+import { arr, bool, nul, num, opt, str, union, } from "@earendil-works/pi-schema";
 import { ModelCostSchema } from "./model-schema.js";
+import { openObject, stringLiteral, stringRecord } from "./schema-builders.js";
 function sessionAffinityFormat(options) {
-    return Type.Union([Type.Literal("openai"), Type.Literal("openai-nosession"), Type.Literal("openrouter")], options);
+    return union([stringLiteral("openai"), stringLiteral("openai-nosession"), stringLiteral("openrouter")], options);
 }
 export const SessionAffinityFormatSchema = sessionAffinityFormat({
     description: "Session-affinity header format used to route related requests consistently.",
 });
 function thinkingTokenBudgetField(options) {
-    return Type.Union([Type.Literal("thinking_token_budget"), Type.Literal("thinking_budget"), Type.Literal("thinking_budget_tokens")], options);
+    return union([
+        stringLiteral("thinking_token_budget"),
+        stringLiteral("thinking_budget"),
+        stringLiteral("thinking_budget_tokens"),
+    ], options);
 }
 export const ThinkingTokenBudgetFieldSchema = thinkingTokenBudgetField({
     description: 'Top-level request field name used by OpenAI-compatible endpoints to cap reasoning tokens. "thinking_token_budget" is used by vLLM, "thinking_budget" by Qwen, DashScope, or SGLang, and "thinking_budget_tokens" by llama.cpp.',
 });
-export const ChatTemplateKwargValueSchema = Type.Union([
-    Type.String(),
-    Type.Number(),
-    Type.Boolean(),
-    Type.Null(),
-    Type.Object({
-        $var: Type.Union([
-            Type.Literal("thinking.enabled"),
-            Type.Literal("thinking.effort"),
-            Type.Literal("thinking.budget"),
+export const ChatTemplateKwargValueSchema = union([
+    str(),
+    num(),
+    bool(),
+    nul(),
+    openObject({
+        $var: union([
+            stringLiteral("thinking.enabled"),
+            stringLiteral("thinking.effort"),
+            stringLiteral("thinking.budget"),
         ]),
-        omitWhenOff: Type.Optional(Type.Boolean()),
+        omitWhenOff: opt(bool()),
     }),
 ]);
 function percentileCutoffs(metric) {
-    return Type.Object({
-        p50: Type.Optional(Type.Number({ description: `${metric} at the 50th percentile.` })),
-        p75: Type.Optional(Type.Number({ description: `${metric} at the 75th percentile.` })),
-        p90: Type.Optional(Type.Number({ description: `${metric} at the 90th percentile.` })),
-        p99: Type.Optional(Type.Number({ description: `${metric} at the 99th percentile.` })),
+    return openObject({
+        p50: opt(num({ description: `${metric} at the 50th percentile.` })),
+        p75: opt(num({ description: `${metric} at the 75th percentile.` })),
+        p90: opt(num({ description: `${metric} at the 90th percentile.` })),
+        p99: opt(num({ description: `${metric} at the 99th percentile.` })),
     });
 }
-export const OpenRouterRoutingSchema = Type.Object({
-    allow_fallbacks: Type.Optional(Type.Boolean({ description: "Whether to allow backup providers to serve requests.", default: true })),
-    require_parameters: Type.Optional(Type.Boolean({
+export const OpenRouterRoutingSchema = openObject({
+    allow_fallbacks: opt(bool({ description: "Whether to allow backup providers to serve requests.", default: true })),
+    require_parameters: opt(bool({
         description: "Whether to filter providers to only those that support all parameters in the request.",
         default: false,
     })),
-    data_collection: Type.Optional(Type.Union([Type.Literal("deny"), Type.Literal("allow")], {
+    data_collection: opt(union([stringLiteral("deny"), stringLiteral("allow")], {
         description: 'Data collection setting. "allow": allow providers that may store or train on data. "deny": only use providers that do not collect user data.',
         default: "allow",
     })),
-    zdr: Type.Optional(Type.Boolean({ description: "Whether to restrict routing to only ZDR (Zero Data Retention) endpoints." })),
-    enforce_distillable_text: Type.Optional(Type.Boolean({ description: "Whether to restrict routing to only models that allow text distillation." })),
-    order: Type.Optional(Type.Array(Type.String(), {
+    zdr: opt(bool({ description: "Whether to restrict routing to only ZDR (Zero Data Retention) endpoints." })),
+    enforce_distillable_text: opt(bool({ description: "Whether to restrict routing to only models that allow text distillation." })),
+    order: opt(arr(str(), {
         description: "An ordered list of provider names or slugs to try in sequence, falling back to the next if unavailable.",
     })),
-    only: Type.Optional(Type.Array(Type.String(), {
+    only: opt(arr(str(), {
         description: "List of provider names or slugs to exclusively allow for this request.",
     })),
-    ignore: Type.Optional(Type.Array(Type.String(), { description: "List of provider names or slugs to skip for this request." })),
-    quantizations: Type.Optional(Type.Array(Type.String(), {
+    ignore: opt(arr(str(), { description: "List of provider names or slugs to skip for this request." })),
+    quantizations: opt(arr(str(), {
         description: 'A list of quantization levels to filter providers by, for example ["fp16", "bf16", "fp8", "fp6", "int8", "int4", "fp4", "fp32"].',
     })),
-    sort: Type.Optional(Type.Union([
-        Type.String(),
-        Type.Object({
-            by: Type.Optional(Type.String({ description: 'The sorting metric, such as "price", "throughput", or "latency".' })),
-            partition: Type.Optional(Type.Union([Type.String(), Type.Null()], {
+    sort: opt(union([
+        str(),
+        openObject({
+            by: opt(str({ description: 'The sorting metric, such as "price", "throughput", or "latency".' })),
+            partition: opt(union([str(), nul()], {
                 description: 'Partitioning strategy: "model" or "none".',
                 default: "model",
             })),
@@ -68,105 +73,105 @@ export const OpenRouterRoutingSchema = Type.Object({
     ], {
         description: 'Sorting strategy. Can be a string such as "price", "throughput", or "latency", or an object.',
     })),
-    max_price: Type.Optional(Type.Object({
-        prompt: Type.Optional(Type.Union([Type.Number(), Type.String()], { description: "Price per million prompt tokens." })),
-        completion: Type.Optional(Type.Union([Type.Number(), Type.String()], { description: "Price per million completion tokens." })),
-        image: Type.Optional(Type.Union([Type.Number(), Type.String()], { description: "Price per image." })),
-        audio: Type.Optional(Type.Union([Type.Number(), Type.String()], { description: "Price per audio unit." })),
-        request: Type.Optional(Type.Union([Type.Number(), Type.String()], { description: "Price per request." })),
+    max_price: opt(openObject({
+        prompt: opt(union([num(), str()], { description: "Price per million prompt tokens." })),
+        completion: opt(union([num(), str()], { description: "Price per million completion tokens." })),
+        image: opt(union([num(), str()], { description: "Price per image." })),
+        audio: opt(union([num(), str()], { description: "Price per audio unit." })),
+        request: opt(union([num(), str()], { description: "Price per request." })),
     }, { description: "Maximum price per million tokens in USD." })),
-    preferred_min_throughput: Type.Optional(Type.Union([Type.Number(), percentileCutoffs("Minimum tokens per second")], {
+    preferred_min_throughput: opt(union([num(), percentileCutoffs("Minimum tokens per second")], {
         description: "Preferred minimum throughput in tokens per second. A number applies to p50.",
     })),
-    preferred_max_latency: Type.Optional(Type.Union([Type.Number(), percentileCutoffs("Maximum latency in seconds")], {
+    preferred_max_latency: opt(union([num(), percentileCutoffs("Maximum latency in seconds")], {
         description: "Preferred maximum latency in seconds. A number applies to p50.",
     })),
 }, {
     description: "OpenRouter provider routing preferences. Controls which upstream providers OpenRouter routes requests to. Sent as the provider field in the OpenRouter API request body. See https://openrouter.ai/docs/guides/routing/provider-selection.",
 });
-export const VercelGatewayRoutingSchema = Type.Object({
-    only: Type.Optional(Type.Array(Type.String(), {
+export const VercelGatewayRoutingSchema = openObject({
+    only: opt(arr(str(), {
         description: 'List of provider slugs to exclusively use for this request, for example ["bedrock", "anthropic"].',
     })),
-    order: Type.Optional(Type.Array(Type.String(), {
+    order: opt(arr(str(), {
         description: 'List of provider slugs to try in order, for example ["anthropic", "openai"].',
     })),
 }, {
     description: "Vercel AI Gateway routing preferences. Controls which upstream providers the gateway routes requests to. See https://vercel.com/docs/ai-gateway/models-and-providers/provider-options.",
 });
-export const AnthropicAllowedFallbackModelSchema = Type.Object({
-    provider: Type.String({ minLength: 1 }),
-    model: Type.String({ minLength: 1 }),
+export const AnthropicAllowedFallbackModelSchema = openObject({
+    provider: str({ minLength: 1 }),
+    model: str({ minLength: 1 }),
     cost: ModelCostSchema,
 }, { description: "An Anthropic server-side refusal fallback model with local pricing metadata." });
 function optionalCompatBoolean(options) {
-    return Type.Optional(Type.Boolean(options));
+    return opt(bool(options));
 }
 function optionalSessionAffinityFormat(options) {
-    return Type.Optional(sessionAffinityFormat(options));
+    return opt(sessionAffinityFormat(options));
 }
-export const OpenAICompletionsCompatSchema = Type.Object({
-    supportsStore: Type.Optional(Type.Boolean({
+const OpenAICompletionsCompatProperties = {
+    supportsStore: opt(bool({
         description: "Whether the provider supports the store field. Default: auto-detected from URL.",
     })),
     supportsDeveloperRole: optionalCompatBoolean({
         description: "Whether the provider supports the developer role instead of system. Default: auto-detected from URL.",
     }),
-    supportsReasoningEffort: Type.Optional(Type.Boolean({
+    supportsReasoningEffort: opt(bool({
         description: "Whether the provider supports reasoning_effort. Default: auto-detected from URL.",
     })),
-    supportsUsageInStreaming: Type.Optional(Type.Boolean({
+    supportsUsageInStreaming: opt(bool({
         description: "Whether the provider supports stream_options.include_usage for token usage in streaming responses.",
         default: true,
     })),
-    supportsFinishReason: Type.Optional(Type.Boolean({
+    supportsFinishReason: opt(bool({
         description: "Whether streamed responses include finish_reason. When false, pi infers stop or toolUse when the stream ends.",
         default: true,
     })),
-    maxTokensField: Type.Optional(Type.Union([Type.Literal("max_completion_tokens"), Type.Literal("max_tokens")], {
+    maxTokensField: opt(union([stringLiteral("max_completion_tokens"), stringLiteral("max_tokens")], {
         description: "Which field to use for max tokens. Default: auto-detected from URL.",
     })),
-    requiresToolResultName: Type.Optional(Type.Boolean({ description: "Whether tool results require the name field. Default: auto-detected from URL." })),
-    requiresAssistantAfterToolResult: Type.Optional(Type.Boolean({
+    requiresToolResultName: opt(bool({ description: "Whether tool results require the name field. Default: auto-detected from URL." })),
+    requiresAssistantAfterToolResult: opt(bool({
         description: "Whether a user message after tool results requires an assistant message in between. Default: auto-detected from URL.",
     })),
-    requiresThinkingAsText: Type.Optional(Type.Boolean({
+    requiresThinkingAsText: opt(bool({
         description: "Whether thinking blocks must be converted to text blocks with <thinking> delimiters. Default: auto-detected from URL.",
     })),
-    requiresReasoningContentOnAssistantMessages: Type.Optional(Type.Boolean({
+    requiresReasoningContentOnAssistantMessages: opt(bool({
         description: "Whether all replayed assistant messages must include an empty reasoning_content field when reasoning is enabled. Default: auto-detected from URL.",
     })),
-    thinkingFormat: Type.Optional(Type.Union([
-        Type.Literal("openai"),
-        Type.Literal("openrouter"),
-        Type.Literal("deepseek"),
-        Type.Literal("together"),
-        Type.Literal("baseten"),
-        Type.Literal("zai"),
-        Type.Literal("qwen"),
-        Type.Literal("chat-template"),
-        Type.Literal("qwen-chat-template"),
-        Type.Literal("string-thinking"),
-        Type.Literal("ant-ling"),
+    thinkingFormat: opt(union([
+        stringLiteral("openai"),
+        stringLiteral("openrouter"),
+        stringLiteral("deepseek"),
+        stringLiteral("together"),
+        stringLiteral("baseten"),
+        stringLiteral("zai"),
+        stringLiteral("qwen"),
+        stringLiteral("chat-template"),
+        stringLiteral("qwen-chat-template"),
+        stringLiteral("string-thinking"),
+        stringLiteral("ant-ling"),
     ], {
         description: 'Format for reasoning or thinking parameters. When omitted, Pi auto-detects the format from the provider URL. "openai" uses reasoning_effort, "openrouter" uses reasoning.effort, "deepseek" uses thinking.type plus reasoning_effort when supported, "together" uses reasoning.enabled plus reasoning_effort when supported, "baseten" uses configurable chat_template_args plus reasoning_effort when supported, "zai" uses thinking.type, "qwen" uses top-level enable_thinking, "qwen-chat-template" uses chat_template_kwargs.enable_thinking and preserve_thinking, "chat-template" uses configurable chat_template_kwargs, "string-thinking" uses top-level thinking, and "ant-ling" uses reasoning.effort only when the mapped effort is non-null.',
     })),
-    chatTemplateKwargs: Type.Optional(Type.Record(Type.String(), ChatTemplateKwargValueSchema, {
+    chatTemplateKwargs: opt(stringRecord(ChatTemplateKwargValueSchema, {
         description: 'Kwargs sent as chat_template_kwargs when thinkingFormat is "chat-template". Use $var with "thinking.enabled", "thinking.effort", or "thinking.budget" for pi-controlled values.',
     })),
-    chatTemplateArgs: Type.Optional(Type.Record(Type.String(), ChatTemplateKwargValueSchema, {
+    chatTemplateArgs: opt(stringRecord(ChatTemplateKwargValueSchema, {
         description: 'Arguments sent as chat_template_args when thinkingFormat is "baseten". Use $var with "thinking.enabled", "thinking.effort", or "thinking.budget" for pi-controlled values.',
     })),
-    openRouterRouting: Type.Optional(OpenRouterRoutingSchema),
-    vercelGatewayRouting: Type.Optional(VercelGatewayRoutingSchema),
-    zaiToolStream: Type.Optional(Type.Boolean({
+    openRouterRouting: opt(OpenRouterRoutingSchema),
+    vercelGatewayRouting: opt(VercelGatewayRoutingSchema),
+    zaiToolStream: opt(bool({
         description: "Whether z.ai supports top-level tool_stream for streaming tool call deltas.",
         default: false,
     })),
-    thinkingTokenBudgetField: Type.Optional(thinkingTokenBudgetField({
+    thinkingTokenBudgetField: opt(thinkingTokenBudgetField({
         description: 'Top-level request field used to cap reasoning tokens from thinkingBudgets. Reasoning and the answer share max_tokens on these endpoints. "thinking_token_budget" is vLLM, "thinking_budget" is Qwen, DashScope, or SGLang, and "thinking_budget_tokens" is llama.cpp. Off by default and not set on the generated catalog.',
     })),
-    supportsThinkingTokenBudget: Type.Optional(Type.Boolean({
+    supportsThinkingTokenBudget: opt(bool({
         description: 'Alias for thinkingTokenBudgetField: "thinking_token_budget" (vLLM). Prefer thinkingTokenBudgetField.',
         default: false,
     })),
@@ -178,7 +183,7 @@ export const OpenAICompletionsCompatSchema = Type.Object({
         description: "Whether the exact model accepts system or developer messages after the conversation has started. When false, later system messages are folded into the leading system message. The generated catalog enables this for verified models.",
         default: false,
     }),
-    supportsMidConvoToolAdditions: Type.Optional(Type.Boolean({
+    supportsMidConvoToolAdditions: opt(bool({
         description: "Whether system messages can introduce additional tools mid-conversation. Requires supportsMidConvoSystemMessages. The generated catalog enables this for capable models.",
         default: false,
     })),
@@ -186,7 +191,7 @@ export const OpenAICompletionsCompatSchema = Type.Object({
         description: "Whether the provider supports the strict field in tool definitions. Generated capable models enable it explicitly.",
         default: false,
     }),
-    cacheControlFormat: Type.Optional(Type.Literal("anthropic", {
+    cacheControlFormat: opt(stringLiteral("anthropic", {
         description: "Cache control convention for prompt caching. Anthropic applies cache_control markers to the system prompt, last tool definition, and last user, assistant, or tool-result text content.",
     })),
     sendSessionAffinityHeaders: optionalCompatBoolean({
@@ -198,14 +203,15 @@ export const OpenAICompletionsCompatSchema = Type.Object({
     supportsLongCacheRetention: optionalCompatBoolean({
         description: 'Whether the provider supports long prompt cache retention (prompt_cache_retention: "24h" or Anthropic-style cache_control.ttl: "1h", depending on format). Default: auto-detected from provider and URL.',
     }),
-    vllmPriority: Type.Optional(Type.Number({
+    vllmPriority: opt(num({
         description: "vLLM scheduler priority sent as the top-level priority request field. Lower values are handled earlier and the server default is 0. Only meaningful with --scheduling-policy priority. Off by default and not set on the generated catalog.",
     })),
-}, {
+};
+export const OpenAICompletionsCompatSchema = openObject(OpenAICompletionsCompatProperties, {
     description: "Compatibility settings for OpenAI-compatible completions APIs. Use this to override URL-based auto-detection for custom providers.",
     additionalProperties: true,
 });
-export const OpenAIResponsesCompatSchema = Type.Object({
+const OpenAIResponsesCompatProperties = {
     supportsDeveloperRole: optionalCompatBoolean({
         description: "Whether the provider supports the developer role instead of system.",
         default: true,
@@ -228,29 +234,33 @@ export const OpenAIResponsesCompatSchema = Type.Object({
         description: "Whether to emit OpenAI custom tools with Lark or regex grammar formats. When false, grammar-constrained tools fall back to normal function tools. The generated catalog enables this for capable models.",
         default: false,
     }),
-    supportsAdditionalTools: Type.Optional(Type.Boolean({
+    supportsAdditionalTools: opt(bool({
         description: "Whether the model supports message-anchored additional_tools input items.",
         default: false,
     })),
-    supportsToolSearch: Type.Optional(Type.Boolean({
+    supportsToolSearch: opt(bool({
         description: "Whether the model supports client-executed tool search for transcript-anchored additions.",
         default: false,
     })),
-    supportsExplicitPromptCacheMode: Type.Optional(Type.Boolean({
+    supportsExplicitPromptCacheMode: opt(bool({
         description: "Whether the model accepts prompt_cache_options. Older OpenAI models reject the parameter.",
         default: false,
     })),
-    supportsMidConvoEffort: Type.Optional(Type.Boolean({
+    supportsMidConvoEffort: opt(bool({
         description: "Whether thinking level changes are sent as configuration_update input items instead of changing reasoning.effort, so a change keeps the prompt cache. Only used by the openai-responses API, and ignored with Sign in with ChatGPT on the openai provider.",
         default: false,
     })),
-    supportsMaxOutputTokens: Type.Optional(Type.Boolean({
+    supportsMaxOutputTokens: opt(bool({
         description: "Whether the provider accepts max_output_tokens. Some Codex-protocol gateways reject it.",
         default: true,
     })),
-}, { description: "Compatibility settings for OpenAI Responses APIs.", additionalProperties: true });
-export const AnthropicMessagesCompatSchema = Type.Object({
-    supportsEagerToolInputStreaming: Type.Optional(Type.Boolean({
+};
+export const OpenAIResponsesCompatSchema = openObject(OpenAIResponsesCompatProperties, {
+    description: "Compatibility settings for OpenAI Responses APIs.",
+    additionalProperties: true,
+});
+const AnthropicMessagesCompatProperties = {
+    supportsEagerToolInputStreaming: opt(bool({
         description: "Whether the provider accepts per-tool eager_input_streaming. When false, the Anthropic provider omits tools[].eager_input_streaming and sends the legacy fine-grained-tool-streaming-2025-05-14 beta header for tool-enabled requests.",
         default: true,
     })),
@@ -261,30 +271,30 @@ export const AnthropicMessagesCompatSchema = Type.Object({
     sendSessionAffinityHeaders: optionalCompatBoolean({
         description: "Whether to send x-session-affinity from options.sessionId when caching is enabled. Required for providers like Fireworks that use session affinity for prompt cache routing; requests to the same replica maximize cache hits. Default: true for OpenRouter endpoints, false otherwise.",
     }),
-    sessionAffinityFormat: Type.Optional(Type.Literal("openrouter", {
+    sessionAffinityFormat: opt(stringLiteral("openrouter", {
         description: "Session-affinity format. openrouter sends x-session-id; when unset, sends x-session-affinity.",
     })),
-    supportsCacheControlOnTools: Type.Optional(Type.Boolean({
+    supportsCacheControlOnTools: opt(bool({
         description: "Whether the provider supports Anthropic-style cache_control markers on tool definitions. When false, cache_control is omitted from tool parameters. Some Anthropic-compatible providers, such as Fireworks, do not support this field on tools and may reject or ignore it.",
         default: true,
     })),
-    supportsTemperature: Type.Optional(Type.Boolean({
+    supportsTemperature: opt(bool({
         description: "Whether the model accepts the Anthropic temperature request field. Claude Opus 4.7+ rejects non-default values.",
         default: true,
     })),
-    forceAdaptiveThinking: Type.Optional(Type.Boolean({
+    forceAdaptiveThinking: opt(bool({
         description: "Whether to force adaptive thinking (thinking.type: adaptive plus output_config.effort) regardless of model ID. Built-in models that require adaptive thinking set this in generated metadata. Custom Anthropic-compatible providers can set this to true for any model whose upstream requires the adaptive format. Set false to opt out on overridden built-in models.",
         default: false,
     })),
-    allowEmptySignature: Type.Optional(Type.Boolean({
+    allowEmptySignature: opt(bool({
         description: "Whether to replay empty thinking signatures instead of converting thinking to text.",
         default: false,
     })),
-    supportsStrictTools: Type.Optional(Type.Boolean({
+    supportsStrictTools: opt(bool({
         description: "Whether the provider supports Anthropic strict tool schemas. Generated Anthropic models enable it explicitly.",
         default: false,
     })),
-    supportsMidConvoEffort: Type.Optional(Type.Boolean({
+    supportsMidConvoEffort: opt(bool({
         description: "Whether the exact model transport supports effort-only system messages and thinking binding controls.",
         default: false,
     })),
@@ -292,35 +302,51 @@ export const AnthropicMessagesCompatSchema = Type.Object({
         description: "Whether the exact model accepts system-role messages inside the conversation. When false, later system messages are folded into the top-level system prompt.",
         default: false,
     }),
-    supportsMidConvoToolChanges: Type.Optional(Type.Boolean({
+    supportsMidConvoToolChanges: opt(bool({
         description: "Whether the exact model accepts mid-conversation tool_addition and tool_removal blocks. Requires supportsMidConvoSystemMessages.",
         default: false,
     })),
-    allowedFallbackModels: Type.Optional(Type.Array(AnthropicAllowedFallbackModelSchema, {
+    allowedFallbackModels: opt(arr(AnthropicAllowedFallbackModelSchema, {
         maxItems: 3,
         description: "Models Anthropic accepts for server-side refusal fallback, with local pricing metadata for returned fallback responses. When absent or empty, callers must omit fallbacks; Anthropic rejects the field for models with no permitted fallback targets.",
     })),
-}, { description: "Compatibility settings for Anthropic Messages-compatible APIs.", additionalProperties: true });
-export const BedrockCompatSchema = Type.Object({
+};
+export const AnthropicMessagesCompatSchema = openObject(AnthropicMessagesCompatProperties, {
+    description: "Compatibility settings for Anthropic Messages-compatible APIs.",
+    additionalProperties: true,
+});
+const BedrockCompatProperties = {
     supportsStrictMode: optionalCompatBoolean({
         description: "Whether the model supports Bedrock strict tool schemas.",
         default: false,
     }),
-}, { description: "Compatibility settings for Amazon Bedrock models.", additionalProperties: true });
-export const MistralConversationsCompatSchema = Type.Object({
+};
+export const BedrockCompatSchema = openObject(BedrockCompatProperties, {
+    description: "Compatibility settings for Amazon Bedrock models.",
+    additionalProperties: true,
+});
+const MistralConversationsCompatProperties = {
     supportsMidConvoSystemMessages: optionalCompatBoolean({
         description: "Whether the exact model accepts system messages after the conversation has started. When false, later system messages are folded into the leading system message.",
         default: false,
     }),
-}, { description: "Compatibility settings for the Mistral chat API.", additionalProperties: true });
-export const SystemOneCompatSchema = Type.Object({
-    imageInput: Type.Optional(Type.Union([Type.Literal("assets"), Type.Literal("images"), Type.Literal("state-image-urls")], {
+};
+export const MistralConversationsCompatSchema = openObject(MistralConversationsCompatProperties, {
+    description: "Compatibility settings for the Mistral chat API.",
+    additionalProperties: true,
+});
+const SystemOneCompatProperties = {
+    imageInput: opt(union([stringLiteral("assets"), stringLiteral("images"), stringLiteral("state-image-urls")], {
         description: 'How the service takes classifier images. "assets" sends TypeSafe\'s assets map (PNG and JPEG) and references the images from the state, as TypeSafe and Jev on Workers AI expect. "images" sends Clef\'s images list of data URLs (PNG, JPEG, and WebP, at most four), as Clef on Workers AI expects. "state-image-urls" places image_url parts before the state, as OpenRouter expects; OpenRouter drops assets without an error. Auto-detected from the provider, baseUrl, and model ID. Classifier models read it from the provider-level compat; models and modelOverrides entries apply to chat models only.',
     })),
     sendImageOptInHeader: optionalCompatBoolean({
         description: "Whether requests with images send the TypeSafe-Danger-Zone-Images: true header, which TypeSafe's own API requires for its experimental image input. Defaults to true for the typesafe-system-one API unless the model is detected as OpenRouter.",
     }),
-}, { description: "Compatibility settings for System One classifier APIs.", additionalProperties: true });
+};
+export const SystemOneCompatSchema = openObject(SystemOneCompatProperties, {
+    description: "Compatibility settings for System One classifier APIs.",
+    additionalProperties: true,
+});
 const ProviderCompatPropertyOverrides = {
     supportsDeveloperRole: optionalCompatBoolean({
         description: "Whether the provider supports the developer role instead of system. Defaults are API-specific.",
@@ -388,8 +414,15 @@ export const CompatSchemasByApi = {
     "typesafe-system-one": SystemOneCompatSchema,
     "cloudflare-workers-ai-system-one": SystemOneCompatSchema,
 };
-const ProviderCompatProperties = mergeCompatProperties([...new Set(Object.values(CompatSchemasByApi))].map((schema) => schema.properties), ProviderCompatPropertyOverrides);
-export const ProviderCompatSchema = Type.Object(ProviderCompatProperties, {
+const ProviderCompatProperties = mergeCompatProperties([
+    OpenAICompletionsCompatProperties,
+    OpenAIResponsesCompatProperties,
+    AnthropicMessagesCompatProperties,
+    BedrockCompatProperties,
+    MistralConversationsCompatProperties,
+    SystemOneCompatProperties,
+], ProviderCompatPropertyOverrides);
+export const ProviderCompatSchema = openObject(ProviderCompatProperties, {
     description: "Provider and model compatibility overrides.",
     additionalProperties: true,
 });