gflows 0.1.16 → 0.1.18

package/README.md

@@ -265,7 +265,7 @@ Release and hotfix names must be a version (`vX.Y.Z` or `X.Y.Z`). Branch names u
 | `init`       | `-I`  | Ensure main exists; create dev from main.                                 |
 | `start`      | `-S`  | Create a workflow branch (requires type + name).                          |
 | `finish`     | `-F`  | Merge branch into target(s), optional tag (release/hotfix), delete, push. |
-| `switch`     | `-W`  | Switch to a workflow branch (picker or name); with uncommitted changes: prompt or `--move` / `--restore` / `--clean` / `--cancel`. |
+| `switch`     | `-W`  | Switch to a workflow branch (picker or name); with uncommitted changes: prompt or `--move` / `--restore` / `--clean` / `--destroy` / `--cancel`. |
 | `delete`     | `-L`  | Delete local workflow branch(es). Never main/dev.                         |
 | `list`       | `-l`  | List workflow branches; optional type filter and remote.                  |
 | `bump`       | —     | Bump or rollback package version (patch/minor/major).                     |
@@ -404,6 +404,7 @@ Switch to a workflow branch. With TTY and no branch name, shows a picker; otherw
 | **Move** | Move current changes to the target branch. |
 | **Restore** | Save changes for this branch; restore target's saved state (if any). |
 | **Clean** | Discard changes and switch clean at HEAD. |
+| **Destroy** | Delete current branch and switch to the target branch (cannot destroy main or dev). |
 | **Cancel** | Abort switching. |
 
 You can skip the prompt by passing exactly one of the flags below. If the target branch has saved changes and you use **Clean**, a warning is shown (unless `-q`).
@@ -415,6 +416,7 @@ bun gflows switch
 bun gflows switch feature/auth-refactor
 bun gflows switch dev --restore
 bun gflows switch main --clean
+bun gflows switch dev --destroy
 bun gflows -W feature/auth-refactor
 ```
 
@@ -428,6 +430,7 @@ bun gflows -W feature/auth-refactor
 | `--move`       | —     | Move current changes to the target branch; no prompt.                       |
 | `--restore`    | —     | Save for this branch; restore target's saved state (if any); no prompt.     |
 | `--clean`      | —     | Discard changes and switch clean at HEAD; no prompt.                       |
+| `--destroy`    | —     | Delete current branch and switch to target; no prompt (not main/dev).      |
 | `--cancel`     | —     | Abort switching; no prompt.                                                |
 | `--verbose`    | `-v`  | Verbose output.                                                            |
 | `--quiet`      | `-q`  | Minimal output (suppresses Clean warning about saved changes on target).  |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gflows",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "A lightweight CLI for consistent Git branching workflows (main + dev, feature/bugfix/chore/release/hotfix).",
   "license": "MIT",
   "type": "module",
@@ -14,6 +14,7 @@
     "lint": "biome check .",
     "lint:fix": "biome check . --write",
     "format": "biome format . --write",
+    "check": "bun run test && bun run typecheck && bun run lint",
     "gflows": "bun run src/cli.ts",
     "publish:all": "bun run scripts/publish.ts",
     "publish:npm": "bun run scripts/publish.ts -- --npm-only",

package/src/cli.ts

@@ -95,11 +95,12 @@ function buildParseArgsOptions() {
       // list (-r is context-dependent: list → include-remote; start/finish → release)
       includeRemote: { type: "boolean" as const },
       "include-remote": { type: "boolean" as const },
-      // switch: explicit mode (--restore, --clean, --cancel, --move)
+      // switch: explicit mode (--restore, --clean, --cancel, --move, --destroy)
       restore: { type: "boolean" as const },
       clean: { type: "boolean" as const },
       cancel: { type: "boolean" as const },
       move: { type: "boolean" as const },
+      destroy: { type: "boolean" as const },
     },
   };
 }
@@ -317,16 +318,17 @@ export function parse(argv: string[] = Bun.argv.slice(2)): ParsedArgs {
   else if (command === "completion" && name === "zsh") completionShell = "zsh";
   else if (command === "completion" && name === "fish") completionShell = "fish";
 
-  let switchMode: "restore" | "clean" | "cancel" | "move" | undefined;
+  let switchMode: "restore" | "clean" | "cancel" | "move" | "destroy" | undefined;
   if (command === "switch") {
     const restore = v.restore === true;
     const clean = v.clean === true;
     const cancel = v.cancel === true;
     const move = v.move === true;
-    const count = [restore, clean, cancel, move].filter(Boolean).length;
+    const destroy = v.destroy === true;
+    const count = [restore, clean, cancel, move, destroy].filter(Boolean).length;
     if (count > 1) {
       console.error(
-        "gflows switch: only one of --restore, --clean, --cancel, or --move may be used at a time.",
+        "gflows switch: only one of --restore, --clean, --cancel, --move, or --destroy may be used at a time.",
       );
       process.exit(EXIT_USER);
     }
@@ -334,6 +336,7 @@ export function parse(argv: string[] = Bun.argv.slice(2)): ParsedArgs {
     else if (clean) switchMode = "clean";
     else if (cancel) switchMode = "cancel";
     else if (move) switchMode = "move";
+    else if (destroy) switchMode = "destroy";
   }
 
   return {

package/src/commands/bump.ts

@@ -160,15 +160,16 @@ function writePackageVersion(dir: string, newVersion: string): void {
 }
 
 /**
- * Updates version in jsr.json if the file exists; preserves other keys.
+ * Updates version in jsr.json if the file exists. Only the version value is changed;
+ * the rest of the file (format, commas, spacing) is left unchanged.
  */
 function syncJsrVersion(dir: string, newVersion: string): boolean {
   const path = join(dir, JSR_JSON);
   if (!existsSync(path)) return false;
   const raw = readFileSync(path, "utf-8");
-  const data = JSON.parse(raw) as Record<string, unknown>;
-  data.version = newVersion;
-  writeFileSync(path, `${JSON.stringify(data, null, 2)}\n`, "utf-8");
+  const updated = raw.replace(/"version":\s*"[^"]*"/, `"version": "${newVersion}"`);
+  if (updated === raw) return false;
+  writeFileSync(path, updated, "utf-8");
   return true;
 }
 

package/src/commands/help.ts

@@ -51,6 +51,7 @@ List:   -r, --include-remote   Include remote-tracking branches
 Switch: --move      Move current changes to the target branch
         --restore   Save for this branch; restore target's saved state (if any)
         --clean     Discard changes and switch clean at HEAD
+        --destroy   Delete current branch and switch to target (not main/dev)
         --cancel    Abort switching
 
 Exit codes: 0 success, 1 usage/validation, 2 Git or system error.

package/src/commands/switch.ts

@@ -5,11 +5,12 @@
 
 import { resolveConfig } from "../config.js";
 import { EXIT_GIT, EXIT_OK, EXIT_USER } from "../constants.js";
-import { NotRepoError } from "../errors.js";
+import { CannotDeleteMainOrDevError, NotRepoError } from "../errors.js";
 import {
   branchList,
   checkout,
   cleanUntracked,
+  deleteBranch,
   findStashRefByBranch,
   findStashRefByMessage,
   getCurrentBranch,
@@ -26,7 +27,7 @@ import { hint, success } from "../out.js";
 import type { BranchType, ParsedArgs } from "../types.js";
 
 /** User choice when switching with uncommitted changes. */
-type SwitchWhenUncommitted = "cancel" | "restore" | "clean" | "move";
+type SwitchWhenUncommitted = "cancel" | "restore" | "clean" | "move" | "destroy";
 
 const BRANCH_TYPES: BranchType[] = ["feature", "bugfix", "chore", "release", "hotfix", "spike"];
 
@@ -87,10 +88,17 @@ export async function run(args: ParsedArgs): Promise<void> {
       process.exit(EXIT_OK);
     }
 
+    const currentBranchForPicker = await getCurrentBranch(root, {
+      dryRun,
+      verbose: args.verbose,
+    });
     const { select } = await import("@inquirer/prompts");
     const chosen = await select({
       message: "Switch to branch",
-      choices: choices.map((b) => ({ name: b, value: b })),
+      choices: choices.map((b) => ({
+        name: currentBranchForPicker && b === currentBranchForPicker ? `${b} (current)` : b,
+        value: b,
+      })),
     });
 
     if (typeof chosen !== "string") {
@@ -117,6 +125,10 @@ export async function run(args: ParsedArgs): Promise<void> {
           value: "restore" as const,
         },
         { name: "Clean — Discard changes and switch clean at HEAD", value: "clean" as const },
+        {
+          name: "Destroy — Delete current branch and switch to the target branch",
+          value: "destroy" as const,
+        },
         { name: "Cancel — Abort switching", value: "cancel" as const },
       ],
     });
@@ -132,6 +144,31 @@ export async function run(args: ParsedArgs): Promise<void> {
     process.exit(EXIT_USER);
   }
 
+  let branchToDestroy: string | undefined;
+  if (whenUncommitted === "destroy") {
+    const currentBranch = await getCurrentBranch(root, gitOpts);
+    if (!currentBranch) {
+      console.error("gflows switch: cannot destroy when HEAD is detached.");
+      process.exit(EXIT_USER);
+    }
+    if (currentBranch === config.main || currentBranch === config.dev) {
+      throw new CannotDeleteMainOrDevError(
+        `Cannot destroy the long-lived branch '${currentBranch}'.`,
+      );
+    }
+    if (currentBranch === targetBranch) {
+      console.error(
+        "gflows switch: cannot destroy current branch when switching to the same branch.",
+      );
+      process.exit(EXIT_USER);
+    }
+    branchToDestroy = currentBranch;
+    if (!treeClean) {
+      await restoreTracked(root, gitOpts);
+      await cleanUntracked(root, gitOpts);
+    }
+  }
+
   if (!treeClean && whenUncommitted === "move") {
     await stashPushMove(root, gitOpts);
   }
@@ -181,26 +218,34 @@ export async function run(args: ParsedArgs): Promise<void> {
     }
   }
 
-  if (whenUncommitted === "restore") {
+  const tryRestoreTargetStash = async (): Promise<void> => {
     const targetStashRef = await findStashRefByBranch(root, targetBranch, gitOpts);
-    if (targetStashRef) {
-      try {
-        await stashPopRef(root, targetStashRef, gitOpts);
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        console.error(
-          `gflows switch: conflicts occurred while restoring saved changes for '${targetBranch}'.`,
-        );
-        console.error(
-          "The stash was not dropped. Resolve conflicts, then commit or run `git stash drop` as needed.",
-        );
-        if (args.verbose && msg) console.error(msg);
-        process.exit(EXIT_GIT);
-      }
+    if (!targetStashRef) return;
+    try {
+      await stashPopRef(root, targetStashRef, gitOpts);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      console.error(
+        `gflows switch: conflicts occurred while restoring saved changes for '${targetBranch}'.`,
+      );
+      console.error(
+        "The stash was not dropped. Resolve conflicts, then commit or run `git stash drop` as needed.",
+      );
+      if (args.verbose && msg) console.error(msg);
+      process.exit(EXIT_GIT);
     }
+  };
+
+  if (whenUncommitted === "restore" || whenUncommitted === undefined) {
+    await tryRestoreTargetStash();
   }
 
-  if (!quiet && !dryRun) {
+  if (branchToDestroy) {
+    await deleteBranch(root, branchToDestroy, gitOpts);
+    if (!quiet && !dryRun) {
+      success(`Deleted branch '${branchToDestroy}' and switched to '${targetBranch}'.`);
+    }
+  } else if (!quiet && !dryRun) {
     success(`Switched to branch '${targetBranch}'.`);
     hint("Use gflows list to see all workflow branches.");
   }

package/src/types.ts

@@ -120,5 +120,5 @@ export interface ParsedArgs {
   // list
   includeRemote: boolean;
   // switch: explicit mode when uncommitted (overrides prompt)
-  switchMode?: "restore" | "clean" | "cancel" | "move";
+  switchMode?: "restore" | "clean" | "cancel" | "move" | "destroy";
 }