@flowscripter/dynamic-cli-framework 8.0.1 → 9.0.1

package/dist/src/service/upgrade/DefaultUpgradeService.d.ts

@@ -50,7 +50,7 @@ export default class DefaultUpgradeService implements UpgradeService {
     detectOs(): SupportedOs | undefined;
     detectArch(): SupportedArch | undefined;
     detectInstallMethod(os: SupportedOs): Promise<InstallMethod | undefined>;
-    checkForUpgrade(osOverride?: SupportedOs, archOverride?: SupportedArch, installMethodOverride?: InstallMethod): Promise<UpgradeCheckResult>;
-    upgrade(osOverride?: SupportedOs, archOverride?: SupportedArch, installMethodOverride?: InstallMethod): Promise<UpgradeResult>;
+    checkForUpgrade(installMethodOverride?: InstallMethod): Promise<UpgradeCheckResult>;
+    upgrade(installMethodOverride?: InstallMethod): Promise<UpgradeResult>;
 }
 //# sourceMappingURL=DefaultUpgradeService.d.ts.map

package/dist/src/service/upgrade/DefaultUpgradeService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultUpgradeService.d.ts","sourceRoot":"","sources":["../../../../src/service/upgrade/DefaultUpgradeService.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,SAAS,EACT,OAAO,EAKP,WAAW,EAEX,kBAAkB,EAClB,aAAa,EAEd,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAEL,aAAa,EAGb,QAAQ,EAER,aAAa,EACb,WAAW,EACX,KAAK,cAAc,EACpB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAwC1E,eAAO,MAAM,uBAAuB,yBAAyB,CAAC;AAY9D,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAI7E;AAaD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAiBpE;AAQD,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;IAKlE,SAAgB,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IAEzD,YAAmB,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS,EAItE;IAEM,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAExC;IA4DM,qBAAqB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAe1D;IAED;;;;OAIG;IACU,wBAAwB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CASnE;IAED;;;OAGG;IACU,2BAA2B,IAAI,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAWlF;IAED;;;;;OAKG;IACI,yBAAyB,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS,CAUjF;IAoBD;;;;;;;OAOG;IACU,OAAO,CAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAY/B;IAEM,QAAQ,IAAI,WAAW,GAAG,SAAS,CAWzC;IAEM,UAAU,IAAI,aAAa,GAAG,SAAS,CAQ7C;IAEY,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAoDpF;IA2CY,eAAe,CAC1B,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,kBAAkB,CAAC,CAsC7B;IAEY,OAAO,CAClB,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,aAAa,CAAC,CAkDxB;CA2TF"}
+{"version":3,"file":"DefaultUpgradeService.d.ts","sourceRoot":"","sources":["../../../../src/service/upgrade/DefaultUpgradeService.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,SAAS,EACT,OAAO,EAKP,WAAW,EAEX,kBAAkB,EAClB,aAAa,EAEd,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAEL,aAAa,EAGb,QAAQ,EAER,aAAa,EACb,WAAW,EACX,KAAK,cAAc,EACpB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAwC1E,eAAO,MAAM,uBAAuB,yBAAyB,CAAC;AAY9D,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAI7E;AAaD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAiBpE;AAQD,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;IAKlE,SAAgB,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IAEzD,YAAmB,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS,EAItE;IAEM,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAExC;IA4DM,qBAAqB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAe1D;IAED;;;;OAIG;IACU,wBAAwB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CASnE;IAED;;;OAGG;IACU,2BAA2B,IAAI,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAWlF;IAED;;;;;OAKG;IACI,yBAAyB,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS,CAUjF;IAoBD;;;;;;;OAOG;IACU,OAAO,CAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAY/B;IAEM,QAAQ,IAAI,WAAW,GAAG,SAAS,CAWzC;IAEM,UAAU,IAAI,aAAa,GAAG,SAAS,CAQ7C;IAEY,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAoDpF;IA2CY,eAAe,CAAC,qBAAqB,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsC/F;IAEY,OAAO,CAAC,qBAAqB,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAiDlF;CAgVF"}

package/dist/src/service/upgrade/DefaultUpgradeService.js

@@ -341,9 +341,9 @@ export default class DefaultUpgradeService {
             await this.#safeKeyValueCall(() => keyValueService.set(INSTALL_METHOD_CACHE_KEY, { method, checkedAt: Date.now() }));
         }
     }
-    async checkForUpgrade(osOverride, archOverride, installMethodOverride) {
-        const os = osOverride ?? this.detectOs();
-        const arch = archOverride ?? this.detectArch();
+    async checkForUpgrade(installMethodOverride) {
+        const os = this.detectOs();
+        const arch = this.detectArch();
         if (!os || !arch || !this.#isPlatformSupported(os, arch)) {
             return { status: "unsupported" };
         }
@@ -374,17 +374,16 @@ export default class DefaultUpgradeService {
             installMethod,
         };
     }
-    async upgrade(osOverride, archOverride, installMethodOverride) {
+    async upgrade(installMethodOverride) {
         const oldVersion = this.#cliConfig.version;
-        const hasOverride = osOverride !== undefined || archOverride !== undefined || installMethodOverride !== undefined;
-        const checkResult = hasOverride
-            ? await this.checkForUpgrade(osOverride, archOverride, installMethodOverride)
+        const checkResult = installMethodOverride !== undefined
+            ? await this.checkForUpgrade(installMethodOverride)
             : await this.getUpgradeCheckResult();
         if (checkResult.status === "unsupported") {
             return {
                 ok: false,
                 oldVersion,
-                error: new Error("No upgrade location configured for the detected or requested platform"),
+                error: new Error("No upgrade location configured for the detected platform"),
             };
         }
         if (checkResult.status === "failed") {
@@ -408,7 +407,7 @@ export default class DefaultUpgradeService {
                     await this.#upgradeViaLinuxScript();
                     break;
                 case InstallMethod.HOMEBREW:
-                    await this.#upgradeViaHomebrew();
+                    await this.#upgradeViaHomebrew(checkResult.latestVersion);
                     break;
                 case InstallMethod.WINGET:
                     await this.#upgradeViaWinget();
@@ -587,12 +586,30 @@ export default class DefaultUpgradeService {
             throw new Error(`Install script failed: ${describeSpawnFailure(result)}`);
         }
     }
-    async #upgradeViaHomebrew() {
+    // The latest version is read from the tap's formula on GitHub, but `brew upgrade` only sees the
+    // local tap clone, which is stale until `brew update` runs. A stale tap makes `brew upgrade`
+    // exit 0 with "already installed", so update first and then confirm the installed version.
+    async #upgradeViaHomebrew(expectedVersion) {
         const { tap, formula } = this.#config.homebrew;
+        const updateResult = await this.#spawnQuoted(["brew", "update"]);
+        if (!updateResult.ok) {
+            throw new Error(`brew update failed: ${describeSpawnFailure(updateResult)}`);
+        }
         const result = await this.#spawnQuoted(["brew", "upgrade", `${tap}/${formula}`]);
         if (!result.ok) {
             throw new Error(`brew upgrade failed: ${describeSpawnFailure(result)}`);
         }
+        const lines = [];
+        const listResult = await this.#spawnService.spawn(["brew", "list", "--versions", formula], {
+            mode: "wrapped",
+            longRunning: false,
+            onOutput: (line) => lines.push(line),
+        });
+        const installed = lines.join(" ").trim();
+        const installedVersions = installed.split(/\s+/).slice(1);
+        if (!listResult.ok || !installedVersions.includes(expectedVersion)) {
+            throw new Error(`brew upgrade completed but version ${expectedVersion} is not installed (installed: ${installed || "unknown"})`);
+        }
     }
     async #upgradeViaWinget() {
         const { packageId } = this.#config.winget;

package/dist/src/service/upgrade/command/UpgradeSubCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UpgradeSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/upgrade/command/UpgradeSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,yCAAyC,CAAC;AAYrF,qBAAa,iBAAkB,YAAW,UAAU;IAClD,QAAQ,CAAC,IAAI,aAAa;IAC1B,QAAQ,CAAC,WAAW,6CAA6C;IACjE,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,WAAW,UAAM;IAE1B,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAerC;IAEW,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E;CACF"}
+{"version":3,"file":"UpgradeSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/upgrade/command/UpgradeSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,yCAAyC,CAAC;AAUrF,qBAAa,iBAAkB,YAAW,UAAU;IAClD,QAAQ,CAAC,IAAI,aAAa;IAC1B,QAAQ,CAAC,WAAW,6CAA6C;IACjE,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,WAAW,UAAM;IAE1B,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAQrC;IAEW,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqD5E;CACF"}

package/dist/src/service/upgrade/command/UpgradeSubCommand.js

@@ -1,18 +1,11 @@
 import { ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
-import { Icon, InstallMethod, PRINTER_SERVICE_ID, SupportedArch, SupportedOs, UPGRADE_SERVICE_ID, } from "@flowscripter/dynamic-cli-framework-api";
+import { Icon, InstallMethod, PRINTER_SERVICE_ID, UPGRADE_SERVICE_ID, } from "@flowscripter/dynamic-cli-framework-api";
 export class UpgradeSubCommand {
     name = "upgrade";
     description = "Upgrade to the latest available version";
     enableConfiguration = false;
     positionals = [];
     options = [
-        {
-            name: "os",
-            type: ValueTypeName.STRING,
-            isOptional: true,
-            allowableValues: Object.values(SupportedOs),
-            description: "Override the detected operating system",
-        },
         {
             name: "install-method",
             type: ValueTypeName.STRING,
@@ -26,16 +19,14 @@ export class UpgradeSubCommand {
         const upgradeService = context.getServiceById(UPGRADE_SERVICE_ID);
         const cliName = context.cliConfig.name;
         const currentVersion = context.cliConfig.version;
-        const os = argumentValues.os;
-        const arch = undefined;
         const installMethod = argumentValues["install-method"];
         await printerService.showSpinner(`Looking for version newer than ${currentVersion}`);
-        const checkResult = os === undefined && installMethod === undefined
+        const checkResult = installMethod === undefined
             ? await upgradeService.refreshUpgradeCheckCache()
-            : await upgradeService.checkForUpgrade(os, arch, installMethod);
+            : await upgradeService.checkForUpgrade(installMethod);
         await printerService.hideSpinner();
         if (checkResult.status === "unsupported") {
-            await printerService.error(`No upgrade location is configured for the detected or requested platform.\n`, Icon.FAILURE);
+            await printerService.error(`No upgrade location is configured for the detected platform.\n`, Icon.FAILURE);
             return;
         }
         if (checkResult.status === "failed") {
@@ -46,7 +37,7 @@ export class UpgradeSubCommand {
             await printerService.print(`${cliName} is already up to date: ${checkResult.currentVersion}\n`, Icon.INFORMATION);
             return;
         }
-        const upgradeResult = await upgradeService.upgrade(os, arch, installMethod);
+        const upgradeResult = await upgradeService.upgrade(installMethod);
         if (!upgradeResult.ok) {
             await printerService.error(`Failed to upgrade ${cliName}: ${upgradeResult.error?.message ?? "unknown error"}\n`, Icon.FAILURE);
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "8.0.1",
+  "version": "9.0.1",
   "description": "A framework for developing CLI applications which supports dynamic discovery and installation of new commands",
   "keywords": [
     "bun",
@@ -49,7 +49,7 @@
     "build": "tsc -p tsconfig.build.json"
   },
   "dependencies": {
-    "@flowscripter/dynamic-cli-framework-api": "^4.2.2",
+    "@flowscripter/dynamic-cli-framework-api": "^5.0.0",
     "@flowscripter/dynamic-plugin-framework": "^2.2.16",
     "emphasize": "^7.0.0",
     "fastest-levenshtein": "^1.0.16",

package/src/service/upgrade/DefaultUpgradeService.ts

@@ -436,13 +436,9 @@ export default class DefaultUpgradeService implements UpgradeService {
     }
   }
 
-  public async checkForUpgrade(
-    osOverride?: SupportedOs,
-    archOverride?: SupportedArch,
-    installMethodOverride?: InstallMethod,
-  ): Promise<UpgradeCheckResult> {
-    const os = osOverride ?? this.detectOs();
-    const arch = archOverride ?? this.detectArch();
+  public async checkForUpgrade(installMethodOverride?: InstallMethod): Promise<UpgradeCheckResult> {
+    const os = this.detectOs();
+    const arch = this.detectArch();
     if (!os || !arch || !this.#isPlatformSupported(os, arch)) {
       return { status: "unsupported" };
     }
@@ -480,22 +476,17 @@ export default class DefaultUpgradeService implements UpgradeService {
     };
   }
 
-  public async upgrade(
-    osOverride?: SupportedOs,
-    archOverride?: SupportedArch,
-    installMethodOverride?: InstallMethod,
-  ): Promise<UpgradeResult> {
+  public async upgrade(installMethodOverride?: InstallMethod): Promise<UpgradeResult> {
     const oldVersion = this.#cliConfig.version;
-    const hasOverride =
-      osOverride !== undefined || archOverride !== undefined || installMethodOverride !== undefined;
-    const checkResult = hasOverride
-      ? await this.checkForUpgrade(osOverride, archOverride, installMethodOverride)
-      : await this.getUpgradeCheckResult();
+    const checkResult =
+      installMethodOverride !== undefined
+        ? await this.checkForUpgrade(installMethodOverride)
+        : await this.getUpgradeCheckResult();
     if (checkResult.status === "unsupported") {
       return {
         ok: false,
         oldVersion,
-        error: new Error("No upgrade location configured for the detected or requested platform"),
+        error: new Error("No upgrade location configured for the detected platform"),
       };
     }
     if (checkResult.status === "failed") {
@@ -521,7 +512,7 @@ export default class DefaultUpgradeService implements UpgradeService {
           await this.#upgradeViaLinuxScript();
           break;
         case InstallMethod.HOMEBREW:
-          await this.#upgradeViaHomebrew();
+          await this.#upgradeViaHomebrew(checkResult.latestVersion);
           break;
         case InstallMethod.WINGET:
           await this.#upgradeViaWinget();
@@ -734,12 +725,33 @@ export default class DefaultUpgradeService implements UpgradeService {
     }
   }
 
-  async #upgradeViaHomebrew(): Promise<void> {
+  // The latest version is read from the tap's formula on GitHub, but `brew upgrade` only sees the
+  // local tap clone, which is stale until `brew update` runs. A stale tap makes `brew upgrade`
+  // exit 0 with "already installed", so update first and then confirm the installed version.
+  async #upgradeViaHomebrew(expectedVersion: string): Promise<void> {
     const { tap, formula } = this.#config.homebrew!;
+    const updateResult = await this.#spawnQuoted(["brew", "update"]);
+    if (!updateResult.ok) {
+      throw new Error(`brew update failed: ${describeSpawnFailure(updateResult)}`);
+    }
     const result = await this.#spawnQuoted(["brew", "upgrade", `${tap}/${formula}`]);
     if (!result.ok) {
       throw new Error(`brew upgrade failed: ${describeSpawnFailure(result)}`);
     }
+
+    const lines: string[] = [];
+    const listResult = await this.#spawnService!.spawn(["brew", "list", "--versions", formula], {
+      mode: "wrapped",
+      longRunning: false,
+      onOutput: (line) => lines.push(line),
+    });
+    const installed = lines.join(" ").trim();
+    const installedVersions = installed.split(/\s+/).slice(1);
+    if (!listResult.ok || !installedVersions.includes(expectedVersion)) {
+      throw new Error(
+        `brew upgrade completed but version ${expectedVersion} is not installed (installed: ${installed || "unknown"})`,
+      );
+    }
   }
 
   async #upgradeViaWinget(): Promise<void> {

package/src/service/upgrade/command/UpgradeSubCommand.ts

@@ -6,8 +6,6 @@ import {
   Icon,
   InstallMethod,
   PRINTER_SERVICE_ID,
-  SupportedArch,
-  SupportedOs,
   UPGRADE_SERVICE_ID,
 } from "@flowscripter/dynamic-cli-framework-api";
 import type { PrinterService } from "@flowscripter/dynamic-cli-framework-api";
@@ -20,13 +18,6 @@ export class UpgradeSubCommand implements SubCommand {
   readonly positionals = [];
 
   readonly options: ReadonlyArray<Option> = [
-    {
-      name: "os",
-      type: ValueTypeName.STRING,
-      isOptional: true,
-      allowableValues: Object.values(SupportedOs),
-      description: "Override the detected operating system",
-    },
     {
       name: "install-method",
       type: ValueTypeName.STRING,
@@ -42,21 +33,19 @@ export class UpgradeSubCommand implements SubCommand {
     const cliName = context.cliConfig.name;
     const currentVersion = context.cliConfig.version;
 
-    const os = argumentValues.os as SupportedOs | undefined;
-    const arch = undefined as SupportedArch | undefined;
     const installMethod = argumentValues["install-method"] as InstallMethod | undefined;
 
     await printerService.showSpinner(`Looking for version newer than ${currentVersion}`);
 
     const checkResult =
-      os === undefined && installMethod === undefined
+      installMethod === undefined
         ? await upgradeService.refreshUpgradeCheckCache()
-        : await upgradeService.checkForUpgrade(os, arch, installMethod);
+        : await upgradeService.checkForUpgrade(installMethod);
 
     await printerService.hideSpinner();
     if (checkResult.status === "unsupported") {
       await printerService.error(
-        `No upgrade location is configured for the detected or requested platform.\n`,
+        `No upgrade location is configured for the detected platform.\n`,
         Icon.FAILURE,
       );
       return;
@@ -78,7 +67,7 @@ export class UpgradeSubCommand implements SubCommand {
       return;
     }
 
-    const upgradeResult = await upgradeService.upgrade(os, arch, installMethod);
+    const upgradeResult = await upgradeService.upgrade(installMethod);
     if (!upgradeResult.ok) {
       await printerService.error(
         `Failed to upgrade ${cliName}: ${upgradeResult.error?.message ?? "unknown error"}\n`,