Move commit message api configuration onto multi provider setup

Author: robertpiosik

packages/vscode/src/commands/commit-changes-command.ts

@@ -3,18 +3,9 @@ import { execSync } from 'child_process'
 import { Logger } from '@/utils/logger'
 import {
   get_git_repository,
-  prepare_staged_changes,
-  GitRepository
+  prepare_staged_changes
 } from '../utils/git-repository-utils'
-import {
-  get_commit_message_config,
-  get_ignored_extensions,
-  collect_affected_files_with_metadata,
-  handle_file_selection_if_needed,
-  build_files_content,
-  generate_commit_message_with_api,
-  build_commit_message_prompt
-} from '../utils/commit-message-generator'
+import { generate_commit_message_from_diff } from '../utils/commit-message-generator'
 
 export function commit_changes_command(context: vscode.ExtensionContext) {
   return vscode.commands.registerCommand(
@@ -27,9 +18,10 @@ export function commit_changes_command(context: vscode.ExtensionContext) {
         const diff = await prepare_staged_changes(repository)
         if (!diff) return
 
-        const commit_message = await generate_commit_message(
+        const commit_message = await generate_commit_message_from_diff(
           context,
           repository,
+          'Generating commit message and committing...',
           diff
         )
 
@@ -66,42 +58,3 @@ export function commit_changes_command(context: vscode.ExtensionContext) {
     }
   )
 }
-
-async function generate_commit_message(
-  context: vscode.ExtensionContext,
-  repository: GitRepository,
-  diff: string
-): Promise<string | null> {
-  const config = vscode.workspace.getConfiguration('codeWebChat')
-  const commit_message_prompt = config.get<string>('commitMessageInstructions')
-  const all_ignored_extensions = get_ignored_extensions()
-
-  const api_config = await get_commit_message_config(context)
-  if (!api_config) return null
-
-  const affected_files_data = await collect_affected_files_with_metadata(
-    repository,
-    all_ignored_extensions
-  )
-
-  const selected_files = await handle_file_selection_if_needed(
-    context,
-    affected_files_data
-  )
-  if (!selected_files) return null
-
-  const affected_files = build_files_content(selected_files)
-  const message = build_commit_message_prompt(
-    commit_message_prompt!,
-    affected_files,
-    diff
-  )
-
-  return await generate_commit_message_with_api(
-    api_config.endpoint_url,
-    api_config.provider,
-    api_config.config,
-    message,
-    'Generating commit message and committing...'
-  )
-}

packages/vscode/src/commands/generate-commit-message-command.ts

@@ -4,15 +4,7 @@ import {
   get_git_repository,
   prepare_staged_changes
 } from '../utils/git-repository-utils'
-import {
-  get_commit_message_config,
-  get_ignored_extensions,
-  collect_affected_files_with_metadata,
-  handle_file_selection_if_needed,
-  build_files_content,
-  generate_commit_message_with_api,
-  build_commit_message_prompt
-} from '../utils/commit-message-generator'
+import { generate_commit_message_from_diff } from '../utils/commit-message-generator'
 
 export function generate_commit_message_command(
   context: vscode.ExtensionContext
@@ -27,41 +19,13 @@ export function generate_commit_message_command(
         const diff = await prepare_staged_changes(repository)
         if (!diff) return
 
-        const config = vscode.workspace.getConfiguration('codeWebChat')
-        const commit_message_prompt = config.get<string>(
-          'commitMessageInstructions'
-        )
-        const all_ignored_extensions = get_ignored_extensions()
-
-        const api_config = await get_commit_message_config(context)
-        if (!api_config) return
-
-        const affected_files_data = await collect_affected_files_with_metadata(
-          repository,
-          all_ignored_extensions
-        )
-
-        const selected_files = await handle_file_selection_if_needed(
+        const commit_message = await generate_commit_message_from_diff(
           context,
-          affected_files_data
-        )
-        if (!selected_files) return
-
-        const affected_files = build_files_content(selected_files)
-        const message = build_commit_message_prompt(
-          commit_message_prompt!,
-          affected_files,
+          repository,
+          'Waiting for a commit message...',
           diff
         )
 
-        const commit_message = await generate_commit_message_with_api(
-          api_config.endpoint_url,
-          api_config.provider,
-          api_config.config,
-          message,
-          'Waiting for a commit message...'
-        )
-
         if (commit_message) {
           repository.inputBox.value = commit_message
         }

packages/vscode/src/commands/open-settings-command/open-settings-command.ts

@@ -1,7 +1,6 @@
 import * as vscode from 'vscode'
 import { api_providers } from './api-providers'
 import { setup_api_tool_multi_config } from './setup-api-tool-multi-config'
-import { setup_api_tool } from './setup-api-tool'
 
 const LABEL_PROVIDERS = '$(key) API Providers'
 const LABEL_CODE_COMPLETIONS = '$(tools) Code Completions'
@@ -88,16 +87,12 @@ export const open_settings_command = (context: vscode.ExtensionContext) => {
             tool: 'intelligent-update'
           })
           break
-        case LABEL_COMMIT_MESSAGES: {
-          const exit_menu = await setup_api_tool({
+        case LABEL_COMMIT_MESSAGES:
+          await setup_api_tool_multi_config({
             context,
             tool: 'commit-messages'
           })
-          if (exit_menu) {
-            show_menu = false
-          }
           break
-        }
       }
     }
   })

packages/vscode/src/commands/open-settings-command/setup-api-tool-multi-config.ts

@@ -4,6 +4,7 @@ import {
   Provider,
   ToolConfig,
   CodeCompletionsConfigs,
+  CommitMessagesConfigs,
   EditContextConfigs,
   IntelligentUpdateConfigs,
   ReasoningEffort
@@ -12,6 +13,9 @@ import { ModelFetcher } from '@/services/model-fetcher'
 import { PROVIDERS } from '@shared/constants/providers'
 import { Logger } from '@/utils/logger'
 import { DEFAULT_TEMPERATURE, SupportedTool } from '@shared/constants/api-tools'
+import { COMMIT_MESSAGES_CONFIRMATION_THRESHOLD_STATE_KEY } from '@/constants/state-keys'
+
+const DEFAULT_COMMIT_MESSAGE_MAX_TOKENS_BEFORE_ASK = 20000
 
 interface ToolMethods {
   get_configs: () => Promise<ToolConfig[]>
@@ -28,6 +32,9 @@ export const setup_api_tool_multi_config = async (params: {
   const providers_manager = new ApiProvidersManager(params.context)
   const model_fetcher = new ModelFetcher()
 
+  const EDIT_INSTRUCTIONS_LABEL = 'Instructions'
+  const CONFIRMATION_THRESHOLD_LABEL = 'Show file picker threshold'
+
   const BACK_LABEL = '$(arrow-left) Back'
   const ADD_CONFIGURATION_LABEL = '$(add) Add configuration...'
   const SET_AS_DEFAULT_LABEL = '$(star) Set as default'
@@ -78,6 +85,18 @@ export const setup_api_tool_multi_config = async (params: {
             ),
           get_display_name: () => 'Intelligent Update'
         }
+      case 'commit-messages':
+        return {
+          get_configs: () =>
+            providers_manager.get_commit_messages_tool_configs(),
+          save_configs: (configs: CommitMessagesConfigs) =>
+            providers_manager.save_commit_messages_tool_configs(configs),
+          get_default_config: () =>
+            providers_manager.get_default_commit_messages_config(),
+          set_default_config: (config: ToolConfig | null) =>
+            providers_manager.set_default_commit_messages_config(config as any),
+          get_display_name: () => 'Commit Messages'
+        }
       default:
         throw new Error(`Unsupported tool: ${tool}`)
     }
@@ -371,7 +390,10 @@ export const setup_api_tool_multi_config = async (params: {
 
   async function edit_configuration(config: ToolConfig): Promise<boolean> {
     const create_edit_options = () => {
-      const options = [
+      const options: (vscode.QuickPickItem & {
+        config?: ToolConfig
+        index?: number
+      })[] = [
         { label: BACK_LABEL },
         { label: '', kind: vscode.QuickPickItemKind.Separator },
         {
@@ -396,6 +418,32 @@ export const setup_api_tool_multi_config = async (params: {
         }
       ]
 
+      if (params.tool == 'commit-messages') {
+        const current_threshold = params.context.globalState.get<number>(
+          COMMIT_MESSAGES_CONFIRMATION_THRESHOLD_STATE_KEY,
+          DEFAULT_COMMIT_MESSAGE_MAX_TOKENS_BEFORE_ASK
+        )
+
+        const current_prompt = vscode.workspace
+          .getConfiguration('codeWebChat')
+          .get<string>('commitMessageInstructions', '')
+
+        options.push(
+          {
+            label: EDIT_INSTRUCTIONS_LABEL,
+            detail: current_prompt
+          },
+          {
+            label: CONFIRMATION_THRESHOLD_LABEL,
+            description: `${current_threshold.toString()} tokens${
+              current_threshold == DEFAULT_COMMIT_MESSAGE_MAX_TOKENS_BEFORE_ASK
+                ? ' (default)'
+                : ''
+            }`
+          }
+        )
+      }
+
       const current_is_default =
         default_config &&
         default_config.provider_type == config.provider_type &&
@@ -434,6 +482,28 @@ export const setup_api_tool_multi_config = async (params: {
           return
         }
 
+        if (
+          params.tool == 'commit-messages' &&
+          selected_option.label == EDIT_INSTRUCTIONS_LABEL
+        ) {
+          await vscode.commands.executeCommand(
+            'workbench.action.openSettings',
+            'codeWebChat.commitMessageInstructions'
+          )
+          resolve(await edit_configuration(config))
+          return
+        }
+
+        if (
+          params.tool == 'commit-messages' &&
+          selected_option.label == CONFIRMATION_THRESHOLD_LABEL
+        ) {
+          quick_pick.hide()
+          await handle_confirmation_threshold_update()
+          resolve(await edit_configuration(config))
+          return
+        }
+
         if (selected_option.label == SET_AS_DEFAULT_LABEL) {
           default_config = { ...config }
           await tool_methods.set_default_config(default_config)
@@ -580,6 +650,26 @@ export const setup_api_tool_multi_config = async (params: {
     })
   }
 
+  async function handle_confirmation_threshold_update() {
+    const current_threshold = params.context.globalState.get<number>(
+      COMMIT_MESSAGES_CONFIRMATION_THRESHOLD_STATE_KEY,
+      DEFAULT_COMMIT_MESSAGE_MAX_TOKENS_BEFORE_ASK
+    )
+    const new_threshold = await set_confirmation_threshold(current_threshold)
+    if (new_threshold !== undefined) {
+      await params.context.globalState.update(
+        COMMIT_MESSAGES_CONFIRMATION_THRESHOLD_STATE_KEY,
+        new_threshold
+      )
+
+      if (current_threshold != new_threshold) {
+        vscode.window.showInformationMessage(
+          `Confirmation threshold updated to ${new_threshold} tokens.`
+        )
+      }
+    }
+  }
+
   async function select_provider(): Promise<
     Pick<Provider, 'type' | 'name'> | undefined
   > {
@@ -730,5 +820,35 @@ export const setup_api_tool_multi_config = async (params: {
     return { value: selected.effort, cancelled: false }
   }
 
+  async function set_confirmation_threshold(
+    current_threshold: number
+  ): Promise<number | undefined> {
+    const threshold_input = await vscode.window.showInputBox({
+      title: 'Set Confirmation Threshold',
+      prompt: 'Enter token count above which to show affected files picker',
+      value: current_threshold.toString(),
+      placeHolder: 'Leave empty to restore default',
+      validateInput: (value) => {
+        if (value == '') return null
+
+        const num = Number(value)
+        if (isNaN(num)) return 'Please enter a valid number'
+        if (num < 0) return 'Threshold must be 0 or greater'
+        if (num > 1000000) return 'Threshold seems too large'
+        return null
+      }
+    })
+
+    if (threshold_input === undefined) {
+      return undefined
+    }
+
+    if (threshold_input === '') {
+      return DEFAULT_COMMIT_MESSAGE_MAX_TOKENS_BEFORE_ASK
+    }
+
+    return Number(threshold_input)
+  }
+
   return await show_configs_quick_pick()
 }