sessix-server 0.1.4 → 0.2.1

package/dist/index.js

@@ -43,6 +43,8 @@ var zh = {
     autoDiscoveryOn: "  \u{1F4A1} \u81EA\u52A8\u53D1\u73B0\u5DF2\u542F\u7528\uFF0C\u540C\u7F51\u6BB5\u624B\u673A\u53EF\u81EA\u52A8\u8FDE\u63A5",
     autoDiscoveryHint: "     \u5982\u5728\u516C\u5171\u7F51\u7EDC\uFF0C\u5EFA\u8BAE\u5173\u95ED: SESSIX_AUTO_CONNECT=false npx sessix-server",
     autoDiscoveryOff: "  \u2139\uFE0F  \u81EA\u52A8\u53D1\u73B0\u5DF2\u5173\u95ED\uFF0C\u624B\u673A\u9700\u624B\u52A8\u8F93\u5165\u5730\u5740\u8FDE\u63A5",
+    pairingOpen: "  \u{1F513} \u914D\u5BF9\u6A21\u5F0F\u5DF2\u5F00\u542F\uFF085 \u5206\u949F\u5185\u6709\u6548\uFF09\u2014 \u6309 p \u91CD\u65B0\u5F00\u542F",
+    pairingReopened: "\u{1F513} \u914D\u5BF9\u6A21\u5F0F\u5DF2\u91CD\u65B0\u5F00\u542F\uFF085 \u5206\u949F\uFF09",
     receivedSignal: "\u6536\u5230 {{signal}}\uFF0C\u6B63\u5728\u4F18\u96C5\u5173\u95ED...",
     goodbye: "\u6240\u6709\u670D\u52A1\u5DF2\u5173\u95ED\uFF0C\u518D\u89C1\uFF01",
     shutdownError: "\u5173\u95ED\u8FC7\u7A0B\u51FA\u9519:",
@@ -69,7 +71,8 @@ var zh = {
     restarting: "\u91CD\u65B0\u542F\u52A8 {{label}}...",
     activityPushEnabled: "ActivityKit Push \u5DF2\u542F\u7528",
     activityPushFailed: "ActivityKit Push \u521D\u59CB\u5316\u5931\u8D25:",
-    activityPushContinue: "\u7EE7\u7EED\u542F\u52A8\uFF08Live Activity \u540E\u53F0\u63A8\u9001\u4E0D\u53EF\u7528\uFF09"
+    activityPushContinue: "\u7EE7\u7EED\u542F\u52A8\uFF08Live Activity \u540E\u53F0\u63A8\u9001\u4E0D\u53EF\u7528\uFF09",
+    noActiveLoginProcess: "\u6CA1\u6709\u6D3B\u8DC3\u7684\u767B\u5F55\u8FDB\u7A0B"
   },
   ws: {
     started: "WebSocket \u670D\u52A1\u5DF2\u542F\u52A8\uFF0C\u7AEF\u53E3 {{port}}",
@@ -144,6 +147,8 @@ var en = {
     autoDiscoveryOn: "  Auto-discovery enabled, phones on the same network can connect automatically",
     autoDiscoveryHint: "     On public networks, disable with: SESSIX_AUTO_CONNECT=false npx sessix-server",
     autoDiscoveryOff: "  Auto-discovery disabled, phone must enter address manually",
+    pairingOpen: "  \u{1F513} Pairing mode open (5 min) \u2014 press p to reopen",
+    pairingReopened: "\u{1F513} Pairing mode reopened (5 min)",
     receivedSignal: "Received {{signal}}, graceful shutdown...",
     goodbye: "All services closed, goodbye!",
     shutdownError: "Shutdown error:",
@@ -170,7 +175,8 @@ var en = {
     restarting: "Restarting {{label}}...",
     activityPushEnabled: "ActivityKit Push enabled",
     activityPushFailed: "ActivityKit Push init failed:",
-    activityPushContinue: "Continuing startup (Live Activity background push unavailable)"
+    activityPushContinue: "Continuing startup (Live Activity background push unavailable)",
+    noActiveLoginProcess: "No active login process"
   },
   ws: {
     started: "WebSocket server started on port {{port}}",
@@ -283,11 +289,14 @@ var import_node_child_process2 = require("child_process");
 var import_node_util = require("util");
 
 // src/providers/ProcessProvider.ts
-var import_child_process = require("child_process");
+var import_child_process2 = require("child_process");
 var import_readline = require("readline");
 var import_events = require("events");
 var import_node_os = require("os");
 var import_uuid = require("uuid");
+
+// src/utils/claudePath.ts
+var import_child_process = require("child_process");
 function findClaudePath() {
   try {
     return (0, import_child_process.execSync)("which claude", { encoding: "utf-8" }).trim();
@@ -307,6 +316,8 @@ function findClaudePath() {
     return "claude";
   }
 }
+
+// src/providers/ProcessProvider.ts
 var CLAUDE_PATH = findClaudePath();
 var ProcessProvider = class {
   /** 活跃会话映射表：sessionId -> { session, process } */
@@ -499,7 +510,7 @@ var ProcessProvider = class {
     }
     const env = { ...process.env, SESSIX_SESSION_ID: sessionId };
     delete env.CLAUDECODE;
-    const proc = (0, import_child_process.spawn)(CLAUDE_PATH, args, {
+    const proc = (0, import_child_process2.spawn)(CLAUDE_PATH, args, {
       cwd: projectPath,
       env,
       stdio: ["pipe", "pipe", "pipe"]
@@ -706,7 +717,7 @@ ${context}`;
     return new Promise((resolve, reject) => {
       const env = { ...process.env };
       delete env.CLAUDECODE;
-      const proc = (0, import_child_process.spawn)(CLAUDE_PATH, ["-p", prompt, "--output-format", "text"], {
+      const proc = (0, import_child_process2.spawn)(CLAUDE_PATH, ["-p", prompt, "--output-format", "text"], {
         cwd: (0, import_node_os.homedir)(),
         env,
         stdio: ["pipe", "pipe", "pipe"]
@@ -1617,6 +1628,7 @@ var ApprovalProxy = class _ApprovalProxy {
   alwaysAllowedTools = /* @__PURE__ */ new Set();
   /** 获取状态信息的回调（由外部注入） */
   statusInfoProvider = null;
+  pairingManager = null;
   constructor(options) {
     this.token = options.token;
     this.port = options.port;
@@ -1651,6 +1663,10 @@ var ApprovalProxy = class _ApprovalProxy {
   setStatusInfoProvider(provider) {
     this.statusInfoProvider = provider;
   }
+  /** 设置配对管理器 */
+  setPairingManager(manager) {
+    this.pairingManager = manager;
+  }
   /** 设置会话的 YOLO 模式（服务端拦截，即使手机断连也生效） */
   setYoloMode(sessionId, enabled) {
     this.yoloSessions.set(sessionId, enabled);
@@ -1811,6 +1827,8 @@ var ApprovalProxy = class _ApprovalProxy {
     const pathname = url.pathname;
     if (req.method === "POST" && pathname === "/hook/approval") {
       this.handleApprovalHook(req, res);
+    } else if (req.method === "POST" && pathname === "/pair") {
+      this.handlePair(req, res);
     } else if (req.method === "GET" && pathname === "/health") {
       this.handleHealth(req, res);
     } else if (req.method === "GET" && pathname === "/token") {
@@ -1881,6 +1899,23 @@ var ApprovalProxy = class _ApprovalProxy {
       activeSessions: info.activeSessions
     });
   }
+  /** 配对端点：配对窗口开放时返回 token */
+  handlePair(_req, res) {
+    if (!this.pairingManager) {
+      this.sendJson(res, 503, { error: "pairing_unavailable" });
+      return;
+    }
+    const result = this.pairingManager.tryPair();
+    if (result) {
+      console.log("[ApprovalProxy] Device paired successfully");
+      this.sendJson(res, 200, result);
+    } else {
+      this.sendJson(res, 403, {
+        error: "pairing_closed",
+        message: "Pairing window is closed. Restart server or press p to reopen."
+      });
+    }
+  }
   /** 返回连接 token（仅本机访问） */
   handleToken(req, res) {
     const remoteAddress = req.socket.remoteAddress;
@@ -1951,12 +1986,12 @@ var MdnsService = class {
   wsPort;
   httpPort;
   version;
-  token;
+  pairing;
   constructor(options) {
     this.wsPort = options.wsPort;
     this.httpPort = options.httpPort;
     this.version = options.version ?? "0.1.0";
-    this.token = options.token ?? "";
+    this.pairing = options.pairing ?? "closed";
   }
   /**
    * 启动 mDNS 广播
@@ -1974,7 +2009,8 @@ var MdnsService = class {
       txt: {
         version: this.version,
         httpPort: String(this.httpPort),
-        token: this.token
+        wsPort: String(this.wsPort),
+        pairing: this.pairing
       }
     });
     console.log(`[MdnsService] ${t("mdns.started", { port: this.wsPort })}`);
@@ -1995,6 +2031,29 @@ var MdnsService = class {
     }
     console.log(`[MdnsService] ${t("mdns.closed")}`);
   }
+  /**
+   * 更新配对状态（重新发布 mDNS 服务）
+   */
+  updatePairingState(state) {
+    this.pairing = state;
+    if (!this.bonjour) return;
+    if (this.service) {
+      this.service.stop?.(() => {
+      });
+      this.service = null;
+    }
+    this.service = this.bonjour.publish({
+      name: "Sessix",
+      type: "sessix",
+      port: this.wsPort,
+      txt: {
+        version: this.version,
+        httpPort: String(this.httpPort),
+        wsPort: String(this.wsPort),
+        pairing: state
+      }
+    });
+  }
 };
 
 // src/hooks/HookInstaller.ts
@@ -2240,8 +2299,8 @@ var NotificationService = class {
     if (entry) entry.enabled = enabled;
   }
   /** 注册手机 push token（连接建立时由 WsBridge 调用） */
-  addPushToken(token) {
-    this.expoChannel?.addToken(token);
+  addPushToken(token, ws) {
+    this.expoChannel?.addToken(token, ws);
   }
   /** 移除手机 push token（断线时或手机主动注销时调用） */
   removePushToken(token) {
@@ -2481,17 +2540,21 @@ var MacNotificationChannel = class {
 var EXPO_PUSH_API = "https://exp.host/--/api/v2/push/send";
 var ExpoNotificationChannel = class {
   tokens = /* @__PURE__ */ new Set();
+  /** push token → WebSocket 连接映射，用于前台抑制 */
+  tokenWsMap = /* @__PURE__ */ new Map();
   /** per-token 通知音效偏好 */
   soundPreferences = /* @__PURE__ */ new Map();
   isAvailable() {
     return this.tokens.size > 0;
   }
-  addToken(token) {
+  addToken(token, ws) {
     this.tokens.add(token);
+    if (ws) this.tokenWsMap.set(token, ws);
     console.log(`[ExpoNotificationChannel] ${t("notification.tokenRegistered", { count: this.tokens.size })}`);
   }
   removeToken(token) {
     this.tokens.delete(token);
+    this.tokenWsMap.delete(token);
     this.soundPreferences.delete(token);
     console.log(`[ExpoNotificationChannel] ${t("notification.tokenRemoved", { count: this.tokens.size })}`);
   }
@@ -2504,7 +2567,12 @@ var ExpoNotificationChannel = class {
   }
   async send(payload) {
     if (this.tokens.size === 0) return;
-    const messages = Array.from(this.tokens).map((to) => {
+    const offlineTokens = Array.from(this.tokens).filter((token) => {
+      const ws = this.tokenWsMap.get(token);
+      return !ws || ws.readyState !== ws.OPEN;
+    });
+    if (offlineTokens.length === 0) return;
+    const messages = offlineTokens.map((to) => {
       let sound = payload.sound ?? "default";
       const prefs = this.soundPreferences.get(to);
       if (prefs) {
@@ -2524,7 +2592,7 @@ var ExpoNotificationChannel = class {
       };
     });
     try {
-      console.log(`[ExpoNotificationChannel] ${t("notification.sendingPush")}`, Array.from(this.tokens));
+      console.log(`[ExpoNotificationChannel] ${t("notification.sendingPush")} (${offlineTokens.length}/${this.tokens.size} devices)`, offlineTokens);
       const res = await fetch(EXPO_PUSH_API, {
         method: "POST",
         headers: { "Content-Type": "application/json", Accept: "application/json" },
@@ -3027,6 +3095,180 @@ async function countJsonlFilesWithMtime(dirPath) {
   }
 }
 
+// src/pairing/PairingManager.ts
+var PairingManager = class {
+  _state = "closed";
+  timer = null;
+  deadline = 0;
+  token;
+  serverName;
+  version;
+  defaultDuration;
+  onStateChange;
+  constructor(opts) {
+    this.token = opts.token;
+    this.serverName = opts.serverName;
+    this.version = opts.version;
+    this.defaultDuration = opts.defaultDuration ?? 3e5;
+    this.onStateChange = opts.onStateChange;
+  }
+  get state() {
+    return this._state;
+  }
+  open(duration) {
+    const ms = duration ?? this.defaultDuration;
+    if (this.timer) clearTimeout(this.timer);
+    this._state = "open";
+    this.deadline = Date.now() + ms;
+    this.timer = setTimeout(() => this.close(), ms);
+    this.onStateChange("open");
+  }
+  close() {
+    if (this.timer) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+    if (this._state === "closed") return;
+    this._state = "closed";
+    this.deadline = 0;
+    this.onStateChange("closed");
+  }
+  tryPair() {
+    if (this._state !== "open") return null;
+    const result = { token: this.token, serverName: this.serverName, version: this.version };
+    this.close();
+    return result;
+  }
+  getRemainingSeconds() {
+    if (this._state !== "open") return 0;
+    return Math.max(0, Math.ceil((this.deadline - Date.now()) / 1e3));
+  }
+  destroy() {
+    if (this.timer) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+  }
+};
+
+// src/auth/AuthManager.ts
+var import_child_process3 = require("child_process");
+var import_child_process4 = require("child_process");
+var import_util = require("util");
+var import_events2 = require("events");
+var execFileAsync = (0, import_util.promisify)(import_child_process4.execFile);
+var CLAUDE_PATH2 = findClaudePath();
+var LOGIN_TIMEOUT_MS = 5 * 60 * 1e3;
+var AuthManager = class extends import_events2.EventEmitter {
+  loginProcess = null;
+  loginTimeout = null;
+  urlSent = false;
+  /** 检查当前 Claude CLI 认证状态（异步，不阻塞事件循环） */
+  async checkAuth() {
+    try {
+      const { stdout } = await execFileAsync(CLAUDE_PATH2, ["auth", "status"], {
+        timeout: 1e4
+      });
+      const parsed = JSON.parse(stdout.trim());
+      return {
+        loggedIn: !!parsed.loggedIn,
+        email: parsed.email,
+        authMethod: parsed.authMethod
+      };
+    } catch {
+      return { loggedIn: false };
+    }
+  }
+  /** 启动登录流程，捕获 URL 并通过事件推送 */
+  async startLogin() {
+    if (this.loginProcess) {
+      this.loginProcess.kill();
+      this.loginProcess = null;
+    }
+    this.clearLoginTimeout();
+    this.urlSent = false;
+    const proc = (0, import_child_process3.spawn)(CLAUDE_PATH2, ["auth", "login"], {
+      env: { ...process.env, BROWSER: "echo" },
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    this.loginProcess = proc;
+    const handleOutput = (data) => {
+      const text = data.toString();
+      console.log(`[AuthManager] login output: ${text.trim()}`);
+      if (!this.urlSent) {
+        const url = this.extractUrl(text);
+        if (url) {
+          this.urlSent = true;
+          console.log(`[AuthManager] \u6355\u83B7\u5230\u767B\u5F55 URL: ${url}`);
+          this.emit("login_url", url);
+        }
+      }
+    };
+    proc.stdout?.on("data", handleOutput);
+    proc.stderr?.on("data", handleOutput);
+    proc.on("exit", (code) => {
+      console.log(`[AuthManager] login process exited with code ${code}`);
+      this.loginProcess = null;
+      this.clearLoginTimeout();
+      this.checkAuth().then((status) => {
+        if (status.loggedIn) {
+          this.emit("login_result", { success: true });
+        } else if (code !== 0) {
+          this.emit("login_result", { success: false, error: `Exit code: ${code}` });
+        }
+      });
+    });
+    proc.on("error", (err) => {
+      console.error(`[AuthManager] login process error:`, err.message);
+      this.loginProcess = null;
+      this.clearLoginTimeout();
+      this.emit("login_result", { success: false, error: err.message });
+    });
+    this.loginTimeout = setTimeout(() => {
+      if (this.loginProcess) {
+        console.warn("[AuthManager] login process timed out, killing");
+        this.loginProcess.kill();
+        this.loginProcess = null;
+        this.emit("login_result", { success: false, error: "Login timed out" });
+      }
+    }, LOGIN_TIMEOUT_MS);
+  }
+  /** 提交授权码到登录进程的 stdin */
+  submitCode(code) {
+    if (!this.loginProcess?.stdin?.writable) {
+      console.warn("[AuthManager] No active login process");
+      return false;
+    }
+    console.log(`[AuthManager] \u63D0\u4EA4\u6388\u6743\u7801`);
+    this.loginProcess.stdin.write(code + "\n");
+    return true;
+  }
+  /** 是否有登录进程在运行 */
+  get isLoginInProgress() {
+    return this.loginProcess !== null;
+  }
+  /** 清理资源 */
+  destroy() {
+    this.clearLoginTimeout();
+    if (this.loginProcess) {
+      this.loginProcess.kill();
+      this.loginProcess = null;
+    }
+    this.removeAllListeners();
+  }
+  clearLoginTimeout() {
+    if (this.loginTimeout) {
+      clearTimeout(this.loginTimeout);
+      this.loginTimeout = null;
+    }
+  }
+  /** 从文本中提取 URL */
+  extractUrl(text) {
+    const match = text.match(/https?:\/\/[^\s"'<>]+/);
+    return match ? match[0] : null;
+  }
+};
+
 // src/server.ts
 var import_promises5 = require("fs/promises");
 var WS_PORT = 3745;
@@ -3105,9 +3347,32 @@ async function start(opts = {}) {
     HTTP_PORT,
     () => ApprovalProxy.create({ port: HTTP_PORT, token })
   );
+  let mdnsService = null;
+  const pairingManager = new PairingManager({
+    token,
+    serverName: (0, import_node_os4.hostname)(),
+    version: "0.2.0",
+    onStateChange: (state) => mdnsService?.updatePairingState(state)
+  });
+  approvalProxy.setPairingManager(pairingManager);
+  if (opts.enablePairing !== false) {
+    pairingManager.open();
+  }
+  const authManager = new AuthManager();
+  authManager.on("login_url", (url) => {
+    wsBridge.broadcast({ type: "auth_login_url", url });
+  });
+  authManager.on("login_result", (result) => {
+    wsBridge.broadcast({ type: "auth_login_result", success: result.success, error: result.error });
+    if (result.success) {
+      authManager.checkAuth().then((status) => {
+        wsBridge.broadcast({ type: "auth_status", loggedIn: status.loggedIn, email: status.email, authMethod: status.authMethod });
+      });
+    }
+  });
   const unreadSessionIds = /* @__PURE__ */ new Set();
   notificationService.setGlobalPendingCountProvider(
-    () => approvalProxy.getPendingCount() + unreadSessionIds.size
+    () => approvalProxy.getPendingCount() + sessionManager.getAllPendingQuestions().length + unreadSessionIds.size
   );
   const broadcastUnreadSessions = () => {
     wsBridge.broadcast({ type: "unread_sessions", sessionIds: Array.from(unreadSessionIds) });
@@ -3322,7 +3587,7 @@ async function start(opts = {}) {
           break;
         }
         case "register_push_token": {
-          notificationService.addPushToken(event.token);
+          notificationService.addPushToken(event.token, ws);
           break;
         }
         case "unregister_push_token": {
@@ -3361,6 +3626,22 @@ async function start(opts = {}) {
           approvalProxy.addToClaudeSettings(event.projectPath, event.toolName);
           break;
         }
+        case "check_auth": {
+          const status = await authManager.checkAuth();
+          wsBridge.send(ws, { type: "auth_status", loggedIn: status.loggedIn, email: status.email, authMethod: status.authMethod });
+          break;
+        }
+        case "start_auth_login": {
+          await authManager.startLogin();
+          break;
+        }
+        case "submit_auth_code": {
+          const submitted = authManager.submitCode(event.code);
+          if (!submitted) {
+            wsBridge.send(ws, { type: "auth_login_result", success: false, error: t("server.noActiveLoginProcess") });
+          }
+          break;
+        }
         default: {
           wsBridge.send(ws, {
             type: "error",
@@ -3438,10 +3719,13 @@ async function start(opts = {}) {
     connections: wsBridge.getConnectionCount(),
     activeSessions: sessionManager.getActiveSessions().length
   }));
-  let mdnsService = null;
   const startMdns = () => {
     if (mdnsService) return;
-    mdnsService = new MdnsService({ wsPort: WS_PORT, httpPort: HTTP_PORT, token });
+    mdnsService = new MdnsService({
+      wsPort: WS_PORT,
+      httpPort: HTTP_PORT,
+      pairing: pairingManager.state
+    });
     mdnsService.start();
   };
   const stopMdns = () => {
@@ -3476,7 +3760,9 @@ async function start(opts = {}) {
         errors.push(err);
       }
     };
+    await attempt(() => authManager.destroy(), "AuthManager");
     await attempt(() => stopMdns(), "mDNS");
+    await attempt(() => pairingManager.destroy(), "PairingManager");
     await attempt(() => wsBridge.close(), "WebSocket");
     await attempt(() => approvalProxy.close(), "ApprovalProxy");
     await attempt(() => sessionManager.destroy(), "SessionManager");
@@ -3504,7 +3790,9 @@ async function start(opts = {}) {
       } else {
         stopMdns();
       }
-    }
+    },
+    openPairing: (duration) => pairingManager.open(duration),
+    closePairing: () => pairingManager.close()
   };
 }
 
@@ -3552,6 +3840,8 @@ async function main() {
   console.log();
   console.log(t("startup.waitingConnection"));
   console.log();
+  console.log(t("startup.pairingOpen"));
+  console.log();
   const shutdown = async (signal) => {
     console.log(`
 [Main] ${t("startup.receivedSignal", { signal })}`);
@@ -3564,8 +3854,24 @@ async function main() {
       process.exit(1);
     }
   };
-  process.on("SIGINT", () => shutdown("SIGINT"));
-  process.on("SIGTERM", () => shutdown("SIGTERM"));
+  if (process.stdin.isTTY) {
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.setEncoding("utf8");
+    process.stdin.on("data", (key) => {
+      if (key === "p" || key === "P") {
+        server.openPairing();
+        console.log(`
+${t("startup.pairingReopened")}`);
+      }
+      if (key === "") {
+        shutdown("SIGINT");
+      }
+    });
+  } else {
+    process.on("SIGINT", () => shutdown("SIGINT"));
+    process.on("SIGTERM", () => shutdown("SIGTERM"));
+  }
 }
 function getLocalIp() {
   const interfaces = (0, import_node_os5.networkInterfaces)();

package/dist/notification/ExpoNotificationChannel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoNotificationChannel.d.ts","sourceRoot":"","sources":["../../src/notification/ExpoNotificationChannel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAI3F;;;;;;;GAOG;AACH,qBAAa,uBAAwB,YAAW,mBAAmB;IACjE,OAAO,CAAC,MAAM,CAAyB;IAEvC,WAAW,IAAI,OAAO;IAItB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK7B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK1B,IAAI,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;CAqCxD"}
+{"version":3,"file":"ExpoNotificationChannel.d.ts","sourceRoot":"","sources":["../../src/notification/ExpoNotificationChannel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAI3F;;;;;;;GAOG;AACH,qBAAa,uBAAwB,YAAW,mBAAmB;IACjE,OAAO,CAAC,MAAM,CAAyB;IAEvC,WAAW,IAAI,OAAO;IAItB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK7B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK1B,IAAI,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;CA6BxD"}

package/dist/notification/ExpoNotificationChannel.js

@@ -45,15 +45,7 @@ class ExpoNotificationChannel {
                 console.warn('[ExpoNotificationChannel] Expo Push API 返回错误:', res.status, JSON.stringify(body));
             }
             else {
-                // 检查每个 ticket 的状态，记录失败的推送
-                const data = body.data;
-                if (Array.isArray(data)) {
-                    for (const ticket of data) {
-                        if (ticket.status === 'error') {
-                            console.error(`[ExpoNotificationChannel] 推送失败: ${ticket.message} (${ticket.details?.error ?? 'unknown'})`);
-                        }
-                    }
-                }
+                console.log('[ExpoNotificationChannel] Expo Push API 响应:', JSON.stringify(body));
             }
         }
         catch (err) {

package/dist/notification/ExpoNotificationChannel.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoNotificationChannel.js","sourceRoot":"","sources":["../../src/notification/ExpoNotificationChannel.ts"],"names":[],"mappings":";;;AAEA,MAAM,aAAa,GAAG,sCAAsC,CAAA;AAE5D;;;;;;;GAOG;AACH,MAAa,uBAAuB;IAC1B,MAAM,GAAgB,IAAI,GAAG,EAAE,CAAA;IAEvC,WAAW;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACtB,OAAO,CAAC,GAAG,CAAC,mDAAmD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IACpF,CAAC;IAED,WAAW,CAAC,KAAa;QACvB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACzB,OAAO,CAAC,GAAG,CAAC,mDAAmD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IACpF,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAA4B;QACrC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC;YAAE,OAAM;QAElC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACpD,EAAE;YACF,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,SAAS;YACjC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,EAAE;SACzB,CAAC,CAAC,CAAA;QAEH,IAAI,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;YAC9E,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,aAAa,EAAE;gBACrC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,EAAE,kBAAkB,EAAE;gBAC3E,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;aAC/B,CAAC,CAAA;YAEF,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;YAC7B,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,OAAO,CAAC,IAAI,CAAC,+CAA+C,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;YACjG,CAAC;iBAAM,CAAC;gBACN,0BAA0B;gBAC1B,MAAM,IAAI,GAAI,IAA0G,CAAC,IAAI,CAAA;gBAC7H,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxB,KAAK,MAAM,MAAM,IAAI,IAAI,EAAE,CAAC;wBAC1B,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;4BAC9B,OAAO,CAAC,KAAK,CAAC,mCAAmC,MAAM,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO,EAAE,KAAK,IAAI,SAAS,GAAG,CAAC,CAAA;wBAC5G,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAA;QACxD,CAAC;IACH,CAAC;CACF;AAtDD,0DAsDC"}
+{"version":3,"file":"ExpoNotificationChannel.js","sourceRoot":"","sources":["../../src/notification/ExpoNotificationChannel.ts"],"names":[],"mappings":";;;AAEA,MAAM,aAAa,GAAG,sCAAsC,CAAA;AAE5D;;;;;;;GAOG;AACH,MAAa,uBAAuB;IAC1B,MAAM,GAAgB,IAAI,GAAG,EAAE,CAAA;IAEvC,WAAW;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACtB,OAAO,CAAC,GAAG,CAAC,mDAAmD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IACpF,CAAC;IAED,WAAW,CAAC,KAAa;QACvB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACzB,OAAO,CAAC,GAAG,CAAC,mDAAmD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IACpF,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAA4B;QACrC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC;YAAE,OAAM;QAElC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACpD,EAAE;YACF,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,SAAS;YACjC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,EAAE;SACzB,CAAC,CAAC,CAAA;QAEH,IAAI,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;YAC9E,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,aAAa,EAAE;gBACrC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,EAAE,kBAAkB,EAAE;gBAC3E,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;aAC/B,CAAC,CAAA;YAEF,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;YAC7B,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,OAAO,CAAC,IAAI,CAAC,+CAA+C,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;YACjG,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,6CAA6C,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;YAClF,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAA;QACxD,CAAC;IACH,CAAC;CACF;AA9CD,0DA8CC"}

package/dist/notification/NotificationService.d.ts

@@ -36,7 +36,7 @@ export declare class NotificationService {
     /** 更新会话的 YOLO 模式状态 */
     setYoloMode(sessionId: string, enabled: boolean): void;
     /** 直接触发审批通知（由 ApprovalProxy 回调调用） */
-    notifyApproval(request: ApprovalRequest, pendingCount: number): void;
+    notifyApproval(request: ApprovalRequest): void;
     /** 简单的工具危险等级判断 */
     private getDangerLevel;
     /** 清理资源 */

package/dist/notification/NotificationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAe,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAuB,MAAM,6BAA6B,CAAA;AAC3F,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAEnE;;;;;;GAMG;AACH,qBAAa,mBAAmB;IAQ5B,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,WAAW;IARrB,OAAO,CAAC,UAAU,CAAwE;IAC1F,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,mBAAmB,CAAmC;IAC9D,0CAA0C;IAC1C,OAAO,CAAC,aAAa,CAA6B;gBAGxC,cAAc,EAAE,cAAc,EAC9B,WAAW,GAAE,uBAAuB,GAAG,IAAW;IAQ5D,8BAA8B;IAC9B,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,OAAO,UAAO,GAAG,IAAI;IAI1E,qBAAqB;IACrB,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAKrD,0CAA0C;IAC1C,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIjC,qCAAqC;IACrC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIpC,8CAA8C;IAC9C,sBAAsB,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAI1D,0DAA0D;IAC1D,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAI5D,gCAAgC;IAChC,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIhD,sBAAsB;IACtB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAItD,qCAAqC;IACrC,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;IAoDpE,kBAAkB;IAClB,OAAO,CAAC,cAAc;IAMtB,WAAW;IACX,OAAO,IAAI,IAAI;IAUf,OAAO,CAAC,WAAW;IA2CnB,OAAO,CAAC,MAAM;IASd,OAAO,CAAC,cAAc;IAKtB,sBAAsB;IACtB,OAAO,CAAC,WAAW;CAGpB"}
+{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAe,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAuB,MAAM,6BAA6B,CAAA;AAC3F,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAEnE;;;;;;GAMG;AACH,qBAAa,mBAAmB;IAQ5B,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,WAAW;IARrB,OAAO,CAAC,UAAU,CAAwE;IAC1F,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,mBAAmB,CAAmC;IAC9D,0CAA0C;IAC1C,OAAO,CAAC,aAAa,CAA6B;gBAGxC,cAAc,EAAE,cAAc,EAC9B,WAAW,GAAE,uBAAuB,GAAG,IAAW;IAQ5D,8BAA8B;IAC9B,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,OAAO,UAAO,GAAG,IAAI;IAI1E,qBAAqB;IACrB,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAKrD,0CAA0C;IAC1C,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIjC,qCAAqC;IACrC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIpC,8CAA8C;IAC9C,sBAAsB,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAI1D,0DAA0D;IAC1D,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAI5D,gCAAgC;IAChC,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIhD,sBAAsB;IACtB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAItD,qCAAqC;IACrC,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IA0C9C,kBAAkB;IAClB,OAAO,CAAC,cAAc;IAMtB,WAAW;IACX,OAAO,IAAI,IAAI;IAUf,OAAO,CAAC,WAAW;IA2CnB,OAAO,CAAC,MAAM;IASd,OAAO,CAAC,cAAc;IAKtB,sBAAsB;IACtB,OAAO,CAAC,WAAW;CAGpB"}

package/dist/notification/NotificationService.js

@@ -60,21 +60,14 @@ class NotificationService {
         this.yoloModeState.set(sessionId, enabled);
     }
     /** 直接触发审批通知（由 ApprovalProxy 回调调用） */
-    notifyApproval(request, pendingCount) {
+    notifyApproval(request) {
         // YOLO 模式：客户端会自动批准，不发推送
         if (this.yoloModeState.get(request.sessionId))
             return;
         const projectName = this.getProjectName(request.sessionId);
-        // 多个待审批时汇总文案
-        const title = pendingCount > 1
-            ? `${pendingCount} 项待审批 — ${projectName}`
-            : `需要授权 — ${projectName}`;
-        const body = pendingCount > 1
-            ? `最新: ${request.toolName}: ${request.description}`
-            : `${request.toolName}: ${request.description}`;
         this.notify({
-            title,
-            body,
+            title: `需要授权 — ${projectName}`,
+            body: `${request.toolName}: ${request.description}`,
             sound: 'Funk',
             data: {
                 type: 'approval_request',
@@ -94,13 +87,12 @@ class NotificationService {
                     toolName: request.toolName,
                     description: request.description.slice(0, 80),
                     dangerLevel,
-                    pendingCount,
                 },
                 isYoloMode,
                 updatedAt: Date.now(),
             }, {
-                title,
-                body,
+                title: `需要授权 — ${projectName}`,
+                body: `${request.toolName}: ${request.description}`,
             });
         }
     }