Generation commit (#503)

* feat: add commit message generation feature

* feat: enhance commit message generation with i18n support and API improvements

* fix(i18n): update parameter placeholder syntax in commit localization files

* feat(types): add isRateLimitRetry metadata field for rate limiting handling

* fix(modelCache): change method call from getInstance to getAllInstance

* refactor(commit): implement singleton pattern and execution lock

Author: mini2s

src/api/providers/zgsm.ts

@@ -521,7 +521,7 @@ export class ZgsmAiHandler extends BaseProvider implements SingleCompletionHandl
 								"system",
 							),
 						},
-						timeout: 10_000,
+						timeout: 5000,
 					}),
 				)
 			} catch (error) {

src/core/costrict/commit/commitGenerator.ts

@@ -112,7 +112,7 @@ export class CommitMessageGenerator {
 			const aiSuggestion = await this.generateCommitMessageWithAI(diffInfo, options)
 			return aiSuggestion
 		} catch (error) {
-			console.log("AI generation failed, falling back to rule-based:", error)
+			this.provider?.log("AI generation failed, falling back to rule-based: " + error?.message)
 			// Fallback to rule-based analysis
 			const suggestion = this.analyzeChanges(diffInfo, options)
 			return suggestion

src/core/costrict/commit/index.ts

@@ -4,6 +4,10 @@
  * Provides functionality to generate commit messages based on local changes
  * and populate them in VSCode's SCM input.
  */
+import * as vscode from "vscode"
+import { CommitService } from "./commitService"
+import { t } from "../../../i18n"
+import { type ClineProvider } from "../../webview/ClineProvider"
 
 export * from "./types"
 export * from "./commitGenerator"
@@ -12,12 +16,12 @@ export * from "./commitService"
 /**
  * Commit generation command handler
  */
-export async function handleGenerateCommitMessage(
-	provider: import("../../webview/ClineProvider").ClineProvider,
-): Promise<void> {
-	const { CommitService } = await import("./commitService")
-	const { t } = await import("../../../i18n")
+// Singleton instance
+let commitServiceInstance: CommitService | null = null
+// Execution lock to prevent concurrent calls
+let isExecuting = false
 
+export async function handleGenerateCommitMessage(provider: ClineProvider): Promise<void> {
 	const workspaceRoot = CommitService.getWorkspaceRoot()
 	if (!workspaceRoot) {
 		throw new Error(t("commit:commit.error.noWorkspace"))
@@ -28,8 +32,27 @@ export async function handleGenerateCommitMessage(
 		throw new Error(t("commit:commit.error.notGitRepo"))
 	}
 
-	const commitService = new CommitService()
-	commitService.initialize(workspaceRoot, provider)
+	// Check if execution is already in progress
+	if (isExecuting) {
+		vscode.window.showInformationMessage(t("commit:commit.message.executing"))
+		return
+	}
+
+	try {
+		// Set execution lock
+		isExecuting = true
 
-	await commitService.generateAndPopulateCommitMessage()
+		// Singleton pattern: reuse existing instance or create new one
+		if (!commitServiceInstance) {
+			commitServiceInstance = new CommitService()
+			commitServiceInstance.initialize(workspaceRoot, provider)
+		}
+
+		await commitServiceInstance.generateAndPopulateCommitMessage()
+		isExecuting = false
+	} catch (error) {
+		// Reset instance on error to allow recovery
+		isExecuting = false
+		throw error
+	}
 }

src/core/task/Task.ts

@@ -2231,7 +2231,6 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 
 						// Now abort (emits TaskAborted which provider listens to)
 						await this.abortTask()
-
 						this?.api?.cancelChat?.(cancelReason)
 						// Do not rehydrate here; provider owns rehydration to avoid duplication races
 					}

src/core/webview/ClineProvider.ts

@@ -2680,6 +2680,7 @@ export class ClineProvider
 			},
 		).catch(() => {
 			console.error("Failed to abort task")
+			task?.api?.cancelChat?.(task.abortReason)
 		})
 
 		task?.api?.cancelChat?.(task.abortReason)

src/i18n/costrict-i18n/locales/en/commit.json

@@ -14,7 +14,8 @@
 		},
 		"message": {
 			"copiedToClipboard": "Commit message generated but could not be automatically populated in the input box. The commit message has been copied to clipboard.",
-			"generationFailed": "Failed to generate commit message: {{error}}"
+			"generationFailed": "Failed to generate commit message: {{error}}",
+			"executing": "Please wait, commit generation is already in progress"
 		},
 		"action": {
 			"addFile": "add {{0}}",

src/i18n/costrict-i18n/locales/zh-CN/commit.json

@@ -14,7 +14,8 @@
 		},
 		"message": {
 			"copiedToClipboard": "提交消息已生成，但无法自动填充到输入框中。提交消息已复制到剪贴板。",
-			"generationFailed": "生成提交消息失败：{{error}}"
+			"generationFailed": "生成提交消息失败：{{error}}",
+			"executing": "点击过于频繁，请等待当前提交生成完成"
 		},
 		"action": {
 			"addFile": "添加 {{0}}",

src/i18n/costrict-i18n/locales/zh-TW/commit.json

@@ -14,7 +14,8 @@
 		},
 		"message": {
 			"copiedToClipboard": "提交訊息已生成，但無法自動填充到輸入框中。提交訊息已複製到剪貼簿。",
-			"generationFailed": "生成提交訊息失敗：{{error}}"
+			"generationFailed": "生成提交訊息失敗：{{error}}",
+			"executing": "點擊過於頻繁，請等待當前提交生成完成"
 		},
 		"action": {
 			"addFile": "添加 {{0}}",

webview-ui/src/components/chat/ChatRow.tsx

@@ -1413,7 +1413,7 @@ export const ChatRowContent = ({
 							message={message.text || ""}
 							apiConfiguration={apiConfiguration}
 							additionalContent={
-								!message?.metadata?.isRateLimit ? (
+								!message?.metadata?.isRateLimit && !message?.metadata?.isRateLimitRetry ? (
 									<>
 										<br />
 										<br />