gh-stack 0.19.7 → 0.19.8

package/README.md

@@ -289,7 +289,9 @@ merge --base [--dry-run] [-d|--delete-branch] [--no-push|--push]
     via GitHub (PR3 → PR2 → PR1), then enables auto-merge for the base PR
     into main. The whole stack lands on main as a single squash commit.
     All merges happen on GitHub so PRs show as "Merged", Linear tickets
-    close automatically, and GitHub Actions fire normally. Skips already-
+    close automatically, and GitHub Actions fire normally. Squash commit
+    subjects leave out the ` (N/M)` stack position that `submit` adds to
+    PR titles. Skips already-
     merged PRs (safe to re-run). Waits for GitHub between merges, and
     self-heals its spurious "Head branch is out of date" (a stale PR
     head pointer after a child squash) by re-syncing and retrying. Before

package/package.json

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

package/src/commands/merge.ts

@@ -25,6 +25,7 @@ import type { Stack } from "../types.ts";
 import { confirmAction, isAutoYes } from "../lib/ui.ts";
 import { guardRemoteContent } from "../lib/remote-guard.ts";
 import { ensureNoPendingRun } from "./restack.ts";
+import { stripSeqSuffix } from "./update-prs.ts";
 import {
   planMerges,
   advancePastMerged,
@@ -62,6 +63,24 @@ export function isTransientMergeError(stderr: string): boolean {
   );
 }
 
+/**
+ * The squash commit subject for a PR titled `title`, without the ` (N/M)`
+ * stack position `submit` adds to PR titles, which GitHub would otherwise put
+ * on the trunk's commit. Null when the title has no position, so GitHub's own
+ * "<title> (#N)" stands.
+ */
+export function squashSubject(title: string, prNumber: number): string | null {
+  const base = stripSeqSuffix(title);
+  return base === title.trimEnd() ? null : `${base} (#${prNumber})`;
+}
+
+/** `gh pr merge` args setting the squash subject (see squashSubject); empty to keep GitHub's. */
+async function squashSubjectArgs(prNumber: number): Promise<string[]> {
+  const title = (await getPrInfo(prNumber))?.title;
+  const subject = title ? squashSubject(title, prNumber) : null;
+  return subject ? ["--subject", subject] : [];
+}
+
 /**
  * Squash-merge a PR, healing the two timing artifacts a top-down cascade
  * provokes — neither of which is a real conflict:
@@ -87,8 +106,9 @@ async function squashMergeWithRetry(
   s: ReturnType<typeof p.spinner>,
 ): Promise<{ ok: true } | { ok: false; stderr: string; genuine: boolean }> {
   const maxAttempts = MERGE_RETRY_BACKOFF_MS.length + 1;
+  const subject = await squashSubjectArgs(prNumber);
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-    const ghArgs = ["pr", "merge", String(prNumber), "--squash"];
+    const ghArgs = ["pr", "merge", String(prNumber), "--squash", ...subject];
     if (deleteFlag) ghArgs.push("--delete-branch");
 
     const proc = Bun.spawn(["gh", ...ghArgs], { stdout: "pipe", stderr: "pipe" });
@@ -423,7 +443,8 @@ OPTIONS
           : "Single branch stack — enabling auto-merge on GitHub.",
       );
       if (!dryRun) {
-        const auto = await $`gh pr merge ${basePr} --squash --auto`.nothrow().quiet();
+        const subject = await squashSubjectArgs(basePr);
+        const auto = await $`gh pr merge ${basePr} --squash --auto ${subject}`.nothrow().quiet();
         if (auto.exitCode === 0) {
           p.log.success(`Auto-merge enabled for PR #${basePr}`);
         } else {
@@ -712,6 +733,7 @@ OPTIONS
 
   const enableAutoMerge = async (): Promise<{ ok: boolean; stderr: string }> => {
     const ghArgs = ["pr", "merge", String(basePr), "--squash", "--auto"];
+    if (basePr != null) ghArgs.push(...(await squashSubjectArgs(basePr)));
     if (deleteFlag) ghArgs.push("--delete-branch");
     const proc = Bun.spawn(["gh", ...ghArgs], { stdout: "pipe", stderr: "pipe" });
     const stderr = await new Response(proc.stderr).text();