desktop-pet-app 0.3.27 → 0.4.3

package/out/main/index.js

@@ -29,13 +29,13 @@ const os = require("os");
 const node_crypto = require("node:crypto");
 const node_http = require("node:http");
 const node_os = require("node:os");
+const promises = require("node:fs/promises");
 const crypto = require("crypto");
 const WebSocket = require("ws");
+const node_child_process = require("node:child_process");
 const fs = require("fs");
-const promises = require("node:fs/promises");
 const node_stream = require("node:stream");
 const promises$1 = require("node:stream/promises");
-const node_child_process = require("node:child_process");
 const http = require("http");
 const ORDER = { debug: 10, info: 20, warn: 30, error: 40 };
 class Logger {
@@ -183,7 +183,9 @@ const SKIN_IDS = [
   "tiger",
   "whale",
   "penguin",
-  "robot-blue"
+  "robot-blue",
+  "yier",
+  "bubu"
 ];
 const SKIN_LABELS = {
   codex: "Codex 小宠",
@@ -197,7 +199,9 @@ const SKIN_LABELS = {
   tiger: "老虎",
   whale: "蓝鲸",
   penguin: "企鹅",
-  "robot-blue": "蓝色协作机器人"
+  "robot-blue": "蓝色协作机器人",
+  yier: "一二（白色）",
+  bubu: "布布（棕色）"
 };
 const PET_EVENT = "pet:event";
 const PET_MOVE = "pet:move";
@@ -364,6 +368,7 @@ class PetManager {
   petsVisible = true;
   localDuty = false;
   remoteDuty = /* @__PURE__ */ new Set();
+  remoteDutyKnown = false;
   localAgentConnectionStatus = "disconnected";
   remoteAgentConnectionStatuses = /* @__PURE__ */ new Map();
   observableTasks = /* @__PURE__ */ new Map();
@@ -410,9 +415,20 @@ class PetManager {
     return this.localAgentConnectionStatus;
   }
   setRemoteDuty(usernames) {
+    this.remoteDutyKnown = true;
     this.remoteDuty = new Set(usernames.map((username) => username.trim().toLowerCase()));
     this.publishActivities();
   }
+  /** undefined 表示尚未收到实时 presence，调用方可回退到后台快照。 */
+  getRemoteDuty(username) {
+    if (!this.remoteDutyKnown) return void 0;
+    return this.remoteDuty.has(username.trim().toLowerCase());
+  }
+  resetRemoteDuty() {
+    this.remoteDutyKnown = false;
+    this.remoteDuty.clear();
+    this.publishActivities();
+  }
   setRemoteAgentConnectionStatuses(statuses) {
     this.remoteAgentConnectionStatuses = new Map(
       Object.entries(statuses).map(([username, status2]) => [username.trim().toLowerCase(), status2])
@@ -517,6 +533,54 @@ function center(bounds) {
   return { x: bounds.x + bounds.width / 2, y: bounds.y + bounds.height / 2 };
 }
 const petManager = new PetManager();
+const MAX_MENU_TASKS = 8;
+const MENU_REFRESH_INTERVAL_MS = 5e3;
+class BackgroundSnapshot {
+  constructor(now = Date.now) {
+    this.now = now;
+  }
+  entry;
+  pending;
+  read(key) {
+    return this.entry && Object.is(this.entry.key, key) ? this.entry.value : void 0;
+  }
+  refresh(key, loader, minIntervalMs = 0) {
+    if (this.entry && Object.is(this.entry.key, key) && this.now() - this.entry.refreshedAt < minIntervalMs) {
+      return Promise.resolve(this.entry.value);
+    }
+    if (this.pending && Object.is(this.pending.key, key)) return this.pending.promise;
+    const token = Symbol("menu-refresh");
+    const promise = Promise.resolve().then(loader).then((value) => {
+      if (this.pending?.token === token) {
+        this.entry = { key, value, refreshedAt: this.now() };
+      }
+      return value;
+    }).catch(() => this.read(key)).finally(() => {
+      if (this.pending?.token === token) this.pending = void 0;
+    });
+    this.pending = { key, token, promise };
+    return promise;
+  }
+  clear() {
+    this.entry = void 0;
+    this.pending = void 0;
+  }
+}
+function compactMenuText(value, maxLength) {
+  const compact = value.replace(/\s+/g, " ").trim();
+  if (compact.length <= maxLength) return compact;
+  if (maxLength <= 1) return compact.slice(0, maxLength);
+  return compact.slice(0, maxLength - 1).trimEnd() + "…";
+}
+function resolveFriendDuty(snapshotDuty, liveDuty) {
+  return liveDuty ?? snapshotDuty ?? false;
+}
+function menuTasks(tasks, limit = MAX_MENU_TASKS) {
+  return [...tasks].sort((a, b) => {
+    const activeDelta = Number(isActiveTask(b)) - Number(isActiveTask(a));
+    return activeDelta || Date.parse(b.updatedAt) - Date.parse(a.updatedAt);
+  }).slice(0, limit);
+}
 const OFFICIAL_SERVER_ROOT = "https://api.xinbit.top/desktop-pet";
 const OFFICIAL_PORTAL_ORIGIN = "https://deskpalai.com";
 const LEGACY_OFFICIAL_SERVER_HOSTS = "47.94.20.104".split(",").map((host) => host.trim()).filter(Boolean);
@@ -623,6 +687,38 @@ function relayURLFromHost(value) {
 function isLocalHost(value) {
   return /^(localhost|127\.0\.0\.1|\[::1\])(?::\d+)?(?:\/|$)/i.test(value.trim());
 }
+const INSTALLATION_ID_FILE = "update-installation-id";
+const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+let cachedInstallationID;
+async function installationID() {
+  if (cachedInstallationID) return cachedInstallationID;
+  const path2 = node_path.join(electron.app.getPath("userData"), INSTALLATION_ID_FILE);
+  let replaceInvalidFile = false;
+  try {
+    const stored = (await promises.readFile(path2, "utf8")).trim();
+    if (UUID_PATTERN.test(stored)) {
+      cachedInstallationID = stored;
+      return stored;
+    }
+    replaceInvalidFile = true;
+  } catch (error) {
+    if (error.code !== "ENOENT") {
+      logger.warn("could not read installation id", { error: String(error) });
+    }
+  }
+  const created = node_crypto.randomUUID();
+  await promises.mkdir(electron.app.getPath("userData"), { recursive: true });
+  try {
+    await promises.writeFile(path2, created, { flag: replaceInvalidFile ? "w" : "wx", mode: 384 });
+    cachedInstallationID = created;
+  } catch (error) {
+    if (error.code !== "EEXIST") throw error;
+    const stored = (await promises.readFile(path2, "utf8")).trim();
+    if (!UUID_PATTERN.test(stored)) throw new Error("设备安装标识无效");
+    cachedInstallationID = stored;
+  }
+  return cachedInstallationID;
+}
 const TASK_PROTOCOL_VERSION = "1.0";
 const WORKSPACE_SNAPSHOT_MIME = "application/vnd.desktop-pet.git-workspace-bundle";
 function taskParticipantRole(task, authenticatedUserId) {
@@ -726,16 +822,67 @@ const CAPABILITY_ALIASES = {
   "web.request": "network",
   "web.browser": "browser",
   "document.write": "document.create",
-  "docs.create": "document.create"
+  "docs.create": "document.create",
+  node: "toolchain.node",
+  go: "toolchain.go",
+  golang: "toolchain.go",
+  git: "toolchain.git",
+  python: "toolchain.python",
+  python3: "toolchain.python",
+  npm: "toolchain.npm",
+  pnpm: "toolchain.pnpm",
+  yarn: "toolchain.yarn",
+  bun: "toolchain.bun",
+  rust: "toolchain.rust",
+  cargo: "toolchain.cargo",
+  java: "toolchain.java",
+  maven: "toolchain.maven",
+  mvn: "toolchain.maven",
+  gradle: "toolchain.gradle"
 };
-function executionCapabilities(configured = process.env.DESKTOP_PET_EXECUTION_CAPABILITIES) {
-  const source = configured?.trim() || DEFAULT_EXECUTION_CAPABILITIES.join(",");
+const TOOLCHAIN_PROBES = [
+  ["git", "toolchain.git"],
+  ["go", "toolchain.go"],
+  ["python3", "toolchain.python"],
+  ["npm", "toolchain.npm"],
+  ["pnpm", "toolchain.pnpm"],
+  ["yarn", "toolchain.yarn"],
+  ["bun", "toolchain.bun"],
+  ["rustc", "toolchain.rust"],
+  ["cargo", "toolchain.cargo"],
+  ["java", "toolchain.java"],
+  ["mvn", "toolchain.maven"],
+  ["gradle", "toolchain.gradle"]
+];
+let cachedDetectedCapabilities;
+function commandAvailable(command) {
+  const result = node_child_process.spawnSync(command, ["--version"], {
+    stdio: "ignore",
+    timeout: 1e3
+  });
+  return !result.error && result.status === 0;
+}
+function detectEnvironmentCapabilities(probe = commandAvailable) {
+  return [
+    "toolchain.node",
+    ...TOOLCHAIN_PROBES.filter(([command]) => probe(command)).map(([, capability]) => capability)
+  ];
+}
+function detectedEnvironmentCapabilities() {
+  if (!cachedDetectedCapabilities) cachedDetectedCapabilities = detectEnvironmentCapabilities();
+  return cachedDetectedCapabilities;
+}
+function normalizeCapabilities(values) {
   return [
     ...new Set(
-      source.split(",").map((value) => value.trim().toLowerCase()).filter(Boolean).map((value) => CAPABILITY_ALIASES[value] ?? value)
+      values.map((value) => value.trim().toLowerCase()).filter(Boolean).map((value) => CAPABILITY_ALIASES[value] ?? value)
     )
   ];
 }
+function executionCapabilities(configured = process.env.DESKTOP_PET_EXECUTION_CAPABILITIES, detected = detectedEnvironmentCapabilities(), additional = process.env.DESKTOP_PET_ADDITIONAL_CAPABILITIES) {
+  const base = configured?.trim() ? configured.split(",") : [...DEFAULT_EXECUTION_CAPABILITIES, ...detected];
+  return normalizeCapabilities([...base, ...additional?.split(",") ?? []]);
+}
 function showDesktopNotification(title, body) {
   if (!electron.Notification.isSupported()) return;
   new electron.Notification({ title, body }).show();
@@ -821,6 +968,7 @@ let observedMcpBridgeVersion;
 let ws = null;
 let connectPromise = null;
 let intentionalClose = false;
+let authenticationBlocked = !allowDevelopmentOverrides && !authToken;
 let protocolV1Available = false;
 let workspaceSnapshotStagingAvailable = false;
 let mcpRegistration;
@@ -868,6 +1016,7 @@ function configureRelayIdentity(config) {
   deviceID = config.deviceId;
   authToken = config.accessToken;
   signingPrivateKey = config.signingPrivateKey ?? "";
+  authenticationBlocked = false;
 }
 function clearRelayIdentity() {
   if (ws || connectPromise) throw new Error("stop relay before clearing identity");
@@ -876,9 +1025,22 @@ function clearRelayIdentity() {
   deviceID = allowDevelopmentOverrides ? process.env.DESKTOP_PET_DEVICE_ID?.trim() || "" : "";
   authToken = allowDevelopmentOverrides ? process.env.DESKTOP_PET_TOKEN?.trim() : void 0;
   signingPrivateKey = "";
+  authenticationBlocked = !allowDevelopmentOverrides && !authToken;
 }
-async function registerMcpClient(agentHost, capabilities = {}) {
-  mcpRegistration = { agentHost, capabilities };
+function isRelayAuthenticationBlocked() {
+  return authenticationBlocked;
+}
+async function registerMcpClient(agentHost, capabilities = {}, hostExecutionCapabilities) {
+  const sanitizedExecutionCapabilities = hostExecutionCapabilities ? [
+    ...new Set(
+      hostExecutionCapabilities.map((value) => value.trim().toLowerCase()).filter((value) => /^[a-z0-9][a-z0-9._-]{0,63}$/.test(value))
+    )
+  ].slice(0, 100) : void 0;
+  mcpRegistration = {
+    agentHost,
+    capabilities,
+    executionCapabilities: sanitizedExecutionCapabilities
+  };
   await ensureConnected();
   ws?.send(
     JSON.stringify({
@@ -917,6 +1079,7 @@ function stopRelay() {
   protocolV1Available = false;
   workspaceSnapshotStagingAvailable = false;
   dutyPublished = false;
+  petManager.resetRemoteDuty();
   cancelRelayReconnect();
   retryAttempt = 0;
   connectPromise = null;
@@ -960,6 +1123,7 @@ function stopRelay() {
 function ensureConnected() {
   if (ws && ws.readyState === WebSocket.OPEN) return Promise.resolve();
   if (connectPromise) return connectPromise;
+  if (authenticationBlocked) return Promise.reject(relayAuthenticationError());
   connectPromise = new Promise((resolve, reject) => {
     let settled = false;
     let authRejected = false;
@@ -989,6 +1153,7 @@ function ensureConnected() {
       if (msg.task) msg.task = withParticipantRole(msg.task);
       if (msg.tasks) msg.tasks = msg.tasks.map(withParticipantRole);
       if (msg.type === "registered") {
+        authenticationBlocked = false;
         retryAttempt = 0;
         protocolV1Available = msg.protocolVersion === TASK_PROTOCOL_VERSION;
         workspaceSnapshotStagingAvailable = msg.capabilities?.workspaceSnapshotStaging === true;
@@ -1092,13 +1257,13 @@ function ensureConnected() {
       }
     });
     sock.on("error", (err) => {
-      if (/Unexpected server response: 40\d/.test(String(err))) authRejected = true;
+      if (/Unexpected server response: (?:401|403)/.test(String(err))) {
+        authRejected = true;
+        if (ws === sock) authenticationBlocked = true;
+      }
       logger.warn("relay socket error", { error: String(err) });
       if (!settled) {
         settled = true;
-        if (ws === sock) {
-          connectPromise = null;
-        }
         reject(err);
       }
     });
@@ -1120,6 +1285,7 @@ function ensureConnected() {
       }
       if (isCurrentSocket && !intentionalClose) {
         if (authRejected) {
+          authenticationBlocked = true;
           logger.warn("relay rejected by server authentication; auto reconnect paused until identity changes", {
             server: serverURL,
             authenticated: Boolean(authToken)
@@ -1132,6 +1298,13 @@ function ensureConnected() {
   });
   return connectPromise;
 }
+function relayAuthenticationError() {
+  const error = new Error(
+    authToken ? "中转服务认证已失效，请重新登录桌宠账号" : "请先登录桌宠账号后再使用协作功能"
+  );
+  error.code = "RELAY_AUTH_REQUIRED";
+  return error;
+}
 async function askFriend(opts) {
   await ensureConnected();
   const questionId = crypto.randomUUID();
@@ -1190,6 +1363,9 @@ async function askFriend(opts) {
 async function getCollaborationState() {
   const response = await relayRPC({ type: "help.list" }, 1e4);
   const friends = response.friends ?? [];
+  petManager.setRemoteDuty(
+    friends.filter((friend) => friend.duty).map((friend) => friend.username)
+  );
   petManager.setRemoteAgentConnectionStatuses(
     Object.fromEntries(
       friends.flatMap((friend) => friend.agentStatus ? [[friend.username, friend.agentStatus]] : [])
@@ -1313,10 +1489,13 @@ function relayCapabilities() {
       connectionStatus: mcpConnectionStatus,
       ...observedMcpBridgeVersion ? { bridgeProtocolVersion: observedMcpBridgeVersion } : {}
     },
-    execution: executionCapabilities(),
+    execution: currentExecutionCapabilities(),
     platform: `${process.platform}-${process.arch}`
   };
 }
+function currentExecutionCapabilities() {
+  return mcpRegistration?.executionCapabilities ?? executionCapabilities();
+}
 function publishDeviceCapabilities() {
   if (!ws || ws.readyState !== WebSocket.OPEN) return;
   ws.send(
@@ -1330,11 +1509,11 @@ function publishDeviceCapabilities() {
 }
 function showCapabilityUnavailable(msg) {
   const required = msg.requiredCapabilities ?? [];
-  const available = new Set(executionCapabilities());
+  const available = new Set(currentExecutionCapabilities());
   const missing = required.filter((capability) => !available.has(capability));
   const named = (missing.length > 0 ? missing : required).join("、") || "所需工具";
   const sender = msg.from ? `@${msg.from} 的` : "这项";
-  const text = `暂时无法匹配：${sender}任务带有语义能力标签 ${named}，但当前设备未声明兼容标签。可移除任务的硬筛选，或更新设备的能力映射后重连。`;
+  const text = `暂时无法匹配：${sender}任务强制要求 ${named}，但当前设备未通过对应能力声明。可让发起方改为 ignore，或补齐工具链/服务后重连。`;
   dispatch({ type: "state", state: "failed", ttl: 12 });
   dispatch({ type: "bubble", text, ttl: 18e3 });
   showDesktopNotification("桌宠暂时无法接单", text);
@@ -1665,13 +1844,13 @@ async function activateStoredDevice() {
   return true;
 }
 async function configureAndActivateDevice(credentials) {
-  const signedCredentials = withSigningKeys(credentials);
+  const signedCredentials = { ...credentials, ...ensureDeviceKeyMaterial(credentials) };
   saveDeviceCredentials(signedCredentials);
   await activateDevice(signedCredentials, true);
 }
 async function activateDevice(credentials, restart) {
   if (!credentials.publicKey || !credentials.privateKey || !credentials.encryptionPublicKey || !credentials.encryptionPrivateKey) {
-    credentials = withSigningKeys(credentials);
+    credentials = { ...credentials, ...ensureDeviceKeyMaterial(credentials) };
     saveDeviceCredentials(credentials);
   }
   const base = credentials.serverUrl.replace(/\/$/, "");
@@ -1681,6 +1860,7 @@ async function activateDevice(credentials, restart) {
     body: JSON.stringify({
       deviceId: credentials.deviceId,
       refreshToken: credentials.refreshToken,
+      installationId: await installationID(),
       publicKey: credentials.publicKey,
       encryptionPublicKey: credentials.encryptionPublicKey
     })
@@ -1719,29 +1899,35 @@ async function activateDevice(credentials, restart) {
     );
   }, refreshAt);
 }
-function withSigningKeys(credentials) {
-  let next = credentials;
-  if (!next.publicKey || !next.privateKey) {
-    const { publicKey, privateKey } = node_crypto.generateKeyPairSync("ed25519", {
+function ensureDeviceKeyMaterial(credentials = {}) {
+  let publicKey = credentials.publicKey;
+  let privateKey = credentials.privateKey;
+  let encryptionPublicKey = credentials.encryptionPublicKey;
+  let encryptionPrivateKey = credentials.encryptionPrivateKey;
+  if (!publicKey || !privateKey) {
+    const generated = node_crypto.generateKeyPairSync("ed25519", {
       publicKeyEncoding: { type: "spki", format: "pem" },
       privateKeyEncoding: { type: "pkcs8", format: "pem" }
     });
-    next = { ...next, publicKey, privateKey };
+    publicKey = generated.publicKey;
+    privateKey = generated.privateKey;
   }
-  if (!next.encryptionPublicKey || !next.encryptionPrivateKey) {
-    const { publicKey, privateKey } = node_crypto.generateKeyPairSync("rsa", {
+  if (!encryptionPublicKey || !encryptionPrivateKey) {
+    const generated = node_crypto.generateKeyPairSync("rsa", {
       modulusLength: 2048,
       publicKeyEncoding: { type: "spki", format: "pem" },
       privateKeyEncoding: { type: "pkcs8", format: "pem" }
     });
-    next = { ...next, encryptionPublicKey: publicKey, encryptionPrivateKey: privateKey };
+    encryptionPublicKey = generated.publicKey;
+    encryptionPrivateKey = generated.privateKey;
   }
-  return next;
+  return { publicKey, privateKey, encryptionPublicKey, encryptionPrivateKey };
 }
 const deviceAuth = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   activateStoredDevice,
   configureAndActivateDevice,
+  ensureDeviceKeyMaterial,
   getDeviceIceServers
 }, Symbol.toStringTag, { value: "Module" }));
 function defaultAccountServerURL(relayURL = configuredRelayURL()) {
@@ -1767,11 +1953,16 @@ async function bindDesktopPetToWebSession(server, accessToken) {
   if (!accessToken) throw new Error("网页没有返回有效的登录会话");
   const session = await get(serverUrl, "/api/auth/me", accessToken);
   if (!session.user?.username) throw new Error("服务器没有返回有效的账号信息");
+  const previousCredentials = reusableCredentials(serverUrl, session.user.username);
+  const keyMaterial = ensureDeviceKeyMaterial(previousCredentials);
   const device = await post(
     serverUrl,
     "/api/devices",
     {
       name: `Desktop Pet · ${node_os.hostname()}`,
+      installationId: await installationID(),
+      publicKey: keyMaterial.publicKey,
+      encryptionPublicKey: keyMaterial.encryptionPublicKey,
       capabilities: {
         agentHost: process.env.DESKTOP_PET_AGENT_HOST || "unknown-mcp-host",
         mcp: { tools: true, sampling: false, roots: true, tasks: true },
@@ -1786,10 +1977,20 @@ async function bindDesktopPetToWebSession(server, accessToken) {
     serverUrl,
     userId: session.user.username,
     deviceId: device.device.id,
-    refreshToken: device.refreshToken
+    refreshToken: device.refreshToken,
+    ...keyMaterial
   });
   return { username: session.user.username };
 }
+function reusableCredentials(serverUrl, username) {
+  try {
+    const credentials = loadDeviceCredentials();
+    if (!credentials || credentials.userId.toLowerCase() !== username.toLowerCase()) return void 0;
+    return normalizeServerURL(credentials.serverUrl) === serverUrl ? credentials : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function normalizeServerURL(value) {
   let url;
   try {
@@ -2203,7 +2404,7 @@ async function checkForUpdates(currentVersion = electron.app.getVersion()) {
     endpoint.searchParams.set("arch", process.arch);
     endpoint.searchParams.set("currentVersion", currentVersion);
     endpoint.searchParams.set("channel", updateChannel());
-    endpoint.searchParams.set("installationId", await updateInstallationID());
+    endpoint.searchParams.set("installationId", await installationID());
     const response = await electron.net.fetch(endpoint.toString(), {
       headers: { accept: "application/json" },
       signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
@@ -2702,34 +2903,6 @@ function updateChannel() {
   const channel = process.env.DESKTOP_PET_UPDATE_CHANNEL?.trim() || "stable";
   return /^[a-z][a-z0-9-]{0,31}$/.test(channel) ? channel : "stable";
 }
-let cachedInstallationID;
-async function updateInstallationID() {
-  if (cachedInstallationID) return cachedInstallationID;
-  const path2 = node_path.join(electron.app.getPath("userData"), "update-installation-id");
-  let replaceInvalidFile = false;
-  try {
-    const stored = (await promises.readFile(path2, "utf8")).trim();
-    if (/^[0-9a-f-]{36}$/i.test(stored)) {
-      cachedInstallationID = stored;
-      return stored;
-    }
-    replaceInvalidFile = true;
-  } catch (error) {
-    if (error.code !== "ENOENT") {
-      logger.warn("could not read update installation id", { error: String(error) });
-    }
-  }
-  const created = node_crypto.randomUUID();
-  await promises.mkdir(electron.app.getPath("userData"), { recursive: true });
-  try {
-    await promises.writeFile(path2, created, { flag: replaceInvalidFile ? "w" : "wx", mode: 384 });
-    cachedInstallationID = created;
-  } catch (error) {
-    if (error.code !== "EEXIST") throw error;
-    cachedInstallationID = (await promises.readFile(path2, "utf8")).trim();
-  }
-  return cachedInstallationID;
-}
 function asString(value) {
   return typeof value === "string" ? value.trim() : "";
 }
@@ -2767,6 +2940,7 @@ function humanizeUpdateError(error) {
   return "暂时无法检查更新";
 }
 const SKINS = SKIN_IDS.map((id) => ({ id, label: SKIN_LABELS[id] }));
+const collaborationSnapshot = new BackgroundSnapshot();
 let nextId = 1;
 function createPetWindow(skin, options) {
   if (petManager.count() >= MAX_PETS) {
@@ -2780,6 +2954,7 @@ function createPetWindow(skin, options) {
   const initialSize = PET_WINDOW_BY_SKIN[skin] ?? PET_WINDOW;
   let W = initialSize.width;
   let H = initialSize.height;
+  let menuOpen = false;
   const x = options.near?.x ?? workArea.x + workArea.width - W - 120;
   const y = options.near?.y ?? workArea.y + workArea.height - H - 60;
   const win = new electron.BrowserWindow({
@@ -2815,6 +2990,7 @@ function createPetWindow(skin, options) {
     const presentation = publishIdentity();
     dispatch({ type: "bubble", text: presentation.greeting }, id);
     petManager.replayActivity(id);
+    refreshCollaborationSnapshot();
   });
   const publishIdentity = () => {
     const presentation = presentPetIdentity(identity, currentAccountUsername());
@@ -2832,17 +3008,30 @@ function createPetWindow(skin, options) {
     }
   };
   const onMenu = (e) => {
-    if (win.isDestroyed() || e.sender !== win.webContents) return;
-    void showPetMenu();
+    if (win.isDestroyed() || e.sender !== win.webContents || menuOpen) return;
+    showPetMenu();
   };
   const onMousePassthrough = (e, enabled) => {
     if (win.isDestroyed() || e.sender !== win.webContents || typeof enabled !== "boolean") return;
     win.setIgnoreMouseEvents(enabled, { forward: enabled });
   };
-  const showPetMenu = async () => {
+  const refreshCollaborationSnapshot = () => {
+    const username = currentAccountUsername();
+    if (!username) {
+      collaborationSnapshot.clear();
+      return;
+    }
+    void collaborationSnapshot.refresh(
+      username,
+      getCollaborationState,
+      MENU_REFRESH_INTERVAL_MS
+    );
+  };
+  const showPetMenu = () => {
     const accountUsername = currentAccountUsername();
     const identityPresentation = publishIdentity();
-    const collaboration = accountUsername ? await loadCollaborationState() : void 0;
+    const collaboration = accountUsername ? collaborationSnapshot.read(accountUsername) : void 0;
+    refreshCollaborationSnapshot();
     if (win.isDestroyed()) return;
     const incoming = collaboration?.helpRequests.filter(
       (request) => request.toUsername === accountUsername && request.status === "pending"
@@ -2894,7 +3083,7 @@ function createPetWindow(skin, options) {
         enabled: Boolean(accountUsername),
         submenu: collaboration ? collaborationMenuItems(collaboration.tasks) : [
           {
-            label: petManager.getLocalAgentConnectionStatus() === "update-required" ? "本机 Agent 需要重连以加载新版 MCP" : petManager.isLocalOnDuty() ? "本机正在驻守 · 服务器状态暂不可用" : "暂时无法读取协作状态",
+            label: petManager.getLocalAgentConnectionStatus() === "update-required" ? "本机 Agent 需要重连以加载新版 MCP" : isRelayAuthenticationBlocked() ? "账号连接已失效，请重新登录" : petManager.isLocalOnDuty() ? "本机正在驻守 · 服务器状态暂不可用" : "正在刷新协作状态，请稍后再打开菜单",
             enabled: false
           }
         ]
@@ -2902,7 +3091,10 @@ function createPetWindow(skin, options) {
       {
         label: `好友状态${collaboration ? `（${collaboration.friends.length}）` : ""}`,
         enabled: Boolean(accountUsername),
-        submenu: collaboration ? friendItems.length > 0 ? friendItems : [{ label: "还没有好友，请先到个人后台添加", enabled: false }] : [{ label: accountUsername ? "暂时无法连接服务器" : "请先登录账号", enabled: false }]
+        submenu: collaboration ? friendItems.length > 0 ? friendItems : [{ label: "还没有好友，请先到个人后台添加", enabled: false }] : [{
+          label: accountUsername ? isRelayAuthenticationBlocked() ? "账号认证已失效，请点击上方账号重新登录" : "正在刷新好友状态，请稍后再打开菜单" : "请先登录账号",
+          enabled: false
+        }]
       },
       {
         label: `要我帮忙${incoming.length ? `（${incoming.length}）` : ""}`,
@@ -2946,6 +3138,10 @@ function createPetWindow(skin, options) {
       ...canSendAwayPet(identity) ? [{ label: "送走这只宠物", click: () => win.close() }] : [],
       { label: "退出", click: () => electron.app.quit() }
     ]);
+    menuOpen = true;
+    menu.once("menu-will-close", () => {
+      menuOpen = false;
+    });
     menu.popup({ window: win });
   };
   electron.ipcMain.on(PET_MOVE, onMove);
@@ -3031,16 +3227,6 @@ function updateMenuItems(petId) {
   }
   return items;
 }
-async function loadCollaborationState() {
-  try {
-    return await Promise.race([
-      getCollaborationState(),
-      new Promise((resolve) => setTimeout(() => resolve(void 0), 1800))
-    ]);
-  } catch {
-    return void 0;
-  }
-}
 function friendMenuItem(friend, state, currentUsername, petId) {
   const activeTask = state.tasks.filter((task) => isActiveTask(task) && taskPeer(task).toLowerCase() === friend.username.toLowerCase()).sort((a, b) => Date.parse(b.updatedAt) - Date.parse(a.updatedAt))[0];
   const outboundHelp = state.helpRequests.find(
@@ -3050,13 +3236,14 @@ function friendMenuItem(friend, state, currentUsername, petId) {
     (request) => request.status === "accepted" && (request.fromUsername === currentUsername && request.toUsername === friend.username || request.fromUsername === friend.username && request.toUsername === currentUsername)
   );
   const helpLabel = outboundHelp?.status === "accepted" ? " · TA 已同意帮我" : outboundHelp?.status === "pending" ? " · 求助待 TA 接受" : activeHelp ? " · 我正在帮 TA" : "";
-  const availability = friend.agentStatus === "update-required" ? " · Agent 需重连" : activeTask ? " · " + taskActivity(activeTask).label.split(" · ").at(-1) : friend.duty ? " · 已驻守" : friend.online && friend.agentStatus === "disconnected" ? " · Agent 未连接" : friend.online ? " · 在线，未驻守" : " · 离线";
+  const friendOnDuty = resolveFriendDuty(friend.duty, petManager.getRemoteDuty(friend.username));
+  const availability = friend.agentStatus === "update-required" ? " · Agent 需重连" : activeTask ? " · " + taskActivity(activeTask).label.split(" · ").at(-1) : friendOnDuty ? " · 已驻守" : friend.online && friend.agentStatus === "disconnected" ? " · Agent 未连接" : friend.online ? " · 在线，未驻守" : " · 离线";
   const chatMessages = ["你好呀！", "现在方便聊聊吗？", "谢谢你的帮助！"];
   return {
     label: friend.displayName + " (@" + friend.username + ")" + availability + helpLabel,
     submenu: [
       {
-        label: friend.agentStatus === "update-required" ? "Desktop Pet 已更新，请 TA 重启或重新加载 Agent 的 MCP 连接" : activeTask ? "当前任务：" + taskActivity(activeTask).detail : friend.duty ? "Agent 正在驻守，等待好友任务" : friend.online && friend.agentStatus === "disconnected" ? "桌宠在线，但 Agent 尚未连接 MCP" : friend.online ? "桌宠在线，但 Agent 尚未驻守" : "桌宠当前离线",
+        label: friend.agentStatus === "update-required" ? "Desktop Pet 已更新，请 TA 重启或重新加载 Agent 的 MCP 连接" : activeTask ? "当前任务：" + taskActivity(activeTask).detail : friendOnDuty ? "Agent 正在驻守，等待好友任务" : friend.online && friend.agentStatus === "disconnected" ? "桌宠在线，但 Agent 尚未连接 MCP" : friend.online ? "桌宠在线，但 Agent 尚未驻守" : "桌宠当前离线",
         enabled: false
       },
       { type: "separator" },
@@ -3110,17 +3297,17 @@ function collaborationMenuItems(tasks) {
   return [
     duty,
     { type: "separator" },
-    ...tasks.slice(0, 12).map((task) => {
+    ...menuTasks(tasks).map((task) => {
       const view = taskActivity(task);
       const measured = view.current != null && view.total != null ? " · " + view.current + "/" + view.total : "";
-      const summary = task.result?.summary?.replace(/\s+/g, " ").slice(0, 80);
+      const summary = task.result?.summary ? compactMenuText(task.result.summary, 80) : void 0;
       return {
         label: taskMenuLabel(task),
         submenu: [
           { label: "状态：" + view.label + measured, enabled: false },
-          { label: "当前步骤：" + view.detail, enabled: false },
+          { label: "当前步骤：" + compactMenuText(view.detail, 120), enabled: false },
           { label: "协作好友：@" + taskPeer(task), enabled: false },
-          { label: "任务：" + taskTitle(task).replace(/\s+/g, " ").slice(0, 90), enabled: false },
+          { label: "任务：" + compactMenuText(taskTitle(task), 90), enabled: false },
           { label: "最近更新：" + new Date(task.updatedAt).toLocaleString(), enabled: false },
           ...summary ? [{ label: "结果：" + summary, enabled: false }] : []
         ]
@@ -3540,6 +3727,7 @@ async function handleRelay(cmd, res) {
           },
           executionPolicy: {
             capabilities: ["filesystem.read"],
+            capabilityMode: "ignore",
             writableScopes: [],
             networkPolicy: "ask",
             approvalMode: "manual",
@@ -3702,7 +3890,7 @@ async function handleRelay(cmd, res) {
         fail(res, 400, "register_mcp_client requires agentHost", ErrorCodes.BAD_EVENT);
         return;
       }
-      await registerMcpClient(agentHost, cmd.mcpCapabilities ?? {});
+      await registerMcpClient(agentHost, cmd.mcpCapabilities ?? {}, cmd.executionCapabilities);
       ok(res);
       return;
     }
@@ -4129,8 +4317,8 @@ electron.app.whenReady().then(async () => {
     return false;
   });
   logger.info("device activation finished", { activated });
-  if (!activated) startRelay();
-  logger.info("relay start requested", { authenticated: activated });
+  if (activated) logger.info("relay start requested", { authenticated: true });
+  else logger.info("relay waiting for account authentication");
   if (process.env.DESKTOP_PET_P2P !== "0") startP2PWindow(getDeviceIceServers());
   logger.info("p2p start requested", { enabled: process.env.DESKTOP_PET_P2P !== "0" });
   void startRunnerManager();