gh-stack 0.2.2 → 0.2.3

package/README.md

@@ -78,12 +78,14 @@ create <branch-name> [--description <desc>]
     Create a new git branch off the current branch and add it to
     the stack. The current branch must already be tracked.
 
-submit [-d|--draft] [-n|--no-edit] [--dry-run]
+submit [-d|--draft] [-n|--no-edit] [-t|--title <t>] [-b|--body <b>] [--body-file <f>] [--dry-run]
     Push all downstack branches to GitHub, create PRs for branches
     that don't have them, and update all PR descriptions with stack
     visualization. Idempotent — safe to run repeatedly.
 
-    In --yes mode, auto-generates PR titles from branch names.
+    --title/-t and --body/-b provide PR details directly (skips prompts).
+    --body-file reads body from a file. In --yes mode without --title,
+    auto-generates PR titles from branch names.
 ```
 
 ### Stack Navigation
@@ -129,8 +131,9 @@ sync [--dry-run]
 
 merge [--dry-run]
     Squash-merge the stack top-down locally (PR3 → PR2 → PR1),
-    then optionally rebase onto main. Closes intermediate PRs and
-    archives the stack on completion.
+    then rebases onto main, closes intermediate PRs, pushes the
+    base branch, and enables GitHub auto-merge (squash). Archives
+    the stack on completion.
 
 delete [<branch>]
     Remove a branch from the stack and re-parent its children.
@@ -251,7 +254,7 @@ gh-stack top         # jump to tip
 gh-stack status
 
 # When PRs are approved, merge the stack
-gh-stack merge
+gh-stack merge       # squash-merges down, pushes, enables auto-merge
 ```
 
 ## Agent/CI Usage
@@ -263,7 +266,8 @@ gh-stack is designed to be used by AI agents and CI pipelines:
 export GH_STACK_YES=1
 
 gh-stack init                    # No confirmations
-gh-stack submit                  # Auto-generates PR titles
+gh-stack submit -t "Title [WEB-1234]" -b "Description"  # Explicit PR details
+gh-stack submit -n               # Or auto-generate titles
 gh-stack sync
 gh-stack restack
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gh-stack",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Stacked PR manager for squash-merge workflows",
   "author": "Kiliman <kiliman@gmail.com>",
   "license": "MIT",

package/src/commands/merge.ts

@@ -6,6 +6,7 @@ import * as git from "../lib/git.ts";
 import { findStackForBranch, getOrderedBranches, writeMetadata } from "../lib/metadata.ts";
 import { ensureMetadata, ensureCleanWorkingTree, ensureValidStack } from "../lib/safety.ts";
 import { takeSnapshot } from "../lib/snapshot.ts";
+import { $ } from "bun";
 import { closePr } from "../lib/github.ts";
 import { confirmAction } from "../lib/ui.ts";
 
@@ -167,10 +168,40 @@ This keeps all commits local (avoiding orphaned squash commits).
   }
   await writeMetadata(meta);
 
-  p.outro(pc.green("Stack merge complete! Stack archived."));
-
+  // Push base branch and enable auto-merge
   console.log();
-  console.log("  Next steps:");
-  console.log(`    1. Push ${pc.yellow(baseBranch)} and let CI run`);
-  console.log(`    2. Squash-merge ${pc.yellow(baseBranch)} into main via GitHub`);
+  const pushAndMerge = await confirmAction(
+    `Push ${pc.yellow(baseBranch)} and enable auto-merge (squash)?`,
+  );
+
+  if (pushAndMerge) {
+    const pushSpinner = p.spinner();
+    pushSpinner.start(`Pushing ${pc.blue(baseBranch)}...`);
+    const pushOk = await git.forcePushWithLease(baseBranch);
+    if (pushOk) {
+      pushSpinner.stop(`Pushed ${pc.blue(baseBranch)}`);
+    } else {
+      pushSpinner.stop(pc.red(`Failed to push ${baseBranch}`));
+      p.outro(
+        pc.yellow("Stack merged locally but push failed. Push manually and merge via GitHub."),
+      );
+      return;
+    }
+
+    // Enable auto-merge via gh CLI
+    const basePrNum = stack.branches[baseBranch]?.pr;
+    if (basePrNum) {
+      const mergeSpinner = p.spinner();
+      mergeSpinner.start("Enabling auto-merge...");
+      try {
+        await $`gh pr merge ${basePrNum} --squash --auto`.quiet();
+        mergeSpinner.stop(`Auto-merge enabled for PR #${basePrNum} — will merge when CI passes`);
+      } catch {
+        mergeSpinner.stop(pc.yellow(`Could not enable auto-merge for PR #${basePrNum}`));
+        p.log.info(`Enable manually: ${pc.dim(`gh pr merge ${basePrNum} --squash --auto`)}`);
+      }
+    }
+  }
+
+  p.outro(pc.green("Stack merge complete! Stack archived."));
 }