@kyubiware/commit-mint 0.10.1 → 0.11.0

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.10.1",
+	version: "0.11.0",
 	description: "🌿 AI-powered git commit tool — auto-group changed files, generate messages, run pre-commit checks",
 	type: "module",
 	bin: { "cmint": "./dist/bin.mjs" },
@@ -1756,8 +1756,8 @@ function buildGroupingUserPrompt(summary) {
 		summary
 	].join("\n");
 }
-function buildRetryGroupingPrompt() {
-	return [
+function buildRetryGroupingPrompt(groupCount) {
+	const lines = [
 		"PREVIOUS ATTEMPT FAILED: You grouped all files into a single group.",
 		"",
 		"You MUST split the files into at least 2 groups based on what changed and why.",
@@ -1778,7 +1778,12 @@ function buildRetryGroupingPrompt() {
 		"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[0] = "PREVIOUS ATTEMPT FAILED: You created the wrong number of groups.";
+		lines[2] = `You MUST create exactly ${groupCount} groups. Do not create more or fewer.`;
+	}
+	return lines.join("\n");
 }
 /**
 * When a specific group count is requested but there are fewer included files
@@ -1826,9 +1831,9 @@ async function generateGroups(files, apiKey, model, timeout, provider, proxy, gr
 		debug("generateGroups: parsed %d raw groups", rawGroups.length);
 		let validated = validateGroups(rawGroups, included);
 		debug("generateGroups: %d validated groups", validated.length);
-		if (isLowQualityGrouping(rawGroups, included)) {
+		if (isLowQualityGrouping(rawGroups, included, groupCount)) {
 			debug("generateGroups: low quality result, retrying with stricter prompt");
-			rawGroups = await callGroupingAI(client, resolvedModel, buildRetryGroupingPrompt(), userPrompt);
+			rawGroups = await callGroupingAI(client, resolvedModel, buildRetryGroupingPrompt(groupCount), userPrompt);
 			debug("generateGroups retry: parsed %d raw groups", rawGroups.length);
 			validated = validateGroups(rawGroups, included);
 			debug("generateGroups retry: %d validated groups", validated.length);
@@ -1864,9 +1869,10 @@ 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) {
+function isLowQualityGrouping(groups, allFiles, groupCount) {
 	if (allFiles.length === 0) return false;
 	if (groups.length === 0) return true;
+	if (groupCount && groupCount > 0 && groups.length !== groupCount) return true;
 	if (allFiles.length < MIN_FILES_FOR_QUALITY_CHECK) return false;
 	return groups.length === 1;
 }
@@ -4075,7 +4081,8 @@ async function handleStaging(changedFiles, flags) {
 	}
 	return {
 		changedFiles: currentFiles,
-		skipStaging
+		skipStaging,
+		stagedAll: stageAllFlag
 	};
 }
 /** Run user-defined pre-commit checks from cmint config */
@@ -4123,6 +4130,7 @@ async function commitCommand(flags, version) {
 	let changedFiles = await getChangedFiles();
 	debug("Changed files:", changedFiles.length);
 	const s = spinner();
+	let stagedAll = true;
 	try {
 		if (flags.single) {
 			debug("Single-commit mode: staging all files");
@@ -4138,6 +4146,7 @@ async function commitCommand(flags, version) {
 			const result = await handleStaging(changedFiles, flags);
 			if (!result) return;
 			changedFiles = result.changedFiles;
+			stagedAll = result.stagedAll;
 		}
 	} catch (err) {
 		s.stop(red("Staging failed."));
@@ -4146,106 +4155,115 @@ async function commitCommand(flags, version) {
 		outro(red(`Failed to stage files: ${msg}`));
 		process.exit(1);
 	}
-	changedFiles = await getChangedFiles();
-	if (!flags.noCheck && await getRunChecks()) await runPreCommitChecks(changedFiles, false);
-	const diffResult = await getStagedDiff();
-	if (!diffResult) {
-		debug("No staged changes found after staging");
-		outro(red("No staged changes found."));
-		process.exit(1);
-	}
-	if ("excludedFiles" in diffResult) {
-		debug("All staged files are excluded:", diffResult.excludedFiles);
-		const message = buildExcludedFilesMessage(diffResult.excludedFiles);
-		log.info(diffResult.excludedFiles.map((f) => `     ${f}`).join("\n"));
-		await saveCachedCommit(repoRoot, message);
-		s.start("Running pre-commit hooks...");
-		const result = await commitWithRecovery(message, s, await getHead());
-		if (result === "committed") {
-			outro(green("Done."));
-			return;
+	while (true) {
+		changedFiles = await getChangedFiles();
+		if (!flags.noCheck && await getRunChecks()) await runPreCommitChecks(changedFiles, false);
+		const diffResult = await getStagedDiff();
+		if (!diffResult) {
+			debug("No staged changes found after staging");
+			outro(red("No staged changes found."));
+			process.exit(1);
 		}
-		if (result === "cancelled") process.exit(1);
-		return;
-	}
-	debug("Staged files:", diffResult.files);
-	debug("Diff length:", diffResult.diff.length, "chars");
-	log.info(diffResult.files.map((f) => `     ${f}`).join("\n"));
-	let message;
-	if (flags.message) {
-		debug("Using provided message:", flags.message);
-		message = flags.message;
-	} else {
-		const config = await readConfig();
-		const provider = isValidProvider(config.provider ?? "groq") ? config.provider : "groq";
-		try {
-			await getProviderApiKey(provider);
-			debug("API key found");
-		} catch {
-			debug("No API key found, prompting user");
-			const { text: promptText } = await import("@clack/prompts");
-			const configKey = PROVIDER_ENV_KEYS[provider];
-			const key = await promptText({
-				message: `Enter your ${formatProviderName(provider)} API key:`,
-				placeholder: provider === "groq" ? "gsk_..." : "...",
-				validate: (v) => v?.trim() ? void 0 : "API key is required"
-			});
-			if (isCancel(key)) {
-				outro(dim("Cancelled."));
-				return;
+		let commitResult;
+		if ("excludedFiles" in diffResult) {
+			debug("All staged files are excluded:", diffResult.excludedFiles);
+			const message = buildExcludedFilesMessage(diffResult.excludedFiles);
+			log.info(diffResult.excludedFiles.map((f) => `     ${f}`).join("\n"));
+			await saveCachedCommit(repoRoot, message);
+			s.start("Running pre-commit hooks...");
+			commitResult = await commitWithRecovery(message, s, await getHead());
+		} else {
+			debug("Staged files:", diffResult.files);
+			debug("Diff length:", diffResult.diff.length, "chars");
+			log.info(diffResult.files.map((f) => `     ${f}`).join("\n"));
+			let message;
+			if (flags.message) {
+				debug("Using provided message:", flags.message);
+				message = flags.message;
+			} else {
+				const config = await readConfig();
+				const provider = isValidProvider(config.provider ?? "groq") ? config.provider : "groq";
+				try {
+					await getProviderApiKey(provider);
+					debug("API key found");
+				} catch {
+					debug("No API key found, prompting user");
+					const { text: promptText } = await import("@clack/prompts");
+					const configKey = PROVIDER_ENV_KEYS[provider];
+					const key = await promptText({
+						message: `Enter your ${formatProviderName(provider)} API key:`,
+						placeholder: provider === "groq" ? "gsk_..." : "...",
+						validate: (v) => v?.trim() ? void 0 : "API key is required"
+					});
+					if (isCancel(key)) {
+						outro(dim("Cancelled."));
+						return;
+					}
+					await setConfigValue(configKey, String(key).trim());
+					debug("API key saved to config");
+				}
+				s.start("Generating commit message...");
+				try {
+					const genStart = Date.now();
+					message = await generateMessage(diffResult.diff, flags.hint);
+					debug("generateMessage took %d ms", Date.now() - genStart);
+					debug("Generated message:", message);
+				} catch (err) {
+					s.stop(red("Failed to generate message."));
+					debug("Message generation failed:", err instanceof Error ? err.message : String(err));
+					outro(red(err instanceof Error ? err.message : String(err)));
+					return;
+				}
+				s.stop("Message generated");
+			}
+			if (flags.single || await getAutoAccept()) {
+				debug("Auto-accept ON: skipping review step");
+				log.info(message);
+			} else {
+				const reviewed = await reviewCommitMessage(message, { regenerate: async (hint) => {
+					const combinedHint = flags.hint ? `${flags.hint}\n${hint}` : hint;
+					debug("Regenerating with combined hint:", combinedHint);
+					s.start("Regenerating commit message...");
+					try {
+						const newMessage = await generateMessage(diffResult.diff, combinedHint);
+						s.stop("Message regenerated");
+						return newMessage;
+					} catch (err) {
+						s.stop(red("Regeneration failed"));
+						throw err;
+					}
+				} });
+				if (reviewed === null) {
+					outro(dim("Cancelled."));
+					return;
+				}
+				message = reviewed;
 			}
-			await setConfigValue(configKey, String(key).trim());
-			debug("API key saved to config");
+			await saveCachedCommit(repoRoot, message);
+			debug("Message cached for repo:", repoRoot);
+			s.start("Running pre-commit hooks...");
+			const headBefore = await getHead();
+			debug("HEAD before commit:", headBefore);
+			commitResult = await commitWithRecovery(message, s, headBefore);
+			debug("Commit result:", commitResult);
 		}
-		s.start("Generating commit message...");
-		try {
-			const genStart = Date.now();
-			message = await generateMessage(diffResult.diff, flags.hint);
-			debug("generateMessage took %d ms", Date.now() - genStart);
-			debug("Generated message:", message);
-		} catch (err) {
-			s.stop(red("Failed to generate message."));
-			debug("Message generation failed:", err instanceof Error ? err.message : String(err));
-			outro(red(err instanceof Error ? err.message : String(err)));
+		if (commitResult === "cancelled") process.exit(1);
+		if (stagedAll) {
+			outro(green("Done."));
 			return;
 		}
-		s.stop("Message generated");
-	}
-	if (flags.single || await getAutoAccept()) {
-		debug("Auto-accept ON: skipping review step");
-		log.info(message);
-	} else {
-		const reviewed = await reviewCommitMessage(message, { regenerate: async (hint) => {
-			const combinedHint = flags.hint ? `${flags.hint}\n${hint}` : hint;
-			debug("Regenerating with combined hint:", combinedHint);
-			s.start("Regenerating commit message...");
-			try {
-				const newMessage = await generateMessage(diffResult.diff, combinedHint);
-				s.stop("Message regenerated");
-				return newMessage;
-			} catch (err) {
-				s.stop(red("Regeneration failed"));
-				throw err;
-			}
-		} });
-		if (reviewed === null) {
-			outro(dim("Cancelled."));
+		const remaining = await getChangedFiles();
+		if (remaining.length === 0) {
+			outro(green("Done."));
 			return;
 		}
-		message = reviewed;
-	}
-	await saveCachedCommit(repoRoot, message);
-	debug("Message cached for repo:", repoRoot);
-	s.start("Running pre-commit hooks...");
-	const headBefore = await getHead();
-	debug("HEAD before commit:", headBefore);
-	const result = await commitWithRecovery(message, s, headBefore);
-	debug("Commit result:", result);
-	if (result === "committed") {
-		outro(green("Done."));
-		return;
+		debug("Uncommitted files remain after commit:", remaining.length);
+		log.info(`${remaining.length} file${remaining.length !== 1 ? "s" : ""} remaining — continuing with the staging menu`);
+		const stagingResult = await handleStaging(remaining, flags);
+		if (!stagingResult) return;
+		changedFiles = stagingResult.changedFiles;
+		stagedAll = stagingResult.stagedAll;
 	}
-	if (result === "cancelled") process.exit(1);
 }
 //#endregion
 //#region src/cli.ts