gh-stack 0.1.0 → 0.1.1

package/README.md

@@ -47,23 +47,24 @@ gh-stack status
 ### Stack Management
 
 ```
-init [--name <name>] [--description <desc>]
+init [--name <name>] [--description <desc>] [--parent <branch>]
     Create a new stack and add the current branch as the first entry.
 
-add [<branch>] [--parent <branch>] [--create] [--description <desc>]
+add [<branch>] [--parent <branch>] [--create <branch>] [--description <desc>]
     Add a branch to the current stack. Defaults to the current branch.
-    --create makes a new branch off the top of stack first.
+    --create <branch> makes a new branch off the top of stack first.
 
-remove <branch>
+remove [<branch>]
     Remove a branch from the stack and re-parent its children.
+    If omitted, an interactive selector is shown.
 ```
 
 ### Navigation
 
 ```
 show
-    Display the current stack as a tree with PR numbers, titles,
-    review status, and CI state. This is the default command.
+    Display the current stack as a tree with branch numbers,
+    PR numbers, and descriptions. This is the default command.
 
 list
     List branches with position numbers. Lightweight output for
@@ -104,6 +105,7 @@ merge [--dry-run]
     Squash-merge the stack top-down locally (PR3 -> PR2 -> PR1),
     then optionally rebase onto main. Keeps all commits local to
     avoid orphaned squash commits from GitHub-only merges.
+    Can also close intermediate PRs and archives the stack on completion.
 
 update-prs
     Update all PR descriptions with a stack visualization:
@@ -119,13 +121,25 @@ update-prs
 ### Maintenance
 
 ```
-archive [--list] [--restore <name>]
-    Manage archived stacks.
+archive [--restore <name>]
+    List archived stacks by default, or restore one by name.
 
 undo
     Restore the last snapshot taken before a destructive operation.
 ```
 
+## Not Implemented Yet
+
+These are still intended, but not shipped in `v0.1.1`:
+
+```text
+split
+    Guided helper for splitting a branch/PR into two and updating stack metadata.
+
+insert
+    Insert a branch into the middle of an existing stack and re-parent the chain.
+```
+
 ## Global Options
 
 ```

package/package.json

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

package/src/commands/add.ts

@@ -5,7 +5,7 @@ import * as git from "../lib/git.ts";
 import { addBranchToStack, getTopOfStack, getOrderedBranches } from "../lib/metadata.ts";
 import { ensureMetadata, ensureCurrentStack } from "../lib/safety.ts";
 import { getPrNumber } from "../lib/github.ts";
-import { selectParent } from "../lib/ui.ts";
+import { isAutoYes, selectParent } from "../lib/ui.ts";
 import type { Branch } from "../types.ts";
 
 export default async function add(args: string[]): Promise<void> {
@@ -95,6 +95,8 @@ OPTIONS
 
     if (ordered.length === 0) {
       parent = "main";
+    } else if (isAutoYes()) {
+      parent = getTopOfStack(stack) ?? "main";
     } else {
       parent = (await selectParent(stack, branchToAdd)) ?? undefined;
       if (!parent) {

package/src/commands/list.ts

@@ -26,7 +26,8 @@ ALIASES
   const currentBranch = await git.currentBranch();
 
   // Find which stack contains the current branch
-  let stackName = findStackForBranch(meta, currentBranch);
+  const branchStackName = findStackForBranch(meta, currentBranch);
+  let stackName = branchStackName;
   if (!stackName) stackName = meta.current_stack;
 
   if (!stackName || !meta.stacks[stackName]) {
@@ -39,7 +40,9 @@ ALIASES
 
   // Update tracking
   meta.current_stack = stackName;
-  stack.last_branch = currentBranch;
+  if (branchStackName === stackName) {
+    stack.last_branch = currentBranch;
+  }
   await writeMetadata(meta);
 
   // Header

package/src/commands/restack.ts

@@ -235,25 +235,27 @@ async function handleFreshRestack(
     console.log();
   }
 
-  // Take snapshot before destructive operation
-  await takeSnapshot(meta, stackName, "restack");
+  if (!dryRun) {
+    // Take snapshot before destructive operation
+    await takeSnapshot(meta, stackName, "restack");
 
-  // Create temporary tags for stable base references
-  p.log.info("Creating temporary base tags...");
-  for (const branch of chain) {
-    const parent = stack.branches[branch]?.parent;
-    if (!parent) continue;
+    // Create temporary tags for stable base references
+    p.log.info("Creating temporary base tags...");
+    for (const branch of chain) {
+      const parent = stack.branches[branch]?.parent;
+      if (!parent) continue;
 
-    const mb = await git.mergeBase(branch, parent);
-    if (mb) {
-      const tagName = `stack-sync-base-${git.sanitizeBranchForTag(branch)}`;
-      await git.createTag(tagName, mb);
-      console.log(
-        `  ${pc.green("✓")} Tagged base for ${branch}: ${pc.cyan(tagName)} (${mb.slice(0, 8)})`,
-      );
+      const mb = await git.mergeBase(branch, parent);
+      if (mb) {
+        const tagName = `stack-sync-base-${git.sanitizeBranchForTag(branch)}`;
+        await git.createTag(tagName, mb);
+        console.log(
+          `  ${pc.green("✓")} Tagged base for ${branch}: ${pc.cyan(tagName)} (${mb.slice(0, 8)})`,
+        );
+      }
     }
+    console.log();
   }
-  console.log();
 
   // Process the chain
   await processChain(meta, stackName, chain, 0, rebasedBranches, dryRun, verbose);

package/src/commands/show.ts

@@ -29,7 +29,8 @@ export default async function show(_args: string[]): Promise<void> {
   const branch = await git.currentBranch();
 
   // Find which stack contains the current branch
-  let stackName = findStackForBranch(meta, branch);
+  const branchStackName = findStackForBranch(meta, branch);
+  let stackName = branchStackName;
 
   if (!stackName) {
     // Fall back to current_stack
@@ -51,7 +52,9 @@ export default async function show(_args: string[]): Promise<void> {
 
   // Update current_stack and last_branch
   meta.current_stack = stackName;
-  stack.last_branch = branch;
+  if (branchStackName === stackName) {
+    stack.last_branch = branch;
+  }
   await writeMetadata(meta);
 
   // Header

package/src/commands/sync.ts

@@ -54,6 +54,28 @@ with the base branch included.
     process.exit(1);
   }
 
+  if (dryRun) {
+    p.log.warn("[DRY RUN] No changes will be made");
+    p.log.info("Planned operations:");
+    console.log(`  ${pc.yellow("1.")} Fetch latest ${pc.cyan("origin/main")}`);
+    console.log(
+      `  ${pc.yellow("2.")} Rebase ${pc.yellow(baseBranch)} onto ${pc.cyan("origin/main")}`,
+    );
+
+    const children = ordered.slice(1);
+    if (children.length === 0) {
+      console.log(`  ${pc.yellow("3.")} No child branches to restack`);
+    } else {
+      console.log(`  ${pc.yellow("3.")} Restack child branches in order:`);
+      for (const branch of children) {
+        const parent = stack.branches[branch]?.parent || "(unknown)";
+        console.log(`     ${pc.yellow("→")} ${branch} ${pc.blue(`(parent: ${parent})`)}`);
+      }
+    }
+    p.outro(pc.green("Sync dry run complete"));
+    return;
+  }
+
   // Fetch main
   const fetchSpinner = p.spinner();
   fetchSpinner.start("Fetching latest main...");

package/src/commands/update-prs.ts

@@ -46,6 +46,7 @@ showing the tree structure, PR links, and review status.
     branch: string;
     prNumber: number | null;
     prTitle: string;
+    prUrl: string | null;
     reviewEmojiStr: string;
   }
 
@@ -55,12 +56,14 @@ showing the tree structure, PR links, and review status.
     const branchMeta = stack.branches[branchName]!;
     const prNumber = branchMeta.pr ?? null;
     let prTitle = branchMeta.description || branchName;
+    let prUrl: string | null = null;
     let review = "PENDING";
 
     if (prNumber) {
       const info = await getPrInfo(prNumber);
       if (info) {
         prTitle = info.title || prTitle;
+        prUrl = info.url;
         review = info.reviewDecision || "PENDING";
       }
     }
@@ -69,6 +72,7 @@ showing the tree structure, PR links, and review status.
       branch: branchName,
       prNumber,
       prTitle,
+      prUrl,
       reviewEmojiStr: reviewEmoji(review),
     });
   }
@@ -131,10 +135,11 @@ interface BranchPrInfo {
   branch: string;
   prNumber: number | null;
   prTitle: string;
+  prUrl: string | null;
   reviewEmojiStr: string;
 }
 
-function buildStackViz(branches: BranchPrInfo[], targetIndex: number): string {
+export function buildStackViz(branches: BranchPrInfo[], targetIndex: number): string {
   const lines: string[] = ["### 📚 Stacked on", ""];
 
   if (branches.length === 1) {
@@ -154,7 +159,7 @@ function buildStackViz(branches: BranchPrInfo[], targetIndex: number): string {
     // PR link
     let prLink: string;
     if (info.prNumber) {
-      prLink = `<a href="https://github.com/beehiiv/swarm/pull/${info.prNumber}">#${info.prNumber}</a>`;
+      prLink = info.prUrl ? `<a href="${info.prUrl}">#${info.prNumber}</a>` : `#${info.prNumber}`;
     } else {
       prLink = "(no PR yet)";
     }