Merge pull request #8 from yamork779/opt/code-simplified

refactor(commit): consolidate custom prompt handling into generateCommitMessage

Author: uaoa

src/extension.ts

@@ -1,5 +1,5 @@
 import * as vscode from "vscode";
-import { generateCommitMessage, editCommitMessage, generateWithCustomPrompt } from "./generators/commit";
+import { generateCommitMessage, editCommitMessage } from "./generators/commit";
 import type { GitRepository, GitAPI, Language } from "./types";
 
 /**
@@ -301,11 +301,11 @@ async function handleCustomPrompt(repo: GitRepository): Promise<void> {
           progress.report({ message });
         };
 
-        const newMessage = await generateWithCustomPrompt(
+        const newMessage = await generateCommitMessage(
           repo,
-          customPrompt,
           language,
-          updateProgress
+          updateProgress,
+          customPrompt
         );
 
         if (newMessage) {

src/generators/commit.ts

@@ -17,7 +17,8 @@ import { generateWithCLI, generateWithCLIManaged, generateWithAPI } from "../cli
 export async function generateCommitMessage(
   repo: GitRepository,
   language: Language = "en",
-  progressCallback: ProgressCallback | null = null
+  progressCallback: ProgressCallback | null = null,
+  customPrompt: string = ""
 ): Promise<string> {
   const repoPath = repo.rootUri.fsPath;
   const config = vscode.workspace.getConfiguration("claudeCommit");
@@ -42,7 +43,7 @@ export async function generateCommitMessage(
     const keepCoAuthoredBy = config.get<boolean>("keepCoAuthoredBy", false);
     const multiLine = config.get<boolean>("multiLineCommit", false);
     const diffSource = config.get<DiffSource>("diffSource", "auto");
-    const prompt = createManagedPrompt(language, keepCoAuthoredBy, multiLine, diffSource, "");
+    const prompt = createManagedPrompt(language, keepCoAuthoredBy, multiLine, diffSource, customPrompt);
     return await generateWithCLIManaged(prompt, repoPath, progressCallback);
   }
 
@@ -149,25 +150,6 @@ export async function generateCommitMessage(
   );
 }
 
-export async function generateWithCustomPrompt(
-  repo: GitRepository,
-  customPrompt: string,
-  language: Language = "en",
-  progressCallback: ProgressCallback | null = null
-): Promise<string> {
-  const repoPath = repo.rootUri.fsPath;
-  const config = vscode.workspace.getConfiguration("claudeCommit");
-
-  if (progressCallback) {
-    progressCallback("Regenerating with custom prompt...");
-  }
-
-  const keepCoAuthoredBy = config.get<boolean>("keepCoAuthoredBy", false);
-  const multiLine = config.get<boolean>("multiLineCommit", false);
-  const diffSource = config.get<DiffSource>("diffSource", "auto");
-  const prompt = createManagedPrompt(language, keepCoAuthoredBy, multiLine, diffSource, customPrompt);
-  return await generateWithCLIManaged(prompt, repoPath, progressCallback);
-}
 
 export async function editCommitMessage(
   repo: GitRepository,

src/prompts/en.ts

@@ -132,6 +132,7 @@ From output start to output end, strictly follow this format:
 
 Keep at the end of footer:
 🤖 Generated with Claude Code
+
 Co-Authored-By: Claude <noreply@anthropic.com>`;
   }
 

src/prompts/ua.ts

@@ -132,6 +132,7 @@ export function getManagedPrompt(keepCoAuthoredBy: boolean, multiline: boolean,
 
 В кінці footer додай:
 🤖 Generated with Claude Code
+
 Co-Authored-By: Claude <noreply@anthropic.com>`;
   }
 

src/prompts/zh.ts

@@ -132,6 +132,7 @@ export function getManagedPrompt(keepCoAuthoredBy: boolean, multiline: boolean,
 
 footer 末尾保留:
 🤖 Generated with Claude Code
+
 Co-Authored-By: Claude <noreply@anthropic.com>`;
   }