Consolidate tool configuration retrieval into a unified method in ModelProvidersManager

Author: robertpiosik

apps/editor/package.json

@@ -2,7 +2,7 @@
   "name": "gemini-coder",
   "displayName": "Code Web Chat",
   "description": "Fast AI coding with static context (CWC)",
-  "version": "1.904.0",
+  "version": "1.905.0",
   "scripts": {
     "build": "npx vsce package --no-dependencies",
     "vscode:prepublish": "rimraf out && npm run compile",

apps/editor/src/commands/code-at-cursor-command/utils/get-code-at-cursor-config.ts

@@ -18,7 +18,7 @@ export const get_code_at_cursor_config = async (params: {
   panel_provider?: PanelProvider
 }): Promise<{ provider: any; config: any } | undefined> => {
   const code_at_cursor_configs =
-    await params.api_providers_manager.get_code_completions_tool_configs()
+    await params.api_providers_manager.get_tool_configs()
 
   if (code_at_cursor_configs.length == 0) {
     vscode.commands.executeCommand('codeWebChat.settings')

apps/editor/src/commands/find-relevant-files-command/find-relevant-files-command.ts

@@ -76,8 +76,7 @@ export const find_relevant_files_command = (
           const api_providers_manager = new ModelProvidersManager(
             extension_context
           )
-          const configs =
-            await api_providers_manager.get_find_relevant_files_tool_configs()
+          const configs = await api_providers_manager.get_tool_configs()
 
           if (configs.length === 0) {
             vscode.commands.executeCommand('codeWebChat.settings')

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

@@ -38,8 +38,7 @@ export const get_commit_message_config = async (
       : await api_providers_manager.get_default_commit_messages_config()
 
   if (!commit_message_config) {
-    const configs =
-      await api_providers_manager.get_commit_messages_tool_configs()
+    const configs = await api_providers_manager.get_tool_configs()
 
     if (configs.length == 0) {
       vscode.commands.executeCommand('codeWebChat.settings')

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

@@ -27,13 +27,6 @@ export const get_tool_config_id = (config: ToolConfig): string => {
     .join(':')
 }
 
-export type CodeCompletionsConfigs = ToolConfig[]
-export type EditContextConfigs = ToolConfig[]
-export type IntelligentUpdateConfigs = ToolConfig[]
-export type CommitMessagesConfigs = ToolConfig[]
-export type FindRelevantFilesConfigs = ToolConfig[]
-export type VoiceInputConfigs = ToolConfig[]
-
 export class ModelProvidersManager {
   private _providers: Provider[] = []
   private _load_promise: Promise<void>
@@ -126,7 +119,8 @@ export class ModelProvidersManager {
     return config
   }
 
-  private _get_tool_configs_from_settings(): ToolConfig[] {
+  public async get_tool_configs(): Promise<ToolConfig[]> {
+    await this._load_promise
     const config = vscode.workspace.getConfiguration('codeWebChat')
     const settings_configs = config.get<any[]>('configurations', [])
 
@@ -146,7 +140,7 @@ export class ModelProvidersManager {
     )
   }
 
-  private async _save_tool_configs_to_settings(configs: ToolConfig[]) {
+  public async save_tool_configs(configs: ToolConfig[]) {
     const config = vscode.workspace.getConfiguration('codeWebChat')
     const old_settings_configs = config.get<any[]>('configurations', [])
 
@@ -243,11 +237,6 @@ export class ModelProvidersManager {
     )
   }
 
-  public async get_code_completions_tool_configs(): Promise<CodeCompletionsConfigs> {
-    await this._load_promise
-    return this._get_tool_configs_from_settings()
-  }
-
   public async get_default_code_completions_config(): Promise<
     ToolConfig | undefined
   > {
@@ -264,26 +253,6 @@ export class ModelProvidersManager {
     )
   }
 
-  public async save_code_completions_tool_configs(
-    configs: CodeCompletionsConfigs
-  ) {
-    await this._save_tool_configs_to_settings(configs)
-  }
-
-  public async get_edit_context_tool_configs(): Promise<EditContextConfigs> {
-    await this._load_promise
-    return this._get_tool_configs_from_settings()
-  }
-
-  public async save_edit_context_tool_configs(configs: EditContextConfigs) {
-    await this._save_tool_configs_to_settings(configs)
-  }
-
-  public async get_commit_messages_tool_configs(): Promise<CommitMessagesConfigs> {
-    await this._load_promise
-    return this._get_tool_configs_from_settings()
-  }
-
   public async get_default_commit_messages_config(): Promise<
     ToolConfig | undefined
   > {
@@ -300,17 +269,6 @@ export class ModelProvidersManager {
     )
   }
 
-  public async save_commit_messages_tool_configs(
-    configs: CommitMessagesConfigs
-  ) {
-    await this._save_tool_configs_to_settings(configs)
-  }
-
-  public async get_intelligent_update_tool_configs(): Promise<IntelligentUpdateConfigs> {
-    await this._load_promise
-    return this._get_tool_configs_from_settings()
-  }
-
   public async get_default_intelligent_update_config(): Promise<
     ToolConfig | undefined
   > {
@@ -329,17 +287,6 @@ export class ModelProvidersManager {
     )
   }
 
-  public async save_intelligent_update_tool_configs(
-    configs: IntelligentUpdateConfigs
-  ) {
-    await this._save_tool_configs_to_settings(configs)
-  }
-
-  public async get_find_relevant_files_tool_configs(): Promise<FindRelevantFilesConfigs> {
-    await this._load_promise
-    return this._get_tool_configs_from_settings()
-  }
-
   public async get_default_find_relevant_files_config(): Promise<
     ToolConfig | undefined
   > {
@@ -358,17 +305,6 @@ export class ModelProvidersManager {
     )
   }
 
-  public async save_find_relevant_files_tool_configs(
-    configs: FindRelevantFilesConfigs
-  ) {
-    await this._save_tool_configs_to_settings(configs)
-  }
-
-  public async get_voice_input_tool_configs(): Promise<VoiceInputConfigs> {
-    await this._load_promise
-    return this._get_tool_configs_from_settings()
-  }
-
   public async get_default_voice_input_config(): Promise<
     ToolConfig | undefined
   > {
@@ -383,10 +319,6 @@ export class ModelProvidersManager {
     )
   }
 
-  public async save_voice_input_tool_configs(configs: VoiceInputConfigs) {
-    await this._save_tool_configs_to_settings(configs)
-  }
-
   public async update_provider_name_in_configs(params: {
     old_name: string
     new_name: string
@@ -396,7 +328,7 @@ export class ModelProvidersManager {
 
     const configs = config.get<{ providerName: string }[]>('configurations', [])
     const updated_configs = configs.map((c) => {
-      if (c.providerName === old_name) {
+      if (c.providerName == old_name) {
         return { ...c, providerName: new_name }
       }
       return c

apps/editor/src/utils/intelligent-update-utils.ts

@@ -19,7 +19,7 @@ export const get_intelligent_update_config = async (
   context: vscode.ExtensionContext
 ): Promise<{ provider: any; config: ToolConfig } | undefined> => {
   const intelligent_update_configs =
-    await api_providers_manager.get_intelligent_update_tool_configs()
+    await api_providers_manager.get_tool_configs()
 
   if (intelligent_update_configs.length == 0) {
     vscode.commands.executeCommand('codeWebChat.settings')

apps/editor/src/views/panel/backend/message-handlers/handle-code-at-cursor.ts

@@ -25,7 +25,7 @@ const get_code_at_cursor_config = async (
   config_id?: string
 ): Promise<{ provider: any; config: any } | undefined> => {
   const code_completions_configs =
-    await api_providers_manager.get_code_completions_tool_configs()
+    await api_providers_manager.get_tool_configs()
 
   if (code_completions_configs.length == 0) {
     vscode.commands.executeCommand('codeWebChat.settings')

apps/editor/src/views/panel/backend/message-handlers/handle-delete-configuration.ts

@@ -7,7 +7,6 @@ export const handle_delete_configuration = async (
 ): Promise<void> => {
   await delete_configuration({
     context: provider.context,
-    configuration_id: message.configuration_id,
-    type: message.api_prompt_type
+    configuration_id: message.configuration_id
   })
 }

apps/editor/src/views/panel/backend/message-handlers/handle-edit-context.ts

@@ -35,7 +35,7 @@ const get_edit_context_config = async (params: {
   config_id?: string
 }): Promise<{ provider: Provider; config: ToolConfig } | undefined> => {
   const edit_context_configs =
-    await params.api_providers_manager.get_edit_context_tool_configs()
+    await params.api_providers_manager.get_tool_configs()
 
   if (edit_context_configs.length == 0) {
     vscode.commands.executeCommand('codeWebChat.settings')

apps/editor/src/views/panel/backend/message-handlers/handle-find-relevant-files.ts

@@ -31,7 +31,7 @@ const get_find_relevant_files_config = async (params: {
   config_id?: string
 }): Promise<{ provider: Provider; config: ToolConfig } | undefined> => {
   const find_relevant_files_configs =
-    await params.api_providers_manager.get_find_relevant_files_tool_configs()
+    await params.api_providers_manager.get_tool_configs()
 
   if (find_relevant_files_configs.length == 0) {
     vscode.commands.executeCommand('codeWebChat.settings')