@qodalis/cli 2.3.0 → 2.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qodalis/cli",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Framework-agnostic CLI engine for @qodalis terminal applications.",
   "author": "Nicolae Lupei, Qodalis Solutions",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "./assets/*": "./assets/*"
   },
   "dependencies": {
-    "@qodalis/cli-core": "2.3.0",
+    "@qodalis/cli-core": "2.4.0",
     "@xterm/xterm": "^6.0.0",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/addon-web-links": "^0.12.0",

package/public-api.d.mts

@@ -165,7 +165,7 @@ declare const CliKeyValueStore_TOKEN: any;
  */
 declare const SyntaxHighlighterRegistry_TOKEN: any;
 
-declare const LIBRARY_VERSION = "2.3.0";
+declare const LIBRARY_VERSION = "2.4.0";
 declare const API_VERSION = 2;
 
 declare class CliAliasCommandProcessor implements ICliCommandProcessor {

package/public-api.d.ts

@@ -165,7 +165,7 @@ declare const CliKeyValueStore_TOKEN: any;
  */
 declare const SyntaxHighlighterRegistry_TOKEN: any;
 
-declare const LIBRARY_VERSION = "2.3.0";
+declare const LIBRARY_VERSION = "2.4.0";
 declare const API_VERSION = 2;
 
 declare class CliAliasCommandProcessor implements ICliCommandProcessor {

package/public-api.js

@@ -519,7 +519,7 @@ var CliKeyValueStore_TOKEN = cliCore.createCliToken("cli-key-value-store");
 var SyntaxHighlighterRegistry_TOKEN = cliCore.createCliToken("syntax-highlighter-registry");
 
 // src/lib/version.ts
-var LIBRARY_VERSION = "2.3.0";
+var LIBRARY_VERSION = "2.4.0";
 var API_VERSION = 2;
 var ANONYMOUS = "\0anonymous";
 function aliasOwner(context2) {
@@ -11188,7 +11188,78 @@ var CliServicesCommandProcessor = class {
     );
   }
 };
+var CLI_EVENT_HISTORY_SIZE = 200;
+function matchesEventPattern(type, pattern) {
+  if (pattern === "*") return true;
+  if (pattern.endsWith(":*")) {
+    return type.startsWith(pattern.slice(0, -1));
+  }
+  return type === pattern;
+}
+var CliEventBus = class {
+  constructor(onHandlerError = (error) => console.error("[CLI] Event handler failed:", error), historySize = CLI_EVENT_HISTORY_SIZE) {
+    this.onHandlerError = onHandlerError;
+    this.historySize = historySize;
+    this.subject = new rxjs.Subject();
+    this.recent = [];
+    this.disposed = false;
+  }
+  emit(type, data, options) {
+    if (this.disposed) return;
+    const event = {
+      type,
+      data,
+      source: options?.source,
+      timestamp: Date.now()
+    };
+    this.recent.push(event);
+    if (this.recent.length > this.historySize) {
+      this.recent.shift();
+    }
+    this.subject.next(event);
+  }
+  on(pattern, handler) {
+    const subscription = this.events$(pattern).subscribe((event) => {
+      try {
+        handler(event);
+      } catch (error) {
+        this.onHandlerError(error, event);
+      }
+    });
+    return () => subscription.unsubscribe();
+  }
+  once(pattern, handler) {
+    let done = false;
+    const unsubscribe = this.on(pattern, (event) => {
+      if (done) return;
+      done = true;
+      unsubscribe();
+      handler(event);
+    });
+    return unsubscribe;
+  }
+  events$(pattern = "*") {
+    return this.subject.asObservable().pipe(operators.filter((event) => matchesEventPattern(event.type, pattern)));
+  }
+  history(pattern = "*", limit) {
+    const matching = this.recent.filter(
+      (event) => matchesEventPattern(event.type, pattern)
+    );
+    return limit !== void 0 ? matching.slice(-limit) : matching;
+  }
+  /** Stop delivering events and complete all observables. */
+  dispose() {
+    if (this.disposed) return;
+    this.disposed = true;
+    this.subject.complete();
+    this.recent.length = 0;
+  }
+};
+
+// src/lib/processors/system/cli-events-command-processor.ts
 var DATA_PREVIEW_LENGTH = 120;
+var SERVER_EVENT = "server:event";
+var SERVER_ENVELOPE_FIELDS = /* @__PURE__ */ new Set(["type", "timestamp"]);
 var RESERVED_NAMESPACES = [
   "boot",
   "command",
@@ -11200,26 +11271,83 @@ var RESERVED_NAMESPACES = [
   "session",
   "user"
 ];
+function serverEventOf(event) {
+  return event.type === SERVER_EVENT ? event.data : void 0;
+}
+function matchesFilter(event, filter2) {
+  const remote = serverEventOf(event);
+  if (!remote) {
+    return !filter2.server && matchesEventPattern(event.type, filter2.pattern);
+  }
+  if (filter2.local) return false;
+  if (filter2.server && remote.server.toLowerCase() !== filter2.server.toLowerCase()) return false;
+  return matchesEventPattern(remote.type, filter2.pattern) || matchesEventPattern(SERVER_EVENT, filter2.pattern);
+}
 function canSee(event, context2) {
   return !event.type.startsWith("user:") || cliCore.cliAuthorize(context2, cliCore.CliUsersPermissions.AuditRead);
 }
+function formatServerEventFields(data) {
+  if (!data || typeof data !== "object") return "";
+  const parts = [];
+  for (const [key, value] of Object.entries(data)) {
+    if (SERVER_ENVELOPE_FIELDS.has(key) || value === void 0 || value === null) continue;
+    const text = typeof value === "string" ? value : JSON.stringify(value);
+    parts.push(`${key}=${/\s/.test(text) ? JSON.stringify(text) : text}`);
+  }
+  return shorten(parts.join(" "));
+}
+function shorten(text) {
+  return text.length > DATA_PREVIEW_LENGTH ? `${text.slice(0, DATA_PREVIEW_LENGTH - 1)}\u2026` : text;
+}
 function formatEvent(event, context2) {
   const { writer } = context2;
-  const time = new Date(event.timestamp).toISOString().slice(11, 23);
-  const source = event.source ? `  ${writer.wrapInColor(`[${event.source}]`, cliCore.CliForegroundColor.Blue)}` : "";
+  const remote = serverEventOf(event);
+  let time = event.timestamp;
+  let type = event.type;
+  let source = event.source;
   let data = "";
-  if (event.data !== void 0) {
+  if (remote) {
+    const sent = remote.data?.timestamp;
+    if (typeof sent === "string" && !isNaN(Date.parse(sent))) time = sent;
+    type = remote.type;
+    source = remote.server;
+    data = formatServerEventFields(remote.data);
+  } else if (event.data !== void 0) {
     try {
       data = JSON.stringify(event.data) ?? "";
     } catch {
       data = String(event.data);
     }
-    if (data.length > DATA_PREVIEW_LENGTH) {
-      data = `${data.slice(0, DATA_PREVIEW_LENGTH - 1)}\u2026`;
-    }
+    data = shorten(data);
   }
-  return `${writer.wrapInColor(time, cliCore.CliForegroundColor.Yellow)}  ${writer.wrapInColor(event.type, cliCore.CliForegroundColor.Cyan)}${source}${data ? `  ${data}` : ""}`;
+  const when = new Date(time).toISOString().slice(11, 23);
+  const from = source ? `  ${writer.wrapInColor(`[${source}]`, remote ? cliCore.CliForegroundColor.Magenta : cliCore.CliForegroundColor.Blue)}` : "";
+  return `${writer.wrapInColor(when, cliCore.CliForegroundColor.Yellow)}  ${writer.wrapInColor(type, cliCore.CliForegroundColor.Cyan)}${from}${data ? `  ${data}` : ""}`;
+}
+function filterOf(command2) {
+  const server = command2.args["server"] ?? command2.args["s"];
+  return {
+    pattern: cliCore.joinShellWords(command2.value ?? "") || "*",
+    server: server === void 0 || server === true ? void 0 : String(server),
+    local: !!(command2.args["local"] || command2.args["l"])
+  };
 }
+var FILTER_PARAMETERS = [
+  {
+    name: "server",
+    aliases: ["s"],
+    type: "string",
+    description: "Only the events of this server",
+    required: false
+  },
+  {
+    name: "local",
+    aliases: ["l"],
+    type: "boolean",
+    description: "Only the terminal's own events",
+    required: false
+  }
+];
 function busOf(context2) {
   if (!context2.events) {
     context2.writer.writeError(
@@ -11231,7 +11359,7 @@ function busOf(context2) {
 var CliEventsCommandProcessor = class {
   constructor() {
     this.command = "events";
-    this.description = "Watch, list and emit events on the event bus";
+    this.description = "Watch, list and emit events of the terminal and the connected servers";
     this.author = cliCore.DefaultLibraryAuthor;
     this.version = "1.0.0";
     this.metadata = {
@@ -11244,16 +11372,17 @@ var CliEventsCommandProcessor = class {
         command: "watch",
         description: "Print events as they happen (Ctrl+C to stop)",
         acceptsRawInput: true,
+        parameters: FILTER_PARAMETERS,
         processCommand: async (command2, context2) => {
           const bus = busOf(context2);
           if (!bus) return;
-          const pattern = cliCore.joinShellWords(command2.value ?? "") || "*";
+          const filter2 = filterOf(command2);
           context2.writer.writeInfo(
-            `Watching ${context2.writer.wrapInColor(pattern, cliCore.CliForegroundColor.Cyan)} \u2014 press Ctrl+C to stop`
+            `Watching ${context2.writer.wrapInColor(filter2.pattern, cliCore.CliForegroundColor.Cyan)} \u2014 press Ctrl+C to stop`
           );
           await new Promise((resolve) => {
-            const off = bus.on(pattern, (event) => {
-              if (canSee(event, context2)) {
+            const off = bus.on("*", (event) => {
+              if (matchesFilter(event, filter2) && canSee(event, context2)) {
                 context2.writer.writeln(formatEvent(event, context2));
               }
             });
@@ -11279,6 +11408,12 @@ var CliEventsCommandProcessor = class {
           context2.writer.writeln(
             `  events watch boot:completed  ${t.t("cli.events.watch.help.one_type", "One type")}`
           );
+          context2.writer.writeln(
+            `  events watch job:* -s node   ${t.t("cli.events.watch.help.server_jobs", "Job events of the server node")}`
+          );
+          context2.writer.writeln(
+            `  events watch --local         ${t.t("cli.events.watch.help.local_only", "Only the terminal's own events")}`
+          );
         }
       },
       {
@@ -11287,6 +11422,7 @@ var CliEventsCommandProcessor = class {
         description: "Show recent events (kept in memory, not persisted)",
         acceptsRawInput: true,
         parameters: [
+          ...FILTER_PARAMETERS,
           {
             name: "limit",
             aliases: ["n"],
@@ -11298,13 +11434,13 @@ var CliEventsCommandProcessor = class {
         processCommand: async (command2, context2) => {
           const bus = busOf(context2);
           if (!bus) return;
-          const pattern = cliCore.joinShellWords(command2.value ?? "") || "*";
+          const filter2 = filterOf(command2);
           const limit = Number(
             command2.args["limit"] ?? command2.args["n"] ?? 20
           );
-          const events = bus.history(pattern).filter((event) => canSee(event, context2)).slice(-(limit > 0 ? limit : 20));
+          const events = bus.history("*").filter((event) => matchesFilter(event, filter2) && canSee(event, context2)).slice(-(limit > 0 ? limit : 20));
           if (events.length === 0) {
-            context2.writer.writeInfo(`No events matching ${pattern}`);
+            context2.writer.writeInfo(`No events matching ${filter2.pattern}`);
             return;
           }
           for (const event of events) {
@@ -11323,6 +11459,9 @@ var CliEventsCommandProcessor = class {
           context2.writer.writeln(
             `  events log server:* -n 50    ${t.t("cli.events.log.help.last_50_server", "Last 50 server events")}`
           );
+          context2.writer.writeln(
+            `  events log job:failed        ${t.t("cli.events.log.help.failed_jobs", "Recent failed job runs, on every server")}`
+          );
         }
       },
       {
@@ -11394,6 +11533,9 @@ var CliEventsCommandProcessor = class {
     writer.writeln(
       t.t("cli.events.help.patterns", "Patterns: an exact type (package:installed), a namespace (package:*) or * for all.")
     );
+    writer.writeln(
+      t.t("cli.events.help.servers", "Events of the connected servers (job runs, user, token and file changes, ...) are shown with the server name; each server sends only the events you may see. Filter with --server <name>, or --local for the terminal's own events.")
+    );
     writer.writeln(
       t.t("cli.events.help.in_memory", "Events are kept in memory for this terminal only; nothing is persisted.")
     );
@@ -21999,73 +22141,6 @@ function createServerModule() {
     services: []
   };
 }
-var CLI_EVENT_HISTORY_SIZE = 200;
-function matchesEventPattern(type, pattern) {
-  if (pattern === "*") return true;
-  if (pattern.endsWith(":*")) {
-    return type.startsWith(pattern.slice(0, -1));
-  }
-  return type === pattern;
-}
-var CliEventBus = class {
-  constructor(onHandlerError = (error) => console.error("[CLI] Event handler failed:", error), historySize = CLI_EVENT_HISTORY_SIZE) {
-    this.onHandlerError = onHandlerError;
-    this.historySize = historySize;
-    this.subject = new rxjs.Subject();
-    this.recent = [];
-    this.disposed = false;
-  }
-  emit(type, data, options) {
-    if (this.disposed) return;
-    const event = {
-      type,
-      data,
-      source: options?.source,
-      timestamp: Date.now()
-    };
-    this.recent.push(event);
-    if (this.recent.length > this.historySize) {
-      this.recent.shift();
-    }
-    this.subject.next(event);
-  }
-  on(pattern, handler) {
-    const subscription = this.events$(pattern).subscribe((event) => {
-      try {
-        handler(event);
-      } catch (error) {
-        this.onHandlerError(error, event);
-      }
-    });
-    return () => subscription.unsubscribe();
-  }
-  once(pattern, handler) {
-    let done = false;
-    const unsubscribe = this.on(pattern, (event) => {
-      if (done) return;
-      done = true;
-      unsubscribe();
-      handler(event);
-    });
-    return unsubscribe;
-  }
-  events$(pattern = "*") {
-    return this.subject.asObservable().pipe(operators.filter((event) => matchesEventPattern(event.type, pattern)));
-  }
-  history(pattern = "*", limit) {
-    const matching = this.recent.filter(
-      (event) => matchesEventPattern(event.type, pattern)
-    );
-    return limit !== void 0 ? matching.slice(-limit) : matching;
-  }
-  /** Stop delivering events and complete all observables. */
-  dispose() {
-    if (this.disposed) return;
-    this.disposed = true;
-    this.subject.complete();
-    this.recent.length = 0;
-  }
-};
 
 // src/lib/editor/syntax/registry.ts
 var SyntaxHighlighterRegistry = class {