@flowscripter/dynamic-cli-framework 3.0.2 → 5.0.0

package/dist/src/service/plugin/DefaultPluginService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultPluginService.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/DefaultPluginService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,KAAK,EACV,wBAAwB,EACxB,WAAW,EACX,yBAAyB,EAC1B,MAAM,wCAAwC,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,oBAAqB,YAAW,aAAa;;gBAGpD,aAAa,EAAE,wBAAwB;IAInD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;IAIlF,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvE,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,aAAa,IAAI,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;IAInE,eAAe,IAAI,aAAa,CAAC;QAC/B,UAAU,EAAE,QAAQ,CAAC,yBAAyB,CAAC,CAAC;QAChD,gBAAgB,EAAE,MAAM,CAAC;KAC1B,CAAC;CAGH"}
+{"version":3,"file":"DefaultPluginService.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/DefaultPluginService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,KAAK,EACV,wBAAwB,EACxB,WAAW,EACX,yBAAyB,EACzB,2BAA2B,EAC3B,yBAAyB,EAC1B,MAAM,wCAAwC,CAAC;AAOhD,MAAM,CAAC,OAAO,OAAO,oBAAqB,YAAW,aAAa;;gBAKpD,YAAY,EAAE,2BAA2B,EAAE,WAAW,EAAE,yBAAyB;IAS7F,IAAI,aAAa,IAAI,wBAAwB,CAE5C;IAEK,sBAAsB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB7E,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;IAIlF,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvE,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,aAAa,IAAI,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;IAInE,eAAe,IAAI,aAAa,CAAC;QAC/B,UAAU,EAAE,QAAQ,CAAC,yBAAyB,CAAC,CAAC;QAChD,gBAAgB,EAAE,MAAM,CAAC;KAC1B,CAAC;CAGH"}

package/dist/src/service/plugin/DefaultPluginService.js

@@ -1,7 +1,26 @@
+import { NpmPluginManager, NpmjsPluginRepository, NpmPluginRepository, } from "@flowscripter/dynamic-plugin-framework";
 export default class DefaultPluginService {
+    #defaultRemoteConfig;
+    #defaultLocalConfig;
     #pluginManager;
-    constructor(pluginManager) {
-        this.#pluginManager = pluginManager;
+    constructor(remoteConfig, localConfig) {
+        this.#defaultRemoteConfig = remoteConfig;
+        this.#defaultLocalConfig = localConfig;
+        this.#pluginManager = new NpmPluginManager([new NpmjsPluginRepository(remoteConfig)], new NpmPluginRepository(localConfig));
+    }
+    get pluginManager() {
+        return this.#pluginManager;
+    }
+    async applyKeyValueOverrides(keyValueService) {
+        let remotesConfig = [this.#defaultRemoteConfig];
+        if (await keyValueService.has("remotes-config")) {
+            remotesConfig = (await keyValueService.get("remotes-config"));
+        }
+        let localConfig = this.#defaultLocalConfig;
+        if (await keyValueService.has("local-config")) {
+            localConfig = (await keyValueService.get("local-config"));
+        }
+        this.#pluginManager = new NpmPluginManager(remotesConfig.map((config) => new NpmjsPluginRepository(config)), new NpmPluginRepository(localConfig));
     }
     search(query) {
         return this.#pluginManager.search(query);

package/dist/src/service/plugin/PluginServiceProvider.d.ts

@@ -0,0 +1,17 @@
+import type { ServiceInfo, ServiceProvider } from "@flowscripter/dynamic-cli-framework-api";
+import type { Context } from "@flowscripter/dynamic-cli-framework-api";
+import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
+import type { NpmjsPluginRepositoryConfig, NpmPluginRepositoryConfig } from "@flowscripter/dynamic-plugin-framework";
+import { type SpawnInterfaceAdapterOptions } from "./SpawnInterfaceAdapter.ts";
+import { type FetchInterfaceAdapterOptions } from "./FetchInterfaceAdapter.ts";
+import DefaultCommandRegistry from "../../runtime/registry/DefaultCommandRegistry.ts";
+import DefaultServiceProviderRegistry from "../../runtime/registry/DefaultServiceProviderRegistry.ts";
+export default class PluginServiceProvider implements ServiceProvider {
+    #private;
+    readonly serviceId = "PLUGIN_SERVICE";
+    readonly servicePriority: number;
+    constructor(servicePriority: number, remoteConfig: NpmjsPluginRepositoryConfig, localConfig: NpmPluginRepositoryConfig, commandRegistry: DefaultCommandRegistry, serviceProviderRegistry: DefaultServiceProviderRegistry, spawnInterfaceAdapterOptions?: SpawnInterfaceAdapterOptions, fetchInterfaceAdapterOptions?: FetchInterfaceAdapterOptions);
+    getServiceInfo(cliConfig: CLIConfig): Promise<ServiceInfo>;
+    initService(context: Context): Promise<void>;
+}
+//# sourceMappingURL=PluginServiceProvider.d.ts.map

package/dist/src/service/plugin/PluginServiceProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PluginServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/PluginServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAWzE,OAAO,KAAK,EAEV,2BAA2B,EAC3B,yBAAyB,EAE1B,MAAM,wCAAwC,CAAC;AAIhD,OAA8B,EAC5B,KAAK,4BAA4B,EAClC,MAAM,4BAA4B,CAAC;AACpC,OAA8B,EAC5B,KAAK,4BAA4B,EAClC,MAAM,4BAA4B,CAAC;AACpC,OAAO,sBAAsB,MAAM,kDAAkD,CAAC;AACtF,OAAO,8BAA8B,MAAM,0DAA0D,CAAC;AAMtG,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,eAAe;;IACnE,QAAQ,CAAC,SAAS,oBAAqB;IACvC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;gBAW/B,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,2BAA2B,EACzC,WAAW,EAAE,yBAAyB,EACtC,eAAe,EAAE,sBAAsB,EACvC,uBAAuB,EAAE,8BAA8B,EACvD,4BAA4B,GAAE,4BAAiC,EAC/D,4BAA4B,GAAE,4BAAiC;IAW3D,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAS1D,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAmEnD"}

package/dist/src/service/plugin/PluginServiceProvider.js

@@ -0,0 +1,95 @@
+import { PRINTER_SERVICE_ID, SPAWN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+import { FETCH_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+import { KEY_VALUE_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+import { DYNAMIC_CLI_FRAMEWORK_COMMAND_FACTORY_EXTENSION_POINT } from "@flowscripter/dynamic-cli-framework-api";
+import { DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT } from "@flowscripter/dynamic-cli-framework-api";
+import { PLUGIN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+import DefaultPluginService from "./DefaultPluginService.js";
+import { PluginGroupCommand } from "./command/PluginGroupCommand.js";
+import SpawnInterfaceAdapter, {} from "./SpawnInterfaceAdapter.js";
+import FetchInterfaceAdapter, {} from "./FetchInterfaceAdapter.js";
+import DefaultCommandRegistry from "../../runtime/registry/DefaultCommandRegistry.js";
+import DefaultServiceProviderRegistry from "../../runtime/registry/DefaultServiceProviderRegistry.js";
+import getLogger from "../../util/logger.js";
+const logger = getLogger("PluginServiceProvider");
+export default class PluginServiceProvider {
+    serviceId = PLUGIN_SERVICE_ID;
+    servicePriority;
+    #remoteConfig;
+    #localConfig;
+    #commandRegistry;
+    #serviceProviderRegistry;
+    #spawnInterfaceAdapterOptions;
+    #fetchInterfaceAdapterOptions;
+    #pluginService;
+    #cliConfig;
+    constructor(servicePriority, remoteConfig, localConfig, commandRegistry, serviceProviderRegistry, spawnInterfaceAdapterOptions = {}, fetchInterfaceAdapterOptions = {}) {
+        this.servicePriority = servicePriority;
+        this.#remoteConfig = remoteConfig;
+        this.#localConfig = localConfig;
+        this.#commandRegistry = commandRegistry;
+        this.#serviceProviderRegistry = serviceProviderRegistry;
+        this.#spawnInterfaceAdapterOptions = spawnInterfaceAdapterOptions;
+        this.#fetchInterfaceAdapterOptions = fetchInterfaceAdapterOptions;
+    }
+    async getServiceInfo(cliConfig) {
+        this.#cliConfig = cliConfig;
+        this.#pluginService = new DefaultPluginService(this.#remoteConfig, this.#localConfig);
+        return {
+            service: this.#pluginService,
+            commands: [new PluginGroupCommand()],
+        };
+    }
+    async initService(context) {
+        const pluginService = this.#pluginService;
+        if (context.doesServiceExist(KEY_VALUE_SERVICE_ID)) {
+            const keyValueService = context.getServiceById(KEY_VALUE_SERVICE_ID);
+            await pluginService.applyKeyValueOverrides(keyValueService);
+        }
+        const pluginManager = pluginService.pluginManager;
+        if (!context.doesServiceExist(SPAWN_SERVICE_ID)) {
+            logger.debug("SpawnService not available, plugin manager will spawn processes directly");
+        }
+        else if (!("setSpawn" in pluginManager)) {
+            logger.debug("Plugin manager does not support SpawnCapable, skipping spawn injection");
+        }
+        else {
+            const spawnService = context.getServiceById(SPAWN_SERVICE_ID);
+            const printerService = context.getServiceById(PRINTER_SERVICE_ID);
+            const adapter = new SpawnInterfaceAdapter(spawnService, printerService, this.#spawnInterfaceAdapterOptions);
+            pluginManager.setSpawn(adapter);
+        }
+        if (!context.doesServiceExist(FETCH_SERVICE_ID)) {
+            logger.debug("FetchService not available, plugin manager will fetch directly");
+        }
+        else if (!("setFetch" in pluginManager)) {
+            logger.debug("Plugin manager does not support FetchCapable, skipping fetch injection");
+        }
+        else {
+            const fetchService = context.getServiceById(FETCH_SERVICE_ID);
+            const adapter = new FetchInterfaceAdapter(fetchService, this.#fetchInterfaceAdapterOptions);
+            pluginManager.setFetch(adapter);
+        }
+        await pluginManager.registerExtensions(DYNAMIC_CLI_FRAMEWORK_COMMAND_FACTORY_EXTENSION_POINT);
+        await pluginManager.registerExtensions(DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT);
+        const commandFactoryExtensions = await pluginManager.getRegisteredExtensions(DYNAMIC_CLI_FRAMEWORK_COMMAND_FACTORY_EXTENSION_POINT);
+        for (const ext of commandFactoryExtensions) {
+            const factory = (await pluginManager.instantiate(ext.extensionHandle));
+            for (const command of factory.getCommands()) {
+                this.#commandRegistry.addCommand(command);
+            }
+        }
+        const spFactoryExtensions = await pluginManager.getRegisteredExtensions(DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT);
+        for (const ext of spFactoryExtensions) {
+            const factory = (await pluginManager.instantiate(ext.extensionHandle));
+            for (const sp of factory.getServiceProviders()) {
+                const info = await sp.getServiceInfo(this.#cliConfig);
+                if (info.service) {
+                    context.addServiceInstance(sp.serviceId, info.service);
+                }
+                info.commands.forEach((cmd) => this.#commandRegistry.addCommand(cmd, sp.serviceId));
+                this.#serviceProviderRegistry.addServiceProvider(sp);
+            }
+        }
+    }
+}

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

@@ -6,11 +6,11 @@ export default class DefaultUpgradeService implements UpgradeService {
     #private;
     constructor(config: UpgradeLocationsConfig, cliConfig: CLIConfig);
     setDependencies(spawnService: SpawnService | undefined, fetchService: FetchService | undefined): void;
-    getUpgradeCheckResult(waitForResult?: boolean): Promise<UpgradeCheckResult | undefined>;
+    getUpgradeCheckResult(waitForResult?: boolean): Promise<UpgradeCheckResult>;
     detectOs(): SupportedOs | undefined;
     detectArch(): SupportedArch | undefined;
     detectInstallMethod(os: SupportedOs): Promise<InstallMethod | undefined>;
-    checkForUpgrade(osOverride?: SupportedOs, archOverride?: SupportedArch, installMethodOverride?: InstallMethod): Promise<UpgradeCheckResult | undefined>;
+    checkForUpgrade(osOverride?: SupportedOs, archOverride?: SupportedArch, installMethodOverride?: InstallMethod): Promise<UpgradeCheckResult>;
     upgrade(osOverride?: SupportedOs, archOverride?: SupportedArch, 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":"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;AAS1E,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAc5C,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,GAAG,SAAS,CAAC;IA0BrF,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,GAAG,SAAS,CAAC;IAmC7B,OAAO,CAClB,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,aAAa,CAAC;CAoQ1B"}
+{"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"}

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

@@ -4,8 +4,6 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { InstallMethod, SupportedArch, SupportedOs, } from "@flowscripter/dynamic-cli-framework-api";
 import semver from "semver";
-import getLogger from "../../util/logger.js";
-const logger = getLogger("DefaultUpgradeService");
 // checkForUpgrade() runs opportunistically on every CLI invocation (via BannerServiceProvider),
 // so that opportunistic call is raced against this timeout so it never stalls CLI startup.
 // A deliberate caller (waitForResult=true, e.g. the `upgrade` command) awaits checkForUpgrade()
@@ -37,14 +35,14 @@ export default class DefaultUpgradeService {
     }
     getUpgradeCheckResult(waitForResult = false) {
         if (!this.#upgradeCheckPromise) {
-            // Only cache a successful result. An `undefined` result can come from a transient
-            // failure (e.g. the opportunistic startup check racing past VERSION_CHECK_TIMEOUT_MS
-            // before checkForUpgrade() itself resolves) - caching that would permanently deny a
-            // later, deliberate caller (e.g. the `upgrade` command explicitly waiting via
-            // waitForResult=true) any chance of a fresh attempt for the rest of this process's
-            // lifetime.
+            // Only cache a non-"failed" result. A "failed" result can come from a transient issue
+            // (e.g. a network blip, or the opportunistic startup check racing past
+            // VERSION_CHECK_TIMEOUT_MS before checkForUpgrade() itself resolves) - caching that would
+            // permanently deny a later, deliberate caller (e.g. the `upgrade` command explicitly
+            // waiting via waitForResult=true) any chance of a fresh attempt for the rest of this
+            // process's lifetime.
             this.#upgradeCheckPromise = this.checkForUpgrade().then((result) => {
-                if (result === undefined) {
+                if (result.status === "failed") {
                     this.#upgradeCheckPromise = undefined;
                 }
                 return result;
@@ -55,7 +53,7 @@ export default class DefaultUpgradeService {
         }
         return Promise.race([
             this.#upgradeCheckPromise,
-            new Promise((resolve) => setTimeout(() => resolve(undefined), VERSION_CHECK_TIMEOUT_MS)),
+            new Promise((resolve) => setTimeout(() => resolve({ status: "pending" }), VERSION_CHECK_TIMEOUT_MS)),
         ]);
     }
     detectOs() {
@@ -99,26 +97,29 @@ export default class DefaultUpgradeService {
         const os = osOverride ?? this.detectOs();
         const arch = archOverride ?? this.detectArch();
         if (!os || !arch || !this.#isPlatformSupported(os, arch)) {
-            return undefined;
+            return { status: "unsupported" };
         }
         const installMethod = installMethodOverride ?? (await this.detectInstallMethod(os));
         if (!installMethod) {
-            return undefined;
+            return { status: "unsupported" };
         }
-        const latestVersion = await this.#getLatestVersion(installMethod);
-        if (!latestVersion) {
-            return undefined;
+        const versionLookup = await this.#getLatestVersion(installMethod);
+        if (!versionLookup.ok) {
+            return { status: "failed", error: versionLookup.error };
         }
         const currentVersion = this.#cliConfig.version;
         const coercedCurrent = semver.coerce(currentVersion);
-        const coercedLatest = semver.coerce(latestVersion);
+        const coercedLatest = semver.coerce(versionLookup.version);
         if (!coercedCurrent || !coercedLatest) {
-            logger.debug(() => `Unable to compare versions '${currentVersion}' and '${latestVersion}'`);
-            return undefined;
+            return {
+                status: "failed",
+                error: new Error(`Unable to compare versions '${currentVersion}' and '${versionLookup.version}'`),
+            };
         }
         return {
+            status: "checked",
             currentVersion,
-            latestVersion,
+            latestVersion: versionLookup.version,
             updateAvailable: semver.gt(coercedLatest, coercedCurrent),
             os,
             arch,
@@ -131,13 +132,20 @@ export default class DefaultUpgradeService {
         const checkResult = hasOverride
             ? await this.checkForUpgrade(osOverride, archOverride, installMethodOverride)
             : await this.getUpgradeCheckResult(true);
-        if (!checkResult) {
+        if (checkResult.status === "unsupported") {
             return {
                 ok: false,
                 oldVersion,
                 error: new Error("No upgrade location configured for the detected or requested platform"),
             };
         }
+        if (checkResult.status === "failed") {
+            return { ok: false, oldVersion, error: checkResult.error };
+        }
+        if (checkResult.status === "pending") {
+            // Unreachable: checkForUpgrade() and getUpgradeCheckResult(true) always run to completion.
+            return { ok: false, oldVersion, error: new Error("Upgrade check did not complete") };
+        }
         if (!this.#spawnService) {
             return { ok: false, oldVersion, error: new Error("SpawnService is not available") };
         }
@@ -194,53 +202,81 @@ export default class DefaultUpgradeService {
                 return this.#getLatestHomebrewVersion();
             case InstallMethod.WINGET:
                 return this.#getLatestWingetVersion();
-            default:
-                return undefined;
         }
     }
     async #getLatestGithubReleaseVersion() {
-        if (!this.#config.githubRelease || !this.#fetchService) {
-            return undefined;
+        if (!this.#config.githubRelease) {
+            return { ok: false, error: new Error("No githubRelease location configured") };
+        }
+        if (!this.#fetchService) {
+            return { ok: false, error: new Error("FetchService is not available") };
         }
         const { owner, repo } = this.#config.githubRelease;
         try {
-            const response = await this.#fetchService.fetch(`https://api.github.com/repos/${owner}/${repo}/releases/latest`);
-            if (!response.ok) {
-                return undefined;
+            // Uses the plain web redirect rather than the api.github.com REST endpoint, since the
+            // latter's unauthenticated rate limit (60 requests/hour/IP) is easily exhausted, e.g. by
+            // CI runners sharing an IP pool.
+            const response = await this.#fetchService.fetch(`https://github.com/${owner}/${repo}/releases/latest`, { redirect: "manual" });
+            const location = response.headers.get("location");
+            const version = location ? /\/releases\/tag\/v?([^/]+)$/.exec(location)?.[1] : undefined;
+            if (!version) {
+                return {
+                    ok: false,
+                    error: new Error(`Unexpected response resolving latest release for ${owner}/${repo}: HTTP ${response.status}`),
+                };
             }
-            const data = (await response.json());
-            return data.tag_name?.replace(/^v/, "");
+            return { ok: true, version };
         }
         catch (error) {
-            logger.debug(() => `Failed to fetch latest GitHub release for ${owner}/${repo}: ${error}`);
-            return undefined;
+            return {
+                ok: false,
+                error: new Error(`Failed to fetch latest GitHub release for ${owner}/${repo}: ${error}`),
+            };
         }
     }
     async #getLatestHomebrewVersion() {
-        if (!this.#config.homebrew || !this.#fetchService) {
-            return undefined;
+        if (!this.#config.homebrew) {
+            return { ok: false, error: new Error("No homebrew location configured") };
+        }
+        if (!this.#fetchService) {
+            return { ok: false, error: new Error("FetchService is not available") };
         }
         const { tap, formula } = this.#config.homebrew;
         const [tapOwner, tapName] = tap.split("/");
         if (!tapOwner || !tapName) {
-            return undefined;
+            return { ok: false, error: new Error(`Invalid homebrew tap '${tap}'`) };
         }
         try {
             const response = await this.#fetchService.fetch(`https://raw.githubusercontent.com/${tapOwner}/homebrew-${tapName}/main/${formula}.rb`);
             if (!response.ok) {
-                return undefined;
+                return {
+                    ok: false,
+                    error: new Error(`Failed to fetch homebrew formula for ${tap}/${formula}: HTTP ${response.status}`),
+                };
             }
             const text = await response.text();
-            return /version\s+"v?([^"]+)"/.exec(text)?.[1];
+            const version = /version\s+"v?([^"]+)"/.exec(text)?.[1];
+            if (!version) {
+                return {
+                    ok: false,
+                    error: new Error(`Could not parse version from homebrew formula ${tap}/${formula}`),
+                };
+            }
+            return { ok: true, version };
         }
         catch (error) {
-            logger.debug(() => `Failed to fetch homebrew formula for ${tap}/${formula}: ${error}`);
-            return undefined;
+            return {
+                ok: false,
+                error: new Error(`Failed to fetch homebrew formula for ${tap}/${formula}: ${error}`),
+            };
         }
     }
     async #getLatestWingetVersion() {
-        if (!this.#spawnService || !this.#config.winget) {
-            return undefined;
+        if (!this.#config.winget) {
+            return { ok: false, error: new Error("No winget location configured") };
+        }
+        if (!this.#spawnService) {
+            return { ok: false, error: new Error("SpawnService is not available") };
         }
         const lines = [];
         const result = await this.#spawnService.spawn(["winget", "show", "--id", this.#config.winget.packageId], {
@@ -249,15 +285,15 @@ export default class DefaultUpgradeService {
             onOutput: (line) => lines.push(line),
         });
         if (!result.ok) {
-            return undefined;
+            return { ok: false, error: new Error(`winget show failed: ${describeSpawnFailure(result)}`) };
         }
         for (const line of lines) {
             const match = /Version:\s*(\S+)/.exec(line);
             if (match?.[1]) {
-                return match[1];
+                return { ok: true, version: match[1] };
             }
         }
-        return undefined;
+        return { ok: false, error: new Error("Could not parse version from winget output") };
     }
     async #upgradeViaLinuxScript() {
         const { scriptUrl } = this.#config.linuxScript;

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

@@ -1 +1 @@
-{"version":3,"file":"UpgradeServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/upgrade/UpgradeServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAczE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAK1E,MAAM,CAAC,OAAO,OAAO,sBAAuB,YAAW,eAAe;;IACpE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAsB;IAChD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;gBAKd,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB;IAKnE,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IASpD,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAsH1D"}
+{"version":3,"file":"UpgradeServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/upgrade/UpgradeServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAczE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAK1E,MAAM,CAAC,OAAO,OAAO,sBAAuB,YAAW,eAAe;;IACpE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAsB;IAChD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;gBAKd,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB;IAKnE,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IASpD,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CA0H1D"}

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

@@ -52,8 +52,8 @@ export default class UpgradeServiceProvider {
             return;
         }
         const keyValueService = context.getServiceById(KEY_VALUE_SERVICE_ID);
-        if (await keyValueService.hasKey("upgrade-status")) {
-            const status = await keyValueService.getKey("upgrade-status");
+        if (await keyValueService.has("upgrade-status")) {
+            const status = await keyValueService.get("upgrade-status");
             if (status === "declined") {
                 logger.debug(() => "Auto-upgrade previously declined, skipping");
                 return;
@@ -97,16 +97,20 @@ export default class UpgradeServiceProvider {
             return;
         }
         if (enableResult.value !== true) {
-            await keyValueService.setKey("upgrade-status", "declined");
+            await keyValueService.set("upgrade-status", "declined");
             return;
         }
-        await keyValueService.setKey("upgrade-status", "enabled");
+        await keyValueService.set("upgrade-status", "enabled");
         await this.#checkAndUpgrade(context, upgradeService, cliConfig);
     }
     async #checkAndUpgrade(context, upgradeService, cliConfig) {
         try {
             const checkResult = await upgradeService.getUpgradeCheckResult();
-            if (!checkResult?.updateAvailable) {
+            if (checkResult.status === "failed") {
+                logger.debug(() => `Auto-upgrade check failed: ${checkResult.error.message}`);
+                return;
+            }
+            if (checkResult.status !== "checked" || !checkResult.updateAvailable) {
                 return;
             }
             const upgradeResult = await upgradeService.upgrade();

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;AASrF,OAAO,KAAK,qBAAqB,MAAM,6BAA6B,CAAC;AAErE,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;gBAIiB,cAAc,EAAE,qBAAqB;IAI3C,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAyC9E"}
+{"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;AASrF,OAAO,KAAK,qBAAqB,MAAM,6BAA6B,CAAC;AAErE,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;gBAIiB,cAAc,EAAE,qBAAqB;IAI3C,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAuD9E"}

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

@@ -34,10 +34,19 @@ export class UpgradeSubCommand {
         const checkResult = os === undefined && installMethod === undefined
             ? await this.#upgradeService.getUpgradeCheckResult(true)
             : await this.#upgradeService.checkForUpgrade(os, arch, installMethod);
-        if (!checkResult) {
+        if (checkResult.status === "unsupported") {
             await printerService.error(`No upgrade location is configured for the detected or requested platform.\n`, Icon.FAILURE);
             return;
         }
+        if (checkResult.status === "failed") {
+            await printerService.error(`Failed to check for updates: ${checkResult.error.message}. Please try again later.\n`, Icon.FAILURE);
+            return;
+        }
+        if (checkResult.status === "pending") {
+            // Unreachable: getUpgradeCheckResult(true) and checkForUpgrade() always run to completion.
+            await printerService.error(`Failed to check for updates.\n`, Icon.FAILURE);
+            return;
+        }
         if (!checkResult.updateAvailable) {
             await printerService.print(`${cliName} is already up to date (${checkResult.currentVersion}).\n`);
             return;

package/index.ts

@@ -187,12 +187,11 @@ export type { ServiceProviderFactory } from "@flowscripter/dynamic-cli-framework
 export { DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT } from "@flowscripter/dynamic-cli-framework-api";
 export { PLUGIN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 export type { PluginService } from "@flowscripter/dynamic-cli-framework-api";
-export { default as DefaultPluginServiceProvider } from "./src/service/plugin/DefaultPluginServiceProvider.ts";
+export { default as PluginServiceProvider } from "./src/service/plugin/PluginServiceProvider.ts";
 
 // Core CLI
 export { default as BaseCLI } from "./src/cli/BaseCLI.ts";
 export { default as DefaultRuntimeCLI } from "./src/cli/DefaultRuntimeCLI.ts";
-export { default as DynamicPluginRuntimeCLI } from "./src/cli/DynamicPluginRuntimeCLI.ts";
 
 // Terminal API
 export type { default as Terminal } from "./src/terminal/Terminal.ts";
@@ -202,8 +201,4 @@ export { SpecialKey } from "./src/terminal/KeyReader.ts";
 export { default as TtyKeyReader } from "./src/terminal/TtyKeyReader.ts";
 
 // Convenience functions
-export {
-  launchDynamicPluginMultiCommandCLI,
-  launchMultiCommandCLI,
-  launchSingleCommandCLI,
-} from "./src/launcher.ts";
+export { launchMultiCommandCLI, launchSingleCommandCLI } from "./src/launcher.ts";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "3.0.2",
+  "version": "5.0.0",
   "description": "A framework for developing CLI applications which supports dynamic discovery and installation of new commands",
   "keywords": [
     "bun",
@@ -48,8 +48,8 @@
     "build": "tsc -p tsconfig.build.json"
   },
   "dependencies": {
-    "@flowscripter/dynamic-cli-framework-api": "^1.4.1",
-    "@flowscripter/dynamic-plugin-framework": "1.12.0",
+    "@flowscripter/dynamic-cli-framework-api": "^2.0.0",
+    "@flowscripter/dynamic-plugin-framework": "2.0.0",
     "emphasize": "^7.0.0",
     "fastest-levenshtein": "^1.0.16",
     "figlet": "^1.11.0",

package/src/cli/BaseCLI.ts

@@ -54,6 +54,7 @@ import ImagePrinterServiceProvider from "../service/imagePrinter/ImagePrinterSer
 import SpawnServiceProvider from "../service/spawn/SpawnServiceProvider.ts";
 import FetchServiceProvider from "../service/fetch/FetchServiceProvider.ts";
 import UpgradeServiceProvider from "../service/upgrade/UpgradeServiceProvider.ts";
+import PluginServiceProvider from "../service/plugin/PluginServiceProvider.ts";
 const logger = getLogger("BaseCLI");
 
 /**
@@ -76,6 +77,7 @@ const logger = getLogger("BaseCLI");
  * * {@link FetchServiceProvider}
  * * {@link CompletionServiceProvider}
  * * {@link UpgradeServiceProvider}
+ * * {@link PluginServiceProvider}
  *
  * `keyReader` is optional. If omitted, or if the stderr {@link Terminal} is not a TTY, prompting is
  * unavailable: {@link PrompterServiceProvider} (and {@link ArgumentPrompterServiceProvider}, if
@@ -141,6 +143,9 @@ export default class BaseCLI implements CLI {
       fetchServiceEnabled: false,
       upgradeServiceEnabled: false,
       upgradeLocationsConfig: { supportedPlatforms: [] },
+      pluginServiceEnabled: false,
+      pluginServiceRemoteConfig: { name: "", registryUrl: "", packageJsonNamespace: "" },
+      pluginServiceLocalConfig: { nodeModulesPath: "", packageJsonNamespace: "" },
       validateAllCommands: false,
       promptingEnabled: true,
       ...options,
@@ -292,6 +297,18 @@ export default class BaseCLI implements CLI {
       this.addServiceProvider(new UpgradeServiceProvider(6, this.#options.upgradeLocationsConfig));
     }
 
+    if (this.#options.pluginServiceEnabled) {
+      this.addServiceProvider(
+        new PluginServiceProvider(
+          50,
+          this.#options.pluginServiceRemoteConfig,
+          this.#options.pluginServiceLocalConfig,
+          this.#commandRegistry,
+          this.#serviceProviderRegistry,
+        ),
+      );
+    }
+
     const configurationServiceProvider = new ConfigurationServiceProvider(
       90,
       this.#options.envVarsSupportEnabled,

package/src/cli/BaseCLIFeatureOptions.ts

@@ -1,4 +1,8 @@
 import type { UpgradeLocationsConfig } from "../service/upgrade/UpgradeLocationsConfig.ts";
+import type {
+  NpmjsPluginRepositoryConfig,
+  NpmPluginRepositoryConfig,
+} from "@flowscripter/dynamic-plugin-framework";
 
 export default interface BaseCLIFeatureOptions {
   readonly configFileSupportEnabled?: boolean;
@@ -12,6 +16,9 @@ export default interface BaseCLIFeatureOptions {
   readonly fetchServiceEnabled?: boolean;
   readonly upgradeServiceEnabled?: boolean;
   readonly upgradeLocationsConfig?: UpgradeLocationsConfig;
+  readonly pluginServiceEnabled?: boolean;
+  readonly pluginServiceRemoteConfig?: NpmjsPluginRepositoryConfig;
+  readonly pluginServiceLocalConfig?: NpmPluginRepositoryConfig;
   readonly validateAllCommands?: boolean;
   readonly promptingEnabled?: boolean;
 }

package/src/command/VersionCommand.ts

@@ -19,8 +19,8 @@ export default class VersionCommand implements GlobalCommand {
     let line = context.cliConfig.version;
     if (context.doesServiceExist(UPGRADE_SERVICE_ID)) {
       const upgradeService = context.getServiceById(UPGRADE_SERVICE_ID) as UpgradeService;
-      const result = await upgradeService.getUpgradeCheckResult().catch(() => undefined);
-      if (result?.updateAvailable) {
+      const result = await upgradeService.getUpgradeCheckResult();
+      if (result.status === "checked" && result.updateAvailable) {
         line += ` (${result.latestVersion} available, run '${context.cliConfig.name} upgrade')`;
       }
     }

package/src/launcher.ts

@@ -9,8 +9,6 @@ import type {
 } from "@flowscripter/dynamic-cli-framework-api";
 import type BaseCLIFeatureOptions from "./cli/BaseCLIFeatureOptions.ts";
 import DefaultRuntimeCLI from "./cli/DefaultRuntimeCLI.ts";
-import DynamicPluginRuntimeCLI from "./cli/DynamicPluginRuntimeCLI.ts";
-import type { MarketplacePluginManager } from "@flowscripter/dynamic-plugin-framework";
 
 export async function launchSingleCommandCLI(
   command: SubCommand,
@@ -75,36 +73,3 @@ export async function launchMultiCommandCLI(
 
   return await cli.run();
 }
-
-export async function launchDynamicPluginMultiCommandCLI(
-  pluginManager: MarketplacePluginManager,
-  commands: ReadonlyArray<Command>,
-  description?: string,
-  name?: string,
-  version?: string,
-  serviceProviders?: ReadonlyArray<ServiceProvider>,
-  options?: BaseCLIFeatureOptions,
-): Promise<RunResult> {
-  if (!name) {
-    name = path.basename(process.execPath);
-  }
-  const cliConfig: CLIConfig = {
-    description,
-    name,
-    version: version || "N/A",
-  };
-
-  const mergedOptions: BaseCLIFeatureOptions = {
-    ...options,
-    validateAllCommands:
-      (options?.validateAllCommands ?? false) ||
-      process.env.DYNAMIC_CLI_FRAMEWORK_VALIDATE_ALL !== undefined,
-  };
-  const cli = new DynamicPluginRuntimeCLI(cliConfig, pluginManager, mergedOptions);
-
-  commands.forEach((command) => cli.addCommand(command));
-
-  serviceProviders?.forEach((service) => cli.addServiceProvider(service));
-
-  return await cli.run();
-}