@mercury-fw/cli 0.59.0 → 0.59.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @mercury-fw/cli
 
+## 0.59.1
+
+### Patch Changes
+
+- 44f2540: Inside an app, `mfw --version` and `mfw --help` (and a bare `mfw`) come from the app's own CLI too when the global one is another version, like every app command: before, they stayed the global one's, so `mfw --version` there showed the global version and a mismatch with the app's went unnoticed. The line saying it hands over names both versions (`mfw 0.53.2: running the app's 0.58.0`). `create` and `upgrade` stay the global CLI's. It's the global `mfw` that hands over, so this takes effect once it's updated: `mfw upgrade`.
+  - @mercury-fw/core@0.59.1
+  - @mercury-fw/utils@0.59.1
+
 ## 0.59.0
 
 ### Patch Changes

package/README.md

@@ -36,7 +36,7 @@ bun add -g @mercury-fw/cli
 mfw create my-agent
 ```
 
-`mfw upgrade` keeps it current. Every app also lists `@mercury-fw/cli` among its devDependencies, at the framework's version, and inside an app the global `mfw` hands its commands over to that one when the two differ (it says so in one line; `mfw --version` and `mfw --help` stay the global one's), so an app's commands always match the framework it runs, whatever version is installed globally. An app not installed yet (no `bun install`) runs on the global one.
+`mfw upgrade` keeps it current. Every app also lists `@mercury-fw/cli` among its devDependencies, at the framework's version, and inside an app the global `mfw` hands its commands over to that one when the two differ, `mfw --version` and `mfw --help` included, so an app's commands always match the framework it runs, whatever version is installed globally. It says so in one line naming both versions (`mfw 0.53.2: running the app's 0.58.0`), so `mfw --version` inside an app tells you when the global one is behind and `mfw upgrade` is due. An app not installed yet (no `bun install`) runs on the global one.
 
 Without a global install: `bun create mercury-agent my-agent` creates an app, and `bunx mfw <command>` runs the app's own CLI from inside it.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercury-fw/cli",
-  "version": "0.59.0",
+  "version": "0.59.1",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -41,8 +41,8 @@
   "comment:shape": "The Mercury CLI (`mfw`). `mfw create <dir>` writes a new Mercury app from the template. The framework packages move in lockstep with it, so a new app gets them at the CLI's own version; plugins and channels at the registry's latest. The plugin and channel packages are devDependencies only for the catalog test. `main(argv)` is exported for create-mercury-agent.",
   "dependencies": {
     "@clack/prompts": "^1.8.1",
-    "@mercury-fw/core": "0.59.0",
-    "@mercury-fw/utils": "0.59.0",
+    "@mercury-fw/core": "0.59.1",
+    "@mercury-fw/utils": "0.59.1",
     "commander": "^15.0.0"
   },
   "devDependencies": {
@@ -51,7 +51,7 @@
     "@mercury-fw/channel-google-chat": "0.11.0",
     "@mercury-fw/channel-http": "0.13.0",
     "@mercury-fw/directory-static": "0.1.1",
-    "@mercury-fw/formatter": "0.59.0",
+    "@mercury-fw/formatter": "0.59.1",
     "@mercury-fw/plugin-atlassian-admin": "0.5.0",
     "@mercury-fw/plugin-bitbucket": "0.6.0",
     "@mercury-fw/plugin-jira": "0.8.0",

package/src/main.ts

@@ -208,12 +208,14 @@ const OWN_COMMANDS = new Set(["create", "upgrade"]);
 /** Inside an app whose own CLI (its devDependency) is installed at another
  * version than this one, as a global `mfw` can be, runs `argv` through that
  * CLI and returns its exit code: the app's commands then always match the
- * framework the app runs. `undefined` means run here: not an app command, not
- * inside an app, the app not installed yet, the same version, or already
- * handed over (`MFW_DEFERRED`). */
+ * framework the app runs. `--version` and `--help` (and a bare `mfw`) go over
+ * too, so inside an app they describe the app's CLI, and the line saying it
+ * hands over shows both versions. `undefined` means run here: one of this
+ * CLI's own commands (`create`, `upgrade`), not inside an app, the app not
+ * installed yet, the same version, or already handed over (`MFW_DEFERRED`). */
 async function handOverToAppCli(argv: string[], cwd: string, relaunch: Relaunch): Promise<number | undefined> {
   const command = argv[0];
-  if (command === undefined || command.startsWith("-") || OWN_COMMANDS.has(command)) return undefined;
+  if (command !== undefined && OWN_COMMANDS.has(command)) return undefined;
   if (process.env.MFW_DEFERRED) return undefined;
   let app: App;
   try {