@pmate/cli 0.32.0 → 0.33.1

package/README.md

@@ -239,12 +239,12 @@ Notes:
 Service logs use the same authenticated API as `dev.pmate.chat`. Each registered Service has `app` (application/deployment) and `runtime` (PM2/Nginx) Table topics on the dedicated `log` chain.
 
 ```sh
-pmate service log pmate:issues-api --topic app --page 0 --json
-pmate service log pmate:issues-api --topic runtime --source nginx --level error --env prod
-pmate service log pmate:issues-api --request-id <id> --follow
+pmate service log pmate:issues-api --topic application --page 0 --json
+pmate service log pmate:issues-api --topic nginx --field status=500 --env prod
+pmate service log pmate:issues-api --field requestId=<id> --follow
 ```
 
-Pages are zero-based. Lists and `--search` cover the chain's configured retention window (30 days in production). `--since-ms` adds an epoch-millisecond lower bound. `--type`, `--level`, `--source`, `--request-id` and `--env` filter on the server. The legacy `--app` argument is optional and does not select a different source.
+Pages are zero-based. Lists and `--search` cover the chain's configured retention window (30 days in production). `--since-ms` adds an epoch-millisecond lower bound. `--field name=value` (repeatable, scalar JSON values) and `--env` filter on the server. Topics are independent sources such as `application`, `nginx`, `pm2`, `deployment`, `pv`, and `vitals`; custom fields live in `data`. Old `--type`, `--level`, `--source`, and `--request-id` flags are removed. The legacy `--app` argument is optional and does not select a different source.
 
 A current CLI session is exchanged in memory for `pmate:developers`; the active App and session file are unchanged. If needed, run `pmate login --app pmate:developers`. Permission denial never falls back to anonymous Indexer reads. Credentials are never printed.
 

package/dist/index.d.ts

@@ -970,11 +970,8 @@ type ServiceCommandArgs = {
 } | {
     type: Command.Service;
     action: "log";
-    topic?: "app" | "runtime";
-    level?: string;
-    source?: string;
-    requestId?: string;
-    logType?: string;
+    topic?: string;
+    fields?: Record<string, string | number | boolean>;
     app?: string;
     sinceMs?: number;
     namespace: string;

package/dist/index.js

@@ -18777,8 +18777,9 @@ async function queryDeveloperLogs(input, fetcher = fetch) {
   });
   if (exchanged?.session?.identity?.app !== appRef || exchanged.session.identity.accountId !== session.accountId || typeof exchanged.token !== "string" || !exchanged.token)
     throw new Error("Developers session identity mismatch");
-  const params = new URLSearchParams({ service: input.service, page: String(input.page), topic: input.topic ?? "app" });
-  for (const key of ["type", "level", "source", "requestId", "environment"]) if (input[key]) params.set(key, input[key]);
+  const params = new URLSearchParams({ service: input.service, page: String(input.page), topic: input.topic ?? "application" });
+  if (input.environment) params.set("environment", input.environment);
+  if (input.fields) params.set("fields", JSON.stringify(input.fields));
   if (input.keyword) params.set("keyword", input.keyword);
   if (input.sinceMs !== void 0) params.set("sinceMs", String(input.sinceMs));
   return request2(`https://dev-api.pmate.chat/api/logs?${params}`, { headers: { Authorization: `Bearer ${exchanged.token}` } });
@@ -19526,7 +19527,7 @@ var ServiceRuntimeRunner = class {
       `git pull --rebase`,
       `pnpm install`,
       ...envSyncCommand ? [envSyncCommand] : [],
-      buildIfNeeded,
+      `{ ${buildIfNeeded}; }`,
       `if [ -f "${appDir}/ecosystem.config.cjs" ]; then eco="${appDir}/ecosystem.config.cjs"; elif [ -f "${appDir}/ecosystem.config.js" ]; then eco="${appDir}/ecosystem.config.js"; else echo "Missing pm2 config: ${appDir}/ecosystem.config.cjs|.js" 1>&2; exit 2; fi`,
       pm2Start,
       pm2Reload
@@ -19804,10 +19805,7 @@ var ServiceRuntimeRunner = class {
       page: options.page,
       keyword: options.search,
       topic: options.topic,
-      type: options.logType,
-      level: options.level,
-      source: options.source,
-      requestId: options.requestId,
+      fields: options.fields,
       environment: options.envName,
       sinceMs: options.sinceMs
     });
@@ -20707,7 +20705,7 @@ var ServiceCommandHandler = class {
       }
       case "log": {
         if (args.app) {
-          const result = await queryDeveloperLogs({ app: args.app, service: `${args.namespace}:${args.name}`, page: args.page, keyword: args.search, sinceMs: args.sinceMs, topic: args.topic, type: args.logType, level: args.level, source: args.source, requestId: args.requestId });
+          const result = await queryDeveloperLogs({ app: args.app, service: `${args.namespace}:${args.name}`, page: args.page, keyword: args.search, sinceMs: args.sinceMs, topic: args.topic, fields: args.fields, environment: args.env });
           console.log(JSON.stringify(result, null, args.json ? void 0 : 2));
           return;
         }
@@ -20720,10 +20718,7 @@ var ServiceCommandHandler = class {
           follow: args.follow,
           envName: args.env,
           topic: args.topic,
-          level: args.level,
-          source: args.source,
-          requestId: args.requestId,
-          logType: args.logType,
+          fields: args.fields,
           sinceMs: args.sinceMs,
           json: args.json
         });
@@ -24004,24 +23999,26 @@ function parseServiceArgs(tokens) {
     while (rest.length > 0) {
       const token = rest.shift();
       switch (token) {
-        case "--topic":
-        case "--level":
-        case "--source":
-        case "--request-id":
-        case "--type": {
+        case "--topic": {
           if (action !== "log") throw new Error(`Unknown service ${action} option: ${token}`);
           const value = requireValue4(rest, token);
-          if (token === "--topic") {
-            if (value !== "app" && value !== "runtime") throw new Error("Invalid --topic");
-            logFilters.topic = value;
-          } else if (token === "--level") {
-            if (!["debug", "info", "warn", "error"].includes(value)) throw new Error("Invalid --level");
-            logFilters.level = value;
-          } else if (token === "--source") {
-            if (!["pm2", "nginx", "application", "deployment"].includes(value)) throw new Error("Invalid --source");
-            logFilters.source = value;
-          } else if (token === "--request-id") logFilters.requestId = value;
-          else logFilters.logType = value;
+          if (!/^[a-z][a-z0-9-]{0,31}$/.test(value)) throw new Error("Invalid --topic");
+          logFilters.topic = value;
+          break;
+        }
+        case "--field": {
+          if (action !== "log") throw new Error(`Unknown service ${action} option: ${token}`);
+          const value = requireValue4(rest, token);
+          const match = /^([a-zA-Z0-9_-]+(?:\.[a-zA-Z0-9_-]+)*)=(.*)$/.exec(value);
+          if (!match || match[1].length > 128 || match[2].length > 256) throw new Error("Use --field name=value");
+          let parsed = match[2];
+          try {
+            parsed = JSON.parse(match[2]);
+          } catch {
+          }
+          if (!["string", "number", "boolean"].includes(typeof parsed)) throw new Error("Field value must be text, number or boolean");
+          logFilters.fields = { ...logFilters.fields, [match[1]]: parsed };
+          if (Object.keys(logFilters.fields).length > 20) throw new Error("At most 20 field filters");
           break;
         }
         case "--app":
@@ -26321,7 +26318,7 @@ var HELP_TEXT = [
   `  ${import_chalk4.default.gray("                  init <ns:objectId> [--cwd <dir>] [--base-url <url>]")}`,
   `  ${import_chalk4.default.gray("                  ssl set <ns:objectId> --cert <key> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  ssl refresh <ns:objectId> [--cert <key>] [--dry-run] [--base-url <url>] [--json]")}`,
-  `  ${import_chalk4.default.gray("                  log <ns:objectId> [--topic app|runtime] [--env <env>] [--level <level>] [--source <source>] [--type <type>] [--request-id <id>] [--search <keyword>] [--since-ms <ms>] [--page <n>] [--follow|-f] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  log <ns:objectId> [--topic <topic>] [--env <env>] [--field <name=value>] [--search <keyword>] [--since-ms <ms>] [--page <n>] [--follow|-f] [--json]")}`,
   `  ${import_chalk4.default.gray("                  default base URL: https://apps-api.pmate.chat")}`,
   `  ${import_chalk4.default.cyan("host")}             Manage host-level environment variables`,
   `  ${import_chalk4.default.gray("                  env list [--host <id>] [--json]")}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {