sessix-server 0.3.6 → 0.3.8

package/dist/index.js

@@ -403,7 +403,7 @@ var ProcessProvider = class {
    * 并开始监听 stdout 的 NDJSON 输出。
    */
   async startSession(opts) {
-    const { projectPath, message, sessionId: existingSessionId, model, permissionMode, effort, images } = opts;
+    const { projectPath, message, sessionId: existingSessionId, model, permissionMode, effort, images, fallbackModel, maxBudgetUsd } = opts;
     const sessionId = existingSessionId ?? (0, import_uuid.v4)();
     if (this.activeSessions.has(sessionId)) {
       await this.killSession(sessionId);
@@ -419,10 +419,10 @@ var ProcessProvider = class {
       summary: message.slice(0, 80)
     };
     const resume = opts.resume ?? !!existingSessionId;
-    const proc = this.spawnClaudeProcess(sessionId, projectPath, resume, model, permissionMode, effort);
+    const proc = this.spawnClaudeProcess(sessionId, projectPath, resume, model, permissionMode, effort, fallbackModel, maxBudgetUsd);
     this.writeUserMessage(proc, message, sessionId, images);
     session.pid = proc.pid;
-    this.activeSessions.set(sessionId, { session, process: proc, model, permissionMode, effort });
+    this.activeSessions.set(sessionId, { session, process: proc, model, permissionMode, effort, fallbackModel, maxBudgetUsd });
     proc.on("error", (err) => {
       console.error(`[ProcessProvider] Session ${sessionId} process error:`, err.message);
       this.activeSessions.delete(sessionId);
@@ -494,7 +494,7 @@ var ProcessProvider = class {
     }
     const savedPendingQuestion = entry.pendingQuestion;
     const newMode = permissionMode ?? entry.permissionMode;
-    const proc = this.spawnClaudeProcess(sessionId, entry.session.projectPath, true, entry.model, newMode, entry.effort);
+    const proc = this.spawnClaudeProcess(sessionId, entry.session.projectPath, true, entry.model, newMode, entry.effort, entry.fallbackModel, entry.maxBudgetUsd);
     this.writeUserMessage(proc, message, sessionId, images);
     entry.session.status = "running";
     entry.session.lastActiveAt = Date.now();
@@ -544,14 +544,15 @@ var ProcessProvider = class {
   /**
    * 启动 claude CLI 进程（持久模式，stdin 保持开放接收多条消息）
    */
-  spawnClaudeProcess(sessionId, projectPath, resume = false, model, permissionMode, effort) {
+  spawnClaudeProcess(sessionId, projectPath, resume = false, model, permissionMode, effort, fallbackModel, maxBudgetUsd) {
     const args = [
       "--input-format",
       "stream-json",
       "--output-format",
       "stream-json",
       "--verbose",
-      "--include-partial-messages"
+      "--include-partial-messages",
+      "--include-hook-events"
     ];
     if (resume) {
       args.push("--resume", sessionId);
@@ -567,6 +568,12 @@ var ProcessProvider = class {
     if (effort) {
       args.push("--effort", effort);
     }
+    if (fallbackModel) {
+      args.push("--fallback-model", fallbackModel);
+    }
+    if (maxBudgetUsd != null) {
+      args.push("--max-budget-usd", String(maxBudgetUsd));
+    }
     const env = { ...process.env, SESSIX_SESSION_ID: sessionId };
     delete env.CLAUDECODE;
     const proc = (0, import_child_process.spawn)(CLAUDE_PATH, args, {
@@ -1677,7 +1684,7 @@ var SessionManager = class {
    * 调用 provider.startSession()，订阅事件流，
    * 将 ClaudeStreamEvent 包装为 ServerEvent 转发。
    */
-  async createSession(projectPath, message, resumeSessionId, newSessionId, model, permissionMode, effort, images, agentType) {
+  async createSession(projectPath, message, resumeSessionId, newSessionId, model, permissionMode, effort, images, agentType, fallbackModel, maxBudgetUsd) {
     let resolvedAgentType = agentType ?? "claude-code";
     if (!agentType && resumeSessionId && this.providerFactory) {
       const codexProvider = this.providerFactory.getProvider("codex");
@@ -1694,7 +1701,9 @@ var SessionManager = class {
       model,
       permissionMode,
       effort,
-      images
+      images,
+      fallbackModel,
+      maxBudgetUsd
     });
     this.sessionAgentType.set(session.id, resolvedAgentType);
     this.lastBroadcastStatus.set(session.id, session.status);
@@ -2335,7 +2344,7 @@ var WsBridge = class _WsBridge {
   onConnection(callback) {
     this.connectionCallbacks.push(callback);
   }
-  /** 注册断开连接回调（任意客户端断开时触发，传入断开的 ws 对象） */
+  /** 注册断开连接回调（任意客户端断开时触发，可通过 getConnectionCount() 判断是否全部断开） */
   onDisconnect(callback) {
     this.disconnectCallbacks.push(callback);
   }
@@ -2449,7 +2458,7 @@ var WsBridge = class _WsBridge {
         console.log(`[WsBridge] Client disconnected, connections: ${this.getConnectionCount()}`);
         for (const cb of this.disconnectCallbacks) {
           try {
-            cb(ws);
+            cb();
           } catch (err) {
             console.error("[WsBridge] Disconnect callback error:", err);
           }
@@ -3275,8 +3284,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 });
@@ -3314,14 +3321,6 @@ 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;
@@ -3464,7 +3463,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
+          } else {
             this.notify({
               title: sessionTitle,
               body,
@@ -3486,7 +3485,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
+          } else {
             this.notify({
               title: sessionTitle,
               body,
@@ -3574,17 +3573,6 @@ 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) {
@@ -4434,7 +4422,7 @@ var TerminalExecutor = class {
 // src/utils/cliCapabilities.ts
 var import_node_child_process8 = require("child_process");
 var DEFAULT_CAPABILITIES = {
-  effortLevels: ["low", "medium", "high", "max"]
+  effortLevels: ["low", "medium", "high", "xhigh", "max"]
 };
 async function parseCliCapabilities() {
   const claudePath = findClaudePath();
@@ -4596,7 +4584,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;
@@ -4643,7 +4630,9 @@ async function start(opts = {}) {
             event.permissionMode,
             event.effort,
             event.images,
-            event.agentType
+            event.agentType,
+            event.fallbackModel,
+            event.maxBudgetUsd
           );
           wsBridge.broadcast({
             type: "session_list",
@@ -4961,8 +4950,7 @@ async function start(opts = {}) {
   terminalExecutor.onEvent((event) => {
     wsBridge.broadcast(event);
   });
-  wsBridge.onDisconnect((ws) => {
-    notificationService.removeTokensByWs(ws);
+  wsBridge.onDisconnect(() => {
     if (wsBridge.getConnectionCount() === 0 && approvalProxy.getPendingCount() > 0) {
       approvalProxy.approveAll(t("server.phoneDisconnected"));
     }

package/dist/server.js

@@ -408,7 +408,7 @@ var ProcessProvider = class {
    * 并开始监听 stdout 的 NDJSON 输出。
    */
   async startSession(opts) {
-    const { projectPath, message, sessionId: existingSessionId, model, permissionMode, effort, images } = opts;
+    const { projectPath, message, sessionId: existingSessionId, model, permissionMode, effort, images, fallbackModel, maxBudgetUsd } = opts;
     const sessionId = existingSessionId ?? (0, import_uuid.v4)();
     if (this.activeSessions.has(sessionId)) {
       await this.killSession(sessionId);
@@ -424,10 +424,10 @@ var ProcessProvider = class {
       summary: message.slice(0, 80)
     };
     const resume = opts.resume ?? !!existingSessionId;
-    const proc = this.spawnClaudeProcess(sessionId, projectPath, resume, model, permissionMode, effort);
+    const proc = this.spawnClaudeProcess(sessionId, projectPath, resume, model, permissionMode, effort, fallbackModel, maxBudgetUsd);
     this.writeUserMessage(proc, message, sessionId, images);
     session.pid = proc.pid;
-    this.activeSessions.set(sessionId, { session, process: proc, model, permissionMode, effort });
+    this.activeSessions.set(sessionId, { session, process: proc, model, permissionMode, effort, fallbackModel, maxBudgetUsd });
     proc.on("error", (err) => {
       console.error(`[ProcessProvider] Session ${sessionId} process error:`, err.message);
       this.activeSessions.delete(sessionId);
@@ -499,7 +499,7 @@ var ProcessProvider = class {
     }
     const savedPendingQuestion = entry.pendingQuestion;
     const newMode = permissionMode ?? entry.permissionMode;
-    const proc = this.spawnClaudeProcess(sessionId, entry.session.projectPath, true, entry.model, newMode, entry.effort);
+    const proc = this.spawnClaudeProcess(sessionId, entry.session.projectPath, true, entry.model, newMode, entry.effort, entry.fallbackModel, entry.maxBudgetUsd);
     this.writeUserMessage(proc, message, sessionId, images);
     entry.session.status = "running";
     entry.session.lastActiveAt = Date.now();
@@ -549,14 +549,15 @@ var ProcessProvider = class {
   /**
    * 启动 claude CLI 进程（持久模式，stdin 保持开放接收多条消息）
    */
-  spawnClaudeProcess(sessionId, projectPath, resume = false, model, permissionMode, effort) {
+  spawnClaudeProcess(sessionId, projectPath, resume = false, model, permissionMode, effort, fallbackModel, maxBudgetUsd) {
     const args = [
       "--input-format",
       "stream-json",
       "--output-format",
       "stream-json",
       "--verbose",
-      "--include-partial-messages"
+      "--include-partial-messages",
+      "--include-hook-events"
     ];
     if (resume) {
       args.push("--resume", sessionId);
@@ -572,6 +573,12 @@ var ProcessProvider = class {
     if (effort) {
       args.push("--effort", effort);
     }
+    if (fallbackModel) {
+      args.push("--fallback-model", fallbackModel);
+    }
+    if (maxBudgetUsd != null) {
+      args.push("--max-budget-usd", String(maxBudgetUsd));
+    }
     const env = { ...process.env, SESSIX_SESSION_ID: sessionId };
     delete env.CLAUDECODE;
     const proc = (0, import_child_process.spawn)(CLAUDE_PATH, args, {
@@ -1682,7 +1689,7 @@ var SessionManager = class {
    * 调用 provider.startSession()，订阅事件流，
    * 将 ClaudeStreamEvent 包装为 ServerEvent 转发。
    */
-  async createSession(projectPath, message, resumeSessionId, newSessionId, model, permissionMode, effort, images, agentType) {
+  async createSession(projectPath, message, resumeSessionId, newSessionId, model, permissionMode, effort, images, agentType, fallbackModel, maxBudgetUsd) {
     let resolvedAgentType = agentType ?? "claude-code";
     if (!agentType && resumeSessionId && this.providerFactory) {
       const codexProvider = this.providerFactory.getProvider("codex");
@@ -1699,7 +1706,9 @@ var SessionManager = class {
       model,
       permissionMode,
       effort,
-      images
+      images,
+      fallbackModel,
+      maxBudgetUsd
     });
     this.sessionAgentType.set(session.id, resolvedAgentType);
     this.lastBroadcastStatus.set(session.id, session.status);
@@ -2340,7 +2349,7 @@ var WsBridge = class _WsBridge {
   onConnection(callback) {
     this.connectionCallbacks.push(callback);
   }
-  /** 注册断开连接回调（任意客户端断开时触发，传入断开的 ws 对象） */
+  /** 注册断开连接回调（任意客户端断开时触发，可通过 getConnectionCount() 判断是否全部断开） */
   onDisconnect(callback) {
     this.disconnectCallbacks.push(callback);
   }
@@ -2454,7 +2463,7 @@ var WsBridge = class _WsBridge {
         console.log(`[WsBridge] Client disconnected, connections: ${this.getConnectionCount()}`);
         for (const cb of this.disconnectCallbacks) {
           try {
-            cb(ws);
+            cb();
           } catch (err) {
             console.error("[WsBridge] Disconnect callback error:", err);
           }
@@ -3280,8 +3289,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 });
@@ -3319,14 +3326,6 @@ 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;
@@ -3469,7 +3468,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
+          } else {
             this.notify({
               title: sessionTitle,
               body,
@@ -3491,7 +3490,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
+          } else {
             this.notify({
               title: sessionTitle,
               body,
@@ -3579,17 +3578,6 @@ 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) {
@@ -4439,7 +4427,7 @@ var TerminalExecutor = class {
 // src/utils/cliCapabilities.ts
 var import_node_child_process8 = require("child_process");
 var DEFAULT_CAPABILITIES = {
-  effortLevels: ["low", "medium", "high", "max"]
+  effortLevels: ["low", "medium", "high", "xhigh", "max"]
 };
 async function parseCliCapabilities() {
   const claudePath = findClaudePath();
@@ -4601,7 +4589,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;
@@ -4648,7 +4635,9 @@ async function start(opts = {}) {
             event.permissionMode,
             event.effort,
             event.images,
-            event.agentType
+            event.agentType,
+            event.fallbackModel,
+            event.maxBudgetUsd
           );
           wsBridge.broadcast({
             type: "session_list",
@@ -4966,8 +4955,7 @@ async function start(opts = {}) {
   terminalExecutor.onEvent((event) => {
     wsBridge.broadcast(event);
   });
-  wsBridge.onDisconnect((ws) => {
-    notificationService.removeTokensByWs(ws);
+  wsBridge.onDisconnect(() => {
     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.6",
+  "version": "0.3.8",
   "bin": {
     "sessix-server": "dist/index.js"
   },