gflows 0.1.16 → 0.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gflows",
-  "version": "0.1.16",
+  "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/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") {
@@ -181,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) {