Skip to content

Commit 4d5ed30

Browse files
committed
Remove the built-in and custom provider type distinction to unify the model provider configuration structure
- remove model provider differentiation 'built-in'/'custom' by removing 'type' key, and making baseUrl required. Inclued appropriate migration. - remove 'change model provider key feature', we always use edit - when creating model provider of existing name, append "(1)", e.g. "Google", "Google (1)", "Google (2)" - when creating model provider of existing name, before appending (1), (2) etc. show input field with the default name. Append if unchnaged thus duplicated. - ask for name before asking for api key - after selecting predefined provider, show 'name' input, then 'api key' - "escape" key from " api key should work as back arrow - "escape" key tapped on any nested level should work like cliking back arrow - "escape" key tapped from 'api key' doesn't how 'name', but the initial quick pick. - going back from 'api key' shows 'name' input with (1), etc. placed at the end. should not - when creating custom endpoint, first ask for base url, then for name. Entering these two values should be required. - prompt_for_url should accept params variable, dont destructure - in `apps/editor/src/views/utils/upsert-model-provider.ts` show 'save' icon like in `apps/editor/src/views/utils/upsert-configuration/upsert-configuration.ts`
1 parent f4ef62b commit 4d5ed30

29 files changed

Lines changed: 289 additions & 482 deletions

‎apps/editor/package.json‎

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1757,45 +1757,18 @@
17571757
"scope": "resource",
17581758
"default": [],
17591759
"items": {
1760-
"oneOf": [
1761-
{
1762-
"type": "object",
1763-
"title": "Built-in Provider",
1764-
"properties": {
1765-
"type": {
1766-
"type": "string",
1767-
"const": "built-in"
1768-
},
1769-
"name": {
1770-
"type": "string"
1771-
}
1772-
},
1773-
"required": [
1774-
"type",
1775-
"name"
1776-
]
1760+
"type": "object",
1761+
"properties": {
1762+
"name": {
1763+
"type": "string"
17771764
},
1778-
{
1779-
"type": "object",
1780-
"title": "Custom Provider",
1781-
"properties": {
1782-
"type": {
1783-
"type": "string",
1784-
"const": "custom"
1785-
},
1786-
"name": {
1787-
"type": "string"
1788-
},
1789-
"baseUrl": {
1790-
"type": "string"
1791-
}
1792-
},
1793-
"required": [
1794-
"type",
1795-
"name",
1796-
"baseUrl"
1797-
]
1765+
"baseUrl": {
1766+
"type": "string"
17981767
}
1768+
},
1769+
"required": [
1770+
"name",
1771+
"baseUrl"
17991772
]
18001773
}
18011774
},

‎apps/editor/src/commands/apply-chat-response-command/response-processor.ts‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { apply_git_patch } from './handlers/diff-handler'
1717
import { apply_file_relocations } from './utils/file-operations'
1818
import { ModelProvidersManager } from '@/services/model-providers-manager'
1919
import { get_intelligent_update_config } from '@/utils/intelligent-update-utils'
20-
import { PROVIDERS } from '@/constants/providers'
2120
import { handle_active_editor_intelligent_update } from './handlers/active-editor-intelligent-update-handler'
2221
import { handle_fast_replace } from './handlers/fast-replace-handler'
2322
import { PanelProvider } from '@/views/panel/backend/panel-provider'
@@ -496,14 +495,7 @@ export const process_chat_response = async (
496495

497496
const { provider, config: intelligent_update_config } = config_result
498497

499-
let endpoint_url = ''
500-
if (provider.type == 'built-in') {
501-
const provider_info =
502-
PROVIDERS[provider.name as keyof typeof PROVIDERS]
503-
endpoint_url = provider_info.base_url
504-
} else {
505-
endpoint_url = provider.base_url
506-
}
498+
const endpoint_url = provider.base_url
507499

508500
const intelligent_update_states =
509501
await handle_active_editor_intelligent_update({

‎apps/editor/src/commands/code-at-cursor-commands.ts‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
} from '../services/model-providers-manager'
1010
import { Logger } from '@shared/utils/logger'
1111
import he from 'he'
12-
import { PROVIDERS } from '@/constants/providers'
1312
import { RECENTLY_USED_CODE_AT_CURSOR_CONFIG_IDS_STATE_KEY } from '@/constants/state-keys'
1413
import { ToolConfig } from '@/services/model-providers-manager'
1514
import { PanelProvider } from '@/views/panel/backend/panel-provider'
@@ -358,24 +357,7 @@ const perform_code_at_cursor = async (params: {
358357
continue
359358
}
360359

361-
let endpoint_url = ''
362-
if (provider.type == 'built-in') {
363-
const provider_info = PROVIDERS[provider.name as keyof typeof PROVIDERS]
364-
if (!provider_info) {
365-
vscode.window.showErrorMessage(
366-
dictionary.error_message.BUILT_IN_PROVIDER_NOT_FOUND(provider.name)
367-
)
368-
Logger.warn({
369-
function_name: 'perform_code_at_cursor',
370-
message: `Built-in provider "${provider.name}" not found.`
371-
})
372-
force_show_quick_pick = true
373-
continue
374-
}
375-
endpoint_url = provider_info.base_url
376-
} else {
377-
endpoint_url = provider.base_url
378-
}
360+
const endpoint_url = provider.base_url
379361

380362
const editor = vscode.window.activeTextEditor
381363
if (editor) {

‎apps/editor/src/commands/generate-commit-message-command/utils/get-commit-message-config.ts‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
} from '@/services/model-providers-manager'
77
import { dictionary } from '@shared/constants/dictionary'
88
import { Logger } from '@shared/utils/logger'
9-
import { PROVIDERS } from '@/constants/providers'
109
import { display_token_count } from '@/utils/display-token-count'
1110
import { RECENTLY_USED_COMMIT_MESSAGES_CONFIG_IDS_STATE_KEY } from '@/constants/state-keys'
1211
import { t } from '@/i18n'
@@ -231,13 +230,7 @@ export const get_commit_message_config = async (
231230
return null
232231
}
233232

234-
let endpoint_url = ''
235-
if (provider.type == 'built-in') {
236-
const provider_info = PROVIDERS[provider.name]
237-
endpoint_url = provider_info.base_url
238-
} else {
239-
endpoint_url = provider.base_url
240-
}
233+
const endpoint_url = provider.base_url
241234

242235
return {
243236
config: commit_message_config,

‎apps/editor/src/extension.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import {
77
migrate_token_cache_cleanup,
88
migrate_configurations_code_completions_to_code_at_cursor,
99
migrate_instructions_state_cleanup,
10-
migrate_checkpoints_title_to_trigger
10+
migrate_checkpoints_title_to_trigger,
11+
migrate_model_providers_type
1112
} from './migrations'
1213
import { SharedFileState } from './context/shared-file-state'
1314
import {
@@ -59,6 +60,8 @@ export async function activate(context: vscode.ExtensionContext) {
5960
await migrate_instructions_state_cleanup(context)
6061
// 2 March 2026
6162
await migrate_checkpoints_title_to_trigger(context)
63+
// 5 March 2026
64+
await migrate_model_providers_type(context)
6265
}
6366

6467
await migrations()

‎apps/editor/src/migrations/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ export * from './migrate-token-cache-cleanup'
22
export * from './migrate-configurations-code-completions-to-code-at-cursor'
33
export * from './migrate-instructions-state-cleanup'
44
export * from './migrate-checkpoints-title-to-trigger'
5+
export * from './migrate-model-providers-type'
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
import * as vscode from 'vscode'
2+
import { Logger } from '@shared/utils/logger'
3+
import { PROVIDERS } from '../constants/providers'
4+
import { SECRET_STORAGE_MODEL_PROVIDERS_KEY } from '@/constants/secret-storage-keys'
5+
6+
const MIGRATION_ID = 'model-providers-type-migration-20260305'
7+
8+
export async function migrate_model_providers_type(
9+
context: vscode.ExtensionContext
10+
): Promise<void> {
11+
try {
12+
if (context.globalState.get(MIGRATION_ID)) {
13+
return
14+
}
15+
16+
const config = vscode.workspace.getConfiguration('codeWebChat')
17+
const old_providers = config.get<any[]>('modelProviders', [])
18+
19+
let modified = false
20+
const new_providers = old_providers.map((p) => {
21+
if (p.type == 'built-in') {
22+
modified = true
23+
const base_url =
24+
PROVIDERS[p.name as keyof typeof PROVIDERS]?.base_url || ''
25+
return {
26+
name: p.name,
27+
baseUrl: base_url
28+
}
29+
} else if (p.type == 'custom') {
30+
modified = true
31+
return {
32+
name: p.name,
33+
baseUrl: p.baseUrl
34+
}
35+
}
36+
return p
37+
})
38+
39+
if (modified) {
40+
await config.update(
41+
'modelProviders',
42+
new_providers,
43+
vscode.ConfigurationTarget.Global
44+
)
45+
}
46+
47+
const secrets_json = await context.secrets.get(
48+
SECRET_STORAGE_MODEL_PROVIDERS_KEY
49+
)
50+
if (secrets_json) {
51+
let secrets_modified = false
52+
const secrets = JSON.parse(secrets_json) as any[]
53+
const new_secrets = secrets.map((p) => {
54+
if (p.type) {
55+
secrets_modified = true
56+
const base_url =
57+
p.type == 'built-in'
58+
? PROVIDERS[p.name as keyof typeof PROVIDERS]?.base_url || ''
59+
: p.base_url
60+
61+
return {
62+
name: p.name,
63+
base_url,
64+
api_key: p.api_key || ''
65+
}
66+
}
67+
return p
68+
})
69+
if (secrets_modified) {
70+
await context.secrets.store(
71+
SECRET_STORAGE_MODEL_PROVIDERS_KEY,
72+
JSON.stringify(new_secrets)
73+
)
74+
}
75+
}
76+
77+
await context.globalState.update(MIGRATION_ID, true)
78+
Logger.info({
79+
function_name: 'migrate_model_providers_type',
80+
message: 'Successfully migrated model providers type structure'
81+
})
82+
} catch (error) {
83+
Logger.error({
84+
function_name: 'migrate_model_providers_type',
85+
message: 'Error migrating model providers type',
86+
data: error instanceof Error ? error.message : String(error)
87+
})
88+
}
89+
}

‎apps/editor/src/services/model-providers-manager.ts‎

Lines changed: 24 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
11
import * as vscode from 'vscode'
2-
import { PROVIDERS } from '@/constants/providers'
32
import { SECRET_STORAGE_MODEL_PROVIDERS_KEY } from '@/constants/secret-storage-keys'
43

5-
export type BuiltInProvider = {
6-
type: 'built-in'
7-
name: keyof typeof PROVIDERS
8-
api_key: string
9-
}
10-
11-
export type CustomProvider = {
12-
type: 'custom'
4+
export type Provider = {
135
name: string
146
base_url: string
157
api_key: string
168
}
179

18-
export type Provider = BuiltInProvider | CustomProvider
19-
2010
export type ToolConfig = {
21-
provider_type: string
2211
provider_name: string
2312
model: string
2413
temperature?: number
@@ -58,9 +47,8 @@ export class ModelProvidersManager {
5847
const config = vscode.workspace.getConfiguration('codeWebChat')
5948
const provider_configs = config.get<
6049
{
61-
type: 'built-in' | 'custom'
6250
name: string
63-
baseUrl?: string
51+
baseUrl: string
6452
}[]
6553
>('modelProviders', [])
6654

@@ -71,25 +59,17 @@ export class ModelProvidersManager {
7159
? (JSON.parse(providers_json) as Provider[])
7260
: []
7361

74-
this._providers = provider_configs
75-
.map((provider_config) => {
76-
const provider_with_key = saved_providers_with_keys.find(
77-
(p) =>
78-
p.name == provider_config.name && p.type == provider_config.type
79-
)
80-
const provider: Provider = {
81-
type: provider_config.type,
82-
name: provider_config.name,
83-
api_key: provider_with_key?.api_key || '',
84-
...(provider_config.type == 'custom' && {
85-
base_url: provider_config.baseUrl || ''
86-
})
87-
} as Provider
88-
return provider
89-
})
90-
.filter(
91-
(provider) => provider.type == 'custom' || PROVIDERS[provider.name]
62+
this._providers = provider_configs.map((provider_config) => {
63+
const provider_with_key = saved_providers_with_keys.find(
64+
(p) => p.name == provider_config.name
9265
)
66+
const provider: Provider = {
67+
name: provider_config.name,
68+
api_key: provider_with_key?.api_key || '',
69+
base_url: provider_config.baseUrl || ''
70+
}
71+
return provider
72+
})
9373
} catch (error) {
9474
console.error('Error loading providers:', error)
9575
this._providers = []
@@ -106,12 +86,7 @@ export class ModelProvidersManager {
10686

10787
// Save provider config to settings
10888
const provider_configs = providers.map((p) => {
109-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
110-
const config: any = { type: p.type, name: p.name }
111-
if (p.type == 'custom') {
112-
config.baseUrl = p.base_url
113-
}
114-
return config
89+
return { name: p.name, baseUrl: p.base_url }
11590
})
11691
const config = vscode.workspace.getConfiguration('codeWebChat')
11792
await config.update(
@@ -142,9 +117,7 @@ export class ModelProvidersManager {
142117
): ToolConfig | undefined {
143118
if (!config) return undefined
144119

145-
const provider = this._providers.find(
146-
(p) => p.type == config.provider_type && p.name == config.provider_name
147-
)
120+
const provider = this._providers.find((p) => p.name == config.provider_name)
148121

149122
if (!provider) {
150123
return undefined
@@ -166,20 +139,16 @@ export class ModelProvidersManager {
166139
}[]
167140
>(settings_key, [])
168141

169-
const tool_configs: ToolConfig[] = settings_configs
170-
.map((sc) => {
171-
const provider = this._providers.find((p) => p.name == sc.providerName)
172-
return {
173-
provider_name: sc.providerName,
174-
provider_type: provider?.type || '',
175-
model: sc.model,
176-
temperature: sc.temperature,
177-
reasoning_effort: sc.reasoningEffort,
178-
system_instructions_override: sc.systemInstructionsOverride,
179-
is_pinned: sc.isPinned
180-
}
181-
})
182-
.filter((tc) => tc.provider_type)
142+
const tool_configs: ToolConfig[] = settings_configs.map((sc) => {
143+
return {
144+
provider_name: sc.providerName,
145+
model: sc.model,
146+
temperature: sc.temperature,
147+
reasoning_effort: sc.reasoningEffort,
148+
system_instructions_override: sc.systemInstructionsOverride,
149+
is_pinned: sc.isPinned
150+
}
151+
})
183152

184153
return tool_configs.filter(
185154
(c) => this._validate_tool_config(c) !== undefined
@@ -253,12 +222,8 @@ export class ModelProvidersManager {
253222
)
254223

255224
if (default_config_from_settings) {
256-
const provider = this._providers.find(
257-
(p) => p.name == default_config_from_settings.providerName
258-
)
259225
const tool_config: ToolConfig = {
260226
provider_name: default_config_from_settings.providerName,
261-
provider_type: provider?.type || '',
262227
model: default_config_from_settings.model,
263228
temperature: default_config_from_settings.temperature,
264229
reasoning_effort: default_config_from_settings.reasoningEffort,

0 commit comments

Comments
 (0)