@kyubiware/commit-mint 0.6.2 → 0.6.4

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.6.2",
+	version: "0.6.4",
 	description: "🌿 A commit tool that actually handles hook failures",
 	type: "module",
 	bin: { "cmint": "./dist/cli.mjs" },
@@ -995,12 +995,28 @@ async function stageAll() {
 	await execa("git", ["add", "-A"]);
 }
 async function resetStaging() {
-	debug("resetStaging: git reset HEAD");
-	await execa("git", ["reset", "HEAD"]);
+	try {
+		debug("resetStaging: git reset HEAD");
+		await execa("git", ["reset", "HEAD"]);
+	} catch {
+		debug("resetStaging: HEAD missing, falling back to git rm --cached");
+		await execa("git", [
+			"rm",
+			"-r",
+			"--cached",
+			"--quiet",
+			"."
+		]);
+	}
 }
 async function getHead() {
-	const { stdout } = await execa("git", ["rev-parse", "HEAD"]);
-	return stdout.trim();
+	try {
+		const { stdout } = await execa("git", ["rev-parse", "HEAD"]);
+		return stdout.trim();
+	} catch {
+		debug("getHead: HEAD does not exist (fresh repo)");
+		return null;
+	}
 }
 async function getStatusShort() {
 	const { stdout } = await execa("git", ["status", "--short"]);
@@ -1061,6 +1077,93 @@ async function attemptCommitNoVerify(message, onProgress) {
 	return attemptCommit(message, ["--no-verify"], onProgress);
 }
 //#endregion
+//#region src/services/grouping-parser.ts
+/** Coerce a parsed value into a CommitGroup, or null if it doesn't match the shape. */
+function coerceGroup(item) {
+	if (typeof item === "object" && item !== null && "name" in item && "description" in item && "files" in item && Array.isArray(item.files)) {
+		const obj = item;
+		return {
+			name: String(obj.name),
+			description: String(obj.description),
+			files: obj.files.filter((f) => typeof f === "string")
+		};
+	}
+	return null;
+}
+/** Return the index of the closing quote of a string starting at text[start] === '"'. */
+function skipString(text, start) {
+	let i = start + 1;
+	while (i < text.length) {
+		const ch = text[i];
+		if (ch === "\\") {
+			i += 2;
+			continue;
+		}
+		if (ch === "\"") return i;
+		i++;
+	}
+	return i;
+}
+function openBrace(state, index) {
+	if (state.depth === 0) state.start = index;
+	state.depth++;
+}
+function pushParsedObject(objects, candidate) {
+	try {
+		objects.push(JSON.parse(candidate));
+	} catch {}
+}
+function closeBrace(state, text, index) {
+	if (state.depth === 0) return;
+	state.depth--;
+	if (state.depth === 0 && state.start !== -1) {
+		pushParsedObject(state.objects, text.slice(state.start, index + 1));
+		state.start = -1;
+	}
+}
+/**
+* Scan for top-level `{...}` objects, respecting string literals and escapes.
+* Used to recover groups when the model emits a single object or concatenated
+* objects instead of the requested JSON array.
+*/
+function extractTopLevelObjects(text) {
+	const state = {
+		objects: [],
+		depth: 0,
+		start: -1
+	};
+	for (let i = 0; i < text.length; i++) {
+		const ch = text[i];
+		if (ch === "\"") {
+			i = skipString(text, i);
+			continue;
+		}
+		if (ch === "{") {
+			openBrace(state, i);
+			continue;
+		}
+		if (ch === "}") closeBrace(state, text, i);
+	}
+	return state.objects;
+}
+function parseGroupingResponse(content) {
+	let cleaned = content.replace(/<think[\s\S]*?<\/think>/gi, "").trim();
+	cleaned = cleaned.replace(/^```(?:json)?\s*/i, "").replace(/\s*```$/i, "").trim();
+	const start = cleaned.indexOf("[");
+	const end = cleaned.lastIndexOf("]");
+	if (start !== -1 && end !== -1 && end > start) try {
+		const parsed = JSON.parse(cleaned.slice(start, end + 1));
+		if (Array.isArray(parsed)) {
+			if (parsed.length === 0) return [];
+			const groups = parsed.map(coerceGroup).filter((g) => g !== null);
+			if (groups.length > 0) return groups;
+		}
+	} catch {}
+	const groups = extractTopLevelObjects(cleaned).map(coerceGroup).filter((g) => g !== null);
+	if (groups.length > 0) return groups;
+	throw new Error("AI response did not contain a JSON array");
+}
+//#endregion
 //#region src/services/grouping.ts
 function matchesExcludePattern(filePath, pattern) {
 	if (pattern === filePath) return true;
@@ -1165,23 +1268,6 @@ function buildRetryGroupingPrompt() {
 		"Output ONLY valid JSON. No markdown fences, no explanation."
 	].join("\n");
 }
-function parseGroupingResponse(content) {
-	let cleaned = content.replace(/<think[\s\S]*?<\/think>/gi, "").trim();
-	cleaned = cleaned.replace(/^```(?:json)?\s*/i, "").replace(/\s*```$/i, "").trim();
-	const start = cleaned.indexOf("[");
-	const end = cleaned.lastIndexOf("]");
-	if (start === -1 || end === -1 || end <= start) throw new Error("AI response did not contain a JSON array");
-	const jsonText = cleaned.slice(start, end + 1);
-	const parsed = JSON.parse(jsonText);
-	if (!Array.isArray(parsed)) throw new Error("AI response was not a JSON array");
-	const rawGroups = [];
-	for (const item of parsed) if (typeof item === "object" && item !== null && "name" in item && "description" in item && "files" in item && Array.isArray(item.files)) rawGroups.push({
-		name: String(item.name),
-		description: String(item.description),
-		files: item.files.filter((f) => typeof f === "string")
-	});
-	return rawGroups;
-}
 async function generateGroups(files, apiKey, model, timeout, provider, proxy) {
 	debug("generateGroups: %d files, model=%s", files.length, model ?? "default");
 	const { included, excluded } = filterExcludedFiles(files);
@@ -1209,7 +1295,7 @@ async function generateGroups(files, apiKey, model, timeout, provider, proxy) {
 		debug("generateGroups: parsed %d raw groups", rawGroups.length);
 		let validated = validateGroups(rawGroups, included);
 		debug("generateGroups: %d validated groups", validated.length);
-		if (isLowQualityGrouping(validated, included)) {
+		if (isLowQualityGrouping(rawGroups, included)) {
 			debug("generateGroups: low quality result, retrying with stricter prompt");
 			rawGroups = await callGroupingAI(client, resolvedModel, buildRetryGroupingPrompt(), userPrompt);
 			debug("generateGroups retry: parsed %d raw groups", rawGroups.length);
@@ -1248,7 +1334,8 @@ async function callGroupingAI(client, model, systemPrompt, userPrompt) {
 /** Minimum file count where a single-group result is considered low quality */
 const MIN_FILES_FOR_QUALITY_CHECK = 5;
 function isLowQualityGrouping(groups, allFiles) {
-	if (groups.length === 0) return false;
+	if (allFiles.length === 0) return false;
+	if (groups.length === 0) return true;
 	if (allFiles.length < MIN_FILES_FOR_QUALITY_CHECK) return false;
 	return groups.length === 1;
 }
@@ -1544,6 +1631,26 @@ async function showCheckFailureMenu(errors, rawStderr, onRetry) {
 	}
 }
 //#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);
@@ -1805,10 +1912,7 @@ async function runAutoGroupFlow(changedFiles, flags) {
 				}
 				break;
 			}
-			if (checkResults.ok) {
-				ck.stop("All checks passed");
-				if (checkResults.results.length > 0) log.info(checkResults.results.map((r) => `  ${green("✓")} ${r.tool}`).join("\n"));
-			}
+			if (checkResults.ok) stopCheckSpinner(ck, checkResults);
 		}
 	}
 	const config = await readConfig();
@@ -1931,18 +2035,6 @@ function buildExcludedFilesMessage(files) {
 //#endregion
 //#region src/commands/agent.ts
 /**
-* Wrapper around getHead() that returns "" on fresh repos with no commits.
-* `git rev-parse HEAD` fails with exit 128 on a brand-new repo, which would
-* crash the agent flow before the first commit can be made.
-*/
-async function safeGetHead() {
-	try {
-		return await getHead();
-	} catch {
-		return "";
-	}
-}
-/**
 * Headless agent command — orchestrates the entire commit flow without any TUI
 * interaction. Emits structured JSON results to stdout, one per line. Returns
 * control to the caller with `process.exitCode` set to one of the 7 documented
@@ -1995,16 +2087,16 @@ async function agentCommand(flags) {
 	if ("excludedFiles" in diffResult) {
 		debug("All staged files are excluded:", diffResult.excludedFiles);
 		const message = buildExcludedFilesMessage(diffResult.excludedFiles);
-		const headBefore = await safeGetHead();
+		const headBefore = await getHead();
 		const result = await attemptCommit(message);
-		const headAfter = await safeGetHead();
+		const headAfter = await getHead();
 		if (result.ok || headBefore !== headAfter) {
 			process.exitCode = EXIT_CODES.SUCCESS;
 			writeAgentResult({
 				status: "success",
 				commits: [{
 					message,
-					hash: headAfter,
+					hash: headAfter ?? "",
 					files: diffResult.excludedFiles
 				}]
 			});
@@ -2020,16 +2112,16 @@ async function agentCommand(flags) {
 	}
 	if (flags.message) {
 		debug("Using provided message:", flags.message);
-		const headBefore = await safeGetHead();
+		const headBefore = await getHead();
 		const result = await attemptCommit(flags.message);
-		const headAfter = await safeGetHead();
+		const headAfter = await getHead();
 		if (result.ok || headBefore !== headAfter) {
 			process.exitCode = EXIT_CODES.SUCCESS;
 			writeAgentResult({
 				status: "success",
 				commits: [{
 					message: flags.message,
-					hash: headAfter,
+					hash: headAfter ?? "",
 					files: diffResult.files
 				}]
 			});
@@ -2069,9 +2161,9 @@ async function agentCommand(flags) {
 		debug("Committing %d excluded files:", excluded.length, excluded);
 		await resetStaging();
 		await stageFiles(excluded);
-		const headBefore = await safeGetHead();
+		const headBefore = await getHead();
 		const result = await attemptCommit(message);
-		const headAfter = await safeGetHead();
+		const headAfter = await getHead();
 		if (!result.ok && headBefore === headAfter) debug("Excluded files commit failed, continuing without them");
 	}
 	if (included.length === 0) {
@@ -2141,13 +2233,13 @@ async function agentCommand(flags) {
 			return;
 		}
 		await saveCachedCommit(await getRepoRoot(), message);
-		const headBefore = await safeGetHead();
+		const headBefore = await getHead();
 		const result = await attemptCommit(message);
-		const headAfter = await safeGetHead();
+		const headAfter = await getHead();
 		if (result.ok || headBefore !== headAfter) {
 			commits.push({
 				message,
-				hash: headAfter,
+				hash: headAfter ?? "",
 				files: group.files,
 				groupName: group.name
 			});
@@ -2526,14 +2618,8 @@ async function handleStaging(changedFiles, flags) {
 				const ckSpinner = spinner();
 				ckSpinner.start("Running checks...");
 				const ckResult = await runAllChecks(repoRoot, allFiles, 6e4);
-				if (ckResult.ok) {
-					ckSpinner.stop("All checks passed");
-					for (const r of ckResult.results) if (r.stdout.trim()) log.info(dim(r.stdout.trim()));
-				} else {
-					const failed = ckResult.results.filter((r) => !r.ok);
-					ckSpinner.stop(`${failed.length} check${failed.length !== 1 ? "s" : ""} failed`);
-					for (const r of failed) log.info(r.stderr?.trim() || r.stdout?.trim() || `Check failed: ${r.command}`);
-				}
+				stopCheckSpinner(ckSpinner, ckResult);
+				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();
 			continue;
@@ -2569,7 +2655,10 @@ async function runPreCommitChecks(changedFiles, noCheck) {
 	const stagedFileList = changedFiles.filter((f) => f.staged && f.status !== "D").map((f) => f.path);
 	if (stagedFileList.length === 0) return;
 	debug("Running user checks on %d staged files...", stagedFileList.length);
+	const 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");
@@ -2584,13 +2673,7 @@ async function runPreCommitChecks(changedFiles, noCheck) {
 			ckSpinner.start("Running checks...");
 			checkResults = await runAllChecks(checkRoot, stagedFileList, 6e4);
 			debug("Retry check results: ok=%s, count=%d", checkResults.ok, checkResults.results.length);
-			if (checkResults.ok) {
-				ckSpinner.stop("All checks passed");
-				for (const r of checkResults.results) if (r.stdout.trim()) log.info(dim(r.stdout.trim()));
-			} else {
-				const retryFailed = checkResults.results.filter((r) => !r.ok);
-				ckSpinner.stop(`${retryFailed.length} check${retryFailed.length !== 1 ? "s" : ""} failed`);
-			}
+			stopCheckSpinner(ckSpinner, checkResults);
 			continue;
 		}
 		break;