Skip to content

fix: unify Anthropic/Claude model detection in ProviderTransform #20414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bussnet wants to merge 2 commits into from
+20 −14
Closed

fix: unify Anthropic/Claude model detection in ProviderTransform #20414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
601362b
fix: unify Anthropic/Claude model detection in ProviderTransform
Apr 1, 2026
a5d9fe3
test: fix non-anthropic model fixture to override inherited id
Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions packages/opencode/src/provider/transform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,22 @@ function mimeToModality(mime: string): Modality | undefined {
export namespace ProviderTransform {
export const OUTPUT_TOKEN_MAX = Flag.OPENCODE_EXPERIMENTAL_OUTPUT_TOKEN_MAX || 32_000

// Detects whether a model targets the Anthropic/Claude API regardless of
// the SDK package used to reach it (direct, proxy, vertex, bedrock, etc.).
function isClaudeModel(model: Provider.Model): boolean {
return (
model.providerID === "anthropic" ||
model.providerID === "google-vertex-anthropic" ||
model.api.id.includes("anthropic") ||
model.api.id.includes("claude") ||
model.id.includes("anthropic") ||
model.id.includes("claude") ||
model.api.npm === "@ai-sdk/anthropic" ||
model.api.npm === "@ai-sdk/google-vertex/anthropic" ||
model.api.npm === "@ai-sdk/amazon-bedrock"
)
}

// Maps npm package to the key the AI SDK expects for providerOptions
function sdkKey(npm: string): string | undefined {
switch (npm) {
Expand Down Expand Up @@ -51,9 +67,7 @@ export namespace ProviderTransform {
model: Provider.Model,
options: Record<string, unknown>,
): ModelMessage[] {
// Anthropic rejects messages with empty content - filter out empty string messages
// and remove empty text/reasoning parts from array content
if (model.api.npm === "@ai-sdk/anthropic" || model.api.npm === "@ai-sdk/amazon-bedrock") {
if (isClaudeModel(model)) {
msgs = msgs
.map((msg) => {
if (typeof msg.content === "string") {
Expand All @@ -73,7 +87,7 @@ export namespace ProviderTransform {
.filter((msg): msg is ModelMessage => msg !== undefined && msg.content !== "")
}

if (model.api.id.includes("claude")) {
if (isClaudeModel(model)) {
const scrub = (id: string) => id.replace(/[^a-zA-Z0-9_-]/g, "_")
return msgs.map((msg) => {
if (msg.role === "assistant" && Array.isArray(msg.content)) {
Expand Down Expand Up @@ -278,16 +292,7 @@ export namespace ProviderTransform {
export function message(msgs: ModelMessage[], model: Provider.Model, options: Record<string, unknown>) {
msgs = unsupportedParts(msgs, model)
msgs = normalizeMessages(msgs, model, options)
if (
(model.providerID === "anthropic" ||
model.providerID === "google-vertex-anthropic" ||
model.api.id.includes("anthropic") ||
model.api.id.includes("claude") ||
model.id.includes("anthropic") ||
model.id.includes("claude") ||
model.api.npm === "@ai-sdk/anthropic") &&
model.api.npm !== "@ai-sdk/gateway"
) {
if (isClaudeModel(model) && model.api.npm !== "@ai-sdk/gateway") {
msgs = applyCaching(msgs, model)
}

Expand Down
1 change: 1 addition & 0 deletions packages/opencode/test/provider/transform.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,6 +1197,7 @@ describe("ProviderTransform.message - anthropic empty content filtering", () =>
test("does not filter for non-anthropic providers", () => {
const openaiModel = {
...anthropicModel,
id: "openai/gpt-4",
providerID: "openai",
api: {
id: "gpt-4",
Expand Down
Loading