@flowscripter/dynamic-cli-framework 5.3.6 → 5.4.1

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;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,CA8ErE;CACF"}
+{"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,CAgFrE;CACF"}

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

@@ -20,7 +20,7 @@ export class PluginAddSubCommand {
         const pluginService = context.getServiceById(PLUGIN_SERVICE_ID);
         const { pluginId, version } = parsePluginSpecifier(argumentValues["pluginId"]);
         const searchLabel = version ? `${pluginId}@${version}` : pluginId;
-        await printerService.info(`Searching for plugin: ${searchLabel}\n`, Icon.INFORMATION);
+        await printerService.showSpinner(`Searching for plugin: ${searchLabel}`);
         let descriptor;
         for await (const d of pluginService.search({ text: pluginId })) {
             if (getPluginId(d) === pluginId || d.pluginId === pluginId) {
@@ -28,6 +28,7 @@ export class PluginAddSubCommand {
                 break;
             }
         }
+        await printerService.hideSpinner();
         if (descriptor && version) {
             // search only ever returns the latest version - substitute the explicitly requested
             // version so install() is asked for the correct one.
@@ -62,7 +63,7 @@ export class PluginAddSubCommand {
                 ? `Version ${versionToCheck} of plugin ${descriptor.pluginId} was not found in the configured plugin registry`
                 : `Plugin ${descriptor.pluginId} was not found in the configured plugin registry`);
         }
-        await printerService.info(`Installing ${installLabel}...\n`, Icon.INFORMATION);
+        await printerService.showSpinner(`Installing ${installLabel}...`);
         await pluginService.install(descriptor);
         // Look up the actually-installed version rather than trusting `descriptor.version`: when no
         // version was requested and the plugin wasn't found via search (direct-install fallback),
@@ -74,6 +75,7 @@ export class PluginAddSubCommand {
                 break;
             }
         }
+        await printerService.hideSpinner();
         await printerService.print(`Plugin ${descriptor.pluginId}@${installedVersion} installed.\n`, Icon.SUCCESS);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"PluginRemoveSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/plugin/command/PluginRemoveSubCommand.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;AAMxE,qBAAa,sBAAuB,YAAW,UAAU;IACvD,QAAQ,CAAC,IAAI,YAAY;IACzB,QAAQ,CAAC,WAAW,uCAAuC;IAC3D,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,CAQrE;CACF"}
+{"version":3,"file":"PluginRemoveSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/plugin/command/PluginRemoveSubCommand.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;AAMxE,qBAAa,sBAAuB,YAAW,UAAU;IACvD,QAAQ,CAAC,IAAI,YAAY;IACzB,QAAQ,CAAC,WAAW,uCAAuC;IAC3D,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,CASrE;CACF"}

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

@@ -17,8 +17,9 @@ export class PluginRemoveSubCommand {
         const printerService = context.getServiceById(PRINTER_SERVICE_ID);
         const pluginService = context.getServiceById(PLUGIN_SERVICE_ID);
         const pluginId = argumentValues["pluginId"];
-        await printerService.info(`Removing plugin: ${pluginId}...\n`, Icon.INFORMATION);
+        await printerService.showSpinner(`Removing plugin: ${pluginId}...`);
         await pluginService.uninstall(pluginId);
+        await printerService.hideSpinner();
         await printerService.print(`Plugin ${pluginId} removed.\n`, Icon.SUCCESS);
     }
 }

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

@@ -1,4 +1,4 @@
-import type { CLIConfig, FetchService, SpawnService, UpgradeCheckResult, UpgradeResult } from "@flowscripter/dynamic-cli-framework-api";
+import type { CLIConfig, FetchService, PrinterService, SpawnService, UpgradeCheckResult, UpgradeResult } from "@flowscripter/dynamic-cli-framework-api";
 import { InstallMethod, SupportedArch, SupportedOs, type UpgradeService } from "@flowscripter/dynamic-cli-framework-api";
 import type { UpgradeLocationsConfig } from "./UpgradeLocationsConfig.ts";
 export declare const VERSION_CHECK_TIMEOUT_MS = 250;
@@ -6,7 +6,7 @@ export declare function describeUpgradeCheckResult(result: UpgradeCheckResult):
 export default class DefaultUpgradeService implements UpgradeService {
     #private;
     constructor(config: UpgradeLocationsConfig, cliConfig: CLIConfig);
-    setDependencies(spawnService: SpawnService | undefined, fetchService: FetchService | undefined): void;
+    setDependencies(spawnService: SpawnService | undefined, fetchService: FetchService | undefined, printerService: PrinterService | undefined): void;
     getUpgradeCheckResult(waitForResult?: boolean): Promise<UpgradeCheckResult>;
     detectOs(): SupportedOs | undefined;
     detectArch(): SupportedArch | undefined;

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;AAY5C,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAI7E;AAQD,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;IAOlE,YAAmB,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS,EAGtE;IAEM,eAAe,CACpB,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,YAAY,EAAE,YAAY,GAAG,SAAS,GACrC,IAAI,CAGN;IAEM,qBAAqB,CAAC,aAAa,UAAQ,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0B/E;IAEM,QAAQ,IAAI,WAAW,GAAG,SAAS,CAWzC;IAEM,UAAU,IAAI,aAAa,GAAG,SAAS,CAS7C;IAEY,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAcpF;IAEY,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,CA+CxB;CAuRF"}
+{"version":3,"file":"DefaultUpgradeService.d.ts","sourceRoot":"","sources":["../../../../src/service/upgrade/DefaultUpgradeService.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,cAAc,EAEd,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;AAY5C,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAI7E;AAQD,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;IAQlE,YAAmB,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS,EAGtE;IAEM,eAAe,CACpB,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,cAAc,EAAE,cAAc,GAAG,SAAS,GACzC,IAAI,CAIN;IAoCM,qBAAqB,CAAC,aAAa,UAAQ,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0B/E;IAEM,QAAQ,IAAI,WAAW,GAAG,SAAS,CAWzC;IAEM,UAAU,IAAI,aAAa,GAAG,SAAS,CAS7C;IAEY,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAcpF;IAEY,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,CAsDxB;CAiRF"}

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

@@ -29,6 +29,7 @@ const OS_LABELS = {
 export default class DefaultUpgradeService {
     #spawnService;
     #fetchService;
+    #printerService;
     #upgradeCheckPromise;
     #config;
     #cliConfig;
@@ -36,9 +37,40 @@ export default class DefaultUpgradeService {
         this.#config = config;
         this.#cliConfig = cliConfig;
     }
-    setDependencies(spawnService, fetchService) {
+    setDependencies(spawnService, fetchService, printerService) {
         this.#spawnService = spawnService;
         this.#fetchService = fetchService;
+        this.#printerService = printerService;
+    }
+    // Mirrors SpawnInterfaceAdapter's plugin:add/plugin:remove pattern: wrap a spawned command's
+    // output in a quoted, marked block that's cleared on success (so a clean install stays quiet)
+    // but left on screen on failure (so the diagnostic output remains visible).
+    async #spawnQuoted(command) {
+        const spawnService = this.#spawnService;
+        const printerService = this.#printerService;
+        if (!printerService) {
+            return spawnService.spawn(command, { mode: "ignore" });
+        }
+        printerService.startQuote();
+        printerService.startMark();
+        // onOutput is synchronous and may be called concurrently for stdout/stderr lines, but
+        // printerService.info() is async and must not be invoked concurrently with itself - queue
+        // writes so they're applied one at a time, in call order.
+        let writeQueue = Promise.resolve();
+        const onOutput = (line) => {
+            writeQueue = writeQueue.then(() => printerService.info(`${line}\n`));
+        };
+        const result = await spawnService.spawn(command, { mode: "wrapped", onOutput });
+        await writeQueue;
+        printerService.endQuote();
+        printerService.endMark();
+        if (result.ok) {
+            await printerService.clearMarked();
+        }
+        else {
+            printerService.discardMark();
+        }
+        return result;
     }
     getUpgradeCheckResult(waitForResult = false) {
         if (!this.#upgradeCheckPromise) {
@@ -161,7 +193,13 @@ export default class DefaultUpgradeService {
         if (checkResult.installMethod === InstallMethod.GITHUB_RELEASE && !this.#fetchService) {
             return { ok: false, oldVersion, error: new Error("FetchService is not available") };
         }
+        if (this.#printerService) {
+            await this.#printerService.showSpinner(`Installing version ${checkResult.latestVersion}...`);
+        }
         try {
+            if (this.#printerService) {
+                await this.#printerService.hideSpinner();
+            }
             switch (checkResult.installMethod) {
                 case InstallMethod.LINUX_SCRIPT:
                     await this.#upgradeViaLinuxScript();
@@ -306,25 +344,21 @@ export default class DefaultUpgradeService {
     }
     async #upgradeViaLinuxScript() {
         const { scriptUrl } = this.#config.linuxScript;
-        const result = await this.#spawnService.spawn(["sh", "-c", `curl -fsSL ${scriptUrl} | sh`], {
-            mode: "ignore",
-        });
+        const result = await this.#spawnQuoted(["sh", "-c", `curl -fsSL ${scriptUrl} | sh`]);
         if (!result.ok) {
             throw new Error(`Install script failed: ${describeSpawnFailure(result)}`);
         }
     }
     async #upgradeViaHomebrew() {
         const { tap, formula } = this.#config.homebrew;
-        const result = await this.#spawnService.spawn(["brew", "upgrade", `${tap}/${formula}`], {
-            mode: "ignore",
-        });
+        const result = await this.#spawnQuoted(["brew", "upgrade", `${tap}/${formula}`]);
         if (!result.ok) {
             throw new Error(`brew upgrade failed: ${describeSpawnFailure(result)}`);
         }
     }
     async #upgradeViaWinget() {
         const { packageId } = this.#config.winget;
-        const result = await this.#spawnService.spawn([
+        const result = await this.#spawnQuoted([
             "winget",
             "upgrade",
             "--id",
@@ -332,7 +366,7 @@ export default class DefaultUpgradeService {
             "--silent",
             "--accept-package-agreements",
             "--accept-source-agreements",
-        ], { mode: "ignore" });
+        ]);
         if (!result.ok) {
             throw new Error(`winget upgrade failed: ${describeSpawnFailure(result)}`);
         }
@@ -356,11 +390,11 @@ export default class DefaultUpgradeService {
         await Bun.write(archivePath, archiveData);
         const currentExecutable = process.execPath;
         if (os === SupportedOs.WINDOWS) {
-            const extractResult = await this.#spawnService.spawn([
+            const extractResult = await this.#spawnQuoted([
                 "powershell",
                 "-Command",
                 `Expand-Archive -Path '${archivePath}' -DestinationPath '${tmpDir}' -Force`,
-            ], { mode: "ignore" });
+            ]);
             if (!extractResult.ok) {
                 throw new Error("Failed to extract release archive");
             }
@@ -370,23 +404,36 @@ export default class DefaultUpgradeService {
             // 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).
+            // may not exist, or may still be locked (e.g. another instance still running). Not quoted -
+            // this is expected to fail silently, there's nothing worth showing the user.
             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" });
+            const moveResult = await this.#spawnQuoted([
+                "cmd",
+                "/c",
+                "move",
+                "/y",
+                currentExecutable,
+                oldPath,
+            ]);
             if (!moveResult.ok) {
                 throw new Error("Failed to move current executable aside");
             }
-            const copyResult = await this.#spawnService.spawn(["cmd", "/c", "copy", "/y", extractedBinary, currentExecutable], { mode: "ignore" });
+            const copyResult = await this.#spawnQuoted([
+                "cmd",
+                "/c",
+                "copy",
+                "/y",
+                extractedBinary,
+                currentExecutable,
+            ]);
             if (!copyResult.ok) {
                 throw new Error("Failed to copy new executable into place");
             }
         }
         else {
-            const extractResult = await this.#spawnService.spawn(["unzip", "-o", archivePath, "-d", tmpDir], {
-                mode: "ignore",
-            });
+            const extractResult = await this.#spawnQuoted(["unzip", "-o", archivePath, "-d", tmpDir]);
             if (!extractResult.ok) {
                 throw new Error("Failed to extract release archive");
             }

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;IAKjC,YAAmB,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,EAGzE;IAEM,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAOhE;IAEY,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAsFxD;CAoCF"}
+{"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;IAKjC,YAAmB,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,EAGzE;IAEM,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAOhE;IAEY,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAuFxD;CAoCF"}

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

@@ -41,7 +41,8 @@ export default class UpgradeServiceProvider {
         if (fetchService === undefined) {
             logger.debug(() => "FetchService not available, upgrade version checks will be unavailable");
         }
-        upgradeService.setDependencies(spawnService, fetchService);
+        const printerService = context.getServiceById(PRINTER_SERVICE_ID);
+        upgradeService.setDependencies(spawnService, fetchService, printerService);
         void upgradeService.getUpgradeCheckResult();
         if (!context.doesServiceExist(PROMPTER_SERVICE_ID)) {
             logger.debug(() => "PrompterService not available, skipping auto-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;IAIF,YAAmB,cAAc,EAAE,qBAAqB,EAEvD;IAEY,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsD5E;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;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;IAIF,YAAmB,cAAc,EAAE,qBAAqB,EAEvD;IAEY,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4D5E;CACF"}

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

@@ -28,12 +28,15 @@ export class UpgradeSubCommand {
     async execute(context, argumentValues) {
         const printerService = context.getServiceById(PRINTER_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
             ? await this.#upgradeService.getUpgradeCheckResult(true)
             : await this.#upgradeService.checkForUpgrade(os, arch, 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);
             return;
@@ -48,7 +51,7 @@ export class UpgradeSubCommand {
             return;
         }
         if (!checkResult.updateAvailable) {
-            await printerService.print(`${cliName} is already up to date (${checkResult.currentVersion}).\n`);
+            await printerService.print(`${cliName} is already up to date: ${checkResult.currentVersion}\n`, Icon.INFORMATION);
             return;
         }
         const upgradeResult = await this.#upgradeService.upgrade(os, arch, installMethod);

package/package.json

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

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

@@ -29,7 +29,7 @@ export class PluginAddSubCommand implements SubCommand {
 
     const { pluginId, version } = parsePluginSpecifier(argumentValues["pluginId"] as string);
     const searchLabel = version ? `${pluginId}@${version}` : pluginId;
-    await printerService.info(`Searching for plugin: ${searchLabel}\n`, Icon.INFORMATION);
+    await printerService.showSpinner(`Searching for plugin: ${searchLabel}`);
 
     let descriptor: VersionedPluginDescriptor | undefined;
     for await (const d of pluginService.search({ text: pluginId })) {
@@ -38,6 +38,7 @@ export class PluginAddSubCommand implements SubCommand {
         break;
       }
     }
+    await printerService.hideSpinner();
 
     if (descriptor && version) {
       // search only ever returns the latest version - substitute the explicitly requested
@@ -83,7 +84,7 @@ export class PluginAddSubCommand implements SubCommand {
       );
     }
 
-    await printerService.info(`Installing ${installLabel}...\n`, Icon.INFORMATION);
+    await printerService.showSpinner(`Installing ${installLabel}...`);
     await pluginService.install(descriptor);
 
     // Look up the actually-installed version rather than trusting `descriptor.version`: when no
@@ -96,6 +97,7 @@ export class PluginAddSubCommand implements SubCommand {
         break;
       }
     }
+    await printerService.hideSpinner();
 
     await printerService.print(
       `Plugin ${descriptor.pluginId}@${installedVersion} installed.\n`,

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

@@ -25,8 +25,9 @@ export class PluginRemoveSubCommand implements SubCommand {
     const pluginService = context.getServiceById(PLUGIN_SERVICE_ID) as PluginService;
 
     const pluginId = argumentValues["pluginId"] as string;
-    await printerService.info(`Removing plugin: ${pluginId}...\n`, Icon.INFORMATION);
+    await printerService.showSpinner(`Removing plugin: ${pluginId}...`);
     await pluginService.uninstall(pluginId);
+    await printerService.hideSpinner();
     await printerService.print(`Plugin ${pluginId} removed.\n`, Icon.SUCCESS);
   }
 }

package/src/service/upgrade/DefaultUpgradeService.ts

@@ -5,6 +5,7 @@ import { dirname, join } from "node:path";
 import type {
   CLIConfig,
   FetchService,
+  PrinterService,
   SpawnResult,
   SpawnService,
   UpgradeCheckResult,
@@ -53,6 +54,7 @@ const OS_LABELS: Record<SupportedOs, string> = {
 export default class DefaultUpgradeService implements UpgradeService {
   #spawnService: SpawnService | undefined;
   #fetchService: FetchService | undefined;
+  #printerService: PrinterService | undefined;
   #upgradeCheckPromise: Promise<UpgradeCheckResult> | undefined;
   readonly #config: UpgradeLocationsConfig;
   readonly #cliConfig: CLIConfig;
@@ -65,9 +67,45 @@ export default class DefaultUpgradeService implements UpgradeService {
   public setDependencies(
     spawnService: SpawnService | undefined,
     fetchService: FetchService | undefined,
+    printerService: PrinterService | undefined,
   ): void {
     this.#spawnService = spawnService;
     this.#fetchService = fetchService;
+    this.#printerService = printerService;
+  }
+
+  // Mirrors SpawnInterfaceAdapter's plugin:add/plugin:remove pattern: wrap a spawned command's
+  // output in a quoted, marked block that's cleared on success (so a clean install stays quiet)
+  // but left on screen on failure (so the diagnostic output remains visible).
+  async #spawnQuoted(command: ReadonlyArray<string>): Promise<SpawnResult> {
+    const spawnService = this.#spawnService!;
+    const printerService = this.#printerService;
+    if (!printerService) {
+      return spawnService.spawn(command, { mode: "ignore" });
+    }
+
+    printerService.startQuote();
+    printerService.startMark();
+
+    // onOutput is synchronous and may be called concurrently for stdout/stderr lines, but
+    // printerService.info() is async and must not be invoked concurrently with itself - queue
+    // writes so they're applied one at a time, in call order.
+    let writeQueue: Promise<void> = Promise.resolve();
+    const onOutput = (line: string): void => {
+      writeQueue = writeQueue.then(() => printerService.info(`${line}\n`));
+    };
+
+    const result = await spawnService.spawn(command, { mode: "wrapped", onOutput });
+    await writeQueue;
+
+    printerService.endQuote();
+    printerService.endMark();
+    if (result.ok) {
+      await printerService.clearMarked();
+    } else {
+      printerService.discardMark();
+    }
+    return result;
   }
 
   public getUpgradeCheckResult(waitForResult = false): Promise<UpgradeCheckResult> {
@@ -214,7 +252,14 @@ export default class DefaultUpgradeService implements UpgradeService {
       return { ok: false, oldVersion, error: new Error("FetchService is not available") };
     }
 
+    if (this.#printerService) {
+      await this.#printerService.showSpinner(`Installing version ${checkResult.latestVersion}...`);
+    }
+
     try {
+      if (this.#printerService) {
+        await this.#printerService.hideSpinner();
+      }
       switch (checkResult.installMethod) {
         case InstallMethod.LINUX_SCRIPT:
           await this.#upgradeViaLinuxScript();
@@ -385,9 +430,7 @@ export default class DefaultUpgradeService implements UpgradeService {
 
   async #upgradeViaLinuxScript(): Promise<void> {
     const { scriptUrl } = this.#config.linuxScript!;
-    const result = await this.#spawnService!.spawn(["sh", "-c", `curl -fsSL ${scriptUrl} | sh`], {
-      mode: "ignore",
-    });
+    const result = await this.#spawnQuoted(["sh", "-c", `curl -fsSL ${scriptUrl} | sh`]);
     if (!result.ok) {
       throw new Error(`Install script failed: ${describeSpawnFailure(result)}`);
     }
@@ -395,9 +438,7 @@ export default class DefaultUpgradeService implements UpgradeService {
 
   async #upgradeViaHomebrew(): Promise<void> {
     const { tap, formula } = this.#config.homebrew!;
-    const result = await this.#spawnService!.spawn(["brew", "upgrade", `${tap}/${formula}`], {
-      mode: "ignore",
-    });
+    const result = await this.#spawnQuoted(["brew", "upgrade", `${tap}/${formula}`]);
     if (!result.ok) {
       throw new Error(`brew upgrade failed: ${describeSpawnFailure(result)}`);
     }
@@ -405,18 +446,15 @@ export default class DefaultUpgradeService implements UpgradeService {
 
   async #upgradeViaWinget(): Promise<void> {
     const { packageId } = this.#config.winget!;
-    const result = await this.#spawnService!.spawn(
-      [
-        "winget",
-        "upgrade",
-        "--id",
-        packageId,
-        "--silent",
-        "--accept-package-agreements",
-        "--accept-source-agreements",
-      ],
-      { mode: "ignore" },
-    );
+    const result = await this.#spawnQuoted([
+      "winget",
+      "upgrade",
+      "--id",
+      packageId,
+      "--silent",
+      "--accept-package-agreements",
+      "--accept-source-agreements",
+    ]);
     if (!result.ok) {
       throw new Error(`winget upgrade failed: ${describeSpawnFailure(result)}`);
     }
@@ -446,14 +484,11 @@ export default class DefaultUpgradeService implements UpgradeService {
     const currentExecutable = process.execPath;
 
     if (os === SupportedOs.WINDOWS) {
-      const extractResult = await this.#spawnService!.spawn(
-        [
-          "powershell",
-          "-Command",
-          `Expand-Archive -Path '${archivePath}' -DestinationPath '${tmpDir}' -Force`,
-        ],
-        { mode: "ignore" },
-      );
+      const extractResult = await this.#spawnQuoted([
+        "powershell",
+        "-Command",
+        `Expand-Archive -Path '${archivePath}' -DestinationPath '${tmpDir}' -Force`,
+      ]);
       if (!extractResult.ok) {
         throw new Error("Failed to extract release archive");
       }
@@ -464,32 +499,36 @@ export default class DefaultUpgradeService implements UpgradeService {
       // 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).
+      // may not exist, or may still be locked (e.g. another instance still running). Not quoted -
+      // this is expected to fail silently, there's nothing worth showing the user.
       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" },
-      );
+      const moveResult = await this.#spawnQuoted([
+        "cmd",
+        "/c",
+        "move",
+        "/y",
+        currentExecutable,
+        oldPath,
+      ]);
       if (!moveResult.ok) {
         throw new Error("Failed to move current executable aside");
       }
-      const copyResult = await this.#spawnService!.spawn(
-        ["cmd", "/c", "copy", "/y", extractedBinary, currentExecutable],
-        { mode: "ignore" },
-      );
+      const copyResult = await this.#spawnQuoted([
+        "cmd",
+        "/c",
+        "copy",
+        "/y",
+        extractedBinary,
+        currentExecutable,
+      ]);
       if (!copyResult.ok) {
         throw new Error("Failed to copy new executable into place");
       }
     } else {
-      const extractResult = await this.#spawnService!.spawn(
-        ["unzip", "-o", archivePath, "-d", tmpDir],
-        {
-          mode: "ignore",
-        },
-      );
+      const extractResult = await this.#spawnQuoted(["unzip", "-o", archivePath, "-d", tmpDir]);
       if (!extractResult.ok) {
         throw new Error("Failed to extract release archive");
       }

package/src/service/upgrade/UpgradeServiceProvider.ts

@@ -56,7 +56,8 @@ export default class UpgradeServiceProvider implements ServiceProvider {
     if (fetchService === undefined) {
       logger.debug(() => "FetchService not available, upgrade version checks will be unavailable");
     }
-    upgradeService.setDependencies(spawnService, fetchService);
+    const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
+    upgradeService.setDependencies(spawnService, fetchService, printerService);
 
     void upgradeService.getUpgradeCheckResult();
 

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

@@ -44,15 +44,20 @@ export class UpgradeSubCommand implements SubCommand {
   public async execute(context: Context, argumentValues: Values): Promise<void> {
     const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
     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
         ? await this.#upgradeService.getUpgradeCheckResult(true)
         : await this.#upgradeService.checkForUpgrade(os, arch, installMethod);
+
+    await printerService.hideSpinner();
     if (checkResult.status === "unsupported") {
       await printerService.error(
         `No upgrade location is configured for the detected or requested platform.\n`,
@@ -77,7 +82,8 @@ export class UpgradeSubCommand implements SubCommand {
 
     if (!checkResult.updateAvailable) {
       await printerService.print(
-        `${cliName} is already up to date (${checkResult.currentVersion}).\n`,
+        `${cliName} is already up to date: ${checkResult.currentVersion}\n`,
+        Icon.INFORMATION,
       );
       return;
     }