Implement the commitMessageAutoAcceptAfter setting to control the automatic acceptance duration for generated commit messages

Author: robertpiosik

packages/shared/src/constants/dictionary.ts

@@ -40,7 +40,9 @@ export const dictionary = {
     NO_EDIT_CONTEXT_CONFIGURATIONS_FOUND:
       'No "Edit Context" configurations found. Please add one in the settings.',
     PRESET_PREVIEW_SENT_TO_BROWSER:
-      'Preset preview sent to the connected browser'
+      'Preset preview sent to the connected browser',
+    COMMIT_CREATED_SUCCESSFULLY: (commit_summary: string) =>
+      `Commit created: "${commit_summary}"`
   },
 
   warning_message: {

packages/ui/src/components/editor/panel/ChatInput/ChatInput.module.scss

@@ -96,6 +96,7 @@
   cursor: pointer;
   color: var(--vscode-icon-foreground);
   opacity: var(--dimmed-opacity);
+  z-index: 0;
 
   &::before {
     font-size: 13px !important;

packages/ui/src/components/editor/panel/modals/CommitMessageModal/CommitMessageModal.stories.tsx

@@ -20,6 +20,7 @@ export const Default = () => {
   return visible ? (
     <CommitMessageModal
       commit_message="feat: Implement amazing new feature"
+      auto_accept_after_seconds={5}
       on_accept={handle_accept}
       on_cancel={handle_cancel}
     />

packages/ui/src/components/editor/panel/modals/CommitMessageModal/CommitMessageModal.tsx

@@ -6,6 +6,7 @@ import { use_commit_timer } from './hooks/use-commit-timer'
 
 type Props = {
   commit_message: string
+  auto_accept_after_seconds: number
   on_accept: (message: string) => void
   on_cancel: () => void
 }
@@ -21,7 +22,7 @@ export const CommitMessageModal: React.FC<Props> = (props) => {
 
   const commit_timer_hook = use_commit_timer({
     on_accept: handle_accept,
-    initial_countdown: 5
+    initial_countdown: props.auto_accept_after_seconds
   })
 
   return (

packages/vscode/package.json

@@ -525,6 +525,12 @@
           "description": "The instructions used when generating a commit message.",
           "default": "Write a brief and precise summary for the changes, limited to a single sentence if possible and nothing else. Use an imperative tone to ensure clarity and focus on the primary change or purpose."
         },
+        "codeWebChat.commitMessageAutoAcceptAfter": {
+          "type": "number",
+          "scope": "resource",
+          "default": 5,
+          "description": "Automatically accept commit message after a specified number of seconds."
+        },
         "codeWebChat.contextSizeWarningThreshold": {
           "type": "number",
           "default": 60000,

packages/vscode/src/views/panel/backend/message-handlers/handle-commit-changes/handle-commit-changes.ts

@@ -9,6 +9,7 @@ import {
 } from './utils'
 import * as path from 'path'
 import { execSync } from 'child_process'
+import { handle_accept_commit_message } from '../handle-accept-commit-message'
 
 async function proceed_with_commit_generation(
   panel_provider: PanelProvider,
@@ -55,10 +56,30 @@ async function proceed_with_commit_generation(
       return
     }
 
-    panel_provider.send_message({
-      command: 'SHOW_COMMIT_MESSAGE_MODAL',
-      commit_message
-    })
+    const auto_accept_after = vscode.workspace
+      .getConfiguration('codeWebChat')
+      .get<number>('commitMessageAutoAcceptAfter')
+
+    if (auto_accept_after && auto_accept_after > 0) {
+      panel_provider.send_message({
+        command: 'SHOW_COMMIT_MESSAGE_MODAL',
+        commit_message,
+        auto_accept_after_seconds: auto_accept_after
+      })
+    } else {
+      await handle_accept_commit_message(panel_provider, commit_message)
+      panel_provider.send_message({ command: 'COMMIT_PROCESS_CANCELLED' })
+      panel_provider.commit_was_staged_by_script = false
+      const commit_message_lines = commit_message.split('\n')
+      const shortened_commit_message = commit_message_lines.length
+        ? `${commit_message_lines[0]}...`
+        : commit_message_lines[0]
+      vscode.window.showInformationMessage(
+        dictionary.information_message.COMMIT_CREATED_SUCCESSFULLY(
+          shortened_commit_message
+        )
+      )
+    }
   } catch (error) {
     if (panel_provider.commit_was_staged_by_script) {
       await vscode.commands.executeCommand('git.unstageAll')

packages/vscode/src/views/panel/frontend/Panel.tsx

@@ -449,7 +449,10 @@ export const Panel = () => {
         {commit_message_to_review && (
           <div className={styles.slot}>
             <UiCommitMessageModal
-              commit_message={commit_message_to_review}
+              commit_message={commit_message_to_review.commit_message}
+              auto_accept_after_seconds={
+                commit_message_to_review.auto_accept_after_seconds
+              }
               on_accept={(message) => {
                 post_message(vscode, {
                   command: 'ACCEPT_COMMIT_MESSAGE',

packages/vscode/src/views/panel/frontend/hooks/use-panel.ts

@@ -37,7 +37,11 @@ export const use_panel = (vscode: any) => {
     string | undefined
   >()
   const [commit_message_to_review, set_commit_message_to_review] = useState<
-    string | undefined
+    | {
+        commit_message: string
+        auto_accept_after_seconds: number
+      }
+    | undefined
   >()
   const [files_to_stage, set_files_to_stage] = useState<string[]>()
   const [
@@ -231,7 +235,10 @@ export const use_panel = (vscode: any) => {
       } else if (message.command == 'FOCUS_CHAT_INPUT') {
         set_chat_input_focus_key((k) => k + 1)
       } else if (message.command == 'SHOW_COMMIT_MESSAGE_MODAL') {
-        set_commit_message_to_review(message.commit_message)
+        set_commit_message_to_review({
+          commit_message: message.commit_message,
+          auto_accept_after_seconds: message.auto_accept_after_seconds
+        })
       } else if (message.command == 'SHOW_STAGE_FILES_MODAL') {
         set_files_to_stage(message.files)
       } else if (message.command == 'COMMIT_PROCESS_CANCELLED') {

packages/vscode/src/views/panel/types/messages.ts

@@ -584,6 +584,7 @@ export interface ShowStageFilesModalMessage extends BaseMessage {
 export interface ShowCommitMessageModalMessage extends BaseMessage {
   command: 'SHOW_COMMIT_MESSAGE_MODAL'
   commit_message: string
+  auto_accept_after_seconds: number
 }
 
 export interface CommitProcessCancelledMessage extends BaseMessage {

packages/vscode/src/views/settings/backend/message-handlers/handle-get-commit-message-auto-accept-after.ts

@@ -0,0 +1,13 @@
+import * as vscode from 'vscode'
+import { SettingsProvider } from '@/views/settings/backend/settings-provider'
+
+export const handle_get_commit_message_auto_accept_after = async (
+  provider: SettingsProvider
+): Promise<void> => {
+  const config = vscode.workspace.getConfiguration('codeWebChat')
+  const seconds = config.get<number | null>('commitMessageAutoAcceptAfter')
+  provider.postMessage({
+    command: 'COMMIT_MESSAGE_AUTO_ACCEPT_AFTER',
+    seconds: seconds ?? null
+  })
+}