@pmate/cli 0.34.0 → 0.35.0

package/README.md

@@ -293,3 +293,7 @@ Config (paths relative to the config file, `web.dist` relative to `web.cwd`):
 Use `--dry-run` to inspect the plan, `--dir` for an unpacked `.app`, or `--signed` to require a configured macOS signing identity. Default builds are ad-hoc signed for local use; they are not notarized distribution releases. Signed builds use electron-builder's standard signing/notarization environment variables; verify notarization separately before distributing.
 
 The shell serves the bundled renderer under its existing exact HTTPS origin, preserving authentication callbacks and API CORS. Other origins remain normal network requests. Static resources are hashed and checked at launch; missing assets return 404. The renderer is sandboxed with Node disabled and no privileged preload bridge. Sign-in, chat and inference still require internet. Updates require a new package. Each build prints its artifact directory and a resource/signing report; no build uploads or auto-updates occur.
+
+### 日志统计默认口径
+
+请求次数与日均可使用 `pmate logs aggregate pmate:issues-api --metric count --topic application --field event=http.access --interval day --timezone Asia/Shanghai --from <ISO> --to <ISO> --json`。计数由数据库完成，返回 `count`、`durationDays`、`averagePerDay`，时间桶包含零值；不返回 UV 或延迟百分位。JSON 模式失败以非零状态退出并返回固定 `error.code`，区分权限、保留期、查询预算和上游故障，避免泄露上游原始错误。

package/dist/index.js

@@ -17612,7 +17612,7 @@ async function buildDesktop(args) {
     files: ["**/*"],
     asar: true,
     artifactName: "${productName}-${version}-${arch}.${ext}",
-    mac: { icon, target: args.dir ? ["dir"] : ["dmg", "zip"], category: "public.app-category.social-networking", hardenedRuntime: args.signed, extendInfo: { NSMicrophoneUsageDescription: `${c.productName} uses your microphone only when you record a voice message.` }, ...args.signed ? {} : { identity: "-", notarize: false } },
+    mac: { icon, target: args.dir ? ["dir"] : ["dmg", "zip"], category: "public.app-category.social-networking", hardenedRuntime: args.signed, extendInfo: { NSMicrophoneUsageDescription: `${c.productName} uses your microphone for voice calls and voice messages.` }, ...args.signed ? {} : { identity: "-", notarize: false } },
     forceCodeSigning: args.signed
   };
   const configPath = import_node_path23.default.join(staging, "builder.json");
@@ -18743,6 +18743,30 @@ function capitalize(value) {
 // src/services/DeveloperLogsClient.ts
 init_sessionStore();
 init_namespacedRef();
+var DeveloperLogError = class extends Error {
+  constructor(code, status, message) {
+    super(message);
+    this.code = code;
+    this.status = status;
+  }
+};
+function logResponseError(status, message) {
+  const errors = {
+    400: ["logs_invalid_query", "Invalid log query; correct parameters before retrying"],
+    401: ["logs_unauthenticated", "Log session expired or invalid"],
+    403: ["logs_forbidden", "Log access denied for this sender"],
+    404: ["logs_not_found", "Requested log service or resource was not found"],
+    409: ["logs_index_changed", "Log index changed; retry the same query once"],
+    422: ["logs_query_limit", "Log query exceeded a retention or analysis limit"],
+    429: ["logs_rate_limited", "Log service rate limit reached"]
+  };
+  if (status === 422 && message === "Requested window extends beyond the safe retained log window")
+    return new DeveloperLogError("logs_retention", status, "Requested time window is outside retained logs");
+  if (status === 422 && ["Analysis exceeds 100 pages; reduce the time window", "Analysis exceeds 10000 records; reduce the time window", "Analysis budget exceeded; reduce the time window", "More than 100 groups; narrow query or choose a coarser dimension"].includes(String(message)))
+    return new DeveloperLogError("logs_budget_exceeded", status, "Analysis limit exceeded; use metric=count for counts, or narrow the window/dimensions for detailed metrics");
+  const [code, detail] = errors[status] ?? ["logs_unavailable", "Log service temporarily unavailable"];
+  return new DeveloperLogError(code, status, `${detail} (HTTP ${status})`);
+}
 var appRef = "pmate:developers";
 async function queryDeveloperLogs(input, fetcher = fetch) {
   if (input.app) parseNamespacedRef(input.app, { entityLabel: "app ref" });
@@ -18766,7 +18790,14 @@ async function requestDeveloperLogTool(tool, params, fetcher = fetch, delegate)
     } 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`);
+    if (!response.ok) {
+      let detail;
+      try {
+        detail = (await response.json())?.message;
+      } catch {
+      }
+      throw logResponseError(response.status, detail);
+    }
     let body;
     try {
       body = await response.json();
@@ -24762,7 +24793,7 @@ function parseLogsArgs(input) {
   const params = {}, fields = {};
   let json = false, actorProfileId;
   if (rest[0] && !rest[0].startsWith("--")) params.service = parseNamespacedRef(rest.shift(), { entityLabel: "service" }).fullId;
-  const keys = { "--topic": "topic", "--env": "environment", "--search": "keyword", "--group-by": "groupBy", "--interval": "interval", "--timezone": "timezone", "--request-id": "requestId", "--page": "page" };
+  const keys = { "--metric": "metric", "--topic": "topic", "--env": "environment", "--search": "keyword", "--group-by": "groupBy", "--interval": "interval", "--timezone": "timezone", "--request-id": "requestId", "--page": "page" };
   const times = { "--from": "from", "--to": "to", "--compare-from": "compareFrom", "--compare-to": "compareTo" };
   while (rest.length) {
     const flag = rest.shift();
@@ -24797,10 +24828,11 @@ function parseLogsArgs(input) {
   if (tool !== "schema" && !params.service) throw Error("Service reference required");
   if (tool === "schema" && (Object.keys(params).length || Object.keys(fields).length)) throw Error("logs schema only accepts --json");
   if (tool === "aggregate" || tool === "compare") {
+    if (params.metric && params.metric !== "count") throw Error("Supported metric: count");
     if (!params.from || !params.to || Number(params.from) >= Number(params.to)) throw Error("An increasing --from/--to window is required");
     if (params.page || params.requestId) throw Error("Use --field requestId=value for analysis; --page only applies to query/trace");
   } else {
-    if (params.groupBy || params.interval || params.timezone || params.compareFrom || params.compareTo) throw Error("Grouping and comparison options require aggregate/compare");
+    if (params.metric || params.groupBy || params.interval || params.timezone || params.compareFrom || params.compareTo) throw Error("Grouping and comparison options require aggregate/compare");
     if (params.from) {
       params.sinceMs = params.from;
       delete params.from;
@@ -28280,8 +28312,15 @@ async function main() {
         const delegate = commandArgs.actorProfileId ? { profileId: commandArgs.actorProfileId, token: process.env.PMATE_LOG_DELEGATE_TOKEN ?? "" } : void 0;
         if (delegate && !delegate.token) throw new Error("PMATE_LOG_DELEGATE_TOKEN is required for delegated log tools");
         if (!delegate && process.env.PMATE_LOG_DELEGATE_TOKEN) throw new Error("Delegated log tools require --actor-profile-id");
-        const result = await requestDeveloperLogTool(commandArgs.tool, new URLSearchParams(commandArgs.params), fetch, delegate);
-        console.log(JSON.stringify(result, null, commandArgs.json ? void 0 : 2));
+        try {
+          const result = await requestDeveloperLogTool(commandArgs.tool, new URLSearchParams(commandArgs.params), fetch, delegate);
+          console.log(JSON.stringify(result, null, commandArgs.json ? void 0 : 2));
+        } catch (error) {
+          if (!commandArgs.json) throw error;
+          const failure = error instanceof DeveloperLogError ? { code: error.code, status: error.status, message: error.message } : { code: "logs_unavailable", message: "Log tool failed before receiving a valid response" };
+          console.log(JSON.stringify({ ok: false, error: failure }));
+          process.exitCode = 1;
+        }
         return;
       }
       case "service" /* Service */: {

package/dist/templates/electron/main.cjs

@@ -1,6 +1,7 @@
-const { app, BrowserWindow, session, shell, Menu } = require('electron')
+const { app, BrowserWindow, session, shell, Menu, desktopCapturer } = require('electron')
 const path = require('node:path')
 const { createResourceHandler } = require('./resources.cjs')
+const { installMediaPermissions } = require('./media.cjs')
 const config = require('./desktop-config.json')
 const manifest = require('./resource-manifest.json')
 app.setName(config.productName)
@@ -44,12 +45,7 @@ else {
       }
       return resources(request) ?? desktopSession.fetch(request, { bypassCustomProtocolHandlers: true })
     })
-    desktopSession.setPermissionRequestHandler((contents, permission, callback, details) => {
-      let trusted = false
-      try { trusted = !!contents && new URL(contents.getURL()).origin === config.origin } catch {}
-      callback(Boolean(trusted && permission === 'media' && details.mediaTypes?.length && details.mediaTypes.every(type => type === 'audio')))
-    })
-    desktopSession.setPermissionCheckHandler((_contents, permission, origin, details) => origin === config.origin && permission === 'media' && details.mediaType === 'audio')
+    installMediaPermissions(desktopSession, { origin: config.origin, getWindow: () => mainWindow, desktopCapturer, Menu })
     Menu.setApplicationMenu(Menu.buildFromTemplate([
       { role: 'appMenu' }, { role: 'editMenu' }, { role: 'viewMenu' }, { role: 'windowMenu' },
       { label: config.productName, submenu: [{ label: 'Back to app', click: () => { if (!mainWindow) createWindow(); else void mainWindow.loadURL(config.origin) } }] },

package/dist/templates/electron/media.cjs

@@ -0,0 +1,38 @@
+function installMediaPermissions(desktopSession, { origin, getWindow, desktopCapturer, Menu }) {
+  const sameOrigin = raw => { try { return new URL(raw).origin === origin } catch { return false } }
+  const trusted = contents => {
+    const window = getWindow()
+    return !!window && !window.isDestroyed() && contents === window.webContents && sameOrigin(contents.getURL())
+  }
+  desktopSession.setPermissionRequestHandler((contents, permission, callback, details) => {
+    const allowed = trusted(contents) && details.isMainFrame === true && sameOrigin(details.requestingUrl)
+    callback(Boolean(allowed && (permission === 'display-capture' || (permission === 'media' && details.mediaTypes?.length && details.mediaTypes.every(type => type === 'audio')))))
+  })
+  desktopSession.setPermissionCheckHandler((contents, permission, requestingOrigin, details) => {
+    return Boolean(trusted(contents) && sameOrigin(requestingOrigin) && details.isMainFrame === true && (permission === 'display-capture' || (permission === 'media' && details.mediaType === 'audio')))
+  })
+  desktopSession.setDisplayMediaRequestHandler(async (request, callback) => {
+    const window = getWindow()
+    const valid = () => window && !window.isDestroyed() && trusted(window.webContents) && request.frame && request.frame === window.webContents.mainFrame && sameOrigin(request.securityOrigin)
+    if (!valid() || !request.userGesture || !request.videoRequested || request.audioRequested) return callback(null)
+    let completed = false
+    const finish = source => {
+      if (completed) return
+      completed = true
+      try { callback(source && valid() ? { video: source } : null) } catch { /* Request frame was closed or navigated. */ }
+    }
+    try {
+      const sources = await desktopCapturer.getSources({ types: ['screen', 'window'], thumbnailSize: { width: 0, height: 0 } })
+      if (!valid() || !sources.length) return finish(null)
+      // Older macOS versions have no system picker. Native menu selection remains explicit.
+      const menu = Menu.buildFromTemplate([
+        { label: 'Choose a screen or window to share', enabled: false },
+        { type: 'separator' },
+        ...sources.map(source => ({ label: source.name.replace(/&/g, '&&'), click: () => finish(source) })),
+        { type: 'separator' }, { label: 'Cancel', click: () => finish(null) },
+      ])
+      menu.popup({ window, callback: () => finish(null) })
+    } catch { finish(null) }
+  }, { useSystemPicker: true })
+}
+module.exports = { installMediaPermissions }

package/package.json

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