From c6ea3f4aff1c6cd1df43dc0774f2e38d7a775028 Mon Sep 17 00:00:00 2001 From: YeonGyu-Kim Date: Wed, 11 Mar 2026 17:07:23 +0900 Subject: [PATCH] map Claude Code model strings to OpenCode format with proper object structure --- .../claude-model-mapper.test.ts | 54 ++++++++++--------- .../claude-model-mapper.ts | 10 +++- .../claude-code-agent-loader/loader.ts | 17 +++--- .../claude-code-agent-loader/types.ts | 6 ++- .../claude-code-plugin-loader/agent-loader.ts | 13 +++-- .../claude-code-plugin-loader/loader.ts | 4 +- 6 files changed, 58 insertions(+), 46 deletions(-) diff --git a/src/features/claude-code-agent-loader/claude-model-mapper.test.ts b/src/features/claude-code-agent-loader/claude-model-mapper.test.ts index c01075d60..e0a9ec638 100644 --- a/src/features/claude-code-agent-loader/claude-model-mapper.test.ts +++ b/src/features/claude-code-agent-loader/claude-model-mapper.test.ts @@ -1,3 +1,5 @@ +/// + import { describe, it, expect } from "bun:test" import { mapClaudeModelToOpenCode } from "./claude-model-mapper" @@ -17,20 +19,20 @@ describe("mapClaudeModelToOpenCode", () => { }) describe("#given Claude Code alias", () => { - it("#when called with sonnet #then maps to anthropic/claude-sonnet-4-6", () => { - expect(mapClaudeModelToOpenCode("sonnet")).toBe("anthropic/claude-sonnet-4-6") + it("#when called with sonnet #then maps to anthropic claude-sonnet-4-6 object", () => { + expect(mapClaudeModelToOpenCode("sonnet")).toEqual({ providerID: "anthropic", modelID: "claude-sonnet-4-6" }) }) - it("#when called with opus #then maps to anthropic/claude-opus-4-6", () => { - expect(mapClaudeModelToOpenCode("opus")).toBe("anthropic/claude-opus-4-6") + it("#when called with opus #then maps to anthropic claude-opus-4-6 object", () => { + expect(mapClaudeModelToOpenCode("opus")).toEqual({ providerID: "anthropic", modelID: "claude-opus-4-6" }) }) - it("#when called with haiku #then maps to anthropic/claude-haiku-4-5", () => { - expect(mapClaudeModelToOpenCode("haiku")).toBe("anthropic/claude-haiku-4-5") + it("#when called with haiku #then maps to anthropic claude-haiku-4-5 object", () => { + expect(mapClaudeModelToOpenCode("haiku")).toEqual({ providerID: "anthropic", modelID: "claude-haiku-4-5" }) }) - it("#when called with Sonnet (capitalized) #then maps case-insensitively", () => { - expect(mapClaudeModelToOpenCode("Sonnet")).toBe("anthropic/claude-sonnet-4-6") + it("#when called with Sonnet (capitalized) #then maps case-insensitively to object", () => { + expect(mapClaudeModelToOpenCode("Sonnet")).toEqual({ providerID: "anthropic", modelID: "claude-sonnet-4-6" }) }) }) @@ -41,40 +43,40 @@ describe("mapClaudeModelToOpenCode", () => { }) describe("#given bare Claude model name", () => { - it("#when called with claude-sonnet-4-5-20250514 #then adds anthropic prefix", () => { - expect(mapClaudeModelToOpenCode("claude-sonnet-4-5-20250514")).toBe("anthropic/claude-sonnet-4-5-20250514") + it("#when called with claude-sonnet-4-5-20250514 #then adds anthropic object format", () => { + expect(mapClaudeModelToOpenCode("claude-sonnet-4-5-20250514")).toEqual({ providerID: "anthropic", modelID: "claude-sonnet-4-5-20250514" }) }) - it("#when called with claude-opus-4-6 #then adds anthropic prefix", () => { - expect(mapClaudeModelToOpenCode("claude-opus-4-6")).toBe("anthropic/claude-opus-4-6") + it("#when called with claude-opus-4-6 #then adds anthropic object format", () => { + expect(mapClaudeModelToOpenCode("claude-opus-4-6")).toEqual({ providerID: "anthropic", modelID: "claude-opus-4-6" }) }) - it("#when called with claude-haiku-4-5-20251001 #then adds anthropic prefix", () => { - expect(mapClaudeModelToOpenCode("claude-haiku-4-5-20251001")).toBe("anthropic/claude-haiku-4-5-20251001") + it("#when called with claude-haiku-4-5-20251001 #then adds anthropic object format", () => { + expect(mapClaudeModelToOpenCode("claude-haiku-4-5-20251001")).toEqual({ providerID: "anthropic", modelID: "claude-haiku-4-5-20251001" }) }) - it("#when called with claude-3-5-sonnet-20241022 #then adds anthropic prefix", () => { - expect(mapClaudeModelToOpenCode("claude-3-5-sonnet-20241022")).toBe("anthropic/claude-3-5-sonnet-20241022") + it("#when called with claude-3-5-sonnet-20241022 #then adds anthropic object format", () => { + expect(mapClaudeModelToOpenCode("claude-3-5-sonnet-20241022")).toEqual({ providerID: "anthropic", modelID: "claude-3-5-sonnet-20241022" }) }) }) describe("#given model with dot version numbers", () => { - it("#when called with claude-3.5-sonnet #then normalizes dots and adds prefix", () => { - expect(mapClaudeModelToOpenCode("claude-3.5-sonnet")).toBe("anthropic/claude-3-5-sonnet") + it("#when called with claude-3.5-sonnet #then normalizes dots and returns object format", () => { + expect(mapClaudeModelToOpenCode("claude-3.5-sonnet")).toEqual({ providerID: "anthropic", modelID: "claude-3-5-sonnet" }) }) - it("#when called with claude-3.5-sonnet-20241022 #then normalizes dots and adds prefix", () => { - expect(mapClaudeModelToOpenCode("claude-3.5-sonnet-20241022")).toBe("anthropic/claude-3-5-sonnet-20241022") + it("#when called with claude-3.5-sonnet-20241022 #then normalizes dots and returns object format", () => { + expect(mapClaudeModelToOpenCode("claude-3.5-sonnet-20241022")).toEqual({ providerID: "anthropic", modelID: "claude-3-5-sonnet-20241022" }) }) }) describe("#given model already in provider/model format", () => { - it("#when called with anthropic/claude-sonnet-4-6 #then passes through unchanged", () => { - expect(mapClaudeModelToOpenCode("anthropic/claude-sonnet-4-6")).toBe("anthropic/claude-sonnet-4-6") + it("#when called with anthropic/claude-sonnet-4-6 #then splits into object format", () => { + expect(mapClaudeModelToOpenCode("anthropic/claude-sonnet-4-6")).toEqual({ providerID: "anthropic", modelID: "claude-sonnet-4-6" }) }) - it("#when called with openai/gpt-5.2 #then passes through unchanged", () => { - expect(mapClaudeModelToOpenCode("openai/gpt-5.2")).toBe("openai/gpt-5.2") + it("#when called with openai/gpt-5.2 #then splits into object format", () => { + expect(mapClaudeModelToOpenCode("openai/gpt-5.2")).toEqual({ providerID: "openai", modelID: "gpt-5.2" }) }) }) @@ -99,8 +101,8 @@ describe("mapClaudeModelToOpenCode", () => { }) describe("#given model with leading/trailing whitespace", () => { - it("#when called with padded string #then trims before mapping", () => { - expect(mapClaudeModelToOpenCode(" claude-sonnet-4-6 ")).toBe("anthropic/claude-sonnet-4-6") + it("#when called with padded string #then trims before returning object format", () => { + expect(mapClaudeModelToOpenCode(" claude-sonnet-4-6 ")).toEqual({ providerID: "anthropic", modelID: "claude-sonnet-4-6" }) }) }) }) diff --git a/src/features/claude-code-agent-loader/claude-model-mapper.ts b/src/features/claude-code-agent-loader/claude-model-mapper.ts index ebdbd3c86..bee1be6f9 100644 --- a/src/features/claude-code-agent-loader/claude-model-mapper.ts +++ b/src/features/claude-code-agent-loader/claude-model-mapper.ts @@ -1,3 +1,4 @@ +import { normalizeModelFormat } from "../../shared/model-format-normalizer" import { normalizeModelID } from "../../shared/model-normalization" const ANTHROPIC_PREFIX = "anthropic/" @@ -8,7 +9,7 @@ const CLAUDE_CODE_ALIAS_MAP = new Map([ ["haiku", `${ANTHROPIC_PREFIX}claude-haiku-4-5`], ]) -export function mapClaudeModelToOpenCode(model: string | undefined): string | undefined { +function mapClaudeModelString(model: string | undefined): string | undefined { if (!model) return undefined const trimmed = model.trim() @@ -29,3 +30,10 @@ export function mapClaudeModelToOpenCode(model: string | undefined): string | un return undefined } + +export function mapClaudeModelToOpenCode( + model: string | undefined +): { providerID: string; modelID: string } | undefined { + const mappedModel = mapClaudeModelString(model) + return mappedModel ? normalizeModelFormat(mappedModel) : undefined +} diff --git a/src/features/claude-code-agent-loader/loader.ts b/src/features/claude-code-agent-loader/loader.ts index e15aa512c..f74d27cc6 100644 --- a/src/features/claude-code-agent-loader/loader.ts +++ b/src/features/claude-code-agent-loader/loader.ts @@ -1,10 +1,9 @@ import { existsSync, readdirSync, readFileSync } from "fs" import { join, basename } from "path" -import type { AgentConfig } from "@opencode-ai/sdk" import { parseFrontmatter } from "../../shared/frontmatter" import { isMarkdownFile } from "../../shared/file-utils" import { getClaudeConfigDir } from "../../shared" -import type { AgentScope, AgentFrontmatter, LoadedAgent } from "./types" +import type { AgentScope, AgentFrontmatter, ClaudeCodeAgentConfig, LoadedAgent } from "./types" import { mapClaudeModelToOpenCode } from "./claude-model-mapper" function parseToolsConfig(toolsStr?: string): Record | undefined { @@ -43,13 +42,13 @@ function loadAgentsFromDir(agentsDir: string, scope: AgentScope): LoadedAgent[] const formattedDescription = `(${scope}) ${originalDescription}` - const mappedModel = mapClaudeModelToOpenCode(data.model) + const mappedModelOverride = mapClaudeModelToOpenCode(data.model) - const config: AgentConfig = { + const config: ClaudeCodeAgentConfig = { description: formattedDescription, mode: "subagent", prompt: body.trim(), - ...(mappedModel && { model: mappedModel }), + ...(mappedModelOverride ? { model: mappedModelOverride } : {}), } const toolsConfig = parseToolsConfig(data.tools) @@ -71,22 +70,22 @@ function loadAgentsFromDir(agentsDir: string, scope: AgentScope): LoadedAgent[] return agents } -export function loadUserAgents(): Record { +export function loadUserAgents(): Record { const userAgentsDir = join(getClaudeConfigDir(), "agents") const agents = loadAgentsFromDir(userAgentsDir, "user") - const result: Record = {} + const result: Record = {} for (const agent of agents) { result[agent.name] = agent.config } return result } -export function loadProjectAgents(directory?: string): Record { +export function loadProjectAgents(directory?: string): Record { const projectAgentsDir = join(directory ?? process.cwd(), ".claude", "agents") const agents = loadAgentsFromDir(projectAgentsDir, "project") - const result: Record = {} + const result: Record = {} for (const agent of agents) { result[agent.name] = agent.config } diff --git a/src/features/claude-code-agent-loader/types.ts b/src/features/claude-code-agent-loader/types.ts index 4ffd9de40..3ccad3ccb 100644 --- a/src/features/claude-code-agent-loader/types.ts +++ b/src/features/claude-code-agent-loader/types.ts @@ -2,6 +2,10 @@ import type { AgentConfig } from "@opencode-ai/sdk" export type AgentScope = "user" | "project" +export type ClaudeCodeAgentConfig = Omit & { + model?: string | { providerID: string; modelID: string } +} + export interface AgentFrontmatter { name?: string description?: string @@ -12,6 +16,6 @@ export interface AgentFrontmatter { export interface LoadedAgent { name: string path: string - config: AgentConfig + config: ClaudeCodeAgentConfig scope: AgentScope } diff --git a/src/features/claude-code-plugin-loader/agent-loader.ts b/src/features/claude-code-plugin-loader/agent-loader.ts index 8e292ebe8..215e29d1b 100644 --- a/src/features/claude-code-plugin-loader/agent-loader.ts +++ b/src/features/claude-code-plugin-loader/agent-loader.ts @@ -1,10 +1,9 @@ import { existsSync, readdirSync, readFileSync } from "fs" import { basename, join } from "path" -import type { AgentConfig } from "@opencode-ai/sdk" import { parseFrontmatter } from "../../shared/frontmatter" import { isMarkdownFile } from "../../shared/file-utils" import { log } from "../../shared/logger" -import type { AgentFrontmatter } from "../claude-code-agent-loader/types" +import type { AgentFrontmatter, ClaudeCodeAgentConfig } from "../claude-code-agent-loader/types" import { mapClaudeModelToOpenCode } from "../claude-code-agent-loader/claude-model-mapper" import type { LoadedPlugin } from "./types" @@ -25,8 +24,8 @@ function parseToolsConfig(toolsStr?: string): Record | undefine return result } -export function loadPluginAgents(plugins: LoadedPlugin[]): Record { - const agents: Record = {} +export function loadPluginAgents(plugins: LoadedPlugin[]): Record { + const agents: Record = {} for (const plugin of plugins) { if (!plugin.agentsDir || !existsSync(plugin.agentsDir)) continue @@ -47,13 +46,13 @@ export function loadPluginAgents(plugins: LoadedPlugin[]): Record skills: Record - agents: Record + agents: Record mcpServers: Record hooksConfigs: HooksConfig[] plugins: LoadedPlugin[]