@kyubiware/commit-mint 0.2.1 → 0.3.0

package/dist/cli.mjs

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import { cli, command } from "cleye";
 import * as p from "@clack/prompts";
-import { intro, isCancel, log, outro, spinner } from "@clack/prompts";
+import { intro, isCancel, log, note, outro, select, spinner } from "@clack/prompts";
 import { bold, cyan, dim, green, red, yellow } from "kolorist";
-import Groq from "groq-sdk";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import os from "node:os";
 import { join } from "node:path";
 import ini from "ini";
 import { execa } from "execa";
 import { spawn } from "node:child_process";
+import Groq from "groq-sdk";
 import { createHash } from "node:crypto";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -26,7 +26,7 @@ var __exportAll = (all, no_symbols) => {
 //#region package.json
 var package_default = {
 	name: "@kyubiware/commit-mint",
-	version: "0.2.1",
+	version: "0.3.0",
 	description: "A commit tool that actually handles hook failures",
 	type: "module",
 	bin: { "cmint": "./dist/cli.mjs" },
@@ -97,171 +97,6 @@ function debug(...args) {
 	console.error(dim(`[debug ${timestamp}]`), ...args);
 }
 //#endregion
-//#region src/services/ai.ts
-const MAX_DIFF_CHARS = 2e4;
-const CONVENTIONAL_COMMIT_REGEX = /^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\(.+\))?!?: .+$/;
-function stripThinkTags(text) {
-	return text.replace(/<think[\s\S]*?<\/think>/gi, "").trim();
-}
-function deriveMessageFromReasoning(reasoning) {
-	const match = reasoning.match(/(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\(.+\))?!?: .+/i);
-	if (match) return match[0].trim();
-	const first = reasoning.split(/[.!?]/).find((s) => s.trim().length >= 10);
-	return first ? first.trim() : null;
-}
-function stripContextLines(diff) {
-	return diff.split("\n").filter((line) => !line.startsWith(" ")).join("\n");
-}
-function compressDiff(diff) {
-	if (diff.length <= MAX_DIFF_CHARS) return diff;
-	let result = stripContextLines(diff);
-	if (result.length <= MAX_DIFF_CHARS) return result;
-	result = result.split(/(?=diff --git)/).filter(Boolean).map((fd) => {
-		return fd.split(/(?=\n@@)/).map((part, idx) => {
-			if (idx === 0) return part;
-			const lines = part.split("\n");
-			return [lines[0], ...lines.slice(1).filter((l) => l.startsWith("+") || l.startsWith("-")).slice(0, 10)].join("\n");
-		}).join("");
-	}).join("");
-	if (result.length <= MAX_DIFF_CHARS) return result;
-	return `Summary of changes:\n${(diff.match(/^diff --git a\/(.+) b\/(.+)$/gm) || []).map((f) => {
-		const match = f.match(/^diff --git a\/(.+) b\/(.+)$/);
-		return match && match[1] === match[2] ? `${match[1]} | changed` : "";
-	}).filter(Boolean).join("\n")}`;
-}
-function buildStatSummary(diff) {
-	const files = [];
-	let currentFile = "";
-	let adds = 0;
-	let dels = 0;
-	for (const line of diff.split("\n")) {
-		const match = line.match(/^diff --git a\/.+ b\/(.+)$/);
-		if (match) {
-			if (currentFile) files.push({
-				name: currentFile,
-				adds,
-				dels
-			});
-			currentFile = match[1];
-			adds = 0;
-			dels = 0;
-		} else if (line.startsWith("+") && !line.startsWith("+++")) adds++;
-		else if (line.startsWith("-") && !line.startsWith("---")) dels++;
-	}
-	if (currentFile) files.push({
-		name: currentFile,
-		adds,
-		dels
-	});
-	const totalAdds = files.reduce((s, f) => s + f.adds, 0);
-	const totalDels = files.reduce((s, f) => s + f.dels, 0);
-	const lines = files.map((f) => ` ${f.name}  | +${f.adds} -${f.dels}`);
-	lines.push(` ${files.length} files changed, ${totalAdds} insertions(+), ${totalDels} deletions(-)`);
-	return lines.join("\n");
-}
-function buildSystemPrompt(type) {
-	let prompt = "You are a commit message generator. Follow the Conventional Commits specification.\nValid types: build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test.\nFormat: type(scope): description\nUse imperative mood, lowercase, no trailing period.\nOutput ONLY the commit message, no markdown fences, no explanation.";
-	if (type && type.trim().length > 0) prompt += `\nYou MUST use type: ${type}`;
-	return prompt;
-}
-function buildUserPrompt(diff, hint, statSummary) {
-	const parts = [];
-	if (hint) parts.push(`Context: ${hint}`);
-	if (statSummary) parts.push(`Change summary:\n${statSummary}`);
-	parts.push(`Generate a conventional commit for:\n\n${diff}`);
-	return parts.join("\n\n");
-}
-function isValidConventionalCommit(message) {
-	return CONVENTIONAL_COMMIT_REGEX.test(message);
-}
-function extractContentText(content) {
-	if (content == null) return "";
-	if (typeof content === "string") return content.trim();
-	if (Array.isArray(content)) return content.filter((part) => part.type === "text" && typeof part.text === "string").map((part) => stripThinkTags(part.text)).join("").trim();
-	return "";
-}
-async function generateCommitMessage(diff, options) {
-	debug("generateCommitMessage: model=%s, type=%s, hint=%s", options.model ?? "default", options.type ?? "none", options.hint ?? "none");
-	const timeoutMs = options.timeout ?? 6e4;
-	debug("Timeout: %d ms", timeoutMs);
-	const client = new Groq({
-		apiKey: options.apiKey,
-		timeout: timeoutMs
-	});
-	const compressedDiff = compressDiff(diff);
-	const statSummary = buildStatSummary(diff);
-	const systemPrompt = buildSystemPrompt(options.type);
-	const userPrompt = buildUserPrompt(compressedDiff, options.hint, statSummary);
-	debug("Diff: %d chars → compressed to %d chars", diff.length, compressedDiff.length);
-	debug("Stat summary:\n%s", statSummary);
-	debug("User prompt length: %d chars", userPrompt.length);
-	async function callAI(strictSystemPrompt) {
-		const callStart = Date.now();
-		debug("callAI: %s — model=%s, promptLen=%d, systemLen=%d", !!strictSystemPrompt ? "RETRY (strict)" : "INITIAL", options.model ?? "openai/gpt-oss-20b", userPrompt.length, (strictSystemPrompt ?? systemPrompt).length);
-		try {
-			const isReasoningModel = /^(o[1-9]|.*gpt-oss.*|.*gpt-5.*)/i.test(options.model ?? "");
-			const completion = await client.chat.completions.create({
-				messages: [{
-					role: "system",
-					content: strictSystemPrompt ?? systemPrompt
-				}, {
-					role: "user",
-					content: userPrompt
-				}],
-				model: options.model ?? "openai/gpt-oss-20b",
-				temperature: .3,
-				...isReasoningModel ? { max_completion_tokens: 1024 } : { max_tokens: 1024 },
-				reasoning_format: "parsed"
-			});
-			const elapsed = Date.now() - callStart;
-			const rawContent = completion.choices[0]?.message?.content;
-			const content = extractContentText(typeof rawContent === "string" ? stripThinkTags(rawContent) : rawContent);
-			debug("callAI response (%d ms): choices=%d, finishReason=%s, contentLen=%d, rawType=%s", elapsed, completion.choices.length, completion.choices[0]?.finish_reason ?? "(none)", content.length, typeof rawContent);
-			debug("callAI raw content: %s", content.slice(0, 300) || "(empty)");
-			if (!content) {
-				const reasoning = completion.choices[0]?.message?.reasoning;
-				debug("callAI: content empty, attempting reasoning fallback (reasoningLen=%d)", reasoning?.length ?? 0);
-				if (reasoning) {
-					const derived = deriveMessageFromReasoning(reasoning);
-					if (derived) {
-						debug("callAI: derived message from reasoning: %s", derived.slice(0, 100));
-						return stripThinkTags(derived);
-					}
-					debug("callAI: could not derive message from reasoning");
-				}
-				throw new Error("AI returned an empty commit message");
-			}
-			return content;
-		} catch (error) {
-			debug("callAI FAILED after %d ms: %s", Date.now() - callStart, error instanceof Error ? `${error.name}: ${error.message}` : String(error));
-			throw error;
-		}
-	}
-	try {
-		const totalStart = Date.now();
-		let message = await callAI();
-		debug("Validation: message=%s, isValid=%s", message.slice(0, 100), isValidConventionalCommit(message));
-		if (!isValidConventionalCommit(message)) {
-			debug("Initial message failed conventional commit validation, retrying with strict prompt (elapsed: %d ms)", Date.now() - totalStart);
-			const retryMessage = await callAI("You MUST output ONLY a valid conventional commit message. Format: type(scope): description. If you output anything else your response will be rejected.\nValid types: build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test.");
-			debug("Retry validation: message=%s, isValid=%s", retryMessage.slice(0, 100), isValidConventionalCommit(retryMessage));
-			if (isValidConventionalCommit(retryMessage)) {
-				debug("Retry produced valid conventional commit");
-				message = retryMessage;
-			} else debug("Retry also failed validation, using original message");
-		}
-		debug("Final message (%d ms total): %s", Date.now() - totalStart, message);
-		return message;
-	} catch (error) {
-		debug("AI error: %s", error instanceof Error ? error.message : String(error));
-		if (error instanceof Groq.AuthenticationError) throw new Error("Invalid GROQ_API_KEY. Run: cmint config set GROQ_API_KEY=<key>");
-		if (error instanceof Groq.RateLimitError) throw new Error("Rate limited by Groq. Please wait and try again.");
-		if (error instanceof Groq.APIConnectionTimeoutError) throw new Error("Request timed out. Check your network or try a smaller diff.");
-		if (error instanceof Groq.APIError) throw new Error(`Groq API error: ${error.message}`);
-		throw new Error(`Unexpected error: ${error instanceof Error ? error.message : String(error)}`);
-	}
-}
-//#endregion
 //#region src/services/config.ts
 const CONFIG_PATH = join(os.homedir(), ".commit-mint");
 const defaults = {
@@ -407,10 +242,14 @@ async function getStatusShort() {
 async function getChangedFiles() {
 	const { stdout } = await execa("git", ["status", "--short"]);
 	if (!stdout.trim()) return [];
-	const files = stdout.split("\n").filter(Boolean).map((line) => ({
-		status: line.slice(0, 2).trim(),
-		path: line.slice(3)
-	}));
+	const files = stdout.split("\n").filter(Boolean).map((line) => {
+		const indexStatus = line[0];
+		return {
+			status: line.slice(0, 2).trim(),
+			path: line.slice(3),
+			staged: indexStatus !== " " && indexStatus !== "?"
+		};
+	});
 	debug("getChangedFiles:", files.length, "files");
 	return files;
 }
@@ -640,9 +479,27 @@ async function showStagingMenu(files) {
 			default: return dim(status);
 		}
 	};
+	const sorted = [...files].sort((a, b) => {
+		if (a.staged !== b.staged) return a.staged ? -1 : 1;
+		return a.path.localeCompare(b.path);
+	});
+	const stagedFiles = sorted.filter((f) => f.staged);
+	const unstagedFiles = sorted.filter((f) => !f.staged);
+	const lines = [];
+	if (stagedFiles.length > 0) lines.push(green(bold("Staged:")), ...stagedFiles.map((f) => `  ${statusLabel(f.status)}  ${f.path}`));
+	if (unstagedFiles.length > 0) {
+		if (lines.length > 0) lines.push("");
+		lines.push(yellow(bold("Changed:")), ...unstagedFiles.map((f) => `  ${statusLabel(f.status)}  ${f.path}`));
+	}
+	p.note(lines.join("\n"), `${files.length} file${files.length !== 1 ? "s" : ""}`);
 	const choice = await p.select({
 		message: "Stage files for commit:",
 		options: [
+			{
+				label: "Auto-group into commits",
+				value: "autogroup",
+				hint: "LLM groups files into logical commits"
+			},
 			{
 				label: "Stage all files",
 				value: "all",
@@ -659,13 +516,14 @@ async function showStagingMenu(files) {
 		]
 	});
 	if (p.isCancel(choice) || choice === "cancel") return null;
+	if (choice === "autogroup") return "autogroup";
 	if (choice === "all") return {
 		files: files.map((f) => f.path),
 		all: true
 	};
 	const selected = await p.multiselect({
 		message: "Select files to stage:",
-		options: files.map((f) => ({
+		options: sorted.map((f) => ({
 			label: `${statusLabel(f.status)}  ${f.path}`,
 			value: f.path
 		})),
@@ -718,8 +576,7 @@ async function showRecoveryMenu(errors, onRetry, onSkipHooks, onRestage, message
 		if (p.isCancel(choice)) {
 			debug("showRecoveryMenu: user cancelled");
 			p.outro(yellow("Cancelled. Message cached for --retry."));
-			process.exit(1);
-			return;
+			return "cancelled";
 		}
 		debug("showRecoveryMenu: user chose %s", choice);
 		switch (choice) {
@@ -731,14 +588,18 @@ async function showRecoveryMenu(errors, onRetry, onSkipHooks, onRestage, message
 				continue;
 			case "skip":
 				p.log.info(yellow("Committing with --no-verify..."));
-				if (await onSkipHooks(message)) p.outro(green("Committed (hooks skipped)."));
-				else p.outro(red("Commit failed even with --no-verify."));
-				return;
+				if (await onSkipHooks(message)) {
+					p.outro(green("Committed (hooks skipped)."));
+					return "committed";
+				} else {
+					p.outro(red("Commit failed even with --no-verify."));
+					return "failed";
+				}
 			case "restage":
 				p.log.info(cyan("Re-staging and retrying..."));
 				if (await onRestage()) {
 					p.outro(green("Committed successfully."));
-					return;
+					return "committed";
 				}
 				showNote = true;
 				continue;
@@ -750,92 +611,846 @@ async function showRecoveryMenu(errors, onRetry, onSkipHooks, onRestage, message
 				});
 				if (p.isCancel(edited)) {
 					p.outro(yellow("Cancelled. Message cached for --retry."));
-					process.exit(1);
-					return;
+					return "cancelled";
+				}
+				if (await onRetry()) {
+					p.outro(green("Committed successfully."));
+					return "committed";
+				} else {
+					p.outro(red("Commit failed again."));
+					return "failed";
 				}
-				if (await onRetry()) p.outro(green("Committed successfully."));
-				else p.outro(red("Commit failed again."));
-				return;
 			}
 			case "cancel":
 				p.outro(dim("Message cached for --retry."));
-				process.exit(1);
-				return;
+				return "cancelled";
 		}
 	}
 }
 //#endregion
-//#region src/utils/cache.ts
-const CACHE_DIR = join(os.homedir(), ".cache", "commit-mint");
-function repoHash(repoPath) {
-	return createHash("sha256").update(repoPath).digest("hex").slice(0, 12);
+//#region src/services/ai.ts
+const MAX_DIFF_CHARS = 2e4;
+function mapGroqError$1(error) {
+	if (error instanceof Groq.AuthenticationError) return /* @__PURE__ */ new Error("Invalid GROQ_API_KEY. Run: cmint config set GROQ_API_KEY=<key>");
+	if (error instanceof Groq.RateLimitError) return /* @__PURE__ */ new Error("Rate limited by Groq. Please wait and try again.");
+	if (error instanceof Groq.APIConnectionTimeoutError) return /* @__PURE__ */ new Error("Request timed out. Check your network or try a smaller diff.");
+	if (error instanceof Groq.APIError) return /* @__PURE__ */ new Error(`Groq API error: ${error.message}`);
+	return /* @__PURE__ */ new Error(`Unexpected error: ${error instanceof Error ? error.message : String(error)}`);
 }
-function cachePath(repoPath) {
-	return join(CACHE_DIR, `${repoHash(repoPath)}.json`);
+const CONVENTIONAL_COMMIT_REGEX = /^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\(.+\))?!?: .+$/;
+function stripThinkTags(text) {
+	return text.replace(/<think[\s\S]*?<\/think>/gi, "").trim();
 }
-async function saveCachedCommit(repoPath, message) {
-	await mkdir(CACHE_DIR, { recursive: true });
-	const data = {
-		message,
-		timestamp: Date.now(),
-		repoPath
-	};
-	const path = cachePath(repoPath);
-	debug("saveCachedCommit: saving to %s", path);
-	await writeFile(path, JSON.stringify(data, null, 2), "utf8");
+function deriveMessageFromReasoning(reasoning) {
+	const match = reasoning.match(/(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\(.+\))?!?: .+/i);
+	if (match) return match[0].trim();
+	const first = reasoning.split(/[.!?]/).find((s) => s.trim().length >= 10);
+	return first ? first.trim() : null;
 }
-async function loadCachedCommit(repoPath) {
-	const path = cachePath(repoPath);
-	debug("loadCachedCommit: loading from %s", path);
-	try {
-		const raw = await readFile(path, "utf8");
-		const data = JSON.parse(raw);
-		debug("loadCachedCommit: found message from %s", new Date(data.timestamp).toISOString());
-		return data;
-	} catch {
-		debug("loadCachedCommit: no cached commit found");
-		return null;
-	}
+function stripContextLines(diff) {
+	return diff.split("\n").filter((line) => !line.startsWith(" ")).join("\n");
 }
-//#endregion
-//#region src/commands/commit.ts
-async function commitCommand(flags) {
-	debug("commitCommand called", { flags });
-	await assertGitRepo();
-	if (flags.retry) {
-		debug("Entering retry mode");
-		const { getRepoRoot } = await Promise.resolve().then(() => git_exports);
-		const repoRoot = await getRepoRoot();
-		debug("Repo root:", repoRoot);
-		const cached = await loadCachedCommit(repoRoot);
-		if (!cached) {
-			debug("No cached commit found");
-			outro(red("No cached commit message found. Run cmint without --retry first."));
-			process.exit(1);
-		}
-		debug("Loaded cached message:", cached.message);
-		intro("commit-mint — retry");
-		const s = spinner();
-		s.start("Retrying commit...");
-		const result = await attemptCommit(cached.message);
-		s.stop("Attempted commit");
-		debug("Retry commit result:", result);
-		if (result.ok) {
-			const checks = parseToolChecks(result.stderr ?? "");
-			if (checks.length > 0) {
-				const lines = checks.map((c) => `  ${c.ok ? green("✓") : red("✗")} ${c.tool}`);
-				log.info(lines.join("\n"));
-			}
-			outro(green("Committed successfully."));
-		} else {
-			const errors = parseHookErrors(result.stderr ?? "");
-			debug("Hook errors on retry:", errors.length);
-			await showRecoveryMenu(errors, async () => (await attemptCommit(cached.message)).ok, async (msg) => (await attemptCommitNoVerify(msg)).ok, async () => {
-				await stageAll();
-				return (await attemptCommit(cached.message)).ok;
-			}, cached.message, result.stderr ?? "");
-		}
-		return;
+function compressDiff(diff) {
+	if (diff.length <= MAX_DIFF_CHARS) return diff;
+	let result = stripContextLines(diff);
+	if (result.length <= MAX_DIFF_CHARS) return result;
+	result = result.split(/(?=diff --git)/).filter(Boolean).map((fd) => {
+		return fd.split(/(?=\n@@)/).map((part, idx) => {
+			if (idx === 0) return part;
+			const lines = part.split("\n");
+			return [lines[0], ...lines.slice(1).filter((l) => l.startsWith("+") || l.startsWith("-")).slice(0, 10)].join("\n");
+		}).join("");
+	}).join("");
+	if (result.length <= MAX_DIFF_CHARS) return result;
+	return `Summary of changes:\n${(diff.match(/^diff --git a\/(.+) b\/(.+)$/gm) || []).map((f) => {
+		const match = f.match(/^diff --git a\/(.+) b\/(.+)$/);
+		return match && match[1] === match[2] ? `${match[1]} | changed` : "";
+	}).filter(Boolean).join("\n")}`;
+}
+function buildStatSummary(diff) {
+	const files = [];
+	let currentFile = "";
+	let adds = 0;
+	let dels = 0;
+	for (const line of diff.split("\n")) {
+		const match = line.match(/^diff --git a\/.+ b\/(.+)$/);
+		if (match) {
+			if (currentFile) files.push({
+				name: currentFile,
+				adds,
+				dels
+			});
+			currentFile = match[1];
+			adds = 0;
+			dels = 0;
+		} else if (line.startsWith("+") && !line.startsWith("+++")) adds++;
+		else if (line.startsWith("-") && !line.startsWith("---")) dels++;
+	}
+	if (currentFile) files.push({
+		name: currentFile,
+		adds,
+		dels
+	});
+	const totalAdds = files.reduce((s, f) => s + f.adds, 0);
+	const totalDels = files.reduce((s, f) => s + f.dels, 0);
+	const lines = files.map((f) => ` ${f.name}  | +${f.adds} -${f.dels}`);
+	lines.push(` ${files.length} files changed, ${totalAdds} insertions(+), ${totalDels} deletions(-)`);
+	return lines.join("\n");
+}
+function buildSystemPrompt(type) {
+	let prompt = "You are a commit message generator. Follow the Conventional Commits specification.\nValid types: build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test.\nFormat: type(scope): description\nUse imperative mood, lowercase, no trailing period.\nOutput ONLY the commit message, no markdown fences, no explanation.";
+	if (type && type.trim().length > 0) prompt += `\nYou MUST use type: ${type}`;
+	return prompt;
+}
+function buildUserPrompt(diff, hint, statSummary) {
+	const parts = [];
+	if (hint) parts.push(`Context: ${hint}`);
+	if (statSummary) parts.push(`Change summary:\n${statSummary}`);
+	parts.push(`Generate a conventional commit for:\n\n${diff}`);
+	return parts.join("\n\n");
+}
+function isValidConventionalCommit(message) {
+	return CONVENTIONAL_COMMIT_REGEX.test(message);
+}
+function extractContentText(content) {
+	if (content == null) return "";
+	if (typeof content === "string") return content.trim();
+	if (Array.isArray(content)) return content.filter((part) => part.type === "text" && typeof part.text === "string").map((part) => stripThinkTags(part.text)).join("").trim();
+	return "";
+}
+async function generateCommitMessage(diff, options) {
+	debug("generateCommitMessage: model=%s, type=%s, hint=%s", options.model ?? "default", options.type ?? "none", options.hint ?? "none");
+	const timeoutMs = options.timeout ?? 6e4;
+	debug("Timeout: %d ms", timeoutMs);
+	const client = new Groq({
+		apiKey: options.apiKey,
+		timeout: timeoutMs
+	});
+	const compressedDiff = compressDiff(diff);
+	const statSummary = buildStatSummary(diff);
+	const systemPrompt = buildSystemPrompt(options.type);
+	const userPrompt = buildUserPrompt(compressedDiff, options.hint, statSummary);
+	debug("Diff: %d chars → compressed to %d chars", diff.length, compressedDiff.length);
+	debug("Stat summary:\n%s", statSummary);
+	debug("User prompt length: %d chars", userPrompt.length);
+	async function callAI(strictSystemPrompt) {
+		const callStart = Date.now();
+		debug("callAI: %s — model=%s, promptLen=%d, systemLen=%d", !!strictSystemPrompt ? "RETRY (strict)" : "INITIAL", options.model ?? "openai/gpt-oss-20b", userPrompt.length, (strictSystemPrompt ?? systemPrompt).length);
+		try {
+			const isReasoningModel = /^(o[1-9]|.*gpt-oss.*|.*gpt-5.*)/i.test(options.model ?? "");
+			const completion = await client.chat.completions.create({
+				messages: [{
+					role: "system",
+					content: strictSystemPrompt ?? systemPrompt
+				}, {
+					role: "user",
+					content: userPrompt
+				}],
+				model: options.model ?? "openai/gpt-oss-20b",
+				temperature: .3,
+				...isReasoningModel ? { max_completion_tokens: 1024 } : { max_tokens: 1024 },
+				reasoning_format: "parsed"
+			});
+			const elapsed = Date.now() - callStart;
+			const rawContent = completion.choices[0]?.message?.content;
+			const content = extractContentText(typeof rawContent === "string" ? stripThinkTags(rawContent) : rawContent);
+			debug("callAI response (%d ms): choices=%d, finishReason=%s, contentLen=%d, rawType=%s", elapsed, completion.choices.length, completion.choices[0]?.finish_reason ?? "(none)", content.length, typeof rawContent);
+			debug("callAI raw content: %s", content.slice(0, 300) || "(empty)");
+			if (!content) {
+				const reasoning = completion.choices[0]?.message?.reasoning;
+				debug("callAI: content empty, attempting reasoning fallback (reasoningLen=%d)", reasoning?.length ?? 0);
+				if (reasoning) {
+					const derived = deriveMessageFromReasoning(reasoning);
+					if (derived) {
+						debug("callAI: derived message from reasoning: %s", derived.slice(0, 100));
+						return stripThinkTags(derived);
+					}
+					debug("callAI: could not derive message from reasoning");
+				}
+				throw new Error("AI returned an empty commit message");
+			}
+			return content;
+		} catch (error) {
+			debug("callAI FAILED after %d ms: %s", Date.now() - callStart, error instanceof Error ? `${error.name}: ${error.message}` : String(error));
+			throw error;
+		}
+	}
+	try {
+		const totalStart = Date.now();
+		let message = await callAI();
+		debug("Validation: message=%s, isValid=%s", message.slice(0, 100), isValidConventionalCommit(message));
+		if (!isValidConventionalCommit(message)) {
+			debug("Initial message failed conventional commit validation, retrying with strict prompt (elapsed: %d ms)", Date.now() - totalStart);
+			const retryMessage = await callAI("You MUST output ONLY a valid conventional commit message. Format: type(scope): description. If you output anything else your response will be rejected.\nValid types: build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test.");
+			debug("Retry validation: message=%s, isValid=%s", retryMessage.slice(0, 100), isValidConventionalCommit(retryMessage));
+			if (isValidConventionalCommit(retryMessage)) {
+				debug("Retry produced valid conventional commit");
+				message = retryMessage;
+			} else debug("Retry also failed validation, using original message");
+		}
+		debug("Final message (%d ms total): %s", Date.now() - totalStart, message);
+		return message;
+	} catch (error) {
+		debug("AI error: %s", error instanceof Error ? error.message : String(error));
+		throw mapGroqError$1(error);
+	}
+}
+//#endregion
+//#region src/services/review-ai.ts
+function buildReviewSystemPrompt() {
+	return [
+		"You are an expert code reviewer. Review the following staged git diff.",
+		"",
+		"Focus on finding:",
+		"1. **Bugs** — logic errors, off-by-one, race conditions, null pointer risks",
+		"2. **Security issues** — injection, exposure of secrets, missing validation, CSRF, XSS",
+		"3. **Performance problems** — unnecessary work, large allocations in hot paths",
+		"4. **Code quality** — readability, maintainability, error handling gaps",
+		"5. **Edge cases** — missing boundary checks, empty states, error states",
+		"",
+		"For each issue found, use this format:",
+		"- SEVERITY: [critical|major|minor|suggestion]",
+		"- LOCATION: <file-path>:<line-number>",
+		"- ISSUE: <description>",
+		"- FIX: <suggested resolution>",
+		"",
+		"Separate issues with a blank line.",
+		"",
+		"If you find NO issues at all, respond with exactly: NO_ISSUES_FOUND",
+		"",
+		"Be thorough but practical. Only flag real problems — not style preferences or nitpicks."
+	].join("\n");
+}
+function buildReviewPrompt(diff, files, statSummary) {
+	const parts = [];
+	parts.push(`Review the following staged changes (${files.length} files):`);
+	parts.push("");
+	parts.push(statSummary);
+	parts.push("");
+	parts.push("```diff");
+	parts.push(diff);
+	parts.push("```");
+	return parts.join("\n");
+}
+async function generateCodeReview(diff, files, options) {
+	debug("generateCodeReview: model=%s, files=%d", options.model ?? "default", files.length);
+	const timeoutMs = options.timeout ?? 6e4;
+	const client = new Groq({
+		apiKey: options.apiKey,
+		timeout: timeoutMs
+	});
+	const compressedDiff = compressDiff(diff);
+	const statSummary = buildStatSummary(diff);
+	const systemPrompt = buildReviewSystemPrompt();
+	const userPrompt = buildReviewPrompt(compressedDiff, files, statSummary);
+	debug("Code review: %d chars → %d chars, system=%d chars, user=%d chars", diff.length, compressedDiff.length, systemPrompt.length, userPrompt.length);
+	try {
+		const completion = await client.chat.completions.create({
+			messages: [{
+				role: "system",
+				content: systemPrompt
+			}, {
+				role: "user",
+				content: userPrompt
+			}],
+			model: options.model ?? "openai/gpt-oss-20b",
+			temperature: .3,
+			max_tokens: 4096
+		});
+		const rawContent = completion.choices[0]?.message?.content;
+		const content = extractContentText(rawContent);
+		debug("generateCodeReview response: choices=%d, finishReason=%s, contentLen=%d", completion.choices.length, completion.choices[0]?.finish_reason ?? "(none)", content.length);
+		if (!content) {
+			const reasoning = completion.choices[0]?.message?.reasoning;
+			if (reasoning) {
+				const derived = deriveMessageFromReasoning(reasoning);
+				if (derived) {
+					debug("generateCodeReview: derived from reasoning");
+					return derived;
+				}
+			}
+			return "NO_ISSUES_FOUND";
+		}
+		return content;
+	} catch (error) {
+		debug("generateCodeReview error: %s", error instanceof Error ? error.message : String(error));
+		throw mapGroqError$1(error);
+	}
+}
+//#endregion
+//#region src/commands/review.ts
+async function reviewCommand() {
+	debug("reviewCommand called");
+	await assertGitRepo();
+	const s = spinner();
+	s.start("Staging all changes...");
+	await stageAll();
+	s.stop("Changes staged");
+	const diffResult = await getStagedDiff();
+	if (!diffResult) {
+		outro(dim("No changes to review."));
+		return;
+	}
+	if ("excludedFiles" in diffResult) {
+		outro(dim("Staged files are all excluded from review."));
+		return;
+	}
+	intro("commit-mint — code review");
+	log.info(diffResult.files.map((f) => `     ${f}`).join("\n"));
+	const report = await isOpenCodeAvailable() ? await reviewWithOpenCode(diffResult.diff, diffResult.files) : await reviewWithGroq(diffResult.diff, diffResult.files);
+	if (report !== "NO_ISSUES_FOUND" && report.trim().length > 0) {
+		note(report, red(bold("Review findings")));
+		await offerClipboardCopy(report);
+	} else outro(green("No issues found. Looks good!"));
+}
+async function offerClipboardCopy(report) {
+	const shouldCopy = await select({
+		message: "Copy review report to clipboard?",
+		options: [{
+			label: "Yes, copy to clipboard",
+			value: "yes"
+		}, {
+			label: "No",
+			value: "no"
+		}]
+	});
+	if (isCancel(shouldCopy) || shouldCopy === "no") {
+		outro(dim("Done."));
+		return;
+	}
+	if (await copyToClipboard(report)) outro(green("Report copied to clipboard. You can paste it anywhere for fixes."));
+	else outro(red("Failed to copy to clipboard. Install xclip, wl-copy, or xsel."));
+}
+async function isOpenCodeAvailable() {
+	try {
+		const { exitCode } = await import("execa").then((m) => m.execa("which", ["opencode"], { reject: false }));
+		return exitCode === 0;
+	} catch {
+		return false;
+	}
+}
+async function reviewWithGroq(diff, files) {
+	const s = spinner();
+	s.start("Reviewing with Groq...");
+	try {
+		const config = await readConfig();
+		const report = await generateCodeReview(diff, files, {
+			apiKey: await getApiKey(),
+			model: config.model,
+			timeout: config.timeout ? Number.parseInt(config.timeout, 10) : void 0
+		});
+		s.stop("Review complete");
+		return report;
+	} catch (err) {
+		s.stop(red("Review failed."));
+		debug("reviewWithGroq error:", err instanceof Error ? err.message : String(err));
+		throw err;
+	}
+}
+async function reviewWithOpenCode(diff, files) {
+	const s = spinner();
+	s.start("Running OpenCode review...");
+	try {
+		const repoRoot = await getRepoRoot();
+		const prompt = [
+			"Review the staged changes in this git repository.",
+			"Analyze the code diff for bugs, security issues, performance problems,",
+			"code quality issues, and missing edge cases.",
+			"",
+			`Files changed (${files.length}):`,
+			...files.map((f) => `  - ${f}`),
+			"",
+			"```diff",
+			diff.slice(0, 15e3),
+			"```",
+			"",
+			"Provide a structured report with severity, location, issue, and fix suggestion for each finding.",
+			"If no issues found, respond with: NO_ISSUES_FOUND"
+		].join("\n");
+		const { stdout } = await import("execa").then((m) => m.execa("opencode", [
+			"run",
+			prompt,
+			"--dir",
+			repoRoot
+		], {
+			timeout: 12e4,
+			reject: false
+		}));
+		s.stop("Review complete");
+		return stdout || "OpenCode review completed but no output captured.";
+	} catch (err) {
+		s.stop(red("OpenCode review failed."));
+		debug("reviewWithOpenCode error:", err instanceof Error ? err.message : String(err));
+		throw new Error(`OpenCode review failed: ${err instanceof Error ? err.message : String(err)}`);
+	}
+}
+//#endregion
+//#region src/ui/review-message.ts
+async function runCodeReview() {
+	const diffResult = await getStagedDiff();
+	if (!diffResult || "excludedFiles" in diffResult) {
+		outro(dim("No staged changes to review."));
+		return;
+	}
+	const opencodeAvailable = await isOpenCodeAvailable();
+	const s = spinner();
+	s.start(opencodeAvailable ? "Running OpenCode review..." : "Running Groq review...");
+	try {
+		const report = opencodeAvailable ? await reviewWithOpenCode(diffResult.diff, diffResult.files) : await reviewWithGroq(diffResult.diff, diffResult.files);
+		s.stop("Review complete");
+		await showReviewResults(report);
+	} catch (err) {
+		s.stop(red("Review failed."));
+		debug("Code review error:", err instanceof Error ? err.message : String(err));
+		outro(red(err instanceof Error ? err.message : String(err)));
+	}
+}
+async function showReviewResults(report) {
+	const { note: clackNote, select: clackSelect } = await import("@clack/prompts");
+	if (!(report !== "NO_ISSUES_FOUND" && report.trim().length > 0)) {
+		log.info(green("No issues found."));
+		return;
+	}
+	clackNote(report, red(bold("Review findings")));
+	const shouldCopy = await clackSelect({
+		message: "Copy review report to clipboard?",
+		options: [{
+			label: "Yes, copy to clipboard",
+			value: "yes"
+		}, {
+			label: "No",
+			value: "no"
+		}]
+	});
+	if (isCancel(shouldCopy) || shouldCopy !== "yes") return;
+	if (await copyToClipboard(report)) log.info(green("Report copied to clipboard."));
+	else log.warn(red("Failed to copy to clipboard."));
+}
+async function reviewCommitMessage(message) {
+	const { select, text } = await import("@clack/prompts");
+	while (true) {
+		const review = await select({
+			message: `Review commit message:\n\n   ${bold(message)}\n`,
+			options: [
+				{
+					label: "Use as-is",
+					value: "use"
+				},
+				{
+					label: "Edit",
+					value: "edit"
+				},
+				{
+					label: "Review with OpenCode",
+					value: "review"
+				},
+				{
+					label: "Cancel",
+					value: "cancel"
+				}
+			]
+		});
+		if (isCancel(review) || review === "cancel") {
+			debug("User cancelled at review step");
+			return null;
+		}
+		if (review === "use") {
+			debug("User accepted message");
+			return message;
+		}
+		if (review === "edit") {
+			debug("User chose to edit message");
+			const edited = await text({
+				message: "Edit commit message:",
+				initialValue: message,
+				validate: (v) => v.trim() ? void 0 : "Message cannot be empty"
+			});
+			if (isCancel(edited)) continue;
+			message = String(edited).trim();
+			debug("Edited message:", message);
+			continue;
+		}
+		if (review === "review") {
+			debug("User chose to review code");
+			await runCodeReview();
+		}
+	}
+}
+//#endregion
+//#region src/utils/cache.ts
+const CACHE_DIR = join(os.homedir(), ".cache", "commit-mint");
+function repoHash(repoPath) {
+	return createHash("sha256").update(repoPath).digest("hex").slice(0, 12);
+}
+function cachePath(repoPath) {
+	return join(CACHE_DIR, `${repoHash(repoPath)}.json`);
+}
+async function saveCachedCommit(repoPath, message) {
+	await mkdir(CACHE_DIR, { recursive: true });
+	const data = {
+		message,
+		timestamp: Date.now(),
+		repoPath
+	};
+	const path = cachePath(repoPath);
+	debug("saveCachedCommit: saving to %s", path);
+	await writeFile(path, JSON.stringify(data, null, 2), "utf8");
+}
+async function loadCachedCommit(repoPath) {
+	const path = cachePath(repoPath);
+	debug("loadCachedCommit: loading from %s", path);
+	try {
+		const raw = await readFile(path, "utf8");
+		const data = JSON.parse(raw);
+		debug("loadCachedCommit: found message from %s", new Date(data.timestamp).toISOString());
+		return data;
+	} catch {
+		debug("loadCachedCommit: no cached commit found");
+		return null;
+	}
+}
+//#endregion
+//#region src/services/grouping.ts
+function mapGroqError(error) {
+	if (error instanceof Groq.AuthenticationError) return /* @__PURE__ */ new Error("Invalid GROQ_API_KEY. Run: cmint config set GROQ_API_KEY=<key>");
+	if (error instanceof Groq.RateLimitError) return /* @__PURE__ */ new Error("Rate limited by Groq. Please wait and try again.");
+	if (error instanceof Groq.APIConnectionTimeoutError) return /* @__PURE__ */ new Error("Request timed out. Check your network and try again.");
+	if (error instanceof Groq.APIError) return /* @__PURE__ */ new Error(`Groq API error: ${error.message}`);
+	return /* @__PURE__ */ new Error(`Unexpected error: ${error instanceof Error ? error.message : String(error)}`);
+}
+function matchesExcludePattern(filePath, pattern) {
+	if (pattern === filePath) return true;
+	if (pattern.endsWith("/**")) {
+		const prefix = pattern.slice(0, -3);
+		return filePath === prefix || filePath.startsWith(`${prefix}/`);
+	}
+	if (pattern.startsWith("*.")) {
+		const suffix = pattern.slice(1);
+		return filePath.endsWith(suffix);
+	}
+	return false;
+}
+function filterExcludedFiles(files) {
+	const patterns = getDefaultExcludes();
+	const included = [];
+	const excluded = [];
+	for (const file of files) if (patterns.some((pattern) => matchesExcludePattern(file.path, pattern))) excluded.push(file.path);
+	else included.push(file);
+	debug("filterExcludedFiles: %d included, %d excluded", included.length, excluded.length);
+	return {
+		included,
+		excluded
+	};
+}
+function statusIndicator(status) {
+	switch (status) {
+		case "M": return "modified";
+		case "A": return "added";
+		case "D": return "deleted";
+		case "R": return "renamed";
+		case "C": return "copied";
+		case "?": return "untracked";
+		default: return "changed";
+	}
+}
+function buildFileSummary(files) {
+	return files.map((f) => `${f.path} (${statusIndicator(f.status)})`).join("\n");
+}
+function buildGroupingSystemPrompt() {
+	return [
+		"You are analyzing changed files in a git repository. Group them into logical commits based on what changed and why. Each group should be a coherent unit of work.",
+		"",
+		"Rules:",
+		"- Group by feature, fix, or concern (e.g., 'Frontend refactor', 'API changes', 'Test updates')",
+		"- Keep related files together (e.g., a component + its test, a model + its migration)",
+		"- Do not split a single logical change across multiple groups",
+		"- If a file does not clearly belong to any group, include it anyway — do not omit files",
+		"",
+		"Output format: JSON array of objects with keys 'name', 'description', 'files'.",
+		"name: short label (3-5 words)",
+		"description: 1-2 sentences explaining what this group changes",
+		"files: array of exact file paths from the input",
+		"",
+		"Output ONLY valid JSON. No markdown fences, no explanation."
+	].join("\n");
+}
+function buildGroupingUserPrompt(summary) {
+	return [
+		"Group the following changed files into logical commits:",
+		"",
+		summary
+	].join("\n");
+}
+function parseGroupingResponse(content) {
+	const jsonText = content.replace(/^```json\s*/, "").replace(/\s*```$/, "").trim();
+	const parsed = JSON.parse(jsonText);
+	if (!Array.isArray(parsed)) throw new Error("AI response was not a JSON array");
+	const rawGroups = [];
+	for (const item of parsed) if (typeof item === "object" && item !== null && "name" in item && "description" in item && "files" in item && Array.isArray(item.files)) rawGroups.push({
+		name: String(item.name),
+		description: String(item.description),
+		files: item.files.filter((f) => typeof f === "string")
+	});
+	return rawGroups;
+}
+async function generateGroups(files, apiKey, model, timeout) {
+	debug("generateGroups: %d files, model=%s", files.length, model ?? "default");
+	const { included, excluded } = filterExcludedFiles(files);
+	if (included.length === 0) {
+		debug("generateGroups: no files to group after exclusion");
+		return {
+			groups: [],
+			excluded
+		};
+	}
+	const summary = buildFileSummary(included);
+	const systemPrompt = buildGroupingSystemPrompt();
+	const userPrompt = buildGroupingUserPrompt(summary);
+	debug("File summary:\n%s", summary);
+	debug("User prompt length: %d chars", userPrompt.length);
+	const client = new Groq({
+		apiKey,
+		timeout: timeout ?? 6e4
+	});
+	try {
+		const completion = await client.chat.completions.create({
+			messages: [{
+				role: "system",
+				content: systemPrompt
+			}, {
+				role: "user",
+				content: userPrompt
+			}],
+			model: model ?? "openai/gpt-oss-20b",
+			temperature: .3,
+			max_tokens: 2048
+		});
+		const rawContent = completion.choices[0]?.message?.content;
+		const content = typeof rawContent === "string" ? rawContent.trim() : "";
+		debug("generateGroups response: choices=%d, finishReason=%s, contentLen=%d", completion.choices.length, completion.choices[0]?.finish_reason ?? "(none)", content.length);
+		debug("generateGroups raw content: %s", content.slice(0, 500) || "(empty)");
+		if (!content) throw new Error("AI returned an empty grouping response");
+		const rawGroups = parseGroupingResponse(content);
+		debug("generateGroups: parsed %d raw groups", rawGroups.length);
+		const validated = validateGroups(rawGroups, included);
+		debug("generateGroups: %d validated groups", validated.length);
+		return {
+			groups: validated,
+			excluded
+		};
+	} catch (error) {
+		debug("generateGroups error: %s", error instanceof Error ? error.message : String(error));
+		throw mapGroqError(error);
+	}
+}
+function validateGroups(groups, allFiles) {
+	const seen = /* @__PURE__ */ new Set();
+	const validated = [];
+	for (const group of groups) {
+		const uniqueFiles = group.files.filter((f) => {
+			if (seen.has(f)) return false;
+			seen.add(f);
+			return true;
+		});
+		if (uniqueFiles.length > 0) validated.push({
+			name: group.name,
+			description: group.description,
+			files: uniqueFiles
+		});
+	}
+	const ungrouped = allFiles.filter((f) => !seen.has(f.path));
+	if (ungrouped.length > 0) {
+		debug("validateGroups: %d ungrouped files added to 'Other changes'", ungrouped.length);
+		validated.push({
+			name: "Other changes",
+			description: "Miscellaneous changes that did not fit into other groups",
+			files: ungrouped.map((f) => f.path)
+		});
+	}
+	return validated;
+}
+//#endregion
+//#region src/ui/grouping.ts
+async function showGroupingConfirmation(groups, excluded) {
+	debug("showGroupingConfirmation: %d groups, %d excluded", groups.length, excluded.length);
+	const lines = [];
+	for (const group of groups) {
+		lines.push(bold(group.name));
+		lines.push(`  ${dim(group.description)}`);
+		lines.push(`  ${green(String(group.files.length))} file${group.files.length !== 1 ? "s" : ""}`);
+		for (const file of group.files) lines.push(`    ${dim("•")} ${file}`);
+		lines.push("");
+	}
+	if (excluded.length > 0) {
+		lines.push(dim(`Excluded: ${excluded.length} file${excluded.length !== 1 ? "s" : ""}`));
+		for (const file of excluded) lines.push(`  ${dim("•")} ${dim(file)}`);
+	}
+	p.note(lines.join("\n"), "Proposed commit groups");
+	const choice = await p.select({
+		message: "Proceed with these groupings?",
+		options: [{
+			label: "Yes, commit all groups",
+			value: "yes"
+		}, {
+			label: "No, cancel",
+			value: "no"
+		}]
+	});
+	if (p.isCancel(choice) || choice === "no") {
+		debug("showGroupingConfirmation: user cancelled");
+		return false;
+	}
+	debug("showGroupingConfirmation: user confirmed");
+	return true;
+}
+function showGroupProgress(current, total, groupName) {
+	p.log.info(`Commit group ${current} of ${total}: ${cyan(`"${groupName}"`)}`);
+}
+//#endregion
+//#region src/commands/auto-group.ts
+async function runAutoGroupFlow(changedFiles, flags) {
+	const { included, excluded } = filterExcludedFiles(changedFiles);
+	try {
+		await getApiKey();
+		debug("API key found");
+	} catch {
+		debug("No API key found, prompting user");
+		const { text: promptText } = await import("@clack/prompts");
+		const key = await promptText({
+			message: "Enter your Groq API key:",
+			placeholder: "gsk_...",
+			validate: (v) => v.trim() ? void 0 : "API key is required"
+		});
+		if (isCancel(key)) {
+			outro(dim("Cancelled."));
+			return "cancelled";
+		}
+		await setConfigValue("GROQ_API_KEY", String(key).trim());
+		debug("API key saved to config");
+	}
+	const s = spinner();
+	s.start("Analyzing files...");
+	const config = await readConfig();
+	const validatedGroups = validateGroups((await generateGroups(included, await getApiKey(), config.model, config.timeout ? parseInt(config.timeout, 10) : void 0)).groups, included);
+	s.stop("Files analyzed");
+	if (!await showGroupingConfirmation(validatedGroups, excluded)) {
+		outro(dim("Cancelled."));
+		return "cancelled";
+	}
+	for (let i = 0; i < validatedGroups.length; i++) {
+		const group = validatedGroups[i];
+		showGroupProgress(i + 1, validatedGroups.length, group.name);
+		await stageFiles(group.files);
+		const diffResult = await getStagedDiff();
+		if (!diffResult || "excludedFiles" in diffResult) {
+			log.warn(red(`No changes found for group "${group.name}" — skipping.`));
+			continue;
+		}
+		s.start("Generating commit message...");
+		let message;
+		try {
+			message = await generateMessage(diffResult.diff, flags.hint);
+		} catch (err) {
+			s.stop(red("Failed to generate message."));
+			outro(red(err instanceof Error ? err.message : String(err)));
+			return "cancelled";
+		}
+		s.stop("Message generated");
+		const reviewed = await reviewCommitMessage(message);
+		if (reviewed === null) {
+			outro(dim("Cancelled."));
+			return "cancelled";
+		}
+		message = reviewed;
+		const { getRepoRoot } = await Promise.resolve().then(() => git_exports);
+		await saveCachedCommit(await getRepoRoot(), message);
+		s.start("Committing...");
+		const headBefore = await getHead();
+		const commitResult = await attemptCommit(message);
+		const headAfter = await getHead();
+		if (commitResult.ok || headBefore !== headAfter) {
+			s.stop("Committed successfully.");
+			const checks = parseToolChecks(commitResult.stderr ?? "");
+			if (checks.length > 0) {
+				const lines = checks.map((c) => `  ${c.ok ? green("✓") : red("✗")} ${c.tool}`);
+				log.info(lines.join("\n"));
+			}
+			continue;
+		}
+		s.stop("Commit failed.");
+		const recoveryResult = await showRecoveryMenu(parseHookErrors(commitResult.stderr ?? ""), async () => (await attemptCommit(message)).ok, async (msg) => (await attemptCommitNoVerify(msg)).ok, async () => {
+			await stageFiles(group.files);
+			return (await attemptCommit(message)).ok;
+		}, message, commitResult.stderr ?? "");
+		if (recoveryResult === "committed") {
+			if (i < validatedGroups.length - 1) continue;
+			return "committed";
+		}
+		return recoveryResult;
+	}
+	outro(green("All groups committed."));
+	return "committed";
+}
+async function generateMessage(diff, hint) {
+	const config = await readConfig();
+	const apiKey = await getApiKey();
+	debug("Generating message with model:", config.model, "type:", config.type);
+	return generateCommitMessage(diff, {
+		apiKey,
+		model: config.model,
+		type: config.type,
+		timeout: config.timeout ? parseInt(config.timeout, 10) : void 0,
+		hint
+	});
+}
+function buildExcludedFilesMessage(files) {
+	const excludes = getDefaultExcludes();
+	const isLockfile = (f) => excludes.some((pattern) => {
+		if (pattern.endsWith(".lock") || pattern.endsWith(".json")) return f === pattern || f.endsWith(pattern.replace("*.", "."));
+		return false;
+	});
+	if (files.every(isLockfile)) return "chore: update lockfile";
+	return "chore: update generated files";
+}
+//#endregion
+//#region src/commands/commit.ts
+async function commitCommand(flags) {
+	debug("commitCommand called", { flags });
+	await assertGitRepo();
+	if (flags.retry) {
+		debug("Entering retry mode");
+		const { getRepoRoot } = await Promise.resolve().then(() => git_exports);
+		const repoRoot = await getRepoRoot();
+		debug("Repo root:", repoRoot);
+		const cached = await loadCachedCommit(repoRoot);
+		if (!cached) {
+			debug("No cached commit found");
+			outro(red("No cached commit message found. Run cmint without --retry first."));
+			process.exit(1);
+		}
+		debug("Loaded cached message:", cached.message);
+		intro("commit-mint — retry");
+		const s = spinner();
+		s.start("Retrying commit...");
+		const result = await attemptCommit(cached.message);
+		s.stop("Attempted commit");
+		debug("Retry commit result:", result);
+		if (result.ok) {
+			const checks = parseToolChecks(result.stderr ?? "");
+			if (checks.length > 0) {
+				const lines = checks.map((c) => `  ${c.ok ? green("✓") : red("✗")} ${c.tool}`);
+				log.info(lines.join("\n"));
+			}
+			outro(green("Committed successfully."));
+		} else {
+			const errors = parseHookErrors(result.stderr ?? "");
+			debug("Hook errors on retry:", errors.length);
+			if (await showRecoveryMenu(errors, async () => (await attemptCommit(cached.message)).ok, async (msg) => (await attemptCommitNoVerify(msg)).ok, async () => {
+				await stageAll();
+				return (await attemptCommit(cached.message)).ok;
+			}, cached.message, result.stderr ?? "") === "cancelled") process.exit(1);
+			return;
+		}
 	}
 	intro("commit-mint");
 	const status = await getStatusShort();
@@ -858,6 +1473,14 @@ async function commitCommand(flags) {
 			s.stop("File staged");
 		} else {
 			const stagingResult = await showStagingMenu(changedFiles);
+			if (stagingResult === "autogroup") {
+				if (flags.message) {
+					outro(red("--message flag is not compatible with auto-group mode."));
+					return;
+				}
+				if (await runAutoGroupFlow(changedFiles, flags) !== "committed") process.exit(1);
+				return;
+			}
 			if (!stagingResult) {
 				outro(dim("Cancelled."));
 				return;
@@ -896,10 +1519,10 @@ async function commitCommand(flags) {
 			return;
 		}
 		s.stop("Commit failed.");
-		await showRecoveryMenu(parseHookErrors(result.stderr ?? ""), async () => (await attemptCommit(message)).ok, async (msg) => (await attemptCommitNoVerify(msg)).ok, async () => {
+		if (await showRecoveryMenu(parseHookErrors(result.stderr ?? ""), async () => (await attemptCommit(message)).ok, async (msg) => (await attemptCommitNoVerify(msg)).ok, async () => {
 			await stageAll();
 			return (await attemptCommit(message)).ok;
-		}, message, result.stderr ?? "");
+		}, message, result.stderr ?? "") === "cancelled") process.exit(1);
 		return;
 	}
 	debug("Staged files:", diffResult.files);
@@ -942,43 +1565,12 @@ async function commitCommand(flags) {
 		}
 		s.stop("Message generated");
 	}
-	const { select, text } = await import("@clack/prompts");
-	const review = await select({
-		message: `Review commit message:\n\n   ${bold(message)}\n`,
-		options: [
-			{
-				label: "Use as-is",
-				value: "use"
-			},
-			{
-				label: "Edit",
-				value: "edit"
-			},
-			{
-				label: "Cancel",
-				value: "cancel"
-			}
-		]
-	});
-	if (isCancel(review) || review === "cancel") {
-		debug("User cancelled at review step");
+	const reviewed = await reviewCommitMessage(message);
+	if (reviewed === null) {
 		outro(dim("Cancelled."));
 		return;
 	}
-	if (review === "edit") {
-		debug("User chose to edit message");
-		const edited = await text({
-			message: "Edit commit message:",
-			initialValue: message,
-			validate: (v) => v.trim() ? void 0 : "Message cannot be empty"
-		});
-		if (isCancel(edited)) {
-			outro(dim("Cancelled."));
-			return;
-		}
-		message = String(edited).trim();
-		debug("Edited message:", message);
-	}
+	message = reviewed;
 	const { getRepoRoot } = await Promise.resolve().then(() => git_exports);
 	const repoRoot = await getRepoRoot();
 	await saveCachedCommit(repoRoot, message);
@@ -1004,35 +1596,14 @@ async function commitCommand(flags) {
 	debug("Commit failed, showing recovery menu");
 	const errors = parseHookErrors(result.stderr ?? "");
 	debug("Parsed hook errors:", errors.length, "errors");
-	await showRecoveryMenu(errors, async () => {
+	if (await showRecoveryMenu(errors, async () => {
 		return (await attemptCommit(message)).ok;
 	}, async (msg) => {
 		return (await attemptCommitNoVerify(msg)).ok;
 	}, async () => {
 		await stageAll();
 		return (await attemptCommit(message)).ok;
-	}, message, result.stderr ?? "");
-}
-async function generateMessage(diff, hint) {
-	const config = await readConfig();
-	const apiKey = await getApiKey();
-	debug("Generating message with model:", config.model, "type:", config.type);
-	return generateCommitMessage(diff, {
-		apiKey,
-		model: config.model,
-		type: config.type,
-		timeout: config.timeout ? parseInt(config.timeout, 10) : void 0,
-		hint
-	});
-}
-function buildExcludedFilesMessage(files) {
-	const excludes = getDefaultExcludes();
-	const isLockfile = (f) => excludes.some((pattern) => {
-		if (pattern.endsWith(".lock") || pattern.endsWith(".json")) return f === pattern || f.endsWith(pattern.replace("*.", "."));
-		return false;
-	});
-	if (files.every(isLockfile)) return "chore: update lockfile";
-	return "chore: update generated files";
+	}, message, result.stderr ?? "") === "cancelled") process.exit(1);
 }
 //#endregion
 //#region src/commands/config.ts
@@ -1090,6 +1661,12 @@ cli({
 			description: "Add context hint for AI commit message generation",
 			alias: "H"
 		},
+		review: {
+			type: Boolean,
+			description: "Review staged changes with a coding model",
+			alias: "R",
+			default: false
+		},
 		debug: {
 			type: Boolean,
 			description: "Enable debug output",
@@ -1100,7 +1677,8 @@ cli({
 	commands: [configCommand]
 }, (argv) => {
 	setDebug(argv.flags.debug);
-	commitCommand(argv.flags);
+	if (argv.flags.review) reviewCommand();
+	else commitCommand(argv.flags);
 });
 //#endregion
 export {};