sessix-server 0.3.7 → 0.3.9

package/dist/index.js

@@ -2523,6 +2523,8 @@ var ApprovalProxy = class _ApprovalProxy {
   pendingApprovals = /* @__PURE__ */ new Map();
   /** 审批请求回调（通知外部推送到手机） */
   approvalRequestCallbacks = [];
+  /** 审批 resolve 回调（任何来源的 resolve 都会触发，用于 WS 广播清理 */
+  approvalResolvedCallbacks = [];
   /** YOLO 模式状态：sessionId -> enabled */
   yoloSessions = /* @__PURE__ */ new Map();
   /** 内存缓存：已被"始终允许"的工具名（避免每次读 settings.json） */
@@ -2560,6 +2562,30 @@ var ApprovalProxy = class _ApprovalProxy {
   onApprovalRequest(callback) {
     this.approvalRequestCallbacks.push(callback);
   }
+  /**
+   * 注册审批 resolve 回调
+   *
+   * 任何来源的 resolve 都会触发：
+   * - resolveApproval（手机端 approve/reject）
+   * - 5 分钟超时自动 allow
+   * - clearPendingForSession（会话被 kill）
+   * - approveAll（手机全断时自动 allow）
+   *
+   * 用于向所有客户端广播 approval_resolved，清理可能残留的审批 UI。
+   */
+  onApprovalResolved(callback) {
+    this.approvalResolvedCallbacks.push(callback);
+  }
+  /** 通知所有 resolve 回调（内部调用） */
+  notifyApprovalResolved(requestId, decision) {
+    for (const callback of this.approvalResolvedCallbacks) {
+      try {
+        callback(requestId, decision);
+      } catch (err) {
+        console.error("[ApprovalProxy] Approval resolved callback error:", err);
+      }
+    }
+  }
   /** 设置状态信息提供者（用于 /health 端点） */
   setStatusInfoProvider(provider) {
     this.statusInfoProvider = provider;
@@ -2593,6 +2619,7 @@ var ApprovalProxy = class _ApprovalProxy {
     pending.resolve(decision);
     this.pendingApprovals.delete(requestId);
     console.log(`[ApprovalProxy] ${t("approval.requestProcessed", { id: requestId })}: ${decision.decision}`);
+    this.notifyApprovalResolved(requestId, decision);
     return true;
   }
   /** 获取当前待处理的审批数量 */
@@ -2608,9 +2635,11 @@ var ApprovalProxy = class _ApprovalProxy {
     for (const [requestId, pending] of this.pendingApprovals) {
       if (pending.request.sessionId === sessionId) {
         clearTimeout(pending.timer);
-        pending.resolve({ decision: "allow" });
+        const decision = { decision: "allow" };
+        pending.resolve(decision);
         this.pendingApprovals.delete(requestId);
         console.log(`[ApprovalProxy] Session ${sessionId} killed, auto-allowed pending approval ${requestId}`);
+        this.notifyApprovalResolved(requestId, decision);
       }
     }
   }
@@ -2698,9 +2727,11 @@ var ApprovalProxy = class _ApprovalProxy {
     const entries = Array.from(this.pendingApprovals.entries());
     for (const [requestId, pending] of entries) {
       clearTimeout(pending.timer);
-      pending.resolve({ decision: "allow" });
+      const decision = { decision: "allow" };
+      pending.resolve(decision);
       this.pendingApprovals.delete(requestId);
       console.log(`[ApprovalProxy] ${t("approval.autoAllowed", { id: requestId, reason: reason ? `\uFF08${reason}\uFF09` : "" })}`);
+      this.notifyApprovalResolved(requestId, decision);
     }
   }
   /** 优雅关闭 HTTP 服务 */
@@ -2792,7 +2823,9 @@ var ApprovalProxy = class _ApprovalProxy {
         const timer = setTimeout(() => {
           console.log(`[ApprovalProxy] ${t("approval.timeout", { id: requestId })}`);
           this.pendingApprovals.delete(requestId);
-          resolve({ decision: "allow" });
+          const autoDecision = { decision: "allow" };
+          resolve(autoDecision);
+          this.notifyApprovalResolved(requestId, autoDecision);
         }, 325e3);
         this.pendingApprovals.set(requestId, { resolve, timer, request: approvalRequest });
       });
@@ -3284,8 +3317,6 @@ var NotificationService = class {
   latestAssistantText = /* @__PURE__ */ new Map();
   /** 获取全局待审批总数的回调（跨所有会话） */
   globalPendingCountProvider = null;
-  /** 获取当前 WS 连接数的回调（用于在线抑制推送） */
-  connectionCountProvider = null;
   /** 添加通知渠道（id 唯一，可用于后续动态开关） */
   addChannel(id, channel, enabled = true) {
     this.channelMap.set(id, { channel, enabled });
@@ -3323,10 +3354,6 @@ var NotificationService = class {
   setGlobalPendingCountProvider(provider) {
     this.globalPendingCountProvider = provider;
   }
-  /** 设置 WS 连接数提供者（用于 status_change 通知的在线抑制） */
-  setConnectionCountProvider(provider) {
-    this.connectionCountProvider = provider;
-  }
   /** 获取全局待审批总数 */
   getGlobalPendingCount() {
     return this.globalPendingCountProvider?.() ?? 0;
@@ -3469,7 +3496,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
+          } else {
             this.notify({
               title: sessionTitle,
               body,
@@ -3491,7 +3518,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
+          } else {
             this.notify({
               title: sessionTitle,
               body,
@@ -4590,7 +4617,6 @@ async function start(opts = {}) {
   notificationService.setGlobalPendingCountProvider(
     () => approvalProxy.getPendingCount() + sessionManager.getAllPendingQuestions().length + unreadSessionIds.size
   );
-  notificationService.setConnectionCountProvider(() => wsBridge.getConnectionCount());
   let cliCapabilities = null;
   parseCliCapabilities().then((caps) => {
     cliCapabilities = caps;
@@ -4962,6 +4988,13 @@ async function start(opts = {}) {
       approvalProxy.approveAll(t("server.phoneDisconnected"));
     }
   });
+  approvalProxy.onApprovalResolved((requestId, decision) => {
+    wsBridge.broadcast({
+      type: "approval_resolved",
+      requestId,
+      decision: decision.decision
+    });
+  });
   approvalProxy.onApprovalRequest((request) => {
     wsBridge.broadcast({ type: "approval_request", request });
     setTimeout(() => {

package/dist/server.js

@@ -2528,6 +2528,8 @@ var ApprovalProxy = class _ApprovalProxy {
   pendingApprovals = /* @__PURE__ */ new Map();
   /** 审批请求回调（通知外部推送到手机） */
   approvalRequestCallbacks = [];
+  /** 审批 resolve 回调（任何来源的 resolve 都会触发，用于 WS 广播清理 */
+  approvalResolvedCallbacks = [];
   /** YOLO 模式状态：sessionId -> enabled */
   yoloSessions = /* @__PURE__ */ new Map();
   /** 内存缓存：已被"始终允许"的工具名（避免每次读 settings.json） */
@@ -2565,6 +2567,30 @@ var ApprovalProxy = class _ApprovalProxy {
   onApprovalRequest(callback) {
     this.approvalRequestCallbacks.push(callback);
   }
+  /**
+   * 注册审批 resolve 回调
+   *
+   * 任何来源的 resolve 都会触发：
+   * - resolveApproval（手机端 approve/reject）
+   * - 5 分钟超时自动 allow
+   * - clearPendingForSession（会话被 kill）
+   * - approveAll（手机全断时自动 allow）
+   *
+   * 用于向所有客户端广播 approval_resolved，清理可能残留的审批 UI。
+   */
+  onApprovalResolved(callback) {
+    this.approvalResolvedCallbacks.push(callback);
+  }
+  /** 通知所有 resolve 回调（内部调用） */
+  notifyApprovalResolved(requestId, decision) {
+    for (const callback of this.approvalResolvedCallbacks) {
+      try {
+        callback(requestId, decision);
+      } catch (err) {
+        console.error("[ApprovalProxy] Approval resolved callback error:", err);
+      }
+    }
+  }
   /** 设置状态信息提供者（用于 /health 端点） */
   setStatusInfoProvider(provider) {
     this.statusInfoProvider = provider;
@@ -2598,6 +2624,7 @@ var ApprovalProxy = class _ApprovalProxy {
     pending.resolve(decision);
     this.pendingApprovals.delete(requestId);
     console.log(`[ApprovalProxy] ${t("approval.requestProcessed", { id: requestId })}: ${decision.decision}`);
+    this.notifyApprovalResolved(requestId, decision);
     return true;
   }
   /** 获取当前待处理的审批数量 */
@@ -2613,9 +2640,11 @@ var ApprovalProxy = class _ApprovalProxy {
     for (const [requestId, pending] of this.pendingApprovals) {
       if (pending.request.sessionId === sessionId) {
         clearTimeout(pending.timer);
-        pending.resolve({ decision: "allow" });
+        const decision = { decision: "allow" };
+        pending.resolve(decision);
         this.pendingApprovals.delete(requestId);
         console.log(`[ApprovalProxy] Session ${sessionId} killed, auto-allowed pending approval ${requestId}`);
+        this.notifyApprovalResolved(requestId, decision);
       }
     }
   }
@@ -2703,9 +2732,11 @@ var ApprovalProxy = class _ApprovalProxy {
     const entries = Array.from(this.pendingApprovals.entries());
     for (const [requestId, pending] of entries) {
       clearTimeout(pending.timer);
-      pending.resolve({ decision: "allow" });
+      const decision = { decision: "allow" };
+      pending.resolve(decision);
       this.pendingApprovals.delete(requestId);
       console.log(`[ApprovalProxy] ${t("approval.autoAllowed", { id: requestId, reason: reason ? `\uFF08${reason}\uFF09` : "" })}`);
+      this.notifyApprovalResolved(requestId, decision);
     }
   }
   /** 优雅关闭 HTTP 服务 */
@@ -2797,7 +2828,9 @@ var ApprovalProxy = class _ApprovalProxy {
         const timer = setTimeout(() => {
           console.log(`[ApprovalProxy] ${t("approval.timeout", { id: requestId })}`);
           this.pendingApprovals.delete(requestId);
-          resolve({ decision: "allow" });
+          const autoDecision = { decision: "allow" };
+          resolve(autoDecision);
+          this.notifyApprovalResolved(requestId, autoDecision);
         }, 325e3);
         this.pendingApprovals.set(requestId, { resolve, timer, request: approvalRequest });
       });
@@ -3289,8 +3322,6 @@ var NotificationService = class {
   latestAssistantText = /* @__PURE__ */ new Map();
   /** 获取全局待审批总数的回调（跨所有会话） */
   globalPendingCountProvider = null;
-  /** 获取当前 WS 连接数的回调（用于在线抑制推送） */
-  connectionCountProvider = null;
   /** 添加通知渠道（id 唯一，可用于后续动态开关） */
   addChannel(id, channel, enabled = true) {
     this.channelMap.set(id, { channel, enabled });
@@ -3328,10 +3359,6 @@ var NotificationService = class {
   setGlobalPendingCountProvider(provider) {
     this.globalPendingCountProvider = provider;
   }
-  /** 设置 WS 连接数提供者（用于 status_change 通知的在线抑制） */
-  setConnectionCountProvider(provider) {
-    this.connectionCountProvider = provider;
-  }
   /** 获取全局待审批总数 */
   getGlobalPendingCount() {
     return this.globalPendingCountProvider?.() ?? 0;
@@ -3474,7 +3501,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
+          } else {
             this.notify({
               title: sessionTitle,
               body,
@@ -3496,7 +3523,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
+          } else {
             this.notify({
               title: sessionTitle,
               body,
@@ -4595,7 +4622,6 @@ async function start(opts = {}) {
   notificationService.setGlobalPendingCountProvider(
     () => approvalProxy.getPendingCount() + sessionManager.getAllPendingQuestions().length + unreadSessionIds.size
   );
-  notificationService.setConnectionCountProvider(() => wsBridge.getConnectionCount());
   let cliCapabilities = null;
   parseCliCapabilities().then((caps) => {
     cliCapabilities = caps;
@@ -4967,6 +4993,13 @@ async function start(opts = {}) {
       approvalProxy.approveAll(t("server.phoneDisconnected"));
     }
   });
+  approvalProxy.onApprovalResolved((requestId, decision) => {
+    wsBridge.broadcast({
+      type: "approval_resolved",
+      requestId,
+      decision: decision.decision
+    });
+  });
   approvalProxy.onApprovalRequest((request) => {
     wsBridge.broadcast({ type: "approval_request", request });
     setTimeout(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sessix-server",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "bin": {
     "sessix-server": "dist/index.js"
   },