@kyubiware/commit-mint 0.5.0 → 0.5.2

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { cli, command } from "cleye";
 import * as p from "@clack/prompts";
-import { intro, isCancel, log, note, outro, select, spinner } 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 os from "node:os";
@@ -9,10 +9,10 @@ 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 { createHash } from "node:crypto";
 import { readFileSync } from "node:fs";
 import picomatch from "picomatch";
+import { spawn } from "node:child_process";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
@@ -28,7 +28,7 @@ var __exportAll = (all, no_symbols) => {
 //#region package.json
 var package_default = {
 	name: "@kyubiware/commit-mint",
-	version: "0.5.0",
+	version: "0.5.2",
 	description: "🌿 A commit tool that actually handles hook failures",
 	type: "module",
 	bin: { "cmint": "./dist/cli.mjs" },
@@ -104,11 +104,11 @@ const PROVIDER_CONFIGS = {
 		defaultModel: "openai/gpt-oss-20b"
 	},
 	cerebras: {
-		baseURL: "https://api.cerebras.ai",
+		baseURL: "https://api.cerebras.ai/v1",
 		defaultModel: "gpt-oss-120b"
 	},
 	mistral: {
-		baseURL: "https://api.mistral.ai",
+		baseURL: "https://api.mistral.ai/v1",
 		defaultModel: "mistral-small"
 	}
 };
@@ -124,17 +124,52 @@ function formatProviderName(provider) {
 function isValidProvider(name) {
 	return ALLOWED_PROVIDERS.includes(name);
 }
+/**
+* Generic OpenAI-compatible chat completions client using fetch.
+* Used for non-Groq providers where the Groq SDK's hardcoded `/openai/v1/` path
+* prefix doesn't match the provider's actual API path.
+*/
+function createFetchClient(baseURL, apiKey, timeout) {
+	return { chat: { completions: { async create(params) {
+		const url = `${baseURL}/chat/completions`;
+		debug("fetchClient: POST %s, model=%s", url, params.model);
+		const controller = new AbortController();
+		const timer = setTimeout(() => controller.abort(), timeout);
+		try {
+			const response = await fetch(url, {
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+					Authorization: `Bearer ${apiKey}`
+				},
+				body: JSON.stringify(params),
+				signal: controller.signal
+			});
+			if (!response.ok) {
+				const text = await response.text().catch(() => "");
+				throw new Error(`${response.status} ${text}`);
+			}
+			return await response.json();
+		} finally {
+			clearTimeout(timer);
+		}
+	} } } };
+}
 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;
+	const timeout = options.timeout ?? 6e4;
+	let client;
+	if (options.provider === "groq") client = new Groq({
+		apiKey: options.apiKey,
+		baseURL,
+		timeout
+	});
+	else client = createFetchClient(baseURL, options.apiKey, timeout);
 	return {
-		client: new Groq({
-			apiKey: options.apiKey,
-			baseURL,
-			timeout: options.timeout
-		}),
+		client,
 		model
 	};
 }
@@ -191,8 +226,17 @@ async function getProviderApiKey(provider) {
 	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) {
-	return config[`model_${provider}`] ?? config.model ?? 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
@@ -567,43 +611,80 @@ async function attemptCommitNoVerify(message, onProgress) {
 	return attemptCommit(message, ["--no-verify"], onProgress);
 }
 //#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;
+//#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"
 				}
-				child.stdin.end(() => {
-					child.unref();
-					done(true);
-				});
+			]
+		});
+		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"
 			});
-		})) return true;
-	} catch {}
-	return false;
+			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
@@ -614,6 +695,7 @@ function mapGroqError(error, providerLabel) {
 	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)(\(.+\))?!?: .+$/;
@@ -720,6 +802,7 @@ async function generateCommitMessage(diff, options) {
 		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",
@@ -731,7 +814,7 @@ async function generateCommitMessage(diff, options) {
 				model,
 				temperature: .3,
 				...isReasoningModel ? { max_completion_tokens: 1024 } : { max_tokens: 1024 },
-				reasoning_format: "parsed"
+				...isGroq && isReasoningModel ? { reasoning_format: "parsed" } : {}
 			});
 			const elapsed = Date.now() - callStart;
 			const rawContent = completion.choices[0]?.message?.content;
@@ -778,330 +861,6 @@ async function generateCommitMessage(diff, options) {
 	}
 }
 //#endregion
-//#region src/services/review-ai.ts
-function buildReviewSystemPrompt() {
-	return [
-		"You are an expert code reviewer. Review the following staged git diff.",
-		"",
-		"Focus on finding:",
-		"1. **Bugs** — logic errors, off-by-one, race conditions, null pointer risks",
-		"2. **Security issues** — injection, exposure of secrets, missing validation, CSRF, XSS",
-		"3. **Performance problems** — unnecessary work, large allocations in hot paths",
-		"4. **Code quality** — readability, maintainability, error handling gaps",
-		"5. **Edge cases** — missing boundary checks, empty states, error states",
-		"",
-		"For each issue found, use this format:",
-		"- SEVERITY: [critical|major|minor|suggestion]",
-		"- LOCATION: <file-path>:<line-number>",
-		"- ISSUE: <description>",
-		"- FIX: <suggested resolution>",
-		"",
-		"Separate issues with a blank line.",
-		"",
-		"If you find NO issues at all, respond with exactly: NO_ISSUES_FOUND",
-		"",
-		"Be thorough but practical. Only flag real problems — not style preferences or nitpicks."
-	].join("\n");
-}
-function buildReviewPrompt(diff, files, statSummary) {
-	const parts = [];
-	parts.push(`Review the following staged changes (${files.length} files):`);
-	parts.push("");
-	parts.push(statSummary);
-	parts.push("");
-	parts.push("```diff");
-	parts.push(diff);
-	parts.push("```");
-	return parts.join("\n");
-}
-async function generateCodeReview(diff, files, options) {
-	debug("generateCodeReview: model=%s, files=%d", options.model ?? "default", files.length);
-	const timeoutMs = options.timeout ?? 6e4;
-	const { client, model } = createProvider({
-		provider: options.provider ?? "groq",
-		apiKey: options.apiKey,
-		modelOverride: options.model,
-		timeout: timeoutMs,
-		baseURLOverride: options.proxy
-	});
-	const compressedDiff = compressDiff(diff);
-	const statSummary = buildStatSummary(diff);
-	const systemPrompt = buildReviewSystemPrompt();
-	const userPrompt = buildReviewPrompt(compressedDiff, files, statSummary);
-	debug("Code review: %d chars → %d chars, system=%d chars, user=%d chars", diff.length, compressedDiff.length, systemPrompt.length, userPrompt.length);
-	try {
-		const completion = await client.chat.completions.create({
-			messages: [{
-				role: "system",
-				content: systemPrompt
-			}, {
-				role: "user",
-				content: userPrompt
-			}],
-			model,
-			temperature: .3,
-			max_tokens: 4096
-		});
-		const rawContent = completion.choices[0]?.message?.content;
-		const content = extractContentText(rawContent);
-		debug("generateCodeReview response: choices=%d, finishReason=%s, contentLen=%d", completion.choices.length, completion.choices[0]?.finish_reason ?? "(none)", content.length);
-		if (!content) {
-			const reasoning = completion.choices[0]?.message?.reasoning;
-			if (reasoning) {
-				const derived = deriveMessageFromReasoning(reasoning);
-				if (derived) {
-					debug("generateCodeReview: derived from reasoning");
-					return derived;
-				}
-			}
-			return "NO_ISSUES_FOUND";
-		}
-		return content;
-	} catch (error) {
-		debug("generateCodeReview error: %s", error instanceof Error ? error.message : String(error));
-		throw mapGroqError(error, options.provider ? formatProviderName(options.provider) : void 0);
-	}
-}
-//#endregion
-//#region src/commands/review.ts
-async function reviewCommand() {
-	debug("reviewCommand called");
-	await assertGitRepo();
-	const s = spinner();
-	s.start("Staging all changes...");
-	await stageAll();
-	s.stop("Changes staged");
-	const diffResult = await getStagedDiff();
-	if (!diffResult) {
-		outro(dim("No changes to review."));
-		return;
-	}
-	if ("excludedFiles" in diffResult) {
-		outro(dim("Staged files are all excluded from review."));
-		return;
-	}
-	intro("🌿 commit-mint — code review");
-	log.info(diffResult.files.map((f) => `     ${f}`).join("\n"));
-	const report = await isOpenCodeAvailable() ? await reviewWithOpenCode(diffResult.diff, diffResult.files) : await reviewWithGroq(diffResult.diff, diffResult.files);
-	if (report !== "NO_ISSUES_FOUND" && report.trim().length > 0) {
-		note(report, red(bold("Review findings")));
-		await offerClipboardCopy(report);
-	} else outro(green("No issues found. Looks good!"));
-}
-async function offerClipboardCopy(report) {
-	const shouldCopy = await select({
-		message: "Copy review report to clipboard?",
-		options: [{
-			label: "Yes, copy to clipboard",
-			value: "yes"
-		}, {
-			label: "No",
-			value: "no"
-		}]
-	});
-	if (isCancel(shouldCopy) || shouldCopy === "no") {
-		outro(dim("Done."));
-		return;
-	}
-	if (await copyToClipboard(report)) outro(green("Report copied to clipboard. You can paste it anywhere for fixes."));
-	else outro(red("Failed to copy to clipboard. Install xclip, wl-copy, or xsel."));
-}
-async function isOpenCodeAvailable() {
-	try {
-		const { exitCode } = await import("execa").then((m) => m.execa("which", ["opencode"], { reject: false }));
-		return exitCode === 0;
-	} catch {
-		return false;
-	}
-}
-async function reviewWithGroq(diff, files) {
-	const 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 ${formatProviderName(provider)}...`);
-	try {
-		const report = await generateCodeReview(diff, files, {
-			apiKey,
-			model,
-			timeout: config.timeout ? Number.parseInt(config.timeout, 10) : void 0,
-			provider,
-			proxy: config.proxy
-		});
-		s.stop("Review complete");
-		return report;
-	} catch (err) {
-		s.stop(red("Review failed."));
-		debug("reviewWithGroq error:", err instanceof Error ? err.message : String(err));
-		throw err;
-	}
-}
-async function reviewWithOpenCode(diff, files) {
-	const s = spinner();
-	s.start("Running OpenCode review...");
-	try {
-		const repoRoot = await getRepoRoot();
-		const prompt = [
-			"Review the staged changes in this git repository.",
-			"Analyze the code diff for bugs, security issues, performance problems,",
-			"code quality issues, and missing edge cases.",
-			"",
-			`Files changed (${files.length}):`,
-			...files.map((f) => `  - ${f}`),
-			"",
-			"```diff",
-			diff.slice(0, 15e3),
-			"```",
-			"",
-			"Provide a structured report with severity, location, issue, and fix suggestion for each finding.",
-			"If no issues found, respond with: NO_ISSUES_FOUND"
-		].join("\n");
-		const { stdout } = await import("execa").then((m) => m.execa("opencode", [
-			"run",
-			prompt,
-			"--dir",
-			repoRoot
-		], {
-			timeout: 12e4,
-			reject: false
-		}));
-		s.stop("Review complete");
-		return stdout || "OpenCode review completed but no output captured.";
-	} catch (err) {
-		s.stop(red("OpenCode review failed."));
-		debug("reviewWithOpenCode error:", err instanceof Error ? err.message : String(err));
-		throw new Error(`OpenCode review failed: ${err instanceof Error ? err.message : String(err)}`);
-	}
-}
-//#endregion
-//#region src/ui/review-message.ts
-async function runCodeReview() {
-	const diffResult = await getStagedDiff();
-	if (!diffResult || "excludedFiles" in diffResult) {
-		outro(dim("No staged changes to review."));
-		return;
-	}
-	const opencodeAvailable = await isOpenCodeAvailable();
-	const config = await readConfig();
-	const provider = isValidProvider(config.provider ?? "groq") ? config.provider : "groq";
-	const s = spinner();
-	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");
-		await showReviewResults(report);
-	} catch (err) {
-		s.stop(red("Review failed."));
-		debug("Code review error:", err instanceof Error ? err.message : String(err));
-		outro(red(err instanceof Error ? err.message : String(err)));
-	}
-}
-async function showReviewResults(report) {
-	const { note: clackNote, select: clackSelect } = await import("@clack/prompts");
-	if (!(report !== "NO_ISSUES_FOUND" && report.trim().length > 0)) {
-		log.info(green("No issues found."));
-		return;
-	}
-	clackNote(report, red(bold("Review findings")));
-	const shouldCopy = await clackSelect({
-		message: "Copy review report to clipboard?",
-		options: [{
-			label: "Yes, copy to clipboard",
-			value: "yes"
-		}, {
-			label: "No",
-			value: "no"
-		}]
-	});
-	if (isCancel(shouldCopy) || shouldCopy !== "yes") return;
-	if (await copyToClipboard(report)) log.info(green("Report copied to clipboard."));
-	else log.warn(red("Failed to copy to clipboard."));
-}
-async function reviewCommitMessage(message) {
-	const { select, text } = await import("@clack/prompts");
-	while (true) {
-		const review = await select({
-			message: `Review commit message:\n\n   ${bold(message)}\n`,
-			options: [
-				{
-					label: "Use as-is",
-					value: "use"
-				},
-				{
-					label: "Edit",
-					value: "edit"
-				},
-				{
-					label: "Review with OpenCode",
-					value: "review"
-				},
-				{
-					label: "Cancel",
-					value: "cancel"
-				}
-			]
-		});
-		if (isCancel(review) || review === "cancel") {
-			debug("User cancelled at review step");
-			return null;
-		}
-		if (review === "use") {
-			debug("User accepted message");
-			return message;
-		}
-		if (review === "edit") {
-			debug("User chose to edit message");
-			const edited = await text({
-				message: "Edit commit message:",
-				initialValue: message,
-				validate: (v) => v?.trim() ? void 0 : "Message cannot be empty"
-			});
-			if (isCancel(edited)) continue;
-			message = String(edited).trim();
-			debug("Edited message:", message);
-			continue;
-		}
-		if (review === "review") {
-			debug("User chose to review code");
-			await runCodeReview();
-		}
-	}
-}
-//#endregion
-//#region src/utils/cache.ts
-const CACHE_DIR = join(os.homedir(), ".cache", "commit-mint");
-function repoHash(repoPath) {
-	return createHash("sha256").update(repoPath).digest("hex").slice(0, 12);
-}
-function cachePath(repoPath) {
-	return join(CACHE_DIR, `${repoHash(repoPath)}.json`);
-}
-async function saveCachedCommit(repoPath, message) {
-	await mkdir(CACHE_DIR, { recursive: true });
-	const data = {
-		message,
-		timestamp: Date.now(),
-		repoPath
-	};
-	const path = cachePath(repoPath);
-	debug("saveCachedCommit: saving to %s", path);
-	await writeFile(path, JSON.stringify(data, null, 2), "utf8");
-}
-async function loadCachedCommit(repoPath) {
-	const path = cachePath(repoPath);
-	debug("loadCachedCommit: loading from %s", path);
-	try {
-		const raw = await readFile(path, "utf8");
-		const data = JSON.parse(raw);
-		debug("loadCachedCommit: found message from %s", new Date(data.timestamp).toISOString());
-		return data;
-	} catch {
-		debug("loadCachedCommit: no cached commit found");
-		return null;
-	}
-}
-//#endregion
 //#region src/services/checks.ts
 /** Config file names, checked in priority order (matches lint-staged naming conventions) */
 const CONFIG_FILES = [
@@ -1515,19 +1274,61 @@ const statusLabel = (status) => {
 		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" : ""}`);
+/** Display combined view: files with status indicators grouped by commit group */
+function showGroupedFiles(groups, changedFiles) {
+	const statusMap = new Map(changedFiles.map((f) => [f.path, f.status]));
+	const lines = [];
+	for (let i = 0; i < groups.length; i++) {
+		const group = groups[i];
+		lines.push(`${bold(group.name)} ${dim("—")} ${group.files.length} file${group.files.length !== 1 ? "s" : ""}`);
+		for (const file of group.files) {
+			const status = statusMap.get(file) ?? "M";
+			lines.push(`  ${statusLabel(status)}  ${file}`);
+		}
+		if (i < groups.length - 1) lines.push("");
+	}
 	p.note(lines.join("\n"), "Commit groups");
 }
 //#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, hasChecks) {
 	debug("showStagingMenu: %d files", files.length);
@@ -1825,8 +1626,7 @@ async function runAutoGroupFlow(changedFiles, flags) {
 	s.start("Analyzing files...");
 	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);
+	showGroupedFiles(validatedGroups, included);
 	if (flags.auto) debug("Auto mode: skipping grouping confirmation");
 	else if (!await showGroupingConfirmation(validatedGroups, excluded)) {
 		outro(dim("Cancelled."));
@@ -2183,10 +1983,11 @@ function maskKey(key) {
 function buildConfigDisplay(config) {
 	const provider = isValidProvider(config.provider ?? "groq") ? config.provider : "groq";
 	const apiKey = config[PROVIDER_ENV_KEYS[provider]];
+	const effectiveModel = getModelForProvider(config, provider, PROVIDER_CONFIGS[provider].defaultModel);
 	return [
 		`Provider:     ${bold(formatProviderName(provider))}`,
 		`API Key:      ${maskKey(apiKey)}`,
-		`Model:        ${config.model ?? "(none)"}`,
+		`Model:        ${effectiveModel}`,
 		`Locale:       ${config.locale ?? "en"}`,
 		`Max Length:   ${config["max-length"] ?? "100"}`,
 		`Commit Type:  ${config.type || dim("(none)")}`,
@@ -2253,11 +2054,23 @@ function getSettingHandlers(config) {
 		provider: async () => {
 			const result = await promptProvider();
 			if (p.isCancel(result)) return result;
-			await writeConfig({ provider: result });
-			debug("config: provider set to %s", result);
+			const newProvider = result;
+			const newDefaultModel = PROVIDER_CONFIGS[newProvider].defaultModel;
+			await writeConfig({
+				provider: newProvider,
+				model: newDefaultModel
+			});
+			debug("config: provider set to %s, model set to %s", newProvider, newDefaultModel);
+			const keyName = PROVIDER_ENV_KEYS[newProvider];
+			if (!(await readConfig())[keyName]) {
+				const keyResult = await promptApiKey(newProvider);
+				if (p.isCancel(keyResult)) return keyResult;
+			}
 		},
 		apikey: async () => promptApiKey(provider),
-		model: async () => promptTextSetting("Model ID:", "model", config.model),
+		model: async () => {
+			return promptTextSetting("Model ID:", "model", getModelForProvider(config, provider, PROVIDER_CONFIGS[provider].defaultModel));
+		},
 		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),
@@ -2276,6 +2089,7 @@ async function editSettingsLoop(initialConfig) {
 	while (true) {
 		config = await readConfig();
 		const provider = getProvider(config);
+		const effectiveModel = getModelForProvider(config, provider, PROVIDER_CONFIGS[provider].defaultModel);
 		const setting = await p.select({
 			message: "Select a setting to edit:",
 			options: [
@@ -2288,7 +2102,7 @@ async function editSettingsLoop(initialConfig) {
 					value: "apikey"
 				},
 				{
-					label: `Model  ${dim(`(${config.model ?? "(none)"})`)}`,
+					label: `Model  ${dim(`(${effectiveModel})`)}`,
 					value: "model"
 				},
 				{
@@ -2380,12 +2194,6 @@ cli({
 			description: "Add context hint for AI commit message generation",
 			alias: "H"
 		},
-		review: {
-			type: Boolean,
-			description: "Review staged changes with a coding model",
-			alias: "R",
-			default: false
-		},
 		debug: {
 			type: Boolean,
 			description: "Enable debug output",
@@ -2404,8 +2212,7 @@ cli({
 	})]
 }, (argv) => {
 	setDebug(argv.flags.debug);
-	if (argv.flags.review) reviewCommand();
-	else commitCommand(argv.flags);
+	commitCommand(argv.flags);
 });
 //#endregion
 export {};