@kyubiware/commit-mint 0.6.0 → 0.6.2

package/dist/cli.mjs

@@ -1,17 +1,17 @@
 #!/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 { bold, cyan, dim, green, red, yellow } from "kolorist";
-import { access, constants, mkdir, readFile, writeFile } from "node:fs/promises";
+import Groq from "groq-sdk";
+import { appendFileSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import os from "node:os";
 import { extname, join } from "node:path";
-import ini from "ini";
-import Groq from "groq-sdk";
+import { bold, cyan, dim, green, red, yellow } from "kolorist";
+import { access, constants, mkdir, readFile, writeFile } from "node:fs/promises";
 import { execa } from "execa";
-import { createHash } from "node:crypto";
-import { readFileSync } from "node:fs";
 import picomatch from "picomatch";
+import ini from "ini";
+import { createHash } from "node:crypto";
+import * as p from "@clack/prompts";
+import { intro, isCancel, log, outro, spinner } from "@clack/prompts";
 import { spawn } from "node:child_process";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -28,7 +28,7 @@ var __exportAll = (all, no_symbols) => {
 //#region package.json
 var package_default = {
 	name: "@kyubiware/commit-mint",
-	version: "0.6.0",
+	version: "0.6.2",
 	description: "🌿 A commit tool that actually handles hook failures",
 	type: "module",
 	bin: { "cmint": "./dist/cli.mjs" },
@@ -39,7 +39,7 @@ var package_default = {
 		"dev:auto": "tsx src/cli.ts -a",
 		"dev:debug": "tsx src/cli.ts --debug",
 		"lint": "biome check .",
-		"lint:fix": "biome check --fix .",
+		"lint:fix": "biome check --write --unsafe .",
 		"typecheck": "tsc --noEmit",
 		"test": "vitest run",
 		"test:coverage": "vitest run --coverage",
@@ -89,13 +89,30 @@ var package_default = {
 //#endregion
 //#region src/utils/debug.ts
 let enabled = false;
+let dirEnsured = false;
+let sessionWritten = false;
+let logFile = join(os.homedir(), ".cache", "commit-mint", "debug.log");
+const LOG_DIR = join(os.homedir(), ".cache", "commit-mint");
+function ensureLogDir() {
+	if (dirEnsured) return;
+	mkdirSync(LOG_DIR, { recursive: true });
+	dirEnsured = true;
+}
 function setDebug(value) {
 	enabled = value;
 }
+function writeSessionHeader() {
+	if (sessionWritten) return;
+	ensureLogDir();
+	writeFileSync(logFile, `--- session ${(/* @__PURE__ */ new Date()).toISOString()} ---\n`, "utf8");
+	sessionWritten = true;
+}
 function debug(...args) {
+	const prefix = `[debug ${(/* @__PURE__ */ new Date()).toISOString().slice(11, 23)}]`;
+	ensureLogDir();
+	appendFileSync(logFile, `${prefix} ${args.map(String).join(" ")}\n`, "utf8");
 	if (!enabled) return;
-	const timestamp = (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
-	console.error(dim(`[debug ${timestamp}]`), ...args);
+	console.error(dim(prefix), ...args);
 }
 //#endregion
 //#region src/services/provider.ts
@@ -175,69 +192,178 @@ function createProvider(options) {
 	};
 }
 //#endregion
-//#region src/services/config.ts
-const CONFIG_PATH = join(os.homedir(), ".commit-mint");
-const defaults = {
-	provider: "groq",
-	model: "openai/gpt-oss-20b",
-	locale: "en",
-	"max-length": "100",
-	type: "",
-	timeout: "10000"
-};
-async function readConfig() {
-	debug("readConfig: loading from %s", CONFIG_PATH);
-	try {
-		const raw = await readFile(CONFIG_PATH, "utf8");
-		const parsed = ini.parse(raw);
-		const merged = {
-			...defaults,
-			...parsed
-		};
-		debug("readConfig: loaded keys: %s", Object.keys(merged).join(", "));
-		return merged;
-	} catch {
-		debug("readConfig: no config file, using defaults");
-		return { ...defaults };
+//#region src/services/ai.ts
+const MAX_DIFF_CHARS = 2e4;
+function mapGroqError(error, providerLabel) {
+	const label = providerLabel ?? "Groq";
+	if (error instanceof Groq.AuthenticationError) return /* @__PURE__ */ new Error(`Invalid API key for ${label}. Run: cmint config set ${label.toUpperCase()}_API_KEY=<key>`);
+	if (error instanceof Groq.RateLimitError) return /* @__PURE__ */ new Error(`Rate limited by ${label}. 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(`${label} API error: ${error.message}`);
+	if (error instanceof Error && /^4\d{2}\s/.test(error.message)) return /* @__PURE__ */ new Error(`${label} API error: ${error.message}`);
+	return /* @__PURE__ */ new Error(`Unexpected error: ${error instanceof Error ? error.message : String(error)}`);
+}
+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");
 }
-async function writeConfig(updates) {
-	const existing = await readConfig();
-	Object.assign(existing, updates);
-	await writeFile(CONFIG_PATH, ini.stringify(existing), "utf8");
+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;
 }
-async function setConfigValue(key, value) {
-	await writeConfig({ [key]: value });
+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");
 }
-async function getProviderApiKey(provider) {
-	const envVar = PROVIDER_ENV_KEYS[provider];
-	if (envVar) {
-		const envValue = process.env[envVar];
-		if (envValue) {
-			debug("getProviderApiKey(%s): found in env", provider);
-			return envValue;
+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) {
+	const timeoutMs = options.timeout ?? 6e4;
+	debug("Timeout: %d ms", timeoutMs);
+	const { client, model } = createProvider({
+		provider: options.provider ?? "groq",
+		apiKey: options.apiKey,
+		modelOverride: options.model,
+		timeout: timeoutMs,
+		baseURLOverride: options.proxy
+	});
+	debug("generateCommitMessage: model=%s, type=%s, hint=%s", model, options.type ?? "none", options.hint ?? "none");
+	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", model, userPrompt.length, (strictSystemPrompt ?? systemPrompt).length);
+		try {
+			const isReasoningModel = /^(o[1-9]|.*gpt-oss.*|.*gpt-5.*)/i.test(model);
+			const isGroq = (options.provider ?? "groq") === "groq";
+			const completion = await client.chat.completions.create({
+				messages: [{
+					role: "system",
+					content: strictSystemPrompt ?? systemPrompt
+				}, {
+					role: "user",
+					content: userPrompt
+				}],
+				model,
+				temperature: .3,
+				...isReasoningModel ? { max_completion_tokens: 1024 } : { max_tokens: 1024 },
+				...isGroq && isReasoningModel ? { 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;
 		}
 	}
-	const config = await readConfig();
-	const configKey = PROVIDER_ENV_KEYS[provider];
-	if (configKey && config[configKey]) {
-		debug("getProviderApiKey(%s): found in config", provider);
-		return config[configKey];
+	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(error, options.provider ? formatProviderName(options.provider) : void 0);
 	}
-	debug("getProviderApiKey(%s): not found", provider);
-	throw new Error(`Please set your ${formatProviderName(provider)} API key via \`cmint config set ${envVar}=<your token>\``);
-}
-/** Check if a model name is the default for a provider OTHER than the given one. */
-function isOtherProviderDefault(model, provider) {
-	for (const [name, config] of Object.entries(PROVIDER_CONFIGS)) if (name !== provider && config.defaultModel === model) return true;
-	return false;
-}
-function getModelForProvider(config, provider, defaultModel) {
-	const providerModel = config[`model_${provider}`];
-	if (providerModel) return providerModel;
-	const globalModel = config.model;
-	if (globalModel && !isOtherProviderDefault(globalModel, provider)) return globalModel;
-	return defaultModel;
 }
 //#endregion
 //#region src/services/hooks.ts
@@ -473,439 +599,6 @@ function findMeaningfulCommand(command) {
 	return segments[segments.length - 1] || command;
 }
 //#endregion
-//#region src/services/hook-progress.ts
-const ansiRe = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
-function createStderrParser() {
-	let buffer = "";
-	return (chunk) => {
-		buffer += chunk;
-		const steps = [];
-		const lines = buffer.split("\n");
-		buffer = lines.pop() ?? "";
-		for (const line of lines) {
-			const match = line.replace(ansiRe, "").match(/\[(STARTED|COMPLETED|FAILED)\]\s+(.+)/);
-			if (!match) continue;
-			const status = match[1].toLowerCase();
-			const command = match[2].trim();
-			if (isLintStagedMeta(command)) continue;
-			const tool = extractToolName(command) ?? command;
-			steps.push({
-				status,
-				command,
-				tool
-			});
-		}
-		return steps;
-	};
-}
-function createProgressHandler(s) {
-	return (step) => {
-		if (step.status === "started") s.message(step.command);
-		else if (step.status === "failed") s.message(step.command);
-	};
-}
-//#endregion
-//#region src/services/git.ts
-var git_exports = /* @__PURE__ */ __exportAll({
-	KnownError: () => KnownError,
-	assertGitRepo: () => assertGitRepo,
-	attemptCommit: () => attemptCommit,
-	attemptCommitNoVerify: () => attemptCommitNoVerify,
-	getChangedFiles: () => getChangedFiles,
-	getDefaultExcludes: () => getDefaultExcludes,
-	getHead: () => getHead,
-	getRepoRoot: () => getRepoRoot,
-	getStagedDiff: () => getStagedDiff,
-	getStatusShort: () => getStatusShort,
-	resetStaging: () => resetStaging,
-	stageAll: () => stageAll,
-	stageFiles: () => stageFiles
-});
-var KnownError = class extends Error {};
-async function assertGitRepo() {
-	debug("assertGitRepo");
-	const { failed } = await execa("git", ["rev-parse", "--show-toplevel"], { reject: false });
-	if (failed) throw new KnownError("The current directory must be a Git repository!");
-}
-async function getRepoRoot() {
-	const { stdout } = await execa("git", ["rev-parse", "--show-toplevel"]);
-	debug("getRepoRoot:", stdout.trim());
-	return stdout.trim();
-}
-const DEFAULT_EXCLUDES = [
-	"package-lock.json",
-	"node_modules/**",
-	"dist/**",
-	"build/**",
-	".next/**",
-	"coverage/**",
-	"*.log",
-	"*.min.js",
-	"*.min.css",
-	"*.lock",
-	".DS_Store"
-];
-function getDefaultExcludes() {
-	return [...DEFAULT_EXCLUDES];
-}
-async function getStagedDiff(exclude) {
-	const excludeArgs = (exclude ?? []).map((e) => `:(exclude)${e}`);
-	const defaultExcludeArgs = DEFAULT_EXCLUDES.map((e) => `:(exclude)${e}`);
-	const { stdout: allFiles } = await execa("git", [
-		"diff",
-		"--cached",
-		"--name-only"
-	]);
-	if (!allFiles) {
-		debug("getStagedDiff: no staged files");
-		return null;
-	}
-	const { stdout: files } = await execa("git", [
-		"diff",
-		"--cached",
-		"--name-only",
-		...defaultExcludeArgs,
-		...excludeArgs
-	]);
-	if (!files) {
-		const excludedFiles = allFiles.split("\n").filter(Boolean);
-		debug("getStagedDiff: all files excluded:", excludedFiles);
-		return { excludedFiles };
-	}
-	const { stdout: diff } = await execa("git", [
-		"diff",
-		"--cached",
-		"--diff-algorithm=minimal",
-		...defaultExcludeArgs,
-		...excludeArgs
-	]);
-	debug("getStagedDiff:", files.split("\n").filter(Boolean).length, "files,", diff.length, "chars");
-	return {
-		files: files.split("\n").filter(Boolean),
-		diff
-	};
-}
-async function stageAll() {
-	debug("stageAll: git add -A");
-	await execa("git", ["add", "-A"]);
-}
-async function resetStaging() {
-	debug("resetStaging: git reset HEAD");
-	await execa("git", ["reset", "HEAD"]);
-}
-async function getHead() {
-	const { stdout } = await execa("git", ["rev-parse", "HEAD"]);
-	return stdout.trim();
-}
-async function getStatusShort() {
-	const { stdout } = await execa("git", ["status", "--short"]);
-	return stdout.trim();
-}
-async function getChangedFiles() {
-	const { stdout } = await execa("git", ["status", "--short"]);
-	if (!stdout.trim()) return [];
-	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;
-}
-async function stageFiles(paths) {
-	debug("stageFiles:", paths);
-	await execa("git", ["add", ...paths]);
-}
-async function attemptCommit(message, extraArgs = [], onProgress) {
-	debug("attemptCommit:", message, extraArgs.length ? extraArgs : "(no extra args)");
-	try {
-		const subprocess = execa("git", [
-			"commit",
-			"-m",
-			message,
-			...extraArgs
-		]);
-		const stderrChunks = [];
-		const parser = onProgress ? createStderrParser() : null;
-		subprocess.stderr?.on("data", (chunk) => {
-			const text = chunk.toString();
-			stderrChunks.push(text);
-			if (parser && onProgress) for (const step of parser(text)) onProgress(step);
-		});
-		await subprocess;
-		debug("attemptCommit: success");
-		return {
-			ok: true,
-			stderr: stderrChunks.join("")
-		};
-	} catch (error) {
-		const e = error;
-		debug("attemptCommit: failed —", e.message?.slice(0, 200));
-		return {
-			ok: false,
-			error: e.message,
-			stderr: typeof e.stderr === "string" ? e.stderr : ""
-		};
-	}
-}
-async function attemptCommitNoVerify(message, onProgress) {
-	debug("attemptCommitNoVerify:", message);
-	return attemptCommit(message, ["--no-verify"], onProgress);
-}
-//#endregion
-//#region src/ui/review-message.ts
-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: "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);
-		}
-	}
-}
-//#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/ai.ts
-const MAX_DIFF_CHARS = 2e4;
-function mapGroqError(error, providerLabel) {
-	const label = providerLabel ?? "Groq";
-	if (error instanceof Groq.AuthenticationError) return /* @__PURE__ */ new Error(`Invalid API key for ${label}. Run: cmint config set ${label.toUpperCase()}_API_KEY=<key>`);
-	if (error instanceof Groq.RateLimitError) return /* @__PURE__ */ new Error(`Rate limited by ${label}. 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(`${label} API error: ${error.message}`);
-	if (error instanceof Error && /^4\d{2}\s/.test(error.message)) return /* @__PURE__ */ new Error(`${label} API error: ${error.message}`);
-	return /* @__PURE__ */ new Error(`Unexpected error: ${error instanceof Error ? error.message : String(error)}`);
-}
-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) {
-	const timeoutMs = options.timeout ?? 6e4;
-	debug("Timeout: %d ms", timeoutMs);
-	const { client, model } = createProvider({
-		provider: options.provider ?? "groq",
-		apiKey: options.apiKey,
-		modelOverride: options.model,
-		timeout: timeoutMs,
-		baseURLOverride: options.proxy
-	});
-	debug("generateCommitMessage: model=%s, type=%s, hint=%s", model, options.type ?? "none", options.hint ?? "none");
-	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", model, userPrompt.length, (strictSystemPrompt ?? systemPrompt).length);
-		try {
-			const isReasoningModel = /^(o[1-9]|.*gpt-oss.*|.*gpt-5.*)/i.test(model);
-			const isGroq = (options.provider ?? "groq") === "groq";
-			const completion = await client.chat.completions.create({
-				messages: [{
-					role: "system",
-					content: strictSystemPrompt ?? systemPrompt
-				}, {
-					role: "user",
-					content: userPrompt
-				}],
-				model,
-				temperature: .3,
-				...isReasoningModel ? { max_completion_tokens: 1024 } : { max_tokens: 1024 },
-				...isGroq && isReasoningModel ? { 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(error, options.provider ? formatProviderName(options.provider) : void 0);
-	}
-}
-//#endregion
 //#region src/services/checks.ts
 /** Config file names, checked in priority order (matches lint-staged naming conventions) */
 const CONFIG_FILES = [
@@ -1094,30 +787,278 @@ async function runAllChecks(repoRoot, stagedFiles, timeout) {
 		debug("runAllChecks: no config found, skipping checks");
 		return {
 			ok: true,
-			results: []
+			results: []
+		};
+	}
+	const config = await loadConfig(repoRoot);
+	debug("runAllChecks: loaded config with %d patterns", Object.keys(config).length);
+	const results = [];
+	for (const [glob, commands] of Object.entries(config)) {
+		const matchedFiles = matchFiles(glob, stagedFiles);
+		if (matchedFiles.length === 0) {
+			debug("runAllChecks: no files matched pattern '%s'", glob);
+			continue;
+		}
+		debug("runAllChecks: pattern '%s' matched %d files", glob, matchedFiles.length);
+		if (!await runCommandsForGlob(resolveCommands(commands, matchedFiles), matchedFiles, timeout, results, repoRoot)) return {
+			ok: false,
+			results
+		};
+	}
+	const ok = results.every((r) => r.ok);
+	debug("runAllChecks: complete — ok=%s, %d results", ok, results.length);
+	return {
+		ok,
+		results
+	};
+}
+//#endregion
+//#region src/services/config.ts
+const CONFIG_PATH = join(os.homedir(), ".commit-mint");
+const defaults = {
+	provider: "groq",
+	model: "openai/gpt-oss-20b",
+	locale: "en",
+	"max-length": "100",
+	type: "",
+	timeout: "10000"
+};
+async function readConfig() {
+	debug("readConfig: loading from %s", CONFIG_PATH);
+	try {
+		const raw = await readFile(CONFIG_PATH, "utf8");
+		const parsed = ini.parse(raw);
+		const merged = {
+			...defaults,
+			...parsed
+		};
+		debug("readConfig: loaded keys: %s", Object.keys(merged).join(", "));
+		return merged;
+	} catch {
+		debug("readConfig: no config file, using defaults");
+		return { ...defaults };
+	}
+}
+async function writeConfig(updates) {
+	const existing = await readConfig();
+	Object.assign(existing, updates);
+	await writeFile(CONFIG_PATH, ini.stringify(existing), "utf8");
+}
+async function setConfigValue(key, value) {
+	await writeConfig({ [key]: value });
+}
+async function getProviderApiKey(provider) {
+	const envVar = PROVIDER_ENV_KEYS[provider];
+	if (envVar) {
+		const envValue = process.env[envVar];
+		if (envValue) {
+			debug("getProviderApiKey(%s): found in env", provider);
+			return envValue;
+		}
+	}
+	const config = await readConfig();
+	const configKey = PROVIDER_ENV_KEYS[provider];
+	if (configKey && config[configKey]) {
+		debug("getProviderApiKey(%s): found in config", provider);
+		return config[configKey];
+	}
+	debug("getProviderApiKey(%s): not found", provider);
+	throw new Error(`Please set your ${formatProviderName(provider)} API key via \`cmint config set ${envVar}=<your token>\``);
+}
+/** Check if a model name is the default for a provider OTHER than the given one. */
+function isOtherProviderDefault(model, provider) {
+	for (const [name, config] of Object.entries(PROVIDER_CONFIGS)) if (name !== provider && config.defaultModel === model) return true;
+	return false;
+}
+function getModelForProvider(config, provider, defaultModel) {
+	const providerModel = config[`model_${provider}`];
+	if (providerModel) return providerModel;
+	const globalModel = config.model;
+	if (globalModel && !isOtherProviderDefault(globalModel, provider)) return globalModel;
+	return defaultModel;
+}
+//#endregion
+//#region src/services/hook-progress.ts
+const ansiRe = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
+function createStderrParser() {
+	let buffer = "";
+	return (chunk) => {
+		buffer += chunk;
+		const steps = [];
+		const lines = buffer.split("\n");
+		buffer = lines.pop() ?? "";
+		for (const line of lines) {
+			const match = line.replace(ansiRe, "").match(/\[(STARTED|COMPLETED|FAILED)\]\s+(.+)/);
+			if (!match) continue;
+			const status = match[1].toLowerCase();
+			const command = match[2].trim();
+			if (isLintStagedMeta(command)) continue;
+			const tool = extractToolName(command) ?? command;
+			steps.push({
+				status,
+				command,
+				tool
+			});
+		}
+		return steps;
+	};
+}
+function createProgressHandler(s) {
+	return (step) => {
+		if (step.status === "started") s.message(step.command);
+		else if (step.status === "failed") s.message(step.command);
+	};
+}
+//#endregion
+//#region src/services/git.ts
+var git_exports = /* @__PURE__ */ __exportAll({
+	KnownError: () => KnownError,
+	assertGitRepo: () => assertGitRepo,
+	attemptCommit: () => attemptCommit,
+	attemptCommitNoVerify: () => attemptCommitNoVerify,
+	getChangedFiles: () => getChangedFiles,
+	getDefaultExcludes: () => getDefaultExcludes,
+	getHead: () => getHead,
+	getRepoRoot: () => getRepoRoot,
+	getStagedDiff: () => getStagedDiff,
+	getStatusShort: () => getStatusShort,
+	resetStaging: () => resetStaging,
+	stageAll: () => stageAll,
+	stageFiles: () => stageFiles
+});
+var KnownError = class extends Error {};
+async function assertGitRepo() {
+	debug("assertGitRepo");
+	const { failed } = await execa("git", ["rev-parse", "--show-toplevel"], { reject: false });
+	if (failed) throw new KnownError("The current directory must be a Git repository!");
+}
+async function getRepoRoot() {
+	const { stdout } = await execa("git", ["rev-parse", "--show-toplevel"]);
+	debug("getRepoRoot:", stdout.trim());
+	return stdout.trim();
+}
+const DEFAULT_EXCLUDES = [
+	"package-lock.json",
+	"node_modules/**",
+	"dist/**",
+	"build/**",
+	".next/**",
+	"coverage/**",
+	"*.log",
+	"*.min.js",
+	"*.min.css",
+	"*.lock",
+	".DS_Store"
+];
+function getDefaultExcludes() {
+	return [...DEFAULT_EXCLUDES];
+}
+async function getStagedDiff(exclude) {
+	const excludeArgs = (exclude ?? []).map((e) => `:(exclude)${e}`);
+	const defaultExcludeArgs = DEFAULT_EXCLUDES.map((e) => `:(exclude)${e}`);
+	const { stdout: allFiles } = await execa("git", [
+		"diff",
+		"--cached",
+		"--name-only"
+	]);
+	if (!allFiles) {
+		debug("getStagedDiff: no staged files");
+		return null;
+	}
+	const { stdout: files } = await execa("git", [
+		"diff",
+		"--cached",
+		"--name-only",
+		...defaultExcludeArgs,
+		...excludeArgs
+	]);
+	if (!files) {
+		const excludedFiles = allFiles.split("\n").filter(Boolean);
+		debug("getStagedDiff: all files excluded:", excludedFiles);
+		return { excludedFiles };
+	}
+	const { stdout: diff } = await execa("git", [
+		"diff",
+		"--cached",
+		"--diff-algorithm=minimal",
+		...defaultExcludeArgs,
+		...excludeArgs
+	]);
+	debug("getStagedDiff:", files.split("\n").filter(Boolean).length, "files,", diff.length, "chars");
+	return {
+		files: files.split("\n").filter(Boolean),
+		diff
+	};
+}
+async function stageAll() {
+	debug("stageAll: git add -A");
+	await execa("git", ["add", "-A"]);
+}
+async function resetStaging() {
+	debug("resetStaging: git reset HEAD");
+	await execa("git", ["reset", "HEAD"]);
+}
+async function getHead() {
+	const { stdout } = await execa("git", ["rev-parse", "HEAD"]);
+	return stdout.trim();
+}
+async function getStatusShort() {
+	const { stdout } = await execa("git", ["status", "--short"]);
+	return stdout.trim();
+}
+async function getChangedFiles() {
+	const { stdout } = await execa("git", ["status", "--short"]);
+	if (!stdout.trim()) return [];
+	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;
+}
+async function stageFiles(paths) {
+	debug("stageFiles:", paths);
+	await execa("git", ["add", ...paths]);
+}
+async function attemptCommit(message, extraArgs = [], onProgress) {
+	debug("attemptCommit:", message, extraArgs.length ? extraArgs : "(no extra args)");
+	try {
+		const subprocess = execa("git", [
+			"commit",
+			"-m",
+			message,
+			...extraArgs
+		]);
+		const stderrChunks = [];
+		const parser = onProgress ? createStderrParser() : null;
+		subprocess.stderr?.on("data", (chunk) => {
+			const text = chunk.toString();
+			stderrChunks.push(text);
+			if (parser && onProgress) for (const step of parser(text)) onProgress(step);
+		});
+		await subprocess;
+		debug("attemptCommit: success");
+		return {
+			ok: true,
+			stderr: stderrChunks.join("")
 		};
-	}
-	const config = await loadConfig(repoRoot);
-	debug("runAllChecks: loaded config with %d patterns", Object.keys(config).length);
-	const results = [];
-	for (const [glob, commands] of Object.entries(config)) {
-		const matchedFiles = matchFiles(glob, stagedFiles);
-		if (matchedFiles.length === 0) {
-			debug("runAllChecks: no files matched pattern '%s'", glob);
-			continue;
-		}
-		debug("runAllChecks: pattern '%s' matched %d files", glob, matchedFiles.length);
-		if (!await runCommandsForGlob(resolveCommands(commands, matchedFiles), matchedFiles, timeout, results, repoRoot)) return {
+	} catch (error) {
+		const e = error;
+		debug("attemptCommit: failed —", e.message?.slice(0, 200));
+		return {
 			ok: false,
-			results
+			error: e.message,
+			stderr: typeof e.stderr === "string" ? e.stderr : ""
 		};
 	}
-	const ok = results.every((r) => r.ok);
-	debug("runAllChecks: complete — ok=%s, %d results", ok, results.length);
-	return {
-		ok,
-		results
-	};
+}
+async function attemptCommitNoVerify(message, onProgress) {
+	debug("attemptCommitNoVerify:", message);
+	return attemptCommit(message, ["--no-verify"], onProgress);
 }
 //#endregion
 //#region src/services/grouping.ts
@@ -1201,8 +1142,36 @@ function buildGroupingUserPrompt(summary) {
 		summary
 	].join("\n");
 }
+function buildRetryGroupingPrompt() {
+	return [
+		"PREVIOUS ATTEMPT FAILED: You grouped all files into a single group.",
+		"",
+		"You MUST split the files into at least 2 groups based on what changed and why.",
+		"",
+		"Look for these natural split points:",
+		"- Source code vs tests",
+		"- Different features or modules (e.g., different directories)",
+		"- New files vs modified files vs deleted files",
+		"- Configuration changes vs code changes",
+		"- Documentation vs implementation",
+		"",
+		"If unsure, err on the side of MORE groups, not fewer.",
+		"",
+		"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 parseGroupingResponse(content) {
-	const jsonText = content.replace(/^```json\s*/, "").replace(/\s*```$/, "").trim();
+	let cleaned = content.replace(/<think[\s\S]*?<\/think>/gi, "").trim();
+	cleaned = cleaned.replace(/^```(?:json)?\s*/i, "").replace(/\s*```$/i, "").trim();
+	const start = cleaned.indexOf("[");
+	const end = cleaned.lastIndexOf("]");
+	if (start === -1 || end === -1 || end <= start) throw new Error("AI response did not contain a JSON array");
+	const jsonText = cleaned.slice(start, end + 1);
 	const parsed = JSON.parse(jsonText);
 	if (!Array.isArray(parsed)) throw new Error("AI response was not a JSON array");
 	const rawGroups = [];
@@ -1236,27 +1205,17 @@ async function generateGroups(files, apiKey, model, timeout, provider, proxy) {
 		baseURLOverride: proxy
 	});
 	try {
-		const completion = await client.chat.completions.create({
-			messages: [{
-				role: "system",
-				content: systemPrompt
-			}, {
-				role: "user",
-				content: userPrompt
-			}],
-			model: resolvedModel,
-			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);
+		let rawGroups = await callGroupingAI(client, resolvedModel, systemPrompt, userPrompt);
 		debug("generateGroups: parsed %d raw groups", rawGroups.length);
-		const validated = validateGroups(rawGroups, included);
+		let validated = validateGroups(rawGroups, included);
 		debug("generateGroups: %d validated groups", validated.length);
+		if (isLowQualityGrouping(validated, included)) {
+			debug("generateGroups: low quality result, retrying with stricter prompt");
+			rawGroups = await callGroupingAI(client, resolvedModel, buildRetryGroupingPrompt(), userPrompt);
+			debug("generateGroups retry: parsed %d raw groups", rawGroups.length);
+			validated = validateGroups(rawGroups, included);
+			debug("generateGroups retry: %d validated groups", validated.length);
+		}
 		return {
 			groups: validated,
 			excluded
@@ -1266,6 +1225,33 @@ async function generateGroups(files, apiKey, model, timeout, provider, proxy) {
 		throw mapGroqError(error, provider ? formatProviderName(provider) : void 0);
 	}
 }
+async function callGroupingAI(client, model, systemPrompt, userPrompt) {
+	const completion = await client.chat.completions.create({
+		messages: [{
+			role: "system",
+			content: systemPrompt
+		}, {
+			role: "user",
+			content: userPrompt
+		}],
+		model,
+		temperature: .3,
+		max_tokens: 2048
+	});
+	const rawContent = completion.choices[0]?.message?.content;
+	const content = typeof rawContent === "string" ? rawContent.trim() : "";
+	debug("callGroupingAI response: choices=%d, finishReason=%s, contentLen=%d", completion.choices.length, completion.choices[0]?.finish_reason ?? "(none)", content.length);
+	debug("callGroupingAI raw content: %s", content.slice(0, 500) || "(empty)");
+	if (!content) throw new Error("AI returned an empty grouping response");
+	return parseGroupingResponse(content);
+}
+/** Minimum file count where a single-group result is considered low quality */
+const MIN_FILES_FOR_QUALITY_CHECK = 5;
+function isLowQualityGrouping(groups, allFiles) {
+	if (groups.length === 0) return false;
+	if (allFiles.length < MIN_FILES_FOR_QUALITY_CHECK) return false;
+	return groups.length === 1;
+}
 function validateGroups(groups, allFiles) {
 	const validPaths = new Set(allFiles.map((f) => f.path));
 	const seen = /* @__PURE__ */ new Set();
@@ -1294,6 +1280,51 @@ function validateGroups(groups, allFiles) {
 	}
 	return validated;
 }
+const EXIT_CODES = {
+	SUCCESS: 0,
+	GENERIC: 1,
+	NO_CHANGES: 2,
+	GIT: 3,
+	AI: 4,
+	CHECK: 5,
+	HOOK: 6
+};
+function writeAgentResult(result) {
+	process.stdout.write(`${JSON.stringify(result)}\n`);
+}
+//#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/clipboard.ts
 /** Milliseconds to wait after stdin closes for quick exit failures. */
@@ -1678,6 +1709,49 @@ async function showRecoveryMenu(errors, onRetry, onSkipHooks, onRestage, message
 	}
 }
 //#endregion
+//#region src/ui/review-message.ts
+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: "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);
+		}
+	}
+}
+//#endregion
 //#region src/commands/auto-group.ts
 async function runAutoGroupFlow(changedFiles, flags) {
 	const { included, excluded } = filterExcludedFiles(changedFiles);
@@ -1855,6 +1929,245 @@ function buildExcludedFilesMessage(files) {
 	return "chore: update generated files";
 }
 //#endregion
+//#region src/commands/agent.ts
+/**
+* Wrapper around getHead() that returns "" on fresh repos with no commits.
+* `git rev-parse HEAD` fails with exit 128 on a brand-new repo, which would
+* crash the agent flow before the first commit can be made.
+*/
+async function safeGetHead() {
+	try {
+		return await getHead();
+	} catch {
+		return "";
+	}
+}
+/**
+* Headless agent command — orchestrates the entire commit flow without any TUI
+* interaction. Emits structured JSON results to stdout, one per line. Returns
+* control to the caller with `process.exitCode` set to one of the 7 documented
+* exit codes (0=success, 1=generic, 2=no_changes, 3=git, 4=ai, 5=check, 6=hook).
+*/
+async function agentCommand(flags) {
+	debug("agentCommand called", { flags });
+	if (flags.retry) {
+		process.exitCode = EXIT_CODES.GENERIC;
+		writeAgentResult({
+			status: "failure",
+			commits: [],
+			errors: ["--agent is not compatible with --retry"]
+		});
+		return;
+	}
+	try {
+		await assertGitRepo();
+	} catch (err) {
+		process.exitCode = EXIT_CODES.GIT;
+		writeAgentResult({
+			status: "failure",
+			commits: [],
+			errors: [err instanceof Error ? err.message : String(err)]
+		});
+		return;
+	}
+	const status = await getStatusShort();
+	debug("Git status:", status || "(empty)");
+	if (!status) {
+		process.exitCode = EXIT_CODES.NO_CHANGES;
+		writeAgentResult({
+			status: "no_changes",
+			commits: []
+		});
+		return;
+	}
+	const changedFiles = await getChangedFiles();
+	debug("Changed files:", changedFiles.length);
+	await stageFiles(changedFiles.map((f) => f.path));
+	const diffResult = await getStagedDiff();
+	if (!diffResult) {
+		process.exitCode = EXIT_CODES.NO_CHANGES;
+		writeAgentResult({
+			status: "no_changes",
+			commits: []
+		});
+		return;
+	}
+	if ("excludedFiles" in diffResult) {
+		debug("All staged files are excluded:", diffResult.excludedFiles);
+		const message = buildExcludedFilesMessage(diffResult.excludedFiles);
+		const headBefore = await safeGetHead();
+		const result = await attemptCommit(message);
+		const headAfter = await safeGetHead();
+		if (result.ok || headBefore !== headAfter) {
+			process.exitCode = EXIT_CODES.SUCCESS;
+			writeAgentResult({
+				status: "success",
+				commits: [{
+					message,
+					hash: headAfter,
+					files: diffResult.excludedFiles
+				}]
+			});
+		} else {
+			process.exitCode = EXIT_CODES.HOOK;
+			writeAgentResult({
+				status: "failure",
+				commits: [],
+				errors: parseHookErrors(result.stderr ?? "").map((e) => `[${e.tool}] ${e.message}`)
+			});
+		}
+		return;
+	}
+	if (flags.message) {
+		debug("Using provided message:", flags.message);
+		const headBefore = await safeGetHead();
+		const result = await attemptCommit(flags.message);
+		const headAfter = await safeGetHead();
+		if (result.ok || headBefore !== headAfter) {
+			process.exitCode = EXIT_CODES.SUCCESS;
+			writeAgentResult({
+				status: "success",
+				commits: [{
+					message: flags.message,
+					hash: headAfter,
+					files: diffResult.files
+				}]
+			});
+		} else {
+			process.exitCode = EXIT_CODES.HOOK;
+			writeAgentResult({
+				status: "failure",
+				commits: [],
+				errors: parseHookErrors(result.stderr ?? "").map((e) => `[${e.tool}] ${e.message}`)
+			});
+		}
+		return;
+	}
+	if (!flags.noCheck) {
+		const repoRoot = await getRepoRoot();
+		if (await detectConfig(repoRoot)) {
+			debug("Running user checks on changed files...");
+			const checkResults = await runAllChecks(repoRoot, changedFiles.filter((f) => f.status !== "D").map((f) => f.path), 6e4);
+			if (!checkResults.ok) {
+				const errorMessages = checkResults.results.filter((r) => !r.ok).map((r) => `[${r.tool}]\n${r.stdout}\n${r.stderr}`.trim()).filter(Boolean);
+				const parsed = parseCheckErrors(errorMessages.join("\n\n"));
+				const errors = parsed.length > 0 ? parsed.map((e) => `[${e.tool}] ${e.message}`) : errorMessages;
+				process.exitCode = EXIT_CODES.CHECK;
+				writeAgentResult({
+					status: "failure",
+					commits: [],
+					errors
+				});
+				return;
+			}
+		}
+	}
+	const { included, excluded } = filterExcludedFiles(changedFiles);
+	debug("Auto-group: %d included, %d excluded", included.length, excluded.length);
+	if (excluded.length > 0) {
+		const message = buildExcludedFilesMessage(excluded);
+		debug("Committing %d excluded files:", excluded.length, excluded);
+		await resetStaging();
+		await stageFiles(excluded);
+		const headBefore = await safeGetHead();
+		const result = await attemptCommit(message);
+		const headAfter = await safeGetHead();
+		if (!result.ok && headBefore === headAfter) debug("Excluded files commit failed, continuing without them");
+	}
+	if (included.length === 0) {
+		process.exitCode = EXIT_CODES.SUCCESS;
+		writeAgentResult({
+			status: "success",
+			commits: []
+		});
+		return;
+	}
+	const config = await readConfig();
+	const provider = isValidProvider(config.provider ?? "groq") ? config.provider : "groq";
+	let apiKey;
+	try {
+		apiKey = await getProviderApiKey(provider);
+	} catch {
+		process.exitCode = EXIT_CODES.AI;
+		writeAgentResult({
+			status: "failure",
+			commits: [],
+			errors: [`No API key found for ${provider}. Set ${PROVIDER_ENV_KEYS[provider]} env var or run 'cmint config'`]
+		});
+		return;
+	}
+	const model = getModelForProvider(config, provider, PROVIDER_CONFIGS[provider].defaultModel);
+	const timeout = config.timeout ? parseInt(config.timeout, 10) : void 0;
+	let groups;
+	try {
+		groups = validateGroups((await generateGroups(included, apiKey, model, timeout, provider, config.proxy)).groups, included);
+	} catch (err) {
+		process.exitCode = EXIT_CODES.AI;
+		writeAgentResult({
+			status: "failure",
+			commits: [],
+			errors: [err instanceof Error ? err.message : String(err)]
+		});
+		return;
+	}
+	const commits = [];
+	for (const group of groups) {
+		debug("Processing group %d/%d: %s", commits.length + 1, groups.length, group.name);
+		await resetStaging();
+		await stageFiles(group.files);
+		const groupDiff = await getStagedDiff();
+		if (!groupDiff || "excludedFiles" in groupDiff) {
+			debug(`Skipping group "${group.name}" — no diff`);
+			continue;
+		}
+		let message;
+		try {
+			message = await generateCommitMessage(groupDiff.diff, {
+				apiKey,
+				model,
+				type: config.type,
+				timeout,
+				hint: flags.hint,
+				provider,
+				proxy: config.proxy
+			});
+		} catch (err) {
+			process.exitCode = EXIT_CODES.AI;
+			writeAgentResult({
+				status: "failure",
+				commits,
+				errors: [err instanceof Error ? err.message : String(err)]
+			});
+			return;
+		}
+		await saveCachedCommit(await getRepoRoot(), message);
+		const headBefore = await safeGetHead();
+		const result = await attemptCommit(message);
+		const headAfter = await safeGetHead();
+		if (result.ok || headBefore !== headAfter) {
+			commits.push({
+				message,
+				hash: headAfter,
+				files: group.files,
+				groupName: group.name
+			});
+			continue;
+		}
+		process.exitCode = EXIT_CODES.HOOK;
+		writeAgentResult({
+			status: "failure",
+			commits,
+			errors: parseHookErrors(result.stderr ?? "").map((e) => `[${e.tool}] ${e.message}`)
+		});
+		return;
+	}
+	process.exitCode = EXIT_CODES.SUCCESS;
+	writeAgentResult({
+		status: "success",
+		commits
+	});
+}
+//#endregion
 //#region src/commands/commit-utils.ts
 /** Shared recovery menu factory — avoids repeating the same callback set */
 function makeRecoveryCallbacks(message) {
@@ -2265,7 +2578,8 @@ async function runPreCommitChecks(changedFiles, noCheck) {
 		});
 		if (menuResult === "cancelled") process.exit(1);
 		if (menuResult === "retried") {
-			debug("Re-running checks after retry...");
+			debug("Re-staging files and re-running checks after retry...");
+			await stageAll();
 			const ckSpinner = spinner();
 			ckSpinner.start("Running checks...");
 			checkResults = await runAllChecks(checkRoot, stagedFileList, 6e4);
@@ -2612,6 +2926,40 @@ async function configCommand() {
 	}
 }
 //#endregion
+//#region src/commands/logs.ts
+const LOG_PATH = join(os.homedir(), ".cache", "commit-mint", "debug.log");
+const SESSION_SEPARATOR = /^--- session .+ ---$/;
+async function logsCommand(flags) {
+	let content;
+	try {
+		content = await readFile(LOG_PATH, "utf8");
+	} catch (err) {
+		if (err.code === "ENOENT") {
+			console.error("No debug logs found. Run cmint with any command first.");
+			process.exit(1);
+		}
+		throw err;
+	}
+	if (content.trim() === "") {
+		console.error("No debug logs found. Run cmint with any command first.");
+		process.exit(1);
+	}
+	const allLines = content.split("\n");
+	let lastSessionIndex = -1;
+	for (let i = allLines.length - 1; i >= 0; i--) if (SESSION_SEPARATOR.test(allLines[i])) {
+		lastSessionIndex = i;
+		break;
+	}
+	const sessionLines = lastSessionIndex === -1 ? allLines : allLines.slice(lastSessionIndex + 1);
+	const filtered = sessionLines.filter((line) => line.length > 0 || sessionLines.indexOf(line) === 0);
+	if (filtered.length === 0) {
+		console.error("No debug logs found. Run cmint with any command first.");
+		process.exit(1);
+	}
+	const lines = flags.lines !== void 0 && flags.lines > 0 ? filtered.slice(-flags.lines) : filtered;
+	for (const line of lines) console.log(line);
+}
+//#endregion
 //#region src/cli.ts
 const { version } = package_default;
 cli({
@@ -2652,14 +3000,31 @@ cli({
 			description: "Skip user-defined pre-commit checks",
 			alias: "N",
 			default: false
+		},
+		agent: {
+			type: Boolean,
+			description: "AI agent mode: non-interactive auto-group with JSON output",
+			default: false
 		}
 	},
-	commands: [command({ name: "config" }, async () => {
+	commands: [command({
+		name: "logs",
+		description: "Show debug logs from the last cmint run",
+		flags: { lines: {
+			type: Number,
+			description: "Number of lines to show from the end",
+			alias: "n"
+		} }
+	}, async (argv) => {
+		await logsCommand(argv.flags);
+	}), command({ name: "config" }, async () => {
 		await configCommand();
 	})]
 }, (argv) => {
+	writeSessionHeader();
 	setDebug(argv.flags.debug);
-	commitCommand(argv.flags);
+	if (argv.flags.agent) agentCommand(argv.flags);
+	else commitCommand(argv.flags);
 });
 //#endregion
 export {};