refactor: add use-as-is flag to lazycommit and update prepare-commit-msg hook

Author: KartikLabhshetwar

README.md

@@ -138,7 +138,7 @@ For large commits with many files, lazycommit automatically stays within API lim
 
 ### Git hook
 
-You can also integrate _lazycommit_ with Git via the [`prepare-commit-msg`](https://git-scm.com/docs/githooks#_prepare_commit_msg) hook. This lets you use Git like you normally would, and edit the commit message before committing.
+You can also integrate _lazycommit_ with Git via the [`prepare-commit-msg`](https://git-scm.com/docs/githooks#_prepare_commit_msg) hook. This lets you use Git like you normally would, and edit the commit message before committing. The hook uses the same enhanced analysis and quality improvements as the CLI mode.
 
 #### Install
 
@@ -167,7 +167,7 @@ lazycommit hook uninstall
 
    > If you ever want to write your own message instead of generating one, you can simply pass one in: `git commit -m "My message"`
 
-2. Lazycommit will generate the commit message for you and pass it back to Git. Git will open it with the [configured editor](https://docs.github.com/en/get-started/getting-started-with-git/associating-text-editors-with-git) for you to review/edit it.
+2. Lazycommit will generate a high-quality commit message using the same enhanced analysis as the CLI mode and pass it back to Git. Git will open it with the [configured editor](https://docs.github.com/en/get-started/getting-started-with-git/associating-text-editors-with-git) for you to review/edit it.
 
 3. Save and close the editor to commit!
 

src/commands/lazycommit.ts

@@ -66,7 +66,7 @@ const buildDiffSnippets = async (
     }
 };
 
-const buildSingleCommitPrompt = async (
+export const buildSingleCommitPrompt = async (
     files: string[],
     compactSummary: string,
     maxLength: number
@@ -238,6 +238,7 @@ export default async (
 
 		let message: string;
 		let editedAlready = false;
+		let useAsIs = false;
 		if (messages.length === 1) {
 			[message] = messages;
 			const choice = await select({
@@ -255,7 +256,7 @@ export default async (
 			}
 
 			if (choice === 'use') {
-				editedAlready = true;
+				useAsIs = true;
 			} else if (choice === 'edit') {
 				const edited = await text({
 					message: 'Edit commit message:',
@@ -281,12 +282,11 @@ export default async (
 			}
 
 			message = selected as string;
-			// User selected a message, no need for further editing
-			editedAlready = true;
+			useAsIs = true;
 		}
 
-		// Offer editing of the final commit message (skip if already edited)
-		if (!editedAlready) {
+		// Offer editing of the final commit message (skip if user chose 'Use as-is' or already edited)
+		if (!useAsIs && !editedAlready) {
 			const wantsEdit = await confirm({ message: 'Edit the commit message before committing?' });
 			if (wantsEdit && !isCancel(wantsEdit)) {
 				const edited = await text({
@@ -299,16 +299,19 @@ export default async (
 					return;
 				}
 				message = String(edited).trim();
+				editedAlready = true;
 			}
 		}
 
-		// Final proceed confirmation displaying the message
-		const proceed = await confirm({
-			message: `Proceed with this commit message?\n\n   ${message}\n`,
-		});
-		if (!proceed || isCancel(proceed)) {
-			outro('Commit cancelled');
-			return;
+		// Final proceed confirmation displaying the message (skip if user chose 'Use as-is')
+		if (!useAsIs) {
+			const proceed = await confirm({
+				message: `Proceed with this commit message?\n\n   ${message}\n`,
+			});
+			if (!proceed || isCancel(proceed)) {
+				outro('Commit cancelled');
+				return;
+			}
 		}
 
 		await execa('git', ['commit', '-m', message, ...rawArgv]);

src/commands/prepare-commit-msg-hook.ts

@@ -2,6 +2,7 @@ import fs from 'fs/promises';
 import { intro, outro, spinner } from '@clack/prompts';
 import { black, green, red, bgCyan } from 'kolorist';
 import { getStagedDiff, buildCompactSummary } from '../utils/git.js';
+import { buildSingleCommitPrompt } from './lazycommit.js';
 import { getConfig } from '../utils/config.js';
 import { generateCommitMessageFromSummary } from '../utils/groq.js';
 import { KnownError, handleCliError } from '../utils/error.js';
@@ -42,11 +43,12 @@ export default () =>
 		try {
 			const compact = await buildCompactSummary();
 			if (compact) {
+				const enhanced = await buildSingleCommitPrompt(staged.files, compact, config['max-length']);
 				messages = await generateCommitMessageFromSummary(
 					config.GROQ_API_KEY,
 					config.model,
 					config.locale,
-					compact,
+					enhanced,
 					config.generate,
 					config['max-length'],
 					config.type,
@@ -56,7 +58,7 @@ export default () =>
 			} else {
 				// Fallback to simple file list if summary fails
 				const fileList = staged!.files.join(', ');
-				const fallbackPrompt = `Generate a commit message for these files: ${fileList}`;
+				const fallbackPrompt = await buildSingleCommitPrompt(staged.files, `Files: ${fileList}`, config['max-length']);
 				messages = await generateCommitMessageFromSummary(
 					config.GROQ_API_KEY,
 					config.model,