@pmate/cli 0.31.0 → 0.32.0

package/README.md

@@ -234,19 +234,19 @@ Notes:
 - `pmate vercel` is a thin wrapper around the installed `vercel` CLI.
 - v1 only supports `vercel.scope` in PMate config.
 - `pmate vercel deploys` requires `--project <name>`.
-# App-scoped access logs
+# Service logs
 
-Developers access logs use the same authenticated API as `dev.pmate.chat`, so CLI users cannot bypass App-Service associations or `pmate:dev` authorization by reading the Indexer directly.
+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:developers-api --app pmate:developers --page 0 --json
-pmate service log pmate:developers-api --app pmate:developers --search http.access --since-ms 1790000000000 --json
+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
 ```
 
-Pages are zero-based. `--search` searches the last 24 hours; the ordinary list follows the Indexer's retention window (currently seven days). `--since-ms` is an epoch-millisecond lower bound. This mode does not accept `--env`, `--follow`, `--history`, or `--base-url`: environment filtering and follow are not implemented by the shared API and are never silently ignored. Without `--app`, the existing operational service-log command is unchanged.
-
-A current CLI session is exchanged in memory for `pmate:developers`; the active App and session file are not changed. If login is required, run `pmate login --app pmate:developers`. Access denial never falls back to anonymous log reads. Neither source nor exchanged tokens are printed.
+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.
 
+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 a desktop app
 

package/dist/index.d.ts

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

package/dist/index.js

@@ -18740,6 +18740,50 @@ function capitalize(value) {
   return value.slice(0, 1).toUpperCase() + value.slice(1);
 }
 
+// src/services/DeveloperLogsClient.ts
+init_sessionStore();
+init_namespacedRef();
+var appRef = "pmate:developers";
+async function queryDeveloperLogs(input, fetcher = fetch) {
+  if (input.app) parseNamespacedRef(input.app, { entityLabel: "app ref" });
+  parseNamespacedRef(input.service, { entityLabel: "service ref" });
+  if (!Number.isSafeInteger(input.page) || input.page < 0) throw new Error("Invalid log page");
+  if (input.sinceMs !== void 0 && (!Number.isSafeInteger(input.sinceMs) || input.sinceMs < 0)) throw new Error("Invalid log time");
+  if (input.keyword && input.keyword.length > 256) throw new Error("Log search must be at most 256 characters");
+  const session = readRequiredSession({ preferredApp: appRef, fallbackToActiveApp: true });
+  if (Date.parse(session.expiresAt) <= Date.now() || !Number.isFinite(Date.parse(session.expiresAt)))
+    throw new Error("Session expired. Run pmate login --app pmate:developers");
+  async function request2(url, init) {
+    let response;
+    try {
+      response = await fetcher(url, { ...init, redirect: "error", signal: AbortSignal.timeout(3e4) });
+    } catch {
+      throw new Error("Developers log request failed; no anonymous fallback was attempted");
+    }
+    if (!response.ok) throw new Error(`Developers log request failed (HTTP ${response.status}); check login, pmate:dev role`);
+    let body;
+    try {
+      body = await response.json();
+    } catch {
+      throw new Error("Invalid Developers API response");
+    }
+    if (!body?.success) throw new Error("Developers API rejected the request");
+    return body.data;
+  }
+  const exchanged = await request2("https://auth-api-v2.pmate.chat/session/exchange", {
+    method: "POST",
+    headers: { Authorization: `Bearer ${session.token}`, "Content-Type": "application/json" },
+    body: JSON.stringify({ app: appRef })
+  });
+  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]);
+  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}` } });
+}
+
 // src/services/ServiceRuntimeRunner.ts
 var import_node_fs22 = require("fs");
 var import_node_os12 = __toESM(require("os"));
@@ -19111,15 +19155,21 @@ var ServiceRuntimeRunner = class {
     const namespace = service.namespace;
     const appName = service.name;
     const page = await this.fetchLogPage(namespace, appName, {
+      ...options,
       page: options.page ?? 0,
       history: options.history ?? false,
       search: options.search
     });
-    ui.title(`Logs for ${namespace}/${appName}`);
+    if (options.json) {
+      console.log(JSON.stringify(page));
+      return;
+    }
+    ui.title(`Logs for ${namespace}/${appName} \xB7 ${options.topic ?? "app"}`);
     ui.info("Source", { mode: options.history ? "history" : "online" });
     this.renderPage(page);
     if (options.follow) {
       await this.followLogs(namespace, appName, {
+        ...options,
         page: options.page ?? 0,
         history: options.history ?? false,
         search: options.search,
@@ -19136,7 +19186,7 @@ var ServiceRuntimeRunner = class {
     interactive?.rl.on("close", () => {
       running = false;
     });
-    const seen = new Set(options.seedItems.map((item) => item.hash));
+    const seen = new Set(options.seedItems.map((item) => item.id ?? item.hash));
     ui.info(
       "Follow",
       interactive ? "enabled (poll every 2s, Ctrl+C to stop, /help for filters)" : "enabled (poll every 2s, Ctrl+C to stop)"
@@ -19147,6 +19197,7 @@ var ServiceRuntimeRunner = class {
       let page;
       try {
         page = await this.fetchLogPage(namespace, appName, {
+          ...options,
           page: options.page,
           history: options.history,
           search: options.search
@@ -19156,12 +19207,12 @@ var ServiceRuntimeRunner = class {
         ui.warn("Follow fetch failed", { message });
         continue;
       }
-      const newItems = page.data.filter((item) => !seen.has(item.hash));
+      const newItems = page.data.filter((item) => !seen.has(item.id ?? item.hash));
       if (newItems.length === 0) {
         continue;
       }
       for (const item of newItems) {
-        seen.add(item.hash);
+        seen.add(item.id ?? item.hash);
         recent.unshift(item);
         if (recent.length > 200) {
           recent.pop();
@@ -19747,35 +19798,19 @@ var ServiceRuntimeRunner = class {
     await this.runRemoteCommand(server, command);
   }
   async fetchLogPage(namespace, appName, options) {
-    const baseUrl = (process.env.INDEXER_BASE_URL || "https://indexer.pmate.chat").replace(/\/$/, "");
-    const chainId = resolveLogChainId();
-    const hasSearch = Boolean(options.search?.trim());
-    const action = options.history || !hasSearch ? "list" : "search";
-    const url = new URL(
-      `/chains/${encodeURIComponent(chainId)}/namespaces/${encodeURIComponent(namespace)}/log/${encodeURIComponent(appName)}/${action}`,
-      `${baseUrl}/`
-    );
-    url.searchParams.set("page_id", String(options.page));
-    if (hasSearch && !options.history) {
-      url.searchParams.set("keyword", options.search.trim());
-    }
-    const response = await fetch(url.toString(), {
-      method: "GET",
-      headers: { Accept: "application/json" }
+    resolveLogChainId();
+    return await queryDeveloperLogs({
+      service: `${namespace}:${appName}`,
+      page: options.page,
+      keyword: options.search,
+      topic: options.topic,
+      type: options.logType,
+      level: options.level,
+      source: options.source,
+      requestId: options.requestId,
+      environment: options.envName,
+      sinceMs: options.sinceMs
     });
-    const payload = await response.json();
-    if (response.status === 404 && /resource not found/i.test(payload.message || "")) {
-      return {
-        page: options.page,
-        totalPage: 0,
-        pageSize: 100,
-        data: []
-      };
-    }
-    if (!response.ok || !payload.success || !payload.data) {
-      throw new Error(payload.message || `Log request failed: ${response.status}`);
-    }
-    return payload.data;
   }
   envNameToStage(envName) {
     if (envName === "dev" || envName === "preview" || envName === "prod") {
@@ -19801,8 +19836,8 @@ var ServiceRuntimeRunner = class {
     const type = isErrorLike ? import_chalk3.default.bold.red(`[${item.type}]`) : import_chalk3.default.bold.blue(`[${item.type}]`);
     const level = resolvedLevel ? `${isErrorLike ? import_chalk3.default.bold.red(resolvedLevel.toUpperCase()) : import_chalk3.default.bold.yellow(resolvedLevel.toUpperCase())} ` : "";
     const data = this.formatLogData(item.data);
-    const hash = import_chalk3.default.gray(`#${item.hash}`);
-    return `${ts} ${level}${type} ${data} ${hash}`;
+    const hash = import_chalk3.default.gray(`#${item.id ?? item.hash}`);
+    return `${ts} ${level}${type} ${item.source ?? ""} ${item.message ?? ""} ${data} ${hash}`;
   }
   formatLogData(value) {
     if (value === null || typeof value !== "object" || Array.isArray(value)) {
@@ -20459,7 +20494,8 @@ var ServiceRuntimeRunner = class {
   }
 };
 function resolveLogChainId(env = process.env) {
-  return env.BLOCKCHAIN_CHAIN_ID?.trim() || "app-log";
+  if (env.APP_LOG_CHAIN_ID && env.APP_LOG_CHAIN_ID !== "log") throw new Error("Logs require log chain");
+  return "log";
 }
 function shellQuote2(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
@@ -20474,51 +20510,6 @@ function parseServiceRef(serviceId) {
 
 // src/commands/ServiceCommandHandler.ts
 init_namespacedRef();
-
-// src/services/DeveloperLogsClient.ts
-init_sessionStore();
-init_namespacedRef();
-var appRef = "pmate:developers";
-async function queryDeveloperLogs(input, fetcher = fetch) {
-  parseNamespacedRef(input.app, { entityLabel: "app ref" });
-  parseNamespacedRef(input.service, { entityLabel: "service ref" });
-  if (!Number.isSafeInteger(input.page) || input.page < 0) throw new Error("Invalid log page");
-  if (input.sinceMs !== void 0 && (!Number.isSafeInteger(input.sinceMs) || input.sinceMs < 0)) throw new Error("Invalid log time");
-  if (input.keyword && input.keyword.length > 256) throw new Error("Log search must be at most 256 characters");
-  const session = readRequiredSession({ preferredApp: appRef, fallbackToActiveApp: true });
-  if (Date.parse(session.expiresAt) <= Date.now() || !Number.isFinite(Date.parse(session.expiresAt)))
-    throw new Error("Session expired. Run pmate login --app pmate:developers");
-  async function request2(url, init) {
-    let response;
-    try {
-      response = await fetcher(url, { ...init, redirect: "error", signal: AbortSignal.timeout(3e4) });
-    } catch {
-      throw new Error("Developers log request failed; no anonymous fallback was attempted");
-    }
-    if (!response.ok) throw new Error(`Developers log request failed (HTTP ${response.status}); check login, pmate:dev role and App-Service access`);
-    let body;
-    try {
-      body = await response.json();
-    } catch {
-      throw new Error("Invalid Developers API response");
-    }
-    if (!body?.success) throw new Error("Developers API rejected the request");
-    return body.data;
-  }
-  const exchanged = await request2("https://auth-api-v2.pmate.chat/session/exchange", {
-    method: "POST",
-    headers: { Authorization: `Bearer ${session.token}`, "Content-Type": "application/json" },
-    body: JSON.stringify({ app: appRef })
-  });
-  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({ app: input.app, service: input.service, page: String(input.page) });
-  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}` } });
-}
-
-// src/commands/ServiceCommandHandler.ts
 var ServiceCommandHandler = class {
   async handle(args) {
     const baseUrl = this.resolveBaseUrl(args.baseUrl);
@@ -20716,7 +20707,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 });
+          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 });
           console.log(JSON.stringify(result, null, args.json ? void 0 : 2));
           return;
         }
@@ -20727,7 +20718,14 @@ var ServiceCommandHandler = class {
           history: args.history,
           search: args.search,
           follow: args.follow,
-          envName: args.env
+          envName: args.env,
+          topic: args.topic,
+          level: args.level,
+          source: args.source,
+          requestId: args.requestId,
+          logType: args.logType,
+          sinceMs: args.sinceMs,
+          json: args.json
         });
         return;
       }
@@ -23998,6 +23996,7 @@ function parseServiceArgs(tokens) {
     let page = 0;
     let app;
     let sinceMs;
+    const logFilters = {};
     let history = false;
     let search;
     let follow = false;
@@ -24005,6 +24004,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": {
+          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;
+          break;
+        }
         case "--app":
           if (action !== "log") throw new Error(`Unknown service ${action} option: ${token}`);
           app = parseNamespacedRef(requireValue4(rest, token), { entityLabel: "app ref" }).fullId;
@@ -24055,8 +24074,7 @@ function parseServiceArgs(tokens) {
     const name = parsedRef.objectId;
     if (action === "log") {
       if (app && (history || follow || env || baseUrl)) throw new Error("App logs do not support --history, --follow, --env or --base-url; use --page, --search and --since-ms");
-      if (sinceMs !== void 0 && !app) throw new Error("--since-ms requires --app");
-      return { type: "service" /* Service */, action, namespace, name, baseUrl, json, page, history, search, follow, env, ...app ? { app } : {}, ...sinceMs !== void 0 ? { sinceMs } : {} };
+      return { type: "service" /* Service */, action, namespace, name, baseUrl, json, page, history, search, follow, env, ...logFilters, ...app ? { app } : {}, ...sinceMs !== void 0 ? { sinceMs } : {} };
     }
     if (action === "deploy-logs" || action === "deploy-history") {
       return { type: "service" /* Service */, action, namespace, name, env, page, baseUrl, json };
@@ -26303,7 +26321,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> [--page <n>] [--history] [--search <keyword>] [--follow|-f] [--base-url <url>]")}`,
+  `  ${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("                  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.31.0",
+  "version": "0.32.0",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {