Add commit message generation and one-click commit functionality to Code Web Chat

Author: robertpiosik

README.md

@@ -120,6 +120,10 @@ Meaningful summaries of changes adhering to your preffered style.
 - `Code Web Chat: Undo Context Selection` - Undo the last context change.
 - `Code Web Chat: Redo Context Selection` - Redo the last undone context change.
 
+### Commit messages
+
+- `Code Web Chat: Commit Changes` - Generate commit message and commit.
+
 ## Contributing
 
 All contributions are welcome. Feel free to submit pull requests, feature requests and bug reports.

apps/editor/package.json

@@ -2,7 +2,7 @@
   "name": "gemini-coder",
   "displayName": "Code Web Chat",
   "description": "Connect VS Code with chatbots (CWC)",
-  "version": "1.773.0",
+  "version": "1.774.0",
   "scripts": {
     "build": "npx vsce package --no-dependencies",
     "vscode:prepublish": "rimraf out && npm run compile",
@@ -308,6 +308,17 @@
         "category": "Code Web Chat",
         "icon": "$(sparkle)"
       },
+      {
+        "command": "codeWebChat.copyCommitMessagePrompt",
+        "title": "Copy Commit Message Prompt from CWC",
+        "category": "Code Web Chat",
+        "icon": "$(copy)"
+      },
+      {
+        "command": "codeWebChat.generateCommitMessageAndCommit",
+        "title": "Commit Changes",
+        "category": "Code Web Chat"
+      },
       {
         "command": "codeWebChat.setRange",
         "title": "Set Range",
@@ -430,6 +441,14 @@
         {
           "command": "codeWebChat.setRange",
           "when": "false"
+        },
+        {
+          "command": "codeWebChat.generateCommitMessage",
+          "when": "false"
+        },
+        {
+          "command": "codeWebChat.copyCommitMessagePrompt",
+          "when": "false"
         }
       ],
       "view/title": [
@@ -524,6 +543,11 @@
           "command": "codeWebChat.generateCommitMessage",
           "group": "navigation",
           "when": "scmProvider == git"
+        },
+        {
+          "command": "codeWebChat.copyCommitMessagePrompt",
+          "group": "navigation",
+          "when": "scmProvider == git"
         }
       ],
       "view/item/context": [

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

@@ -10,44 +10,91 @@ import { generate_commit_message_with_api } from './utils/generate-commit-messag
 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
+  const get_prompt_data = async (source_control?: vscode.SourceControl) => {
+    const repository = await get_git_repository(source_control)
+    if (!repository) return null
 
-      await repository.status()
-      const was_empty_stage = (repository.state.indexChanges || []).length == 0
+    await repository.status()
+    const was_empty_stage = (repository.state.indexChanges || []).length == 0
 
-      const diff = await prepare_staged_changes(repository)
+    const diff = await prepare_staged_changes(repository)
 
-      if (!diff) return
+    if (!diff) return null
 
-      const message_prompt = build_commit_message_prompt(diff)
+    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
+    return { repository, was_empty_stage, message_prompt }
+  }
+
+  const run_generate_action = async (
+    source_control: vscode.SourceControl | undefined,
+    should_commit: boolean
+  ) => {
+    const data = await get_prompt_data(source_control)
+    if (!data) return
+    const { repository, was_empty_stage, message_prompt } = data
+
+    const api_config_data = await get_commit_message_config(context)
+
+    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
+      if (should_commit) {
+        await vscode.commands.executeCommand('git.commit', repository)
+      }
+    } else if (was_empty_stage) {
+      await vscode.commands.executeCommand('git.unstageAll')
+    }
+  }
+
+  const generate_command = vscode.commands.registerCommand(
+    'codeWebChat.generateCommitMessage',
+    async (source_control?: vscode.SourceControl) => {
+      await run_generate_action(source_control, false)
+    }
+  )
 
-      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
-      })
+  const generate_and_commit_command = vscode.commands.registerCommand(
+    'codeWebChat.generateCommitMessageAndCommit',
+    async (source_control?: vscode.SourceControl) => {
+      await run_generate_action(source_control, true)
+    }
+  )
 
-      if (commit_message) {
-        repository.inputBox.value = commit_message
-      } else if (was_empty_stage) {
+  const copy_command = vscode.commands.registerCommand(
+    'codeWebChat.copyCommitMessagePrompt',
+    async (source_control?: vscode.SourceControl) => {
+      const data = await get_prompt_data(source_control)
+      if (!data) return
+      const { was_empty_stage, message_prompt } = data
+
+      await vscode.env.clipboard.writeText(message_prompt)
+      vscode.window.showInformationMessage(
+        'Commit message prompt copied to clipboard'
+      )
+
+      if (was_empty_stage) {
         await vscode.commands.executeCommand('git.unstageAll')
       }
     }
   )
+
+  return vscode.Disposable.from(
+    generate_command,
+    generate_and_commit_command,
+    copy_command
+  )
 }

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

@@ -17,8 +17,7 @@ export interface CommitMessageConfig {
 }
 
 export const get_commit_message_config = async (
-  context: vscode.ExtensionContext,
-  message_prompt?: string
+  context: vscode.ExtensionContext
 ): Promise<{
   config: CommitMessageConfig
   provider: any
@@ -49,14 +48,7 @@ export const get_commit_message_config = async (
         tooltip: 'Close'
       }
 
-      const copy_button = {
-        iconPath: new vscode.ThemeIcon('copy'),
-        tooltip: 'Copy prompt to clipboard'
-      }
-
-      quick_pick.buttons = message_prompt
-        ? [copy_button, close_button]
-        : [close_button]
+      quick_pick.buttons = [close_button]
       quick_pick.items = configs.map((config, index) => {
         const description_parts = [config.provider_name]
         if (config.reasoning_effort) {
@@ -98,9 +90,6 @@ export const get_commit_message_config = async (
           if (button == close_button) {
             quick_pick.hide()
             resolve(undefined)
-          } else if (button == copy_button && message_prompt) {
-            vscode.env.clipboard.writeText(message_prompt)
-            vscode.window.showInformationMessage('Prompt copied to clipboard')
           }
         })