sessix-server 0.3.5 → 0.3.6

package/dist/index.js

@@ -27,7 +27,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var import_node_os8 = require("os");
 var import_node_fs4 = require("fs");
 var import_node_path7 = require("path");
-var import_node_child_process9 = require("child_process");
+var import_node_child_process10 = require("child_process");
 
 // src/i18n/locales/zh.ts
 var zh = {
@@ -306,7 +306,7 @@ var import_uuid6 = require("uuid");
 var import_promises4 = require("fs/promises");
 var import_node_os7 = require("os");
 var import_node_path6 = require("path");
-var import_node_child_process8 = require("child_process");
+var import_node_child_process9 = require("child_process");
 var import_node_util = require("util");
 
 // src/providers/ProcessProvider.ts
@@ -2335,7 +2335,7 @@ var WsBridge = class _WsBridge {
   onConnection(callback) {
     this.connectionCallbacks.push(callback);
   }
-  /** 注册断开连接回调（任意客户端断开时触发，可通过 getConnectionCount() 判断是否全部断开） */
+  /** 注册断开连接回调（任意客户端断开时触发，传入断开的 ws 对象） */
   onDisconnect(callback) {
     this.disconnectCallbacks.push(callback);
   }
@@ -2449,7 +2449,7 @@ var WsBridge = class _WsBridge {
         console.log(`[WsBridge] Client disconnected, connections: ${this.getConnectionCount()}`);
         for (const cb of this.disconnectCallbacks) {
           try {
-            cb();
+            cb(ws);
           } catch (err) {
             console.error("[WsBridge] Disconnect callback error:", err);
           }
@@ -3275,6 +3275,8 @@ var NotificationService = class {
   latestAssistantText = /* @__PURE__ */ new Map();
   /** 获取全局待审批总数的回调（跨所有会话） */
   globalPendingCountProvider = null;
+  /** 获取当前 WS 连接数的回调（用于在线抑制推送） */
+  connectionCountProvider = null;
   /** 添加通知渠道（id 唯一，可用于后续动态开关） */
   addChannel(id, channel, enabled = true) {
     this.channelMap.set(id, { channel, enabled });
@@ -3312,6 +3314,14 @@ var NotificationService = class {
   setGlobalPendingCountProvider(provider) {
     this.globalPendingCountProvider = provider;
   }
+  /** 设置 WS 连接数提供者（用于 status_change 通知的在线抑制） */
+  setConnectionCountProvider(provider) {
+    this.connectionCountProvider = provider;
+  }
+  /** 移除指定 WebSocket 关联的所有 push token */
+  removeTokensByWs(ws) {
+    this.expoChannel?.removeTokensByWs(ws);
+  }
   /** 获取全局待审批总数 */
   getGlobalPendingCount() {
     return this.globalPendingCountProvider?.() ?? 0;
@@ -3454,7 +3464,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else {
+          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
             this.notify({
               title: sessionTitle,
               body,
@@ -3476,7 +3486,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else {
+          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
             this.notify({
               title: sessionTitle,
               body,
@@ -3564,6 +3574,17 @@ var ExpoNotificationChannel = class {
     this.soundPreferences.delete(token);
     console.log(`[ExpoNotificationChannel] ${t("notification.tokenRemoved", { count: this.tokens.size })}`);
   }
+  /** 移除指定 WebSocket 关联的所有 token（设备断开时调用） */
+  removeTokensByWs(ws) {
+    for (const [token, tokenWs] of this.tokenWsMap) {
+      if (tokenWs === ws) {
+        this.tokens.delete(token);
+        this.tokenWsMap.delete(token);
+        this.soundPreferences.delete(token);
+        console.log(`[ExpoNotificationChannel] Token removed on WS disconnect, remaining: ${this.tokens.size}`);
+      }
+    }
+  }
   /** 更新某个 token 的音效偏好 */
   setSoundPreferences(prefs) {
     for (const token of this.tokens) {
@@ -4410,10 +4431,50 @@ var TerminalExecutor = class {
   }
 };
 
+// src/utils/cliCapabilities.ts
+var import_node_child_process8 = require("child_process");
+var DEFAULT_CAPABILITIES = {
+  effortLevels: ["low", "medium", "high", "max"]
+};
+async function parseCliCapabilities() {
+  const claudePath = findClaudePath();
+  const [helpText, version] = await Promise.all([
+    runCli(claudePath, ["--help"]),
+    runCli(claudePath, ["--version"])
+  ]);
+  const capabilities = { ...DEFAULT_CAPABILITIES };
+  if (version) {
+    capabilities.version = version.trim();
+  }
+  if (helpText) {
+    const effortMatch = helpText.match(/--effort\s.*?\(([^)]+)\)/);
+    if (effortMatch) {
+      const levels = effortMatch[1].split(",").map((s) => s.trim()).filter(Boolean);
+      if (levels.length > 0) {
+        capabilities.effortLevels = levels;
+      }
+    }
+  }
+  console.log(`[CliCapabilities] version=${capabilities.version ?? "unknown"}, effort=[${capabilities.effortLevels.join(", ")}]`);
+  return capabilities;
+}
+function runCli(path2, args) {
+  return new Promise((resolve) => {
+    (0, import_node_child_process8.execFile)(path2, args, { timeout: 5e3 }, (err, stdout) => {
+      if (err) {
+        console.warn(`[CliCapabilities] Failed to run ${path2} ${args.join(" ")}:`, err.message);
+        resolve(null);
+      } else {
+        resolve(stdout);
+      }
+    });
+  });
+}
+
 // src/server.ts
 var WS_PORT = 3745;
 var HTTP_PORT = 3746;
-var execAsync = (0, import_node_util.promisify)(import_node_child_process8.exec);
+var execAsync = (0, import_node_util.promisify)(import_node_child_process9.exec);
 async function killPortProcess(port) {
   try {
     if (isWindows) {
@@ -4535,6 +4596,12 @@ 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;
+  }).catch(() => {
+  });
   const broadcastUnreadSessions = () => {
     wsBridge.broadcast({ type: "unread_sessions", sessionIds: Array.from(unreadSessionIds) });
   };
@@ -4556,6 +4623,9 @@ async function start(opts = {}) {
     if (unreadSessionIds.size > 0) {
       wsBridge.send(ws, { type: "unread_sessions", sessionIds: Array.from(unreadSessionIds) });
     }
+    if (cliCapabilities) {
+      wsBridge.send(ws, { type: "cli_info", effortLevels: cliCapabilities.effortLevels, version: cliCapabilities.version });
+    }
   });
   wsBridge.onClientEvent(async (event, ws) => {
     try {
@@ -4891,7 +4961,8 @@ async function start(opts = {}) {
   terminalExecutor.onEvent((event) => {
     wsBridge.broadcast(event);
   });
-  wsBridge.onDisconnect(() => {
+  wsBridge.onDisconnect((ws) => {
+    notificationService.removeTokensByWs(ws);
     if (wsBridge.getConnectionCount() === 0 && approvalProxy.getPendingCount() > 0) {
       approvalProxy.approveAll(t("server.phoneDisconnected"));
     }
@@ -5076,7 +5147,7 @@ async function autoUpdateIfNeeded() {
   console.log(`  \u{1F4E6} ${t("startup.autoUpdating", { current: PKG_VERSION, latest })}`);
   console.log();
   try {
-    (0, import_node_child_process9.execFileSync)("npx", [`sessix-server@${latest}`], {
+    (0, import_node_child_process10.execFileSync)("npx", [`sessix-server@${latest}`], {
       stdio: "inherit",
       env: { ...process.env, __SESSIX_UPDATED: "1" }
     });

package/dist/server.js

@@ -311,7 +311,7 @@ var import_uuid6 = require("uuid");
 var import_promises4 = require("fs/promises");
 var import_node_os7 = require("os");
 var import_node_path6 = require("path");
-var import_node_child_process8 = require("child_process");
+var import_node_child_process9 = require("child_process");
 var import_node_util = require("util");
 
 // src/providers/ProcessProvider.ts
@@ -2340,7 +2340,7 @@ var WsBridge = class _WsBridge {
   onConnection(callback) {
     this.connectionCallbacks.push(callback);
   }
-  /** 注册断开连接回调（任意客户端断开时触发，可通过 getConnectionCount() 判断是否全部断开） */
+  /** 注册断开连接回调（任意客户端断开时触发，传入断开的 ws 对象） */
   onDisconnect(callback) {
     this.disconnectCallbacks.push(callback);
   }
@@ -2454,7 +2454,7 @@ var WsBridge = class _WsBridge {
         console.log(`[WsBridge] Client disconnected, connections: ${this.getConnectionCount()}`);
         for (const cb of this.disconnectCallbacks) {
           try {
-            cb();
+            cb(ws);
           } catch (err) {
             console.error("[WsBridge] Disconnect callback error:", err);
           }
@@ -3280,6 +3280,8 @@ var NotificationService = class {
   latestAssistantText = /* @__PURE__ */ new Map();
   /** 获取全局待审批总数的回调（跨所有会话） */
   globalPendingCountProvider = null;
+  /** 获取当前 WS 连接数的回调（用于在线抑制推送） */
+  connectionCountProvider = null;
   /** 添加通知渠道（id 唯一，可用于后续动态开关） */
   addChannel(id, channel, enabled = true) {
     this.channelMap.set(id, { channel, enabled });
@@ -3317,6 +3319,14 @@ var NotificationService = class {
   setGlobalPendingCountProvider(provider) {
     this.globalPendingCountProvider = provider;
   }
+  /** 设置 WS 连接数提供者（用于 status_change 通知的在线抑制） */
+  setConnectionCountProvider(provider) {
+    this.connectionCountProvider = provider;
+  }
+  /** 移除指定 WebSocket 关联的所有 push token */
+  removeTokensByWs(ws) {
+    this.expoChannel?.removeTokensByWs(ws);
+  }
   /** 获取全局待审批总数 */
   getGlobalPendingCount() {
     return this.globalPendingCountProvider?.() ?? 0;
@@ -3459,7 +3469,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else {
+          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
             this.notify({
               title: sessionTitle,
               body,
@@ -3481,7 +3491,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else {
+          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
             this.notify({
               title: sessionTitle,
               body,
@@ -3569,6 +3579,17 @@ var ExpoNotificationChannel = class {
     this.soundPreferences.delete(token);
     console.log(`[ExpoNotificationChannel] ${t("notification.tokenRemoved", { count: this.tokens.size })}`);
   }
+  /** 移除指定 WebSocket 关联的所有 token（设备断开时调用） */
+  removeTokensByWs(ws) {
+    for (const [token, tokenWs] of this.tokenWsMap) {
+      if (tokenWs === ws) {
+        this.tokens.delete(token);
+        this.tokenWsMap.delete(token);
+        this.soundPreferences.delete(token);
+        console.log(`[ExpoNotificationChannel] Token removed on WS disconnect, remaining: ${this.tokens.size}`);
+      }
+    }
+  }
   /** 更新某个 token 的音效偏好 */
   setSoundPreferences(prefs) {
     for (const token of this.tokens) {
@@ -4415,10 +4436,50 @@ var TerminalExecutor = class {
   }
 };
 
+// src/utils/cliCapabilities.ts
+var import_node_child_process8 = require("child_process");
+var DEFAULT_CAPABILITIES = {
+  effortLevels: ["low", "medium", "high", "max"]
+};
+async function parseCliCapabilities() {
+  const claudePath = findClaudePath();
+  const [helpText, version] = await Promise.all([
+    runCli(claudePath, ["--help"]),
+    runCli(claudePath, ["--version"])
+  ]);
+  const capabilities = { ...DEFAULT_CAPABILITIES };
+  if (version) {
+    capabilities.version = version.trim();
+  }
+  if (helpText) {
+    const effortMatch = helpText.match(/--effort\s.*?\(([^)]+)\)/);
+    if (effortMatch) {
+      const levels = effortMatch[1].split(",").map((s) => s.trim()).filter(Boolean);
+      if (levels.length > 0) {
+        capabilities.effortLevels = levels;
+      }
+    }
+  }
+  console.log(`[CliCapabilities] version=${capabilities.version ?? "unknown"}, effort=[${capabilities.effortLevels.join(", ")}]`);
+  return capabilities;
+}
+function runCli(path2, args) {
+  return new Promise((resolve) => {
+    (0, import_node_child_process8.execFile)(path2, args, { timeout: 5e3 }, (err, stdout) => {
+      if (err) {
+        console.warn(`[CliCapabilities] Failed to run ${path2} ${args.join(" ")}:`, err.message);
+        resolve(null);
+      } else {
+        resolve(stdout);
+      }
+    });
+  });
+}
+
 // src/server.ts
 var WS_PORT = 3745;
 var HTTP_PORT = 3746;
-var execAsync = (0, import_node_util.promisify)(import_node_child_process8.exec);
+var execAsync = (0, import_node_util.promisify)(import_node_child_process9.exec);
 async function killPortProcess(port) {
   try {
     if (isWindows) {
@@ -4540,6 +4601,12 @@ 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;
+  }).catch(() => {
+  });
   const broadcastUnreadSessions = () => {
     wsBridge.broadcast({ type: "unread_sessions", sessionIds: Array.from(unreadSessionIds) });
   };
@@ -4561,6 +4628,9 @@ async function start(opts = {}) {
     if (unreadSessionIds.size > 0) {
       wsBridge.send(ws, { type: "unread_sessions", sessionIds: Array.from(unreadSessionIds) });
     }
+    if (cliCapabilities) {
+      wsBridge.send(ws, { type: "cli_info", effortLevels: cliCapabilities.effortLevels, version: cliCapabilities.version });
+    }
   });
   wsBridge.onClientEvent(async (event, ws) => {
     try {
@@ -4896,7 +4966,8 @@ async function start(opts = {}) {
   terminalExecutor.onEvent((event) => {
     wsBridge.broadcast(event);
   });
-  wsBridge.onDisconnect(() => {
+  wsBridge.onDisconnect((ws) => {
+    notificationService.removeTokensByWs(ws);
     if (wsBridge.getConnectionCount() === 0 && approvalProxy.getPendingCount() > 0) {
       approvalProxy.approveAll(t("server.phoneDisconnected"));
     }

package/package.json

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