@flowscripter/dynamic-cli-framework 1.7.3 → 1.7.5

package/src/api/service/core/TableGeneratorService.ts

@@ -32,6 +32,7 @@ export interface CellOptions {
 }
 
 export default interface TableGeneratorService {
+  createTable(rowCount: number, columnCount: number, options?: TableOptions): Table;
   render(table: Table): string;
 }
 

package/src/cli/BaseCLI.ts

@@ -51,11 +51,6 @@ import ArgumentPrompterServiceProvider from "../service/argumentPrompter/Argumen
 import DefaultCompletionService from "../service/completion/DefaultCompletionService.ts";
 import CompletionServiceProvider from "../service/completion/CompletionServiceProvider.ts";
 import ImagePrinterServiceProvider from "../service/imagePrinter/ImagePrinterServiceProvider.ts";
-import {
-  CompletionCompleteSubCommand,
-  CompletionGroupCommand,
-  CompletionIntegrationSubCommand,
-} from "../command/CompletionCommand.ts";
 const logger = getLogger("BaseCLI");
 
 /**
@@ -233,10 +228,11 @@ export default class BaseCLI implements CLI {
       this.addServiceProvider(new ImagePrinterServiceProvider(55, this.#stdoutTerminal));
     }
 
-    let completionService: DefaultCompletionService | undefined;
     if (this.#options.completionServiceEnabled) {
-      completionService = new DefaultCompletionService();
-      this.addServiceProvider(new CompletionServiceProvider(5, completionService));
+      const completionService = new DefaultCompletionService();
+      this.addServiceProvider(
+        new CompletionServiceProvider(5, completionService, this.#commandRegistry),
+      );
     }
 
     const configurationServiceProvider = new ConfigurationServiceProvider(
@@ -303,16 +299,6 @@ export default class BaseCLI implements CLI {
       // register the version command
       this.#commandRegistry.addCommand(new VersionCommand());
 
-      // register completion commands (need CommandRegistry reference like help commands)
-      if (completionService) {
-        completionService.setCommandRegistry(this.#commandRegistry);
-        const integrationCommand = new CompletionIntegrationSubCommand();
-        const completeCommand = new CompletionCompleteSubCommand();
-        this.#commandRegistry.addCommand(
-          new CompletionGroupCommand(integrationCommand, completeCommand),
-        );
-      }
-
       // run...
       const runResult = await run(
         args,
@@ -345,7 +331,6 @@ export default class BaseCLI implements CLI {
       if (shutdownState.shutdownRequested || (error as Error).message === "Interrupted") {
         return { runState: RunState.INTERRUPTED };
       }
-      logger.error("Runtime error: %s", (error as Error).message);
       await printRuntimeError(this.#context, error as Error);
       return {
         runState: RunState.RUNTIME_ERROR,

package/src/service/completion/CompletionServiceProvider.ts

@@ -13,7 +13,11 @@ import { KEY_VALUE_SERVICE_ID } from "../../api/service/core/KeyValueService.ts"
 import type KeyValueService from "../../api/service/core/KeyValueService.ts";
 import { Icon, PRINTER_SERVICE_ID } from "../../api/service/core/PrinterService.ts";
 import type PrinterService from "../../api/service/core/PrinterService.ts";
+import type CommandRegistry from "../../runtime/registry/CommandRegistry.ts";
 import getLogger from "../../util/logger.ts";
+import { CompletionIntegrationSubCommand } from "./command/CompletionIntegrationSubCommand.ts";
+import { CompletionCompleteSubCommand } from "./command/CompletionCompleteSubCommand.ts";
+import { CompletionGroupCommand } from "./command/CompletionGroupCommand.ts";
 
 const logger = getLogger("CompletionServiceProvider");
 
@@ -23,16 +27,26 @@ export default class CompletionServiceProvider implements ServiceProvider {
   readonly #completionService: DefaultCompletionService;
   #cliName = "";
 
-  public constructor(servicePriority: number, completionService: DefaultCompletionService) {
+  public constructor(
+    servicePriority: number,
+    completionService: DefaultCompletionService,
+    commandRegistry: CommandRegistry,
+  ) {
     this.servicePriority = servicePriority;
     this.#completionService = completionService;
+    this.#completionService.setCommandRegistry(commandRegistry);
   }
 
   public getServiceInfo(cliConfig: CLIConfig): Promise<ServiceInfo> {
     this.#cliName = cliConfig.name;
     return Promise.resolve({
       service: this.#completionService,
-      commands: [],
+      commands: [
+        new CompletionGroupCommand(
+          new CompletionIntegrationSubCommand(),
+          new CompletionCompleteSubCommand(),
+        ),
+      ],
     });
   }
 
@@ -119,7 +133,6 @@ export default class CompletionServiceProvider implements ServiceProvider {
       await this.#installCompletion(context, shellType);
       await keyValueService.setKey("completion-status", "installed");
     } catch (error) {
-      logger.error("Failed to install completion: %s", (error as Error).message);
       if (context.doesServiceExist(PRINTER_SERVICE_ID)) {
         const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
         await printerService.error(

package/src/service/completion/command/CompletionCompleteSubCommand.ts

@@ -0,0 +1,59 @@
+import type SubCommand from "../../../api/command/SubCommand.ts";
+import type Option from "../../../api/argument/Option.ts";
+import type Positional from "../../../api/argument/Positional.ts";
+import type Context from "../../../api/Context.ts";
+import {
+  type ArgumentValues,
+  ArgumentValueTypeName,
+} from "../../../api/argument/ArgumentValueTypes.ts";
+import { COMPLETION_SERVICE_ID, ShellType } from "../../../api/service/core/CompletionService.ts";
+import type DefaultCompletionService from "../DefaultCompletionService.ts";
+import { PRINTER_SERVICE_ID } from "../../../api/service/core/PrinterService.ts";
+import type PrinterService from "../../../api/service/core/PrinterService.ts";
+
+export class CompletionCompleteSubCommand implements SubCommand {
+  readonly name = "complete";
+  readonly description = "Generate completions for shell integration";
+  readonly enableConfiguration = false;
+  readonly disableGenericHelpDisplay = true;
+
+  readonly options: ReadonlyArray<Option> = [];
+
+  readonly positionals: ReadonlyArray<Positional> = [
+    {
+      name: "shell",
+      type: ArgumentValueTypeName.STRING,
+      allowableValues: Object.values(ShellType),
+      description: "Shell type",
+    },
+    {
+      name: "args",
+      type: ArgumentValueTypeName.STRING,
+      isVarargMultiple: true,
+      isVarargOptional: true,
+      description: "Shell-specific completion context arguments",
+    },
+  ];
+
+  async execute(context: Context, argumentValues: ArgumentValues): Promise<void> {
+    const completionService = context.getServiceById(
+      COMPLETION_SERVICE_ID,
+    ) as DefaultCompletionService;
+    const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
+
+    const shellType = argumentValues.shell as ShellType;
+    const args = (argumentValues.args || []) as string[];
+
+    const completionContext = completionService.parseCompletionContext(shellType, args);
+    const completions = await completionService.generateCompletions(
+      shellType,
+      completionContext.line,
+      completionContext.cursorPosition,
+    );
+
+    const output = completionService.formatCompletions(shellType, completions);
+    if (output.length > 0) {
+      await printerService.print(output + "\n");
+    }
+  }
+}

package/src/service/completion/command/CompletionGroupCommand.ts

@@ -0,0 +1,21 @@
+import type GroupCommand from "../../../api/command/GroupCommand.ts";
+import type SubCommand from "../../../api/command/SubCommand.ts";
+import type Context from "../../../api/Context.ts";
+import type { CompletionIntegrationSubCommand } from "./CompletionIntegrationSubCommand.ts";
+import type { CompletionCompleteSubCommand } from "./CompletionCompleteSubCommand.ts";
+
+export class CompletionGroupCommand implements GroupCommand {
+  readonly name = "completion";
+  readonly description = "Manage shell auto-completion";
+  readonly enableConfiguration = false;
+  readonly memberSubCommands: ReadonlyArray<SubCommand>;
+
+  constructor(
+    integrationCommand: CompletionIntegrationSubCommand,
+    completeCommand: CompletionCompleteSubCommand,
+  ) {
+    this.memberSubCommands = [integrationCommand, completeCommand];
+  }
+
+  async execute(_context: Context): Promise<void> {}
+}

package/src/{command/CompletionCommand.ts → service/completion/command/CompletionIntegrationSubCommand.ts}

@@ -1,14 +1,16 @@
 import process from "node:process";
-import type GroupCommand from "../api/command/GroupCommand.ts";
-import type SubCommand from "../api/command/SubCommand.ts";
-import type Option from "../api/argument/Option.ts";
-import type Positional from "../api/argument/Positional.ts";
-import type Context from "../api/Context.ts";
-import { type ArgumentValues, ArgumentValueTypeName } from "../api/argument/ArgumentValueTypes.ts";
-import { COMPLETION_SERVICE_ID, ShellType } from "../api/service/core/CompletionService.ts";
-import type DefaultCompletionService from "../service/completion/DefaultCompletionService.ts";
-import { Icon, PRINTER_SERVICE_ID } from "../api/service/core/PrinterService.ts";
-import type PrinterService from "../api/service/core/PrinterService.ts";
+import type SubCommand from "../../../api/command/SubCommand.ts";
+import type Option from "../../../api/argument/Option.ts";
+import type Positional from "../../../api/argument/Positional.ts";
+import type Context from "../../../api/Context.ts";
+import {
+  type ArgumentValues,
+  ArgumentValueTypeName,
+} from "../../../api/argument/ArgumentValueTypes.ts";
+import { COMPLETION_SERVICE_ID, ShellType } from "../../../api/service/core/CompletionService.ts";
+import type DefaultCompletionService from "../DefaultCompletionService.ts";
+import { Icon, PRINTER_SERVICE_ID } from "../../../api/service/core/PrinterService.ts";
+import type PrinterService from "../../../api/service/core/PrinterService.ts";
 
 export class CompletionIntegrationSubCommand implements SubCommand {
   readonly name = "integration";
@@ -94,66 +96,3 @@ export class CompletionIntegrationSubCommand implements SubCommand {
     );
   }
 }
-
-export class CompletionCompleteSubCommand implements SubCommand {
-  readonly name = "complete";
-  readonly description = "Generate completions for shell integration";
-  readonly enableConfiguration = false;
-  readonly disableGenericHelpDisplay = true;
-
-  readonly options: ReadonlyArray<Option> = [];
-
-  readonly positionals: ReadonlyArray<Positional> = [
-    {
-      name: "shell",
-      type: ArgumentValueTypeName.STRING,
-      allowableValues: Object.values(ShellType),
-      description: "Shell type",
-    },
-    {
-      name: "args",
-      type: ArgumentValueTypeName.STRING,
-      isVarargMultiple: true,
-      isVarargOptional: true,
-      description: "Shell-specific completion context arguments",
-    },
-  ];
-
-  async execute(context: Context, argumentValues: ArgumentValues): Promise<void> {
-    const completionService = context.getServiceById(
-      COMPLETION_SERVICE_ID,
-    ) as DefaultCompletionService;
-    const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
-
-    const shellType = argumentValues.shell as ShellType;
-    const args = (argumentValues.args || []) as string[];
-
-    const completionContext = completionService.parseCompletionContext(shellType, args);
-    const completions = await completionService.generateCompletions(
-      shellType,
-      completionContext.line,
-      completionContext.cursorPosition,
-    );
-
-    const output = completionService.formatCompletions(shellType, completions);
-    if (output.length > 0) {
-      await printerService.print(output + "\n");
-    }
-  }
-}
-
-export class CompletionGroupCommand implements GroupCommand {
-  readonly name = "completions";
-  readonly description = "Manage shell auto-completion";
-  readonly enableConfiguration = false;
-  readonly memberSubCommands: ReadonlyArray<SubCommand>;
-
-  constructor(
-    integrationCommand: CompletionIntegrationSubCommand,
-    completeCommand: CompletionCompleteSubCommand,
-  ) {
-    this.memberSubCommands = [integrationCommand, completeCommand];
-  }
-
-  async execute(_context: Context): Promise<void> {}
-}

package/src/service/completion/shell/bash.ts

@@ -16,7 +16,7 @@ export default class BashShellHandler implements ShellHandler {
     return [
       `_${cliName}_completions() {`,
       `  local IFS=$'\\n'`,
-      `  COMPREPLY=( $("${executablePath}" completions:complete bash "\${COMP_LINE}" "\${COMP_POINT}" 2>/dev/null) )`,
+      `  COMPREPLY=( $("${executablePath}" completion:complete bash "\${COMP_LINE}" "\${COMP_POINT}" 2>/dev/null) )`,
       `}`,
       `complete -F _${cliName}_completions ${cliName}`,
     ].join("\n");

package/src/service/completion/shell/fish.ts

@@ -13,7 +13,7 @@ export default class FishShellHandler implements ShellHandler {
   }
 
   getBootstrapScript(cliName: string, executablePath: string): string {
-    return `complete -c ${cliName} -f -a '("${executablePath}" completions:complete fish (commandline -cp) (commandline -C) 2>/dev/null)'`;
+    return `complete -c ${cliName} -f -a '("${executablePath}" completion:complete fish (commandline -cp) (commandline -C) 2>/dev/null)'`;
   }
 
   validateEnvironment(): Promise<boolean> {

package/src/service/completion/shell/powershell.ts

@@ -19,7 +19,7 @@ export default class PowerShellShellHandler implements ShellHandler {
     return [
       `Register-ArgumentCompleter -Native -CommandName ${cliName} -ScriptBlock {`,
       `  param($wordToComplete, $commandAst, $cursorPosition)`,
-      `  $completions = & "${executablePath}" completions:complete powershell "$commandAst" "$cursorPosition" 2>$null`,
+      `  $completions = & "${executablePath}" completion:complete powershell "$commandAst" "$cursorPosition" 2>$null`,
       `  $completions -split '\\n' | ForEach-Object {`,
       `    [System.Management.Automation.CompletionResult]::new($_, $_, 'ParameterValue', $_)`,
       `  }`,

package/src/service/completion/shell/zsh.ts

@@ -16,7 +16,7 @@ export default class ZshShellHandler implements ShellHandler {
     return [
       `_${cliName}_completions() {`,
       `  local -a completions`,
-      `  completions=("\${(@f)$("${executablePath}" completions:complete zsh "\${words}" "\${CURSOR}" 2>/dev/null)}")`,
+      `  completions=("\${(@f)$("${executablePath}" completion:complete zsh "\${words}" "\${CURSOR}" 2>/dev/null)}")`,
       `  _describe '${cliName}' completions`,
       `}`,
       `compdef _${cliName}_completions ${cliName}`,

package/src/service/plugin/DefaultPluginServiceProvider.ts

@@ -1,10 +1,10 @@
-import type { ServiceProvider, ServiceInfo } from "../../api/service/ServiceProvider.ts";
+import type { ServiceInfo, ServiceProvider } from "../../api/service/ServiceProvider.ts";
 import type Context from "../../api/Context.ts";
 import type CLIConfig from "../../api/CLIConfig.ts";
 import type { MarketplacePluginManager } from "@flowscripter/dynamic-plugin-framework";
 import { PLUGIN_SERVICE_ID } from "../../api/service/core/PluginService.ts";
 import DefaultPluginService from "./DefaultPluginService.ts";
-import { PluginGroupCommand } from "../../command/PluginCommand.ts";
+import { PluginGroupCommand } from "./command/PluginGroupCommand.ts";
 
 export default class DefaultPluginServiceProvider implements ServiceProvider {
   readonly serviceId = PLUGIN_SERVICE_ID;

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

@@ -0,0 +1,64 @@
+import type SubCommand from "../../../api/command/SubCommand.ts";
+import type Context from "../../../api/Context.ts";
+import type { ArgumentValues } from "../../../api/argument/ArgumentValueTypes.ts";
+import { ArgumentValueTypeName } from "../../../api/argument/ArgumentValueTypes.ts";
+import type PrinterService from "../../../api/service/core/PrinterService.ts";
+import { Icon, PRINTER_SERVICE_ID } from "../../../api/service/core/PrinterService.ts";
+import { PLUGIN_SERVICE_ID } from "../../../api/service/core/PluginService.ts";
+import type PluginService from "../../../api/service/core/PluginService.ts";
+import type { VersionedPluginDescriptor } from "@flowscripter/dynamic-plugin-framework";
+import { getPluginId } from "./getPluginId.ts";
+
+export class PluginAddSubCommand implements SubCommand {
+  readonly name = "add";
+  readonly description = "Install a remote plugin";
+  readonly enableConfiguration = false;
+  readonly options = [];
+  readonly positionals = [
+    {
+      name: "pluginId",
+      description: "Plugin ID to install (e.g. @scope/name)",
+      type: ArgumentValueTypeName.STRING,
+    },
+  ];
+
+  async execute(context: Context, argumentValues: ArgumentValues): Promise<void> {
+    const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
+    const pluginService = context.getServiceById(PLUGIN_SERVICE_ID) as PluginService;
+
+    const pluginId = argumentValues["pluginId"] as string;
+    await printerService.info(`Searching for plugin: ${pluginId}\n`, Icon.INFORMATION);
+
+    let descriptor: VersionedPluginDescriptor | undefined;
+    for await (const d of pluginService.search({ text: pluginId })) {
+      if (getPluginId(d) === pluginId || d.pluginId === pluginId) {
+        descriptor = d;
+        break;
+      }
+    }
+
+    if (!descriptor) {
+      // Search did not find an exact match - attempt direct install by plugin ID.
+      // This handles cases where the package exists on the registry but is not
+      // returned by search (e.g. recently published or low search ranking).
+      await printerService.info(
+        `Plugin not found via search, attempting direct install of ${pluginId}...\n`,
+        Icon.INFORMATION,
+      );
+      const parts = pluginId.startsWith("@") ? pluginId.slice(1).split("/") : [undefined, pluginId];
+      const scope = pluginId.startsWith("@") ? `@${parts[0]}` : undefined;
+      const name = pluginId.startsWith("@") ? parts[1]! : pluginId;
+      descriptor = {
+        pluginId,
+        scope,
+        name,
+        version: "latest",
+        extensionPoints: [],
+      };
+    }
+
+    await printerService.info(`Installing ${descriptor.pluginId}...\n`, Icon.INFORMATION);
+    await pluginService.install(descriptor);
+    await printerService.print(`Plugin ${descriptor.pluginId} installed.\n`, Icon.SUCCESS);
+  }
+}

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

@@ -0,0 +1,27 @@
+import type GroupCommand from "../../../api/command/GroupCommand.ts";
+import type SubCommand from "../../../api/command/SubCommand.ts";
+import type Context from "../../../api/Context.ts";
+import { PluginListSubCommand } from "./PluginListSubCommand.ts";
+import { PluginSearchSubCommand } from "./PluginSearchSubCommand.ts";
+import { PluginAddSubCommand } from "./PluginAddSubCommand.ts";
+import { PluginRemoveSubCommand } from "./PluginRemoveSubCommand.ts";
+import { PluginUpgradeSubCommand } from "./PluginUpgradeSubCommand.ts";
+
+export class PluginGroupCommand implements GroupCommand {
+  readonly name = "plugin";
+  readonly description = "Manage CLI plugins";
+  readonly enableConfiguration = false;
+  readonly memberSubCommands: ReadonlyArray<SubCommand>;
+
+  constructor() {
+    this.memberSubCommands = [
+      new PluginListSubCommand(),
+      new PluginSearchSubCommand(),
+      new PluginAddSubCommand(),
+      new PluginRemoveSubCommand(),
+      new PluginUpgradeSubCommand(),
+    ];
+  }
+
+  async execute(_context: Context): Promise<void> {}
+}

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

@@ -0,0 +1,33 @@
+import type SubCommand from "../../../api/command/SubCommand.ts";
+import type Context from "../../../api/Context.ts";
+import type { ArgumentValues } from "../../../api/argument/ArgumentValueTypes.ts";
+import type PrinterService from "../../../api/service/core/PrinterService.ts";
+import { PRINTER_SERVICE_ID } from "../../../api/service/core/PrinterService.ts";
+import { PLUGIN_SERVICE_ID } from "../../../api/service/core/PluginService.ts";
+import type PluginService from "../../../api/service/core/PluginService.ts";
+import { getPluginId } from "./getPluginId.ts";
+
+export class PluginListSubCommand implements SubCommand {
+  readonly name = "list";
+  readonly description = "List locally installed plugins";
+  readonly enableConfiguration = false;
+  readonly options = [];
+  readonly positionals = [];
+
+  async execute(context: Context, _argumentValues: ArgumentValues): Promise<void> {
+    const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
+    const pluginService = context.getServiceById(PLUGIN_SERVICE_ID) as PluginService;
+
+    let found = false;
+    for await (const descriptor of pluginService.listInstalled()) {
+      if (!found) {
+        found = true;
+        await printerService.print("Installed plugins:\n");
+      }
+      await printerService.print(`  ${getPluginId(descriptor)}  ${descriptor.version}\n`);
+    }
+    if (!found) {
+      await printerService.print("No plugins installed.\n");
+    }
+  }
+}

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

@@ -0,0 +1,32 @@
+import type SubCommand from "../../../api/command/SubCommand.ts";
+import type Context from "../../../api/Context.ts";
+import type { ArgumentValues } from "../../../api/argument/ArgumentValueTypes.ts";
+import { ArgumentValueTypeName } from "../../../api/argument/ArgumentValueTypes.ts";
+import type PrinterService from "../../../api/service/core/PrinterService.ts";
+import { Icon, PRINTER_SERVICE_ID } from "../../../api/service/core/PrinterService.ts";
+import { PLUGIN_SERVICE_ID } from "../../../api/service/core/PluginService.ts";
+import type PluginService from "../../../api/service/core/PluginService.ts";
+
+export class PluginRemoveSubCommand implements SubCommand {
+  readonly name = "remove";
+  readonly description = "Remove a locally installed plugin";
+  readonly enableConfiguration = false;
+  readonly options = [];
+  readonly positionals = [
+    {
+      name: "pluginId",
+      description: "Plugin ID to remove (e.g. @scope/name)",
+      type: ArgumentValueTypeName.STRING,
+    },
+  ];
+
+  async execute(context: Context, argumentValues: ArgumentValues): Promise<void> {
+    const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
+    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 pluginService.uninstall(pluginId);
+    await printerService.print(`Plugin ${pluginId} removed.\n`, Icon.SUCCESS);
+  }
+}

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

@@ -0,0 +1,42 @@
+import type SubCommand from "../../../api/command/SubCommand.ts";
+import type Context from "../../../api/Context.ts";
+import type { ArgumentValues } from "../../../api/argument/ArgumentValueTypes.ts";
+import { ArgumentValueTypeName } from "../../../api/argument/ArgumentValueTypes.ts";
+import type PrinterService from "../../../api/service/core/PrinterService.ts";
+import { PRINTER_SERVICE_ID } from "../../../api/service/core/PrinterService.ts";
+import { PLUGIN_SERVICE_ID } from "../../../api/service/core/PluginService.ts";
+import type PluginService from "../../../api/service/core/PluginService.ts";
+import { getPluginId } from "./getPluginId.ts";
+
+export class PluginSearchSubCommand implements SubCommand {
+  readonly name = "search";
+  readonly description = "Search remote plugins";
+  readonly enableConfiguration = false;
+  readonly options = [];
+  readonly positionals = [
+    {
+      name: "query",
+      description: "Search query",
+      type: ArgumentValueTypeName.STRING,
+      isVarargOptional: true,
+    },
+  ];
+
+  async execute(context: Context, argumentValues: ArgumentValues): Promise<void> {
+    const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
+    const pluginService = context.getServiceById(PLUGIN_SERVICE_ID) as PluginService;
+
+    const query = (argumentValues["query"] as string | undefined) ?? "";
+    let found = false;
+    for await (const descriptor of pluginService.search({ text: query })) {
+      if (!found) {
+        found = true;
+        await printerService.print("Available plugins:\n");
+      }
+      await printerService.print(`  ${getPluginId(descriptor)}  ${descriptor.version}\n`);
+    }
+    if (!found) {
+      await printerService.print("No plugins found.\n");
+    }
+  }
+}

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

@@ -0,0 +1,36 @@
+import type SubCommand from "../../../api/command/SubCommand.ts";
+import type Context from "../../../api/Context.ts";
+import type { ArgumentValues } from "../../../api/argument/ArgumentValueTypes.ts";
+import type PrinterService from "../../../api/service/core/PrinterService.ts";
+import { Icon, PRINTER_SERVICE_ID } from "../../../api/service/core/PrinterService.ts";
+import { PLUGIN_SERVICE_ID } from "../../../api/service/core/PluginService.ts";
+import type PluginService from "../../../api/service/core/PluginService.ts";
+import { getPluginId } from "./getPluginId.ts";
+
+export class PluginUpgradeSubCommand implements SubCommand {
+  readonly name = "upgrade";
+  readonly description = "Upgrade locally installed plugins";
+  readonly enableConfiguration = false;
+  readonly options = [];
+  readonly positionals = [];
+
+  async execute(context: Context, _argumentValues: ArgumentValues): Promise<void> {
+    const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
+    const pluginService = context.getServiceById(PLUGIN_SERVICE_ID) as PluginService;
+
+    let upgraded = 0;
+    for await (const update of pluginService.checkForUpdates()) {
+      const id = getPluginId(update.descriptor);
+      await printerService.info(
+        `Upgrading ${id} to ${update.availableVersion}...\n`,
+        Icon.INFORMATION,
+      );
+      await pluginService.install(update.descriptor);
+      await printerService.print(`Upgraded ${id} to ${update.availableVersion}.\n`, Icon.SUCCESS);
+      upgraded++;
+    }
+    if (upgraded === 0) {
+      await printerService.print("All plugins are up to date.\n");
+    }
+  }
+}

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

@@ -0,0 +1,5 @@
+import type { VersionedPluginDescriptor } from "@flowscripter/dynamic-plugin-framework";
+
+export function getPluginId(descriptor: VersionedPluginDescriptor): string {
+  return descriptor.scope ? `@${descriptor.scope}/${descriptor.name}` : descriptor.name;
+}

package/src/service/tableGenerator/DefaultTableGeneratorService.ts

@@ -1,6 +1,7 @@
 import type TableGeneratorService from "../../api/service/core/TableGeneratorService.ts";
 import { Align } from "../../api/service/core/TableGeneratorService.ts";
-import type Table from "../../api/service/core/Table.ts";
+import type { TableOptions } from "../../api/service/core/TableGeneratorService.ts";
+import Table from "../../api/service/core/Table.ts";
 
 const BORDER_TOP_LEFT = "┌";
 const BORDER_TOP = "─";
@@ -23,6 +24,10 @@ export default class DefaultTableGeneratorService implements TableGeneratorServi
   colorFunction: (text: string, hexFormattedColor: string) => string = (text) => text;
   backgroundColorFunction: (text: string, hexFormattedColor: string) => string = (text) => text;
 
+  createTable(rowCount: number, columnCount: number, options?: TableOptions): Table {
+    return new Table(rowCount, columnCount, options);
+  }
+
   #resolveAlign(table: Table, rowIndex: number, columnIndex: number): Align {
     const cellOpts = table.getCell(rowIndex, columnIndex)?.options;
     if (cellOpts?.align !== undefined) return cellOpts.align;

package/src/terminal/ImageRenderer.ts

@@ -23,12 +23,14 @@ export default class ImageRenderer {
     hexFormattedBackgroundColor?: string,
   ): Promise<string> {
     if (!this.#isMultiplexer()) {
-      if (supportsTerminalGraphics.stdout.kitty) {
-        return this.#renderKitty(imageBuffer, widthPercentage);
-      }
+      // iTerm2 only supports its own proprietary image protocol, not Kitty's, despite
+      // supports-terminal-graphics incorrectly reporting kitty:true for iTerm2 3.6+.
       if (supportsTerminalGraphics.stdout.iterm2) {
         return this.#renderITerm2(imageBuffer, widthPercentage);
       }
+      if (supportsTerminalGraphics.stdout.kitty) {
+        return this.#renderKitty(imageBuffer, widthPercentage);
+      }
     }
     return this.#renderAnsiBlocks(imageBuffer, widthPercentage, hexFormattedBackgroundColor);
   }
@@ -57,9 +59,9 @@ export default class ImageRenderer {
     for (let i = 0; i < chunks.length; i++) {
       const isLast = i === chunks.length - 1;
       if (i === 0) {
-        result += `\x1b_Gf=100,a=T,c=${columns},m=${isLast ? 0 : 1};${chunks[i]}\x1b\\`;
+        result += `\x1b_Gf=100,a=T,c=${columns},q=2,m=${isLast ? 0 : 1};${chunks[i]}\x1b\\`;
       } else {
-        result += `\x1b_Gm=${isLast ? 0 : 1};${chunks[i]}\x1b\\`;
+        result += `\x1b_Gq=2,m=${isLast ? 0 : 1};${chunks[i]}\x1b\\`;
       }
     }
     return result;