@kyubiware/commit-mint 0.6.3 → 0.6.5

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.3",
+	version: "0.6.5",
 	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"]);
@@ -1138,6 +1154,7 @@ function parseGroupingResponse(content) {
 	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;
 		}
@@ -1278,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);
@@ -1317,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;
 }
@@ -2017,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
@@ -2081,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
 				}]
 			});
@@ -2106,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
 				}]
 			});
@@ -2155,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) {
@@ -2227,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
 			});
@@ -2672,6 +2678,19 @@ async function runPreCommitChecks(changedFiles, noCheck) {
 		}
 		break;
 	}
+	await restageFormatterModifications(stagedFileList);
+}
+/**
+* Re-stage staged files whose working-tree content diverged from the index after checks ran.
+* Signal: a file with both index and working-tree modifications has git status "MM".
+*/
+async function restageFormatterModifications(stagedFileList) {
+	const checkedSet = new Set(stagedFileList);
+	const modifiedByChecks = (await getChangedFiles()).filter((f) => checkedSet.has(f.path) && f.staged && f.status === "MM").map((f) => f.path);
+	if (modifiedByChecks.length === 0) return;
+	debug("Re-staging %d file(s) modified by checks", modifiedByChecks.length);
+	await stageFiles(modifiedByChecks);
+	log.info(`Re-staged ${modifiedByChecks.length} file${modifiedByChecks.length !== 1 ? "s" : ""} modified by checks`);
 }
 //#endregion
 //#region src/commands/commit.ts