gflows 0.1.15 → 0.1.17

package/README.md

@@ -401,10 +401,10 @@ Switch to a workflow branch. With TTY and no branch name, shows a picker; otherw
 
 | Option | Description |
 | ------ | ----------- |
+| **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. |
 | **Cancel** | Abort switching. |
-| **Move changes to target** | Take current changes with you to the target branch (stash → switch → pop). |
-| **Restore** | Save changes for the current branch; switch; restore any saved changes for the target branch (if any). |
-| **Clean** | Discard changes and switch to the target branch clean at HEAD. |
 
 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`).
 
@@ -425,9 +425,9 @@ bun gflows -W feature/auth-refactor
 | -------------- | ----- | --------------------------------------------------------------------------- |
 | `--path <dir>` | `-C`  | Run as if in `<dir>`.                                                      |
 | `--branch <name>` | `-B` | Branch to switch to (alternative to positional).                           |
-| `--move`       | —     | Take current changes to the target branch; no prompt.                       |
-| `--restore`    | —     | Per-branch save/restore; no prompt.                                         |
-| `--clean`      | —     | Discard changes and switch clean; no prompt.                               |
+| `--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.                       |
 | `--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.15",
+  "version": "0.1.17",
   "description": "A lightweight CLI for consistent Git branching workflows (main + dev, feature/bugfix/chore/release/hotfix).",
   "license": "MIT",
   "type": "module",

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

@@ -48,7 +48,10 @@ Start:  --force         Allow dirty working tree
 Finish: --no-ff         Always create merge commit; -D/--delete, -N/--no-delete;
         -s/--sign, -T/--no-tag, -M/--tag-message, -m/--message
 List:   -r, --include-remote   Include remote-tracking branches
-Switch: --move, --restore, --clean, --cancel   Explicit mode when uncommitted (no prompt)
+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
+        --cancel    Abort switching
 
 Exit codes: 0 success, 1 usage/validation, 2 Git or system error.
 

package/src/commands/switch.ts

@@ -87,10 +87,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") {
@@ -111,19 +118,13 @@ export async function run(args: ParsedArgs): Promise<void> {
     whenUncommitted = await selectPrompt({
       message: "Working tree has uncommitted changes. What do you want to do?",
       choices: [
-        { name: "Cancel — Abort switching", value: "cancel" as const },
-        {
-          name: "Move changes to target — Take current changes with you to the target branch",
-          value: "move" as const,
-        },
+        { name: "Move — Move current changes to the target branch", value: "move" as const },
         {
-          name: "Restore — Save for this branch; switch; restore target's saved changes (if any)",
+          name: "Restore — Save changes for this branch; restore target's saved state (if any)",
           value: "restore" as const,
         },
-        {
-          name: "Clean — Discard changes and switch to target clean at HEAD",
-          value: "clean" as const,
-        },
+        { name: "Clean — Discard changes and switch clean at HEAD", value: "clean" as const },
+        { name: "Cancel — Abort switching", value: "cancel" as const },
       ],
     });
   } else if (!treeClean) {
@@ -187,23 +188,26 @@ 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) {