@kyubiware/commit-mint 0.5.5 → 0.6.0

package/dist/cli.mjs

@@ -28,7 +28,7 @@ var __exportAll = (all, no_symbols) => {
 //#region package.json
 var package_default = {
 	name: "@kyubiware/commit-mint",
-	version: "0.5.5",
+	version: "0.6.0",
 	description: "🌿 A commit tool that actually handles hook failures",
 	type: "module",
 	bin: { "cmint": "./dist/cli.mjs" },
@@ -47,7 +47,8 @@ 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"
+		"prepublishOnly": "npm run build",
+		"publish:cmint": "cd packages/cmint && npm publish"
 	},
 	keywords: [
 		"git",
@@ -1294,6 +1295,224 @@ function validateGroups(groups, allFiles) {
 	return validated;
 }
 //#endregion
+//#region src/services/clipboard.ts
+/** Milliseconds to wait after stdin closes for quick exit failures. */
+const GRACE_PERIOD_MS = 150;
+async function copyToClipboard(content) {
+	for (const [cmd, args] of [
+		["wl-copy", []],
+		["xclip", ["-selection", "clipboard"]],
+		["xsel", ["--clipboard", "--input"]],
+		["pbcopy", []]
+	]) try {
+		if (await tryCopy(cmd, args, content)) return true;
+	} catch {}
+	return false;
+}
+/**
+* Try to copy content using a single clipboard tool.
+*
+* Waits a short grace period after stdin closes to detect quick failures
+* (e.g. wl-copy on non-Wayland, missing display). If the tool survives
+* the grace period, assumes success — clipboard tools like xclip and
+* wl-copy hold the selection open indefinitely, so we can't wait for exit.
+*/
+/**
+* Evaluate clipboard tool status after the grace period.
+* If the child already exited, report based on exit code.
+* If still alive, assume success (clipboard tools hold selection open).
+*/
+function handleGracePeriod(settled, exitCode, stderrChunks, child, done) {
+	if (settled) return;
+	if (exitCode !== null) {
+		if (exitCode === 0) done(true, "exited 0");
+		else {
+			const stderr = Buffer.concat(stderrChunks).toString().trim();
+			done(false, `exit ${exitCode}${stderr ? `: ${stderr}` : ""}`);
+		}
+		return;
+	}
+	child.unref();
+	done(true);
+}
+function tryCopy(cmd, args, content) {
+	return new Promise((resolve) => {
+		debug("clipboard: trying %s", cmd);
+		const child = spawn(cmd, args, { stdio: [
+			"pipe",
+			"ignore",
+			"pipe"
+		] });
+		let settled = false;
+		const stderrChunks = [];
+		child.stderr?.on("data", (chunk) => {
+			stderrChunks.push(chunk);
+		});
+		const done = (result, reason) => {
+			if (settled) return;
+			settled = true;
+			debug("clipboard: %s %s%s", cmd, result ? "ok" : "failed", reason ? ` (${reason})` : "");
+			resolve(result);
+		};
+		child.on("error", (err) => {
+			done(false, err.message);
+		});
+		let exitCode = null;
+		child.on("exit", (code) => {
+			exitCode = code;
+		});
+		child.stdin.write(content, (err) => {
+			if (err) {
+				done(false, "stdin write error");
+				return;
+			}
+			child.stdin.end(() => {
+				setTimeout(() => handleGracePeriod(settled, exitCode, stderrChunks, child, done), GRACE_PERIOD_MS);
+			});
+		});
+	});
+}
+//#endregion
+//#region src/ui/check-failure-menu.ts
+const MAX_TSC_DIAGNOSTICS = 3;
+const MAX_ESLINT_DIAGNOSTICS = 3;
+const MAX_SUMMARY_LINE_LENGTH = 120;
+const TSC_DIAGNOSTIC = /^(.+?\.(?:ts|tsx|mts|cts|js|jsx|mjs|cjs))\((\d+),(\d+)\):\s+error\s+(TS\d+):\s+(.+)$/;
+const ESLINT_ERROR_LINE = /^\s*(\d+):(\d+)\s+(error|warning)\s+(.+)\s{2,}(\S+)\s*$/;
+function formatCheckFailureSummary(errors) {
+	if (errors.length === 0) return "No check error details were parsed. View full output for details.";
+	return errors.map((error) => formatCheckErrorSummary(error)).join("\n");
+}
+function formatCheckErrorSummary(error) {
+	if (error.tool === "tsc") {
+		const diagnostics = extractTscDiagnostics(error.raw || error.message);
+		if (diagnostics.length > 0) return formatTscSummary(diagnostics);
+	}
+	if (error.tool === "eslint") {
+		const diagnostics = extractEslintDiagnostics(error.raw || error.message);
+		if (diagnostics.length > 0) return formatEslintSummary(diagnostics);
+	}
+	const message = firstMeaningfulLine(error.message || error.raw);
+	return `  ${red("•")} [${error.tool}] ${truncate(message, MAX_SUMMARY_LINE_LENGTH)}`;
+}
+function extractTscDiagnostics(raw) {
+	return raw.split("\n").map((line) => line.trim()).map((line) => {
+		const match = TSC_DIAGNOSTIC.exec(line);
+		if (!match) return null;
+		return {
+			file: match[1] ?? "",
+			line: match[2] ?? "",
+			column: match[3] ?? "",
+			code: match[4] ?? "",
+			message: match[5] ?? ""
+		};
+	}).filter((diagnostic) => diagnostic !== null);
+}
+function formatTscSummary(diagnostics) {
+	const visible = diagnostics.slice(0, MAX_TSC_DIAGNOSTICS);
+	const hidden = diagnostics.length - visible.length;
+	const lines = [`  ${red("•")} [tsc] ${diagnostics.length} TypeScript error${diagnostics.length !== 1 ? "s" : ""}`, ...visible.map((diagnostic) => `${diagnostic.file}:${diagnostic.line}:${diagnostic.column} — error ${diagnostic.code}: ${truncate(diagnostic.message, MAX_SUMMARY_LINE_LENGTH)}`)];
+	if (hidden > 0) lines.push(dim(`    +${hidden} more TypeScript error${hidden !== 1 ? "s" : ""}. View full output for details.`));
+	return lines.join("\n");
+}
+function extractEslintDiagnostics(raw) {
+	const diagnostics = [];
+	const lines = raw.split("\n");
+	let currentFile = "";
+	for (const line of lines) {
+		if (!/^\s/.test(line) && line.includes("/") && !ESLINT_ERROR_LINE.test(line)) {
+			currentFile = line.trim();
+			continue;
+		}
+		const match = ESLINT_ERROR_LINE.exec(line);
+		if (match) diagnostics.push({
+			file: currentFile || "unknown",
+			line: match[1] ?? "",
+			column: match[2] ?? "",
+			severity: match[3] ?? "",
+			message: (match[4] ?? "").trim(),
+			rule: match[5] ?? ""
+		});
+	}
+	return diagnostics;
+}
+function formatEslintSummary(diagnostics) {
+	const visible = diagnostics.slice(0, MAX_ESLINT_DIAGNOSTICS);
+	const hidden = diagnostics.length - visible.length;
+	const count = diagnostics.length;
+	const noun = count === 1 ? "problem" : "problems";
+	const lines = [`  ${red("•")} [eslint] ${count} ESLint ${noun}`, ...visible.map((diagnostic) => `${diagnostic.file}:${diagnostic.line}:${diagnostic.column} ${diagnostic.severity} ${diagnostic.rule} — ${truncate(diagnostic.message, MAX_SUMMARY_LINE_LENGTH)}`)];
+	if (hidden > 0) lines.push(dim(`    +${hidden} more ESLint ${hidden === 1 ? "problem" : "problems"}. View full output for details.`));
+	return lines.join("\n");
+}
+function firstMeaningfulLine(message) {
+	return message.split("\n").map((l) => l.trim()).find((l) => l.length > 0 && !l.startsWith(">") && !l.startsWith("ELIFECYCLE")) ?? message;
+}
+function truncate(message, maxLength) {
+	const collapsed = message.replace(/\s+/g, " ").trim();
+	if (collapsed.length <= maxLength) return collapsed;
+	return `${collapsed.slice(0, Math.max(0, maxLength - 1))}…`;
+}
+async function showCheckFailureMenu(errors, rawStderr, onRetry) {
+	debug("showCheckFailureMenu: %d errors", errors.length);
+	let clipboardCopied = false;
+	p.note(formatCheckFailureSummary(errors), 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: "Retry checks",
+					value: "retry",
+					hint: "Re-run checks after fixing errors"
+				},
+				{
+					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 "retry":
+				if (onRetry) return "retried";
+				return "retried";
+			case "skip":
+				p.log.info("Skipping checks and proceeding with commit...");
+				return "skipped";
+			case "cancel":
+				p.outro(dim("Cancelled."));
+				return "cancelled";
+		}
+	}
+}
+//#endregion
 //#region src/ui/grouping.ts
 async function showGroupingConfirmation(groups, excluded) {
 	debug("showGroupingConfirmation: %d groups, %d excluded", groups.length, excluded.length);
@@ -1356,126 +1575,7 @@ function showGroupedFiles(groups, changedFiles) {
 	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);
-	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
-	};
-}
+//#region src/ui/recovery-menu.ts
 async function showRecoveryMenu(errors, onRetry, onSkipHooks, onRestage, message, rawStderr) {
 	debug("showRecoveryMenu: %d errors", errors.length);
 	let clipboardCopied = false;
@@ -1577,65 +1677,6 @@ async function showRecoveryMenu(errors, onRetry, onSkipHooks, onRestage, message
 		}
 	}
 }
-async function showCheckFailureMenu(errors, rawStderr, onRetry) {
-	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: "Retry checks",
-					value: "retry",
-					hint: "Re-run checks after fixing errors"
-				},
-				{
-					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 "retry":
-				if (onRetry) return "retried";
-				return "retried";
-			case "skip":
-				p.log.info("Skipping checks and proceeding with commit...");
-				return "skipped";
-			case "cancel":
-				p.outro(dim("Cancelled."));
-				return "cancelled";
-		}
-	}
-}
 //#endregion
 //#region src/commands/auto-group.ts
 async function runAutoGroupFlow(changedFiles, flags) {
@@ -1869,6 +1910,281 @@ async function handleRetry() {
 	else process.exit(1);
 }
 //#endregion
+//#region src/commands/setup.ts
+/** Marker files for each tool. First match wins per tool. */
+const TOOL_MARKERS = {
+	biome: ["biome.json", "biome.jsonc"],
+	eslint: [
+		"eslint.config.js",
+		"eslint.config.mjs",
+		"eslint.config.ts",
+		"eslint.config.cjs",
+		".eslintrc.js",
+		".eslintrc.cjs",
+		".eslintrc.json",
+		".eslintrc.yml",
+		".eslintrc.yaml",
+		".eslintrc"
+	],
+	typescript: ["tsconfig.json"],
+	vitest: [
+		"vitest.config.js",
+		"vitest.config.mts",
+		"vitest.config.ts",
+		"vitest.config.mjs"
+	]
+};
+/** Indent for generated config — matches biome.json `indentStyle: "tab"`. */
+const TAB = "	";
+async function exists(path) {
+	try {
+		await access(path, constants.R_OK);
+		return true;
+	} catch {
+		return false;
+	}
+}
+/**
+* Scan a directory for marker files that indicate which tools the project uses.
+* Returns a map of tool name to detected status. Order within each tool's list
+* is priority order (first match wins).
+*/
+async function detectTools(cwd) {
+	const result = {
+		biome: false,
+		eslint: false,
+		typescript: false,
+		vitest: false
+	};
+	for (const [tool, files] of Object.entries(TOOL_MARKERS)) for (const file of files) if (await exists(join(cwd, file))) {
+		result[tool] = true;
+		debug("setup: detected %s via %s", tool, file);
+		break;
+	}
+	debug("setup: detection result %o", result);
+	return result;
+}
+/**
+* Build the string content of a .cmintrc file from a detection result.
+* Returns tabs-indented TS/JS object literal with trailing commas. Biome is
+* preferred when both biome and eslint are present — overlapping globs would
+* cause both tools to run on the same files, which is wasteful and noisy.
+*/
+function buildCmintrcContent(tools) {
+	const entries = [];
+	if (tools.biome || tools.eslint) {
+		const cmd = tools.biome ? "biome check --write --no-errors-on-unmatched --error-on-warnings" : "eslint --fix";
+		const ext = tools.biome ? "{js,ts,json}" : "{js,ts}";
+		entries.push(`${TAB}"*.${ext}": "${cmd}",`);
+	}
+	const tsChecks = [];
+	if (tools.typescript) tsChecks.push("tsc --noEmit");
+	if (tools.vitest) tsChecks.push("vitest run --passWithNoTests");
+	if (tsChecks.length > 0) {
+		const body = tsChecks.map((c) => `"${c}"`).join(", ");
+		const fn = tsChecks.length === 1 ? `() => ${body}` : `() => [${body}]`;
+		entries.push(`${TAB}"*.ts": ${fn},`);
+	}
+	if (entries.length === 0) return `export default {\n};\n`;
+	return `export default {\n${entries.join("\n")}\n};\n`;
+}
+/** Choose the file extension based on whether the project uses TypeScript. */
+function pickFileName(tools) {
+	return tools.typescript ? ".cmintrc.ts" : ".cmintrc";
+}
+function formatDetection(tools) {
+	return Object.entries(tools).map(([tool, found]) => `  ${found ? green("✓") : dim("✗")} ${tool}`).join("\n");
+}
+/**
+* Interactive setup for `.cmintrc`. Detects biome/eslint/typescript/vitest in
+* the given directory, previews the generated config, and writes the file
+* after confirmation. Refuses to overwrite without explicit consent. Defaults
+* to `process.cwd()` when called from the `cmint config` menu; the preflight
+* caller passes the repo root explicitly.
+*/
+async function setupCmintrcCommand(cwd = process.cwd()) {
+	debug("setupCmintrcCommand: starting in %s", cwd);
+	const tools = await detectTools(cwd);
+	p.log.info(`Detected tools in ${bold(cwd)}:`);
+	p.log.message(formatDetection(tools));
+	if (!Object.values(tools).some(Boolean)) p.log.warn("No recognized tools found. Writing an empty config to fill in manually.");
+	else if (tools.biome && tools.eslint) p.log.warn(yellow("Both biome and eslint detected — using biome (remove this line to switch)."));
+	const fileName = pickFileName(tools);
+	const filePath = join(cwd, fileName);
+	if (await exists(filePath)) {
+		const overwrite = await p.confirm({ message: `${fileName} already exists. Overwrite?` });
+		if (p.isCancel(overwrite) || !overwrite) {
+			p.log.info(dim("Cancelled — existing file left untouched."));
+			return;
+		}
+	}
+	const content = buildCmintrcContent(tools);
+	p.log.info(dim(`\nPreview of ${fileName}:`));
+	p.log.message(dim(content));
+	const confirm = await p.confirm({ message: `Write ${fileName}?` });
+	if (p.isCancel(confirm) || !confirm) {
+		p.log.info(dim("Cancelled."));
+		return;
+	}
+	await writeFile(filePath, content, "utf-8");
+	debug("setupCmintrcCommand: wrote %s", filePath);
+	p.log.success(green(`Wrote ${fileName}`));
+}
+/** Project-local marker file that suppresses the preflight prompt forever. */
+const SKIP_SETUP_MARKER = ".cmint-skip-setup";
+/** True if at least one of biome/eslint/typescript/vitest is present. */
+function isAutoConfigurable(tools) {
+	return Object.values(tools).some(Boolean);
+}
+/** True if the skip-setup marker exists in `cwd`. */
+async function hasSkipSetupMarker(cwd) {
+	return exists(join(cwd, SKIP_SETUP_MARKER));
+}
+/** Write the skip-setup marker to `cwd`. The file is empty by design. */
+async function writeSkipSetupMarker(cwd) {
+	const filePath = join(cwd, SKIP_SETUP_MARKER);
+	await writeFile(filePath, "", "utf-8");
+	debug("preflight: wrote skip-setup marker to %s", filePath);
+}
+/**
+* One-shot prompt run at the start of `cmint`. Skips silently if the user
+* already has a `.cmintrc` or has previously opted out (`.cmint-skip-setup`).
+* If the project is auto-configurable, asks the user whether to run setup
+* now. Choices: `yes` runs the standard setup flow; `no` proceeds without
+* setup and re-prompts next time; `never` writes a marker to suppress the
+* prompt for this project forever.
+*/
+async function runPreflightSetupPrompt(cwd) {
+	debug("preflight: checking %s", cwd);
+	if (await hasSkipSetupMarker(cwd)) {
+		debug("preflight: skip-setup marker present, skipping prompt");
+		return;
+	}
+	const existingConfig = await detectConfig(cwd);
+	if (existingConfig) {
+		debug("preflight: .cmintrc present at %s, skipping prompt", existingConfig);
+		return;
+	}
+	if (!isAutoConfigurable(await detectTools(cwd))) {
+		debug("preflight: project not auto-configurable, skipping prompt");
+		return;
+	}
+	const choice = await p.select({
+		message: "No .cmintrc found. Run setup to create one from detected tools?",
+		options: [
+			{
+				label: "Yes, set up .cmintrc",
+				value: "yes"
+			},
+			{
+				label: "No, skip for now",
+				value: "no"
+			},
+			{
+				label: "No, don't ask again",
+				value: "never"
+			}
+		]
+	});
+	if (p.isCancel(choice)) {
+		debug("preflight: user cancelled prompt");
+		return;
+	}
+	if (choice === "never") {
+		await writeSkipSetupMarker(cwd);
+		p.log.info(dim(`Won't ask again. Delete ${SKIP_SETUP_MARKER} to re-enable.`));
+		return;
+	}
+	if (choice === "no") {
+		p.log.info(dim("Skipping .cmintrc setup."));
+		return;
+	}
+	debug("preflight: user chose yes, running setup");
+	await setupCmintrcCommand(cwd);
+}
+//#endregion
+//#region src/ui/staging-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
+	};
+}
+//#endregion
 //#region src/commands/staging.ts
 /** Interactive staging loop for multiple changed files */
 async function handleStaging(changedFiles, flags) {
@@ -1972,6 +2288,8 @@ async function commitCommand(flags) {
 	debug("commitCommand called", { flags });
 	await assertGitRepo();
 	if (flags.retry) return handleRetry();
+	const repoRoot = await getRepoRoot();
+	await runPreflightSetupPrompt(repoRoot);
 	intro("🌿 commit-mint");
 	const status = await getStatusShort();
 	debug("Git status:", status || "(empty)");
@@ -2018,7 +2336,7 @@ 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"));
-		await saveCachedCommit(await getRepoRoot(), message);
+		await saveCachedCommit(repoRoot, message);
 		s.start("Running pre-commit hooks...");
 		const result = await commitWithRecovery(message, s, await getHead());
 		if (result === "committed") {
@@ -2077,7 +2395,6 @@ async function commitCommand(flags) {
 		return;
 	}
 	message = reviewed;
-	const repoRoot = await getRepoRoot();
 	await saveCachedCommit(repoRoot, message);
 	debug("Message cached for repo:", repoRoot);
 	s.start("Running pre-commit hooks...");
@@ -2261,13 +2578,20 @@ async function configCommand() {
 		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"
-			}]
+			options: [
+				{
+					label: "Edit settings",
+					value: "edit"
+				},
+				{
+					label: "Setup .cmintrc",
+					value: "setup"
+				},
+				{
+					label: "Done",
+					value: "done"
+				}
+			]
 		});
 		if (p.isCancel(action)) {
 			debug("configCommand: cancelled at main menu");
@@ -2279,6 +2603,11 @@ async function configCommand() {
 			p.outro("Config saved.");
 			return;
 		}
+		if (action === "setup") {
+			debug("configCommand: starting .cmintrc setup");
+			await setupCmintrcCommand();
+			continue;
+		}
 		await editSettingsLoop(config);
 	}
 }