@kyubiware/commit-mint 0.7.6 → 0.8.1

package/dist/cli.mjs

@@ -29,7 +29,7 @@ var __exportAll = (all, no_symbols) => {
 //#region package.json
 var package_default = {
 	name: "@kyubiware/commit-mint",
-	version: "0.7.6",
+	version: "0.8.1",
 	description: "🌿 AI-powered git commit tool — auto-group changed files, generate messages, run pre-commit checks",
 	type: "module",
 	bin: { "cmint": "./dist/cli.mjs" },
@@ -673,7 +673,10 @@ async function runCommand(command, timeout, repoRoot) {
 			timeout,
 			all: true,
 			preferLocal: true,
-			...repoRoot ? { localDir: repoRoot } : {}
+			...repoRoot ? {
+				localDir: repoRoot,
+				cwd: repoRoot
+			} : {}
 		});
 		const ok = !result.failed;
 		debug("runCommand: %s — ok=%s", tool, ok);
@@ -924,8 +927,10 @@ var git_exports = /* @__PURE__ */ __exportAll({
 	getHead: () => getHead,
 	getRepoRoot: () => getRepoRoot,
 	getStagedDiff: () => getStagedDiff,
+	getStagedFiles: () => getStagedFiles,
 	getStatusShort: () => getStatusShort,
 	resetStaging: () => resetStaging,
+	resolveToRepoRoot: () => resolveToRepoRoot,
 	stageAll: () => stageAll,
 	stageFiles: () => stageFiles
 });
@@ -1026,7 +1031,11 @@ async function getStatusShort() {
 	return stdout.trim();
 }
 async function getChangedFiles() {
-	const { stdout } = await execa("git", ["status", "--short"]);
+	const { stdout } = await execa("git", [
+		"status",
+		"--short",
+		"--untracked-files=all"
+	]);
 	if (!stdout.trim()) return [];
 	const files = stdout.split("\n").filter(Boolean).map((line) => {
 		const indexStatus = line[0];
@@ -1039,6 +1048,44 @@ async function getChangedFiles() {
 	debug("getChangedFiles:", files.length, "files");
 	return files;
 }
+/**
+* Return staged file paths relative to the repository root, excluding deletions.
+*
+* `git status --short` reports paths relative to the current working directory,
+* but `.cmintrc` globs are written from the repo root (matching lint-staged
+* conventions). Use this helper whenever staged paths need to match repo-root
+* globs. `--diff-filter=d` excludes staged deletions so check commands don't
+* receive paths whose content no longer exists.
+*/
+async function getStagedFiles() {
+	const { stdout } = await execa("git", [
+		"diff",
+		"--cached",
+		"--name-only",
+		"--diff-filter=d"
+	]);
+	const files = stdout.split("\n").map((line) => line.trim()).filter(Boolean);
+	debug("getStagedFiles:", files.length, "files");
+	return files;
+}
+/**
+* Convert cwd-relative file paths to repo-root-relative paths.
+*
+* Uses `git rev-parse --show-prefix` to discover the prefix of the current
+* working directory relative to the repo root (e.g. `"extension/"` when cwd
+* is `<repo>/extension`, or `""` when at the repo root). Useful when a caller
+* has cwd-relative paths from `getChangedFiles()` but needs to match them
+* against repo-root-relative `.cmintrc` globs (e.g. the auto-group flow,
+* which runs checks BEFORE files are staged — so `getStagedFiles()` can't be
+* used because the index doesn't yet contain those paths).
+*/
+async function resolveToRepoRoot(cwdRelativePaths) {
+	if (cwdRelativePaths.length === 0) return [];
+	const { stdout } = await execa("git", ["rev-parse", "--show-prefix"]);
+	const prefix = stdout.trim();
+	if (!prefix) return [...cwdRelativePaths];
+	return cwdRelativePaths.map((p) => `${prefix}${p}`);
+}
 async function stageFiles(paths) {
 	debug("stageFiles:", paths);
 	await execa("git", ["add", ...paths]);
@@ -1167,6 +1214,168 @@ function parseGroupingResponse(content) {
 	throw new Error("AI response did not contain a JSON array");
 }
 //#endregion
+//#region src/services/grouping-reunite.ts
+/**
+* # Test/source reunification
+*
+* AI grouping prompts ask the model to keep a source file and its tests in the
+* same commit group, but the model frequently ignores that instruction (it
+* split `git.ts` from `git.test.ts` in the bug report that motivated this
+* module). The functions here provide a deterministic post-processing pass
+* that moves misplaced test files back into the group already containing
+* their source counterpart, regardless of what the model decided.
+*
+* Supported layouts (in priority order):
+* 1. Co-located: `src/foo.ts` ↔ `src/foo.test.ts`
+* 2. `__tests__/` mirror: `src/foo.ts` ↔ `src/__tests__/foo.test.ts`
+* 3. `tests/` or `test/` mirror: `src/foo.ts` ↔ `tests/foo.test.ts`
+*
+* Reunification runs inside `validateGroups()` (see `grouping.ts`) after
+* hallucinated-path filtering so only real files participate.
+*/
+/** Suffixes that mark a file as a test companion of a same-name source. */
+const TEST_SUFFIXES = [".test", ".spec"];
+/**
+* Extensions tried when looking for a source counterpart for a test file. The
+* test file's own extension is usually the right one, but we also try common
+* alternates (a `.test.tsx` may back a `.tsx` or a `.ts`).
+*/
+const SOURCE_EXTENSIONS = [
+	".ts",
+	".tsx",
+	".js",
+	".jsx",
+	".mjs",
+	".cjs",
+	".mts",
+	".cts"
+];
+/** Matches a test file by extension regardless of which suffix it uses. */
+const TEST_FILE_PATTERN = /\.(?:test|spec)\.(?:ts|tsx|js|jsx|mjs|cjs|mts|cts)$/;
+/** Directory prefixes/segments that mirror source layout for non-co-located tests. */
+const TEST_DIR_PREFIXES = ["tests/", "test/"];
+/** Marker segment for co-located `__tests__/` directories. */
+const TESTS_DIR_SEGMENT = "/__tests__/";
+function stripTestSuffix(filename) {
+	for (const suffix of TEST_SUFFIXES) {
+		const marker = `${suffix}.`;
+		const idx = filename.lastIndexOf(marker);
+		if (idx > 0) return filename.slice(0, idx);
+	}
+	return null;
+}
+function withEachExtension(base) {
+	return SOURCE_EXTENSIONS.map((ext) => `${base}${ext}`);
+}
+/** Co-located: `dir/foo.test.ts` → `dir/foo.{ts,tsx,...}` */
+function colocatedCandidates(testPath) {
+	const base = stripTestSuffix(testPath);
+	return base === null ? [] : withEachExtension(base);
+}
+/** `__tests__` mirror: `src/__tests__/foo.test.ts` → `src/foo.{ts,tsx,...}` */
+function testsDirCandidates(testPath) {
+	const segmentIdx = testPath.indexOf(TESTS_DIR_SEGMENT);
+	if (segmentIdx < 0) return [];
+	const parentDir = testPath.slice(0, segmentIdx);
+	const base = stripTestSuffix(testPath.slice(segmentIdx + 11));
+	if (base === null) return [];
+	return withEachExtension(`${parentDir}/${base}`);
+}
+/** `tests/` or `test/` mirror: `tests/services/foo.test.ts` → `src/services/foo.{ts,tsx,...}` */
+function prefixedDirCandidates(testPath) {
+	for (const prefix of TEST_DIR_PREFIXES) {
+		if (!testPath.startsWith(prefix)) continue;
+		const base = stripTestSuffix(testPath.slice(prefix.length));
+		if (base === null) return [];
+		return withEachExtension(`src/${base}`);
+	}
+	return [];
+}
+/**
+* Compute candidate source paths for a test file in priority order: co-located
+* first, then `__tests__/` mirror, then `tests/`/`test/` mirror. Each mirror
+* emits one entry per `SOURCE_EXTENSIONS` candidate so the caller can match
+* against any of them.
+*/
+function candidateSourcePaths(testPath) {
+	return [
+		...colocatedCandidates(testPath),
+		...testsDirCandidates(testPath),
+		...prefixedDirCandidates(testPath)
+	];
+}
+/**
+* Resolve the unambiguous target group for a single test file, or `null` when
+* no source counterpart exists / matches more than one group (ambiguous). A
+* test whose candidates span multiple groups (e.g. `foo.ts` and `foo.tsx` in
+* different groups) is intentionally left alone rather than guessed.
+*/
+function findTargetGroup(testFile, currentGi, fileToGroup) {
+	const targetGroups = /* @__PURE__ */ new Set();
+	for (const candidate of candidateSourcePaths(testFile)) {
+		const targetGi = fileToGroup.get(candidate);
+		if (targetGi !== void 0 && targetGi !== currentGi) targetGroups.add(targetGi);
+	}
+	return targetGroups.size === 1 ? [...targetGroups][0] : null;
+}
+/**
+* Find the unambiguous target group for each misplaced test file.
+*
+* Returns a map of `testFile → targetGroupIndex`. A test is only moved when
+* its candidate source matches exactly one other group; ambiguous matches are
+* skipped (see {@link findTargetGroup}).
+*/
+function findMoves(groups, fileToGroup) {
+	const moves = /* @__PURE__ */ new Map();
+	for (let gi = 0; gi < groups.length; gi++) for (const file of groups[gi].files) {
+		if (moves.has(file) || !TEST_FILE_PATTERN.test(file)) continue;
+		const target = findTargetGroup(file, gi, fileToGroup);
+		if (target !== null) moves.set(file, target);
+	}
+	return moves;
+}
+/**
+* Apply queued moves to a fresh copy of the groups array. Tests are removed
+* from their original group and appended to the target group. Groups left
+* empty by moves are dropped.
+*/
+function applyMoves(groups, moves) {
+	const result = groups.map((g) => ({
+		...g,
+		files: [...g.files]
+	}));
+	const movedFiles = new Set(moves.keys());
+	const additionsByGroup = /* @__PURE__ */ new Map();
+	for (const [file, toGroup] of moves) {
+		const bucket = additionsByGroup.get(toGroup) ?? [];
+		bucket.push(file);
+		additionsByGroup.set(toGroup, bucket);
+	}
+	for (let gi = 0; gi < result.length; gi++) {
+		if (movedFiles.size > 0) result[gi].files = result[gi].files.filter((f) => !movedFiles.has(f));
+		const additions = additionsByGroup.get(gi);
+		if (!additions) continue;
+		const existing = new Set(result[gi].files);
+		for (const file of additions) if (!existing.has(file)) result[gi].files.push(file);
+	}
+	return result.filter((g) => g.files.length > 0);
+}
+/**
+* Move test files (`.test.*` / `.spec.*`) into the group that already contains
+* their source counterpart. Returns the same array reference if no moves were
+* needed; otherwise returns a fresh array of new group objects.
+*
+* See module doc for the matching algorithm.
+*/
+function reuniteTestsWithSources(groups) {
+	if (groups.length === 0) return groups;
+	const fileToGroup = /* @__PURE__ */ new Map();
+	for (let gi = 0; gi < groups.length; gi++) for (const file of groups[gi].files) fileToGroup.set(file, gi);
+	const moves = findMoves(groups, fileToGroup);
+	if (moves.size === 0) return groups;
+	return applyMoves(groups, moves);
+}
+//#endregion
 //#region src/services/grouping.ts
 function matchesExcludePattern(filePath, pattern) {
 	if (pattern === filePath) return true;
@@ -1227,7 +1436,8 @@ function buildGroupingSystemPrompt() {
 		"You are analyzing changed files in a git repository. Group them into logical commits based on what changed and why. Each group should be a coherent unit of work.",
 		"",
 		"Rules:",
-		"- Group by feature, fix, or concern (e.g., 'Frontend refactor', 'API changes', 'Test updates')",
+		"- ALWAYS keep a test file in the same group as the source file it tests. Examples: `foo.test.ts` stays with `foo.ts`; `__tests__/foo.test.ts` stays with `foo.ts` in the parent directory; `tests/foo.test.ts` stays with `src/foo.ts`. Never put source and its tests in separate groups.",
+		"- Group by feature, fix, or concern (e.g., 'Frontend refactor', 'API changes')",
 		"- Keep related files together (e.g., a component + its test, a model + its migration)",
 		"- Separate documentation changes (*.md files, docs/) from code changes — put docs in their own group",
 		"- Do not split a single logical change across multiple groups",
@@ -1255,12 +1465,13 @@ function buildRetryGroupingPrompt() {
 		"You MUST split the files into at least 2 groups based on what changed and why.",
 		"",
 		"Look for these natural split points:",
-		"- Source code vs tests",
 		"- Different features or modules (e.g., different directories)",
 		"- New files vs modified files vs deleted files",
 		"- Configuration changes vs code changes",
 		"- Documentation vs implementation",
 		"",
+		"Do NOT split a source file from its tests — keep `foo.ts` and `foo.test.ts` in the same group.",
+		"",
 		"If unsure, err on the side of MORE groups, not fewer.",
 		"",
 		"Output format: JSON array of objects with keys 'name', 'description', 'files'.",
@@ -1359,16 +1570,18 @@ function validateGroups(groups, allFiles) {
 			files: uniqueFiles
 		});
 	}
+	const reunited = reuniteTestsWithSources(validated);
+	if (reunited !== validated) debug("validateGroups: reunited %d groups after test/source merge", reunited.length);
 	const ungrouped = allFiles.filter((f) => !seen.has(f.path));
 	if (ungrouped.length > 0) {
 		debug("validateGroups: %d ungrouped files added to 'Other changes'", ungrouped.length);
-		validated.push({
+		reunited.push({
 			name: "Other changes",
 			description: "Miscellaneous changes that did not fit into other groups",
 			files: ungrouped.map((f) => f.path)
 		});
 	}
-	return validated;
+	return reunited;
 }
 const EXIT_CODES = {
 	SUCCESS: 0,
@@ -1416,6 +1629,68 @@ async function loadCachedCommit(repoPath) {
 	}
 }
 //#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 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
 /** Milliseconds to wait after stdin closes for quick exit failures. */
 const GRACE_PERIOD_MS = 150;
@@ -1480,286 +1755,18 @@ function tryCopy(cmd, args, content) {
 		});
 		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_TEST_FAILURES = 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*$/;
-const TEST_FILE_FAIL = /^\s*FAIL\s+(.+?\.(?:test|spec)\.[^\s>]+)\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);
-	}
-	if (error.tool === "vitest" || error.tool === "jest") {
-		const failures = extractTestFailures(error.raw || error.message);
-		if (failures.length > 0) return formatTestFailureSummary(failures, error.tool);
-	}
-	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 extractTestFailures(raw) {
-	const failures = [];
-	const seen = /* @__PURE__ */ new Set();
-	for (const line of raw.split("\n")) {
-		const match = TEST_FILE_FAIL.exec(line);
-		if (!match) continue;
-		const file = (match[1] ?? "").trim();
-		const name = (match[2] ?? "").trim();
-		if (!file || !name) continue;
-		const key = `${file}\u0000${name}`;
-		if (seen.has(key)) continue;
-		seen.add(key);
-		failures.push({
-			file,
-			name
-		});
-	}
-	return failures;
-}
-function formatTestFailureSummary(failures, tool) {
-	const total = failures.length;
-	const visible = failures.slice(0, MAX_TEST_FAILURES);
-	const hidden = total - visible.length;
-	const fileCount = new Set(failures.map((f) => f.file)).size;
-	const testNoun = total === 1 ? "test" : "tests";
-	const fileNoun = fileCount === 1 ? "file" : "files";
-	const lines = [`  ${red("•")} [${tool}] ${total} failed ${testNoun} in ${fileCount} ${fileNoun}`];
-	const byFile = /* @__PURE__ */ new Map();
-	for (const failure of visible) {
-		const names = byFile.get(failure.file) ?? [];
-		names.push(failure.name);
-		byFile.set(failure.file, names);
-	}
-	for (const [file, names] of byFile) {
-		lines.push(`    ${truncate(file, MAX_SUMMARY_LINE_LENGTH)}`);
-		for (const name of names) lines.push(`      ${red("×")} ${truncate(name, MAX_SUMMARY_LINE_LENGTH)}`);
-	}
-	if (hidden > 0) lines.push(dim(`    +${hidden} more failed ${hidden === 1 ? "test" : "tests"}. View full output for details.`));
-	return lines.join("\n");
-}
-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/check-summary.ts
-/**
-* Stop a check spinner with a per-tool summary of the check results.
-*
-* - On success: stops with "All checks passed" and prints a `✓ tool` line
-*   for each result.
-* - On failure: stops with "N checks failed" (pluralized). Raw error output
-*   is intentionally NOT printed here — callers handle failure display
-*   (menu, raw print, etc.).
-*/
-function stopCheckSpinner(spinner, results) {
-	if (results.ok) {
-		spinner.stop("All checks passed");
-		if (results.results.length > 0) log.info(results.results.map((r) => `  ${green("✓")} ${r.tool}`).join("\n"));
-	} else {
-		const failed = results.results.filter((r) => !r.ok);
-		spinner.stop(`${failed.length} check${failed.length !== 1 ? "s" : ""} failed`);
-	}
-}
-//#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 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");
+			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/recovery-menu.ts
@@ -1939,6 +1946,259 @@ async function reviewCommitMessage(message, options) {
 	}
 }
 //#endregion
+//#region src/ui/check-failure-menu.ts
+const MAX_TSC_DIAGNOSTICS = 3;
+const MAX_ESLINT_DIAGNOSTICS = 3;
+const MAX_TEST_FAILURES = 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*$/;
+const TEST_FILE_FAIL = /^\s*FAIL\s+(.+?\.(?:test|spec)\.[^\s>]+)\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);
+	}
+	if (error.tool === "vitest" || error.tool === "jest") {
+		const failures = extractTestFailures(error.raw || error.message);
+		if (failures.length > 0) return formatTestFailureSummary(failures, error.tool);
+	}
+	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 extractTestFailures(raw) {
+	const failures = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const line of raw.split("\n")) {
+		const match = TEST_FILE_FAIL.exec(line);
+		if (!match) continue;
+		const file = (match[1] ?? "").trim();
+		const name = (match[2] ?? "").trim();
+		if (!file || !name) continue;
+		const key = `${file}\u0000${name}`;
+		if (seen.has(key)) continue;
+		seen.add(key);
+		failures.push({
+			file,
+			name
+		});
+	}
+	return failures;
+}
+function formatTestFailureSummary(failures, tool) {
+	const total = failures.length;
+	const visible = failures.slice(0, MAX_TEST_FAILURES);
+	const hidden = total - visible.length;
+	const fileCount = new Set(failures.map((f) => f.file)).size;
+	const testNoun = total === 1 ? "test" : "tests";
+	const fileNoun = fileCount === 1 ? "file" : "files";
+	const lines = [`  ${red("•")} [${tool}] ${total} failed ${testNoun} in ${fileCount} ${fileNoun}`];
+	const byFile = /* @__PURE__ */ new Map();
+	for (const failure of visible) {
+		const names = byFile.get(failure.file) ?? [];
+		names.push(failure.name);
+		byFile.set(failure.file, names);
+	}
+	for (const [file, names] of byFile) {
+		lines.push(`    ${truncate(file, MAX_SUMMARY_LINE_LENGTH)}`);
+		for (const name of names) lines.push(`      ${red("×")} ${truncate(name, MAX_SUMMARY_LINE_LENGTH)}`);
+	}
+	if (hidden > 0) lines.push(dim(`    +${hidden} more failed ${hidden === 1 ? "test" : "tests"}. View full output for details.`));
+	return lines.join("\n");
+}
+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/check-summary.ts
+/**
+* Stop a check spinner with a per-tool summary of the check results.
+*
+* - On success: stops with "All checks passed" and prints a `✓ tool` line
+*   for each result.
+* - On failure: stops with "N checks failed" (pluralized). Raw error output
+*   is intentionally NOT printed here — callers handle failure display
+*   (menu, raw print, etc.).
+*/
+function stopCheckSpinner(spinner, results) {
+	if (results.ok) {
+		spinner.stop("All checks passed");
+		if (results.results.length > 0) log.info(results.results.map((r) => `  ${green("✓")} ${r.tool}`).join("\n"));
+	} else {
+		const failed = results.results.filter((r) => !r.ok);
+		spinner.stop(`${failed.length} check${failed.length !== 1 ? "s" : ""} failed`);
+	}
+}
+//#endregion
+//#region src/commands/check-phase.ts
+/**
+* Run user-defined pre-commit checks with an interactive failure menu.
+*
+* Single entry point for the check-execution pipeline shared by `runPreCommitChecks`
+* (post-staging, normal commit flow) and `runAutoGroupFlow` (pre-staging, auto-group
+* flow). Encapsulates: detectConfig guard → spinner → runAllChecks → retry loop with
+* `showCheckFailureMenu`.
+*
+* Caller responsibilities:
+* - Skip when `noCheck` is set (caller's policy).
+* - Skip when there are no files to check (caller has the file list context).
+* - Derive `files` in **repo-root-relative** form so they match `.cmintrc` globs.
+*   Post-staging callers should use `getStagedFiles()`; pre-staging callers should
+*   use `resolveToRepoRoot()` since the index doesn't yet contain those paths.
+*
+* Returns the outcome so the caller can decide how to handle cancellation
+* (`process.exit(1)` in the commit flow, `return "cancelled"` in auto-group).
+*/
+async function runCheckPhaseInteractive(repoRoot, files, timeout, onRetry) {
+	if (!await detectConfig(repoRoot)) return "passed";
+	debug("Running user checks on %d files...", files.length);
+	const ck = spinner();
+	ck.start("Running checks...");
+	let checkResults = await runAllChecks(repoRoot, files, timeout);
+	stopCheckSpinner(ck, checkResults);
+	debug("Check results: ok=%s, count=%d", checkResults.ok, checkResults.results.length);
+	while (!checkResults.ok) {
+		const rawOutput = checkResults.results.filter((r) => !r.ok).map((r) => `[${r.tool}]\n${r.stdout}\n${r.stderr}`.trim()).join("\n\n");
+		const menuResult = await showCheckFailureMenu(parseCheckErrors(rawOutput), rawOutput, async () => {
+			return (await runAllChecks(repoRoot, files, timeout)).ok;
+		});
+		if (menuResult === "cancelled") return "cancelled";
+		if (menuResult === "retried") {
+			debug("Re-running checks after retry...");
+			if (onRetry) await onRetry();
+			ck.start("Running checks...");
+			checkResults = await runAllChecks(repoRoot, files, timeout);
+			stopCheckSpinner(ck, checkResults);
+			debug("Retry check results: ok=%s, count=%d", checkResults.ok, checkResults.results.length);
+			continue;
+		}
+		break;
+	}
+	return checkResults.ok ? "passed" : "skipped";
+}
+//#endregion
 //#region src/commands/auto-group.ts
 async function runAutoGroupFlow(changedFiles, flags) {
 	const { included, excluded } = filterExcludedFiles(changedFiles);
@@ -1967,33 +2227,7 @@ async function runAutoGroupFlow(changedFiles, flags) {
 	}
 	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);
-		if (await detectConfig(repoRoot)) {
-			debug("Running user checks on %d files...", allFiles.length);
-			const ck = spinner();
-			ck.start("Running checks...");
-			let checkResults = await runAllChecks(repoRoot, allFiles, 6e4);
-			debug("Check results: ok=%s, count=%d", checkResults.ok, checkResults.results.length);
-			while (!checkResults.ok) {
-				const failed = checkResults.results.filter((r) => !r.ok);
-				ck.stop(`${failed.length} check(s) failed`);
-				const rawOutput = failed.map((r) => `[${r.tool}]\n${r.stdout}\n${r.stderr}`.trim()).join("\n\n");
-				const menuResult = await showCheckFailureMenu(parseCheckErrors(rawOutput), rawOutput, async () => {
-					return (await runAllChecks(repoRoot, allFiles, 6e4)).ok;
-				});
-				if (menuResult === "cancelled") return "cancelled";
-				if (menuResult === "retried") {
-					debug("Re-running checks after retry...");
-					ck.start("Running checks...");
-					checkResults = await runAllChecks(repoRoot, allFiles, 6e4);
-					debug("Retry check results: ok=%s, count=%d", checkResults.ok, checkResults.results.length);
-					continue;
-				}
-				break;
-			}
-			if (checkResults.ok) stopCheckSpinner(ck, checkResults);
-		}
+		if (await runCheckPhaseInteractive(await getRepoRoot(), await resolveToRepoRoot(included.filter((f) => f.status !== "D").map((f) => f.path)), 6e4) === "cancelled") return "cancelled";
 	}
 	const config = await readConfig();
 	const resolvedProvider = config.provider ?? "groq";
@@ -2231,7 +2465,7 @@ async function agentCommand(flags) {
 		const repoRoot = await getRepoRoot();
 		if (await detectConfig(repoRoot)) {
 			debug("Running user checks on changed files...");
-			const checkResults = await runAllChecks(repoRoot, changedFiles.filter((f) => f.status !== "D").map((f) => f.path), 6e4);
+			const checkResults = await runAllChecks(repoRoot, await resolveToRepoRoot(changedFiles.filter((f) => f.status !== "D").map((f) => f.path)), 6e4);
 			if (!checkResults.ok) {
 				const errorMessages = checkResults.results.filter((r) => !r.ok).map((r) => `[${r.tool}]\n${r.stdout}\n${r.stderr}`.trim()).filter(Boolean);
 				const parsed = parseCheckErrors(errorMessages.join("\n\n"));
@@ -3036,7 +3270,7 @@ async function handleStaging(changedFiles, flags) {
 		}
 		if (stagingResult === "checks") {
 			await stageAll();
-			const allFiles = currentFiles.filter((f) => f.status !== "D").map((f) => f.path);
+			const allFiles = await getStagedFiles();
 			if (await detectConfig(repoRoot)) {
 				const ckSpinner = spinner();
 				ckSpinner.start("Running checks...");
@@ -3075,33 +3309,13 @@ async function handleStaging(changedFiles, flags) {
 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);
+	const stagedFileList = await getStagedFiles();
 	if (stagedFileList.length === 0) return;
-	debug("Running user checks on %d staged files...", stagedFileList.length);
-	const ckSpinner = spinner();
-	ckSpinner.start("Running checks...");
-	let checkResults = await runAllChecks(checkRoot, stagedFileList, 6e4);
-	stopCheckSpinner(ckSpinner, checkResults);
-	debug("Check results: ok=%s, count=%d", checkResults.ok, checkResults.results.length);
-	while (!checkResults.ok) {
-		const rawOutput = checkResults.results.filter((r) => !r.ok).map((r) => `[${r.tool}]\n${r.stdout}\n${r.stderr}`.trim()).join("\n\n");
-		const menuResult = await showCheckFailureMenu(parseCheckErrors(rawOutput), rawOutput, async () => {
-			return (await runAllChecks(checkRoot, stagedFileList, 6e4)).ok;
-		});
-		if (menuResult === "cancelled") process.exit(1);
-		if (menuResult === "retried") {
-			debug("Re-staging files and re-running checks after retry...");
-			await stageAll();
-			const ckSpinner = spinner();
-			ckSpinner.start("Running checks...");
-			checkResults = await runAllChecks(checkRoot, stagedFileList, 6e4);
-			debug("Retry check results: ok=%s, count=%d", checkResults.ok, checkResults.results.length);
-			stopCheckSpinner(ckSpinner, checkResults);
-			continue;
-		}
-		break;
-	}
-	await restageFormatterModifications(stagedFileList);
+	if (await runCheckPhaseInteractive(checkRoot, stagedFileList, 6e4, async () => {
+		debug("Re-staging files before retry...");
+		await stageAll();
+	}) === "cancelled") process.exit(1);
+	await restageFormatterModifications(changedFiles.filter((f) => f.staged && f.status !== "D").map((f) => f.path));
 }
 /**
 * Re-stage staged files whose working-tree content diverged from the index after checks ran.