xonecas.io
64875
Mc

mini-coder / commit 72833c9

refactor(llm): make model resolver routing more declarative

xonecas2026-03-14 72833c96d3e6986205c9213d20550b26b0730627 parent 0a98de4

2 files changed

src/llm-api/providers-resolve.test.ts+63−0
@@ -0,0 +1,63 @@
1+import { afterEach, describe, expect, test } from "bun:test";
2+import { autoDiscoverModel, resolveModel } from "./providers.ts";
3+
4+const ENV_KEYS = [
5+ "OPENCODE_API_KEY",
6+ "ANTHROPIC_API_KEY",
7+ "OPENAI_API_KEY",
8+ "GOOGLE_API_KEY",
9+ "GEMINI_API_KEY",
10+] as const;
11+
12+const initialEnv = new Map<string, string | undefined>(
13+ ENV_KEYS.map((key) => [key, process.env[key]]),
14+);
15+
16+afterEach(() => {
17+ for (const key of ENV_KEYS) {
18+ const value = initialEnv.get(key);
19+ if (value === undefined) {
20+ delete process.env[key];
21+ continue;
22+ }
23+ process.env[key] = value;
24+ }
25+});
26+
27+describe("resolveModel", () => {
28+ test("rejects model strings without provider prefix", () => {
29+ expect(() => resolveModel("gpt-4o")).toThrow(
30+ 'Invalid model string "gpt-4o". Expected format: "<provider>/<model-id>"',
31+ );
32+ });
33+
34+ test("rejects unsupported providers", () => {
35+ expect(() => resolveModel("foo/bar")).toThrow(
36+ 'Unknown provider "foo". Supported: zen, anthropic, openai, google, ollama',
37+ );
38+ });
39+});
40+
41+describe("autoDiscoverModel", () => {
42+ test("uses provider priority order", () => {
43+ delete process.env.OPENCODE_API_KEY;
44+ delete process.env.ANTHROPIC_API_KEY;
45+ delete process.env.OPENAI_API_KEY;
46+ delete process.env.GOOGLE_API_KEY;
47+ delete process.env.GEMINI_API_KEY;
48+
49+ expect(autoDiscoverModel()).toBe("ollama/llama3.2");
50+
51+ process.env.GEMINI_API_KEY = "gem";
52+ expect(autoDiscoverModel()).toBe("google/gemini-2.0-flash");
53+
54+ process.env.OPENAI_API_KEY = "openai";
55+ expect(autoDiscoverModel()).toBe("openai/gpt-4o");
56+
57+ process.env.ANTHROPIC_API_KEY = "anthropic";
58+ expect(autoDiscoverModel()).toBe("anthropic/claude-sonnet-4-5-20250929");
59+
60+ process.env.OPENCODE_API_KEY = "zen";
61+ expect(autoDiscoverModel()).toBe("zen/claude-sonnet-4-6");
62+ });
63+});
src/llm-api/providers.ts+19−19
@@ -31,6 +31,7 @@ type AnthropicProvider = ReturnType<typeof createAnthropic>;
3131 type OpenAIProvider = ReturnType<typeof createOpenAI>;
3232 type GoogleProvider = ReturnType<typeof createGoogleGenerativeAI>;
3333 type OpenAICompatProvider = ReturnType<typeof createOpenAICompatible>;
34+type ModelResolver = (modelId: string) => LanguageModel;
3435
3536 function createFetchWithLogging(): ProviderFetch {
3637 const customFetch = async (
@@ -149,17 +150,17 @@ const directProviders = {
149150 }),
150151 };
151152
153+const ZEN_BACKEND_RESOLVERS: Readonly<
154+ Record<ReturnType<typeof getZenBackend>, ModelResolver>
155+> = {
156+ anthropic: (modelId) => zenProviders.anthropic()(modelId),
157+ openai: (modelId) => zenProviders.openai().responses(modelId),
158+ google: (modelId) => zenProviders.google()(modelId),
159+ compat: (modelId) => zenProviders.compat()(modelId),
160+};
161+
152162 function resolveZenModel(modelId: string): LanguageModel {
153- switch (getZenBackend(modelId)) {
154- case "anthropic":
155- return zenProviders.anthropic()(modelId);
156- case "openai":
157- return zenProviders.openai().responses(modelId);
158- case "google":
159- return zenProviders.google()(modelId);
160- case "compat":
161- return zenProviders.compat()(modelId);
162- }
163+ return ZEN_BACKEND_RESOLVERS[getZenBackend(modelId)](modelId);
163164 }
164165
165166 function resolveOpenAIModel(modelId: string): LanguageModel {
@@ -168,15 +169,14 @@ function resolveOpenAIModel(modelId: string): LanguageModel {
168169 : directProviders.openai()(modelId);
169170 }
170171
171-const PROVIDER_MODEL_RESOLVERS: Readonly<
172- Record<ProviderName, (modelId: string) => LanguageModel>
173-> = {
174- zen: resolveZenModel,
175- anthropic: (modelId) => directProviders.anthropic()(modelId),
176- openai: resolveOpenAIModel,
177- google: (modelId) => directProviders.google()(modelId),
178- ollama: (modelId) => directProviders.ollama().chatModel(modelId),
179-};
172+const PROVIDER_MODEL_RESOLVERS: Readonly<Record<ProviderName, ModelResolver>> =
173+ {
174+ zen: resolveZenModel,
175+ anthropic: (modelId) => directProviders.anthropic()(modelId),
176+ openai: resolveOpenAIModel,
177+ google: (modelId) => directProviders.google()(modelId),
178+ ollama: (modelId) => directProviders.ollama().chatModel(modelId),
179+ };
180180
181181 function isProviderName(provider: string): provider is ProviderName {
182182 return SUPPORTED_PROVIDERS.includes(provider as ProviderName);