contribute-now 0.4.1-dev.23d6614 → 0.4.1-dev.3325fdb

package/dist/index.js

@@ -1222,19 +1222,22 @@ function extractJson(raw) {
   }
   return text2;
 }
-async function generateCommitMessage(diff, stagedFiles, model, convention = "clean-commit") {
+async function generateCommitMessage(diff, stagedFiles, model, convention = "clean-commit", context) {
   try {
     const isLarge = stagedFiles.length >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD;
     const multiFileHint = stagedFiles.length > 1 ? `
 
 IMPORTANT: Multiple files are staged. Generate ONE commit message that captures the high-level purpose of ALL changes together. Focus on the overall intent, not individual file changes. Be specific but concise — do not list every file.` : "";
+    const squashHint = context === "squash-merge" ? `
+
+CONTEXT: This is a squash merge of an entire feature branch into the base branch. All commits are being combined into ONE single commit. Generate a single high-level summary that describes the overall feature or change — NOT a list of individual commits. Think: what capability was added or what problem was solved? Be specific but concise.` : "";
     const diffContent = isLarge ? createCompactDiff(stagedFiles, diff) : diff.slice(0, 4000);
     const userMessage = `Generate a commit message for these staged changes:
 
 Files (${stagedFiles.length}): ${stagedFiles.join(", ")}
 
 Diff:
-${diffContent}${multiFileHint}`;
+${diffContent}${multiFileHint}${squashHint}`;
     const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model, isLarge ? COPILOT_LONG_TIMEOUT_MS : COPILOT_TIMEOUT_MS);
     return result?.trim() ?? null;
   } catch {
@@ -1966,6 +1969,27 @@ ${pc6.bold("Changed files:")}`);
       }
     }
     info(`Staged files: ${stagedFiles.join(", ")}`);
+    const LARGE_COMMIT_THRESHOLD = 10;
+    if (stagedFiles.length >= LARGE_COMMIT_THRESHOLD && !args.group) {
+      const dirs = new Set(stagedFiles.map((f) => f.split("/")[0]));
+      if (dirs.size > 1) {
+        console.log();
+        warn(`You're staging ${pc6.bold(String(stagedFiles.length))} files across ${pc6.bold(String(dirs.size))} directories in a single commit.`);
+        info(pc6.dim("Large commits mixing different topics make history harder to read and bisect. " + "For cleaner history, consider splitting into atomic commits."));
+        const choice = await selectPrompt("How would you like to proceed?", [
+          "Continue as single commit",
+          "Switch to group mode (AI splits into atomic commits)",
+          "Cancel"
+        ]);
+        if (choice === "Cancel") {
+          process.exit(0);
+        }
+        if (choice === "Switch to group mode (AI splits into atomic commits)") {
+          await runGroupCommit(args.model, config);
+          return;
+        }
+      }
+    }
     let commitMessage = null;
     const useAI = !args["no-ai"];
     if (useAI) {
@@ -2244,7 +2268,7 @@ import pc7 from "picocolors";
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.4.1-dev.23d6614",
+  version: "0.4.1-dev.3325fdb",
   description: "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   type: "module",
   bin: {
@@ -3475,7 +3499,7 @@ var status_default = defineCommand9({
       const branchDiv = await getDivergence(currentBranch, baseBranch);
       const branchLine = formatStatus(currentBranch, baseBranch, branchDiv.ahead, branchDiv.behind);
       console.log(branchLine + pc12.dim(` (current ${pc12.green("*")})`));
-      branchStatus = await detectBranchStatus(currentBranch, baseBranch, config);
+      branchStatus = await detectBranchStatus(currentBranch, baseBranch);
       if (branchStatus.merged) {
         console.log(`  ${pc12.green("✓")}  ${pc12.green("Branch merged")} — ${pc12.dim(branchStatus.mergedReason ?? "all commits reachable from base")}`);
       }
@@ -3552,7 +3576,7 @@ function formatStatus(branch, base, ahead, behind) {
   return `  ${pc12.red("⚡")}  ${label} ${pc12.yellow(`${ahead} ahead`)}${pc12.dim(", ")}${pc12.red(`${behind} behind`)} ${pc12.dim(base)}`;
 }
 var STALE_THRESHOLD_DAYS = 14;
-async function detectBranchStatus(branch, baseBranch, config) {
+async function detectBranchStatus(branch, baseBranch) {
   const result = { merged: false, mergedReason: null, stale: false, staleDaysAgo: null };
   const div = await getDivergence(branch, baseBranch);
   const hasWork = div.ahead > 0;
@@ -3616,10 +3640,12 @@ async function performSquashMerge(origin, baseBranch, featureBranch, options) {
     if (!copilotError) {
       const spinner = createSpinner("Generating AI commit message for squash merge...");
       const [stagedDiff, stagedFiles] = await Promise.all([getStagedDiff(), getStagedFiles()]);
-      const aiMsg = await generateCommitMessage(stagedDiff, stagedFiles, options?.model, options?.convention ?? "clean-commit");
+      const aiMsg = await generateCommitMessage(stagedDiff, stagedFiles, options?.model, options?.convention ?? "clean-commit", "squash-merge");
       if (aiMsg) {
         message = aiMsg;
         spinner.success("AI commit message generated.");
+        console.log(`
+  ${pc13.dim("AI suggestion:")} ${pc13.bold(pc13.cyan(message))}`);
       } else {
         spinner.fail("AI did not return a commit message.");
       }
@@ -3627,13 +3653,38 @@ async function performSquashMerge(origin, baseBranch, featureBranch, options) {
       warn(`AI unavailable: ${copilotError}`);
     }
   }
-  const fallback = message || `squash merge ${featureBranch}`;
-  let finalMsg;
+  let finalMsg = null;
   if (message) {
-    console.log(`  ${pc13.dim("Commit message:")} ${pc13.bold(message)}`);
-    finalMsg = message;
+    while (!finalMsg) {
+      const action = await selectPrompt("What would you like to do?", [
+        "Accept this message",
+        "Edit this message",
+        "Regenerate",
+        "Write manually"
+      ]);
+      if (action === "Accept this message") {
+        finalMsg = message;
+      } else if (action === "Edit this message") {
+        finalMsg = await inputPrompt("Edit commit message", message);
+      } else if (action === "Regenerate") {
+        const spinner = createSpinner("Regenerating commit message...");
+        const [stagedDiff, stagedFiles] = await Promise.all([getStagedDiff(), getStagedFiles()]);
+        const regen = await generateCommitMessage(stagedDiff, stagedFiles, options?.model, options?.convention ?? "clean-commit", "squash-merge");
+        if (regen) {
+          message = regen;
+          spinner.success("Commit message regenerated.");
+          console.log(`
+  ${pc13.dim("AI suggestion:")} ${pc13.bold(pc13.cyan(regen))}`);
+        } else {
+          spinner.fail("Regeneration failed.");
+          finalMsg = await inputPrompt("Enter commit message");
+        }
+      } else {
+        finalMsg = await inputPrompt("Enter commit message");
+      }
+    }
   } else {
-    finalMsg = await inputPrompt("Commit message", fallback);
+    finalMsg = await inputPrompt("Commit message", `squash merge ${featureBranch}`);
   }
   const commitResult = await commitWithMessage(finalMsg);
   if (commitResult.exitCode !== 0) {
@@ -4007,7 +4058,6 @@ ${pc13.dim("AI body preview:")}`);
     }
     if (submitAction === "squash") {
       await performSquashMerge(origin, baseBranch, currentBranch, {
-        defaultMsg: prTitle ?? undefined,
         model: args.model,
         convention: config.commitConvention
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contribute-now",
-  "version": "0.4.1-dev.23d6614",
+  "version": "0.4.1-dev.3325fdb",
   "description": "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   "type": "module",
   "bin": {