gflows 1.1.1 → 1.2.1

package/AGENTS.md

@@ -9,7 +9,7 @@ gflows is a **local Git branching workflow CLI** (main + dev + typed short-lived
 3. **Do not finish empty branches** — if there are no commits beyond the merge target, finish exits `2`. Commit first.
 4. **Conflicts** — resolve files, then `gflows continue`. Or `gflows abort` / `gflows undo`.
 5. **Discover the API** — run `gflows schema` (JSON) or read this file + README.
-6. **MCP** — `gflows mcp` (stdio JSON-RPC) exposes status/doctor/info/list/start/sync/finish/schema tools.
+6. **MCP** — `gflows mcp` (stdio JSON-RPC) exposes status/doctor/info/list/start/sync/finish/release/schema tools.
 7. **Hub / viz** — bare `gflows` (TTY) opens an Ink fullscreen hub (`/` commands). Prompts use Clack. `gflows viz` prints the scrollback status panel.
 
 ## Exit codes
@@ -39,13 +39,17 @@ gflows start bugfix hotfix-login -o main
 # … commit …
 gflows finish bugfix -y -p   # merges main, then main→dev
 
-# Release
+# Release (branch workflow)
 gflows bump up minor
 # commit version files, or: gflows finish release --bump …
 gflows start release v1.2.0
 # … changelog / commits …
 gflows finish release -y -p
 
+# Quick release from dev (bump or keep version + merge main + tag, no release/* branch)
+gflows release up patch -y -p      # or -P; must be on dev
+gflows release current -y -p       # after a manual bump; tags package version as-is
+
 # Stuck
 gflows doctor --json
 gflows continue

package/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.1] - 2026-07-25
+
+### Added
+
+- Quick release can keep the package version already on disk: `gflows release current -y -p` (or choose **keep current** in the hub / interactive prompt)
+- MCP `gflows_release` accepts `keepCurrent: true` as an alternative to `bumpType`
+
+## [1.2.0] - 2026-07-25
+
+### Added
+
+- `gflows release` — quick release from `dev`: bump package version, merge into `main`, tag, sync `main` → `dev` (`up patch|minor|major`, `-y`, `-p`/`-P`)
+- Hub `/release` wizard and MCP tool `gflows_release`
+
+### Fixed
+
+- `gflows bump` (and finish `--bump`) update `package.json` version in place so tab/space formatting is preserved (Biome-friendly)
+
 ## [1.1.1] - 2026-07-25
 
 ### Fixed

package/README.md

@@ -49,7 +49,7 @@ Then:
 g          # or: gflows
 ```
 
-You get a fullscreen menu: what’s next, branch map, actions. **Select** an item (or type `/start`, `/finish`, `/sync`, …). Follow-up questions (type, name, push, rebase) stay **inside the Ink UI** — no drop-out to a separate prompt tool. Only the git command itself runs on the main screen, then you press enter to return.
+You get a fullscreen menu: what’s next, branch map, actions. **Select** an item (or type `/start`, `/finish`, `/release`, `/sync`, …). Follow-up questions (type, name, push, rebase) stay **inside the Ink UI** — no drop-out to a separate prompt tool. Only the git command itself runs on the main screen, then you press enter to return.
 
 ```
 ❯ ★ Start new work
@@ -130,6 +130,7 @@ main  ←  release / hotfix only          (production)
 | **dev**                              | Integration (created by `init` from main)                   |
 | **feature / bugfix / chore / spike** | Day-to-day work → merge to **dev**                          |
 | **release / hotfix**                 | Versioned (`vX.Y.Z`) → **main**, then **main → dev**, + tag |
+| **quick release** (`gflows release`) | From **dev** only: bump or keep → **main** → tag → sync **dev** |
 
 
 **Lifecycle:** `init` → `start` → commit → (`sync`) → (`pr`) → `finish`
@@ -216,6 +217,14 @@ Hub: `g` → select the action. Typed short form assumes `alias g=gflows`.
 | `gflows start release v1.4.0` | `g -S -r v1.4.0` |
 | `gflows finish release -y -p` | `g -F -r -y -p` |
 
+**Quick release from `dev`** — merge **main**, tag, sync **main → dev** (no `release/*` branch). Choose a bump, or keep a version you already set manually.
+
+| Long | Short |
+|------|-------|
+| `gflows release up patch -y -p` | — (bump, then ship) |
+| `gflows release up minor -y -p` | — |
+| `gflows release current -y -p` | — (keep `package.json` version; no bump commit) |
+
 **Hotfix**
 
 | Long | Short |
@@ -247,7 +256,7 @@ Bare `gflows` / `g` in a **TTY** opens the Ink hub (see [Way 1](#way-1--hub-reco
 | Input                                      | Action                                 |
 | ------------------------------------------ | -------------------------------------- |
 | ↑↓ Enter                                   | Select an action — Ink wizard if needed |
-| `/start` `/finish` `/sync` …               | Slash command; wizards stay in the hub |
+| `/start` `/finish` `/release` `/sync` …    | Slash command; wizards stay in the hub |
 | `?`                                        | Shortcut help                          |
 | `q` / Esc / Ctrl+C                         | Quit                                   |
 
@@ -267,6 +276,7 @@ Bare `gflows` / `g` in a **TTY** opens the Ink hub (see [Way 1](#way-1--hub-reco
 | `init` `-I`                   | Ensure main; create dev                     |
 | `start` `-S`                  | Create typed branch                         |
 | `finish` `-F`                 | Merge + close (plan; delete default **on**) |
+| `release`                     | Quick release from `dev` (bump/keep + main + tag)|
 | `sync`                        | Update branch from its base                 |
 | `pr`                          | Open PR/MR (`gh` / `glab`)                  |
 | `switch` `-W`                 | Switch branch                               |

package/llms.txt

@@ -12,7 +12,9 @@
 
 - `gflows` (TTY): Ink fullscreen hub (frame, tips, actions, `/` slash commands, status bar); Clack prompts
 - `gflows viz`: scrollback status panel — lifecycle, branches, recommended next step
-- `gflows init` / `start` / `finish` / `sync` / `pr`
+- `gflows init` / `start` / `finish` / `release` / `sync` / `pr`
+- `gflows release up patch -y -p` — quick ship from `dev` (bump + merge main + tag)
+- `gflows release current -y -p` — same, but keep the package version already on disk (after a manual bump)
 - `gflows continue` / `undo` / `abort` — recovery after conflicts
 - `gflows doctor` / `info` / `config` / `status --json` / `mcp`
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gflows",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "author": "Ali AlNaghmoush (https://github.com/alialnaghmoush)",
   "repository": {
     "type": "git",

package/src/commands/bump.ts

@@ -5,142 +5,10 @@
  * @module commands/bump
  */
 
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { join, relative } from "node:path";
 import { EXIT_OK, EXIT_USER } from "../constants.js";
-import { InvalidVersionError } from "../errors.js";
 import { hint, success } from "../out.js";
-import { findPackageRoots, PACKAGE_JSON } from "../packages.js";
 import type { BumpDirection, BumpType, ParsedArgs } from "../types.js";
-
-const JSR_JSON = "jsr.json";
-
-/** Semver triplet. */
-interface Semver {
-  major: number;
-  minor: number;
-  patch: number;
-}
-
-/**
- * Parses a version string (vX.Y.Z or X.Y.Z) into components.
- * @throws InvalidVersionError if format is invalid
- */
-function parseVersion(version: string): Semver {
-  const trimmed = version.trim();
-  const normalized = trimmed.startsWith("v") ? trimmed.slice(1) : trimmed;
-  const parts = normalized.split(".");
-  if (parts.length !== 3 || parts.some((p) => !/^\d+$/.test(p))) {
-    throw new InvalidVersionError(
-      `Invalid version '${version}'. Expected format: X.Y.Z or vX.Y.Z (e.g. 1.2.3 or v1.2.3).`,
-    );
-  }
-  const [p0, p1, p2] = parts;
-  return {
-    major: parseInt(p0 ?? "0", 10),
-    minor: parseInt(p1 ?? "0", 10),
-    patch: parseInt(p2 ?? "0", 10),
-  };
-}
-
-/**
- * Formats semver as string (no leading v, for package.json).
- */
-function formatVersion(semver: Semver): string {
-  return `${semver.major}.${semver.minor}.${semver.patch}`;
-}
-
-/**
- * Computes new version for bump up (patch/minor/major).
- */
-function bumpUp(semver: Semver, type: BumpType): Semver {
-  switch (type) {
-    case "patch":
-      return { ...semver, patch: semver.patch + 1 };
-    case "minor":
-      return { major: semver.major, minor: semver.minor + 1, patch: 0 };
-    case "major":
-      return { major: semver.major + 1, minor: 0, patch: 0 };
-    default:
-      return semver;
-  }
-}
-
-/**
- * Computes new version for rollback (down), with floor at 0.
- */
-function bumpDown(semver: Semver, type: BumpType): Semver {
-  switch (type) {
-    case "patch":
-      return {
-        ...semver,
-        patch: Math.max(0, semver.patch - 1),
-      };
-    case "minor":
-      return {
-        major: semver.major,
-        minor: Math.max(0, semver.minor - 1),
-        patch: 0,
-      };
-    case "major":
-      return {
-        major: Math.max(0, semver.major - 1),
-        minor: semver.minor,
-        patch: semver.patch,
-      };
-    default:
-      return semver;
-  }
-}
-
-/**
- * Reads version from package.json in dir.
- * @throws InvalidVersionError if version is missing or invalid
- */
-function readPackageVersion(dir: string): { raw: string; semver: Semver } {
-  const path = join(dir, PACKAGE_JSON);
-  if (!existsSync(path)) {
-    throw new InvalidVersionError(
-      `No package.json found at ${path}. Run from project root or use -C <dir>.`,
-    );
-  }
-  const raw = readFileSync(path, "utf-8");
-  const data = JSON.parse(raw) as Record<string, unknown>;
-  const version = data.version;
-  if (typeof version !== "string" || version.trim() === "") {
-    throw new InvalidVersionError(
-      'package.json has no valid \'version\' field. Add a "version" field (e.g. "0.0.0") to package.json.',
-    );
-  }
-  const semver = parseVersion(version);
-  return { raw: version.trim(), semver };
-}
-
-/**
- * Writes version to package.json, preserving other keys and formatting as much as possible.
- * Uses JSON.stringify with 2 spaces for consistency.
- */
-function writePackageVersion(dir: string, newVersion: string): void {
-  const path = join(dir, PACKAGE_JSON);
-  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");
-}
-
-/**
- * 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 updated = raw.replace(/"version":\s*"[^"]*"/, `"version": "${newVersion}"`);
-  if (updated === raw) return false;
-  writeFileSync(path, updated, "utf-8");
-  return true;
-}
+import { applyVersionToPackages, computeBump } from "../version-bump.js";
 
 /**
  * Run the bump command.
@@ -182,34 +50,7 @@ export async function run(args: ParsedArgs): Promise<void> {
     });
   }
 
-  let roots = findPackageRoots(cwd);
-  roots = [...roots].sort((a, b) => {
-    if (a === cwd && b !== cwd) return -1;
-    if (a !== cwd && b === cwd) return 1;
-    return a.localeCompare(b);
-  });
-  if (roots.length === 0) {
-    throw new InvalidVersionError(
-      `No package.json found under ${cwd}. Run from project root or use -C <dir>.`,
-    );
-  }
-  const primaryRoot = roots[0];
-  if (primaryRoot === undefined) {
-    throw new InvalidVersionError(
-      `No package.json found under ${cwd}. Run from project root or use -C <dir>.`,
-    );
-  }
-  const { raw: oldVersion, semver } = readPackageVersion(primaryRoot);
-  const newSemver = direction === "up" ? bumpUp(semver, type) : bumpDown(semver, type);
-  const newVersion = formatVersion(newSemver);
-
-  const filesToUpdate: string[] = [];
-  for (const dir of roots) {
-    filesToUpdate.push(relative(cwd, join(dir, PACKAGE_JSON)) || PACKAGE_JSON);
-    if (existsSync(join(dir, JSR_JSON))) {
-      filesToUpdate.push(relative(cwd, join(dir, JSR_JSON)) || JSR_JSON);
-    }
-  }
+  const { oldVersion, newVersion, roots, filesToUpdate } = computeBump(cwd, direction, type);
 
   if (dryRun) {
     if (!quiet) {
@@ -219,18 +60,13 @@ export async function run(args: ParsedArgs): Promise<void> {
     process.exit(EXIT_OK);
   }
 
-  const updated: string[] = [];
-  for (const dir of roots) {
-    writePackageVersion(dir, newVersion);
-    updated.push(relative(cwd, join(dir, PACKAGE_JSON)) || PACKAGE_JSON);
-    if (syncJsrVersion(dir, newVersion)) {
-      updated.push(relative(cwd, join(dir, JSR_JSON)) || JSR_JSON);
-    }
-  }
+  const updated = applyVersionToPackages(cwd, roots, newVersion);
 
   if (!quiet) {
     success(`Bumped version: ${oldVersion} → ${newVersion}`);
     success(`Updated: ${updated.join(", ")}`);
-    hint("Commit the change, then run gflows start release vX.Y.Z to release.");
+    hint(
+      "Commit the change, then run gflows start release vX.Y.Z — or gflows release up <type> from dev.",
+    );
   }
 }

package/src/commands/completion.ts

@@ -12,6 +12,7 @@ const COMMANDS = [
   "init",
   "start",
   "finish",
+  "release",
   "sync",
   "pr",
   "viz",
@@ -132,6 +133,15 @@ _gflows() {
         COMPREPLY=()
       fi
       ;;
+    release)
+      if (( cword == cmd_idx + 1 )); then
+        COMPREPLY=($(compgen -W "up current" -- "$cur"))
+      elif (( cword == cmd_idx + 2 )) && [[ "${D}words[cmd_idx + 1]}" == "up" ]]; then
+        COMPREPLY=($(compgen -W "${BUMP_TYPES.join(" ")}" -- "$cur"))
+      else
+        COMPREPLY=()
+      fi
+      ;;
     *)
       COMPREPLY=()
       ;;
@@ -212,6 +222,13 @@ _gflows() {
             _values "direction" ${BUMP_DIRECTIONS.map((d) => `"${d}"`).join(" ")}
           fi
           ;;
+        release)
+          if [[ "${D}words[CURRENT-1]}" == "up" ]]; then
+            _values "bump-type" ${BUMP_TYPES.map((t) => `"${t}"`).join(" ")}
+          else
+            _values "mode" "up" "current"
+          fi
+          ;;
       esac
       ;;
   esac
@@ -253,6 +270,8 @@ complete -c gflows -f -n "not __fish_seen_subcommand_from ${COMMANDS.join(" ")}"
   -a "start" -d "Create workflow branch"
 complete -c gflows -f -n "not __fish_seen_subcommand_from ${COMMANDS.join(" ")}" \\
   -a "finish" -d "Merge and close branch"
+complete -c gflows -f -n "not __fish_seen_subcommand_from ${COMMANDS.join(" ")}" \\
+  -a "release" -d "Quick release from dev"
 complete -c gflows -f -n "not __fish_seen_subcommand_from ${COMMANDS.join(" ")}" \\
   -a "switch" -d "Switch branch"
 complete -c gflows -f -n "not __fish_seen_subcommand_from ${COMMANDS.join(" ")}" \\
@@ -315,6 +334,14 @@ complete -c gflows -f -n "__fish_seen_subcommand_from bump; and not __fish_seen_
 complete -c gflows -f -n "__fish_seen_subcommand_from bump; and __fish_seen_subcommand_from up down" \\
   -a "patch minor major"
 
+# release up [patch|minor|major] | current
+complete -c gflows -f -n "__fish_seen_subcommand_from release; and not __fish_seen_subcommand_from up current" \\
+  -a "up" -d "Bump then release"
+complete -c gflows -f -n "__fish_seen_subcommand_from release; and not __fish_seen_subcommand_from up current" \\
+  -a "current" -d "Keep current version (no bump)"
+complete -c gflows -f -n "__fish_seen_subcommand_from release; and __fish_seen_subcommand_from up" \\
+  -a "patch minor major"
+
 # Common flags
 complete -c gflows -x -n "__fish_seen_subcommand_from ${COMMANDS.join(" ")}" -l path -s C -d "Run as if in dir" -a "(__fish_complete_directories)"
 complete -c gflows -f -n "__fish_seen_subcommand_from ${COMMANDS.join(" ")}" -l help -s h -d "Show help"

package/src/commands/finish.ts

@@ -37,6 +37,7 @@ import {
   tagExists,
 } from "../git.js";
 import { hint, success } from "../out.js";
+import { PACKAGE_JSON } from "../packages.js";
 import {
   completeRun,
   type GflowsRunState,
@@ -44,9 +45,11 @@ import {
   suspendRun,
   writeActiveRun,
 } from "../run-state.js";
-import type { BranchType, MergeTarget, ParsedArgs, ResolvedConfig } from "../types.js";
+import type { BranchType, MergeTarget, ParsedArgs } from "../types.js";
+import { applyVersionToPackages, JSR_JSON, sortedPackageRoots } from "../version-bump.js";
 
-interface FinishContext {
+/** Context persisted for finish / quick-release multi-step runs. */
+export interface FinishContext {
   branchToFinish: string;
   type: BranchType;
   version?: string;
@@ -65,6 +68,19 @@ interface FinishContext {
   bumpOnFinish: boolean;
 }
 
+/** Options for {@link runFinishPlan}. */
+export interface FinishPlanOptions {
+  dryRun: boolean;
+  verbose: boolean;
+  quiet: boolean;
+  /** Plan header label (default: "gflows finish plan"). */
+  planLabel?: string;
+  /** When true, print plan and return without executing. */
+  preview?: boolean;
+  /** When false, skip printing the plan (caller already did). Default true. */
+  printPlan?: boolean;
+}
+
 /**
  * Runs remaining finish steps from run state (also used by continue).
  */
@@ -375,48 +391,10 @@ export async function run(args: ParsedArgs): Promise<void> {
     });
   }
 
-  const targetsDisplay = formatMergeTarget(mergeTarget, config);
-  const tagName =
-    meta.tagOnFinish && version && !args.noTag ? normalizeTagVersion(version) : undefined;
-
-  console.error("gflows finish plan:");
-  console.error(`  branch:  ${branchToFinish}`);
-  console.error(`  merge:   → ${targetsDisplay}`);
-  if (tagName) console.error(`  tag:     ${tagName}`);
-  console.error(`  delete:  ${shouldDelete ? "yes" : "no"}`);
-  console.error(`  push:    ${doPush ? "yes" : "no"}`);
-  if (args.squash) console.error("  squash:  yes");
-
-  if (args.preview) {
-    success("gflows: preview only (no changes).");
-    return;
-  }
-
   if (args.bumpOnFinish && (type === "release" || type === "hotfix") && version) {
-    await bumpAndCommit(repoRoot, version, args, config);
+    await bumpAndCommit(repoRoot, version, args);
   }
 
-  const steps =
-    mergeTarget === "dev"
-      ? [
-          { id: "merge-dev", label: `Merge into ${config.dev}` },
-          ...(shouldDelete ? [{ id: "delete", label: "Delete branch" }] : []),
-          ...(doPush ? [{ id: "push", label: "Push" }] : []),
-        ]
-      : [
-          { id: "merge-main", label: `Merge into ${config.main}` },
-          ...(tagName ? [{ id: "tag", label: `Tag ${tagName}` }] : []),
-          { id: "merge-main-into-dev", label: `Merge ${config.main} into ${config.dev}` },
-          ...(tagName ? [{ id: "changelog", label: "Update CHANGELOG" }] : []),
-          ...(shouldDelete ? [{ id: "delete", label: "Delete branch" }] : []),
-          ...(doPush ? [{ id: "push", label: "Push" }] : []),
-        ];
-
-  const branchSha = await resolveSha(repoRoot, branchToFinish, opts);
-  const mainSha = await resolveSha(repoRoot, config.main, opts);
-  const devSha = await resolveSha(repoRoot, config.dev, opts);
-  const prevBranch = await getCurrentBranch(repoRoot, opts);
-
   const ctx: FinishContext = {
     branchToFinish,
     type,
@@ -436,56 +414,117 @@ export async function run(args: ParsedArgs): Promise<void> {
     bumpOnFinish: args.bumpOnFinish,
   };
 
+  await runFinishPlan(repoRoot, ctx, {
+    ...opts,
+    preview: args.preview,
+    planLabel: "gflows finish plan",
+  });
+}
+
+/**
+ * Prints a finish-style plan and executes it via the shared step runner.
+ * Used by `finish` and quick `release` from dev.
+ */
+export async function runFinishPlan(
+  repoRoot: string,
+  ctx: FinishContext,
+  opts: FinishPlanOptions,
+): Promise<void> {
+  const tagName = ctx.version && !ctx.noTag ? normalizeTagVersion(ctx.version) : undefined;
+  const targetsDisplay = formatMergeTarget(ctx.mergeTarget, {
+    main: ctx.main,
+    dev: ctx.dev,
+    remote: ctx.remote,
+    prefixes: {
+      feature: "feature/",
+      bugfix: "bugfix/",
+      chore: "chore/",
+      release: "release/",
+      hotfix: "hotfix/",
+      spike: "spike/",
+    },
+  });
+
+  if (opts.printPlan !== false) {
+    console.error(`${opts.planLabel ?? "gflows finish plan"}:`);
+    console.error(`  branch:  ${ctx.branchToFinish}`);
+    console.error(`  merge:   → ${targetsDisplay}`);
+    if (tagName) console.error(`  tag:     ${tagName}`);
+    console.error(`  delete:  ${ctx.shouldDelete ? "yes" : "no"}`);
+    console.error(`  push:    ${ctx.doPush ? "yes" : "no"}`);
+    if (ctx.squash) console.error("  squash:  yes");
+  }
+
+  if (opts.preview) {
+    success("gflows: preview only (no changes).");
+    return;
+  }
+
+  const steps =
+    ctx.mergeTarget === "dev"
+      ? [
+          { id: "merge-dev", label: `Merge into ${ctx.dev}` },
+          ...(ctx.shouldDelete ? [{ id: "delete", label: "Delete branch" }] : []),
+          ...(ctx.doPush ? [{ id: "push", label: "Push" }] : []),
+        ]
+      : [
+          { id: "merge-main", label: `Merge into ${ctx.main}` },
+          ...(tagName ? [{ id: "tag", label: `Tag ${tagName}` }] : []),
+          { id: "merge-main-into-dev", label: `Merge ${ctx.main} into ${ctx.dev}` },
+          ...(tagName ? [{ id: "changelog", label: "Update CHANGELOG" }] : []),
+          ...(ctx.shouldDelete ? [{ id: "delete", label: "Delete branch" }] : []),
+          ...(ctx.doPush ? [{ id: "push", label: "Push" }] : []),
+        ];
+
+  const gitOpts = { dryRun: opts.dryRun, verbose: opts.verbose, quiet: opts.quiet };
+  const branchSha = await resolveSha(repoRoot, ctx.branchToFinish, gitOpts);
+  const mainSha = await resolveSha(repoRoot, ctx.main, gitOpts);
+  const devSha = await resolveSha(repoRoot, ctx.dev, gitOpts);
+  const prevBranch = await getCurrentBranch(repoRoot, gitOpts);
+
   const state = startRun(repoRoot, "finish", steps, ctx as unknown as Record<string, unknown>, {
     branchSha,
     mainSha,
     devSha,
     prevBranch,
     createdTag: tagName ?? null,
-    branchName: branchToFinish,
-    shouldDelete,
-    main: config.main,
-    dev: config.dev,
+    branchName: ctx.branchToFinish,
+    shouldDelete: ctx.shouldDelete,
+    main: ctx.main,
+    dev: ctx.dev,
   });
 
-  await executeFinishSteps(repoRoot, state, opts);
+  await executeFinishSteps(repoRoot, state, gitOpts);
 }
 
-async function bumpAndCommit(
-  repoRoot: string,
-  version: string,
-  args: ParsedArgs,
-  _config: ResolvedConfig,
-): Promise<void> {
+/**
+ * Bumps package versions (format-preserving) and commits on the current branch.
+ */
+async function bumpAndCommit(repoRoot: string, version: string, args: ParsedArgs): Promise<void> {
+  if (args.dryRun) return;
   const ver = version.replace(/^v/, "");
-  // Use bump command logic via spawning package files — light inline for finish --bump
-  const pkgPath = join(repoRoot, "package.json");
-  if (!existsSync(pkgPath)) return;
+  const roots = sortedPackageRoots(repoRoot);
+  if (roots.length === 0) return;
   try {
-    const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")) as { version?: string };
-    pkg.version = ver;
-    if (!args.dryRun) {
-      writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`, "utf-8");
-    }
-    const jsrPath = join(repoRoot, "jsr.json");
-    if (existsSync(jsrPath)) {
-      let jsrRaw = readFileSync(jsrPath, "utf-8");
-      jsrRaw = jsrRaw.replace(/"version"\s*:\s*"[^"]*"/, `"version": "${ver}"`);
-      if (!args.dryRun) writeFileSync(jsrPath, jsrRaw, "utf-8");
-    }
-    if (!args.dryRun) {
-      await runGit(["add", "package.json", "jsr.json"], {
+    applyVersionToPackages(repoRoot, roots, ver);
+    for (const dir of roots) {
+      await runGit(["add", "--", join(dir, PACKAGE_JSON)], {
         cwd: repoRoot,
-        dryRun: args.dryRun,
+        dryRun: false,
         verbose: args.verbose,
-      });
-      await runGit(["commit", "-m", `chore: bump to ${ver}`], {
+      }).catch(() => undefined);
+      await runGit(["add", "--", join(dir, JSR_JSON)], {
         cwd: repoRoot,
-        dryRun: args.dryRun,
+        dryRun: false,
         verbose: args.verbose,
-      });
-      if (!args.quiet) success(`gflows: bumped version to ${ver} and committed.`);
+      }).catch(() => undefined);
     }
+    await runGit(["commit", "-m", `chore: bump to ${ver}`], {
+      cwd: repoRoot,
+      dryRun: false,
+      verbose: args.verbose,
+    });
+    if (!args.quiet) success(`gflows: bumped version to ${ver} and committed.`);
   } catch {
     hint("finish --bump: could not bump/commit version files; continuing finish.");
   }

package/src/commands/help.ts

@@ -19,6 +19,7 @@ Commands:
   init, -I       Ensure main, create dev (TTY: wizard; optional package.json script alias)
   start, -S      Create workflow branch (TTY: prompts if args missing)
   finish, -F     Merge and close branch (plan + delete by default)
+  release        Quick release from dev (bump or keep version + merge main + tag)
   sync           Update current branch from its base
   pr             Open PR/MR via gh or glab (correct base)
   switch, -W     Switch branch (picker or name)
@@ -42,7 +43,7 @@ Commands:
 Types: feature (-f), bugfix (-b), chore (-c), release (-r), hotfix (-x), spike (-e)
 
 Common flags:
-  -p, --push           Push after init/start/finish/pr
+  -p, --push           Push after init/start/finish/release/pr
   -P, --no-push        Do not push (init defaults to push; start does not)
   --main <name>        Main branch (init: persist to .gflows.json)
   --dev <name>         Dev branch (init: persist to .gflows.json)
@@ -61,6 +62,7 @@ Init:   --script-alias <name>  Add package.json script (e.g. g → "gflows")
 Start:  --force         Allow dirty working tree
 Finish: --no-ff         Always create merge commit; -D/--delete, -N/--no-delete;
         --squash, --preview, --bump; -s/--sign, -T/--no-tag, -M/--tag-message, -m/--message
+Release: up <patch|minor|major> | current  (from dev only); -y -p|-P; --preview; -s/--sign
 Sync:   --rebase, --force
 List:   -r, --include-remote   Include remote-tracking branches
 Switch: --move | --restore | --clean | --destroy | --cancel