sessix-server 0.2.8 → 0.3.0

package/dist/server.js

@@ -57,6 +57,9 @@ var zh = {
     tokenRegenerated: "\u{1F511} Token \u5DF2\u91CD\u7F6E\uFF0C\u6240\u6709\u5BA2\u6237\u7AEF\u5DF2\u65AD\u5F00\uFF0C\u8BF7\u91CD\u65B0\u626B\u7801\u914D\u5BF9",
     tokenRegenerateFailed: "Token \u91CD\u7F6E\u5931\u8D25:",
     updateAvailable: "\u53D1\u73B0\u65B0\u7248\u672C v{{latest}}\uFF08\u5F53\u524D v{{current}}\uFF09\uFF0C\u8FD0\u884C\u4EE5\u4E0B\u547D\u4EE4\u66F4\u65B0\uFF1A",
+    autoUpdating: "\u53D1\u73B0\u65B0\u7248\u672C v{{latest}}\uFF08\u5F53\u524D v{{current}}\uFF09\uFF0C\u6B63\u5728\u81EA\u52A8\u66F4\u65B0...",
+    autoUpdateFailed: "\u81EA\u52A8\u66F4\u65B0\u5931\u8D25\uFF0C\u7EE7\u7EED\u4F7F\u7528\u5F53\u524D\u7248\u672C",
+    skipUpdateCheck: "\u8DF3\u8FC7\u7248\u672C\u68C0\u67E5\uFF08SESSIX_NO_UPDATE_CHECK=1\uFF09",
     receivedSignal: "\u6536\u5230 {{signal}}\uFF0C\u6B63\u5728\u4F18\u96C5\u5173\u95ED...",
     goodbye: "\u6240\u6709\u670D\u52A1\u5DF2\u5173\u95ED\uFF0C\u518D\u89C1\uFF01",
     shutdownError: "\u5173\u95ED\u8FC7\u7A0B\u51FA\u9519:",
@@ -167,6 +170,9 @@ var en = {
     tokenRegenerated: "\u{1F511} Token regenerated, all clients disconnected. Scan QR to re-pair",
     tokenRegenerateFailed: "Token regeneration failed:",
     updateAvailable: "New version v{{latest}} available (current v{{current}}). Update with:",
+    autoUpdating: "New version v{{latest}} available (current v{{current}}), auto-updating...",
+    autoUpdateFailed: "Auto-update failed, continuing with current version",
+    skipUpdateCheck: "Skipping update check (SESSIX_NO_UPDATE_CHECK=1)",
     receivedSignal: "Received {{signal}}, graceful shutdown...",
     goodbye: "All services closed, goodbye!",
     shutdownError: "Shutdown error:",
@@ -301,11 +307,11 @@ function t(key, params) {
 }
 
 // src/server.ts
-var import_uuid5 = require("uuid");
+var import_uuid6 = require("uuid");
 var import_promises4 = require("fs/promises");
-var import_node_os6 = require("os");
-var import_node_path5 = require("path");
-var import_node_child_process6 = require("child_process");
+var import_node_os7 = require("os");
+var import_node_path6 = require("path");
+var import_node_child_process8 = require("child_process");
 var import_node_util = require("util");
 
 // src/providers/ProcessProvider.ts
@@ -650,7 +656,9 @@ var ProcessProvider = class {
         const event = result.value;
         if (event.type === "assistant") {
           for (const block of event.message.content) {
-            if (block.type === "tool_use" && block.name === "AskUserQuestion") {
+            if (block.type === "tool_use") {
+              const isQuestion = block.name === "AskUserQuestion" || block.name === "AskFollowupQuestion";
+              if (!isQuestion) continue;
               const input = block.input;
               const question = input.question ?? "";
               if (!question) continue;
@@ -662,6 +670,7 @@ var ProcessProvider = class {
               }
               if (sessionSet.has(prevKey)) continue;
               sessionSet.add(prevKey);
+              console.log(`[ProcessProvider] Session ${sessionId}: detected ${block.name} (toolUseId=${block.id})`);
               this.emitter.emit(this.getQuestionEventName(sessionId), {
                 toolUseId: block.id,
                 question,
@@ -853,11 +862,500 @@ ${context}`;
   }
 };
 
-// src/session/SessionManager.ts
+// src/providers/CodexProvider.ts
+var import_child_process2 = require("child_process");
+var import_readline2 = require("readline");
+var import_events2 = require("events");
 var import_uuid2 = require("uuid");
+
+// src/utils/codexPath.ts
+var import_node_child_process3 = require("child_process");
+var import_node_fs2 = require("fs");
+var import_node_path2 = require("path");
+var import_node_os3 = require("os");
+function findCodexPath() {
+  try {
+    const cmd = isWindows ? "where codex" : "which codex";
+    return (0, import_node_child_process3.execSync)(cmd, { encoding: "utf-8" }).trim().split("\n")[0];
+  } catch {
+  }
+  const candidates = isWindows ? [
+    (0, import_node_path2.join)(process.env.LOCALAPPDATA ?? "", "Programs", "codex", "codex.exe"),
+    (0, import_node_path2.join)((0, import_node_os3.homedir)(), ".codex", "local", "codex.exe")
+  ] : [
+    "/opt/homebrew/bin/codex",
+    "/usr/local/bin/codex",
+    (0, import_node_path2.join)((0, import_node_os3.homedir)(), ".local", "bin", "codex")
+  ];
+  for (const candidate of candidates) {
+    try {
+      (0, import_node_fs2.accessSync)(candidate, import_node_fs2.constants.X_OK);
+      return candidate;
+    } catch {
+    }
+  }
+  return "codex";
+}
+var CODEX_PATH = findCodexPath();
+async function getCodexVersion() {
+  try {
+    const output = (0, import_node_child_process3.execSync)(`"${CODEX_PATH}" --version`, {
+      encoding: "utf-8",
+      timeout: 5e3
+    }).trim();
+    return output.replace(/^codex-cli\s+/, "");
+  } catch {
+    return void 0;
+  }
+}
+function isCodexAvailable() {
+  try {
+    (0, import_node_fs2.accessSync)(CODEX_PATH, import_node_fs2.constants.X_OK);
+    return true;
+  } catch {
+    try {
+      (0, import_node_child_process3.execSync)(`"${CODEX_PATH}" --version`, { timeout: 5e3 });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}
+
+// src/providers/CodexProvider.ts
+var CodexProvider = class {
+  activeSessions = /* @__PURE__ */ new Map();
+  emitter = new import_events2.EventEmitter();
+  /** 自增 ID 计数器，用于生成 ClaudeStreamEvent 中的 message/block ID */
+  idCounter = 0;
+  async startSession(opts) {
+    const { projectPath, message, sessionId: existingSessionId } = opts;
+    const sessionId = existingSessionId ?? (0, import_uuid2.v4)();
+    if (this.activeSessions.has(sessionId)) {
+      await this.killSession(sessionId);
+    }
+    const projectId = projectPath.split("/").filter(Boolean).pop() ?? "unknown";
+    const session = {
+      id: sessionId,
+      projectId,
+      projectPath,
+      status: "running",
+      createdAt: Date.now(),
+      lastActiveAt: Date.now(),
+      summary: message.slice(0, 80),
+      agentType: "codex"
+    };
+    const resume = opts.resume ?? !!existingSessionId;
+    const proc = this.spawnCodexProcess(projectPath, message, void 0);
+    session.pid = proc.pid;
+    this.activeSessions.set(sessionId, {
+      session,
+      process: proc,
+      threadId: void 0,
+      turnStartTime: Date.now()
+    });
+    const initEvent = {
+      type: "system",
+      subtype: "init",
+      session_id: sessionId
+    };
+    this.emitter.emit(this.getEventName(sessionId), initEvent);
+    proc.on("error", (err) => {
+      console.error(`[CodexProvider] Session ${sessionId} process error:`, err.message);
+      this.activeSessions.delete(sessionId);
+      this.emitError(sessionId, `Process spawn failed: ${err.message}`);
+    });
+    this.attachStdoutListener(sessionId, proc);
+    this.attachStderrListener(sessionId, proc);
+    this.attachExitListener(sessionId, proc);
+    return session;
+  }
+  async killSession(sessionId) {
+    const entry = this.activeSessions.get(sessionId);
+    if (!entry) return;
+    if (entry.process.exitCode === null && entry.process.signalCode === null) {
+      try {
+        entry.process.stdin?.end();
+      } catch {
+      }
+      await killProcessCrossPlatform(entry.process);
+    }
+    this.activeSessions.delete(sessionId);
+  }
+  async sendMessage(sessionId, message) {
+    const entry = this.activeSessions.get(sessionId);
+    if (!entry) {
+      throw new Error(`Session ${sessionId} not found or already ended`);
+    }
+    if (entry.process.exitCode === null && entry.process.signalCode === null) {
+      try {
+        entry.process.stdin?.end();
+      } catch {
+      }
+      await killProcessCrossPlatform(entry.process);
+    }
+    const threadId = entry.threadId;
+    if (!threadId) {
+      throw new Error(`Session ${sessionId} has no thread ID, cannot resume`);
+    }
+    const proc = this.spawnCodexProcess(entry.session.projectPath, message, threadId);
+    entry.session.status = "running";
+    entry.session.lastActiveAt = Date.now();
+    entry.session.pid = proc.pid;
+    entry.process = proc;
+    entry.turnStartTime = Date.now();
+    proc.on("error", (err) => {
+      console.error(`[CodexProvider] Session ${sessionId} sendMessage process error:`, err.message);
+      this.activeSessions.delete(sessionId);
+      this.emitError(sessionId, `Failed to send message: ${err.message}`);
+    });
+    this.attachStdoutListener(sessionId, proc);
+    this.attachStderrListener(sessionId, proc);
+    this.attachExitListener(sessionId, proc);
+  }
+  onEvent(sessionId, callback) {
+    const eventName = this.getEventName(sessionId);
+    this.emitter.on(eventName, callback);
+    return () => {
+      this.emitter.off(eventName, callback);
+    };
+  }
+  getActiveSessions() {
+    return Array.from(this.activeSessions.values()).map((e) => e.session);
+  }
+  async generateSuggestion(_context) {
+    return "";
+  }
+  async answerQuestion(_sessionId, _toolUseId, _answer) {
+  }
+  onQuestion(_sessionId, _callback) {
+    return () => {
+    };
+  }
+  // ============================================
+  // 私有方法
+  // ============================================
+  nextId() {
+    return `codex_${++this.idCounter}`;
+  }
+  /**
+   * 启动 codex CLI 进程
+   *
+   * @param projectPath 工作目录
+   * @param message 用户消息
+   * @param resumeThreadId 如果提供，则使用 `codex exec resume` 恢复会话
+   */
+  spawnCodexProcess(projectPath, message, resumeThreadId) {
+    const args = ["exec", "--json", "--full-auto"];
+    if (resumeThreadId) {
+      args.push("resume", resumeThreadId);
+    } else {
+      args.push("-C", projectPath);
+    }
+    args.push(message);
+    const env = { ...process.env };
+    const proc = (0, import_child_process2.spawn)(CODEX_PATH, args, {
+      cwd: projectPath,
+      env,
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    try {
+      proc.stdin?.end();
+    } catch {
+    }
+    return proc;
+  }
+  /**
+   * 挂载 stdout 监听器，逐行解析 Codex NDJSON 并转换为 ClaudeStreamEvent
+   */
+  attachStdoutListener(sessionId, proc) {
+    if (!proc.stdout) return;
+    const rl = (0, import_readline2.createInterface)({ input: proc.stdout, crlfDelay: Infinity });
+    const entry = this.activeSessions.get(sessionId);
+    if (entry) entry.rl = rl;
+    rl.on("line", (line) => {
+      const trimmed = line.trim();
+      if (!trimmed) return;
+      let event;
+      try {
+        event = JSON.parse(trimmed);
+      } catch {
+        console.warn(`[CodexProvider] Session ${sessionId}: failed to parse: ${trimmed.substring(0, 100)}`);
+        return;
+      }
+      this.handleCodexEvent(sessionId, event);
+    });
+  }
+  /**
+   * 处理单个 Codex NDJSON 事件，转换并发射 ClaudeStreamEvent
+   */
+  handleCodexEvent(sessionId, event) {
+    const entry = this.activeSessions.get(sessionId);
+    if (!entry) return;
+    entry.session.lastActiveAt = Date.now();
+    switch (event.type) {
+      case "thread.started": {
+        if (event.thread_id) {
+          entry.threadId = event.thread_id;
+        }
+        break;
+      }
+      case "turn.started": {
+        entry.session.status = "running";
+        entry.turnStartTime = Date.now();
+        break;
+      }
+      case "item.completed": {
+        if (!event.item) break;
+        this.handleItemCompleted(sessionId, event.item);
+        break;
+      }
+      case "turn.completed": {
+        entry.session.status = "idle";
+        const duration = entry.turnStartTime ? Date.now() - entry.turnStartTime : 0;
+        const resultEvent = {
+          type: "result",
+          subtype: "success",
+          session_id: sessionId,
+          is_error: false,
+          result: "",
+          duration_ms: duration,
+          num_turns: 1,
+          usage: event.usage
+        };
+        this.emitter.emit(this.getEventName(sessionId), resultEvent);
+        break;
+      }
+      case "turn.failed": {
+        entry.session.status = "error";
+        const failEvent = {
+          type: "result",
+          subtype: "error",
+          session_id: sessionId,
+          is_error: true,
+          result: event.error ?? "Turn failed",
+          duration_ms: entry.turnStartTime ? Date.now() - entry.turnStartTime : 0,
+          num_turns: 1
+        };
+        this.emitter.emit(this.getEventName(sessionId), failEvent);
+        break;
+      }
+    }
+  }
+  /**
+   * 处理 item.completed 事件，按 item.type 转换为对应的 ClaudeStreamEvent
+   */
+  handleItemCompleted(sessionId, item) {
+    switch (item.type) {
+      case "agent_message": {
+        const msgEvent = {
+          type: "assistant",
+          session_id: sessionId,
+          message: {
+            id: item.id || this.nextId(),
+            model: "codex",
+            role: "assistant",
+            content: [{ type: "text", text: item.text ?? "" }]
+          }
+        };
+        this.emitter.emit(this.getEventName(sessionId), msgEvent);
+        break;
+      }
+      case "command_execution": {
+        const toolUseId = item.id || this.nextId();
+        const toolEvent = {
+          type: "assistant",
+          session_id: sessionId,
+          message: {
+            id: this.nextId(),
+            model: "codex",
+            role: "assistant",
+            content: [{
+              type: "tool_use",
+              id: toolUseId,
+              name: "Bash",
+              input: { command: item.command ?? "" }
+            }]
+          }
+        };
+        this.emitter.emit(this.getEventName(sessionId), toolEvent);
+        const resultContent = item.aggregated_output ?? "";
+        const isError = item.exit_code != null && item.exit_code !== 0;
+        const toolResultEvent = {
+          type: "user",
+          session_id: sessionId,
+          message: {
+            role: "user",
+            content: [{
+              type: "tool_result",
+              tool_use_id: toolUseId,
+              content: resultContent,
+              is_error: isError
+            }]
+          }
+        };
+        this.emitter.emit(this.getEventName(sessionId), toolResultEvent);
+        break;
+      }
+      case "file_change": {
+        const editToolUseId = item.id || this.nextId();
+        const toolEvent = {
+          type: "assistant",
+          session_id: sessionId,
+          message: {
+            id: this.nextId(),
+            model: "codex",
+            role: "assistant",
+            content: [{
+              type: "tool_use",
+              id: editToolUseId,
+              name: "Edit",
+              input: { file_path: item.file_path ?? "", diff: item.diff ?? "" }
+            }]
+          }
+        };
+        this.emitter.emit(this.getEventName(sessionId), toolEvent);
+        const toolResultEvent = {
+          type: "user",
+          session_id: sessionId,
+          message: {
+            role: "user",
+            content: [{
+              type: "tool_result",
+              tool_use_id: editToolUseId,
+              content: `File edited: ${item.file_path ?? "unknown"}`
+            }]
+          }
+        };
+        this.emitter.emit(this.getEventName(sessionId), toolResultEvent);
+        break;
+      }
+      case "reasoning": {
+        const thinkEvent = {
+          type: "assistant",
+          session_id: sessionId,
+          message: {
+            id: item.id || this.nextId(),
+            model: "codex",
+            role: "assistant",
+            content: [{ type: "thinking", thinking: item.text ?? "" }]
+          }
+        };
+        this.emitter.emit(this.getEventName(sessionId), thinkEvent);
+        break;
+      }
+    }
+  }
+  attachStderrListener(sessionId, proc) {
+    if (!proc.stderr) return;
+    proc.stderr.on("data", (data) => {
+      const text = data.toString().trim();
+      if (text) {
+        console.error(`[CodexProvider] Session ${sessionId} stderr: ${text}`);
+      }
+    });
+  }
+  attachExitListener(sessionId, proc) {
+    proc.once("exit", (code, signal) => {
+      const entry = this.activeSessions.get(sessionId);
+      if (!entry) return;
+      if (entry.process !== proc) return;
+      if (entry.rl) {
+        entry.rl.close();
+        entry.rl = void 0;
+      }
+      entry.session.pid = void 0;
+      entry.session.lastActiveAt = Date.now();
+      const alreadyHasResult = entry.session.status === "idle" || entry.session.status === "error";
+      if (alreadyHasResult) return;
+      const isNormal = isNormalExit(code, signal);
+      entry.session.status = isNormal ? "idle" : "error";
+      if (!isNormal) {
+        console.error(`[CodexProvider] Session ${sessionId}: process exited abnormally code=${code} signal=${signal}`);
+      }
+      const syntheticResult = {
+        type: "result",
+        subtype: isNormal ? "success" : "error",
+        session_id: sessionId,
+        is_error: !isNormal,
+        result: isNormal ? "" : `Process exited code=${code} signal=${signal}`,
+        duration_ms: 0,
+        num_turns: 0
+      };
+      this.emitter.emit(this.getEventName(sessionId), syntheticResult);
+    });
+  }
+  emitError(sessionId, message) {
+    const event = {
+      type: "result",
+      subtype: "error",
+      result: message,
+      session_id: sessionId,
+      duration_ms: 0,
+      is_error: true,
+      num_turns: 0
+    };
+    this.emitter.emit(this.getEventName(sessionId), event);
+  }
+  getEventName(sessionId) {
+    return `claude:${sessionId}`;
+  }
+};
+
+// src/providers/ProviderFactory.ts
+var import_node_child_process4 = require("child_process");
+var ProviderFactory = class {
+  providers = /* @__PURE__ */ new Map();
+  getProvider(agentType) {
+    const existing = this.providers.get(agentType);
+    if (existing) return existing;
+    let provider;
+    switch (agentType) {
+      case "codex":
+        provider = new CodexProvider();
+        break;
+      case "claude-code":
+      default:
+        provider = new ProcessProvider();
+        break;
+    }
+    this.providers.set(agentType, provider);
+    return provider;
+  }
+  async detectAgents() {
+    const agents = [];
+    try {
+      const claudePath = findClaudePath();
+      const claudeVersion = (0, import_node_child_process4.execSync)(`"${claudePath}" --version`, {
+        encoding: "utf-8",
+        timeout: 5e3
+      }).trim();
+      agents.push({
+        type: "claude-code",
+        name: "Claude Code",
+        available: true,
+        version: claudeVersion
+      });
+    } catch {
+      agents.push({ type: "claude-code", name: "Claude Code", available: false });
+    }
+    if (isCodexAvailable()) {
+      const version = await getCodexVersion();
+      agents.push({ type: "codex", name: "Codex", available: true, version });
+    } else {
+      agents.push({ type: "codex", name: "Codex", available: false });
+    }
+    return agents;
+  }
+};
+
+// src/session/SessionManager.ts
+var import_uuid3 = require("uuid");
 var BUFFER_MAX = 5e3;
 var SessionManager = class {
   provider;
+  providerFactory;
+  sessionAgentType = /* @__PURE__ */ new Map();
   /** 事件回调列表（事件会被转发到 WsBridge） */
   eventCallbacks = [];
   /** 每个会话的事件流取消订阅函数 */
@@ -883,8 +1381,19 @@ var SessionManager = class {
   bufferTruncated = /* @__PURE__ */ new Set();
   /** sessionId → projectPath 映射，用于截断时从 JSONL 补全历史 */
   sessionProjectPaths = /* @__PURE__ */ new Map();
-  constructor(provider) {
-    this.provider = provider;
+  constructor(providerOrFactory) {
+    if (providerOrFactory instanceof ProviderFactory) {
+      this.providerFactory = providerOrFactory;
+      this.provider = providerOrFactory.getProvider("claude-code");
+    } else {
+      this.provider = providerOrFactory;
+      this.providerFactory = null;
+    }
+  }
+  getProviderForSession(sessionId) {
+    if (!this.providerFactory) return this.provider;
+    const agentType = this.sessionAgentType.get(sessionId) ?? "claude-code";
+    return this.providerFactory.getProvider(agentType);
   }
   // ============================================
   // 公开 API
@@ -895,8 +1404,9 @@ var SessionManager = class {
    * 调用 provider.startSession()，订阅事件流，
    * 将 ClaudeStreamEvent 包装为 ServerEvent 转发。
    */
-  async createSession(projectPath, message, resumeSessionId, newSessionId, model, permissionMode, effort, images) {
-    const session = await this.provider.startSession({
+  async createSession(projectPath, message, resumeSessionId, newSessionId, model, permissionMode, effort, images, agentType = "claude-code") {
+    const provider = this.providerFactory ? this.providerFactory.getProvider(agentType) : this.provider;
+    const session = await provider.startSession({
       projectPath,
       message,
       sessionId: resumeSessionId ?? newSessionId,
@@ -906,6 +1416,7 @@ var SessionManager = class {
       effort,
       images
     });
+    this.sessionAgentType.set(session.id, agentType);
     this.lastBroadcastStatus.set(session.id, session.status);
     this.sessionProjectPaths.set(session.id, projectPath);
     this.unsubscribeSession(session.id);
@@ -917,7 +1428,8 @@ var SessionManager = class {
    * 发送消息到已有会话
    */
   async sendMessage(sessionId, message, permissionMode, images) {
-    await this.provider.sendMessage(sessionId, message, permissionMode, images);
+    const provider = this.getProviderForSession(sessionId);
+    await provider.sendMessage(sessionId, message, permissionMode, images);
     this.updateSessionStatus(sessionId, "running");
     console.log(`[SessionManager] Message sent to session: ${sessionId}`);
   }
@@ -937,7 +1449,9 @@ var SessionManager = class {
       clearTimeout(pending.timer);
       this.pendingAssistantEvents.delete(sessionId);
     }
-    await this.provider.killSession(sessionId);
+    const provider = this.getProviderForSession(sessionId);
+    await provider.killSession(sessionId);
+    this.sessionAgentType.delete(sessionId);
     console.log(`[SessionManager] Session killed: ${sessionId}`);
   }
   /**
@@ -1016,7 +1530,11 @@ var SessionManager = class {
    * 获取所有活跃会话（含服务器端统计）
    */
   getActiveSessions() {
-    return this.provider.getActiveSessions().map((session) => {
+    const rawSessions = this.providerFactory ? [
+      ...this.providerFactory.getProvider("claude-code").getActiveSessions(),
+      ...this.providerFactory.getProvider("codex").getActiveSessions()
+    ] : this.provider.getActiveSessions();
+    return rawSessions.map((session) => {
       const stats = this.getSessionStats(session.id);
       return stats ? { ...session, stats } : session;
     });
@@ -1046,6 +1564,7 @@ var SessionManager = class {
     this.sessionEventBuffers.clear();
     this.bufferTruncated.clear();
     this.sessionProjectPaths.clear();
+    this.sessionAgentType.clear();
     this.sessionStats.clear();
     for (const [, pending] of this.pendingAssistantEvents) {
       clearTimeout(pending.timer);
@@ -1063,10 +1582,11 @@ var SessionManager = class {
    * 订阅指定会话的事件流（包括 AskUserQuestion 问题事件）
    */
   subscribeToSession(sessionId) {
-    const unsubscribeEvent = this.provider.onEvent(sessionId, (event) => {
+    const provider = this.getProviderForSession(sessionId);
+    const unsubscribeEvent = provider.onEvent(sessionId, (event) => {
       this.handleClaudeEvent(sessionId, event);
     });
-    const unsubscribeQuestion = this.provider.onQuestion(
+    const unsubscribeQuestion = provider.onQuestion(
       sessionId,
       ({ toolUseId, question, options }) => {
         this.handleAskUserQuestion(sessionId, toolUseId, question, options);
@@ -1241,7 +1761,7 @@ var SessionManager = class {
       console.log(`[SessionManager] Session ${sessionId}: AskUserQuestion updated (requestId=${existingRequestId})`);
       return;
     }
-    const requestId = (0, import_uuid2.v4)();
+    const requestId = (0, import_uuid3.v4)();
     const request = {
       id: requestId,
       sessionId,
@@ -1257,7 +1777,8 @@ var SessionManager = class {
     });
     answerPromise.then(async (answer) => {
       try {
-        await this.provider.answerQuestion(sessionId, toolUseId, answer);
+        const provider = this.getProviderForSession(sessionId);
+        await provider.answerQuestion(sessionId, toolUseId, answer);
       } catch (err) {
         console.error(`[SessionManager] answerQuestion failed (${sessionId}):`, err);
       }
@@ -1680,15 +2201,15 @@ var WsBridge = class _WsBridge {
 
 // src/approval/ApprovalProxy.ts
 var import_node_http = __toESM(require("http"));
-var import_node_fs2 = __toESM(require("fs"));
-var import_node_path2 = __toESM(require("path"));
-var import_node_os3 = __toESM(require("os"));
-var import_uuid3 = require("uuid");
+var import_node_fs3 = __toESM(require("fs"));
+var import_node_path3 = __toESM(require("path"));
+var import_node_os4 = __toESM(require("os"));
+var import_uuid4 = require("uuid");
 var ApprovalProxy = class _ApprovalProxy {
   server;
   token;
   port;
-  settingsPath = import_node_path2.default.join(import_node_os3.default.homedir(), ".claude", "settings.json");
+  settingsPath = import_node_path3.default.join(import_node_os4.default.homedir(), ".claude", "settings.json");
   /** 待处理的审批请求：requestId -> { resolve, timer, request } */
   pendingApprovals = /* @__PURE__ */ new Map();
   /** 审批请求回调（通知外部推送到手机） */
@@ -1793,7 +2314,7 @@ var ApprovalProxy = class _ApprovalProxy {
   isToolInClaudeSettings(toolName, projectPath) {
     const checkPath = (filepath) => {
       try {
-        const raw = import_node_fs2.default.readFileSync(filepath, "utf-8");
+        const raw = import_node_fs3.default.readFileSync(filepath, "utf-8");
         const settings = JSON.parse(raw);
         const allow = settings?.permissions?.allow ?? [];
         return allow.some((entry) => {
@@ -1807,24 +2328,24 @@ var ApprovalProxy = class _ApprovalProxy {
       }
     };
     if (projectPath) {
-      const projectSettingsPath = import_node_path2.default.join(projectPath, ".claude", "settings.json");
+      const projectSettingsPath = import_node_path3.default.join(projectPath, ".claude", "settings.json");
       if (checkPath(projectSettingsPath)) return true;
     }
     return checkPath(this.settingsPath);
   }
   /** 将工具写入 settings.json permissions.allow（项目级或全局） */
   addToClaudeSettings(projectPath, toolName) {
-    const targetPath = projectPath ? import_node_path2.default.join(projectPath, ".claude", "settings.json") : this.settingsPath;
+    const targetPath = projectPath ? import_node_path3.default.join(projectPath, ".claude", "settings.json") : this.settingsPath;
     try {
       if (projectPath) {
-        const dir = import_node_path2.default.dirname(targetPath);
-        if (!import_node_fs2.default.existsSync(dir)) {
-          import_node_fs2.default.mkdirSync(dir, { recursive: true });
+        const dir = import_node_path3.default.dirname(targetPath);
+        if (!import_node_fs3.default.existsSync(dir)) {
+          import_node_fs3.default.mkdirSync(dir, { recursive: true });
         }
       }
       let settings = {};
       try {
-        settings = JSON.parse(import_node_fs2.default.readFileSync(targetPath, "utf-8"));
+        settings = JSON.parse(import_node_fs3.default.readFileSync(targetPath, "utf-8"));
       } catch {
       }
       if (!settings.permissions) {
@@ -1838,7 +2359,7 @@ var ApprovalProxy = class _ApprovalProxy {
       const entry = `${toolName}(*)`;
       if (!allow.includes(entry)) {
         allow.push(entry);
-        import_node_fs2.default.writeFileSync(targetPath, JSON.stringify(settings, null, 2), "utf-8");
+        import_node_fs3.default.writeFileSync(targetPath, JSON.stringify(settings, null, 2), "utf-8");
         const label = projectPath ? `${projectPath}/.claude/settings.json` : "~/.claude/settings.json";
         console.log(`[ApprovalProxy] ${t("approval.alwaysAllowWritten", { entry, label })}`);
       }
@@ -1933,7 +2454,7 @@ var ApprovalProxy = class _ApprovalProxy {
     try {
       const body = await this.parseJsonBody(req);
       const payload = body.payload ?? body;
-      const requestId = (0, import_uuid3.v4)();
+      const requestId = (0, import_uuid4.v4)();
       const projectPath = String(body.projectPath ?? "unknown");
       const toolName = String(payload.tool_name ?? body.tool_name ?? "unknown");
       const toolInput = payload.tool_input ?? body.tool_input ?? {};
@@ -2065,8 +2586,8 @@ var ApprovalProxy = class _ApprovalProxy {
 };
 
 // src/mdns/MdnsService.ts
-var import_node_child_process3 = require("child_process");
-var import_node_os4 = require("os");
+var import_node_child_process5 = require("child_process");
+var import_node_os5 = require("os");
 function buildTxtArgs(txt) {
   return Object.entries(txt).map(([k, v]) => `${k}=${v}`);
 }
@@ -2084,7 +2605,7 @@ var MdnsService = class {
     this.httpPort = options.httpPort;
     this.version = options.version ?? "0.1.0";
     this.pairing = options.pairing ?? "closed";
-    this.useDnsSd = (0, import_node_os4.platform)() === "darwin";
+    this.useDnsSd = (0, import_node_os5.platform)() === "darwin";
   }
   getTxt() {
     return {
@@ -2117,7 +2638,7 @@ var MdnsService = class {
       String(this.wsPort),
       ...buildTxtArgs(this.getTxt())
     ];
-    this.proc = (0, import_node_child_process3.spawn)("dns-sd", args, { stdio: "ignore" });
+    this.proc = (0, import_node_child_process5.spawn)("dns-sd", args, { stdio: "ignore" });
     this.proc.on("error", (err) => {
       console.warn(`[MdnsService] dns-sd failed, falling back to bonjour-service: ${err.message}`);
       this.proc = null;
@@ -2138,7 +2659,7 @@ var MdnsService = class {
       return;
     }
     try {
-      const { default: Bonjour } = await import("bonjour-service");
+      const { Bonjour } = await import("bonjour-service");
       const { networkInterfaces } = await import("os");
       const lanAddrs = getLanAddresses(networkInterfaces);
       const opts = lanAddrs.length > 0 ? { interface: lanAddrs[0] } : {};
@@ -2229,12 +2750,12 @@ function getLanAddresses(networkInterfacesFn) {
 
 // src/hooks/HookInstaller.ts
 var import_promises2 = require("fs/promises");
-var import_node_path3 = require("path");
-var import_node_os5 = require("os");
-var SESSIX_HOOKS_DIR = (0, import_node_path3.join)((0, import_node_os5.homedir)(), ".sessix", "hooks");
-var HOOK_SCRIPT_PATH = (0, import_node_path3.join)(SESSIX_HOOKS_DIR, "approval-hook.js");
-var PERMISSION_ACCEPT_PATH = (0, import_node_path3.join)(SESSIX_HOOKS_DIR, "permission-accept.js");
-var CLAUDE_SETTINGS_PATH = (0, import_node_path3.join)((0, import_node_os5.homedir)(), ".claude", "settings.json");
+var import_node_path4 = require("path");
+var import_node_os6 = require("os");
+var SESSIX_HOOKS_DIR = (0, import_node_path4.join)((0, import_node_os6.homedir)(), ".sessix", "hooks");
+var HOOK_SCRIPT_PATH = (0, import_node_path4.join)(SESSIX_HOOKS_DIR, "approval-hook.js");
+var PERMISSION_ACCEPT_PATH = (0, import_node_path4.join)(SESSIX_HOOKS_DIR, "permission-accept.js");
+var CLAUDE_SETTINGS_PATH = (0, import_node_path4.join)((0, import_node_os6.homedir)(), ".claude", "settings.json");
 var HOOK_COMMAND = "node ~/.sessix/hooks/approval-hook.js";
 var PERMISSION_ACCEPT_COMMAND = "node ~/.sessix/hooks/permission-accept.js";
 var LEGACY_HOOK_COMMANDS = [
@@ -2408,7 +2929,7 @@ var HookInstaller = class {
    * 写入 Claude Code settings.json
    */
   async writeClaudeSettings(settings) {
-    await (0, import_promises2.mkdir)((0, import_node_path3.join)((0, import_node_os5.homedir)(), ".claude"), { recursive: true });
+    await (0, import_promises2.mkdir)((0, import_node_path4.join)((0, import_node_os6.homedir)(), ".claude"), { recursive: true });
     await (0, import_promises2.writeFile)(CLAUDE_SETTINGS_PATH, JSON.stringify(settings, null, 2) + "\n", "utf-8");
   }
   /**
@@ -2435,7 +2956,7 @@ var HookInstaller = class {
 };
 
 // src/notification/NotificationService.ts
-var import_node_path4 = require("path");
+var import_node_path5 = require("path");
 var NotificationService = class {
   constructor(sessionManager, expoChannel = null) {
     this.sessionManager = sessionManager;
@@ -2531,7 +3052,7 @@ var NotificationService = class {
     const dangerLevel = this.getDangerLevel(request.toolName);
     const isDangerous = dangerLevel === "danger" || dangerLevel === "write";
     const categoryId = isDangerous ? "APPROVAL_DANGEROUS" : "APPROVAL_NORMAL";
-    const projectName = (0, import_node_path4.basename)(
+    const projectName = (0, import_node_path5.basename)(
       this.sessionManager.getActiveSessions().find((s) => s.id === request.sessionId)?.projectPath ?? ""
     );
     const pushTitle = isDangerous ? `\u26A0\uFE0F ${title}` : title;
@@ -2587,7 +3108,7 @@ var NotificationService = class {
   /** 从审批请求中提取操作目标的简短描述 */
   extractTarget(request) {
     const input = request.toolInput;
-    if (input.file_path) return (0, import_node_path4.basename)(String(input.file_path));
+    if (input.file_path) return (0, import_node_path5.basename)(String(input.file_path));
     if (input.command) return String(input.command).slice(0, 40);
     return request.description.slice(0, 40);
   }
@@ -2690,7 +3211,7 @@ var NotificationService = class {
   getSessionTitle(sessionId) {
     const session = this.sessionManager.getActiveSessions().find((s) => s.id === sessionId);
     if (!session) return "Unknown";
-    return session.summary ?? (0, import_node_path4.basename)(session.projectPath);
+    return session.summary ?? (0, import_node_path5.basename)(session.projectPath);
   }
   /** 获取会话的 YOLO 模式状态 */
   getYoloMode(sessionId) {
@@ -2699,7 +3220,7 @@ var NotificationService = class {
 };
 
 // src/notification/DesktopNotificationChannel.ts
-var import_node_child_process4 = require("child_process");
+var import_node_child_process6 = require("child_process");
 var DesktopNotificationChannel = class {
   isAvailable() {
     return process.platform === "darwin";
@@ -2711,7 +3232,7 @@ var DesktopNotificationChannel = class {
     const sound = payload.sound ?? "Ping";
     const script = `display notification "${body}" with title "${title}" sound name "${sound}"`;
     return new Promise((resolve) => {
-      (0, import_node_child_process4.execFile)("osascript", ["-e", script], (err) => {
+      (0, import_node_child_process6.execFile)("osascript", ["-e", script], (err) => {
         if (err) {
           console.warn("[DesktopNotificationChannel] Send notification failed:", err.message);
         }
@@ -2985,7 +3506,7 @@ var ActivityPushChannel = class {
 
 // src/session/ProjectReader.ts
 var import_promises3 = require("fs/promises");
-var import_readline2 = require("readline");
+var import_readline3 = require("readline");
 var import_path = require("path");
 var import_os = require("os");
 var CLAUDE_PROJECTS_DIR = (0, import_path.join)((0, import_os.homedir)(), ".claude", "projects");
@@ -3037,16 +3558,23 @@ async function getHistoricalSessions(projectPath) {
     const entries = await (0, import_promises3.readdir)(projectDir, { withFileTypes: true });
     const jsonlFiles = entries.filter((e) => e.isFile() && e.name.endsWith(".jsonl"));
     const mtimeMap = /* @__PURE__ */ new Map();
-    for (const entry of jsonlFiles) {
-      const sessionId = entry.name.slice(0, -6);
-      const filePath = (0, import_path.join)(projectDir, entry.name);
-      try {
-        const fileStat = await (0, import_promises3.stat)(filePath);
-        mtimeMap.set(sessionId, fileStat.mtimeMs);
-      } catch {
-        mtimeMap.set(sessionId, 0);
-      }
-    }
+    await Promise.all(
+      jsonlFiles.map(async (entry) => {
+        const sessionId = entry.name.slice(0, -6);
+        const filePath = (0, import_path.join)(projectDir, entry.name);
+        try {
+          const contentTs = await extractLastTimestamp(filePath);
+          if (contentTs) {
+            mtimeMap.set(sessionId, contentTs);
+          } else {
+            const fileStat = await (0, import_promises3.stat)(filePath);
+            mtimeMap.set(sessionId, fileStat.mtimeMs);
+          }
+        } catch {
+          mtimeMap.set(sessionId, 0);
+        }
+      })
+    );
     const uuidDirs = entries.filter(
       (e) => e.isDirectory() && UUID_RE.test(e.name) && !mtimeMap.has(e.name)
     );
@@ -3197,11 +3725,37 @@ async function getSessionHistory(projectPath, sessionId) {
     };
   }
 }
+async function extractLastTimestamp(filePath) {
+  let fileHandle;
+  try {
+    fileHandle = await (0, import_promises3.open)(filePath, "r");
+    const fileStat = await fileHandle.stat();
+    const readSize = Math.min(fileStat.size, 8192);
+    const buffer = Buffer.alloc(readSize);
+    await fileHandle.read(buffer, 0, readSize, fileStat.size - readSize);
+    const tail = buffer.toString("utf-8");
+    const lines = tail.split("\n").filter((l) => l.trim());
+    for (let i = lines.length - 1; i >= 0; i--) {
+      try {
+        const obj = JSON.parse(lines[i]);
+        if (obj.timestamp) {
+          const ts = new Date(obj.timestamp).getTime();
+          if (!isNaN(ts)) return ts;
+        }
+      } catch {
+      }
+    }
+  } catch {
+  } finally {
+    await fileHandle?.close();
+  }
+  return void 0;
+}
 async function extractFirstPrompt(filePath) {
   let fileHandle;
   try {
     fileHandle = await (0, import_promises3.open)(filePath, "r");
-    const rl = (0, import_readline2.createInterface)({
+    const rl = (0, import_readline3.createInterface)({
       input: fileHandle.createReadStream({ encoding: "utf-8" }),
       crlfDelay: Infinity
     });
@@ -3265,17 +3819,24 @@ async function countJsonlFilesWithMtime(dirPath) {
       (e) => e.isDirectory() && UUID_RE.test(e.name) && !jsonlNames.has(e.name)
     );
     let latestMtime = 0;
-    const allEntries = [
-      ...entries.filter((e) => e.isFile() && e.name.endsWith(".jsonl")),
-      ...uuidDirs
-    ];
-    for (const entry of allEntries) {
-      try {
-        const fileStat = await (0, import_promises3.stat)((0, import_path.join)(dirPath, entry.name));
-        if (fileStat.mtimeMs > latestMtime) latestMtime = fileStat.mtimeMs;
-      } catch {
-      }
-    }
+    const jsonlEntries = entries.filter((e) => e.isFile() && e.name.endsWith(".jsonl"));
+    await Promise.all([
+      ...jsonlEntries.map(async (entry) => {
+        try {
+          const contentTs = await extractLastTimestamp((0, import_path.join)(dirPath, entry.name));
+          const ts = contentTs ?? (await (0, import_promises3.stat)((0, import_path.join)(dirPath, entry.name))).mtimeMs;
+          if (ts > latestMtime) latestMtime = ts;
+        } catch {
+        }
+      }),
+      ...uuidDirs.map(async (entry) => {
+        try {
+          const fileStat = await (0, import_promises3.stat)((0, import_path.join)(dirPath, entry.name));
+          if (fileStat.mtimeMs > latestMtime) latestMtime = fileStat.mtimeMs;
+        } catch {
+        }
+      })
+    ]);
     return { count: jsonlNames.size + uuidDirs.length, latestMtime };
   } catch {
     return { count: 0, latestMtime: 0 };
@@ -3342,14 +3903,14 @@ var PairingManager = class {
 };
 
 // src/auth/AuthManager.ts
-var import_child_process2 = require("child_process");
 var import_child_process3 = require("child_process");
+var import_child_process4 = require("child_process");
 var import_util = require("util");
-var import_events2 = require("events");
-var execFileAsync = (0, import_util.promisify)(import_child_process3.execFile);
+var import_events3 = require("events");
+var execFileAsync = (0, import_util.promisify)(import_child_process4.execFile);
 var CLAUDE_PATH2 = findClaudePath();
 var LOGIN_TIMEOUT_MS = 5 * 60 * 1e3;
-var AuthManager = class extends import_events2.EventEmitter {
+var AuthManager = class extends import_events3.EventEmitter {
   loginProcess = null;
   loginTimeout = null;
   urlSent = false;
@@ -3377,7 +3938,7 @@ var AuthManager = class extends import_events2.EventEmitter {
     }
     this.clearLoginTimeout();
     this.urlSent = false;
-    const proc = (0, import_child_process2.spawn)(CLAUDE_PATH2, ["auth", "login"], {
+    const proc = (0, import_child_process3.spawn)(CLAUDE_PATH2, ["auth", "login"], {
       env: { ...process.env, BROWSER: "echo" },
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -3463,8 +4024,8 @@ var AuthManager = class extends import_events2.EventEmitter {
 var import_promises5 = require("fs/promises");
 
 // src/terminal/TerminalExecutor.ts
-var import_node_child_process5 = require("child_process");
-var import_uuid4 = require("uuid");
+var import_node_child_process7 = require("child_process");
+var import_uuid5 = require("uuid");
 var EXEC_TIMEOUT_MS = 5 * 60 * 1e3;
 var TerminalExecutor = class {
   processes = /* @__PURE__ */ new Map();
@@ -3486,10 +4047,10 @@ var TerminalExecutor = class {
     }
   }
   exec(sessionId, command, cwd) {
-    const execId = (0, import_uuid4.v4)();
+    const execId = (0, import_uuid5.v4)();
     const shell = isWindows ? "powershell" : "bash";
     const args = isWindows ? ["-Command", command] : ["-c", command];
-    const proc = (0, import_node_child_process5.spawn)(shell, args, {
+    const proc = (0, import_node_child_process7.spawn)(shell, args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
       env: { ...process.env }
@@ -3552,7 +4113,7 @@ var TerminalExecutor = class {
 // src/server.ts
 var WS_PORT = 3745;
 var HTTP_PORT = 3746;
-var execAsync = (0, import_node_util.promisify)(import_node_child_process6.exec);
+var execAsync = (0, import_node_util.promisify)(import_node_child_process8.exec);
 async function killPortProcess(port) {
   try {
     if (isWindows) {
@@ -3594,8 +4155,8 @@ async function createWithRetry(label, port, factory) {
   }
 }
 async function start(opts = {}) {
-  const configDir = (0, import_node_path5.join)((0, import_node_os6.homedir)(), ".sessix");
-  const tokenFile = (0, import_node_path5.join)(configDir, "token");
+  const configDir = (0, import_node_path6.join)((0, import_node_os7.homedir)(), ".sessix");
+  const tokenFile = (0, import_node_path6.join)(configDir, "token");
   let token;
   if (opts.token !== void 0) {
     token = opts.token;
@@ -3607,14 +4168,14 @@ async function start(opts = {}) {
       try {
         token = (await (0, import_promises4.readFile)(tokenFile, "utf8")).trim();
       } catch {
-        token = (0, import_uuid5.v4)();
+        token = (0, import_uuid6.v4)();
         await (0, import_promises4.mkdir)(configDir, { recursive: true });
         await (0, import_promises4.writeFile)(tokenFile, token, "utf8");
       }
     }
   }
-  const provider = new ProcessProvider();
-  const sessionManager = new SessionManager(provider);
+  const providerFactory = new ProviderFactory();
+  const sessionManager = new SessionManager(providerFactory);
   const terminalExecutor = new TerminalExecutor();
   const wsBridge = await createWithRetry(
     "WsBridge",
@@ -3654,7 +4215,7 @@ async function start(opts = {}) {
   let mdnsService = null;
   const pairingManager = new PairingManager({
     token,
-    serverName: (0, import_node_os6.hostname)(),
+    serverName: (0, import_node_os7.hostname)(),
     version: "0.2.0",
     onStateChange: (state) => mdnsService?.updatePairingState(state)
   });
@@ -3711,7 +4272,8 @@ async function start(opts = {}) {
             event.model,
             event.permissionMode,
             event.effort,
-            event.images
+            event.images,
+            event.agentType
           );
           wsBridge.broadcast({
             type: "session_list",
@@ -3887,7 +4449,7 @@ async function start(opts = {}) {
               return null;
             }).filter(Boolean).join("\n");
           }
-          const suggestion = await provider.generateSuggestion(context);
+          const suggestion = await providerFactory.getProvider("claude-code").generateSuggestion(context);
           wsBridge.send(ws, {
             type: "prompt_suggestion",
             sessionId: event.sessionId,
@@ -3909,9 +4471,9 @@ async function start(opts = {}) {
         }
         case "terminal_exec": {
           const activeSession = sessionManager.getActiveSessions().find((s) => s.id === event.sessionId);
-          const cwd = activeSession?.projectPath ?? sessionManager.getSessionProjectPath(event.sessionId);
+          const cwd = activeSession?.projectPath ?? sessionManager.getSessionProjectPath(event.sessionId) ?? event.projectPath;
           if (!cwd) {
-            wsBridge.send(ws, { type: "error", code: "TERMINAL_EXEC_ERROR", message: "Session not found or no project path", sessionId: event.sessionId });
+            wsBridge.send(ws, { type: "error", code: "TERMINAL_EXEC_ERROR", message: `Session not found (id: ${event.sessionId.slice(0, 8)}\u2026)`, sessionId: event.sessionId });
             break;
           }
           terminalExecutor.exec(event.sessionId, event.command, cwd);
@@ -3965,6 +4527,11 @@ async function start(opts = {}) {
           }
           break;
         }
+        case "list_agents": {
+          const agents = await providerFactory.detectAgents();
+          wsBridge.send(ws, { type: "agent_list", agents });
+          break;
+        }
         default: {
           wsBridge.send(ws, {
             type: "error",
@@ -4128,7 +4695,7 @@ async function start(opts = {}) {
     openPairing: (duration) => pairingManager.open(duration),
     closePairing: () => pairingManager.close(),
     regenerateToken: async () => {
-      const newToken = (0, import_uuid5.v4)();
+      const newToken = (0, import_uuid6.v4)();
       await (0, import_promises4.mkdir)(configDir, { recursive: true });
       await (0, import_promises4.writeFile)(tokenFile, newToken, "utf8");
       instance.token = newToken;