@flowscripter/dynamic-cli-framework 5.0.5 → 5.1.0

package/dist/src/service/plugin/command/PluginAddSubCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PluginAddSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/plugin/command/PluginAddSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAQxE,qBAAa,mBAAoB,YAAW,UAAU;IACpD,QAAQ,CAAC,IAAI,SAAS;IACtB,QAAQ,CAAC,WAAW,6BAA6B;IACjD,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,OAAO,UAAM;IACtB,QAAQ,CAAC,WAAW;;;;QAMlB;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAuCvE"}
+{"version":3,"file":"PluginAddSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/plugin/command/PluginAddSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AASxE,qBAAa,mBAAoB,YAAW,UAAU;IACpD,QAAQ,CAAC,IAAI,SAAS;IACtB,QAAQ,CAAC,WAAW,6BAA6B;IACjD,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,OAAO,UAAM;IACtB,QAAQ,CAAC,WAAW;;;;QAMlB;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CA6CvE"}

package/dist/src/service/plugin/command/PluginAddSubCommand.js

@@ -2,6 +2,7 @@ import { ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import { Icon, PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import { PLUGIN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import { getPluginId } from "./getPluginId.js";
+import { parsePluginSpecifier } from "./parsePluginSpecifier.js";
 export class PluginAddSubCommand {
     name = "add";
     description = "Install a remote plugin";
@@ -10,14 +11,14 @@ export class PluginAddSubCommand {
     positionals = [
         {
             name: "pluginId",
-            description: "Plugin ID to install (e.g. @scope/name)",
+            description: "Plugin ID to install (e.g. @scope/name or @scope/name:version)",
             type: ValueTypeName.STRING,
         },
     ];
     async execute(context, argumentValues) {
         const printerService = context.getServiceById(PRINTER_SERVICE_ID);
         const pluginService = context.getServiceById(PLUGIN_SERVICE_ID);
-        const pluginId = argumentValues["pluginId"];
+        const { pluginId, version } = parsePluginSpecifier(argumentValues["pluginId"]);
         await printerService.info(`Searching for plugin: ${pluginId}\n`, Icon.INFORMATION);
         let descriptor;
         for await (const d of pluginService.search({ text: pluginId })) {
@@ -26,6 +27,11 @@ export class PluginAddSubCommand {
                 break;
             }
         }
+        if (descriptor && version) {
+            // search only ever returns the latest version - substitute the explicitly requested
+            // version so install() is asked for the correct one.
+            descriptor = { ...descriptor, version };
+        }
         if (!descriptor) {
             // Search did not find an exact match - attempt direct install by plugin ID.
             // This handles cases where the package exists on the registry but is not
@@ -38,7 +44,7 @@ export class PluginAddSubCommand {
                 pluginId,
                 scope,
                 name,
-                version: "latest",
+                version: version ?? "latest",
                 extensionPoints: [],
             };
         }

package/dist/src/service/plugin/command/parsePluginSpecifier.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Splits a plugin specifier into a bare plugin ID and an optional version.
+ *
+ * The specifier is split on the *last* `:` character, if present. Scoped npm package names
+ * (e.g. `@scope/name`) never legitimately contain a literal `:`, so this split cannot collide
+ * with the scope/slash structure of the plugin ID itself.
+ *
+ * Everything after the last `:` is always treated as the requested version, including
+ * non-semver tags such as `latest` or `next` - no validation is performed on the tail.
+ *
+ * @param specifier raw plugin specifier, e.g. `@scope/name`, `@scope/name:3.0.0` or `name:latest`.
+ */
+export declare function parsePluginSpecifier(specifier: string): {
+    pluginId: string;
+    version?: string;
+};
+//# sourceMappingURL=parsePluginSpecifier.d.ts.map

package/dist/src/service/plugin/command/parsePluginSpecifier.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parsePluginSpecifier.d.ts","sourceRoot":"","sources":["../../../../../src/service/plugin/command/parsePluginSpecifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAS9F"}

package/dist/src/service/plugin/command/parsePluginSpecifier.js

@@ -0,0 +1,22 @@
+/**
+ * Splits a plugin specifier into a bare plugin ID and an optional version.
+ *
+ * The specifier is split on the *last* `:` character, if present. Scoped npm package names
+ * (e.g. `@scope/name`) never legitimately contain a literal `:`, so this split cannot collide
+ * with the scope/slash structure of the plugin ID itself.
+ *
+ * Everything after the last `:` is always treated as the requested version, including
+ * non-semver tags such as `latest` or `next` - no validation is performed on the tail.
+ *
+ * @param specifier raw plugin specifier, e.g. `@scope/name`, `@scope/name:3.0.0` or `name:latest`.
+ */
+export function parsePluginSpecifier(specifier) {
+    const index = specifier.lastIndexOf(":");
+    if (index === -1) {
+        return { pluginId: specifier };
+    }
+    return {
+        pluginId: specifier.slice(0, index),
+        version: specifier.slice(index + 1),
+    };
+}

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":"AAIA,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EAEZ,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACd,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,aAAa,EACb,aAAa,EACb,WAAW,EACX,KAAK,cAAc,EACpB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAM1E,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAkB5C,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;gBAO/C,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS;IAKhE,eAAe,CACpB,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,YAAY,EAAE,YAAY,GAAG,SAAS,GACrC,IAAI;IAKA,qBAAqB,CAAC,aAAa,UAAQ,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA0BzE,QAAQ,IAAI,WAAW,GAAG,SAAS;IAanC,UAAU,IAAI,aAAa,GAAG,SAAS;IAWjC,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAgBxE,eAAe,CAC1B,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,kBAAkB,CAAC;IAwCjB,OAAO,CAClB,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,aAAa,CAAC;CA4S1B"}
+{"version":3,"file":"DefaultUpgradeService.d.ts","sourceRoot":"","sources":["../../../../src/service/upgrade/DefaultUpgradeService.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EAEZ,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACd,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,aAAa,EACb,aAAa,EACb,WAAW,EACX,KAAK,cAAc,EACpB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAM1E,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAkB5C,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;gBAO/C,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS;IAKhE,eAAe,CACpB,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,YAAY,EAAE,YAAY,GAAG,SAAS,GACrC,IAAI;IAKA,qBAAqB,CAAC,aAAa,UAAQ,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA0BzE,QAAQ,IAAI,WAAW,GAAG,SAAS;IAanC,UAAU,IAAI,aAAa,GAAG,SAAS;IAWjC,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAgBxE,eAAe,CAC1B,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,kBAAkB,CAAC;IAwCjB,OAAO,CAClB,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,aAAa,CAAC;CAsU1B"}

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

@@ -1,7 +1,7 @@
 import process from "node:process";
-import { mkdtemp } from "node:fs/promises";
+import { mkdtemp, rename, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { InstallMethod, SupportedArch, SupportedOs, } from "@flowscripter/dynamic-cli-framework-api";
 import semver from "semver";
 // checkForUpgrade() runs opportunistically on every CLI invocation (via BannerServiceProvider),
@@ -330,7 +330,9 @@ export default class DefaultUpgradeService {
     }
     async #upgradeViaGithubRelease(os, arch) {
         const { owner, repo, assetPattern } = this.#config.githubRelease;
-        const archLabel = os === SupportedOs.MACOS ? "aarch64" : arch === SupportedArch.X64 ? "x64" : "arm64";
+        // macOS release assets use "aarch64" rather than "arm64" for the arm64 build; x64 (including
+        // Intel Macs) always uses "x64" regardless of os.
+        const archLabel = arch === SupportedArch.X64 ? "x64" : os === SupportedOs.MACOS ? "aarch64" : "arm64";
         const assetName = assetPattern.replace("{os}", OS_LABELS[os]).replace("{arch}", archLabel);
         const url = `https://github.com/${owner}/${repo}/releases/latest/download/${assetName}`;
         // longRunning: true gets cooperative Ctrl-C handling during what can be the slowest step of
@@ -355,6 +357,14 @@ export default class DefaultUpgradeService {
             }
             const extractedBinary = join(tmpDir, `${this.#cliConfig.name}.exe`);
             const oldPath = `${currentExecutable}.old.exe`;
+            // Best-effort cleanup of a stale "<exe>.old.exe" left behind by a *previous* upgrade run.
+            // Windows won't let us delete the just-renamed-aside exe while this process still has it
+            // open/mapped - that can only happen once we're no longer holding it, i.e. at the start of
+            // the NEXT invocation, before we move today's running exe aside. Ignore failures: the file
+            // may not exist, or may still be locked (e.g. another instance still running).
+            await this.#spawnService.spawn(["cmd", "/c", "del", "/f", "/q", oldPath], {
+                mode: "ignore",
+            });
             const moveResult = await this.#spawnService.spawn(["cmd", "/c", "move", "/y", currentExecutable, oldPath], { mode: "ignore" });
             if (!moveResult.ok) {
                 throw new Error("Failed to move current executable aside");
@@ -372,8 +382,22 @@ export default class DefaultUpgradeService {
                 throw new Error("Failed to extract release archive");
             }
             const extractedBinary = join(tmpDir, this.#cliConfig.name);
-            await Bun.write(currentExecutable, Bun.file(extractedBinary));
-            await this.#spawnService.spawn(["chmod", "+x", currentExecutable], { mode: "ignore" });
+            // Extract into a staging file in the SAME directory as the running executable (not
+            // os.tmpdir(), which may be a different filesystem/mount), then atomically rename it over
+            // currentExecutable. This avoids ETXTBSY: the kernel refuses to open-for-write the inode
+            // mapped as a running process's text segment, but rename() only swaps the directory entry
+            // to point at a different inode - the running process keeps executing from its original,
+            // now-unlinked-but-still-open inode until it next execs/restarts.
+            const stagingDir = await mkdtemp(join(dirname(currentExecutable), ".upgrade-"));
+            try {
+                const stagingBinary = join(stagingDir, this.#cliConfig.name);
+                await Bun.write(stagingBinary, Bun.file(extractedBinary));
+                await this.#spawnService.spawn(["chmod", "+x", stagingBinary], { mode: "ignore" });
+                await rename(stagingBinary, currentExecutable);
+            }
+            finally {
+                await rm(stagingDir, { recursive: true, force: true });
+            }
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "5.0.5",
+  "version": "5.1.0",
   "description": "A framework for developing CLI applications which supports dynamic discovery and installation of new commands",
   "keywords": [
     "bun",

package/src/service/plugin/command/PluginAddSubCommand.ts

@@ -8,6 +8,7 @@ import { PLUGIN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import type { PluginService } from "@flowscripter/dynamic-cli-framework-api";
 import type { VersionedPluginDescriptor } from "@flowscripter/dynamic-plugin-framework";
 import { getPluginId } from "./getPluginId.ts";
+import { parsePluginSpecifier } from "./parsePluginSpecifier.ts";
 
 export class PluginAddSubCommand implements SubCommand {
   readonly name = "add";
@@ -17,7 +18,7 @@ export class PluginAddSubCommand implements SubCommand {
   readonly positionals = [
     {
       name: "pluginId",
-      description: "Plugin ID to install (e.g. @scope/name)",
+      description: "Plugin ID to install (e.g. @scope/name or @scope/name:version)",
       type: ValueTypeName.STRING,
     },
   ];
@@ -26,7 +27,7 @@ export class PluginAddSubCommand implements SubCommand {
     const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
     const pluginService = context.getServiceById(PLUGIN_SERVICE_ID) as PluginService;
 
-    const pluginId = argumentValues["pluginId"] as string;
+    const { pluginId, version } = parsePluginSpecifier(argumentValues["pluginId"] as string);
     await printerService.info(`Searching for plugin: ${pluginId}\n`, Icon.INFORMATION);
 
     let descriptor: VersionedPluginDescriptor | undefined;
@@ -37,6 +38,12 @@ export class PluginAddSubCommand implements SubCommand {
       }
     }
 
+    if (descriptor && version) {
+      // search only ever returns the latest version - substitute the explicitly requested
+      // version so install() is asked for the correct one.
+      descriptor = { ...descriptor, version };
+    }
+
     if (!descriptor) {
       // Search did not find an exact match - attempt direct install by plugin ID.
       // This handles cases where the package exists on the registry but is not
@@ -52,7 +59,7 @@ export class PluginAddSubCommand implements SubCommand {
         pluginId,
         scope,
         name,
-        version: "latest",
+        version: version ?? "latest",
         extensionPoints: [],
       };
     }

package/src/service/plugin/command/parsePluginSpecifier.ts

@@ -0,0 +1,22 @@
+/**
+ * Splits a plugin specifier into a bare plugin ID and an optional version.
+ *
+ * The specifier is split on the *last* `:` character, if present. Scoped npm package names
+ * (e.g. `@scope/name`) never legitimately contain a literal `:`, so this split cannot collide
+ * with the scope/slash structure of the plugin ID itself.
+ *
+ * Everything after the last `:` is always treated as the requested version, including
+ * non-semver tags such as `latest` or `next` - no validation is performed on the tail.
+ *
+ * @param specifier raw plugin specifier, e.g. `@scope/name`, `@scope/name:3.0.0` or `name:latest`.
+ */
+export function parsePluginSpecifier(specifier: string): { pluginId: string; version?: string } {
+  const index = specifier.lastIndexOf(":");
+  if (index === -1) {
+    return { pluginId: specifier };
+  }
+  return {
+    pluginId: specifier.slice(0, index),
+    version: specifier.slice(index + 1),
+  };
+}

package/src/service/upgrade/DefaultUpgradeService.ts

@@ -1,7 +1,7 @@
 import process from "node:process";
-import { mkdtemp } from "node:fs/promises";
+import { mkdtemp, rename, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import type {
   CLIConfig,
   FetchService,
@@ -413,8 +413,10 @@ export default class DefaultUpgradeService implements UpgradeService {
 
   async #upgradeViaGithubRelease(os: SupportedOs, arch: SupportedArch): Promise<void> {
     const { owner, repo, assetPattern } = this.#config.githubRelease!;
+    // macOS release assets use "aarch64" rather than "arm64" for the arm64 build; x64 (including
+    // Intel Macs) always uses "x64" regardless of os.
     const archLabel =
-      os === SupportedOs.MACOS ? "aarch64" : arch === SupportedArch.X64 ? "x64" : "arm64";
+      arch === SupportedArch.X64 ? "x64" : os === SupportedOs.MACOS ? "aarch64" : "arm64";
     const assetName = assetPattern.replace("{os}", OS_LABELS[os]).replace("{arch}", archLabel);
     const url = `https://github.com/${owner}/${repo}/releases/latest/download/${assetName}`;
 
@@ -446,6 +448,16 @@ export default class DefaultUpgradeService implements UpgradeService {
       }
       const extractedBinary = join(tmpDir, `${this.#cliConfig.name}.exe`);
       const oldPath = `${currentExecutable}.old.exe`;
+
+      // Best-effort cleanup of a stale "<exe>.old.exe" left behind by a *previous* upgrade run.
+      // Windows won't let us delete the just-renamed-aside exe while this process still has it
+      // open/mapped - that can only happen once we're no longer holding it, i.e. at the start of
+      // the NEXT invocation, before we move today's running exe aside. Ignore failures: the file
+      // may not exist, or may still be locked (e.g. another instance still running).
+      await this.#spawnService!.spawn(["cmd", "/c", "del", "/f", "/q", oldPath], {
+        mode: "ignore",
+      });
+
       const moveResult = await this.#spawnService!.spawn(
         ["cmd", "/c", "move", "/y", currentExecutable, oldPath],
         { mode: "ignore" },
@@ -471,8 +483,22 @@ export default class DefaultUpgradeService implements UpgradeService {
         throw new Error("Failed to extract release archive");
       }
       const extractedBinary = join(tmpDir, this.#cliConfig.name);
-      await Bun.write(currentExecutable, Bun.file(extractedBinary));
-      await this.#spawnService!.spawn(["chmod", "+x", currentExecutable], { mode: "ignore" });
+
+      // Extract into a staging file in the SAME directory as the running executable (not
+      // os.tmpdir(), which may be a different filesystem/mount), then atomically rename it over
+      // currentExecutable. This avoids ETXTBSY: the kernel refuses to open-for-write the inode
+      // mapped as a running process's text segment, but rename() only swaps the directory entry
+      // to point at a different inode - the running process keeps executing from its original,
+      // now-unlinked-but-still-open inode until it next execs/restarts.
+      const stagingDir = await mkdtemp(join(dirname(currentExecutable), ".upgrade-"));
+      try {
+        const stagingBinary = join(stagingDir, this.#cliConfig.name);
+        await Bun.write(stagingBinary, Bun.file(extractedBinary));
+        await this.#spawnService!.spawn(["chmod", "+x", stagingBinary], { mode: "ignore" });
+        await rename(stagingBinary, currentExecutable);
+      } finally {
+        await rm(stagingDir, { recursive: true, force: true });
+      }
     }
   }
 }