Refactor commit message generation to use configurable API providers and modular utilities

Author: robertpiosik

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

@@ -0,0 +1,53 @@
+import * as vscode from 'vscode'
+import {
+  get_git_repository,
+  prepare_staged_changes
+} from '../../utils/git-repository-utils'
+import { get_commit_message_config } from './utils/get-commit-message-config'
+import { build_commit_message_prompt } from './utils/build-commit-message-prompt'
+import { generate_commit_message_with_api } from './utils/generate-commit-message-with-api'
+
+export const generate_commit_message_command = (
+  context: vscode.ExtensionContext
+) => {
+  return vscode.commands.registerCommand(
+    'codeWebChat.generateCommitMessage',
+    async (source_control?: vscode.SourceControl) => {
+      const repository = await get_git_repository(source_control)
+      if (!repository) return
+
+      await repository.status()
+      const was_empty_stage = (repository.state.indexChanges || []).length == 0
+
+      const diff = await prepare_staged_changes(repository)
+
+      if (!diff) return
+
+      const message_prompt = build_commit_message_prompt(diff)
+
+      const api_config_data = await get_commit_message_config(
+        context,
+        message_prompt
+      )
+      if (!api_config_data) {
+        if (was_empty_stage) {
+          await vscode.commands.executeCommand('git.unstageAll')
+        }
+        return
+      }
+
+      const commit_message = await generate_commit_message_with_api({
+        endpoint_url: api_config_data.endpoint_url,
+        provider: api_config_data.provider,
+        config: api_config_data.config,
+        message: message_prompt
+      })
+
+      if (commit_message) {
+        repository.inputBox.value = commit_message
+      } else if (was_empty_stage) {
+        await vscode.commands.executeCommand('git.unstageAll')
+      }
+    }
+  )
+}

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

@@ -0,0 +1 @@
+export * from './generate-commit-message-command'

apps/editor/src/commands/generate-commit-message-command/index.ts

@@ -0,0 +1,86 @@
+import * as vscode from 'vscode'
+import { commit_message_instructions } from '@/constants/instructions'
+
+export const build_commit_message_prompt = (diff: string): string => {
+  const config = vscode.workspace.getConfiguration('codeWebChat')
+  const instructions = config.get<string>('commitMessageInstructions')
+  const commit_message_prompt = instructions || commit_message_instructions
+
+  const file_diffs = diff.split(/^diff --git /m).filter((d) => d.trim() != '')
+
+  let changes_content = '<files>\n'
+  for (const file_diff_content of file_diffs) {
+    const full_file_diff = 'diff --git ' + file_diff_content
+    const lines = full_file_diff.split('\n')
+    const old_path_line = lines.find((l) => l.startsWith('--- a/'))
+    const new_path_line = lines.find((l) => l.startsWith('+++ b/'))
+    const rename_from_line = lines.find((l) => l.startsWith('rename from '))
+
+    const old_path = old_path_line
+      ? old_path_line.substring('--- a/'.length)
+      : undefined
+    const new_path = new_path_line
+      ? new_path_line.substring('+++ b/'.length)
+      : undefined
+
+    let final_diff_content = full_file_diff
+    let file_path: string | undefined
+    let is_deleted = false
+
+    if (new_path && new_path != '/dev/null') {
+      file_path = new_path
+    } else if (old_path && old_path != '/dev/null') {
+      file_path = old_path
+      is_deleted = true
+      // Shorten diff of a deleted file
+      const split_diff = full_file_diff.split('+++ /dev/null')
+      final_diff_content = split_diff[0] + '+++ /dev/null'
+    } else {
+      // Fallback: try to identify file from diff header (e.g. binary files)
+      // diff --git a/path b/path
+      const diff_header = lines[0]
+      const match = diff_header.match(/^diff --git a\/(.*) b\/(.*)$/)
+      if (match) {
+        file_path = match[2]
+      }
+    }
+
+    if (file_path) {
+      let status = 'updated'
+
+      if (is_deleted) {
+        status = 'deleted'
+      } else if (!old_path && new_path) {
+        status = 'created'
+      } else if (rename_from_line) {
+        status = 'renamed'
+      } else if (lines.some((l) => l.startsWith('new file mode'))) {
+        status = 'created'
+      } else if (lines.some((l) => l.startsWith('deleted file mode'))) {
+        status = 'deleted'
+        is_deleted = true
+      }
+
+      let old_path_attr: string | undefined
+      if (status == 'renamed') {
+        if (rename_from_line) {
+          old_path_attr = rename_from_line
+            .substring('rename from '.length)
+            .trim()
+        }
+      }
+
+      changes_content += `<file path="${file_path}" status="${status}"`
+      if (old_path_attr) {
+        changes_content += ` old_path="${old_path_attr}"`
+      }
+      changes_content += '>\n'
+      changes_content += `<![CDATA[\n${final_diff_content}\n]]>\n`
+      changes_content += `</file>\n`
+    }
+  }
+
+  changes_content += '</files>'
+
+  return `${commit_message_prompt}\n${changes_content}\n${commit_message_prompt}`
+}

apps/editor/src/commands/generate-commit-message-command/utils/build-commit-message-prompt.ts

@@ -0,0 +1,93 @@
+import * as vscode from 'vscode'
+import axios from 'axios'
+import { apply_reasoning_effort } from '@/utils/apply-reasoning-effort'
+import { dictionary } from '@shared/constants/dictionary'
+import { make_api_request } from '@/utils/make-api-request'
+import { process_single_trailing_dot } from '@/utils/process-single-trailing-dot/process-single-trailing-dot'
+import { Logger } from '@shared/utils/logger'
+import { strip_wrapping_quotes } from './strip-wrapping-quotes'
+import { CommitMessageConfig } from './get-commit-message-config'
+
+export const generate_commit_message_with_api = async (params: {
+  endpoint_url: string
+  provider: any
+  config: CommitMessageConfig
+  message: string
+}): Promise<string | null> => {
+  const messages = [
+    {
+      role: 'user',
+      content: params.message
+    }
+  ]
+
+  const body = {
+    messages,
+    model: params.config.model,
+    temperature: params.config.temperature
+  } as any
+
+  apply_reasoning_effort(body, params.provider, params.config.reasoning_effort)
+
+  const cancel_token_source = axios.CancelToken.source()
+
+  return await vscode.window.withProgress(
+    {
+      location: vscode.ProgressLocation.Notification,
+      title: dictionary.api_call.WAITING_FOR_RESPONSE,
+      cancellable: true
+    },
+    async (progress, token) => {
+      token.onCancellationRequested(() => {
+        cancel_token_source.cancel('Operation cancelled by user')
+      })
+
+      let wait_time = 0
+      const wait_timer = setInterval(() => {
+        progress.report({
+          message: `${(wait_time / 10).toFixed(1)}s`
+        })
+        wait_time++
+      }, 100)
+
+      try {
+        const response_result = await make_api_request({
+          endpoint_url: params.endpoint_url,
+          api_key: params.provider.api_key,
+          body,
+          cancellation_token: cancel_token_source.token
+        })
+
+        if (!response_result) {
+          if (token.isCancellationRequested) {
+            return null
+          }
+          vscode.window.showErrorMessage(
+            dictionary.error_message.FAILED_TO_GENERATE_COMMIT_MESSAGE
+          )
+          return null
+        } else {
+          let commit_message = process_single_trailing_dot(
+            response_result.response
+          )
+          commit_message = strip_wrapping_quotes(commit_message)
+          // Sanitize to prevent shell syntax errors
+          commit_message = commit_message.replace(/[<>`$()]/g, '')
+          return commit_message
+        }
+      } catch (error) {
+        if (axios.isCancel(error)) {
+          return null
+        }
+        Logger.error({
+          function_name: 'generate_commit_message_with_api',
+          message: 'Error during API request',
+          data: error
+        })
+        throw error
+      } finally {
+        clearInterval(wait_timer)
+      }
+    }
+  )
+}