git-release-manager 0.0.14 → 0.6.0

package/dist/commands/track/command.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createTrackCommand = createTrackCommand;
+const commander_1 = require("commander");
+const TrackController_1 = require("../../modules/track/TrackController");
+const configManager_1 = require("../../config/configManager");
+/**
+ * `track` — the version lines a project keeps alive at once.
+ *
+ * TWO VERBS, AND NEITHER OF THEM WRITES. `list` answers which tracks are alive
+ * and `next` answers what one would cut; opening a branch and cutting a tag are
+ * separate acts and are not folded in here, because a read that can also write
+ * is a read nobody can run without deciding first whether they meant to.
+ *
+ * `next` PRINTS THE VERSION ALONE on stdout, like `flow next`, so a caller can
+ * substitute it into a tag name. Everything else it knows — the branch, what the
+ * track carries today — goes to stderr, where a human reads it and a pipeline
+ * does not.
+ *
+ * ── THE GLOBAL FLAGS ARE READ WITH optsWithGlobals() ──
+ *
+ * `--config` and `--environment` are declared on the PROGRAM, and commander does
+ * not put a parent's options into a subcommand's `options` object.
+ *
+ * ⚠️ AN EARLIER VERSION OF THIS NOTE CLAIMED EVERY OTHER SUBCOMMAND IS BROKEN
+ * BY THAT, AND IT WAS WRONG. They build their options as
+ * `{ ...program.opts(), ...commandOptions }`, and `program.opts()` carries the
+ * globals — measured by passing a config with a different `tag.prefix`, which no
+ * other cause can produce: `grm --config alt.json flow next prod` answers with
+ * alt's prefix. The claim came from a probe that changed `phase.bump` instead,
+ * where a second explanation existed (the derived bump overwrites the declared
+ * one on a repository with a real commit range) and I took the first.
+ *
+ * `optsWithGlobals()` is still what this command uses: it says what it needs
+ * directly instead of reconstructing it from two objects, and it does not
+ * silently pick up whatever else `program.opts()` happens to hold.
+ */
+function createTrackCommand(program) {
+    const track = program
+        .command('track')
+        .alias('t')
+        .description('The version tracks alive at once: 1.1.x maintained while development runs on 1.2.x');
+    track
+        .command('list')
+        .alias('l')
+        .description('Every live instance of every declared track, with what it carries and what it would cut')
+        .action(async (options, command) => {
+        const globals = command.optsWithGlobals();
+        const config = await (0, configManager_1.readConfig)(globals === null || globals === void 0 ? void 0 : globals.config, globals === null || globals === void 0 ? void 0 : globals.environment);
+        const controller = new TrackController_1.TrackController(config);
+        const declared = Object.keys(controller.declared());
+        if (!declared.length) {
+            // NOT AN ERROR. A project with one line has nothing to declare —
+            // the release line IS the track. Saying so beats an empty table,
+            // which reads as "your tracks have vanished".
+            console.error('No tracks are declared. A project with a single version line does not need them: ' +
+                'the release line is that track. Declare `tracks` when a customer stays on a version ' +
+                'development has moved past.');
+            return;
+        }
+        const rows = await controller.instances();
+        if (!rows.length) {
+            console.error(`Declared: ${declared.join(', ')} — and no branch matches any of them yet.`);
+            return;
+        }
+        const w = (s, n) => s.padEnd(n);
+        console.log(`${w('TRACK', 14)}${w('BRANCH', 22)}${w('CARRIES', 14)}NEXT`);
+        for (const r of rows) {
+            console.log(`${w(r.track, 14)}${w(r.branch, 22)}${w(r.carries || '—', 14)}${r.next}`);
+        }
+    });
+    track
+        .command('next')
+        .alias('n')
+        .description('The version this track would cut next (the version alone on stdout)')
+        .addArgument(new commander_1.Argument('<track>', 'A declared track, e.g. maintenance'))
+        .addArgument(new commander_1.Argument('[series]', 'The version series for a patterned track, e.g. 1.1'))
+        .action(async (name, series, options, command) => {
+        const globals = command.optsWithGlobals();
+        const config = await (0, configManager_1.readConfig)(globals === null || globals === void 0 ? void 0 : globals.config, globals === null || globals === void 0 ? void 0 : globals.environment);
+        const controller = new TrackController_1.TrackController(config);
+        try {
+            const answer = await controller.next(name, series);
+            console.error(`track ${name} · branch ${answer.branch} · carries ${answer.carries || 'nothing yet'}`);
+            console.log(answer.next);
+        }
+        catch (error) {
+            console.error(`error: ${error.message}`);
+            process.exit(1);
+        }
+    });
+    track
+        .command('forward')
+        .alias('f')
+        .description('Carry a fix from one track up through the tracks above it, ending at the integration line')
+        .addArgument(new commander_1.Argument('<series>', 'The series the fix was written on, e.g. 1.1'))
+        .addOption(new commander_1.Option('--yes', 'Perform the merges. Without it this PLANS and writes nothing'))
+        .addOption(new commander_1.Option('--merge <strategy>', 'no-ff (default) or ff').choices(['no-ff', 'ff']))
+        .action(async (series, options, command) => {
+        const globals = command.optsWithGlobals();
+        const config = await (0, configManager_1.readConfig)(globals === null || globals === void 0 ? void 0 : globals.config, globals === null || globals === void 0 ? void 0 : globals.environment);
+        const controller = new TrackController_1.TrackController(config);
+        try {
+            const result = await controller.forwardPort(series, {
+                yes: Boolean(options === null || options === void 0 ? void 0 : options.yes),
+                merge: options === null || options === void 0 ? void 0 : options.merge,
+            });
+            if (!(options === null || options === void 0 ? void 0 : options.yes)) {
+                console.error(`PLAN — nothing was merged. Execute it with --yes.`);
+                console.log([result.from, ...result.chain].join(' → '));
+                return;
+            }
+            for (const target of result.chain) {
+                if (result.stoppedAt === target)
+                    break;
+                const head = result.merged[target];
+                console.error(head ? `  ✓ ${target}  ${head.slice(0, 12)}` : `  · ${target}  already had it`);
+            }
+            if (result.stoppedAt) {
+                // NAMED, because the whole value of a cascade over a fan-out
+                // is knowing which link did not hold. "The forward-port
+                // failed" leaves the operator to find out which tracks moved.
+                console.error(`  ✗ ${result.stoppedAt}  ${result.error}`);
+                console.error(`\nstopped at ${result.stoppedAt}. The tracks before it DID move; ` +
+                    `resolve there and run the same command again — it resumes from what is already merged.`);
+                process.exit(1);
+            }
+            console.error(`\ncarried ${series} through ${result.chain.length} branch(es)`);
+        }
+        catch (error) {
+            console.error(`error: ${error.message}`);
+            process.exit(1);
+        }
+    });
+}
+//# sourceMappingURL=command.js.map

package/dist/commands/track/command.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/commands/track/command.ts"],"names":[],"mappings":";;AAmCA,gDAqGC;AAxID,yCAAqD;AACrD,yEAAqE;AACrE,8DAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,SAAgB,kBAAkB,CAAC,OAAgB;IAC/C,MAAM,KAAK,GAAG,OAAO;SAChB,OAAO,CAAC,OAAO,CAAC;SAChB,KAAK,CAAC,GAAG,CAAC;SACV,WAAW,CAAC,oFAAoF,CAAC,CAAA;IAEtG,KAAK;SACA,OAAO,CAAC,MAAM,CAAC;SACf,KAAK,CAAC,GAAG,CAAC;SACV,WAAW,CAAC,yFAAyF,CAAC;SACtG,MAAM,CAAC,KAAK,EAAE,OAAY,EAAE,OAAgB,EAAE,EAAE;QAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,EAAS,CAAA;QAChD,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAU,EAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAC,CAAA;QACtE,MAAM,UAAU,GAAG,IAAI,iCAAe,CAAC,MAAM,CAAC,CAAA;QAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;QACnD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACnB,iEAAiE;YACjE,iEAAiE;YACjE,8CAA8C;YAC9C,OAAO,CAAC,KAAK,CACT,mFAAmF;gBACnF,sFAAsF;gBACtF,6BAA6B,CAChC,CAAA;YACD,OAAM;QACV,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,SAAS,EAAE,CAAA;QACzC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,aAAa,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAA;YAC1F,OAAM;QACV,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAC/C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,MAAM,CAAC,CAAA;QACzE,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;QACzF,CAAC;IACL,CAAC,CAAC,CAAA;IAEN,KAAK;SACA,OAAO,CAAC,MAAM,CAAC;SACf,KAAK,CAAC,GAAG,CAAC;SACV,WAAW,CAAC,qEAAqE,CAAC;SAClF,WAAW,CAAC,IAAI,oBAAQ,CAAC,SAAS,EAAE,oCAAoC,CAAC,CAAC;SAC1E,WAAW,CAAC,IAAI,oBAAQ,CAAC,UAAU,EAAE,oDAAoD,CAAC,CAAC;SAC3F,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,MAA0B,EAAE,OAAY,EAAE,OAAgB,EAAE,EAAE;QACvF,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,EAAS,CAAA;QAChD,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAU,EAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAC,CAAA;QACtE,MAAM,UAAU,GAAG,IAAI,iCAAe,CAAC,MAAM,CAAC,CAAA;QAC9C,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YAClD,OAAO,CAAC,KAAK,CAAC,SAAS,IAAI,aAAa,MAAM,CAAC,MAAM,cAAc,MAAM,CAAC,OAAO,IAAI,aAAa,EAAE,CAAC,CAAA;YACrG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC5B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,UAAW,KAAe,CAAC,OAAO,EAAE,CAAC,CAAA;YACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;IACL,CAAC,CAAC,CAAA;IAEN,KAAK;SACA,OAAO,CAAC,SAAS,CAAC;SAClB,KAAK,CAAC,GAAG,CAAC;SACV,WAAW,CAAC,2FAA2F,CAAC;SACxG,WAAW,CAAC,IAAI,oBAAQ,CAAC,UAAU,EAAE,6CAA6C,CAAC,CAAC;SACpF,SAAS,CAAC,IAAI,kBAAM,CAAC,OAAO,EAAE,8DAA8D,CAAC,CAAC;SAC9F,SAAS,CAAC,IAAI,kBAAM,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;SAC7F,MAAM,CAAC,KAAK,EAAE,MAAc,EAAE,OAAY,EAAE,OAAgB,EAAE,EAAE;QAC7D,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,EAAS,CAAA;QAChD,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAU,EAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAC,CAAA;QACtE,MAAM,UAAU,GAAG,IAAI,iCAAe,CAAC,MAAM,CAAC,CAAA;QAC9C,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE;gBAChD,GAAG,EAAE,OAAO,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC;gBAC1B,KAAK,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK;aACxB,CAAC,CAAA;YACF,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAA,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAA;gBAClE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;gBACvD,OAAM;YACV,CAAC;YACD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBAChC,IAAI,MAAM,CAAC,SAAS,KAAK,MAAM;oBAAE,MAAK;gBACtC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;gBAClC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,MAAM,kBAAkB,CAAC,CAAA;YACjG,CAAC;YACD,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;gBACnB,6DAA6D;gBAC7D,wDAAwD;gBACxD,8DAA8D;gBAC9D,OAAO,CAAC,KAAK,CAAC,OAAO,MAAM,CAAC,SAAS,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;gBACzD,OAAO,CAAC,KAAK,CACT,gBAAgB,MAAM,CAAC,SAAS,mCAAmC;oBACnE,wFAAwF,CAC3F,CAAA;gBACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACnB,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,aAAa,MAAM,YAAY,MAAM,CAAC,KAAK,CAAC,MAAM,aAAa,CAAC,CAAA;QAClF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,UAAW,KAAe,CAAC,OAAO,EAAE,CAAC,CAAA;YACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;IACL,CAAC,CAAC,CAAA;AACV,CAAC"}

package/dist/commands/version/command.js

@@ -4,19 +4,91 @@ exports.createVersionCommand = createVersionCommand;
 const commander_1 = require("commander");
 const VersionController_1 = require("../../modules/version/VersionController");
 function createVersionCommand(program) {
+    // ── The FLAG surface, restored on the parent command ──────────────────
+    //
+    // The controller (VersionController.handleVersionCommand) is a FLAT flag
+    // dispatcher and always has been: it branches on options.init, .major,
+    // .minor, .patch, .channel, .detect, .update, .list, .compare, .revert,
+    // .validate, .sync. The subcommands added later are a translation veneer
+    // over exactly that contract.
+    //
+    // The parent `version` command carried NO options, so every one of those
+    // spellings answered "unknown option" — which is why 92 of the e2e suite's
+    // invocations failed against an engine that was perfectly capable of serving
+    // them, and why notes/genel.md documents a CLI that could not be run.
+    //
+    // Both spellings now reach the same controller with the same option shape.
+    // `version --patch` and `version increment --patch` are one code path, not
+    // two implementations that can drift.
     const versionProgram = program
         .command("version")
         .alias('v')
-        .description("Comprehensive version and release management operations");
+        .description("Comprehensive version and release management operations")
+        .option("--init [version]", "Initialize the version line (bare = 0.0.0)")
+        .option("-m, --major", "Increment the major version number")
+        .option("-i, --minor", "Increment the minor version number")
+        .option("-p, --patch", "Increment the patch version number")
+        .option("-c, --channel <channel>", "Prerelease channel (e.g. alpha, beta)")
+        .option("--prefix <prefix>", "Prefix for this version line (e.g. v, gear-v)")
+        .option("--prerelease <identifier>", "Add a prerelease identifier")
+        .option("--build <identifier>", "Add build metadata")
+        .option("--no-channel-number", "Exclude the channel number")
+        .option("--reset", "Delete every local tag for this line")
+        .option("--list [count]", "List recent versions")
+        .option("--latest", "Show the latest version")
+        .option("--compare <version>", "Compare a version against the latest")
+        .option("--revert <version>", "Revert to a specific version")
+        .option("--validate <version>", "Check whether a version string is valid")
+        .option("--detect", "Detect the current version from the project file")
+        .option("--update [version]", "Update the version in the project file")
+        // Both spellings: the e2e suite and the notes use --project-path, the
+        // `version project` subcommand uses --path. They are one value.
+        .option("--path <path>", "Project file or folder path")
+        .option("--project-path <path>", "Project file or folder path (alias of --path)")
+        .option("--sync", "Sync versions with the remote")
+        .option("--push", "Push commits and tags to the remote")
+        .option("--note <message>", "Add a release note")
+        .option("--note-file <path>", "Load release notes from a file")
+        .option("-n, --dry-run", "Print the version that WOULD be cut; write nothing")
+        .option("--from <version>", "Compute from THIS baseline instead of discovering the latest tag")
+        .option("--derive", "Derive the bump from the commits in the range, via commitTypes/noteTypes `bump`")
+        .option("--explain-bump", "Print the derivation`s reasoning on STDERR (stdout stays the version)")
+        .option("--to <ref>", "End of the derivation range (default: HEAD)")
+        .option("--paths <paths>", "Space-separated pathspecs; the derivation sees only commits touching them")
+        .option("--since <ref>", "Start the derivation range at THIS ref (default: the --from baseline resolved as a ref)")
+        // Two flags rather than one `--no-stamp`: the config can turn stamping on
+        // by default (versioning.stamp.onBump), so BOTH directions need an override
+        // — force it for a project that has not opted in, and skip it once for a
+        // project that has. A single negatable flag can only express one of them.
+        .option("--stamp", "Write the version into the files declared in versioning.stamp, even if onBump is off")
+        .option("--skip-stamp", "Do not stamp, even if versioning.stamp.onBump is on")
+        .action(async (commandOptions) => {
+        var _a;
+        // --path is the CLI spelling of the controller's projectPath, the same
+        // translation `version project` performs.
+        const options = { ...program.opts(), ...commandOptions, projectPath: (_a = commandOptions.projectPath) !== null && _a !== void 0 ? _a : commandOptions.path };
+        const controller = new VersionController_1.VersionController();
+        await controller.handleVersionCommand(options);
+    });
     versionProgram.addCommand(new commander_1.Command()
         .command("init")
         .alias("vin")
         .description("Initialize the project version")
         .addArgument(new commander_1.Argument("<version>", "Version to initialize"))
+        // initVersion() already READS options.prefix to build the initial tag —
+        // the CLI simply never offered it, so `version init 1.0.0 --prefix v`
+        // died on "unknown option" for a value the engine was waiting for.
+        // Prefixes are how independent version LINES coexist in one repo
+        // (gear-v1.0.0 alongside plugin-v0.3.2), so init must accept one.
+        .option("--prefix <prefix>", "Prefix for this version line (e.g. v, gear-v)")
         .option("--note <message>", "Add a release note during initialization")
         .option("--note-file <path>", "Load release notes from a file for initialization")
-        .action(async (args, commandOptions) => {
-        const options = { ...program.opts(), ...commandOptions };
+        .action(async (args, commandOptions, command) => {
+        // The positional is the version being initialised. The controller is a
+        // FLAT flag dispatcher (options.init), so the subcommand layer has to
+        // translate — parsing it and not forwarding it is why `version init
+        // 1.0.0` silently produced 0.0.0.
+        const options = { ...program.opts(), ...command.optsWithGlobals(), init: args };
         const controller = new VersionController_1.VersionController();
         await controller.handleVersionCommand(options);
     }));
@@ -34,8 +106,15 @@ function createVersionCommand(program) {
         .option("--no-channel-number", "Exclude channel number")
         .option("--note <message>", "Add a release note")
         .option("--note-file <path>", "Load release notes from a file")
-        .action(async (args, commandOptions) => {
-        const options = { ...program.opts(), ...commandOptions };
+        .option("-n, --dry-run", "Print the version that WOULD be cut; write nothing")
+        .option("--from <version>", "Compute from THIS baseline instead of discovering the latest tag")
+        // NO positional argument is declared, so commander invokes the action as
+        // (options, command). The old signature named the FIRST parameter `args`
+        // and read the SECOND as the options — which handed it a Command
+        // instance, so every flag on this subcommand was silently discarded.
+        // Measured: `increment --major --prefix v` produced 0.0.0, unprefixed.
+        .action(async (commandOptions, command) => {
+        const options = { ...program.opts(), ...command.optsWithGlobals() };
         const controller = new VersionController_1.VersionController();
         await controller.handleVersionCommand(options);
     }));
@@ -46,8 +125,8 @@ function createVersionCommand(program) {
         .addArgument(new commander_1.Argument("<version>", "Version to set"))
         .option("--note <message>", "Add a release note while setting the version")
         .option("--note-file <path>", "Load release notes from a file for setting the version")
-        .action(async (args, commandOptions) => {
-        const options = { ...program.opts(), ...commandOptions };
+        .action(async (args, commandOptions, command) => {
+        const options = { ...program.opts(), ...command.optsWithGlobals() };
         options.version = args;
         const controller = new VersionController_1.VersionController();
         await controller.handleVersionCommand(options);
@@ -56,24 +135,32 @@ function createVersionCommand(program) {
         .command("reset")
         .alias("vr")
         .description("Reset the project version to initial state")
-        .action(async (args, commandOptions) => {
-        const options = { ...program.opts(), ...commandOptions };
+        .action(async (commandOptions, command) => {
+        // `reset` declares no options at all, so even with the signature fixed
+        // nothing would set the flag the controller dispatches on — the command
+        // would fall through to generateNewVersion and cut a version instead of
+        // resetting. The subcommand states its own intent.
+        const options = { ...program.opts(), ...command.optsWithGlobals(), reset: true };
         const controller = new VersionController_1.VersionController();
         await controller.handleVersionCommand(options);
     }));
     versionProgram.addCommand(new commander_1.Command()
         .command("list")
         .alias("vl")
-        .description("Check if a version string is valid")
-        .addArgument(new commander_1.Argument("<version>", "Version string to validate"))
+        // The description and the argument were copy-pasted from `validate`:
+        // this command lists versions, and the controller reads options.list as
+        // a COUNT (`list === true ? 10 : parseInt(list)`). Left as-is it asked
+        // for a version string and then parsed it as a number.
+        .description("List recent versions (most recent first)")
+        .addArgument(new commander_1.Argument("[count]", "How many versions to list (default 10)"))
         // .option('-r, --reverse', 'List versions in reverse order')
         // .option('-t, --tag', 'List versions with tags')
         // .option('-d, --date', 'List versions with dates')
         // .option('-s, --sort', 'Sort versions')
         // .option('-v, --verbose', 'Show detailed version information')
         // .option('-a, --all', 'Show all versions')
-        .action(async (args, commandOptions) => {
-        const options = { ...program.opts(), ...commandOptions };
+        .action(async (args, commandOptions, command) => {
+        const options = { ...program.opts(), ...command.optsWithGlobals(), list: args !== null && args !== void 0 ? args : true };
         const controller = new VersionController_1.VersionController();
         await controller.handleVersionCommand(options);
     }));
@@ -82,8 +169,12 @@ function createVersionCommand(program) {
         .alias("vc")
         .description("Compare a specific version with the current/latest one")
         .option("--version <version>", "Version to compare against the latest")
-        .action(async (args, commandOptions) => {
-        const options = { ...program.opts(), ...commandOptions };
+        .action(async (commandOptions, command) => {
+        // The subcommand spells it --version; the controller dispatches on
+        // options.compare. Without the translation the flag landed in
+        // options.version, which the controller reads as "use this literal
+        // version" — so `compare` would have CUT a tag instead of comparing.
+        const options = { ...program.opts(), ...command.optsWithGlobals(), compare: commandOptions.version };
         const controller = new VersionController_1.VersionController();
         await controller.handleVersionCommand(options);
     }));
@@ -94,8 +185,9 @@ function createVersionCommand(program) {
         .option("--path <path>", "Specify the project file or folder path")
         .option("-d, --detect", "Detect the current version from the project")
         .option("-u, --update [version]", "Update version in project to specified value")
-        .action(async (args, commandOptions) => {
-        const options = { ...program.opts(), ...commandOptions };
+        .action(async (commandOptions, command) => {
+        // --path is the subcommand's spelling of the controller's projectPath.
+        const options = { ...program.opts(), ...command.optsWithGlobals(), projectPath: commandOptions.path };
         const controller = new VersionController_1.VersionController();
         await controller.handleVersionCommand(options);
     }));
@@ -104,8 +196,8 @@ function createVersionCommand(program) {
         .alias("vv")
         .description("Check if a version string is valid")
         .addArgument(new commander_1.Argument("<version>", "Version string to validate"))
-        .action(async (args, commandOptions) => {
-        const options = { ...program.opts(), ...commandOptions };
+        .action(async (args, commandOptions, command) => {
+        const options = { ...program.opts(), ...command.optsWithGlobals(), validate: args };
         const controller = new VersionController_1.VersionController();
         await controller.handleVersionCommand(options);
     }));
@@ -114,8 +206,8 @@ function createVersionCommand(program) {
         .alias("vrev")
         .description("Revert the project to a specific version")
         .addArgument(new commander_1.Argument("<version>", "Version to revert to"))
-        .action(async (args, commandOptions) => {
-        const options = { ...program.opts(), ...commandOptions };
+        .action(async (args, commandOptions, command) => {
+        const options = { ...program.opts(), ...command.optsWithGlobals(), revert: args };
         const controller = new VersionController_1.VersionController();
         await controller.handleVersionCommand(options);
     }));
@@ -125,8 +217,8 @@ function createVersionCommand(program) {
         .option("--sync", "Sync versions with remote repository")
         .option("--push", "Push local changes and tags to remote")
         .option("--draft", "Create a draft release")
-        .action(async (args, commandOptions) => {
-        const options = { ...program.opts(), ...commandOptions };
+        .action(async (commandOptions, command) => {
+        const options = { ...program.opts(), ...command.optsWithGlobals() };
         const controller = new VersionController_1.VersionController();
         await controller.handleVersionCommand(options);
     }));

package/dist/commands/version/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/commands/version/command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/commands/version/command.ts"],"names":[],"mappings":"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"}