sessix-server 0.2.3 → 0.2.5

package/dist/index.js

@@ -1113,6 +1113,7 @@ var SessionManager = class {
   }
   /**
    * 刷新缓冲的 assistant 事件，批量发送
+   * Public：subscribe 时需要在读取缓冲区前先刷出，避免事件同时出现在 session_history 和广播中
    */
   flushPendingAssistant(sessionId) {
     const pending = this.pendingAssistantEvents.get(sessionId);
@@ -2038,7 +2039,13 @@ var MdnsService = class {
       return;
     }
     const lanAddrs = getLanAddresses();
-    this.bonjour = lanAddrs.length > 0 ? new import_bonjour_service.default({ interface: lanAddrs[0] }) : new import_bonjour_service.default();
+    const onMdnsError = (err) => {
+      console.warn(`[MdnsService] mDNS error (non-fatal): ${err.message}`);
+      this.stop();
+    };
+    const opts = lanAddrs.length > 0 ? { interface: lanAddrs[0] } : {};
+    this.bonjour = new import_bonjour_service.default(opts, onMdnsError);
+    this.bonjour.server?.mdns?.on("error", onMdnsError);
     if (lanAddrs.length > 0) {
       console.log(`[MdnsService] ${t("mdns.boundInterface", { ip: lanAddrs[0] })}`);
     }
@@ -2386,7 +2393,7 @@ var NotificationService = class {
     const title = pendingCount > 1 ? t("notification.pendingApprovals", { title: sessionTitle, count: pendingCount }) : sessionTitle;
     const body = pendingCount > 1 ? `\u{1F527} \u6700\u65B0: ${request.toolName}: ${request.description}` : `\u{1F527} ${request.toolName}: ${request.description}`;
     if (this.activityPushChannel?.hasToken(request.sessionId)) {
-      const dangerLevel = this.getDangerLevel(request.toolName);
+      const dangerLevel2 = this.getDangerLevel(request.toolName);
       const isYoloMode = this.getYoloMode(request.sessionId);
       this.activityPushChannel.updateActivityWithAlert(
         request.sessionId,
@@ -2398,7 +2405,7 @@ var NotificationService = class {
             requestId: request.id,
             toolName: request.toolName,
             description: request.description.slice(0, 80),
-            dangerLevel,
+            dangerLevel: dangerLevel2,
             pendingCount
           },
           isYoloMode,
@@ -2408,15 +2415,28 @@ var NotificationService = class {
       );
       return;
     }
+    const dangerLevel = this.getDangerLevel(request.toolName);
+    const isDangerous = dangerLevel === "danger" || dangerLevel === "write";
+    const categoryId = isDangerous ? "APPROVAL_DANGEROUS" : "APPROVAL_NORMAL";
+    const projectName = (0, import_node_path3.basename)(
+      this.sessionManager.getActiveSessions().find((s) => s.id === request.sessionId)?.projectPath ?? ""
+    );
+    const pushTitle = isDangerous ? `\u26A0\uFE0F ${title}` : title;
+    const subtitle = `\u{1F527} ${request.toolName}: ${this.extractTarget(request)}`;
     this.notify({
-      title,
+      title: pushTitle,
+      subtitle,
       body,
       sound: "default",
       badge: this.getGlobalPendingCount(),
+      categoryId,
       data: {
         type: "approval_request",
         sessionId: request.sessionId,
-        requestId: request.id
+        requestId: request.id,
+        toolName: request.toolName,
+        projectName,
+        dangerLevel
       }
     });
   }
@@ -2451,6 +2471,13 @@ var NotificationService = class {
       }
     });
   }
+  /** 从审批请求中提取操作目标的简短描述 */
+  extractTarget(request) {
+    const input = request.toolInput;
+    if (input.file_path) return (0, import_node_path3.basename)(String(input.file_path));
+    if (input.command) return String(input.command).slice(0, 40);
+    return request.description.slice(0, 40);
+  }
   /** 简单的工具危险等级判断 */
   getDangerLevel(toolName) {
     if (toolName === "Bash") return "danger";
@@ -2630,9 +2657,11 @@ var ExpoNotificationChannel = class {
       return {
         to,
         title: payload.title,
+        subtitle: payload.subtitle,
         body: payload.body,
         badge: payload.badge,
         sound: pushSound,
+        categoryId: payload.categoryId,
         data: payload.data ?? {}
       };
     });
@@ -3495,7 +3524,8 @@ async function start(opts = {}) {
             type: "session_list",
             sessions: sessionManager.getActiveSessions()
           });
-          const bufferedEvents = sessionManager.getSessionEvents(event.sessionId);
+          sessionManager.flushPendingAssistant(event.sessionId);
+          const bufferedEvents = [...sessionManager.getSessionEvents(event.sessionId)];
           if (sessionManager.isBufferTruncated(event.sessionId)) {
             const projectPath = sessionManager.getSessionProjectPath(event.sessionId);
             if (projectPath) {

package/dist/server.js

@@ -1119,6 +1119,7 @@ var SessionManager = class {
   }
   /**
    * 刷新缓冲的 assistant 事件，批量发送
+   * Public：subscribe 时需要在读取缓冲区前先刷出，避免事件同时出现在 session_history 和广播中
    */
   flushPendingAssistant(sessionId) {
     const pending = this.pendingAssistantEvents.get(sessionId);
@@ -2044,7 +2045,13 @@ var MdnsService = class {
       return;
     }
     const lanAddrs = getLanAddresses();
-    this.bonjour = lanAddrs.length > 0 ? new import_bonjour_service.default({ interface: lanAddrs[0] }) : new import_bonjour_service.default();
+    const onMdnsError = (err) => {
+      console.warn(`[MdnsService] mDNS error (non-fatal): ${err.message}`);
+      this.stop();
+    };
+    const opts = lanAddrs.length > 0 ? { interface: lanAddrs[0] } : {};
+    this.bonjour = new import_bonjour_service.default(opts, onMdnsError);
+    this.bonjour.server?.mdns?.on("error", onMdnsError);
     if (lanAddrs.length > 0) {
       console.log(`[MdnsService] ${t("mdns.boundInterface", { ip: lanAddrs[0] })}`);
     }
@@ -2392,7 +2399,7 @@ var NotificationService = class {
     const title = pendingCount > 1 ? t("notification.pendingApprovals", { title: sessionTitle, count: pendingCount }) : sessionTitle;
     const body = pendingCount > 1 ? `\u{1F527} \u6700\u65B0: ${request.toolName}: ${request.description}` : `\u{1F527} ${request.toolName}: ${request.description}`;
     if (this.activityPushChannel?.hasToken(request.sessionId)) {
-      const dangerLevel = this.getDangerLevel(request.toolName);
+      const dangerLevel2 = this.getDangerLevel(request.toolName);
       const isYoloMode = this.getYoloMode(request.sessionId);
       this.activityPushChannel.updateActivityWithAlert(
         request.sessionId,
@@ -2404,7 +2411,7 @@ var NotificationService = class {
             requestId: request.id,
             toolName: request.toolName,
             description: request.description.slice(0, 80),
-            dangerLevel,
+            dangerLevel: dangerLevel2,
             pendingCount
           },
           isYoloMode,
@@ -2414,15 +2421,28 @@ var NotificationService = class {
       );
       return;
     }
+    const dangerLevel = this.getDangerLevel(request.toolName);
+    const isDangerous = dangerLevel === "danger" || dangerLevel === "write";
+    const categoryId = isDangerous ? "APPROVAL_DANGEROUS" : "APPROVAL_NORMAL";
+    const projectName = (0, import_node_path3.basename)(
+      this.sessionManager.getActiveSessions().find((s) => s.id === request.sessionId)?.projectPath ?? ""
+    );
+    const pushTitle = isDangerous ? `\u26A0\uFE0F ${title}` : title;
+    const subtitle = `\u{1F527} ${request.toolName}: ${this.extractTarget(request)}`;
     this.notify({
-      title,
+      title: pushTitle,
+      subtitle,
       body,
       sound: "default",
       badge: this.getGlobalPendingCount(),
+      categoryId,
       data: {
         type: "approval_request",
         sessionId: request.sessionId,
-        requestId: request.id
+        requestId: request.id,
+        toolName: request.toolName,
+        projectName,
+        dangerLevel
       }
     });
   }
@@ -2457,6 +2477,13 @@ var NotificationService = class {
       }
     });
   }
+  /** 从审批请求中提取操作目标的简短描述 */
+  extractTarget(request) {
+    const input = request.toolInput;
+    if (input.file_path) return (0, import_node_path3.basename)(String(input.file_path));
+    if (input.command) return String(input.command).slice(0, 40);
+    return request.description.slice(0, 40);
+  }
   /** 简单的工具危险等级判断 */
   getDangerLevel(toolName) {
     if (toolName === "Bash") return "danger";
@@ -2636,9 +2663,11 @@ var ExpoNotificationChannel = class {
       return {
         to,
         title: payload.title,
+        subtitle: payload.subtitle,
         body: payload.body,
         badge: payload.badge,
         sound: pushSound,
+        categoryId: payload.categoryId,
         data: payload.data ?? {}
       };
     });
@@ -3501,7 +3530,8 @@ async function start(opts = {}) {
             type: "session_list",
             sessions: sessionManager.getActiveSessions()
           });
-          const bufferedEvents = sessionManager.getSessionEvents(event.sessionId);
+          sessionManager.flushPendingAssistant(event.sessionId);
+          const bufferedEvents = [...sessionManager.getSessionEvents(event.sessionId)];
           if (sessionManager.isBufferTruncated(event.sessionId)) {
             const projectPath = sessionManager.getSessionProjectPath(event.sessionId);
             if (projectPath) {

package/package.json

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