@alejandrochaves/devflow-cli 1.3.1 → 1.4.0

package/dist/commands/amend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"amend.d.ts","sourceRoot":"","sources":["../../src/commands/amend.ts"],"names":[],"mappings":"AA4CA,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAsB,YAAY,CAAC,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsJ5E"}
+{"version":3,"file":"amend.d.ts","sourceRoot":"","sources":["../../src/commands/amend.ts"],"names":[],"mappings":"AA6CA,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AASD,wBAAsB,YAAY,CAAC,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0O5E"}

package/dist/commands/amend.js

@@ -1,8 +1,9 @@
-import { confirm, input, select, search } from "@inquirer/prompts";
+import { confirm } from "@inquirer/prompts";
 import { execSync } from "child_process";
 import { loadConfig } from "../config.js";
 import { inferTicket } from "../git.js";
 import { bold, dim, green, yellow, cyan } from "../colors.js";
+import { selectWithBack, inputWithBack, confirmWithBack, searchWithBack, BACK_VALUE } from "../prompts.js";
 function getLastCommitMessage() {
     return execSync("git log -1 --format=%s", { encoding: "utf-8" }).trim();
 }
@@ -51,78 +52,140 @@ export async function amendCommand(options = {}) {
         }
         let newMessage = lastMessage;
         if (editMessage) {
-            // Get type from flag or prompt
-            const type = options.type || await select({
-                message: "Select commit type:",
-                choices: config.commitTypes.map((t) => ({ value: t.value, name: t.label })),
-                default: parsed.type,
-            });
-            // Get scope from flag or prompt
-            let finalScope;
-            if (options.scope !== undefined) {
-                finalScope = options.scope;
-            }
-            else if (config.scopes.length > 0) {
-                finalScope = await search({
-                    message: parsed.scope
-                        ? `Select scope (current: ${cyan(parsed.scope)}):`
-                        : "Select scope (type to filter):",
-                    source: (term) => {
-                        const filtered = config.scopes.filter((s) => !term ||
-                            s.value.includes(term.toLowerCase()) ||
-                            s.description.toLowerCase().includes(term.toLowerCase()));
-                        if (parsed.scope) {
-                            filtered.sort((a, b) => a.value === parsed.scope ? -1 : b.value === parsed.scope ? 1 : 0);
+            // Initialize state from parsed message
+            const state = {
+                type: options.type || parsed.type || "",
+                scope: options.scope ?? parsed.scope ?? "",
+                message: options.message || parsed.message || "",
+                isBreaking: options.breaking ?? parsed.breaking,
+            };
+            let currentStep = "type";
+            // Skip steps that have flags
+            if (options.type)
+                currentStep = "scope";
+            while (currentStep !== undefined) {
+                switch (currentStep) {
+                    case "type": {
+                        if (options.type) {
+                            currentStep = "scope";
+                            break;
                         }
-                        return filtered.map((s) => ({
-                            value: s.value,
-                            name: `${s.value} — ${s.description}`,
-                        }));
-                    },
-                });
-            }
-            else {
-                finalScope = await input({
-                    message: "Enter scope (optional):",
-                    default: parsed.scope,
-                });
-            }
-            // Get message from flag or prompt
-            let message;
-            if (options.message) {
-                message = options.message;
-            }
-            else {
-                message = await input({
-                    message: "Enter commit message:",
-                    default: parsed.message,
-                    validate: (val) => val.trim().length > 0 || "Commit message is required",
-                });
-            }
-            // Get breaking change status from flag or prompt
-            let isBreaking;
-            if (options.breaking !== undefined) {
-                isBreaking = options.breaking;
-            }
-            else if (options.yes) {
-                isBreaking = parsed.breaking;
-            }
-            else {
-                isBreaking = await confirm({
-                    message: "Is this a breaking change?",
-                    default: parsed.breaking,
-                });
+                        const result = await selectWithBack({
+                            message: "Select commit type:",
+                            choices: config.commitTypes.map((t) => ({ value: t.value, name: t.label })),
+                            default: state.type,
+                            showBack: false, // First step
+                        });
+                        if (result === BACK_VALUE) {
+                            // Can't go back from first step
+                        }
+                        else {
+                            state.type = result;
+                            currentStep = "scope";
+                        }
+                        break;
+                    }
+                    case "scope": {
+                        if (options.scope !== undefined) {
+                            currentStep = "message";
+                            break;
+                        }
+                        if (config.scopes.length > 0) {
+                            const result = await searchWithBack({
+                                message: parsed.scope
+                                    ? `Select scope (current: ${cyan(parsed.scope)}):`
+                                    : "Select scope (type to filter):",
+                                source: (term) => {
+                                    const filtered = config.scopes.filter((s) => !term ||
+                                        s.value.includes(term.toLowerCase()) ||
+                                        s.description.toLowerCase().includes(term.toLowerCase()));
+                                    if (parsed.scope) {
+                                        filtered.sort((a, b) => a.value === parsed.scope ? -1 : b.value === parsed.scope ? 1 : 0);
+                                    }
+                                    return filtered.map((s) => ({
+                                        value: s.value,
+                                        name: `${s.value} — ${s.description}`,
+                                    }));
+                                },
+                                showBack: !options.type,
+                            });
+                            if (result === BACK_VALUE) {
+                                currentStep = "type";
+                            }
+                            else {
+                                state.scope = result;
+                                currentStep = "message";
+                            }
+                        }
+                        else {
+                            const result = await inputWithBack({
+                                message: "Enter scope (optional):",
+                                default: state.scope,
+                                showBack: !options.type,
+                            });
+                            if (result === BACK_VALUE) {
+                                currentStep = "type";
+                            }
+                            else {
+                                state.scope = result;
+                                currentStep = "message";
+                            }
+                        }
+                        break;
+                    }
+                    case "message": {
+                        if (options.message) {
+                            currentStep = "breaking";
+                            break;
+                        }
+                        const result = await inputWithBack({
+                            message: "Enter commit message:",
+                            default: state.message,
+                            validate: (val) => val.trim().length > 0 || "Commit message is required",
+                            showBack: true,
+                        });
+                        if (result === BACK_VALUE) {
+                            currentStep = options.scope !== undefined ? "type" : "scope";
+                        }
+                        else {
+                            state.message = result;
+                            currentStep = "breaking";
+                        }
+                        break;
+                    }
+                    case "breaking": {
+                        if (options.breaking !== undefined || options.yes) {
+                            currentStep = undefined;
+                            break;
+                        }
+                        const result = await confirmWithBack({
+                            message: "Is this a breaking change?",
+                            default: state.isBreaking,
+                            showBack: true,
+                        });
+                        if (result === BACK_VALUE) {
+                            currentStep = options.message ? "scope" : "message";
+                        }
+                        else {
+                            state.isBreaking = result;
+                            currentStep = undefined;
+                        }
+                        break;
+                    }
+                    default:
+                        currentStep = undefined;
+                }
             }
             const ticket = parsed.ticket || inferTicket();
-            const breaking = isBreaking ? "!" : "";
-            const scope = finalScope || "";
+            const breaking = state.isBreaking ? "!" : "";
+            const scope = state.scope || "";
             // Build using format
             let result = config.commitFormat;
-            result = result.replace("{type}", type);
+            result = result.replace("{type}", state.type);
             result = result.replace("{ticket}", ticket);
             result = result.replace("{breaking}", breaking);
             result = result.replace("{scope}", scope);
-            result = result.replace("{message}", message.trim());
+            result = result.replace("{message}", state.message.trim());
             result = result.replace(/\[\]/g, "");
             result = result.replace(/\(\)/g, "");
             newMessage = result;
@@ -146,11 +209,19 @@ export async function amendCommand(options = {}) {
         }
         // Confirm (skip if --yes)
         if (!options.yes) {
-            const confirmed = await confirm({
+            const confirmResult = await selectWithBack({
                 message: "Amend this commit?",
-                default: true,
+                choices: [
+                    { value: "yes", name: "Yes, amend commit" },
+                    { value: "no", name: "No, abort" },
+                ],
+                default: "yes",
+                showBack: true,
             });
-            if (!confirmed) {
+            if (confirmResult === BACK_VALUE) {
+                return amendCommand(options);
+            }
+            if (confirmResult !== "yes") {
                 console.log("Aborted.");
                 process.exit(0);
             }

package/dist/commands/amend.js.map

@@ -1 +1 @@
-{"version":3,"file":"amend.js","sourceRoot":"","sources":["../../src/commands/amend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAc,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAE9D,SAAS,oBAAoB;IAC3B,OAAO,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AAC1E,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAW,EAAE,MAAc;IAOrD,iEAAiE;IACjE,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;IACpE,IAAI,KAAK,EAAE,CAAC;QACV,OAAO;YACL,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;YAChB,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG;YAC1B,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;YACf,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;SAClB,CAAC;IACJ,CAAC;IAED,yDAAyD;IACzD,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAC/D,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO;YACL,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;YACrB,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,GAAG;YACjC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC;YACtB,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;SACzB,CAAC;IACJ,CAAC;IAED,yCAAyC;IACzC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAC3C,CAAC;AAWD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,UAAwB,EAAE;IAC3D,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,oBAAoB,EAAE,CAAC;QAC3C,MAAM,MAAM,GAAG,kBAAkB,CAAC,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;QAEpE,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,cAAc,CAAC,IAAI,WAAW,IAAI,CAAC,CAAC;QAEzD,gFAAgF;QAChF,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC;QAC1H,IAAI,WAAoB,CAAC;QACzB,IAAI,YAAY,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAChC,WAAW,GAAG,YAAY,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,WAAW,GAAG,MAAM,OAAO,CAAC;gBAC1B,OAAO,EAAE,sBAAsB;gBAC/B,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;QACL,CAAC;QAED,IAAI,UAAU,GAAG,WAAW,CAAC;QAE7B,IAAI,WAAW,EAAE,CAAC;YAChB,+BAA+B;YAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,MAAM,MAAM,CAAC;gBACxC,OAAO,EAAE,qBAAqB;gBAC9B,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC3E,OAAO,EAAE,MAAM,CAAC,IAAI;aACrB,CAAC,CAAC;YAEH,gCAAgC;YAChC,IAAI,UAA8B,CAAC;YACnC,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAChC,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC;YAC7B,CAAC;iBAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpC,UAAU,GAAG,MAAM,MAAM,CAAC;oBACxB,OAAO,EAAE,MAAM,CAAC,KAAK;wBACnB,CAAC,CAAC,0BAA0B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI;wBAClD,CAAC,CAAC,gCAAgC;oBACpC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;wBACf,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CACnC,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,IAAI;4BACL,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;4BACpC,CAAC,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAC3D,CAAC;wBACF,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;4BACjB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACrB,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjE,CAAC;wBACJ,CAAC;wBACD,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;4BAC1B,KAAK,EAAE,CAAC,CAAC,KAAK;4BACd,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,WAAW,EAAE;yBACtC,CAAC,CAAC,CAAC;oBACN,CAAC;iBACF,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,UAAU,GAAG,MAAM,KAAK,CAAC;oBACvB,OAAO,EAAE,yBAAyB;oBAClC,OAAO,EAAE,MAAM,CAAC,KAAK;iBACtB,CAAC,CAAC;YACL,CAAC;YAED,kCAAkC;YAClC,IAAI,OAAe,CAAC;YACpB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,MAAM,KAAK,CAAC;oBACpB,OAAO,EAAE,uBAAuB;oBAChC,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,4BAA4B;iBACzE,CAAC,CAAC;YACL,CAAC;YAED,iDAAiD;YACjD,IAAI,UAAmB,CAAC;YACxB,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBACnC,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC;YAChC,CAAC;iBAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;gBACvB,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,UAAU,GAAG,MAAM,OAAO,CAAC;oBACzB,OAAO,EAAE,4BAA4B;oBACrC,OAAO,EAAE,MAAM,CAAC,QAAQ;iBACzB,CAAC,CAAC;YACL,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,WAAW,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,UAAU,IAAI,EAAE,CAAC;YAE/B,qBAAqB;YACrB,IAAI,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC;YACjC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YACxC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC5C,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YAChD,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YAC1C,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACrD,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACrC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAErC,UAAU,GAAG,MAAM,CAAC;QACtB,CAAC;QAED,sCAAsC;QACtC,MAAM,MAAM,GAAG,QAAQ,CAAC,+BAA+B,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACvF,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC,CAAC;YACvD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACtE,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACtD,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,SAAS,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAE/C,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC,CAAC;YAClD,OAAO;QACT,CAAC;QAED,0BAA0B;QAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YACjB,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC;gBAC9B,OAAO,EAAE,oBAAoB;gBAC7B,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;YAEH,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACxB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QAED,QAAQ,CAAC,yBAAyB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,EAAE;YAC9D,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAAe,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YAChD,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}
+{"version":3,"file":"amend.js","sourceRoot":"","sources":["../../src/commands/amend.ts"],"names":[],"mappings":"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"}

package/dist/commands/branch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../src/commands/branch.ts"],"names":[],"mappings":"AAOA,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3E,MAAM,CAaR;AAkBD,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAsB,aAAa,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwK9E"}
+{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../src/commands/branch.ts"],"names":[],"mappings":"AAQA,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3E,MAAM,CAaR;AAkBD,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAWD,wBAAsB,aAAa,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2S9E"}

package/dist/commands/branch.js

@@ -4,6 +4,7 @@ import { loadConfig } from "../config.js";
 import { bold, dim, green, cyan, gray } from "../colors.js";
 import { setTestPlan } from "../test-plan.js";
 import { createTicketProvider, inferBranchTypeFromLabels } from "../providers/tickets.js";
+import { selectWithBack, inputWithBack, BACK_VALUE } from "../prompts.js";
 export function formatBranchName(format, vars) {
     let result = format;
     result = result.replace("{type}", vars.type);
@@ -37,95 +38,173 @@ export async function branchCommand(options = {}) {
         const config = loadConfig();
         const branchFormat = config.branchFormat;
         const needsTicket = branchFormat.includes("{ticket}");
-        // Check if ticket provider is configured
         const ticketProvider = createTicketProvider(config.ticketProvider);
-        let ticket;
-        let selectedIssue;
-        let inferredType;
-        let suggestedDescription;
-        // Use ticket from flag if provided
+        // Initialize state
+        const state = {
+            ticket: options.ticket?.trim() || "",
+            type: options.type || "",
+            description: options.description || "",
+        };
+        // Determine starting step
+        let currentStep = "ticketMethod";
         if (options.ticket !== undefined) {
-            ticket = options.ticket.trim() || "UNTRACKED";
+            state.ticket = options.ticket.trim() || "UNTRACKED";
+            currentStep = "type";
         }
-        else if (ticketProvider && needsTicket) {
-            // If provider is configured and format needs ticket, offer issue picker
-            const ticketMethod = await select({
-                message: "How do you want to select the ticket?",
-                choices: [
-                    { value: "pick", name: "Pick from open issues (assigned to me)" },
-                    { value: "manual", name: "Enter manually" },
-                    { value: "skip", name: "Skip (UNTRACKED)" },
-                ],
-            });
-            if (ticketMethod === "pick") {
-                const issues = ticketProvider.listOpen({ assignee: "@me" });
-                if (issues.length === 0) {
-                    console.log(dim("No open issues assigned to you. Falling back to manual input."));
-                    ticket = await input({
-                        message: "Ticket number (leave blank for UNTRACKED):",
-                    });
-                    ticket = ticket.trim() || "UNTRACKED";
-                }
-                else {
-                    selectedIssue = await select({
-                        message: "Select an issue:",
-                        choices: issues.map(formatIssueChoice),
-                    });
-                    ticket = selectedIssue.id;
-                    inferredType = inferBranchTypeFromLabels(selectedIssue.labels);
-                    suggestedDescription = toKebabCase(selectedIssue.title);
-                    if (inferredType) {
-                        console.log(dim(`  Inferred type from labels: ${cyan(inferredType)}`));
-                    }
-                }
-            }
-            else if (ticketMethod === "manual") {
-                ticket = await input({
-                    message: "Ticket number (leave blank for UNTRACKED):",
-                });
-                ticket = ticket.trim() || "UNTRACKED";
+        else if (!ticketProvider || !needsTicket) {
+            if (needsTicket) {
+                currentStep = "ticketInput";
             }
             else {
-                ticket = "UNTRACKED";
+                currentStep = "type";
             }
         }
-        else if (needsTicket) {
-            // No provider, use manual input
-            ticket = await input({
-                message: "Ticket number (leave blank for UNTRACKED):",
-            });
-            ticket = ticket.trim() || "UNTRACKED";
-        }
-        // Get type from flag or prompt
-        let type;
         if (options.type) {
-            type = options.type;
+            state.type = options.type;
+            if (currentStep === "type")
+                currentStep = "description";
         }
-        else {
-            const typeChoices = config.branchTypes.map((t) => ({ value: t, name: t }));
-            const defaultType = inferredType && config.branchTypes.includes(inferredType) ? inferredType : undefined;
-            type = await select({
-                message: "Select branch type:",
-                choices: typeChoices,
-                default: defaultType,
-            });
-        }
-        // Get description from flag or prompt
-        let description;
         if (options.description) {
-            description = options.description;
+            state.description = options.description;
+        }
+        // Skip interactive flow if all options provided
+        if (options.ticket !== undefined && options.type && options.description) {
+            state.ticket = options.ticket.trim() || "UNTRACKED";
+            // Skip to branch creation
         }
         else {
-            description = await input({
-                message: "Short description:",
-                default: suggestedDescription,
-                validate: (val) => val.trim().length > 0 || "Description is required",
-            });
+            // Interactive step flow
+            while (currentStep !== undefined) {
+                switch (currentStep) {
+                    case "ticketMethod": {
+                        const result = await selectWithBack({
+                            message: "How do you want to select the ticket?",
+                            choices: [
+                                { value: "pick", name: "Pick from open issues (assigned to me)" },
+                                { value: "manual", name: "Enter manually" },
+                                { value: "skip", name: "Skip (UNTRACKED)" },
+                            ],
+                            showBack: false, // First step, no back
+                        });
+                        if (result === "pick") {
+                            currentStep = "ticketPick";
+                        }
+                        else if (result === "manual") {
+                            currentStep = "ticketInput";
+                        }
+                        else {
+                            state.ticket = "UNTRACKED";
+                            currentStep = "type";
+                        }
+                        break;
+                    }
+                    case "ticketInput": {
+                        const showBack = ticketProvider && needsTicket;
+                        const result = await inputWithBack({
+                            message: "Ticket number (leave blank for UNTRACKED):",
+                            default: state.ticket !== "UNTRACKED" ? state.ticket : undefined,
+                            showBack,
+                        });
+                        if (result === BACK_VALUE) {
+                            currentStep = "ticketMethod";
+                        }
+                        else {
+                            state.ticket = result.trim() || "UNTRACKED";
+                            currentStep = options.type ? "description" : "type";
+                        }
+                        break;
+                    }
+                    case "ticketPick": {
+                        if (!ticketProvider) {
+                            currentStep = "ticketInput";
+                            break;
+                        }
+                        const issues = ticketProvider.listOpen({ assignee: "@me" });
+                        if (issues.length === 0) {
+                            console.log(dim("No open issues assigned to you. Falling back to manual input."));
+                            currentStep = "ticketInput";
+                            break;
+                        }
+                        const result = await selectWithBack({
+                            message: "Select an issue:",
+                            choices: issues.map(formatIssueChoice),
+                            showBack: true,
+                        });
+                        if (result === BACK_VALUE) {
+                            currentStep = "ticketMethod";
+                        }
+                        else {
+                            state.selectedIssue = result;
+                            state.ticket = state.selectedIssue.id;
+                            state.inferredType = inferBranchTypeFromLabels(state.selectedIssue.labels);
+                            state.suggestedDescription = toKebabCase(state.selectedIssue.title);
+                            if (state.inferredType) {
+                                console.log(dim(`  Inferred type from labels: ${cyan(state.inferredType)}`));
+                            }
+                            currentStep = options.type ? "description" : "type";
+                        }
+                        break;
+                    }
+                    case "type": {
+                        if (options.type) {
+                            currentStep = "description";
+                            break;
+                        }
+                        const typeChoices = config.branchTypes.map((t) => ({ value: t, name: t }));
+                        const defaultType = state.inferredType && config.branchTypes.includes(state.inferredType)
+                            ? state.inferredType
+                            : state.type || undefined;
+                        // Determine if we can go back
+                        const canGoBack = needsTicket && !options.ticket;
+                        const result = await selectWithBack({
+                            message: "Select branch type:",
+                            choices: typeChoices,
+                            default: defaultType,
+                            showBack: canGoBack,
+                        });
+                        if (result === BACK_VALUE) {
+                            if (ticketProvider && needsTicket) {
+                                currentStep = state.selectedIssue ? "ticketPick" : "ticketMethod";
+                            }
+                            else if (needsTicket) {
+                                currentStep = "ticketInput";
+                            }
+                        }
+                        else {
+                            state.type = result;
+                            currentStep = "description";
+                        }
+                        break;
+                    }
+                    case "description": {
+                        if (options.description) {
+                            currentStep = undefined;
+                            break;
+                        }
+                        const result = await inputWithBack({
+                            message: "Short description:",
+                            default: state.suggestedDescription || state.description || undefined,
+                            validate: (val) => val.trim().length > 0 || "Description is required",
+                            showBack: true,
+                        });
+                        if (result === BACK_VALUE) {
+                            currentStep = options.type ? (needsTicket ? "ticketMethod" : "type") : "type";
+                        }
+                        else {
+                            state.description = result;
+                            currentStep = undefined;
+                        }
+                        break;
+                    }
+                    default:
+                        currentStep = undefined;
+                }
+            }
         }
-        const kebab = toKebabCase(description);
+        const kebab = toKebabCase(state.description);
         const branchName = formatBranchName(branchFormat, {
-            type,
-            ticket,
+            type: state.type,
+            ticket: state.ticket,
             description: kebab,
         });
         console.log(`\n${dim("───")} ${bold("Branch Preview")} ${dim("───")}`);
@@ -137,17 +216,59 @@ export async function branchCommand(options = {}) {
         }
         // Confirm (skip if --yes)
         if (!options.yes) {
-            const confirmed = await confirm({
+            const confirmResult = await selectWithBack({
                 message: "Create this branch?",
-                default: true,
+                choices: [
+                    { value: "yes", name: "Yes, create branch" },
+                    { value: "no", name: "No, abort" },
+                ],
+                default: "yes",
+                showBack: true,
+            });
+            if (confirmResult === BACK_VALUE) {
+                // Restart the flow
+                return branchCommand(options);
+            }
+            if (confirmResult !== "yes") {
+                console.log("Aborted.");
+                process.exit(0);
+            }
+        }
+        // Check if branch already exists
+        let branchExists = false;
+        try {
+            execSync(`git rev-parse --verify ${branchName}`, { stdio: "pipe" });
+            branchExists = true;
+        }
+        catch {
+            branchExists = false;
+        }
+        if (branchExists) {
+            const action = await select({
+                message: `Branch "${branchName}" already exists. What do you want to do?`,
+                choices: [
+                    { value: "checkout", name: "Checkout the existing branch" },
+                    { value: "new", name: "Create with a different name" },
+                    { value: "abort", name: "Abort" },
+                ],
             });
-            if (!confirmed) {
+            if (action === "checkout") {
+                execSync(`git checkout ${branchName}`, { stdio: "inherit" });
+                console.log(green(`✓ Checked out existing branch: ${branchName}`));
+            }
+            else if (action === "new") {
+                console.log("Aborted. Please run devflow branch again with a different description.");
+                process.exit(0);
+            }
+            else {
                 console.log("Aborted.");
                 process.exit(0);
             }
         }
-        execSync(`git checkout -b ${branchName}`, { stdio: "inherit" });
-        console.log(green(`✓ Branch created: ${branchName}`));
+        else {
+            execSync(`git checkout -b ${branchName}`, { stdio: "inherit" });
+            console.log(green(`✓ Branch created: ${branchName}`));
+        }
         // Handle test plan from flag or prompt
         if (options.testPlan) {
             const steps = options.testPlan.split("|").map((s) => s.trim()).filter(Boolean);