From 733bb0613448c2bba1f24cc4871676b1402f76ca Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Wed, 24 Jun 2026 23:05:02 +0530 Subject: [PATCH 01/18] feat(llm): add native provider packages --- packages/llm/package.json | 13 ++++-- packages/llm/src/index.ts | 5 +++ packages/llm/src/provider-package.ts | 16 +++++++ .../src/provider-packages/amazon-bedrock.ts | 28 ++++++++++++ .../provider-packages/anthropic-messages.ts | 15 +++++++ .../llm/src/provider-packages/openai-chat.ts | 20 +++++++++ .../openai-compatible-chat.ts | 17 +++++++ .../src/provider-packages/openai-responses.ts | 25 +++++++++++ packages/llm/src/provider-packages/shared.ts | 8 ++++ packages/llm/test/provider-package.test.ts | 45 +++++++++++++++++++ 10 files changed, 188 insertions(+), 4 deletions(-) create mode 100644 packages/llm/src/provider-package.ts create mode 100644 packages/llm/src/provider-packages/amazon-bedrock.ts create mode 100644 packages/llm/src/provider-packages/anthropic-messages.ts create mode 100644 packages/llm/src/provider-packages/openai-chat.ts create mode 100644 packages/llm/src/provider-packages/openai-compatible-chat.ts create mode 100644 packages/llm/src/provider-packages/openai-responses.ts create mode 100644 packages/llm/src/provider-packages/shared.ts create mode 100644 packages/llm/test/provider-package.test.ts diff --git a/packages/llm/package.json b/packages/llm/package.json index faccd3dd47..4c9d62fdcd 100644 --- a/packages/llm/package.json +++ b/packages/llm/package.json @@ -15,14 +15,19 @@ "./route": "./src/route/index.ts", "./provider": "./src/provider.ts", "./providers": "./src/providers/index.ts", - "./providers/amazon-bedrock": "./src/providers/amazon-bedrock.ts", - "./providers/anthropic": "./src/providers/anthropic.ts", + "./provider-package": "./src/provider-package.ts", + "./providers/amazon-bedrock": "./src/provider-packages/amazon-bedrock.ts", + "./providers/anthropic": "./src/provider-packages/anthropic-messages.ts", + "./providers/anthropic/messages": "./src/provider-packages/anthropic-messages.ts", "./providers/azure": "./src/providers/azure.ts", "./providers/cloudflare": "./src/providers/cloudflare.ts", "./providers/github-copilot": "./src/providers/github-copilot.ts", "./providers/google": "./src/providers/google.ts", - "./providers/openai": "./src/providers/openai.ts", - "./providers/openai-compatible": "./src/providers/openai-compatible.ts", + "./providers/openai": "./src/provider-packages/openai-responses.ts", + "./providers/openai/responses": "./src/provider-packages/openai-responses.ts", + "./providers/openai/chat": "./src/provider-packages/openai-chat.ts", + "./providers/openai-compatible": "./src/provider-packages/openai-compatible-chat.ts", + "./providers/openai-compatible/chat": "./src/provider-packages/openai-compatible-chat.ts", "./providers/openai-compatible-profile": "./src/providers/openai-compatible-profile.ts", "./providers/openrouter": "./src/providers/openrouter.ts", "./providers/xai": "./src/providers/xai.ts", diff --git a/packages/llm/src/index.ts b/packages/llm/src/index.ts index 735520ff77..843b4536a6 100644 --- a/packages/llm/src/index.ts +++ b/packages/llm/src/index.ts @@ -1,6 +1,7 @@ export { LLMClient } from "./route/client" export { Auth } from "./route/auth" export { Provider } from "./provider" +export { ProviderPackage } from "./provider-package" export { isContextOverflow, isContextOverflowFailure } from "./provider-error" export type { RouteModelInput, @@ -31,3 +32,7 @@ export type { ModelFactory as ProviderModelFactory, ModelOptions as ProviderModelOptions, } from "./provider" +export type { + Definition as ProviderPackageDefinition, + Settings as ProviderPackageSettings, +} from "./provider-package" diff --git a/packages/llm/src/provider-package.ts b/packages/llm/src/provider-package.ts new file mode 100644 index 0000000000..977a211864 --- /dev/null +++ b/packages/llm/src/provider-package.ts @@ -0,0 +1,16 @@ +import type { Model } from "./schema" + +export interface Settings extends Readonly> { + readonly headers?: Readonly> + readonly body?: Readonly> + readonly limits?: { + readonly context: number + readonly output: number + } +} + +export interface Definition { + readonly model: (id: string, settings: ProviderSettings) => Model +} + +export * as ProviderPackage from "./provider-package" diff --git a/packages/llm/src/provider-packages/amazon-bedrock.ts b/packages/llm/src/provider-packages/amazon-bedrock.ts new file mode 100644 index 0000000000..f00b2056ae --- /dev/null +++ b/packages/llm/src/provider-packages/amazon-bedrock.ts @@ -0,0 +1,28 @@ +import type { ProviderPackage } from "../provider-package" +import * as AmazonBedrock from "../providers/amazon-bedrock" +import type { BedrockCredentials } from "../protocols/bedrock-converse" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly auth?: "bearer" | "sigv4" + readonly baseURL?: string + readonly credentials?: BedrockCredentials + readonly region?: string + readonly topP?: number +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => { + if (settings.auth === "bearer" && settings.apiKey === undefined) + throw new Error("Amazon Bedrock bearer auth requires apiKey") + if (settings.auth === "sigv4" && settings.apiKey !== undefined) + throw new Error("Amazon Bedrock SigV4 auth does not accept apiKey") + return AmazonBedrock.configure({ + ...defaults(settings), + apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey, + baseURL: settings.baseURL, + credentials: settings.credentials, + generation: settings.topP === undefined ? undefined : { topP: settings.topP }, + region: settings.region, + }).model(id) +} diff --git a/packages/llm/src/provider-packages/anthropic-messages.ts b/packages/llm/src/provider-packages/anthropic-messages.ts new file mode 100644 index 0000000000..be6def4081 --- /dev/null +++ b/packages/llm/src/provider-packages/anthropic-messages.ts @@ -0,0 +1,15 @@ +import type { ProviderPackage } from "../provider-package" +import * as Anthropic from "../providers/anthropic" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => + Anthropic.configure({ + ...defaults(settings), + apiKey: settings.apiKey, + baseURL: settings.baseURL, + }).model(id) diff --git a/packages/llm/src/provider-packages/openai-chat.ts b/packages/llm/src/provider-packages/openai-chat.ts new file mode 100644 index 0000000000..6a6d04c704 --- /dev/null +++ b/packages/llm/src/provider-packages/openai-chat.ts @@ -0,0 +1,20 @@ +import type { ProviderPackage } from "../provider-package" +import * as OpenAI from "../providers/openai" +import type { OpenAIProviderOptionsInput } from "../providers/openai-options" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string + readonly queryParams?: Readonly> + readonly providerOptions?: OpenAIProviderOptionsInput +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => + OpenAI.configure({ + ...defaults(settings), + apiKey: settings.apiKey, + baseURL: settings.baseURL, + queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, + providerOptions: settings.providerOptions, + }).chat(id) diff --git a/packages/llm/src/provider-packages/openai-compatible-chat.ts b/packages/llm/src/provider-packages/openai-compatible-chat.ts new file mode 100644 index 0000000000..ba7d569b9c --- /dev/null +++ b/packages/llm/src/provider-packages/openai-compatible-chat.ts @@ -0,0 +1,17 @@ +import type { ProviderPackage } from "../provider-package" +import * as OpenAICompatible from "../providers/openai-compatible" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL: string + readonly provider?: string +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => + OpenAICompatible.configure({ + ...defaults(settings), + apiKey: settings.apiKey, + baseURL: settings.baseURL, + provider: settings.provider, + }).model(id) diff --git a/packages/llm/src/provider-packages/openai-responses.ts b/packages/llm/src/provider-packages/openai-responses.ts new file mode 100644 index 0000000000..4851a96a34 --- /dev/null +++ b/packages/llm/src/provider-packages/openai-responses.ts @@ -0,0 +1,25 @@ +import type { ProviderPackage } from "../provider-package" +import * as OpenAI from "../providers/openai" +import type { OpenAIProviderOptionsInput } from "../providers/openai-options" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string + readonly queryParams?: Readonly> + readonly transport?: "http" | "websocket" + readonly providerOptions?: OpenAIProviderOptionsInput +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => { + const provider = OpenAI.configure({ + ...defaults(settings), + apiKey: settings.apiKey, + baseURL: settings.baseURL, + queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, + providerOptions: settings.providerOptions, + }) + if (settings.transport === undefined || settings.transport === "http") return provider.responses(id) + if (settings.transport === "websocket") return provider.responsesWebSocket(id) + throw new Error(`Unsupported OpenAI Responses transport: ${String(settings.transport)}`) +} diff --git a/packages/llm/src/provider-packages/shared.ts b/packages/llm/src/provider-packages/shared.ts new file mode 100644 index 0000000000..e3c7ec2444 --- /dev/null +++ b/packages/llm/src/provider-packages/shared.ts @@ -0,0 +1,8 @@ +import type { RouteDefaultsInput } from "../route/client" +import type { ProviderPackage } from "../provider-package" + +export const defaults = (settings: ProviderPackage.Settings): RouteDefaultsInput => ({ + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + limits: settings.limits, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, +}) diff --git a/packages/llm/test/provider-package.test.ts b/packages/llm/test/provider-package.test.ts new file mode 100644 index 0000000000..a4f1627c67 --- /dev/null +++ b/packages/llm/test/provider-package.test.ts @@ -0,0 +1,45 @@ +import { describe, expect, test } from "bun:test" +import { model } from "@opencode-ai/llm/providers/openai" + +describe("provider package entrypoints", () => { + test("semantic API aliases expose the same contract", async () => { + const modules = await Promise.all([ + import("@opencode-ai/llm/providers/openai"), + import("@opencode-ai/llm/providers/openai/responses"), + import("@opencode-ai/llm/providers/openai/chat"), + import("@opencode-ai/llm/providers/anthropic"), + import("@opencode-ai/llm/providers/anthropic/messages"), + import("@opencode-ai/llm/providers/openai-compatible"), + import("@opencode-ai/llm/providers/openai-compatible/chat"), + import("@opencode-ai/llm/providers/amazon-bedrock"), + ]) + + for (const module of modules) expect(module.model).toBeFunction() + expect(modules[0].model).toBe(modules[1].model) + expect(modules[3].model).toBe(modules[4].model) + expect(modules[5].model).toBe(modules[6].model) + }) + + test("maps package settings onto the executable model", () => { + const selected = model("gpt-5", { + apiKey: "fixture", + baseURL: "https://api.openai.test/v1", + headers: { "x-application": "opencode" }, + body: { service_tier: "priority" }, + limits: { context: 200_000, output: 64_000 }, + unrelatedInheritedSetting: true, + }) + + expect(selected.route.id).toBe("openai-responses") + expect(selected.route.defaults.headers).toEqual({ "x-application": "opencode" }) + expect(selected.route.defaults.http?.body).toEqual({ service_tier: "priority" }) + expect(selected.route.defaults.limits).toEqual({ context: 200_000, output: 64_000 }) + }) + + test("selects transport without changing the semantic API", () => { + expect(model("gpt-5", { apiKey: "fixture" }).route.id).toBe("openai-responses") + expect(model("gpt-5", { apiKey: "fixture", transport: "websocket" }).route.id).toBe( + "openai-responses-websocket", + ) + }) +}) From 547496656c3c771289d8fca7d20a08eda98b9631 Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Wed, 24 Jun 2026 23:10:45 +0530 Subject: [PATCH 02/18] refactor(llm): colocate provider package logic --- packages/llm/package.json | 14 ++++----- .../src/provider-packages/amazon-bedrock.ts | 28 ------------------ .../provider-packages/anthropic-messages.ts | 15 ---------- .../llm/src/provider-packages/openai-chat.ts | 20 ------------- .../openai-compatible-chat.ts | 17 ----------- .../src/provider-packages/openai-responses.ts | 25 ---------------- packages/llm/src/provider-packages/shared.ts | 8 ----- packages/llm/src/providers/amazon-bedrock.ts | 27 ++++++++++++++++- packages/llm/src/providers/anthropic.ts | 15 +++++++++- .../llm/src/providers/openai-compatible.ts | 17 +++++++++++ packages/llm/src/providers/openai.ts | 29 ++++++++++++++++++- packages/llm/src/providers/openai/chat.ts | 2 ++ .../llm/src/providers/openai/responses.ts | 2 ++ packages/llm/test/exports.test.ts | 1 - packages/llm/test/provider-package.test.ts | 4 --- 15 files changed, 95 insertions(+), 129 deletions(-) delete mode 100644 packages/llm/src/provider-packages/amazon-bedrock.ts delete mode 100644 packages/llm/src/provider-packages/anthropic-messages.ts delete mode 100644 packages/llm/src/provider-packages/openai-chat.ts delete mode 100644 packages/llm/src/provider-packages/openai-compatible-chat.ts delete mode 100644 packages/llm/src/provider-packages/openai-responses.ts delete mode 100644 packages/llm/src/provider-packages/shared.ts create mode 100644 packages/llm/src/providers/openai/chat.ts create mode 100644 packages/llm/src/providers/openai/responses.ts diff --git a/packages/llm/package.json b/packages/llm/package.json index 4c9d62fdcd..2a5d97d5bf 100644 --- a/packages/llm/package.json +++ b/packages/llm/package.json @@ -16,18 +16,16 @@ "./provider": "./src/provider.ts", "./providers": "./src/providers/index.ts", "./provider-package": "./src/provider-package.ts", - "./providers/amazon-bedrock": "./src/provider-packages/amazon-bedrock.ts", - "./providers/anthropic": "./src/provider-packages/anthropic-messages.ts", - "./providers/anthropic/messages": "./src/provider-packages/anthropic-messages.ts", + "./providers/amazon-bedrock": "./src/providers/amazon-bedrock.ts", + "./providers/anthropic": "./src/providers/anthropic.ts", "./providers/azure": "./src/providers/azure.ts", "./providers/cloudflare": "./src/providers/cloudflare.ts", "./providers/github-copilot": "./src/providers/github-copilot.ts", "./providers/google": "./src/providers/google.ts", - "./providers/openai": "./src/provider-packages/openai-responses.ts", - "./providers/openai/responses": "./src/provider-packages/openai-responses.ts", - "./providers/openai/chat": "./src/provider-packages/openai-chat.ts", - "./providers/openai-compatible": "./src/provider-packages/openai-compatible-chat.ts", - "./providers/openai-compatible/chat": "./src/provider-packages/openai-compatible-chat.ts", + "./providers/openai": "./src/providers/openai.ts", + "./providers/openai/responses": "./src/providers/openai/responses.ts", + "./providers/openai/chat": "./src/providers/openai/chat.ts", + "./providers/openai-compatible": "./src/providers/openai-compatible.ts", "./providers/openai-compatible-profile": "./src/providers/openai-compatible-profile.ts", "./providers/openrouter": "./src/providers/openrouter.ts", "./providers/xai": "./src/providers/xai.ts", diff --git a/packages/llm/src/provider-packages/amazon-bedrock.ts b/packages/llm/src/provider-packages/amazon-bedrock.ts deleted file mode 100644 index f00b2056ae..0000000000 --- a/packages/llm/src/provider-packages/amazon-bedrock.ts +++ /dev/null @@ -1,28 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as AmazonBedrock from "../providers/amazon-bedrock" -import type { BedrockCredentials } from "../protocols/bedrock-converse" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly auth?: "bearer" | "sigv4" - readonly baseURL?: string - readonly credentials?: BedrockCredentials - readonly region?: string - readonly topP?: number -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => { - if (settings.auth === "bearer" && settings.apiKey === undefined) - throw new Error("Amazon Bedrock bearer auth requires apiKey") - if (settings.auth === "sigv4" && settings.apiKey !== undefined) - throw new Error("Amazon Bedrock SigV4 auth does not accept apiKey") - return AmazonBedrock.configure({ - ...defaults(settings), - apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey, - baseURL: settings.baseURL, - credentials: settings.credentials, - generation: settings.topP === undefined ? undefined : { topP: settings.topP }, - region: settings.region, - }).model(id) -} diff --git a/packages/llm/src/provider-packages/anthropic-messages.ts b/packages/llm/src/provider-packages/anthropic-messages.ts deleted file mode 100644 index be6def4081..0000000000 --- a/packages/llm/src/provider-packages/anthropic-messages.ts +++ /dev/null @@ -1,15 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as Anthropic from "../providers/anthropic" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly baseURL?: string -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => - Anthropic.configure({ - ...defaults(settings), - apiKey: settings.apiKey, - baseURL: settings.baseURL, - }).model(id) diff --git a/packages/llm/src/provider-packages/openai-chat.ts b/packages/llm/src/provider-packages/openai-chat.ts deleted file mode 100644 index 6a6d04c704..0000000000 --- a/packages/llm/src/provider-packages/openai-chat.ts +++ /dev/null @@ -1,20 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as OpenAI from "../providers/openai" -import type { OpenAIProviderOptionsInput } from "../providers/openai-options" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly baseURL?: string - readonly queryParams?: Readonly> - readonly providerOptions?: OpenAIProviderOptionsInput -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => - OpenAI.configure({ - ...defaults(settings), - apiKey: settings.apiKey, - baseURL: settings.baseURL, - queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, - providerOptions: settings.providerOptions, - }).chat(id) diff --git a/packages/llm/src/provider-packages/openai-compatible-chat.ts b/packages/llm/src/provider-packages/openai-compatible-chat.ts deleted file mode 100644 index ba7d569b9c..0000000000 --- a/packages/llm/src/provider-packages/openai-compatible-chat.ts +++ /dev/null @@ -1,17 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as OpenAICompatible from "../providers/openai-compatible" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly baseURL: string - readonly provider?: string -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => - OpenAICompatible.configure({ - ...defaults(settings), - apiKey: settings.apiKey, - baseURL: settings.baseURL, - provider: settings.provider, - }).model(id) diff --git a/packages/llm/src/provider-packages/openai-responses.ts b/packages/llm/src/provider-packages/openai-responses.ts deleted file mode 100644 index 4851a96a34..0000000000 --- a/packages/llm/src/provider-packages/openai-responses.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as OpenAI from "../providers/openai" -import type { OpenAIProviderOptionsInput } from "../providers/openai-options" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly baseURL?: string - readonly queryParams?: Readonly> - readonly transport?: "http" | "websocket" - readonly providerOptions?: OpenAIProviderOptionsInput -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => { - const provider = OpenAI.configure({ - ...defaults(settings), - apiKey: settings.apiKey, - baseURL: settings.baseURL, - queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, - providerOptions: settings.providerOptions, - }) - if (settings.transport === undefined || settings.transport === "http") return provider.responses(id) - if (settings.transport === "websocket") return provider.responsesWebSocket(id) - throw new Error(`Unsupported OpenAI Responses transport: ${String(settings.transport)}`) -} diff --git a/packages/llm/src/provider-packages/shared.ts b/packages/llm/src/provider-packages/shared.ts deleted file mode 100644 index e3c7ec2444..0000000000 --- a/packages/llm/src/provider-packages/shared.ts +++ /dev/null @@ -1,8 +0,0 @@ -import type { RouteDefaultsInput } from "../route/client" -import type { ProviderPackage } from "../provider-package" - -export const defaults = (settings: ProviderPackage.Settings): RouteDefaultsInput => ({ - headers: settings.headers === undefined ? undefined : { ...settings.headers }, - limits: settings.limits, - http: settings.body === undefined ? undefined : { body: { ...settings.body } }, -}) diff --git a/packages/llm/src/providers/amazon-bedrock.ts b/packages/llm/src/providers/amazon-bedrock.ts index 2f1791e0d6..e578d614c6 100644 --- a/packages/llm/src/providers/amazon-bedrock.ts +++ b/packages/llm/src/providers/amazon-bedrock.ts @@ -1,5 +1,6 @@ import type { RouteDefaultsInput } from "../route/client" import { Auth } from "../route/auth" +import type { ProviderPackage } from "../provider-package" import { ProviderID, type ModelID } from "../schema" import * as BedrockConverse from "../protocols/bedrock-converse" import type { BedrockCredentials } from "../protocols/bedrock-converse" @@ -15,6 +16,15 @@ export type Config = RouteDefaultsInput & { /** Override the computed `https://bedrock-runtime..amazonaws.com` URL. */ readonly baseURL?: string } + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly auth?: "bearer" | "sigv4" + readonly baseURL?: string + readonly credentials?: BedrockCredentials + readonly region?: string + readonly topP?: number +} export const routes = [BedrockConverse.route] const bedrockBaseURL = (region: string) => `https://bedrock-runtime.${region}.amazonaws.com` @@ -40,4 +50,19 @@ export const configure = (input: Config = {}) => { } export const provider = configure() -export const model = provider.model +export const model: ProviderPackage.Definition["model"] = (id, settings) => { + if (settings.auth === "bearer" && settings.apiKey === undefined) + throw new Error("Amazon Bedrock bearer auth requires apiKey") + if (settings.auth === "sigv4" && settings.apiKey !== undefined) + throw new Error("Amazon Bedrock SigV4 auth does not accept apiKey") + return configure({ + apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey, + baseURL: settings.baseURL, + credentials: settings.credentials, + generation: settings.topP === undefined ? undefined : { topP: settings.topP }, + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, + limits: settings.limits, + region: settings.region, + }).model(id) +} diff --git a/packages/llm/src/providers/anthropic.ts b/packages/llm/src/providers/anthropic.ts index 0c9640af5e..8ef0293eeb 100644 --- a/packages/llm/src/providers/anthropic.ts +++ b/packages/llm/src/providers/anthropic.ts @@ -1,6 +1,7 @@ import type { RouteDefaultsInput } from "../route/client" import { Auth } from "../route/auth" import type { ProviderAuthOption } from "../route/auth-options" +import type { ProviderPackage } from "../provider-package" import { ProviderID, type ModelID } from "../schema" import * as AnthropicMessages from "../protocols/anthropic-messages" @@ -10,6 +11,11 @@ export const routes = [AnthropicMessages.route] export type Config = RouteDefaultsInput & ProviderAuthOption<"optional"> & { readonly baseURL?: string } +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string +} + const auth = (options: ProviderAuthOption<"optional">) => { if ("auth" in options && options.auth) return options.auth return Auth.optional("apiKey" in options ? options.apiKey : undefined, "apiKey") @@ -32,4 +38,11 @@ export const configure = (input: Config = {}) => { } export const provider = configure() -export const model = provider.model +export const model: ProviderPackage.Definition["model"] = (id, settings) => + configure({ + apiKey: settings.apiKey, + baseURL: settings.baseURL, + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, + limits: settings.limits, + }).model(id) diff --git a/packages/llm/src/providers/openai-compatible.ts b/packages/llm/src/providers/openai-compatible.ts index a79f65f6df..36d9b3fd5a 100644 --- a/packages/llm/src/providers/openai-compatible.ts +++ b/packages/llm/src/providers/openai-compatible.ts @@ -2,6 +2,7 @@ import { ProviderID, type ModelID } from "../schema" import * as OpenAICompatibleChat from "../protocols/openai-compatible-chat" import type { RouteDefaultsInput } from "../route/client" import { AuthOptions, type ProviderAuthOption } from "../route/auth-options" +import type { ProviderPackage } from "../provider-package" import { profiles, type OpenAICompatibleProfile } from "./openai-compatible-profile" export const id = ProviderID.make("openai-compatible") @@ -12,6 +13,12 @@ type GenericModelOptions = RouteDefaultsInput & readonly baseURL: string } +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL: string + readonly provider?: string +} + export type FamilyModelOptions = RouteDefaultsInput & ProviderAuthOption<"optional"> & { readonly baseURL?: string @@ -56,6 +63,16 @@ export const provider = { configure, } +export const model: ProviderPackage.Definition["model"] = (id, settings) => + configure({ + apiKey: settings.apiKey, + baseURL: settings.baseURL, + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, + limits: settings.limits, + provider: settings.provider, + }).model(id) + export const baseten = define(profiles.baseten) export const cerebras = define(profiles.cerebras) export const deepinfra = define(profiles.deepinfra) diff --git a/packages/llm/src/providers/openai.ts b/packages/llm/src/providers/openai.ts index 098cad8493..b40a94514b 100644 --- a/packages/llm/src/providers/openai.ts +++ b/packages/llm/src/providers/openai.ts @@ -1,5 +1,6 @@ import { AuthOptions, type ProviderAuthOption } from "../route/auth-options" import type { Route, RouteDefaultsInput } from "../route/client" +import type { ProviderPackage } from "../provider-package" import { ProviderID, type ModelID } from "../schema" import * as OpenAIChat from "../protocols/openai-chat" import * as OpenAIResponses from "../protocols/openai-responses" @@ -21,6 +22,14 @@ export type Config = RouteDefaultsInput & readonly providerOptions?: OpenAIProviderOptionsInput } +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string + readonly queryParams?: Readonly> + readonly transport?: "http" | "websocket" + readonly providerOptions?: OpenAIProviderOptionsInput +} + const auth = (options: ProviderAuthOption<"optional">) => AuthOptions.bearer(options, "OPENAI_API_KEY") const defaults = (input: Config) => { @@ -57,7 +66,25 @@ export const configure = (input: Config = {}) => { export const provider = configure() -export const model = provider.model +const config = (settings: Settings): Config => ({ + apiKey: settings.apiKey, + baseURL: settings.baseURL, + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, + limits: settings.limits, + providerOptions: settings.providerOptions, + queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, +}) + +export const model: ProviderPackage.Definition["model"] = (id, settings) => { + const configured = configure(config(settings)) + if (settings.transport === undefined || settings.transport === "http") return configured.responses(id) + if (settings.transport === "websocket") return configured.responsesWebSocket(id) + throw new Error(`Unsupported OpenAI Responses transport: ${String(settings.transport)}`) +} + +export const chatModel: ProviderPackage.Definition["model"] = (id, settings) => + configure(config(settings)).chat(id) export const responses = provider.responses export const responsesWebSocket = provider.responsesWebSocket export const chat = provider.chat diff --git a/packages/llm/src/providers/openai/chat.ts b/packages/llm/src/providers/openai/chat.ts new file mode 100644 index 0000000000..eb92db8ac5 --- /dev/null +++ b/packages/llm/src/providers/openai/chat.ts @@ -0,0 +1,2 @@ +export { chatModel as model } from "../openai" +export type { Settings } from "../openai" diff --git a/packages/llm/src/providers/openai/responses.ts b/packages/llm/src/providers/openai/responses.ts new file mode 100644 index 0000000000..4db3a232c7 --- /dev/null +++ b/packages/llm/src/providers/openai/responses.ts @@ -0,0 +1,2 @@ +export { model } from "../openai" +export type { Settings } from "../openai" diff --git a/packages/llm/test/exports.test.ts b/packages/llm/test/exports.test.ts index 693a21638b..6ed66a0d8e 100644 --- a/packages/llm/test/exports.test.ts +++ b/packages/llm/test/exports.test.ts @@ -30,7 +30,6 @@ describe("public exports", () => { test("provider barrels expose user-facing facades", () => { expect(OpenAI.model).toBeFunction() - expect(OpenAI.provider.model).toBe(OpenAI.model) expect(OpenAI.provider.responses).toBe(OpenAI.responses) expect(OpenAI.provider.responsesWebSocket).toBe(OpenAI.responsesWebSocket) expect(OpenAI.configure({ apiKey: "fixture" }).responses).toBeFunction() diff --git a/packages/llm/test/provider-package.test.ts b/packages/llm/test/provider-package.test.ts index a4f1627c67..c8cba78eb1 100644 --- a/packages/llm/test/provider-package.test.ts +++ b/packages/llm/test/provider-package.test.ts @@ -8,16 +8,12 @@ describe("provider package entrypoints", () => { import("@opencode-ai/llm/providers/openai/responses"), import("@opencode-ai/llm/providers/openai/chat"), import("@opencode-ai/llm/providers/anthropic"), - import("@opencode-ai/llm/providers/anthropic/messages"), import("@opencode-ai/llm/providers/openai-compatible"), - import("@opencode-ai/llm/providers/openai-compatible/chat"), import("@opencode-ai/llm/providers/amazon-bedrock"), ]) for (const module of modules) expect(module.model).toBeFunction() expect(modules[0].model).toBe(modules[1].model) - expect(modules[3].model).toBe(modules[4].model) - expect(modules[5].model).toBe(modules[6].model) }) test("maps package settings onto the executable model", () => { From 9848587052203485c24f4eaed1927053c40feab9 Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Wed, 24 Jun 2026 23:29:06 +0530 Subject: [PATCH 03/18] refactor(llm): name provider model identity --- packages/llm/src/provider-package.ts | 2 +- packages/llm/src/providers/amazon-bedrock.ts | 4 ++-- packages/llm/src/providers/anthropic.ts | 4 ++-- packages/llm/src/providers/openai-compatible.ts | 4 ++-- packages/llm/src/providers/openai.ts | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/llm/src/provider-package.ts b/packages/llm/src/provider-package.ts index 977a211864..fd878a9d06 100644 --- a/packages/llm/src/provider-package.ts +++ b/packages/llm/src/provider-package.ts @@ -10,7 +10,7 @@ export interface Settings extends Readonly> { } export interface Definition { - readonly model: (id: string, settings: ProviderSettings) => Model + readonly model: (modelID: string, settings: ProviderSettings) => Model } export * as ProviderPackage from "./provider-package" diff --git a/packages/llm/src/providers/amazon-bedrock.ts b/packages/llm/src/providers/amazon-bedrock.ts index e578d614c6..4e5040c9ec 100644 --- a/packages/llm/src/providers/amazon-bedrock.ts +++ b/packages/llm/src/providers/amazon-bedrock.ts @@ -50,7 +50,7 @@ export const configure = (input: Config = {}) => { } export const provider = configure() -export const model: ProviderPackage.Definition["model"] = (id, settings) => { +export const model: ProviderPackage.Definition["model"] = (modelID, settings) => { if (settings.auth === "bearer" && settings.apiKey === undefined) throw new Error("Amazon Bedrock bearer auth requires apiKey") if (settings.auth === "sigv4" && settings.apiKey !== undefined) @@ -64,5 +64,5 @@ export const model: ProviderPackage.Definition["model"] = (id, setting http: settings.body === undefined ? undefined : { body: { ...settings.body } }, limits: settings.limits, region: settings.region, - }).model(id) + }).model(modelID) } diff --git a/packages/llm/src/providers/anthropic.ts b/packages/llm/src/providers/anthropic.ts index 8ef0293eeb..1bf8bf569c 100644 --- a/packages/llm/src/providers/anthropic.ts +++ b/packages/llm/src/providers/anthropic.ts @@ -38,11 +38,11 @@ export const configure = (input: Config = {}) => { } export const provider = configure() -export const model: ProviderPackage.Definition["model"] = (id, settings) => +export const model: ProviderPackage.Definition["model"] = (modelID, settings) => configure({ apiKey: settings.apiKey, baseURL: settings.baseURL, headers: settings.headers === undefined ? undefined : { ...settings.headers }, http: settings.body === undefined ? undefined : { body: { ...settings.body } }, limits: settings.limits, - }).model(id) + }).model(modelID) diff --git a/packages/llm/src/providers/openai-compatible.ts b/packages/llm/src/providers/openai-compatible.ts index 36d9b3fd5a..8b5d23eed7 100644 --- a/packages/llm/src/providers/openai-compatible.ts +++ b/packages/llm/src/providers/openai-compatible.ts @@ -63,7 +63,7 @@ export const provider = { configure, } -export const model: ProviderPackage.Definition["model"] = (id, settings) => +export const model: ProviderPackage.Definition["model"] = (modelID, settings) => configure({ apiKey: settings.apiKey, baseURL: settings.baseURL, @@ -71,7 +71,7 @@ export const model: ProviderPackage.Definition["model"] = (id, setting http: settings.body === undefined ? undefined : { body: { ...settings.body } }, limits: settings.limits, provider: settings.provider, - }).model(id) + }).model(modelID) export const baseten = define(profiles.baseten) export const cerebras = define(profiles.cerebras) diff --git a/packages/llm/src/providers/openai.ts b/packages/llm/src/providers/openai.ts index b40a94514b..6b49b9def2 100644 --- a/packages/llm/src/providers/openai.ts +++ b/packages/llm/src/providers/openai.ts @@ -76,15 +76,15 @@ const config = (settings: Settings): Config => ({ queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, }) -export const model: ProviderPackage.Definition["model"] = (id, settings) => { +export const model: ProviderPackage.Definition["model"] = (modelID, settings) => { const configured = configure(config(settings)) - if (settings.transport === undefined || settings.transport === "http") return configured.responses(id) - if (settings.transport === "websocket") return configured.responsesWebSocket(id) + if (settings.transport === undefined || settings.transport === "http") return configured.responses(modelID) + if (settings.transport === "websocket") return configured.responsesWebSocket(modelID) throw new Error(`Unsupported OpenAI Responses transport: ${String(settings.transport)}`) } -export const chatModel: ProviderPackage.Definition["model"] = (id, settings) => - configure(config(settings)).chat(id) +export const chatModel: ProviderPackage.Definition["model"] = (modelID, settings) => + configure(config(settings)).chat(modelID) export const responses = provider.responses export const responsesWebSocket = provider.responsesWebSocket export const chat = provider.chat From 62e44a80e75f4183d51ce79c142de67642a883d9 Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Thu, 25 Jun 2026 00:17:32 +0530 Subject: [PATCH 04/18] feat(core): migrate native provider config --- packages/core/src/catalog.ts | 24 +++- packages/core/src/config/plugin/provider.ts | 95 ++++++++++++-- packages/core/src/config/provider.ts | 37 ++---- packages/core/src/model-request.ts | 33 ++++- packages/core/src/model.ts | 3 + packages/core/src/provider.ts | 5 + packages/core/src/session/runner/model.ts | 6 + packages/core/src/v1/config/migrate.ts | 38 ++---- packages/core/test/catalog.test.ts | 1 + packages/core/test/config/config.test.ts | 31 ++--- packages/core/test/config/provider.test.ts | 120 +++++++++++++++--- .../core/test/session-runner-model.test.ts | 34 +++++ packages/core/test/shared-schema.test.ts | 2 + packages/schema/src/model.ts | 9 ++ packages/schema/src/provider.ts | 14 ++ packages/sdk/js/src/v2/gen/types.gen.ts | 5 + 16 files changed, 358 insertions(+), 99 deletions(-) diff --git a/packages/core/src/catalog.ts b/packages/core/src/catalog.ts index 0b274299e5..9b993391f5 100644 --- a/packages/core/src/catalog.ts +++ b/packages/core/src/catalog.ts @@ -78,12 +78,28 @@ export const layer = Layer.effect( const projectModel = (model: ModelV2.Info, provider: ProviderV2.Info) => { const api = - model.api.type === "native" && !model.api.url && Object.keys(model.api.settings).length === 0 - ? { ...provider.api, id: model.api.id } + model.api.type === "native" && !model.api.package + ? { + ...provider.api, + id: model.api.id, + url: model.api.url ?? provider.api.url, + settings: ModelRequest.mergeRecords(provider.api.settings, model.api.settings), + } + : model.api.type === "native" && provider.api.type === "native" && !model.api.url + ? { + ...model.api, + package: model.api.package ?? provider.api.package, + url: provider.api.url, + settings: ModelRequest.mergeRecords(provider.api.settings, model.api.settings), + } : model.api.type === "aisdk" && provider.api.type === "aisdk" && !model.api.url - ? { ...model.api, url: provider.api.url, settings: { ...provider.api.settings, ...model.api.settings } } + ? { + ...model.api, + url: provider.api.url, + settings: ModelRequest.mergeRecords(provider.api.settings, model.api.settings), + } : model.api.type === "aisdk" && provider.api.type === "aisdk" - ? { ...model.api, settings: { ...provider.api.settings, ...model.api.settings } } + ? { ...model.api, settings: ModelRequest.mergeRecords(provider.api.settings, model.api.settings) } : model.api const request = { ...ModelRequest.merge({ ...provider.request, generation: {}, options: {} }, model.request), diff --git a/packages/core/src/config/plugin/provider.ts b/packages/core/src/config/plugin/provider.ts index 6fb13f1c63..92cb0c1d42 100644 --- a/packages/core/src/config/plugin/provider.ts +++ b/packages/core/src/config/plugin/provider.ts @@ -48,26 +48,95 @@ export const Plugin = define({ const model = ModelV2.parse(configuredDefault) catalog.model.default.set(model.providerID, model.modelID) } + const providerAiSDK = new Map() + const modelAiSDK = new Map() for (const file of files) { for (const [id, item] of Object.entries(file.info.providers ?? {})) { const providerID = id + if (item.aiSDK !== undefined) providerAiSDK.set(providerID, item.aiSDK) catalog.provider.update(providerID, (provider) => { if (item.name !== undefined) provider.name = item.name - if (item.api !== undefined) provider.api = { ...item.api } - if (item.request !== undefined) { - Object.assign(provider.request.headers, item.request.headers) - Object.assign(provider.request.body, item.request.body) + if (item.package !== undefined) { + const settings = ModelRequest.mergeRecords(provider.api.settings, item.settings) + const url = + item.settings && Object.hasOwn(item.settings, "baseURL") + ? typeof settings.baseURL === "string" + ? settings.baseURL + : undefined + : provider.api.url + provider.api = (providerAiSDK.get(providerID) ?? provider.api.type === "aisdk") + ? { type: "aisdk", package: item.package, ...(url === undefined ? {} : { url }), settings } + : { type: "native", package: item.package, ...(url === undefined ? {} : { url }), settings } + } else if (item.settings !== undefined) { + provider.api.settings = ModelRequest.mergeRecords(provider.api.settings, item.settings) + if (Object.hasOwn(item.settings, "baseURL")) { + provider.api.url = + typeof provider.api.settings.baseURL === "string" ? provider.api.settings.baseURL : undefined + } } + if (item.package === undefined && item.aiSDK !== undefined) { + if (item.aiSDK && provider.api.type === "native" && provider.api.package !== undefined) { + provider.api = { ...provider.api, type: "aisdk", package: provider.api.package } + } + if (!item.aiSDK && provider.api.type === "aisdk") { + provider.api = { ...provider.api, type: "native", settings: provider.api.settings ?? {} } + } + } + ModelRequest.assign(provider.request, { headers: item.headers, body: item.body }) }) const providerApi = catalog.provider.get(providerID)?.provider.api const providerPackage = providerApi?.type === "aisdk" ? providerApi.package : undefined for (const [id, config] of Object.entries(item.models ?? {})) { + const modelKey = `${providerID}/${id}` + if (config.aiSDK !== undefined) modelAiSDK.set(modelKey, config.aiSDK) catalog.model.update(providerID, id, (model) => { if (config.family !== undefined) model.family = config.family if (config.name !== undefined) model.name = config.name - if (config.api !== undefined) model.api = { ...model.api, ...config.api } + if (config.id !== undefined) model.api.id = config.id + if (config.package !== undefined) { + const aiSDK = + modelAiSDK.get(modelKey) ?? providerAiSDK.get(providerID) ?? providerApi?.type === "aisdk" + const settings = ModelRequest.mergeRecords(model.api.settings, config.settings) + const url = + config.settings && Object.hasOwn(config.settings, "baseURL") + ? typeof settings.baseURL === "string" + ? settings.baseURL + : undefined + : model.api.url + model.api = aiSDK + ? { + id: model.api.id, + type: "aisdk", + package: config.package, + ...(url === undefined ? {} : { url }), + settings, + } + : { + id: model.api.id, + type: "native", + package: config.package, + ...(url === undefined ? {} : { url }), + settings, + } + } else if (config.settings !== undefined) { + model.api.settings = ModelRequest.mergeRecords(model.api.settings, config.settings) + if (Object.hasOwn(config.settings, "baseURL")) { + model.api.url = + typeof model.api.settings.baseURL === "string" ? model.api.settings.baseURL : undefined + } + } + if (config.package === undefined && config.aiSDK !== undefined) { + if (config.aiSDK && model.api.type === "native" && model.api.package !== undefined) { + model.api = { ...model.api, type: "aisdk", package: model.api.package } + } + if (!config.aiSDK && model.api.type === "aisdk") { + model.api = { ...model.api, type: "native", settings: model.api.settings ?? {} } + } + } const packageName = model.api.type === "aisdk" ? model.api.package : providerPackage + const aiSDK = + modelAiSDK.get(modelKey) ?? providerAiSDK.get(providerID) ?? providerApi?.type === "aisdk" if (config.capabilities !== undefined) { model.capabilities = { tools: config.capabilities.tools, @@ -75,19 +144,22 @@ export const Plugin = define({ output: [...config.capabilities.output], } } - if (config.request !== undefined) { + if (config.headers !== undefined || config.body !== undefined) { ModelRequest.assign(model.request, { - headers: config.request.headers, - ...ModelRequest.normalizeAiSdkOptions(packageName, config.request.body ?? {}), + headers: config.headers, + ...(aiSDK + ? ModelRequest.normalizeAiSdkOptions(packageName, config.body ?? {}) + : { body: config.body }), }) - if (config.request.variant !== undefined) model.request.variant = config.request.variant } + if (config.variant !== undefined) model.request.variant = config.variant if (config.variants !== undefined) { for (const variant of config.variants) { let existing = model.variants.find((item) => item.id === variant.id) if (!existing) { existing = { id: variant.id, + settings: {}, headers: {}, body: {}, generation: {}, @@ -95,9 +167,12 @@ export const Plugin = define({ } model.variants.push(existing) } + existing.settings = ModelRequest.mergeRecords(existing.settings, variant.settings) ModelRequest.assign(existing, { headers: variant.headers, - ...ModelRequest.normalizeAiSdkOptions(packageName, variant.body ?? {}), + ...(aiSDK + ? ModelRequest.normalizeAiSdkOptions(packageName, variant.body ?? {}) + : { body: variant.body }), }) } } diff --git a/packages/core/src/config/provider.ts b/packages/core/src/config/provider.ts index 1b54757078..665799ec3f 100644 --- a/packages/core/src/config/provider.ts +++ b/packages/core/src/config/provider.ts @@ -1,7 +1,6 @@ export * as ConfigProvider from "./provider" import { Schema } from "effect" -import { ProviderV2 } from "../provider" import { ModelV2 } from "../model" export class Request extends Schema.Class("ConfigV2.Provider.Request")({ @@ -9,6 +8,11 @@ export class Request extends Schema.Class("ConfigV2.Provider.Request")( body: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), }) {} +const Overlays = { + settings: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), + ...Request.fields, +} + class Cache extends Schema.Class("ConfigV2.Model.Cost.Cache")({ read: Schema.Finite.pipe(Schema.optional), write: Schema.Finite.pipe(Schema.optional), @@ -30,32 +34,18 @@ class Limit extends Schema.Class("ConfigV2.Model.Limit")({ output: Schema.Int.pipe(Schema.optional), }) {} -const ModelApi = Schema.Union([ - Schema.Struct({ - id: ModelV2.ID.pipe(Schema.optional), - ...ProviderV2.AISDK.fields, - }), - Schema.Struct({ - id: ModelV2.ID.pipe(Schema.optional), - ...ProviderV2.Native.fields, - }), - Schema.Struct({ - id: ModelV2.ID, - }), -]) - class Model extends Schema.Class("ConfigV2.Model")({ + id: ModelV2.ID.pipe(Schema.optional), + package: Schema.String.pipe(Schema.optional), + aiSDK: Schema.Boolean.pipe(Schema.optional), + ...Overlays, family: ModelV2.Family.pipe(Schema.optional), name: Schema.String.pipe(Schema.optional), - api: ModelApi.pipe(Schema.optional), capabilities: ModelV2.Capabilities.pipe(Schema.optional), - request: Schema.Struct({ - ...Request.fields, - variant: Schema.String.pipe(Schema.optional), - }).pipe(Schema.optional), + variant: Schema.String.pipe(Schema.optional), variants: Schema.Struct({ id: ModelV2.VariantID, - ...Request.fields, + ...Overlays, }).pipe(Schema.Array, Schema.optional), cost: Schema.Union([Cost, Cost.pipe(Schema.Array)]).pipe(Schema.optional), disabled: Schema.Boolean.pipe(Schema.optional), @@ -65,7 +55,8 @@ class Model extends Schema.Class("ConfigV2.Model")({ export class Info extends Schema.Class("ConfigV2.Provider")({ name: Schema.String.pipe(Schema.optional), env: Schema.String.pipe(Schema.Array, Schema.optional), - api: ProviderV2.Api.pipe(Schema.optional), - request: Request.pipe(Schema.optional), + package: Schema.String.pipe(Schema.optional), + aiSDK: Schema.Boolean.pipe(Schema.optional), + ...Overlays, models: Schema.Record(Schema.String, Model).pipe(Schema.optional), }) {} diff --git a/packages/core/src/model-request.ts b/packages/core/src/model-request.ts index 06059a9d73..6779d808ef 100644 --- a/packages/core/src/model-request.ts +++ b/packages/core/src/model-request.ts @@ -67,16 +67,41 @@ const profiles = new Map([ export const namespace = (packageName: string) => profiles.get(packageName)?.namespace +const isRecord = (value: unknown): value is Record => + typeof value === "object" && value !== null && !Array.isArray(value) + +export const mergeRecords = (...items: ReadonlyArray> | undefined>) => { + const result: Record = {} + for (const item of items) { + for (const [key, value] of Object.entries(item ?? {})) { + result[key] = isRecord(result[key]) && isRecord(value) ? mergeRecords(result[key], value) : value + } + } + return result +} + +export const mergeHeaders = (...items: ReadonlyArray> | undefined>) => { + const result = new Map() + for (const item of items) { + for (const entry of Object.entries(item ?? {})) result.set(entry[0].toLowerCase(), entry) + } + return Object.fromEntries(result.values()) +} + export const merge = (base: Request, override: Partial) => ({ - headers: { ...base.headers, ...override.headers }, - body: { ...base.body, ...override.body }, + headers: mergeHeaders(base.headers, override.headers), + body: mergeRecords(base.body, override.body), generation: { ...base.generation, ...override.generation }, options: { ...base.options, ...override.options }, }) export const assign = (target: MutableRequest, override: Partial) => { - Object.assign(target.headers, override.headers) - Object.assign(target.body, override.body) + const headers = mergeHeaders(target.headers, override.headers) + Object.keys(target.headers).forEach((key) => delete target.headers[key]) + Object.assign(target.headers, headers) + const body = mergeRecords(target.body, override.body) + Object.keys(target.body).forEach((key) => delete target.body[key]) + Object.assign(target.body, body) Object.assign((target.generation ??= {}), override.generation) Object.assign((target.options ??= {}), override.options) } diff --git a/packages/core/src/model.ts b/packages/core/src/model.ts index 52fff98733..bb22033943 100644 --- a/packages/core/src/model.ts +++ b/packages/core/src/model.ts @@ -8,6 +8,9 @@ export type ID = typeof ID.Type export const VariantID = Model.VariantID export type VariantID = typeof VariantID.Type +export const Package = Model.Package +export type Package = Model.Package + // Grouping of models, eg claude opus, claude sonnet export const Family = Model.Family export type Family = Model.Family diff --git a/packages/core/src/provider.ts b/packages/core/src/provider.ts index 03f7d7eef3..95de2c3ebc 100644 --- a/packages/core/src/provider.ts +++ b/packages/core/src/provider.ts @@ -6,6 +6,11 @@ import { Provider } from "@opencode-ai/schema/provider" export const ID = Provider.ID export type ID = typeof ID.Type +export const Overlays = Provider.Overlays + +export const Package = Provider.Package +export type Package = Provider.Package + export const AISDK = Provider.AISDK export const Native = Provider.Native diff --git a/packages/core/src/session/runner/model.ts b/packages/core/src/session/runner/model.ts index 97b862e432..253be42216 100644 --- a/packages/core/src/session/runner/model.ts +++ b/packages/core/src/session/runner/model.ts @@ -122,6 +122,12 @@ const withVariant = ( return Effect.succeed( variant ? produce(model, (draft) => { + if (variant.settings !== undefined) { + draft.api.settings = ModelRequest.mergeRecords(draft.api.settings, variant.settings) + if (Object.hasOwn(variant.settings, "baseURL")) { + draft.api.url = typeof draft.api.settings.baseURL === "string" ? draft.api.settings.baseURL : undefined + } + } ModelRequest.assign(draft.request, variant) }) : model, diff --git a/packages/core/src/v1/config/migrate.ts b/packages/core/src/v1/config/migrate.ts index c474cac51a..67a78cba86 100644 --- a/packages/core/src/v1/config/migrate.ts +++ b/packages/core/src/v1/config/migrate.ts @@ -174,15 +174,14 @@ function migrateProvider(info: ConfigProviderV1.Info) { return { name: info.name, env: info.env, - api: info.npm - ? { - type: "aisdk" as const, - package: info.npm, - url: info.api ?? options.url, - settings: options.settings ?? {}, - } - : undefined, - request: info.options && { headers: options.headers, body: options.body }, + package: info.npm, + aiSDK: info.npm ? true : undefined, + settings: { + ...options.settings, + ...(info.api ?? options.url ? { baseURL: info.api ?? options.url } : {}), + }, + headers: options.headers, + body: options.body, models: info.models && Object.fromEntries(Object.entries(info.models).map(([name, model]) => [name, migrateModel(model, info.npm)])), @@ -221,22 +220,13 @@ function migrateModel(info: typeof ConfigProviderV1.Model.Type, packageName?: st return { family: info.family, name: info.name, - api: info.provider?.npm - ? { - ...(info.id === undefined ? {} : { id: info.id }), - type: "aisdk" as const, - package: info.provider.npm, - url: info.provider.api, - settings: {}, - } - : info.id === undefined - ? undefined - : { id: info.id }, + id: info.id, + package: info.provider?.npm, + aiSDK: info.provider?.npm ? true : undefined, + settings: info.provider?.api ? { baseURL: info.provider.api } : undefined, capabilities, - request: (info.headers || request) && { - headers: info.headers, - body: request, - }, + headers: info.headers, + body: request, variants: info.variants && Object.entries(info.variants).map(([id, options]) => ({ diff --git a/packages/core/test/catalog.test.ts b/packages/core/test/catalog.test.ts index 23a3a0f4aa..a165343c83 100644 --- a/packages/core/test/catalog.test.ts +++ b/packages/core/test/catalog.test.ts @@ -213,6 +213,7 @@ describe("CatalogV2", () => { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://provider.example.com", + settings: {}, }) }), ) diff --git a/packages/core/test/config/config.test.ts b/packages/core/test/config/config.test.ts index 6275d8fed3..552a87da49 100644 --- a/packages/core/test/config/config.test.ts +++ b/packages/core/test/config/config.test.ts @@ -103,13 +103,10 @@ describe("Config", () => { }, }) - expect(migrated.providers?.bedrock?.api).toEqual({ - type: "aisdk", + expect(migrated.providers?.bedrock).toMatchObject({ package: "@ai-sdk/amazon-bedrock", - url: undefined, + aiSDK: true, settings: { region: "us-east-1", profile: "dev" }, - }) - expect(migrated.providers?.bedrock?.request).toEqual({ headers: { "x-test": "1" }, body: { trace: true }, }) @@ -585,34 +582,34 @@ describe("Config", () => { }) expect(documents[0]?.info.attachments).toEqual({ image: { auto_resize: false, max_width: 1200 } }) expect(documents[0]?.info.providers?.custom).toMatchObject({ - request: { body: { apiKey: "secret" } }, + body: { apiKey: "secret" }, models: { model: { - request: { body: { reasoningEffort: "high" } }, + body: { reasoningEffort: "high" }, variants: [{ id: "fast", body: { temperature: 0.2 } }], }, }, }) expect(documents[0]?.info.providers?.openai).toMatchObject({ - api: { settings: {} }, - request: { headers: { Authorization: "Bearer secret", "OpenAI-Organization": "org" } }, + package: "@ai-sdk/openai", + aiSDK: true, + settings: {}, + headers: { Authorization: "Bearer secret", "OpenAI-Organization": "org" }, models: { model: { - request: { - body: { temperature: 0.3, reasoningEffort: "high", serviceTier: "priority" }, - }, + body: { temperature: 0.3, reasoningEffort: "high", serviceTier: "priority" }, variants: [{ id: "high", body: { reasoningEffort: "high", reasoningSummary: "auto" } }], }, }, }) expect(documents[0]?.info.providers?.anthropic).toMatchObject({ + package: "@ai-sdk/anthropic", + aiSDK: true, models: { model: { - request: { - body: { - output_config: { effort: "high", task_budget: 4096 }, - metadata: { user_id: "user-1" }, - }, + body: { + output_config: { effort: "high", task_budget: 4096 }, + metadata: { user_id: "user-1" }, }, }, }, diff --git a/packages/core/test/config/provider.test.ts b/packages/core/test/config/provider.test.ts index 12f4a01c78..f8715b6e68 100644 --- a/packages/core/test/config/provider.test.ts +++ b/packages/core/test/config/provider.test.ts @@ -45,16 +45,90 @@ function withEnv(vars: Record, effect: () = ) } -function request(headers: Record, variant?: string) { - return { - headers, - variant, - } -} - const decode = Schema.decodeUnknownSync(Config.Info) describe("ConfigProviderPlugin.Plugin", () => { + it.effect("merges flat provider and model overlays", () => + Effect.gen(function* () { + const catalog = yield* Catalog.Service + const providerID = ProviderV2.ID.make("custom") + const modelID = ModelV2.ID.make("chat") + const config = Config.Service.of({ + entries: () => + Effect.succeed([ + new Config.Document({ + type: "document", + info: decode({ providers: { custom: { aiSDK: true } } }), + }), + new Config.Document({ + type: "document", + info: decode({ + providers: { + custom: { + package: "custom-provider", + settings: { auth: { type: "token", region: "us-east-1" } }, + headers: { "X-Test": "provider" }, + body: { reasoning: { type: "enabled", budget: 8_000 }, tags: ["provider"] }, + models: { + chat: { + package: "custom-model-provider", + settings: { auth: { region: "us-west-2" } }, + headers: { "x-test": "model" }, + body: { reasoning: { budget: 32_000 }, tags: ["model"] }, + }, + inherit: { + settings: { auth: { region: "eu-west-1" }, baseURL: "https://model.example/v1" }, + }, + clear: { settings: { baseURL: "https://old.example/v1" } }, + }, + }, + }, + }), + }), + new Config.Document({ + type: "document", + info: decode({ + providers: { + custom: { models: { clear: { package: "custom-provider", settings: { baseURL: null } } } }, + }, + }), + }), + ]), + }) + + yield* addPlugin(config) + + const model = required(yield* catalog.model.get(providerID, modelID)) + expect(model.api).toEqual({ + id: modelID, + type: "aisdk", + package: "custom-model-provider", + settings: { auth: { type: "token", region: "us-west-2" } }, + }) + expect(model.request.headers).toEqual({ "x-test": "model" }) + expect(model.request.body).toEqual({ + reasoning: { type: "enabled", budget: 32_000 }, + tags: ["model"], + }) + expect(required(yield* catalog.model.get(providerID, ModelV2.ID.make("inherit"))).api).toEqual({ + id: ModelV2.ID.make("inherit"), + type: "aisdk", + package: "custom-provider", + url: "https://model.example/v1", + settings: { + auth: { type: "token", region: "eu-west-1" }, + baseURL: "https://model.example/v1", + }, + }) + expect(required(yield* catalog.model.get(providerID, ModelV2.ID.make("clear"))).api).toEqual({ + id: ModelV2.ID.make("clear"), + type: "aisdk", + package: "custom-provider", + settings: { auth: { type: "token", region: "us-east-1" }, baseURL: null }, + }) + }), + ) + it.effect("partitions existing model variant bodies without changing config shape", () => Effect.gen(function* () { const catalog = yield* Catalog.Service @@ -68,7 +142,9 @@ describe("ConfigProviderPlugin.Plugin", () => { info: decode({ providers: { opencode: { - api: { type: "aisdk", package: "@ai-sdk/openai", url: "https://opencode.test/v1" }, + package: "@ai-sdk/openai", + aiSDK: true, + settings: { baseURL: "https://opencode.test/v1" }, models: { "alpha-gpt-next": { variants: [ @@ -120,7 +196,9 @@ describe("ConfigProviderPlugin.Plugin", () => { info: decode({ providers: { opencode: { - api: { type: "aisdk", package: "@ai-sdk/openai", url: "https://opencode.test/v1" }, + package: "@ai-sdk/openai", + aiSDK: true, + settings: { baseURL: "https://opencode.test/v1" }, }, }, }), @@ -171,8 +249,8 @@ describe("ConfigProviderPlugin.Plugin", () => { custom: { name: "Configured", env: ["CUSTOM_API_KEY"], - api: { type: "native", settings: {} }, - request: request({ first: "first", shared: "first" }), + package: "custom-native", + headers: { first: "first", shared: "first" }, models: { chat: { name: "First", @@ -180,7 +258,8 @@ describe("ConfigProviderPlugin.Plugin", () => { disabled: true, limit: { context: 100, output: 50 }, cost: { input: 1, output: 2 }, - request: request({ first: "first", shared: "first" }, "retained"), + headers: { first: "first", shared: "first" }, + variant: "retained", variants: [ { id: "fast", @@ -199,17 +278,19 @@ describe("ConfigProviderPlugin.Plugin", () => { model: "custom/default", providers: { custom: { - api: { type: "aisdk", package: "custom-sdk", url: "https://example.test" }, - request: request({ last: "last", shared: "last" }), + package: "custom-sdk", + aiSDK: true, + settings: { baseURL: "https://example.test" }, + headers: { last: "last", shared: "last" }, models: { default: { name: "Default", }, chat: { - api: { id: "api-chat" }, + id: "api-chat", name: "Last", limit: { output: 75 }, - request: request({ last: "last", shared: "last" }), + headers: { last: "last", shared: "last" }, variants: [ { id: "fast", @@ -249,7 +330,12 @@ describe("ConfigProviderPlugin.Plugin", () => { }) expect((yield* integrations.get(Integration.ID.make("custom")))?.name).toBe("Renamed") expect(provider.disabled).toBeUndefined() - expect(provider.api).toEqual({ type: "aisdk", package: "custom-sdk", url: "https://example.test" }) + expect(provider.api).toEqual({ + type: "aisdk", + package: "custom-sdk", + url: "https://example.test", + settings: { baseURL: "https://example.test" }, + }) expect(provider.request.headers).toEqual({ first: "first", shared: "last", last: "last" }) expect(model.api.id).toBe(ModelV2.ID.make("api-chat")) expect(model.name).toBe("Last") diff --git a/packages/core/test/session-runner-model.test.ts b/packages/core/test/session-runner-model.test.ts index efebe60d04..f570dabfc7 100644 --- a/packages/core/test/session-runner-model.test.ts +++ b/packages/core/test/session-runner-model.test.ts @@ -148,6 +148,40 @@ describe("SessionRunnerModel", () => { }), ) + it.effect("applies a selected variant base URL", () => + Effect.gen(function* () { + const base = model( + { type: "aisdk", package: "@ai-sdk/openai", url: "https://default.example/v1" }, + [ + { + id: ModelV2.VariantID.make("regional"), + settings: { baseURL: "https://regional.example/v1" }, + headers: {}, + body: {}, + generation: {}, + options: {}, + }, + ], + ) + const session = SessionV2.Info.make({ + id: SessionV2.ID.make("ses_regional_variant"), + projectID: ProjectV2.ID.global, + title: "test", + model: { id: base.id, providerID: base.providerID, variant: ModelV2.VariantID.make("regional") }, + cost: 0, + tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } }, + time: { created: DateTime.makeUnsafe(0), updated: DateTime.makeUnsafe(0) }, + location: { directory: AbsolutePath.make("/project") }, + }) + const resolved = yield* SessionRunnerModel.resolve( + session, + base, + ) + + expect(resolved.route.endpoint.baseURL).toBe("https://regional.example/v1") + }), + ) + it.effect("lowers selected OpenAI-compatible Session variants into Chat options", () => Effect.gen(function* () { const catalog = model( diff --git a/packages/core/test/shared-schema.test.ts b/packages/core/test/shared-schema.test.ts index a1794b9263..3632c701fe 100644 --- a/packages/core/test/shared-schema.test.ts +++ b/packages/core/test/shared-schema.test.ts @@ -99,6 +99,7 @@ test("Core reuses the canonical shared schemas", async () => { [coreLLM.ToolContent, LLM.ToolContent], [ModelV2.ID, Model.ID], [ModelV2.VariantID, Model.VariantID], + [ModelV2.Package, Model.Package], [ModelV2.Ref, Model.Ref], [ModelV2.Family, Model.Family], [ModelV2.Capabilities, Model.Capabilities], @@ -106,6 +107,7 @@ test("Core reuses the canonical shared schemas", async () => { [ModelV2.Api, Model.Api], [ModelV2.Info, Model.Info], [ProviderV2.ID, Provider.ID], + [ProviderV2.Package, Provider.Package], [ProviderV2.AISDK, Provider.AISDK], [ProviderV2.Native, Provider.Native], [ProviderV2.Api, Provider.Api], diff --git a/packages/schema/src/model.ts b/packages/schema/src/model.ts index 62b76df0fc..3f95afd49c 100644 --- a/packages/schema/src/model.ts +++ b/packages/schema/src/model.ts @@ -11,6 +11,14 @@ export type ID = typeof ID.Type export const VariantID = Schema.String.pipe(Schema.brand("VariantID")) export type VariantID = typeof VariantID.Type +export const Package = Schema.Struct({ + modelID: ID, + package: Schema.String.pipe(Schema.optional), + aiSDK: Schema.Boolean.pipe(Schema.optional), + ...Provider.Overlays, +}) +export type Package = typeof Package.Type + export const Ref = Schema.Struct({ id: ID, providerID: Provider.ID, @@ -68,6 +76,7 @@ export const Info = Schema.Struct({ }), variants: Schema.Struct({ id: VariantID, + settings: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), ...ModelRequest.Request.fields, }).pipe(Schema.Array, Schema.mutable), time: Schema.Struct({ diff --git a/packages/schema/src/provider.ts b/packages/schema/src/provider.ts index d3d5109608..21e24285a2 100644 --- a/packages/schema/src/provider.ts +++ b/packages/schema/src/provider.ts @@ -22,6 +22,19 @@ export const ID = Schema.String.pipe( ) export type ID = typeof ID.Type +export const Overlays = { + settings: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), + headers: Schema.Record(Schema.String, Schema.String).pipe(Schema.optional), + body: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), +} + +export const Package = Schema.Struct({ + package: Schema.String, + aiSDK: Schema.Boolean.pipe(Schema.optional), + ...Overlays, +}) +export type Package = typeof Package.Type + export interface AISDK extends Schema.Schema.Type {} export const AISDK = Schema.Struct({ type: Schema.Literal("aisdk"), @@ -33,6 +46,7 @@ export const AISDK = Schema.Struct({ export interface Native extends Schema.Schema.Type {} export const Native = Schema.Struct({ type: Schema.Literal("native"), + package: Schema.String.pipe(Schema.optional), url: Schema.String.pipe(Schema.optional), settings: Schema.Record(Schema.String, Schema.Unknown), }) diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts index 9f9ddb14c2..107e3a08ce 100644 --- a/packages/sdk/js/src/v2/gen/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/types.gen.ts @@ -4002,6 +4002,7 @@ export type ModelV2Info = { | { id: string type: "native" + package?: string url?: string settings: { [key: string]: unknown @@ -4036,6 +4037,9 @@ export type ModelV2Info = { } variants: Array<{ id: string + settings?: { + [key: string]: unknown + } headers: { [key: string]: string } @@ -4096,6 +4100,7 @@ export type ProviderV2Info = { } | { type: "native" + package?: string url?: string settings: { [key: string]: unknown From 2b0b57347495d450fa14e693b7a0ad7871e1eae5 Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Wed, 24 Jun 2026 23:05:02 +0530 Subject: [PATCH 05/18] feat(llm): add native provider packages --- packages/llm/package.json | 13 ++++-- packages/llm/src/index.ts | 5 +++ packages/llm/src/provider-package.ts | 16 +++++++ .../src/provider-packages/amazon-bedrock.ts | 28 ++++++++++++ .../provider-packages/anthropic-messages.ts | 15 +++++++ .../llm/src/provider-packages/openai-chat.ts | 20 +++++++++ .../openai-compatible-chat.ts | 17 +++++++ .../src/provider-packages/openai-responses.ts | 25 +++++++++++ packages/llm/src/provider-packages/shared.ts | 8 ++++ packages/llm/test/provider-package.test.ts | 45 +++++++++++++++++++ 10 files changed, 188 insertions(+), 4 deletions(-) create mode 100644 packages/llm/src/provider-package.ts create mode 100644 packages/llm/src/provider-packages/amazon-bedrock.ts create mode 100644 packages/llm/src/provider-packages/anthropic-messages.ts create mode 100644 packages/llm/src/provider-packages/openai-chat.ts create mode 100644 packages/llm/src/provider-packages/openai-compatible-chat.ts create mode 100644 packages/llm/src/provider-packages/openai-responses.ts create mode 100644 packages/llm/src/provider-packages/shared.ts create mode 100644 packages/llm/test/provider-package.test.ts diff --git a/packages/llm/package.json b/packages/llm/package.json index faccd3dd47..4c9d62fdcd 100644 --- a/packages/llm/package.json +++ b/packages/llm/package.json @@ -15,14 +15,19 @@ "./route": "./src/route/index.ts", "./provider": "./src/provider.ts", "./providers": "./src/providers/index.ts", - "./providers/amazon-bedrock": "./src/providers/amazon-bedrock.ts", - "./providers/anthropic": "./src/providers/anthropic.ts", + "./provider-package": "./src/provider-package.ts", + "./providers/amazon-bedrock": "./src/provider-packages/amazon-bedrock.ts", + "./providers/anthropic": "./src/provider-packages/anthropic-messages.ts", + "./providers/anthropic/messages": "./src/provider-packages/anthropic-messages.ts", "./providers/azure": "./src/providers/azure.ts", "./providers/cloudflare": "./src/providers/cloudflare.ts", "./providers/github-copilot": "./src/providers/github-copilot.ts", "./providers/google": "./src/providers/google.ts", - "./providers/openai": "./src/providers/openai.ts", - "./providers/openai-compatible": "./src/providers/openai-compatible.ts", + "./providers/openai": "./src/provider-packages/openai-responses.ts", + "./providers/openai/responses": "./src/provider-packages/openai-responses.ts", + "./providers/openai/chat": "./src/provider-packages/openai-chat.ts", + "./providers/openai-compatible": "./src/provider-packages/openai-compatible-chat.ts", + "./providers/openai-compatible/chat": "./src/provider-packages/openai-compatible-chat.ts", "./providers/openai-compatible-profile": "./src/providers/openai-compatible-profile.ts", "./providers/openrouter": "./src/providers/openrouter.ts", "./providers/xai": "./src/providers/xai.ts", diff --git a/packages/llm/src/index.ts b/packages/llm/src/index.ts index 735520ff77..843b4536a6 100644 --- a/packages/llm/src/index.ts +++ b/packages/llm/src/index.ts @@ -1,6 +1,7 @@ export { LLMClient } from "./route/client" export { Auth } from "./route/auth" export { Provider } from "./provider" +export { ProviderPackage } from "./provider-package" export { isContextOverflow, isContextOverflowFailure } from "./provider-error" export type { RouteModelInput, @@ -31,3 +32,7 @@ export type { ModelFactory as ProviderModelFactory, ModelOptions as ProviderModelOptions, } from "./provider" +export type { + Definition as ProviderPackageDefinition, + Settings as ProviderPackageSettings, +} from "./provider-package" diff --git a/packages/llm/src/provider-package.ts b/packages/llm/src/provider-package.ts new file mode 100644 index 0000000000..977a211864 --- /dev/null +++ b/packages/llm/src/provider-package.ts @@ -0,0 +1,16 @@ +import type { Model } from "./schema" + +export interface Settings extends Readonly> { + readonly headers?: Readonly> + readonly body?: Readonly> + readonly limits?: { + readonly context: number + readonly output: number + } +} + +export interface Definition { + readonly model: (id: string, settings: ProviderSettings) => Model +} + +export * as ProviderPackage from "./provider-package" diff --git a/packages/llm/src/provider-packages/amazon-bedrock.ts b/packages/llm/src/provider-packages/amazon-bedrock.ts new file mode 100644 index 0000000000..f00b2056ae --- /dev/null +++ b/packages/llm/src/provider-packages/amazon-bedrock.ts @@ -0,0 +1,28 @@ +import type { ProviderPackage } from "../provider-package" +import * as AmazonBedrock from "../providers/amazon-bedrock" +import type { BedrockCredentials } from "../protocols/bedrock-converse" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly auth?: "bearer" | "sigv4" + readonly baseURL?: string + readonly credentials?: BedrockCredentials + readonly region?: string + readonly topP?: number +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => { + if (settings.auth === "bearer" && settings.apiKey === undefined) + throw new Error("Amazon Bedrock bearer auth requires apiKey") + if (settings.auth === "sigv4" && settings.apiKey !== undefined) + throw new Error("Amazon Bedrock SigV4 auth does not accept apiKey") + return AmazonBedrock.configure({ + ...defaults(settings), + apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey, + baseURL: settings.baseURL, + credentials: settings.credentials, + generation: settings.topP === undefined ? undefined : { topP: settings.topP }, + region: settings.region, + }).model(id) +} diff --git a/packages/llm/src/provider-packages/anthropic-messages.ts b/packages/llm/src/provider-packages/anthropic-messages.ts new file mode 100644 index 0000000000..be6def4081 --- /dev/null +++ b/packages/llm/src/provider-packages/anthropic-messages.ts @@ -0,0 +1,15 @@ +import type { ProviderPackage } from "../provider-package" +import * as Anthropic from "../providers/anthropic" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => + Anthropic.configure({ + ...defaults(settings), + apiKey: settings.apiKey, + baseURL: settings.baseURL, + }).model(id) diff --git a/packages/llm/src/provider-packages/openai-chat.ts b/packages/llm/src/provider-packages/openai-chat.ts new file mode 100644 index 0000000000..6a6d04c704 --- /dev/null +++ b/packages/llm/src/provider-packages/openai-chat.ts @@ -0,0 +1,20 @@ +import type { ProviderPackage } from "../provider-package" +import * as OpenAI from "../providers/openai" +import type { OpenAIProviderOptionsInput } from "../providers/openai-options" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string + readonly queryParams?: Readonly> + readonly providerOptions?: OpenAIProviderOptionsInput +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => + OpenAI.configure({ + ...defaults(settings), + apiKey: settings.apiKey, + baseURL: settings.baseURL, + queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, + providerOptions: settings.providerOptions, + }).chat(id) diff --git a/packages/llm/src/provider-packages/openai-compatible-chat.ts b/packages/llm/src/provider-packages/openai-compatible-chat.ts new file mode 100644 index 0000000000..ba7d569b9c --- /dev/null +++ b/packages/llm/src/provider-packages/openai-compatible-chat.ts @@ -0,0 +1,17 @@ +import type { ProviderPackage } from "../provider-package" +import * as OpenAICompatible from "../providers/openai-compatible" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL: string + readonly provider?: string +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => + OpenAICompatible.configure({ + ...defaults(settings), + apiKey: settings.apiKey, + baseURL: settings.baseURL, + provider: settings.provider, + }).model(id) diff --git a/packages/llm/src/provider-packages/openai-responses.ts b/packages/llm/src/provider-packages/openai-responses.ts new file mode 100644 index 0000000000..4851a96a34 --- /dev/null +++ b/packages/llm/src/provider-packages/openai-responses.ts @@ -0,0 +1,25 @@ +import type { ProviderPackage } from "../provider-package" +import * as OpenAI from "../providers/openai" +import type { OpenAIProviderOptionsInput } from "../providers/openai-options" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string + readonly queryParams?: Readonly> + readonly transport?: "http" | "websocket" + readonly providerOptions?: OpenAIProviderOptionsInput +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => { + const provider = OpenAI.configure({ + ...defaults(settings), + apiKey: settings.apiKey, + baseURL: settings.baseURL, + queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, + providerOptions: settings.providerOptions, + }) + if (settings.transport === undefined || settings.transport === "http") return provider.responses(id) + if (settings.transport === "websocket") return provider.responsesWebSocket(id) + throw new Error(`Unsupported OpenAI Responses transport: ${String(settings.transport)}`) +} diff --git a/packages/llm/src/provider-packages/shared.ts b/packages/llm/src/provider-packages/shared.ts new file mode 100644 index 0000000000..e3c7ec2444 --- /dev/null +++ b/packages/llm/src/provider-packages/shared.ts @@ -0,0 +1,8 @@ +import type { RouteDefaultsInput } from "../route/client" +import type { ProviderPackage } from "../provider-package" + +export const defaults = (settings: ProviderPackage.Settings): RouteDefaultsInput => ({ + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + limits: settings.limits, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, +}) diff --git a/packages/llm/test/provider-package.test.ts b/packages/llm/test/provider-package.test.ts new file mode 100644 index 0000000000..a4f1627c67 --- /dev/null +++ b/packages/llm/test/provider-package.test.ts @@ -0,0 +1,45 @@ +import { describe, expect, test } from "bun:test" +import { model } from "@opencode-ai/llm/providers/openai" + +describe("provider package entrypoints", () => { + test("semantic API aliases expose the same contract", async () => { + const modules = await Promise.all([ + import("@opencode-ai/llm/providers/openai"), + import("@opencode-ai/llm/providers/openai/responses"), + import("@opencode-ai/llm/providers/openai/chat"), + import("@opencode-ai/llm/providers/anthropic"), + import("@opencode-ai/llm/providers/anthropic/messages"), + import("@opencode-ai/llm/providers/openai-compatible"), + import("@opencode-ai/llm/providers/openai-compatible/chat"), + import("@opencode-ai/llm/providers/amazon-bedrock"), + ]) + + for (const module of modules) expect(module.model).toBeFunction() + expect(modules[0].model).toBe(modules[1].model) + expect(modules[3].model).toBe(modules[4].model) + expect(modules[5].model).toBe(modules[6].model) + }) + + test("maps package settings onto the executable model", () => { + const selected = model("gpt-5", { + apiKey: "fixture", + baseURL: "https://api.openai.test/v1", + headers: { "x-application": "opencode" }, + body: { service_tier: "priority" }, + limits: { context: 200_000, output: 64_000 }, + unrelatedInheritedSetting: true, + }) + + expect(selected.route.id).toBe("openai-responses") + expect(selected.route.defaults.headers).toEqual({ "x-application": "opencode" }) + expect(selected.route.defaults.http?.body).toEqual({ service_tier: "priority" }) + expect(selected.route.defaults.limits).toEqual({ context: 200_000, output: 64_000 }) + }) + + test("selects transport without changing the semantic API", () => { + expect(model("gpt-5", { apiKey: "fixture" }).route.id).toBe("openai-responses") + expect(model("gpt-5", { apiKey: "fixture", transport: "websocket" }).route.id).toBe( + "openai-responses-websocket", + ) + }) +}) From 928510608d2d297aa4117debb7eb381a7bd7aa17 Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Wed, 24 Jun 2026 23:10:45 +0530 Subject: [PATCH 06/18] refactor(llm): colocate provider package logic --- packages/llm/package.json | 14 ++++----- .../src/provider-packages/amazon-bedrock.ts | 28 ------------------ .../provider-packages/anthropic-messages.ts | 15 ---------- .../llm/src/provider-packages/openai-chat.ts | 20 ------------- .../openai-compatible-chat.ts | 17 ----------- .../src/provider-packages/openai-responses.ts | 25 ---------------- packages/llm/src/provider-packages/shared.ts | 8 ----- packages/llm/src/providers/amazon-bedrock.ts | 27 ++++++++++++++++- packages/llm/src/providers/anthropic.ts | 15 +++++++++- .../llm/src/providers/openai-compatible.ts | 17 +++++++++++ packages/llm/src/providers/openai.ts | 29 ++++++++++++++++++- packages/llm/src/providers/openai/chat.ts | 2 ++ .../llm/src/providers/openai/responses.ts | 2 ++ packages/llm/test/exports.test.ts | 1 - packages/llm/test/provider-package.test.ts | 4 --- 15 files changed, 95 insertions(+), 129 deletions(-) delete mode 100644 packages/llm/src/provider-packages/amazon-bedrock.ts delete mode 100644 packages/llm/src/provider-packages/anthropic-messages.ts delete mode 100644 packages/llm/src/provider-packages/openai-chat.ts delete mode 100644 packages/llm/src/provider-packages/openai-compatible-chat.ts delete mode 100644 packages/llm/src/provider-packages/openai-responses.ts delete mode 100644 packages/llm/src/provider-packages/shared.ts create mode 100644 packages/llm/src/providers/openai/chat.ts create mode 100644 packages/llm/src/providers/openai/responses.ts diff --git a/packages/llm/package.json b/packages/llm/package.json index 4c9d62fdcd..2a5d97d5bf 100644 --- a/packages/llm/package.json +++ b/packages/llm/package.json @@ -16,18 +16,16 @@ "./provider": "./src/provider.ts", "./providers": "./src/providers/index.ts", "./provider-package": "./src/provider-package.ts", - "./providers/amazon-bedrock": "./src/provider-packages/amazon-bedrock.ts", - "./providers/anthropic": "./src/provider-packages/anthropic-messages.ts", - "./providers/anthropic/messages": "./src/provider-packages/anthropic-messages.ts", + "./providers/amazon-bedrock": "./src/providers/amazon-bedrock.ts", + "./providers/anthropic": "./src/providers/anthropic.ts", "./providers/azure": "./src/providers/azure.ts", "./providers/cloudflare": "./src/providers/cloudflare.ts", "./providers/github-copilot": "./src/providers/github-copilot.ts", "./providers/google": "./src/providers/google.ts", - "./providers/openai": "./src/provider-packages/openai-responses.ts", - "./providers/openai/responses": "./src/provider-packages/openai-responses.ts", - "./providers/openai/chat": "./src/provider-packages/openai-chat.ts", - "./providers/openai-compatible": "./src/provider-packages/openai-compatible-chat.ts", - "./providers/openai-compatible/chat": "./src/provider-packages/openai-compatible-chat.ts", + "./providers/openai": "./src/providers/openai.ts", + "./providers/openai/responses": "./src/providers/openai/responses.ts", + "./providers/openai/chat": "./src/providers/openai/chat.ts", + "./providers/openai-compatible": "./src/providers/openai-compatible.ts", "./providers/openai-compatible-profile": "./src/providers/openai-compatible-profile.ts", "./providers/openrouter": "./src/providers/openrouter.ts", "./providers/xai": "./src/providers/xai.ts", diff --git a/packages/llm/src/provider-packages/amazon-bedrock.ts b/packages/llm/src/provider-packages/amazon-bedrock.ts deleted file mode 100644 index f00b2056ae..0000000000 --- a/packages/llm/src/provider-packages/amazon-bedrock.ts +++ /dev/null @@ -1,28 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as AmazonBedrock from "../providers/amazon-bedrock" -import type { BedrockCredentials } from "../protocols/bedrock-converse" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly auth?: "bearer" | "sigv4" - readonly baseURL?: string - readonly credentials?: BedrockCredentials - readonly region?: string - readonly topP?: number -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => { - if (settings.auth === "bearer" && settings.apiKey === undefined) - throw new Error("Amazon Bedrock bearer auth requires apiKey") - if (settings.auth === "sigv4" && settings.apiKey !== undefined) - throw new Error("Amazon Bedrock SigV4 auth does not accept apiKey") - return AmazonBedrock.configure({ - ...defaults(settings), - apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey, - baseURL: settings.baseURL, - credentials: settings.credentials, - generation: settings.topP === undefined ? undefined : { topP: settings.topP }, - region: settings.region, - }).model(id) -} diff --git a/packages/llm/src/provider-packages/anthropic-messages.ts b/packages/llm/src/provider-packages/anthropic-messages.ts deleted file mode 100644 index be6def4081..0000000000 --- a/packages/llm/src/provider-packages/anthropic-messages.ts +++ /dev/null @@ -1,15 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as Anthropic from "../providers/anthropic" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly baseURL?: string -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => - Anthropic.configure({ - ...defaults(settings), - apiKey: settings.apiKey, - baseURL: settings.baseURL, - }).model(id) diff --git a/packages/llm/src/provider-packages/openai-chat.ts b/packages/llm/src/provider-packages/openai-chat.ts deleted file mode 100644 index 6a6d04c704..0000000000 --- a/packages/llm/src/provider-packages/openai-chat.ts +++ /dev/null @@ -1,20 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as OpenAI from "../providers/openai" -import type { OpenAIProviderOptionsInput } from "../providers/openai-options" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly baseURL?: string - readonly queryParams?: Readonly> - readonly providerOptions?: OpenAIProviderOptionsInput -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => - OpenAI.configure({ - ...defaults(settings), - apiKey: settings.apiKey, - baseURL: settings.baseURL, - queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, - providerOptions: settings.providerOptions, - }).chat(id) diff --git a/packages/llm/src/provider-packages/openai-compatible-chat.ts b/packages/llm/src/provider-packages/openai-compatible-chat.ts deleted file mode 100644 index ba7d569b9c..0000000000 --- a/packages/llm/src/provider-packages/openai-compatible-chat.ts +++ /dev/null @@ -1,17 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as OpenAICompatible from "../providers/openai-compatible" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly baseURL: string - readonly provider?: string -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => - OpenAICompatible.configure({ - ...defaults(settings), - apiKey: settings.apiKey, - baseURL: settings.baseURL, - provider: settings.provider, - }).model(id) diff --git a/packages/llm/src/provider-packages/openai-responses.ts b/packages/llm/src/provider-packages/openai-responses.ts deleted file mode 100644 index 4851a96a34..0000000000 --- a/packages/llm/src/provider-packages/openai-responses.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as OpenAI from "../providers/openai" -import type { OpenAIProviderOptionsInput } from "../providers/openai-options" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly baseURL?: string - readonly queryParams?: Readonly> - readonly transport?: "http" | "websocket" - readonly providerOptions?: OpenAIProviderOptionsInput -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => { - const provider = OpenAI.configure({ - ...defaults(settings), - apiKey: settings.apiKey, - baseURL: settings.baseURL, - queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, - providerOptions: settings.providerOptions, - }) - if (settings.transport === undefined || settings.transport === "http") return provider.responses(id) - if (settings.transport === "websocket") return provider.responsesWebSocket(id) - throw new Error(`Unsupported OpenAI Responses transport: ${String(settings.transport)}`) -} diff --git a/packages/llm/src/provider-packages/shared.ts b/packages/llm/src/provider-packages/shared.ts deleted file mode 100644 index e3c7ec2444..0000000000 --- a/packages/llm/src/provider-packages/shared.ts +++ /dev/null @@ -1,8 +0,0 @@ -import type { RouteDefaultsInput } from "../route/client" -import type { ProviderPackage } from "../provider-package" - -export const defaults = (settings: ProviderPackage.Settings): RouteDefaultsInput => ({ - headers: settings.headers === undefined ? undefined : { ...settings.headers }, - limits: settings.limits, - http: settings.body === undefined ? undefined : { body: { ...settings.body } }, -}) diff --git a/packages/llm/src/providers/amazon-bedrock.ts b/packages/llm/src/providers/amazon-bedrock.ts index 2f1791e0d6..e578d614c6 100644 --- a/packages/llm/src/providers/amazon-bedrock.ts +++ b/packages/llm/src/providers/amazon-bedrock.ts @@ -1,5 +1,6 @@ import type { RouteDefaultsInput } from "../route/client" import { Auth } from "../route/auth" +import type { ProviderPackage } from "../provider-package" import { ProviderID, type ModelID } from "../schema" import * as BedrockConverse from "../protocols/bedrock-converse" import type { BedrockCredentials } from "../protocols/bedrock-converse" @@ -15,6 +16,15 @@ export type Config = RouteDefaultsInput & { /** Override the computed `https://bedrock-runtime..amazonaws.com` URL. */ readonly baseURL?: string } + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly auth?: "bearer" | "sigv4" + readonly baseURL?: string + readonly credentials?: BedrockCredentials + readonly region?: string + readonly topP?: number +} export const routes = [BedrockConverse.route] const bedrockBaseURL = (region: string) => `https://bedrock-runtime.${region}.amazonaws.com` @@ -40,4 +50,19 @@ export const configure = (input: Config = {}) => { } export const provider = configure() -export const model = provider.model +export const model: ProviderPackage.Definition["model"] = (id, settings) => { + if (settings.auth === "bearer" && settings.apiKey === undefined) + throw new Error("Amazon Bedrock bearer auth requires apiKey") + if (settings.auth === "sigv4" && settings.apiKey !== undefined) + throw new Error("Amazon Bedrock SigV4 auth does not accept apiKey") + return configure({ + apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey, + baseURL: settings.baseURL, + credentials: settings.credentials, + generation: settings.topP === undefined ? undefined : { topP: settings.topP }, + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, + limits: settings.limits, + region: settings.region, + }).model(id) +} diff --git a/packages/llm/src/providers/anthropic.ts b/packages/llm/src/providers/anthropic.ts index 0c9640af5e..8ef0293eeb 100644 --- a/packages/llm/src/providers/anthropic.ts +++ b/packages/llm/src/providers/anthropic.ts @@ -1,6 +1,7 @@ import type { RouteDefaultsInput } from "../route/client" import { Auth } from "../route/auth" import type { ProviderAuthOption } from "../route/auth-options" +import type { ProviderPackage } from "../provider-package" import { ProviderID, type ModelID } from "../schema" import * as AnthropicMessages from "../protocols/anthropic-messages" @@ -10,6 +11,11 @@ export const routes = [AnthropicMessages.route] export type Config = RouteDefaultsInput & ProviderAuthOption<"optional"> & { readonly baseURL?: string } +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string +} + const auth = (options: ProviderAuthOption<"optional">) => { if ("auth" in options && options.auth) return options.auth return Auth.optional("apiKey" in options ? options.apiKey : undefined, "apiKey") @@ -32,4 +38,11 @@ export const configure = (input: Config = {}) => { } export const provider = configure() -export const model = provider.model +export const model: ProviderPackage.Definition["model"] = (id, settings) => + configure({ + apiKey: settings.apiKey, + baseURL: settings.baseURL, + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, + limits: settings.limits, + }).model(id) diff --git a/packages/llm/src/providers/openai-compatible.ts b/packages/llm/src/providers/openai-compatible.ts index a79f65f6df..36d9b3fd5a 100644 --- a/packages/llm/src/providers/openai-compatible.ts +++ b/packages/llm/src/providers/openai-compatible.ts @@ -2,6 +2,7 @@ import { ProviderID, type ModelID } from "../schema" import * as OpenAICompatibleChat from "../protocols/openai-compatible-chat" import type { RouteDefaultsInput } from "../route/client" import { AuthOptions, type ProviderAuthOption } from "../route/auth-options" +import type { ProviderPackage } from "../provider-package" import { profiles, type OpenAICompatibleProfile } from "./openai-compatible-profile" export const id = ProviderID.make("openai-compatible") @@ -12,6 +13,12 @@ type GenericModelOptions = RouteDefaultsInput & readonly baseURL: string } +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL: string + readonly provider?: string +} + export type FamilyModelOptions = RouteDefaultsInput & ProviderAuthOption<"optional"> & { readonly baseURL?: string @@ -56,6 +63,16 @@ export const provider = { configure, } +export const model: ProviderPackage.Definition["model"] = (id, settings) => + configure({ + apiKey: settings.apiKey, + baseURL: settings.baseURL, + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, + limits: settings.limits, + provider: settings.provider, + }).model(id) + export const baseten = define(profiles.baseten) export const cerebras = define(profiles.cerebras) export const deepinfra = define(profiles.deepinfra) diff --git a/packages/llm/src/providers/openai.ts b/packages/llm/src/providers/openai.ts index 098cad8493..b40a94514b 100644 --- a/packages/llm/src/providers/openai.ts +++ b/packages/llm/src/providers/openai.ts @@ -1,5 +1,6 @@ import { AuthOptions, type ProviderAuthOption } from "../route/auth-options" import type { Route, RouteDefaultsInput } from "../route/client" +import type { ProviderPackage } from "../provider-package" import { ProviderID, type ModelID } from "../schema" import * as OpenAIChat from "../protocols/openai-chat" import * as OpenAIResponses from "../protocols/openai-responses" @@ -21,6 +22,14 @@ export type Config = RouteDefaultsInput & readonly providerOptions?: OpenAIProviderOptionsInput } +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string + readonly queryParams?: Readonly> + readonly transport?: "http" | "websocket" + readonly providerOptions?: OpenAIProviderOptionsInput +} + const auth = (options: ProviderAuthOption<"optional">) => AuthOptions.bearer(options, "OPENAI_API_KEY") const defaults = (input: Config) => { @@ -57,7 +66,25 @@ export const configure = (input: Config = {}) => { export const provider = configure() -export const model = provider.model +const config = (settings: Settings): Config => ({ + apiKey: settings.apiKey, + baseURL: settings.baseURL, + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, + limits: settings.limits, + providerOptions: settings.providerOptions, + queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, +}) + +export const model: ProviderPackage.Definition["model"] = (id, settings) => { + const configured = configure(config(settings)) + if (settings.transport === undefined || settings.transport === "http") return configured.responses(id) + if (settings.transport === "websocket") return configured.responsesWebSocket(id) + throw new Error(`Unsupported OpenAI Responses transport: ${String(settings.transport)}`) +} + +export const chatModel: ProviderPackage.Definition["model"] = (id, settings) => + configure(config(settings)).chat(id) export const responses = provider.responses export const responsesWebSocket = provider.responsesWebSocket export const chat = provider.chat diff --git a/packages/llm/src/providers/openai/chat.ts b/packages/llm/src/providers/openai/chat.ts new file mode 100644 index 0000000000..eb92db8ac5 --- /dev/null +++ b/packages/llm/src/providers/openai/chat.ts @@ -0,0 +1,2 @@ +export { chatModel as model } from "../openai" +export type { Settings } from "../openai" diff --git a/packages/llm/src/providers/openai/responses.ts b/packages/llm/src/providers/openai/responses.ts new file mode 100644 index 0000000000..4db3a232c7 --- /dev/null +++ b/packages/llm/src/providers/openai/responses.ts @@ -0,0 +1,2 @@ +export { model } from "../openai" +export type { Settings } from "../openai" diff --git a/packages/llm/test/exports.test.ts b/packages/llm/test/exports.test.ts index 693a21638b..6ed66a0d8e 100644 --- a/packages/llm/test/exports.test.ts +++ b/packages/llm/test/exports.test.ts @@ -30,7 +30,6 @@ describe("public exports", () => { test("provider barrels expose user-facing facades", () => { expect(OpenAI.model).toBeFunction() - expect(OpenAI.provider.model).toBe(OpenAI.model) expect(OpenAI.provider.responses).toBe(OpenAI.responses) expect(OpenAI.provider.responsesWebSocket).toBe(OpenAI.responsesWebSocket) expect(OpenAI.configure({ apiKey: "fixture" }).responses).toBeFunction() diff --git a/packages/llm/test/provider-package.test.ts b/packages/llm/test/provider-package.test.ts index a4f1627c67..c8cba78eb1 100644 --- a/packages/llm/test/provider-package.test.ts +++ b/packages/llm/test/provider-package.test.ts @@ -8,16 +8,12 @@ describe("provider package entrypoints", () => { import("@opencode-ai/llm/providers/openai/responses"), import("@opencode-ai/llm/providers/openai/chat"), import("@opencode-ai/llm/providers/anthropic"), - import("@opencode-ai/llm/providers/anthropic/messages"), import("@opencode-ai/llm/providers/openai-compatible"), - import("@opencode-ai/llm/providers/openai-compatible/chat"), import("@opencode-ai/llm/providers/amazon-bedrock"), ]) for (const module of modules) expect(module.model).toBeFunction() expect(modules[0].model).toBe(modules[1].model) - expect(modules[3].model).toBe(modules[4].model) - expect(modules[5].model).toBe(modules[6].model) }) test("maps package settings onto the executable model", () => { From d1446a9e72a3aaef900f480f783ed981c9511a50 Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Wed, 24 Jun 2026 23:29:06 +0530 Subject: [PATCH 07/18] refactor(llm): name provider model identity --- packages/llm/src/provider-package.ts | 2 +- packages/llm/src/providers/amazon-bedrock.ts | 4 ++-- packages/llm/src/providers/anthropic.ts | 4 ++-- packages/llm/src/providers/openai-compatible.ts | 4 ++-- packages/llm/src/providers/openai.ts | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/llm/src/provider-package.ts b/packages/llm/src/provider-package.ts index 977a211864..fd878a9d06 100644 --- a/packages/llm/src/provider-package.ts +++ b/packages/llm/src/provider-package.ts @@ -10,7 +10,7 @@ export interface Settings extends Readonly> { } export interface Definition { - readonly model: (id: string, settings: ProviderSettings) => Model + readonly model: (modelID: string, settings: ProviderSettings) => Model } export * as ProviderPackage from "./provider-package" diff --git a/packages/llm/src/providers/amazon-bedrock.ts b/packages/llm/src/providers/amazon-bedrock.ts index e578d614c6..4e5040c9ec 100644 --- a/packages/llm/src/providers/amazon-bedrock.ts +++ b/packages/llm/src/providers/amazon-bedrock.ts @@ -50,7 +50,7 @@ export const configure = (input: Config = {}) => { } export const provider = configure() -export const model: ProviderPackage.Definition["model"] = (id, settings) => { +export const model: ProviderPackage.Definition["model"] = (modelID, settings) => { if (settings.auth === "bearer" && settings.apiKey === undefined) throw new Error("Amazon Bedrock bearer auth requires apiKey") if (settings.auth === "sigv4" && settings.apiKey !== undefined) @@ -64,5 +64,5 @@ export const model: ProviderPackage.Definition["model"] = (id, setting http: settings.body === undefined ? undefined : { body: { ...settings.body } }, limits: settings.limits, region: settings.region, - }).model(id) + }).model(modelID) } diff --git a/packages/llm/src/providers/anthropic.ts b/packages/llm/src/providers/anthropic.ts index 8ef0293eeb..1bf8bf569c 100644 --- a/packages/llm/src/providers/anthropic.ts +++ b/packages/llm/src/providers/anthropic.ts @@ -38,11 +38,11 @@ export const configure = (input: Config = {}) => { } export const provider = configure() -export const model: ProviderPackage.Definition["model"] = (id, settings) => +export const model: ProviderPackage.Definition["model"] = (modelID, settings) => configure({ apiKey: settings.apiKey, baseURL: settings.baseURL, headers: settings.headers === undefined ? undefined : { ...settings.headers }, http: settings.body === undefined ? undefined : { body: { ...settings.body } }, limits: settings.limits, - }).model(id) + }).model(modelID) diff --git a/packages/llm/src/providers/openai-compatible.ts b/packages/llm/src/providers/openai-compatible.ts index 36d9b3fd5a..8b5d23eed7 100644 --- a/packages/llm/src/providers/openai-compatible.ts +++ b/packages/llm/src/providers/openai-compatible.ts @@ -63,7 +63,7 @@ export const provider = { configure, } -export const model: ProviderPackage.Definition["model"] = (id, settings) => +export const model: ProviderPackage.Definition["model"] = (modelID, settings) => configure({ apiKey: settings.apiKey, baseURL: settings.baseURL, @@ -71,7 +71,7 @@ export const model: ProviderPackage.Definition["model"] = (id, setting http: settings.body === undefined ? undefined : { body: { ...settings.body } }, limits: settings.limits, provider: settings.provider, - }).model(id) + }).model(modelID) export const baseten = define(profiles.baseten) export const cerebras = define(profiles.cerebras) diff --git a/packages/llm/src/providers/openai.ts b/packages/llm/src/providers/openai.ts index b40a94514b..6b49b9def2 100644 --- a/packages/llm/src/providers/openai.ts +++ b/packages/llm/src/providers/openai.ts @@ -76,15 +76,15 @@ const config = (settings: Settings): Config => ({ queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, }) -export const model: ProviderPackage.Definition["model"] = (id, settings) => { +export const model: ProviderPackage.Definition["model"] = (modelID, settings) => { const configured = configure(config(settings)) - if (settings.transport === undefined || settings.transport === "http") return configured.responses(id) - if (settings.transport === "websocket") return configured.responsesWebSocket(id) + if (settings.transport === undefined || settings.transport === "http") return configured.responses(modelID) + if (settings.transport === "websocket") return configured.responsesWebSocket(modelID) throw new Error(`Unsupported OpenAI Responses transport: ${String(settings.transport)}`) } -export const chatModel: ProviderPackage.Definition["model"] = (id, settings) => - configure(config(settings)).chat(id) +export const chatModel: ProviderPackage.Definition["model"] = (modelID, settings) => + configure(config(settings)).chat(modelID) export const responses = provider.responses export const responsesWebSocket = provider.responsesWebSocket export const chat = provider.chat From 1a9bd8c1fde07e7fe8ec08ac3444fce04bed7a34 Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Thu, 25 Jun 2026 19:49:14 +0530 Subject: [PATCH 08/18] refactor(schema): flatten provider identity --- packages/core/src/catalog.ts | 29 +---- packages/core/src/config/plugin/provider.ts | 91 ++----------- packages/core/src/config/provider.ts | 37 ++++-- packages/core/src/model.ts | 69 ++++++++-- packages/core/src/provider-overlay.ts | 34 ----- packages/core/src/provider.ts | 63 ++++++--- packages/core/src/session/runner/model.ts | 10 +- packages/core/src/v1/config/migrate.ts | 38 ++++-- packages/core/test/catalog.test.ts | 1 - packages/core/test/config/config.test.ts | 31 +++-- packages/core/test/config/provider.test.ts | 120 +++--------------- .../core/test/session-runner-model.test.ts | 29 ----- packages/core/test/shared-schema.test.ts | 51 ++++++-- packages/schema/src/model.ts | 47 ++----- packages/schema/src/provider.ts | 41 +----- packages/sdk/js/src/v2/gen/types.gen.ts | 5 - 16 files changed, 261 insertions(+), 435 deletions(-) delete mode 100644 packages/core/src/provider-overlay.ts diff --git a/packages/core/src/catalog.ts b/packages/core/src/catalog.ts index 00fbb5f3dc..431aa004b3 100644 --- a/packages/core/src/catalog.ts +++ b/packages/core/src/catalog.ts @@ -7,7 +7,6 @@ import { EventV2 } from "./event" import { Policy } from "./policy" import { State } from "./state" import { Integration } from "./integration" -import { ProviderOverlay } from "./provider-overlay" export type ProviderRecord = { provider: ProviderV2.MutableInfo @@ -78,32 +77,16 @@ export const layer = Layer.effect( const projectModel = (model: ModelV2.Info, provider: ProviderV2.Info) => { const api = - model.api.type === "native" && !model.api.package - ? { - ...provider.api, - id: model.api.id, - url: model.api.url ?? provider.api.url, - settings: ProviderOverlay.mergeRecords(provider.api.settings, model.api.settings), - } - : model.api.type === "native" && provider.api.type === "native" && !model.api.url - ? { - ...model.api, - package: model.api.package ?? provider.api.package, - url: provider.api.url, - settings: ProviderOverlay.mergeRecords(provider.api.settings, model.api.settings), - } + model.api.type === "native" && !model.api.url && Object.keys(model.api.settings).length === 0 + ? { ...provider.api, id: model.api.id } : model.api.type === "aisdk" && provider.api.type === "aisdk" && !model.api.url - ? { - ...model.api, - url: provider.api.url, - settings: ProviderOverlay.mergeRecords(provider.api.settings, model.api.settings), - } + ? { ...model.api, url: provider.api.url, settings: { ...provider.api.settings, ...model.api.settings } } : model.api.type === "aisdk" && provider.api.type === "aisdk" - ? { ...model.api, settings: ProviderOverlay.mergeRecords(provider.api.settings, model.api.settings) } + ? { ...model.api, settings: { ...provider.api.settings, ...model.api.settings } } : model.api const request = { - headers: ProviderOverlay.mergeHeaders(provider.request.headers, model.request.headers), - body: ProviderOverlay.mergeRecords(provider.request.body, model.request.body), + headers: { ...provider.request.headers, ...model.request.headers }, + body: { ...provider.request.body, ...model.request.body }, variant: model.request.variant, } return ModelV2.Info.make({ diff --git a/packages/core/src/config/plugin/provider.ts b/packages/core/src/config/plugin/provider.ts index 85dfced30c..6f6e0528da 100644 --- a/packages/core/src/config/plugin/provider.ts +++ b/packages/core/src/config/plugin/provider.ts @@ -5,7 +5,6 @@ import { Effect } from "effect" import { Config } from "../../config" import { ModelV2 } from "../../model" import { ProviderV2 } from "../../provider" -import { ProviderOverlay } from "../../provider-overlay" export const Plugin = define({ id: "config-provider", @@ -48,90 +47,22 @@ export const Plugin = define({ const model = ModelV2.parse(configuredDefault) catalog.model.default.set(model.providerID, model.modelID) } - const providerAiSDK = new Map() - const modelAiSDK = new Map() for (const file of files) { for (const [id, item] of Object.entries(file.info.providers ?? {})) { const providerID = id - if (item.aiSDK !== undefined) providerAiSDK.set(providerID, item.aiSDK) catalog.provider.update(providerID, (provider) => { if (item.name !== undefined) provider.name = item.name - if (item.package !== undefined) { - const settings = ProviderOverlay.mergeRecords(provider.api.settings, item.settings) - const url = - item.settings && Object.hasOwn(item.settings, "baseURL") - ? typeof settings.baseURL === "string" - ? settings.baseURL - : undefined - : provider.api.url - provider.api = (providerAiSDK.get(providerID) ?? provider.api.type === "aisdk") - ? { type: "aisdk", package: item.package, ...(url === undefined ? {} : { url }), settings } - : { type: "native", package: item.package, ...(url === undefined ? {} : { url }), settings } - } else if (item.settings !== undefined) { - provider.api.settings = ProviderOverlay.mergeRecords(provider.api.settings, item.settings) - if (Object.hasOwn(item.settings, "baseURL")) { - provider.api.url = - typeof provider.api.settings.baseURL === "string" ? provider.api.settings.baseURL : undefined - } + if (item.api !== undefined) provider.api = { ...item.api } + if (item.request !== undefined) { + Object.assign(provider.request.headers, item.request.headers) + Object.assign(provider.request.body, item.request.body) } - if (item.package === undefined && item.aiSDK !== undefined) { - if (item.aiSDK && provider.api.type === "native" && provider.api.package !== undefined) { - provider.api = { ...provider.api, type: "aisdk", package: provider.api.package } - } - if (!item.aiSDK && provider.api.type === "aisdk") { - provider.api = { ...provider.api, type: "native", settings: provider.api.settings ?? {} } - } - } - ProviderOverlay.assign(provider.request, { headers: item.headers, body: item.body }) }) - const providerApi = catalog.provider.get(providerID)?.provider.api for (const [id, config] of Object.entries(item.models ?? {})) { - const modelKey = `${providerID}/${id}` - if (config.aiSDK !== undefined) modelAiSDK.set(modelKey, config.aiSDK) catalog.model.update(providerID, id, (model) => { if (config.family !== undefined) model.family = config.family if (config.name !== undefined) model.name = config.name - if (config.id !== undefined) model.api.id = config.id - if (config.package !== undefined) { - const aiSDK = - modelAiSDK.get(modelKey) ?? providerAiSDK.get(providerID) ?? providerApi?.type === "aisdk" - const settings = ProviderOverlay.mergeRecords(model.api.settings, config.settings) - const url = - config.settings && Object.hasOwn(config.settings, "baseURL") - ? typeof settings.baseURL === "string" - ? settings.baseURL - : undefined - : model.api.url - model.api = aiSDK - ? { - id: model.api.id, - type: "aisdk", - package: config.package, - ...(url === undefined ? {} : { url }), - settings, - } - : { - id: model.api.id, - type: "native", - package: config.package, - ...(url === undefined ? {} : { url }), - settings, - } - } else if (config.settings !== undefined) { - model.api.settings = ProviderOverlay.mergeRecords(model.api.settings, config.settings) - if (Object.hasOwn(config.settings, "baseURL")) { - model.api.url = - typeof model.api.settings.baseURL === "string" ? model.api.settings.baseURL : undefined - } - } - if (config.package === undefined && config.aiSDK !== undefined) { - if (config.aiSDK && model.api.type === "native" && model.api.package !== undefined) { - model.api = { ...model.api, type: "aisdk", package: model.api.package } - } - if (!config.aiSDK && model.api.type === "aisdk") { - model.api = { ...model.api, type: "native", settings: model.api.settings ?? {} } - } - } + if (config.api !== undefined) model.api = { ...model.api, ...config.api } if (config.capabilities !== undefined) { model.capabilities = { tools: config.capabilities.tools, @@ -139,24 +70,24 @@ export const Plugin = define({ output: [...config.capabilities.output], } } - if (config.headers !== undefined || config.body !== undefined) { - ProviderOverlay.assign(model.request, { headers: config.headers, body: config.body }) + if (config.request !== undefined) { + Object.assign(model.request.headers, config.request.headers) + Object.assign(model.request.body, config.request.body) + if (config.request.variant !== undefined) model.request.variant = config.request.variant } - if (config.variant !== undefined) model.request.variant = config.variant if (config.variants !== undefined) { for (const variant of config.variants) { let existing = model.variants.find((item) => item.id === variant.id) if (!existing) { existing = { id: variant.id, - settings: {}, headers: {}, body: {}, } model.variants.push(existing) } - existing.settings = ProviderOverlay.mergeRecords(existing.settings, variant.settings) - ProviderOverlay.assign(existing, { headers: variant.headers, body: variant.body }) + Object.assign(existing.headers, variant.headers) + Object.assign(existing.body, variant.body) } } if (config.cost !== undefined) { diff --git a/packages/core/src/config/provider.ts b/packages/core/src/config/provider.ts index 665799ec3f..1b54757078 100644 --- a/packages/core/src/config/provider.ts +++ b/packages/core/src/config/provider.ts @@ -1,6 +1,7 @@ export * as ConfigProvider from "./provider" import { Schema } from "effect" +import { ProviderV2 } from "../provider" import { ModelV2 } from "../model" export class Request extends Schema.Class("ConfigV2.Provider.Request")({ @@ -8,11 +9,6 @@ export class Request extends Schema.Class("ConfigV2.Provider.Request")( body: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), }) {} -const Overlays = { - settings: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), - ...Request.fields, -} - class Cache extends Schema.Class("ConfigV2.Model.Cost.Cache")({ read: Schema.Finite.pipe(Schema.optional), write: Schema.Finite.pipe(Schema.optional), @@ -34,18 +30,32 @@ class Limit extends Schema.Class("ConfigV2.Model.Limit")({ output: Schema.Int.pipe(Schema.optional), }) {} +const ModelApi = Schema.Union([ + Schema.Struct({ + id: ModelV2.ID.pipe(Schema.optional), + ...ProviderV2.AISDK.fields, + }), + Schema.Struct({ + id: ModelV2.ID.pipe(Schema.optional), + ...ProviderV2.Native.fields, + }), + Schema.Struct({ + id: ModelV2.ID, + }), +]) + class Model extends Schema.Class("ConfigV2.Model")({ - id: ModelV2.ID.pipe(Schema.optional), - package: Schema.String.pipe(Schema.optional), - aiSDK: Schema.Boolean.pipe(Schema.optional), - ...Overlays, family: ModelV2.Family.pipe(Schema.optional), name: Schema.String.pipe(Schema.optional), + api: ModelApi.pipe(Schema.optional), capabilities: ModelV2.Capabilities.pipe(Schema.optional), - variant: Schema.String.pipe(Schema.optional), + request: Schema.Struct({ + ...Request.fields, + variant: Schema.String.pipe(Schema.optional), + }).pipe(Schema.optional), variants: Schema.Struct({ id: ModelV2.VariantID, - ...Overlays, + ...Request.fields, }).pipe(Schema.Array, Schema.optional), cost: Schema.Union([Cost, Cost.pipe(Schema.Array)]).pipe(Schema.optional), disabled: Schema.Boolean.pipe(Schema.optional), @@ -55,8 +65,7 @@ class Model extends Schema.Class("ConfigV2.Model")({ export class Info extends Schema.Class("ConfigV2.Provider")({ name: Schema.String.pipe(Schema.optional), env: Schema.String.pipe(Schema.Array, Schema.optional), - package: Schema.String.pipe(Schema.optional), - aiSDK: Schema.Boolean.pipe(Schema.optional), - ...Overlays, + api: ProviderV2.Api.pipe(Schema.optional), + request: Request.pipe(Schema.optional), models: Schema.Record(Schema.String, Model).pipe(Schema.optional), }) {} diff --git a/packages/core/src/model.ts b/packages/core/src/model.ts index bb22033943..bae4408560 100644 --- a/packages/core/src/model.ts +++ b/packages/core/src/model.ts @@ -1,6 +1,8 @@ -import { Types } from "effect" +import { Schema } from "effect" import { Model } from "@opencode-ai/schema/model" import { ProviderV2 } from "./provider" +import { withStatics } from "./schema" +import type { DeepMutable } from "./schema" export const ID = Model.ID export type ID = typeof ID.Type @@ -8,10 +10,6 @@ export type ID = typeof ID.Type export const VariantID = Model.VariantID export type VariantID = typeof VariantID.Type -export const Package = Model.Package -export type Package = Model.Package - -// Grouping of models, eg claude opus, claude sonnet export const Family = Model.Family export type Family = Model.Family @@ -23,15 +21,62 @@ export const Cost = Model.Cost export const Ref = Model.Ref export type Ref = typeof Ref.Type -export const Api = Model.Api -export type Api = Model.Api +// Temporary runtime schema until core catalog consumers migrate to the flat +// package identity in @opencode-ai/schema. +export const Api = Schema.Union([ + Schema.Struct({ id: ID, ...ProviderV2.AISDK.fields }), + Schema.Struct({ id: ID, ...ProviderV2.Native.fields }), +]).pipe(Schema.toTaggedUnion("type")) +export type Api = typeof Api.Type -export const Info = Model.Info -export type Info = Model.Info +export interface Info extends Schema.Schema.Type {} +export const Info = Schema.Struct({ + id: ID, + providerID: ProviderV2.ID, + family: Family.pipe(Schema.optional), + name: Schema.String, + api: Api, + capabilities: Capabilities, + request: Schema.Struct({ + ...ProviderV2.Request.fields, + variant: Schema.String.pipe(Schema.optional), + }), + variants: Schema.Struct({ + id: VariantID, + ...ProviderV2.Request.fields, + }).pipe(Schema.Array, Schema.mutable), + time: Schema.Struct({ released: Schema.Finite }), + cost: Cost.pipe(Schema.Array, Schema.mutable), + status: Schema.Literals(["alpha", "beta", "deprecated", "active"]), + enabled: Schema.Boolean, + limit: Schema.Struct({ + context: Schema.Int, + input: Schema.Int.pipe(Schema.optional), + output: Schema.Int, + }), +}) + .annotate({ identifier: "ModelV2.Info" }) + .pipe( + withStatics((schema) => ({ + empty: (providerID: ProviderV2.ID, modelID: ID) => + schema.make({ + id: modelID, + providerID, + name: modelID, + api: { id: modelID, type: "native", settings: {} }, + capabilities: { tools: false, input: [], output: [] }, + request: { headers: {}, body: {} }, + variants: [], + time: { released: 0 }, + cost: [], + status: "active", + enabled: true, + limit: { context: 0, output: 0 }, + }), + })), + ) -export type MutableInfo = Omit, "api"> & { - api: ProviderV2.MutableApi -} +export type MutableInfo = Omit, "api"> & { api: ProviderV2.MutableApi } export function parse(input: string): { providerID: ProviderV2.ID; modelID: ID } { const [providerID, ...modelID] = input.split("/") diff --git a/packages/core/src/provider-overlay.ts b/packages/core/src/provider-overlay.ts deleted file mode 100644 index 2a2044c929..0000000000 --- a/packages/core/src/provider-overlay.ts +++ /dev/null @@ -1,34 +0,0 @@ -export * as ProviderOverlay from "./provider-overlay" - -const isRecord = (value: unknown): value is Record => - typeof value === "object" && value !== null && !Array.isArray(value) - -export const mergeRecords = (...items: ReadonlyArray> | undefined>) => { - const result: Record = {} - for (const item of items) { - for (const [key, value] of Object.entries(item ?? {})) { - result[key] = isRecord(result[key]) && isRecord(value) ? mergeRecords(result[key], value) : value - } - } - return result -} - -export const mergeHeaders = (...items: ReadonlyArray> | undefined>) => { - const result = new Map() - for (const item of items) { - for (const entry of Object.entries(item ?? {})) result.set(entry[0].toLowerCase(), entry) - } - return Object.fromEntries(result.values()) -} - -export const assign = ( - target: { headers: Record; body: Record }, - overlay: { readonly headers?: Readonly>; readonly body?: Readonly> }, -) => { - const headers = mergeHeaders(target.headers, overlay.headers) - Object.keys(target.headers).forEach((key) => delete target.headers[key]) - Object.assign(target.headers, headers) - const body = mergeRecords(target.body, overlay.body) - Object.keys(target.body).forEach((key) => delete target.body[key]) - Object.assign(target.body, body) -} diff --git a/packages/core/src/provider.ts b/packages/core/src/provider.ts index 95de2c3ebc..d1a541dd65 100644 --- a/packages/core/src/provider.ts +++ b/packages/core/src/provider.ts @@ -1,30 +1,61 @@ export * as ProviderV2 from "./provider" -import { Types } from "effect" +import { Schema } from "effect" import { Provider } from "@opencode-ai/schema/provider" +import { Integration } from "./integration" +import { withStatics } from "./schema" +import type { DeepMutable } from "./schema" export const ID = Provider.ID export type ID = typeof ID.Type -export const Overlays = Provider.Overlays +// Temporary runtime schema until core catalog consumers migrate to the flat +// package identity in @opencode-ai/schema. +export interface AISDK extends Schema.Schema.Type {} +export const AISDK = Schema.Struct({ + type: Schema.Literal("aisdk"), + package: Schema.String, + url: Schema.String.pipe(Schema.optional), + settings: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), +}) -export const Package = Provider.Package -export type Package = Provider.Package +export interface Native extends Schema.Schema.Type {} +export const Native = Schema.Struct({ + type: Schema.Literal("native"), + url: Schema.String.pipe(Schema.optional), + settings: Schema.Record(Schema.String, Schema.Unknown), +}) -export const AISDK = Provider.AISDK - -export const Native = Provider.Native - -export const Api = Provider.Api -export type Api = Provider.Api -export type MutableApi = T extends Api - ? Omit, "settings"> & (undefined extends T["settings"] ? { settings?: any } : { settings: any }) - : never +export const Api = Schema.Union([AISDK, Native]).pipe(Schema.toTaggedUnion("type")) +export type Api = typeof Api.Type export const Request = Provider.Request export type Request = Provider.Request -export const Info = Provider.Info -export type Info = Provider.Info +export interface Info extends Schema.Schema.Type {} +export const Info = Schema.Struct({ + id: ID, + integrationID: Integration.ID.pipe(Schema.optional), + name: Schema.String, + disabled: Schema.Boolean.pipe(Schema.optional), + api: Api, + request: Request, +}) + .annotate({ identifier: "ProviderV2.Info" }) + .pipe( + withStatics((schema) => ({ + empty: (id: ID) => + schema.make({ + id, + name: id, + api: { type: "native", settings: {} }, + request: { headers: {}, body: {} }, + }), + })), + ) -export type MutableInfo = Omit, "api"> & { api: MutableApi } +export type MutableApi = T extends Api + ? Omit, "settings"> & (undefined extends T["settings"] ? { settings?: any } : { settings: any }) + : never + +export type MutableInfo = Omit, "api"> & { api: MutableApi } diff --git a/packages/core/src/session/runner/model.ts b/packages/core/src/session/runner/model.ts index b24746ef10..b864df8ba3 100644 --- a/packages/core/src/session/runner/model.ts +++ b/packages/core/src/session/runner/model.ts @@ -12,7 +12,6 @@ import { Credential } from "../../credential" import { Integration } from "../../integration" import { ModelV2 } from "../../model" import { ProviderV2 } from "../../provider" -import { ProviderOverlay } from "../../provider-overlay" import { SessionSchema } from "../schema" export class ModelNotSelectedError extends Schema.TaggedErrorClass()( @@ -118,13 +117,8 @@ const withVariant = ( return Effect.succeed( variant ? produce(model, (draft) => { - if (variant.settings !== undefined) { - draft.api.settings = ProviderOverlay.mergeRecords(draft.api.settings, variant.settings) - if (Object.hasOwn(variant.settings, "baseURL")) { - draft.api.url = typeof draft.api.settings.baseURL === "string" ? draft.api.settings.baseURL : undefined - } - } - ProviderOverlay.assign(draft.request, variant) + Object.assign(draft.request.headers, variant.headers) + Object.assign(draft.request.body, variant.body) }) : model, ) diff --git a/packages/core/src/v1/config/migrate.ts b/packages/core/src/v1/config/migrate.ts index 6e35e10f5e..1583c6c1d5 100644 --- a/packages/core/src/v1/config/migrate.ts +++ b/packages/core/src/v1/config/migrate.ts @@ -173,14 +173,15 @@ function migrateProvider(info: ConfigProviderV1.Info) { return { name: info.name, env: info.env, - package: info.npm, - aiSDK: info.npm ? true : undefined, - settings: { - ...options.settings, - ...(info.api ?? options.url ? { baseURL: info.api ?? options.url } : {}), - }, - headers: options.headers, - body: options.body, + api: info.npm + ? { + type: "aisdk" as const, + package: info.npm, + url: info.api ?? options.url, + settings: options.settings ?? {}, + } + : undefined, + request: info.options && { headers: options.headers, body: options.body }, models: info.models && Object.fromEntries(Object.entries(info.models).map(([name, model]) => [name, migrateModel(model, info.npm)])), @@ -215,13 +216,22 @@ function migrateModel(info: typeof ConfigProviderV1.Model.Type, packageName?: st return { family: info.family, name: info.name, - id: info.id, - package: info.provider?.npm, - aiSDK: info.provider?.npm ? true : undefined, - settings: info.provider?.api ? { baseURL: info.provider.api } : undefined, + api: info.provider?.npm + ? { + ...(info.id === undefined ? {} : { id: info.id }), + type: "aisdk" as const, + package: info.provider.npm, + url: info.provider.api, + settings: {}, + } + : info.id === undefined + ? undefined + : { id: info.id }, capabilities, - headers: info.headers, - body: request, + request: (info.headers || request) && { + headers: info.headers, + body: request, + }, variants: info.variants && Object.entries(info.variants).map(([id, options]) => ({ diff --git a/packages/core/test/catalog.test.ts b/packages/core/test/catalog.test.ts index bc5a74efc0..a3a1c4972d 100644 --- a/packages/core/test/catalog.test.ts +++ b/packages/core/test/catalog.test.ts @@ -213,7 +213,6 @@ describe("CatalogV2", () => { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://provider.example.com", - settings: {}, }) }), ) diff --git a/packages/core/test/config/config.test.ts b/packages/core/test/config/config.test.ts index 756977104b..b092bb5582 100644 --- a/packages/core/test/config/config.test.ts +++ b/packages/core/test/config/config.test.ts @@ -103,10 +103,13 @@ describe("Config", () => { }, }) - expect(migrated.providers?.bedrock).toMatchObject({ + expect(migrated.providers?.bedrock?.api).toEqual({ + type: "aisdk", package: "@ai-sdk/amazon-bedrock", - aiSDK: true, + url: undefined, settings: { region: "us-east-1", profile: "dev" }, + }) + expect(migrated.providers?.bedrock?.request).toEqual({ headers: { "x-test": "1" }, body: { trace: true }, }) @@ -582,34 +585,34 @@ describe("Config", () => { }) expect(documents[0]?.info.attachments).toEqual({ image: { auto_resize: false, max_width: 1200 } }) expect(documents[0]?.info.providers?.custom).toMatchObject({ - body: { apiKey: "secret" }, + request: { body: { apiKey: "secret" } }, models: { model: { - body: { reasoningEffort: "high" }, + request: { body: { reasoningEffort: "high" } }, variants: [{ id: "fast", body: { temperature: 0.2 } }], }, }, }) expect(documents[0]?.info.providers?.openai).toMatchObject({ - package: "@ai-sdk/openai", - aiSDK: true, - settings: {}, - headers: { Authorization: "Bearer secret", "OpenAI-Organization": "org" }, + api: { settings: {} }, + request: { headers: { Authorization: "Bearer secret", "OpenAI-Organization": "org" } }, models: { model: { - body: { temperature: 0.3, reasoning_effort: "high", service_tier: "priority" }, + request: { + body: { temperature: 0.3, reasoning_effort: "high", service_tier: "priority" }, + }, variants: [{ id: "high", body: { reasoning_effort: "high", reasoning_summary: "auto" } }], }, }, }) expect(documents[0]?.info.providers?.anthropic).toMatchObject({ - package: "@ai-sdk/anthropic", - aiSDK: true, models: { model: { - body: { - output_config: { effort: "high", task_budget: 4096 }, - metadata: { user_id: "user-1" }, + request: { + body: { + output_config: { effort: "high", task_budget: 4096 }, + metadata: { user_id: "user-1" }, + }, }, }, }, diff --git a/packages/core/test/config/provider.test.ts b/packages/core/test/config/provider.test.ts index 602852d701..605bcd63cf 100644 --- a/packages/core/test/config/provider.test.ts +++ b/packages/core/test/config/provider.test.ts @@ -45,90 +45,16 @@ function withEnv(vars: Record, effect: () = ) } +function request(headers: Record, variant?: string) { + return { + headers, + variant, + } +} + const decode = Schema.decodeUnknownSync(Config.Info) describe("ConfigProviderPlugin.Plugin", () => { - it.effect("merges flat provider and model overlays", () => - Effect.gen(function* () { - const catalog = yield* Catalog.Service - const providerID = ProviderV2.ID.make("custom") - const modelID = ModelV2.ID.make("chat") - const config = Config.Service.of({ - entries: () => - Effect.succeed([ - new Config.Document({ - type: "document", - info: decode({ providers: { custom: { aiSDK: true } } }), - }), - new Config.Document({ - type: "document", - info: decode({ - providers: { - custom: { - package: "custom-provider", - settings: { auth: { type: "token", region: "us-east-1" } }, - headers: { "X-Test": "provider" }, - body: { reasoning: { type: "enabled", budget: 8_000 }, tags: ["provider"] }, - models: { - chat: { - package: "custom-model-provider", - settings: { auth: { region: "us-west-2" } }, - headers: { "x-test": "model" }, - body: { reasoning: { budget: 32_000 }, tags: ["model"] }, - }, - inherit: { - settings: { auth: { region: "eu-west-1" }, baseURL: "https://model.example/v1" }, - }, - clear: { settings: { baseURL: "https://old.example/v1" } }, - }, - }, - }, - }), - }), - new Config.Document({ - type: "document", - info: decode({ - providers: { - custom: { models: { clear: { package: "custom-provider", settings: { baseURL: null } } } }, - }, - }), - }), - ]), - }) - - yield* addPlugin(config) - - const model = required(yield* catalog.model.get(providerID, modelID)) - expect(model.api).toEqual({ - id: modelID, - type: "aisdk", - package: "custom-model-provider", - settings: { auth: { type: "token", region: "us-west-2" } }, - }) - expect(model.request.headers).toEqual({ "x-test": "model" }) - expect(model.request.body).toEqual({ - reasoning: { type: "enabled", budget: 32_000 }, - tags: ["model"], - }) - expect(required(yield* catalog.model.get(providerID, ModelV2.ID.make("inherit"))).api).toEqual({ - id: ModelV2.ID.make("inherit"), - type: "aisdk", - package: "custom-provider", - url: "https://model.example/v1", - settings: { - auth: { type: "token", region: "eu-west-1" }, - baseURL: "https://model.example/v1", - }, - }) - expect(required(yield* catalog.model.get(providerID, ModelV2.ID.make("clear"))).api).toEqual({ - id: ModelV2.ID.make("clear"), - type: "aisdk", - package: "custom-provider", - settings: { auth: { type: "token", region: "us-east-1" }, baseURL: null }, - }) - }), - ) - it.effect("keeps configured model variant bodies unchanged", () => Effect.gen(function* () { const catalog = yield* Catalog.Service @@ -142,9 +68,7 @@ describe("ConfigProviderPlugin.Plugin", () => { info: decode({ providers: { opencode: { - package: "@ai-sdk/openai", - aiSDK: true, - settings: { baseURL: "https://opencode.test/v1" }, + api: { type: "aisdk", package: "@ai-sdk/openai", url: "https://opencode.test/v1" }, models: { "alpha-gpt-next": { variants: [ @@ -195,9 +119,7 @@ describe("ConfigProviderPlugin.Plugin", () => { info: decode({ providers: { opencode: { - package: "@ai-sdk/openai", - aiSDK: true, - settings: { baseURL: "https://opencode.test/v1" }, + api: { type: "aisdk", package: "@ai-sdk/openai", url: "https://opencode.test/v1" }, }, }, }), @@ -247,8 +169,8 @@ describe("ConfigProviderPlugin.Plugin", () => { custom: { name: "Configured", env: ["CUSTOM_API_KEY"], - package: "custom-native", - headers: { first: "first", shared: "first" }, + api: { type: "native", settings: {} }, + request: request({ first: "first", shared: "first" }), models: { chat: { name: "First", @@ -256,8 +178,7 @@ describe("ConfigProviderPlugin.Plugin", () => { disabled: true, limit: { context: 100, output: 50 }, cost: { input: 1, output: 2 }, - headers: { first: "first", shared: "first" }, - variant: "retained", + request: request({ first: "first", shared: "first" }, "retained"), variants: [ { id: "fast", @@ -276,19 +197,17 @@ describe("ConfigProviderPlugin.Plugin", () => { model: "custom/default", providers: { custom: { - package: "custom-sdk", - aiSDK: true, - settings: { baseURL: "https://example.test" }, - headers: { last: "last", shared: "last" }, + api: { type: "aisdk", package: "custom-sdk", url: "https://example.test" }, + request: request({ last: "last", shared: "last" }), models: { default: { name: "Default", }, chat: { - id: "api-chat", + api: { id: "api-chat" }, name: "Last", limit: { output: 75 }, - headers: { last: "last", shared: "last" }, + request: request({ last: "last", shared: "last" }), variants: [ { id: "fast", @@ -328,12 +247,7 @@ describe("ConfigProviderPlugin.Plugin", () => { }) expect((yield* integrations.get(Integration.ID.make("custom")))?.name).toBe("Renamed") expect(provider.disabled).toBeUndefined() - expect(provider.api).toEqual({ - type: "aisdk", - package: "custom-sdk", - url: "https://example.test", - settings: { baseURL: "https://example.test" }, - }) + expect(provider.api).toEqual({ type: "aisdk", package: "custom-sdk", url: "https://example.test" }) expect(provider.request.headers).toEqual({ first: "first", shared: "last", last: "last" }) expect(model.api.id).toBe(ModelV2.ID.make("api-chat")) expect(model.name).toBe("Last") diff --git a/packages/core/test/session-runner-model.test.ts b/packages/core/test/session-runner-model.test.ts index 502b021d80..94669b24be 100644 --- a/packages/core/test/session-runner-model.test.ts +++ b/packages/core/test/session-runner-model.test.ts @@ -141,35 +141,6 @@ describe("SessionRunnerModel", () => { }), ) - it.effect("applies a selected variant base URL", () => - Effect.gen(function* () { - const base = model( - { type: "aisdk", package: "@ai-sdk/openai", url: "https://default.example/v1" }, - [ - { - id: ModelV2.VariantID.make("regional"), - settings: { baseURL: "https://regional.example/v1" }, - headers: {}, - body: {}, - }, - ], - ) - const session = SessionV2.Info.make({ - id: SessionV2.ID.make("ses_regional_variant"), - projectID: ProjectV2.ID.global, - title: "test", - model: { id: base.id, providerID: base.providerID, variant: ModelV2.VariantID.make("regional") }, - cost: 0, - tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } }, - time: { created: DateTime.makeUnsafe(0), updated: DateTime.makeUnsafe(0) }, - location: { directory: AbsolutePath.make("/project") }, - }) - const resolved = yield* SessionRunnerModel.resolve(session, base) - - expect(resolved.route.endpoint.baseURL).toBe("https://regional.example/v1") - }), - ) - it.effect("overlays selected OpenAI-compatible Session variant bodies", () => Effect.gen(function* () { const catalog = model( diff --git a/packages/core/test/shared-schema.test.ts b/packages/core/test/shared-schema.test.ts index 4f529a1c62..1d4cebb660 100644 --- a/packages/core/test/shared-schema.test.ts +++ b/packages/core/test/shared-schema.test.ts @@ -96,20 +96,12 @@ test("Core reuses the canonical shared schemas", async () => { [coreLLM.ToolContent, LLM.ToolContent], [ModelV2.ID, Model.ID], [ModelV2.VariantID, Model.VariantID], - [ModelV2.Package, Model.Package], [ModelV2.Ref, Model.Ref], [ModelV2.Family, Model.Family], [ModelV2.Capabilities, Model.Capabilities], [ModelV2.Cost, Model.Cost], - [ModelV2.Api, Model.Api], - [ModelV2.Info, Model.Info], [ProviderV2.ID, Provider.ID], - [ProviderV2.Package, Provider.Package], - [ProviderV2.AISDK, Provider.AISDK], - [ProviderV2.Native, Provider.Native], - [ProviderV2.Api, Provider.Api], [ProviderV2.Request, Provider.Request], - [ProviderV2.Info, Provider.Info], [corePermission.Effect, Permission.Effect], [corePermission.Rule, Permission.Rule], [corePermission.Ruleset, Permission.Ruleset], @@ -157,15 +149,50 @@ test("Core reuses the canonical shared schemas", async () => { for (const [core, shared] of schemas) expect(core).toBe(shared) expect(Agent.Info.empty(Agent.ID.make("test"))).toEqual(AgentV2.Info.empty(AgentV2.ID.make("test"))) - expect(Model.Info.empty(Provider.ID.make("test"), Model.ID.make("model"))).toEqual( - ModelV2.Info.empty(ProviderV2.ID.make("test"), ModelV2.ID.make("model")), - ) - expect(Provider.Info.empty(Provider.ID.make("test"))).toEqual(ProviderV2.Info.empty(ProviderV2.ID.make("test"))) expect(Skill.Source.key(Skill.DirectorySource.make({ type: "directory", path: AbsolutePath.make("/tmp") }))).toBe( "directory:/tmp", ) }) +test("shared provider schemas use flat package identity", () => { + expect( + Schema.decodeUnknownSync(Provider.Info)({ + id: "openai", + name: "OpenAI", + package: "@opencode-ai/llm/providers/openai", + settings: { baseURL: "https://api.openai.com/v1" }, + headers: { "x-application": "opencode" }, + body: { service_tier: "priority" }, + }), + ).toMatchObject({ package: "@opencode-ai/llm/providers/openai" }) + expect( + Schema.decodeUnknownSync(Provider.Info)({ + id: "legacy", + name: "Legacy", + package: "aisdk:@ai-sdk/openai", + }), + ).toMatchObject({ package: "aisdk:@ai-sdk/openai" }) + expect( + Schema.decodeUnknownSync(Model.Info)({ + id: "claude-sonnet", + modelID: "us.anthropic.claude-sonnet-4-6", + providerID: "amazon-bedrock", + name: "Claude Sonnet", + package: "@opencode-ai/llm/providers/amazon-bedrock", + settings: { region: "us-west-2" }, + headers: {}, + body: { additionalModelRequestFields: { reasoning_config: { type: "enabled" } } }, + capabilities: { tools: true, input: ["text"], output: ["text"] }, + variants: [{ id: "max", settings: {}, body: { budget_tokens: 31999 } }], + time: { released: 0 }, + cost: [], + status: "active", + enabled: true, + limit: { context: 200000, output: 64000 }, + }), + ).toMatchObject({ id: "claude-sonnet", modelID: "us.anthropic.claude-sonnet-4-6" }) +}) + test("shared record schemas construct and decode plain objects", () => { const made = Prompt.make({ text: "hello" }) const decoded = Schema.decodeUnknownSync(Prompt)({ text: "hello" }) diff --git a/packages/schema/src/model.ts b/packages/schema/src/model.ts index 3af906d04c..4b04efd9f9 100644 --- a/packages/schema/src/model.ts +++ b/packages/schema/src/model.ts @@ -10,14 +10,6 @@ export type ID = typeof ID.Type export const VariantID = Schema.String.pipe(Schema.brand("VariantID")) export type VariantID = typeof VariantID.Type -export const Package = Schema.Struct({ - modelID: ID, - package: Schema.String.pipe(Schema.optional), - aiSDK: Schema.Boolean.pipe(Schema.optional), - ...Provider.Overlays, -}) -export type Package = typeof Package.Type - export const Ref = Schema.Struct({ id: ID, providerID: Provider.ID, @@ -49,35 +41,23 @@ export const Cost = Schema.Struct({ }), }) -export const Api = Schema.Union([ - Schema.Struct({ - id: ID, - ...Provider.AISDK.fields, - }), - Schema.Struct({ - id: ID, - ...Provider.Native.fields, - }), -]).pipe(Schema.toTaggedUnion("type")) -export type Api = typeof Api.Type +export interface Variant extends Schema.Schema.Type {} +export const Variant = Schema.Struct({ + id: VariantID, + ...Provider.Overlays, +}) export interface Info extends Schema.Schema.Type {} export const Info = Schema.Struct({ id: ID, + modelID: ID.pipe(Schema.optional), providerID: Provider.ID, family: Family.pipe(Schema.optional), name: Schema.String, - api: Api, + package: Provider.Package.pipe(Schema.optional), + ...Provider.Overlays, capabilities: Capabilities, - request: Schema.Struct({ - ...Provider.Request.fields, - variant: Schema.String.pipe(Schema.optional), - }), - variants: Schema.Struct({ - id: VariantID, - settings: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), - ...Provider.Request.fields, - }).pipe(Schema.Array, Schema.mutable), + variants: Variant.pipe(Schema.Array, Schema.mutable, Schema.optional), time: Schema.Struct({ released: Schema.Finite, }), @@ -93,15 +73,12 @@ export const Info = Schema.Struct({ .annotate({ identifier: "ModelV2.Info" }) .pipe( withStatics((schema) => ({ - empty: (providerID: Provider.ID, modelID: ID) => + empty: (providerID: Provider.ID, id: ID) => schema.make({ - id: modelID, + id, providerID, - name: modelID, - api: { id: modelID, type: "native", settings: {} }, + name: id, capabilities: { tools: false, input: [], output: [] }, - request: { headers: {}, body: {} }, - variants: [], time: { released: 0 }, cost: [], status: "active", diff --git a/packages/schema/src/provider.ts b/packages/schema/src/provider.ts index 21e24285a2..cd2cafaa45 100644 --- a/packages/schema/src/provider.ts +++ b/packages/schema/src/provider.ts @@ -22,38 +22,15 @@ export const ID = Schema.String.pipe( ) export type ID = typeof ID.Type +export const Package = Schema.String +export type Package = typeof Package.Type + export const Overlays = { settings: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), headers: Schema.Record(Schema.String, Schema.String).pipe(Schema.optional), body: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), } -export const Package = Schema.Struct({ - package: Schema.String, - aiSDK: Schema.Boolean.pipe(Schema.optional), - ...Overlays, -}) -export type Package = typeof Package.Type - -export interface AISDK extends Schema.Schema.Type {} -export const AISDK = Schema.Struct({ - type: Schema.Literal("aisdk"), - package: Schema.String, - url: Schema.String.pipe(Schema.optional), - settings: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), -}) - -export interface Native extends Schema.Schema.Type {} -export const Native = Schema.Struct({ - type: Schema.Literal("native"), - package: Schema.String.pipe(Schema.optional), - url: Schema.String.pipe(Schema.optional), - settings: Schema.Record(Schema.String, Schema.Unknown), -}) - -export const Api = Schema.Union([AISDK, Native]).pipe(Schema.toTaggedUnion("type")) -export type Api = typeof Api.Type - export interface Request extends Schema.Schema.Type {} export const Request = Schema.Struct({ headers: Schema.Record(Schema.String, Schema.String), @@ -66,18 +43,12 @@ export const Info = Schema.Struct({ integrationID: Integration.ID.pipe(Schema.optional), name: Schema.String, disabled: Schema.Boolean.pipe(Schema.optional), - api: Api, - request: Request, + package: Package, + ...Overlays, }) .annotate({ identifier: "ProviderV2.Info" }) .pipe( withStatics((schema) => ({ - empty: (id: ID) => - schema.make({ - id, - name: id, - api: { type: "native", settings: {} }, - request: { headers: {}, body: {} }, - }), + empty: (id: ID) => schema.make({ id, name: id, package: "" }), })), ) diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts index ece914c9d0..3116c295f1 100644 --- a/packages/sdk/js/src/v2/gen/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/types.gen.ts @@ -4002,7 +4002,6 @@ export type ModelV2Info = { | { id: string type: "native" - package?: string url?: string settings: { [key: string]: unknown @@ -4024,9 +4023,6 @@ export type ModelV2Info = { } variants: Array<{ id: string - settings?: { - [key: string]: unknown - } headers: { [key: string]: string } @@ -4074,7 +4070,6 @@ export type ProviderV2Info = { } | { type: "native" - package?: string url?: string settings: { [key: string]: unknown From aca5adf39e396886b000a52e98a338e2a9824f13 Mon Sep 17 00:00:00 2001 From: Dax Raad Date: Wed, 24 Jun 2026 12:51:59 -0400 Subject: [PATCH 09/18] refactor(core): flatten provider config --- packages/core/src/config/provider.ts | 39 ++-- packages/core/src/plugin/provider/opencode.ts | 4 +- packages/core/src/v1/config/migrate.ts | 38 ++-- .../core/src/v1/config/provider-options.ts | 201 ++---------------- packages/core/test/config/config.test.ts | 36 ++-- .../core/test/config/provider-options.test.ts | 197 ++--------------- 6 files changed, 76 insertions(+), 439 deletions(-) diff --git a/packages/core/src/config/provider.ts b/packages/core/src/config/provider.ts index 1b54757078..2dc038962c 100644 --- a/packages/core/src/config/provider.ts +++ b/packages/core/src/config/provider.ts @@ -1,12 +1,17 @@ export * as ConfigProvider from "./provider" import { Schema } from "effect" -import { ProviderV2 } from "../provider" import { ModelV2 } from "../model" -export class Request extends Schema.Class("ConfigV2.Provider.Request")({ +export const Overlays = { + settings: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), headers: Schema.Record(Schema.String, Schema.String).pipe(Schema.optional), body: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), +} + +export class Request extends Schema.Class("ConfigV2.Provider.Request")({ + headers: Overlays.headers, + body: Overlays.body, }) {} class Cache extends Schema.Class("ConfigV2.Model.Cost.Cache")({ @@ -30,32 +35,17 @@ class Limit extends Schema.Class("ConfigV2.Model.Limit")({ output: Schema.Int.pipe(Schema.optional), }) {} -const ModelApi = Schema.Union([ - Schema.Struct({ - id: ModelV2.ID.pipe(Schema.optional), - ...ProviderV2.AISDK.fields, - }), - Schema.Struct({ - id: ModelV2.ID.pipe(Schema.optional), - ...ProviderV2.Native.fields, - }), - Schema.Struct({ - id: ModelV2.ID, - }), -]) - class Model extends Schema.Class("ConfigV2.Model")({ + id: ModelV2.ID.pipe(Schema.optional), family: ModelV2.Family.pipe(Schema.optional), name: Schema.String.pipe(Schema.optional), - api: ModelApi.pipe(Schema.optional), + package: Schema.String.pipe(Schema.optional), + aisdk: Schema.Literal(true).pipe(Schema.optional), + ...Overlays, capabilities: ModelV2.Capabilities.pipe(Schema.optional), - request: Schema.Struct({ - ...Request.fields, - variant: Schema.String.pipe(Schema.optional), - }).pipe(Schema.optional), variants: Schema.Struct({ id: ModelV2.VariantID, - ...Request.fields, + ...Overlays, }).pipe(Schema.Array, Schema.optional), cost: Schema.Union([Cost, Cost.pipe(Schema.Array)]).pipe(Schema.optional), disabled: Schema.Boolean.pipe(Schema.optional), @@ -65,7 +55,8 @@ class Model extends Schema.Class("ConfigV2.Model")({ export class Info extends Schema.Class("ConfigV2.Provider")({ name: Schema.String.pipe(Schema.optional), env: Schema.String.pipe(Schema.Array, Schema.optional), - api: ProviderV2.Api.pipe(Schema.optional), - request: Request.pipe(Schema.optional), + package: Schema.String.pipe(Schema.optional), + aisdk: Schema.Literal(true).pipe(Schema.optional), + ...Overlays, models: Schema.Record(Schema.String, Model).pipe(Schema.optional), }) {} diff --git a/packages/core/src/plugin/provider/opencode.ts b/packages/core/src/plugin/provider/opencode.ts index 87a02d328a..8ef365e49c 100644 --- a/packages/core/src/plugin/provider/opencode.ts +++ b/packages/core/src/plugin/provider/opencode.ts @@ -144,12 +144,12 @@ export const OpencodePlugin = define ({ id: ModelV2.VariantID.make(id), headers: { ...(options.headers ?? {}) }, - body: lowerer.request(withoutCredentials(options)), + body: lowerer.model(withoutCredentials(options)), })) } if (config.release_date !== undefined) { diff --git a/packages/core/src/v1/config/migrate.ts b/packages/core/src/v1/config/migrate.ts index 1583c6c1d5..7914be66d5 100644 --- a/packages/core/src/v1/config/migrate.ts +++ b/packages/core/src/v1/config/migrate.ts @@ -173,15 +173,11 @@ function migrateProvider(info: ConfigProviderV1.Info) { return { name: info.name, env: info.env, - api: info.npm - ? { - type: "aisdk" as const, - package: info.npm, - url: info.api ?? options.url, - settings: options.settings ?? {}, - } - : undefined, - request: info.options && { headers: options.headers, body: options.body }, + package: info.npm, + aisdk: info.npm ? (true as const) : undefined, + settings: info.api ? { ...options.settings, baseURL: info.api } : options.settings, + headers: info.options && options.headers, + body: info.options && options.body, models: info.models && Object.fromEntries(Object.entries(info.models).map(([name, model]) => [name, migrateModel(model, info.npm)])), @@ -191,7 +187,7 @@ function migrateProvider(info: ConfigProviderV1.Info) { function migrateModel(info: typeof ConfigProviderV1.Model.Type, packageName?: string) { const packageID = info.provider?.npm ?? packageName const lowerer = ConfigProviderOptionsV1.get(packageID) - const request = info.options && lowerer.request(info.options) + const settings = info.options && lowerer.model(info.options) const costs = info.cost && [ { input: info.cost.input, @@ -214,29 +210,19 @@ function migrateModel(info: typeof ConfigProviderV1.Model.Type, packageName?: st ? { tools: info.tool_call ?? false, input: info.modalities?.input ?? [], output: info.modalities?.output ?? [] } : undefined return { + id: info.id, family: info.family, name: info.name, - api: info.provider?.npm - ? { - ...(info.id === undefined ? {} : { id: info.id }), - type: "aisdk" as const, - package: info.provider.npm, - url: info.provider.api, - settings: {}, - } - : info.id === undefined - ? undefined - : { id: info.id }, + package: info.provider?.npm, + aisdk: info.provider?.npm ? (true as const) : undefined, + settings: info.provider?.api ? { ...settings, baseURL: info.provider.api } : settings, capabilities, - request: (info.headers || request) && { - headers: info.headers, - body: request, - }, + headers: info.headers, variants: info.variants && Object.entries(info.variants).map(([id, options]) => ({ id, - body: lowerer.request(options), + settings: lowerer.model(options), })), cost: costs, disabled: info.status === "deprecated" ? true : undefined, diff --git a/packages/core/src/v1/config/provider-options.ts b/packages/core/src/v1/config/provider-options.ts index a441a1a211..01f813197f 100644 --- a/packages/core/src/v1/config/provider-options.ts +++ b/packages/core/src/v1/config/provider-options.ts @@ -3,209 +3,32 @@ export * as ConfigProviderOptionsV1 from "./provider-options" type Options = Readonly> export interface ProviderResult { + readonly settings: Record readonly headers?: Record readonly body?: Record - readonly url?: string - readonly settings?: Record } export interface Lowerer { readonly provider: (options: Options) => ProviderResult - readonly request: (options: Options) => Record + readonly model: (options: Options) => Record } -export function get(packageName?: string): Lowerer { - const key = packageName ?? "" - return Object.hasOwn(lowerers, key) ? lowerers[key]! : raw -} - -const raw: Lowerer = { - provider(options) { - return { body: clone(options) } - }, - request: clone, -} - -const openai: Lowerer = { +const lowerer: Lowerer = { provider(options) { return { - url: string(options.baseURL), - headers: compact({ - Authorization: bearer(options.apiKey), - "OpenAI-Organization": string(options.organization), - "OpenAI-Project": string(options.project), - ...headers(options.headers), - }), - body: body(options.body), - settings: omit(options, ["apiKey", "baseURL", "organization", "project", "headers", "body"]), + settings: Object.fromEntries(Object.entries(options).filter(([key]) => key !== "headers" && key !== "body")), + headers: record(options.headers, (value): value is string => typeof value === "string"), + body: record(options.body, () => true), } }, - request: snake, + model: (options) => ({ ...options }), } -const anthropic: Lowerer = { - provider(options) { - return { - url: string(options.baseURL), - headers: compact({ - "x-api-key": string(options.apiKey), - Authorization: options.authToken ? bearer(options.authToken) : undefined, - ...headers(options.headers), - }), - body: body(options.body), - settings: omit(options, ["apiKey", "authToken", "baseURL", "headers", "body"]), - } - }, - request(options) { - const result = snake(options) - if (options.effort !== undefined || options.taskBudget !== undefined) { - result.output_config = compactUnknown({ effort: options.effort, task_budget: options.taskBudget }) - delete result.effort - delete result.task_budget - } - if (isRecord(options.metadata) && options.metadata.userId !== undefined) { - result.metadata = { ...(isRecord(result.metadata) ? result.metadata : {}), user_id: options.metadata.userId } - } - return result - }, +export function get(_packageName?: string): Lowerer { + return lowerer } -const google: Lowerer = { - provider(options) { - return { - url: string(options.baseURL), - headers: compact({ "x-goog-api-key": string(options.apiKey), ...headers(options.headers) }), - body: body(options.body), - settings: omit(options, ["apiKey", "baseURL", "headers", "body"]), - } - }, - request(options) { - const generationConfig = pick(options, ["thinkingConfig", "responseModalities", "mediaResolution", "imageConfig"]) - return { - ...omit(options, ["thinkingConfig", "responseModalities", "mediaResolution", "imageConfig"]), - ...(Object.keys(generationConfig).length ? { generationConfig } : {}), - } - }, -} - -const azure: Lowerer = { - provider(options) { - return { - url: string(options.baseURL), - headers: compact({ "api-key": string(options.apiKey), ...headers(options.headers) }), - body: body(options.body), - settings: omit(options, ["apiKey", "baseURL", "headers", "body"]), - } - }, - request: openai.request, -} - -const bedrock: Lowerer = { - provider(options) { - return direct(options) - }, - request(options) { - return { additionalModelRequestFields: clone(options) } - }, -} - -const openaiCompatible: Lowerer = { - provider(options) { - return { ...direct(options, ["baseURL"]), url: string(options.baseURL) } - }, - request(options) { - const result = clone(options) - if (options.reasoningEffort !== undefined) { - result.reasoning_effort = options.reasoningEffort - delete result.reasoningEffort - } - return result - }, -} - -const lowerers: Readonly> = { - "@ai-sdk/openai": openai, - "@ai-sdk/anthropic": anthropic, - "@ai-sdk/google-vertex/anthropic": anthropic, - "@ai-sdk/google": google, - "@ai-sdk/google-vertex": google, - "@ai-sdk/azure": azure, - "@ai-sdk/amazon-bedrock": bedrock, - "@ai-sdk/openai-compatible": openaiCompatible, - "@ai-sdk/cerebras": openaiCompatible, - "@ai-sdk/deepinfra": openaiCompatible, - "@ai-sdk/groq": openaiCompatible, - "@ai-sdk/mistral": openaiCompatible, - "@ai-sdk/togetherai": openaiCompatible, - "@ai-sdk/xai": openaiCompatible, - "@openrouter/ai-sdk-provider": openaiCompatible, - "ai-gateway-provider": openaiCompatible, - "venice-ai-sdk-provider": openaiCompatible, -} - -function direct(options: Options, extraKeys: ReadonlyArray = []): ProviderResult { - return { - headers: headers(options.headers), - body: body(options.body), - settings: omit(options, ["headers", "body", ...extraKeys]), - } -} - -function body(input: unknown) { - if (!isRecord(input)) return undefined - return { ...input } -} - -function snake(options: Options) { - return Object.fromEntries(Object.entries(options).map(([key, value]) => [snakeKey(key), snakeValue(value)])) -} - -function snakeValue(value: unknown): unknown { - if (Array.isArray(value)) return value.map(snakeValue) - if (!isRecord(value)) return value - return Object.fromEntries(Object.entries(value).map(([key, value]) => [snakeKey(key), snakeValue(value)])) -} - -function snakeKey(key: string) { - return key.replace(/[A-Z]/g, (match) => "_" + match.toLowerCase()) -} - -function clone(options: Options) { - return { ...options } -} - -function omit(options: Options, keys: ReadonlyArray) { - return Object.fromEntries(Object.entries(options).filter(([key]) => !keys.includes(key))) -} - -function pick(options: Options, keys: ReadonlyArray) { - return Object.fromEntries(Object.entries(options).filter(([key]) => keys.includes(key))) -} - -function headers(input: unknown) { - if (!isRecord(input)) return undefined - return Object.fromEntries( - Object.entries(input).filter((entry): entry is [string, string] => typeof entry[1] === "string"), - ) -} - -function compact(input: Record) { - const entries = Object.entries(input).filter((entry): entry is [string, string] => entry[1] !== undefined) - return entries.length ? Object.fromEntries(entries) : undefined -} - -function compactUnknown(input: Record) { - return Object.fromEntries(Object.entries(input).filter((entry) => entry[1] !== undefined)) -} - -function string(input: unknown) { - return typeof input === "string" && input ? input : undefined -} - -function bearer(input: unknown) { - return typeof input === "string" && input ? `Bearer ${input}` : undefined -} - -function isRecord(input: unknown): input is Record { - return typeof input === "object" && input !== null && !Array.isArray(input) +function record(input: unknown, guard: (value: unknown) => value is T) { + if (typeof input !== "object" || input === null || Array.isArray(input)) return undefined + return Object.fromEntries(Object.entries(input).filter((entry): entry is [string, T] => guard(entry[1]))) } diff --git a/packages/core/test/config/config.test.ts b/packages/core/test/config/config.test.ts index b092bb5582..328b5a3b82 100644 --- a/packages/core/test/config/config.test.ts +++ b/packages/core/test/config/config.test.ts @@ -93,6 +93,7 @@ describe("Config", () => { provider: { bedrock: { npm: "@ai-sdk/amazon-bedrock", + api: "https://bedrock.example.com", options: { headers: { "x-test": "1" }, body: { trace: true }, @@ -103,13 +104,10 @@ describe("Config", () => { }, }) - expect(migrated.providers?.bedrock?.api).toEqual({ - type: "aisdk", + expect(migrated.providers?.bedrock).toMatchObject({ package: "@ai-sdk/amazon-bedrock", - url: undefined, - settings: { region: "us-east-1", profile: "dev" }, - }) - expect(migrated.providers?.bedrock?.request).toEqual({ + aisdk: true, + settings: { baseURL: "https://bedrock.example.com", region: "us-east-1", profile: "dev" }, headers: { "x-test": "1" }, body: { trace: true }, }) @@ -585,34 +583,32 @@ describe("Config", () => { }) expect(documents[0]?.info.attachments).toEqual({ image: { auto_resize: false, max_width: 1200 } }) expect(documents[0]?.info.providers?.custom).toMatchObject({ - request: { body: { apiKey: "secret" } }, + settings: { apiKey: "secret" }, models: { model: { - request: { body: { reasoningEffort: "high" } }, - variants: [{ id: "fast", body: { temperature: 0.2 } }], + settings: { reasoningEffort: "high" }, + variants: [{ id: "fast", settings: { temperature: 0.2 } }], }, }, }) expect(documents[0]?.info.providers?.openai).toMatchObject({ - api: { settings: {} }, - request: { headers: { Authorization: "Bearer secret", "OpenAI-Organization": "org" } }, + package: "@ai-sdk/openai", + aisdk: true, + settings: { apiKey: "secret", organization: "org" }, models: { model: { - request: { - body: { temperature: 0.3, reasoning_effort: "high", service_tier: "priority" }, - }, - variants: [{ id: "high", body: { reasoning_effort: "high", reasoning_summary: "auto" } }], + settings: { temperature: 0.3, reasoningEffort: "high", serviceTier: "priority" }, + variants: [{ id: "high", settings: { reasoningEffort: "high", reasoningSummary: "auto" } }], }, }, }) expect(documents[0]?.info.providers?.anthropic).toMatchObject({ models: { model: { - request: { - body: { - output_config: { effort: "high", task_budget: 4096 }, - metadata: { user_id: "user-1" }, - }, + settings: { + effort: "high", + taskBudget: 4096, + metadata: { userId: "user-1" }, }, }, }, diff --git a/packages/core/test/config/provider-options.test.ts b/packages/core/test/config/provider-options.test.ts index a407353d09..d9fbe2dfd7 100644 --- a/packages/core/test/config/provider-options.test.ts +++ b/packages/core/test/config/provider-options.test.ts @@ -2,20 +2,7 @@ import { describe, expect, test } from "bun:test" import { ConfigProviderOptionsV1 } from "@opencode-ai/core/v1/config/provider-options" describe("ConfigProviderOptionsV1", () => { - test("keeps raw provider and request options unchanged", () => { - const lowerer = ConfigProviderOptionsV1.get("custom-provider") - - expect(lowerer.provider({ apiKey: "secret", headers: { "x-test": "1" }, nested: { camelCase: true } })).toEqual({ - body: { apiKey: "secret", headers: { "x-test": "1" }, nested: { camelCase: true } }, - }) - expect(lowerer.request({ nested: { camelCase: true } })).toEqual({ nested: { camelCase: true } }) - }) - - test("falls back to raw lowering for prototype property package names", () => { - expect(ConfigProviderOptionsV1.get("toString").provider({ enabled: true })).toEqual({ body: { enabled: true } }) - }) - - test("lowers OpenAI provider and request options", () => { + test("splits provider overlays without changing package settings", () => { const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/openai") expect( @@ -23,189 +10,43 @@ describe("ConfigProviderOptionsV1", () => { apiKey: "secret", baseURL: "https://openai.example/v1", organization: "org", - project: "project", - headers: { "x-test": "1" }, + headers: { "x-test": "1", invalid: true }, body: { store: true }, - timeout: 1000, + nested: { camelCase: true }, }), ).toEqual({ - url: "https://openai.example/v1", - headers: { - Authorization: "Bearer secret", - "OpenAI-Organization": "org", - "OpenAI-Project": "project", - "x-test": "1", + settings: { + apiKey: "secret", + baseURL: "https://openai.example/v1", + organization: "org", + nested: { camelCase: true }, }, + headers: { "x-test": "1" }, body: { store: true }, - settings: { timeout: 1000 }, - }) - expect(lowerer.request({ reasoningEffort: "high", nestedValue: { camelCase: true } })).toEqual({ - reasoning_effort: "high", - nested_value: { camel_case: true }, }) }) - test("lowers Anthropic provider and request options", () => { + test("keeps model and variant options unchanged", () => { const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/anthropic") expect( - lowerer.provider({ - apiKey: "secret", - authToken: "token", - baseURL: "https://anthropic.example", - headers: { "x-test": "1" }, - body: { beta: true }, - generateId: "custom", - }), - ).toEqual({ - url: "https://anthropic.example", - headers: { "x-api-key": "secret", Authorization: "Bearer token", "x-test": "1" }, - body: { beta: true }, - settings: { generateId: "custom" }, - }) - expect( - lowerer.request({ - effort: "high", + lowerer.model({ + reasoningEffort: "high", taskBudget: 1024, - metadata: { userId: "user", traceId: "trace" }, - nestedValue: { camelCase: true }, + metadata: { userId: "user" }, }), ).toEqual({ - output_config: { effort: "high", task_budget: 1024 }, - metadata: { user_id: "user", trace_id: "trace" }, - nested_value: { camel_case: true }, + reasoningEffort: "high", + taskBudget: 1024, + metadata: { userId: "user" }, }) }) - test("lowers Google provider and request options", () => { - const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/google") - - expect( - lowerer.provider({ - apiKey: "secret", - baseURL: "https://google.example", - headers: { "x-test": "1" }, - body: { trace: true }, - project: "project", - }), - ).toEqual({ - url: "https://google.example", - headers: { "x-goog-api-key": "secret", "x-test": "1" }, - body: { trace: true }, - settings: { project: "project" }, - }) - expect( - lowerer.request({ - thinkingConfig: { thinkingBudget: 1024 }, - responseModalities: ["TEXT"], - mediaResolution: "high", - imageConfig: { aspectRatio: "16:9" }, - safetySettings: ["safe"], - }), - ).toEqual({ - safetySettings: ["safe"], - generationConfig: { - thinkingConfig: { thinkingBudget: 1024 }, - responseModalities: ["TEXT"], - mediaResolution: "high", - imageConfig: { aspectRatio: "16:9" }, - }, - }) - }) - - test("lowers Azure provider options and uses OpenAI request lowering", () => { - const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/azure") - - expect( - lowerer.provider({ - apiKey: "secret", - baseURL: "https://azure.example", - headers: { "x-test": "1" }, - body: { trace: true }, - resourceName: "resource", - }), - ).toEqual({ - url: "https://azure.example", - headers: { "api-key": "secret", "x-test": "1" }, - body: { trace: true }, - settings: { resourceName: "resource" }, - }) - expect(lowerer.request({ reasoningEffort: "high" })).toEqual({ reasoning_effort: "high" }) - }) - - test("lowers Amazon Bedrock provider and request options", () => { - const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/amazon-bedrock") - - expect( - lowerer.provider({ - headers: { "x-test": "1" }, - body: { trace: true }, - region: "us-east-1", - profile: "dev", - }), - ).toEqual({ - headers: { "x-test": "1" }, - body: { trace: true }, - settings: { region: "us-east-1", profile: "dev" }, - }) - expect(lowerer.request({ temperature: 0.2 })).toEqual({ - additionalModelRequestFields: { temperature: 0.2 }, - }) - }) - - test("lowers OpenAI-compatible provider and request options", () => { - const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/openai-compatible") - - expect( - lowerer.provider({ - baseURL: "https://compatible.example/v1", - headers: { "x-test": "1" }, - body: { trace: true }, - apiKey: "secret", - }), - ).toEqual({ - url: "https://compatible.example/v1", - headers: { "x-test": "1" }, - body: { trace: true }, - settings: { apiKey: "secret" }, - }) - expect(lowerer.request({ reasoningEffort: "high", serviceTier: "priority" })).toEqual({ - reasoning_effort: "high", - serviceTier: "priority", - }) - }) - - test.each([ - "@ai-sdk/cerebras", - "@ai-sdk/deepinfra", - "@ai-sdk/groq", - "@ai-sdk/mistral", - "@ai-sdk/togetherai", - "@ai-sdk/xai", - "@openrouter/ai-sdk-provider", - "ai-gateway-provider", - "venice-ai-sdk-provider", - ])("uses OpenAI-compatible lowering for %s", (packageName) => { - const lowerer = ConfigProviderOptionsV1.get(packageName) - - expect(lowerer.provider({ baseURL: "https://example.test", apiKey: "secret" })).toEqual({ - url: "https://example.test", + test("uses the same mechanical lowering for every package", () => { + expect(ConfigProviderOptionsV1.get("custom-provider").provider({ enabled: true })).toEqual({ + settings: { enabled: true }, headers: undefined, body: undefined, - settings: { apiKey: "secret" }, }) - expect(lowerer.request({ reasoningEffort: "high" })).toEqual({ reasoning_effort: "high" }) }) - - test.each(["@ai-sdk/google-vertex", "@ai-sdk/google-vertex/anthropic"])( - "uses provider family lowering for %s", - (packageName) => { - const lowerer = ConfigProviderOptionsV1.get(packageName) - - expect(lowerer.provider({ baseURL: "https://example.test", profile: "dev" })).toMatchObject({ - url: "https://example.test", - settings: { profile: "dev" }, - }) - }, - ) }) From e40ce1d5565fa0c627ec0900b3065231019845a4 Mon Sep 17 00:00:00 2001 From: Dax Raad Date: Wed, 24 Jun 2026 12:52:44 -0400 Subject: [PATCH 10/18] fix(core): validate provider body options --- packages/core/src/v1/config/provider-options.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/v1/config/provider-options.ts b/packages/core/src/v1/config/provider-options.ts index 01f813197f..16206aa631 100644 --- a/packages/core/src/v1/config/provider-options.ts +++ b/packages/core/src/v1/config/provider-options.ts @@ -18,7 +18,7 @@ const lowerer: Lowerer = { return { settings: Object.fromEntries(Object.entries(options).filter(([key]) => key !== "headers" && key !== "body")), headers: record(options.headers, (value): value is string => typeof value === "string"), - body: record(options.body, () => true), + body: record(options.body, (_value): _value is unknown => true), } }, model: (options) => ({ ...options }), From 248db536e2b228323afc70f29c55daab5fd68503 Mon Sep 17 00:00:00 2001 From: Dax Raad Date: Wed, 24 Jun 2026 13:00:46 -0400 Subject: [PATCH 11/18] refactor(core): migrate provider consumers --- packages/core/src/aisdk.ts | 22 +-- packages/core/src/catalog.ts | 67 ++++++--- packages/core/src/config/plugin/provider.ts | 31 ++-- packages/core/src/config/provider.ts | 2 +- packages/core/src/model.ts | 63 +------- packages/core/src/plugin/models-dev.ts | 30 +--- .../src/plugin/provider/amazon-bedrock.ts | 17 +-- .../core/src/plugin/provider/anthropic.ts | 10 +- packages/core/src/plugin/provider/azure.ts | 31 ++-- packages/core/src/plugin/provider/cerebras.ts | 6 +- .../plugin/provider/cloudflare-workers-ai.ts | 16 +- .../src/plugin/provider/github-copilot.ts | 7 +- packages/core/src/plugin/provider/gitlab.ts | 22 ++- .../core/src/plugin/provider/google-vertex.ts | 42 +++--- packages/core/src/plugin/provider/kilo.ts | 9 +- .../core/src/plugin/provider/llmgateway.ts | 15 +- packages/core/src/plugin/provider/nvidia.ts | 15 +- packages/core/src/plugin/provider/openai.ts | 6 +- packages/core/src/plugin/provider/opencode.ts | 36 +++-- .../core/src/plugin/provider/openrouter.ts | 7 +- .../core/src/plugin/provider/sap-ai-core.ts | 2 +- packages/core/src/plugin/provider/vercel.ts | 7 +- packages/core/src/plugin/provider/xai.ts | 2 +- packages/core/src/plugin/provider/zenmux.ts | 13 +- packages/core/src/plugin/variant.ts | 24 +-- packages/core/src/provider.ts | 54 +------ packages/core/src/session/runner/model.ts | 85 +++++++---- packages/core/src/v1/config/migrate.ts | 2 +- packages/core/test/catalog.test.ts | 82 +++++------ packages/core/test/config/config.test.ts | 6 +- packages/core/test/config/provider.test.ts | 53 +++---- packages/core/test/location-layer.test.ts | 2 +- packages/core/test/plugin/host.ts | 23 ++- .../core/test/plugin/provider-alibaba.test.ts | 20 ++- .../plugin/provider-amazon-bedrock.test.ts | 137 ++++++++++-------- .../test/plugin/provider-anthropic.test.ts | 27 ++-- .../provider-azure-cognitive-services.test.ts | 56 ++++--- .../core/test/plugin/provider-azure.test.ts | 88 +++++++---- .../test/plugin/provider-cerebras.test.ts | 33 ++--- .../provider-cloudflare-ai-gateway.test.ts | 48 ++++-- .../provider-cloudflare-workers-ai.test.ts | 79 +++++----- .../core/test/plugin/provider-cohere.test.ts | 16 +- .../test/plugin/provider-deepinfra.test.ts | 30 ++-- .../core/test/plugin/provider-dynamic.test.ts | 34 +++-- .../core/test/plugin/provider-gateway.test.ts | 20 ++- .../plugin/provider-github-copilot.test.ts | 52 +++++-- .../core/test/plugin/provider-gitlab.test.ts | 49 ++++--- .../provider-google-vertex-anthropic.test.ts | 61 +++++--- .../plugin/provider-google-vertex.test.ts | 133 +++++++++-------- .../core/test/plugin/provider-google.test.ts | 14 +- .../core/test/plugin/provider-groq.test.ts | 28 ++-- .../core/test/plugin/provider-kilo.test.ts | 47 +++--- .../test/plugin/provider-llmgateway.test.ts | 24 ++- .../core/test/plugin/provider-mistral.test.ts | 24 ++- .../core/test/plugin/provider-nvidia.test.ts | 39 ++--- .../plugin/provider-openai-compatible.test.ts | 20 ++- .../core/test/plugin/provider-openai.test.ts | 28 +++- .../test/plugin/provider-opencode.test.ts | 91 +++++++----- .../test/plugin/provider-openrouter.test.ts | 21 ++- .../test/plugin/provider-perplexity.test.ts | 20 ++- .../test/plugin/provider-sap-ai-core.test.ts | 4 +- .../plugin/provider-snowflake-cortex.test.ts | 24 ++- .../test/plugin/provider-togetherai.test.ts | 28 ++-- .../core/test/plugin/provider-venice.test.ts | 20 ++- .../core/test/plugin/provider-vercel.test.ts | 22 +-- .../core/test/plugin/provider-xai.test.ts | 22 ++- .../core/test/plugin/provider-zenmux.test.ts | 40 +++-- packages/core/test/plugin/variant.test.ts | 37 +++-- .../core/test/session-runner-model.test.ts | 82 ++++++----- packages/core/test/shared-schema.test.ts | 45 +----- packages/sdk/js/src/v2/gen/types.gen.ts | 79 ++++------ 71 files changed, 1313 insertions(+), 1138 deletions(-) diff --git a/packages/core/src/aisdk.ts b/packages/core/src/aisdk.ts index 9ea79394f3..3aaf5484ee 100644 --- a/packages/core/src/aisdk.ts +++ b/packages/core/src/aisdk.ts @@ -73,10 +73,10 @@ function wrapSSE(res: Response, ms: number, ctl: AbortController) { function prepareOptions(model: ModelV2.Info, pkg: string) { const options: Record = { name: model.providerID, - ...(model.api.type === "aisdk" ? (model.api.settings ?? {}) : {}), - ...model.request.body, + ...(model.settings ?? {}), + headers: model.headers, + body: model.body, } - if (model.api.type === "aisdk" && model.api.url) options.baseURL = model.api.url const customFetch = options.fetch const chunkTimeout = options.chunkTimeout @@ -195,24 +195,26 @@ export const locationLayer = Layer.effect( runSDK: (event) => run(sdkHooks, event), runLanguage: (event) => run(languageHooks, event), language: Effect.fn("AISDK.language")(function* (model) { - const key = `${model.providerID}/${model.id}/${model.request.variant ?? "default"}` + const key = `${model.providerID}/${model.id}/${model.modelID ?? model.id}/${JSON.stringify(model.settings)}` const existing = languages.get(key) if (existing) return existing - if (model.api.type !== "aisdk") + if (!model.aisdk) return yield* new InitError({ providerID: model.providerID, - cause: new Error(`Unsupported api ${model.api.type}`), + cause: new Error(`Unsupported package ${model.package}`), }) - const options = prepareOptions(model, model.api.package) + const options = prepareOptions(model, model.package ?? "") const sdkKey = JSON.stringify({ providerID: model.providerID, - api: model.api, + package: model.package, + settings: model.settings, options, }) const sdk = sdks.get(sdkKey) ?? - (yield* service.runSDK({ model, package: model.api.package, options }).pipe(initError(model.providerID))).sdk + (yield* service.runSDK({ model, package: model.package ?? "", options }).pipe(initError(model.providerID))) + .sdk if (!sdk) return yield* new InitError({ providerID: model.providerID, @@ -220,7 +222,7 @@ export const locationLayer = Layer.effect( }) sdks.set(sdkKey, sdk) const result = yield* service.runLanguage({ model, sdk, options }).pipe(initError(model.providerID)) - const language = yield* Effect.sync(() => result.language ?? sdk.languageModel(model.api.id)).pipe( + const language = yield* Effect.sync(() => result.language ?? sdk.languageModel(model.modelID ?? model.id)).pipe( initError(model.providerID), ) languages.set(key, language) diff --git a/packages/core/src/catalog.ts b/packages/core/src/catalog.ts index 431aa004b3..51b33cea74 100644 --- a/packages/core/src/catalog.ts +++ b/packages/core/src/catalog.ts @@ -70,38 +70,22 @@ export const layer = Layer.effect( const available = (provider: ProviderV2.Info, integration: Integration.Info | undefined) => { if (provider.disabled) return false - if (typeof provider.request.body.apiKey === "string") return true + if (typeof provider.settings?.apiKey === "string") return true if (integration?.connections.length) return true return provider.integrationID === undefined && !integration } const projectModel = (model: ModelV2.Info, provider: ProviderV2.Info) => { - const api = - model.api.type === "native" && !model.api.url && Object.keys(model.api.settings).length === 0 - ? { ...provider.api, id: model.api.id } - : model.api.type === "aisdk" && provider.api.type === "aisdk" && !model.api.url - ? { ...model.api, url: provider.api.url, settings: { ...provider.api.settings, ...model.api.settings } } - : model.api.type === "aisdk" && provider.api.type === "aisdk" - ? { ...model.api, settings: { ...provider.api.settings, ...model.api.settings } } - : model.api - const request = { - headers: { ...provider.request.headers, ...model.request.headers }, - body: { ...provider.request.body, ...model.request.body }, - variant: model.request.variant, - } return ModelV2.Info.make({ ...model, - api, - request, + package: model.package ?? provider.package, + aisdk: model.package === undefined ? (model.aisdk ?? provider.aisdk) : model.aisdk, + settings: merge(provider.settings, model.settings), + headers: headers(provider.headers, model.headers), + body: merge(provider.body, model.body), }) } - const normalizeApi = (item: ProviderV2.MutableInfo | ModelV2.MutableInfo) => { - if (typeof item.request.body.baseURL !== "string") return - item.api.url = item.request.body.baseURL - delete item.request.body.baseURL - } - const state = State.create({ initial: () => ({ providers: new Map() }), draft: (draft) => { @@ -119,7 +103,6 @@ export const layer = Layer.effect( draft.providers.set(providerID, current) } fn(current.provider) - normalizeApi(current.provider) }, remove: (providerID) => { draft.providers.delete(providerID) @@ -142,7 +125,6 @@ export const layer = Layer.effect( fn(model) model.id = modelID model.providerID = providerID - normalizeApi(model) }, remove: (providerID, modelID) => { draft.providers.get(providerID)?.models.delete(modelID) @@ -288,6 +270,43 @@ export const layer = Layer.effect( const SMALL_MODEL_RE = /\b(nano|flash|lite|mini|haiku|small|fast)\b/ +function merge( + base: Readonly> | undefined, + overlay: Readonly> | undefined, +): Record | undefined { + if (base === undefined) return overlay && { ...overlay } + if (overlay === undefined) return { ...base } + return Object.fromEntries( + new Set([...Object.keys(base), ...Object.keys(overlay)]).values().map((key) => { + const left = base[key] + const right = overlay[key] + if (right === undefined) return [key, left] + if (plain(left) && plain(right)) return [key, merge(left, right)] + return [key, right] + }), + ) +} + +function plain(input: unknown): input is Readonly> { + if (typeof input !== "object" || input === null || Array.isArray(input)) return false + const prototype = Object.getPrototypeOf(input) + return prototype === Object.prototype || prototype === null +} + +function headers( + base: Readonly> | undefined, + overlay: Readonly> | undefined, +) { + return Object.fromEntries( + [...Object.entries(base ?? {}), ...Object.entries(overlay ?? {})] + .reduce((result, entry) => { + result.set(entry[0].toLowerCase(), entry) + return result + }, new Map()) + .values(), + ) +} + export const locationLayer = layer.pipe( Layer.provideMerge(Integration.locationLayer), Layer.provideMerge(Policy.locationLayer), diff --git a/packages/core/src/config/plugin/provider.ts b/packages/core/src/config/plugin/provider.ts index 6f6e0528da..3129240639 100644 --- a/packages/core/src/config/plugin/provider.ts +++ b/packages/core/src/config/plugin/provider.ts @@ -52,17 +52,22 @@ export const Plugin = define({ const providerID = id catalog.provider.update(providerID, (provider) => { if (item.name !== undefined) provider.name = item.name - if (item.api !== undefined) provider.api = { ...item.api } - if (item.request !== undefined) { - Object.assign(provider.request.headers, item.request.headers) - Object.assign(provider.request.body, item.request.body) - } + if (item.package !== undefined) provider.package = item.package + if (item.aisdk !== undefined) provider.aisdk = item.aisdk + if (item.settings !== undefined) provider.settings = { ...provider.settings, ...item.settings } + if (item.headers !== undefined) provider.headers = { ...provider.headers, ...item.headers } + if (item.body !== undefined) provider.body = { ...provider.body, ...item.body } }) for (const [id, config] of Object.entries(item.models ?? {})) { catalog.model.update(providerID, id, (model) => { if (config.family !== undefined) model.family = config.family if (config.name !== undefined) model.name = config.name - if (config.api !== undefined) model.api = { ...model.api, ...config.api } + if (config.modelID !== undefined) model.modelID = config.modelID + if (config.package !== undefined) model.package = config.package + if (config.aisdk !== undefined) model.aisdk = config.aisdk + if (config.settings !== undefined) model.settings = { ...model.settings, ...config.settings } + if (config.headers !== undefined) model.headers = { ...model.headers, ...config.headers } + if (config.body !== undefined) model.body = { ...model.body, ...config.body } if (config.capabilities !== undefined) { model.capabilities = { tools: config.capabilities.tools, @@ -70,24 +75,20 @@ export const Plugin = define({ output: [...config.capabilities.output], } } - if (config.request !== undefined) { - Object.assign(model.request.headers, config.request.headers) - Object.assign(model.request.body, config.request.body) - if (config.request.variant !== undefined) model.request.variant = config.request.variant - } if (config.variants !== undefined) { + model.variants ??= [] for (const variant of config.variants) { let existing = model.variants.find((item) => item.id === variant.id) if (!existing) { existing = { id: variant.id, - headers: {}, - body: {}, } model.variants.push(existing) } - Object.assign(existing.headers, variant.headers) - Object.assign(existing.body, variant.body) + if (variant.settings !== undefined) + existing.settings = { ...existing.settings, ...variant.settings } + if (variant.headers !== undefined) existing.headers = { ...existing.headers, ...variant.headers } + if (variant.body !== undefined) existing.body = { ...existing.body, ...variant.body } } } if (config.cost !== undefined) { diff --git a/packages/core/src/config/provider.ts b/packages/core/src/config/provider.ts index 2dc038962c..153ab7fcef 100644 --- a/packages/core/src/config/provider.ts +++ b/packages/core/src/config/provider.ts @@ -36,7 +36,7 @@ class Limit extends Schema.Class("ConfigV2.Model.Limit")({ }) {} class Model extends Schema.Class("ConfigV2.Model")({ - id: ModelV2.ID.pipe(Schema.optional), + modelID: ModelV2.ID.pipe(Schema.optional), family: ModelV2.Family.pipe(Schema.optional), name: Schema.String.pipe(Schema.optional), package: Schema.String.pipe(Schema.optional), diff --git a/packages/core/src/model.ts b/packages/core/src/model.ts index bae4408560..2d7c597a44 100644 --- a/packages/core/src/model.ts +++ b/packages/core/src/model.ts @@ -1,8 +1,6 @@ -import { Schema } from "effect" +import { Types } from "effect" import { Model } from "@opencode-ai/schema/model" import { ProviderV2 } from "./provider" -import { withStatics } from "./schema" -import type { DeepMutable } from "./schema" export const ID = Model.ID export type ID = typeof ID.Type @@ -10,6 +8,7 @@ export type ID = typeof ID.Type export const VariantID = Model.VariantID export type VariantID = typeof VariantID.Type +// Grouping of models, eg claude opus, claude sonnet export const Family = Model.Family export type Family = Model.Family @@ -21,62 +20,10 @@ export const Cost = Model.Cost export const Ref = Model.Ref export type Ref = typeof Ref.Type -// Temporary runtime schema until core catalog consumers migrate to the flat -// package identity in @opencode-ai/schema. -export const Api = Schema.Union([ - Schema.Struct({ id: ID, ...ProviderV2.AISDK.fields }), - Schema.Struct({ id: ID, ...ProviderV2.Native.fields }), -]).pipe(Schema.toTaggedUnion("type")) -export type Api = typeof Api.Type +export const Info = Model.Info +export type Info = Model.Info -export interface Info extends Schema.Schema.Type {} -export const Info = Schema.Struct({ - id: ID, - providerID: ProviderV2.ID, - family: Family.pipe(Schema.optional), - name: Schema.String, - api: Api, - capabilities: Capabilities, - request: Schema.Struct({ - ...ProviderV2.Request.fields, - variant: Schema.String.pipe(Schema.optional), - }), - variants: Schema.Struct({ - id: VariantID, - ...ProviderV2.Request.fields, - }).pipe(Schema.Array, Schema.mutable), - time: Schema.Struct({ released: Schema.Finite }), - cost: Cost.pipe(Schema.Array, Schema.mutable), - status: Schema.Literals(["alpha", "beta", "deprecated", "active"]), - enabled: Schema.Boolean, - limit: Schema.Struct({ - context: Schema.Int, - input: Schema.Int.pipe(Schema.optional), - output: Schema.Int, - }), -}) - .annotate({ identifier: "ModelV2.Info" }) - .pipe( - withStatics((schema) => ({ - empty: (providerID: ProviderV2.ID, modelID: ID) => - schema.make({ - id: modelID, - providerID, - name: modelID, - api: { id: modelID, type: "native", settings: {} }, - capabilities: { tools: false, input: [], output: [] }, - request: { headers: {}, body: {} }, - variants: [], - time: { released: 0 }, - cost: [], - status: "active", - enabled: true, - limit: { context: 0, output: 0 }, - }), - })), - ) - -export type MutableInfo = Omit, "api"> & { api: ProviderV2.MutableApi } +export type MutableInfo = Types.DeepMutable export function parse(input: string): { providerID: ProviderV2.ID; modelID: ID } { const [providerID, ...modelID] = input.split("/") diff --git a/packages/core/src/plugin/models-dev.ts b/packages/core/src/plugin/models-dev.ts index 1adc979d25..ba6e4a869a 100644 --- a/packages/core/src/plugin/models-dev.ts +++ b/packages/core/src/plugin/models-dev.ts @@ -75,17 +75,9 @@ export const ModelsDevPlugin = define({ const providerID = ProviderV2.ID.make(item.id) catalog.provider.update(providerID, (provider) => { provider.name = item.name - provider.api = item.npm - ? { - type: "aisdk", - package: item.npm, - url: item.api, - } - : { - type: "native", - url: item.api, - settings: {}, - } + provider.package = item.npm ?? "" + provider.aisdk = item.npm ? true : undefined + provider.settings = item.api ? { ...provider.settings, baseURL: item.api } : provider.settings }) for (const model of Object.values(item.models)) { @@ -93,19 +85,9 @@ export const ModelsDevPlugin = define({ catalog.model.update(providerID, modelID, (draft) => { draft.name = model.name draft.family = model.family ? ModelV2.Family.make(model.family) : undefined - draft.api = model.provider?.npm - ? { - id: draft.api.id, - type: "aisdk", - package: model.provider?.npm, - url: model.provider.api, - } - : { - id: draft.api.id, - type: "native", - url: model.provider?.api, - settings: {}, - } + draft.package = model.provider?.npm + draft.aisdk = model.provider?.npm ? true : undefined + draft.settings = model.provider?.api ? { ...draft.settings, baseURL: model.provider.api } : draft.settings draft.capabilities = { tools: model.tool_call, input: [...(model.modalities?.input ?? [])], diff --git a/packages/core/src/plugin/provider/amazon-bedrock.ts b/packages/core/src/plugin/provider/amazon-bedrock.ts index 0995cf1c17..00dc73edb0 100644 --- a/packages/core/src/plugin/provider/amazon-bedrock.ts +++ b/packages/core/src/plugin/provider/amazon-bedrock.ts @@ -65,15 +65,14 @@ export const AmazonBedrockPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (item.provider.api.type !== "aisdk") continue - if (item.provider.api.package !== "@ai-sdk/amazon-bedrock") continue + if (!item.provider.aisdk) continue + if (item.provider.package !== "@ai-sdk/amazon-bedrock") continue evt.provider.update(item.provider.id, (provider) => { - if (provider.api.type !== "aisdk") return - if (typeof provider.request.body.endpoint !== "string") return + if (typeof provider.settings?.endpoint !== "string") return // The AI SDK expects a base URL, but users configure Bedrock private/VPC // endpoints as `endpoint`; move it into the catalog endpoint URL once. - provider.api.url = provider.request.body.endpoint - delete provider.request.body.endpoint + provider.settings.baseURL = provider.settings.endpoint + delete provider.settings.endpoint }) } }), @@ -114,12 +113,12 @@ export const AmazonBedrockPlugin = define({ yield* ctx.aisdk.language( Effect.fn(function* (evt) { if (evt.model.providerID !== ProviderV2.ID.amazonBedrock) return - if (evt.model.api.type === "aisdk" && evt.model.api.package === "@ai-sdk/amazon-bedrock/mantle") { - evt.language = selectMantleModel(evt.sdk, evt.model.api.id) + if (evt.model.aisdk && evt.model.package === "@ai-sdk/amazon-bedrock/mantle") { + evt.language = selectMantleModel(evt.sdk, evt.model.modelID ?? evt.model.id) return } const region = typeof evt.options.region === "string" ? evt.options.region : process.env.AWS_REGION - evt.language = evt.sdk.languageModel(resolveModelID(evt.model.api.id, region)) + evt.language = evt.sdk.languageModel(resolveModelID(evt.model.modelID ?? evt.model.id, region)) }), ) }), diff --git a/packages/core/src/plugin/provider/anthropic.ts b/packages/core/src/plugin/provider/anthropic.ts index cf883a0687..c13fbbfdad 100644 --- a/packages/core/src/plugin/provider/anthropic.ts +++ b/packages/core/src/plugin/provider/anthropic.ts @@ -7,11 +7,13 @@ export const AnthropicPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (item.provider.api.type !== "aisdk") continue - if (item.provider.api.package !== "@ai-sdk/anthropic") continue + if (!item.provider.aisdk) continue + if (item.provider.package !== "@ai-sdk/anthropic") continue evt.provider.update(item.provider.id, (provider) => { - provider.request.headers["anthropic-beta"] = - "interleaved-thinking-2025-05-14,fine-grained-tool-streaming-2025-05-14" + provider.headers = { + ...provider.headers, + "anthropic-beta": "interleaved-thinking-2025-05-14,fine-grained-tool-streaming-2025-05-14", + } }) } }), diff --git a/packages/core/src/plugin/provider/azure.ts b/packages/core/src/plugin/provider/azure.ts index 2e1f9d9b48..b1e5754606 100644 --- a/packages/core/src/plugin/provider/azure.ts +++ b/packages/core/src/plugin/provider/azure.ts @@ -16,14 +16,14 @@ export const AzurePlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (item.provider.api.type !== "aisdk") continue - if (item.provider.api.package !== "@ai-sdk/azure") continue - const configured = item.provider.request.body.resourceName + if (!item.provider.aisdk) continue + if (item.provider.package !== "@ai-sdk/azure") continue + const configured = item.provider.settings?.resourceName const resourceName = typeof configured === "string" && configured.trim() !== "" ? configured : process.env.AZURE_RESOURCE_NAME if (!resourceName) continue evt.provider.update(item.provider.id, (provider) => { - provider.request.body.resourceName = resourceName + provider.settings = { ...provider.settings, resourceName } }) } }), @@ -35,7 +35,7 @@ export const AzurePlugin = define({ if ( !evt.options.resourceName && !evt.options.baseURL && - (evt.model.api.type !== "aisdk" || !evt.model.api.url) + (!evt.model.aisdk || typeof evt.model.settings?.baseURL !== "string") ) { throw new Error( "AZURE_RESOURCE_NAME is missing, set it using env var or reconnecting the azure provider and setting it", @@ -49,7 +49,11 @@ export const AzurePlugin = define({ yield* ctx.aisdk.language( Effect.fn(function* (evt) { if (evt.model.providerID !== ProviderV2.ID.azure) return - evt.language = selectLanguage(evt.sdk, evt.model.api.id, Boolean(evt.options.useCompletionUrls)) + evt.language = selectLanguage( + evt.sdk, + evt.model.modelID ?? evt.model.id, + Boolean(evt.options.useCompletionUrls), + ) }), ) }), @@ -63,11 +67,14 @@ export const AzureCognitiveServicesPlugin = define({ const resourceName = process.env.AZURE_COGNITIVE_SERVICES_RESOURCE_NAME if (!resourceName) return for (const item of evt.provider.list()) { - if (item.provider.api.type !== "aisdk") continue - if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue + if (!item.provider.aisdk) continue + if (item.provider.package !== "@ai-sdk/openai-compatible") continue if (!item.provider.id.includes("azure-cognitive-services")) continue evt.provider.update(item.provider.id, (provider) => { - provider.request.body.baseURL = `https://${resourceName}.cognitiveservices.azure.com/openai` + provider.settings = { + ...provider.settings, + baseURL: `https://${resourceName}.cognitiveservices.azure.com/openai`, + } }) } }), @@ -75,7 +82,11 @@ export const AzureCognitiveServicesPlugin = define({ yield* ctx.aisdk.language( Effect.fn(function* (evt) { if (evt.model.providerID !== ProviderV2.ID.make("azure-cognitive-services")) return - evt.language = selectLanguage(evt.sdk, evt.model.api.id, Boolean(evt.options.useCompletionUrls)) + evt.language = selectLanguage( + evt.sdk, + evt.model.modelID ?? evt.model.id, + Boolean(evt.options.useCompletionUrls), + ) }), ) }), diff --git a/packages/core/src/plugin/provider/cerebras.ts b/packages/core/src/plugin/provider/cerebras.ts index 0fd651160f..cb15cb9312 100644 --- a/packages/core/src/plugin/provider/cerebras.ts +++ b/packages/core/src/plugin/provider/cerebras.ts @@ -7,10 +7,10 @@ export const CerebrasPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (item.provider.api.type !== "aisdk") continue - if (item.provider.api.package !== "@ai-sdk/cerebras") continue + if (!item.provider.aisdk) continue + if (item.provider.package !== "@ai-sdk/cerebras") continue evt.provider.update(item.provider.id, (provider) => { - provider.request.headers["X-Cerebras-3rd-Party-Integration"] = "opencode" + provider.headers = { ...provider.headers, "X-Cerebras-3rd-Party-Integration": "opencode" } }) } }), diff --git a/packages/core/src/plugin/provider/cloudflare-workers-ai.ts b/packages/core/src/plugin/provider/cloudflare-workers-ai.ts index 1a1c533eb5..0ed7b0dffa 100644 --- a/packages/core/src/plugin/provider/cloudflare-workers-ai.ts +++ b/packages/core/src/plugin/provider/cloudflare-workers-ai.ts @@ -14,10 +14,10 @@ export const CloudflareWorkersAIPlugin = define({ const item = evt.provider.get(providerID) if (!item) return evt.provider.update(item.provider.id, (provider) => { - if (provider.api.type !== "aisdk") return - if (provider.api.url) return - const accountId = resolveAccountId(provider.request.body) - if (accountId) provider.api.url = workersEndpoint(accountId) + if (!provider.aisdk) return + if (typeof provider.settings?.baseURL === "string") return + const accountId = resolveAccountId(provider.settings ?? {}) + if (accountId) provider.settings = { ...provider.settings, baseURL: workersEndpoint(accountId) } }) }), ) @@ -27,7 +27,7 @@ export const CloudflareWorkersAIPlugin = define({ if (evt.package !== "@ai-sdk/openai-compatible") return const accountId = resolveAccountId(evt.options) - if (!hasWorkersEndpoint(evt.model.api) && !accountId) return + if (!hasWorkersEndpoint(evt.model) && !accountId) return const mod = yield* Effect.promise(() => import("@ai-sdk/openai-compatible")) evt.sdk = mod.createOpenAICompatible( sdkOptions({ @@ -40,7 +40,7 @@ export const CloudflareWorkersAIPlugin = define({ yield* ctx.aisdk.language( Effect.fn(function* (evt) { if (evt.model.providerID !== providerID) return - evt.language = evt.sdk.languageModel(evt.model.api.id) + evt.language = evt.sdk.languageModel(evt.model.modelID ?? evt.model.id) }), ) }), @@ -54,8 +54,8 @@ function workersEndpoint(accountId: string) { return `https://api.cloudflare.com/client/v4/accounts/${accountId}/ai/v1` } -function hasWorkersEndpoint(api: ProviderV2.Api) { - return api.type === "aisdk" && Boolean(api.url) +function hasWorkersEndpoint(model: { readonly aisdk?: true; readonly settings?: Readonly> }) { + return model.aisdk && typeof model.settings?.baseURL === "string" } function sdkOptions(options: Record) { diff --git a/packages/core/src/plugin/provider/github-copilot.ts b/packages/core/src/plugin/provider/github-copilot.ts index 682579d7a9..12f9a12f23 100644 --- a/packages/core/src/plugin/provider/github-copilot.ts +++ b/packages/core/src/plugin/provider/github-copilot.ts @@ -36,12 +36,11 @@ export const GithubCopilotPlugin = define({ Effect.fn(function* (evt) { if (evt.model.providerID !== ProviderV2.ID.githubCopilot) return if (evt.sdk.responses === undefined && evt.sdk.chat === undefined) { - evt.language = evt.sdk.languageModel(evt.model.api.id) + evt.language = evt.sdk.languageModel(evt.model.modelID ?? evt.model.id) return } - evt.language = shouldUseResponses(evt.model.api.id) - ? evt.sdk.responses(evt.model.api.id) - : evt.sdk.chat(evt.model.api.id) + const id = evt.model.modelID ?? evt.model.id + evt.language = shouldUseResponses(id) ? evt.sdk.responses(id) : evt.sdk.chat(id) }), ) }), diff --git a/packages/core/src/plugin/provider/gitlab.ts b/packages/core/src/plugin/provider/gitlab.ts index 8723cdaac2..56619ff922 100644 --- a/packages/core/src/plugin/provider/gitlab.ts +++ b/packages/core/src/plugin/provider/gitlab.ts @@ -36,26 +36,24 @@ export const GitLabPlugin = define({ if (evt.model.providerID !== ProviderV2.ID.gitlab) return const featureFlags = typeof evt.options.featureFlags === "object" && evt.options.featureFlags ? evt.options.featureFlags : {} - if (evt.model.api.id.startsWith("duo-workflow-")) { + const id = evt.model.modelID ?? evt.model.id + if (id.startsWith("duo-workflow-")) { const gitlab = yield* Effect.promise(() => import("gitlab-ai-provider")).pipe(Effect.orDie) const workflowRef = - typeof evt.model.request.body.workflowRef === "string" ? evt.model.request.body.workflowRef : undefined + typeof evt.model.settings?.workflowRef === "string" ? evt.model.settings.workflowRef : undefined const workflowDefinition = - typeof evt.model.request.body.workflowDefinition === "string" - ? evt.model.request.body.workflowDefinition + typeof evt.model.settings?.workflowDefinition === "string" + ? evt.model.settings.workflowDefinition : undefined - const language = evt.sdk.workflowChat( - gitlab.isWorkflowModel(evt.model.api.id) ? evt.model.api.id : "duo-workflow", - { - featureFlags, - workflowDefinition, - }, - ) + const language = evt.sdk.workflowChat(gitlab.isWorkflowModel(id) ? id : "duo-workflow", { + featureFlags, + workflowDefinition, + }) if (workflowRef) language.selectedModelRef = workflowRef evt.language = language return } - evt.language = evt.sdk.agenticChat(evt.model.api.id, { + evt.language = evt.sdk.agenticChat(id, { aiGatewayHeaders: evt.options.aiGatewayHeaders, featureFlags, }) diff --git a/packages/core/src/plugin/provider/google-vertex.ts b/packages/core/src/plugin/provider/google-vertex.ts index 4e643c9f51..fa7afc98bf 100644 --- a/packages/core/src/plugin/provider/google-vertex.ts +++ b/packages/core/src/plugin/provider/google-vertex.ts @@ -60,25 +60,28 @@ export const GoogleVertexPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (item.provider.api.type !== "aisdk") continue + if (!item.provider.aisdk) continue if ( - item.provider.api.package !== "@ai-sdk/google-vertex" && + item.provider.package !== "@ai-sdk/google-vertex" && !( item.provider.id === ProviderV2.ID.googleVertex && - item.provider.api.package.includes("@ai-sdk/openai-compatible") + item.provider.package.includes("@ai-sdk/openai-compatible") ) ) continue - const project = resolveProject(item.provider.request.body) - const location = String(resolveLocation(item.provider.request.body)) + const project = resolveProject(item.provider.settings ?? {}) + const location = String(resolveLocation(item.provider.settings ?? {})) evt.provider.update(item.provider.id, (provider) => { - if (project) provider.request.body.project = project - provider.request.body.location = location - if (provider.api.type === "aisdk" && provider.api.url) { - provider.api.url = replaceVertexVars(provider.api.url, project, location) - } - if (provider.api.type === "aisdk" && provider.api.package.includes("@ai-sdk/openai-compatible")) { - provider.request.body.fetch = authFetch(provider.request.body.fetch) + provider.settings = { + ...provider.settings, + ...(project ? { project } : {}), + location, + ...(typeof provider.settings?.baseURL === "string" + ? { baseURL: replaceVertexVars(provider.settings.baseURL, project, location) } + : {}), + ...(provider.package.includes("@ai-sdk/openai-compatible") + ? { fetch: authFetch(provider.settings?.fetch) } + : {}), } }) } @@ -106,7 +109,7 @@ export const GoogleVertexPlugin = define({ yield* ctx.aisdk.language( Effect.fn(function* (evt) { if (evt.model.providerID !== ProviderV2.ID.googleVertex) return - evt.language = evt.sdk.languageModel(String(evt.model.api.id).trim()) + evt.language = evt.sdk.languageModel(String(evt.model.modelID ?? evt.model.id).trim()) }), ) }), @@ -118,21 +121,20 @@ export const GoogleVertexAnthropicPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (item.provider.api.type !== "aisdk") continue - if (item.provider.api.package !== "@ai-sdk/google-vertex/anthropic") continue + if (!item.provider.aisdk) continue + if (item.provider.package !== "@ai-sdk/google-vertex/anthropic") continue const project = - item.provider.request.body.project ?? + item.provider.settings?.project ?? process.env.GOOGLE_CLOUD_PROJECT ?? process.env.GCP_PROJECT ?? process.env.GCLOUD_PROJECT const location = - item.provider.request.body.location ?? + item.provider.settings?.location ?? process.env.GOOGLE_CLOUD_LOCATION ?? process.env.VERTEX_LOCATION ?? "global" evt.provider.update(item.provider.id, (provider) => { - if (project) provider.request.body.project = project - provider.request.body.location = location + provider.settings = { ...provider.settings, ...(project ? { project } : {}), location } }) } }), @@ -166,7 +168,7 @@ export const GoogleVertexAnthropicPlugin = define({ yield* ctx.aisdk.language( Effect.fn(function* (evt) { if (evt.model.providerID !== ProviderV2.ID.make("google-vertex-anthropic")) return - evt.language = evt.sdk.languageModel(String(evt.model.api.id).trim()) + evt.language = evt.sdk.languageModel(String(evt.model.modelID ?? evt.model.id).trim()) }), ) }), diff --git a/packages/core/src/plugin/provider/kilo.ts b/packages/core/src/plugin/provider/kilo.ts index 6ee6670ee5..9cfd5b2791 100644 --- a/packages/core/src/plugin/provider/kilo.ts +++ b/packages/core/src/plugin/provider/kilo.ts @@ -7,12 +7,11 @@ export const KiloPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (item.provider.api.type !== "aisdk") continue - if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue - if (item.provider.api.url !== "https://api.kilo.ai/api/gateway") continue + if (!item.provider.aisdk) continue + if (item.provider.package !== "@ai-sdk/openai-compatible") continue + if (item.provider.settings?.baseURL !== "https://api.kilo.ai/api/gateway") continue evt.provider.update(item.provider.id, (provider) => { - provider.request.headers["HTTP-Referer"] = "https://opencode.ai/" - provider.request.headers["X-Title"] = "opencode" + provider.headers = { ...provider.headers, "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode" } }) } }), diff --git a/packages/core/src/plugin/provider/llmgateway.ts b/packages/core/src/plugin/provider/llmgateway.ts index eafc5edd6c..73ee23b876 100644 --- a/packages/core/src/plugin/provider/llmgateway.ts +++ b/packages/core/src/plugin/provider/llmgateway.ts @@ -10,14 +10,17 @@ export const LLMGatewayPlugin = define({ Effect.fn(function* (evt) { for (const item of evt.provider.list()) { if (item.provider.disabled) continue - if (item.provider.api.type !== "aisdk") continue - if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue - if (item.provider.api.url !== "https://api.llmgateway.io/v1") continue + if (!item.provider.aisdk) continue + if (item.provider.package !== "@ai-sdk/openai-compatible") continue + if (item.provider.settings?.baseURL !== "https://api.llmgateway.io/v1") continue if (!(yield* integrations.get(Integration.ID.make(item.provider.id)))) continue evt.provider.update(item.provider.id, (provider) => { - provider.request.headers["HTTP-Referer"] = "https://opencode.ai/" - provider.request.headers["X-Title"] = "opencode" - provider.request.headers["X-Source"] = "opencode" + provider.headers = { + ...provider.headers, + "HTTP-Referer": "https://opencode.ai/", + "X-Title": "opencode", + "X-Source": "opencode", + } }) } }), diff --git a/packages/core/src/plugin/provider/nvidia.ts b/packages/core/src/plugin/provider/nvidia.ts index 449599727c..5a80180aa6 100644 --- a/packages/core/src/plugin/provider/nvidia.ts +++ b/packages/core/src/plugin/provider/nvidia.ts @@ -7,13 +7,16 @@ export const NvidiaPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (item.provider.api.type !== "aisdk") continue - if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue - if (item.provider.api.url !== "https://integrate.api.nvidia.com/v1") continue + if (!item.provider.aisdk) continue + if (item.provider.package !== "@ai-sdk/openai-compatible") continue + if (item.provider.settings?.baseURL !== "https://integrate.api.nvidia.com/v1") continue evt.provider.update(item.provider.id, (provider) => { - provider.request.headers["HTTP-Referer"] = "https://opencode.ai/" - provider.request.headers["X-Title"] = "opencode" - provider.request.headers["X-BILLING-INVOKE-ORIGIN"] ??= "OpenCode" + provider.headers = { + ...provider.headers, + "HTTP-Referer": "https://opencode.ai/", + "X-Title": "opencode", + "X-BILLING-INVOKE-ORIGIN": provider.headers?.["X-BILLING-INVOKE-ORIGIN"] ?? "OpenCode", + } }) } }), diff --git a/packages/core/src/plugin/provider/openai.ts b/packages/core/src/plugin/provider/openai.ts index e89382440e..dda85b4688 100644 --- a/packages/core/src/plugin/provider/openai.ts +++ b/packages/core/src/plugin/provider/openai.ts @@ -156,8 +156,8 @@ export const OpenAIPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (item.provider.api.type !== "aisdk") continue - if (item.provider.api.package !== "@ai-sdk/openai") continue + if (!item.provider.aisdk) continue + if (item.provider.package !== "@ai-sdk/openai") continue if (!item.models.has(ModelV2.ID.make("gpt-5-chat-latest"))) continue evt.model.update(item.provider.id, ModelV2.ID.make("gpt-5-chat-latest"), (model) => { // OpenAIPlugin sends OpenAI models through Responses; this alias is a @@ -177,7 +177,7 @@ export const OpenAIPlugin = define({ yield* ctx.aisdk.language( Effect.fn(function* (evt) { if (evt.model.providerID !== ProviderV2.ID.openai) return - evt.language = evt.sdk.responses(evt.model.api.id) + evt.language = evt.sdk.responses(evt.model.modelID ?? evt.model.id) }), ) }), diff --git a/packages/core/src/plugin/provider/opencode.ts b/packages/core/src/plugin/provider/opencode.ts index 8ef365e49c..29e1eb704a 100644 --- a/packages/core/src/plugin/provider/opencode.ts +++ b/packages/core/src/plugin/provider/opencode.ts @@ -111,11 +111,14 @@ export const OpencodePlugin = define { provider.integrationID = Integration.ID.make("opencode") if (item.name !== undefined) provider.name = item.name - provider.api = item.npm - ? { type: "aisdk", package: item.npm, url: item.api } - : { type: "native", url: item.api, settings: {} } - Object.assign(provider.request.headers, item.options?.headers) - Object.assign(provider.request.body, withoutCredentials(item.options)) + provider.package = item.npm ?? "" + provider.aisdk = item.npm ? true : undefined + provider.settings = { + ...provider.settings, + ...withoutCredentials(item.options), + ...(item.api ? { baseURL: item.api } : {}), + } + provider.headers = { ...provider.headers, ...item.options?.headers } }) const modelIDs = new Set(Object.keys(item.models ?? {})) @@ -127,29 +130,24 @@ export const OpencodePlugin = define { if (config.family !== undefined) model.family = config.family if (config.name !== undefined) model.name = config.name - if (config.id !== undefined) model.api.id = config.id + if (config.id !== undefined) model.modelID = config.id if (config.provider !== undefined) { - model.api = config.provider.npm - ? { - id: model.api.id, - type: "aisdk", - package: config.provider.npm, - url: config.provider.api, - } - : { id: model.api.id, type: "native", url: config.provider.api, settings: {} } + model.package = config.provider.npm + model.aisdk = config.provider.npm ? true : undefined + if (config.provider.api) model.settings = { ...model.settings, baseURL: config.provider.api } } if (config.tool_call !== undefined) model.capabilities.tools = config.tool_call if (config.modalities?.input !== undefined) model.capabilities.input = [...config.modalities.input] if (config.modalities?.output !== undefined) model.capabilities.output = [...config.modalities.output] const packageName = config.provider?.npm ?? item.npm const lowerer = ConfigProviderOptionsV1.get(packageName) - Object.assign(model.request.headers, config.headers) - Object.assign(model.request.body, lowerer.model(withoutCredentials(config.options))) + model.headers = { ...model.headers, ...config.headers } + model.settings = { ...model.settings, ...lowerer.model(withoutCredentials(config.options)) } if (config.variants !== undefined) { model.variants = Object.entries(config.variants).map(([id, options]) => ({ id: ModelV2.VariantID.make(id), headers: { ...(options.headers ?? {}) }, - body: lowerer.model(withoutCredentials(options)), + settings: lowerer.model(withoutCredentials(options)), })) } if (config.release_date !== undefined) { @@ -168,9 +166,9 @@ export const OpencodePlugin = define { - if (!hasKey) provider.request.body.apiKey = "public" + if (!hasKey) provider.settings = { ...provider.settings, apiKey: "public" } }) if (hasKey) return for (const model of item.models.values()) { diff --git a/packages/core/src/plugin/provider/openrouter.ts b/packages/core/src/plugin/provider/openrouter.ts index 0f295fb095..eb26dcb08d 100644 --- a/packages/core/src/plugin/provider/openrouter.ts +++ b/packages/core/src/plugin/provider/openrouter.ts @@ -8,11 +8,10 @@ export const OpenRouterPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (item.provider.api.type !== "aisdk") continue - if (item.provider.api.package !== "@openrouter/ai-sdk-provider") continue + if (!item.provider.aisdk) continue + if (item.provider.package !== "@openrouter/ai-sdk-provider") continue evt.provider.update(item.provider.id, (provider) => { - provider.request.headers["HTTP-Referer"] = "https://opencode.ai/" - provider.request.headers["X-Title"] = "opencode" + provider.headers = { ...provider.headers, "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode" } }) for (const modelID of [ModelV2.ID.make("gpt-5-chat-latest"), ModelV2.ID.make("openai/gpt-5-chat")]) { if (!item.models.has(modelID)) continue diff --git a/packages/core/src/plugin/provider/sap-ai-core.ts b/packages/core/src/plugin/provider/sap-ai-core.ts index 8c668d8b41..69956a377d 100644 --- a/packages/core/src/plugin/provider/sap-ai-core.ts +++ b/packages/core/src/plugin/provider/sap-ai-core.ts @@ -39,7 +39,7 @@ export const SapAICorePlugin = define({ yield* ctx.aisdk.language( Effect.fn(function* (evt) { if (evt.model.providerID !== ProviderV2.ID.make("sap-ai-core")) return - evt.language = evt.sdk(evt.model.api.id) + evt.language = evt.sdk(evt.model.modelID ?? evt.model.id) }), ) }), diff --git a/packages/core/src/plugin/provider/vercel.ts b/packages/core/src/plugin/provider/vercel.ts index 00f5601430..da67661abe 100644 --- a/packages/core/src/plugin/provider/vercel.ts +++ b/packages/core/src/plugin/provider/vercel.ts @@ -7,11 +7,10 @@ export const VercelPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (item.provider.api.type !== "aisdk") continue - if (item.provider.api.package !== "@ai-sdk/vercel") continue + if (!item.provider.aisdk) continue + if (item.provider.package !== "@ai-sdk/vercel") continue evt.provider.update(item.provider.id, (provider) => { - provider.request.headers["http-referer"] = "https://opencode.ai/" - provider.request.headers["x-title"] = "opencode" + provider.headers = { ...provider.headers, "http-referer": "https://opencode.ai/", "x-title": "opencode" } }) } }), diff --git a/packages/core/src/plugin/provider/xai.ts b/packages/core/src/plugin/provider/xai.ts index 8145a3480a..20596a54e8 100644 --- a/packages/core/src/plugin/provider/xai.ts +++ b/packages/core/src/plugin/provider/xai.ts @@ -15,7 +15,7 @@ export const XAIPlugin = define({ yield* ctx.aisdk.language( Effect.fn(function* (evt) { if (evt.model.providerID !== ProviderV2.ID.make("xai")) return - evt.language = evt.sdk.responses(evt.model.api.id) + evt.language = evt.sdk.responses(evt.model.modelID ?? evt.model.id) }), ) }), diff --git a/packages/core/src/plugin/provider/zenmux.ts b/packages/core/src/plugin/provider/zenmux.ts index 29adebc0ee..a37d7f0678 100644 --- a/packages/core/src/plugin/provider/zenmux.ts +++ b/packages/core/src/plugin/provider/zenmux.ts @@ -7,12 +7,15 @@ export const ZenmuxPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (item.provider.api.type !== "aisdk") continue - if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue - if (item.provider.api.url !== "https://zenmux.ai/api/v1") continue + if (!item.provider.aisdk) continue + if (item.provider.package !== "@ai-sdk/openai-compatible") continue + if (item.provider.settings?.baseURL !== "https://zenmux.ai/api/v1") continue evt.provider.update(item.provider.id, (provider) => { - provider.request.headers["HTTP-Referer"] ??= "https://opencode.ai/" - provider.request.headers["X-Title"] ??= "opencode" + provider.headers = { + "HTTP-Referer": "https://opencode.ai/", + "X-Title": "opencode", + ...provider.headers, + } }) } }), diff --git a/packages/core/src/plugin/variant.ts b/packages/core/src/plugin/variant.ts index 05e1653b6e..ccdbd5a15c 100644 --- a/packages/core/src/plugin/variant.ts +++ b/packages/core/src/plugin/variant.ts @@ -1,7 +1,7 @@ export * as VariantPlugin from "./variant" -import type { ModelV2Info } from "@opencode-ai/sdk/v2/types" import { Effect } from "effect" +import { ModelV2 } from "../model" import { define } from "./internal" export const Plugin = define({ @@ -11,14 +11,14 @@ export const Plugin = define({ for (const record of catalog.provider.list()) { for (const model of record.models.values()) { catalog.model.update(model.providerID, model.id, (draft) => { - const generated = generate(draft) + const generated = generate(draft as ModelV2.Info, record.provider) if (generated.length === 0) return - const explicit = new Map(draft.variants.map((variant) => [variant.id, variant])) - const generatedIDs = new Set(generated.map((variant) => variant.id)) + const explicit = new Map((draft.variants ?? []).map((variant) => [variant.id, variant])) + const generatedIDs = new Set(generated.map((variant) => variant.id)) draft.variants = [ ...generated.map((variant) => explicit.get(variant.id) ?? variant), - ...draft.variants.filter((variant) => !generatedIDs.has(variant.id)), + ...(draft.variants ?? []).filter((variant) => !generatedIDs.has(variant.id)), ] }) } @@ -27,13 +27,15 @@ export const Plugin = define({ }), }) -export function generate(model: ModelV2Info): ModelV2Info["variants"] { - if (model.api.type !== "aisdk" || model.api.package !== "@ai-sdk/openai-compatible") return [] - const ids = `${model.id} ${model.api.id}`.toLowerCase() +export function generate( + model: ModelV2.Info, + provider?: { readonly package: string; readonly aisdk?: true }, +): NonNullable { + if (!(model.aisdk ?? provider?.aisdk) || (model.package ?? provider?.package) !== "@ai-sdk/openai-compatible") return [] + const ids = `${model.id} ${model.modelID ?? ""}`.toLowerCase() if (!["glm-5.2", "glm-5-2", "glm-5p2"].some((name) => ids.includes(name))) return [] return ["high", "max"].map((id) => ({ - id, - headers: {}, - body: { reasoning_effort: id }, + id: ModelV2.VariantID.make(id), + settings: { reasoningEffort: id }, })) } diff --git a/packages/core/src/provider.ts b/packages/core/src/provider.ts index d1a541dd65..576abd3df1 100644 --- a/packages/core/src/provider.ts +++ b/packages/core/src/provider.ts @@ -1,61 +1,15 @@ export * as ProviderV2 from "./provider" -import { Schema } from "effect" +import { Types } from "effect" import { Provider } from "@opencode-ai/schema/provider" -import { Integration } from "./integration" -import { withStatics } from "./schema" -import type { DeepMutable } from "./schema" export const ID = Provider.ID export type ID = typeof ID.Type -// Temporary runtime schema until core catalog consumers migrate to the flat -// package identity in @opencode-ai/schema. -export interface AISDK extends Schema.Schema.Type {} -export const AISDK = Schema.Struct({ - type: Schema.Literal("aisdk"), - package: Schema.String, - url: Schema.String.pipe(Schema.optional), - settings: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional), -}) - -export interface Native extends Schema.Schema.Type {} -export const Native = Schema.Struct({ - type: Schema.Literal("native"), - url: Schema.String.pipe(Schema.optional), - settings: Schema.Record(Schema.String, Schema.Unknown), -}) - -export const Api = Schema.Union([AISDK, Native]).pipe(Schema.toTaggedUnion("type")) -export type Api = typeof Api.Type - export const Request = Provider.Request export type Request = Provider.Request -export interface Info extends Schema.Schema.Type {} -export const Info = Schema.Struct({ - id: ID, - integrationID: Integration.ID.pipe(Schema.optional), - name: Schema.String, - disabled: Schema.Boolean.pipe(Schema.optional), - api: Api, - request: Request, -}) - .annotate({ identifier: "ProviderV2.Info" }) - .pipe( - withStatics((schema) => ({ - empty: (id: ID) => - schema.make({ - id, - name: id, - api: { type: "native", settings: {} }, - request: { headers: {}, body: {} }, - }), - })), - ) +export const Info = Provider.Info +export type Info = Provider.Info -export type MutableApi = T extends Api - ? Omit, "settings"> & (undefined extends T["settings"] ? { settings?: any } : { settings: any }) - : never - -export type MutableInfo = Omit, "api"> & { api: MutableApi } +export type MutableInfo = Types.DeepMutable diff --git a/packages/core/src/session/runner/model.ts b/packages/core/src/session/runner/model.ts index b864df8ba3..f8cc794a86 100644 --- a/packages/core/src/session/runner/model.ts +++ b/packages/core/src/session/runner/model.ts @@ -50,16 +50,16 @@ export class VariantUnavailableError extends Schema.TaggedErrorClass()( - "SessionRunnerModel.UnsupportedApiError", +export class UnsupportedPackageError extends Schema.TaggedErrorClass()( + "SessionRunnerModel.UnsupportedPackageError", { providerID: ProviderV2.ID, modelID: ModelV2.ID, - api: Schema.String, + package: Schema.String, }, ) { override get message() { - return `Unsupported API for ${this.providerID}/${this.modelID}: ${this.api}` + return `Unsupported package for ${this.providerID}/${this.modelID}: ${this.package}` } } @@ -67,7 +67,7 @@ export type Error = | ModelNotSelectedError | ModelUnavailableError | VariantUnavailableError - | UnsupportedApiError + | UnsupportedPackageError | Integration.AuthorizationError export interface Interface { @@ -82,19 +82,19 @@ export const layerWith = (resolve: Interface["resolve"]) => Layer.succeed(Servic const apiKey = (model: ModelV2.Info, credential?: Credential.Value) => { if (credential?.type === "key") return Auth.value(credential.key) if (credential?.type === "oauth") return Auth.value(credential.access) - const value = model.request.body.apiKey ?? model.api.settings?.apiKey + const value = model.settings?.apiKey if (typeof value === "string") return Auth.value(value) } const withDefaults = (model: ModelV2.Info, route: AnyRoute) => { - const body = model.request.body + const body = model.body ?? {} const httpBody = Object.hasOwn(body, "apiKey") ? Object.fromEntries(Object.entries(body).filter(([key]) => key !== "apiKey")) : body return route.with({ provider: model.providerID, - endpoint: model.api.url === undefined ? undefined : { baseURL: model.api.url }, - headers: model.request.headers, + endpoint: typeof model.settings?.baseURL === "string" ? { baseURL: model.settings.baseURL } : undefined, + headers: model.headers, http: { body: httpBody }, limits: { context: model.limit.context, output: model.limit.output }, }) @@ -104,8 +104,8 @@ const withVariant = ( model: ModelV2.Info, variantID: ModelV2.VariantID | undefined, ): Effect.Effect => { - const id = variantID === "default" || variantID === undefined ? model.request.variant : variantID - const variant = model.variants.find((item) => item.id === id) + const id = variantID === "default" ? undefined : variantID + const variant = model.variants?.find((item) => item.id === id) if (!variant && variantID !== undefined && variantID !== "default") return Effect.fail( new VariantUnavailableError({ @@ -117,53 +117,55 @@ const withVariant = ( return Effect.succeed( variant ? produce(model, (draft) => { - Object.assign(draft.request.headers, variant.headers) - Object.assign(draft.request.body, variant.body) + draft.settings = merge(draft.settings, variant.settings) + draft.headers = { ...draft.headers, ...variant.headers } + draft.body = merge(draft.body, variant.body) }) : model, ) } -const apiName = (model: ModelV2.Info) => - model.api.type === "aisdk" ? `${model.api.type}:${model.api.package}` : model.api.type - export const fromCatalogModel = ( model: ModelV2.Info, credential?: Credential.Value, -): Effect.Effect => { +): Effect.Effect => { const resolved = credential?.metadata === undefined ? model : produce(model, (draft) => { - Object.assign(draft.request.body, credential.metadata) + draft.settings = { ...draft.settings, ...credential.metadata } }) const key = apiKey(resolved, credential) - if (resolved.api.type === "aisdk" && resolved.api.package === "@ai-sdk/openai") { + if (resolved.aisdk && resolved.package === "@ai-sdk/openai") { return Effect.succeed( withDefaults(resolved, OpenAIResponses.route) .with({ auth: key === undefined ? Auth.none : Auth.bearer(key) }) - .model({ id: resolved.api.id }), + .model({ id: resolved.modelID ?? resolved.id }), ) } - if (resolved.api.type === "aisdk" && resolved.api.package === "@ai-sdk/anthropic") { + if (resolved.aisdk && resolved.package === "@ai-sdk/anthropic") { return Effect.succeed( withDefaults(resolved, AnthropicMessages.route) .with({ auth: key === undefined ? Auth.none : Auth.header("x-api-key", key) }) - .model({ id: resolved.api.id }), + .model({ id: resolved.modelID ?? resolved.id }), ) } - if (resolved.api.type === "aisdk" && resolved.api.package === "@ai-sdk/openai-compatible" && resolved.api.url) { + if ( + resolved.aisdk && + resolved.package === "@ai-sdk/openai-compatible" && + typeof resolved.settings?.baseURL === "string" + ) { return Effect.succeed( withDefaults(resolved, OpenAICompatibleChat.route) .with({ auth: key === undefined ? Auth.none : Auth.bearer(key) }) - .model({ id: resolved.api.id }), + .model({ id: resolved.modelID ?? resolved.id }), ) } return Effect.fail( - new UnsupportedApiError({ + new UnsupportedPackageError({ providerID: resolved.providerID, modelID: resolved.id, - api: apiName(resolved), + package: resolved.aisdk ? `aisdk:${resolved.package}` : (resolved.package ?? "unknown"), }), ) } @@ -172,10 +174,10 @@ export const resolve = (session: SessionSchema.Info, model: ModelV2.Info, creden withVariant(model, session.model?.variant).pipe(Effect.flatMap((model) => fromCatalogModel(model, credential))) export const supported = (model: ModelV2.Info) => - model.api.type === "aisdk" && - (model.api.package === "@ai-sdk/openai" || - model.api.package === "@ai-sdk/anthropic" || - (model.api.package === "@ai-sdk/openai-compatible" && model.api.url !== undefined)) + model.aisdk === true && + (model.package === "@ai-sdk/openai" || + model.package === "@ai-sdk/anthropic" || + (model.package === "@ai-sdk/openai-compatible" && typeof model.settings?.baseURL === "string")) /** Resolves models from the catalog belonging to the current Location runtime. */ export const locationLayer = Layer.effect( @@ -213,3 +215,26 @@ export const locationLayer = Layer.effect( }) }), ) + +function merge( + base: Readonly> | undefined, + overlay: Readonly> | undefined, +): Record | undefined { + if (base === undefined) return overlay && { ...overlay } + if (overlay === undefined) return { ...base } + return Object.fromEntries( + Array.from(new Set([...Object.keys(base), ...Object.keys(overlay)])).map((key) => { + const left = base[key] + const right = overlay[key] + if (right === undefined) return [key, left] + if (plain(left) && plain(right)) return [key, merge(left, right)] + return [key, right] + }), + ) +} + +function plain(input: unknown): input is Readonly> { + if (typeof input !== "object" || input === null || Array.isArray(input)) return false + const prototype = Object.getPrototypeOf(input) + return prototype === Object.prototype || prototype === null +} diff --git a/packages/core/src/v1/config/migrate.ts b/packages/core/src/v1/config/migrate.ts index 7914be66d5..f0fcd1402f 100644 --- a/packages/core/src/v1/config/migrate.ts +++ b/packages/core/src/v1/config/migrate.ts @@ -210,7 +210,7 @@ function migrateModel(info: typeof ConfigProviderV1.Model.Type, packageName?: st ? { tools: info.tool_call ?? false, input: info.modalities?.input ?? [], output: info.modalities?.output ?? [] } : undefined return { - id: info.id, + modelID: info.id, family: info.family, name: info.name, package: info.provider?.npm, diff --git a/packages/core/test/catalog.test.ts b/packages/core/test/catalog.test.ts index a3a1c4972d..ec5cc3010a 100644 --- a/packages/core/test/catalog.test.ts +++ b/packages/core/test/catalog.test.ts @@ -65,14 +65,14 @@ describe("CatalogV2", () => { }) expect((yield* catalog.provider.available()).map((provider) => provider.id)).toEqual([ProviderV2.ID.make("test")]) - expect(required(yield* catalog.provider.get(ProviderV2.ID.make("test"))).request.body).toEqual({}) + expect(required(yield* catalog.provider.get(ProviderV2.ID.make("test"))).body).toBeUndefined() yield* credentials.create({ integrationID, label: "Second", value: Credential.Key.make({ type: "key", key: "second", metadata: { tenant: "two" } }), }) expect((yield* catalog.provider.available()).map((provider) => provider.id)).toEqual([ProviderV2.ID.make("test")]) - expect(required(yield* catalog.provider.get(ProviderV2.ID.make("test"))).request.body).toEqual({}) + expect(required(yield* catalog.provider.get(ProviderV2.ID.make("test"))).body).toBeUndefined() }).pipe(Effect.provide(layer)) }) @@ -135,111 +135,95 @@ describe("CatalogV2", () => { ), ) - it.effect("normalizes provider baseURL into api url", () => + it.effect("keeps provider API settings flat", () => Effect.gen(function* () { const catalog = yield* Catalog.Service const providerID = ProviderV2.ID.make("test") yield* catalog.transform((catalog) => catalog.provider.update(providerID, (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://default.example.com", - } - provider.request.body.baseURL = "https://override.example.com" + provider.package = "@ai-sdk/openai-compatible" + provider.aisdk = true + provider.settings = { baseURL: "https://override.example.com" } }), ) - expect(required(yield* catalog.provider.get(providerID)).api).toEqual({ - type: "aisdk", + expect(required(yield* catalog.provider.get(providerID))).toMatchObject({ package: "@ai-sdk/openai-compatible", - url: "https://override.example.com", + aisdk: true, + settings: { baseURL: "https://override.example.com" }, }) }), ) - it.effect("normalizes model baseURL into api url", () => + it.effect("resolves model settings and upstream model ID", () => Effect.gen(function* () { const catalog = yield* Catalog.Service const providerID = ProviderV2.ID.make("test") const modelID = ModelV2.ID.make("model") yield* catalog.transform((catalog) => { catalog.provider.update(providerID, (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://provider.example.com", - } + provider.package = "@ai-sdk/openai-compatible" + provider.aisdk = true + provider.settings = { baseURL: "https://provider.example.com" } }) catalog.model.update(providerID, modelID, (model) => { - model.api = { - id: modelID, - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://model.example.com", - } - model.request.body.baseURL = "https://override.example.com" + model.modelID = ModelV2.ID.make("upstream-model") + model.settings = { baseURL: "https://override.example.com" } }) }) - expect(required(yield* catalog.model.get(providerID, modelID)).api).toEqual({ + expect(required(yield* catalog.model.get(providerID, modelID))).toMatchObject({ id: modelID, - type: "aisdk", + modelID: ModelV2.ID.make("upstream-model"), package: "@ai-sdk/openai-compatible", - url: "https://override.example.com", - settings: {}, + aisdk: true, + settings: { baseURL: "https://override.example.com" }, }) }), ) - it.effect("resolves default model api from provider api", () => + it.effect("resolves default model transport from provider transport", () => Effect.gen(function* () { const catalog = yield* Catalog.Service const providerID = ProviderV2.ID.make("test") const modelID = ModelV2.ID.make("model") yield* catalog.transform((catalog) => { catalog.provider.update(providerID, (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://provider.example.com", - } + provider.package = "@ai-sdk/openai-compatible" + provider.aisdk = true + provider.settings = { baseURL: "https://provider.example.com" } }) catalog.model.update(providerID, modelID, () => {}) }) - expect(required(yield* catalog.model.get(providerID, modelID)).api).toEqual({ + expect(required(yield* catalog.model.get(providerID, modelID))).toMatchObject({ id: modelID, - type: "aisdk", package: "@ai-sdk/openai-compatible", - url: "https://provider.example.com", + aisdk: true, + settings: { baseURL: "https://provider.example.com" }, }) }), ) - it.effect("resolves provider and model request merges", () => + it.effect("resolves provider and model overlay merges", () => Effect.gen(function* () { const catalog = yield* Catalog.Service const providerID = ProviderV2.ID.make("test") const modelID = ModelV2.ID.make("model") yield* catalog.transform((catalog) => { catalog.provider.update(providerID, (provider) => { - provider.request.headers.provider = "provider" - provider.request.headers.shared = "provider" - provider.request.body.provider = true + provider.headers = { provider: "provider", shared: "provider" } + provider.body = { provider: true } }) catalog.model.update(providerID, modelID, (model) => { - model.request.headers.model = "model" - model.request.headers.shared = "model" - model.request.body.model = true - model.request.body.request = true - model.request.body.shared = "model" + model.headers = { model: "model", shared: "model" } + model.body = { model: true, request: true, shared: "model" } }) }) const model = required(yield* catalog.model.get(providerID, modelID)) - expect(model.request.headers).toEqual({ provider: "provider", shared: "model", model: "model" }) - expect(model.request.body).toEqual({ provider: true, model: true, request: true, shared: "model" }) + expect(model.headers).toEqual({ provider: "provider", shared: "model", model: "model" }) + expect(model.body).toEqual({ provider: true, model: true, request: true, shared: "model" }) }), ) diff --git a/packages/core/test/config/config.test.ts b/packages/core/test/config/config.test.ts index 328b5a3b82..d74ea49c79 100644 --- a/packages/core/test/config/config.test.ts +++ b/packages/core/test/config/config.test.ts @@ -43,11 +43,7 @@ function testLayer( } const provider = { - api: { type: "native", settings: {} }, - request: { - headers: {}, - body: {}, - }, + package: "test-provider", models: {}, } diff --git a/packages/core/test/config/provider.test.ts b/packages/core/test/config/provider.test.ts index 605bcd63cf..9ca8b8ca1e 100644 --- a/packages/core/test/config/provider.test.ts +++ b/packages/core/test/config/provider.test.ts @@ -45,13 +45,6 @@ function withEnv(vars: Record, effect: () = ) } -function request(headers: Record, variant?: string) { - return { - headers, - variant, - } -} - const decode = Schema.decodeUnknownSync(Config.Info) describe("ConfigProviderPlugin.Plugin", () => { @@ -68,7 +61,9 @@ describe("ConfigProviderPlugin.Plugin", () => { info: decode({ providers: { opencode: { - api: { type: "aisdk", package: "@ai-sdk/openai", url: "https://opencode.test/v1" }, + package: "@ai-sdk/openai", + aisdk: true, + settings: { baseURL: "https://opencode.test/v1" }, models: { "alpha-gpt-next": { variants: [ @@ -119,7 +114,9 @@ describe("ConfigProviderPlugin.Plugin", () => { info: decode({ providers: { opencode: { - api: { type: "aisdk", package: "@ai-sdk/openai", url: "https://opencode.test/v1" }, + package: "@ai-sdk/openai", + aisdk: true, + settings: { baseURL: "https://opencode.test/v1" }, }, }, }), @@ -144,7 +141,7 @@ describe("ConfigProviderPlugin.Plugin", () => { yield* addPlugin(config) const model = required(yield* catalog.model.get(providerID, modelID)) - expect(model.variants[0]).toMatchObject({ + expect(model.variants?.[0]).toMatchObject({ id: "high", body: { reasoningEffort: "high" }, }) @@ -169,8 +166,8 @@ describe("ConfigProviderPlugin.Plugin", () => { custom: { name: "Configured", env: ["CUSTOM_API_KEY"], - api: { type: "native", settings: {} }, - request: request({ first: "first", shared: "first" }), + package: "native", + headers: { first: "first", shared: "first" }, models: { chat: { name: "First", @@ -178,7 +175,8 @@ describe("ConfigProviderPlugin.Plugin", () => { disabled: true, limit: { context: 100, output: 50 }, cost: { input: 1, output: 2 }, - request: request({ first: "first", shared: "first" }, "retained"), + settings: { retained: true }, + headers: { first: "first", shared: "first" }, variants: [ { id: "fast", @@ -197,17 +195,19 @@ describe("ConfigProviderPlugin.Plugin", () => { model: "custom/default", providers: { custom: { - api: { type: "aisdk", package: "custom-sdk", url: "https://example.test" }, - request: request({ last: "last", shared: "last" }), + package: "custom-sdk", + aisdk: true, + settings: { baseURL: "https://example.test" }, + headers: { last: "last", shared: "last" }, models: { default: { name: "Default", }, chat: { - api: { id: "api-chat" }, + modelID: "api-chat", name: "Last", limit: { output: 75 }, - request: request({ last: "last", shared: "last" }), + headers: { last: "last", shared: "last" }, variants: [ { id: "fast", @@ -247,22 +247,25 @@ describe("ConfigProviderPlugin.Plugin", () => { }) expect((yield* integrations.get(Integration.ID.make("custom")))?.name).toBe("Renamed") expect(provider.disabled).toBeUndefined() - expect(provider.api).toEqual({ type: "aisdk", package: "custom-sdk", url: "https://example.test" }) - expect(provider.request.headers).toEqual({ first: "first", shared: "last", last: "last" }) - expect(model.api.id).toBe(ModelV2.ID.make("api-chat")) + expect(provider.package).toBe("custom-sdk") + expect(provider.aisdk).toBe(true) + expect(provider.settings).toEqual({ baseURL: "https://example.test" }) + expect(provider.headers).toEqual({ first: "first", shared: "last", last: "last" }) + expect(model.id).toBe(modelID) + expect(model.modelID).toBe(ModelV2.ID.make("api-chat")) expect(model.name).toBe("Last") expect(model.capabilities).toEqual({ tools: true, input: ["text"], output: ["text"] }) expect(model.enabled).toBe(false) expect(model.limit).toEqual({ context: 100, output: 75 }) expect(model.cost).toEqual([{ input: 1, output: 2, cache: { read: 0, write: 0 }, tier: undefined }]) - expect(model.request.headers).toEqual({ first: "first", shared: "last", last: "last" }) - expect(model.request.variant).toBe("retained") - expect(model.variants.map((variant) => variant.id)).toEqual([ + expect(model.settings).toEqual({ baseURL: "https://example.test", retained: true }) + expect(model.headers).toEqual({ first: "first", shared: "last", last: "last" }) + expect(model.variants?.map((variant) => variant.id)).toEqual([ ModelV2.VariantID.make("fast"), ModelV2.VariantID.make("slow"), ]) - expect(model.variants[0]?.headers).toEqual({ first: "first", shared: "last", last: "last" }) - expect(model.variants[1]?.headers).toEqual({ slow: "slow" }) + expect(model.variants?.[0]?.headers).toEqual({ first: "first", shared: "last", last: "last" }) + expect(model.variants?.[1]?.headers).toEqual({ slow: "slow" }) }), ), ) diff --git a/packages/core/test/location-layer.test.ts b/packages/core/test/location-layer.test.ts index 14b2ed7378..a33cee0689 100644 --- a/packages/core/test/location-layer.test.ts +++ b/packages/core/test/location-layer.test.ts @@ -168,7 +168,7 @@ describe("LocationServiceMap", () => { providers: { unavailable: { name: "Unavailable", - api: { type: "native", settings: {} }, + package: "test-provider", models: { chat: { disabled: true } }, }, }, diff --git a/packages/core/test/plugin/host.ts b/packages/core/test/plugin/host.ts index 4561366d4c..b1231fe4eb 100644 --- a/packages/core/test/plugin/host.ts +++ b/packages/core/test/plugin/host.ts @@ -118,7 +118,7 @@ export function catalogHost(catalog: Catalog.Interface): PluginContext["catalog" id: ModelV2.ID.make(current.id), providerID: ProviderV2.ID.make(current.providerID), family: current.family === undefined ? undefined : ModelV2.Family.make(current.family), - variants: current.variants.map((variant) => ({ + variants: current.variants?.map((variant) => ({ ...variant, id: ModelV2.VariantID.make(variant.id), })), @@ -272,29 +272,28 @@ function agentInfo(value: AgentV2.Info) { function providerInfo(value: ProviderV2.MutableInfo) { return { ...value, - api: { ...value.api, settings: value.api.settings && { ...value.api.settings } }, - request: { headers: { ...value.request.headers }, body: { ...value.request.body } }, + settings: value.settings && { ...value.settings }, + headers: value.headers && { ...value.headers }, + body: value.body && { ...value.body }, } } function modelInfo(value: ModelV2.Info | ModelV2.MutableInfo) { return { ...value, - api: { ...value.api, settings: value.api.settings && { ...value.api.settings } }, + settings: value.settings && { ...value.settings }, + headers: value.headers && { ...value.headers }, + body: value.body && { ...value.body }, capabilities: { ...value.capabilities, input: [...value.capabilities.input], output: [...value.capabilities.output], }, - request: { - ...value.request, - headers: { ...value.request.headers }, - body: { ...value.request.body }, - }, - variants: value.variants.map((variant) => ({ + variants: value.variants?.map((variant) => ({ ...variant, - headers: { ...variant.headers }, - body: { ...variant.body }, + settings: variant.settings && { ...variant.settings }, + headers: variant.headers && { ...variant.headers }, + body: variant.body && { ...variant.body }, })), time: { ...value.time }, cost: value.cost.map((cost) => ({ ...cost, tier: cost.tier && { ...cost.tier }, cache: { ...cost.cache } })), diff --git a/packages/core/test/plugin/provider-alibaba.test.ts b/packages/core/test/plugin/provider-alibaba.test.ts index 25d46bf83c..3bf2e0b325 100644 --- a/packages/core/test/plugin/provider-alibaba.test.ts +++ b/packages/core/test/plugin/provider-alibaba.test.ts @@ -28,7 +28,9 @@ describe("AlibabaPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("alibaba"), ModelV2.ID.make("qwen")), - api: { id: ModelV2.ID.make("qwen"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("qwen"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/alibaba", options: { name: "alibaba" }, @@ -45,7 +47,9 @@ describe("AlibabaPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("alibaba"), ModelV2.ID.make("qwen")), - api: { id: ModelV2.ID.make("qwen"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("qwen"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "alibaba" }, @@ -62,7 +66,9 @@ describe("AlibabaPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-alibaba"), ModelV2.ID.make("qwen")), - api: { id: ModelV2.ID.make("qwen"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("qwen"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/alibaba", options: { name: "custom-alibaba", apiKey: "test" }, @@ -74,17 +80,19 @@ describe("AlibabaPlugin", () => { }), ) - it.effect("uses the old default languageModel(api.id) behavior", () => + it.effect("uses the default languageModel(modelID) behavior", () => Effect.gen(function* () { const plugin = yield* PluginV2.Service const aisdk = yield* AISDK.Service yield* addPlugin() const item = ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("alibaba"), ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("qwen-plus"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("qwen-plus"), + aisdk: true, + package: "test-provider", }) const result = yield* aisdk.runSDK({ model: item, package: "@ai-sdk/alibaba", options: {} }) - const language = result.sdk?.languageModel(item.api.id) + const language = result.sdk?.languageModel(item.modelID ?? item.id) expect(language?.modelId).toBe("qwen-plus") expect(language?.provider).toBe("alibaba.chat") }), diff --git a/packages/core/test/plugin/provider-amazon-bedrock.test.ts b/packages/core/test/plugin/provider-amazon-bedrock.test.ts index 5d24879e49..42e9fc10ec 100644 --- a/packages/core/test/plugin/provider-amazon-bedrock.test.ts +++ b/packages/core/test/plugin/provider-amazon-bedrock.test.ts @@ -79,31 +79,32 @@ function openAIUrl(language: unknown, path: string, modelId: string) { } describe("AmazonBedrockPlugin", () => { - it.effect("moves endpoint option to api URL", () => + it.effect("moves endpoint option to baseURL", () => Effect.gen(function* () { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { const bedrock = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.amazonBedrock), - api: { type: "aisdk", package: "@ai-sdk/amazon-bedrock" }, - request: { - headers: {}, - body: { endpoint: "https://bedrock.example" }, - }, + aisdk: true, + package: "@ai-sdk/amazon-bedrock", + headers: {}, + settings: { endpoint: "https://bedrock.example" }, }) catalog.provider.update(bedrock.id, (item) => { - item.api = bedrock.api - item.request = bedrock.request + item.aisdk = bedrock.aisdk + item.package = bedrock.package + item.headers = bedrock.headers + item.settings = { endpoint: "https://bedrock.example" } }) }) yield* addPlugin() const result = required(yield* catalog.provider.get(ProviderV2.ID.amazonBedrock)) - expect(result.api).toEqual({ - type: "aisdk", + expect(result).toMatchObject({ + aisdk: true, package: "@ai-sdk/amazon-bedrock", - url: "https://bedrock.example", + settings: { baseURL: "https://bedrock.example" }, }) - expect(result.request.body.endpoint).toBeUndefined() + expect(result.settings?.endpoint).toBeUndefined() }), ) @@ -116,7 +117,9 @@ describe("AmazonBedrockPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { @@ -141,7 +144,9 @@ describe("AmazonBedrockPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { @@ -175,11 +180,9 @@ describe("AmazonBedrockPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { - id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - type: "aisdk", - package: "test-provider", - }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { name: "amazon-bedrock" }, @@ -199,7 +202,9 @@ describe("AmazonBedrockPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { name: "amazon-bedrock", region: "eu-west-1" }, @@ -218,7 +223,9 @@ describe("AmazonBedrockPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { name: "amazon-bedrock" }, @@ -237,7 +244,9 @@ describe("AmazonBedrockPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { name: "amazon-bedrock" }, @@ -257,7 +266,9 @@ describe("AmazonBedrockPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { @@ -286,7 +297,9 @@ describe("AmazonBedrockPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { @@ -314,11 +327,9 @@ describe("AmazonBedrockPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("openai.gpt-5.5")), - api: { - id: ModelV2.ID.make("openai.gpt-5.5"), - type: "aisdk", - package: "@ai-sdk/amazon-bedrock/mantle", - }, + modelID: ModelV2.ID.make("openai.gpt-5.5"), + aisdk: true, + package: "@ai-sdk/amazon-bedrock/mantle", }), package: "@ai-sdk/amazon-bedrock/mantle", options: { @@ -345,11 +356,9 @@ describe("AmazonBedrockPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("openai.gpt-5.5")), - api: { - id: ModelV2.ID.make("openai.gpt-5.5"), - type: "aisdk", - package: "@ai-sdk/amazon-bedrock/mantle", - }, + modelID: ModelV2.ID.make("openai.gpt-5.5"), + aisdk: true, + package: "@ai-sdk/amazon-bedrock/mantle", }), sdk: fakeSelectorSdk(calls), options: { baseURL: "https://bedrock-mantle.us-east-2.api.aws/openai/v1", region: "us-east-2" }, @@ -357,11 +366,9 @@ describe("AmazonBedrockPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("openai.gpt-oss-safeguard-120b")), - api: { - id: ModelV2.ID.make("openai.gpt-oss-safeguard-120b"), - type: "aisdk", - package: "@ai-sdk/amazon-bedrock/mantle", - }, + modelID: ModelV2.ID.make("openai.gpt-oss-safeguard-120b"), + aisdk: true, + package: "@ai-sdk/amazon-bedrock/mantle", }), sdk: fakeSelectorSdk(calls), options: { region: "us-east-1" }, @@ -378,11 +385,9 @@ describe("AmazonBedrockPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { - id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - type: "aisdk", - package: "@ai-sdk/amazon-bedrock/anthropic", - }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "@ai-sdk/amazon-bedrock/anthropic", }), package: "@ai-sdk/amazon-bedrock/anthropic", options: { name: "amazon-bedrock" }, @@ -409,11 +414,9 @@ describe("AmazonBedrockPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { - id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - type: "aisdk", - package: "test-provider", - }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { @@ -444,7 +447,9 @@ describe("AmazonBedrockPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: {}, @@ -452,7 +457,9 @@ describe("AmazonBedrockPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: { region: "eu-west-1" }, @@ -460,11 +467,9 @@ describe("AmazonBedrockPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("global.anthropic.claude-sonnet-4-5")), - api: { - id: ModelV2.ID.make("global.anthropic.claude-sonnet-4-5"), - type: "aisdk", - package: "test-provider", - }, + modelID: ModelV2.ID.make("global.anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: { region: "eu-west-1" }, @@ -472,7 +477,9 @@ describe("AmazonBedrockPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: { region: "ap-northeast-1" }, @@ -480,7 +487,9 @@ describe("AmazonBedrockPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: { region: "ap-southeast-2" }, @@ -505,7 +514,9 @@ describe("AmazonBedrockPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: {}, @@ -591,7 +602,9 @@ describe("AmazonBedrockPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make(item.modelID)), - api: { id: ModelV2.ID.make(item.modelID), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make(item.modelID), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: { region: item.region }, @@ -610,7 +623,9 @@ describe("AmazonBedrockPlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: { region: "eu-west-1" }, diff --git a/packages/core/test/plugin/provider-anthropic.test.ts b/packages/core/test/plugin/provider-anthropic.test.ts index a4ad4d7950..53e68a8098 100644 --- a/packages/core/test/plugin/provider-anthropic.test.ts +++ b/packages/core/test/plugin/provider-anthropic.test.ts @@ -31,19 +31,22 @@ describe("AnthropicPlugin", () => { yield* catalog.transform((catalog) => { const item = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.anthropic), - api: { type: "aisdk", package: "@ai-sdk/anthropic" }, - request: { headers: { Existing: "1" }, body: {} }, + aisdk: true, + package: "@ai-sdk/anthropic", + headers: { Existing: "1" }, + settings: {}, }) catalog.provider.update(item.id, (draft) => { - draft.api = item.api - draft.request = item.request + draft.aisdk = item.aisdk + draft.package = item.package + draft.headers = item.headers }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.anthropic)).request.headers["anthropic-beta"]).toBe( + expect(required(yield* catalog.provider.get(ProviderV2.ID.anthropic)).headers?.["anthropic-beta"]).toBe( "interleaved-thinking-2025-05-14,fine-grained-tool-streaming-2025-05-14", ) - expect(required(yield* catalog.provider.get(ProviderV2.ID.anthropic)).request.headers.Existing).toBe("1") + expect(required(yield* catalog.provider.get(ProviderV2.ID.anthropic)).headers?.Existing).toBe("1") }), ) @@ -52,9 +55,7 @@ describe("AnthropicPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.openai, () => {})) yield* addPlugin() - expect( - required(yield* catalog.provider.get(ProviderV2.ID.openai)).request.headers["anthropic-beta"], - ).toBeUndefined() + expect(required(yield* catalog.provider.get(ProviderV2.ID.openai)).headers?.["anthropic-beta"]).toBeUndefined() }), ) @@ -66,7 +67,9 @@ describe("AnthropicPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-anthropic"), ModelV2.ID.make("claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("claude-sonnet-4-5"), type: "aisdk", package: "@ai-sdk/anthropic" }, + modelID: ModelV2.ID.make("claude-sonnet-4-5"), + aisdk: true, + package: "@ai-sdk/anthropic", }), package: "@ai-sdk/anthropic", options: { name: "custom-anthropic", apiKey: "test" }, @@ -83,7 +86,9 @@ describe("AnthropicPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.anthropic, ModelV2.ID.make("claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("claude-sonnet-4-5"), type: "aisdk", package: "@ai-sdk/anthropic" }, + modelID: ModelV2.ID.make("claude-sonnet-4-5"), + aisdk: true, + package: "@ai-sdk/anthropic", }), package: "@ai-sdk/anthropic", options: { name: "anthropic", apiKey: "test" }, diff --git a/packages/core/test/plugin/provider-azure-cognitive-services.test.ts b/packages/core/test/plugin/provider-azure-cognitive-services.test.ts index 6b3f6c6a38..f726f8bf90 100644 --- a/packages/core/test/plugin/provider-azure-cognitive-services.test.ts +++ b/packages/core/test/plugin/provider-azure-cognitive-services.test.ts @@ -66,18 +66,18 @@ describe("AzureCognitiveServicesPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("azure-cognitive-services"), (item) => { - item.api = { type: "aisdk", package: "@ai-sdk/openai-compatible" } + item.aisdk = true + item.package = "@ai-sdk/openai-compatible" }) }) yield* addPlugin() const result = required(yield* catalog.provider.get(ProviderV2.ID.make("azure-cognitive-services"))) - expect(result.api).toEqual({ - type: "aisdk", + expect(result).toMatchObject({ + aisdk: true, package: "@ai-sdk/openai-compatible", - url: "https://cognitive.cognitiveservices.azure.com/openai", + settings: { baseURL: "https://cognitive.cognitiveservices.azure.com/openai" }, }) - expect(result.request.body.baseURL).toBeUndefined() - expect(result.request.body.resourceName).toBeUndefined() + expect(result.settings?.resourceName).toBeUndefined() }), ), ) @@ -89,26 +89,30 @@ describe("AzureCognitiveServicesPlugin", () => { yield* catalog.transform((catalog) => { const azure = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services")), - api: { type: "aisdk", package: "@ai-sdk/openai-compatible" }, + aisdk: true, + package: "@ai-sdk/openai-compatible", }) const openai = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.openai), - api: { type: "aisdk", package: "test-provider" }, + aisdk: true, + package: "test-provider", }) catalog.provider.update(azure.id, (item) => { - item.api = azure.api + item.aisdk = azure.aisdk + item.package = azure.package }) catalog.provider.update(openai.id, (item) => { - item.api = openai.api + item.aisdk = openai.aisdk + item.package = openai.package }) }) yield* addPlugin() const azure = required(yield* catalog.provider.get(ProviderV2.ID.make("azure-cognitive-services"))) const openai = required(yield* catalog.provider.get(ProviderV2.ID.openai)) - expect(azure.request.body.baseURL).toBeUndefined() - expect(azure.api).toEqual({ type: "aisdk", package: "@ai-sdk/openai-compatible" }) - expect(openai.request.body.baseURL).toBeUndefined() - expect(openai.api).toEqual({ type: "aisdk", package: "test-provider" }) + expect(azure.settings?.baseURL).toBeUndefined() + expect(azure).toMatchObject({ aisdk: true, package: "@ai-sdk/openai-compatible" }) + expect(openai.settings?.baseURL).toBeUndefined() + expect(openai).toMatchObject({ aisdk: true, package: "test-provider" }) }), ), ) @@ -122,7 +126,9 @@ describe("AzureCognitiveServicesPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("deployment")), - api: { id: ModelV2.ID.make("deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("deployment"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: { useCompletionUrls: true }, @@ -140,7 +146,9 @@ describe("AzureCognitiveServicesPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("deployment")), - api: { id: ModelV2.ID.make("deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("deployment"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -148,7 +156,9 @@ describe("AzureCognitiveServicesPlugin", () => { const ignored = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("deployment")), - api: { id: ModelV2.ID.make("deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("deployment"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -168,7 +178,9 @@ describe("AzureCognitiveServicesPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("messages-deployment")), - api: { id: ModelV2.ID.make("messages-deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("messages-deployment"), + aisdk: true, + package: "test-provider", }), sdk: { messages: sdk.messages, chat: sdk.chat, languageModel: sdk.languageModel }, options: {}, @@ -176,7 +188,9 @@ describe("AzureCognitiveServicesPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("chat-deployment")), - api: { id: ModelV2.ID.make("chat-deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("chat-deployment"), + aisdk: true, + package: "test-provider", }), sdk: { chat: sdk.chat, languageModel: sdk.languageModel }, options: {}, @@ -184,7 +198,9 @@ describe("AzureCognitiveServicesPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("language-deployment")), - api: { id: ModelV2.ID.make("language-deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("language-deployment"), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: sdk.languageModel }, options: {}, diff --git a/packages/core/test/plugin/provider-azure.test.ts b/packages/core/test/plugin/provider-azure.test.ts index 1d8172854c..65bad6e289 100644 --- a/packages/core/test/plugin/provider-azure.test.ts +++ b/packages/core/test/plugin/provider-azure.test.ts @@ -66,11 +66,12 @@ describe("AzurePlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.azure, (item) => { - item.api = { type: "aisdk", package: "@ai-sdk/azure" } + item.aisdk = true + item.package = "@ai-sdk/azure" }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.azure)).request.body.resourceName).toBe("from-env") + expect(required(yield* catalog.provider.get(ProviderV2.ID.azure)).settings?.resourceName).toBe("from-env") }), ), ) @@ -82,18 +83,22 @@ describe("AzurePlugin", () => { yield* catalog.transform((catalog) => { const azure = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.azure), - api: { type: "aisdk", package: "@ai-sdk/azure" }, - request: { headers: {}, body: { resourceName: "from-config" } }, + aisdk: true, + package: "@ai-sdk/azure", + headers: {}, + settings: { resourceName: "from-config" }, }) catalog.provider.update(azure.id, (item) => { - item.api = azure.api - item.request = azure.request + item.aisdk = azure.aisdk + item.package = azure.package + item.headers = azure.headers + item.settings = { resourceName: "from-config" } }) catalog.provider.update(ProviderV2.ID.openai, () => {}) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.azure)).request.body.resourceName).toBe("from-config") - expect(required(yield* catalog.provider.get(ProviderV2.ID.openai)).request.body.resourceName).toBeUndefined() + expect(required(yield* catalog.provider.get(ProviderV2.ID.azure)).settings?.resourceName).toBe("from-config") + expect(required(yield* catalog.provider.get(ProviderV2.ID.openai)).settings?.resourceName).toBeUndefined() }), ), ) @@ -105,16 +110,20 @@ describe("AzurePlugin", () => { yield* catalog.transform((catalog) => { const azure = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.azure), - api: { type: "aisdk", package: "@ai-sdk/azure" }, - request: { headers: {}, body: { resourceName: "" } }, + aisdk: true, + package: "@ai-sdk/azure", + headers: {}, + settings: { resourceName: "" }, }) catalog.provider.update(azure.id, (item) => { - item.api = azure.api - item.request = azure.request + item.aisdk = azure.aisdk + item.package = azure.package + item.headers = azure.headers + item.settings = { resourceName: "" } }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.azure)).request.body.resourceName).toBe("from-env") + expect(required(yield* catalog.provider.get(ProviderV2.ID.azure)).settings?.resourceName).toBe("from-env") }), ), ) @@ -126,16 +135,20 @@ describe("AzurePlugin", () => { yield* catalog.transform((catalog) => { const azure = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.azure), - api: { type: "aisdk", package: "@ai-sdk/azure" }, - request: { headers: {}, body: { resourceName: " " } }, + aisdk: true, + package: "@ai-sdk/azure", + headers: {}, + settings: { resourceName: " " }, }) catalog.provider.update(azure.id, (item) => { - item.api = azure.api - item.request = azure.request + item.aisdk = azure.aisdk + item.package = azure.package + item.headers = azure.headers + item.settings = { resourceName: " " } }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.azure)).request.body.resourceName).toBe("from-env") + expect(required(yield* catalog.provider.get(ProviderV2.ID.azure)).settings?.resourceName).toBe("from-env") }), ), ) @@ -149,7 +162,9 @@ describe("AzurePlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")), - api: { id: ModelV2.ID.make("deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("deployment"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/azure", options: { name: "azure", baseURL: "https://proxy.example.com/openai" }, @@ -168,7 +183,9 @@ describe("AzurePlugin", () => { .runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")), - api: { id: ModelV2.ID.make("deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("deployment"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/azure", options: { name: "azure" }, @@ -188,7 +205,9 @@ describe("AzurePlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")), - api: { id: ModelV2.ID.make("deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("deployment"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: { useCompletionUrls: true }, @@ -206,7 +225,9 @@ describe("AzurePlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")), - api: { id: ModelV2.ID.make("deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("deployment"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: { useCompletionUrls: true }, @@ -224,8 +245,11 @@ describe("AzurePlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")), - api: { id: ModelV2.ID.make("deployment"), type: "aisdk", package: "test-provider" }, - request: { headers: {}, body: { useCompletionUrls: true } }, + modelID: ModelV2.ID.make("deployment"), + aisdk: true, + package: "test-provider", + headers: {}, + settings: { useCompletionUrls: true }, }), sdk: fakeSelectorSdk(calls), options: {}, @@ -243,7 +267,9 @@ describe("AzurePlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")), - api: { id: ModelV2.ID.make("deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("deployment"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -251,7 +277,9 @@ describe("AzurePlugin", () => { const ignored = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("deployment")), - api: { id: ModelV2.ID.make("deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("deployment"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -274,7 +302,9 @@ describe("AzurePlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("messages-deployment")), - api: { id: ModelV2.ID.make("messages-deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("messages-deployment"), + aisdk: true, + package: "test-provider", }), sdk: { messages: make("messages"), chat: make("chat"), languageModel: make("languageModel") }, options: {}, @@ -282,7 +312,9 @@ describe("AzurePlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("language-deployment")), - api: { id: ModelV2.ID.make("language-deployment"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("language-deployment"), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: make("languageModel") }, options: {}, diff --git a/packages/core/test/plugin/provider-cerebras.test.ts b/packages/core/test/plugin/provider-cerebras.test.ts index adcc1779b0..ae58572c64 100644 --- a/packages/core/test/plugin/provider-cerebras.test.ts +++ b/packages/core/test/plugin/provider-cerebras.test.ts @@ -36,12 +36,13 @@ describe("CerebrasPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("cerebras"), (item) => { - item.api = { type: "aisdk", package: "@ai-sdk/cerebras" } - item.request.headers.Existing = "1" + item.aisdk = true + item.package = "@ai-sdk/cerebras" + item.headers = { ...item.headers, Existing: "1" } }) }) yield* addPlugin() - expect((yield* catalog.provider.get(ProviderV2.ID.make("cerebras")))?.request.headers).toEqual({ + expect((yield* catalog.provider.get(ProviderV2.ID.make("cerebras")))?.headers).toEqual({ Existing: "1", "X-Cerebras-3rd-Party-Integration": "opencode", }) @@ -53,7 +54,7 @@ describe("CerebrasPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("groq"), () => {})) yield* addPlugin() - expect((yield* catalog.provider.get(ProviderV2.ID.make("groq")))?.request.headers).toEqual({}) + expect((yield* catalog.provider.get(ProviderV2.ID.make("groq")))?.headers).toBeUndefined() }), ) @@ -69,11 +70,9 @@ describe("CerebrasPlugin", () => { ProviderV2.ID.make("custom-cerebras"), ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), ), - api: { - id: ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), - type: "aisdk", - package: "test-provider", - }, + modelID: ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/cerebras", options: { name: "custom-cerebras", apiKey: "test" }, @@ -95,11 +94,9 @@ describe("CerebrasPlugin", () => { ProviderV2.ID.make("custom-cerebras"), ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), ), - api: { - id: ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), - type: "aisdk", - package: "test-provider", - }, + modelID: ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/cerebras", options: { name: "configured-cerebras", apiKey: "test" }, @@ -120,11 +117,9 @@ describe("CerebrasPlugin", () => { ProviderV2.ID.make("custom-cerebras"), ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), ), - api: { - id: ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), - type: "aisdk", - package: "test-provider", - }, + modelID: ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/groq", options: { name: "custom-cerebras", apiKey: "test" }, diff --git a/packages/core/test/plugin/provider-cloudflare-ai-gateway.test.ts b/packages/core/test/plugin/provider-cloudflare-ai-gateway.test.ts index 008b9a46a3..7259f7ed56 100644 --- a/packages/core/test/plugin/provider-cloudflare-ai-gateway.test.ts +++ b/packages/core/test/plugin/provider-cloudflare-ai-gateway.test.ts @@ -118,7 +118,9 @@ describe("CloudflareAIGatewayPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), - api: { id: ModelV2.ID.make("openai/gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("openai/gpt-5"), + aisdk: true, + package: "test-provider", }), package: "ai-gateway-provider", options: { name: "cloudflare-ai-gateway" }, @@ -139,7 +141,9 @@ describe("CloudflareAIGatewayPlugin", () => { yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), - api: { id: ModelV2.ID.make("openai/gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("openai/gpt-5"), + aisdk: true, + package: "test-provider", }), package: "ai-gateway-provider", options: { @@ -183,7 +187,9 @@ describe("CloudflareAIGatewayPlugin", () => { yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), - api: { id: ModelV2.ID.make("openai/gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("openai/gpt-5"), + aisdk: true, + package: "test-provider", }), package: "ai-gateway-provider", options: { @@ -212,7 +218,9 @@ describe("CloudflareAIGatewayPlugin", () => { yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), - api: { id: ModelV2.ID.make("openai/gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("openai/gpt-5"), + aisdk: true, + package: "test-provider", }), package: "ai-gateway-provider", options: { @@ -249,7 +257,9 @@ describe("CloudflareAIGatewayPlugin", () => { yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), - api: { id: ModelV2.ID.make("openai/gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("openai/gpt-5"), + aisdk: true, + package: "test-provider", }), package: "ai-gateway-provider", options: { @@ -280,7 +290,9 @@ describe("CloudflareAIGatewayPlugin", () => { yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), - api: { id: ModelV2.ID.make("openai/gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("openai/gpt-5"), + aisdk: true, + package: "test-provider", }), package: "ai-gateway-provider", options: { name: "cloudflare-ai-gateway" }, @@ -302,7 +314,9 @@ describe("CloudflareAIGatewayPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), - api: { id: ModelV2.ID.make("openai/gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("openai/gpt-5"), + aisdk: true, + package: "test-provider", }), package: "ai-gateway-provider", options: { name: "cloudflare-ai-gateway" }, @@ -325,7 +339,9 @@ describe("CloudflareAIGatewayPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), - api: { id: ModelV2.ID.make("openai/gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("openai/gpt-5"), + aisdk: true, + package: "test-provider", }), package: "ai-gateway-provider", options: { name: "cloudflare-ai-gateway" }, @@ -354,7 +370,9 @@ describe("CloudflareAIGatewayPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), - api: { id: ModelV2.ID.make("openai/gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("openai/gpt-5"), + aisdk: true, + package: "test-provider", }), package: "ai-gateway-provider", options: { name: "cloudflare-ai-gateway", baseURL: "https://proxy.example/v1" }, @@ -380,11 +398,9 @@ describe("CloudflareAIGatewayPlugin", () => { ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("anthropic/claude-sonnet-4-5"), ), - api: { - id: ModelV2.ID.make("anthropic/claude-sonnet-4-5"), - type: "aisdk", - package: "test-provider", - }, + modelID: ModelV2.ID.make("anthropic/claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "ai-gateway-provider", options: { name: "cloudflare-ai-gateway" }, @@ -412,7 +428,9 @@ describe("CloudflareAIGatewayPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), - api: { id: ModelV2.ID.make("openai/gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("openai/gpt-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "cloudflare-ai-gateway" }, diff --git a/packages/core/test/plugin/provider-cloudflare-workers-ai.test.ts b/packages/core/test/plugin/provider-cloudflare-workers-ai.test.ts index d1eeaa581e..2eeb89caf2 100644 --- a/packages/core/test/plugin/provider-cloudflare-workers-ai.test.ts +++ b/packages/core/test/plugin/provider-cloudflare-workers-ai.test.ts @@ -87,7 +87,8 @@ describe("CloudflareWorkersAIPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("cloudflare-workers-ai"), (provider) => { - provider.api = { type: "aisdk", package: "test-provider" } + provider.aisdk = true + provider.package = "test-provider" }), ) yield* addPlugin() @@ -95,15 +96,18 @@ describe("CloudflareWorkersAIPlugin", () => { const sdk = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")), - api: { id: ModelV2.ID.make("@cf/model"), ...provider.api }, + modelID: ModelV2.ID.make("@cf/model"), + aisdk: provider.aisdk, + package: provider.package, + settings: provider.settings, }), package: "@ai-sdk/openai-compatible", options: { name: "cloudflare-workers-ai", headers: { custom: "header" } }, }) - expect(provider.api).toEqual({ - type: "aisdk", + expect(provider).toMatchObject({ + aisdk: true, package: "test-provider", - url: "https://api.cloudflare.com/client/v4/accounts/acct/ai/v1", + settings: { baseURL: "https://api.cloudflare.com/client/v4/accounts/acct/ai/v1" }, }) expect(sdk.sdk).toBeDefined() }), @@ -116,14 +120,16 @@ describe("CloudflareWorkersAIPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("cloudflare-workers-ai"), (provider) => { - provider.api = { type: "aisdk", package: "test-provider", url: "https://proxy.example/v1" } + provider.aisdk = true + provider.package = "test-provider" + provider.settings = { ...provider.settings, baseURL: "https://proxy.example/v1" } }), ) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.make("cloudflare-workers-ai"))).api).toEqual({ - type: "aisdk", + expect(required(yield* catalog.provider.get(ProviderV2.ID.make("cloudflare-workers-ai")))).toMatchObject({ + aisdk: true, package: "test-provider", - url: "https://proxy.example/v1", + settings: { baseURL: "https://proxy.example/v1" }, }) }), ), @@ -138,12 +144,10 @@ describe("CloudflareWorkersAIPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")), - api: { - id: ModelV2.ID.make("@cf/model"), - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://proxy.example/v1", - }, + modelID: ModelV2.ID.make("@cf/model"), + aisdk: true, + package: "@ai-sdk/openai-compatible", + settings: { baseURL: "https://proxy.example/v1" }, }), package: "@ai-sdk/openai-compatible", options: { name: "cloudflare-workers-ai", baseURL: "https://proxy.example/v1" }, @@ -159,15 +163,16 @@ describe("CloudflareWorkersAIPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("cloudflare-workers-ai"), (provider) => { - provider.api = { type: "aisdk", package: "test-provider" } - provider.request.body.accountId = "configured-acct" + provider.aisdk = true + provider.package = "test-provider" + provider.settings = { ...provider.settings, accountId: "configured-acct" } }), ) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.make("cloudflare-workers-ai"))).api).toEqual({ - type: "aisdk", + expect(required(yield* catalog.provider.get(ProviderV2.ID.make("cloudflare-workers-ai")))).toMatchObject({ + aisdk: true, package: "test-provider", - url: "https://api.cloudflare.com/client/v4/accounts/env-acct/ai/v1", + settings: { baseURL: "https://api.cloudflare.com/client/v4/accounts/env-acct/ai/v1" }, }) }), ), @@ -182,12 +187,10 @@ describe("CloudflareWorkersAIPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")), - api: { - id: ModelV2.ID.make("@cf/model"), - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://proxy.example/v1", - }, + modelID: ModelV2.ID.make("@cf/model"), + aisdk: true, + package: "@ai-sdk/openai-compatible", + settings: { baseURL: "https://proxy.example/v1" }, }), package: "@ai-sdk/openai-compatible", options: { @@ -214,12 +217,10 @@ describe("CloudflareWorkersAIPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")), - api: { - id: ModelV2.ID.make("@cf/model"), - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://api.cloudflare.com/client/v4/accounts/${CLOUDFLARE_ACCOUNT_ID}/ai/v1", - }, + modelID: ModelV2.ID.make("@cf/model"), + aisdk: true, + package: "@ai-sdk/openai-compatible", + settings: { baseURL: "https://api.cloudflare.com/client/v4/accounts/${CLOUDFLARE_ACCOUNT_ID}/ai/v1" }, }), package: "@ai-sdk/openai-compatible", options: { @@ -243,7 +244,9 @@ describe("CloudflareWorkersAIPlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("@cf/api-model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("@cf/api-model"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -262,12 +265,10 @@ describe("CloudflareWorkersAIPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")), - api: { - id: ModelV2.ID.make("@cf/model"), - type: "aisdk", - package: "@ai-sdk/anthropic", - url: "https://proxy.example/v1", - }, + modelID: ModelV2.ID.make("@cf/model"), + aisdk: true, + package: "@ai-sdk/anthropic", + settings: { baseURL: "https://proxy.example/v1" }, }), package: "@ai-sdk/anthropic", options: { name: "cloudflare-workers-ai" }, diff --git a/packages/core/test/plugin/provider-cohere.test.ts b/packages/core/test/plugin/provider-cohere.test.ts index c001ad935f..fea89915bf 100644 --- a/packages/core/test/plugin/provider-cohere.test.ts +++ b/packages/core/test/plugin/provider-cohere.test.ts @@ -56,7 +56,9 @@ describe("CoherePlugin", () => { const ignored = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cohere"), ModelV2.ID.make("command")), - api: { id: ModelV2.ID.make("command"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("command"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "cohere" }, @@ -66,7 +68,9 @@ describe("CoherePlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cohere"), ModelV2.ID.make("command")), - api: { id: ModelV2.ID.make("command"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("command"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/cohere", options: { name: "cohere" }, @@ -83,7 +87,9 @@ describe("CoherePlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-cohere"), ModelV2.ID.make("command-r-plus")), - api: { id: ModelV2.ID.make("command-r-plus"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("command-r-plus"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/cohere", options: { name: "custom-cohere", apiKey: "test", baseURL: "https://cohere.example" }, @@ -108,7 +114,9 @@ describe("CoherePlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cohere"), ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("command-r-plus"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("command-r-plus"), + aisdk: true, + package: "test-provider", }), sdk, options: {}, diff --git a/packages/core/test/plugin/provider-deepinfra.test.ts b/packages/core/test/plugin/provider-deepinfra.test.ts index 9cb9a4866c..6d1f74157d 100644 --- a/packages/core/test/plugin/provider-deepinfra.test.ts +++ b/packages/core/test/plugin/provider-deepinfra.test.ts @@ -48,7 +48,9 @@ describe("DeepInfraPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("deepinfra"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "@ai-sdk/deepinfra" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "@ai-sdk/deepinfra", }), package: "@ai-sdk/deepinfra", options: { name: "deepinfra" }, @@ -66,7 +68,9 @@ describe("DeepInfraPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-deepinfra"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "@ai-sdk/deepinfra" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "@ai-sdk/deepinfra", }), package: "@ai-sdk/deepinfra", options: { name: "custom-deepinfra", apiKey: "test" }, @@ -85,7 +89,9 @@ describe("DeepInfraPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("deepinfra"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "@ai-sdk/deepinfra" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "@ai-sdk/deepinfra", }), package: "@ai-sdk/deepinfra", options: { name: "deepinfra", apiKey: "test" }, @@ -111,7 +117,9 @@ describe("DeepInfraPlugin", () => { const ignored = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("deepinfra"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "@ai-sdk/deepinfra" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "@ai-sdk/deepinfra", }), package: item, options: { name: "deepinfra" }, @@ -122,7 +130,9 @@ describe("DeepInfraPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("deepinfra"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "@ai-sdk/deepinfra" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "@ai-sdk/deepinfra", }), package: "@ai-sdk/deepinfra", options: { name: "deepinfra" }, @@ -141,17 +151,15 @@ describe("DeepInfraPlugin", () => { const sdkEvent = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("deepinfra"), ModelV2.ID.make("meta-llama/Llama-3.3-70B-Instruct")), - api: { - id: ModelV2.ID.make("meta-llama/Llama-3.3-70B-Instruct"), - type: "aisdk", - package: "@ai-sdk/deepinfra", - }, + modelID: ModelV2.ID.make("meta-llama/Llama-3.3-70B-Instruct"), + aisdk: true, + package: "@ai-sdk/deepinfra", }), package: "@ai-sdk/deepinfra", options: { name: "deepinfra" }, }) const result = yield* aisdk.runLanguage({ model: sdkEvent.model, sdk: sdkEvent.sdk, options: sdkEvent.options }) - const language = result.language ?? result.sdk.languageModel(result.model.api.id) + const language = result.language ?? result.sdk.languageModel(result.model.modelID ?? result.model.id) expect(language.provider).toBe("deepinfra.chat") expect(deepinfraLanguageModels).toEqual(["meta-llama/Llama-3.3-70B-Instruct"]) }), diff --git a/packages/core/test/plugin/provider-dynamic.test.ts b/packages/core/test/plugin/provider-dynamic.test.ts index 3ba6e5aae4..68509bce9a 100644 --- a/packages/core/test/plugin/provider-dynamic.test.ts +++ b/packages/core/test/plugin/provider-dynamic.test.ts @@ -53,7 +53,9 @@ describe("DynamicProviderPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("test-model")), - api: { id: ModelV2.ID.make("test-model"), type: "aisdk", package: fixtureProvider }, + modelID: ModelV2.ID.make("test-model"), + aisdk: true, + package: fixtureProvider, }), package: fixtureProvider, options: { name: "custom", marker: "dynamic" }, @@ -71,7 +73,9 @@ describe("DynamicProviderPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("test-model")), - api: { id: ModelV2.ID.make("test-model"), type: "aisdk", package: fixtureProvider }, + modelID: ModelV2.ID.make("test-model"), + aisdk: true, + package: fixtureProvider, }), package: fixtureProvider, options: { name: "custom", marker: "dynamic" }, @@ -88,7 +92,9 @@ describe("DynamicProviderPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-provider"), ModelV2.ID.make("test-model")), - api: { id: ModelV2.ID.make("test-model"), type: "aisdk", package: fixtureProvider }, + modelID: ModelV2.ID.make("test-model"), + aisdk: true, + package: fixtureProvider, }), package: fixtureProvider, options: { name: "custom-provider", marker: "dynamic" }, @@ -104,7 +110,9 @@ describe("DynamicProviderPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("npm-provider"), ModelV2.ID.make("test-model")), - api: { id: ModelV2.ID.make("test-model"), type: "aisdk", package: "fixture-provider" }, + modelID: ModelV2.ID.make("test-model"), + aisdk: true, + package: "fixture-provider", }), package: "fixture-provider", options: { name: "npm-provider", marker: "npm" }, @@ -121,7 +129,9 @@ describe("DynamicProviderPlugin", () => { .language( ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("missing-entrypoint"), ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("alias"), type: "aisdk", package: "fixture-provider" }, + modelID: ModelV2.ID.make("alias"), + aisdk: true, + package: "fixture-provider", }), ) .pipe(Effect.exit) @@ -138,7 +148,9 @@ describe("DynamicProviderPlugin", () => { .language( ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("bad-import"), ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("alias"), type: "aisdk", package: "file:///missing/provider-factory.js" }, + modelID: ModelV2.ID.make("alias"), + aisdk: true, + package: "file:///missing/provider-factory.js", }), ) .pipe(Effect.exit) @@ -157,7 +169,9 @@ describe("DynamicProviderPlugin", () => { .language( ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("missing-factory"), ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("alias"), type: "aisdk", package: "fixture-provider" }, + modelID: ModelV2.ID.make("alias"), + aisdk: true, + package: "fixture-provider", }), ) .pipe(Effect.exit) @@ -166,7 +180,7 @@ describe("DynamicProviderPlugin", () => { }), ) - itWithAISDK.effect("uses the model api.id for the default language model", () => + itWithAISDK.effect("uses the model modelID for the default language model", () => Effect.gen(function* () { const plugin = yield* PluginV2.Service const aisdk = yield* AISDK.Service @@ -174,7 +188,9 @@ describe("DynamicProviderPlugin", () => { const language = yield* aisdk.language( ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("test-model-api"), type: "aisdk", package: fixtureProvider }, + modelID: ModelV2.ID.make("test-model-api"), + aisdk: true, + package: fixtureProvider, }), ) expect(language).toMatchObject({ modelID: "test-model-api", options: { name: "custom" } }) diff --git a/packages/core/test/plugin/provider-gateway.test.ts b/packages/core/test/plugin/provider-gateway.test.ts index c6a0427cdb..2c49e1a026 100644 --- a/packages/core/test/plugin/provider-gateway.test.ts +++ b/packages/core/test/plugin/provider-gateway.test.ts @@ -45,7 +45,9 @@ describe("GatewayPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gateway"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/gateway", options: { name: "gateway" }, @@ -65,11 +67,9 @@ describe("GatewayPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("vercel"), ModelV2.ID.make("anthropic/claude-sonnet-4")), - api: { - id: ModelV2.ID.make("anthropic/claude-sonnet-4"), - type: "aisdk", - package: "test-provider", - }, + modelID: ModelV2.ID.make("anthropic/claude-sonnet-4"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/gateway", options: { name: "vercel", apiKey: "test-key" }, @@ -91,7 +91,9 @@ describe("GatewayPlugin", () => { const ignored = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("vercel"), ModelV2.ID.make(modelID)), - api: { id: ModelV2.ID.make(modelID), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make(modelID), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/vercel", options: { name: "vercel" }, @@ -101,7 +103,9 @@ describe("GatewayPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("vercel"), ModelV2.ID.make(modelID)), - api: { id: ModelV2.ID.make(modelID), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make(modelID), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/gateway", options: { name: "vercel" }, diff --git a/packages/core/test/plugin/provider-github-copilot.test.ts b/packages/core/test/plugin/provider-github-copilot.test.ts index beef89ae8c..44bea74ea4 100644 --- a/packages/core/test/plugin/provider-github-copilot.test.ts +++ b/packages/core/test/plugin/provider-github-copilot.test.ts @@ -47,7 +47,9 @@ describe("GithubCopilotPlugin", () => { const ignored = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")), - api: { id: ModelV2.ID.make("gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "github-copilot" }, @@ -55,7 +57,9 @@ describe("GithubCopilotPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")), - api: { id: ModelV2.ID.make("gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/github-copilot", options: { name: "github-copilot" }, @@ -74,7 +78,9 @@ describe("GithubCopilotPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("claude-sonnet-4")), - api: { id: ModelV2.ID.make("claude-sonnet-4"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude-sonnet-4"), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: {}, @@ -92,7 +98,9 @@ describe("GithubCopilotPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("claude-sonnet-4"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude-sonnet-4"), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: {}, @@ -110,7 +118,9 @@ describe("GithubCopilotPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")), - api: { id: ModelV2.ID.make("gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-5"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -118,7 +128,9 @@ describe("GithubCopilotPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5.1-codex")), - api: { id: ModelV2.ID.make("gpt-5.1-codex"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-5.1-codex"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -126,7 +138,9 @@ describe("GithubCopilotPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-4o")), - api: { id: ModelV2.ID.make("gpt-4o"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-4o"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -134,7 +148,9 @@ describe("GithubCopilotPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5-mini")), - api: { id: ModelV2.ID.make("gpt-5-mini"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-5-mini"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -142,7 +158,9 @@ describe("GithubCopilotPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5-mini-2025-08-07")), - api: { id: ModelV2.ID.make("gpt-5-mini-2025-08-07"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-5-mini-2025-08-07"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -166,7 +184,9 @@ describe("GithubCopilotPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("default")), - api: { id: ModelV2.ID.make("gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-5"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -174,7 +194,9 @@ describe("GithubCopilotPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("small")), - api: { id: ModelV2.ID.make("gpt-5-mini"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-5-mini"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -182,7 +204,9 @@ describe("GithubCopilotPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("sonnet")), - api: { id: ModelV2.ID.make("claude-sonnet-4"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude-sonnet-4"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -230,7 +254,9 @@ describe("GithubCopilotPlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("openai"), ModelV2.ID.make("gpt-5")), - api: { id: ModelV2.ID.make("gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-5"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, diff --git a/packages/core/test/plugin/provider-gitlab.test.ts b/packages/core/test/plugin/provider-gitlab.test.ts index f9880844d3..6c72c65301 100644 --- a/packages/core/test/plugin/provider-gitlab.test.ts +++ b/packages/core/test/plugin/provider-gitlab.test.ts @@ -70,7 +70,9 @@ describe("GitLabPlugin", () => { yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")), - api: { id: ModelV2.ID.make("claude"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude"), + aisdk: true, + package: "test-provider", }), package: "gitlab-ai-provider", options: { name: "gitlab" }, @@ -107,7 +109,9 @@ describe("GitLabPlugin", () => { yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")), - api: { id: ModelV2.ID.make("claude"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude"), + aisdk: true, + package: "test-provider", }), package: "gitlab-ai-provider", options: { name: "gitlab" }, @@ -132,7 +136,9 @@ describe("GitLabPlugin", () => { yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")), - api: { id: ModelV2.ID.make("claude"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude"), + aisdk: true, + package: "test-provider", }), package: "gitlab-ai-provider", options: { @@ -173,7 +179,9 @@ describe("GitLabPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")), - api: { id: ModelV2.ID.make("claude"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai", options: { name: "gitlab" }, @@ -192,11 +200,11 @@ describe("GitLabPlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("duo-workflow-custom")), - api: { id: ModelV2.ID.make("duo-workflow-custom"), type: "aisdk", package: "test-provider" }, - request: { - headers: {}, - body: { workflowRef: "ref", workflowDefinition: "definition" }, - }, + modelID: ModelV2.ID.make("duo-workflow-custom"), + aisdk: true, + package: "test-provider", + headers: {}, + settings: { workflowRef: "ref", workflowDefinition: "definition" }, }), sdk: { workflowChat: (id: string, options: unknown) => { @@ -227,7 +235,9 @@ describe("GitLabPlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("duo-workflow-exact")), - api: { id: ModelV2.ID.make("duo-workflow-exact"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("duo-workflow-exact"), + aisdk: true, + package: "test-provider", }), sdk: { workflowChat: (id: string, options: unknown) => { @@ -245,7 +255,7 @@ describe("GitLabPlugin", () => { }), ) - it.effect("uses provider feature flags instead of request feature flags", () => + it.effect("uses provider feature flags instead of model settings feature flags", () => Effect.gen(function* () { const plugin = yield* PluginV2.Service const aisdk = yield* AISDK.Service @@ -254,11 +264,11 @@ describe("GitLabPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("duo-workflow-custom")), - api: { id: ModelV2.ID.make("duo-workflow-custom"), type: "aisdk", package: "test-provider" }, - request: { - headers: {}, - body: { featureFlags: { request_flag: true } }, - }, + modelID: ModelV2.ID.make("duo-workflow-custom"), + aisdk: true, + package: "test-provider", + headers: {}, + settings: { featureFlags: { request_flag: true } }, }), sdk: { workflowChat: (id: string, options: unknown) => { @@ -282,8 +292,11 @@ describe("GitLabPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")), - api: { id: ModelV2.ID.make("claude"), type: "aisdk", package: "test-provider" }, - request: { headers: { h: "v" }, body: {} }, + modelID: ModelV2.ID.make("claude"), + aisdk: true, + package: "test-provider", + headers: { h: "v" }, + settings: {}, }), sdk: { workflowChat: () => undefined, diff --git a/packages/core/test/plugin/provider-google-vertex-anthropic.test.ts b/packages/core/test/plugin/provider-google-vertex-anthropic.test.ts index d94321f3bd..8afb38b1f8 100644 --- a/packages/core/test/plugin/provider-google-vertex-anthropic.test.ts +++ b/packages/core/test/plugin/provider-google-vertex-anthropic.test.ts @@ -64,16 +64,17 @@ describe("GoogleVertexAnthropicPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex-anthropic"), (provider) => { - provider.api = { type: "aisdk", package: "@ai-sdk/google-vertex/anthropic" } + provider.aisdk = true + provider.package = "@ai-sdk/google-vertex/anthropic" }), ) yield* addPlugin(GoogleVertexAnthropicPlugin) - expect( - (yield* catalog.provider.get(ProviderV2.ID.make("google-vertex-anthropic")))?.request.body.project, - ).toBe("cloud-project") - expect( - (yield* catalog.provider.get(ProviderV2.ID.make("google-vertex-anthropic")))?.request.body.location, - ).toBe("cloud-location") + expect((yield* catalog.provider.get(ProviderV2.ID.make("google-vertex-anthropic")))?.settings?.project).toBe( + "cloud-project", + ) + expect((yield* catalog.provider.get(ProviderV2.ID.make("google-vertex-anthropic")))?.settings?.location).toBe( + "cloud-location", + ) }), ), ) @@ -84,18 +85,18 @@ describe("GoogleVertexAnthropicPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex-anthropic"), (provider) => { - provider.api = { type: "aisdk", package: "@ai-sdk/google-vertex/anthropic" } - provider.request.body.project = "configured-project" - provider.request.body.location = "configured-location" + provider.aisdk = true + provider.package = "@ai-sdk/google-vertex/anthropic" + provider.settings = { ...provider.settings, project: "configured-project", location: "configured-location" } }), ) yield* addPlugin(GoogleVertexAnthropicPlugin) - expect((yield* catalog.provider.get(ProviderV2.ID.make("google-vertex-anthropic")))?.request.body.project).toBe( + expect((yield* catalog.provider.get(ProviderV2.ID.make("google-vertex-anthropic")))?.settings?.project).toBe( "configured-project", ) - expect( - (yield* catalog.provider.get(ProviderV2.ID.make("google-vertex-anthropic")))?.request.body.location, - ).toBe("configured-location") + expect((yield* catalog.provider.get(ProviderV2.ID.make("google-vertex-anthropic")))?.settings?.location).toBe( + "configured-location", + ) }), ), ) @@ -121,7 +122,9 @@ describe("GoogleVertexAnthropicPlugin", () => { ProviderV2.ID.make("google-vertex-anthropic"), ModelV2.ID.make("claude-sonnet-4-5"), ), - api: { id: ModelV2.ID.make("claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/google-vertex/anthropic", options: { name: "google-vertex-anthropic" }, @@ -147,7 +150,9 @@ describe("GoogleVertexAnthropicPlugin", () => { ProviderV2.ID.make("google-vertex-anthropic"), ModelV2.ID.make("claude-sonnet-4-5"), ), - api: { id: ModelV2.ID.make("claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/google-vertex/anthropic", options: { name: "google-vertex-anthropic" }, @@ -167,7 +172,9 @@ describe("GoogleVertexAnthropicPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/google-vertex/anthropic", options: { name: "google-vertex", project: "project", location: "eu" }, @@ -186,7 +193,9 @@ describe("GoogleVertexAnthropicPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/google-vertex/anthropic", options: { name: "google-vertex", project: "project", location: "eu", baseURL: "https://proxy.example/v1" }, @@ -204,7 +213,9 @@ describe("GoogleVertexAnthropicPlugin", () => { const sdkResult = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make(" claude-sonnet-4-5 ")), - api: { id: ModelV2.ID.make(" claude-sonnet-4-5 "), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make(" claude-sonnet-4-5 "), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/google-vertex/anthropic", options: { name: "google-vertex", project: "project", location: "us" }, @@ -212,7 +223,9 @@ describe("GoogleVertexAnthropicPlugin", () => { const languageResult = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make(" claude-sonnet-4-5 ")), - api: { id: ModelV2.ID.make(" claude-sonnet-4-5 "), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make(" claude-sonnet-4-5 "), + aisdk: true, + package: "test-provider", }), sdk: sdkResult.sdk, options: {}, @@ -234,7 +247,9 @@ describe("GoogleVertexAnthropicPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex-anthropic"), ModelV2.ID.make(" claude-sonnet-4-5 ")), - api: { id: ModelV2.ID.make(" claude-sonnet-4-5 "), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make(" claude-sonnet-4-5 "), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: selector(calls) }, options: {}, @@ -252,7 +267,9 @@ describe("GoogleVertexAnthropicPlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("claude-sonnet-4-5")), - api: { id: ModelV2.ID.make("claude-sonnet-4-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude-sonnet-4-5"), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: selector(calls) }, options: {}, diff --git a/packages/core/test/plugin/provider-google-vertex.test.ts b/packages/core/test/plugin/provider-google-vertex.test.ts index 388528bd65..026bcd0282 100644 --- a/packages/core/test/plugin/provider-google-vertex.test.ts +++ b/packages/core/test/plugin/provider-google-vertex.test.ts @@ -92,17 +92,15 @@ describe("GoogleVertexPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.opencode, (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://opencode.ai/zen/v1", - } + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { ...provider.settings, baseURL: "https://opencode.ai/zen/v1" } }), ) yield* addPlugin() const provider = required(yield* catalog.provider.get(ProviderV2.ID.opencode)) - expect(provider.request.body).toEqual({}) + expect(provider.settings).toEqual({ baseURL: "https://opencode.ai/zen/v1" }) }), ) @@ -121,21 +119,26 @@ describe("GoogleVertexPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://${GOOGLE_VERTEX_ENDPOINT}/v1/projects/${GOOGLE_VERTEX_PROJECT}/locations/${GOOGLE_VERTEX_LOCATION}", + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { + ...provider.settings, + baseURL: + "https://${GOOGLE_VERTEX_ENDPOINT}/v1/projects/${GOOGLE_VERTEX_PROJECT}/locations/${GOOGLE_VERTEX_LOCATION}", } }), ) yield* addPlugin() const provider = required(yield* catalog.provider.get(ProviderV2.ID.make("google-vertex"))) - expect(provider.request.body.project).toBe("google-cloud-project") - expect(provider.request.body.location).toBe("google-vertex-location") - expect(provider.api).toEqual({ - type: "aisdk", + expect(provider.settings?.project).toBe("google-cloud-project") + expect(provider.settings?.location).toBe("google-vertex-location") + expect(provider).toMatchObject({ + aisdk: true, package: "@ai-sdk/openai-compatible", - url: "https://google-vertex-location-aiplatform.googleapis.com/v1/projects/google-cloud-project/locations/google-vertex-location", + settings: { + baseURL: + "https://google-vertex-location-aiplatform.googleapis.com/v1/projects/google-cloud-project/locations/google-vertex-location", + }, }) }), ), @@ -160,10 +163,12 @@ describe("GoogleVertexPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://${GOOGLE_VERTEX_ENDPOINT}/v1/projects/${GOOGLE_VERTEX_PROJECT}/locations/${GOOGLE_VERTEX_LOCATION}", + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { + ...provider.settings, + baseURL: + "https://${GOOGLE_VERTEX_ENDPOINT}/v1/projects/${GOOGLE_VERTEX_PROJECT}/locations/${GOOGLE_VERTEX_LOCATION}", } }), ) @@ -172,21 +177,22 @@ describe("GoogleVertexPlugin", () => { yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("gemini")), - api: { - id: ModelV2.ID.make("gemini"), - type: "aisdk", - package: "@ai-sdk/google-vertex", - }, + modelID: ModelV2.ID.make("gemini"), + aisdk: true, + package: "@ai-sdk/google-vertex", }), package: "@ai-sdk/google-vertex", options: { name: "google-vertex" }, }) - expect(provider.request.body.project).toBe("vertex-project") - expect(provider.api).toEqual({ - type: "aisdk", + expect(provider.settings?.project).toBe("vertex-project") + expect(provider).toMatchObject({ + aisdk: true, package: "@ai-sdk/openai-compatible", - url: "https://europe-west4-aiplatform.googleapis.com/v1/projects/vertex-project/locations/europe-west4", + settings: { + baseURL: + "https://europe-west4-aiplatform.googleapis.com/v1/projects/vertex-project/locations/europe-west4", + }, }) expect(vertexOptions[0].project).toBe("vertex-project") expect(vertexOptions[0].location).toBe("europe-west4") @@ -209,23 +215,24 @@ describe("GoogleVertexPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://${GOOGLE_VERTEX_ENDPOINT}/v1/projects/${GOOGLE_VERTEX_PROJECT}/locations/${GOOGLE_VERTEX_LOCATION}", + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { + ...provider.settings, + baseURL: + "https://${GOOGLE_VERTEX_ENDPOINT}/v1/projects/${GOOGLE_VERTEX_PROJECT}/locations/${GOOGLE_VERTEX_LOCATION}", } - provider.request.body.project = "config-project" - provider.request.body.location = "global" + provider.settings = { ...provider.settings, project: "config-project", location: "global" } }), ) yield* addPlugin() const provider = required(yield* catalog.provider.get(ProviderV2.ID.make("google-vertex"))) - expect(provider.request.body.project).toBe("config-project") - expect(provider.request.body.location).toBe("global") - expect(provider.api).toEqual({ - type: "aisdk", + expect(provider.settings?.project).toBe("config-project") + expect(provider.settings?.location).toBe("global") + expect(provider).toMatchObject({ + aisdk: true, package: "@ai-sdk/openai-compatible", - url: "https://aiplatform.googleapis.com/v1/projects/config-project/locations/global", + settings: { baseURL: "https://aiplatform.googleapis.com/v1/projects/config-project/locations/global" }, }) }), ), @@ -236,21 +243,22 @@ describe("GoogleVertexPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://${GOOGLE_VERTEX_ENDPOINT}/v1/projects/${GOOGLE_VERTEX_PROJECT}/locations/${GOOGLE_VERTEX_LOCATION}", + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { + ...provider.settings, + baseURL: + "https://${GOOGLE_VERTEX_ENDPOINT}/v1/projects/${GOOGLE_VERTEX_PROJECT}/locations/${GOOGLE_VERTEX_LOCATION}", } - provider.request.body.project = "config-project" - provider.request.body.location = "eu" + provider.settings = { ...provider.settings, project: "config-project", location: "eu" } }), ) yield* addPlugin() const provider = required(yield* catalog.provider.get(ProviderV2.ID.make("google-vertex"))) - expect(provider.api).toEqual({ - type: "aisdk", + expect(provider).toMatchObject({ + aisdk: true, package: "@ai-sdk/openai-compatible", - url: "https://eu-aiplatform.googleapis.com/v1/projects/config-project/locations/eu", + settings: { baseURL: "https://eu-aiplatform.googleapis.com/v1/projects/config-project/locations/eu" }, }) }), ) @@ -270,14 +278,15 @@ describe("GoogleVertexPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => { - provider.api = { type: "aisdk", package: "@ai-sdk/google-vertex" } - provider.request.body.project = "config-project" + provider.aisdk = true + provider.package = "@ai-sdk/google-vertex" + provider.settings = { ...provider.settings, project: "config-project" } }), ) yield* addPlugin() const provider = required(yield* catalog.provider.get(ProviderV2.ID.make("google-vertex"))) - expect(provider.request.body.project).toBe("config-project") - expect(provider.request.body.location).toBe("us-central1") + expect(provider.settings?.project).toBe("config-project") + expect(provider.settings?.location).toBe("us-central1") }), ), ) @@ -297,11 +306,9 @@ describe("GoogleVertexPlugin", () => { yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("gemini")), - api: { - id: ModelV2.ID.make("gemini"), - type: "aisdk", - package: "@ai-sdk/google-vertex", - }, + modelID: ModelV2.ID.make("gemini"), + aisdk: true, + package: "@ai-sdk/google-vertex", }), package: "@ai-sdk/google-vertex", options: { name: "google-vertex" }, @@ -345,11 +352,9 @@ describe("GoogleVertexPlugin", () => { aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("gemini")), - api: { - id: ModelV2.ID.make("gemini"), - type: "aisdk", - package: "@ai-sdk/openai-compatible", - }, + modelID: ModelV2.ID.make("gemini"), + aisdk: true, + package: "@ai-sdk/openai-compatible", }), package: "@ai-sdk/openai-compatible", options: { name: "google-vertex" }, @@ -376,7 +381,9 @@ describe("GoogleVertexPlugin", () => { yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make(" gemini-2.5-pro ")), - api: { id: ModelV2.ID.make(" gemini-2.5-pro "), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make(" gemini-2.5-pro "), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: {}, diff --git a/packages/core/test/plugin/provider-google.test.ts b/packages/core/test/plugin/provider-google.test.ts index 8c10689ca1..f2022d31d1 100644 --- a/packages/core/test/plugin/provider-google.test.ts +++ b/packages/core/test/plugin/provider-google.test.ts @@ -27,7 +27,9 @@ describe("GooglePlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-google"), ModelV2.ID.make("gemini")), - api: { id: ModelV2.ID.make("gemini"), type: "aisdk", package: "@ai-sdk/google" }, + modelID: ModelV2.ID.make("gemini"), + aisdk: true, + package: "@ai-sdk/google", }), package: "@ai-sdk/google", options: { name: "custom-google", apiKey: "test" }, @@ -45,7 +47,9 @@ describe("GooglePlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google"), ModelV2.ID.make("gemini")), - api: { id: ModelV2.ID.make("gemini"), type: "aisdk", package: "@ai-sdk/google" }, + modelID: ModelV2.ID.make("gemini"), + aisdk: true, + package: "@ai-sdk/google", }), package: "@ai-sdk/google-vertex", options: { name: "google" }, @@ -62,7 +66,9 @@ describe("GooglePlugin", () => { const sdkEvent = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-google"), ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("gemini-api"), type: "aisdk", package: "@ai-sdk/google" }, + modelID: ModelV2.ID.make("gemini-api"), + aisdk: true, + package: "@ai-sdk/google", }), package: "@ai-sdk/google", options: { name: "custom-google", apiKey: "test" }, @@ -72,7 +78,7 @@ describe("GooglePlugin", () => { sdk: sdkEvent.sdk, options: sdkEvent.options, }) - const language = result.language ?? result.sdk.languageModel(result.model.api.id) + const language = result.language ?? result.sdk.languageModel(result.model.modelID ?? result.model.id) expect(language.modelId).toBe("gemini-api") expect(language.provider).toBe("custom-google") }), diff --git a/packages/core/test/plugin/provider-groq.test.ts b/packages/core/test/plugin/provider-groq.test.ts index ac96ea98a3..2e30264352 100644 --- a/packages/core/test/plugin/provider-groq.test.ts +++ b/packages/core/test/plugin/provider-groq.test.ts @@ -28,7 +28,9 @@ describe("GroqPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("groq"), ModelV2.ID.make("llama")), - api: { id: ModelV2.ID.make("llama"), type: "aisdk", package: "@ai-sdk/groq" }, + modelID: ModelV2.ID.make("llama"), + aisdk: true, + package: "@ai-sdk/groq", }), package: "@ai-sdk/groq", options: { name: "groq" }, @@ -45,7 +47,9 @@ describe("GroqPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("groq"), ModelV2.ID.make("llama")), - api: { id: ModelV2.ID.make("llama"), type: "aisdk", package: "@ai-sdk/groq" }, + modelID: ModelV2.ID.make("llama"), + aisdk: true, + package: "@ai-sdk/groq", }), package: "@ai-sdk/openai-compatible", options: { name: "groq" }, @@ -62,7 +66,9 @@ describe("GroqPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("groq"), ModelV2.ID.make("llama")), - api: { id: ModelV2.ID.make("llama"), type: "aisdk", package: "@ai-sdk/groq" }, + modelID: ModelV2.ID.make("llama"), + aisdk: true, + package: "@ai-sdk/groq", }), package: "@ai-sdk/groq/compat", options: { name: "groq" }, @@ -79,7 +85,9 @@ describe("GroqPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-groq"), ModelV2.ID.make("llama")), - api: { id: ModelV2.ID.make("llama"), type: "aisdk", package: "@ai-sdk/groq" }, + modelID: ModelV2.ID.make("llama"), + aisdk: true, + package: "@ai-sdk/groq", }), package: "@ai-sdk/groq", options: { name: "custom-groq", apiKey: "test" }, @@ -93,7 +101,7 @@ describe("GroqPlugin", () => { }), ) - it.effect("uses the default languageModel(api.id) behavior", () => + it.effect("uses the default languageModel(modelID) behavior", () => Effect.gen(function* () { const plugin = yield* PluginV2.Service const aisdk = yield* AISDK.Service @@ -104,16 +112,14 @@ describe("GroqPlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("groq"), ModelV2.ID.make("alias")), - api: { - id: ModelV2.ID.make("llama-api"), - type: "aisdk", - package: "@ai-sdk/groq", - }, + modelID: ModelV2.ID.make("llama-api"), + aisdk: true, + package: "@ai-sdk/groq", }), sdk, options: { name: "groq", apiKey: "test" }, }) - const language = result.language ?? sdk.languageModel(result.model.api.id) + const language = result.language ?? sdk.languageModel(result.model.modelID ?? result.model.id) expect(language.modelId).toBe("llama-api") expect(language.provider).toBe("groq.chat") }), diff --git a/packages/core/test/plugin/provider-kilo.test.ts b/packages/core/test/plugin/provider-kilo.test.ts index 1df0fd3156..7ad6b00382 100644 --- a/packages/core/test/plugin/provider-kilo.test.ts +++ b/packages/core/test/plugin/provider-kilo.test.ts @@ -27,22 +27,20 @@ describe("KiloPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("kilo"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://api.kilo.ai/api/gateway", - } - provider.request = { headers: { Existing: "value" }, body: {} } + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { ...provider.settings, baseURL: "https://api.kilo.ai/api/gateway" } + provider.headers = { Existing: "value" } }) catalog.provider.update(ProviderV2.ID.openrouter, () => {}) }) yield* addPlugin() - expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo")))?.request.headers).toEqual({ + expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo")))?.headers).toEqual({ Existing: "value", "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode", }) - expect((yield* catalog.provider.get(ProviderV2.ID.openrouter))?.request.headers).toEqual({}) + expect((yield* catalog.provider.get(ProviderV2.ID.openrouter))?.headers).toBeUndefined() }), ) @@ -51,24 +49,20 @@ describe("KiloPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("kilo"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://api.kilo.ai/api/gateway", - } + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { ...provider.settings, baseURL: "https://api.kilo.ai/api/gateway" } }) }) yield* addPlugin() - expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo")))?.request.headers).toEqual({ + expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo")))?.headers).toEqual({ "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode", }) - expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo")))?.request.headers).not.toHaveProperty( - "http-referer", - ) - expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo")))?.request.headers).not.toHaveProperty("x-title") - expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo")))?.request.headers).not.toHaveProperty("X-Source") + expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo")))?.headers).not.toHaveProperty("http-referer") + expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo")))?.headers).not.toHaveProperty("x-title") + expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo")))?.headers).not.toHaveProperty("X-Source") }), ) @@ -77,23 +71,22 @@ describe("KiloPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("kilo"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://api.kilo.ai/api/gateway", - } + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { ...provider.settings, baseURL: "https://api.kilo.ai/api/gateway" } }) catalog.provider.update(ProviderV2.ID.make("custom-kilo"), (provider) => { - provider.api = { type: "aisdk", package: "kilo" } + provider.aisdk = true + provider.package = "kilo" }) }) yield* addPlugin() - expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo")))?.request.headers).toEqual({ + expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo")))?.headers).toEqual({ "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode", }) - expect((yield* catalog.provider.get(ProviderV2.ID.make("custom-kilo")))?.request.headers).toEqual({}) + expect((yield* catalog.provider.get(ProviderV2.ID.make("custom-kilo")))?.headers).toBeUndefined() }), ) }) diff --git a/packages/core/test/plugin/provider-llmgateway.test.ts b/packages/core/test/plugin/provider-llmgateway.test.ts index d7f9d0d73d..f0eb026aca 100644 --- a/packages/core/test/plugin/provider-llmgateway.test.ts +++ b/packages/core/test/plugin/provider-llmgateway.test.ts @@ -34,23 +34,21 @@ describe("LLMGatewayPlugin", () => { }) yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("llmgateway"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://api.llmgateway.io/v1", - } - provider.request = { headers: { Existing: "value" }, body: {} } + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { ...provider.settings, baseURL: "https://api.llmgateway.io/v1" } + provider.headers = { Existing: "value" } }) catalog.provider.update(ProviderV2.ID.openrouter, () => {}) }) yield* addPlugin() - expect((yield* catalog.provider.get(ProviderV2.ID.make("llmgateway")))?.request.headers).toEqual({ + expect((yield* catalog.provider.get(ProviderV2.ID.make("llmgateway")))?.headers).toEqual({ Existing: "value", "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode", "X-Source": "opencode", }) - expect((yield* catalog.provider.get(ProviderV2.ID.openrouter))?.request.headers).toEqual({}) + expect((yield* catalog.provider.get(ProviderV2.ID.openrouter))?.headers).toBeUndefined() }), ) @@ -64,17 +62,15 @@ describe("LLMGatewayPlugin", () => { yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("llmgateway"), (provider) => { provider.disabled = true - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://api.llmgateway.io/v1", - } + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { ...provider.settings, baseURL: "https://api.llmgateway.io/v1" } }) }) yield* addPlugin() expect((yield* catalog.provider.get(ProviderV2.ID.make("llmgateway")))?.disabled).toBe(true) - expect((yield* catalog.provider.get(ProviderV2.ID.make("llmgateway")))?.request.headers).toEqual({}) + expect((yield* catalog.provider.get(ProviderV2.ID.make("llmgateway")))?.headers).toBeUndefined() }), ) }) diff --git a/packages/core/test/plugin/provider-mistral.test.ts b/packages/core/test/plugin/provider-mistral.test.ts index b1b1bc0638..5e549e3ec8 100644 --- a/packages/core/test/plugin/provider-mistral.test.ts +++ b/packages/core/test/plugin/provider-mistral.test.ts @@ -28,7 +28,9 @@ describe("MistralPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("mistral"), ModelV2.ID.make("mistral-large")), - api: { id: ModelV2.ID.make("mistral-large"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("mistral-large"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/mistral", options: { name: "mistral" }, @@ -45,7 +47,9 @@ describe("MistralPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("mistral"), ModelV2.ID.make("mistral-large")), - api: { id: ModelV2.ID.make("mistral-large"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("mistral-large"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "mistral" }, @@ -68,7 +72,9 @@ describe("MistralPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("mistral"), ModelV2.ID.make("mistral-large")), - api: { id: ModelV2.ID.make("mistral-large"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("mistral-large"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/mistral", options: { name: "mistral" }, @@ -92,7 +98,9 @@ describe("MistralPlugin", () => { yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-mistral"), ModelV2.ID.make("mistral-large")), - api: { id: ModelV2.ID.make("mistral-large"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("mistral-large"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/mistral", options: { name: "custom-mistral" }, @@ -101,7 +109,7 @@ describe("MistralPlugin", () => { }), ) - it.effect("leaves Mistral language selection on the default sdk.languageModel(api.id) path", () => + it.effect("leaves Mistral language selection on the default sdk.languageModel(modelID) path", () => Effect.gen(function* () { const plugin = yield* PluginV2.Service const aisdk = yield* AISDK.Service @@ -116,12 +124,14 @@ describe("MistralPlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("mistral"), ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("mistral-large"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("mistral-large"), + aisdk: true, + package: "test-provider", }), sdk, options: {}, }) - const language = result.language ?? sdk.languageModel(result.model.api.id) + const language = result.language ?? sdk.languageModel(result.model.modelID ?? result.model.id) expect(calls).toEqual(["languageModel:mistral-large"]) expect(language).toBeDefined() }), diff --git a/packages/core/test/plugin/provider-nvidia.test.ts b/packages/core/test/plugin/provider-nvidia.test.ts index a1c05df335..b1f051ab9d 100644 --- a/packages/core/test/plugin/provider-nvidia.test.ts +++ b/packages/core/test/plugin/provider-nvidia.test.ts @@ -27,23 +27,21 @@ describe("NvidiaPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("nvidia"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://integrate.api.nvidia.com/v1", - } - provider.request = { headers: { Existing: "value" }, body: {} } + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { ...provider.settings, baseURL: "https://integrate.api.nvidia.com/v1" } + provider.headers = { Existing: "value" } }) catalog.provider.update(ProviderV2.ID.openrouter, () => {}) }) yield* addPlugin() - expect((yield* catalog.provider.get(ProviderV2.ID.make("nvidia")))?.request.headers).toEqual({ + expect((yield* catalog.provider.get(ProviderV2.ID.make("nvidia")))?.headers).toEqual({ Existing: "value", "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode", "X-BILLING-INVOKE-ORIGIN": "OpenCode", }) - expect((yield* catalog.provider.get(ProviderV2.ID.openrouter))?.request.headers).toEqual({}) + expect((yield* catalog.provider.get(ProviderV2.ID.openrouter))?.headers).toBeUndefined() }), ) @@ -52,16 +50,14 @@ describe("NvidiaPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("nvidia"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://integrate.api.nvidia.com/v1", - } + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { ...provider.settings, baseURL: "https://integrate.api.nvidia.com/v1" } }) }) yield* addPlugin() - expect((yield* catalog.provider.get(ProviderV2.ID.make("nvidia")))?.request.headers).toEqual({ + expect((yield* catalog.provider.get(ProviderV2.ID.make("nvidia")))?.headers).toEqual({ "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode", "X-BILLING-INVOKE-ORIGIN": "OpenCode", @@ -74,20 +70,15 @@ describe("NvidiaPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("nvidia"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://integrate.api.nvidia.com/v1", - } - provider.request = { - headers: { "X-BILLING-INVOKE-ORIGIN": "CustomOrigin" }, - body: { baseURL: "https://integrate.api.nvidia.com/v1" }, - } + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { ...provider.settings, baseURL: "https://integrate.api.nvidia.com/v1" } + provider.headers = { "X-BILLING-INVOKE-ORIGIN": "CustomOrigin" } }) }) yield* addPlugin() - expect((yield* catalog.provider.get(ProviderV2.ID.make("nvidia")))?.request.headers).toEqual({ + expect((yield* catalog.provider.get(ProviderV2.ID.make("nvidia")))?.headers).toEqual({ "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode", "X-BILLING-INVOKE-ORIGIN": "CustomOrigin", diff --git a/packages/core/test/plugin/provider-openai-compatible.test.ts b/packages/core/test/plugin/provider-openai-compatible.test.ts index 4e74a37125..ac4e782cc6 100644 --- a/packages/core/test/plugin/provider-openai-compatible.test.ts +++ b/packages/core/test/plugin/provider-openai-compatible.test.ts @@ -27,7 +27,9 @@ describe("OpenAICompatiblePlugin", () => { const defaulted = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "custom" }, @@ -35,7 +37,9 @@ describe("OpenAICompatiblePlugin", () => { const disabled = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "custom", includeUsage: false }, @@ -53,7 +57,9 @@ describe("OpenAICompatiblePlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "file:///tmp/@ai-sdk/openai-compatible-provider.js", options: { name: "custom" }, @@ -76,7 +82,9 @@ describe("OpenAICompatiblePlugin", () => { yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-provider"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "custom-provider", baseURL: "https://example.com/v1" }, @@ -96,7 +104,9 @@ describe("OpenAICompatiblePlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "cloudflare-workers-ai" }, diff --git a/packages/core/test/plugin/provider-openai.test.ts b/packages/core/test/plugin/provider-openai.test.ts index 31a80f9319..c9866ea879 100644 --- a/packages/core/test/plugin/provider-openai.test.ts +++ b/packages/core/test/plugin/provider-openai.test.ts @@ -67,7 +67,9 @@ describe("OpenAIPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-openai"), ModelV2.ID.make("gpt-5")), - api: { id: ModelV2.ID.make("gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai", options: { name: "custom-openai", apiKey: "test" }, @@ -84,7 +86,9 @@ describe("OpenAIPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("gpt-5")), - api: { id: ModelV2.ID.make("gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "openai" }, @@ -102,7 +106,9 @@ describe("OpenAIPlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-5"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -121,7 +127,9 @@ describe("OpenAIPlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.anthropic, ModelV2.ID.make("gpt-5")), - api: { id: ModelV2.ID.make("gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-5"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -137,10 +145,12 @@ describe("OpenAIPlugin", () => { yield* catalog.transform((catalog) => { const item = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.openai), - api: { type: "aisdk", package: "@ai-sdk/openai" }, + aisdk: true, + package: "@ai-sdk/openai", }) catalog.provider.update(item.id, (draft) => { - draft.api = item.api + draft.aisdk = item.aisdk + draft.package = item.package }) catalog.model.update(item.id, ModelV2.ID.make("gpt-5"), () => {}) catalog.model.update(item.id, ModelV2.ID.make("gpt-5-chat-latest"), () => {}) @@ -159,10 +169,12 @@ describe("OpenAIPlugin", () => { yield* catalog.transform((catalog) => { const item = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.make("custom-openai")), - api: { type: "aisdk", package: "test-provider" }, + aisdk: true, + package: "test-provider", }) catalog.provider.update(item.id, (draft) => { - draft.api = item.api + draft.aisdk = item.aisdk + draft.package = item.package }) catalog.model.update(item.id, ModelV2.ID.make("gpt-5-chat-latest"), () => {}) }) diff --git a/packages/core/test/plugin/provider-opencode.test.ts b/packages/core/test/plugin/provider-opencode.test.ts index 93177c283e..3d8560b055 100644 --- a/packages/core/test/plugin/provider-opencode.test.ts +++ b/packages/core/test/plugin/provider-opencode.test.ts @@ -133,13 +133,12 @@ describe("OpencodePlugin", () => { expect(provider).toMatchObject({ name: "Remote", integrationID: "opencode", - api: { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: `${server.url.origin}/v1`, - }, + aisdk: true, + package: "@ai-sdk/openai-compatible", + settings: { baseURL: `${server.url.origin}/v1` }, }) - expect(provider.request).toEqual({ headers: { "x-org-id": "org" }, body: { custom: "value" } }) + expect(provider.headers).toEqual({ "x-org-id": "org" }) + expect(provider.settings).toMatchObject({ custom: "value" }) expect(yield* (yield* Integration.Service).get(Integration.ID.make("remote"))).toBeUndefined() const model = required(yield* catalog.model.get(ProviderV2.ID.make("remote"), ModelV2.ID.make("model"))) @@ -150,12 +149,16 @@ describe("OpencodePlugin", () => { cost: [{ input: 1, output: 2, cache: { read: 0.1, write: 0 } }], limit: { context: 1000, output: 100 }, }) - expect(model.request.body).toEqual({ custom: "value", temperature: 0.5 }) + expect(model.settings).toEqual({ + baseURL: `${server.url.origin}/v1`, + custom: "value", + temperature: 0.5, + }) expect(model.variants).toEqual([ { id: ModelV2.VariantID.make("high"), headers: {}, - body: { temperature: 0.2 }, + settings: { temperature: 0.2 }, }, ]) expect( @@ -175,11 +178,14 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.opencode), - api: { type: "aisdk", package: "test-provider" }, + aisdk: true, + package: "test-provider", }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")), - api: { id: ModelV2.ID.make("paid"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("paid"), + aisdk: true, + package: "test-provider", cost: cost(1), }) catalog.provider.update(provider.id, () => {}) @@ -188,7 +194,7 @@ describe("OpencodePlugin", () => { }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBe("public") + expect(required(yield* catalog.provider.get(ProviderV2.ID.opencode)).settings?.apiKey).toBe("public") expect(required(yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("paid"))).enabled).toBe(false) }), ), @@ -201,11 +207,14 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.opencode), - api: { type: "aisdk", package: "test-provider" }, + aisdk: true, + package: "test-provider", }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("free")), - api: { id: ModelV2.ID.make("free"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("free"), + aisdk: true, + package: "test-provider", cost: cost(0), }) catalog.provider.update(provider.id, () => {}) @@ -214,7 +223,7 @@ describe("OpencodePlugin", () => { }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBe("public") + expect(required(yield* catalog.provider.get(ProviderV2.ID.opencode)).settings?.apiKey).toBe("public") expect(required(yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("free"))).enabled).toBe(true) }), ), @@ -227,11 +236,14 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.opencode), - api: { type: "aisdk", package: "test-provider" }, + aisdk: true, + package: "test-provider", }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("output-only")), - api: { id: ModelV2.ID.make("output-only"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("output-only"), + aisdk: true, + package: "test-provider", cost: cost(0, 1), }) catalog.provider.update(provider.id, () => {}) @@ -240,7 +252,7 @@ describe("OpencodePlugin", () => { }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBe("public") + expect(required(yield* catalog.provider.get(ProviderV2.ID.opencode)).settings?.apiKey).toBe("public") expect(required(yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("output-only"))).enabled).toBe( true, ) @@ -255,11 +267,14 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.opencode), - api: { type: "aisdk", package: "test-provider" }, + aisdk: true, + package: "test-provider", }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")), - api: { id: ModelV2.ID.make("paid"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("paid"), + aisdk: true, + package: "test-provider", cost: cost(1), }) catalog.provider.update(provider.id, () => {}) @@ -268,7 +283,7 @@ describe("OpencodePlugin", () => { }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBeUndefined() + expect(required(yield* catalog.provider.get(ProviderV2.ID.opencode)).settings?.apiKey).toBeUndefined() expect(required(yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("paid"))).enabled).toBe(true) }), ), @@ -288,11 +303,14 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.opencode), - api: { type: "aisdk", package: "test-provider" }, + aisdk: true, + package: "test-provider", }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")), - api: { id: ModelV2.ID.make("paid"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("paid"), + aisdk: true, + package: "test-provider", cost: cost(1), }) catalog.provider.update(provider.id, () => {}) @@ -301,7 +319,7 @@ describe("OpencodePlugin", () => { }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBeUndefined() + expect(required(yield* catalog.provider.get(ProviderV2.ID.opencode)).settings?.apiKey).toBeUndefined() expect(required(yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("paid"))).enabled).toBe(true) }), ), @@ -314,26 +332,28 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.opencode), - api: { type: "aisdk", package: "test-provider" }, - request: { - headers: {}, - body: { apiKey: "configured" }, - }, + aisdk: true, + package: "test-provider", + headers: {}, + settings: { apiKey: "configured" }, }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")), - api: { id: ModelV2.ID.make("paid"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("paid"), + aisdk: true, + package: "test-provider", cost: cost(1), }) catalog.provider.update(provider.id, (draft) => { - draft.request = provider.request + draft.headers = provider.headers + draft.settings = { apiKey: "configured" } }) catalog.model.update(provider.id, model.id, (draft) => { draft.cost = [...model.cost] }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBe("configured") + expect(required(yield* catalog.provider.get(ProviderV2.ID.opencode)).settings?.apiKey).toBe("configured") expect(required(yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("paid"))).enabled).toBe(true) }), ), @@ -346,11 +366,14 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.openai), - api: { type: "aisdk", package: "test-provider" }, + aisdk: true, + package: "test-provider", }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")), - api: { id: ModelV2.ID.make("paid"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("paid"), + aisdk: true, + package: "test-provider", cost: cost(1), }) catalog.provider.update(provider.id, () => {}) @@ -359,7 +382,7 @@ describe("OpencodePlugin", () => { }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.openai)).request.body.apiKey).toBeUndefined() + expect(required(yield* catalog.provider.get(ProviderV2.ID.openai)).settings?.apiKey).toBeUndefined() expect(required(yield* catalog.model.get(ProviderV2.ID.openai, ModelV2.ID.make("paid"))).enabled).toBe(true) }), ), diff --git a/packages/core/test/plugin/provider-openrouter.test.ts b/packages/core/test/plugin/provider-openrouter.test.ts index 953943673f..5548b93597 100644 --- a/packages/core/test/plugin/provider-openrouter.test.ts +++ b/packages/core/test/plugin/provider-openrouter.test.ts @@ -30,19 +30,21 @@ describe("OpenRouterPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.openrouter, (provider) => { - provider.api = { type: "aisdk", package: "@openrouter/ai-sdk-provider" } - provider.request = { headers: { Existing: "value" }, body: {} } + provider.aisdk = true + provider.package = "@openrouter/ai-sdk-provider" + provider.headers = { Existing: "value" } + provider.settings = {} }) catalog.provider.update(ProviderV2.ID.make("nvidia"), () => {}) }) yield* addPlugin() - expect((yield* catalog.provider.get(ProviderV2.ID.openrouter))?.request.headers).toEqual({ + expect((yield* catalog.provider.get(ProviderV2.ID.openrouter))?.headers).toEqual({ Existing: "value", "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode", }) - expect((yield* catalog.provider.get(ProviderV2.ID.make("nvidia")))?.request.headers).toEqual({}) + expect((yield* catalog.provider.get(ProviderV2.ID.make("nvidia")))?.headers).toBeUndefined() }), ) @@ -55,7 +57,9 @@ describe("OpenRouterPlugin", () => { const ignored = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openrouter, ModelV2.ID.make("openai/gpt-5")), - api: { id: ModelV2.ID.make("openai/gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("openai/gpt-5"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "openrouter" }, @@ -65,7 +69,9 @@ describe("OpenRouterPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("openai/gpt-5")), - api: { id: ModelV2.ID.make("openai/gpt-5"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("openai/gpt-5"), + aisdk: true, + package: "test-provider", }), package: "@openrouter/ai-sdk-provider", options: { name: "custom" }, @@ -79,7 +85,8 @@ describe("OpenRouterPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.openrouter, (provider) => { - provider.api = { type: "aisdk", package: "@openrouter/ai-sdk-provider" } + provider.aisdk = true + provider.package = "@openrouter/ai-sdk-provider" }) catalog.provider.update(ProviderV2.ID.openai, () => {}) catalog.model.update(ProviderV2.ID.openrouter, ModelV2.ID.make("openai/gpt-5-chat"), () => {}) diff --git a/packages/core/test/plugin/provider-perplexity.test.ts b/packages/core/test/plugin/provider-perplexity.test.ts index a2a3969233..121f5ddd54 100644 --- a/packages/core/test/plugin/provider-perplexity.test.ts +++ b/packages/core/test/plugin/provider-perplexity.test.ts @@ -41,7 +41,9 @@ describe("PerplexityPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("perplexity"), ModelV2.ID.make("sonar")), - api: { id: ModelV2.ID.make("sonar"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("sonar"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/perplexity", options: { name: "perplexity" }, @@ -58,7 +60,9 @@ describe("PerplexityPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("perplexity"), ModelV2.ID.make("sonar")), - api: { id: ModelV2.ID.make("sonar"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("sonar"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/perplexity-compatible", options: { name: "perplexity" }, @@ -75,7 +79,9 @@ describe("PerplexityPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("perplexity"), ModelV2.ID.make("sonar")), - api: { id: ModelV2.ID.make("sonar"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("sonar"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/perplexity", options: { name: "perplexity" }, @@ -92,7 +98,9 @@ describe("PerplexityPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-perplexity"), ModelV2.ID.make("sonar")), - api: { id: ModelV2.ID.make("sonar"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("sonar"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/perplexity", options: { name: "custom-perplexity" }, @@ -110,7 +118,9 @@ describe("PerplexityPlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("perplexity"), ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("sonar"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("sonar"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, diff --git a/packages/core/test/plugin/provider-sap-ai-core.test.ts b/packages/core/test/plugin/provider-sap-ai-core.test.ts index 5056c5dbb7..dd9bb4ec25 100644 --- a/packages/core/test/plugin/provider-sap-ai-core.test.ts +++ b/packages/core/test/plugin/provider-sap-ai-core.test.ts @@ -49,7 +49,9 @@ function withEnv(vars: Record, effect: () = function model(providerID: string) { return ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make(providerID), ModelV2.ID.make("sap-model")), - api: { id: ModelV2.ID.make("sap-model"), type: "aisdk", package: fixtureProvider }, + modelID: ModelV2.ID.make("sap-model"), + aisdk: true, + package: fixtureProvider, }) } diff --git a/packages/core/test/plugin/provider-snowflake-cortex.test.ts b/packages/core/test/plugin/provider-snowflake-cortex.test.ts index cd67feb40e..9fece1ecf6 100644 --- a/packages/core/test/plugin/provider-snowflake-cortex.test.ts +++ b/packages/core/test/plugin/provider-snowflake-cortex.test.ts @@ -57,7 +57,9 @@ describe("SnowflakeCortexPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("openai"), ModelV2.ID.make("gpt-4")), - api: { id: ModelV2.ID.make("gpt-4"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("gpt-4"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai", options: { name: "openai" }, @@ -75,7 +77,9 @@ describe("SnowflakeCortexPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")), - api: { id: ModelV2.ID.make("claude-sonnet-4-6"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude-sonnet-4-6"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "snowflake-cortex", baseURL: "https://test.snowflakecomputing.com/api/v2/cortex/v1" }, @@ -94,7 +98,9 @@ describe("SnowflakeCortexPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")), - api: { id: ModelV2.ID.make("claude-sonnet-4-6"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude-sonnet-4-6"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { @@ -117,7 +123,9 @@ describe("SnowflakeCortexPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")), - api: { id: ModelV2.ID.make("claude-sonnet-4-6"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude-sonnet-4-6"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "snowflake-cortex", baseURL: "https://test.snowflakecomputing.com/api/v2/cortex/v1" }, @@ -136,7 +144,9 @@ describe("SnowflakeCortexPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")), - api: { id: ModelV2.ID.make("claude-sonnet-4-6"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude-sonnet-4-6"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { @@ -159,7 +169,9 @@ describe("SnowflakeCortexPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")), - api: { id: ModelV2.ID.make("claude-sonnet-4-6"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("claude-sonnet-4-6"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "snowflake-cortex", baseURL: "https://test.snowflakecomputing.com/api/v2/cortex/v1" }, diff --git a/packages/core/test/plugin/provider-togetherai.test.ts b/packages/core/test/plugin/provider-togetherai.test.ts index 56bf7c9642..fc87a0cfbd 100644 --- a/packages/core/test/plugin/provider-togetherai.test.ts +++ b/packages/core/test/plugin/provider-togetherai.test.ts @@ -41,7 +41,9 @@ describe("TogetherAIPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("togetherai"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/togetherai", options: { name: "togetherai" }, @@ -59,7 +61,9 @@ describe("TogetherAIPlugin", () => { const ignored = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("togetherai"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "file:///tmp/@ai-sdk/togetherai-provider.js", options: { name: "togetherai" }, @@ -69,7 +73,9 @@ describe("TogetherAIPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("togetherai"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/togetherai", options: { name: "togetherai" }, @@ -87,7 +93,9 @@ describe("TogetherAIPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-togetherai"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/togetherai", options: { name: "custom-togetherai" }, @@ -110,11 +118,9 @@ describe("TogetherAIPlugin", () => { ProviderV2.ID.make("togetherai"), ModelV2.ID.make("meta-llama/Llama-3.3-70B-Instruct-Turbo"), ), - api: { - id: ModelV2.ID.make("meta-llama/Llama-3.3-70B-Instruct-Turbo"), - type: "aisdk", - package: "test-provider", - }, + modelID: ModelV2.ID.make("meta-llama/Llama-3.3-70B-Instruct-Turbo"), + aisdk: true, + package: "test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: {}, @@ -122,7 +128,9 @@ describe("TogetherAIPlugin", () => { expect(result.language).toBeUndefined() expect(calls).toEqual([]) - expect(result.language ?? fakeSelectorSdk(calls).languageModel(result.model.api.id)).toBeDefined() + expect( + result.language ?? fakeSelectorSdk(calls).languageModel(result.model.modelID ?? result.model.id), + ).toBeDefined() expect(calls).toEqual(["languageModel:meta-llama/Llama-3.3-70B-Instruct-Turbo"]) }), ) diff --git a/packages/core/test/plugin/provider-venice.test.ts b/packages/core/test/plugin/provider-venice.test.ts index 3ed6c711c4..ba4cfef8af 100644 --- a/packages/core/test/plugin/provider-venice.test.ts +++ b/packages/core/test/plugin/provider-venice.test.ts @@ -41,7 +41,9 @@ describe("VenicePlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("venice"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "venice-ai-sdk-provider", options: { name: "venice" }, @@ -58,7 +60,9 @@ describe("VenicePlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-venice"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "venice-ai-sdk-provider", options: { name: "custom-venice", apiKey: "test" }, @@ -76,7 +80,9 @@ describe("VenicePlugin", () => { const similar = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("venice"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "file:///tmp/venice-ai-sdk-provider.js", options: { name: "venice" }, @@ -84,7 +90,9 @@ describe("VenicePlugin", () => { const other = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("venice"), ModelV2.ID.make("model")), - api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("model"), + aisdk: true, + package: "test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "venice" }, @@ -103,7 +111,9 @@ describe("VenicePlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("venice"), ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("alias"), type: "aisdk", package: "test-provider" }, + modelID: ModelV2.ID.make("alias"), + aisdk: true, + package: "test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, diff --git a/packages/core/test/plugin/provider-vercel.test.ts b/packages/core/test/plugin/provider-vercel.test.ts index eb87b15132..08f169aa6e 100644 --- a/packages/core/test/plugin/provider-vercel.test.ts +++ b/packages/core/test/plugin/provider-vercel.test.ts @@ -25,12 +25,13 @@ describe("VercelPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("vercel"), (provider) => { - provider.api = { type: "aisdk", package: "@ai-sdk/vercel" } - provider.request.headers.Existing = "1" + provider.aisdk = true + provider.package = "@ai-sdk/vercel" + provider.headers = { ...provider.headers, Existing: "1" } }) }) yield* addPlugin() - expect((yield* catalog.provider.get(ProviderV2.ID.make("vercel")))?.request.headers).toEqual({ + expect((yield* catalog.provider.get(ProviderV2.ID.make("vercel")))?.headers).toEqual({ Existing: "1", "http-referer": "https://opencode.ai/", "x-title": "opencode", @@ -43,14 +44,13 @@ describe("VercelPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("vercel"), (provider) => { - provider.api = { type: "aisdk", package: "@ai-sdk/vercel" } + provider.aisdk = true + provider.package = "@ai-sdk/vercel" }), ) yield* addPlugin() - expect((yield* catalog.provider.get(ProviderV2.ID.make("vercel")))?.request.headers).not.toHaveProperty( - "HTTP-Referer", - ) - expect((yield* catalog.provider.get(ProviderV2.ID.make("vercel")))?.request.headers).not.toHaveProperty("X-Title") + expect((yield* catalog.provider.get(ProviderV2.ID.make("vercel")))?.headers).not.toHaveProperty("HTTP-Referer") + expect((yield* catalog.provider.get(ProviderV2.ID.make("vercel")))?.headers).not.toHaveProperty("X-Title") }), ) @@ -62,7 +62,9 @@ describe("VercelPlugin", () => { const event = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-vercel"), ModelV2.ID.make("v0-1.0-md")), - api: { id: ModelV2.ID.make("v0-1.0-md"), type: "aisdk", package: "@ai-sdk/vercel" }, + modelID: ModelV2.ID.make("v0-1.0-md"), + aisdk: true, + package: "@ai-sdk/vercel", }), package: "@ai-sdk/vercel", options: { name: "custom-vercel" }, @@ -77,7 +79,7 @@ describe("VercelPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("gateway"), () => {})) yield* addPlugin() - expect((yield* catalog.provider.get(ProviderV2.ID.make("gateway")))?.request.headers).toEqual({}) + expect((yield* catalog.provider.get(ProviderV2.ID.make("gateway")))?.headers).toBeUndefined() }), ) }) diff --git a/packages/core/test/plugin/provider-xai.test.ts b/packages/core/test/plugin/provider-xai.test.ts index c4d1a5ece3..525b2bbb62 100644 --- a/packages/core/test/plugin/provider-xai.test.ts +++ b/packages/core/test/plugin/provider-xai.test.ts @@ -42,7 +42,9 @@ describe("XAIPlugin", () => { const ignored = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("xai"), ModelV2.ID.make("grok-4")), - api: { id: ModelV2.ID.make("grok-4"), type: "aisdk", package: "@ai-sdk/xai" }, + modelID: ModelV2.ID.make("grok-4"), + aisdk: true, + package: "@ai-sdk/xai", }), package: "@ai-sdk/openai-compatible", options: {}, @@ -51,7 +53,9 @@ describe("XAIPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("xai"), ModelV2.ID.make("grok-4")), - api: { id: ModelV2.ID.make("grok-4"), type: "aisdk", package: "@ai-sdk/xai" }, + modelID: ModelV2.ID.make("grok-4"), + aisdk: true, + package: "@ai-sdk/xai", }), package: "@ai-sdk/xai", options: {}, @@ -71,7 +75,9 @@ describe("XAIPlugin", () => { const result = yield* aisdk.runSDK({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-xai"), ModelV2.ID.make("grok-4")), - api: { id: ModelV2.ID.make("grok-4"), type: "aisdk", package: "@ai-sdk/xai" }, + modelID: ModelV2.ID.make("grok-4"), + aisdk: true, + package: "@ai-sdk/xai", }), package: "@ai-sdk/xai", options: {}, @@ -81,7 +87,7 @@ describe("XAIPlugin", () => { }), ) - it.effect("uses responses with the model api.id for xAI language models", () => + it.effect("uses responses with the model modelID for xAI language models", () => Effect.gen(function* () { const plugin = yield* PluginV2.Service const aisdk = yield* AISDK.Service @@ -91,7 +97,9 @@ describe("XAIPlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("xai"), ModelV2.ID.make("alias")), - api: { id: ModelV2.ID.make("grok-4"), type: "aisdk", package: "@ai-sdk/xai" }, + modelID: ModelV2.ID.make("grok-4"), + aisdk: true, + package: "@ai-sdk/xai", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -112,7 +120,9 @@ describe("XAIPlugin", () => { const result = yield* aisdk.runLanguage({ model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("grok-4")), - api: { id: ModelV2.ID.make("grok-4"), type: "aisdk", package: "@ai-sdk/xai" }, + modelID: ModelV2.ID.make("grok-4"), + aisdk: true, + package: "@ai-sdk/xai", }), sdk: fakeSelectorSdk(calls), options: {}, diff --git a/packages/core/test/plugin/provider-zenmux.test.ts b/packages/core/test/plugin/provider-zenmux.test.ts index b9d34a1f5b..15da40167e 100644 --- a/packages/core/test/plugin/provider-zenmux.test.ts +++ b/packages/core/test/plugin/provider-zenmux.test.ts @@ -32,17 +32,15 @@ describe("ZenmuxPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("zenmux"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://zenmux.ai/api/v1", - } + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { ...provider.settings, baseURL: "https://zenmux.ai/api/v1" } }) }) yield* addPlugin() const result = required(yield* catalog.provider.get(ProviderV2.ID.make("zenmux"))) - expect(result.request.headers).toEqual({ "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode" }) - expect(Object.keys(result.request.headers).sort()).toEqual(["HTTP-Referer", "X-Title"]) + expect(result.headers).toEqual({ "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode" }) + expect(Object.keys(required(result.headers)).sort()).toEqual(["HTTP-Referer", "X-Title"]) }), ) @@ -51,17 +49,15 @@ describe("ZenmuxPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("zenmux"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://zenmux.ai/api/v1", - } - provider.request.headers.Existing = "value" + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { ...provider.settings, baseURL: "https://zenmux.ai/api/v1" } + provider.headers = { ...provider.headers, Existing: "value" } }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.make("zenmux"))).request.headers).toEqual({ + expect(required(yield* catalog.provider.get(ProviderV2.ID.make("zenmux"))).headers).toEqual({ Existing: "value", "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode", @@ -74,17 +70,15 @@ describe("ZenmuxPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("zenmux"), (provider) => { - provider.api = { - type: "aisdk", - package: "@ai-sdk/openai-compatible", - url: "https://zenmux.ai/api/v1", - } - provider.request.headers = { "HTTP-Referer": "https://example.com/", "X-Title": "custom-title" } + provider.aisdk = true + provider.package = "@ai-sdk/openai-compatible" + provider.settings = { ...provider.settings, baseURL: "https://zenmux.ai/api/v1" } + provider.headers = { "HTTP-Referer": "https://example.com/", "X-Title": "custom-title" } }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.make("zenmux"))).request.headers).toEqual({ + expect(required(yield* catalog.provider.get(ProviderV2.ID.make("zenmux"))).headers).toEqual({ "HTTP-Referer": "https://example.com/", "X-Title": "custom-title", }) @@ -96,12 +90,12 @@ describe("ZenmuxPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.openrouter, (provider) => { - provider.request.headers = { "HTTP-Referer": "https://example.com/", "X-Title": "custom-title" } + provider.headers = { "HTTP-Referer": "https://example.com/", "X-Title": "custom-title" } }) }) yield* addPlugin() - expect(required(yield* catalog.provider.get(ProviderV2.ID.openrouter)).request.headers).toEqual({ + expect(required(yield* catalog.provider.get(ProviderV2.ID.openrouter)).headers).toEqual({ "HTTP-Referer": "https://example.com/", "X-Title": "custom-title", }) diff --git a/packages/core/test/plugin/variant.test.ts b/packages/core/test/plugin/variant.test.ts index 45476f366c..e20fd3a11d 100644 --- a/packages/core/test/plugin/variant.test.ts +++ b/packages/core/test/plugin/variant.test.ts @@ -23,7 +23,13 @@ const connections = Credential.defaultLayer.pipe(Layer.fresh) const integrations = Integration.locationLayer.pipe(Layer.provide(events), Layer.provide(connections)) const catalog = Catalog.layer.pipe( Layer.provide( - Layer.mergeAll(events, locationLayer, Policy.layer.pipe(Layer.provide(locationLayer)), connections, integrations), + Layer.mergeAll( + events, + locationLayer, + Policy.layer.pipe(Layer.provide(locationLayer)), + connections, + integrations, + ), ), ) const it = testEffect( @@ -36,21 +42,20 @@ describe("VariantPlugin", () => { const service = yield* Catalog.Service yield* service.transform((catalog) => { catalog.provider.update(ProviderV2.ID.opencode, (provider) => { - provider.api = { type: "aisdk", package: "@ai-sdk/openai-compatible" } + provider.package = "@ai-sdk/openai-compatible" + provider.aisdk = true }) catalog.model.update(ProviderV2.ID.opencode, ModelV2.ID.make("glm-5.2"), (model) => { - model.api = { - id: ModelV2.ID.make("glm-5.2"), - type: "aisdk", - package: "@ai-sdk/openai-compatible", - } + model.modelID = ModelV2.ID.make("glm-5.2") + model.package = "@ai-sdk/openai-compatible" + model.aisdk = true }) }) yield* VariantPlugin.Plugin.effect(host({ catalog: catalogHost(service) })) expect((yield* service.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("glm-5.2")))?.variants).toEqual([ - expect.objectContaining({ id: "high", body: { reasoning_effort: "high" } }), - expect.objectContaining({ id: "max", body: { reasoning_effort: "max" } }), + expect.objectContaining({ id: "high", settings: { reasoningEffort: "high" } }), + expect.objectContaining({ id: "max", settings: { reasoningEffort: "max" } }), ]) }), ) @@ -60,19 +65,19 @@ describe("VariantPlugin", () => { const service = yield* Catalog.Service yield* service.transform((catalog) => { catalog.model.update(ProviderV2.ID.opencode, ModelV2.ID.make("glm-5.2"), (model) => { - model.api = { - id: ModelV2.ID.make("glm-5.2"), - type: "aisdk", - package: "@ai-sdk/openai-compatible", - } - model.variants = [{ id: ModelV2.VariantID.make("high"), headers: { custom: "true" }, body: {} }] + model.modelID = ModelV2.ID.make("glm-5.2") + model.package = "@ai-sdk/openai-compatible" + model.aisdk = true + model.variants = [ + { id: ModelV2.VariantID.make("high"), headers: { custom: "true" } }, + ] }) }) yield* VariantPlugin.Plugin.effect(host({ catalog: catalogHost(service) })) expect((yield* service.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("glm-5.2")))?.variants).toEqual([ expect.objectContaining({ id: "high", headers: { custom: "true" } }), - expect.objectContaining({ id: "max", body: { reasoning_effort: "max" } }), + expect.objectContaining({ id: "max", settings: { reasoningEffort: "max" } }), ]) }), ) diff --git a/packages/core/test/session-runner-model.test.ts b/packages/core/test/session-runner-model.test.ts index 94669b24be..d2283a1086 100644 --- a/packages/core/test/session-runner-model.test.ts +++ b/packages/core/test/session-runner-model.test.ts @@ -12,26 +12,23 @@ import { SessionV2 } from "@opencode-ai/core/session" import { AbsolutePath } from "@opencode-ai/core/schema" import { it } from "./lib/effect" -type Api = - | { - readonly type: "aisdk" - readonly package: string - readonly url?: string - readonly settings?: Record - } - | { readonly type: "native"; readonly url?: string; readonly settings: Record } +type Transport = { + readonly package: string + readonly aisdk?: true + readonly settings?: Record +} -const model = (api: Api, variants: ModelV2.Info["variants"] = []) => +const model = (transport: Transport, variants?: NonNullable) => ModelV2.Info.make({ id: ModelV2.ID.make("test-model"), + modelID: ModelV2.ID.make("api-test-model"), providerID: ProviderV2.ID.make("test-provider"), name: "Test model", - api: { id: ModelV2.ID.make("api-test-model"), ...api }, + ...transport, + settings: { apiKey: "secret", ...transport.settings }, capabilities: { tools: true, input: ["text"], output: ["text"] }, - request: { - headers: { "x-test": "header" }, - body: { apiKey: "secret", custom_extension: { enabled: true } }, - }, + headers: { "x-test": "header" }, + body: { custom_extension: { enabled: true } }, variants, time: { released: 0 }, cost: [], @@ -44,7 +41,7 @@ describe("SessionRunnerModel", () => { it.effect("maps catalog OpenAI AI SDK models into native Responses routes", () => Effect.gen(function* () { const resolved = yield* SessionRunnerModel.fromCatalogModel( - model({ type: "aisdk", package: "@ai-sdk/openai", url: "https://openai.example/v1" }), + model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }), ) expect(resolved).toMatchObject({ id: "api-test-model", provider: "test-provider" }) @@ -63,7 +60,7 @@ describe("SessionRunnerModel", () => { it.effect("keeps catalog apiKey credentials out of provider JSON", () => Effect.gen(function* () { const resolved = yield* SessionRunnerModel.fromCatalogModel( - model({ type: "aisdk", package: "@ai-sdk/openai", url: "https://openai.example/v1" }), + model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }), ) const prepared = yield* LLMClient.prepare(LLM.request({ model: resolved, prompt: "Hello" })) @@ -77,12 +74,16 @@ describe("SessionRunnerModel", () => { const resolved = yield* SessionRunnerModel.fromCatalogModel( ModelV2.Info.make({ ...model({ - type: "aisdk", package: "@ai-sdk/openai-compatible", - url: "https://compatible.example/v1", - settings: { apiKey: "settings-secret", compatibility: "strict" }, + aisdk: true, + settings: { + apiKey: "settings-secret", + baseURL: "https://compatible.example/v1", + compatibility: "strict", + }, }), - request: { headers: {}, body: {} }, + headers: {}, + body: {}, }), ) const request = LLM.request({ model: resolved, prompt: "Hello" }) @@ -101,7 +102,7 @@ describe("SessionRunnerModel", () => { it.effect("overlays selected OpenAI Session variant bodies", () => Effect.gen(function* () { - const catalog = model({ type: "aisdk", package: "@ai-sdk/openai", url: "https://openai.example/v1" }, [ + const catalog = model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }, [ { id: ModelV2.VariantID.make("high"), headers: { "x-variant": "high" }, @@ -144,7 +145,11 @@ describe("SessionRunnerModel", () => { it.effect("overlays selected OpenAI-compatible Session variant bodies", () => Effect.gen(function* () { const catalog = model( - { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://compatible.example/v1" }, + { + package: "@ai-sdk/openai-compatible", + aisdk: true, + settings: { baseURL: "https://compatible.example/v1" }, + }, [ { id: ModelV2.VariantID.make("high"), @@ -176,7 +181,7 @@ describe("SessionRunnerModel", () => { it.effect("rejects an explicit unavailable Session variant during model resolution", () => Effect.gen(function* () { - const catalog = model({ type: "aisdk", package: "@ai-sdk/openai", url: "https://openai.example/v1" }) + const catalog = model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }) const session = SessionV2.Info.make({ id: SessionV2.ID.make("ses_model_variant_unavailable"), projectID: ProjectV2.ID.global, @@ -206,7 +211,7 @@ describe("SessionRunnerModel", () => { it.effect("overlays selected Anthropic Session variant bodies", () => Effect.gen(function* () { - const catalog = model({ type: "aisdk", package: "@ai-sdk/anthropic", url: "https://anthropic.example/v1" }, [ + const catalog = model({ package: "@ai-sdk/anthropic", aisdk: true, settings: { baseURL: "https://anthropic.example/v1" } }, [ { id: ModelV2.VariantID.make("high"), headers: {}, @@ -236,7 +241,7 @@ describe("SessionRunnerModel", () => { it.effect("maps catalog Anthropic AI SDK models into native routes", () => Effect.gen(function* () { const resolved = yield* SessionRunnerModel.fromCatalogModel( - model({ type: "aisdk", package: "@ai-sdk/anthropic", url: "https://anthropic.example/v1" }), + model({ package: "@ai-sdk/anthropic", aisdk: true, settings: { baseURL: "https://anthropic.example/v1" } }), ) expect(resolved.route).toMatchObject({ @@ -250,8 +255,9 @@ describe("SessionRunnerModel", () => { Effect.gen(function* () { const resolved = yield* SessionRunnerModel.fromCatalogModel( ModelV2.Info.make({ - ...model({ type: "aisdk", package: "@ai-sdk/openai", url: "https://openai.example/v1" }), - request: { headers: {}, body: {} }, + ...model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }), + headers: {}, + body: {}, }), Credential.Key.make({ type: "key", key: "secret" }), ) @@ -273,8 +279,10 @@ describe("SessionRunnerModel", () => { const credential = Credential.Key.make({ type: "key", key: "stored-secret", metadata: { tenant: "work" } }) const resolved = yield* SessionRunnerModel.fromCatalogModel( ModelV2.Info.make({ - ...model({ type: "aisdk", package: "@ai-sdk/openai", url: "https://openai.example/v1" }), - request: { headers: {}, body: { apiKey: "configured-secret" } }, + ...model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }), + settings: { apiKey: "configured-secret", baseURL: "https://openai.example/v1" }, + headers: {}, + body: {}, }), credential, ) @@ -287,23 +295,23 @@ describe("SessionRunnerModel", () => { }) expect(headers.authorization).toBe("Bearer stored-secret") - expect(resolved.route.defaults.http?.body).toEqual({ tenant: "work" }) + expect(resolved.route.defaults.http?.body).toEqual({}) }), ) it.effect("rejects catalog APIs without a native route", () => Effect.gen(function* () { const failure = yield* SessionRunnerModel.fromCatalogModel( - model({ type: "aisdk", package: "@ai-sdk/google", url: "https://google.example/v1" }), + model({ package: "@ai-sdk/google", aisdk: true, settings: { baseURL: "https://google.example/v1" } }), ).pipe(Effect.flip) expect(failure).toMatchObject({ - _tag: "SessionRunnerModel.UnsupportedApiError", + _tag: "SessionRunnerModel.UnsupportedPackageError", providerID: "test-provider", modelID: "test-model", - api: "aisdk:@ai-sdk/google", + package: "aisdk:@ai-sdk/google", }) - expect(failure.message).toBe("Unsupported API for test-provider/test-model: aisdk:@ai-sdk/google") + expect(failure.message).toBe("Unsupported package for test-provider/test-model: aisdk:@ai-sdk/google") }), ) @@ -311,15 +319,15 @@ describe("SessionRunnerModel", () => { Effect.sync(() => { expect( SessionRunnerModel.supported( - model({ type: "aisdk", package: "@ai-sdk/openai", url: "https://openai.example/v1" }), + model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }), ), ).toBe(true) expect( SessionRunnerModel.supported( - model({ type: "aisdk", package: "@ai-sdk/google", url: "https://google.example/v1" }), + model({ package: "@ai-sdk/google", aisdk: true, settings: { baseURL: "https://google.example/v1" } }), ), ).toBe(false) - expect(SessionRunnerModel.supported(model({ type: "native", settings: {} }))).toBe(false) + expect(SessionRunnerModel.supported(model({ package: "native" }))).toBe(false) }), ) }) diff --git a/packages/core/test/shared-schema.test.ts b/packages/core/test/shared-schema.test.ts index 1d4cebb660..7bd8da8c58 100644 --- a/packages/core/test/shared-schema.test.ts +++ b/packages/core/test/shared-schema.test.ts @@ -100,8 +100,10 @@ test("Core reuses the canonical shared schemas", async () => { [ModelV2.Family, Model.Family], [ModelV2.Capabilities, Model.Capabilities], [ModelV2.Cost, Model.Cost], + [ModelV2.Info, Model.Info], [ProviderV2.ID, Provider.ID], [ProviderV2.Request, Provider.Request], + [ProviderV2.Info, Provider.Info], [corePermission.Effect, Permission.Effect], [corePermission.Rule, Permission.Rule], [corePermission.Ruleset, Permission.Ruleset], @@ -149,50 +151,15 @@ test("Core reuses the canonical shared schemas", async () => { for (const [core, shared] of schemas) expect(core).toBe(shared) expect(Agent.Info.empty(Agent.ID.make("test"))).toEqual(AgentV2.Info.empty(AgentV2.ID.make("test"))) + expect(Model.Info.empty(Provider.ID.make("test"), Model.ID.make("model"))).toEqual( + ModelV2.Info.empty(ProviderV2.ID.make("test"), ModelV2.ID.make("model")), + ) + expect(Provider.Info.empty(Provider.ID.make("test"))).toEqual(ProviderV2.Info.empty(ProviderV2.ID.make("test"))) expect(Skill.Source.key(Skill.DirectorySource.make({ type: "directory", path: AbsolutePath.make("/tmp") }))).toBe( "directory:/tmp", ) }) -test("shared provider schemas use flat package identity", () => { - expect( - Schema.decodeUnknownSync(Provider.Info)({ - id: "openai", - name: "OpenAI", - package: "@opencode-ai/llm/providers/openai", - settings: { baseURL: "https://api.openai.com/v1" }, - headers: { "x-application": "opencode" }, - body: { service_tier: "priority" }, - }), - ).toMatchObject({ package: "@opencode-ai/llm/providers/openai" }) - expect( - Schema.decodeUnknownSync(Provider.Info)({ - id: "legacy", - name: "Legacy", - package: "aisdk:@ai-sdk/openai", - }), - ).toMatchObject({ package: "aisdk:@ai-sdk/openai" }) - expect( - Schema.decodeUnknownSync(Model.Info)({ - id: "claude-sonnet", - modelID: "us.anthropic.claude-sonnet-4-6", - providerID: "amazon-bedrock", - name: "Claude Sonnet", - package: "@opencode-ai/llm/providers/amazon-bedrock", - settings: { region: "us-west-2" }, - headers: {}, - body: { additionalModelRequestFields: { reasoning_config: { type: "enabled" } } }, - capabilities: { tools: true, input: ["text"], output: ["text"] }, - variants: [{ id: "max", settings: {}, body: { budget_tokens: 31999 } }], - time: { released: 0 }, - cost: [], - status: "active", - enabled: true, - limit: { context: 200000, output: 64000 }, - }), - ).toMatchObject({ id: "claude-sonnet", modelID: "us.anthropic.claude-sonnet-4-6" }) -}) - test("shared record schemas construct and decode plain objects", () => { const made = Prompt.make({ text: "hello" }) const decoded = Schema.decodeUnknownSync(Prompt)({ text: "hello" }) diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts index 3116c295f1..694e00560c 100644 --- a/packages/sdk/js/src/v2/gen/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/types.gen.ts @@ -3986,47 +3986,35 @@ export type SessionMessage = export type ModelV2Info = { id: string + modelID?: string providerID: string family?: string name: string - api: - | { - id: string - type: "aisdk" - package: string - url?: string - settings?: { - [key: string]: unknown - } - } - | { - id: string - type: "native" - url?: string - settings: { - [key: string]: unknown - } - } + package?: string + aisdk?: true + settings?: { + [key: string]: unknown + } + headers?: { + [key: string]: string + } + body?: { + [key: string]: unknown + } capabilities: { tools: boolean input: Array output: Array } - request: { - headers: { - [key: string]: string - } - body: { + variants?: Array<{ + id: string + settings?: { [key: string]: unknown } - variant?: string - } - variants: Array<{ - id: string - headers: { + headers?: { [key: string]: string } - body: { + body?: { [key: string]: unknown } }> @@ -4059,29 +4047,16 @@ export type ProviderV2Info = { integrationID?: string name: string disabled?: boolean - api: - | { - type: "aisdk" - package: string - url?: string - settings?: { - [key: string]: unknown - } - } - | { - type: "native" - url?: string - settings: { - [key: string]: unknown - } - } - request: { - headers: { - [key: string]: string - } - body: { - [key: string]: unknown - } + package: string + aisdk?: true + settings?: { + [key: string]: unknown + } + headers?: { + [key: string]: string + } + body?: { + [key: string]: unknown } } From cd3885910d97418d7b36fd13439920f9bc0dc8ab Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Thu, 25 Jun 2026 20:24:53 +0530 Subject: [PATCH 12/18] feat(core): load native provider packages --- packages/core/src/aisdk.ts | 10 +-- packages/core/src/catalog.ts | 45 +--------- packages/core/src/config/plugin/provider.ts | 24 ++--- packages/core/src/config/provider.ts | 2 - packages/core/src/model.ts | 4 +- packages/core/src/plugin/models-dev.ts | 6 +- .../src/plugin/provider/amazon-bedrock.ts | 9 +- .../core/src/plugin/provider/anthropic.ts | 5 +- packages/core/src/plugin/provider/azure.ts | 10 +-- packages/core/src/plugin/provider/cerebras.ts | 5 +- .../plugin/provider/cloudflare-workers-ai.ts | 9 +- .../core/src/plugin/provider/google-vertex.ts | 12 +-- packages/core/src/plugin/provider/kilo.ts | 5 +- .../core/src/plugin/provider/llmgateway.ts | 5 +- packages/core/src/plugin/provider/nvidia.ts | 5 +- packages/core/src/plugin/provider/openai.ts | 4 +- packages/core/src/plugin/provider/opencode.ts | 6 +- .../core/src/plugin/provider/openrouter.ts | 5 +- packages/core/src/plugin/provider/vercel.ts | 5 +- packages/core/src/plugin/provider/zenmux.ts | 5 +- packages/core/src/plugin/variant.ts | 6 +- packages/core/src/provider-overlay.ts | 38 ++++++++ packages/core/src/provider-package.ts | 75 ++++++++++++++++ packages/core/src/provider.ts | 10 ++- packages/core/src/session/runner/model.ts | 87 +++++++++++-------- packages/core/src/v1/config/migrate.ts | 7 +- packages/core/test/catalog.test.ts | 48 ++++++---- packages/core/test/config/config.test.ts | 6 +- packages/core/test/config/provider.test.ts | 12 +-- .../core/test/plugin/provider-alibaba.test.ts | 12 +-- .../plugin/provider-amazon-bedrock.test.ts | 71 +++++---------- .../test/plugin/provider-anthropic.test.ts | 11 +-- .../provider-azure-cognitive-services.test.ts | 38 +++----- .../core/test/plugin/provider-azure.test.ts | 45 ++++------ .../test/plugin/provider-cerebras.test.ts | 12 +-- .../provider-cloudflare-ai-gateway.test.ts | 33 +++---- .../provider-cloudflare-workers-ai.test.ts | 34 +++----- .../core/test/plugin/provider-cohere.test.ts | 12 +-- .../test/plugin/provider-deepinfra.test.ts | 18 ++-- .../core/test/plugin/provider-dynamic.test.ts | 24 ++--- .../core/test/plugin/provider-gateway.test.ts | 12 +-- .../plugin/provider-github-copilot.test.ts | 39 +++------ .../core/test/plugin/provider-gitlab.test.ts | 24 ++--- .../provider-google-vertex-anthropic.test.ts | 30 +++---- .../plugin/provider-google-vertex.test.ts | 42 +++------ .../core/test/plugin/provider-google.test.ts | 9 +- .../core/test/plugin/provider-groq.test.ts | 15 ++-- .../core/test/plugin/provider-kilo.test.ts | 12 +-- .../test/plugin/provider-llmgateway.test.ts | 6 +- .../core/test/plugin/provider-mistral.test.ts | 15 ++-- .../core/test/plugin/provider-nvidia.test.ts | 9 +- .../plugin/provider-openai-compatible.test.ts | 15 ++-- .../core/test/plugin/provider-openai.test.ts | 22 ++--- .../test/plugin/provider-opencode.test.ts | 45 ++++------ .../test/plugin/provider-openrouter.test.ts | 12 +-- .../test/plugin/provider-perplexity.test.ts | 15 ++-- .../test/plugin/provider-sap-ai-core.test.ts | 3 +- .../plugin/provider-snowflake-cortex.test.ts | 18 ++-- .../test/plugin/provider-togetherai.test.ts | 15 ++-- .../core/test/plugin/provider-venice.test.ts | 15 ++-- .../core/test/plugin/provider-vercel.test.ts | 9 +- .../core/test/plugin/provider-xai.test.ts | 15 ++-- .../core/test/plugin/provider-zenmux.test.ts | 9 +- packages/core/test/plugin/variant.test.ts | 21 ++--- .../core/test/session-runner-model.test.ts | 72 ++++++++++----- packages/sdk/js/src/v2/gen/types.gen.ts | 2 - 66 files changed, 588 insertions(+), 693 deletions(-) create mode 100644 packages/core/src/provider-overlay.ts create mode 100644 packages/core/src/provider-package.ts diff --git a/packages/core/src/aisdk.ts b/packages/core/src/aisdk.ts index 3aaf5484ee..9eb47006f0 100644 --- a/packages/core/src/aisdk.ts +++ b/packages/core/src/aisdk.ts @@ -198,23 +198,23 @@ export const locationLayer = Layer.effect( const key = `${model.providerID}/${model.id}/${model.modelID ?? model.id}/${JSON.stringify(model.settings)}` const existing = languages.get(key) if (existing) return existing - if (!model.aisdk) + if (!ProviderV2.isAISDK(model.package)) return yield* new InitError({ providerID: model.providerID, cause: new Error(`Unsupported package ${model.package}`), }) - const options = prepareOptions(model, model.package ?? "") + const packageName = ProviderV2.packageName(model.package) ?? "" + const options = prepareOptions(model, packageName) const sdkKey = JSON.stringify({ providerID: model.providerID, - package: model.package, + package: packageName, settings: model.settings, options, }) const sdk = sdks.get(sdkKey) ?? - (yield* service.runSDK({ model, package: model.package ?? "", options }).pipe(initError(model.providerID))) - .sdk + (yield* service.runSDK({ model, package: packageName, options }).pipe(initError(model.providerID))).sdk if (!sdk) return yield* new InitError({ providerID: model.providerID, diff --git a/packages/core/src/catalog.ts b/packages/core/src/catalog.ts index 51b33cea74..96610b71cc 100644 --- a/packages/core/src/catalog.ts +++ b/packages/core/src/catalog.ts @@ -7,6 +7,7 @@ import { EventV2 } from "./event" import { Policy } from "./policy" import { State } from "./state" import { Integration } from "./integration" +import { ProviderOverlay } from "./provider-overlay" export type ProviderRecord = { provider: ProviderV2.MutableInfo @@ -79,10 +80,9 @@ export const layer = Layer.effect( return ModelV2.Info.make({ ...model, package: model.package ?? provider.package, - aisdk: model.package === undefined ? (model.aisdk ?? provider.aisdk) : model.aisdk, - settings: merge(provider.settings, model.settings), - headers: headers(provider.headers, model.headers), - body: merge(provider.body, model.body), + settings: ProviderOverlay.merge(provider.settings, model.settings), + headers: ProviderOverlay.headers(provider.headers, model.headers), + body: ProviderOverlay.merge(provider.body, model.body), }) } @@ -270,43 +270,6 @@ export const layer = Layer.effect( const SMALL_MODEL_RE = /\b(nano|flash|lite|mini|haiku|small|fast)\b/ -function merge( - base: Readonly> | undefined, - overlay: Readonly> | undefined, -): Record | undefined { - if (base === undefined) return overlay && { ...overlay } - if (overlay === undefined) return { ...base } - return Object.fromEntries( - new Set([...Object.keys(base), ...Object.keys(overlay)]).values().map((key) => { - const left = base[key] - const right = overlay[key] - if (right === undefined) return [key, left] - if (plain(left) && plain(right)) return [key, merge(left, right)] - return [key, right] - }), - ) -} - -function plain(input: unknown): input is Readonly> { - if (typeof input !== "object" || input === null || Array.isArray(input)) return false - const prototype = Object.getPrototypeOf(input) - return prototype === Object.prototype || prototype === null -} - -function headers( - base: Readonly> | undefined, - overlay: Readonly> | undefined, -) { - return Object.fromEntries( - [...Object.entries(base ?? {}), ...Object.entries(overlay ?? {})] - .reduce((result, entry) => { - result.set(entry[0].toLowerCase(), entry) - return result - }, new Map()) - .values(), - ) -} - export const locationLayer = layer.pipe( Layer.provideMerge(Integration.locationLayer), Layer.provideMerge(Policy.locationLayer), diff --git a/packages/core/src/config/plugin/provider.ts b/packages/core/src/config/plugin/provider.ts index 3129240639..4dd4e064f2 100644 --- a/packages/core/src/config/plugin/provider.ts +++ b/packages/core/src/config/plugin/provider.ts @@ -4,6 +4,7 @@ import { define } from "../../plugin/internal" import { Effect } from "effect" import { Config } from "../../config" import { ModelV2 } from "../../model" +import { ProviderOverlay } from "../../provider-overlay" import { ProviderV2 } from "../../provider" export const Plugin = define({ @@ -53,10 +54,10 @@ export const Plugin = define({ catalog.provider.update(providerID, (provider) => { if (item.name !== undefined) provider.name = item.name if (item.package !== undefined) provider.package = item.package - if (item.aisdk !== undefined) provider.aisdk = item.aisdk - if (item.settings !== undefined) provider.settings = { ...provider.settings, ...item.settings } - if (item.headers !== undefined) provider.headers = { ...provider.headers, ...item.headers } - if (item.body !== undefined) provider.body = { ...provider.body, ...item.body } + if (item.settings !== undefined) + provider.settings = ProviderOverlay.merge(provider.settings, item.settings) + if (item.headers !== undefined) provider.headers = ProviderOverlay.headers(provider.headers, item.headers) + if (item.body !== undefined) provider.body = ProviderOverlay.merge(provider.body, item.body) }) for (const [id, config] of Object.entries(item.models ?? {})) { catalog.model.update(providerID, id, (model) => { @@ -64,10 +65,10 @@ export const Plugin = define({ if (config.name !== undefined) model.name = config.name if (config.modelID !== undefined) model.modelID = config.modelID if (config.package !== undefined) model.package = config.package - if (config.aisdk !== undefined) model.aisdk = config.aisdk - if (config.settings !== undefined) model.settings = { ...model.settings, ...config.settings } - if (config.headers !== undefined) model.headers = { ...model.headers, ...config.headers } - if (config.body !== undefined) model.body = { ...model.body, ...config.body } + if (config.settings !== undefined) + model.settings = ProviderOverlay.merge(model.settings, config.settings) + if (config.headers !== undefined) model.headers = ProviderOverlay.headers(model.headers, config.headers) + if (config.body !== undefined) model.body = ProviderOverlay.merge(model.body, config.body) if (config.capabilities !== undefined) { model.capabilities = { tools: config.capabilities.tools, @@ -86,9 +87,10 @@ export const Plugin = define({ model.variants.push(existing) } if (variant.settings !== undefined) - existing.settings = { ...existing.settings, ...variant.settings } - if (variant.headers !== undefined) existing.headers = { ...existing.headers, ...variant.headers } - if (variant.body !== undefined) existing.body = { ...existing.body, ...variant.body } + existing.settings = ProviderOverlay.merge(existing.settings, variant.settings) + if (variant.headers !== undefined) + existing.headers = ProviderOverlay.headers(existing.headers, variant.headers) + if (variant.body !== undefined) existing.body = ProviderOverlay.merge(existing.body, variant.body) } } if (config.cost !== undefined) { diff --git a/packages/core/src/config/provider.ts b/packages/core/src/config/provider.ts index 153ab7fcef..990207d9cb 100644 --- a/packages/core/src/config/provider.ts +++ b/packages/core/src/config/provider.ts @@ -40,7 +40,6 @@ class Model extends Schema.Class("ConfigV2.Model")({ family: ModelV2.Family.pipe(Schema.optional), name: Schema.String.pipe(Schema.optional), package: Schema.String.pipe(Schema.optional), - aisdk: Schema.Literal(true).pipe(Schema.optional), ...Overlays, capabilities: ModelV2.Capabilities.pipe(Schema.optional), variants: Schema.Struct({ @@ -56,7 +55,6 @@ export class Info extends Schema.Class("ConfigV2.Provider")({ name: Schema.String.pipe(Schema.optional), env: Schema.String.pipe(Schema.Array, Schema.optional), package: Schema.String.pipe(Schema.optional), - aisdk: Schema.Literal(true).pipe(Schema.optional), ...Overlays, models: Schema.Record(Schema.String, Model).pipe(Schema.optional), }) {} diff --git a/packages/core/src/model.ts b/packages/core/src/model.ts index 2d7c597a44..3f264ecd9f 100644 --- a/packages/core/src/model.ts +++ b/packages/core/src/model.ts @@ -1,6 +1,6 @@ -import { Types } from "effect" import { Model } from "@opencode-ai/schema/model" import { ProviderV2 } from "./provider" +import type { DeepMutable } from "./schema" export const ID = Model.ID export type ID = typeof ID.Type @@ -23,7 +23,7 @@ export type Ref = typeof Ref.Type export const Info = Model.Info export type Info = Model.Info -export type MutableInfo = Types.DeepMutable +export type MutableInfo = DeepMutable export function parse(input: string): { providerID: ProviderV2.ID; modelID: ID } { const [providerID, ...modelID] = input.split("/") diff --git a/packages/core/src/plugin/models-dev.ts b/packages/core/src/plugin/models-dev.ts index ba6e4a869a..ae6a828487 100644 --- a/packages/core/src/plugin/models-dev.ts +++ b/packages/core/src/plugin/models-dev.ts @@ -75,8 +75,7 @@ export const ModelsDevPlugin = define({ const providerID = ProviderV2.ID.make(item.id) catalog.provider.update(providerID, (provider) => { provider.name = item.name - provider.package = item.npm ?? "" - provider.aisdk = item.npm ? true : undefined + provider.package = item.npm ? ProviderV2.aisdk(item.npm) : "" provider.settings = item.api ? { ...provider.settings, baseURL: item.api } : provider.settings }) @@ -85,8 +84,7 @@ export const ModelsDevPlugin = define({ catalog.model.update(providerID, modelID, (draft) => { draft.name = model.name draft.family = model.family ? ModelV2.Family.make(model.family) : undefined - draft.package = model.provider?.npm - draft.aisdk = model.provider?.npm ? true : undefined + draft.package = model.provider?.npm ? ProviderV2.aisdk(model.provider.npm) : undefined draft.settings = model.provider?.api ? { ...draft.settings, baseURL: model.provider.api } : draft.settings draft.capabilities = { tools: model.tool_call, diff --git a/packages/core/src/plugin/provider/amazon-bedrock.ts b/packages/core/src/plugin/provider/amazon-bedrock.ts index 00dc73edb0..f538cc1601 100644 --- a/packages/core/src/plugin/provider/amazon-bedrock.ts +++ b/packages/core/src/plugin/provider/amazon-bedrock.ts @@ -65,8 +65,8 @@ export const AmazonBedrockPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (!item.provider.aisdk) continue - if (item.provider.package !== "@ai-sdk/amazon-bedrock") continue + if (!ProviderV2.isAISDK(item.provider.package)) continue + if (ProviderV2.packageName(item.provider.package) !== "@ai-sdk/amazon-bedrock") continue evt.provider.update(item.provider.id, (provider) => { if (typeof provider.settings?.endpoint !== "string") return // The AI SDK expects a base URL, but users configure Bedrock private/VPC @@ -113,7 +113,10 @@ export const AmazonBedrockPlugin = define({ yield* ctx.aisdk.language( Effect.fn(function* (evt) { if (evt.model.providerID !== ProviderV2.ID.amazonBedrock) return - if (evt.model.aisdk && evt.model.package === "@ai-sdk/amazon-bedrock/mantle") { + if ( + ProviderV2.isAISDK(evt.model.package) && + ProviderV2.packageName(evt.model.package) === "@ai-sdk/amazon-bedrock/mantle" + ) { evt.language = selectMantleModel(evt.sdk, evt.model.modelID ?? evt.model.id) return } diff --git a/packages/core/src/plugin/provider/anthropic.ts b/packages/core/src/plugin/provider/anthropic.ts index c13fbbfdad..13b4d0c78b 100644 --- a/packages/core/src/plugin/provider/anthropic.ts +++ b/packages/core/src/plugin/provider/anthropic.ts @@ -1,5 +1,6 @@ import { Effect } from "effect" import { define } from "../internal" +import { ProviderV2 } from "../../provider" export const AnthropicPlugin = define({ id: "anthropic", @@ -7,8 +8,8 @@ export const AnthropicPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (!item.provider.aisdk) continue - if (item.provider.package !== "@ai-sdk/anthropic") continue + if (!ProviderV2.isAISDK(item.provider.package)) continue + if (ProviderV2.packageName(item.provider.package) !== "@ai-sdk/anthropic") continue evt.provider.update(item.provider.id, (provider) => { provider.headers = { ...provider.headers, diff --git a/packages/core/src/plugin/provider/azure.ts b/packages/core/src/plugin/provider/azure.ts index b1e5754606..a97713d59d 100644 --- a/packages/core/src/plugin/provider/azure.ts +++ b/packages/core/src/plugin/provider/azure.ts @@ -16,8 +16,8 @@ export const AzurePlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (!item.provider.aisdk) continue - if (item.provider.package !== "@ai-sdk/azure") continue + if (!ProviderV2.isAISDK(item.provider.package)) continue + if (ProviderV2.packageName(item.provider.package) !== "@ai-sdk/azure") continue const configured = item.provider.settings?.resourceName const resourceName = typeof configured === "string" && configured.trim() !== "" ? configured : process.env.AZURE_RESOURCE_NAME @@ -35,7 +35,7 @@ export const AzurePlugin = define({ if ( !evt.options.resourceName && !evt.options.baseURL && - (!evt.model.aisdk || typeof evt.model.settings?.baseURL !== "string") + (!ProviderV2.isAISDK(evt.model.package) || typeof evt.model.settings?.baseURL !== "string") ) { throw new Error( "AZURE_RESOURCE_NAME is missing, set it using env var or reconnecting the azure provider and setting it", @@ -67,8 +67,8 @@ export const AzureCognitiveServicesPlugin = define({ const resourceName = process.env.AZURE_COGNITIVE_SERVICES_RESOURCE_NAME if (!resourceName) return for (const item of evt.provider.list()) { - if (!item.provider.aisdk) continue - if (item.provider.package !== "@ai-sdk/openai-compatible") continue + if (!ProviderV2.isAISDK(item.provider.package)) continue + if (ProviderV2.packageName(item.provider.package) !== "@ai-sdk/openai-compatible") continue if (!item.provider.id.includes("azure-cognitive-services")) continue evt.provider.update(item.provider.id, (provider) => { provider.settings = { diff --git a/packages/core/src/plugin/provider/cerebras.ts b/packages/core/src/plugin/provider/cerebras.ts index cb15cb9312..c0829c1c66 100644 --- a/packages/core/src/plugin/provider/cerebras.ts +++ b/packages/core/src/plugin/provider/cerebras.ts @@ -1,5 +1,6 @@ import { Effect } from "effect" import { define } from "../internal" +import { ProviderV2 } from "../../provider" export const CerebrasPlugin = define({ id: "cerebras", @@ -7,8 +8,8 @@ export const CerebrasPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (!item.provider.aisdk) continue - if (item.provider.package !== "@ai-sdk/cerebras") continue + if (!ProviderV2.isAISDK(item.provider.package)) continue + if (ProviderV2.packageName(item.provider.package) !== "@ai-sdk/cerebras") continue evt.provider.update(item.provider.id, (provider) => { provider.headers = { ...provider.headers, "X-Cerebras-3rd-Party-Integration": "opencode" } }) diff --git a/packages/core/src/plugin/provider/cloudflare-workers-ai.ts b/packages/core/src/plugin/provider/cloudflare-workers-ai.ts index 0ed7b0dffa..08a988b198 100644 --- a/packages/core/src/plugin/provider/cloudflare-workers-ai.ts +++ b/packages/core/src/plugin/provider/cloudflare-workers-ai.ts @@ -14,7 +14,7 @@ export const CloudflareWorkersAIPlugin = define({ const item = evt.provider.get(providerID) if (!item) return evt.provider.update(item.provider.id, (provider) => { - if (!provider.aisdk) return + if (!ProviderV2.isAISDK(provider.package)) return if (typeof provider.settings?.baseURL === "string") return const accountId = resolveAccountId(provider.settings ?? {}) if (accountId) provider.settings = { ...provider.settings, baseURL: workersEndpoint(accountId) } @@ -54,8 +54,11 @@ function workersEndpoint(accountId: string) { return `https://api.cloudflare.com/client/v4/accounts/${accountId}/ai/v1` } -function hasWorkersEndpoint(model: { readonly aisdk?: true; readonly settings?: Readonly> }) { - return model.aisdk && typeof model.settings?.baseURL === "string" +function hasWorkersEndpoint(model: { + readonly package?: string + readonly settings?: Readonly> +}) { + return ProviderV2.isAISDK(model.package) && typeof model.settings?.baseURL === "string" } function sdkOptions(options: Record) { diff --git a/packages/core/src/plugin/provider/google-vertex.ts b/packages/core/src/plugin/provider/google-vertex.ts index fa7afc98bf..202c9ead20 100644 --- a/packages/core/src/plugin/provider/google-vertex.ts +++ b/packages/core/src/plugin/provider/google-vertex.ts @@ -60,12 +60,12 @@ export const GoogleVertexPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (!item.provider.aisdk) continue + if (!ProviderV2.isAISDK(item.provider.package)) continue if ( - item.provider.package !== "@ai-sdk/google-vertex" && + ProviderV2.packageName(item.provider.package) !== "@ai-sdk/google-vertex" && !( item.provider.id === ProviderV2.ID.googleVertex && - item.provider.package.includes("@ai-sdk/openai-compatible") + ProviderV2.packageName(item.provider.package)?.includes("@ai-sdk/openai-compatible") ) ) continue @@ -79,7 +79,7 @@ export const GoogleVertexPlugin = define({ ...(typeof provider.settings?.baseURL === "string" ? { baseURL: replaceVertexVars(provider.settings.baseURL, project, location) } : {}), - ...(provider.package.includes("@ai-sdk/openai-compatible") + ...(ProviderV2.packageName(provider.package)?.includes("@ai-sdk/openai-compatible") ? { fetch: authFetch(provider.settings?.fetch) } : {}), } @@ -121,8 +121,8 @@ export const GoogleVertexAnthropicPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (!item.provider.aisdk) continue - if (item.provider.package !== "@ai-sdk/google-vertex/anthropic") continue + if (!ProviderV2.isAISDK(item.provider.package)) continue + if (ProviderV2.packageName(item.provider.package) !== "@ai-sdk/google-vertex/anthropic") continue const project = item.provider.settings?.project ?? process.env.GOOGLE_CLOUD_PROJECT ?? diff --git a/packages/core/src/plugin/provider/kilo.ts b/packages/core/src/plugin/provider/kilo.ts index 9cfd5b2791..e3436cbea0 100644 --- a/packages/core/src/plugin/provider/kilo.ts +++ b/packages/core/src/plugin/provider/kilo.ts @@ -1,5 +1,6 @@ import { Effect } from "effect" import { define } from "../internal" +import { ProviderV2 } from "../../provider" export const KiloPlugin = define({ id: "kilo", @@ -7,8 +8,8 @@ export const KiloPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (!item.provider.aisdk) continue - if (item.provider.package !== "@ai-sdk/openai-compatible") continue + if (!ProviderV2.isAISDK(item.provider.package)) continue + if (ProviderV2.packageName(item.provider.package) !== "@ai-sdk/openai-compatible") continue if (item.provider.settings?.baseURL !== "https://api.kilo.ai/api/gateway") continue evt.provider.update(item.provider.id, (provider) => { provider.headers = { ...provider.headers, "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode" } diff --git a/packages/core/src/plugin/provider/llmgateway.ts b/packages/core/src/plugin/provider/llmgateway.ts index 73ee23b876..82cc67727a 100644 --- a/packages/core/src/plugin/provider/llmgateway.ts +++ b/packages/core/src/plugin/provider/llmgateway.ts @@ -1,6 +1,7 @@ import { Effect } from "effect" import { define } from "../internal" import { Integration } from "../../integration" +import { ProviderV2 } from "../../provider" export const LLMGatewayPlugin = define({ id: "llmgateway", @@ -10,8 +11,8 @@ export const LLMGatewayPlugin = define({ Effect.fn(function* (evt) { for (const item of evt.provider.list()) { if (item.provider.disabled) continue - if (!item.provider.aisdk) continue - if (item.provider.package !== "@ai-sdk/openai-compatible") continue + if (!ProviderV2.isAISDK(item.provider.package)) continue + if (ProviderV2.packageName(item.provider.package) !== "@ai-sdk/openai-compatible") continue if (item.provider.settings?.baseURL !== "https://api.llmgateway.io/v1") continue if (!(yield* integrations.get(Integration.ID.make(item.provider.id)))) continue evt.provider.update(item.provider.id, (provider) => { diff --git a/packages/core/src/plugin/provider/nvidia.ts b/packages/core/src/plugin/provider/nvidia.ts index 5a80180aa6..dbab4edbda 100644 --- a/packages/core/src/plugin/provider/nvidia.ts +++ b/packages/core/src/plugin/provider/nvidia.ts @@ -1,5 +1,6 @@ import { Effect } from "effect" import { define } from "../internal" +import { ProviderV2 } from "../../provider" export const NvidiaPlugin = define({ id: "nvidia", @@ -7,8 +8,8 @@ export const NvidiaPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (!item.provider.aisdk) continue - if (item.provider.package !== "@ai-sdk/openai-compatible") continue + if (!ProviderV2.isAISDK(item.provider.package)) continue + if (ProviderV2.packageName(item.provider.package) !== "@ai-sdk/openai-compatible") continue if (item.provider.settings?.baseURL !== "https://integrate.api.nvidia.com/v1") continue evt.provider.update(item.provider.id, (provider) => { provider.headers = { diff --git a/packages/core/src/plugin/provider/openai.ts b/packages/core/src/plugin/provider/openai.ts index dda85b4688..6119b259da 100644 --- a/packages/core/src/plugin/provider/openai.ts +++ b/packages/core/src/plugin/provider/openai.ts @@ -156,8 +156,8 @@ export const OpenAIPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (!item.provider.aisdk) continue - if (item.provider.package !== "@ai-sdk/openai") continue + if (!ProviderV2.isAISDK(item.provider.package)) continue + if (ProviderV2.packageName(item.provider.package) !== "@ai-sdk/openai") continue if (!item.models.has(ModelV2.ID.make("gpt-5-chat-latest"))) continue evt.model.update(item.provider.id, ModelV2.ID.make("gpt-5-chat-latest"), (model) => { // OpenAIPlugin sends OpenAI models through Responses; this alias is a diff --git a/packages/core/src/plugin/provider/opencode.ts b/packages/core/src/plugin/provider/opencode.ts index 29e1eb704a..47d3d09648 100644 --- a/packages/core/src/plugin/provider/opencode.ts +++ b/packages/core/src/plugin/provider/opencode.ts @@ -111,8 +111,7 @@ export const OpencodePlugin = define { provider.integrationID = Integration.ID.make("opencode") if (item.name !== undefined) provider.name = item.name - provider.package = item.npm ?? "" - provider.aisdk = item.npm ? true : undefined + provider.package = item.npm ? ProviderV2.aisdk(item.npm) : "" provider.settings = { ...provider.settings, ...withoutCredentials(item.options), @@ -132,8 +131,7 @@ export const OpencodePlugin = define { provider.headers = { ...provider.headers, "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode" } }) diff --git a/packages/core/src/plugin/provider/vercel.ts b/packages/core/src/plugin/provider/vercel.ts index da67661abe..fba7898658 100644 --- a/packages/core/src/plugin/provider/vercel.ts +++ b/packages/core/src/plugin/provider/vercel.ts @@ -1,5 +1,6 @@ import { Effect } from "effect" import { define } from "../internal" +import { ProviderV2 } from "../../provider" export const VercelPlugin = define({ id: "vercel", @@ -7,8 +8,8 @@ export const VercelPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (!item.provider.aisdk) continue - if (item.provider.package !== "@ai-sdk/vercel") continue + if (!ProviderV2.isAISDK(item.provider.package)) continue + if (ProviderV2.packageName(item.provider.package) !== "@ai-sdk/vercel") continue evt.provider.update(item.provider.id, (provider) => { provider.headers = { ...provider.headers, "http-referer": "https://opencode.ai/", "x-title": "opencode" } }) diff --git a/packages/core/src/plugin/provider/zenmux.ts b/packages/core/src/plugin/provider/zenmux.ts index a37d7f0678..757d4babbe 100644 --- a/packages/core/src/plugin/provider/zenmux.ts +++ b/packages/core/src/plugin/provider/zenmux.ts @@ -1,5 +1,6 @@ import { Effect } from "effect" import { define } from "../internal" +import { ProviderV2 } from "../../provider" export const ZenmuxPlugin = define({ id: "zenmux", @@ -7,8 +8,8 @@ export const ZenmuxPlugin = define({ yield* ctx.catalog.transform( Effect.fn(function* (evt) { for (const item of evt.provider.list()) { - if (!item.provider.aisdk) continue - if (item.provider.package !== "@ai-sdk/openai-compatible") continue + if (!ProviderV2.isAISDK(item.provider.package)) continue + if (ProviderV2.packageName(item.provider.package) !== "@ai-sdk/openai-compatible") continue if (item.provider.settings?.baseURL !== "https://zenmux.ai/api/v1") continue evt.provider.update(item.provider.id, (provider) => { provider.headers = { diff --git a/packages/core/src/plugin/variant.ts b/packages/core/src/plugin/variant.ts index ccdbd5a15c..41d1bfd106 100644 --- a/packages/core/src/plugin/variant.ts +++ b/packages/core/src/plugin/variant.ts @@ -2,6 +2,7 @@ export * as VariantPlugin from "./variant" import { Effect } from "effect" import { ModelV2 } from "../model" +import { ProviderV2 } from "../provider" import { define } from "./internal" export const Plugin = define({ @@ -29,9 +30,10 @@ export const Plugin = define({ export function generate( model: ModelV2.Info, - provider?: { readonly package: string; readonly aisdk?: true }, + provider?: { readonly package: string }, ): NonNullable { - if (!(model.aisdk ?? provider?.aisdk) || (model.package ?? provider?.package) !== "@ai-sdk/openai-compatible") return [] + const packageName = model.package ?? provider?.package + if (!ProviderV2.isAISDK(packageName) || ProviderV2.packageName(packageName) !== "@ai-sdk/openai-compatible") return [] const ids = `${model.id} ${model.modelID ?? ""}`.toLowerCase() if (!["glm-5.2", "glm-5-2", "glm-5p2"].some((name) => ids.includes(name))) return [] return ["high", "max"].map((id) => ({ diff --git a/packages/core/src/provider-overlay.ts b/packages/core/src/provider-overlay.ts new file mode 100644 index 0000000000..f5f7aca8e8 --- /dev/null +++ b/packages/core/src/provider-overlay.ts @@ -0,0 +1,38 @@ +export * as ProviderOverlay from "./provider-overlay" + +export function merge( + base: Readonly> | undefined, + overlay: Readonly> | undefined, +): Record | undefined { + if (base === undefined) return overlay && { ...overlay } + if (overlay === undefined) return { ...base } + return Object.fromEntries( + new Set([...Object.keys(base), ...Object.keys(overlay)]).values().map((key) => { + const left = base[key] + const right = overlay[key] + if (right === undefined) return [key, left] + if (plain(left) && plain(right)) return [key, merge(left, right)] + return [key, right] + }), + ) +} + +export function headers( + base: Readonly> | undefined, + overlay: Readonly> | undefined, +) { + return Object.fromEntries( + [...Object.entries(base ?? {}), ...Object.entries(overlay ?? {})] + .reduce((result, entry) => { + result.set(entry[0].toLowerCase(), entry) + return result + }, new Map()) + .values(), + ) +} + +function plain(input: unknown): input is Readonly> { + if (typeof input !== "object" || input === null || Array.isArray(input)) return false + const prototype = Object.getPrototypeOf(input) + return prototype === Object.prototype || prototype === null +} diff --git a/packages/core/src/provider-package.ts b/packages/core/src/provider-package.ts new file mode 100644 index 0000000000..559caf0d0f --- /dev/null +++ b/packages/core/src/provider-package.ts @@ -0,0 +1,75 @@ +export * as ProviderPackage from "./provider-package" + +import { Effect, Option, Schema } from "effect" +import { pathToFileURL } from "url" +import type { Model, ProviderPackageDefinition, ProviderPackageSettings } from "@opencode-ai/llm" +import { Npm } from "./npm" + +const cache = new Map>() + +export class LoadError extends Schema.TaggedErrorClass()("ProviderPackage.LoadError", { + package: Schema.String, + cause: Schema.Defect(), +}) {} + +export const load = Effect.fn("ProviderPackage.load")(function* (specifier: string) { + const npm = Option.getOrUndefined(yield* Effect.serviceOption(Npm.Service)) + const resolved = + specifier.startsWith("file://") || specifier.startsWith("@opencode-ai/llm/") + ? specifier + : yield* Effect.sync(() => { + try { + return import.meta.resolve(specifier) + } catch { + return undefined + } + }) + if (resolved) return yield* importProviderPackage(specifier, resolved) + if (!npm) { + return yield* new LoadError({ + package: specifier, + cause: new Error(`Provider package ${specifier} is not installed`), + }) + } + const installed = yield* npm + .add(packageName(specifier)) + .pipe(Effect.mapError((cause) => new LoadError({ package: specifier, cause }))) + const entrypoint = yield* Effect.try({ + try: () => import.meta.resolve(specifier, pathToFileURL(`${installed.directory}/`).href), + catch: (cause) => new LoadError({ package: specifier, cause }), + }) + return yield* importProviderPackage(specifier, entrypoint) +}) + +const importProviderPackage = Effect.fn("ProviderPackage.import")(function* (specifier: string, entrypoint: string) { + const module = yield* Effect.tryPromise({ + try: () => { + const existing = cache.get(entrypoint) + if (existing) return existing + const loaded = import(entrypoint) + cache.set(entrypoint, loaded) + return loaded + }, + catch: (cause) => new LoadError({ package: specifier, cause }), + }) + if (!isProviderPackage(module)) { + return yield* new LoadError({ + package: specifier, + cause: new Error(`Provider package ${specifier} does not export model(id, settings)`), + }) + } + return module +}) + +export const make = (module: ProviderPackageDefinition, modelID: string, settings: ProviderPackageSettings): Model => + module.model(modelID, settings) + +function isProviderPackage(input: unknown): input is ProviderPackageDefinition { + return typeof input === "object" && input !== null && "model" in input && typeof input.model === "function" +} + +function packageName(specifier: string) { + const parts = specifier.split("/") + if (specifier.startsWith("@")) return parts.slice(0, 2).join("/") + return parts[0] +} diff --git a/packages/core/src/provider.ts b/packages/core/src/provider.ts index 576abd3df1..3246c8d36e 100644 --- a/packages/core/src/provider.ts +++ b/packages/core/src/provider.ts @@ -1,15 +1,21 @@ export * as ProviderV2 from "./provider" -import { Types } from "effect" import { Provider } from "@opencode-ai/schema/provider" +import type { DeepMutable } from "./schema" export const ID = Provider.ID export type ID = typeof ID.Type +export const AISDK_PREFIX = "aisdk:" +export const isAISDK = (packageName: string | undefined) => packageName?.startsWith(AISDK_PREFIX) ?? false +export const aisdk = (packageName: string) => (isAISDK(packageName) ? packageName : `${AISDK_PREFIX}${packageName}`) +export const packageName = (packageName: string | undefined) => + isAISDK(packageName) ? packageName!.slice(AISDK_PREFIX.length) : packageName + export const Request = Provider.Request export type Request = Provider.Request export const Info = Provider.Info export type Info = Provider.Info -export type MutableInfo = Types.DeepMutable +export type MutableInfo = DeepMutable diff --git a/packages/core/src/session/runner/model.ts b/packages/core/src/session/runner/model.ts index f8cc794a86..464bab36a6 100644 --- a/packages/core/src/session/runner/model.ts +++ b/packages/core/src/session/runner/model.ts @@ -12,6 +12,8 @@ import { Credential } from "../../credential" import { Integration } from "../../integration" import { ModelV2 } from "../../model" import { ProviderV2 } from "../../provider" +import { ProviderPackage } from "../../provider-package" +import { ProviderOverlay } from "../../provider-overlay" import { SessionSchema } from "../schema" export class ModelNotSelectedError extends Schema.TaggedErrorClass()( @@ -117,9 +119,9 @@ const withVariant = ( return Effect.succeed( variant ? produce(model, (draft) => { - draft.settings = merge(draft.settings, variant.settings) - draft.headers = { ...draft.headers, ...variant.headers } - draft.body = merge(draft.body, variant.body) + draft.settings = ProviderOverlay.merge(draft.settings, variant.settings) + draft.headers = ProviderOverlay.headers(draft.headers, variant.headers) + draft.body = ProviderOverlay.merge(draft.body, variant.body) }) : model, ) @@ -133,17 +135,18 @@ export const fromCatalogModel = ( credential?.metadata === undefined ? model : produce(model, (draft) => { - draft.settings = { ...draft.settings, ...credential.metadata } + draft.settings = ProviderOverlay.merge(draft.settings, credential.metadata) }) const key = apiKey(resolved, credential) - if (resolved.aisdk && resolved.package === "@ai-sdk/openai") { + const packageName = ProviderV2.packageName(resolved.package) + if (ProviderV2.isAISDK(resolved.package) && packageName === "@ai-sdk/openai") { return Effect.succeed( withDefaults(resolved, OpenAIResponses.route) .with({ auth: key === undefined ? Auth.none : Auth.bearer(key) }) .model({ id: resolved.modelID ?? resolved.id }), ) } - if (resolved.aisdk && resolved.package === "@ai-sdk/anthropic") { + if (ProviderV2.isAISDK(resolved.package) && packageName === "@ai-sdk/anthropic") { return Effect.succeed( withDefaults(resolved, AnthropicMessages.route) .with({ auth: key === undefined ? Auth.none : Auth.header("x-api-key", key) }) @@ -151,8 +154,8 @@ export const fromCatalogModel = ( ) } if ( - resolved.aisdk && - resolved.package === "@ai-sdk/openai-compatible" && + ProviderV2.isAISDK(resolved.package) && + packageName === "@ai-sdk/openai-compatible" && typeof resolved.settings?.baseURL === "string" ) { return Effect.succeed( @@ -161,11 +164,44 @@ export const fromCatalogModel = ( .model({ id: resolved.modelID ?? resolved.id }), ) } + if (!ProviderV2.isAISDK(resolved.package) && resolved.package) { + const specifier = resolved.package + return Effect.gen(function* () { + const module = yield* ProviderPackage.load(specifier).pipe( + Effect.mapError( + () => + new UnsupportedPackageError({ + providerID: resolved.providerID, + modelID: resolved.id, + package: specifier, + }), + ), + ) + const settings = { + ...resolved.settings, + ...(credential?.type === "key" ? { apiKey: credential.key } : {}), + ...(credential?.type === "oauth" ? { apiKey: credential.access } : {}), + ...credential?.metadata, + headers: resolved.headers, + body: resolved.body, + limits: { context: resolved.limit.context, output: resolved.limit.output }, + } + return yield* Effect.try({ + try: () => ProviderPackage.make(module, resolved.modelID ?? resolved.id, settings), + catch: () => + new UnsupportedPackageError({ + providerID: resolved.providerID, + modelID: resolved.id, + package: specifier, + }), + }) + }) + } return Effect.fail( new UnsupportedPackageError({ providerID: resolved.providerID, modelID: resolved.id, - package: resolved.aisdk ? `aisdk:${resolved.package}` : (resolved.package ?? "unknown"), + package: resolved.package ?? "unknown", }), ) } @@ -174,10 +210,12 @@ export const resolve = (session: SessionSchema.Info, model: ModelV2.Info, creden withVariant(model, session.model?.variant).pipe(Effect.flatMap((model) => fromCatalogModel(model, credential))) export const supported = (model: ModelV2.Info) => - model.aisdk === true && - (model.package === "@ai-sdk/openai" || - model.package === "@ai-sdk/anthropic" || - (model.package === "@ai-sdk/openai-compatible" && typeof model.settings?.baseURL === "string")) + Boolean(model.package) && + (!ProviderV2.isAISDK(model.package) || + ProviderV2.packageName(model.package) === "@ai-sdk/openai" || + ProviderV2.packageName(model.package) === "@ai-sdk/anthropic" || + (ProviderV2.packageName(model.package) === "@ai-sdk/openai-compatible" && + typeof model.settings?.baseURL === "string")) /** Resolves models from the catalog belonging to the current Location runtime. */ export const locationLayer = Layer.effect( @@ -215,26 +253,3 @@ export const locationLayer = Layer.effect( }) }), ) - -function merge( - base: Readonly> | undefined, - overlay: Readonly> | undefined, -): Record | undefined { - if (base === undefined) return overlay && { ...overlay } - if (overlay === undefined) return { ...base } - return Object.fromEntries( - Array.from(new Set([...Object.keys(base), ...Object.keys(overlay)])).map((key) => { - const left = base[key] - const right = overlay[key] - if (right === undefined) return [key, left] - if (plain(left) && plain(right)) return [key, merge(left, right)] - return [key, right] - }), - ) -} - -function plain(input: unknown): input is Readonly> { - if (typeof input !== "object" || input === null || Array.isArray(input)) return false - const prototype = Object.getPrototypeOf(input) - return prototype === Object.prototype || prototype === null -} diff --git a/packages/core/src/v1/config/migrate.ts b/packages/core/src/v1/config/migrate.ts index f0fcd1402f..7489878c6e 100644 --- a/packages/core/src/v1/config/migrate.ts +++ b/packages/core/src/v1/config/migrate.ts @@ -6,6 +6,7 @@ import { ConfigMCPV1 } from "./mcp" import { ConfigPermissionV1 } from "./permission" import { ConfigProviderV1 } from "./provider" import { ConfigProviderOptionsV1 } from "./provider-options" +import { ProviderV2 } from "../../provider" const keys = new Set([ "logLevel", @@ -173,8 +174,7 @@ function migrateProvider(info: ConfigProviderV1.Info) { return { name: info.name, env: info.env, - package: info.npm, - aisdk: info.npm ? (true as const) : undefined, + package: info.npm ? ProviderV2.aisdk(info.npm) : undefined, settings: info.api ? { ...options.settings, baseURL: info.api } : options.settings, headers: info.options && options.headers, body: info.options && options.body, @@ -213,8 +213,7 @@ function migrateModel(info: typeof ConfigProviderV1.Model.Type, packageName?: st modelID: info.id, family: info.family, name: info.name, - package: info.provider?.npm, - aisdk: info.provider?.npm ? (true as const) : undefined, + package: info.provider?.npm ? ProviderV2.aisdk(info.provider.npm) : undefined, settings: info.provider?.api ? { ...settings, baseURL: info.provider.api } : settings, capabilities, headers: info.headers, diff --git a/packages/core/test/catalog.test.ts b/packages/core/test/catalog.test.ts index ec5cc3010a..2c30342a2f 100644 --- a/packages/core/test/catalog.test.ts +++ b/packages/core/test/catalog.test.ts @@ -141,15 +141,13 @@ describe("CatalogV2", () => { const providerID = ProviderV2.ID.make("test") yield* catalog.transform((catalog) => catalog.provider.update(providerID, (provider) => { - provider.package = "@ai-sdk/openai-compatible" - provider.aisdk = true + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { baseURL: "https://override.example.com" } }), ) expect(required(yield* catalog.provider.get(providerID))).toMatchObject({ - package: "@ai-sdk/openai-compatible", - aisdk: true, + package: "aisdk:@ai-sdk/openai-compatible", settings: { baseURL: "https://override.example.com" }, }) }), @@ -162,8 +160,7 @@ describe("CatalogV2", () => { const modelID = ModelV2.ID.make("model") yield* catalog.transform((catalog) => { catalog.provider.update(providerID, (provider) => { - provider.package = "@ai-sdk/openai-compatible" - provider.aisdk = true + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { baseURL: "https://provider.example.com" } }) catalog.model.update(providerID, modelID, (model) => { @@ -175,8 +172,7 @@ describe("CatalogV2", () => { expect(required(yield* catalog.model.get(providerID, modelID))).toMatchObject({ id: modelID, modelID: ModelV2.ID.make("upstream-model"), - package: "@ai-sdk/openai-compatible", - aisdk: true, + package: "aisdk:@ai-sdk/openai-compatible", settings: { baseURL: "https://override.example.com" }, }) }), @@ -189,8 +185,7 @@ describe("CatalogV2", () => { const modelID = ModelV2.ID.make("model") yield* catalog.transform((catalog) => { catalog.provider.update(providerID, (provider) => { - provider.package = "@ai-sdk/openai-compatible" - provider.aisdk = true + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { baseURL: "https://provider.example.com" } }) catalog.model.update(providerID, modelID, () => {}) @@ -198,8 +193,7 @@ describe("CatalogV2", () => { expect(required(yield* catalog.model.get(providerID, modelID))).toMatchObject({ id: modelID, - package: "@ai-sdk/openai-compatible", - aisdk: true, + package: "aisdk:@ai-sdk/openai-compatible", settings: { baseURL: "https://provider.example.com" }, }) }), @@ -212,18 +206,36 @@ describe("CatalogV2", () => { const modelID = ModelV2.ID.make("model") yield* catalog.transform((catalog) => { catalog.provider.update(providerID, (provider) => { - provider.headers = { provider: "provider", shared: "provider" } - provider.body = { provider: true } + provider.headers = { provider: "provider", "X-Shared": "provider" } + provider.body = { + provider: true, + reasoning: { type: "enabled", budget: 8_000 }, + stop: ["END"], + disabled: { type: "enabled" }, + } }) catalog.model.update(providerID, modelID, (model) => { - model.headers = { model: "model", shared: "model" } - model.body = { model: true, request: true, shared: "model" } + model.headers = { model: "model", "x-shared": "model" } + model.body = { + model: true, + request: true, + reasoning: { budget: 32_000 }, + stop: ["STOP"], + disabled: null, + } }) }) const model = required(yield* catalog.model.get(providerID, modelID)) - expect(model.headers).toEqual({ provider: "provider", shared: "model", model: "model" }) - expect(model.body).toEqual({ provider: true, model: true, request: true, shared: "model" }) + expect(model.headers).toEqual({ provider: "provider", "x-shared": "model", model: "model" }) + expect(model.body).toEqual({ + provider: true, + model: true, + request: true, + reasoning: { type: "enabled", budget: 32_000 }, + stop: ["STOP"], + disabled: null, + }) }), ) diff --git a/packages/core/test/config/config.test.ts b/packages/core/test/config/config.test.ts index d74ea49c79..12fc4d408f 100644 --- a/packages/core/test/config/config.test.ts +++ b/packages/core/test/config/config.test.ts @@ -101,8 +101,7 @@ describe("Config", () => { }) expect(migrated.providers?.bedrock).toMatchObject({ - package: "@ai-sdk/amazon-bedrock", - aisdk: true, + package: "aisdk:@ai-sdk/amazon-bedrock", settings: { baseURL: "https://bedrock.example.com", region: "us-east-1", profile: "dev" }, headers: { "x-test": "1" }, body: { trace: true }, @@ -588,8 +587,7 @@ describe("Config", () => { }, }) expect(documents[0]?.info.providers?.openai).toMatchObject({ - package: "@ai-sdk/openai", - aisdk: true, + package: "aisdk:@ai-sdk/openai", settings: { apiKey: "secret", organization: "org" }, models: { model: { diff --git a/packages/core/test/config/provider.test.ts b/packages/core/test/config/provider.test.ts index 9ca8b8ca1e..d1d27dc6e9 100644 --- a/packages/core/test/config/provider.test.ts +++ b/packages/core/test/config/provider.test.ts @@ -61,8 +61,7 @@ describe("ConfigProviderPlugin.Plugin", () => { info: decode({ providers: { opencode: { - package: "@ai-sdk/openai", - aisdk: true, + package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://opencode.test/v1" }, models: { "alpha-gpt-next": { @@ -114,8 +113,7 @@ describe("ConfigProviderPlugin.Plugin", () => { info: decode({ providers: { opencode: { - package: "@ai-sdk/openai", - aisdk: true, + package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://opencode.test/v1" }, }, }, @@ -195,8 +193,7 @@ describe("ConfigProviderPlugin.Plugin", () => { model: "custom/default", providers: { custom: { - package: "custom-sdk", - aisdk: true, + package: "aisdk:custom-sdk", settings: { baseURL: "https://example.test" }, headers: { last: "last", shared: "last" }, models: { @@ -247,8 +244,7 @@ describe("ConfigProviderPlugin.Plugin", () => { }) expect((yield* integrations.get(Integration.ID.make("custom")))?.name).toBe("Renamed") expect(provider.disabled).toBeUndefined() - expect(provider.package).toBe("custom-sdk") - expect(provider.aisdk).toBe(true) + expect(provider.package).toBe("aisdk:custom-sdk") expect(provider.settings).toEqual({ baseURL: "https://example.test" }) expect(provider.headers).toEqual({ first: "first", shared: "last", last: "last" }) expect(model.id).toBe(modelID) diff --git a/packages/core/test/plugin/provider-alibaba.test.ts b/packages/core/test/plugin/provider-alibaba.test.ts index 3bf2e0b325..bb7f922e52 100644 --- a/packages/core/test/plugin/provider-alibaba.test.ts +++ b/packages/core/test/plugin/provider-alibaba.test.ts @@ -29,8 +29,7 @@ describe("AlibabaPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("alibaba"), ModelV2.ID.make("qwen")), modelID: ModelV2.ID.make("qwen"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/alibaba", options: { name: "alibaba" }, @@ -48,8 +47,7 @@ describe("AlibabaPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("alibaba"), ModelV2.ID.make("qwen")), modelID: ModelV2.ID.make("qwen"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "alibaba" }, @@ -67,8 +65,7 @@ describe("AlibabaPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-alibaba"), ModelV2.ID.make("qwen")), modelID: ModelV2.ID.make("qwen"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/alibaba", options: { name: "custom-alibaba", apiKey: "test" }, @@ -88,8 +85,7 @@ describe("AlibabaPlugin", () => { const item = ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("alibaba"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("qwen-plus"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }) const result = yield* aisdk.runSDK({ model: item, package: "@ai-sdk/alibaba", options: {} }) const language = result.sdk?.languageModel(item.modelID ?? item.id) diff --git a/packages/core/test/plugin/provider-amazon-bedrock.test.ts b/packages/core/test/plugin/provider-amazon-bedrock.test.ts index 42e9fc10ec..da47e55e90 100644 --- a/packages/core/test/plugin/provider-amazon-bedrock.test.ts +++ b/packages/core/test/plugin/provider-amazon-bedrock.test.ts @@ -85,13 +85,12 @@ describe("AmazonBedrockPlugin", () => { yield* catalog.transform((catalog) => { const bedrock = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.amazonBedrock), - aisdk: true, - package: "@ai-sdk/amazon-bedrock", + package: "aisdk:@ai-sdk/amazon-bedrock", headers: {}, settings: { endpoint: "https://bedrock.example" }, }) catalog.provider.update(bedrock.id, (item) => { - item.aisdk = bedrock.aisdk + item.package = bedrock.package item.package = bedrock.package item.headers = bedrock.headers item.settings = { endpoint: "https://bedrock.example" } @@ -100,8 +99,7 @@ describe("AmazonBedrockPlugin", () => { yield* addPlugin() const result = required(yield* catalog.provider.get(ProviderV2.ID.amazonBedrock)) expect(result).toMatchObject({ - aisdk: true, - package: "@ai-sdk/amazon-bedrock", + package: "aisdk:@ai-sdk/amazon-bedrock", settings: { baseURL: "https://bedrock.example" }, }) expect(result.settings?.endpoint).toBeUndefined() @@ -118,8 +116,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { @@ -145,8 +142,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { @@ -181,8 +177,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { name: "amazon-bedrock" }, @@ -203,8 +198,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { name: "amazon-bedrock", region: "eu-west-1" }, @@ -224,8 +218,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { name: "amazon-bedrock" }, @@ -245,8 +238,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { name: "amazon-bedrock" }, @@ -267,8 +259,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { @@ -298,8 +289,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { @@ -328,8 +318,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("openai.gpt-5.5")), modelID: ModelV2.ID.make("openai.gpt-5.5"), - aisdk: true, - package: "@ai-sdk/amazon-bedrock/mantle", + package: "aisdk:@ai-sdk/amazon-bedrock/mantle", }), package: "@ai-sdk/amazon-bedrock/mantle", options: { @@ -357,8 +346,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("openai.gpt-5.5")), modelID: ModelV2.ID.make("openai.gpt-5.5"), - aisdk: true, - package: "@ai-sdk/amazon-bedrock/mantle", + package: "aisdk:@ai-sdk/amazon-bedrock/mantle", }), sdk: fakeSelectorSdk(calls), options: { baseURL: "https://bedrock-mantle.us-east-2.api.aws/openai/v1", region: "us-east-2" }, @@ -367,8 +355,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("openai.gpt-oss-safeguard-120b")), modelID: ModelV2.ID.make("openai.gpt-oss-safeguard-120b"), - aisdk: true, - package: "@ai-sdk/amazon-bedrock/mantle", + package: "aisdk:@ai-sdk/amazon-bedrock/mantle", }), sdk: fakeSelectorSdk(calls), options: { region: "us-east-1" }, @@ -386,8 +373,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "@ai-sdk/amazon-bedrock/anthropic", + package: "aisdk:@ai-sdk/amazon-bedrock/anthropic", }), package: "@ai-sdk/amazon-bedrock/anthropic", options: { name: "amazon-bedrock" }, @@ -415,8 +401,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/amazon-bedrock", options: { @@ -448,8 +433,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: {}, @@ -458,8 +442,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: { region: "eu-west-1" }, @@ -468,8 +451,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("global.anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("global.anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: { region: "eu-west-1" }, @@ -478,8 +460,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: { region: "ap-northeast-1" }, @@ -488,8 +469,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: { region: "ap-southeast-2" }, @@ -515,8 +495,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: {}, @@ -603,8 +582,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make(item.modelID)), modelID: ModelV2.ID.make(item.modelID), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: { region: item.region }, @@ -624,8 +602,7 @@ describe("AmazonBedrockPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("anthropic.claude-sonnet-4-5")), modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: { region: "eu-west-1" }, diff --git a/packages/core/test/plugin/provider-anthropic.test.ts b/packages/core/test/plugin/provider-anthropic.test.ts index 53e68a8098..ab9fdf7007 100644 --- a/packages/core/test/plugin/provider-anthropic.test.ts +++ b/packages/core/test/plugin/provider-anthropic.test.ts @@ -31,13 +31,12 @@ describe("AnthropicPlugin", () => { yield* catalog.transform((catalog) => { const item = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.anthropic), - aisdk: true, - package: "@ai-sdk/anthropic", + package: "aisdk:@ai-sdk/anthropic", headers: { Existing: "1" }, settings: {}, }) catalog.provider.update(item.id, (draft) => { - draft.aisdk = item.aisdk + draft.package = item.package draft.package = item.package draft.headers = item.headers }) @@ -68,8 +67,7 @@ describe("AnthropicPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-anthropic"), ModelV2.ID.make("claude-sonnet-4-5")), modelID: ModelV2.ID.make("claude-sonnet-4-5"), - aisdk: true, - package: "@ai-sdk/anthropic", + package: "aisdk:@ai-sdk/anthropic", }), package: "@ai-sdk/anthropic", options: { name: "custom-anthropic", apiKey: "test" }, @@ -87,8 +85,7 @@ describe("AnthropicPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.anthropic, ModelV2.ID.make("claude-sonnet-4-5")), modelID: ModelV2.ID.make("claude-sonnet-4-5"), - aisdk: true, - package: "@ai-sdk/anthropic", + package: "aisdk:@ai-sdk/anthropic", }), package: "@ai-sdk/anthropic", options: { name: "anthropic", apiKey: "test" }, diff --git a/packages/core/test/plugin/provider-azure-cognitive-services.test.ts b/packages/core/test/plugin/provider-azure-cognitive-services.test.ts index f726f8bf90..f52f013105 100644 --- a/packages/core/test/plugin/provider-azure-cognitive-services.test.ts +++ b/packages/core/test/plugin/provider-azure-cognitive-services.test.ts @@ -66,15 +66,13 @@ describe("AzureCognitiveServicesPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("azure-cognitive-services"), (item) => { - item.aisdk = true - item.package = "@ai-sdk/openai-compatible" + item.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") }) }) yield* addPlugin() const result = required(yield* catalog.provider.get(ProviderV2.ID.make("azure-cognitive-services"))) expect(result).toMatchObject({ - aisdk: true, - package: "@ai-sdk/openai-compatible", + package: "aisdk:@ai-sdk/openai-compatible", settings: { baseURL: "https://cognitive.cognitiveservices.azure.com/openai" }, }) expect(result.settings?.resourceName).toBeUndefined() @@ -89,20 +87,18 @@ describe("AzureCognitiveServicesPlugin", () => { yield* catalog.transform((catalog) => { const azure = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services")), - aisdk: true, - package: "@ai-sdk/openai-compatible", + package: "aisdk:@ai-sdk/openai-compatible", }) const openai = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.openai), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }) catalog.provider.update(azure.id, (item) => { - item.aisdk = azure.aisdk + item.package = azure.package item.package = azure.package }) catalog.provider.update(openai.id, (item) => { - item.aisdk = openai.aisdk + item.package = openai.package item.package = openai.package }) }) @@ -110,9 +106,9 @@ describe("AzureCognitiveServicesPlugin", () => { const azure = required(yield* catalog.provider.get(ProviderV2.ID.make("azure-cognitive-services"))) const openai = required(yield* catalog.provider.get(ProviderV2.ID.openai)) expect(azure.settings?.baseURL).toBeUndefined() - expect(azure).toMatchObject({ aisdk: true, package: "@ai-sdk/openai-compatible" }) + expect(azure).toMatchObject({ package: "aisdk:@ai-sdk/openai-compatible" }) expect(openai.settings?.baseURL).toBeUndefined() - expect(openai).toMatchObject({ aisdk: true, package: "test-provider" }) + expect(openai).toMatchObject({ package: "aisdk:test-provider" }) }), ), ) @@ -127,8 +123,7 @@ describe("AzureCognitiveServicesPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("deployment")), modelID: ModelV2.ID.make("deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: { useCompletionUrls: true }, @@ -147,8 +142,7 @@ describe("AzureCognitiveServicesPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("deployment")), modelID: ModelV2.ID.make("deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -157,8 +151,7 @@ describe("AzureCognitiveServicesPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("deployment")), modelID: ModelV2.ID.make("deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -179,8 +172,7 @@ describe("AzureCognitiveServicesPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("messages-deployment")), modelID: ModelV2.ID.make("messages-deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { messages: sdk.messages, chat: sdk.chat, languageModel: sdk.languageModel }, options: {}, @@ -189,8 +181,7 @@ describe("AzureCognitiveServicesPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("chat-deployment")), modelID: ModelV2.ID.make("chat-deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { chat: sdk.chat, languageModel: sdk.languageModel }, options: {}, @@ -199,8 +190,7 @@ describe("AzureCognitiveServicesPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("language-deployment")), modelID: ModelV2.ID.make("language-deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: sdk.languageModel }, options: {}, diff --git a/packages/core/test/plugin/provider-azure.test.ts b/packages/core/test/plugin/provider-azure.test.ts index 65bad6e289..204b61a089 100644 --- a/packages/core/test/plugin/provider-azure.test.ts +++ b/packages/core/test/plugin/provider-azure.test.ts @@ -66,8 +66,7 @@ describe("AzurePlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.azure, (item) => { - item.aisdk = true - item.package = "@ai-sdk/azure" + item.package = ProviderV2.aisdk("@ai-sdk/azure") }) }) yield* addPlugin() @@ -83,13 +82,12 @@ describe("AzurePlugin", () => { yield* catalog.transform((catalog) => { const azure = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.azure), - aisdk: true, - package: "@ai-sdk/azure", + package: "aisdk:@ai-sdk/azure", headers: {}, settings: { resourceName: "from-config" }, }) catalog.provider.update(azure.id, (item) => { - item.aisdk = azure.aisdk + item.package = azure.package item.package = azure.package item.headers = azure.headers item.settings = { resourceName: "from-config" } @@ -110,13 +108,12 @@ describe("AzurePlugin", () => { yield* catalog.transform((catalog) => { const azure = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.azure), - aisdk: true, - package: "@ai-sdk/azure", + package: "aisdk:@ai-sdk/azure", headers: {}, settings: { resourceName: "" }, }) catalog.provider.update(azure.id, (item) => { - item.aisdk = azure.aisdk + item.package = azure.package item.package = azure.package item.headers = azure.headers item.settings = { resourceName: "" } @@ -135,13 +132,12 @@ describe("AzurePlugin", () => { yield* catalog.transform((catalog) => { const azure = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.azure), - aisdk: true, - package: "@ai-sdk/azure", + package: "aisdk:@ai-sdk/azure", headers: {}, settings: { resourceName: " " }, }) catalog.provider.update(azure.id, (item) => { - item.aisdk = azure.aisdk + item.package = azure.package item.package = azure.package item.headers = azure.headers item.settings = { resourceName: " " } @@ -163,8 +159,7 @@ describe("AzurePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")), modelID: ModelV2.ID.make("deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/azure", options: { name: "azure", baseURL: "https://proxy.example.com/openai" }, @@ -184,8 +179,7 @@ describe("AzurePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")), modelID: ModelV2.ID.make("deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/azure", options: { name: "azure" }, @@ -206,8 +200,7 @@ describe("AzurePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")), modelID: ModelV2.ID.make("deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: { useCompletionUrls: true }, @@ -226,8 +219,7 @@ describe("AzurePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")), modelID: ModelV2.ID.make("deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: { useCompletionUrls: true }, @@ -246,8 +238,7 @@ describe("AzurePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")), modelID: ModelV2.ID.make("deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", headers: {}, settings: { useCompletionUrls: true }, }), @@ -268,8 +259,7 @@ describe("AzurePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")), modelID: ModelV2.ID.make("deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -278,8 +268,7 @@ describe("AzurePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("deployment")), modelID: ModelV2.ID.make("deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -303,8 +292,7 @@ describe("AzurePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("messages-deployment")), modelID: ModelV2.ID.make("messages-deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { messages: make("messages"), chat: make("chat"), languageModel: make("languageModel") }, options: {}, @@ -313,8 +301,7 @@ describe("AzurePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("language-deployment")), modelID: ModelV2.ID.make("language-deployment"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: make("languageModel") }, options: {}, diff --git a/packages/core/test/plugin/provider-cerebras.test.ts b/packages/core/test/plugin/provider-cerebras.test.ts index ae58572c64..eb5c4ec1bf 100644 --- a/packages/core/test/plugin/provider-cerebras.test.ts +++ b/packages/core/test/plugin/provider-cerebras.test.ts @@ -36,8 +36,7 @@ describe("CerebrasPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("cerebras"), (item) => { - item.aisdk = true - item.package = "@ai-sdk/cerebras" + item.package = ProviderV2.aisdk("@ai-sdk/cerebras") item.headers = { ...item.headers, Existing: "1" } }) }) @@ -71,8 +70,7 @@ describe("CerebrasPlugin", () => { ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), ), modelID: ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/cerebras", options: { name: "custom-cerebras", apiKey: "test" }, @@ -95,8 +93,7 @@ describe("CerebrasPlugin", () => { ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), ), modelID: ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/cerebras", options: { name: "configured-cerebras", apiKey: "test" }, @@ -118,8 +115,7 @@ describe("CerebrasPlugin", () => { ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), ), modelID: ModelV2.ID.make("llama-4-scout-17b-16e-instruct"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/groq", options: { name: "custom-cerebras", apiKey: "test" }, diff --git a/packages/core/test/plugin/provider-cloudflare-ai-gateway.test.ts b/packages/core/test/plugin/provider-cloudflare-ai-gateway.test.ts index 7259f7ed56..cbd2b95c9e 100644 --- a/packages/core/test/plugin/provider-cloudflare-ai-gateway.test.ts +++ b/packages/core/test/plugin/provider-cloudflare-ai-gateway.test.ts @@ -119,8 +119,7 @@ describe("CloudflareAIGatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), modelID: ModelV2.ID.make("openai/gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "ai-gateway-provider", options: { name: "cloudflare-ai-gateway" }, @@ -142,8 +141,7 @@ describe("CloudflareAIGatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), modelID: ModelV2.ID.make("openai/gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "ai-gateway-provider", options: { @@ -188,8 +186,7 @@ describe("CloudflareAIGatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), modelID: ModelV2.ID.make("openai/gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "ai-gateway-provider", options: { @@ -219,8 +216,7 @@ describe("CloudflareAIGatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), modelID: ModelV2.ID.make("openai/gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "ai-gateway-provider", options: { @@ -258,8 +254,7 @@ describe("CloudflareAIGatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), modelID: ModelV2.ID.make("openai/gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "ai-gateway-provider", options: { @@ -291,8 +286,7 @@ describe("CloudflareAIGatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), modelID: ModelV2.ID.make("openai/gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "ai-gateway-provider", options: { name: "cloudflare-ai-gateway" }, @@ -315,8 +309,7 @@ describe("CloudflareAIGatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), modelID: ModelV2.ID.make("openai/gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "ai-gateway-provider", options: { name: "cloudflare-ai-gateway" }, @@ -340,8 +333,7 @@ describe("CloudflareAIGatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), modelID: ModelV2.ID.make("openai/gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "ai-gateway-provider", options: { name: "cloudflare-ai-gateway" }, @@ -371,8 +363,7 @@ describe("CloudflareAIGatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), modelID: ModelV2.ID.make("openai/gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "ai-gateway-provider", options: { name: "cloudflare-ai-gateway", baseURL: "https://proxy.example/v1" }, @@ -399,8 +390,7 @@ describe("CloudflareAIGatewayPlugin", () => { ModelV2.ID.make("anthropic/claude-sonnet-4-5"), ), modelID: ModelV2.ID.make("anthropic/claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "ai-gateway-provider", options: { name: "cloudflare-ai-gateway" }, @@ -429,8 +419,7 @@ describe("CloudflareAIGatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")), modelID: ModelV2.ID.make("openai/gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "cloudflare-ai-gateway" }, diff --git a/packages/core/test/plugin/provider-cloudflare-workers-ai.test.ts b/packages/core/test/plugin/provider-cloudflare-workers-ai.test.ts index 2eeb89caf2..d67b8d91cc 100644 --- a/packages/core/test/plugin/provider-cloudflare-workers-ai.test.ts +++ b/packages/core/test/plugin/provider-cloudflare-workers-ai.test.ts @@ -87,8 +87,7 @@ describe("CloudflareWorkersAIPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("cloudflare-workers-ai"), (provider) => { - provider.aisdk = true - provider.package = "test-provider" + provider.package = ProviderV2.aisdk("test-provider") }), ) yield* addPlugin() @@ -97,7 +96,6 @@ describe("CloudflareWorkersAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")), modelID: ModelV2.ID.make("@cf/model"), - aisdk: provider.aisdk, package: provider.package, settings: provider.settings, }), @@ -105,8 +103,7 @@ describe("CloudflareWorkersAIPlugin", () => { options: { name: "cloudflare-workers-ai", headers: { custom: "header" } }, }) expect(provider).toMatchObject({ - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", settings: { baseURL: "https://api.cloudflare.com/client/v4/accounts/acct/ai/v1" }, }) expect(sdk.sdk).toBeDefined() @@ -120,15 +117,13 @@ describe("CloudflareWorkersAIPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("cloudflare-workers-ai"), (provider) => { - provider.aisdk = true - provider.package = "test-provider" + provider.package = ProviderV2.aisdk("test-provider") provider.settings = { ...provider.settings, baseURL: "https://proxy.example/v1" } }), ) yield* addPlugin() expect(required(yield* catalog.provider.get(ProviderV2.ID.make("cloudflare-workers-ai")))).toMatchObject({ - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", settings: { baseURL: "https://proxy.example/v1" }, }) }), @@ -145,8 +140,7 @@ describe("CloudflareWorkersAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")), modelID: ModelV2.ID.make("@cf/model"), - aisdk: true, - package: "@ai-sdk/openai-compatible", + package: "aisdk:@ai-sdk/openai-compatible", settings: { baseURL: "https://proxy.example/v1" }, }), package: "@ai-sdk/openai-compatible", @@ -163,15 +157,13 @@ describe("CloudflareWorkersAIPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("cloudflare-workers-ai"), (provider) => { - provider.aisdk = true - provider.package = "test-provider" + provider.package = ProviderV2.aisdk("test-provider") provider.settings = { ...provider.settings, accountId: "configured-acct" } }), ) yield* addPlugin() expect(required(yield* catalog.provider.get(ProviderV2.ID.make("cloudflare-workers-ai")))).toMatchObject({ - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", settings: { baseURL: "https://api.cloudflare.com/client/v4/accounts/env-acct/ai/v1" }, }) }), @@ -188,8 +180,7 @@ describe("CloudflareWorkersAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")), modelID: ModelV2.ID.make("@cf/model"), - aisdk: true, - package: "@ai-sdk/openai-compatible", + package: "aisdk:@ai-sdk/openai-compatible", settings: { baseURL: "https://proxy.example/v1" }, }), package: "@ai-sdk/openai-compatible", @@ -218,8 +209,7 @@ describe("CloudflareWorkersAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")), modelID: ModelV2.ID.make("@cf/model"), - aisdk: true, - package: "@ai-sdk/openai-compatible", + package: "aisdk:@ai-sdk/openai-compatible", settings: { baseURL: "https://api.cloudflare.com/client/v4/accounts/${CLOUDFLARE_ACCOUNT_ID}/ai/v1" }, }), package: "@ai-sdk/openai-compatible", @@ -245,8 +235,7 @@ describe("CloudflareWorkersAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("@cf/api-model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -266,8 +255,7 @@ describe("CloudflareWorkersAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")), modelID: ModelV2.ID.make("@cf/model"), - aisdk: true, - package: "@ai-sdk/anthropic", + package: "aisdk:@ai-sdk/anthropic", settings: { baseURL: "https://proxy.example/v1" }, }), package: "@ai-sdk/anthropic", diff --git a/packages/core/test/plugin/provider-cohere.test.ts b/packages/core/test/plugin/provider-cohere.test.ts index fea89915bf..a4109f74bd 100644 --- a/packages/core/test/plugin/provider-cohere.test.ts +++ b/packages/core/test/plugin/provider-cohere.test.ts @@ -57,8 +57,7 @@ describe("CoherePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cohere"), ModelV2.ID.make("command")), modelID: ModelV2.ID.make("command"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "cohere" }, @@ -69,8 +68,7 @@ describe("CoherePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cohere"), ModelV2.ID.make("command")), modelID: ModelV2.ID.make("command"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/cohere", options: { name: "cohere" }, @@ -88,8 +86,7 @@ describe("CoherePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-cohere"), ModelV2.ID.make("command-r-plus")), modelID: ModelV2.ID.make("command-r-plus"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/cohere", options: { name: "custom-cohere", apiKey: "test", baseURL: "https://cohere.example" }, @@ -115,8 +112,7 @@ describe("CoherePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cohere"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("command-r-plus"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk, options: {}, diff --git a/packages/core/test/plugin/provider-deepinfra.test.ts b/packages/core/test/plugin/provider-deepinfra.test.ts index 6d1f74157d..14c41e550d 100644 --- a/packages/core/test/plugin/provider-deepinfra.test.ts +++ b/packages/core/test/plugin/provider-deepinfra.test.ts @@ -49,8 +49,7 @@ describe("DeepInfraPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("deepinfra"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "@ai-sdk/deepinfra", + package: "aisdk:@ai-sdk/deepinfra", }), package: "@ai-sdk/deepinfra", options: { name: "deepinfra" }, @@ -69,8 +68,7 @@ describe("DeepInfraPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-deepinfra"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "@ai-sdk/deepinfra", + package: "aisdk:@ai-sdk/deepinfra", }), package: "@ai-sdk/deepinfra", options: { name: "custom-deepinfra", apiKey: "test" }, @@ -90,8 +88,7 @@ describe("DeepInfraPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("deepinfra"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "@ai-sdk/deepinfra", + package: "aisdk:@ai-sdk/deepinfra", }), package: "@ai-sdk/deepinfra", options: { name: "deepinfra", apiKey: "test" }, @@ -118,8 +115,7 @@ describe("DeepInfraPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("deepinfra"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "@ai-sdk/deepinfra", + package: "aisdk:@ai-sdk/deepinfra", }), package: item, options: { name: "deepinfra" }, @@ -131,8 +127,7 @@ describe("DeepInfraPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("deepinfra"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "@ai-sdk/deepinfra", + package: "aisdk:@ai-sdk/deepinfra", }), package: "@ai-sdk/deepinfra", options: { name: "deepinfra" }, @@ -152,8 +147,7 @@ describe("DeepInfraPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("deepinfra"), ModelV2.ID.make("meta-llama/Llama-3.3-70B-Instruct")), modelID: ModelV2.ID.make("meta-llama/Llama-3.3-70B-Instruct"), - aisdk: true, - package: "@ai-sdk/deepinfra", + package: "aisdk:@ai-sdk/deepinfra", }), package: "@ai-sdk/deepinfra", options: { name: "deepinfra" }, diff --git a/packages/core/test/plugin/provider-dynamic.test.ts b/packages/core/test/plugin/provider-dynamic.test.ts index 68509bce9a..86e8864fb9 100644 --- a/packages/core/test/plugin/provider-dynamic.test.ts +++ b/packages/core/test/plugin/provider-dynamic.test.ts @@ -54,8 +54,7 @@ describe("DynamicProviderPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("test-model")), modelID: ModelV2.ID.make("test-model"), - aisdk: true, - package: fixtureProvider, + package: ProviderV2.aisdk(fixtureProvider), }), package: fixtureProvider, options: { name: "custom", marker: "dynamic" }, @@ -74,8 +73,7 @@ describe("DynamicProviderPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("test-model")), modelID: ModelV2.ID.make("test-model"), - aisdk: true, - package: fixtureProvider, + package: ProviderV2.aisdk(fixtureProvider), }), package: fixtureProvider, options: { name: "custom", marker: "dynamic" }, @@ -93,8 +91,7 @@ describe("DynamicProviderPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-provider"), ModelV2.ID.make("test-model")), modelID: ModelV2.ID.make("test-model"), - aisdk: true, - package: fixtureProvider, + package: ProviderV2.aisdk(fixtureProvider), }), package: fixtureProvider, options: { name: "custom-provider", marker: "dynamic" }, @@ -111,8 +108,7 @@ describe("DynamicProviderPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("npm-provider"), ModelV2.ID.make("test-model")), modelID: ModelV2.ID.make("test-model"), - aisdk: true, - package: "fixture-provider", + package: "aisdk:fixture-provider", }), package: "fixture-provider", options: { name: "npm-provider", marker: "npm" }, @@ -130,8 +126,7 @@ describe("DynamicProviderPlugin", () => { ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("missing-entrypoint"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("alias"), - aisdk: true, - package: "fixture-provider", + package: "aisdk:fixture-provider", }), ) .pipe(Effect.exit) @@ -149,8 +144,7 @@ describe("DynamicProviderPlugin", () => { ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("bad-import"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("alias"), - aisdk: true, - package: "file:///missing/provider-factory.js", + package: "aisdk:file:///missing/provider-factory.js", }), ) .pipe(Effect.exit) @@ -170,8 +164,7 @@ describe("DynamicProviderPlugin", () => { ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("missing-factory"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("alias"), - aisdk: true, - package: "fixture-provider", + package: "aisdk:fixture-provider", }), ) .pipe(Effect.exit) @@ -189,8 +182,7 @@ describe("DynamicProviderPlugin", () => { ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("test-model-api"), - aisdk: true, - package: fixtureProvider, + package: ProviderV2.aisdk(fixtureProvider), }), ) expect(language).toMatchObject({ modelID: "test-model-api", options: { name: "custom" } }) diff --git a/packages/core/test/plugin/provider-gateway.test.ts b/packages/core/test/plugin/provider-gateway.test.ts index 2c49e1a026..722bbde9b6 100644 --- a/packages/core/test/plugin/provider-gateway.test.ts +++ b/packages/core/test/plugin/provider-gateway.test.ts @@ -46,8 +46,7 @@ describe("GatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gateway"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/gateway", options: { name: "gateway" }, @@ -68,8 +67,7 @@ describe("GatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("vercel"), ModelV2.ID.make("anthropic/claude-sonnet-4")), modelID: ModelV2.ID.make("anthropic/claude-sonnet-4"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/gateway", options: { name: "vercel", apiKey: "test-key" }, @@ -92,8 +90,7 @@ describe("GatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("vercel"), ModelV2.ID.make(modelID)), modelID: ModelV2.ID.make(modelID), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/vercel", options: { name: "vercel" }, @@ -104,8 +101,7 @@ describe("GatewayPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("vercel"), ModelV2.ID.make(modelID)), modelID: ModelV2.ID.make(modelID), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/gateway", options: { name: "vercel" }, diff --git a/packages/core/test/plugin/provider-github-copilot.test.ts b/packages/core/test/plugin/provider-github-copilot.test.ts index 44bea74ea4..4c5a3b1160 100644 --- a/packages/core/test/plugin/provider-github-copilot.test.ts +++ b/packages/core/test/plugin/provider-github-copilot.test.ts @@ -48,8 +48,7 @@ describe("GithubCopilotPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")), modelID: ModelV2.ID.make("gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "github-copilot" }, @@ -58,8 +57,7 @@ describe("GithubCopilotPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")), modelID: ModelV2.ID.make("gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/github-copilot", options: { name: "github-copilot" }, @@ -79,8 +77,7 @@ describe("GithubCopilotPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("claude-sonnet-4")), modelID: ModelV2.ID.make("claude-sonnet-4"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: {}, @@ -99,8 +96,7 @@ describe("GithubCopilotPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("claude-sonnet-4"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: {}, @@ -119,8 +115,7 @@ describe("GithubCopilotPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")), modelID: ModelV2.ID.make("gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -129,8 +124,7 @@ describe("GithubCopilotPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5.1-codex")), modelID: ModelV2.ID.make("gpt-5.1-codex"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -139,8 +133,7 @@ describe("GithubCopilotPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-4o")), modelID: ModelV2.ID.make("gpt-4o"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -149,8 +142,7 @@ describe("GithubCopilotPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5-mini")), modelID: ModelV2.ID.make("gpt-5-mini"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -159,8 +151,7 @@ describe("GithubCopilotPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5-mini-2025-08-07")), modelID: ModelV2.ID.make("gpt-5-mini-2025-08-07"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -185,8 +176,7 @@ describe("GithubCopilotPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("default")), modelID: ModelV2.ID.make("gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -195,8 +185,7 @@ describe("GithubCopilotPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("small")), modelID: ModelV2.ID.make("gpt-5-mini"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -205,8 +194,7 @@ describe("GithubCopilotPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("sonnet")), modelID: ModelV2.ID.make("claude-sonnet-4"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -255,8 +243,7 @@ describe("GithubCopilotPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("openai"), ModelV2.ID.make("gpt-5")), modelID: ModelV2.ID.make("gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, diff --git a/packages/core/test/plugin/provider-gitlab.test.ts b/packages/core/test/plugin/provider-gitlab.test.ts index 6c72c65301..ae66a61aa8 100644 --- a/packages/core/test/plugin/provider-gitlab.test.ts +++ b/packages/core/test/plugin/provider-gitlab.test.ts @@ -71,8 +71,7 @@ describe("GitLabPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")), modelID: ModelV2.ID.make("claude"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "gitlab-ai-provider", options: { name: "gitlab" }, @@ -110,8 +109,7 @@ describe("GitLabPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")), modelID: ModelV2.ID.make("claude"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "gitlab-ai-provider", options: { name: "gitlab" }, @@ -137,8 +135,7 @@ describe("GitLabPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")), modelID: ModelV2.ID.make("claude"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "gitlab-ai-provider", options: { @@ -180,8 +177,7 @@ describe("GitLabPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")), modelID: ModelV2.ID.make("claude"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai", options: { name: "gitlab" }, @@ -201,8 +197,7 @@ describe("GitLabPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("duo-workflow-custom")), modelID: ModelV2.ID.make("duo-workflow-custom"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", headers: {}, settings: { workflowRef: "ref", workflowDefinition: "definition" }, }), @@ -236,8 +231,7 @@ describe("GitLabPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("duo-workflow-exact")), modelID: ModelV2.ID.make("duo-workflow-exact"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { workflowChat: (id: string, options: unknown) => { @@ -265,8 +259,7 @@ describe("GitLabPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("duo-workflow-custom")), modelID: ModelV2.ID.make("duo-workflow-custom"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", headers: {}, settings: { featureFlags: { request_flag: true } }, }), @@ -293,8 +286,7 @@ describe("GitLabPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")), modelID: ModelV2.ID.make("claude"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", headers: { h: "v" }, settings: {}, }), diff --git a/packages/core/test/plugin/provider-google-vertex-anthropic.test.ts b/packages/core/test/plugin/provider-google-vertex-anthropic.test.ts index 8afb38b1f8..090abb945c 100644 --- a/packages/core/test/plugin/provider-google-vertex-anthropic.test.ts +++ b/packages/core/test/plugin/provider-google-vertex-anthropic.test.ts @@ -64,8 +64,7 @@ describe("GoogleVertexAnthropicPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex-anthropic"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/google-vertex/anthropic" + provider.package = ProviderV2.aisdk("@ai-sdk/google-vertex/anthropic") }), ) yield* addPlugin(GoogleVertexAnthropicPlugin) @@ -85,8 +84,7 @@ describe("GoogleVertexAnthropicPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex-anthropic"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/google-vertex/anthropic" + provider.package = ProviderV2.aisdk("@ai-sdk/google-vertex/anthropic") provider.settings = { ...provider.settings, project: "configured-project", location: "configured-location" } }), ) @@ -123,8 +121,7 @@ describe("GoogleVertexAnthropicPlugin", () => { ModelV2.ID.make("claude-sonnet-4-5"), ), modelID: ModelV2.ID.make("claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/google-vertex/anthropic", options: { name: "google-vertex-anthropic" }, @@ -151,8 +148,7 @@ describe("GoogleVertexAnthropicPlugin", () => { ModelV2.ID.make("claude-sonnet-4-5"), ), modelID: ModelV2.ID.make("claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/google-vertex/anthropic", options: { name: "google-vertex-anthropic" }, @@ -173,8 +169,7 @@ describe("GoogleVertexAnthropicPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("claude-sonnet-4-5")), modelID: ModelV2.ID.make("claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/google-vertex/anthropic", options: { name: "google-vertex", project: "project", location: "eu" }, @@ -194,8 +189,7 @@ describe("GoogleVertexAnthropicPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("claude-sonnet-4-5")), modelID: ModelV2.ID.make("claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/google-vertex/anthropic", options: { name: "google-vertex", project: "project", location: "eu", baseURL: "https://proxy.example/v1" }, @@ -214,8 +208,7 @@ describe("GoogleVertexAnthropicPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make(" claude-sonnet-4-5 ")), modelID: ModelV2.ID.make(" claude-sonnet-4-5 "), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/google-vertex/anthropic", options: { name: "google-vertex", project: "project", location: "us" }, @@ -224,8 +217,7 @@ describe("GoogleVertexAnthropicPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make(" claude-sonnet-4-5 ")), modelID: ModelV2.ID.make(" claude-sonnet-4-5 "), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: sdkResult.sdk, options: {}, @@ -248,8 +240,7 @@ describe("GoogleVertexAnthropicPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex-anthropic"), ModelV2.ID.make(" claude-sonnet-4-5 ")), modelID: ModelV2.ID.make(" claude-sonnet-4-5 "), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: selector(calls) }, options: {}, @@ -268,8 +259,7 @@ describe("GoogleVertexAnthropicPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("claude-sonnet-4-5")), modelID: ModelV2.ID.make("claude-sonnet-4-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: selector(calls) }, options: {}, diff --git a/packages/core/test/plugin/provider-google-vertex.test.ts b/packages/core/test/plugin/provider-google-vertex.test.ts index 026bcd0282..fc7f398d75 100644 --- a/packages/core/test/plugin/provider-google-vertex.test.ts +++ b/packages/core/test/plugin/provider-google-vertex.test.ts @@ -92,8 +92,7 @@ describe("GoogleVertexPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.opencode, (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: "https://opencode.ai/zen/v1" } }), ) @@ -119,8 +118,7 @@ describe("GoogleVertexPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: @@ -133,8 +131,7 @@ describe("GoogleVertexPlugin", () => { expect(provider.settings?.project).toBe("google-cloud-project") expect(provider.settings?.location).toBe("google-vertex-location") expect(provider).toMatchObject({ - aisdk: true, - package: "@ai-sdk/openai-compatible", + package: "aisdk:@ai-sdk/openai-compatible", settings: { baseURL: "https://google-vertex-location-aiplatform.googleapis.com/v1/projects/google-cloud-project/locations/google-vertex-location", @@ -163,8 +160,7 @@ describe("GoogleVertexPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: @@ -178,8 +174,7 @@ describe("GoogleVertexPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("gemini")), modelID: ModelV2.ID.make("gemini"), - aisdk: true, - package: "@ai-sdk/google-vertex", + package: "aisdk:@ai-sdk/google-vertex", }), package: "@ai-sdk/google-vertex", options: { name: "google-vertex" }, @@ -187,8 +182,7 @@ describe("GoogleVertexPlugin", () => { expect(provider.settings?.project).toBe("vertex-project") expect(provider).toMatchObject({ - aisdk: true, - package: "@ai-sdk/openai-compatible", + package: "aisdk:@ai-sdk/openai-compatible", settings: { baseURL: "https://europe-west4-aiplatform.googleapis.com/v1/projects/vertex-project/locations/europe-west4", @@ -215,8 +209,7 @@ describe("GoogleVertexPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: @@ -230,8 +223,7 @@ describe("GoogleVertexPlugin", () => { expect(provider.settings?.project).toBe("config-project") expect(provider.settings?.location).toBe("global") expect(provider).toMatchObject({ - aisdk: true, - package: "@ai-sdk/openai-compatible", + package: "aisdk:@ai-sdk/openai-compatible", settings: { baseURL: "https://aiplatform.googleapis.com/v1/projects/config-project/locations/global" }, }) }), @@ -243,8 +235,7 @@ describe("GoogleVertexPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: @@ -256,8 +247,7 @@ describe("GoogleVertexPlugin", () => { yield* addPlugin() const provider = required(yield* catalog.provider.get(ProviderV2.ID.make("google-vertex"))) expect(provider).toMatchObject({ - aisdk: true, - package: "@ai-sdk/openai-compatible", + package: "aisdk:@ai-sdk/openai-compatible", settings: { baseURL: "https://eu-aiplatform.googleapis.com/v1/projects/config-project/locations/eu" }, }) }), @@ -278,8 +268,7 @@ describe("GoogleVertexPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/google-vertex" + provider.package = ProviderV2.aisdk("@ai-sdk/google-vertex") provider.settings = { ...provider.settings, project: "config-project" } }), ) @@ -307,8 +296,7 @@ describe("GoogleVertexPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("gemini")), modelID: ModelV2.ID.make("gemini"), - aisdk: true, - package: "@ai-sdk/google-vertex", + package: "aisdk:@ai-sdk/google-vertex", }), package: "@ai-sdk/google-vertex", options: { name: "google-vertex" }, @@ -353,8 +341,7 @@ describe("GoogleVertexPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("gemini")), modelID: ModelV2.ID.make("gemini"), - aisdk: true, - package: "@ai-sdk/openai-compatible", + package: "aisdk:@ai-sdk/openai-compatible", }), package: "@ai-sdk/openai-compatible", options: { name: "google-vertex" }, @@ -382,8 +369,7 @@ describe("GoogleVertexPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make(" gemini-2.5-pro ")), modelID: ModelV2.ID.make(" gemini-2.5-pro "), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: {}, diff --git a/packages/core/test/plugin/provider-google.test.ts b/packages/core/test/plugin/provider-google.test.ts index f2022d31d1..fd9a4c90dd 100644 --- a/packages/core/test/plugin/provider-google.test.ts +++ b/packages/core/test/plugin/provider-google.test.ts @@ -28,8 +28,7 @@ describe("GooglePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-google"), ModelV2.ID.make("gemini")), modelID: ModelV2.ID.make("gemini"), - aisdk: true, - package: "@ai-sdk/google", + package: "aisdk:@ai-sdk/google", }), package: "@ai-sdk/google", options: { name: "custom-google", apiKey: "test" }, @@ -48,8 +47,7 @@ describe("GooglePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("google"), ModelV2.ID.make("gemini")), modelID: ModelV2.ID.make("gemini"), - aisdk: true, - package: "@ai-sdk/google", + package: "aisdk:@ai-sdk/google", }), package: "@ai-sdk/google-vertex", options: { name: "google" }, @@ -67,8 +65,7 @@ describe("GooglePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-google"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("gemini-api"), - aisdk: true, - package: "@ai-sdk/google", + package: "aisdk:@ai-sdk/google", }), package: "@ai-sdk/google", options: { name: "custom-google", apiKey: "test" }, diff --git a/packages/core/test/plugin/provider-groq.test.ts b/packages/core/test/plugin/provider-groq.test.ts index 2e30264352..b8900384b7 100644 --- a/packages/core/test/plugin/provider-groq.test.ts +++ b/packages/core/test/plugin/provider-groq.test.ts @@ -29,8 +29,7 @@ describe("GroqPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("groq"), ModelV2.ID.make("llama")), modelID: ModelV2.ID.make("llama"), - aisdk: true, - package: "@ai-sdk/groq", + package: "aisdk:@ai-sdk/groq", }), package: "@ai-sdk/groq", options: { name: "groq" }, @@ -48,8 +47,7 @@ describe("GroqPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("groq"), ModelV2.ID.make("llama")), modelID: ModelV2.ID.make("llama"), - aisdk: true, - package: "@ai-sdk/groq", + package: "aisdk:@ai-sdk/groq", }), package: "@ai-sdk/openai-compatible", options: { name: "groq" }, @@ -67,8 +65,7 @@ describe("GroqPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("groq"), ModelV2.ID.make("llama")), modelID: ModelV2.ID.make("llama"), - aisdk: true, - package: "@ai-sdk/groq", + package: "aisdk:@ai-sdk/groq", }), package: "@ai-sdk/groq/compat", options: { name: "groq" }, @@ -86,8 +83,7 @@ describe("GroqPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-groq"), ModelV2.ID.make("llama")), modelID: ModelV2.ID.make("llama"), - aisdk: true, - package: "@ai-sdk/groq", + package: "aisdk:@ai-sdk/groq", }), package: "@ai-sdk/groq", options: { name: "custom-groq", apiKey: "test" }, @@ -113,8 +109,7 @@ describe("GroqPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("groq"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("llama-api"), - aisdk: true, - package: "@ai-sdk/groq", + package: "aisdk:@ai-sdk/groq", }), sdk, options: { name: "groq", apiKey: "test" }, diff --git a/packages/core/test/plugin/provider-kilo.test.ts b/packages/core/test/plugin/provider-kilo.test.ts index 7ad6b00382..8fc1287222 100644 --- a/packages/core/test/plugin/provider-kilo.test.ts +++ b/packages/core/test/plugin/provider-kilo.test.ts @@ -27,8 +27,7 @@ describe("KiloPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("kilo"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: "https://api.kilo.ai/api/gateway" } provider.headers = { Existing: "value" } }) @@ -49,8 +48,7 @@ describe("KiloPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("kilo"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: "https://api.kilo.ai/api/gateway" } }) }) @@ -71,13 +69,11 @@ describe("KiloPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("kilo"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: "https://api.kilo.ai/api/gateway" } }) catalog.provider.update(ProviderV2.ID.make("custom-kilo"), (provider) => { - provider.aisdk = true - provider.package = "kilo" + provider.package = ProviderV2.aisdk("kilo") }) }) yield* addPlugin() diff --git a/packages/core/test/plugin/provider-llmgateway.test.ts b/packages/core/test/plugin/provider-llmgateway.test.ts index f0eb026aca..b3d451a473 100644 --- a/packages/core/test/plugin/provider-llmgateway.test.ts +++ b/packages/core/test/plugin/provider-llmgateway.test.ts @@ -34,8 +34,7 @@ describe("LLMGatewayPlugin", () => { }) yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("llmgateway"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: "https://api.llmgateway.io/v1" } provider.headers = { Existing: "value" } }) @@ -62,8 +61,7 @@ describe("LLMGatewayPlugin", () => { yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("llmgateway"), (provider) => { provider.disabled = true - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: "https://api.llmgateway.io/v1" } }) }) diff --git a/packages/core/test/plugin/provider-mistral.test.ts b/packages/core/test/plugin/provider-mistral.test.ts index 5e549e3ec8..182873482c 100644 --- a/packages/core/test/plugin/provider-mistral.test.ts +++ b/packages/core/test/plugin/provider-mistral.test.ts @@ -29,8 +29,7 @@ describe("MistralPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("mistral"), ModelV2.ID.make("mistral-large")), modelID: ModelV2.ID.make("mistral-large"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/mistral", options: { name: "mistral" }, @@ -48,8 +47,7 @@ describe("MistralPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("mistral"), ModelV2.ID.make("mistral-large")), modelID: ModelV2.ID.make("mistral-large"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "mistral" }, @@ -73,8 +71,7 @@ describe("MistralPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("mistral"), ModelV2.ID.make("mistral-large")), modelID: ModelV2.ID.make("mistral-large"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/mistral", options: { name: "mistral" }, @@ -99,8 +96,7 @@ describe("MistralPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-mistral"), ModelV2.ID.make("mistral-large")), modelID: ModelV2.ID.make("mistral-large"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/mistral", options: { name: "custom-mistral" }, @@ -125,8 +121,7 @@ describe("MistralPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("mistral"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("mistral-large"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk, options: {}, diff --git a/packages/core/test/plugin/provider-nvidia.test.ts b/packages/core/test/plugin/provider-nvidia.test.ts index b1f051ab9d..b5984d6237 100644 --- a/packages/core/test/plugin/provider-nvidia.test.ts +++ b/packages/core/test/plugin/provider-nvidia.test.ts @@ -27,8 +27,7 @@ describe("NvidiaPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("nvidia"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: "https://integrate.api.nvidia.com/v1" } provider.headers = { Existing: "value" } }) @@ -50,8 +49,7 @@ describe("NvidiaPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("nvidia"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: "https://integrate.api.nvidia.com/v1" } }) }) @@ -70,8 +68,7 @@ describe("NvidiaPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("nvidia"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: "https://integrate.api.nvidia.com/v1" } provider.headers = { "X-BILLING-INVOKE-ORIGIN": "CustomOrigin" } }) diff --git a/packages/core/test/plugin/provider-openai-compatible.test.ts b/packages/core/test/plugin/provider-openai-compatible.test.ts index ac4e782cc6..a954af9f00 100644 --- a/packages/core/test/plugin/provider-openai-compatible.test.ts +++ b/packages/core/test/plugin/provider-openai-compatible.test.ts @@ -28,8 +28,7 @@ describe("OpenAICompatiblePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "custom" }, @@ -38,8 +37,7 @@ describe("OpenAICompatiblePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "custom", includeUsage: false }, @@ -58,8 +56,7 @@ describe("OpenAICompatiblePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "file:///tmp/@ai-sdk/openai-compatible-provider.js", options: { name: "custom" }, @@ -83,8 +80,7 @@ describe("OpenAICompatiblePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-provider"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "custom-provider", baseURL: "https://example.com/v1" }, @@ -105,8 +101,7 @@ describe("OpenAICompatiblePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "cloudflare-workers-ai" }, diff --git a/packages/core/test/plugin/provider-openai.test.ts b/packages/core/test/plugin/provider-openai.test.ts index c9866ea879..daf48310fd 100644 --- a/packages/core/test/plugin/provider-openai.test.ts +++ b/packages/core/test/plugin/provider-openai.test.ts @@ -68,8 +68,7 @@ describe("OpenAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-openai"), ModelV2.ID.make("gpt-5")), modelID: ModelV2.ID.make("gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai", options: { name: "custom-openai", apiKey: "test" }, @@ -87,8 +86,7 @@ describe("OpenAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("gpt-5")), modelID: ModelV2.ID.make("gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "openai" }, @@ -107,8 +105,7 @@ describe("OpenAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -128,8 +125,7 @@ describe("OpenAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.anthropic, ModelV2.ID.make("gpt-5")), modelID: ModelV2.ID.make("gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -145,11 +141,10 @@ describe("OpenAIPlugin", () => { yield* catalog.transform((catalog) => { const item = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.openai), - aisdk: true, - package: "@ai-sdk/openai", + package: "aisdk:@ai-sdk/openai", }) catalog.provider.update(item.id, (draft) => { - draft.aisdk = item.aisdk + draft.package = item.package draft.package = item.package }) catalog.model.update(item.id, ModelV2.ID.make("gpt-5"), () => {}) @@ -169,11 +164,10 @@ describe("OpenAIPlugin", () => { yield* catalog.transform((catalog) => { const item = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.make("custom-openai")), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }) catalog.provider.update(item.id, (draft) => { - draft.aisdk = item.aisdk + draft.package = item.package draft.package = item.package }) catalog.model.update(item.id, ModelV2.ID.make("gpt-5-chat-latest"), () => {}) diff --git a/packages/core/test/plugin/provider-opencode.test.ts b/packages/core/test/plugin/provider-opencode.test.ts index 3d8560b055..ebf7e6ff66 100644 --- a/packages/core/test/plugin/provider-opencode.test.ts +++ b/packages/core/test/plugin/provider-opencode.test.ts @@ -133,8 +133,7 @@ describe("OpencodePlugin", () => { expect(provider).toMatchObject({ name: "Remote", integrationID: "opencode", - aisdk: true, - package: "@ai-sdk/openai-compatible", + package: "aisdk:@ai-sdk/openai-compatible", settings: { baseURL: `${server.url.origin}/v1` }, }) expect(provider.headers).toEqual({ "x-org-id": "org" }) @@ -178,14 +177,12 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.opencode), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")), modelID: ModelV2.ID.make("paid"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", cost: cost(1), }) catalog.provider.update(provider.id, () => {}) @@ -207,14 +204,12 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.opencode), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("free")), modelID: ModelV2.ID.make("free"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", cost: cost(0), }) catalog.provider.update(provider.id, () => {}) @@ -236,14 +231,12 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.opencode), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("output-only")), modelID: ModelV2.ID.make("output-only"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", cost: cost(0, 1), }) catalog.provider.update(provider.id, () => {}) @@ -267,14 +260,12 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.opencode), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")), modelID: ModelV2.ID.make("paid"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", cost: cost(1), }) catalog.provider.update(provider.id, () => {}) @@ -303,14 +294,12 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.opencode), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")), modelID: ModelV2.ID.make("paid"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", cost: cost(1), }) catalog.provider.update(provider.id, () => {}) @@ -332,16 +321,14 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.opencode), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", headers: {}, settings: { apiKey: "configured" }, }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")), modelID: ModelV2.ID.make("paid"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", cost: cost(1), }) catalog.provider.update(provider.id, (draft) => { @@ -366,14 +353,12 @@ describe("OpencodePlugin", () => { yield* catalog.transform((catalog) => { const provider = ProviderV2.Info.make({ ...ProviderV2.Info.empty(ProviderV2.ID.openai), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }) const model = ModelV2.Info.make({ ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")), modelID: ModelV2.ID.make("paid"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", cost: cost(1), }) catalog.provider.update(provider.id, () => {}) diff --git a/packages/core/test/plugin/provider-openrouter.test.ts b/packages/core/test/plugin/provider-openrouter.test.ts index 5548b93597..7c3e140407 100644 --- a/packages/core/test/plugin/provider-openrouter.test.ts +++ b/packages/core/test/plugin/provider-openrouter.test.ts @@ -30,8 +30,7 @@ describe("OpenRouterPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.openrouter, (provider) => { - provider.aisdk = true - provider.package = "@openrouter/ai-sdk-provider" + provider.package = ProviderV2.aisdk("@openrouter/ai-sdk-provider") provider.headers = { Existing: "value" } provider.settings = {} }) @@ -58,8 +57,7 @@ describe("OpenRouterPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openrouter, ModelV2.ID.make("openai/gpt-5")), modelID: ModelV2.ID.make("openai/gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "openrouter" }, @@ -70,8 +68,7 @@ describe("OpenRouterPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("openai/gpt-5")), modelID: ModelV2.ID.make("openai/gpt-5"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@openrouter/ai-sdk-provider", options: { name: "custom" }, @@ -85,8 +82,7 @@ describe("OpenRouterPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.openrouter, (provider) => { - provider.aisdk = true - provider.package = "@openrouter/ai-sdk-provider" + provider.package = ProviderV2.aisdk("@openrouter/ai-sdk-provider") }) catalog.provider.update(ProviderV2.ID.openai, () => {}) catalog.model.update(ProviderV2.ID.openrouter, ModelV2.ID.make("openai/gpt-5-chat"), () => {}) diff --git a/packages/core/test/plugin/provider-perplexity.test.ts b/packages/core/test/plugin/provider-perplexity.test.ts index 121f5ddd54..d66f5dd71c 100644 --- a/packages/core/test/plugin/provider-perplexity.test.ts +++ b/packages/core/test/plugin/provider-perplexity.test.ts @@ -42,8 +42,7 @@ describe("PerplexityPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("perplexity"), ModelV2.ID.make("sonar")), modelID: ModelV2.ID.make("sonar"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/perplexity", options: { name: "perplexity" }, @@ -61,8 +60,7 @@ describe("PerplexityPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("perplexity"), ModelV2.ID.make("sonar")), modelID: ModelV2.ID.make("sonar"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/perplexity-compatible", options: { name: "perplexity" }, @@ -80,8 +78,7 @@ describe("PerplexityPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("perplexity"), ModelV2.ID.make("sonar")), modelID: ModelV2.ID.make("sonar"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/perplexity", options: { name: "perplexity" }, @@ -99,8 +96,7 @@ describe("PerplexityPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-perplexity"), ModelV2.ID.make("sonar")), modelID: ModelV2.ID.make("sonar"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/perplexity", options: { name: "custom-perplexity" }, @@ -119,8 +115,7 @@ describe("PerplexityPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("perplexity"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("sonar"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, diff --git a/packages/core/test/plugin/provider-sap-ai-core.test.ts b/packages/core/test/plugin/provider-sap-ai-core.test.ts index dd9bb4ec25..8822866be8 100644 --- a/packages/core/test/plugin/provider-sap-ai-core.test.ts +++ b/packages/core/test/plugin/provider-sap-ai-core.test.ts @@ -50,8 +50,7 @@ function model(providerID: string) { return ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make(providerID), ModelV2.ID.make("sap-model")), modelID: ModelV2.ID.make("sap-model"), - aisdk: true, - package: fixtureProvider, + package: ProviderV2.aisdk(fixtureProvider), }) } diff --git a/packages/core/test/plugin/provider-snowflake-cortex.test.ts b/packages/core/test/plugin/provider-snowflake-cortex.test.ts index 9fece1ecf6..f9be96b74b 100644 --- a/packages/core/test/plugin/provider-snowflake-cortex.test.ts +++ b/packages/core/test/plugin/provider-snowflake-cortex.test.ts @@ -58,8 +58,7 @@ describe("SnowflakeCortexPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("openai"), ModelV2.ID.make("gpt-4")), modelID: ModelV2.ID.make("gpt-4"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai", options: { name: "openai" }, @@ -78,8 +77,7 @@ describe("SnowflakeCortexPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")), modelID: ModelV2.ID.make("claude-sonnet-4-6"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "snowflake-cortex", baseURL: "https://test.snowflakecomputing.com/api/v2/cortex/v1" }, @@ -99,8 +97,7 @@ describe("SnowflakeCortexPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")), modelID: ModelV2.ID.make("claude-sonnet-4-6"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { @@ -124,8 +121,7 @@ describe("SnowflakeCortexPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")), modelID: ModelV2.ID.make("claude-sonnet-4-6"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "snowflake-cortex", baseURL: "https://test.snowflakecomputing.com/api/v2/cortex/v1" }, @@ -145,8 +141,7 @@ describe("SnowflakeCortexPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")), modelID: ModelV2.ID.make("claude-sonnet-4-6"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { @@ -170,8 +165,7 @@ describe("SnowflakeCortexPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")), modelID: ModelV2.ID.make("claude-sonnet-4-6"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "snowflake-cortex", baseURL: "https://test.snowflakecomputing.com/api/v2/cortex/v1" }, diff --git a/packages/core/test/plugin/provider-togetherai.test.ts b/packages/core/test/plugin/provider-togetherai.test.ts index fc87a0cfbd..1fffb03156 100644 --- a/packages/core/test/plugin/provider-togetherai.test.ts +++ b/packages/core/test/plugin/provider-togetherai.test.ts @@ -42,8 +42,7 @@ describe("TogetherAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("togetherai"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/togetherai", options: { name: "togetherai" }, @@ -62,8 +61,7 @@ describe("TogetherAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("togetherai"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "file:///tmp/@ai-sdk/togetherai-provider.js", options: { name: "togetherai" }, @@ -74,8 +72,7 @@ describe("TogetherAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("togetherai"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/togetherai", options: { name: "togetherai" }, @@ -94,8 +91,7 @@ describe("TogetherAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-togetherai"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/togetherai", options: { name: "custom-togetherai" }, @@ -119,8 +115,7 @@ describe("TogetherAIPlugin", () => { ModelV2.ID.make("meta-llama/Llama-3.3-70B-Instruct-Turbo"), ), modelID: ModelV2.ID.make("meta-llama/Llama-3.3-70B-Instruct-Turbo"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: { languageModel: fakeSelectorSdk(calls).languageModel }, options: {}, diff --git a/packages/core/test/plugin/provider-venice.test.ts b/packages/core/test/plugin/provider-venice.test.ts index ba4cfef8af..057d2c6ded 100644 --- a/packages/core/test/plugin/provider-venice.test.ts +++ b/packages/core/test/plugin/provider-venice.test.ts @@ -42,8 +42,7 @@ describe("VenicePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("venice"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "venice-ai-sdk-provider", options: { name: "venice" }, @@ -61,8 +60,7 @@ describe("VenicePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-venice"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "venice-ai-sdk-provider", options: { name: "custom-venice", apiKey: "test" }, @@ -81,8 +79,7 @@ describe("VenicePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("venice"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "file:///tmp/venice-ai-sdk-provider.js", options: { name: "venice" }, @@ -91,8 +88,7 @@ describe("VenicePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("venice"), ModelV2.ID.make("model")), modelID: ModelV2.ID.make("model"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), package: "@ai-sdk/openai-compatible", options: { name: "venice" }, @@ -112,8 +108,7 @@ describe("VenicePlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("venice"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("alias"), - aisdk: true, - package: "test-provider", + package: "aisdk:test-provider", }), sdk: fakeSelectorSdk(calls), options: {}, diff --git a/packages/core/test/plugin/provider-vercel.test.ts b/packages/core/test/plugin/provider-vercel.test.ts index 08f169aa6e..46d5fe25b8 100644 --- a/packages/core/test/plugin/provider-vercel.test.ts +++ b/packages/core/test/plugin/provider-vercel.test.ts @@ -25,8 +25,7 @@ describe("VercelPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("vercel"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/vercel" + provider.package = ProviderV2.aisdk("@ai-sdk/vercel") provider.headers = { ...provider.headers, Existing: "1" } }) }) @@ -44,8 +43,7 @@ describe("VercelPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.make("vercel"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/vercel" + provider.package = ProviderV2.aisdk("@ai-sdk/vercel") }), ) yield* addPlugin() @@ -63,8 +61,7 @@ describe("VercelPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-vercel"), ModelV2.ID.make("v0-1.0-md")), modelID: ModelV2.ID.make("v0-1.0-md"), - aisdk: true, - package: "@ai-sdk/vercel", + package: "aisdk:@ai-sdk/vercel", }), package: "@ai-sdk/vercel", options: { name: "custom-vercel" }, diff --git a/packages/core/test/plugin/provider-xai.test.ts b/packages/core/test/plugin/provider-xai.test.ts index 525b2bbb62..94824af339 100644 --- a/packages/core/test/plugin/provider-xai.test.ts +++ b/packages/core/test/plugin/provider-xai.test.ts @@ -43,8 +43,7 @@ describe("XAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("xai"), ModelV2.ID.make("grok-4")), modelID: ModelV2.ID.make("grok-4"), - aisdk: true, - package: "@ai-sdk/xai", + package: "aisdk:@ai-sdk/xai", }), package: "@ai-sdk/openai-compatible", options: {}, @@ -54,8 +53,7 @@ describe("XAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("xai"), ModelV2.ID.make("grok-4")), modelID: ModelV2.ID.make("grok-4"), - aisdk: true, - package: "@ai-sdk/xai", + package: "aisdk:@ai-sdk/xai", }), package: "@ai-sdk/xai", options: {}, @@ -76,8 +74,7 @@ describe("XAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("custom-xai"), ModelV2.ID.make("grok-4")), modelID: ModelV2.ID.make("grok-4"), - aisdk: true, - package: "@ai-sdk/xai", + package: "aisdk:@ai-sdk/xai", }), package: "@ai-sdk/xai", options: {}, @@ -98,8 +95,7 @@ describe("XAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.make("xai"), ModelV2.ID.make("alias")), modelID: ModelV2.ID.make("grok-4"), - aisdk: true, - package: "@ai-sdk/xai", + package: "aisdk:@ai-sdk/xai", }), sdk: fakeSelectorSdk(calls), options: {}, @@ -121,8 +117,7 @@ describe("XAIPlugin", () => { model: ModelV2.Info.make({ ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("grok-4")), modelID: ModelV2.ID.make("grok-4"), - aisdk: true, - package: "@ai-sdk/xai", + package: "aisdk:@ai-sdk/xai", }), sdk: fakeSelectorSdk(calls), options: {}, diff --git a/packages/core/test/plugin/provider-zenmux.test.ts b/packages/core/test/plugin/provider-zenmux.test.ts index 15da40167e..02856e232a 100644 --- a/packages/core/test/plugin/provider-zenmux.test.ts +++ b/packages/core/test/plugin/provider-zenmux.test.ts @@ -32,8 +32,7 @@ describe("ZenmuxPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("zenmux"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: "https://zenmux.ai/api/v1" } }) }) @@ -49,8 +48,7 @@ describe("ZenmuxPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("zenmux"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: "https://zenmux.ai/api/v1" } provider.headers = { ...provider.headers, Existing: "value" } }) @@ -70,8 +68,7 @@ describe("ZenmuxPlugin", () => { const catalog = yield* Catalog.Service yield* catalog.transform((catalog) => { catalog.provider.update(ProviderV2.ID.make("zenmux"), (provider) => { - provider.aisdk = true - provider.package = "@ai-sdk/openai-compatible" + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") provider.settings = { ...provider.settings, baseURL: "https://zenmux.ai/api/v1" } provider.headers = { "HTTP-Referer": "https://example.com/", "X-Title": "custom-title" } }) diff --git a/packages/core/test/plugin/variant.test.ts b/packages/core/test/plugin/variant.test.ts index e20fd3a11d..fc85cc69ce 100644 --- a/packages/core/test/plugin/variant.test.ts +++ b/packages/core/test/plugin/variant.test.ts @@ -23,13 +23,7 @@ const connections = Credential.defaultLayer.pipe(Layer.fresh) const integrations = Integration.locationLayer.pipe(Layer.provide(events), Layer.provide(connections)) const catalog = Catalog.layer.pipe( Layer.provide( - Layer.mergeAll( - events, - locationLayer, - Policy.layer.pipe(Layer.provide(locationLayer)), - connections, - integrations, - ), + Layer.mergeAll(events, locationLayer, Policy.layer.pipe(Layer.provide(locationLayer)), connections, integrations), ), ) const it = testEffect( @@ -42,13 +36,11 @@ describe("VariantPlugin", () => { const service = yield* Catalog.Service yield* service.transform((catalog) => { catalog.provider.update(ProviderV2.ID.opencode, (provider) => { - provider.package = "@ai-sdk/openai-compatible" - provider.aisdk = true + provider.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") }) catalog.model.update(ProviderV2.ID.opencode, ModelV2.ID.make("glm-5.2"), (model) => { model.modelID = ModelV2.ID.make("glm-5.2") - model.package = "@ai-sdk/openai-compatible" - model.aisdk = true + model.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") }) }) yield* VariantPlugin.Plugin.effect(host({ catalog: catalogHost(service) })) @@ -66,11 +58,8 @@ describe("VariantPlugin", () => { yield* service.transform((catalog) => { catalog.model.update(ProviderV2.ID.opencode, ModelV2.ID.make("glm-5.2"), (model) => { model.modelID = ModelV2.ID.make("glm-5.2") - model.package = "@ai-sdk/openai-compatible" - model.aisdk = true - model.variants = [ - { id: ModelV2.VariantID.make("high"), headers: { custom: "true" } }, - ] + model.package = ProviderV2.aisdk("@ai-sdk/openai-compatible") + model.variants = [{ id: ModelV2.VariantID.make("high"), headers: { custom: "true" } }] }) }) yield* VariantPlugin.Plugin.effect(host({ catalog: catalogHost(service) })) diff --git a/packages/core/test/session-runner-model.test.ts b/packages/core/test/session-runner-model.test.ts index d2283a1086..824e0278f1 100644 --- a/packages/core/test/session-runner-model.test.ts +++ b/packages/core/test/session-runner-model.test.ts @@ -14,7 +14,6 @@ import { it } from "./lib/effect" type Transport = { readonly package: string - readonly aisdk?: true readonly settings?: Record } @@ -38,10 +37,36 @@ const model = (transport: Transport, variants?: NonNullable { + it.effect("constructs native provider package models mechanically", () => + Effect.gen(function* () { + const resolved = yield* SessionRunnerModel.fromCatalogModel( + model({ + package: "@opencode-ai/llm/providers/openai", + settings: { baseURL: "https://openai.example/v1" }, + }), + Credential.Key.make({ type: "key", key: "runtime-secret" }), + ) + const headers = yield* resolved.route.auth.apply({ + request: LLM.request({ model: resolved, prompt: "Hello" }), + method: "POST", + url: "https://openai.example/v1/responses", + body: "{}", + headers: Headers.empty, + }) + + expect(String(resolved.id)).toBe("api-test-model") + expect(resolved.route.id).toBe("openai-responses") + expect(resolved.route.defaults.headers).toEqual({ "x-test": "header" }) + expect(resolved.route.defaults.http?.body).toEqual({ custom_extension: { enabled: true } }) + expect(resolved.route.defaults.limits).toEqual({ context: 100, output: 20 }) + expect(headers.authorization).toBe("Bearer runtime-secret") + }), + ) + it.effect("maps catalog OpenAI AI SDK models into native Responses routes", () => Effect.gen(function* () { const resolved = yield* SessionRunnerModel.fromCatalogModel( - model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }), + model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }), ) expect(resolved).toMatchObject({ id: "api-test-model", provider: "test-provider" }) @@ -60,7 +85,7 @@ describe("SessionRunnerModel", () => { it.effect("keeps catalog apiKey credentials out of provider JSON", () => Effect.gen(function* () { const resolved = yield* SessionRunnerModel.fromCatalogModel( - model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }), + model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }), ) const prepared = yield* LLMClient.prepare(LLM.request({ model: resolved, prompt: "Hello" })) @@ -74,8 +99,7 @@ describe("SessionRunnerModel", () => { const resolved = yield* SessionRunnerModel.fromCatalogModel( ModelV2.Info.make({ ...model({ - package: "@ai-sdk/openai-compatible", - aisdk: true, + package: "aisdk:@ai-sdk/openai-compatible", settings: { apiKey: "settings-secret", baseURL: "https://compatible.example/v1", @@ -102,7 +126,7 @@ describe("SessionRunnerModel", () => { it.effect("overlays selected OpenAI Session variant bodies", () => Effect.gen(function* () { - const catalog = model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }, [ + const catalog = model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }, [ { id: ModelV2.VariantID.make("high"), headers: { "x-variant": "high" }, @@ -146,8 +170,7 @@ describe("SessionRunnerModel", () => { Effect.gen(function* () { const catalog = model( { - package: "@ai-sdk/openai-compatible", - aisdk: true, + package: "aisdk:@ai-sdk/openai-compatible", settings: { baseURL: "https://compatible.example/v1" }, }, [ @@ -181,7 +204,7 @@ describe("SessionRunnerModel", () => { it.effect("rejects an explicit unavailable Session variant during model resolution", () => Effect.gen(function* () { - const catalog = model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }) + const catalog = model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }) const session = SessionV2.Info.make({ id: SessionV2.ID.make("ses_model_variant_unavailable"), projectID: ProjectV2.ID.global, @@ -211,13 +234,16 @@ describe("SessionRunnerModel", () => { it.effect("overlays selected Anthropic Session variant bodies", () => Effect.gen(function* () { - const catalog = model({ package: "@ai-sdk/anthropic", aisdk: true, settings: { baseURL: "https://anthropic.example/v1" } }, [ - { - id: ModelV2.VariantID.make("high"), - headers: {}, - body: { thinking: { type: "enabled", budget_tokens: 12000 } }, - }, - ]) + const catalog = model( + { package: "aisdk:@ai-sdk/anthropic", settings: { baseURL: "https://anthropic.example/v1" } }, + [ + { + id: ModelV2.VariantID.make("high"), + headers: {}, + body: { thinking: { type: "enabled", budget_tokens: 12000 } }, + }, + ], + ) const session = SessionV2.Info.make({ id: SessionV2.ID.make("ses_anthropic_variant"), projectID: ProjectV2.ID.global, @@ -241,7 +267,7 @@ describe("SessionRunnerModel", () => { it.effect("maps catalog Anthropic AI SDK models into native routes", () => Effect.gen(function* () { const resolved = yield* SessionRunnerModel.fromCatalogModel( - model({ package: "@ai-sdk/anthropic", aisdk: true, settings: { baseURL: "https://anthropic.example/v1" } }), + model({ package: "aisdk:@ai-sdk/anthropic", settings: { baseURL: "https://anthropic.example/v1" } }), ) expect(resolved.route).toMatchObject({ @@ -255,7 +281,7 @@ describe("SessionRunnerModel", () => { Effect.gen(function* () { const resolved = yield* SessionRunnerModel.fromCatalogModel( ModelV2.Info.make({ - ...model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }), + ...model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }), headers: {}, body: {}, }), @@ -279,7 +305,7 @@ describe("SessionRunnerModel", () => { const credential = Credential.Key.make({ type: "key", key: "stored-secret", metadata: { tenant: "work" } }) const resolved = yield* SessionRunnerModel.fromCatalogModel( ModelV2.Info.make({ - ...model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }), + ...model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }), settings: { apiKey: "configured-secret", baseURL: "https://openai.example/v1" }, headers: {}, body: {}, @@ -302,7 +328,7 @@ describe("SessionRunnerModel", () => { it.effect("rejects catalog APIs without a native route", () => Effect.gen(function* () { const failure = yield* SessionRunnerModel.fromCatalogModel( - model({ package: "@ai-sdk/google", aisdk: true, settings: { baseURL: "https://google.example/v1" } }), + model({ package: "aisdk:@ai-sdk/google", settings: { baseURL: "https://google.example/v1" } }), ).pipe(Effect.flip) expect(failure).toMatchObject({ @@ -319,15 +345,15 @@ describe("SessionRunnerModel", () => { Effect.sync(() => { expect( SessionRunnerModel.supported( - model({ package: "@ai-sdk/openai", aisdk: true, settings: { baseURL: "https://openai.example/v1" } }), + model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }), ), ).toBe(true) expect( SessionRunnerModel.supported( - model({ package: "@ai-sdk/google", aisdk: true, settings: { baseURL: "https://google.example/v1" } }), + model({ package: "aisdk:@ai-sdk/google", settings: { baseURL: "https://google.example/v1" } }), ), ).toBe(false) - expect(SessionRunnerModel.supported(model({ package: "native" }))).toBe(false) + expect(SessionRunnerModel.supported(model({ package: "native-provider-package" }))).toBe(true) }), ) }) diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts index 694e00560c..6d91a3ac96 100644 --- a/packages/sdk/js/src/v2/gen/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/types.gen.ts @@ -3991,7 +3991,6 @@ export type ModelV2Info = { family?: string name: string package?: string - aisdk?: true settings?: { [key: string]: unknown } @@ -4048,7 +4047,6 @@ export type ProviderV2Info = { name: string disabled?: boolean package: string - aisdk?: true settings?: { [key: string]: unknown } From 2f85f4744d90dbb842e3d3459d7a5089b9a12ab4 Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Wed, 24 Jun 2026 23:05:02 +0530 Subject: [PATCH 13/18] feat(llm): add native provider packages --- packages/llm/package.json | 13 ++++-- packages/llm/src/index.ts | 5 +++ packages/llm/src/provider-package.ts | 16 +++++++ .../src/provider-packages/amazon-bedrock.ts | 28 ++++++++++++ .../provider-packages/anthropic-messages.ts | 15 +++++++ .../llm/src/provider-packages/openai-chat.ts | 20 +++++++++ .../openai-compatible-chat.ts | 17 +++++++ .../src/provider-packages/openai-responses.ts | 25 +++++++++++ packages/llm/src/provider-packages/shared.ts | 8 ++++ packages/llm/test/provider-package.test.ts | 45 +++++++++++++++++++ 10 files changed, 188 insertions(+), 4 deletions(-) create mode 100644 packages/llm/src/provider-package.ts create mode 100644 packages/llm/src/provider-packages/amazon-bedrock.ts create mode 100644 packages/llm/src/provider-packages/anthropic-messages.ts create mode 100644 packages/llm/src/provider-packages/openai-chat.ts create mode 100644 packages/llm/src/provider-packages/openai-compatible-chat.ts create mode 100644 packages/llm/src/provider-packages/openai-responses.ts create mode 100644 packages/llm/src/provider-packages/shared.ts create mode 100644 packages/llm/test/provider-package.test.ts diff --git a/packages/llm/package.json b/packages/llm/package.json index d5b370c7d4..6b52dccfe9 100644 --- a/packages/llm/package.json +++ b/packages/llm/package.json @@ -15,14 +15,19 @@ "./route": "./src/route/index.ts", "./provider": "./src/provider.ts", "./providers": "./src/providers/index.ts", - "./providers/amazon-bedrock": "./src/providers/amazon-bedrock.ts", - "./providers/anthropic": "./src/providers/anthropic.ts", + "./provider-package": "./src/provider-package.ts", + "./providers/amazon-bedrock": "./src/provider-packages/amazon-bedrock.ts", + "./providers/anthropic": "./src/provider-packages/anthropic-messages.ts", + "./providers/anthropic/messages": "./src/provider-packages/anthropic-messages.ts", "./providers/azure": "./src/providers/azure.ts", "./providers/cloudflare": "./src/providers/cloudflare.ts", "./providers/github-copilot": "./src/providers/github-copilot.ts", "./providers/google": "./src/providers/google.ts", - "./providers/openai": "./src/providers/openai.ts", - "./providers/openai-compatible": "./src/providers/openai-compatible.ts", + "./providers/openai": "./src/provider-packages/openai-responses.ts", + "./providers/openai/responses": "./src/provider-packages/openai-responses.ts", + "./providers/openai/chat": "./src/provider-packages/openai-chat.ts", + "./providers/openai-compatible": "./src/provider-packages/openai-compatible-chat.ts", + "./providers/openai-compatible/chat": "./src/provider-packages/openai-compatible-chat.ts", "./providers/openai-compatible-profile": "./src/providers/openai-compatible-profile.ts", "./providers/openrouter": "./src/providers/openrouter.ts", "./providers/xai": "./src/providers/xai.ts", diff --git a/packages/llm/src/index.ts b/packages/llm/src/index.ts index 735520ff77..843b4536a6 100644 --- a/packages/llm/src/index.ts +++ b/packages/llm/src/index.ts @@ -1,6 +1,7 @@ export { LLMClient } from "./route/client" export { Auth } from "./route/auth" export { Provider } from "./provider" +export { ProviderPackage } from "./provider-package" export { isContextOverflow, isContextOverflowFailure } from "./provider-error" export type { RouteModelInput, @@ -31,3 +32,7 @@ export type { ModelFactory as ProviderModelFactory, ModelOptions as ProviderModelOptions, } from "./provider" +export type { + Definition as ProviderPackageDefinition, + Settings as ProviderPackageSettings, +} from "./provider-package" diff --git a/packages/llm/src/provider-package.ts b/packages/llm/src/provider-package.ts new file mode 100644 index 0000000000..977a211864 --- /dev/null +++ b/packages/llm/src/provider-package.ts @@ -0,0 +1,16 @@ +import type { Model } from "./schema" + +export interface Settings extends Readonly> { + readonly headers?: Readonly> + readonly body?: Readonly> + readonly limits?: { + readonly context: number + readonly output: number + } +} + +export interface Definition { + readonly model: (id: string, settings: ProviderSettings) => Model +} + +export * as ProviderPackage from "./provider-package" diff --git a/packages/llm/src/provider-packages/amazon-bedrock.ts b/packages/llm/src/provider-packages/amazon-bedrock.ts new file mode 100644 index 0000000000..f00b2056ae --- /dev/null +++ b/packages/llm/src/provider-packages/amazon-bedrock.ts @@ -0,0 +1,28 @@ +import type { ProviderPackage } from "../provider-package" +import * as AmazonBedrock from "../providers/amazon-bedrock" +import type { BedrockCredentials } from "../protocols/bedrock-converse" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly auth?: "bearer" | "sigv4" + readonly baseURL?: string + readonly credentials?: BedrockCredentials + readonly region?: string + readonly topP?: number +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => { + if (settings.auth === "bearer" && settings.apiKey === undefined) + throw new Error("Amazon Bedrock bearer auth requires apiKey") + if (settings.auth === "sigv4" && settings.apiKey !== undefined) + throw new Error("Amazon Bedrock SigV4 auth does not accept apiKey") + return AmazonBedrock.configure({ + ...defaults(settings), + apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey, + baseURL: settings.baseURL, + credentials: settings.credentials, + generation: settings.topP === undefined ? undefined : { topP: settings.topP }, + region: settings.region, + }).model(id) +} diff --git a/packages/llm/src/provider-packages/anthropic-messages.ts b/packages/llm/src/provider-packages/anthropic-messages.ts new file mode 100644 index 0000000000..be6def4081 --- /dev/null +++ b/packages/llm/src/provider-packages/anthropic-messages.ts @@ -0,0 +1,15 @@ +import type { ProviderPackage } from "../provider-package" +import * as Anthropic from "../providers/anthropic" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => + Anthropic.configure({ + ...defaults(settings), + apiKey: settings.apiKey, + baseURL: settings.baseURL, + }).model(id) diff --git a/packages/llm/src/provider-packages/openai-chat.ts b/packages/llm/src/provider-packages/openai-chat.ts new file mode 100644 index 0000000000..6a6d04c704 --- /dev/null +++ b/packages/llm/src/provider-packages/openai-chat.ts @@ -0,0 +1,20 @@ +import type { ProviderPackage } from "../provider-package" +import * as OpenAI from "../providers/openai" +import type { OpenAIProviderOptionsInput } from "../providers/openai-options" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string + readonly queryParams?: Readonly> + readonly providerOptions?: OpenAIProviderOptionsInput +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => + OpenAI.configure({ + ...defaults(settings), + apiKey: settings.apiKey, + baseURL: settings.baseURL, + queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, + providerOptions: settings.providerOptions, + }).chat(id) diff --git a/packages/llm/src/provider-packages/openai-compatible-chat.ts b/packages/llm/src/provider-packages/openai-compatible-chat.ts new file mode 100644 index 0000000000..ba7d569b9c --- /dev/null +++ b/packages/llm/src/provider-packages/openai-compatible-chat.ts @@ -0,0 +1,17 @@ +import type { ProviderPackage } from "../provider-package" +import * as OpenAICompatible from "../providers/openai-compatible" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL: string + readonly provider?: string +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => + OpenAICompatible.configure({ + ...defaults(settings), + apiKey: settings.apiKey, + baseURL: settings.baseURL, + provider: settings.provider, + }).model(id) diff --git a/packages/llm/src/provider-packages/openai-responses.ts b/packages/llm/src/provider-packages/openai-responses.ts new file mode 100644 index 0000000000..4851a96a34 --- /dev/null +++ b/packages/llm/src/provider-packages/openai-responses.ts @@ -0,0 +1,25 @@ +import type { ProviderPackage } from "../provider-package" +import * as OpenAI from "../providers/openai" +import type { OpenAIProviderOptionsInput } from "../providers/openai-options" +import { defaults } from "./shared" + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string + readonly queryParams?: Readonly> + readonly transport?: "http" | "websocket" + readonly providerOptions?: OpenAIProviderOptionsInput +} + +export const model: ProviderPackage.Definition["model"] = (id, settings) => { + const provider = OpenAI.configure({ + ...defaults(settings), + apiKey: settings.apiKey, + baseURL: settings.baseURL, + queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, + providerOptions: settings.providerOptions, + }) + if (settings.transport === undefined || settings.transport === "http") return provider.responses(id) + if (settings.transport === "websocket") return provider.responsesWebSocket(id) + throw new Error(`Unsupported OpenAI Responses transport: ${String(settings.transport)}`) +} diff --git a/packages/llm/src/provider-packages/shared.ts b/packages/llm/src/provider-packages/shared.ts new file mode 100644 index 0000000000..e3c7ec2444 --- /dev/null +++ b/packages/llm/src/provider-packages/shared.ts @@ -0,0 +1,8 @@ +import type { RouteDefaultsInput } from "../route/client" +import type { ProviderPackage } from "../provider-package" + +export const defaults = (settings: ProviderPackage.Settings): RouteDefaultsInput => ({ + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + limits: settings.limits, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, +}) diff --git a/packages/llm/test/provider-package.test.ts b/packages/llm/test/provider-package.test.ts new file mode 100644 index 0000000000..a4f1627c67 --- /dev/null +++ b/packages/llm/test/provider-package.test.ts @@ -0,0 +1,45 @@ +import { describe, expect, test } from "bun:test" +import { model } from "@opencode-ai/llm/providers/openai" + +describe("provider package entrypoints", () => { + test("semantic API aliases expose the same contract", async () => { + const modules = await Promise.all([ + import("@opencode-ai/llm/providers/openai"), + import("@opencode-ai/llm/providers/openai/responses"), + import("@opencode-ai/llm/providers/openai/chat"), + import("@opencode-ai/llm/providers/anthropic"), + import("@opencode-ai/llm/providers/anthropic/messages"), + import("@opencode-ai/llm/providers/openai-compatible"), + import("@opencode-ai/llm/providers/openai-compatible/chat"), + import("@opencode-ai/llm/providers/amazon-bedrock"), + ]) + + for (const module of modules) expect(module.model).toBeFunction() + expect(modules[0].model).toBe(modules[1].model) + expect(modules[3].model).toBe(modules[4].model) + expect(modules[5].model).toBe(modules[6].model) + }) + + test("maps package settings onto the executable model", () => { + const selected = model("gpt-5", { + apiKey: "fixture", + baseURL: "https://api.openai.test/v1", + headers: { "x-application": "opencode" }, + body: { service_tier: "priority" }, + limits: { context: 200_000, output: 64_000 }, + unrelatedInheritedSetting: true, + }) + + expect(selected.route.id).toBe("openai-responses") + expect(selected.route.defaults.headers).toEqual({ "x-application": "opencode" }) + expect(selected.route.defaults.http?.body).toEqual({ service_tier: "priority" }) + expect(selected.route.defaults.limits).toEqual({ context: 200_000, output: 64_000 }) + }) + + test("selects transport without changing the semantic API", () => { + expect(model("gpt-5", { apiKey: "fixture" }).route.id).toBe("openai-responses") + expect(model("gpt-5", { apiKey: "fixture", transport: "websocket" }).route.id).toBe( + "openai-responses-websocket", + ) + }) +}) From beefda1f8fe017852626baef83a467840604a6fd Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Wed, 24 Jun 2026 23:10:45 +0530 Subject: [PATCH 14/18] refactor(llm): colocate provider package logic --- packages/llm/package.json | 14 ++++----- .../src/provider-packages/amazon-bedrock.ts | 28 ------------------ .../provider-packages/anthropic-messages.ts | 15 ---------- .../llm/src/provider-packages/openai-chat.ts | 20 ------------- .../openai-compatible-chat.ts | 17 ----------- .../src/provider-packages/openai-responses.ts | 25 ---------------- packages/llm/src/provider-packages/shared.ts | 8 ----- packages/llm/src/providers/amazon-bedrock.ts | 27 ++++++++++++++++- packages/llm/src/providers/anthropic.ts | 15 +++++++++- .../llm/src/providers/openai-compatible.ts | 17 +++++++++++ packages/llm/src/providers/openai.ts | 29 ++++++++++++++++++- packages/llm/src/providers/openai/chat.ts | 2 ++ .../llm/src/providers/openai/responses.ts | 2 ++ packages/llm/test/exports.test.ts | 1 - packages/llm/test/provider-package.test.ts | 4 --- 15 files changed, 95 insertions(+), 129 deletions(-) delete mode 100644 packages/llm/src/provider-packages/amazon-bedrock.ts delete mode 100644 packages/llm/src/provider-packages/anthropic-messages.ts delete mode 100644 packages/llm/src/provider-packages/openai-chat.ts delete mode 100644 packages/llm/src/provider-packages/openai-compatible-chat.ts delete mode 100644 packages/llm/src/provider-packages/openai-responses.ts delete mode 100644 packages/llm/src/provider-packages/shared.ts create mode 100644 packages/llm/src/providers/openai/chat.ts create mode 100644 packages/llm/src/providers/openai/responses.ts diff --git a/packages/llm/package.json b/packages/llm/package.json index 6b52dccfe9..f78509d247 100644 --- a/packages/llm/package.json +++ b/packages/llm/package.json @@ -16,18 +16,16 @@ "./provider": "./src/provider.ts", "./providers": "./src/providers/index.ts", "./provider-package": "./src/provider-package.ts", - "./providers/amazon-bedrock": "./src/provider-packages/amazon-bedrock.ts", - "./providers/anthropic": "./src/provider-packages/anthropic-messages.ts", - "./providers/anthropic/messages": "./src/provider-packages/anthropic-messages.ts", + "./providers/amazon-bedrock": "./src/providers/amazon-bedrock.ts", + "./providers/anthropic": "./src/providers/anthropic.ts", "./providers/azure": "./src/providers/azure.ts", "./providers/cloudflare": "./src/providers/cloudflare.ts", "./providers/github-copilot": "./src/providers/github-copilot.ts", "./providers/google": "./src/providers/google.ts", - "./providers/openai": "./src/provider-packages/openai-responses.ts", - "./providers/openai/responses": "./src/provider-packages/openai-responses.ts", - "./providers/openai/chat": "./src/provider-packages/openai-chat.ts", - "./providers/openai-compatible": "./src/provider-packages/openai-compatible-chat.ts", - "./providers/openai-compatible/chat": "./src/provider-packages/openai-compatible-chat.ts", + "./providers/openai": "./src/providers/openai.ts", + "./providers/openai/responses": "./src/providers/openai/responses.ts", + "./providers/openai/chat": "./src/providers/openai/chat.ts", + "./providers/openai-compatible": "./src/providers/openai-compatible.ts", "./providers/openai-compatible-profile": "./src/providers/openai-compatible-profile.ts", "./providers/openrouter": "./src/providers/openrouter.ts", "./providers/xai": "./src/providers/xai.ts", diff --git a/packages/llm/src/provider-packages/amazon-bedrock.ts b/packages/llm/src/provider-packages/amazon-bedrock.ts deleted file mode 100644 index f00b2056ae..0000000000 --- a/packages/llm/src/provider-packages/amazon-bedrock.ts +++ /dev/null @@ -1,28 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as AmazonBedrock from "../providers/amazon-bedrock" -import type { BedrockCredentials } from "../protocols/bedrock-converse" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly auth?: "bearer" | "sigv4" - readonly baseURL?: string - readonly credentials?: BedrockCredentials - readonly region?: string - readonly topP?: number -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => { - if (settings.auth === "bearer" && settings.apiKey === undefined) - throw new Error("Amazon Bedrock bearer auth requires apiKey") - if (settings.auth === "sigv4" && settings.apiKey !== undefined) - throw new Error("Amazon Bedrock SigV4 auth does not accept apiKey") - return AmazonBedrock.configure({ - ...defaults(settings), - apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey, - baseURL: settings.baseURL, - credentials: settings.credentials, - generation: settings.topP === undefined ? undefined : { topP: settings.topP }, - region: settings.region, - }).model(id) -} diff --git a/packages/llm/src/provider-packages/anthropic-messages.ts b/packages/llm/src/provider-packages/anthropic-messages.ts deleted file mode 100644 index be6def4081..0000000000 --- a/packages/llm/src/provider-packages/anthropic-messages.ts +++ /dev/null @@ -1,15 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as Anthropic from "../providers/anthropic" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly baseURL?: string -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => - Anthropic.configure({ - ...defaults(settings), - apiKey: settings.apiKey, - baseURL: settings.baseURL, - }).model(id) diff --git a/packages/llm/src/provider-packages/openai-chat.ts b/packages/llm/src/provider-packages/openai-chat.ts deleted file mode 100644 index 6a6d04c704..0000000000 --- a/packages/llm/src/provider-packages/openai-chat.ts +++ /dev/null @@ -1,20 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as OpenAI from "../providers/openai" -import type { OpenAIProviderOptionsInput } from "../providers/openai-options" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly baseURL?: string - readonly queryParams?: Readonly> - readonly providerOptions?: OpenAIProviderOptionsInput -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => - OpenAI.configure({ - ...defaults(settings), - apiKey: settings.apiKey, - baseURL: settings.baseURL, - queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, - providerOptions: settings.providerOptions, - }).chat(id) diff --git a/packages/llm/src/provider-packages/openai-compatible-chat.ts b/packages/llm/src/provider-packages/openai-compatible-chat.ts deleted file mode 100644 index ba7d569b9c..0000000000 --- a/packages/llm/src/provider-packages/openai-compatible-chat.ts +++ /dev/null @@ -1,17 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as OpenAICompatible from "../providers/openai-compatible" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly baseURL: string - readonly provider?: string -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => - OpenAICompatible.configure({ - ...defaults(settings), - apiKey: settings.apiKey, - baseURL: settings.baseURL, - provider: settings.provider, - }).model(id) diff --git a/packages/llm/src/provider-packages/openai-responses.ts b/packages/llm/src/provider-packages/openai-responses.ts deleted file mode 100644 index 4851a96a34..0000000000 --- a/packages/llm/src/provider-packages/openai-responses.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { ProviderPackage } from "../provider-package" -import * as OpenAI from "../providers/openai" -import type { OpenAIProviderOptionsInput } from "../providers/openai-options" -import { defaults } from "./shared" - -export interface Settings extends ProviderPackage.Settings { - readonly apiKey?: string - readonly baseURL?: string - readonly queryParams?: Readonly> - readonly transport?: "http" | "websocket" - readonly providerOptions?: OpenAIProviderOptionsInput -} - -export const model: ProviderPackage.Definition["model"] = (id, settings) => { - const provider = OpenAI.configure({ - ...defaults(settings), - apiKey: settings.apiKey, - baseURL: settings.baseURL, - queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, - providerOptions: settings.providerOptions, - }) - if (settings.transport === undefined || settings.transport === "http") return provider.responses(id) - if (settings.transport === "websocket") return provider.responsesWebSocket(id) - throw new Error(`Unsupported OpenAI Responses transport: ${String(settings.transport)}`) -} diff --git a/packages/llm/src/provider-packages/shared.ts b/packages/llm/src/provider-packages/shared.ts deleted file mode 100644 index e3c7ec2444..0000000000 --- a/packages/llm/src/provider-packages/shared.ts +++ /dev/null @@ -1,8 +0,0 @@ -import type { RouteDefaultsInput } from "../route/client" -import type { ProviderPackage } from "../provider-package" - -export const defaults = (settings: ProviderPackage.Settings): RouteDefaultsInput => ({ - headers: settings.headers === undefined ? undefined : { ...settings.headers }, - limits: settings.limits, - http: settings.body === undefined ? undefined : { body: { ...settings.body } }, -}) diff --git a/packages/llm/src/providers/amazon-bedrock.ts b/packages/llm/src/providers/amazon-bedrock.ts index 2f1791e0d6..e578d614c6 100644 --- a/packages/llm/src/providers/amazon-bedrock.ts +++ b/packages/llm/src/providers/amazon-bedrock.ts @@ -1,5 +1,6 @@ import type { RouteDefaultsInput } from "../route/client" import { Auth } from "../route/auth" +import type { ProviderPackage } from "../provider-package" import { ProviderID, type ModelID } from "../schema" import * as BedrockConverse from "../protocols/bedrock-converse" import type { BedrockCredentials } from "../protocols/bedrock-converse" @@ -15,6 +16,15 @@ export type Config = RouteDefaultsInput & { /** Override the computed `https://bedrock-runtime..amazonaws.com` URL. */ readonly baseURL?: string } + +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly auth?: "bearer" | "sigv4" + readonly baseURL?: string + readonly credentials?: BedrockCredentials + readonly region?: string + readonly topP?: number +} export const routes = [BedrockConverse.route] const bedrockBaseURL = (region: string) => `https://bedrock-runtime.${region}.amazonaws.com` @@ -40,4 +50,19 @@ export const configure = (input: Config = {}) => { } export const provider = configure() -export const model = provider.model +export const model: ProviderPackage.Definition["model"] = (id, settings) => { + if (settings.auth === "bearer" && settings.apiKey === undefined) + throw new Error("Amazon Bedrock bearer auth requires apiKey") + if (settings.auth === "sigv4" && settings.apiKey !== undefined) + throw new Error("Amazon Bedrock SigV4 auth does not accept apiKey") + return configure({ + apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey, + baseURL: settings.baseURL, + credentials: settings.credentials, + generation: settings.topP === undefined ? undefined : { topP: settings.topP }, + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, + limits: settings.limits, + region: settings.region, + }).model(id) +} diff --git a/packages/llm/src/providers/anthropic.ts b/packages/llm/src/providers/anthropic.ts index 0c9640af5e..8ef0293eeb 100644 --- a/packages/llm/src/providers/anthropic.ts +++ b/packages/llm/src/providers/anthropic.ts @@ -1,6 +1,7 @@ import type { RouteDefaultsInput } from "../route/client" import { Auth } from "../route/auth" import type { ProviderAuthOption } from "../route/auth-options" +import type { ProviderPackage } from "../provider-package" import { ProviderID, type ModelID } from "../schema" import * as AnthropicMessages from "../protocols/anthropic-messages" @@ -10,6 +11,11 @@ export const routes = [AnthropicMessages.route] export type Config = RouteDefaultsInput & ProviderAuthOption<"optional"> & { readonly baseURL?: string } +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string +} + const auth = (options: ProviderAuthOption<"optional">) => { if ("auth" in options && options.auth) return options.auth return Auth.optional("apiKey" in options ? options.apiKey : undefined, "apiKey") @@ -32,4 +38,11 @@ export const configure = (input: Config = {}) => { } export const provider = configure() -export const model = provider.model +export const model: ProviderPackage.Definition["model"] = (id, settings) => + configure({ + apiKey: settings.apiKey, + baseURL: settings.baseURL, + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, + limits: settings.limits, + }).model(id) diff --git a/packages/llm/src/providers/openai-compatible.ts b/packages/llm/src/providers/openai-compatible.ts index a79f65f6df..36d9b3fd5a 100644 --- a/packages/llm/src/providers/openai-compatible.ts +++ b/packages/llm/src/providers/openai-compatible.ts @@ -2,6 +2,7 @@ import { ProviderID, type ModelID } from "../schema" import * as OpenAICompatibleChat from "../protocols/openai-compatible-chat" import type { RouteDefaultsInput } from "../route/client" import { AuthOptions, type ProviderAuthOption } from "../route/auth-options" +import type { ProviderPackage } from "../provider-package" import { profiles, type OpenAICompatibleProfile } from "./openai-compatible-profile" export const id = ProviderID.make("openai-compatible") @@ -12,6 +13,12 @@ type GenericModelOptions = RouteDefaultsInput & readonly baseURL: string } +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL: string + readonly provider?: string +} + export type FamilyModelOptions = RouteDefaultsInput & ProviderAuthOption<"optional"> & { readonly baseURL?: string @@ -56,6 +63,16 @@ export const provider = { configure, } +export const model: ProviderPackage.Definition["model"] = (id, settings) => + configure({ + apiKey: settings.apiKey, + baseURL: settings.baseURL, + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, + limits: settings.limits, + provider: settings.provider, + }).model(id) + export const baseten = define(profiles.baseten) export const cerebras = define(profiles.cerebras) export const deepinfra = define(profiles.deepinfra) diff --git a/packages/llm/src/providers/openai.ts b/packages/llm/src/providers/openai.ts index 098cad8493..b40a94514b 100644 --- a/packages/llm/src/providers/openai.ts +++ b/packages/llm/src/providers/openai.ts @@ -1,5 +1,6 @@ import { AuthOptions, type ProviderAuthOption } from "../route/auth-options" import type { Route, RouteDefaultsInput } from "../route/client" +import type { ProviderPackage } from "../provider-package" import { ProviderID, type ModelID } from "../schema" import * as OpenAIChat from "../protocols/openai-chat" import * as OpenAIResponses from "../protocols/openai-responses" @@ -21,6 +22,14 @@ export type Config = RouteDefaultsInput & readonly providerOptions?: OpenAIProviderOptionsInput } +export interface Settings extends ProviderPackage.Settings { + readonly apiKey?: string + readonly baseURL?: string + readonly queryParams?: Readonly> + readonly transport?: "http" | "websocket" + readonly providerOptions?: OpenAIProviderOptionsInput +} + const auth = (options: ProviderAuthOption<"optional">) => AuthOptions.bearer(options, "OPENAI_API_KEY") const defaults = (input: Config) => { @@ -57,7 +66,25 @@ export const configure = (input: Config = {}) => { export const provider = configure() -export const model = provider.model +const config = (settings: Settings): Config => ({ + apiKey: settings.apiKey, + baseURL: settings.baseURL, + headers: settings.headers === undefined ? undefined : { ...settings.headers }, + http: settings.body === undefined ? undefined : { body: { ...settings.body } }, + limits: settings.limits, + providerOptions: settings.providerOptions, + queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, +}) + +export const model: ProviderPackage.Definition["model"] = (id, settings) => { + const configured = configure(config(settings)) + if (settings.transport === undefined || settings.transport === "http") return configured.responses(id) + if (settings.transport === "websocket") return configured.responsesWebSocket(id) + throw new Error(`Unsupported OpenAI Responses transport: ${String(settings.transport)}`) +} + +export const chatModel: ProviderPackage.Definition["model"] = (id, settings) => + configure(config(settings)).chat(id) export const responses = provider.responses export const responsesWebSocket = provider.responsesWebSocket export const chat = provider.chat diff --git a/packages/llm/src/providers/openai/chat.ts b/packages/llm/src/providers/openai/chat.ts new file mode 100644 index 0000000000..eb92db8ac5 --- /dev/null +++ b/packages/llm/src/providers/openai/chat.ts @@ -0,0 +1,2 @@ +export { chatModel as model } from "../openai" +export type { Settings } from "../openai" diff --git a/packages/llm/src/providers/openai/responses.ts b/packages/llm/src/providers/openai/responses.ts new file mode 100644 index 0000000000..4db3a232c7 --- /dev/null +++ b/packages/llm/src/providers/openai/responses.ts @@ -0,0 +1,2 @@ +export { model } from "../openai" +export type { Settings } from "../openai" diff --git a/packages/llm/test/exports.test.ts b/packages/llm/test/exports.test.ts index 693a21638b..6ed66a0d8e 100644 --- a/packages/llm/test/exports.test.ts +++ b/packages/llm/test/exports.test.ts @@ -30,7 +30,6 @@ describe("public exports", () => { test("provider barrels expose user-facing facades", () => { expect(OpenAI.model).toBeFunction() - expect(OpenAI.provider.model).toBe(OpenAI.model) expect(OpenAI.provider.responses).toBe(OpenAI.responses) expect(OpenAI.provider.responsesWebSocket).toBe(OpenAI.responsesWebSocket) expect(OpenAI.configure({ apiKey: "fixture" }).responses).toBeFunction() diff --git a/packages/llm/test/provider-package.test.ts b/packages/llm/test/provider-package.test.ts index a4f1627c67..c8cba78eb1 100644 --- a/packages/llm/test/provider-package.test.ts +++ b/packages/llm/test/provider-package.test.ts @@ -8,16 +8,12 @@ describe("provider package entrypoints", () => { import("@opencode-ai/llm/providers/openai/responses"), import("@opencode-ai/llm/providers/openai/chat"), import("@opencode-ai/llm/providers/anthropic"), - import("@opencode-ai/llm/providers/anthropic/messages"), import("@opencode-ai/llm/providers/openai-compatible"), - import("@opencode-ai/llm/providers/openai-compatible/chat"), import("@opencode-ai/llm/providers/amazon-bedrock"), ]) for (const module of modules) expect(module.model).toBeFunction() expect(modules[0].model).toBe(modules[1].model) - expect(modules[3].model).toBe(modules[4].model) - expect(modules[5].model).toBe(modules[6].model) }) test("maps package settings onto the executable model", () => { From 3a09383d331e3b3c8ead76a81f11b934f7d4b7d5 Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Wed, 24 Jun 2026 23:29:06 +0530 Subject: [PATCH 15/18] refactor(llm): name provider model identity --- packages/llm/src/provider-package.ts | 2 +- packages/llm/src/providers/amazon-bedrock.ts | 4 ++-- packages/llm/src/providers/anthropic.ts | 4 ++-- packages/llm/src/providers/openai-compatible.ts | 4 ++-- packages/llm/src/providers/openai.ts | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/llm/src/provider-package.ts b/packages/llm/src/provider-package.ts index 977a211864..fd878a9d06 100644 --- a/packages/llm/src/provider-package.ts +++ b/packages/llm/src/provider-package.ts @@ -10,7 +10,7 @@ export interface Settings extends Readonly> { } export interface Definition { - readonly model: (id: string, settings: ProviderSettings) => Model + readonly model: (modelID: string, settings: ProviderSettings) => Model } export * as ProviderPackage from "./provider-package" diff --git a/packages/llm/src/providers/amazon-bedrock.ts b/packages/llm/src/providers/amazon-bedrock.ts index e578d614c6..4e5040c9ec 100644 --- a/packages/llm/src/providers/amazon-bedrock.ts +++ b/packages/llm/src/providers/amazon-bedrock.ts @@ -50,7 +50,7 @@ export const configure = (input: Config = {}) => { } export const provider = configure() -export const model: ProviderPackage.Definition["model"] = (id, settings) => { +export const model: ProviderPackage.Definition["model"] = (modelID, settings) => { if (settings.auth === "bearer" && settings.apiKey === undefined) throw new Error("Amazon Bedrock bearer auth requires apiKey") if (settings.auth === "sigv4" && settings.apiKey !== undefined) @@ -64,5 +64,5 @@ export const model: ProviderPackage.Definition["model"] = (id, setting http: settings.body === undefined ? undefined : { body: { ...settings.body } }, limits: settings.limits, region: settings.region, - }).model(id) + }).model(modelID) } diff --git a/packages/llm/src/providers/anthropic.ts b/packages/llm/src/providers/anthropic.ts index 8ef0293eeb..1bf8bf569c 100644 --- a/packages/llm/src/providers/anthropic.ts +++ b/packages/llm/src/providers/anthropic.ts @@ -38,11 +38,11 @@ export const configure = (input: Config = {}) => { } export const provider = configure() -export const model: ProviderPackage.Definition["model"] = (id, settings) => +export const model: ProviderPackage.Definition["model"] = (modelID, settings) => configure({ apiKey: settings.apiKey, baseURL: settings.baseURL, headers: settings.headers === undefined ? undefined : { ...settings.headers }, http: settings.body === undefined ? undefined : { body: { ...settings.body } }, limits: settings.limits, - }).model(id) + }).model(modelID) diff --git a/packages/llm/src/providers/openai-compatible.ts b/packages/llm/src/providers/openai-compatible.ts index 36d9b3fd5a..8b5d23eed7 100644 --- a/packages/llm/src/providers/openai-compatible.ts +++ b/packages/llm/src/providers/openai-compatible.ts @@ -63,7 +63,7 @@ export const provider = { configure, } -export const model: ProviderPackage.Definition["model"] = (id, settings) => +export const model: ProviderPackage.Definition["model"] = (modelID, settings) => configure({ apiKey: settings.apiKey, baseURL: settings.baseURL, @@ -71,7 +71,7 @@ export const model: ProviderPackage.Definition["model"] = (id, setting http: settings.body === undefined ? undefined : { body: { ...settings.body } }, limits: settings.limits, provider: settings.provider, - }).model(id) + }).model(modelID) export const baseten = define(profiles.baseten) export const cerebras = define(profiles.cerebras) diff --git a/packages/llm/src/providers/openai.ts b/packages/llm/src/providers/openai.ts index b40a94514b..6b49b9def2 100644 --- a/packages/llm/src/providers/openai.ts +++ b/packages/llm/src/providers/openai.ts @@ -76,15 +76,15 @@ const config = (settings: Settings): Config => ({ queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams }, }) -export const model: ProviderPackage.Definition["model"] = (id, settings) => { +export const model: ProviderPackage.Definition["model"] = (modelID, settings) => { const configured = configure(config(settings)) - if (settings.transport === undefined || settings.transport === "http") return configured.responses(id) - if (settings.transport === "websocket") return configured.responsesWebSocket(id) + if (settings.transport === undefined || settings.transport === "http") return configured.responses(modelID) + if (settings.transport === "websocket") return configured.responsesWebSocket(modelID) throw new Error(`Unsupported OpenAI Responses transport: ${String(settings.transport)}`) } -export const chatModel: ProviderPackage.Definition["model"] = (id, settings) => - configure(config(settings)).chat(id) +export const chatModel: ProviderPackage.Definition["model"] = (modelID, settings) => + configure(config(settings)).chat(modelID) export const responses = provider.responses export const responsesWebSocket = provider.responsesWebSocket export const chat = provider.chat From 8efd8783d05dee0825699d2fae57facc3c2beee5 Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Thu, 25 Jun 2026 20:36:02 +0530 Subject: [PATCH 16/18] fix(schema): adapt legacy catalog responses --- packages/core/src/model.ts | 28 ++++++++++++++++++++++++ packages/core/src/provider.ts | 16 ++++++++++++++ packages/server/src/handlers/model.ts | 3 ++- packages/server/src/handlers/provider.ts | 7 ++++-- 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/packages/core/src/model.ts b/packages/core/src/model.ts index bae4408560..293954ecb2 100644 --- a/packages/core/src/model.ts +++ b/packages/core/src/model.ts @@ -78,6 +78,34 @@ export const Info = Schema.Struct({ export type MutableInfo = Omit, "api"> & { api: ProviderV2.MutableApi } +export function flatten(info: Info): Model.Info { + return Model.Info.make({ + id: info.id, + modelID: info.api.id === info.id ? undefined : info.api.id, + providerID: info.providerID, + family: info.family, + name: info.name, + package: info.api.type === "aisdk" ? `aisdk:${info.api.package}` : undefined, + settings: { + ...info.api.settings, + ...(info.api.url === undefined ? {} : { baseURL: info.api.url }), + }, + headers: info.request.headers, + body: info.request.body, + capabilities: info.capabilities, + variants: info.variants.map((variant) => ({ + id: variant.id, + headers: variant.headers, + body: variant.body, + })), + time: info.time, + cost: info.cost, + status: info.status, + enabled: info.enabled, + limit: info.limit, + }) +} + export function parse(input: string): { providerID: ProviderV2.ID; modelID: ID } { const [providerID, ...modelID] = input.split("/") return { diff --git a/packages/core/src/provider.ts b/packages/core/src/provider.ts index d1a541dd65..40f1f357d6 100644 --- a/packages/core/src/provider.ts +++ b/packages/core/src/provider.ts @@ -59,3 +59,19 @@ export type MutableApi = T extends Api : never export type MutableInfo = Omit, "api"> & { api: MutableApi } + +export function flatten(info: Info): Provider.Info { + return Provider.Info.make({ + id: info.id, + integrationID: info.integrationID, + name: info.name, + disabled: info.disabled, + package: info.api.type === "aisdk" ? `aisdk:${info.api.package}` : "", + settings: { + ...info.api.settings, + ...(info.api.url === undefined ? {} : { baseURL: info.api.url }), + }, + headers: info.request.headers, + body: info.request.body, + }) +} diff --git a/packages/server/src/handlers/model.ts b/packages/server/src/handlers/model.ts index 36639ae7b1..a2c2fd4960 100644 --- a/packages/server/src/handlers/model.ts +++ b/packages/server/src/handlers/model.ts @@ -3,6 +3,7 @@ import { Effect } from "effect" import { HttpApiBuilder } from "effect/unstable/httpapi" import { Api } from "../api" import { response } from "../location" +import { ModelV2 } from "@opencode-ai/core/model" export const ModelHandler = HttpApiBuilder.group(Api, "server.model", (handlers) => Effect.gen(function* () { @@ -10,7 +11,7 @@ export const ModelHandler = HttpApiBuilder.group(Api, "server.model", (handlers) "model.list", Effect.fn(function* () { const catalog = yield* Catalog.Service - return yield* response(catalog.model.available()) + return yield* response(catalog.model.available().pipe(Effect.map((models) => models.map(ModelV2.flatten)))) }), ) }), diff --git a/packages/server/src/handlers/provider.ts b/packages/server/src/handlers/provider.ts index c3f25ab0df..9144cde29f 100644 --- a/packages/server/src/handlers/provider.ts +++ b/packages/server/src/handlers/provider.ts @@ -3,6 +3,7 @@ import { Effect } from "effect" import { HttpApiBuilder } from "effect/unstable/httpapi" import { Api } from "../api" import { ProviderNotFoundError } from "@opencode-ai/protocol/errors" +import { ProviderV2 } from "@opencode-ai/core/provider" import { response } from "../location" export const ProviderHandler = HttpApiBuilder.group(Api, "server.provider", (handlers) => @@ -12,7 +13,9 @@ export const ProviderHandler = HttpApiBuilder.group(Api, "server.provider", (han "provider.list", Effect.fn(function* () { const catalog = yield* Catalog.Service - return yield* response(catalog.provider.available()) + return yield* response( + catalog.provider.available().pipe(Effect.map((providers) => providers.map(ProviderV2.flatten))), + ) }), ) .handle( @@ -25,7 +28,7 @@ export const ProviderHandler = HttpApiBuilder.group(Api, "server.provider", (han providerID: ctx.params.providerID, message: `Provider not found: ${ctx.params.providerID}`, }) - return yield* response(Effect.succeed(provider)) + return yield* response(Effect.succeed(ProviderV2.flatten(provider))) }), ) }), From 864f16c703e83bc17b13b5618286f749a2f8d1de Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Mon, 29 Jun 2026 19:50:12 +0530 Subject: [PATCH 17/18] refactor(core): consolidate provider helpers --- packages/core/src/catalog.ts | 7 +- packages/core/src/config/plugin/provider.ts | 19 ++-- packages/core/src/provider-overlay.ts | 38 ------- packages/core/src/provider-package.ts | 75 ------------ packages/core/src/provider.ts | 119 ++++++++++++++++++++ packages/core/src/session/runner/model.ts | 31 +++-- 6 files changed, 152 insertions(+), 137 deletions(-) delete mode 100644 packages/core/src/provider-overlay.ts delete mode 100644 packages/core/src/provider-package.ts diff --git a/packages/core/src/catalog.ts b/packages/core/src/catalog.ts index a9e01c66e6..5db968a22c 100644 --- a/packages/core/src/catalog.ts +++ b/packages/core/src/catalog.ts @@ -8,7 +8,6 @@ import { EventV2 } from "./event" import { Policy } from "./policy" import { State } from "./state" import { Integration } from "./integration" -import { ProviderOverlay } from "./provider-overlay" export type ProviderRecord = { provider: ProviderV2.MutableInfo @@ -79,9 +78,9 @@ export const layer = Layer.effect( return ModelV2.Info.make({ ...model, package: model.package ?? provider.package, - settings: ProviderOverlay.merge(provider.settings, model.settings), - headers: ProviderOverlay.headers(provider.headers, model.headers), - body: ProviderOverlay.merge(provider.body, model.body), + settings: ProviderV2.mergeOverlay(provider.settings, model.settings), + headers: ProviderV2.mergeHeaders(provider.headers, model.headers), + body: ProviderV2.mergeOverlay(provider.body, model.body), }) } diff --git a/packages/core/src/config/plugin/provider.ts b/packages/core/src/config/plugin/provider.ts index 4dd4e064f2..8c1811ff8e 100644 --- a/packages/core/src/config/plugin/provider.ts +++ b/packages/core/src/config/plugin/provider.ts @@ -4,7 +4,6 @@ import { define } from "../../plugin/internal" import { Effect } from "effect" import { Config } from "../../config" import { ModelV2 } from "../../model" -import { ProviderOverlay } from "../../provider-overlay" import { ProviderV2 } from "../../provider" export const Plugin = define({ @@ -55,9 +54,9 @@ export const Plugin = define({ if (item.name !== undefined) provider.name = item.name if (item.package !== undefined) provider.package = item.package if (item.settings !== undefined) - provider.settings = ProviderOverlay.merge(provider.settings, item.settings) - if (item.headers !== undefined) provider.headers = ProviderOverlay.headers(provider.headers, item.headers) - if (item.body !== undefined) provider.body = ProviderOverlay.merge(provider.body, item.body) + provider.settings = ProviderV2.mergeOverlay(provider.settings, item.settings) + if (item.headers !== undefined) provider.headers = ProviderV2.mergeHeaders(provider.headers, item.headers) + if (item.body !== undefined) provider.body = ProviderV2.mergeOverlay(provider.body, item.body) }) for (const [id, config] of Object.entries(item.models ?? {})) { catalog.model.update(providerID, id, (model) => { @@ -66,9 +65,9 @@ export const Plugin = define({ if (config.modelID !== undefined) model.modelID = config.modelID if (config.package !== undefined) model.package = config.package if (config.settings !== undefined) - model.settings = ProviderOverlay.merge(model.settings, config.settings) - if (config.headers !== undefined) model.headers = ProviderOverlay.headers(model.headers, config.headers) - if (config.body !== undefined) model.body = ProviderOverlay.merge(model.body, config.body) + model.settings = ProviderV2.mergeOverlay(model.settings, config.settings) + if (config.headers !== undefined) model.headers = ProviderV2.mergeHeaders(model.headers, config.headers) + if (config.body !== undefined) model.body = ProviderV2.mergeOverlay(model.body, config.body) if (config.capabilities !== undefined) { model.capabilities = { tools: config.capabilities.tools, @@ -87,10 +86,10 @@ export const Plugin = define({ model.variants.push(existing) } if (variant.settings !== undefined) - existing.settings = ProviderOverlay.merge(existing.settings, variant.settings) + existing.settings = ProviderV2.mergeOverlay(existing.settings, variant.settings) if (variant.headers !== undefined) - existing.headers = ProviderOverlay.headers(existing.headers, variant.headers) - if (variant.body !== undefined) existing.body = ProviderOverlay.merge(existing.body, variant.body) + existing.headers = ProviderV2.mergeHeaders(existing.headers, variant.headers) + if (variant.body !== undefined) existing.body = ProviderV2.mergeOverlay(existing.body, variant.body) } } if (config.cost !== undefined) { diff --git a/packages/core/src/provider-overlay.ts b/packages/core/src/provider-overlay.ts deleted file mode 100644 index f5f7aca8e8..0000000000 --- a/packages/core/src/provider-overlay.ts +++ /dev/null @@ -1,38 +0,0 @@ -export * as ProviderOverlay from "./provider-overlay" - -export function merge( - base: Readonly> | undefined, - overlay: Readonly> | undefined, -): Record | undefined { - if (base === undefined) return overlay && { ...overlay } - if (overlay === undefined) return { ...base } - return Object.fromEntries( - new Set([...Object.keys(base), ...Object.keys(overlay)]).values().map((key) => { - const left = base[key] - const right = overlay[key] - if (right === undefined) return [key, left] - if (plain(left) && plain(right)) return [key, merge(left, right)] - return [key, right] - }), - ) -} - -export function headers( - base: Readonly> | undefined, - overlay: Readonly> | undefined, -) { - return Object.fromEntries( - [...Object.entries(base ?? {}), ...Object.entries(overlay ?? {})] - .reduce((result, entry) => { - result.set(entry[0].toLowerCase(), entry) - return result - }, new Map()) - .values(), - ) -} - -function plain(input: unknown): input is Readonly> { - if (typeof input !== "object" || input === null || Array.isArray(input)) return false - const prototype = Object.getPrototypeOf(input) - return prototype === Object.prototype || prototype === null -} diff --git a/packages/core/src/provider-package.ts b/packages/core/src/provider-package.ts deleted file mode 100644 index 559caf0d0f..0000000000 --- a/packages/core/src/provider-package.ts +++ /dev/null @@ -1,75 +0,0 @@ -export * as ProviderPackage from "./provider-package" - -import { Effect, Option, Schema } from "effect" -import { pathToFileURL } from "url" -import type { Model, ProviderPackageDefinition, ProviderPackageSettings } from "@opencode-ai/llm" -import { Npm } from "./npm" - -const cache = new Map>() - -export class LoadError extends Schema.TaggedErrorClass()("ProviderPackage.LoadError", { - package: Schema.String, - cause: Schema.Defect(), -}) {} - -export const load = Effect.fn("ProviderPackage.load")(function* (specifier: string) { - const npm = Option.getOrUndefined(yield* Effect.serviceOption(Npm.Service)) - const resolved = - specifier.startsWith("file://") || specifier.startsWith("@opencode-ai/llm/") - ? specifier - : yield* Effect.sync(() => { - try { - return import.meta.resolve(specifier) - } catch { - return undefined - } - }) - if (resolved) return yield* importProviderPackage(specifier, resolved) - if (!npm) { - return yield* new LoadError({ - package: specifier, - cause: new Error(`Provider package ${specifier} is not installed`), - }) - } - const installed = yield* npm - .add(packageName(specifier)) - .pipe(Effect.mapError((cause) => new LoadError({ package: specifier, cause }))) - const entrypoint = yield* Effect.try({ - try: () => import.meta.resolve(specifier, pathToFileURL(`${installed.directory}/`).href), - catch: (cause) => new LoadError({ package: specifier, cause }), - }) - return yield* importProviderPackage(specifier, entrypoint) -}) - -const importProviderPackage = Effect.fn("ProviderPackage.import")(function* (specifier: string, entrypoint: string) { - const module = yield* Effect.tryPromise({ - try: () => { - const existing = cache.get(entrypoint) - if (existing) return existing - const loaded = import(entrypoint) - cache.set(entrypoint, loaded) - return loaded - }, - catch: (cause) => new LoadError({ package: specifier, cause }), - }) - if (!isProviderPackage(module)) { - return yield* new LoadError({ - package: specifier, - cause: new Error(`Provider package ${specifier} does not export model(id, settings)`), - }) - } - return module -}) - -export const make = (module: ProviderPackageDefinition, modelID: string, settings: ProviderPackageSettings): Model => - module.model(modelID, settings) - -function isProviderPackage(input: unknown): input is ProviderPackageDefinition { - return typeof input === "object" && input !== null && "model" in input && typeof input.model === "function" -} - -function packageName(specifier: string) { - const parts = specifier.split("/") - if (specifier.startsWith("@")) return parts.slice(0, 2).join("/") - return parts[0] -} diff --git a/packages/core/src/provider.ts b/packages/core/src/provider.ts index 3246c8d36e..d7a48f0e8d 100644 --- a/packages/core/src/provider.ts +++ b/packages/core/src/provider.ts @@ -1,6 +1,10 @@ export * as ProviderV2 from "./provider" +import { Effect, Schema } from "effect" +import { pathToFileURL } from "url" import { Provider } from "@opencode-ai/schema/provider" +import type { Model, ProviderPackageDefinition, ProviderPackageSettings } from "@opencode-ai/llm" +import { Npm } from "./npm" import type { DeepMutable } from "./schema" export const ID = Provider.ID @@ -12,6 +16,81 @@ export const aisdk = (packageName: string) => (isAISDK(packageName) ? packageNam export const packageName = (packageName: string | undefined) => isAISDK(packageName) ? packageName!.slice(AISDK_PREFIX.length) : packageName +export class LoadError extends Schema.TaggedErrorClass()("ProviderV2.LoadError", { + package: Schema.String, + cause: Schema.Defect(), +}) {} +export type ProviderPackage = ProviderPackageDefinition + +const packages = new Map>() + +export const loadPackage = Effect.fn("ProviderV2.loadPackage")(function* (specifier: string, npm?: Npm.Interface) { + const resolved = yield* resolvePackage(specifier) + if (resolved) return yield* importPackage(specifier, resolved) + if (!npm) { + return yield* new LoadError({ + package: specifier, + cause: new Error(`Provider package ${specifier} is not installed`), + }) + } + const installed = yield* npm + .add(rootPackage(specifier)) + .pipe(Effect.mapError((cause) => new LoadError({ package: specifier, cause }))) + const entrypoint = yield* Effect.try({ + try: () => import.meta.resolve(specifier, pathToFileURL(`${installed.directory}/`).href), + catch: (cause) => new LoadError({ package: specifier, cause }), + }) + return yield* importPackage(specifier, entrypoint) +}) + +export const makeModel = ( + module: ProviderPackageDefinition, + modelID: string, + settings: ProviderPackageSettings, +): Model => module.model(modelID, settings) + +export function mergeOverlay( + base: Readonly> | undefined, + overlay: Readonly> | undefined, +): Record | undefined { + if (base === undefined) return overlay && { ...overlay } + if (overlay === undefined) return { ...base } + return Object.fromEntries( + new Set([...Object.keys(base), ...Object.keys(overlay)]).values().map((key) => { + const left = base[key] + const right = overlay[key] + if (right === undefined) return [key, left] + if ( + typeof left === "object" && + left !== null && + !Array.isArray(left) && + typeof right === "object" && + right !== null && + !Array.isArray(right) + ) + return [ + key, + mergeOverlay(left as Readonly>, right as Readonly>), + ] + return [key, right] + }), + ) +} + +export function mergeHeaders( + base: Readonly> | undefined, + overlay: Readonly> | undefined, +) { + return Object.fromEntries( + [...Object.entries(base ?? {}), ...Object.entries(overlay ?? {})] + .reduce((result, entry) => { + result.set(entry[0].toLowerCase(), entry) + return result + }, new Map()) + .values(), + ) +} + export const Request = Provider.Request export type Request = Provider.Request @@ -19,3 +98,43 @@ export const Info = Provider.Info export type Info = Provider.Info export type MutableInfo = DeepMutable + +const resolvePackage = (specifier: string) => + Effect.sync(() => { + if (specifier.startsWith("file://") || specifier.startsWith("@opencode-ai/llm/")) return specifier + try { + return import.meta.resolve(specifier) + } catch { + return undefined + } + }) + +const importPackage = Effect.fn("ProviderV2.importPackage")(function* (specifier: string, entrypoint: string) { + const module = yield* Effect.tryPromise({ + try: () => { + const existing = packages.get(entrypoint) + if (existing) return existing + const loaded = import(entrypoint) + packages.set(entrypoint, loaded) + return loaded + }, + catch: (cause) => new LoadError({ package: specifier, cause }), + }) + if (!isProviderPackage(module)) { + return yield* new LoadError({ + package: specifier, + cause: new Error(`Provider package ${specifier} does not export model(modelID, settings)`), + }) + } + return module +}) + +function isProviderPackage(input: unknown): input is ProviderPackageDefinition { + return typeof input === "object" && input !== null && "model" in input && typeof input.model === "function" +} + +function rootPackage(specifier: string) { + const parts = specifier.split("/") + if (specifier.startsWith("@")) return parts.slice(0, 2).join("/") + return parts[0] +} diff --git a/packages/core/src/session/runner/model.ts b/packages/core/src/session/runner/model.ts index 464bab36a6..4b3045182e 100644 --- a/packages/core/src/session/runner/model.ts +++ b/packages/core/src/session/runner/model.ts @@ -11,9 +11,8 @@ import { Catalog } from "../../catalog" import { Credential } from "../../credential" import { Integration } from "../../integration" import { ModelV2 } from "../../model" +import { Npm } from "../../npm" import { ProviderV2 } from "../../provider" -import { ProviderPackage } from "../../provider-package" -import { ProviderOverlay } from "../../provider-overlay" import { SessionSchema } from "../schema" export class ModelNotSelectedError extends Schema.TaggedErrorClass()( @@ -119,9 +118,9 @@ const withVariant = ( return Effect.succeed( variant ? produce(model, (draft) => { - draft.settings = ProviderOverlay.merge(draft.settings, variant.settings) - draft.headers = ProviderOverlay.headers(draft.headers, variant.headers) - draft.body = ProviderOverlay.merge(draft.body, variant.body) + draft.settings = ProviderV2.mergeOverlay(draft.settings, variant.settings) + draft.headers = ProviderV2.mergeHeaders(draft.headers, variant.headers) + draft.body = ProviderV2.mergeOverlay(draft.body, variant.body) }) : model, ) @@ -130,12 +129,15 @@ const withVariant = ( export const fromCatalogModel = ( model: ModelV2.Info, credential?: Credential.Value, + loadPackage: ( + specifier: string, + ) => Effect.Effect = ProviderV2.loadPackage, ): Effect.Effect => { const resolved = credential?.metadata === undefined ? model : produce(model, (draft) => { - draft.settings = ProviderOverlay.merge(draft.settings, credential.metadata) + draft.settings = ProviderV2.mergeOverlay(draft.settings, credential.metadata) }) const key = apiKey(resolved, credential) const packageName = ProviderV2.packageName(resolved.package) @@ -167,7 +169,7 @@ export const fromCatalogModel = ( if (!ProviderV2.isAISDK(resolved.package) && resolved.package) { const specifier = resolved.package return Effect.gen(function* () { - const module = yield* ProviderPackage.load(specifier).pipe( + const module = yield* loadPackage(specifier).pipe( Effect.mapError( () => new UnsupportedPackageError({ @@ -187,7 +189,7 @@ export const fromCatalogModel = ( limits: { context: resolved.limit.context, output: resolved.limit.output }, } return yield* Effect.try({ - try: () => ProviderPackage.make(module, resolved.modelID ?? resolved.id, settings), + try: () => ProviderV2.makeModel(module, resolved.modelID ?? resolved.id, settings), catch: () => new UnsupportedPackageError({ providerID: resolved.providerID, @@ -206,8 +208,15 @@ export const fromCatalogModel = ( ) } -export const resolve = (session: SessionSchema.Info, model: ModelV2.Info, credential?: Credential.Value) => - withVariant(model, session.model?.variant).pipe(Effect.flatMap((model) => fromCatalogModel(model, credential))) +export const resolve = ( + session: SessionSchema.Info, + model: ModelV2.Info, + credential?: Credential.Value, + loadPackage?: (specifier: string) => Effect.Effect, +) => + withVariant(model, session.model?.variant).pipe( + Effect.flatMap((model) => fromCatalogModel(model, credential, loadPackage)), + ) export const supported = (model: ModelV2.Info) => Boolean(model.package) && @@ -223,6 +232,7 @@ export const locationLayer = Layer.effect( Effect.gen(function* () { const catalog = yield* Catalog.Service const integrations = yield* Integration.Service + const npm = yield* Npm.Service return Service.of({ resolve: Effect.fn("SessionRunnerModel.resolve")(function* (session) { // Location plugins populate and filter the catalog asynchronously during layer startup. @@ -248,6 +258,7 @@ export const locationLayer = Layer.effect( session, selected, connection ? yield* integrations.connection.resolve(connection) : undefined, + (specifier) => ProviderV2.loadPackage(specifier, npm), ) }), }) From 78880f32889afad8ea0d7672bcfd884ed7d397a1 Mon Sep 17 00:00:00 2001 From: Shoubhit Dash Date: Mon, 29 Jun 2026 20:48:01 +0530 Subject: [PATCH 18/18] fix(core): preserve aisdk provider compatibility --- packages/core/src/aisdk.ts | 365 +++++++++++++++++- packages/core/src/plugin/provider/opencode.ts | 6 +- packages/core/src/provider.ts | 12 +- packages/core/src/session/runner/model.ts | 138 +++---- packages/core/src/v1/config/migrate.ts | 13 +- .../core/src/v1/config/provider-options.ts | 38 +- .../core/test/config/provider-options.test.ts | 12 +- .../core/test/plugin/provider-google.test.ts | 20 + .../core/test/session-runner-model.test.ts | 63 +-- 9 files changed, 495 insertions(+), 172 deletions(-) diff --git a/packages/core/src/aisdk.ts b/packages/core/src/aisdk.ts index 9eb47006f0..5ff78cde70 100644 --- a/packages/core/src/aisdk.ts +++ b/packages/core/src/aisdk.ts @@ -1,12 +1,46 @@ export * as AISDK from "./aisdk" -import type { LanguageModelV3 } from "@ai-sdk/provider" -import { Cause, Context, Effect, Layer, Schema, Scope } from "effect" +import type { + JSONSchema7, + JSONValue, + LanguageModelV3, + LanguageModelV3CallOptions, + LanguageModelV3FunctionTool, + LanguageModelV3Message, + LanguageModelV3Prompt, + LanguageModelV3StreamPart, + LanguageModelV3ToolChoice, + SharedV3ProviderOptions, +} from "@ai-sdk/provider" +import { + FinishReason, + InvalidProviderOutputReason, + LLMEvent, + LLMError, + Model, + ProviderID, + ProviderMetadata, + ToolResultValue, + UnknownProviderReason, + type ContentPart, + type LLMRequest, + type ToolDefinition, + type UsageInput, +} from "@opencode-ai/llm" +import { + Auth, + Endpoint, + type AnyRoute, +} from "@opencode-ai/llm/route" +import { Cause, Context, Effect, Layer, Schema, Scope, Stream } from "effect" import { ModelV2 } from "./model" import { ProviderV2 } from "./provider" import { State } from "./state" type SDK = any +type UserContent = Extract["content"] +type AssistantContent = Extract["content"] +type ToolResultContent = Extract export interface SDKEvent { readonly model: ModelV2.Info @@ -141,6 +175,7 @@ export interface Interface { readonly runSDK: (event: SDKEvent) => Effect.Effect readonly runLanguage: (event: LanguageEvent) => Effect.Effect readonly language: (model: ModelV2.Info) => Effect.Effect + readonly model: (model: ModelV2.Info) => Effect.Effect } export class Service extends Context.Service()("@opencode/v2/AISDK") {} @@ -228,9 +263,335 @@ export const locationLayer = Layer.effect( languages.set(key, language) return language }), + model: Effect.fn("AISDK.model")(function* (model) { + return modelFromLanguage(model, yield* service.language(model)) + }), }) return service }), ) export const defaultLayer = locationLayer + +function modelFromLanguage(info: ModelV2.Info, language: LanguageModelV3) { + const route: AnyRoute = { + id: `ai-sdk:${ProviderV2.packageName(info.package) ?? "unknown"}`, + provider: ProviderID.make(info.providerID), + protocol: "ai-sdk", + endpoint: Endpoint.path("/", { baseURL: "https://ai-sdk.local" }), + auth: Auth.none, + transport: { + id: "ai-sdk", + prepare: (input) => Effect.succeed(input.body), + frames: () => Stream.empty, + }, + defaults: { + headers: info.headers, + http: info.body === undefined ? undefined : { body: { ...info.body } }, + limits: { context: info.limit.context, output: info.limit.output }, + }, + body: { + schema: Schema.Unknown, + from: (request) => Effect.succeed(callOptions(request)), + }, + with: () => route, + model: (input) => + Model.make({ ...input, provider: "provider" in input ? input.provider : info.providerID, route }), + prepareTransport: (body) => Effect.succeed(body), + streamPrepared: (prepared) => streamLanguage(language, prepared as LanguageModelV3CallOptions), + } + return Model.make({ id: info.modelID ?? info.id, provider: info.providerID, route }) +} + +function callOptions(request: LLMRequest): LanguageModelV3CallOptions { + return { + prompt: prompt(request), + maxOutputTokens: request.generation?.maxTokens ?? request.model.route.defaults.limits?.output, + temperature: request.generation?.temperature, + stopSequences: request.generation?.stop === undefined ? undefined : [...request.generation.stop], + topP: request.generation?.topP, + topK: request.generation?.topK, + presencePenalty: request.generation?.presencePenalty, + frequencyPenalty: request.generation?.frequencyPenalty, + seed: request.generation?.seed, + responseFormat: responseFormat(request), + tools: request.tools.map(tool), + toolChoice: toolChoice(request.toolChoice), + headers: request.http?.headers, + providerOptions: providerOptions(request.providerOptions), + } +} + +function prompt(request: LLMRequest): LanguageModelV3Prompt { + const system = request.system.map((part) => part.text).filter(Boolean).join("\n\n") + const messages = request.messages.flatMap(message) + if (!system.length) return messages + return [{ role: "system", content: system }, ...messages] +} + +function message(input: LLMRequest["messages"][number]): LanguageModelV3Message[] { + switch (input.role) { + case "system": + return [{ role: "system", content: input.content.flatMap(text).join("\n\n") }] + case "user": + return [{ role: "user", content: input.content.flatMap(userPart) }] + case "assistant": + return [{ role: "assistant", content: input.content.flatMap(assistantPart) }] + case "tool": { + const content = input.content.flatMap(toolResultPart) + return content.length ? [{ role: "tool", content }] : [] + } + } +} + +function text(part: ContentPart) { + return part.type === "text" ? [part.text] : [] +} + +function userPart(part: ContentPart): UserContent { + if (part.type === "text") return [{ type: "text", text: part.text }] + if (part.type === "media") return [{ type: "file", mediaType: part.mediaType, data: part.data, filename: part.filename }] + return [] +} + +function assistantPart(part: ContentPart): AssistantContent { + switch (part.type) { + case "text": + return [{ type: "text", text: part.text }] + case "media": + return [{ type: "file", mediaType: part.mediaType, data: part.data, filename: part.filename }] + case "reasoning": + return [{ type: "reasoning", text: part.text }] + case "tool-call": + return [ + { + type: "tool-call", + toolCallId: part.id, + toolName: part.name, + input: part.input, + providerExecuted: part.providerExecuted, + }, + ] + case "tool-result": + return toolResultPart(part) + } +} + +function toolResultPart(part: ContentPart): ToolResultContent[] { + if (part.type !== "tool-result") return [] + return [ + { + type: "tool-result", + toolCallId: part.id, + toolName: part.name, + output: toolOutput(part.result), + }, + ] +} + +function toolOutput(result: ToolResultValue) { + switch (result.type) { + case "text": + case "error": + return { type: "text" as const, value: messageValue(result.value) } + } + return { type: "json" as const, value: jsonValue(result.value) } +} + +function tool(input: ToolDefinition): LanguageModelV3FunctionTool { + return { + type: "function", + name: input.name, + description: input.description, + inputSchema: input.inputSchema as JSONSchema7, + } +} + +function toolChoice(input: LLMRequest["toolChoice"]): LanguageModelV3ToolChoice | undefined { + if (!input) return undefined + if (input.type === "tool") return input.name === undefined ? undefined : { type: "tool", toolName: input.name } + return { type: input.type } +} + +function responseFormat(request: LLMRequest): LanguageModelV3CallOptions["responseFormat"] { + if (request.responseFormat?.type === "json") return { type: "json", schema: request.responseFormat.schema as JSONSchema7 } + if (request.responseFormat) return { type: "text" } +} + +function providerOptions(input: LLMRequest["providerOptions"]): SharedV3ProviderOptions | undefined { + if (!input) return undefined + return Object.fromEntries(Object.entries(input).map(([key, value]) => [key, jsonObject(value)])) +} + +function streamLanguage(language: LanguageModelV3, options: LanguageModelV3CallOptions) { + const state = { step: 0, toolNames: {} as Record } + return Stream.concat( + Stream.make(LLMEvent.stepStart({ index: state.step })), + Stream.unwrap( + Effect.tryPromise({ + try: () => language.doStream(options), + catch: (error) => llmError("doStream", error), + }).pipe( + Effect.map((result) => + Stream.fromReadableStream({ + evaluate: () => result.stream, + onError: (error) => llmError("readStream", error), + }).pipe( + Stream.mapEffect((event) => streamPartEvents(state, event)), + Stream.flatMap((events) => Stream.fromIterable(events)), + ), + ), + ), + ), + ) +} + +function streamPartEvents( + state: { step: number; toolNames: Record }, + event: LanguageModelV3StreamPart, +): Effect.Effect, LLMError> { + switch (event.type) { + case "stream-start": + case "response-metadata": + case "raw": + case "file": + case "source": + case "tool-approval-request": + return Effect.succeed([]) + case "text-start": + return Effect.succeed([LLMEvent.textStart({ id: event.id, providerMetadata: providerMetadata(event.providerMetadata) })]) + case "text-delta": + return Effect.succeed([ + LLMEvent.textDelta({ id: event.id, text: event.delta, providerMetadata: providerMetadata(event.providerMetadata) }), + ]) + case "text-end": + return Effect.succeed([LLMEvent.textEnd({ id: event.id, providerMetadata: providerMetadata(event.providerMetadata) })]) + case "reasoning-start": + return Effect.succeed([ + LLMEvent.reasoningStart({ id: event.id, providerMetadata: providerMetadata(event.providerMetadata) }), + ]) + case "reasoning-delta": + return Effect.succeed([ + LLMEvent.reasoningDelta({ id: event.id, text: event.delta, providerMetadata: providerMetadata(event.providerMetadata) }), + ]) + case "reasoning-end": + return Effect.succeed([ + LLMEvent.reasoningEnd({ id: event.id, providerMetadata: providerMetadata(event.providerMetadata) }), + ]) + case "tool-input-start": + state.toolNames[event.id] = event.toolName + return Effect.succeed([ + LLMEvent.toolInputStart({ id: event.id, name: event.toolName, providerMetadata: providerMetadata(event.providerMetadata) }), + ]) + case "tool-input-delta": + return Effect.succeed([LLMEvent.toolInputDelta({ id: event.id, name: state.toolNames[event.id] ?? "unknown", text: event.delta })]) + case "tool-input-end": + return Effect.succeed([ + LLMEvent.toolInputEnd({ id: event.id, name: state.toolNames[event.id] ?? "unknown", providerMetadata: providerMetadata(event.providerMetadata) }), + ]) + case "tool-call": + state.toolNames[event.toolCallId] = event.toolName + return Effect.succeed([ + LLMEvent.toolCall({ + id: event.toolCallId, + name: event.toolName, + input: parseToolInput(event.input), + providerExecuted: event.providerExecuted, + providerMetadata: providerMetadata(event.providerMetadata), + }), + ]) + case "tool-result": + delete state.toolNames[event.toolCallId] + return Effect.succeed([ + LLMEvent.toolResult({ + id: event.toolCallId, + name: event.toolName, + result: ToolResultValue.make(event.result, event.isError ? "error" : "json"), + providerExecuted: true, + providerMetadata: providerMetadata(event.providerMetadata), + }), + ]) + case "finish": + return Effect.succeed([ + LLMEvent.stepFinish({ + index: state.step++, + reason: finishReason(event.finishReason), + usage: usage(event.usage), + providerMetadata: providerMetadata(event.providerMetadata), + }), + LLMEvent.finish({ + reason: finishReason(event.finishReason), + usage: usage(event.usage), + providerMetadata: providerMetadata(event.providerMetadata), + }), + ]) + case "error": + return Effect.fail(llmError("stream", event.error)) + } +} + +function usage(input: Extract["usage"]): UsageInput | undefined { + const output = { + inputTokens: input.inputTokens.total, + nonCachedInputTokens: input.inputTokens.noCache, + cacheReadInputTokens: input.inputTokens.cacheRead, + cacheWriteInputTokens: input.inputTokens.cacheWrite, + outputTokens: input.outputTokens.total, + reasoningTokens: input.outputTokens.reasoning, + totalTokens: + input.inputTokens.total === undefined || input.outputTokens.total === undefined + ? undefined + : input.inputTokens.total + input.outputTokens.total, + } + return Object.values(output).some((value) => value !== undefined) ? output : undefined +} + +function finishReason(value: unknown): FinishReason { + return Schema.is(FinishReason)(value) ? value : "unknown" +} + +function providerMetadata(value: unknown) { + return Schema.is(ProviderMetadata)(value) ? value : undefined +} + +function parseToolInput(value: string) { + try { + return JSON.parse(value) as unknown + } catch { + return value + } +} + +function jsonObject(input: Record) { + return Object.fromEntries(Object.entries(input).map(([key, value]) => [key, jsonValue(value)])) +} + +function jsonValue(input: unknown): JSONValue { + try { + const encoded = JSON.stringify(input) + return encoded === undefined ? null : (JSON.parse(encoded) as JSONValue) + } catch { + return messageValue(input) + } +} + +function messageValue(input: unknown) { + if (typeof input === "string") return input + try { + return JSON.stringify(input) ?? String(input) + } catch { + return String(input) + } +} + +function llmError(method: string, error: unknown) { + const reason = + error instanceof LLMError + ? new InvalidProviderOutputReason({ message: error.message }) + : new UnknownProviderReason({ message: error instanceof Error ? error.message : String(error) }) + return new LLMError({ + module: "AISDK", + method, + reason, + }) +} diff --git a/packages/core/src/plugin/provider/opencode.ts b/packages/core/src/plugin/provider/opencode.ts index f515d6cc23..24e0c3c54b 100644 --- a/packages/core/src/plugin/provider/opencode.ts +++ b/packages/core/src/plugin/provider/opencode.ts @@ -132,15 +132,13 @@ export const OpencodePlugin = define ({ id: ModelV2.VariantID.make(id), headers: { ...(options.headers ?? {}) }, - settings: lowerer.model(withoutCredentials(options)), + settings: ConfigProviderOptionsV1.model(withoutCredentials(options)), })) } if (config.release_date !== undefined) { diff --git a/packages/core/src/provider.ts b/packages/core/src/provider.ts index d7a48f0e8d..b9e1928a94 100644 --- a/packages/core/src/provider.ts +++ b/packages/core/src/provider.ts @@ -3,7 +3,7 @@ export * as ProviderV2 from "./provider" import { Effect, Schema } from "effect" import { pathToFileURL } from "url" import { Provider } from "@opencode-ai/schema/provider" -import type { Model, ProviderPackageDefinition, ProviderPackageSettings } from "@opencode-ai/llm" +import type { ProviderPackageDefinition } from "@opencode-ai/llm" import { Npm } from "./npm" import type { DeepMutable } from "./schema" @@ -43,12 +43,6 @@ export const loadPackage = Effect.fn("ProviderV2.loadPackage")(function* (specif return yield* importPackage(specifier, entrypoint) }) -export const makeModel = ( - module: ProviderPackageDefinition, - modelID: string, - settings: ProviderPackageSettings, -): Model => module.model(modelID, settings) - export function mergeOverlay( base: Readonly> | undefined, overlay: Readonly> | undefined, @@ -81,8 +75,10 @@ export function mergeHeaders( base: Readonly> | undefined, overlay: Readonly> | undefined, ) { + if (base === undefined) return overlay && { ...overlay } + if (overlay === undefined) return { ...base } return Object.fromEntries( - [...Object.entries(base ?? {}), ...Object.entries(overlay ?? {})] + [...Object.entries(base), ...Object.entries(overlay)] .reduce((result, entry) => { result.set(entry[0].toLowerCase(), entry) return result diff --git a/packages/core/src/session/runner/model.ts b/packages/core/src/session/runner/model.ts index 4b3045182e..a347c9919d 100644 --- a/packages/core/src/session/runner/model.ts +++ b/packages/core/src/session/runner/model.ts @@ -1,12 +1,9 @@ export * as SessionRunnerModel from "./model" -import { type Model } from "@opencode-ai/llm" -import * as AnthropicMessages from "@opencode-ai/llm/protocols/anthropic-messages" -import * as OpenAICompatibleChat from "@opencode-ai/llm/protocols/openai-compatible-chat" -import * as OpenAIResponses from "@opencode-ai/llm/protocols/openai-responses" -import { Auth, type AnyRoute } from "@opencode-ai/llm/route" +import { Model } from "@opencode-ai/llm" import { Context, Effect, Layer, Schema } from "effect" import { produce } from "immer" +import { AISDK } from "../../aisdk" import { Catalog } from "../../catalog" import { Credential } from "../../credential" import { Integration } from "../../integration" @@ -80,27 +77,6 @@ export class Service extends Context.Service()("@opencode/v2 /** Test or embedding seam for supplying a model resolver directly. */ export const layerWith = (resolve: Interface["resolve"]) => Layer.succeed(Service, Service.of({ resolve })) -const apiKey = (model: ModelV2.Info, credential?: Credential.Value) => { - if (credential?.type === "key") return Auth.value(credential.key) - if (credential?.type === "oauth") return Auth.value(credential.access) - const value = model.settings?.apiKey - if (typeof value === "string") return Auth.value(value) -} - -const withDefaults = (model: ModelV2.Info, route: AnyRoute) => { - const body = model.body ?? {} - const httpBody = Object.hasOwn(body, "apiKey") - ? Object.fromEntries(Object.entries(body).filter(([key]) => key !== "apiKey")) - : body - return route.with({ - provider: model.providerID, - endpoint: typeof model.settings?.baseURL === "string" ? { baseURL: model.settings.baseURL } : undefined, - headers: model.headers, - http: { body: httpBody }, - limits: { context: model.limit.context, output: model.limit.output }, - }) -} - const withVariant = ( model: ModelV2.Info, variantID: ModelV2.VariantID | undefined, @@ -126,105 +102,79 @@ const withVariant = ( ) } +export interface Dependencies { + readonly loadPackage?: (specifier: string) => Effect.Effect + readonly loadAISDK?: (model: ModelV2.Info) => Effect.Effect +} + +const unsupported = (model: ModelV2.Info, packageName = model.package ?? "unknown") => + new UnsupportedPackageError({ + providerID: model.providerID, + modelID: model.id, + package: packageName, + }) + +const credentialSettings = (credential: Credential.Value | undefined) => ({ + ...(credential?.type === "key" ? { apiKey: credential.key } : {}), + ...(credential?.type === "oauth" ? { apiKey: credential.access } : {}), + ...credential?.metadata, +}) + export const fromCatalogModel = ( model: ModelV2.Info, credential?: Credential.Value, - loadPackage: ( - specifier: string, - ) => Effect.Effect = ProviderV2.loadPackage, + dependencies: Dependencies = {}, ): Effect.Effect => { const resolved = credential?.metadata === undefined ? model : produce(model, (draft) => { draft.settings = ProviderV2.mergeOverlay(draft.settings, credential.metadata) - }) - const key = apiKey(resolved, credential) - const packageName = ProviderV2.packageName(resolved.package) - if (ProviderV2.isAISDK(resolved.package) && packageName === "@ai-sdk/openai") { - return Effect.succeed( - withDefaults(resolved, OpenAIResponses.route) - .with({ auth: key === undefined ? Auth.none : Auth.bearer(key) }) - .model({ id: resolved.modelID ?? resolved.id }), + }) + if (ProviderV2.isAISDK(resolved.package)) { + if (!dependencies.loadAISDK) { + return Effect.fail(unsupported(resolved)) + } + const runtime = produce(resolved, (draft) => { + draft.settings = ProviderV2.mergeOverlay(draft.settings, credentialSettings(credential)) + }) + return dependencies.loadAISDK(runtime).pipe( + Effect.mapError(() => unsupported(resolved)), ) } - if (ProviderV2.isAISDK(resolved.package) && packageName === "@ai-sdk/anthropic") { - return Effect.succeed( - withDefaults(resolved, AnthropicMessages.route) - .with({ auth: key === undefined ? Auth.none : Auth.header("x-api-key", key) }) - .model({ id: resolved.modelID ?? resolved.id }), - ) - } - if ( - ProviderV2.isAISDK(resolved.package) && - packageName === "@ai-sdk/openai-compatible" && - typeof resolved.settings?.baseURL === "string" - ) { - return Effect.succeed( - withDefaults(resolved, OpenAICompatibleChat.route) - .with({ auth: key === undefined ? Auth.none : Auth.bearer(key) }) - .model({ id: resolved.modelID ?? resolved.id }), - ) - } - if (!ProviderV2.isAISDK(resolved.package) && resolved.package) { + if (resolved.package) { const specifier = resolved.package return Effect.gen(function* () { - const module = yield* loadPackage(specifier).pipe( - Effect.mapError( - () => - new UnsupportedPackageError({ - providerID: resolved.providerID, - modelID: resolved.id, - package: specifier, - }), - ), + const module = yield* (dependencies.loadPackage ?? ProviderV2.loadPackage)(specifier).pipe( + Effect.mapError(() => unsupported(resolved, specifier)), ) const settings = { ...resolved.settings, - ...(credential?.type === "key" ? { apiKey: credential.key } : {}), - ...(credential?.type === "oauth" ? { apiKey: credential.access } : {}), - ...credential?.metadata, + ...credentialSettings(credential), headers: resolved.headers, body: resolved.body, limits: { context: resolved.limit.context, output: resolved.limit.output }, } return yield* Effect.try({ - try: () => ProviderV2.makeModel(module, resolved.modelID ?? resolved.id, settings), - catch: () => - new UnsupportedPackageError({ - providerID: resolved.providerID, - modelID: resolved.id, - package: specifier, - }), + try: () => Model.update(module.model(resolved.modelID ?? resolved.id, settings), { provider: resolved.providerID }), + catch: () => unsupported(resolved, specifier), }) }) } - return Effect.fail( - new UnsupportedPackageError({ - providerID: resolved.providerID, - modelID: resolved.id, - package: resolved.package ?? "unknown", - }), - ) + return Effect.fail(unsupported(resolved)) } export const resolve = ( session: SessionSchema.Info, model: ModelV2.Info, credential?: Credential.Value, - loadPackage?: (specifier: string) => Effect.Effect, + dependencies?: Dependencies, ) => withVariant(model, session.model?.variant).pipe( - Effect.flatMap((model) => fromCatalogModel(model, credential, loadPackage)), + Effect.flatMap((model) => fromCatalogModel(model, credential, dependencies)), ) -export const supported = (model: ModelV2.Info) => - Boolean(model.package) && - (!ProviderV2.isAISDK(model.package) || - ProviderV2.packageName(model.package) === "@ai-sdk/openai" || - ProviderV2.packageName(model.package) === "@ai-sdk/anthropic" || - (ProviderV2.packageName(model.package) === "@ai-sdk/openai-compatible" && - typeof model.settings?.baseURL === "string")) +export const supported = (model: ModelV2.Info) => Boolean(model.package) /** Resolves models from the catalog belonging to the current Location runtime. */ export const locationLayer = Layer.effect( @@ -233,6 +183,7 @@ export const locationLayer = Layer.effect( const catalog = yield* Catalog.Service const integrations = yield* Integration.Service const npm = yield* Npm.Service + const aisdk = yield* AISDK.Service return Service.of({ resolve: Effect.fn("SessionRunnerModel.resolve")(function* (session) { // Location plugins populate and filter the catalog asynchronously during layer startup. @@ -258,7 +209,10 @@ export const locationLayer = Layer.effect( session, selected, connection ? yield* integrations.connection.resolve(connection) : undefined, - (specifier) => ProviderV2.loadPackage(specifier, npm), + { + loadPackage: (specifier) => ProviderV2.loadPackage(specifier, npm), + loadAISDK: (model) => aisdk.model(model), + }, ) }), }) diff --git a/packages/core/src/v1/config/migrate.ts b/packages/core/src/v1/config/migrate.ts index 7489878c6e..49a4c4bf45 100644 --- a/packages/core/src/v1/config/migrate.ts +++ b/packages/core/src/v1/config/migrate.ts @@ -169,8 +169,7 @@ function providers(info?: Readonly>) { } function migrateProvider(info: ConfigProviderV1.Info) { - const lowerer = ConfigProviderOptionsV1.get(info.npm) - const options = lowerer.provider(info.options ?? {}) + const options = ConfigProviderOptionsV1.provider(info.options ?? {}) return { name: info.name, env: info.env, @@ -180,14 +179,12 @@ function migrateProvider(info: ConfigProviderV1.Info) { body: info.options && options.body, models: info.models && - Object.fromEntries(Object.entries(info.models).map(([name, model]) => [name, migrateModel(model, info.npm)])), + Object.fromEntries(Object.entries(info.models).map(([name, model]) => [name, migrateModel(model)])), } } -function migrateModel(info: typeof ConfigProviderV1.Model.Type, packageName?: string) { - const packageID = info.provider?.npm ?? packageName - const lowerer = ConfigProviderOptionsV1.get(packageID) - const settings = info.options && lowerer.model(info.options) +function migrateModel(info: typeof ConfigProviderV1.Model.Type) { + const settings = info.options && ConfigProviderOptionsV1.model(info.options) const costs = info.cost && [ { input: info.cost.input, @@ -221,7 +218,7 @@ function migrateModel(info: typeof ConfigProviderV1.Model.Type, packageName?: st info.variants && Object.entries(info.variants).map(([id, options]) => ({ id, - settings: lowerer.model(options), + settings: ConfigProviderOptionsV1.model(options), })), cost: costs, disabled: info.status === "deprecated" ? true : undefined, diff --git a/packages/core/src/v1/config/provider-options.ts b/packages/core/src/v1/config/provider-options.ts index 16206aa631..6b61391100 100644 --- a/packages/core/src/v1/config/provider-options.ts +++ b/packages/core/src/v1/config/provider-options.ts @@ -8,27 +8,23 @@ export interface ProviderResult { readonly body?: Record } -export interface Lowerer { - readonly provider: (options: Options) => ProviderResult - readonly model: (options: Options) => Record +export function provider(options: Options): ProviderResult { + const headers = options.headers + const body = options.body + const entries = Object.entries(options) + const settings = Object.fromEntries(entries.filter(([key]) => key !== "headers" && key !== "body")) + const headerOverlay = + typeof headers === "object" && headers !== null && !Array.isArray(headers) + ? Object.fromEntries(Object.entries(headers).filter((entry): entry is [string, string] => typeof entry[1] === "string")) + : undefined + const bodyOverlay = typeof body === "object" && body !== null && !Array.isArray(body) ? { ...body } : undefined + return { + settings, + headers: headerOverlay, + body: bodyOverlay, + } } -const lowerer: Lowerer = { - provider(options) { - return { - settings: Object.fromEntries(Object.entries(options).filter(([key]) => key !== "headers" && key !== "body")), - headers: record(options.headers, (value): value is string => typeof value === "string"), - body: record(options.body, (_value): _value is unknown => true), - } - }, - model: (options) => ({ ...options }), -} - -export function get(_packageName?: string): Lowerer { - return lowerer -} - -function record(input: unknown, guard: (value: unknown) => value is T) { - if (typeof input !== "object" || input === null || Array.isArray(input)) return undefined - return Object.fromEntries(Object.entries(input).filter((entry): entry is [string, T] => guard(entry[1]))) +export function model(options: Options) { + return { ...options } } diff --git a/packages/core/test/config/provider-options.test.ts b/packages/core/test/config/provider-options.test.ts index d9fbe2dfd7..ac746e4441 100644 --- a/packages/core/test/config/provider-options.test.ts +++ b/packages/core/test/config/provider-options.test.ts @@ -3,10 +3,8 @@ import { ConfigProviderOptionsV1 } from "@opencode-ai/core/v1/config/provider-op describe("ConfigProviderOptionsV1", () => { test("splits provider overlays without changing package settings", () => { - const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/openai") - expect( - lowerer.provider({ + ConfigProviderOptionsV1.provider({ apiKey: "secret", baseURL: "https://openai.example/v1", organization: "org", @@ -27,10 +25,8 @@ describe("ConfigProviderOptionsV1", () => { }) test("keeps model and variant options unchanged", () => { - const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/anthropic") - expect( - lowerer.model({ + ConfigProviderOptionsV1.model({ reasoningEffort: "high", taskBudget: 1024, metadata: { userId: "user" }, @@ -42,8 +38,8 @@ describe("ConfigProviderOptionsV1", () => { }) }) - test("uses the same mechanical lowering for every package", () => { - expect(ConfigProviderOptionsV1.get("custom-provider").provider({ enabled: true })).toEqual({ + test("uses mechanical lowering for custom provider options", () => { + expect(ConfigProviderOptionsV1.provider({ enabled: true })).toEqual({ settings: { enabled: true }, headers: undefined, body: undefined, diff --git a/packages/core/test/plugin/provider-google.test.ts b/packages/core/test/plugin/provider-google.test.ts index fd9a4c90dd..d04e00e3b3 100644 --- a/packages/core/test/plugin/provider-google.test.ts +++ b/packages/core/test/plugin/provider-google.test.ts @@ -80,4 +80,24 @@ describe("GooglePlugin", () => { expect(language.provider).toBe("custom-google") }), ) + + it.effect("wraps AI SDK language models for the native runner", () => + Effect.gen(function* () { + const aisdk = yield* AISDK.Service + yield* addPlugin() + + const resolved = yield* aisdk.model( + ModelV2.Info.make({ + ...ModelV2.Info.empty(ProviderV2.ID.make("custom-google"), ModelV2.ID.make("alias")), + modelID: ModelV2.ID.make("gemini-api"), + package: "aisdk:@ai-sdk/google", + settings: { apiKey: "test" }, + }), + ) + + expect(String(resolved.id)).toBe("gemini-api") + expect(String(resolved.provider)).toBe("custom-google") + expect(resolved.route.id).toBe("ai-sdk:@ai-sdk/google") + }), + ) }) diff --git a/packages/core/test/session-runner-model.test.ts b/packages/core/test/session-runner-model.test.ts index 824e0278f1..b53b656f54 100644 --- a/packages/core/test/session-runner-model.test.ts +++ b/packages/core/test/session-runner-model.test.ts @@ -1,5 +1,6 @@ import { describe, expect } from "bun:test" import { LLM } from "@opencode-ai/llm" +import { OpenAI } from "@opencode-ai/llm/providers" import { LLMClient } from "@opencode-ai/llm/route" import { DateTime, Effect } from "effect" import { Headers } from "effect/unstable/http" @@ -36,6 +37,18 @@ const model = (transport: Transport, variants?: NonNullable + Effect.succeed( + OpenAI.model(input.modelID ?? input.id, { + ...input.settings, + headers: input.headers, + body: input.body, + limits: { context: input.limit.context, output: input.limit.output }, + }), + ), +} + describe("SessionRunnerModel", () => { it.effect("constructs native provider package models mechanically", () => Effect.gen(function* () { @@ -63,10 +76,10 @@ describe("SessionRunnerModel", () => { }), ) - it.effect("maps catalog OpenAI AI SDK models into native Responses routes", () => + it.effect("maps catalog OpenAI native provider packages into Responses routes", () => Effect.gen(function* () { const resolved = yield* SessionRunnerModel.fromCatalogModel( - model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }), + model({ package: "@opencode-ai/llm/providers/openai", settings: { baseURL: "https://openai.example/v1" } }), ) expect(resolved).toMatchObject({ id: "api-test-model", provider: "test-provider" }) @@ -85,7 +98,7 @@ describe("SessionRunnerModel", () => { it.effect("keeps catalog apiKey credentials out of provider JSON", () => Effect.gen(function* () { const resolved = yield* SessionRunnerModel.fromCatalogModel( - model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }), + model({ package: "@opencode-ai/llm/providers/openai", settings: { baseURL: "https://openai.example/v1" } }), ) const prepared = yield* LLMClient.prepare(LLM.request({ model: resolved, prompt: "Hello" })) @@ -99,7 +112,7 @@ describe("SessionRunnerModel", () => { const resolved = yield* SessionRunnerModel.fromCatalogModel( ModelV2.Info.make({ ...model({ - package: "aisdk:@ai-sdk/openai-compatible", + package: "@opencode-ai/llm/providers/openai-compatible", settings: { apiKey: "settings-secret", baseURL: "https://compatible.example/v1", @@ -126,7 +139,7 @@ describe("SessionRunnerModel", () => { it.effect("overlays selected OpenAI Session variant bodies", () => Effect.gen(function* () { - const catalog = model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }, [ + const catalog = model({ package: "@opencode-ai/llm/providers/openai", settings: { baseURL: "https://openai.example/v1" } }, [ { id: ModelV2.VariantID.make("high"), headers: { "x-variant": "high" }, @@ -170,7 +183,7 @@ describe("SessionRunnerModel", () => { Effect.gen(function* () { const catalog = model( { - package: "aisdk:@ai-sdk/openai-compatible", + package: "@opencode-ai/llm/providers/openai-compatible", settings: { baseURL: "https://compatible.example/v1" }, }, [ @@ -204,7 +217,7 @@ describe("SessionRunnerModel", () => { it.effect("rejects an explicit unavailable Session variant during model resolution", () => Effect.gen(function* () { - const catalog = model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }) + const catalog = model({ package: "@opencode-ai/llm/providers/openai", settings: { baseURL: "https://openai.example/v1" } }) const session = SessionV2.Info.make({ id: SessionV2.ID.make("ses_model_variant_unavailable"), projectID: ProjectV2.ID.global, @@ -235,7 +248,7 @@ describe("SessionRunnerModel", () => { it.effect("overlays selected Anthropic Session variant bodies", () => Effect.gen(function* () { const catalog = model( - { package: "aisdk:@ai-sdk/anthropic", settings: { baseURL: "https://anthropic.example/v1" } }, + { package: "@opencode-ai/llm/providers/anthropic", settings: { baseURL: "https://anthropic.example/v1" } }, [ { id: ModelV2.VariantID.make("high"), @@ -264,10 +277,10 @@ describe("SessionRunnerModel", () => { }), ) - it.effect("maps catalog Anthropic AI SDK models into native routes", () => + it.effect("maps catalog Anthropic native provider packages into native routes", () => Effect.gen(function* () { const resolved = yield* SessionRunnerModel.fromCatalogModel( - model({ package: "aisdk:@ai-sdk/anthropic", settings: { baseURL: "https://anthropic.example/v1" } }), + model({ package: "@opencode-ai/llm/providers/anthropic", settings: { baseURL: "https://anthropic.example/v1" } }), ) expect(resolved.route).toMatchObject({ @@ -281,7 +294,7 @@ describe("SessionRunnerModel", () => { Effect.gen(function* () { const resolved = yield* SessionRunnerModel.fromCatalogModel( ModelV2.Info.make({ - ...model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }), + ...model({ package: "@opencode-ai/llm/providers/openai", settings: { baseURL: "https://openai.example/v1" } }), headers: {}, body: {}, }), @@ -305,7 +318,7 @@ describe("SessionRunnerModel", () => { const credential = Credential.Key.make({ type: "key", key: "stored-secret", metadata: { tenant: "work" } }) const resolved = yield* SessionRunnerModel.fromCatalogModel( ModelV2.Info.make({ - ...model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }), + ...model({ package: "@opencode-ai/llm/providers/openai", settings: { baseURL: "https://openai.example/v1" } }), settings: { apiKey: "configured-secret", baseURL: "https://openai.example/v1" }, headers: {}, body: {}, @@ -325,34 +338,26 @@ describe("SessionRunnerModel", () => { }), ) - it.effect("rejects catalog APIs without a native route", () => + it.effect("delegates aisdk-prefixed packages to the compatibility resolver", () => Effect.gen(function* () { - const failure = yield* SessionRunnerModel.fromCatalogModel( + const resolved = yield* SessionRunnerModel.fromCatalogModel( model({ package: "aisdk:@ai-sdk/google", settings: { baseURL: "https://google.example/v1" } }), - ).pipe(Effect.flip) + undefined, + aisdkDependencies, + ) - expect(failure).toMatchObject({ - _tag: "SessionRunnerModel.UnsupportedPackageError", - providerID: "test-provider", - modelID: "test-model", - package: "aisdk:@ai-sdk/google", - }) - expect(failure.message).toBe("Unsupported package for test-provider/test-model: aisdk:@ai-sdk/google") + expect(resolved.route.id).toBe("openai-responses") + expect(resolved.route.endpoint).toMatchObject({ baseURL: "https://google.example/v1" }) }), ) - it.effect("reports whether a catalog model has a supported native route", () => + it.effect("reports whether a catalog model has a supported package", () => Effect.sync(() => { - expect( - SessionRunnerModel.supported( - model({ package: "aisdk:@ai-sdk/openai", settings: { baseURL: "https://openai.example/v1" } }), - ), - ).toBe(true) expect( SessionRunnerModel.supported( model({ package: "aisdk:@ai-sdk/google", settings: { baseURL: "https://google.example/v1" } }), ), - ).toBe(false) + ).toBe(true) expect(SessionRunnerModel.supported(model({ package: "native-provider-package" }))).toBe(true) }), )