@kyubiware/commit-mint 0.9.3 → 0.10.0

package/README.md

@@ -72,6 +72,7 @@ cmint # interactive cli for committing changes
 ```bash
 cmint             # interactive: stage → checks → review → commit
 cmint -a          # auto-group, generate messages, commit everything
+cmint -a 3        # auto-group into exactly 3 commits
 cmint -s          # stage all tracked files in single commit, skip staging menu
 cmint config      # edit provider, model, locale, etc.
 cmint update      # update cmint to the latest published version
@@ -185,7 +186,7 @@ single raw-stderr entry.
 
 | Flag | Description |
 |---|---|
-| `-a`, `--auto` | Auto-stage tracked files and auto-group into commits |
+| `-a`, `--auto [N]` | Auto-group files into N commits (default: LLM decides). Use `-a 0` or `-a` for AI-determined groups |
 | `-m`, `--message <msg>` | Use your own message instead of AI generation |
 | `-H`, `--hint <hint>` | Context hint to the AI (e.g. `"refactor only"`) |
 | `-r`, `--retry` | Retry last failed commit (uses cached message) |
@@ -274,7 +275,7 @@ returns either.
 | Form | Behavior |
 |---|---|
 | `string` | Matched files are appended as trailing arguments. Paths with spaces are quoted automatically. |
-| `string[]` | Commands run sequentially, each as a separate command. First failure stops the run. |
+| `string[]` | Commands run sequentially, each as a separate command. All commands run regardless of failures. |
 | `(files) => string \| string[]` | Function receives the matched files. Use when the command depends on the file list. |
 
 **String command:**
@@ -313,8 +314,8 @@ export default {
 
 - Checks run after `git add`, before the AI call.
 - Globs are processed in declaration order.
-- Commands run sequentially per glob. First failure stops the run (fail-fast)
-  and skips remaining globs.
+- Commands run sequentially per glob. All commands and all globs always run;
+  failures are collected and returned together.
 - 60s timeout per command. ENOENT (command not found) and timeouts are
   reported back to the menu as their own error.
 - Skipped entirely with `cmint -N` or the `c` hotkey toggle.

package/dist/bin.mjs

@@ -33,7 +33,7 @@ var __exportAll = (all, no_symbols) => {
 //#region package.json
 var package_default = {
 	name: "@kyubiware/commit-mint",
-	version: "0.9.3",
+	version: "0.10.0",
 	description: "🌿 AI-powered git commit tool — auto-group changed files, generate messages, run pre-commit checks",
 	type: "module",
 	bin: { "cmint": "./dist/bin.mjs" },
@@ -1727,8 +1727,8 @@ function statusIndicator(status) {
 function buildFileSummary(files) {
 	return files.map((f) => `${f.path} (${statusIndicator(f.status)})`).join("\n");
 }
-function buildGroupingSystemPrompt() {
-	return [
+function buildGroupingSystemPrompt(groupCount) {
+	const lines = [
 		"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:",
@@ -1745,7 +1745,9 @@ function buildGroupingSystemPrompt() {
 		"files: array of exact file paths from the input",
 		"",
 		"Output ONLY valid JSON. No markdown fences, no explanation."
-	].join("\n");
+	];
+	if (groupCount && groupCount > 0) lines.unshift(`Create exactly ${groupCount} groups.`);
+	return lines.join("\n");
 }
 function buildGroupingUserPrompt(summary) {
 	return [
@@ -1778,7 +1780,24 @@ function buildRetryGroupingPrompt() {
 		"Output ONLY valid JSON. No markdown fences, no explanation."
 	].join("\n");
 }
-async function generateGroups(files, apiKey, model, timeout, provider, proxy) {
+/**
+* When a specific group count is requested but there are fewer included files
+* than groups, create one-file-per-group groups without calling the AI.
+* Returns null when the pre-condition is not met.
+*/
+function createPerFileGroups(files, groupCount, excluded) {
+	if (!(groupCount && groupCount > 0 && files.length < groupCount)) return null;
+	debug("generateGroups: %d files < %d requested groups, creating per-file groups", files.length, groupCount);
+	return {
+		groups: files.map((f) => ({
+			name: f.path.split("/").pop() || f.path,
+			description: `Changes to ${f.path}`,
+			files: [f.path]
+		})),
+		excluded
+	};
+}
+async function generateGroups(files, apiKey, model, timeout, provider, proxy, groupCount) {
 	debug("generateGroups: %d files, model=%s", files.length, model ?? "default");
 	const { included, excluded } = filterExcludedFiles(files);
 	if (included.length === 0) {
@@ -1788,8 +1807,10 @@ async function generateGroups(files, apiKey, model, timeout, provider, proxy) {
 			excluded
 		};
 	}
+	const perFile = createPerFileGroups(included, groupCount, excluded);
+	if (perFile) return perFile;
 	const summary = buildFileSummary(included);
-	const systemPrompt = buildGroupingSystemPrompt();
+	const systemPrompt = buildGroupingSystemPrompt(groupCount);
 	const userPrompt = buildGroupingUserPrompt(summary);
 	debug("File summary:\n%s", summary);
 	debug("User prompt length: %d chars", userPrompt.length);
@@ -2287,30 +2308,29 @@ function resolveCommands(commands, matchedFiles) {
 /**
 * Run resolved commands for a single glob entry, appending results.
 * Function-originated commands run as-is; string commands get matched files appended.
-* Returns false if any command fails (for fail-fast signaling).
+* All commands run regardless of individual failures.
 */
-async function runCommandsForGlob(cmds, matchedFiles, timeout, results, repoRoot) {
+async function runCommandsForGlob(cmds, matchedFiles, timeout, results, repoRoot, observer) {
 	for (const { command, fromFunction } of cmds) {
 		const fullCommand = fromFunction ? command : buildCommand(command, matchedFiles);
+		const tool = extractToolName(fullCommand) ?? fullCommand.split(" ")[0];
 		debug("runCommandsForGlob: running '%s'", fullCommand);
+		observer?.onStart?.(tool, fullCommand, matchedFiles);
 		const result = await runCommand(fullCommand, timeout, repoRoot);
 		results.push({
 			...result,
 			files: matchedFiles
 		});
-		if (!result.ok) {
-			debug("runCommandsForGlob: check failed, stopping (fail-fast)");
-			return false;
-		}
+		observer?.onResult?.(result);
+		if (!result.ok) debug("runCommandsForGlob: check failed, continuing to next command");
 	}
-	return true;
 }
 /**
 * Run all user-defined checks from .cmintrc against staged files.
 * Returns a no-op result when no config exists.
-* Fail-fast: stops on first error.
+* All checks always run; failures are collected and returned together.
 */
-async function runAllChecks(repoRoot, stagedFiles, timeout) {
+async function runAllChecks(repoRoot, stagedFiles, timeout, observer) {
 	debug("runAllChecks: %d staged files, checking for config in %s", stagedFiles.length, repoRoot);
 	if (!await detectConfig(repoRoot)) {
 		debug("runAllChecks: no config found, skipping checks");
@@ -2329,10 +2349,7 @@ async function runAllChecks(repoRoot, stagedFiles, timeout) {
 			continue;
 		}
 		debug("runAllChecks: pattern '%s' matched %d files", glob, matchedFiles.length);
-		if (!await runCommandsForGlob(resolveCommands(commands, matchedFiles), matchedFiles, timeout, results, repoRoot)) return {
-			ok: false,
-			results
-		};
+		await runCommandsForGlob(resolveCommands(commands, matchedFiles), matchedFiles, timeout, results, repoRoot, observer);
 	}
 	const ok = results.every((r) => r.ok);
 	debug("runAllChecks: complete — ok=%s, %d results", ok, results.length);
@@ -2414,7 +2431,9 @@ function extractEslintDiagnostics(raw) {
 function extractTestFailures(raw) {
 	const failures = [];
 	const seen = /* @__PURE__ */ new Set();
-	for (const line of raw.split("\n")) {
+	const lines = raw.split("\n");
+	for (let i = 0; i < lines.length; i++) {
+		const line = lines[i];
 		const match = TEST_FILE_FAIL.exec(line);
 		if (!match) continue;
 		const file = (match[1] ?? "").trim();
@@ -2423,13 +2442,35 @@ function extractTestFailures(raw) {
 		const key = `${file}\u0000${name}`;
 		if (seen.has(key)) continue;
 		seen.add(key);
+		const message = scanForwardForMessage(lines, i + 1, TEST_FILE_FAIL);
 		failures.push({
 			file,
-			name
+			name,
+			message
 		});
 	}
 	return failures;
 }
+/**
+* Scan forward from `startIndex` to find the first assertion error message line
+* after a FAIL header. Skips blank lines, separator dashes, stack frames,
+* subsequent FAIL lines, and vitest summary footers.
+*/
+function scanForwardForMessage(lines, startIndex, testFileFailRegex) {
+	for (let j = startIndex; j < lines.length; j++) {
+		const rawLine = lines[j];
+		const trimmed = rawLine.trim();
+		if (!trimmed) continue;
+		const stripped = trimmed.replace(/\s/g, "");
+		if (stripped.length > 5) {
+			if ((stripped.match(/[⎯\-═]/g) ?? []).length / stripped.length > .5) continue;
+		}
+		if (/^\s*[❯>]\s/.test(rawLine)) continue;
+		if (testFileFailRegex.test(trimmed)) break;
+		if (/^(Test Files|Tests)\s/.test(trimmed)) break;
+		return truncate(trimmed, MAX_SUMMARY_LINE_LENGTH);
+	}
+}
 function formatTestFailureSummary(failures, tool) {
 	const total = failures.length;
 	const visible = failures.slice(0, MAX_TEST_FAILURES);
@@ -2440,13 +2481,19 @@ function formatTestFailureSummary(failures, tool) {
 	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);
+		const entries = byFile.get(failure.file) ?? [];
+		entries.push({
+			name: failure.name,
+			message: failure.message
+		});
+		byFile.set(failure.file, entries);
 	}
-	for (const [file, names] of byFile) {
+	for (const [file, entries] of byFile) {
 		lines.push(`    ${truncate(file, MAX_SUMMARY_LINE_LENGTH)}`);
-		for (const name of names) lines.push(`      ${red("×")} ${truncate(name, MAX_SUMMARY_LINE_LENGTH)}`);
+		for (const entry of entries) {
+			lines.push(`      ${red("×")} ${truncate(entry.name, MAX_SUMMARY_LINE_LENGTH)}`);
+			if (entry.message) lines.push(`        ${dim("→")} ${entry.message}`);
+		}
 	}
 	if (hidden > 0) lines.push(dim(`    +${hidden} more failed ${hidden === 1 ? "test" : "tests"}. View full output for details.`));
 	return lines.join("\n");
@@ -2543,24 +2590,42 @@ async function showCheckFailureMenu(errors, rawStderr, onRetry) {
 	}
 }
 //#endregion
-//#region src/ui/check-summary.ts
+//#region src/ui/check-progress.ts
 /**
-* Stop a check spinner with a per-tool summary of the check results.
+* Creates a live check progress display.
 *
-* - 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.).
+* - Each check gets its own line. While a check runs, a spinner animates
+*   in the status position. When it completes, the spinner becomes a ✓ or ✗.
+* - There is no separate "Running checks…" header — the spinner IS the
+*   check line.
+* - When all checks finish, a `log.info` summary line is emitted.
+*
+* Returns a `CheckObserver` (pass directly to `runAllChecks`) plus a `finish()`
+* method that prints the final summary.
 */
-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`);
-	}
+function createCheckProgressDisplay() {
+	const s = spinner();
+	const toolResults = [];
+	let started = false;
+	return {
+		onStart(_tool, _command, _matchedFiles) {
+			if (!started) {
+				s.start(_tool);
+				started = true;
+			} else s.message(_tool);
+		},
+		onResult(result) {
+			toolResults.push({
+				tool: result.tool,
+				ok: result.ok
+			});
+			s.message(`${result.ok ? "✓" : "✗"} ${result.tool}`);
+		},
+		finish(ok) {
+			s.stop(ok ? green("All checks passed") : red("Some checks failed"));
+			if (toolResults.length > 0) log.info(toolResults.map((r) => `  ${r.ok ? green("✓") : red("✗")} ${r.tool}`).join("\n"));
+		}
+	};
 }
 //#endregion
 //#region src/commands/check-phase.ts
@@ -2569,7 +2634,7 @@ function stopCheckSpinner(spinner, results) {
 *
 * 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
+* flow). Encapsulates: detectConfig guard → live progress display → runAllChecks → retry loop with
 * `showCheckFailureMenu`.
 *
 * Caller responsibilities:
@@ -2585,10 +2650,9 @@ function stopCheckSpinner(spinner, results) {
 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);
+	const display = createCheckProgressDisplay();
+	let checkResults = await runAllChecks(repoRoot, files, timeout, display);
+	display.finish(checkResults.ok);
 	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");
@@ -2599,9 +2663,9 @@ async function runCheckPhaseInteractive(repoRoot, files, timeout, onRetry) {
 		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);
+			const retryDisplay = createCheckProgressDisplay();
+			checkResults = await runAllChecks(repoRoot, files, timeout, retryDisplay);
+			retryDisplay.finish(checkResults.ok);
 			debug("Retry check results: ok=%s, count=%d", checkResults.ok, checkResults.results.length);
 			continue;
 		}
@@ -2662,13 +2726,14 @@ async function runAutoGroupFlow(changedFiles, flags) {
 		await setConfigValue(configKey, String(key).trim());
 		debug("API key saved to config");
 	}
+	const groupCount = typeof flags.auto === "number" ? flags.auto : 0;
 	const s = spinner();
 	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);
+	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, groupCount)).groups, included);
 	s.stop("Files analyzed");
 	showGroupedFiles(validatedGroups, included);
 	const autoAccept = await getAutoAccept();
-	const skipPrompts = flags.auto || autoAccept;
+	const skipPrompts = flags.auto !== false || autoAccept;
 	if (skipPrompts) debug("Skipping grouping confirmation (auto=%s autoAccept=%s)", flags.auto, autoAccept);
 	else if (!await showGroupingConfirmation(validatedGroups, excluded)) {
 		outro(dim("Cancelled."));
@@ -3691,11 +3756,13 @@ function buildMultiSelectRender(message, options, output) {
 				return `${header}\n${dim(S_BAR_END)}  ${cancelled}`;
 			}
 			default: {
+				const stdio = output ?? process.stdout;
+				const termRows = ("rows" in stdio ? stdio.rows : void 0) ?? 24;
 				const lines = limitOptions({
 					cursor,
 					options,
 					style: (opt, active) => renderCheckboxOption(opt.label, value.includes(opt.value), active),
-					maxItems: 7,
+					maxItems: Math.min(options.length, Math.max(5, termRows - 3)),
 					output: output ?? process.stdout
 				}).map((line) => `${dim(S_BAR)}  ${line}`);
 				const hintLine = "↑/↓ navigate · space select · enter confirm · A select all · N select none";
@@ -3806,8 +3873,8 @@ function buildPromptRenderer(opts, state) {
 	const toggleList = opts.toggles;
 	return function() {
 		const sym = symbol(this.state);
-		const statusLines = toggleList.map((t) => renderToggleState(t, state[t.hotkey])).join("\n");
-		const header = `${sym}  ${opts.message}\n${dim(S_BAR)}  ${statusLines}`;
+		const statusLines = toggleList.map((t) => `${dim(S_BAR)}  ${renderToggleState(t, state[t.hotkey])}`).join("\n");
+		const header = `${sym}  ${opts.message}\n${statusLines}`;
 		switch (this.state) {
 			case "submit": {
 				const selected = optionList[this.cursor];
@@ -3820,11 +3887,14 @@ function buildPromptRenderer(opts, state) {
 				return `${header}\n${dim(S_BAR)}  ${styleText(["strikethrough", "dim"], text)}\n${dim(S_BAR_END)}`;
 			}
 			default: {
+				const stdio = opts.output ?? process.stdout;
+				const termRows = ("rows" in stdio ? stdio.rows : void 0) ?? 24;
+				const dynamicMax = Math.min(optionList.length, Math.max(5, termRows - 5));
 				const lines = limitOptions({
 					cursor: this.cursor,
 					options: optionList,
 					style: (opt, active) => renderOption(opt, active),
-					maxItems: 7,
+					maxItems: dynamicMax,
 					output: opts.output ?? process.stdout
 				}).map((line) => `${dim(S_BAR)}  ${line}`);
 				const hotkeysHint = toggleList.map((t) => `\`${t.hotkey}\` toggle ${t.label.toLowerCase()}`).join(" • ");
@@ -3972,10 +4042,9 @@ async function handleStaging(changedFiles, flags) {
 			await stageAll();
 			const allFiles = await getStagedFiles();
 			if (await detectConfig(repoRoot)) {
-				const ckSpinner = spinner();
-				ckSpinner.start("Running checks...");
-				const ckResult = await runAllChecks(repoRoot, allFiles, 6e4);
-				stopCheckSpinner(ckSpinner, ckResult);
+				const display = createCheckProgressDisplay();
+				const ckResult = await runAllChecks(repoRoot, allFiles, 6e4, display);
+				display.finish(ckResult.ok);
 				if (!ckResult.ok) for (const r of ckResult.results.filter((r) => !r.ok)) log.info(r.stderr?.trim() || r.stdout?.trim() || `Check failed: ${r.command}`);
 			}
 			currentFiles = await getChangedFiles();
@@ -4054,7 +4123,7 @@ async function commitCommand(flags, version) {
 		if (flags.single) {
 			debug("Single-commit mode: staging all files");
 			await stageAll();
-		} else if (flags.auto) {
+		} else if (flags.auto !== false) {
 			if (flags.message) {
 				outro(red("--message flag is not compatible with auto-group mode."));
 				return;
@@ -4356,9 +4425,10 @@ async function agentCommand(flags) {
 	}
 	const model = getModelForProvider(config, provider, PROVIDER_CONFIGS[provider].defaultModel);
 	const timeout = config.timeout ? parseInt(config.timeout, 10) : void 0;
+	const groupCount = typeof flags.auto === "number" ? flags.auto : 0;
 	let groups;
 	try {
-		groups = validateGroups((await generateGroups(included, apiKey, model, timeout, provider, config.proxy)).groups, included);
+		groups = validateGroups((await generateGroups(included, apiKey, model, timeout, provider, config.proxy, groupCount)).groups, included);
 	} catch (err) {
 		process.exitCode = EXIT_CODES.AI;
 		writeAgentResult({
@@ -4820,8 +4890,12 @@ cli({
 			default: false
 		},
 		auto: {
-			type: Boolean,
-			description: "Auto-group files into commits and accept messages (no prompts)",
+			type: (raw) => {
+				if (raw === "") return true;
+				const n = Number(raw);
+				return Number.isNaN(n) ? true : n;
+			},
+			description: "Auto-group files into commits. Use -a <N> to request N groups (0 = LLM decides)",
 			alias: "a",
 			default: false
 		},