@opencode/ai 2.1.3 → 2.1.4

package/dist/protocols/open-responses.js

@@ -566,7 +566,7 @@ export const lowerConversation = Effect.fnUntraced(function* (request, adapter)
 export const lowerGeneration = (request, options = OpenResponsesOptions.resolve(request)) => {
     const generation = request.generation;
     const cacheKey = ProviderShared.promptCacheKey(request);
-    const parallelToolCalls = resolveParallelToolCalls(request);
+    const parallelToolCalls = resolveParallelToolCalls(request, options);
     return {
         stream: true,
         max_output_tokens: generation?.maxTokens,
@@ -593,15 +593,15 @@ export const lowerGeneration = (request, options = OpenResponsesOptions.resolve(
         ...(options.truncation ? { truncation: options.truncation } : {}),
     };
 };
-export const resolveParallelToolCalls = (request) => {
-    const configured = OpenResponsesOptions.resolve(request).parallelToolCalls;
+export const resolveParallelToolCalls = (request, options = OpenResponsesOptions.resolve(request)) => {
+    const configured = options.parallelToolCalls;
     if (configured !== undefined)
         return configured;
     const disabled = request.toolChoice?.disableParallelToolUse;
     return disabled === undefined ? undefined : !disabled;
 };
-export const allowedToolChoice = (request) => {
-    const allowed = OpenResponsesOptions.resolve(request).allowedTools;
+export const allowedToolChoice = (request, options = OpenResponsesOptions.resolve(request)) => {
+    const allowed = options.allowedTools;
     if (!allowed)
         return undefined;
     return {
@@ -612,11 +612,12 @@ export const allowedToolChoice = (request) => {
 };
 export const fromRequestWithAdapter = Effect.fn("OpenResponses.fromRequestWithAdapter")(function* (request, adapter) {
     const projected = ProviderShared.flattenToolRequest(request);
+    const options = OpenResponsesOptions.resolve(request);
     return {
         ...(yield* lowerConversation(projected.request, adapter)),
-        ...lowerGeneration(request),
+        ...lowerGeneration(request, options),
         tools: projected.tools.length === 0 ? undefined : yield* lowerTools(projected.tools, adapter),
-        tool_choice: allowedToolChoice(request) ??
+        tool_choice: allowedToolChoice(request, options) ??
             (request.toolChoice ? yield* lowerToolChoice(adapter.name, request.toolChoice) : undefined),
     };
 });

package/dist/protocols/openai-chat.d.ts

@@ -571,13 +571,6 @@ export declare const fromRequest: (request: LLMRequest<import("../schema/options
     messages: ({
         readonly role: "system";
         readonly content: string | readonly ({
-            readonly type: "text";
-            readonly text: string;
-            readonly cache_control?: {
-                readonly type: "ephemeral";
-                readonly ttl?: string | undefined;
-            } | undefined;
-        } | {
             readonly type: "image_url";
             readonly image_url: {
                 readonly url: string;
@@ -588,17 +581,17 @@ export declare const fromRequest: (request: LLMRequest<import("../schema/options
                 readonly filename: string;
                 readonly file_data: string;
             };
-        })[];
-    } | {
-        readonly role: "user";
-        readonly content: string | readonly ({
+        } | {
             readonly type: "text";
             readonly text: string;
             readonly cache_control?: {
                 readonly type: "ephemeral";
                 readonly ttl?: string | undefined;
             } | undefined;
-        } | {
+        })[];
+    } | {
+        readonly role: "user";
+        readonly content: string | readonly ({
             readonly type: "image_url";
             readonly image_url: {
                 readonly url: string;
@@ -609,6 +602,13 @@ export declare const fromRequest: (request: LLMRequest<import("../schema/options
                 readonly filename: string;
                 readonly file_data: string;
             };
+        } | {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
         })[];
     } | {
         readonly role: "tool";
@@ -691,13 +691,6 @@ export declare const fromRequest: (request: LLMRequest<import("../schema/options
     messages: ({
         readonly role: "system";
         readonly content: string | readonly ({
-            readonly type: "text";
-            readonly text: string;
-            readonly cache_control?: {
-                readonly type: "ephemeral";
-                readonly ttl?: string | undefined;
-            } | undefined;
-        } | {
             readonly type: "image_url";
             readonly image_url: {
                 readonly url: string;
@@ -708,17 +701,17 @@ export declare const fromRequest: (request: LLMRequest<import("../schema/options
                 readonly filename: string;
                 readonly file_data: string;
             };
-        })[];
-    } | {
-        readonly role: "user";
-        readonly content: string | readonly ({
+        } | {
             readonly type: "text";
             readonly text: string;
             readonly cache_control?: {
                 readonly type: "ephemeral";
                 readonly ttl?: string | undefined;
             } | undefined;
-        } | {
+        })[];
+    } | {
+        readonly role: "user";
+        readonly content: string | readonly ({
             readonly type: "image_url";
             readonly image_url: {
                 readonly url: string;
@@ -729,6 +722,13 @@ export declare const fromRequest: (request: LLMRequest<import("../schema/options
                 readonly filename: string;
                 readonly file_data: string;
             };
+        } | {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
         })[];
     } | {
         readonly role: "tool";
@@ -1031,13 +1031,6 @@ export declare const protocol: Protocol<{
     readonly messages: readonly ({
         readonly role: "system";
         readonly content: string | readonly ({
-            readonly type: "text";
-            readonly text: string;
-            readonly cache_control?: {
-                readonly type: "ephemeral";
-                readonly ttl?: string | undefined;
-            } | undefined;
-        } | {
             readonly type: "image_url";
             readonly image_url: {
                 readonly url: string;
@@ -1048,17 +1041,17 @@ export declare const protocol: Protocol<{
                 readonly filename: string;
                 readonly file_data: string;
             };
-        })[];
-    } | {
-        readonly role: "user";
-        readonly content: string | readonly ({
+        } | {
             readonly type: "text";
             readonly text: string;
             readonly cache_control?: {
                 readonly type: "ephemeral";
                 readonly ttl?: string | undefined;
             } | undefined;
-        } | {
+        })[];
+    } | {
+        readonly role: "user";
+        readonly content: string | readonly ({
             readonly type: "image_url";
             readonly image_url: {
                 readonly url: string;
@@ -1069,6 +1062,13 @@ export declare const protocol: Protocol<{
                 readonly filename: string;
                 readonly file_data: string;
             };
+        } | {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
         })[];
     } | {
         readonly role: "tool";
@@ -1226,13 +1226,6 @@ export declare const httpTransport: HttpTransport.HttpJsonTransport<{
     readonly messages: readonly ({
         readonly role: "system";
         readonly content: string | readonly ({
-            readonly type: "text";
-            readonly text: string;
-            readonly cache_control?: {
-                readonly type: "ephemeral";
-                readonly ttl?: string | undefined;
-            } | undefined;
-        } | {
             readonly type: "image_url";
             readonly image_url: {
                 readonly url: string;
@@ -1243,17 +1236,17 @@ export declare const httpTransport: HttpTransport.HttpJsonTransport<{
                 readonly filename: string;
                 readonly file_data: string;
             };
-        })[];
-    } | {
-        readonly role: "user";
-        readonly content: string | readonly ({
+        } | {
             readonly type: "text";
             readonly text: string;
             readonly cache_control?: {
                 readonly type: "ephemeral";
                 readonly ttl?: string | undefined;
             } | undefined;
-        } | {
+        })[];
+    } | {
+        readonly role: "user";
+        readonly content: string | readonly ({
             readonly type: "image_url";
             readonly image_url: {
                 readonly url: string;
@@ -1264,6 +1257,13 @@ export declare const httpTransport: HttpTransport.HttpJsonTransport<{
                 readonly filename: string;
                 readonly file_data: string;
             };
+        } | {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
         })[];
     } | {
         readonly role: "tool";
@@ -1348,13 +1348,6 @@ export declare const route: Route<{
     readonly messages: readonly ({
         readonly role: "system";
         readonly content: string | readonly ({
-            readonly type: "text";
-            readonly text: string;
-            readonly cache_control?: {
-                readonly type: "ephemeral";
-                readonly ttl?: string | undefined;
-            } | undefined;
-        } | {
             readonly type: "image_url";
             readonly image_url: {
                 readonly url: string;
@@ -1365,17 +1358,17 @@ export declare const route: Route<{
                 readonly filename: string;
                 readonly file_data: string;
             };
-        })[];
-    } | {
-        readonly role: "user";
-        readonly content: string | readonly ({
+        } | {
             readonly type: "text";
             readonly text: string;
             readonly cache_control?: {
                 readonly type: "ephemeral";
                 readonly ttl?: string | undefined;
             } | undefined;
-        } | {
+        })[];
+    } | {
+        readonly role: "user";
+        readonly content: string | readonly ({
             readonly type: "image_url";
             readonly image_url: {
                 readonly url: string;
@@ -1386,6 +1379,13 @@ export declare const route: Route<{
                 readonly filename: string;
                 readonly file_data: string;
             };
+        } | {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
         })[];
     } | {
         readonly role: "tool";

package/dist/protocols/openai-chat.js

@@ -419,7 +419,7 @@ const lowerMessages = Effect.fnUntraced(function* (request, options) {
     const mistral = ["mistral", "devstral", "codestral", "pixtral", "mixtral"].some((family) => modelID.includes(family));
     const lowering = {
         ...options,
-        providerMetadataKey: request.model.route.providerMetadataKey ?? String(request.model.provider),
+        providerMetadataKey: request.model.route.providerMetadataKey ?? request.model.provider,
         toolCallID: (id) => {
             if (mistral)
                 return id
@@ -607,7 +607,7 @@ export const fromRequest = Effect.fn("OpenAIChat.fromRequest")(function* (reques
         return yield* ProviderShared.invalidRequest(`OpenAI Chat reasoning field conflicts with reserved field ${reasoningField}`);
     const generation = request.generation;
     const flattened = ProviderShared.flattenToolRequest(request);
-    const provider = String(request.model.provider);
+    const provider = request.model.provider;
     const baseURL = request.model.route.endpoint.baseURL;
     const detectedMaxTokensField = detectMaxTokensField(provider, baseURL);
     const maxTokensField = request.model.compatibility?.maxTokensField ?? detectedMaxTokensField;
@@ -1005,7 +1005,7 @@ export const protocol = Protocol.make({
     stream: {
         event: OpenAIChatStreamEvent,
         initial: (request) => ({
-            providerMetadataKey: request.model.route.providerMetadataKey ?? String(request.model.provider),
+            providerMetadataKey: request.model.route.providerMetadataKey ?? request.model.provider,
             tools: ToolStream.empty(),
             pendingTools: {},
             toolCallEvents: [],

package/dist/protocols/openai-compatible-chat.d.ts

@@ -1,5 +1,4 @@
-import { Route, type RouteRoutedLanguageModelInput } from "../route/client.js";
-export type OpenAICompatibleChatLanguageModelInput = RouteRoutedLanguageModelInput;
+import { Route } from "../route/client.js";
 /**
  * Route for non-OpenAI providers that expose an OpenAI Chat-compatible
  * `/chat/completions` endpoint. Reuses `OpenAIChat.protocol` end-to-end and
@@ -12,13 +11,6 @@ export declare const route: Route<{
     readonly messages: readonly ({
         readonly role: "system";
         readonly content: string | readonly ({
-            readonly type: "text";
-            readonly text: string;
-            readonly cache_control?: {
-                readonly type: "ephemeral";
-                readonly ttl?: string | undefined;
-            } | undefined;
-        } | {
             readonly type: "image_url";
             readonly image_url: {
                 readonly url: string;
@@ -29,17 +21,17 @@ export declare const route: Route<{
                 readonly filename: string;
                 readonly file_data: string;
             };
-        })[];
-    } | {
-        readonly role: "user";
-        readonly content: string | readonly ({
+        } | {
             readonly type: "text";
             readonly text: string;
             readonly cache_control?: {
                 readonly type: "ephemeral";
                 readonly ttl?: string | undefined;
             } | undefined;
-        } | {
+        })[];
+    } | {
+        readonly role: "user";
+        readonly content: string | readonly ({
             readonly type: "image_url";
             readonly image_url: {
                 readonly url: string;
@@ -50,6 +42,13 @@ export declare const route: Route<{
                 readonly filename: string;
                 readonly file_data: string;
             };
+        } | {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
         })[];
     } | {
         readonly role: "tool";

package/dist/protocols/openai-compatible-responses.d.ts

@@ -1,5 +1,4 @@
-import { Route, type RouteRoutedLanguageModelInput } from "../route/client.js";
-export type OpenAICompatibleResponsesLanguageModelInput = RouteRoutedLanguageModelInput;
+import { Route } from "../route/client.js";
 /**
  * Deployment adapter for providers that expose an Open Responses-compatible
  * `/responses` endpoint. Provider helpers configure identity, endpoint, and
@@ -8,10 +7,6 @@ export type OpenAICompatibleResponsesLanguageModelInput = RouteRoutedLanguageMod
 export declare const route: Route<{
     readonly model: string;
     readonly input: readonly ({
-        readonly type: "compaction";
-        readonly id?: string | null | undefined;
-        readonly encrypted_content: string;
-    } | {
         readonly type: "configuration_update";
         readonly reasoning: {
             readonly effort: import("../index.js").ReasoningEffort;
@@ -24,10 +19,45 @@ export declare const route: Route<{
         readonly type: "message";
         readonly role: "developer";
         readonly content: string;
+    } | {
+        readonly type: "function_call_output";
+        readonly call_id: string;
+        readonly output: string | readonly ({
+            readonly type: "input_text";
+            readonly text: string;
+        } | {
+            readonly type: "input_video";
+            readonly video_url: string;
+        } | {
+            readonly type: "input_image";
+            readonly image_url: string;
+            readonly detail?: string | undefined;
+        } | {
+            readonly type: "input_file";
+            readonly filename: string;
+            readonly detail?: string | undefined;
+            readonly file_data?: string | undefined;
+            readonly file_url?: string | undefined;
+        })[];
+    } | {
+        readonly type: "reasoning";
+        readonly id?: string | undefined;
+        readonly summary: readonly {
+            readonly type: "summary_text";
+            readonly text: string;
+        }[];
+        readonly encrypted_content?: string | null | undefined;
+    } | {
+        readonly type: "compaction";
+        readonly id?: string | null | undefined;
+        readonly encrypted_content: string;
     } | {
         readonly type: "message";
         readonly role: "user";
         readonly content: readonly ({
+            readonly type: "input_text";
+            readonly text: string;
+        } | {
             readonly type: "input_image";
             readonly image_url: string;
             readonly detail?: string | undefined;
@@ -37,9 +67,6 @@ export declare const route: Route<{
             readonly detail?: string | undefined;
             readonly file_data?: string | undefined;
             readonly file_url?: string | undefined;
-        } | {
-            readonly type: "input_text";
-            readonly text: string;
         })[];
         readonly id?: string | undefined;
         readonly status?: string | undefined;
@@ -53,14 +80,6 @@ export declare const route: Route<{
         }[];
         readonly phase?: "commentary" | "final_answer" | null | undefined;
         readonly status?: string | undefined;
-    } | {
-        readonly type: "reasoning";
-        readonly id?: string | undefined;
-        readonly summary: readonly {
-            readonly type: "summary_text";
-            readonly text: string;
-        }[];
-        readonly encrypted_content?: string | null | undefined;
     } | {
         readonly type: "function_call";
         readonly id?: string | undefined;
@@ -68,26 +87,6 @@ export declare const route: Route<{
         readonly name: string;
         readonly namespace?: string | undefined;
         readonly arguments: string;
-    } | {
-        readonly type: "function_call_output";
-        readonly call_id: string;
-        readonly output: string | readonly ({
-            readonly type: "input_image";
-            readonly image_url: string;
-            readonly detail?: string | undefined;
-        } | {
-            readonly type: "input_file";
-            readonly filename: string;
-            readonly detail?: string | undefined;
-            readonly file_data?: string | undefined;
-            readonly file_url?: string | undefined;
-        } | {
-            readonly type: "input_text";
-            readonly text: string;
-        } | {
-            readonly type: "input_video";
-            readonly video_url: string;
-        })[];
     } | {
         readonly [x: string]: unknown;
         readonly type: "web_search_call";

package/dist/protocols/openai-images.d.ts

@@ -30,14 +30,6 @@ interface State {
     readonly usage?: MediaUsage;
 }
 export declare const protocol: MediaProtocol.Streamed<Request, {
-    readonly type: "generation-queued";
-    readonly id: string;
-    readonly position?: number | undefined;
-} | {
-    readonly type: "generation-progress";
-    readonly id: string;
-    readonly progress?: number | undefined;
-} | {
     readonly type: "image-partial";
     readonly index: number;
     readonly image: Media.Asset;
@@ -45,17 +37,17 @@ export declare const protocol: MediaProtocol.Streamed<Request, {
     readonly type: "image";
     readonly index: number;
     readonly image: Media.Asset;
+} | {
+    readonly type: "generation-queued";
+    readonly id: string;
+    readonly position?: number | undefined;
+} | {
+    readonly type: "generation-progress";
+    readonly id: string;
+    readonly progress?: number | undefined;
 } | {
     readonly type: "finish";
     readonly usage?: {
-        readonly type: "tokens";
-        readonly input?: number | undefined;
-        readonly output?: number | undefined;
-        readonly total?: number | undefined;
-        readonly details?: {
-            readonly [x: string]: unknown;
-        } | undefined;
-    } | {
         readonly type: "seconds";
         readonly seconds: number;
     } | {
@@ -67,6 +59,14 @@ export declare const protocol: MediaProtocol.Streamed<Request, {
     } | {
         readonly type: "compute";
         readonly seconds: number;
+    } | {
+        readonly type: "tokens";
+        readonly input?: number | undefined;
+        readonly output?: number | undefined;
+        readonly total?: number | undefined;
+        readonly details?: {
+            readonly [x: string]: unknown;
+        } | undefined;
     } | undefined;
     readonly notices?: readonly {
         readonly type: "filtered" | "moderated" | "other";
@@ -86,14 +86,6 @@ export declare const protocol: MediaProtocol.Streamed<Request, {
 export declare const model: (input: MediaRoute.ModelInput) => ImageModel<OpenAIImageOptions>;
 export declare const OpenAIImages: {
     readonly protocol: MediaProtocol.Streamed<Request, {
-        readonly type: "generation-queued";
-        readonly id: string;
-        readonly position?: number | undefined;
-    } | {
-        readonly type: "generation-progress";
-        readonly id: string;
-        readonly progress?: number | undefined;
-    } | {
         readonly type: "image-partial";
         readonly index: number;
         readonly image: Media.Asset;
@@ -101,17 +93,17 @@ export declare const OpenAIImages: {
         readonly type: "image";
         readonly index: number;
         readonly image: Media.Asset;
+    } | {
+        readonly type: "generation-queued";
+        readonly id: string;
+        readonly position?: number | undefined;
+    } | {
+        readonly type: "generation-progress";
+        readonly id: string;
+        readonly progress?: number | undefined;
     } | {
         readonly type: "finish";
         readonly usage?: {
-            readonly type: "tokens";
-            readonly input?: number | undefined;
-            readonly output?: number | undefined;
-            readonly total?: number | undefined;
-            readonly details?: {
-                readonly [x: string]: unknown;
-            } | undefined;
-        } | {
             readonly type: "seconds";
             readonly seconds: number;
         } | {
@@ -123,6 +115,14 @@ export declare const OpenAIImages: {
         } | {
             readonly type: "compute";
             readonly seconds: number;
+        } | {
+            readonly type: "tokens";
+            readonly input?: number | undefined;
+            readonly output?: number | undefined;
+            readonly total?: number | undefined;
+            readonly details?: {
+                readonly [x: string]: unknown;
+            } | undefined;
         } | undefined;
         readonly notices?: readonly {
             readonly type: "filtered" | "moderated" | "other";