Skip to content

Commit 5f9bd2e

Browse files
committed
refactor(webview): resolve model ID fields from provider definitions
Replace the webview-side model-ID registries with the provider definitions that already own this data: - Add getProviderModelIdKey(provider) to provider-settings.ts as the write counterpart of getModelId(), returning the definition's modelIdKey. - Delete PROVIDER_MODEL_CONFIG, PROVIDER_DEFAULT_MODEL_IDS, getProviderModelConfig and getDefaultModelIdForProvider from providerModelConfig.ts. - ApiOptions derives the model field from getProviderModelIdKey and the fallback from getProviderDefaultModelId, which also fixes the two registries disagreeing about defaults for the dynamic providers. - ModelSelector keeps hidden providers (Fake AI, Gemini CLI) unsupported, matching the previous absence of a config entry for them.
1 parent b1353db commit 5f9bd2e

7 files changed

Lines changed: 93 additions & 271 deletions

File tree

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

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1-
import { ANTHROPIC_API_PROTOCOL, OPENAI_API_PROTOCOL, providerIdentifiers, providerNames } from "../index.js"
1+
import {
2+
ANTHROPIC_API_PROTOCOL,
3+
OPENAI_API_PROTOCOL,
4+
providerIdentifiers,
5+
providerNames,
6+
type ProviderSettings,
7+
} from "../index.js"
28
import {
39
getApiProtocol,
10+
getModelId,
11+
getProviderDefaultModelId,
412
getProviderIsProxy,
513
getProviderLabel,
14+
getProviderModelIdKey,
615
getProviderModels,
716
getProviderServiceUrl,
817
isProviderHidden,
@@ -150,6 +159,45 @@ describe("provider definition metadata", () => {
150159
})
151160
})
152161

162+
describe("getProviderModelIdKey", () => {
163+
it.each(
164+
providerDefinitionList.flatMap((definition) =>
165+
definition.modelIdKey ? [[definition.apiProvider, definition.modelIdKey] as const] : [],
166+
),
167+
)("returns the model ID field declared by the %s provider definition", (apiProvider, modelIdKey) => {
168+
expect(getProviderModelIdKey(apiProvider)).toBe(modelIdKey)
169+
expect(PROVIDER_SETTINGS_KEYS).toContain(modelIdKey)
170+
})
171+
172+
it.each([providerIdentifiers.vscodeLm, providerIdentifiers.githubCopilot])(
173+
"returns undefined for %s, which stores its selection in a nested selector",
174+
(provider) => {
175+
expect(getProviderModelIdKey(provider)).toBeUndefined()
176+
},
177+
)
178+
179+
it("returns undefined for an unregistered provider", () => {
180+
expect(getProviderModelIdKey("unregistered-provider" as (typeof providerNames)[number])).toBeUndefined()
181+
})
182+
183+
it("agrees with getModelId about where the selection is stored", () => {
184+
const settings: ProviderSettings = {
185+
apiProvider: providerIdentifiers.openrouter,
186+
openRouterModelId: "vendor/model",
187+
}
188+
const modelIdKey = getProviderModelIdKey(providerIdentifiers.openrouter)
189+
190+
expect(modelIdKey).toBeDefined()
191+
expect(settings[modelIdKey!]).toBe(getModelId(settings))
192+
})
193+
194+
it("resolves the default through the same provider definition", () => {
195+
expect(getProviderDefaultModelId(providerIdentifiers.anthropic, {})).toBe(
196+
getProviderDefaultModelId(providerIdentifiers.anthropic, { apiProvider: providerIdentifiers.anthropic }),
197+
)
198+
})
199+
})
200+
153201
describe("selectableProviders", () => {
154202
it("offers exactly the non-hidden provider definitions", () => {
155203
const expected = providerDefinitionList

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,17 @@ export function getModelId(settings: ProviderSettings): string | undefined {
342342
return undefined
343343
}
344344

345+
/**
346+
* Get the settings key that stores the provider's model ID. This is the write
347+
* counterpart of `getModelId()`. Providers that keep their selection in a nested
348+
* field (VS Code LM and GitHub Copilot) return `undefined`.
349+
*/
350+
export function getProviderModelIdKey(provider: ProviderName): Extract<keyof ProviderSettings, string> | undefined {
351+
// Every declared `modelIdKey` belongs to the provider's own settings shape, which
352+
// `providerSettingsSchema` merges into `ProviderSettings`.
353+
return providerDefinitions[provider]?.modelIdKey as Extract<keyof ProviderSettings, string> | undefined
354+
}
355+
345356
/**
346357
* Get the provider's default model ID, ignoring any configured model selection.
347358
* Used as a fallback while provider models are still loading.

‎webview-ui/src/components/chat/ModelSelector.tsx‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import {
77
type ProviderName,
88
type ModelInfo,
99
providerIdentifiers,
10+
getProviderModelIdKey,
11+
isProviderHidden,
1012
isRetiredProvider,
1113
} from "@roo-code/types"
1214

@@ -22,7 +24,6 @@ import { useExtensionState } from "@/context/ExtensionStateContext"
2224
import {
2325
isStaticModelProvider,
2426
getStaticModelsForProvider,
25-
getProviderModelConfig,
2627
handleModelChangeSideEffects,
2728
} from "@/components/settings/utils/providerModelConfig"
2829
import { filterModels } from "@/components/settings/utils/organizationFilters"
@@ -44,7 +45,13 @@ const UNSUPPORTED_QUICK_PICK_PROVIDERS: ProviderName[] = [
4445
]
4546

4647
function getModelIdField(provider: ProviderName): string | undefined {
47-
return getProviderModelConfig(provider)?.field
48+
// Hidden providers (Fake AI, Gemini CLI) are never offered in the settings UI,
49+
// so the quick picker must not treat them as selectable either.
50+
if (isProviderHidden(provider)) {
51+
return undefined
52+
}
53+
54+
return getProviderModelIdKey(provider)
4855
}
4956

5057
function useModelListForProvider(provider: ProviderName | undefined, apiConfiguration: ProviderSettings) {

‎webview-ui/src/components/chat/__tests__/ModelSelector.spec.tsx‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -360,17 +360,18 @@ describe("ModelSelector", () => {
360360
expect(screen.getByText("common:ui.no_results")).toBeInTheDocument()
361361
})
362362

363-
test("does not request router models for providers without a model field", () => {
364-
render(
365-
<ModelSelector apiConfiguration={{ apiProvider: providerIdentifiers.fakeAi }} title="Select model" />,
366-
)
367-
368-
expect(routerModelsResult.calls.length).toBeGreaterThan(0)
369-
expect(routerModelsResult.calls.every((opts) => (opts as { enabled: boolean }).enabled === false)).toBe(
370-
true,
371-
)
372-
expect(screen.getByTestId("model-selector-unsupported-trigger")).toBeInTheDocument()
373-
})
363+
test.each([providerIdentifiers.fakeAi, providerIdentifiers.geminiCli])(
364+
"does not offer a quick picker for the hidden provider %s",
365+
(apiProvider) => {
366+
render(<ModelSelector apiConfiguration={{ apiProvider }} title="Select model" />)
367+
368+
expect(routerModelsResult.calls.length).toBeGreaterThan(0)
369+
expect(routerModelsResult.calls.every((opts) => (opts as { enabled: boolean }).enabled === false)).toBe(
370+
true,
371+
)
372+
expect(screen.getByTestId("model-selector-unsupported-trigger")).toBeInTheDocument()
373+
},
374+
)
374375
})
375376

376377
test("falls back to a degraded trigger for providers without a simple model list, and jumps to Settings on click", () => {

‎webview-ui/src/components/settings/ApiOptions.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import { ExternalLinkIcon } from "@radix-ui/react-icons"
77
import {
88
type ProviderName,
99
type ProviderSettings,
10+
getProviderDefaultModelId,
1011
getProviderLabel,
12+
getProviderModelIdKey,
1113
getProviderModels,
1214
getProviderServiceUrl,
1315
isDynamicProvider,
@@ -24,9 +26,7 @@ import {
2426
} from "@roo-code/types"
2527

2628
import {
27-
getDefaultModelIdForProvider,
2829
getProviderDocsSlug,
29-
getProviderModelConfig,
3030
getStaticModelsForProvider,
3131
shouldUseGenericModelPicker,
3232
handleModelChangeSideEffects,
@@ -366,13 +366,13 @@ const ApiOptions = ({
366366
}
367367
}
368368

369-
const config = getProviderModelConfig(value, apiConfiguration)
370-
if (config) {
369+
const modelIdKey = getProviderModelIdKey(value)
370+
if (modelIdKey) {
371371
validateAndResetModel(
372372
value,
373-
apiConfiguration[config.field] as string | undefined,
374-
config.field,
375-
config.default,
373+
apiConfiguration[modelIdKey] as string | undefined,
374+
modelIdKey,
375+
getProviderDefaultModelId(value, apiConfiguration),
376376
)
377377
}
378378
},
@@ -774,7 +774,7 @@ const ApiOptions = ({
774774
<ModelPicker
775775
apiConfiguration={apiConfiguration}
776776
setApiConfigurationField={setApiConfigurationField}
777-
defaultModelId={getDefaultModelIdForProvider(activeSelectedProvider, apiConfiguration)}
777+
defaultModelId={getProviderDefaultModelId(activeSelectedProvider, apiConfiguration)}
778778
models={getStaticModelsForProvider(
779779
activeSelectedProvider,
780780
t("settings:labels.useCustomArn"),

‎webview-ui/src/components/settings/utils/__tests__/providerModelConfig.spec.ts‎

Lines changed: 1 addition & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
1-
import {
2-
anthropicDefaultModelId,
3-
ioIntelligenceDefaultModelId,
4-
mainlandZAiDefaultModelId,
5-
nanoGptDefaultModelId,
6-
providerIdentifiers,
7-
} from "@roo-code/types"
1+
import { providerIdentifiers } from "@roo-code/types"
82

93
import {
10-
PROVIDER_DEFAULT_MODEL_IDS,
11-
getProviderModelConfig,
124
getProviderDocsSlug,
13-
getDefaultModelIdForProvider,
145
getStaticModelsForProvider,
156
isStaticModelProvider,
167
PROVIDERS_WITH_CUSTOM_MODEL_UI,
@@ -22,120 +13,6 @@ import {
2213
const appProfileArn = "arn:aws:bedrock:us-west-2:123456789012:application-inference-profile/abcd1234efgh"
2314

2415
describe("providerModelConfig", () => {
25-
describe("PROVIDER_DEFAULT_MODEL_IDS", () => {
26-
it("contains default model IDs for static providers", () => {
27-
expect(PROVIDER_DEFAULT_MODEL_IDS[providerIdentifiers.anthropic]).toBeDefined()
28-
expect(PROVIDER_DEFAULT_MODEL_IDS[providerIdentifiers.bedrock]).toBeDefined()
29-
expect(PROVIDER_DEFAULT_MODEL_IDS[providerIdentifiers.gemini]).toBeDefined()
30-
expect(PROVIDER_DEFAULT_MODEL_IDS[providerIdentifiers.openaiNative]).toBeDefined()
31-
})
32-
})
33-
34-
describe("getDefaultModelIdForProvider", () => {
35-
it("returns default model ID for known provider", () => {
36-
const defaultId = getDefaultModelIdForProvider(providerIdentifiers.anthropic)
37-
expect(defaultId).toBeDefined()
38-
expect(typeof defaultId).toBe("string")
39-
expect(defaultId.length).toBeGreaterThan(0)
40-
})
41-
42-
it("returns empty string for unknown provider", () => {
43-
const defaultId = getDefaultModelIdForProvider("unknown" as any)
44-
expect(defaultId).toBe("")
45-
})
46-
47-
it("returns international default for Z.ai without apiConfiguration", () => {
48-
const defaultId = getDefaultModelIdForProvider(providerIdentifiers.zai)
49-
expect(defaultId).toBeDefined()
50-
expect(typeof defaultId).toBe("string")
51-
expect(defaultId.length).toBeGreaterThan(0)
52-
})
53-
54-
it("returns mainland default for Z.ai with china_coding entrypoint", () => {
55-
const defaultId = getDefaultModelIdForProvider(providerIdentifiers.zai, {
56-
apiProvider: providerIdentifiers.zai,
57-
zaiApiLine: "china_coding",
58-
})
59-
expect(defaultId).toBeDefined()
60-
expect(typeof defaultId).toBe("string")
61-
// Mainland model IDs should contain 'mainland' or be different from international
62-
expect(defaultId.length).toBeGreaterThan(0)
63-
})
64-
65-
it("returns mainland default for Z.ai with china_api entrypoint", () => {
66-
expect(
67-
getDefaultModelIdForProvider(providerIdentifiers.zai, {
68-
apiProvider: providerIdentifiers.zai,
69-
zaiApiLine: "china_api",
70-
}),
71-
).toBe(mainlandZAiDefaultModelId)
72-
})
73-
74-
it("returns international default for Z.ai with international_coding entrypoint", () => {
75-
const defaultId = getDefaultModelIdForProvider(providerIdentifiers.zai, {
76-
apiProvider: providerIdentifiers.zai,
77-
zaiApiLine: "international_coding",
78-
})
79-
expect(defaultId).toBeDefined()
80-
expect(typeof defaultId).toBe("string")
81-
expect(defaultId.length).toBeGreaterThan(0)
82-
})
83-
84-
it("uses mainland or international defaults based on zaiApiLine setting", () => {
85-
// Verify the function correctly routes to appropriate defaults
86-
const chinaDefault = getDefaultModelIdForProvider(providerIdentifiers.zai, {
87-
apiProvider: providerIdentifiers.zai,
88-
zaiApiLine: "china_coding",
89-
})
90-
const internationalDefault = getDefaultModelIdForProvider(providerIdentifiers.zai, {
91-
apiProvider: providerIdentifiers.zai,
92-
zaiApiLine: "international_coding",
93-
})
94-
// Both should return valid model IDs (they may or may not be the same)
95-
expect(chinaDefault).toBeDefined()
96-
expect(internationalDefault).toBeDefined()
97-
expect(chinaDefault.length).toBeGreaterThan(0)
98-
expect(internationalDefault.length).toBeGreaterThan(0)
99-
})
100-
})
101-
102-
describe("getProviderModelConfig", () => {
103-
it("selects the Z.ai default for the configured API line", () => {
104-
const config = getProviderModelConfig(providerIdentifiers.zai, {
105-
apiProvider: providerIdentifiers.zai,
106-
zaiApiLine: "china_coding",
107-
})
108-
109-
expect(config).toEqual({
110-
field: "apiModelId",
111-
default: mainlandZAiDefaultModelId,
112-
})
113-
})
114-
115-
it("returns undefined for a provider with no model config entry", () => {
116-
expect(getProviderModelConfig("unknown-provider" as any)).toBeUndefined()
117-
})
118-
119-
it("returns the static field config for a non-zai provider", () => {
120-
const config = getProviderModelConfig(providerIdentifiers.anthropic)
121-
expect(config).toEqual({ field: "apiModelId", default: anthropicDefaultModelId })
122-
})
123-
124-
it("returns NanoGPT's dynamic model field and fallback", () => {
125-
expect(getProviderModelConfig(providerIdentifiers.nanogpt)).toEqual({
126-
field: "nanoGptModelId",
127-
default: nanoGptDefaultModelId,
128-
})
129-
})
130-
131-
it("returns IO Intelligence's dynamic model field and fallback", () => {
132-
expect(getProviderModelConfig(providerIdentifiers.ioIntelligence)).toEqual({
133-
field: "ioIntelligenceModelId",
134-
default: ioIntelligenceDefaultModelId,
135-
})
136-
})
137-
})
138-
13916
describe("getProviderDocsSlug", () => {
14017
it("uses NanoGPT's provider identifier as its external documentation slug", () => {
14118
expect(getProviderDocsSlug(providerIdentifiers.nanogpt)).toBe("nanogpt")

0 commit comments

Comments
 (0)