@flowscripter/dynamic-cli-framework 5.1.7 → 5.2.0

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

@@ -16,6 +16,7 @@ export default class SpawnInterfaceAdapter implements SpawnInterface {
     constructor(spawnService: SpawnService, printerService: PrinterService, options?: SpawnInterfaceAdapterOptions);
     spawn(command: ReadonlyArray<string>, options: {
         cwd: string;
+        timeoutMs?: number;
     }): Promise<SpawnResult>;
 }
 //# sourceMappingURL=SpawnInterfaceAdapter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SpawnInterfaceAdapter.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/SpawnInterfaceAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAE1F,MAAM,WAAW,4BAA4B;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;gBAOhE,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,OAAO,GAAE,4BAAiC;IAQ/B,KAAK,CAChB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,EAC9B,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GACvB,OAAO,CAAC,WAAW,CAAC;CAsCxB"}
+{"version":3,"file":"SpawnInterfaceAdapter.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/SpawnInterfaceAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAE1F,MAAM,WAAW,4BAA4B;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;gBAOhE,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,OAAO,GAAE,4BAAiC;IAQ/B,KAAK,CAChB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,EAC9B,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAC3C,OAAO,CAAC,WAAW,CAAC;CAuCxB"}

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

@@ -30,6 +30,7 @@ export default class SpawnInterfaceAdapter {
             cwd: options.cwd,
             mode: "wrapped",
             onOutput,
+            timeoutMs: options.timeoutMs,
         });
         await writeQueue;
         this.#printerService.endQuote();
@@ -47,7 +48,7 @@ export default class SpawnInterfaceAdapter {
             return { ok: true, exitCode: result.exitCode };
         }
         return "timedOut" in result
-            ? { ok: false, error: new Error("Command timed out") }
+            ? { ok: false, timedOut: true }
             : { ok: false, exitCode: result.exitCode, error: result.error };
     }
 }

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;CAgEvE"}
+{"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;CA+EvE"}

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

@@ -64,6 +64,16 @@ export class PluginAddSubCommand {
         }
         await printerService.info(`Installing ${installLabel}...\n`, Icon.INFORMATION);
         await pluginService.install(descriptor);
-        await printerService.print(`Plugin ${descriptor.pluginId} installed.\n`, Icon.SUCCESS);
+        // 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),
+        // `descriptor.version` is still the literal placeholder "latest", not a real version number.
+        let installedVersion = descriptor.version;
+        for await (const installed of pluginService.listInstalled()) {
+            if (installed.pluginId === descriptor.pluginId) {
+                installedVersion = installed.version;
+                break;
+            }
+        }
+        await printerService.print(`Plugin ${descriptor.pluginId}@${installedVersion} installed.\n`, Icon.SUCCESS);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "5.1.7",
+  "version": "5.2.0",
   "description": "A framework for developing CLI applications which supports dynamic discovery and installation of new commands",
   "keywords": [
     "bun",
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@flowscripter/dynamic-cli-framework-api": "^2.3.0",
-    "@flowscripter/dynamic-plugin-framework": "^2.2.1",
+    "@flowscripter/dynamic-plugin-framework": "^2.2.2",
     "emphasize": "^7.0.0",
     "fastest-levenshtein": "^1.0.16",
     "figlet": "^1.11.0",

package/src/service/plugin/SpawnInterfaceAdapter.ts

@@ -32,7 +32,7 @@ export default class SpawnInterfaceAdapter implements SpawnInterface {
 
   public async spawn(
     command: ReadonlyArray<string>,
-    options: { cwd: string },
+    options: { cwd: string; timeoutMs?: number },
   ): Promise<SpawnResult> {
     this.#printerService.startQuote(this.#quoteColor);
     this.#printerService.startMark();
@@ -49,6 +49,7 @@ export default class SpawnInterfaceAdapter implements SpawnInterface {
       cwd: options.cwd,
       mode: "wrapped",
       onOutput,
+      timeoutMs: options.timeoutMs,
     });
 
     await writeQueue;
@@ -68,7 +69,7 @@ export default class SpawnInterfaceAdapter implements SpawnInterface {
       return { ok: true, exitCode: result.exitCode };
     }
     return "timedOut" in result
-      ? { ok: false, error: new Error("Command timed out") }
+      ? { ok: false, timedOut: true }
       : { ok: false, exitCode: result.exitCode, error: result.error };
   }
 }

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

@@ -85,6 +85,21 @@ export class PluginAddSubCommand implements SubCommand {
 
     await printerService.info(`Installing ${installLabel}...\n`, Icon.INFORMATION);
     await pluginService.install(descriptor);
-    await printerService.print(`Plugin ${descriptor.pluginId} installed.\n`, Icon.SUCCESS);
+
+    // 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),
+    // `descriptor.version` is still the literal placeholder "latest", not a real version number.
+    let installedVersion = descriptor.version;
+    for await (const installed of pluginService.listInstalled()) {
+      if (installed.pluginId === descriptor.pluginId) {
+        installedVersion = installed.version;
+        break;
+      }
+    }
+
+    await printerService.print(
+      `Plugin ${descriptor.pluginId}@${installedVersion} installed.\n`,
+      Icon.SUCCESS,
+    );
   }
 }