gh-stack 0.7.0 → 0.7.1

package/README.md

@@ -149,9 +149,12 @@ merge [--dry-run] [-d|--delete-branch] [--collapse]
                 review the cumulative diff on GitHub. Re-run
                 `gh-stack merge` (without --collapse) to finish.
 
-delete [<branch>]
-    Remove a branch from the stack and re-parent its children.
-    Interactive selector if no branch specified.
+delete [<branch>] [-k|--keep-branch] [--no-remote]
+    Remove a branch from the stack and re-parent its children, then
+    delete the underlying local git branch (and the remote branch if
+    it was pushed). Interactive selector if no branch specified.
+    --keep-branch leaves the git branches untouched (metadata only);
+    --no-remote deletes the local branch but keeps the remote.
 ```
 
 ### Info & Maintenance

package/package.json

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

package/src/commands/delete.ts

@@ -4,7 +4,7 @@ import pc from "picocolors";
 import { removeBranchFromStack, getChildren } from "../lib/metadata.ts";
 import { ensureMetadata, ensureCurrentStack, ensureValidStack } from "../lib/safety.ts";
 import { takeSnapshot } from "../lib/snapshot.ts";
-import { selectBranch } from "../lib/ui.ts";
+import { selectBranch, confirmAction } from "../lib/ui.ts";
 import * as git from "../lib/git.ts";
 
 export default async function deleteCmd(args: string[]): Promise<void> {
@@ -13,14 +13,26 @@ export default async function deleteCmd(args: string[]): Promise<void> {
 gh-stack delete — Delete a branch from the stack
 
 USAGE
-  gh-stack delete [<branch>]
+  gh-stack delete [<branch>] [options]
 
-Removes the branch and re-parents its children to its parent.
-If no branch is specified, shows interactive selector.
+Removes the branch from the stack and deletes the underlying git branch,
+re-parenting any children to the removed branch's parent. If the deleted
+branch was pushed, its remote counterpart is deleted too.
+
+If no branch is specified, shows an interactive selector.
+
+OPTIONS
+  -k, --keep-branch   Only remove from the stack metadata; leave the
+                      local and remote git branches untouched
+      --no-remote     Delete the local branch but keep the remote branch
 `);
     return;
   }
 
+  const keepBranch = args.includes("--keep-branch") || args.includes("-k");
+  const noRemote = args.includes("--no-remote");
+  const positional = args.filter((a) => !a.startsWith("-"));
+
   const meta = await ensureMetadata();
   const stackName = ensureCurrentStack(meta);
   await ensureValidStack(meta, stackName);
@@ -30,7 +42,7 @@ If no branch is specified, shows interactive selector.
   p.intro(pc.cyan("Delete Branch from Stack"));
 
   // Get branch to delete
-  let branchName = args[0];
+  let branchName = positional[0];
   if (!branchName) {
     branchName = (await selectBranch(stack, "Select branch to delete", currentBranch)) ?? undefined;
     if (!branchName) {
@@ -46,9 +58,13 @@ If no branch is specified, shows interactive selector.
     process.exit(1);
   }
 
+  // Discover what actually exists in git so we report (and delete) accurately
+  const hasLocal = !keepBranch && (await git.localBranchExists(branchName));
+  const hasRemote = !keepBranch && !noRemote && (await git.remoteBranchExists(branchName));
+
   // Show what will happen
   const children = getChildren(stack, branchName);
-  p.log.info(`Removing: ${pc.yellow(branchName)}`);
+  p.log.info(`Removing: ${pc.yellow(branchName)} from stack ${pc.blue(stackName)}`);
   p.log.info(`Parent was: ${pc.dim(branch.parent)}`);
 
   if (children.length > 0) {
@@ -60,11 +76,19 @@ If no branch is specified, shows interactive selector.
     }
   }
 
-  // Confirm
-  const confirmed = await p.confirm({
-    message: `Delete ${pc.yellow(branchName)} from stack?`,
-  });
-  if (p.isCancel(confirmed) || !confirmed) {
+  if (keepBranch) {
+    p.log.info(pc.dim("Keeping git branch (--keep-branch) — stack metadata only"));
+  } else {
+    if (hasLocal) p.log.info(`Deleting local branch ${pc.yellow(branchName)}`);
+    if (hasRemote) p.log.info(`Deleting remote branch ${pc.yellow(`origin/${branchName}`)}`);
+    if (!hasLocal && !hasRemote) {
+      p.log.info(pc.dim("No git branch found to delete — stack metadata only"));
+    }
+  }
+
+  // Confirm (respects --yes / GH_STACK_YES — no interactive hang for agents)
+  const confirmed = await confirmAction(`Delete ${pc.yellow(branchName)}?`);
+  if (!confirmed) {
     p.cancel("Cancelled");
     process.exit(0);
   }
@@ -72,8 +96,38 @@ If no branch is specified, shows interactive selector.
   // Take snapshot before destructive operation
   await takeSnapshot(meta, stackName, "delete");
 
-  // Remove branch
+  // If we're sitting on the branch we're about to delete, git won't let us
+  // remove it — move to the parent (or trunk) first.
+  if (hasLocal && branchName === currentBranch) {
+    const fallback = (await git.localBranchExists(branch.parent))
+      ? branch.parent
+      : await git.trunkBranch();
+    await git.checkout(fallback);
+    p.log.info(`Switched to ${pc.blue(fallback)} (was on the deleted branch)`);
+  }
+
+  // Remove from metadata (re-parents children, fixes last_branch)
   await removeBranchFromStack(meta, stackName, branchName);
 
+  // Delete the actual git branch(es)
+  if (hasRemote) {
+    const ok = await git.deleteRemoteBranch(branchName);
+    if (ok) {
+      p.log.success(`Deleted remote branch ${pc.dim(`origin/${branchName}`)}`);
+    } else {
+      p.log.warn(
+        `Could not delete remote branch ${pc.dim(`origin/${branchName}`)} (delete it manually)`,
+      );
+    }
+  }
+  if (hasLocal) {
+    const ok = await git.deleteLocalBranch(branchName);
+    if (ok) {
+      p.log.success(`Deleted local branch ${pc.dim(branchName)}`);
+    } else {
+      p.log.warn(`Could not delete local branch ${pc.dim(branchName)} (delete it manually)`);
+    }
+  }
+
   p.outro(pc.green(`Removed ${pc.yellow(branchName)} from stack ${pc.blue(stackName)}`));
 }

package/src/lib/git.ts

@@ -158,6 +158,24 @@ export async function localBranchExists(branch: string): Promise<boolean> {
   return exitCode === 0;
 }
 
+/**
+ * Delete a local branch. Uses -D (force) since stacked branches are
+ * routinely rebased and won't appear "merged" to git. Returns false if
+ * the branch didn't exist or the delete failed.
+ */
+export async function deleteLocalBranch(branch: string): Promise<boolean> {
+  const { exitCode } = await $`git branch -D ${branch}`.nothrow().quiet();
+  return exitCode === 0;
+}
+
+/**
+ * Delete a branch on the remote (origin). Returns false on failure.
+ */
+export async function deleteRemoteBranch(branch: string): Promise<boolean> {
+  const { exitCode } = await $`git push origin --delete ${branch}`.nothrow().quiet();
+  return exitCode === 0;
+}
+
 /**
  * Create a temporary tag at a specific commit.
  */