Skip to content

Commit e7181c0

Browse files
committed
refactor(types): move provider default model data into provider definitions
Each provider definition now declares its own `getDefaultModelId`, mirroring `getModelId`, so per-provider default-model data lives next to the rest of that provider's configuration instead of in a central switch. - Add `getDefaultModelId` to `ProviderDefinition`/`createProviderDefinition` and a shared `NO_DEFAULT_MODEL_ID` constant. - Move every provider's default into its definition; Z.ai keeps its region-dependent logic by reading `zaiApiLine` from settings. - Remove the `getProviderDefaultModelId` switch from `providers/index.ts`. - Re-add `getProviderDefaultModelId(provider, settings)` in `provider-settings.ts`, resolving the definition and falling back to the Anthropic default. - Update webview callers to pass `apiConfiguration` and drop the duplicated Z.ai region logic in `providerModelConfig.ts`. - Extend tests to cover the new accessor and the Z.ai API-line defaults.
1 parent 4ed3ffe commit e7181c0

45 files changed

Lines changed: 141 additions & 150 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/types/src/__tests__/io-intelligence.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe("IO Intelligence shared contract", () => {
1212
it("registers the stable dynamic-provider identity and default model", () => {
1313
expect(providerIdentifiers.ioIntelligence).toBe("io-intelligence")
1414
expect(dynamicProviders).toContain(providerIdentifiers.ioIntelligence)
15-
expect(getProviderDefaultModelId(providerIdentifiers.ioIntelligence)).toBe(ioIntelligenceDefaultModelId)
15+
expect(getProviderDefaultModelId(providerIdentifiers.ioIntelligence, {})).toBe(ioIntelligenceDefaultModelId)
1616
})
1717

1818
it("classifies the API key as secret and resolves the configured model", () => {

‎packages/types/src/__tests__/nanogpt.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe("NanoGPT shared contract", () => {
1414
it("registers the stable dynamic-provider identity and default model", () => {
1515
expect(providerIdentifiers.nanogpt).toBe("nanogpt")
1616
expect(dynamicProviders).toContain(providerIdentifiers.nanogpt)
17-
expect(getProviderDefaultModelId(providerIdentifiers.nanogpt)).toBe(nanoGptDefaultModelId)
17+
expect(getProviderDefaultModelId(providerIdentifiers.nanogpt, {})).toBe(nanoGptDefaultModelId)
1818
})
1919

2020
it("classifies the API key as secret and resolves missing routing to auto", () => {

‎packages/types/src/__tests__/provider-default-model.test.ts‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ vi.mock("../provider-identifiers.js", async (importOriginal) => {
1515
import { providerIdentifiers } from "../provider-identifiers.js"
1616
import {
1717
anthropicDefaultModelId,
18-
getProviderDefaultModelId,
1918
internationalZAiDefaultModelId,
2019
kimiCodeDefaultModelId,
2120
mainlandZAiDefaultModelId,
@@ -24,49 +23,58 @@ import {
2423
vscodeLlmDefaultModelId,
2524
zooGatewayDefaultModelId,
2625
} from "../providers/index.js"
26+
import { getProviderDefaultModelId } from "../provider-settings.js"
2727

2828
describe("getProviderDefaultModelId", () => {
2929
it("selects a static default through the canonical provider identifier", () => {
30-
expect(getProviderDefaultModelId(providerIdentifiers.openrouter as ProviderName)).toBe(openRouterDefaultModelId)
30+
expect(getProviderDefaultModelId(providerIdentifiers.openrouter as ProviderName, {})).toBe(
31+
openRouterDefaultModelId,
32+
)
3133
})
3234

3335
it("triangulates static selection with another provider category", () => {
34-
expect(getProviderDefaultModelId(providerIdentifiers.vscodeLm)).toBe(vscodeLlmDefaultModelId)
36+
expect(getProviderDefaultModelId(providerIdentifiers.vscodeLm, {})).toBe(vscodeLlmDefaultModelId)
3537
})
3638

3739
it("gives GitHub Copilot the same default as the VS Code LM provider", () => {
38-
expect(getProviderDefaultModelId(providerIdentifiers.githubCopilot)).toBe(vscodeLlmDefaultModelId)
40+
expect(getProviderDefaultModelId(providerIdentifiers.githubCopilot, {})).toBe(vscodeLlmDefaultModelId)
3941
})
4042

4143
it("uses the canonical OpenAI Native default model", () => {
42-
expect(getProviderDefaultModelId(providerIdentifiers.openaiNative)).toBe(openAiNativeDefaultModelId)
44+
expect(getProviderDefaultModelId(providerIdentifiers.openaiNative, {})).toBe(openAiNativeDefaultModelId)
4345
})
4446

4547
it.each([
4648
[providerIdentifiers.kimiCode, kimiCodeDefaultModelId],
4749
[providerIdentifiers.zooGateway, zooGatewayDefaultModelId],
4850
])("preserves the %s default added on main", (provider, expectedModelId) => {
49-
expect(getProviderDefaultModelId(provider)).toBe(expectedModelId)
51+
expect(getProviderDefaultModelId(provider, {})).toBe(expectedModelId)
5052
})
5153

5254
it("preserves region-dependent defaults", () => {
53-
// These defaults currently share the same model ID, so the assertions document
54-
// both branches but cannot detect swapped ternary arms until the IDs diverge.
55-
expect(getProviderDefaultModelId(providerIdentifiers.zai, { isChina: true })).toBe(mainlandZAiDefaultModelId)
56-
expect(getProviderDefaultModelId(providerIdentifiers.zai)).toBe(internationalZAiDefaultModelId)
55+
expect(getProviderDefaultModelId(providerIdentifiers.zai, { zaiApiLine: "china_coding" })).toBe(
56+
mainlandZAiDefaultModelId,
57+
)
58+
expect(getProviderDefaultModelId(providerIdentifiers.zai, { zaiApiLine: "international_coding" })).toBe(
59+
internationalZAiDefaultModelId,
60+
)
61+
})
62+
63+
it("falls back to the international Z.ai default when the API line is unset", () => {
64+
expect(getProviderDefaultModelId(providerIdentifiers.zai, {})).toBe(internationalZAiDefaultModelId)
5765
})
5866

5967
it.each([providerIdentifiers.openai, providerIdentifiers.ollama, providerIdentifiers.lmstudio])(
6068
"returns an empty default for custom or locally selected models from %s",
6169
(provider) => {
62-
expect(getProviderDefaultModelId(provider)).toBe("")
70+
expect(getProviderDefaultModelId(provider, {})).toBe("")
6371
},
6472
)
6573

6674
it.each([providerIdentifiers.anthropic, providerIdentifiers.geminiCli, providerIdentifiers.fakeAi])(
6775
"preserves the Anthropic fallback for %s",
6876
(provider) => {
69-
expect(getProviderDefaultModelId(provider)).toBe(anthropicDefaultModelId)
77+
expect(getProviderDefaultModelId(provider, {})).toBe(anthropicDefaultModelId)
7078
},
7179
)
7280
})

‎packages/types/src/__tests__/provider-settings.test.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ describe("provider settings discriminated union", () => {
1818
expect(new Set(registeredProviders).size).toBe(providerNames.length)
1919
})
2020

21+
it.each(providerDefinitionList.map((definition) => definition.apiProvider))(
22+
"exposes a default model accessor for %s",
23+
(apiProvider) => {
24+
const definition = providerDefinitionList.find((candidate) => candidate.apiProvider === apiProvider)
25+
26+
expect(typeof definition?.getDefaultModelId).toBe("function")
27+
expect(typeof definition?.getDefaultModelId({})).toBe("string")
28+
},
29+
)
30+
2131
it.each(providerNames)("accepts the %s provider branch", (apiProvider) => {
2232
expect(providerSettingsSchemaDiscriminated.safeParse({ apiProvider }).success).toBe(true)
2333
})

‎packages/types/src/provider-settings.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
type RetiredProviderIdentifier,
2626
} from "./provider-identifiers.js"
2727
import {
28+
anthropicDefaultModelId,
2829
anthropicModels,
2930
basetenModels,
3031
bedrockModels,
@@ -359,6 +360,14 @@ export function getModelId(settings: ProviderSettings): string | undefined {
359360
return undefined
360361
}
361362

363+
/**
364+
* Get the provider's default model ID, ignoring any configured model selection.
365+
* Used as a fallback while provider models are still loading.
366+
*/
367+
export function getProviderDefaultModelId(provider: ProviderName, settings: ProviderSettings): string {
368+
return providerDefinitions[provider]?.getDefaultModelId(settings) ?? anthropicDefaultModelId
369+
}
370+
362371
/**
363372
* ANTHROPIC_STYLE_PROVIDERS
364373
*/

‎packages/types/src/providers/anthropic.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ export const anthropicProviderDefinition = createProviderDefinition({
362362
apiProvider: providerIdentifiers.anthropic,
363363
modelIdKey: API_MODEL_ID_FIELD,
364364
getModelId: createModelIdAccessor(API_MODEL_ID_FIELD),
365+
getDefaultModelId: () => anthropicDefaultModelId,
365366
schema: {
366367
...apiModelIdProviderModelShape,
367368
apiKey: z.string().optional(),

‎packages/types/src/providers/baseten.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ export const basetenProviderDefinition = createProviderDefinition({
172172
apiProvider: providerIdentifiers.baseten,
173173
modelIdKey: API_MODEL_ID_FIELD,
174174
getModelId: createModelIdAccessor(API_MODEL_ID_FIELD),
175+
getDefaultModelId: () => basetenDefaultModelId,
175176
schema: {
176177
...apiModelIdProviderModelShape,
177178
basetenApiKey: z.string().optional(),

‎packages/types/src/providers/bedrock.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -830,6 +830,7 @@ export const bedrockProviderDefinition = createProviderDefinition({
830830
apiProvider: providerIdentifiers.bedrock,
831831
modelIdKey: API_MODEL_ID_FIELD,
832832
getModelId: createModelIdAccessor(API_MODEL_ID_FIELD),
833+
getDefaultModelId: () => bedrockDefaultModelId,
833834
schema: {
834835
...apiModelIdProviderModelShape,
835836
awsAccessKey: z.string().optional(),

‎packages/types/src/providers/common.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ export const API_PROVIDER_FIELD = "apiProvider"
77
export const SETTINGS_SHAPE_FIELD = "settingsShape"
88
export const API_MODEL_ID_FIELD = "apiModelId"
99

10+
/**
11+
* Providers whose model is chosen by the user (custom endpoints or locally
12+
* discovered models) have no meaningful default.
13+
*/
14+
export const NO_DEFAULT_MODEL_ID = ""
15+
1016
// Treat a persisted `null` as an unset value. Previously persisted or imported
1117
// profiles may store `null` for these fields; converting `null` to `undefined`
1218
// before validation keeps the inferred type as `NonNull<T> | undefined` (so
@@ -43,6 +49,7 @@ export const apiModelIdProviderModelShape = {
4349
type ModelId = string | undefined
4450
type UntypedProviderSettings = Record<string, unknown>
4551
type ProviderModelIdAccessor = (settings: UntypedProviderSettings) => ModelId
52+
type ProviderDefaultModelIdAccessor = (settings: UntypedProviderSettings) => string
4653
type ProviderSettingsFromSchema<S extends z.ZodRawShape> = z.infer<z.ZodObject<S>>
4754
type TypedProviderModelIdAccessor<S extends z.ZodRawShape> = (settings: ProviderSettingsFromSchema<S>) => ModelId
4855

@@ -51,6 +58,8 @@ type ProviderDefinitionInput<P extends ProviderIdentifier, S extends z.ZodRawSha
5158
schema: S
5259
modelIdKey?: Extract<keyof S, string>
5360
getModelId: TypedProviderModelIdAccessor<S>
61+
// Provider-specific default model data lives with the provider definition, mirroring `getModelId`.
62+
getDefaultModelId: ProviderDefaultModelIdAccessor
5463
}
5564

5665
export type ProviderDefinition = {
@@ -59,6 +68,7 @@ export type ProviderDefinition = {
5968
modelIdKey?: string
6069
schema: z.ZodObject
6170
getModelId: ProviderModelIdAccessor
71+
getDefaultModelId: ProviderDefaultModelIdAccessor
6272
}
6373

6474
export const createModelIdAccessor =
@@ -87,5 +97,6 @@ export const createProviderDefinition = <P extends ProviderIdentifier, S extends
8797
[API_PROVIDER_FIELD]: z.literal(apiProvider),
8898
}),
8999
getModelId,
100+
getDefaultModelId: modelIdDefinition.getDefaultModelId,
90101
}
91102
}

‎packages/types/src/providers/deepseek.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ export const deepSeekProviderDefinition = createProviderDefinition({
8989
apiProvider: providerIdentifiers.deepseek,
9090
modelIdKey: API_MODEL_ID_FIELD,
9191
getModelId: createModelIdAccessor(API_MODEL_ID_FIELD),
92+
getDefaultModelId: () => deepSeekDefaultModelId,
9293
schema: {
9394
...apiModelIdProviderModelShape,
9495
deepSeekBaseUrl: z.string().optional(),

0 commit comments

Comments
 (0)