sessix-server 0.3.5 → 0.3.7

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
@@ -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);
@@ -3275,6 +3284,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 +3323,10 @@ var NotificationService = class {
   setGlobalPendingCountProvider(provider) {
     this.globalPendingCountProvider = provider;
   }
+  /** 设置 WS 连接数提供者（用于 status_change 通知的在线抑制） */
+  setConnectionCountProvider(provider) {
+    this.connectionCountProvider = provider;
+  }
   /** 获取全局待审批总数 */
   getGlobalPendingCount() {
     return this.globalPendingCountProvider?.() ?? 0;
@@ -3454,7 +3469,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else {
+          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
             this.notify({
               title: sessionTitle,
               body,
@@ -3476,7 +3491,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else {
+          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
             this.notify({
               title: sessionTitle,
               body,
@@ -4410,10 +4425,50 @@ var TerminalExecutor = class {
   }
 };
 
+// src/utils/cliCapabilities.ts
+var import_node_child_process8 = require("child_process");
+var DEFAULT_CAPABILITIES = {
+  effortLevels: ["low", "medium", "high", "xhigh", "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 +4590,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 +4617,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 {
@@ -4573,7 +4637,9 @@ async function start(opts = {}) {
             event.permissionMode,
             event.effort,
             event.images,
-            event.agentType
+            event.agentType,
+            event.fallbackModel,
+            event.maxBudgetUsd
           );
           wsBridge.broadcast({
             type: "session_list",
@@ -5076,7 +5142,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
@@ -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);
@@ -3280,6 +3289,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 +3328,10 @@ var NotificationService = class {
   setGlobalPendingCountProvider(provider) {
     this.globalPendingCountProvider = provider;
   }
+  /** 设置 WS 连接数提供者（用于 status_change 通知的在线抑制） */
+  setConnectionCountProvider(provider) {
+    this.connectionCountProvider = provider;
+  }
   /** 获取全局待审批总数 */
   getGlobalPendingCount() {
     return this.globalPendingCountProvider?.() ?? 0;
@@ -3459,7 +3474,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else {
+          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
             this.notify({
               title: sessionTitle,
               body,
@@ -3481,7 +3496,7 @@ var NotificationService = class {
               isYoloMode,
               updatedAt: Date.now()
             });
-          } else {
+          } else if ((this.connectionCountProvider?.() ?? 0) === 0) {
             this.notify({
               title: sessionTitle,
               body,
@@ -4415,10 +4430,50 @@ var TerminalExecutor = class {
   }
 };
 
+// src/utils/cliCapabilities.ts
+var import_node_child_process8 = require("child_process");
+var DEFAULT_CAPABILITIES = {
+  effortLevels: ["low", "medium", "high", "xhigh", "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 +4595,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 +4622,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 {
@@ -4578,7 +4642,9 @@ async function start(opts = {}) {
             event.permissionMode,
             event.effort,
             event.images,
-            event.agentType
+            event.agentType,
+            event.fallbackModel,
+            event.maxBudgetUsd
           );
           wsBridge.broadcast({
             type: "session_list",

package/package.json

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