@flowscripter/dynamic-cli-framework 3.0.2 → 5.0.0

package/src/service/upgrade/DefaultUpgradeService.ts

@@ -18,9 +18,6 @@ import {
 } from "@flowscripter/dynamic-cli-framework-api";
 import semver from "semver";
 import type { UpgradeLocationsConfig } from "./UpgradeLocationsConfig.ts";
-import getLogger from "../../util/logger.ts";
-
-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.
@@ -28,6 +25,10 @@ const logger = getLogger("DefaultUpgradeService");
 // directly with no timeout, so its underlying network/spawn calls are never artificially cut off.
 export const VERSION_CHECK_TIMEOUT_MS = 250;
 
+type VersionLookupResult =
+  | { readonly ok: true; readonly version: string }
+  | { readonly ok: false; readonly error: Error };
+
 function describeSpawnFailure(result: Extract<SpawnResult, { ok: false }>): string {
   return "timedOut" in result
     ? "timed out"
@@ -43,7 +44,7 @@ const OS_LABELS: Record<SupportedOs, string> = {
 export default class DefaultUpgradeService implements UpgradeService {
   #spawnService: SpawnService | undefined;
   #fetchService: FetchService | undefined;
-  #upgradeCheckPromise: Promise<UpgradeCheckResult | undefined> | undefined;
+  #upgradeCheckPromise: Promise<UpgradeCheckResult> | undefined;
   readonly #config: UpgradeLocationsConfig;
   readonly #cliConfig: CLIConfig;
 
@@ -60,16 +61,16 @@ export default class DefaultUpgradeService implements UpgradeService {
     this.#fetchService = fetchService;
   }
 
-  public getUpgradeCheckResult(waitForResult = false): Promise<UpgradeCheckResult | undefined> {
+  public getUpgradeCheckResult(waitForResult = false): Promise<UpgradeCheckResult> {
     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;
@@ -80,8 +81,8 @@ export default class DefaultUpgradeService implements UpgradeService {
     }
     return Promise.race([
       this.#upgradeCheckPromise,
-      new Promise<undefined>((resolve) =>
-        setTimeout(() => resolve(undefined), VERSION_CHECK_TIMEOUT_MS),
+      new Promise<UpgradeCheckResult>((resolve) =>
+        setTimeout(() => resolve({ status: "pending" }), VERSION_CHECK_TIMEOUT_MS),
       ),
     ]);
   }
@@ -130,34 +131,39 @@ export default class DefaultUpgradeService implements UpgradeService {
     osOverride?: SupportedOs,
     archOverride?: SupportedArch,
     installMethodOverride?: InstallMethod,
-  ): Promise<UpgradeCheckResult | undefined> {
+  ): Promise<UpgradeCheckResult> {
     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,
@@ -176,13 +182,20 @@ export default class DefaultUpgradeService implements UpgradeService {
     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") };
     }
@@ -243,7 +256,7 @@ export default class DefaultUpgradeService implements UpgradeService {
     return process.execPath.startsWith("/usr/local/bin/");
   }
 
-  async #getLatestVersion(installMethod: InstallMethod): Promise<string | undefined> {
+  async #getLatestVersion(installMethod: InstallMethod): Promise<VersionLookupResult> {
     switch (installMethod) {
       case InstallMethod.GITHUB_RELEASE:
       case InstallMethod.LINUX_SCRIPT:
@@ -252,58 +265,91 @@ export default class DefaultUpgradeService implements UpgradeService {
         return this.#getLatestHomebrewVersion();
       case InstallMethod.WINGET:
         return this.#getLatestWingetVersion();
-      default:
-        return undefined;
     }
   }
 
-  async #getLatestGithubReleaseVersion(): Promise<string | undefined> {
-    if (!this.#config.githubRelease || !this.#fetchService) {
-      return undefined;
+  async #getLatestGithubReleaseVersion(): Promise<VersionLookupResult> {
+    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 {
+      // 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://api.github.com/repos/${owner}/${repo}/releases/latest`,
+        `https://github.com/${owner}/${repo}/releases/latest`,
+        { redirect: "manual" },
       );
-      if (!response.ok) {
-        return undefined;
+      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()) as { tag_name?: string };
-      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(): Promise<string | undefined> {
-    if (!this.#config.homebrew || !this.#fetchService) {
-      return undefined;
+  async #getLatestHomebrewVersion(): Promise<VersionLookupResult> {
+    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(): Promise<string | undefined> {
-    if (!this.#spawnService || !this.#config.winget) {
-      return undefined;
+  async #getLatestWingetVersion(): Promise<VersionLookupResult> {
+    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: string[] = [];
     const result = await this.#spawnService.spawn(
@@ -315,15 +361,15 @@ export default class DefaultUpgradeService implements UpgradeService {
       },
     );
     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(): Promise<void> {

package/src/service/upgrade/UpgradeServiceProvider.ts

@@ -71,8 +71,8 @@ export default class UpgradeServiceProvider implements ServiceProvider {
 
     const keyValueService = context.getServiceById(KEY_VALUE_SERVICE_ID) as KeyValueService;
 
-    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;
@@ -120,11 +120,11 @@ export default class UpgradeServiceProvider implements ServiceProvider {
     }
 
     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);
   }
 
@@ -135,7 +135,11 @@ export default class UpgradeServiceProvider implements ServiceProvider {
   ): Promise<void> {
     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/src/service/upgrade/command/UpgradeSubCommand.ts

@@ -53,7 +53,7 @@ export class UpgradeSubCommand implements SubCommand {
       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,
@@ -61,6 +61,20 @@ export class UpgradeSubCommand implements SubCommand {
       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`,

package/dist/src/cli/DynamicPluginRuntimeCLI.d.ts

@@ -1,20 +0,0 @@
-import type { MarketplacePluginManager } from "@flowscripter/dynamic-plugin-framework";
-import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
-import type BaseCLIFeatureOptions from "./BaseCLIFeatureOptions.ts";
-import type { RunResult } from "@flowscripter/dynamic-cli-framework-api";
-import DefaultRuntimeCLI from "./DefaultRuntimeCLI.ts";
-/**
- * Extension of {@link DefaultRuntimeCLI} that discovers and loads installed plugins before running.
- *
- * On each invocation of {@link run}, all locally installed plugins are discovered via the
- * {@link MarketplacePluginManager}. Commands provided by {@link CommandFactory} extensions and
- * service providers provided by {@link ServiceProviderFactory} extensions are registered before
- * the runner starts, so they participate in the full initialization lifecycle.
- */
-export default class DynamicPluginRuntimeCLI extends DefaultRuntimeCLI {
-    #private;
-    constructor(cliConfig: CLIConfig, pluginManager: MarketplacePluginManager, options?: BaseCLIFeatureOptions);
-    run(): Promise<RunResult>;
-    loadPlugins(): Promise<void>;
-}
-//# sourceMappingURL=DynamicPluginRuntimeCLI.d.ts.map

package/dist/src/cli/DynamicPluginRuntimeCLI.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DynamicPluginRuntimeCLI.d.ts","sourceRoot":"","sources":["../../../src/cli/DynamicPluginRuntimeCLI.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AAQvD;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,iBAAiB;;gBAIlE,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,wBAAwB,EACvC,OAAO,CAAC,EAAE,qBAAqB;IAOlB,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC;IAUlC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAgCnC"}

package/dist/src/cli/DynamicPluginRuntimeCLI.js

@@ -1,50 +0,0 @@
-import { RunState } from "@flowscripter/dynamic-cli-framework-api";
-import DefaultRuntimeCLI from "./DefaultRuntimeCLI.js";
-import DefaultPluginServiceProvider from "../service/plugin/DefaultPluginServiceProvider.js";
-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 process from "node:process";
-/**
- * Extension of {@link DefaultRuntimeCLI} that discovers and loads installed plugins before running.
- *
- * On each invocation of {@link run}, all locally installed plugins are discovered via the
- * {@link MarketplacePluginManager}. Commands provided by {@link CommandFactory} extensions and
- * service providers provided by {@link ServiceProviderFactory} extensions are registered before
- * the runner starts, so they participate in the full initialization lifecycle.
- */
-export default class DynamicPluginRuntimeCLI extends DefaultRuntimeCLI {
-    #pluginManager;
-    constructor(cliConfig, pluginManager, options) {
-        super(cliConfig, options);
-        this.#pluginManager = pluginManager;
-        this.addServiceProvider(new DefaultPluginServiceProvider(pluginManager));
-    }
-    async run() {
-        try {
-            await this.loadPlugins();
-        }
-        catch (err) {
-            console.error(err);
-            process.exit(RunState.RUNTIME_ERROR);
-        }
-        return super.run();
-    }
-    async loadPlugins() {
-        await this.#pluginManager.registerExtensions(DYNAMIC_CLI_FRAMEWORK_COMMAND_FACTORY_EXTENSION_POINT);
-        await this.#pluginManager.registerExtensions(DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT);
-        const commandFactoryExtensions = await this.#pluginManager.getRegisteredExtensions(DYNAMIC_CLI_FRAMEWORK_COMMAND_FACTORY_EXTENSION_POINT);
-        for (const ext of commandFactoryExtensions) {
-            const factory = (await this.#pluginManager.instantiate(ext.extensionHandle));
-            for (const command of factory.getCommands()) {
-                this.addCommand(command);
-            }
-        }
-        const spFactoryExtensions = await this.#pluginManager.getRegisteredExtensions(DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT);
-        for (const ext of spFactoryExtensions) {
-            const factory = (await this.#pluginManager.instantiate(ext.extensionHandle));
-            for (const sp of factory.getServiceProviders()) {
-                this.addServiceProvider(sp);
-            }
-        }
-    }
-}

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

@@ -1,15 +0,0 @@
-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 { MarketplacePluginManager } from "@flowscripter/dynamic-plugin-framework";
-import { type SpawnInterfaceAdapterOptions } from "./SpawnInterfaceAdapter.ts";
-import { type FetchInterfaceAdapterOptions } from "./FetchInterfaceAdapter.ts";
-export default class DefaultPluginServiceProvider implements ServiceProvider {
-    #private;
-    readonly serviceId = "PLUGIN_SERVICE";
-    readonly servicePriority: number;
-    constructor(pluginManager: MarketplacePluginManager, servicePriority?: number, spawnInterfaceAdapterOptions?: SpawnInterfaceAdapterOptions, fetchInterfaceAdapterOptions?: FetchInterfaceAdapterOptions);
-    getServiceInfo(_cliConfig: CLIConfig): Promise<ServiceInfo>;
-    initService(context: Context): Promise<void>;
-}
-//# sourceMappingURL=DefaultPluginServiceProvider.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"DefaultPluginServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/DefaultPluginServiceProvider.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;AAKzE,OAAO,KAAK,EAEV,wBAAwB,EAEzB,MAAM,wCAAwC,CAAC;AAIhD,OAA8B,EAC5B,KAAK,4BAA4B,EAClC,MAAM,4BAA4B,CAAC;AACpC,OAA8B,EAC5B,KAAK,4BAA4B,EAClC,MAAM,4BAA4B,CAAC;AAKpC,MAAM,CAAC,OAAO,OAAO,4BAA6B,YAAW,eAAe;;IAC1E,QAAQ,CAAC,SAAS,oBAAqB;IACvC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;gBAO/B,aAAa,EAAE,wBAAwB,EACvC,eAAe,SAAK,EACpB,4BAA4B,GAAE,4BAAiC,EAC/D,4BAA4B,GAAE,4BAAiC;IAQ3D,cAAc,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAQjE,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CA4B7C"}

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

@@ -1,56 +0,0 @@
-import { PRINTER_SERVICE_ID, SPAWN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
-import { FETCH_SERVICE_ID } 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 getLogger from "../../util/logger.js";
-const logger = getLogger("DefaultPluginServiceProvider");
-export default class DefaultPluginServiceProvider {
-    serviceId = PLUGIN_SERVICE_ID;
-    servicePriority;
-    #pluginManager;
-    #spawnInterfaceAdapterOptions;
-    #fetchInterfaceAdapterOptions;
-    #pluginService;
-    constructor(pluginManager, servicePriority = 50, spawnInterfaceAdapterOptions = {}, fetchInterfaceAdapterOptions = {}) {
-        this.#pluginManager = pluginManager;
-        this.servicePriority = servicePriority;
-        this.#spawnInterfaceAdapterOptions = spawnInterfaceAdapterOptions;
-        this.#fetchInterfaceAdapterOptions = fetchInterfaceAdapterOptions;
-    }
-    async getServiceInfo(_cliConfig) {
-        this.#pluginService = new DefaultPluginService(this.#pluginManager);
-        return {
-            service: this.#pluginService,
-            commands: [new PluginGroupCommand()],
-        };
-    }
-    initService(context) {
-        if (!context.doesServiceExist(SPAWN_SERVICE_ID)) {
-            logger.debug("SpawnService not available, plugin manager will spawn processes directly");
-        }
-        else if (!("setSpawn" in this.#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);
-            this.#pluginManager.setSpawn(adapter);
-        }
-        if (!context.doesServiceExist(FETCH_SERVICE_ID)) {
-            logger.debug("FetchService not available, plugin manager will fetch directly");
-        }
-        else if (!("setFetch" in this.#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);
-            this.#pluginManager.setFetch(adapter);
-        }
-        return Promise.resolve();
-    }
-}

package/src/cli/DynamicPluginRuntimeCLI.ts

@@ -1,77 +0,0 @@
-import type { MarketplacePluginManager } from "@flowscripter/dynamic-plugin-framework";
-import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
-import type BaseCLIFeatureOptions from "./BaseCLIFeatureOptions.ts";
-import type { RunResult } from "@flowscripter/dynamic-cli-framework-api";
-import { RunState } from "@flowscripter/dynamic-cli-framework-api";
-import DefaultRuntimeCLI from "./DefaultRuntimeCLI.ts";
-import DefaultPluginServiceProvider from "../service/plugin/DefaultPluginServiceProvider.ts";
-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 type { CommandFactory } from "@flowscripter/dynamic-cli-framework-api";
-import type { ServiceProviderFactory } from "@flowscripter/dynamic-cli-framework-api";
-import process from "node:process";
-
-/**
- * Extension of {@link DefaultRuntimeCLI} that discovers and loads installed plugins before running.
- *
- * On each invocation of {@link run}, all locally installed plugins are discovered via the
- * {@link MarketplacePluginManager}. Commands provided by {@link CommandFactory} extensions and
- * service providers provided by {@link ServiceProviderFactory} extensions are registered before
- * the runner starts, so they participate in the full initialization lifecycle.
- */
-export default class DynamicPluginRuntimeCLI extends DefaultRuntimeCLI {
-  readonly #pluginManager: MarketplacePluginManager;
-
-  constructor(
-    cliConfig: CLIConfig,
-    pluginManager: MarketplacePluginManager,
-    options?: BaseCLIFeatureOptions,
-  ) {
-    super(cliConfig, options);
-    this.#pluginManager = pluginManager;
-    this.addServiceProvider(new DefaultPluginServiceProvider(pluginManager));
-  }
-
-  override async run(): Promise<RunResult> {
-    try {
-      await this.loadPlugins();
-    } catch (err) {
-      console.error(err);
-      process.exit(RunState.RUNTIME_ERROR);
-    }
-    return super.run();
-  }
-
-  async loadPlugins(): Promise<void> {
-    await this.#pluginManager.registerExtensions(
-      DYNAMIC_CLI_FRAMEWORK_COMMAND_FACTORY_EXTENSION_POINT,
-    );
-    await this.#pluginManager.registerExtensions(
-      DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT,
-    );
-
-    const commandFactoryExtensions = await this.#pluginManager.getRegisteredExtensions(
-      DYNAMIC_CLI_FRAMEWORK_COMMAND_FACTORY_EXTENSION_POINT,
-    );
-    for (const ext of commandFactoryExtensions) {
-      const factory = (await this.#pluginManager.instantiate(
-        ext.extensionHandle,
-      )) as CommandFactory;
-      for (const command of factory.getCommands()) {
-        this.addCommand(command);
-      }
-    }
-
-    const spFactoryExtensions = await this.#pluginManager.getRegisteredExtensions(
-      DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT,
-    );
-    for (const ext of spFactoryExtensions) {
-      const factory = (await this.#pluginManager.instantiate(
-        ext.extensionHandle,
-      )) as ServiceProviderFactory;
-      for (const sp of factory.getServiceProviders()) {
-        this.addServiceProvider(sp);
-      }
-    }
-  }
-}

package/src/service/plugin/DefaultPluginServiceProvider.ts

@@ -1,82 +0,0 @@
-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 { PrinterService, SpawnService } from "@flowscripter/dynamic-cli-framework-api";
-import { PRINTER_SERVICE_ID, SPAWN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
-import type { FetchService } from "@flowscripter/dynamic-cli-framework-api";
-import { FETCH_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
-import type {
-  FetchCapable,
-  MarketplacePluginManager,
-  SpawnCapable,
-} from "@flowscripter/dynamic-plugin-framework";
-import { PLUGIN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
-import DefaultPluginService from "./DefaultPluginService.ts";
-import { PluginGroupCommand } from "./command/PluginGroupCommand.ts";
-import SpawnInterfaceAdapter, {
-  type SpawnInterfaceAdapterOptions,
-} from "./SpawnInterfaceAdapter.ts";
-import FetchInterfaceAdapter, {
-  type FetchInterfaceAdapterOptions,
-} from "./FetchInterfaceAdapter.ts";
-import getLogger from "../../util/logger.ts";
-
-const logger = getLogger("DefaultPluginServiceProvider");
-
-export default class DefaultPluginServiceProvider implements ServiceProvider {
-  readonly serviceId = PLUGIN_SERVICE_ID;
-  readonly servicePriority: number;
-  readonly #pluginManager: MarketplacePluginManager;
-  readonly #spawnInterfaceAdapterOptions: SpawnInterfaceAdapterOptions;
-  readonly #fetchInterfaceAdapterOptions: FetchInterfaceAdapterOptions;
-  #pluginService: DefaultPluginService | undefined;
-
-  constructor(
-    pluginManager: MarketplacePluginManager,
-    servicePriority = 50,
-    spawnInterfaceAdapterOptions: SpawnInterfaceAdapterOptions = {},
-    fetchInterfaceAdapterOptions: FetchInterfaceAdapterOptions = {},
-  ) {
-    this.#pluginManager = pluginManager;
-    this.servicePriority = servicePriority;
-    this.#spawnInterfaceAdapterOptions = spawnInterfaceAdapterOptions;
-    this.#fetchInterfaceAdapterOptions = fetchInterfaceAdapterOptions;
-  }
-
-  async getServiceInfo(_cliConfig: CLIConfig): Promise<ServiceInfo> {
-    this.#pluginService = new DefaultPluginService(this.#pluginManager);
-    return {
-      service: this.#pluginService,
-      commands: [new PluginGroupCommand()],
-    };
-  }
-
-  initService(context: Context): Promise<void> {
-    if (!context.doesServiceExist(SPAWN_SERVICE_ID)) {
-      logger.debug("SpawnService not available, plugin manager will spawn processes directly");
-    } else if (!("setSpawn" in this.#pluginManager)) {
-      logger.debug("Plugin manager does not support SpawnCapable, skipping spawn injection");
-    } else {
-      const spawnService = context.getServiceById(SPAWN_SERVICE_ID) as SpawnService;
-      const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
-      const adapter = new SpawnInterfaceAdapter(
-        spawnService,
-        printerService,
-        this.#spawnInterfaceAdapterOptions,
-      );
-      (this.#pluginManager as unknown as SpawnCapable).setSpawn(adapter);
-    }
-
-    if (!context.doesServiceExist(FETCH_SERVICE_ID)) {
-      logger.debug("FetchService not available, plugin manager will fetch directly");
-    } else if (!("setFetch" in this.#pluginManager)) {
-      logger.debug("Plugin manager does not support FetchCapable, skipping fetch injection");
-    } else {
-      const fetchService = context.getServiceById(FETCH_SERVICE_ID) as FetchService;
-      const adapter = new FetchInterfaceAdapter(fetchService, this.#fetchInterfaceAdapterOptions);
-      (this.#pluginManager as unknown as FetchCapable).setFetch(adapter);
-    }
-
-    return Promise.resolve();
-  }
-}