contribute-now 0.6.0-dev.211431e → 0.6.0-dev.6c42203

package/dist/index.js

@@ -2268,7 +2268,7 @@ import pc7 from "picocolors";
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.6.0-dev.211431e",
+  version: "0.6.0-dev.6c42203",
   description: "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   type: "module",
   bin: {
@@ -4142,39 +4142,22 @@ ${pc14.dim("AI body preview:")}`);
         warn(`AI unavailable: ${copilotError}`);
       }
     }
+    if (!args["no-ai"]) {
+      await tryGenerateAI();
+    }
     const CANCEL = "Cancel";
     const SQUASH_LOCAL = `Squash merge to ${baseBranch} locally (no PR)`;
     const REGENERATE = "Regenerate AI description";
     let submitAction = "cancel";
     const isMaintainer = config.role === "maintainer";
-    if (isMaintainer) {
-      const maintainerChoice = await selectPrompt("How would you like to submit your changes?", ["Create a PR", SQUASH_LOCAL, CANCEL]);
-      if (maintainerChoice === CANCEL) {
-        warn("Submit cancelled.");
-        return;
-      }
-      if (maintainerChoice === SQUASH_LOCAL) {
-        await performSquashMerge(origin, baseBranch, currentBranch, {
-          model: args.model,
-          convention: config.commitConvention
-        });
-        return;
-      }
-    }
-    if (!args["no-ai"]) {
-      await tryGenerateAI();
-    }
     let actionResolved = false;
     while (!actionResolved) {
       if (prTitle && prBody) {
-        const action = await selectPrompt("What would you like to do with the PR description?", [
-          "Use AI description",
-          "Edit title",
-          "Write manually",
-          "Use gh --fill (auto-fill from commits)",
-          REGENERATE,
-          CANCEL
-        ]);
+        const choices = ["Use AI description"];
+        if (isMaintainer)
+          choices.push(SQUASH_LOCAL);
+        choices.push("Edit title", "Write manually", "Use gh --fill (auto-fill from commits)", REGENERATE, CANCEL);
+        const action = await selectPrompt("What would you like to do with the PR description?", choices);
         if (action === CANCEL) {
           submitAction = "cancel";
           actionResolved = true;
@@ -4182,6 +4165,9 @@ ${pc14.dim("AI body preview:")}`);
           prTitle = null;
           prBody = null;
           await tryGenerateAI();
+        } else if (action === SQUASH_LOCAL) {
+          submitAction = "squash";
+          actionResolved = true;
         } else if (action === "Use AI description") {
           submitAction = "create-pr";
           actionResolved = true;
@@ -4200,6 +4186,8 @@ ${pc14.dim("AI body preview:")}`);
         }
       } else {
         const choices = [];
+        if (isMaintainer)
+          choices.push(SQUASH_LOCAL);
         if (!args["no-ai"])
           choices.push(REGENERATE);
         choices.push("Write title & body manually", "Use gh --fill (auto-fill from commits)", CANCEL);
@@ -4209,6 +4197,9 @@ ${pc14.dim("AI body preview:")}`);
           actionResolved = true;
         } else if (action === REGENERATE) {
           await tryGenerateAI();
+        } else if (action === SQUASH_LOCAL) {
+          submitAction = "squash";
+          actionResolved = true;
         } else if (action === "Write title & body manually") {
           prTitle = await inputPrompt("PR title");
           prBody = await inputPrompt("PR body (markdown)");
@@ -4224,6 +4215,13 @@ ${pc14.dim("AI body preview:")}`);
       warn("Submit cancelled.");
       return;
     }
+    if (submitAction === "squash") {
+      await performSquashMerge(origin, baseBranch, currentBranch, {
+        model: args.model,
+        convention: config.commitConvention
+      });
+      return;
+    }
     info(`Pushing ${pc14.bold(currentBranch)} to ${origin}...`);
     const pushResult = await pushSetUpstream(origin, currentBranch);
     if (pushResult.exitCode !== 0) {

package/package.json

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