gflows 0.1.12 → 0.1.13

package/README.md

@@ -1,4 +1,4 @@
-# gflows
+# gFlows
 
 A lightweight CLI for consistent Git branching workflows: long-lived **main** (production) and **dev** (integration), plus short-lived workflow branches with clear merge targets. Built for [Bun](https://bun.sh) and TypeScript; **scriptable** and **safe by default**—no history rewriting, predictable exit codes, and optional interactive pickers only when running in a TTY.
 
@@ -181,20 +181,22 @@ gflows finish hotfix --push               # merge to main, then dev; tag v1.3.1;
 
 **Common flags** (used by multiple commands):
 
-| Flag | Short | Description |
-|------|-------|-------------|
-| `--path <dir>` | `-C` | Run as if in `<dir>`. |
-| `--dry-run` | `-d` | Log intended actions only; no writes. |
-| `--verbose` | `-v` | Verbose output. |
-| `--quiet` | `-q` | Minimal output. |
-| `--push` | `-p` | Push after init/start/finish. |
-| `--no-push` | `-P` | Do not push. |
-| `--main <name>` | — | Main branch override. |
-| `--dev <name>` | — | Dev branch override. |
-| `--remote <name>` | `-R` | Remote for push. |
-| `--from <branch>` | `-o` | Base branch override (start). |
-| `--branch <name>` | `-B` | Branch name (finish). |
-| `--yes` | `-y` | Skip confirmations. |
+
+| Flag              | Short | Description                           |
+| ----------------- | ----- | ------------------------------------- |
+| `--path <dir>`    | `-C`  | Run as if in `<dir>`.                 |
+| `--dry-run`       | `-d`  | Log intended actions only; no writes. |
+| `--verbose`       | `-v`  | Verbose output.                       |
+| `--quiet`         | `-q`  | Minimal output.                       |
+| `--push`          | `-p`  | Push after init/start/finish.         |
+| `--no-push`       | `-P`  | Do not push.                          |
+| `--main <name>`   | —     | Main branch override.                 |
+| `--dev <name>`    | —     | Dev branch override.                  |
+| `--remote <name>` | `-R`  | Remote for push.                      |
+| `--from <branch>` | `-o`  | Base branch override (start).         |
+| `--branch <name>` | `-B`  | Branch name (finish).                 |
+| `--yes`           | `-y`  | Skip confirmations.                   |
+
 
 ---
 
@@ -216,16 +218,18 @@ gflows init --dry-run           # log intended actions only
 
 **Flags:**
 
-| Flag | Short | Description |
-|------|-------|-------------|
-| `--push` | `-p` | Push dev to remote after creating. |
-| `--main <name>` | — | Main branch name (persisted to `.gflows.json` when provided). |
-| `--dev <name>` | — | Dev branch name (persisted to `.gflows.json` when provided). |
-| `--remote <name>` | `-R` | Remote name (persisted to `.gflows.json` when provided). |
-| `--path <dir>` | `-C` | Run as if in `<dir>`. |
-| `--dry-run` | `-d` | Log intended actions only; no writes. |
-| `--verbose` | `-v` | Verbose output. |
-| `--quiet` | `-q` | Minimal output. |
+
+| Flag              | Short | Description                                                   |
+| ----------------- | ----- | ------------------------------------------------------------- |
+| `--push`          | `-p`  | Push dev to remote after creating.                            |
+| `--main <name>`   | —     | Main branch name (persisted to `.gflows.json` when provided). |
+| `--dev <name>`    | —     | Dev branch name (persisted to `.gflows.json` when provided).  |
+| `--remote <name>` | `-R`  | Remote name (persisted to `.gflows.json` when provided).      |
+| `--path <dir>`    | `-C`  | Run as if in `<dir>`.                                         |
+| `--dry-run`       | `-d`  | Log intended actions only; no writes.                         |
+| `--verbose`       | `-v`  | Verbose output.                                               |
+| `--quiet`         | `-q`  | Minimal output.                                               |
+
 
 ---
 
@@ -250,16 +254,18 @@ gflows start chore deps-update -C ./backend      # run in subdirectory
 
 **Flags:**
 
-| Flag | Short | Description |
-|------|-------|-------------|
-| `--force` | — | Allow dirty working tree. |
-| `--push` | `-p` | Push new branch to remote after creating. |
-| `--from <branch>` | `-o` | Base branch override (e.g. `-o main` for bugfix). |
-| `--remote <name>` | `-R` | Remote for push. |
-| `--path <dir>` | `-C` | Run as if in `<dir>`. |
-| `--dry-run` | `-d` | Log intended actions only; no writes. |
-| `--verbose` | `-v` | Verbose output. |
-| `--quiet` | `-q` | Minimal output. |
+
+| Flag              | Short | Description                                       |
+| ----------------- | ----- | ------------------------------------------------- |
+| `--force`         | —     | Allow dirty working tree.                         |
+| `--push`          | `-p`  | Push new branch to remote after creating.         |
+| `--from <branch>` | `-o`  | Base branch override (e.g. `-o main` for bugfix). |
+| `--remote <name>` | `-R`  | Remote for push.                                  |
+| `--path <dir>`    | `-C`  | Run as if in `<dir>`.                             |
+| `--dry-run`       | `-d`  | Log intended actions only; no writes.             |
+| `--verbose`       | `-v`  | Verbose output.                                   |
+| `--quiet`         | `-q`  | Minimal output.                                   |
+
 
 ---
 
@@ -286,23 +292,25 @@ gflows finish -y                           # skip "Delete branch after finish?"
 
 **Flags:**
 
-| Flag | Short | Description |
-|------|-------|-------------|
-| `--branch <name>` | `-B` | Branch to finish (current branch if omitted; picker in TTY when `-B` with no value). |
-| `--no-ff` | — | Always create a merge commit. |
-| `--delete` | `-D` | Delete branch after finish. |
-| `--no-delete` | `-N` | Do not delete branch after finish. |
-| `--push` | `-p` | Push after merge (finish prompts "Do you want to push?" when neither `-p` nor `-P`). |
-| `--no-push` | `-P` | Do not push. |
-| `--sign` | `-s` | Sign the tag (release/hotfix; GPG). |
-| `--no-tag` | `-T` | Do not create tag (release/hotfix). |
-| `--tag-message <msg>` | `-M` | Tag message. |
-| `--message <msg>` | `-m` | Merge message. |
-| `--yes` | `-y` | Skip confirmations (e.g. "Delete branch after finish?"). |
-| `--path <dir>` | `-C` | Run as if in `<dir>`. |
-| `--dry-run` | `-d` | Log intended actions only; no writes. |
-| `--verbose` | `-v` | Verbose output. |
-| `--quiet` | `-q` | Minimal output. |
+
+| Flag                  | Short | Description                                                                          |
+| --------------------- | ----- | ------------------------------------------------------------------------------------ |
+| `--branch <name>`     | `-B`  | Branch to finish (current branch if omitted; picker in TTY when `-B` with no value). |
+| `--no-ff`             | —     | Always create a merge commit.                                                        |
+| `--delete`            | `-D`  | Delete branch after finish.                                                          |
+| `--no-delete`         | `-N`  | Do not delete branch after finish.                                                   |
+| `--push`              | `-p`  | Push after merge (finish prompts "Do you want to push?" when neither `-p` nor `-P`). |
+| `--no-push`           | `-P`  | Do not push.                                                                         |
+| `--sign`              | `-s`  | Sign the tag (release/hotfix; GPG).                                                  |
+| `--no-tag`            | `-T`  | Do not create tag (release/hotfix).                                                  |
+| `--tag-message <msg>` | `-M`  | Tag message.                                                                         |
+| `--message <msg>`     | `-m`  | Merge message.                                                                       |
+| `--yes`               | `-y`  | Skip confirmations (e.g. "Delete branch after finish?").                             |
+| `--path <dir>`        | `-C`  | Run as if in `<dir>`.                                                                |
+| `--dry-run`           | `-d`  | Log intended actions only; no writes.                                                |
+| `--verbose`           | `-v`  | Verbose output.                                                                      |
+| `--quiet`             | `-q`  | Minimal output.                                                                      |
+
 
 ---
 
@@ -320,11 +328,13 @@ gflows -W feature/auth-refactor    # same with short command
 
 **Flags:**
 
-| Flag | Short | Description |
-|------|-------|-------------|
-| `--path <dir>` | `-C` | Run as if in `<dir>`. |
-| `--verbose` | `-v` | Verbose output. |
-| `--quiet` | `-q` | Minimal output. |
+
+| Flag           | Short | Description           |
+| -------------- | ----- | --------------------- |
+| `--path <dir>` | `-C`  | Run as if in `<dir>`. |
+| `--verbose`    | `-v`  | Verbose output.       |
+| `--quiet`      | `-q`  | Minimal output.       |
+
 
 ---
 
@@ -342,11 +352,13 @@ gflows delete feature/one feature/two    # delete multiple
 
 **Flags:**
 
-| Flag | Short | Description |
-|------|-------|-------------|
-| `--path <dir>` | `-C` | Run as if in `<dir>`. |
-| `--verbose` | `-v` | Verbose output. |
-| `--quiet` | `-q` | Minimal output. |
+
+| Flag           | Short | Description           |
+| -------------- | ----- | --------------------- |
+| `--path <dir>` | `-C`  | Run as if in `<dir>`. |
+| `--verbose`    | `-v`  | Verbose output.       |
+| `--quiet`      | `-q`  | Minimal output.       |
+
 
 ---
 
@@ -366,13 +378,15 @@ gflows list --include-remote
 
 **Flags:**
 
-| Flag | Short | Description |
-|------|-------|-------------|
-| `--include-remote` | `-r` | Include remote-tracking branches (may run `git fetch`). |
-| `--path <dir>` | `-C` | Run as if in `<dir>`. |
-| `--dry-run` | `-d` | Log intended actions only. |
-| `--verbose` | `-v` | Verbose output. |
-| `--quiet` | `-q` | Minimal output. |
+
+| Flag               | Short | Description                                             |
+| ------------------ | ----- | ------------------------------------------------------- |
+| `--include-remote` | `-r`  | Include remote-tracking branches (may run `git fetch`). |
+| `--path <dir>`     | `-C`  | Run as if in `<dir>`.                                   |
+| `--dry-run`        | `-d`  | Log intended actions only.                              |
+| `--verbose`        | `-v`  | Verbose output.                                         |
+| `--quiet`          | `-q`  | Minimal output.                                         |
+
 
 ---
 
@@ -396,12 +410,14 @@ gflows bump --dry-run                    # print old → new, no file writes
 
 **Flags:**
 
-| Flag | Short | Description |
-|------|-------|-------------|
-| `--dry-run` | `-d` | Print old → new version only; no file writes. |
-| `--path <dir>` | `-C` | Run as if in `<dir>`. |
-| `--verbose` | `-v` | Verbose output. |
-| `--quiet` | `-q` | Minimal output. |
+
+| Flag           | Short | Description                                   |
+| -------------- | ----- | --------------------------------------------- |
+| `--dry-run`    | `-d`  | Print old → new version only; no file writes. |
+| `--path <dir>` | `-C`  | Run as if in `<dir>`.                         |
+| `--verbose`    | `-v`  | Verbose output.                               |
+| `--quiet`      | `-q`  | Minimal output.                               |
+
 
 ---
 
@@ -418,11 +434,13 @@ gflows -t
 
 **Flags:**
 
-| Flag | Short | Description |
-|------|-------|-------------|
-| `--path <dir>` | `-C` | Run as if in `<dir>`. |
-| `--verbose` | `-v` | Verbose output. |
-| `--quiet` | `-q` | Minimal output. |
+
+| Flag           | Short | Description           |
+| -------------- | ----- | --------------------- |
+| `--path <dir>` | `-C`  | Run as if in `<dir>`. |
+| `--verbose`    | `-v`  | Verbose output.       |
+| `--quiet`      | `-q`  | Minimal output.       |
+
 
 ---
 
@@ -476,7 +494,7 @@ Configuration is **optional**. Override branch names, remote, and branch **prefi
 **Resolution order** (later overrides earlier):
 
 1. Built-in defaults (`main`, `dev`, `origin`, and default prefixes).
-2. Repo config file: `**.gflows.json`** in repo root, or `**gflows`** key in `**package.json**`.
+2. Repo config file: `**.gflows.json`** in repo root, or `**gflows`** key in `**package.json`**.
 3. CLI (e.g. `--main`, `--dev`, `-R`/`--remote`).
 
 Only include keys you want to override; the rest stay default. Invalid or malformed config is ignored (with an optional warning when using `-v`).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gflows",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "A lightweight CLI for consistent Git branching workflows (main + dev, feature/bugfix/chore/release/hotfix).",
   "license": "MIT",
   "type": "module",

package/src/cli.ts

@@ -123,6 +123,45 @@ function resolveCwd(pathFlag: string | undefined): string {
   return absolute;
 }
 
+/**
+ * Returns the command name closest to `input` by edit distance, or undefined if no close match.
+ * Used for "did you mean?" when the user mistypes a command.
+ */
+function closestCommand(input: string): Command | undefined {
+  if (!input || input.length < 2) return undefined;
+  const target = input.toLowerCase();
+  let best: Command | undefined;
+  let bestDistance = 3; // only suggest if within 2 edits
+  for (const cmd of COMMANDS) {
+    const d = editDistance(target, cmd);
+    if (d < bestDistance) {
+      bestDistance = d;
+      best = cmd as Command;
+    }
+  }
+  return best;
+}
+
+/** Levenshtein edit distance between two strings. */
+function editDistance(a: string, b: string): number {
+  const m = a.length;
+  const n = b.length;
+  const dp: number[][] = Array.from({ length: m + 1 }, () => Array(n + 1).fill(0));
+  for (let i = 0; i <= m; i++) dp[i]![0] = i;
+  for (let j = 0; j <= n; j++) dp[0]![j] = j;
+  for (let i = 1; i <= m; i++) {
+    for (let j = 1; j <= n; j++) {
+      const cost = a[i - 1] === b[j - 1] ? 0 : 1;
+      dp[i]![j] = Math.min(
+        dp[i - 1]![j]! + 1,
+        dp[i]![j - 1]! + 1,
+        dp[i - 1]![j - 1]! + cost
+      );
+    }
+  }
+  return dp[m]![n]!;
+}
+
 /** Resolve command from positionals and short flags. Short wins if both present. */
 function resolveCommand(
   positionals: string[],
@@ -240,7 +279,13 @@ export function parse(argv: string[] = Bun.argv.slice(2)): ParsedArgs {
 
   const command = resolveCommand(positionals, v);
   if (!command) {
-    console.error("gflows: missing command. Use 'gflows help' for usage.");
+    const first = positionals[0];
+    const suggestion = typeof first === "string" ? closestCommand(first) : undefined;
+    if (suggestion) {
+      console.error(`gflows: unknown command '${first}'. Did you mean '${suggestion}'?`);
+    } else {
+      console.error("gflows: missing command. Use 'gflows help' for usage.");
+    }
     process.exit(EXIT_USER);
   }
 

package/src/commands/bump.ts

@@ -111,7 +111,7 @@ function readPackageVersion(dir: string): { raw: string; semver: Semver } {
   const version = data.version;
   if (typeof version !== "string" || version.trim() === "") {
     throw new InvalidVersionError(
-      "package.json has no valid 'version' field."
+      "package.json has no valid 'version' field. Add a \"version\" field (e.g. \"0.0.0\") to package.json."
     );
   }
   const semver = parseVersion(version);

package/src/commands/list.ts

@@ -82,17 +82,17 @@ export async function run(args: ParsedArgs): Promise<void> {
     typeFilter
   );
 
-  const sorted = [...workflowBranches].sort();
+  // Show main and dev first (when present), then workflow branches
+  const mainAndDev = [config.main, config.dev].filter((b) =>
+    allBranches.includes(b)
+  );
+  const sorted = [...mainAndDev, ...[...workflowBranches].sort()];
 
   for (const b of sorted) {
     console.log(b);
   }
 
-  if (!quiet && sorted.length === 0) {
-    console.error("No workflow branches found.");
-    // Hint: suggest creating first workflow branch
-    hint("Run gflows start <type> <name> to create a workflow branch.");
-  } else if (!quiet && sorted.length > 0) {
+  if (!quiet && sorted.length > 0) {
     // Hint: suggest switching to a listed branch
     hint("Use gflows switch <branch> to switch to a branch.");
   }

package/src/commands/switch.ts

@@ -81,10 +81,15 @@ export async function run(args: ParsedArgs): Promise<void> {
 
   const allLocal = await branchList(root, { dryRun, verbose: args.verbose });
   const workflowBranches = getWorkflowBranches(allLocal, config.prefixes);
+  // Include main and dev so we always show whatever branches exist
+  const mainAndDev = [config.main, config.dev].filter((b) =>
+    allLocal.includes(b)
+  );
+  const choices = [...mainAndDev, ...workflowBranches];
 
-  if (workflowBranches.length === 0) {
+  if (choices.length === 0) {
     if (!quiet) {
-      console.error("No workflow branches found. Create one with 'gflows start <type> <name>'.");
+      console.error("No branches found.");
     }
     process.exit(EXIT_OK);
   }
@@ -92,7 +97,7 @@ export async function run(args: ParsedArgs): Promise<void> {
   const { select } = await import("@inquirer/prompts");
   const chosen = await select({
     message: "Switch to branch",
-    choices: workflowBranches.map((b) => ({ name: b, value: b })),
+    choices: choices.map((b) => ({ name: b, value: b })),
   });
 
   if (typeof chosen !== "string") {