@qodalis/cli 2.0.0-beta.10 → 2.0.0-beta.12

package/public-api.js

@@ -411,7 +411,7 @@ var CliBackgroundServiceRegistry_TOKEN = "cli-background-service-registry";
 var CliPackageManagerService_TOKEN = "cli-package-manager-service";
 
 // src/lib/version.ts
-var LIBRARY_VERSION = "2.0.0-beta.10";
+var LIBRARY_VERSION = "2.0.0-beta.12";
 var API_VERSION = 2;
 var CliAliasCommandProcessor = class {
   constructor() {
@@ -4774,6 +4774,7 @@ var CliPackagesCommandProcessor = class {
           const { progressBar, writer } = context2;
           const { signal, cleanup } = scope.createAbortSignal(context2);
           progressBar.show();
+          context2.setStatusText("Browsing packages");
           const prefix = packagesManager.QODALIS_COMMAND_PREFIX;
           const knownShortNames = [
             "browser-storage",
@@ -4966,6 +4967,7 @@ var CliPackagesCommandProcessor = class {
           const packages = command2.value.split(" ");
           for (const pkg of packages) {
             if (signal.aborted) break;
+            context2.setStatusText(`Installing ${pkg}`);
             await scope.addPackage(pkg, context2, signal);
           }
           cleanup();
@@ -5006,6 +5008,7 @@ var CliPackagesCommandProcessor = class {
           const packages = command2.value.split(" ");
           for (const pkg of packages) {
             if (signal.aborted) break;
+            context2.setStatusText(`Removing ${pkg}`);
             await scope.removePackage(pkg, context2);
           }
           cleanup();
@@ -5041,6 +5044,7 @@ var CliPackagesCommandProcessor = class {
           const fullName = name.startsWith(prefix) ? name : `${prefix}${name}`;
           progressBar.show();
           progressBar.setText(`Fetching versions for ${name}`);
+          context2.setStatusText(`Fetching versions for ${name}`);
           try {
             const response = await scriptsLoader.getScript(
               `https://registry.npmjs.org/${encodeURIComponent(fullName)}`,
@@ -6247,6 +6251,8 @@ async function executeOnServer(connection, serverName, descriptor, command2, con
     command: commandPath && commandPath.length > 0 ? commandPath[0] : descriptor.command,
     chainCommands: commandPath && commandPath.length > 1 ? commandPath.slice(1) : []
   };
+  const cmdLabel = commandPath && commandPath.length > 0 ? commandPath.join(" ") : descriptor.command;
+  context2.setStatusText(`executing command: ${cmdLabel} on server ${serverName}`);
   try {
     if (connection.capabilities?.streaming) {
       const result = await connection.executeStream(
@@ -10405,6 +10411,7 @@ var CliPingCommandProcessor = class {
     context2.writer.writeln(
       `PING ${host} (${url}):`
     );
+    context2.setStatusText(`ping ${host}`);
     const times = [];
     let transmitted = 0;
     let received = 0;
@@ -10430,6 +10437,7 @@ var CliPingCommandProcessor = class {
           received++;
           times.push(elapsed);
           const status = response.type === "opaque" ? "ok" : `status=${response.status}`;
+          context2.setStatusText(`ping ${host}: seq=${seq} time=${ms}ms`);
           context2.writer.writeln(
             `${url}: seq=${seq} ${status} time=${ms} ms`
           );
@@ -10895,11 +10903,21 @@ var CliCommandExecutionContext = class {
     this.reader = context2.reader;
     this.enterFullScreenMode = (p, o) => context2.enterFullScreenMode(p, o);
     this.exitFullScreenMode = () => context2.exitFullScreenMode();
+    this.submitCommand = (command2) => context2.submitCommand(command2);
     this.createInterval = (cb, ms) => context2.createInterval(cb, ms);
     this.createTimeout = (cb, ms) => context2.createTimeout(cb, ms);
     this.backgroundServices = context2.backgroundServices;
     this.state = context2.services.get(CliStateStoreManager_TOKEN).getProcessorStateStore(processor);
   }
+  setStatusText(text) {
+    this.context.setStatusText(text);
+  }
+  clearStatusText() {
+    this.context.clearStatusText();
+  }
+  getStatusText() {
+    return this.context.getStatusText();
+  }
   get promptLength() {
     return this.context.promptLength;
   }
@@ -14076,18 +14094,15 @@ var CommandLineMode = class {
     if (data === "\r") {
       this.clearGhostText();
       this.host.terminal.write("\r\n");
-      if (buffer.text) {
-        await this.host.commandHistory.addCommand(buffer.text);
+      const text = buffer.text;
+      if (text) {
         this.historyIndex = this.host.commandHistory.getLastIndex();
         this.bufferSetByHistory = false;
-        this.isExecutingCommand = true;
-        const ctx = this.host.getExecutionContext();
-        await ctx.executor.executeCommand(buffer.text, ctx);
-        this.isExecutingCommand = false;
-      }
-      if (!this.host.isRawModeActive()) {
-        this.host.showPrompt();
       }
+      this.isExecutingCommand = true;
+      const ctx = this.host.getExecutionContext();
+      await ctx.submitCommand(text);
+      this.isExecutingCommand = false;
     } else if (data === "\x1B[A") {
       this.showPreviousCommand();
     } else if (data === "\x1B[B") {
@@ -14469,6 +14484,12 @@ var CliExecutionContext = class {
     this.onAbort = new rxjs.Subject();
     this.completionEngine = new CliCompletionEngine();
     this.promptLength = 0;
+    /**
+     * Whether a command is currently being executed.
+     * Set by the command executor at start/end of executeCommand().
+     */
+    this.isExecuting = false;
+    this.statusTextChange$ = new rxjs.Subject();
     this.lineBuffer = new CliLineBuffer();
     this.modeStack = [];
     this.timerManager = new CliTimerManager();
@@ -14523,6 +14544,17 @@ var CliExecutionContext = class {
       this.backgroundServices
     );
   }
+  setStatusText(text) {
+    this._statusText = text;
+    this.statusTextChange$.next(text);
+  }
+  clearStatusText() {
+    this._statusText = void 0;
+    this.statusTextChange$.next(void 0);
+  }
+  getStatusText() {
+    return this._statusText;
+  }
   // -- Public API (ICliExecutionContext) --
   writeToTerminal(text) {
     this.terminal.write(text);
@@ -14602,6 +14634,20 @@ var CliExecutionContext = class {
       this.getPromptOptions()
     );
   }
+  /**
+   * Submit and execute a command — shared by interactive Enter key
+   * and programmatic engine.execute(). Adds to history, runs the
+   * command, and shows a new prompt afterwards.
+   */
+  async submitCommand(command2) {
+    if (command2.trim()) {
+      await this.commandHistory.addCommand(command2);
+      await this.executor.executeCommand(command2, this);
+    }
+    if (!this.isRawModeActive()) {
+      this.showPrompt();
+    }
+  }
   clearCurrentLine() {
     this.clearLine();
     this.showPrompt();
@@ -15187,92 +15233,106 @@ var CliCommandExecutor = class {
     } else {
       rootContext = context2;
     }
-    let lastExitSuccess = true;
-    let shouldRunNext = true;
-    let pipelineData = void 0;
-    let lastCapturingWriter;
-    for (let i = 0; i < parts.length; i++) {
-      const part = parts[i];
-      if (part.type === "&&") {
-        shouldRunNext = lastExitSuccess;
-        continue;
-      } else if (part.type === "||") {
-        shouldRunNext = !lastExitSuccess;
-        continue;
-      } else if (part.type === "|") {
-        shouldRunNext = true;
-        continue;
-      } else if (part.type === ";") {
-        shouldRunNext = true;
-        pipelineData = void 0;
-        continue;
-      } else if (part.type === ">>") {
-        const nextPart = parts[i + 1];
-        i++;
-        if (!nextPart || nextPart.type !== "command") {
-          context2.writer.writeError("Missing file path after >>");
-          lastExitSuccess = false;
+    rootContext.isExecuting = true;
+    try {
+      let lastExitSuccess = true;
+      let shouldRunNext = true;
+      let pipelineData = void 0;
+      let lastCapturingWriter;
+      for (let i = 0; i < parts.length; i++) {
+        const part = parts[i];
+        if (part.type === "&&") {
+          shouldRunNext = lastExitSuccess;
           continue;
-        }
-        if (shouldRunNext) {
-          await appendOutputToFile(nextPart.value, context2);
-          pipelineData = void 0;
-        }
-        continue;
-      } else if (part.type === ">") {
-        const nextPart = parts[i + 1];
-        i++;
-        if (!nextPart || nextPart.type !== "command") {
-          context2.writer.writeError("Missing file path after >");
-          lastExitSuccess = false;
+        } else if (part.type === "||") {
+          shouldRunNext = !lastExitSuccess;
           continue;
-        }
-        if (shouldRunNext) {
-          await writeOutputToFile(nextPart.value, context2);
+        } else if (part.type === "|") {
+          shouldRunNext = true;
+          continue;
+        } else if (part.type === ";") {
+          shouldRunNext = true;
           pipelineData = void 0;
-        }
-        continue;
-      } else if (part.type === "2>>") {
-        const nextPart = parts[i + 1];
-        i++;
-        if (!nextPart || nextPart.type !== "command") {
-          context2.writer.writeError("Missing file path after 2>>");
-          lastExitSuccess = false;
+          continue;
+        } else if (part.type === ">>") {
+          const nextPart = parts[i + 1];
+          i++;
+          if (!nextPart || nextPart.type !== "command") {
+            context2.writer.writeError("Missing file path after >>");
+            lastExitSuccess = false;
+            continue;
+          }
+          if (shouldRunNext) {
+            await appendOutputToFile(nextPart.value, context2);
+            pipelineData = void 0;
+          }
+          continue;
+        } else if (part.type === ">") {
+          const nextPart = parts[i + 1];
+          i++;
+          if (!nextPart || nextPart.type !== "command") {
+            context2.writer.writeError("Missing file path after >");
+            lastExitSuccess = false;
+            continue;
+          }
+          if (shouldRunNext) {
+            await writeOutputToFile(nextPart.value, context2);
+            pipelineData = void 0;
+          }
+          continue;
+        } else if (part.type === "2>>") {
+          const nextPart = parts[i + 1];
+          i++;
+          if (!nextPart || nextPart.type !== "command") {
+            context2.writer.writeError("Missing file path after 2>>");
+            lastExitSuccess = false;
+            continue;
+          }
+          if (shouldRunNext) {
+            await appendStderrToFile(nextPart.value, context2, lastCapturingWriter);
+          }
+          continue;
+        } else if (part.type === "2>") {
+          const nextPart = parts[i + 1];
+          i++;
+          if (!nextPart || nextPart.type !== "command") {
+            context2.writer.writeError("Missing file path after 2>");
+            lastExitSuccess = false;
+            continue;
+          }
+          if (shouldRunNext) {
+            await writeStderrToFile(nextPart.value, context2, lastCapturingWriter);
+          }
           continue;
         }
-        if (shouldRunNext) {
-          await appendStderrToFile(nextPart.value, context2, lastCapturingWriter);
-        }
-        continue;
-      } else if (part.type === "2>") {
-        const nextPart = parts[i + 1];
-        i++;
-        if (!nextPart || nextPart.type !== "command") {
-          context2.writer.writeError("Missing file path after 2>");
-          lastExitSuccess = false;
+        if (!shouldRunNext) {
           continue;
         }
-        if (shouldRunNext) {
-          await writeStderrToFile(nextPart.value, context2, lastCapturingWriter);
+        try {
+          lastCapturingWriter = await this.executeSingleCommand(
+            part.value,
+            pipelineData,
+            rootContext
+          );
+          lastExitSuccess = context2.process.exitCode === void 0 || context2.process.exitCode === 0;
+          rootContext.lastCommandResult = {
+            command: part.value,
+            success: lastExitSuccess
+          };
+          pipelineData = context2.process.data;
+        } catch (e) {
+          lastExitSuccess = false;
+          rootContext.lastCommandResult = {
+            command: part.value,
+            success: false
+          };
+          context2.writer.writeError(`Command ${part.value} failed: ${e}`);
         }
-        continue;
-      }
-      if (!shouldRunNext) {
-        continue;
-      }
-      try {
-        lastCapturingWriter = await this.executeSingleCommand(
-          part.value,
-          pipelineData,
-          rootContext
-        );
-        lastExitSuccess = context2.process.exitCode === void 0 || context2.process.exitCode === 0;
-        pipelineData = context2.process.data;
-      } catch (e) {
-        lastExitSuccess = false;
-        context2.writer.writeError(`Command ${part.value} failed: ${e}`);
+        shouldRunNext = true;
       }
-      shouldRunNext = true;
+    } finally {
+      rootContext.isExecuting = false;
+      rootContext.clearStatusText?.();
     }
   }
   async executeSingleCommand(command2, data, context2) {
@@ -16857,6 +16917,7 @@ var ServerStatusProcessor = class {
       return;
     }
     context2.spinner?.show(`Pinging ${serverName}...`);
+    context2.setStatusText(`Pinging ${serverName}`);
     const reachable = await connection.ping();
     context2.spinner?.hide();
     if (reachable) {
@@ -16896,6 +16957,7 @@ var ServerReconnectProcessor = class {
       return;
     }
     context2.spinner?.show(`Reconnecting to ${serverName}...`);
+    context2.setStatusText(`Reconnecting to ${serverName}`);
     const result = await manager.reconnect(serverName);
     context2.spinner?.hide();
     if (result.success) {
@@ -17321,6 +17383,7 @@ function initializeTerminal(container, opts) {
   terminal.loadAddon(serializeAddon);
   terminal.open(container);
   fitAddon.fit();
+  requestAnimationFrame(() => fitAddon.fit());
   container.classList.add("terminal-container");
   container.style.background = opts.theme?.background ?? "#000";
   const wheelListener = (e) => e.preventDefault();
@@ -17778,6 +17841,8 @@ var CliEngine = class {
     if (this.options?.snapshot) {
       await this.restoreSnapshot(this.options.snapshot);
     }
+    this._startedAt = Date.now();
+    this.safeFit();
   }
   /**
    * Clean up terminal and event listeners.
@@ -17836,15 +17901,22 @@ var CliEngine = class {
     return this.registry;
   }
   /**
-   * Execute a command programmatically.
+   * Timestamp (ms since epoch) when the engine finished starting.
+   */
+  get startedAt() {
+    return this._startedAt;
+  }
+  /**
+   * Execute a command programmatically, behaving the same as if the user
+   * typed it and pressed Enter: echoes the command, adds it to history,
+   * executes it, and shows a new prompt afterwards.
    */
   async execute(command2) {
-    if (this.executionContext) {
-      await this.executionContext.executor.executeCommand(
-        command2,
-        this.executionContext
-      );
-    }
+    if (!this.executionContext) return;
+    const ctx = this.executionContext;
+    ctx.showPrompt({ reset: true });
+    this.terminal.write(command2 + "\r\n");
+    await ctx.submitCommand(command2);
   }
   /**
    * Capture a snapshot of the current engine state.
@@ -18070,6 +18142,14 @@ var CliTestHarness = class {
       },
       exitFullScreenMode: () => {
       },
+      submitCommand: async (command2) => {
+        await this.executor.executeCommand(command2, context2);
+      },
+      setStatusText: () => {
+      },
+      clearStatusText: () => {
+      },
+      getStatusText: () => void 0,
       createInterval: (cb, ms) => {
         const id = setInterval(cb, ms);
         return {