From ab6e18e4ff3df4a3e59340297f4d270678ff6a3f Mon Sep 17 00:00:00 2001 From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Date: Tue, 11 Aug 2026 15:29:02 -0500 Subject: [PATCH] fix(core): route Vertex Anthropic natively (#41836) --- packages/core/src/aisdk-native.ts | 21 ++++++++++ packages/core/test/aisdk-native.test.ts | 29 +++++++++++++ packages/core/test/model-resolver.test.ts | 51 +++++++++++++++++++++++ 3 files changed, 101 insertions(+) diff --git a/packages/core/src/aisdk-native.ts b/packages/core/src/aisdk-native.ts index 3092a2ccb90..4a8baa2b455 100644 --- a/packages/core/src/aisdk-native.ts +++ b/packages/core/src/aisdk-native.ts @@ -51,6 +51,27 @@ export function map(input: MapInput): Mapping | undefined { ...mapGoogleOptions(input.settings), }, } + case "@ai-sdk/google-vertex/anthropic": + return { + package: "@opencode-ai/ai/providers/google-vertex/messages", + settings: { + ...baseSettings, + ...(typeof input.settings.accessToken === "string" ? { accessToken: input.settings.accessToken } : {}), + ...(typeof input.settings.location === "string" ? { location: input.settings.location } : {}), + ...(typeof input.settings.project === "string" ? { project: input.settings.project } : {}), + ...(isRecord(input.settings.thinking) || typeof input.settings.effort === "string" + ? { + providerOptions: { + anthropic: { + ...(isRecord(input.settings.thinking) ? { thinking: input.settings.thinking } : {}), + ...(typeof input.settings.effort === "string" ? { effort: input.settings.effort } : {}), + }, + }, + } + : {}), + }, + ...(isStringRecord(input.settings.headers) ? { headers: input.settings.headers } : {}), + } case "@openrouter/ai-sdk-provider": return mapOpenRouter(input.settings, baseSettings) case "@ai-sdk/xai": diff --git a/packages/core/test/aisdk-native.test.ts b/packages/core/test/aisdk-native.test.ts index ceb390f85df..7d28d19e35f 100644 --- a/packages/core/test/aisdk-native.test.ts +++ b/packages/core/test/aisdk-native.test.ts @@ -273,6 +273,35 @@ describe("AISDKNative", () => { }) }) + test("maps Vertex Anthropic settings to native Messages", () => { + expect( + map("@ai-sdk/google-vertex/anthropic", { + accessToken: "vertex-token", + baseURL: "https://vertex.example/v1", + headers: { "x-test": "value" }, + location: "eu", + project: "vertex-project", + thinking: { type: "adaptive", display: "summarized" }, + effort: "high", + }), + ).toEqual({ + package: "@opencode-ai/ai/providers/google-vertex/messages", + settings: { + accessToken: "vertex-token", + baseURL: "https://vertex.example/v1", + location: "eu", + project: "vertex-project", + providerOptions: { + anthropic: { + thinking: { type: "adaptive", display: "summarized" }, + effort: "high", + }, + }, + }, + headers: { "x-test": "value" }, + }) + }) + test("maps supported xAI settings", () => { expect( map("@ai-sdk/xai", { diff --git a/packages/core/test/model-resolver.test.ts b/packages/core/test/model-resolver.test.ts index 08aeee3b3f3..83e1ed6188b 100644 --- a/packages/core/test/model-resolver.test.ts +++ b/packages/core/test/model-resolver.test.ts @@ -763,6 +763,57 @@ describe("ModelResolver", () => { }), ) + it.effect("routes Vertex Anthropic catalog models through native Messages", () => + Effect.gen(function* () { + const native = yield* ModelResolver.fromCatalogModel(model(Provider.aisdk("@ai-sdk/openai"))) + const credential = Credential.OAuth.make({ + type: "oauth", + methodID: Integration.MethodID.make("device"), + access: "vertex-token", + refresh: "refresh", + expires: Date.now() + 60_000, + }) + + const resolved = yield* ModelResolver.fromCatalogModel( + model(Provider.aisdk("@ai-sdk/google-vertex/anthropic"), { + modelID: "claude-sonnet-4-6", + settings: { + location: "eu", + project: "vertex-project", + thinking: { type: "adaptive", display: "summarized" }, + effort: "high", + }, + }), + credential, + { + loadPackage: (specifier) => { + expect(specifier).toBe("@opencode-ai/ai/providers/google-vertex/messages") + return Effect.succeed({ + model: (modelID, settings) => { + expect(modelID).toBe("claude-sonnet-4-6") + expect(settings).toMatchObject({ + accessToken: "vertex-token", + location: "eu", + project: "vertex-project", + providerOptions: { + anthropic: { + thinking: { type: "adaptive", display: "summarized" }, + effort: "high", + }, + }, + }) + return LanguageModel.make({ id: modelID, provider: "native-provider", route: native.route }) + }, + }) + }, + loadAISDK: () => Effect.die("AI SDK loader should not be called"), + }, + ) + + expect(resolved).toMatchObject({ id: "claude-sonnet-4-6", provider: "test-provider" }) + }), + ) + it.effect("merges mapped OpenRouter headers and body with catalog overlays", () => ModelResolver.fromCatalogModel( model(Provider.aisdk("@openrouter/ai-sdk-provider"), {