gflows 0.1.12 → 0.1.14

package/src/commands/finish.ts

@@ -5,13 +5,8 @@
  * @module commands/finish
  */
 
-import type { BranchType, ParsedArgs } from "../types.js";
+import { getBranchTypeMeta, resolveConfig } from "../config.js";
 import { EXIT_USER, VERSION_REGEX } from "../constants.js";
-import {
-  getBranchTypeMeta,
-  getPrefixForType,
-  resolveConfig,
-} from "../config.js";
 import { BranchNotFoundError } from "../errors.js";
 import {
   assertNoRebaseOrMerge,
@@ -27,6 +22,7 @@ import {
   tagExists,
 } from "../git.js";
 import { hint, success } from "../out.js";
+import type { BranchType, ParsedArgs } from "../types.js";
 
 /** Normalizes version to vX.Y.Z for tag name. */
 function normalizeTagVersion(version: string): string {
@@ -39,7 +35,7 @@ function normalizeTagVersion(version: string): string {
  */
 async function getWorkflowBranches(
   cwd: string,
-  prefixes: Record<BranchType, string>
+  prefixes: Record<BranchType, string>,
 ): Promise<string[]> {
   const all = await branchList(cwd, { dryRun: false, verbose: false });
   const workflow: string[] = [];
@@ -59,16 +55,9 @@ async function getWorkflowBranches(
  */
 function parseBranchTypeAndVersion(
   branchName: string,
-  prefixes: Record<BranchType, string>
+  prefixes: Record<BranchType, string>,
 ): { type: BranchType; version?: string } | null {
-  for (const type of [
-    "release",
-    "hotfix",
-    "feature",
-    "bugfix",
-    "chore",
-    "spike",
-  ] as BranchType[]) {
+  for (const type of ["release", "hotfix", "feature", "bugfix", "chore", "spike"] as BranchType[]) {
     const prefix = prefixes[type];
     if (prefix && branchName.startsWith(prefix)) {
       const suffix = branchName.slice(prefix.length);
@@ -93,7 +82,7 @@ export async function run(args: ParsedArgs): Promise<void> {
   const config = resolveConfig(
     repoRoot,
     { main: args.main, dev: args.dev, remote: args.remote },
-    { verbose: args.verbose }
+    { verbose: args.verbose },
   );
 
   const opts: { dryRun: boolean; verbose: boolean } = {
@@ -106,9 +95,7 @@ export async function run(args: ParsedArgs): Promise<void> {
   // Resolve branch to finish (and guard main/dev early so we can error before picker)
   let branchToFinish: string;
   const explicitBranch =
-    typeof args.branch === "string" && args.branch.trim() !== ""
-      ? args.branch.trim()
-      : undefined;
+    typeof args.branch === "string" && args.branch.trim() !== "" ? args.branch.trim() : undefined;
 
   if (explicitBranch) {
     branchToFinish = explicitBranch;
@@ -127,7 +114,7 @@ export async function run(args: ParsedArgs): Promise<void> {
     const current = await getCurrentBranch(repoRoot, opts);
     if (!current) {
       console.error(
-        "gflows finish: HEAD is detached. Checkout a branch or specify one with -B <name>."
+        "gflows finish: HEAD is detached. Checkout a branch or specify one with -B <name>.",
       );
       process.exit(EXIT_USER);
     }
@@ -137,7 +124,7 @@ export async function run(args: ParsedArgs): Promise<void> {
   // Refuse finish on main or dev
   if (branchToFinish === config.main || branchToFinish === config.dev) {
     console.error(
-      `gflows finish: cannot finish the long-lived branch '${branchToFinish}'. Finish a workflow branch (feature, bugfix, etc.) instead.`
+      `gflows finish: cannot finish the long-lived branch '${branchToFinish}'. Finish a workflow branch (feature, bugfix, etc.) instead.`,
     );
     process.exit(2);
   }
@@ -147,13 +134,13 @@ export async function run(args: ParsedArgs): Promise<void> {
   const type: BranchType | undefined = args.type ?? parsed?.type ?? undefined;
   if (!type) {
     console.error(
-      `gflows finish: cannot determine branch type for '${branchToFinish}'. Specify type (e.g. gflows finish feature) or use a branch name with a known prefix.`
+      `gflows finish: cannot determine branch type for '${branchToFinish}'. Specify type (e.g. gflows finish feature) or use a branch name with a known prefix.`,
     );
     process.exit(EXIT_USER);
   }
   if (parsed && parsed.type !== type) {
     console.error(
-      `gflows finish: branch '${branchToFinish}' matches type '${parsed.type}', but '${type}' was specified.`
+      `gflows finish: branch '${branchToFinish}' matches type '${parsed.type}', but '${type}' was specified.`,
     );
     process.exit(EXIT_USER);
   }
@@ -175,7 +162,7 @@ export async function run(args: ParsedArgs): Promise<void> {
     }
   } else if (meta.tagOnFinish && !version) {
     console.error(
-      `gflows finish: release/hotfix branch '${branchToFinish}' has no valid version segment. Use format release/vX.Y.Z or hotfix/vX.Y.Z.`
+      `gflows finish: release/hotfix branch '${branchToFinish}' has no valid version segment. Use format release/vX.Y.Z or hotfix/vX.Y.Z.`,
     );
     process.exit(EXIT_USER);
   }
@@ -184,38 +171,33 @@ export async function run(args: ParsedArgs): Promise<void> {
   const branches = await branchList(repoRoot, { ...opts, dryRun: false });
   if (!branches.includes(branchToFinish)) {
     throw new BranchNotFoundError(
-      `Branch '${branchToFinish}' not found. Specify an existing local branch with -B <name>.`
+      `Branch '${branchToFinish}' not found. Specify an existing local branch with -B <name>.`,
     );
   }
 
   const noFf = args.noFf;
+  if (meta.mergeTarget === "dev") {
+    await checkout(repoRoot, config.dev, opts);
+    await merge(repoRoot, branchToFinish, { ...opts, noFf });
+  } else {
+    // main-then-dev: merge into main first, then merge main into dev
+    await checkout(repoRoot, config.main, opts);
+    await merge(repoRoot, branchToFinish, { ...opts, noFf });
 
-  try {
-    if (meta.mergeTarget === "dev") {
-      await checkout(repoRoot, config.dev, opts);
-      await merge(repoRoot, branchToFinish, { ...opts, noFf });
-    } else {
-      // main-then-dev: merge into main first, then merge main into dev
-      await checkout(repoRoot, config.main, opts);
-      await merge(repoRoot, branchToFinish, { ...opts, noFf });
-
-      if (meta.tagOnFinish && version && !args.noTag) {
-        const tagName = normalizeTagVersion(version);
-        await tag(repoRoot, tagName, {
-          ...opts,
-          sign: args.signTag,
-          tagMessage: args.tagMessage,
-        });
-        if (!args.quiet && !args.dryRun) {
-          success(`gflows: created tag '${tagName}'.`);
-        }
+    if (meta.tagOnFinish && version && !args.noTag) {
+      const tagName = normalizeTagVersion(version);
+      await tag(repoRoot, tagName, {
+        ...opts,
+        sign: args.signTag,
+        tagMessage: args.tagMessage,
+      });
+      if (!args.quiet && !args.dryRun) {
+        success(`gflows: created tag '${tagName}'.`);
       }
-
-      await checkout(repoRoot, config.dev, opts);
-      await merge(repoRoot, config.main, { ...opts, noFf });
     }
-  } catch (err) {
-    throw err;
+
+    await checkout(repoRoot, config.dev, opts);
+    await merge(repoRoot, config.main, { ...opts, noFf });
   }
 
   // Optional: delete the finished branch
@@ -263,16 +245,10 @@ export async function run(args: ParsedArgs): Promise<void> {
     if (meta.mergeTarget === "main-then-dev") {
       refsToPush.push(config.main);
     }
-    const pushCode = await push(
-      repoRoot,
-      remote,
-      refsToPush,
-      didCreateTag,
-      opts
-    );
+    const pushCode = await push(repoRoot, remote, refsToPush, didCreateTag, opts);
     if (pushCode !== 0) {
       console.error(
-        "gflows: merge and tag succeeded locally, but push failed. Retry with `git push` or `gflows finish ... --push`."
+        "gflows: merge and tag succeeded locally, but push failed. Retry with `git push` or `gflows finish ... --push`.",
       );
       process.exit(2);
     }

package/src/commands/help.ts

@@ -32,7 +32,7 @@ Types: feature (-f), bugfix (-b), chore (-c), release (-r), hotfix (-x), spike (
 
 Common flags:
   -p, --push           Push after init/start/finish
-  -P, --no-push        Do not push (finish: prompts "Do you want to push?" when neither -p nor -P)
+  -P, --no-push        Do not push (init/start: push is default; finish: prompts when neither -p nor -P)
   --main <name>        Main branch (init: persist to .gflows.json)
   --dev <name>         Dev branch (init: persist to .gflows.json)
   -R, --remote <name>  Remote for push (init: persist to .gflows.json)

package/src/commands/init.ts

@@ -6,13 +6,7 @@
 
 import { resolveConfig, writeConfigFile } from "../config.js";
 import { BranchNotFoundError, NotRepoError } from "../errors.js";
-import {
-  branchList,
-  push,
-  resolveRepoRoot,
-  revParse,
-  runGit,
-} from "../git.js";
+import { branchList, push, resolveRepoRoot, revParse, runGit } from "../git.js";
 import { banner, hint, success } from "../out.js";
 import type { ParsedArgs } from "../types.js";
 
@@ -33,7 +27,7 @@ export async function run(args: ParsedArgs): Promise<void> {
       dev: args.dev,
       remote: args.remote,
     },
-    { verbose: args.verbose }
+    { verbose: args.verbose },
   );
 
   if (!args.quiet) {
@@ -44,7 +38,7 @@ export async function run(args: ParsedArgs): Promise<void> {
       `  dev    ${config.dev}`,
       `  remote ${config.remote}`,
       "",
-      "→ Dev from main. Use --push to push.",
+      "→ Dev from main. Use --no-push to skip pushing.",
     ]);
   }
 
@@ -60,7 +54,7 @@ export async function run(args: ParsedArgs): Promise<void> {
     if (err instanceof NotRepoError) throw err;
     if (err instanceof BranchNotFoundError) {
       throw new BranchNotFoundError(
-        `Main branch '${config.main}' does not exist. Create an initial commit and the main branch first.`
+        `Main branch '${config.main}' does not exist. Create an initial commit and the main branch first.`,
       );
     }
     throw err;
@@ -76,12 +70,12 @@ export async function run(args: ParsedArgs): Promise<void> {
     }
   }
 
-  const doPush = args.push && !args.noPush;
+  const doPush = !args.noPush;
   if (doPush) {
     const pushCode = await push(repoRoot, config.remote, [config.dev], false, opts);
     if (pushCode !== 0) {
       throw new Error(
-        `Push failed. Local branch '${config.dev}' was created. Retry with \`git push ${config.remote} ${config.dev}\` or \`gflows init --push\`.`
+        `Push failed. Local branch '${config.dev}' was created. Retry with \`git push ${config.remote} ${config.dev}\` or \`gflows init\`.`,
       );
     }
     if (!args.quiet && !args.dryRun) {
@@ -89,7 +83,8 @@ export async function run(args: ParsedArgs): Promise<void> {
     }
   }
 
-  const hasConfigFlags = args.main !== undefined || args.dev !== undefined || args.remote !== undefined;
+  const hasConfigFlags =
+    args.main !== undefined || args.dev !== undefined || args.remote !== undefined;
   if (!args.dryRun && hasConfigFlags) {
     writeConfigFile(repoRoot, {
       ...(args.main !== undefined && { main: args.main }),

package/src/commands/list.ts

@@ -5,22 +5,13 @@
  * @module commands/list
  */
 
-import type { BranchType } from "../types.js";
-import type { ParsedArgs } from "../types.js";
-import type { ResolvedConfig } from "../types.js";
 import { resolveConfig } from "../config.js";
 import { NotRepoError } from "../errors.js";
 import { branchList, fetch, resolveRepoRoot } from "../git.js";
 import { hint } from "../out.js";
+import type { BranchType, ParsedArgs, ResolvedConfig } from "../types.js";
 
-const BRANCH_TYPES: BranchType[] = [
-  "feature",
-  "bugfix",
-  "chore",
-  "release",
-  "hotfix",
-  "spike",
-];
+const BRANCH_TYPES: BranchType[] = ["feature", "bugfix", "chore", "release", "hotfix", "spike"];
 
 /**
  * Returns branch names that match any workflow prefix. If typeFilter is set,
@@ -29,13 +20,11 @@ const BRANCH_TYPES: BranchType[] = [
 function filterWorkflowBranches(
   allBranches: string[],
   config: ResolvedConfig,
-  typeFilter: BranchType | undefined
+  typeFilter: BranchType | undefined,
 ): string[] {
   const { main, dev, prefixes } = config;
   const prefixesToMatch =
-    typeFilter !== undefined
-      ? [prefixes[typeFilter]]
-      : BRANCH_TYPES.map((t) => prefixes[t]);
+    typeFilter !== undefined ? [prefixes[typeFilter]] : BRANCH_TYPES.map((t) => prefixes[t]);
 
   return allBranches.filter((b) => {
     if (b === main || b === dev) return false;
@@ -61,7 +50,7 @@ export async function run(args: ParsedArgs): Promise<void> {
   const config = resolveConfig(
     root,
     { main: args.main, dev: args.dev, remote: args.remote },
-    { verbose: !!verbose }
+    { verbose: !!verbose },
   );
 
   if (includeRemote && !dryRun) {
@@ -76,23 +65,17 @@ export async function run(args: ParsedArgs): Promise<void> {
     verbose: !!verbose,
   });
 
-  const workflowBranches = filterWorkflowBranches(
-    allBranches,
-    config,
-    typeFilter
-  );
+  const workflowBranches = filterWorkflowBranches(allBranches, config, 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/start.ts

@@ -4,11 +4,9 @@
  * @module commands/start
  */
 
-import type { BranchType, ParsedArgs } from "../types.js";
-import { EXIT_USER, VERSION_REGEX } from "../constants.js";
 import { getPrefixForType, resolveConfig } from "../config.js";
+import { EXIT_USER, VERSION_REGEX } from "../constants.js";
 import { BranchNotFoundError, DirtyWorkingTreeError, InvalidVersionError } from "../errors.js";
-import { hint, success } from "../out.js";
 import {
   assertNoRebaseOrMerge,
   assertNotDetached,
@@ -21,16 +19,13 @@ import {
   runGit,
   validateBranchName,
 } from "../git.js";
+import { hint, success } from "../out.js";
+import type { BranchType, ParsedArgs } from "../types.js";
 
 /**
  * Returns the base branch name for the given type and fromMain flag (main vs dev).
  */
-function getBaseBranch(
-  type: BranchType,
-  fromMain: boolean,
-  main: string,
-  dev: string
-): string {
+function getBaseBranch(type: BranchType, fromMain: boolean, main: string, dev: string): string {
   if (type === "hotfix") return main;
   if (type === "bugfix" && fromMain) return main;
   return dev;
@@ -45,7 +40,9 @@ function getBaseBranch(
  */
 export async function run(args: ParsedArgs): Promise<void> {
   if (!args.type || args.name === undefined || args.name === "") {
-    console.error("gflows start: requires type and name (e.g. gflows start feature my-feat). Use 'gflows help' for usage.");
+    console.error(
+      "gflows start: requires type and name (e.g. gflows start feature my-feat). Use 'gflows help' for usage.",
+    );
     process.exit(EXIT_USER);
   }
 
@@ -55,7 +52,7 @@ export async function run(args: ParsedArgs): Promise<void> {
   const config = resolveConfig(
     repoRoot,
     { main: args.main, dev: args.dev, remote: args.remote },
-    { verbose: args.verbose }
+    { verbose: args.verbose },
   );
 
   const opts = {
@@ -79,7 +76,7 @@ export async function run(args: ParsedArgs): Promise<void> {
   if (type === "release" || type === "hotfix") {
     if (!VERSION_REGEX.test(name)) {
       throw new InvalidVersionError(
-        `Invalid version '${name}'. Use format vX.Y.Z or X.Y.Z (e.g. v1.2.0).`
+        `Invalid version '${name}'. Use format vX.Y.Z or X.Y.Z (e.g. v1.2.0).`,
       );
     }
   } else {
@@ -89,10 +86,10 @@ export async function run(args: ParsedArgs): Promise<void> {
   const base = getBaseBranch(type, args.fromMain, config.main, config.dev);
 
   // Ensure base exists (local or create from remote after fetch)
-  let baseExists = false;
+  let _baseExists = false;
   try {
     await revParse(repoRoot, base, [], { dryRun: false, verbose: opts.verbose });
-    baseExists = true;
+    _baseExists = true;
   } catch {
     // Fetch and try remote ref
     await fetch(repoRoot, config.remote, opts);
@@ -102,10 +99,10 @@ export async function run(args: ParsedArgs): Promise<void> {
       if (!opts.dryRun) {
         await runGit(["branch", base, remoteRef], { cwd: repoRoot, ...opts, dryRun: false });
       }
-      baseExists = true;
+      _baseExists = true;
     } catch {
       throw new BranchNotFoundError(
-        `Base branch '${base}' not found locally or on ${config.remote}. Create it or push it first.`
+        `Base branch '${base}' not found locally or on ${config.remote}. Create it or push it first.`,
       );
     }
   }
@@ -116,7 +113,7 @@ export async function run(args: ParsedArgs): Promise<void> {
   const branches = await branchList(repoRoot, { ...opts, dryRun: false });
   if (branches.includes(fullBranchName)) {
     throw new BranchNotFoundError(
-      `Branch '${fullBranchName}' already exists. Use a different name or switch to it.`
+      `Branch '${fullBranchName}' already exists. Use a different name or switch to it.`,
     );
   }
 
@@ -132,7 +129,7 @@ export async function run(args: ParsedArgs): Promise<void> {
     const pushCode = await push(repoRoot, remote, [fullBranchName], false, opts);
     if (pushCode !== 0) {
       throw new Error(
-        `Push failed. Local branch '${fullBranchName}' was created. Retry with \`git push ${remote} ${fullBranchName}\` or \`gflows start ... --push\`.`
+        `Push failed. Local branch '${fullBranchName}' was created. Retry with \`git push ${remote} ${fullBranchName}\` or \`gflows start ... --push\`.`,
       );
     }
     if (!args.quiet && !args.dryRun) {

package/src/commands/status.ts

@@ -6,28 +6,13 @@
  * @module commands/status
  */
 
-import type { BranchType, ParsedArgs } from "../types.js";
-import type { ResolvedConfig } from "../types.js";
-import {
-  getBranchTypeMeta,
-  resolveConfig,
-} from "../config.js";
+import { getBranchTypeMeta, resolveConfig } from "../config.js";
 import { NotRepoError } from "../errors.js";
-import {
-  getAheadBehind,
-  getCurrentBranch,
-  resolveRepoRoot,
-} from "../git.js";
+import { getAheadBehind, getCurrentBranch, resolveRepoRoot } from "../git.js";
 import { hint } from "../out.js";
+import type { BranchType, ParsedArgs, ResolvedConfig } from "../types.js";
 
-const BRANCH_TYPES: BranchType[] = [
-  "feature",
-  "bugfix",
-  "chore",
-  "release",
-  "hotfix",
-  "spike",
-];
+const BRANCH_TYPES: BranchType[] = ["feature", "bugfix", "chore", "release", "hotfix", "spike"];
 
 /**
  * Classifies a branch name into a workflow type, "main", "dev", or null (unknown).
@@ -35,7 +20,7 @@ const BRANCH_TYPES: BranchType[] = [
  */
 function classifyBranch(
   branchName: string,
-  config: ResolvedConfig
+  config: ResolvedConfig,
 ): BranchType | "main" | "dev" | null {
   if (branchName === config.main) return "main";
   if (branchName === config.dev) return "dev";
@@ -54,7 +39,7 @@ function classifyBranch(
  */
 function formatMergeTarget(
   mergeTarget: "main" | "dev" | "main-then-dev",
-  config: ResolvedConfig
+  config: ResolvedConfig,
 ): string {
   if (mergeTarget === "main-then-dev") {
     return `${config.main}, then ${config.dev}`;
@@ -78,7 +63,7 @@ export async function run(args: ParsedArgs): Promise<void> {
   const config = resolveConfig(
     root,
     { main: args.main, dev: args.dev, remote: args.remote },
-    { verbose: !!verbose }
+    { verbose: !!verbose },
   );
   const current = await getCurrentBranch(root, {
     dryRun: !!dryRun,
@@ -129,12 +114,10 @@ export async function run(args: ParsedArgs): Promise<void> {
     console.log(`Merge target(s): ${mergeTargetDisplay}`);
   }
 
-  const { ahead, behind } = await getAheadBehind(
-    root,
-    baseBranch,
-    current,
-    { dryRun: !!dryRun, verbose: !!verbose }
-  );
+  const { ahead, behind } = await getAheadBehind(root, baseBranch, current, {
+    dryRun: !!dryRun,
+    verbose: !!verbose,
+  });
 
   if (!quiet) {
     console.log(`Ahead/behind: ${ahead} ahead, ${behind} behind`);

package/src/commands/switch.ts

@@ -3,38 +3,24 @@
  * @module commands/switch
  */
 
-import type { BranchType } from "../types.js";
-import type { ParsedArgs } from "../types.js";
 import { resolveConfig } from "../config.js";
 import { EXIT_OK, EXIT_USER } from "../constants.js";
 import { NotRepoError } from "../errors.js";
-import {
-  branchList,
-  checkout,
-  resolveRepoRoot,
-} from "../git.js";
+import { branchList, checkout, resolveRepoRoot } from "../git.js";
 import { hint, success } from "../out.js";
+import type { BranchType, ParsedArgs } from "../types.js";
 
-const BRANCH_TYPES: BranchType[] = [
-  "feature",
-  "bugfix",
-  "chore",
-  "release",
-  "hotfix",
-  "spike",
-];
+const BRANCH_TYPES: BranchType[] = ["feature", "bugfix", "chore", "release", "hotfix", "spike"];
 
 /**
  * Returns local branch names that match any workflow prefix (feature/, bugfix/, etc.).
  */
 function getWorkflowBranches(
   allBranches: string[],
-  prefixes: Record<BranchType, string>
+  prefixes: Record<BranchType, string>,
 ): string[] {
   const prefixed = BRANCH_TYPES.map((t) => prefixes[t]).filter(Boolean);
-  return allBranches.filter((b) =>
-    prefixed.some((p) => p && b.startsWith(p))
-  );
+  return allBranches.filter((b) => prefixed.some((p) => p && b.startsWith(p)));
 }
 
 /**
@@ -74,17 +60,20 @@ export async function run(args: ParsedArgs): Promise<void> {
   const isTTY = typeof process.stdin.isTTY === "boolean" && process.stdin.isTTY;
   if (!isTTY) {
     console.error(
-      "gflows switch: no branch name given and stdin is not a TTY. Pass a branch name (e.g. gflows switch feature/my-branch) or run from an interactive terminal."
+      "gflows switch: no branch name given and stdin is not a TTY. Pass a branch name (e.g. gflows switch feature/my-branch) or run from an interactive terminal.",
     );
     process.exit(EXIT_USER);
   }
 
   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 +81,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") {