@kyubiware/commit-mint 0.4.1 → 0.5.0

package/dist/cli.mjs

@@ -5,12 +5,14 @@ import { intro, isCancel, log, note, outro, select, spinner } from "@clack/promp
 import { bold, cyan, dim, green, red, yellow } from "kolorist";
 import { access, constants, mkdir, readFile, writeFile } from "node:fs/promises";
 import os from "node:os";
-import { join } from "node:path";
+import { extname, join } from "node:path";
 import ini from "ini";
+import Groq from "groq-sdk";
 import { execa } from "execa";
 import { spawn } from "node:child_process";
-import Groq from "groq-sdk";
 import { createHash } from "node:crypto";
+import { readFileSync } from "node:fs";
+import picomatch from "picomatch";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
@@ -26,8 +28,8 @@ var __exportAll = (all, no_symbols) => {
 //#region package.json
 var package_default = {
 	name: "@kyubiware/commit-mint",
-	version: "0.4.1",
-	description: "A commit tool that actually handles hook failures",
+	version: "0.5.0",
+	description: "🌿 A commit tool that actually handles hook failures",
 	type: "module",
 	bin: { "cmint": "./dist/cli.mjs" },
 	files: ["dist"],
@@ -45,16 +47,13 @@ var package_default = {
 		"release:patch": "bash scripts/release.sh patch",
 		"release:minor": "bash scripts/release.sh minor",
 		"release:major": "bash scripts/release.sh major",
-		"prepublishOnly": "npm run build",
-		"prepare": "simple-git-hooks"
+		"prepublishOnly": "npm run build"
 	},
-	"simple-git-hooks": { "pre-commit": "npx lint-staged" },
 	keywords: [
 		"git",
 		"commit",
 		"hooks",
 		"pre-commit",
-		"lint-staged",
 		"ai",
 		"groq",
 		"conventional-commits",
@@ -72,14 +71,14 @@ var package_default = {
 		"execa": "^9.6.0",
 		"groq-sdk": "^0.32.0",
 		"ini": "^5.0.0",
-		"kolorist": "^1.8.0"
+		"jiti": "^2.7.0",
+		"kolorist": "^1.8.0",
+		"picomatch": "^4.0.4"
 	},
 	devDependencies: {
 		"@biomejs/biome": "^2.0.0",
 		"@types/ini": "^4.1.1",
 		"@vitest/coverage-v8": "^3.2.4",
-		"lint-staged": "^17.0.5",
-		"simple-git-hooks": "^2.13.1",
 		"tsdown": "^0.22.0",
 		"tsx": "^4.22.2",
 		"typescript": "^5.9.2",
@@ -98,9 +97,52 @@ function debug(...args) {
 	console.error(dim(`[debug ${timestamp}]`), ...args);
 }
 //#endregion
+//#region src/services/provider.ts
+const PROVIDER_CONFIGS = {
+	groq: {
+		baseURL: "https://api.groq.com",
+		defaultModel: "openai/gpt-oss-20b"
+	},
+	cerebras: {
+		baseURL: "https://api.cerebras.ai",
+		defaultModel: "gpt-oss-120b"
+	},
+	mistral: {
+		baseURL: "https://api.mistral.ai",
+		defaultModel: "mistral-small"
+	}
+};
+const ALLOWED_PROVIDERS = Object.keys(PROVIDER_CONFIGS);
+const PROVIDER_ENV_KEYS = {
+	groq: "GROQ_API_KEY",
+	cerebras: "CEREBRAS_API_KEY",
+	mistral: "MISTRAL_API_KEY"
+};
+function formatProviderName(provider) {
+	return provider.charAt(0).toUpperCase() + provider.slice(1);
+}
+function isValidProvider(name) {
+	return ALLOWED_PROVIDERS.includes(name);
+}
+function createProvider(options) {
+	if (!isValidProvider(options.provider)) throw new Error(`Invalid provider "${options.provider}". Allowed values: ${ALLOWED_PROVIDERS.join(", ")}`);
+	const providerConfig = PROVIDER_CONFIGS[options.provider];
+	const model = options.modelOverride ?? providerConfig.defaultModel;
+	const baseURL = options.baseURLOverride ?? providerConfig.baseURL;
+	return {
+		client: new Groq({
+			apiKey: options.apiKey,
+			baseURL,
+			timeout: options.timeout
+		}),
+		model
+	};
+}
+//#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",
@@ -128,25 +170,250 @@ async function writeConfig(updates) {
 	Object.assign(existing, updates);
 	await writeFile(CONFIG_PATH, ini.stringify(existing), "utf8");
 }
-async function getConfigValue(key) {
-	return (await readConfig())[key];
-}
 async function setConfigValue(key, value) {
 	await writeConfig({ [key]: value });
 }
-async function getApiKey() {
-	const envKey = process.env.GROQ_API_KEY;
-	if (envKey) {
-		debug("getApiKey: found in env");
-		return envKey;
+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();
-	if (config.GROQ_API_KEY) {
-		debug("getApiKey: found in config");
-		return config.GROQ_API_KEY;
+	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>\``);
+}
+function getModelForProvider(config, provider, defaultModel) {
+	return config[`model_${provider}`] ?? config.model ?? defaultModel;
+}
+//#endregion
+//#region src/services/hooks.ts
+/**
+* Parse git hook error output into structured, human-readable errors.
+* Handles output from lint-staged, biome, eslint, tsc, vitest, jest.
+*/
+function parseHookErrors(stderr) {
+	if (!stderr) return [];
+	debug("parseHookErrors: stderr length=%d", stderr.length);
+	const errors = [];
+	if (stderr.includes("lint-staged") || stderr.includes("[FAILED]")) errors.push(...parseLintStagedErrors(stderr));
+	if (stderr.includes("biome") || stderr.includes("Biome")) errors.push(...parseBiomeErrors(stderr));
+	if (stderr.includes("error TS") || stderr.includes("tsc")) errors.push(...parseTscErrors(stderr));
+	if (stderr.includes("vitest") || stderr.includes("jest") || stderr.includes("FAIL") || stderr.includes("test failed")) errors.push(...parseTestErrors(stderr));
+	if (stderr.includes("eslint") || stderr.includes("ESLint")) errors.push(...parseEslintErrors(stderr));
+	if (errors.length === 0) {
+		debug("parseHookErrors: no patterns matched, using raw fallback");
+		errors.push({
+			tool: "git hooks",
+			message: stderr.trim(),
+			raw: stderr
+		});
+	}
+	debug("parseHookErrors: found %d errors", errors.length);
+	return errors;
+}
+function parseLintStagedErrors(output) {
+	const errors = [];
+	for (const match of output.matchAll(/\[FAILED\]\s+(.+?)\s+\[FAILED\]/g)) {
+		const task = match[1].trim();
+		errors.push({
+			tool: "lint-staged",
+			message: `Task failed: ${task}`,
+			raw: match[0]
+		});
+	}
+	return errors;
+}
+function parseBiomeErrors(output) {
+	const errors = [];
+	for (const match of output.matchAll(/^(.+?):(\d+):(\d+)\s+(.+)$/gm)) errors.push({
+		tool: "biome",
+		message: `${match[1]}:${match[2]}:${match[3]} — ${match[4]}`,
+		raw: match[0]
+	});
+	if (errors.length === 0 && output.includes("biome")) errors.push({
+		tool: "biome",
+		message: "Biome check failed. See raw output for details.",
+		raw: output
+	});
+	return errors;
+}
+function parseTscErrors(output) {
+	const errors = [];
+	for (const match of output.matchAll(/^(.+?)\((\d+),(\d+)\):\s+error\s+(TS\d+):\s+(.+)$/gm)) errors.push({
+		tool: "tsc",
+		message: `${match[1]}:${match[2]}:${match[3]} — ${match[4]}: ${match[5]}`,
+		raw: match[0]
+	});
+	return errors;
+}
+function parseTestErrors(output) {
+	const errors = [];
+	const match = /FAIL\s+(.+\.(test|spec)\..+)/.exec(output);
+	if (match) errors.push({
+		tool: output.includes("vitest") ? "vitest" : "jest",
+		message: `Test file failed: ${match[1]}`,
+		raw: output
+	});
+	if (errors.length === 0 && (output.includes("vitest") || output.includes("jest"))) errors.push({
+		tool: output.includes("vitest") ? "vitest" : "jest",
+		message: "Tests failed. See raw output for details.",
+		raw: output
+	});
+	return errors;
+}
+function parseEslintErrors(output) {
+	const errors = [];
+	const lines = output.split("\n");
+	let currentFile = "";
+	for (const line of lines) {
+		if (!/^\s/.test(line) && line.includes("/")) {
+			currentFile = line.trim();
+			continue;
+		}
+		const match = line.match(/^\s*(\d+):(\d+)\s+(error|warning)\s+(.+)\s{2,}(\S+)\s*$/);
+		if (match) {
+			const [, lineNum, col, severity, message, rule] = match;
+			const file = currentFile || "unknown";
+			errors.push({
+				tool: "eslint",
+				message: `${file}:${lineNum}:${col} ${severity}: ${message} (${rule})`,
+				raw: line.trim()
+			});
+		}
+	}
+	return errors;
+}
+/**
+* Parse lint-staged/hook stderr output to discover which tools ran
+* and whether they succeeded. Used for clean post-commit summary.
+*/
+function parseToolChecks(stderr) {
+	if (!stderr) return [];
+	const checks = [];
+	for (const match of stderr.matchAll(/\[(COMPLETED|FAILED)\]\s+(.+)/g)) {
+		const status = match[1];
+		const command = match[2].trim();
+		if (isLintStagedMeta(command)) continue;
+		const tool = extractToolName(command);
+		if (!tool) continue;
+		checks.push({
+			tool,
+			ok: status === "COMPLETED"
+		});
+	}
+	const seen = /* @__PURE__ */ new Map();
+	for (const c of checks) seen.set(c.tool, c);
+	return [...seen.values()];
+}
+/** Heuristic: skip lint-staged internal metadata lines */
+function isLintStagedMeta(command) {
+	if (/[*{}[\]]/.test(command)) return true;
+	if (/\s[-–—]\s(\d+\s)?files?$/.test(command)) return true;
+	if (/\s[-–—]\sno\s files$/.test(command)) return true;
+	if (/^(Running tasks|Applying modifications|Cleaning up|Backing up|Backed up|Updating Git)/.test(command)) return true;
+	if (/\.{3}$/.test(command)) return true;
+	return false;
+}
+/** Extract a display-friendly tool name from a lint-staged command */
+function extractToolName(command) {
+	const unwrapped = unwrapShC(command);
+	if (unwrapped !== null) command = unwrapped;
+	command = findMeaningfulCommand(command);
+	return parseToolFromTokens(command.split(/\s+/));
+}
+/** Map common script names to their underlying tool */
+const SCRIPT_MAP = {
+	typecheck: "tsc",
+	lint: "eslint",
+	format: "prettier"
+};
+/** Package managers that use [run|exec] <script|tool> pattern */
+const PKG_MANAGERS = [
+	"npm",
+	"yarn",
+	"pnpm",
+	"bun"
+];
+/** Parse tool name from a tokenized command */
+function parseToolFromTokens(tokens) {
+	const first = tokens[0];
+	if (first === "sh" || first === "bash" || first === "zsh") return null;
+	if (PKG_MANAGERS.includes(first)) return parsePackageManagerTool(tokens);
+	if (first === "npx") return tokens[1] ?? null;
+	if (first === "uv") return parseUvTool(tokens);
+	return first;
+}
+/** Extract tool name from npm/yarn/pnpm/bun commands */
+function parsePackageManagerTool(tokens) {
+	const sub = tokens[1];
+	if (sub === "exec") return tokens[2] ?? null;
+	const script = tokens[sub === "run" ? 2 : 1];
+	if (!script) return null;
+	return SCRIPT_MAP[script] ?? script;
+}
+/** Extract tool name from uv commands */
+function parseUvTool(tokens) {
+	if (tokens[1] === "run") return tokens[2] ?? null;
+	if (tokens[1] === "tool" && tokens[2] === "run") return tokens[3] ?? null;
+	return null;
+}
+/** Unwrap sh -c 'command' or sh -c "command" wrappers */
+function unwrapShC(command) {
+	const quoted = command.match(/^(?:sh|bash|zsh)\s+-c\s+(['"])([\s\S]*)\1$/);
+	if (quoted) return quoted[2];
+	const bare = command.match(/^(?:sh|bash|zsh)\s+-c\s+(\S+)$/);
+	if (bare) return bare[1];
+	return null;
+}
+/** Find the meaningful command in a && chain, skipping cd segments */
+function findMeaningfulCommand(command) {
+	const segments = command.split(/\s*&&\s*/).map((s) => s.trim()).filter(Boolean);
+	for (const seg of segments) {
+		if (/^cd\s/.test(seg)) continue;
+		return seg;
 	}
-	debug("getApiKey: not found");
-	throw new Error("Please set your Groq API key via `cmint config set GROQ_API_KEY=<your token>`");
+	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
@@ -263,7 +530,7 @@ async function stageFiles(paths) {
 	debug("stageFiles:", paths);
 	await execa("git", ["add", ...paths]);
 }
-async function attemptCommit(message, extraArgs = []) {
+async function attemptCommit(message, extraArgs = [], onProgress) {
 	debug("attemptCommit:", message, extraArgs.length ? extraArgs : "(no extra args)");
 	try {
 		const subprocess = execa("git", [
@@ -273,8 +540,11 @@ async function attemptCommit(message, extraArgs = []) {
 			...extraArgs
 		]);
 		const stderrChunks = [];
+		const parser = onProgress ? createStderrParser() : null;
 		subprocess.stderr?.on("data", (chunk) => {
-			stderrChunks.push(chunk.toString());
+			const text = chunk.toString();
+			stderrChunks.push(text);
+			if (parser && onProgress) for (const step of parser(text)) onProgress(step);
 		});
 		await subprocess;
 		debug("attemptCommit: success");
@@ -292,411 +562,63 @@ async function attemptCommit(message, extraArgs = []) {
 		};
 	}
 }
-async function attemptCommitNoVerify(message) {
+async function attemptCommitNoVerify(message, onProgress) {
 	debug("attemptCommitNoVerify:", message);
-	return attemptCommit(message, ["--no-verify"]);
+	return attemptCommit(message, ["--no-verify"], onProgress);
 }
 //#endregion
-//#region src/services/hooks.ts
-/**
-* Parse git hook error output into structured, human-readable errors.
-* Handles output from lint-staged, biome, eslint, tsc, vitest, jest.
-*/
-function parseHookErrors(stderr) {
-	if (!stderr) return [];
-	debug("parseHookErrors: stderr length=%d", stderr.length);
-	const errors = [];
-	if (stderr.includes("lint-staged") || stderr.includes("[FAILED]")) errors.push(...parseLintStagedErrors(stderr));
-	if (stderr.includes("biome") || stderr.includes("Biome")) errors.push(...parseBiomeErrors(stderr));
-	if (stderr.includes("error TS") || stderr.includes("tsc")) errors.push(...parseTscErrors(stderr));
-	if (stderr.includes("vitest") || stderr.includes("jest") || stderr.includes("FAIL") || stderr.includes("test failed")) errors.push(...parseTestErrors(stderr));
-	if (stderr.includes("eslint") || stderr.includes("ESLint")) errors.push(...parseEslintErrors(stderr));
-	if (errors.length === 0) {
-		debug("parseHookErrors: no patterns matched, using raw fallback");
-		errors.push({
-			tool: "git hooks",
-			message: stderr.trim(),
-			raw: stderr
-		});
-	}
-	debug("parseHookErrors: found %d errors", errors.length);
-	return errors;
-}
-function parseLintStagedErrors(output) {
-	const errors = [];
-	for (const match of output.matchAll(/\[FAILED\]\s+(.+?)\s+\[FAILED\]/g)) {
-		const task = match[1].trim();
-		errors.push({
-			tool: "lint-staged",
-			message: `Task failed: ${task}`,
-			raw: match[0]
-		});
-	}
-	return errors;
+//#region src/services/clipboard.ts
+async function copyToClipboard(content) {
+	for (const [cmd, args] of [
+		["wl-copy", []],
+		["xclip", ["-selection", "clipboard"]],
+		["xsel", ["--clipboard", "--input"]],
+		["pbcopy", []]
+	]) try {
+		if (await new Promise((resolve) => {
+			const child = spawn(cmd, args, { stdio: [
+				"pipe",
+				"ignore",
+				"ignore"
+			] });
+			let settled = false;
+			const done = (result) => {
+				if (settled) return;
+				settled = true;
+				resolve(result);
+			};
+			child.on("error", () => done(false));
+			child.on("exit", (code) => {
+				if (code !== 0) done(false);
+			});
+			child.stdin.write(content, (err) => {
+				if (err) {
+					done(false);
+					return;
+				}
+				child.stdin.end(() => {
+					child.unref();
+					done(true);
+				});
+			});
+		})) return true;
+	} catch {}
+	return false;
 }
-function parseBiomeErrors(output) {
-	const errors = [];
-	for (const match of output.matchAll(/^(.+?):(\d+):(\d+)\s+(.+)$/gm)) errors.push({
-		tool: "biome",
-		message: `${match[1]}:${match[2]}:${match[3]} — ${match[4]}`,
-		raw: match[0]
-	});
-	if (errors.length === 0 && output.includes("biome")) errors.push({
-		tool: "biome",
-		message: "Biome check failed. See raw output for details.",
-		raw: output
-	});
-	return errors;
+//#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}`);
+	return /* @__PURE__ */ new Error(`Unexpected error: ${error instanceof Error ? error.message : String(error)}`);
 }
-function parseTscErrors(output) {
-	const errors = [];
-	for (const match of output.matchAll(/^(.+?)\((\d+),(\d+)\):\s+error\s+(TS\d+):\s+(.+)$/gm)) errors.push({
-		tool: "tsc",
-		message: `${match[1]}:${match[2]}:${match[3]} — ${match[4]}: ${match[5]}`,
-		raw: match[0]
-	});
-	return errors;
-}
-function parseTestErrors(output) {
-	const errors = [];
-	const match = /FAIL\s+(.+\.(test|spec)\..+)/.exec(output);
-	if (match) errors.push({
-		tool: output.includes("vitest") ? "vitest" : "jest",
-		message: `Test file failed: ${match[1]}`,
-		raw: output
-	});
-	if (errors.length === 0 && (output.includes("vitest") || output.includes("jest"))) errors.push({
-		tool: output.includes("vitest") ? "vitest" : "jest",
-		message: "Tests failed. See raw output for details.",
-		raw: output
-	});
-	return errors;
-}
-function parseEslintErrors(output) {
-	const errors = [];
-	for (const match of output.matchAll(/^\s*\d+:(\d+)\s+(error|warning)\s+(.+?)\s+(.+?)$/gm)) errors.push({
-		tool: "eslint",
-		message: `${match[2]}: ${match[3]} (${match[4]})`,
-		raw: match[0]
-	});
-	return errors;
-}
-/**
-* Parse lint-staged/hook stderr output to discover which tools ran
-* and whether they succeeded. Used for clean post-commit summary.
-*/
-function parseToolChecks(stderr) {
-	if (!stderr) return [];
-	const checks = [];
-	for (const match of stderr.matchAll(/\[(COMPLETED|FAILED)\]\s+(.+)/g)) {
-		const status = match[1];
-		const command = match[2].trim();
-		if (isLintStagedMeta(command)) continue;
-		const tool = extractToolName(command);
-		if (!tool) continue;
-		checks.push({
-			tool,
-			ok: status === "COMPLETED"
-		});
-	}
-	const seen = /* @__PURE__ */ new Map();
-	for (const c of checks) seen.set(c.tool, c);
-	return [...seen.values()];
-}
-/** Heuristic: skip lint-staged internal metadata lines */
-function isLintStagedMeta(command) {
-	if (/[*{}[\]]/.test(command)) return true;
-	if (/\s[-–—]\s(\d+\s)?files?$/.test(command)) return true;
-	if (/\s[-–—]\sno\s files$/.test(command)) return true;
-	if (/^(Running tasks|Applying modifications|Cleaning up|Backing up|Backed up|Updating Git)/.test(command)) return true;
-	if (/\.{3}$/.test(command)) return true;
-	return false;
-}
-/** Extract a display-friendly tool name from a lint-staged command */
-function extractToolName(command) {
-	const tokens = command.split(/\s+/);
-	const first = tokens[0];
-	if ([
-		"npm",
-		"yarn",
-		"pnpm",
-		"bun"
-	].includes(first)) {
-		const script = tokens[tokens[1] === "run" ? 2 : 1];
-		if (!script) return null;
-		return {
-			typecheck: "tsc",
-			lint: "eslint",
-			format: "prettier"
-		}[script] ?? script;
-	}
-	if (first === "npx") return tokens[1] ?? null;
-	return first;
-}
-//#endregion
-//#region src/services/lint-staged.ts
-const CONFIG_FILES = [
-	".lintstagedrc",
-	".lintstagedrc.json",
-	".lintstagedrc.yaml",
-	".lintstagedrc.yml",
-	".lintstagedrc.mjs",
-	".lintstagedrc.cjs",
-	"lint-staged.config.mjs",
-	"lint-staged.config.cjs",
-	"lint-staged.config.js"
-];
-async function hasLintStagedConfig(repoRoot) {
-	debug("hasLintStagedConfig: checking in %s", repoRoot);
-	for (const file of CONFIG_FILES) {
-		const path = join(repoRoot, file);
-		try {
-			await access(path, constants.F_OK);
-			debug("hasLintStagedConfig: found %s", file);
-			return true;
-		} catch {}
-	}
-	const packageJsonPath = join(repoRoot, "package.json");
-	try {
-		const raw = await readFile(packageJsonPath, "utf8");
-		if ("lint-staged" in JSON.parse(raw)) {
-			debug("hasLintStagedConfig: found lint-staged in package.json");
-			return true;
-		}
-	} catch {}
-	debug("hasLintStagedConfig: no config found");
-	return false;
-}
-async function runLintStaged() {
-	debug("runLintStaged: starting npx lint-staged");
-	const { failed, stdout, stderr } = await execa("npx", ["lint-staged"], { reject: false });
-	debug("runLintStaged: finished, failed=%s", failed);
-	return {
-		ok: !failed,
-		stdout,
-		stderr
-	};
-}
-//#endregion
-//#region src/services/clipboard.ts
-async function copyToClipboard(content) {
-	for (const [cmd, args] of [
-		["wl-copy", []],
-		["xclip", ["-selection", "clipboard"]],
-		["xsel", ["--clipboard", "--input"]],
-		["pbcopy", []]
-	]) try {
-		if (await new Promise((resolve) => {
-			const child = spawn(cmd, args, { stdio: [
-				"pipe",
-				"ignore",
-				"ignore"
-			] });
-			let settled = false;
-			const done = (result) => {
-				if (settled) return;
-				settled = true;
-				resolve(result);
-			};
-			child.on("error", () => done(false));
-			child.on("exit", (code) => {
-				if (code !== 0) done(false);
-			});
-			child.stdin.write(content, (err) => {
-				if (err) {
-					done(false);
-					return;
-				}
-				child.stdin.end(() => {
-					child.unref();
-					done(true);
-				});
-			});
-		})) return true;
-	} catch {}
-	return false;
-}
-//#endregion
-//#region src/ui/menu.ts
-async function showStagingMenu(files, hasLintStaged) {
-	debug("showStagingMenu: %d files", files.length);
-	const statusLabel = (status) => {
-		switch (status) {
-			case "M": return yellow("M");
-			case "A": return green("A");
-			case "D": return red("D");
-			case "?":
-			case "??": return cyan("?");
-			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",
-				hint: `${files.length} file${files.length !== 1 ? "s" : ""}`
-			},
-			...hasLintStaged ? [{
-				label: "Run lint-staged checks",
-				value: "lint-staged",
-				hint: "Pre-flight checks on all changed files"
-			}] : [],
-			{
-				label: "Select files...",
-				value: "select"
-			},
-			{
-				label: "Cancel",
-				value: "cancel"
-			}
-		]
-	});
-	if (p.isCancel(choice) || choice === "cancel") return null;
-	if (choice === "autogroup") return "autogroup";
-	if (choice === "lint-staged") return "lint-staged";
-	if (choice === "all") return {
-		files: files.map((f) => f.path),
-		all: true
-	};
-	const selected = await p.multiselect({
-		message: "Select files to stage:",
-		options: sorted.map((f) => ({
-			label: `${statusLabel(f.status)}  ${f.path}`,
-			value: f.path
-		})),
-		required: true
-	});
-	if (p.isCancel(selected)) return null;
-	return {
-		files: selected,
-		all: false
-	};
-}
-async function showRecoveryMenu(errors, onRetry, onSkipHooks, onRestage, message, rawStderr) {
-	debug("showRecoveryMenu: %d errors", errors.length);
-	let clipboardCopied = false;
-	let showNote = true;
-	while (true) {
-		if (showNote) {
-			p.note(errors.map((e) => `  ${red("•")} [${e.tool}] ${e.message}`).join("\n"), red(bold("Pre-commit hook failed")));
-			showNote = false;
-		}
-		const choice = await p.select({
-			message: "What do you want to do?",
-			options: [
-				{
-					label: clipboardCopied ? `${green("✓")} Copy error report to clipboard` : "Copy error report to clipboard",
-					value: "clipboard",
-					hint: clipboardCopied ? "Copied!" : "Paste into another terminal for an AI agent"
-				},
-				{
-					label: "Skip hooks and commit (--no-verify)",
-					value: "skip",
-					hint: "Commit anyway, fix later"
-				},
-				{
-					label: "Re-stage files and retry",
-					value: "restage",
-					hint: "Pick up fixes from another terminal"
-				},
-				{
-					label: "Edit commit message",
-					value: "edit",
-					hint: "Modify the message before retrying"
-				},
-				{
-					label: "Cancel",
-					value: "cancel"
-				}
-			]
-		});
-		if (p.isCancel(choice)) {
-			debug("showRecoveryMenu: user cancelled");
-			p.outro(yellow("Cancelled. Message cached for --retry."));
-			return "cancelled";
-		}
-		debug("showRecoveryMenu: user chose %s", choice);
-		switch (choice) {
-			case "clipboard":
-				if (await copyToClipboard(rawStderr)) {
-					clipboardCopied = true;
-					p.log.step(green("Copied to clipboard."));
-				} else p.log.warn(red("No clipboard tool found. Install xclip, wl-copy, or xsel."));
-				continue;
-			case "skip":
-				p.log.info(yellow("Committing with --no-verify..."));
-				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 "committed";
-				}
-				showNote = true;
-				continue;
-			case "edit": {
-				const edited = await p.text({
-					message: "Edit commit message:",
-					initialValue: message,
-					validate: (v) => v?.trim() ? void 0 : "Message cannot be empty"
-				});
-				if (p.isCancel(edited)) {
-					p.outro(yellow("Cancelled. Message cached for --retry."));
-					return "cancelled";
-				}
-				if (await onRetry()) {
-					p.outro(green("Committed successfully."));
-					return "committed";
-				} else {
-					p.outro(red("Commit failed again."));
-					return "failed";
-				}
-			}
-			case "cancel":
-				p.outro(dim("Message cached for --retry."));
-				return "cancelled";
-		}
-	}
-}
-//#endregion
-//#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)}`);
-}
-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();
+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);
@@ -776,13 +698,16 @@ function extractContentText(content) {
 	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({
+	const { client, model } = createProvider({
+		provider: options.provider ?? "groq",
 		apiKey: options.apiKey,
-		timeout: timeoutMs
+		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);
@@ -792,9 +717,9 @@ async function generateCommitMessage(diff, options) {
 	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);
+		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(options.model ?? "");
+			const isReasoningModel = /^(o[1-9]|.*gpt-oss.*|.*gpt-5.*)/i.test(model);
 			const completion = await client.chat.completions.create({
 				messages: [{
 					role: "system",
@@ -803,7 +728,7 @@ async function generateCommitMessage(diff, options) {
 					role: "user",
 					content: userPrompt
 				}],
-				model: options.model ?? "openai/gpt-oss-20b",
+				model,
 				temperature: .3,
 				...isReasoningModel ? { max_completion_tokens: 1024 } : { max_tokens: 1024 },
 				reasoning_format: "parsed"
@@ -849,7 +774,7 @@ async function generateCommitMessage(diff, options) {
 		return message;
 	} catch (error) {
 		debug("AI error: %s", error instanceof Error ? error.message : String(error));
-		throw mapGroqError$1(error);
+		throw mapGroqError(error, options.provider ? formatProviderName(options.provider) : void 0);
 	}
 }
 //#endregion
@@ -892,9 +817,12 @@ function buildReviewPrompt(diff, files, statSummary) {
 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({
+	const { client, model } = createProvider({
+		provider: options.provider ?? "groq",
 		apiKey: options.apiKey,
-		timeout: timeoutMs
+		modelOverride: options.model,
+		timeout: timeoutMs,
+		baseURLOverride: options.proxy
 	});
 	const compressedDiff = compressDiff(diff);
 	const statSummary = buildStatSummary(diff);
@@ -910,7 +838,7 @@ async function generateCodeReview(diff, files, options) {
 				role: "user",
 				content: userPrompt
 			}],
-			model: options.model ?? "openai/gpt-oss-20b",
+			model,
 			temperature: .3,
 			max_tokens: 4096
 		});
@@ -931,7 +859,7 @@ async function generateCodeReview(diff, files, options) {
 		return content;
 	} catch (error) {
 		debug("generateCodeReview error: %s", error instanceof Error ? error.message : String(error));
-		throw mapGroqError$1(error);
+		throw mapGroqError(error, options.provider ? formatProviderName(options.provider) : void 0);
 	}
 }
 //#endregion
@@ -952,7 +880,7 @@ async function reviewCommand() {
 		outro(dim("Staged files are all excluded from review."));
 		return;
 	}
-	intro("commit-mint — code review");
+	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) {
@@ -987,14 +915,19 @@ async function isOpenCodeAvailable() {
 	}
 }
 async function reviewWithGroq(diff, files) {
+	const config = await readConfig();
+	const provider = isValidProvider(config.provider ?? "groq") ? config.provider : "groq";
+	const apiKey = await getProviderApiKey(provider);
+	const model = getModelForProvider(config, provider, PROVIDER_CONFIGS[provider].defaultModel);
 	const s = spinner();
-	s.start("Reviewing with Groq...");
+	s.start(`Reviewing with ${formatProviderName(provider)}...`);
 	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
+			apiKey,
+			model,
+			timeout: config.timeout ? Number.parseInt(config.timeout, 10) : void 0,
+			provider,
+			proxy: config.proxy
 		});
 		s.stop("Review complete");
 		return report;
@@ -1050,8 +983,10 @@ async function runCodeReview() {
 		return;
 	}
 	const opencodeAvailable = await isOpenCodeAvailable();
+	const config = await readConfig();
+	const provider = isValidProvider(config.provider ?? "groq") ? config.provider : "groq";
 	const s = spinner();
-	s.start(opencodeAvailable ? "Running OpenCode review..." : "Running Groq review...");
+	s.start(opencodeAvailable ? "Running OpenCode review..." : `Running ${formatProviderName(provider)} review...`);
 	try {
 		const report = opencodeAvailable ? await reviewWithOpenCode(diffResult.diff, diffResult.files) : await reviewWithGroq(diffResult.diff, diffResult.files);
 		s.stop("Review complete");
@@ -1167,14 +1102,201 @@ async function loadCachedCommit(repoPath) {
 	}
 }
 //#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)}`);
+//#region src/services/checks.ts
+/** Config file names, checked in priority order (matches lint-staged naming conventions) */
+const CONFIG_FILES = [
+	".cmintrc",
+	".cmintrc.json",
+	".cmintrc.mjs",
+	".cmintrc.mts",
+	".cmintrc.js",
+	".cmintrc.ts",
+	".cmintrc.cjs",
+	".cmintrc.cts",
+	"cmint.config.mjs",
+	"cmint.config.mts",
+	"cmint.config.js",
+	"cmint.config.ts",
+	"cmint.config.cjs",
+	"cmint.config.cts"
+];
+/**
+* Detect whether the repo has a cmint config file.
+* Returns the config file path, or null if none found.
+*/
+async function detectConfig(repoRoot) {
+	debug("detectConfig: checking for config in %s", repoRoot);
+	for (const name of CONFIG_FILES) try {
+		await access(join(repoRoot, name), constants.R_OK);
+		debug("detectConfig: found %s", name);
+		return join(repoRoot, name);
+	} catch {}
+	debug("detectConfig: no config file found");
+	return null;
+}
+/**
+* Load and validate the cmint config from a repo root.
+* Throws if the loaded value is missing or not a non-null object.
+*/
+async function loadConfig(repoRoot) {
+	const configPath = await detectConfig(repoRoot);
+	if (!configPath) throw new Error("No cmint config file found");
+	debug("loadConfig: loading %s", configPath);
+	const ext = extname(configPath);
+	const isJSON = ext === ".json";
+	const needsJiti = ext === ".ts" || ext === ".mts" || ext === ".cts" || ext === ".cjs";
+	let config;
+	if (isJSON) {
+		const raw = readFileSync(configPath, "utf-8");
+		config = JSON.parse(raw);
+	} else if (needsJiti) {
+		const { createJiti } = await import("jiti");
+		const mod = await createJiti(import.meta.url, {}).import(configPath);
+		config = mod.default ?? mod;
+	} else config = (await import(configPath)).default;
+	if (!config || typeof config !== "object" || Array.isArray(config)) throw new Error("cmint config must export a non-null object with glob→command mappings");
+	debug("loadConfig: loaded %d glob patterns", Object.keys(config).length);
+	return config;
+}
+/**
+* Run a shell command and capture its output.
+* Returns a CheckResult with ok=true on success (exit 0), ok=false on failure.
+* Handles ENOENT (command not found) and timeout errors gracefully.
+*/
+async function runCommand(command, timeout, repoRoot) {
+	debug("runCommand: %s (timeout: %dms)", command, timeout);
+	const tool = extractToolName(command) ?? command.split(" ")[0];
+	try {
+		const result = await execa(command, {
+			shell: true,
+			reject: false,
+			timeout,
+			all: true,
+			preferLocal: true,
+			...repoRoot ? { localDir: repoRoot } : {}
+		});
+		const ok = !result.failed;
+		debug("runCommand: %s — ok=%s", tool, ok);
+		return {
+			ok,
+			tool,
+			command,
+			stdout: result.stdout ?? "",
+			stderr: result.stderr ?? "",
+			files: []
+		};
+	} catch (err) {
+		const msg = err instanceof Error ? err.message : String(err);
+		const isTimedOut = msg.toLowerCase().includes("timed out");
+		const isNotFound = msg.toLowerCase().includes("enoent") || msg.toLowerCase().includes("not found");
+		debug("runCommand: %s — error: %s", tool, msg);
+		return {
+			ok: false,
+			tool,
+			command,
+			stdout: "",
+			stderr: isTimedOut ? `Check timed out after ${timeout}ms` : isNotFound ? `Command not found: ${tool}` : msg,
+			files: []
+		};
+	}
+}
+/**
+* Filter a list of file paths by a picomatch glob pattern.
+* When the pattern contains no `/`, files are matched at any depth (matchBase).
+* Dotfiles are included (dot: true).
+*/
+function matchFiles(pattern, files) {
+	if (!pattern) return [];
+	const matchBase = !pattern.includes("/");
+	const isMatch = picomatch(pattern, {
+		dot: true,
+		posixSlashes: true,
+		strictBrackets: true
+	});
+	return files.filter((f) => {
+		const parts = f.split("/");
+		return isMatch(matchBase ? parts[parts.length - 1] : f);
+	});
+}
+/**
+* Build a shell command string from a base command and a list of file paths.
+* File paths containing spaces are wrapped in double quotes.
+* If no files are provided, the base command is returned as-is.
+*/
+function buildCommand(command, files) {
+	if (files.length === 0) return command;
+	return `${command} ${files.map((f) => f.includes(" ") ? `"${f}"` : f).join(" ")}`;
+}
+/**
+* Resolve config commands for a glob entry into an array of command strings.
+* Function commands receive matched filenames; string commands are used as-is.
+*/
+function resolveCommands(commands, matchedFiles) {
+	if (typeof commands === "function") {
+		const resolved = commands(matchedFiles);
+		return Array.isArray(resolved) ? resolved : [resolved];
+	}
+	return Array.isArray(commands) ? commands : [commands];
+}
+/**
+* Run resolved commands for a single glob entry, appending results.
+* Returns false if any command fails (for fail-fast signaling).
+*/
+async function runCommandsForGlob(cmds, isFunction, matchedFiles, timeout, results, repoRoot) {
+	for (const cmd of cmds) {
+		const fullCommand = isFunction ? cmd : buildCommand(cmd, matchedFiles);
+		debug("runCommandsForGlob: running '%s'", fullCommand);
+		const result = await runCommand(fullCommand, timeout, repoRoot);
+		results.push({
+			...result,
+			files: matchedFiles
+		});
+		if (!result.ok) {
+			debug("runCommandsForGlob: check failed, stopping (fail-fast)");
+			return false;
+		}
+	}
+	return true;
+}
+/**
+* Run all user-defined checks from .cmintrc against staged files.
+* Returns a no-op result when no config exists.
+* Fail-fast: stops on first error.
+*/
+async function runAllChecks(repoRoot, stagedFiles, timeout) {
+	debug("runAllChecks: %d staged files, checking for config in %s", stagedFiles.length, repoRoot);
+	if (!await detectConfig(repoRoot)) {
+		debug("runAllChecks: no config found, skipping checks");
+		return {
+			ok: true,
+			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);
+		const isFunction = typeof commands === "function";
+		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), isFunction, 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/grouping.ts
 function matchesExcludePattern(filePath, pattern) {
 	if (pattern === filePath) return true;
 	if (pattern.endsWith("/**")) {
@@ -1191,7 +1313,9 @@ function matchesExcludePattern(filePath, pattern) {
 const LOCKFILE_COMPANIONS = {
 	"package-lock.json": "package.json",
 	"pnpm-lock.yaml": "package.json",
-	"yarn.lock": "package.json"
+	"yarn.lock": "package.json",
+	"bun.lock": "package.json",
+	"bun.lockb": "package.json"
 };
 function filterExcludedFiles(files) {
 	const patterns = getDefaultExcludes();
@@ -1265,7 +1389,7 @@ function parseGroupingResponse(content) {
 	});
 	return rawGroups;
 }
-async function generateGroups(files, apiKey, model, timeout) {
+async function generateGroups(files, apiKey, model, timeout, provider, proxy) {
 	debug("generateGroups: %d files, model=%s", files.length, model ?? "default");
 	const { included, excluded } = filterExcludedFiles(files);
 	if (included.length === 0) {
@@ -1280,9 +1404,12 @@ async function generateGroups(files, apiKey, model, timeout) {
 	const userPrompt = buildGroupingUserPrompt(summary);
 	debug("File summary:\n%s", summary);
 	debug("User prompt length: %d chars", userPrompt.length);
-	const client = new Groq({
+	const { client, model: resolvedModel } = createProvider({
+		provider: provider ?? "groq",
 		apiKey,
-		timeout: timeout ?? 6e4
+		modelOverride: model,
+		timeout: timeout ?? 6e4,
+		baseURLOverride: proxy
 	});
 	try {
 		const completion = await client.chat.completions.create({
@@ -1293,7 +1420,7 @@ async function generateGroups(files, apiKey, model, timeout) {
 				role: "user",
 				content: userPrompt
 			}],
-			model: model ?? "openai/gpt-oss-20b",
+			model: resolvedModel,
 			temperature: .3,
 			max_tokens: 2048
 		});
@@ -1312,7 +1439,7 @@ async function generateGroups(files, apiKey, model, timeout) {
 		};
 	} catch (error) {
 		debug("generateGroups error: %s", error instanceof Error ? error.message : String(error));
-		throw mapGroqError(error);
+		throw mapGroqError(error, provider ? formatProviderName(provider) : void 0);
 	}
 }
 function validateGroups(groups, allFiles) {
@@ -1339,72 +1466,367 @@ function validateGroups(groups, allFiles) {
 			files: ungrouped.map((f) => f.path)
 		});
 	}
-	return validated;
+	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}"`)}`);
+}
+const statusLabel = (status) => {
+	switch (status) {
+		case "M": return yellow("M");
+		case "A": return green("A");
+		case "D": return red("D");
+		case "?":
+		case "??": return cyan("?");
+		default: return dim(status);
+	}
+};
+/** Display a table of changed files with status indicators */
+function showChangedFilesTable(files) {
+	if (files.length === 0) return;
+	const lines = files.map((f) => `  ${statusLabel(f.status)}  ${f.path}`);
+	p.note(lines.join("\n"), `${files.length} file${files.length !== 1 ? "s" : ""} changed`);
+}
+/** Display a compact grouping summary (only shown when >1 group) */
+function showGroupingSummary(groups) {
+	if (groups.length <= 1) return;
+	const lines = groups.map((g) => `${bold(g.name)} ${dim("—")} ${g.files.length} file${g.files.length !== 1 ? "s" : ""}`);
+	p.note(lines.join("\n"), "Commit groups");
+}
+//#endregion
+//#region src/ui/menu.ts
+async function showStagingMenu(files, hasChecks) {
+	debug("showStagingMenu: %d files", files.length);
+	const statusLabel = (status) => {
+		switch (status) {
+			case "M": return yellow("M");
+			case "A": return green("A");
+			case "D": return red("D");
+			case "?":
+			case "??": return cyan("?");
+			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"
+			},
+			...stagedFiles.length > 0 ? [{
+				label: "Commit staged files only",
+				value: "staged",
+				hint: `${stagedFiles.length} file${stagedFiles.length !== 1 ? "s" : ""} already staged`
+			}] : [],
+			{
+				label: "Stage all files",
+				value: "all",
+				hint: `${files.length} file${files.length !== 1 ? "s" : ""}`
+			},
+			...hasChecks ? [{
+				label: "Run checks",
+				value: "checks",
+				hint: "Pre-flight checks from cmint config"
+			}] : [],
+			{
+				label: "Select files...",
+				value: "select"
+			},
+			{
+				label: "Cancel",
+				value: "cancel"
+			}
+		]
+	});
+	if (p.isCancel(choice) || choice === "cancel") return null;
+	if (choice === "autogroup") return "autogroup";
+	if (choice === "checks") return "checks";
+	if (choice === "staged") return "staged";
+	if (choice === "all") return {
+		files: files.map((f) => f.path),
+		all: true
+	};
+	const selected = await p.multiselect({
+		message: "Select files to stage:",
+		options: sorted.map((f) => ({
+			label: `${statusLabel(f.status)}  ${f.path}`,
+			value: f.path
+		})),
+		required: true
+	});
+	if (p.isCancel(selected)) return null;
+	return {
+		files: selected,
+		all: false
+	};
+}
+async function showRecoveryMenu(errors, onRetry, onSkipHooks, onRestage, message, rawStderr) {
+	debug("showRecoveryMenu: %d errors", errors.length);
+	let clipboardCopied = false;
+	let showNote = true;
+	while (true) {
+		if (showNote) {
+			p.note(errors.map((e) => `  ${red("•")} [${e.tool}] ${e.message}`).join("\n"), red(bold("Pre-commit hook failed")));
+			showNote = false;
+		}
+		const choice = await p.select({
+			message: "What do you want to do?",
+			options: [
+				{
+					label: clipboardCopied ? `${green("✓")} Copy error report to clipboard` : "Copy error report to clipboard",
+					value: "clipboard",
+					hint: clipboardCopied ? "Copied!" : "Paste into another terminal for an AI agent"
+				},
+				{
+					label: "View full error output",
+					value: "view",
+					hint: "Show the raw stderr from hooks"
+				},
+				{
+					label: "Skip hooks and commit (--no-verify)",
+					value: "skip",
+					hint: "Commit anyway, fix later"
+				},
+				{
+					label: "Re-stage files and retry",
+					value: "restage",
+					hint: "Pick up fixes from another terminal"
+				},
+				{
+					label: "Edit commit message",
+					value: "edit",
+					hint: "Modify the message before retrying"
+				},
+				{
+					label: "Cancel",
+					value: "cancel"
+				}
+			]
+		});
+		if (p.isCancel(choice)) {
+			debug("showRecoveryMenu: user cancelled");
+			p.outro(yellow("Cancelled. Message cached for --retry."));
+			return "cancelled";
+		}
+		debug("showRecoveryMenu: user chose %s", choice);
+		switch (choice) {
+			case "clipboard":
+				if (await copyToClipboard(rawStderr)) {
+					clipboardCopied = true;
+					p.log.step(green("Copied to clipboard."));
+				} else p.log.warn(red("No clipboard tool found. Install xclip, wl-copy, or xsel."));
+				continue;
+			case "view":
+				p.note(rawStderr.trim() || "(no raw output)", "Full error output");
+				showNote = true;
+				continue;
+			case "skip":
+				p.log.info(yellow("Committing with --no-verify..."));
+				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 "committed";
+				}
+				showNote = true;
+				continue;
+			case "edit": {
+				const edited = await p.text({
+					message: "Edit commit message:",
+					initialValue: message,
+					validate: (v) => v?.trim() ? void 0 : "Message cannot be empty"
+				});
+				if (p.isCancel(edited)) {
+					p.outro(yellow("Cancelled. Message cached for --retry."));
+					return "cancelled";
+				}
+				if (await onRetry()) {
+					p.outro(green("Committed successfully."));
+					return "committed";
+				} else {
+					p.outro(red("Commit failed again."));
+					return "failed";
+				}
+			}
+			case "cancel":
+				p.outro(dim("Message cached for --retry."));
+				return "cancelled";
+		}
+	}
 }
-//#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;
+async function showCheckFailureMenu(errors, rawStderr) {
+	debug("showCheckFailureMenu: %d errors", errors.length);
+	let clipboardCopied = false;
+	p.note(errors.map((e) => `  ${red("•")} [${e.tool}] ${e.message}`).join("\n"), red("Pre-commit check failed"));
+	while (true) {
+		const choice = await p.select({
+			message: "What do you want to do?",
+			options: [
+				{
+					label: clipboardCopied ? `${green("✓")} Copy error report to clipboard` : "Copy error report to clipboard",
+					value: "copy"
+				},
+				{
+					label: "View full error output",
+					value: "view",
+					hint: "Show the raw stderr from checks"
+				},
+				{
+					label: "Skip checks and commit",
+					value: "skip"
+				},
+				{
+					label: "Cancel",
+					value: "cancel"
+				}
+			]
+		});
+		if (p.isCancel(choice)) {
+			debug("showCheckFailureMenu: user cancelled");
+			return "cancelled";
+		}
+		debug("showCheckFailureMenu: user chose %s", choice);
+		switch (choice) {
+			case "copy":
+				if (await copyToClipboard(rawStderr)) {
+					clipboardCopied = true;
+					p.log.step(green("Copied to clipboard."));
+				} else p.log.warn(red("No clipboard tool found. Install xclip, wl-copy, or xsel."));
+				continue;
+			case "view":
+				p.note(rawStderr.trim() || "(no raw output)", "Full error output");
+				continue;
+			case "skip":
+				p.log.info("Skipping checks and proceeding with commit...");
+				return "skipped";
+			case "cancel":
+				p.outro(dim("Cancelled."));
+				return "cancelled";
+		}
 	}
-	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);
+	if (excluded.length > 0) {
+		debug("Committing %d excluded files upfront:", excluded.length, excluded);
+		const message = buildExcludedFilesMessage(excluded);
+		await resetStaging();
+		await stageFiles(excluded);
+		const headBefore = await getHead();
+		const commitResult = await attemptCommit(message);
+		const headAfter = await getHead();
+		if (commitResult.ok || headBefore !== headAfter) debug("Excluded files committed:", message);
+		else debug("Excluded files commit failed, continuing without them");
+	}
+	if (included.length === 0) {
+		debug("No included files to group, done");
+		outro(green("Done."));
+		return "committed";
+	}
+	if (!flags.noCheck) {
+		const { getRepoRoot } = await Promise.resolve().then(() => git_exports);
+		const repoRoot = await getRepoRoot();
+		const allFiles = included.filter((f) => f.status !== "D").map((f) => f.path);
+		debug("Running user checks on %d files...", allFiles.length);
+		const ck = spinner();
+		ck.start("Running checks...");
+		const checkResults = await runAllChecks(repoRoot, allFiles, 6e4);
+		debug("Check results: ok=%s, count=%d", checkResults.ok, checkResults.results.length);
+		if (!checkResults.ok) {
+			ck.stop(`${checkResults.results.filter((r) => !r.ok).length} check(s) failed`);
+			const rawStderr = checkResults.results.filter((r) => !r.ok).map((r) => `[${r.tool}] ${r.stderr}`).join("\n");
+			if (await showCheckFailureMenu(parseHookErrors(rawStderr), rawStderr) === "cancelled") return "cancelled";
+		} else {
+			ck.stop("All checks passed");
+			if (checkResults.results.length > 0) log.info(checkResults.results.map((r) => `  ${green("✓")} ${r.tool}`).join("\n"));
+		}
+	}
+	const config = await readConfig();
+	const resolvedProvider = config.provider ?? "groq";
+	const provider = isValidProvider(resolvedProvider) ? resolvedProvider : "groq";
 	try {
-		await getApiKey();
+		await getProviderApiKey(provider);
 		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_...",
+			message: `Enter your ${formatProviderName(provider)} API key:`,
+			placeholder: provider === "groq" ? "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());
+		const configKey = PROVIDER_ENV_KEYS[provider];
+		await setConfigValue(configKey, 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);
+	const validatedGroups = validateGroups((await generateGroups(included, await getProviderApiKey(provider), getModelForProvider(config, provider, PROVIDER_CONFIGS[provider].defaultModel), config.timeout ? parseInt(config.timeout, 10) : void 0, provider, config.proxy)).groups, included);
 	s.stop("Files analyzed");
+	showChangedFilesTable(included);
+	showGroupingSummary(validatedGroups);
 	if (flags.auto) debug("Auto mode: skipping grouping confirmation");
 	else if (!await showGroupingConfirmation(validatedGroups, excluded)) {
 		outro(dim("Cancelled."));
@@ -1442,9 +1864,9 @@ async function runAutoGroupFlow(changedFiles, flags) {
 		}
 		const { getRepoRoot } = await Promise.resolve().then(() => git_exports);
 		await saveCachedCommit(await getRepoRoot(), message);
-		s.start("Committing...");
+		s.start("Running pre-commit hooks...");
 		const headBefore = await getHead();
-		const commitResult = await attemptCommit(message);
+		const commitResult = await attemptCommit(message, [], createProgressHandler(s));
 		const headAfter = await getHead();
 		if (commitResult.ok || headBefore !== headAfter) {
 			s.stop("Committed successfully.");
@@ -1471,14 +1893,19 @@ async function runAutoGroupFlow(changedFiles, flags) {
 }
 async function generateMessage(diff, hint) {
 	const config = await readConfig();
-	const apiKey = await getApiKey();
-	debug("Generating message with model:", config.model, "type:", config.type);
+	const resolvedProvider = config.provider ?? "groq";
+	const provider = isValidProvider(resolvedProvider) ? resolvedProvider : "groq";
+	const apiKey = await getProviderApiKey(provider);
+	const model = getModelForProvider(config, provider, PROVIDER_CONFIGS[provider].defaultModel);
+	debug("Generating message with provider:", provider, "model:", model, "type:", config.type);
 	return generateCommitMessage(diff, {
 		apiKey,
-		model: config.model,
+		model,
 		type: config.type,
 		timeout: config.timeout ? parseInt(config.timeout, 10) : void 0,
-		hint
+		hint,
+		provider,
+		proxy: config.proxy
 	});
 }
 function buildExcludedFilesMessage(files) {
@@ -1491,46 +1918,143 @@ function buildExcludedFilesMessage(files) {
 	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);
+//#region src/commands/commit-utils.ts
+/** Shared recovery menu factory — avoids repeating the same callback set */
+function makeRecoveryCallbacks(message) {
+	return {
+		retry: async () => (await attemptCommit(message)).ok,
+		skipHooks: async (msg) => (await attemptCommitNoVerify(msg)).ok,
+		restage: async () => {
+			await stageAll();
+			return (await attemptCommit(message)).ok;
+		},
+		message
+	};
+}
+/**
+* Attempt commit with automatic recovery flow.
+* Handles the attempt → HEAD check → success (tool checks display)
+* / failure (recovery menu) pattern.
+* Caller is responsible for starting the spinner and showing the final outro.
+*/
+async function commitWithRecovery(message, s, headBefore) {
+	const result = await attemptCommit(message, [], createProgressHandler(s));
+	const headAfter = await getHead();
+	if (result.ok || headBefore !== headAfter) {
+		s.stop("Committed successfully.");
+		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"));
 		}
-		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"));
+		return "committed";
+	}
+	s.stop("Commit failed.");
+	const errors = parseHookErrors(result.stderr ?? "");
+	const cb = makeRecoveryCallbacks(message);
+	if (await showRecoveryMenu(errors, cb.retry, cb.skipHooks, cb.restage, cb.message, result.stderr ?? "") === "cancelled") return "cancelled";
+	return "committed";
+}
+//#endregion
+//#region src/commands/retry.ts
+/** Handle --retry mode: load cached message and re-attempt commit */
+async function handleRetry() {
+	debug("Entering retry mode");
+	const cached = await loadCachedCommit(await getRepoRoot());
+	if (!cached) {
+		outro(red("No cached commit message found. Run cmint without --retry first."));
+		process.exit(1);
+	}
+	intro("🌿 commit-mint — retry");
+	const s = spinner();
+	const headBefore = await getHead();
+	s.start("Running pre-commit hooks...");
+	if (await commitWithRecovery(cached.message, s, headBefore) === "committed") outro(green("Committed successfully."));
+	else process.exit(1);
+}
+//#endregion
+//#region src/commands/staging.ts
+/** Interactive staging loop for multiple changed files */
+async function handleStaging(changedFiles, flags) {
+	const repoRoot = await getRepoRoot();
+	const checksAvailable = await detectConfig(repoRoot) !== null;
+	debug("checks available:", checksAvailable);
+	let stagingResult = null;
+	let filesToStage = [];
+	let stageAllFlag = false;
+	let skipStaging = false;
+	let currentFiles = changedFiles;
+	while (true) {
+		stagingResult = await showStagingMenu(currentFiles, checksAvailable);
+		if (stagingResult === "autogroup") {
+			if (flags.message) {
+				outro(red("--message flag is not compatible with auto-group mode."));
+				return null;
 			}
-			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;
+			if (await runAutoGroupFlow(currentFiles, flags) !== "committed") process.exit(1);
+			return null;
+		}
+		if (stagingResult === "checks") {
+			await stageAll();
+			const ckSpinner = spinner();
+			ckSpinner.start("Running checks...");
+			const ckResult = await runAllChecks(repoRoot, currentFiles.filter((f) => f.status !== "D").map((f) => f.path), 6e4);
+			if (ckResult.ok) {
+				ckSpinner.stop("All checks passed");
+				for (const r of ckResult.results) if (r.stdout.trim()) log.info(dim(r.stdout.trim()));
+			} else {
+				const failed = ckResult.results.filter((r) => !r.ok);
+				ckSpinner.stop(`${failed.length} check${failed.length !== 1 ? "s" : ""} failed`);
+				for (const r of failed) log.info(r.stderr?.trim() || r.stdout?.trim() || `Check failed: ${r.command}`);
+			}
+			currentFiles = await getChangedFiles();
+			continue;
+		}
+		if (stagingResult === "staged") {
+			skipStaging = true;
+			break;
+		}
+		if (!stagingResult) {
+			outro(dim("Cancelled."));
+			return null;
 		}
+		filesToStage = stagingResult.files;
+		stageAllFlag = stagingResult.all;
+		break;
+	}
+	if (!skipStaging) {
+		const s = spinner();
+		s.start(`Staging ${filesToStage.length} file${filesToStage.length !== 1 ? "s" : ""}...`);
+		if (stageAllFlag) await stageAll();
+		else await stageFiles(filesToStage);
+		s.stop("Files staged");
 	}
-	intro("commit-mint");
+	return {
+		changedFiles: currentFiles,
+		skipStaging
+	};
+}
+/** Run user-defined pre-commit checks from cmint config */
+async function runPreCommitChecks(changedFiles, noCheck) {
+	if (noCheck) return;
+	const checkRoot = await getRepoRoot();
+	const stagedFileList = changedFiles.filter((f) => f.staged && f.status !== "D").map((f) => f.path);
+	if (stagedFileList.length === 0) return;
+	debug("Running user checks on %d staged files...", stagedFileList.length);
+	const checkResults = await runAllChecks(checkRoot, stagedFileList, 6e4);
+	debug("Check results: ok=%s, count=%d", checkResults.ok, checkResults.results.length);
+	if (!checkResults.ok) {
+		const rawStderr = checkResults.results.filter((r) => !r.ok).map((r) => `[${r.tool}] ${r.stderr}`).join("\n");
+		if (await showCheckFailureMenu(parseHookErrors(rawStderr), rawStderr) === "cancelled") process.exit(1);
+	}
+}
+//#endregion
+//#region src/commands/commit.ts
+async function commitCommand(flags) {
+	debug("commitCommand called", { flags });
+	await assertGitRepo();
+	if (flags.retry) return handleRetry();
+	intro("🌿 commit-mint");
 	const status = await getStatusShort();
 	debug("Git status:", status || "(empty)");
 	if (!status) {
@@ -1553,49 +2077,9 @@ async function commitCommand(flags) {
 			await stageFiles([changedFiles[0].path]);
 			s.stop("File staged");
 		} else {
-			const { getRepoRoot } = await Promise.resolve().then(() => git_exports);
-			const lintStagedAvailable = await hasLintStagedConfig(await getRepoRoot());
-			debug("lint-staged available:", lintStagedAvailable);
-			let stagingResult = null;
-			let filesToStage = [];
-			let stageAllFlag = false;
-			while (true) {
-				stagingResult = await showStagingMenu(changedFiles, lintStagedAvailable);
-				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 === "lint-staged") {
-					await stageAll();
-					const lsSpinner = spinner();
-					lsSpinner.start("Running lint-staged checks...");
-					const lsResult = await runLintStaged();
-					if (lsResult.ok) {
-						lsSpinner.stop("All lint-staged checks passed");
-						if (lsResult.stdout.trim()) log.info(dim(lsResult.stdout.trim()));
-					} else {
-						lsSpinner.stop("Lint-staged checks failed");
-						log.info(lsResult.stderr?.trim() || lsResult.stdout?.trim() || "Unknown error");
-					}
-					changedFiles = await getChangedFiles();
-					continue;
-				}
-				if (!stagingResult) {
-					outro(dim("Cancelled."));
-					return;
-				}
-				filesToStage = stagingResult.files;
-				stageAllFlag = stagingResult.all;
-				break;
-			}
-			s.start(`Staging ${filesToStage.length} file${filesToStage.length !== 1 ? "s" : ""}...`);
-			if (stageAllFlag) await stageAll();
-			else await stageFiles(filesToStage);
-			s.stop("Files staged");
+			const result = await handleStaging(changedFiles, flags);
+			if (!result) return;
+			changedFiles = result.changedFiles;
 		}
 	} catch (err) {
 		s.stop(red("Staging failed."));
@@ -1604,6 +2088,8 @@ async function commitCommand(flags) {
 		outro(red(`Failed to stage files: ${msg}`));
 		process.exit(1);
 	}
+	changedFiles = await getChangedFiles();
+	await runPreCommitChecks(changedFiles, flags.noCheck);
 	const diffResult = await getStagedDiff();
 	if (!diffResult) {
 		debug("No staged changes found after staging");
@@ -1614,22 +2100,14 @@ async function commitCommand(flags) {
 		debug("All staged files are excluded:", diffResult.excludedFiles);
 		const message = buildExcludedFilesMessage(diffResult.excludedFiles);
 		log.info(diffResult.excludedFiles.map((f) => `     ${f}`).join("\n"));
-		const { getRepoRoot } = await Promise.resolve().then(() => git_exports);
 		await saveCachedCommit(await getRepoRoot(), message);
-		s.start("Committing...");
-		const headBefore = await getHead();
-		const result = await attemptCommit(message);
-		const headAfter = await getHead();
-		if (result.ok || headBefore !== headAfter) {
-			s.stop("Committed successfully.");
+		s.start("Running pre-commit hooks...");
+		const result = await commitWithRecovery(message, s, await getHead());
+		if (result === "committed") {
 			outro(green("Done."));
 			return;
 		}
-		s.stop("Commit failed.");
-		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 ?? "") === "cancelled") process.exit(1);
+		if (result === "cancelled") process.exit(1);
 		return;
 	}
 	debug("Staged files:", diffResult.files);
@@ -1640,22 +2118,25 @@ async function commitCommand(flags) {
 		debug("Using provided message:", flags.message);
 		message = flags.message;
 	} else {
+		const config = await readConfig();
+		const provider = isValidProvider(config.provider ?? "groq") ? config.provider : "groq";
 		try {
-			await getApiKey();
+			await getProviderApiKey(provider);
 			debug("API key found");
 		} catch {
 			debug("No API key found, prompting user");
 			const { text: promptText } = await import("@clack/prompts");
+			const configKey = PROVIDER_ENV_KEYS[provider];
 			const key = await promptText({
-				message: "Enter your Groq API key:",
-				placeholder: "gsk_...",
+				message: `Enter your ${formatProviderName(provider)} API key:`,
+				placeholder: provider === "groq" ? "gsk_..." : "...",
 				validate: (v) => v?.trim() ? void 0 : "API key is required"
 			});
 			if (isCancel(key)) {
 				outro(dim("Cancelled."));
 				return;
 			}
-			await setConfigValue("GROQ_API_KEY", String(key).trim());
+			await setConfigValue(configKey, String(key).trim());
 			debug("API key saved to config");
 		}
 		s.start("Generating commit message...");
@@ -1678,66 +2159,197 @@ async function commitCommand(flags) {
 		return;
 	}
 	message = reviewed;
-	const { getRepoRoot } = await Promise.resolve().then(() => git_exports);
 	const repoRoot = await getRepoRoot();
 	await saveCachedCommit(repoRoot, message);
 	debug("Message cached for repo:", repoRoot);
-	s.start("Committing...");
+	s.start("Running pre-commit hooks...");
 	const headBefore = await getHead();
 	debug("HEAD before commit:", headBefore);
-	const result = await attemptCommit(message);
-	const headAfter = await getHead();
-	debug("HEAD after commit:", headAfter);
+	const result = await commitWithRecovery(message, s, headBefore);
 	debug("Commit result:", result);
-	if (result.ok || headBefore !== headAfter) {
-		s.stop("Committed successfully.");
-		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"));
-		}
+	if (result === "committed") {
 		outro(green("Done."));
 		return;
 	}
-	s.stop("Commit failed.");
-	debug("Commit failed, showing recovery menu");
-	const errors = parseHookErrors(result.stderr ?? "");
-	debug("Parsed hook errors:", errors.length, "errors");
-	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 ?? "") === "cancelled") process.exit(1);
+	if (result === "cancelled") process.exit(1);
 }
 //#endregion
 //#region src/commands/config.ts
-const configCommand = command({
-	name: "config",
-	parameters: ["<mode>", "<key=value...>"]
-}, async (argv) => {
-	const { mode, keyValue } = argv._;
-	if (mode === "get") {
-		for (const kv of keyValue) {
-			const key = kv.split("=")[0];
-			const value = await getConfigValue(key);
-			console.log(`${key}=${value ?? ""}`);
-		}
-		return;
+function maskKey(key) {
+	if (!key) return dim("not set");
+	if (key.length <= 8) return "****";
+	return `${key.slice(0, 4)}${"*".repeat(Math.min(key.length - 8, 20))}${key.slice(-4)}`;
+}
+function buildConfigDisplay(config) {
+	const provider = isValidProvider(config.provider ?? "groq") ? config.provider : "groq";
+	const apiKey = config[PROVIDER_ENV_KEYS[provider]];
+	return [
+		`Provider:     ${bold(formatProviderName(provider))}`,
+		`API Key:      ${maskKey(apiKey)}`,
+		`Model:        ${config.model ?? "(none)"}`,
+		`Locale:       ${config.locale ?? "en"}`,
+		`Max Length:   ${config["max-length"] ?? "100"}`,
+		`Commit Type:  ${config.type || dim("(none)")}`,
+		`Timeout:      ${config.timeout ?? "10000"}ms`,
+		`Proxy:        ${config.proxy || dim("(none)")}`
+	].join("\n");
+}
+function getProvider(config) {
+	return isValidProvider(config.provider ?? "groq") ? config.provider : "groq";
+}
+async function promptProvider() {
+	return p.select({
+		message: "Select LLM provider:",
+		options: [
+			{
+				label: "Groq",
+				value: "groq",
+				hint: PROVIDER_CONFIGS.groq.defaultModel
+			},
+			{
+				label: "Cerebras",
+				value: "cerebras",
+				hint: PROVIDER_CONFIGS.cerebras.defaultModel
+			},
+			{
+				label: "Mistral",
+				value: "mistral",
+				hint: PROVIDER_CONFIGS.mistral.defaultModel
+			}
+		]
+	});
+}
+async function promptApiKey(provider) {
+	const keyName = PROVIDER_ENV_KEYS[provider];
+	const result = await p.text({
+		message: `${formatProviderName(provider)} API key:`,
+		placeholder: "Paste your API key",
+		validate: (v) => !v?.trim() ? "API key cannot be empty" : void 0
+	});
+	if (p.isCancel(result)) return result;
+	await writeConfig({ [keyName]: result.toString().trim() });
+	debug("config: %s set", keyName);
+	return result;
+}
+async function promptTextSetting(label, configKey, currentValue, validate) {
+	const result = await p.text({
+		message: label,
+		placeholder: currentValue ?? "",
+		initialValue: currentValue ?? "",
+		validate
+	});
+	if (p.isCancel(result)) return result;
+	await writeConfig({ [configKey]: result.toString().trim() });
+	debug("config: %s set to %s", configKey, result);
+	return result;
+}
+const requireNumber = (v) => {
+	if (!v?.trim()) return "Value cannot be empty";
+	return Number.isNaN(Number(v)) ? "Must be a number" : void 0;
+};
+function getSettingHandlers(config) {
+	const provider = getProvider(config);
+	return {
+		provider: async () => {
+			const result = await promptProvider();
+			if (p.isCancel(result)) return result;
+			await writeConfig({ provider: result });
+			debug("config: provider set to %s", result);
+		},
+		apikey: async () => promptApiKey(provider),
+		model: async () => promptTextSetting("Model ID:", "model", config.model),
+		locale: async () => promptTextSetting("Locale (e.g. en, ja, ko):", "locale", config.locale),
+		maxlen: async () => promptTextSetting("Max commit message length:", "max-length", config["max-length"], requireNumber),
+		type: async () => promptTextSetting("Commit type prefix (e.g. conventional):", "type", config.type),
+		timeout: async () => promptTextSetting("Timeout (ms):", "timeout", config.timeout, requireNumber),
+		proxy: async () => promptTextSetting("Proxy URL:", "proxy", config.proxy)
+	};
+}
+async function handleEditSetting(setting, config) {
+	const handler = getSettingHandlers(config)[setting];
+	if (!handler) return false;
+	const result = await handler();
+	return !p.isCancel(result);
+}
+async function editSettingsLoop(initialConfig) {
+	let config = initialConfig;
+	while (true) {
+		config = await readConfig();
+		const provider = getProvider(config);
+		const setting = await p.select({
+			message: "Select a setting to edit:",
+			options: [
+				{
+					label: `LLM Provider  ${dim(`(${formatProviderName(provider)})`)}`,
+					value: "provider"
+				},
+				{
+					label: `API Key  ${dim(`(for ${formatProviderName(provider)})`)}`,
+					value: "apikey"
+				},
+				{
+					label: `Model  ${dim(`(${config.model ?? "(none)"})`)}`,
+					value: "model"
+				},
+				{
+					label: `Locale  ${dim(`(${config.locale ?? "en"})`)}`,
+					value: "locale"
+				},
+				{
+					label: `Max commit length  ${dim(`(${config["max-length"] ?? "100"})`)}`,
+					value: "maxlen"
+				},
+				{
+					label: `Commit type prefix  ${dim(`(${config.type || "(none)"})`)}`,
+					value: "type"
+				},
+				{
+					label: `Timeout (ms)  ${dim(`(${config.timeout ?? "10000"})`)}`,
+					value: "timeout"
+				},
+				{
+					label: `Proxy URL  ${dim(`(${config.proxy || "(none)"})`)}`,
+					value: "proxy"
+				},
+				{
+					label: "Done editing",
+					value: "done"
+				}
+			]
+		});
+		if (p.isCancel(setting) || setting === "done") break;
+		if (await handleEditSetting(setting, config)) p.log.success(green("Updated."));
 	}
-	if (mode === "set") {
-		for (const kv of keyValue) {
-			const [key, ...rest] = kv.split("=");
-			await setConfigValue(key, rest.join("="));
+}
+async function configCommand() {
+	debug("configCommand: starting");
+	p.intro(bold("🌿 commit-mint config"));
+	while (true) {
+		const config = await readConfig();
+		p.note(buildConfigDisplay(config), "commit-mint config");
+		const action = await p.select({
+			message: "What would you like to do?",
+			options: [{
+				label: "Edit settings",
+				value: "edit"
+			}, {
+				label: "Done",
+				value: "done"
+			}]
+		});
+		if (p.isCancel(action)) {
+			debug("configCommand: cancelled at main menu");
+			p.outro(dim("Cancelled."));
+			return;
 		}
-		console.log("Config updated.");
-		return;
+		if (action === "done") {
+			debug("configCommand: done");
+			p.outro("Config saved.");
+			return;
+		}
+		await editSettingsLoop(config);
 	}
-	console.error(`Unknown config mode: ${mode}. Use "get" or "set".`);
-	process.exit(1);
-});
+}
 //#endregion
 //#region src/cli.ts
 const { version } = package_default;
@@ -1779,9 +2391,17 @@ cli({
 			description: "Enable debug output",
 			alias: "d",
 			default: false
+		},
+		noCheck: {
+			type: Boolean,
+			description: "Skip user-defined pre-commit checks",
+			alias: "N",
+			default: false
 		}
 	},
-	commands: [configCommand]
+	commands: [command({ name: "config" }, async () => {
+		await configCommand();
+	})]
 }, (argv) => {
 	setDebug(argv.flags.debug);
 	if (argv.flags.review) reviewCommand();