Skip to content

Commit 759f9d9

Browse files
committed
Rename configuration setting codeWebChat.configurations to codeWebChat.apiConfigurations and reorganize action modules into categorized directories
- rename codeWebChat.configurations -> codeWebChat.apiConfigurations, do appropriate migration - place actions in 'web' and 'api' folders `apps/editor/src/views/actions/web` `apps/editor/src/views/actions/api`. simplify file names and function names accordingly.
1 parent f7cb138 commit 759f9d9

57 files changed

Lines changed: 183 additions & 107 deletions

File tree

Some content is hidden

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

‎apps/editor/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@
10691069
]
10701070
}
10711071
},
1072-
"codeWebChat.configurations": {
1072+
"codeWebChat.apiConfigurations": {
10731073
"type": "array",
10741074
"scope": "resource",
10751075
"items": {

‎apps/editor/src/extension.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import {
1414
migrate_preset_affix_to_prompt_template,
1515
migrate_remove_preset_groups_and_separators,
1616
migrate_merge_chat_presets,
17-
migrate_chat_presets_to_web_configurations
17+
migrate_chat_presets_to_web_configurations,
18+
migrate_configurations_to_api_configurations
1819
} from './migrations'
1920
import {
2021
apply_chat_response_command,
@@ -79,6 +80,8 @@ export const activate = async (context: vscode.ExtensionContext) => {
7980
await migrate_merge_chat_presets(context)
8081
// 11 June 2026
8182
await migrate_chat_presets_to_web_configurations(context)
83+
// 26 June 2026
84+
await migrate_configurations_to_api_configurations(context)
8285
}
8386

8487
await migrations()

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ export * from './migrate-preset-affix-to-prompt-template'
99
export * from './migrate-remove-preset-groups-and-separators'
1010
export * from './migrate-merge-chat-presets'
1111
export * from './migrate-chat-presets-to-web-configurations'
12+
export * from './migrate-configurations-to-api-configurations'
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import * as vscode from 'vscode'
2+
import { Logger } from '@shared/utils/logger'
3+
4+
const MIGRATION_ID = 'configurations-to-api-configurations-migration-20260626'
5+
6+
export async function migrate_configurations_to_api_configurations(
7+
context: vscode.ExtensionContext
8+
): Promise<void> {
9+
try {
10+
if (context.globalState.get(MIGRATION_ID)) {
11+
return
12+
}
13+
14+
const config = vscode.workspace.getConfiguration('codeWebChat')
15+
const inspect = config.inspect<any[]>('configurations')
16+
17+
if (inspect?.globalValue !== undefined) {
18+
await config.update(
19+
'apiConfigurations',
20+
inspect.globalValue,
21+
vscode.ConfigurationTarget.Global
22+
)
23+
await config.update(
24+
'configurations',
25+
undefined,
26+
vscode.ConfigurationTarget.Global
27+
)
28+
}
29+
30+
await context.globalState.update(MIGRATION_ID, true)
31+
Logger.info({
32+
function_name: 'migrate_configurations_to_api_configurations',
33+
message: 'Successfully migrated configurations to api configurations'
34+
})
35+
} catch (error) {
36+
Logger.error({
37+
function_name: 'migrate_configurations_to_api_configurations',
38+
message: 'Error migrating configurations to api configurations',
39+
data: error instanceof Error ? error.message : String(error)
40+
})
41+
}
42+
}

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export class ModelProvidersManager {
129129
public async get_api_configurations(): Promise<ApiConfiguration[]> {
130130
await this._load_promise
131131
const config = vscode.workspace.getConfiguration('codeWebChat')
132-
const settings_configs = config.get<any[]>('configurations', [])
132+
const settings_configs = config.get<any[]>('apiConfigurations', [])
133133

134134
const api_configurations: ApiConfiguration[] = settings_configs.map(
135135
(sc) => {
@@ -150,7 +150,7 @@ export class ModelProvidersManager {
150150

151151
public async save_api_configurations(api_configurations: ApiConfiguration[]) {
152152
const config = vscode.workspace.getConfiguration('codeWebChat')
153-
const old_settings_configs = config.get<any[]>('configurations', [])
153+
const old_settings_configs = config.get<any[]>('apiConfigurations', [])
154154

155155
const new_settings_configs = api_configurations.map((c) => {
156156
const old_config = old_settings_configs.find((oldC) =>
@@ -179,7 +179,7 @@ export class ModelProvidersManager {
179179
})
180180

181181
await config.update(
182-
'configurations',
182+
'apiConfigurations',
183183
new_settings_configs,
184184
vscode.ConfigurationTarget.Global
185185
)
@@ -202,7 +202,7 @@ export class ModelProvidersManager {
202202
default_key: string
203203
): ApiConfiguration | undefined {
204204
const config = vscode.workspace.getConfiguration('codeWebChat')
205-
const settings_configs = config.get<any[]>('configurations', [])
205+
const settings_configs = config.get<any[]>('apiConfigurations', [])
206206
const default_config_from_settings = settings_configs.find(
207207
(c) => c[default_key]
208208
)
@@ -227,7 +227,7 @@ export class ModelProvidersManager {
227227
config_to_set: ApiConfiguration | null
228228
) {
229229
const config = vscode.workspace.getConfiguration('codeWebChat')
230-
const settings_configs = config.get<any[]>('configurations', [])
230+
const settings_configs = config.get<any[]>('apiConfigurations', [])
231231

232232
const new_settings_configs = settings_configs.map((c) => {
233233
const is_default =
@@ -244,7 +244,7 @@ export class ModelProvidersManager {
244244
})
245245

246246
await config.update(
247-
'configurations',
247+
'apiConfigurations',
248248
new_settings_configs,
249249
vscode.ConfigurationTarget.Global
250250
)
@@ -347,15 +347,18 @@ export class ModelProvidersManager {
347347
const { old_name, new_name } = params
348348
const config = vscode.workspace.getConfiguration('codeWebChat')
349349

350-
const configs = config.get<{ providerName: string }[]>('configurations', [])
350+
const configs = config.get<{ providerName: string }[]>(
351+
'apiConfigurations',
352+
[]
353+
)
351354
const updated_configs = configs.map((c) => {
352355
if (c.providerName == old_name) {
353356
return { ...c, providerName: new_name }
354357
}
355358
return c
356359
})
357360
await config.update(
358-
'configurations',
361+
'apiConfigurations',
359362
updated_configs,
360363
vscode.ConfigurationTarget.Global
361364
)

apps/editor/src/views/actions/create-api-configuration/create-api-configuration.ts renamed to apps/editor/src/views/actions/api/create/create.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@ import * as vscode from 'vscode'
22
import {
33
ModelProvidersManager,
44
ApiConfiguration,
5-
get_api_configuration_id,
65
ModelProvider
76
} from '@/services/model-providers-manager'
8-
import { dictionary } from '@shared/constants/dictionary'
97
import { ModelFetcher } from '@/services/model-fetcher'
108
import {
119
initial_select_model,
1210
initial_select_model_provider
1311
} from './interactions'
1412
import { ToolType } from '@/views/settings/types/tools'
1513

16-
export const create_api_configuration = async (params: {
14+
export const create = async (params: {
1715
context: vscode.ExtensionContext
1816
tool_type: ToolType
1917
create_on_top?: boolean

apps/editor/src/views/actions/create-api-configuration/interactions/index.ts renamed to apps/editor/src/views/actions/api/create/interactions/index.ts

File renamed without changes.

apps/editor/src/views/actions/create-api-configuration/interactions/initial-select-model.ts renamed to apps/editor/src/views/actions/api/create/interactions/initial-select-model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import {
66
} from '@/services/model-fetcher'
77
import { Logger } from '@shared/utils/logger'
88
import { dictionary } from '@shared/constants/dictionary'
9-
import { ToolType } from '../../../settings/types/tools'
109
import { verify_model } from './verify-model'
10+
import { ToolType } from '@/views/settings/types/tools'
1111

1212
export const initial_select_model = async (
1313
model_fetcher: ModelFetcher,

apps/editor/src/views/actions/create-api-configuration/interactions/initial-select-provider.ts renamed to apps/editor/src/views/actions/api/create/interactions/initial-select-provider.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
ModelProvidersManager,
44
ModelProvider
55
} from '@/services/model-providers-manager'
6-
import { upsert_model_provider } from '../../upsert-model-provider'
6+
import { upsert_provider } from '../../upsert-provider'
77

88
export const initial_select_model_provider = async (
99
context: vscode.ExtensionContext,
@@ -14,7 +14,7 @@ export const initial_select_model_provider = async (
1414
const model_providers = await providers_manager.get_model_providers()
1515

1616
if (model_providers.length == 0) {
17-
const new_model_provider = await upsert_model_provider({ context })
17+
const new_model_provider = await upsert_provider({ context })
1818
if (new_model_provider) {
1919
return new_model_provider
2020
}
@@ -86,7 +86,7 @@ export const initial_select_model_provider = async (
8686
}
8787

8888
if (selected.label == add_new_item.label) {
89-
const new_model_provider = await upsert_model_provider({
89+
const new_model_provider = await upsert_provider({
9090
context,
9191
show_back_button: true
9292
})

apps/editor/src/views/actions/create-api-configuration/interactions/verify-model.ts renamed to apps/editor/src/views/actions/api/create/interactions/verify-model.ts

File renamed without changes.

0 commit comments

Comments
 (0)