@kyubiware/commit-mint 0.7.3 → 0.7.5

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.3",
+	version: "0.7.5",
 	description: "🌿 AI-powered git commit tool — auto-group changed files, generate messages, run pre-commit checks",
 	type: "module",
 	bin: { "cmint": "./dist/cli.mjs" },
@@ -1866,25 +1866,65 @@ async function showRecoveryMenu(errors, onRetry, onSkipHooks, onRestage, message
 }
 //#endregion
 //#region src/ui/review-message.ts
-async function reviewCommitMessage(message) {
-	const { select, text } = await import("@clack/prompts");
+async function handleEdit(message) {
+	const { text } = await import("@clack/prompts");
+	const edited = await text({
+		message: "Edit commit message:",
+		initialValue: message,
+		validate: (v) => v?.trim() ? void 0 : "Message cannot be empty"
+	});
+	if (isCancel(edited)) {
+		debug("User cancelled edit, returning to review menu");
+		return null;
+	}
+	const newMessage = String(edited).trim();
+	debug("Edited message:", newMessage);
+	return newMessage;
+}
+async function handleRegenerate(regenerate) {
+	const { log, text } = await import("@clack/prompts");
+	const hint = await text({
+		message: "Describe what this commit is about to guide regeneration:",
+		validate: (v) => v?.trim() ? void 0 : "Hint cannot be empty"
+	});
+	if (isCancel(hint)) {
+		debug("User cancelled hint entry, returning to review menu");
+		return null;
+	}
+	const hintValue = String(hint).trim();
+	debug("Regenerating with hint:", hintValue);
+	try {
+		const newMessage = await regenerate(hintValue);
+		debug("Regenerated message:", newMessage);
+		return newMessage;
+	} catch (err) {
+		const errMsg = err instanceof Error ? err.message : String(err);
+		debug("Regeneration failed:", errMsg);
+		log.warn(red(`Regeneration failed: ${errMsg}`));
+		return null;
+	}
+}
+async function reviewCommitMessage(message, options) {
+	const { select } = await import("@clack/prompts");
 	while (true) {
+		const reviewOptions = [{
+			label: "Use as-is",
+			value: "use"
+		}, {
+			label: "Edit",
+			value: "edit"
+		}];
+		if (options?.regenerate) reviewOptions.push({
+			label: "Regenerate with hint",
+			value: "regenerate"
+		});
+		reviewOptions.push({
+			label: "Cancel",
+			value: "cancel"
+		});
 		const review = await select({
 			message: `Review commit message:\n\n   ${bold(message)}\n`,
-			options: [
-				{
-					label: "Use as-is",
-					value: "use"
-				},
-				{
-					label: "Edit",
-					value: "edit"
-				},
-				{
-					label: "Cancel",
-					value: "cancel"
-				}
-			]
+			options: reviewOptions
 		});
 		if (isCancel(review) || review === "cancel") {
 			debug("User cancelled at review step");
@@ -1894,17 +1934,8 @@ async function reviewCommitMessage(message) {
 			debug("User accepted message");
 			return message;
 		}
-		if (review === "edit") {
-			debug("User chose to edit message");
-			const edited = await text({
-				message: "Edit commit message:",
-				initialValue: message,
-				validate: (v) => v?.trim() ? void 0 : "Message cannot be empty"
-			});
-			if (isCancel(edited)) continue;
-			message = String(edited).trim();
-			debug("Edited message:", message);
-		}
+		if (review === "edit") message = await handleEdit(message) ?? message;
+		if (review === "regenerate" && options?.regenerate) message = await handleRegenerate(options.regenerate) ?? message;
 	}
 }
 //#endregion
@@ -2019,7 +2050,19 @@ async function runAutoGroupFlow(changedFiles, flags) {
 		log.info(dim(message));
 		if (flags.auto) debug("Auto mode: accepting generated message");
 		else {
-			const reviewed = await reviewCommitMessage(message);
+			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 "cancelled";
@@ -2311,7 +2354,6 @@ async function agentCommand(flags) {
 //#endregion
 //#region src/services/update-check.ts
 const REGISTRY_URL = "https://registry.npmjs.org/-/package/@kyubiware/commit-mint/dist-tags";
-const PACKAGE_NAME$1 = "@kyubiware/commit-mint";
 const TTL_MS = 1440 * 60 * 1e3;
 const FETCH_TIMEOUT_MS = 5e3;
 let cachePath = join(os.homedir(), ".cache", "commit-mint", "update-check.json");
@@ -2396,7 +2438,7 @@ async function fetchLatest(parentSignal) {
 }
 function displayNag(current, latest) {
 	debug("displayNag: %s → %s", current, latest);
-	const message = `Update available: ${yellow(current)} → ${green(latest)}\nRun ${cyan(`npm update -g ${PACKAGE_NAME$1}`)} to update`;
+	const message = `Update available: ${yellow(current)} → ${green(latest)}\nRun ${cyan("cmint update")} to update`;
 	log.warn(message);
 }
 /**
@@ -2404,11 +2446,16 @@ function displayNag(current, latest) {
 * {@link checkForUpdatesUpfront}. Accepts an optional AbortSignal that
 * propagates to the underlying fetch — used by the cancellable spinner.
 *
+* When an update is available, {@link onNag} is invoked (defaulting to
+* {@link displayNag}). The cancellable spinner path passes a capturing
+* callback so it can stop the spinner BEFORE the nag prints — otherwise
+* `log.warn` interleaves with the spinner line and leaves it on screen.
+*
 * Returns an {@link UpdateCheckStatus} so the caller can distinguish a
 * real fetch that found the user current (eligible for "You are on the
 * latest version" feedback) from a silent cache hit.
 */
-async function runUpdateCheck(currentVersion, parentSignal) {
+async function runUpdateCheck(currentVersion, parentSignal, onNag = displayNag) {
 	debug("runUpdateCheck: currentVersion=%s", currentVersion);
 	if (shouldSkip(currentVersion)) {
 		debug("runUpdateCheck: skipped (NO_UPDATE_NOTIFIER / CI / NODE_ENV=test / non-TTY / invalid version)");
@@ -2419,7 +2466,7 @@ async function runUpdateCheck(currentVersion, parentSignal) {
 		if (cached && Date.now() - cached.checkedAt < TTL_MS) {
 			debug("runUpdateCheck: cache fresh (<%dh), skipping fetch", TTL_MS / 36e5);
 			if (semver.gt(cached.latest, currentVersion)) {
-				displayNag(currentVersion, cached.latest);
+				onNag(currentVersion, cached.latest);
 				return "cache-update";
 			}
 			debug("runUpdateCheck: current >= latest, no nag");
@@ -2437,7 +2484,7 @@ async function runUpdateCheck(currentVersion, parentSignal) {
 			checkedAt: Date.now()
 		});
 		if (semver.gt(latest, currentVersion)) {
-			displayNag(currentVersion, latest);
+			onNag(currentVersion, latest);
 			return "fetch-update";
 		}
 		debug("runUpdateCheck: current >= latest, no nag");
@@ -2560,9 +2607,15 @@ async function runCheckWithSpinner(currentVersion) {
 		reportFetchCurrent(await runUpdateCheck(currentVersion));
 		return;
 	}
+	const captured = { nag: null };
 	let status;
 	try {
-		status = await runUpdateCheck(currentVersion, controller.signal);
+		status = await runUpdateCheck(currentVersion, controller.signal, (current, latest) => {
+			captured.nag = {
+				current,
+				latest
+			};
+		});
 	} finally {
 		handler.cleanup();
 	}
@@ -2570,8 +2623,10 @@ async function runCheckWithSpinner(currentVersion) {
 		debug("runCheckWithSpinner: spinner dismissed by user");
 		s.stop("Skipped");
 	} else if (status === "fetch-current") s.stop(green("You are on the latest version"));
-	else if (status === "fetch-update") s.stop("");
-	else if (status === "fetch-failed-or-aborted") s.stop("Update check failed");
+	else if (status === "fetch-update" || status === "cache-update") {
+		s.stop("");
+		if (captured.nag) displayNag(captured.nag.current, captured.nag.latest);
+	} else if (status === "fetch-failed-or-aborted") s.stop("Update check failed");
 	else s.stop("");
 }
 //#endregion
@@ -2997,11 +3052,13 @@ async function runPreCommitChecks(changedFiles, noCheck) {
 }
 /**
 * 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".
+* Signals (git status --short, 2-char XY code):
+*   "MM" — tracked file staged-modified, then reformatted on disk
+*   "AM" — newly-added file staged, then reformatted on disk
 */
 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);
+	const modifiedByChecks = (await getChangedFiles()).filter((f) => checkedSet.has(f.path) && f.staged && (f.status === "MM" || f.status === "AM")).map((f) => f.path);
 	if (modifiedByChecks.length === 0) return;
 	debug("Re-staging %d file(s) modified by checks", modifiedByChecks.length);
 	await stageFiles(modifiedByChecks);
@@ -3115,7 +3172,19 @@ async function commitCommand(flags, version) {
 		}
 		s.stop("Message generated");
 	}
-	const reviewed = await reviewCommitMessage(message);
+	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;