sessix-server 0.3.1 → 0.3.3

package/dist/index.js

@@ -326,14 +326,14 @@ var import_node_os = require("os");
 var import_node_child_process = require("child_process");
 var isWindows = process.platform === "win32";
 function killProcessCrossPlatform(proc, timeoutMs = 3e3) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve) => {
     if (proc.exitCode !== null || proc.signalCode !== null) {
-      resolve2();
+      resolve();
       return;
     }
     const onExit = () => {
       clearTimeout(timer);
-      resolve2();
+      resolve();
     };
     proc.once("exit", onExit);
     if (isWindows) {
@@ -349,7 +349,7 @@ function killProcessCrossPlatform(proc, timeoutMs = 3e3) {
           proc.kill("SIGKILL");
         }
       }
-      resolve2();
+      resolve();
     }, timeoutMs);
   });
 }
@@ -781,7 +781,7 @@ var ProcessProvider = class {
     const prompt = `You are an AI coding assistant. Based on the following Claude Code conversation context, suggest the most valuable next instruction for the user (give the instruction directly, no explanation, no quotes):
 
 ${context}`;
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       const env = { ...process.env };
       delete env.CLAUDECODE;
       const proc = (0, import_child_process.spawn)(CLAUDE_PATH, ["-p", prompt, "--output-format", "text"], {
@@ -796,7 +796,7 @@ ${context}`;
       });
       proc.once("exit", (code) => {
         if (code === 0) {
-          resolve2(output.trim());
+          resolve(output.trim());
         } else {
           reject(new Error(`generateSuggestion process exit code: ${code}`));
         }
@@ -823,10 +823,10 @@ ${context}`;
       tool_use_id: toolUseId,
       content: answer
     });
-    await new Promise((resolve2, reject) => {
+    await new Promise((resolve, reject) => {
       entry.process.stdin.write(toolResult + "\n", (err) => {
         if (err) reject(err);
-        else resolve2();
+        else resolve();
       });
     });
     console.log(`[ProcessProvider] Session ${sessionId}: AskUserQuestion answered (toolUseId=${toolUseId})`);
@@ -896,15 +896,7 @@ function findCodexPath() {
 }
 function resolveCodexJsEntry(codexPath) {
   try {
-    let realPath;
-    try {
-      realPath = (0, import_node_fs2.readlinkSync)(codexPath);
-      if (!realPath.startsWith("/")) {
-        realPath = (0, import_node_path2.resolve)((0, import_node_path2.dirname)(codexPath), realPath);
-      }
-    } catch {
-      realPath = codexPath;
-    }
+    const realPath = (0, import_node_fs2.realpathSync)(codexPath);
     const head = (0, import_node_fs2.readFileSync)(realPath, { encoding: "utf-8", flag: "r" }).slice(0, 100);
     if (head.startsWith("#!/usr/bin/env node") || head.startsWith("#!/usr/bin/node")) {
       return realPath;
@@ -1004,6 +996,7 @@ var CodexProvider = class {
       session_id: sessionId
     };
     this.emitter.emit(this.getEventName(sessionId), initEvent);
+    this.emitUserMessage(sessionId, message);
     proc.on("error", (err) => {
       console.error(`[CodexProvider] Session ${sessionId} process error:`, err.message);
       this.activeSessions.delete(sessionId);
@@ -1044,7 +1037,7 @@ var CodexProvider = class {
         summary: persisted.summary,
         agentType: "codex"
       };
-      const placeholderProc = (0, import_child_process2.spawn)("true", [], { stdio: "ignore" });
+      const placeholderProc = (0, import_child_process2.spawn)(process.execPath, ["-e", ""], { stdio: "ignore" });
       entry = {
         session,
         process: placeholderProc,
@@ -1065,6 +1058,7 @@ var CodexProvider = class {
     if (!threadId) {
       console.warn(`[CodexProvider] Session ${sessionId} has no thread ID, falling back to new thread`);
     }
+    this.emitUserMessage(sessionId, message);
     const proc = this.spawnCodexProcess(entry.session.projectPath, message, threadId ?? void 0);
     entry.session.status = "running";
     entry.session.lastActiveAt = Date.now();
@@ -1088,7 +1082,26 @@ var CodexProvider = class {
     };
   }
   getActiveSessions() {
-    return Array.from(this.activeSessions.values()).map((e) => e.session);
+    const active = /* @__PURE__ */ new Map();
+    for (const [id, entry] of this.activeSessions) {
+      active.set(id, entry.session);
+    }
+    for (const [id, persisted] of this.persistedSessions) {
+      if (!active.has(id) && persisted.threadId) {
+        const projectId = persisted.projectPath.split("/").filter(Boolean).pop() ?? "unknown";
+        active.set(id, {
+          id,
+          projectId,
+          projectPath: persisted.projectPath,
+          status: "idle",
+          createdAt: persisted.createdAt,
+          lastActiveAt: persisted.lastActiveAt,
+          summary: persisted.summary,
+          agentType: "codex"
+        });
+      }
+    }
+    return Array.from(active.values());
   }
   async generateSuggestion(_context) {
     return "";
@@ -1213,6 +1226,15 @@ var CodexProvider = class {
           usage: event.usage
         };
         this.emitter.emit(this.getEventName(sessionId), resultEvent);
+        if (entry.threadId) {
+          this.persistSession(sessionId, {
+            threadId: entry.threadId,
+            projectPath: entry.session.projectPath,
+            summary: entry.session.summary,
+            createdAt: entry.session.createdAt,
+            lastActiveAt: Date.now()
+          });
+        }
         break;
       }
       case "turn.failed": {
@@ -1375,6 +1397,20 @@ var CodexProvider = class {
       this.emitter.emit(this.getEventName(sessionId), syntheticResult);
     });
   }
+  /**
+   * 合成用户消息事件（Codex CLI 不会在 stdout 回显用户输入，需手动补充到事件流）
+   */
+  emitUserMessage(sessionId, message) {
+    const event = {
+      type: "user",
+      session_id: sessionId,
+      message: {
+        role: "user",
+        content: [{ type: "text", text: message }]
+      }
+    };
+    this.emitter.emit(this.getEventName(sessionId), event);
+  }
   emitError(sessionId, message) {
     const event = {
       type: "result",
@@ -1438,6 +1474,22 @@ var CodexProvider = class {
   isKnownSession(sessionId) {
     return this.activeSessions.has(sessionId) || this.persistedSessions.has(sessionId);
   }
+  /**
+   * 获取指定项目路径下的 Codex 持久化会话列表（供 project_sessions 合并）
+   */
+  getPersistedSessionsForProject(projectPath) {
+    const result = [];
+    for (const [sessionId, meta] of this.persistedSessions) {
+      if (meta.projectPath === projectPath && meta.threadId) {
+        result.push({
+          sessionId,
+          lastModified: meta.lastActiveAt,
+          summary: meta.summary
+        });
+      }
+    }
+    return result;
+  }
 };
 
 // src/providers/ProviderFactory.ts
@@ -1549,8 +1601,15 @@ var SessionManager = class {
    * 调用 provider.startSession()，订阅事件流，
    * 将 ClaudeStreamEvent 包装为 ServerEvent 转发。
    */
-  async createSession(projectPath, message, resumeSessionId, newSessionId, model, permissionMode, effort, images, agentType = "claude-code") {
-    const provider = this.providerFactory ? this.providerFactory.getProvider(agentType) : this.provider;
+  async createSession(projectPath, message, resumeSessionId, newSessionId, model, permissionMode, effort, images, agentType) {
+    let resolvedAgentType = agentType ?? "claude-code";
+    if (!agentType && resumeSessionId && this.providerFactory) {
+      const codexProvider = this.providerFactory.getProvider("codex");
+      if (codexProvider instanceof CodexProvider && codexProvider.isKnownSession(resumeSessionId)) {
+        resolvedAgentType = "codex";
+      }
+    }
+    const provider = this.providerFactory ? this.providerFactory.getProvider(resolvedAgentType) : this.provider;
     const session = await provider.startSession({
       projectPath,
       message,
@@ -1561,7 +1620,7 @@ var SessionManager = class {
       effort,
       images
     });
-    this.sessionAgentType.set(session.id, agentType);
+    this.sessionAgentType.set(session.id, resolvedAgentType);
     this.lastBroadcastStatus.set(session.id, session.status);
     this.sessionProjectPaths.set(session.id, projectPath);
     this.unsubscribeSession(session.id);
@@ -1917,8 +1976,8 @@ var SessionManager = class {
     };
     this.updateSessionStatus(sessionId, "waiting_question");
     this.emit({ type: "question_request", request });
-    const answerPromise = new Promise((resolve2) => {
-      this.pendingQuestions.set(requestId, { sessionId, toolUseId, question, options, createdAt: request.createdAt, resolve: resolve2 });
+    const answerPromise = new Promise((resolve) => {
+      this.pendingQuestions.set(requestId, { sessionId, toolUseId, question, options, createdAt: request.createdAt, resolve });
     });
     answerPromise.then(async (answer) => {
       try {
@@ -2160,11 +2219,11 @@ var WsBridge = class _WsBridge {
    * 使用此方法代替 new WsBridge()，确保 EADDRINUSE 等错误能被调用方的 try-catch 捕获。
    */
   static async create(options) {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       const bridge = new _WsBridge(options);
       bridge.wss.once("listening", () => {
         bridge.wss.on("error", (err) => console.error(`[WsBridge] ${t("ws.serverError")}:`, err));
-        resolve2(bridge);
+        resolve(bridge);
       });
       bridge.wss.once("error", reject);
     });
@@ -2227,7 +2286,7 @@ var WsBridge = class _WsBridge {
   }
   /** 优雅关闭 WebSocket 服务 */
   close() {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       if (this.heartbeatTimer) {
         clearInterval(this.heartbeatTimer);
         this.heartbeatTimer = null;
@@ -2240,7 +2299,7 @@ var WsBridge = class _WsBridge {
           reject(err);
         } else {
           console.log("[WsBridge] WebSocket server closed");
-          resolve2();
+          resolve();
         }
       });
     });
@@ -2380,11 +2439,11 @@ var ApprovalProxy = class _ApprovalProxy {
    * 异步工厂方法：等待端口监听成功后 resolve，端口占用等错误时 reject。
    */
   static async create(options) {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       const proxy = new _ApprovalProxy(options);
       proxy.server.once("listening", () => {
         proxy.server.on("error", (err) => console.error(`[ApprovalProxy] ${t("approval.serverError")}:`, err));
-        resolve2(proxy);
+        resolve(proxy);
       });
       proxy.server.once("error", reject);
     });
@@ -2541,7 +2600,7 @@ var ApprovalProxy = class _ApprovalProxy {
   }
   /** 优雅关闭 HTTP 服务 */
   close() {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       const pendingEntries = Array.from(this.pendingApprovals.entries());
       for (const [, pending] of pendingEntries) {
         clearTimeout(pending.timer);
@@ -2553,7 +2612,7 @@ var ApprovalProxy = class _ApprovalProxy {
           reject(err);
         } else {
           console.log(`[ApprovalProxy] ${t("approval.httpClosed")}`);
-          resolve2();
+          resolve();
         }
       });
     });
@@ -2624,13 +2683,13 @@ var ApprovalProxy = class _ApprovalProxy {
         return;
       }
       this.notifyApprovalRequest(approvalRequest);
-      const decision = await new Promise((resolve2) => {
+      const decision = await new Promise((resolve) => {
         const timer = setTimeout(() => {
           console.log(`[ApprovalProxy] ${t("approval.timeout", { id: requestId })}`);
           this.pendingApprovals.delete(requestId);
-          resolve2({ decision: "allow" });
+          resolve({ decision: "allow" });
         }, 325e3);
-        this.pendingApprovals.set(requestId, { resolve: resolve2, timer, request: approvalRequest });
+        this.pendingApprovals.set(requestId, { resolve, timer, request: approvalRequest });
       });
       this.sendJson(res, 200, decision);
     } catch (err) {
@@ -2691,7 +2750,7 @@ var ApprovalProxy = class _ApprovalProxy {
   /** 手动解析请求的 JSON body（限制最大 1MB 防止滥用） */
   parseJsonBody(req) {
     const MAX_BODY_SIZE = 1024 * 1024;
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       const chunks = [];
       let totalSize = 0;
       let destroyed = false;
@@ -2709,7 +2768,7 @@ var ApprovalProxy = class _ApprovalProxy {
         try {
           const raw = Buffer.concat(chunks).toString("utf-8");
           const parsed = JSON.parse(raw);
-          resolve2(parsed);
+          resolve(parsed);
         } catch {
           reject(new Error(t("approval.invalidJson")));
         }
@@ -3376,12 +3435,12 @@ var DesktopNotificationChannel = class {
     const body = payload.body.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
     const sound = payload.sound ?? "Ping";
     const script = `display notification "${body}" with title "${title}" sound name "${sound}"`;
-    return new Promise((resolve2) => {
+    return new Promise((resolve) => {
       (0, import_node_child_process6.execFile)("osascript", ["-e", script], (err) => {
         if (err) {
           console.warn("[DesktopNotificationChannel] Send notification failed:", err.message);
         }
-        resolve2();
+        resolve();
       });
     });
   }
@@ -3581,7 +3640,7 @@ var ActivityPushChannel = class {
     const topic = "com.kachun.sessix.push-type.liveactivity";
     const jwt = this.getJWT();
     const payloadStr = JSON.stringify(payload);
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       let client;
       try {
         client = this.getHttp2Client();
@@ -3609,7 +3668,7 @@ var ActivityPushChannel = class {
       });
       req.on("end", () => {
         if (statusCode === 200) {
-          resolve2();
+          resolve();
         } else {
           if (statusCode === 0) {
             this.http2Client?.destroy();
@@ -3792,7 +3851,7 @@ async function getSessionHistory(projectPath, sessionId) {
       if (err.code === "ENOENT") return null;
       throw err;
     });
-    if (raw === null) return { ok: false, error: new Error("ENOENT") };
+    if (raw === null) return { ok: true, value: [] };
     const lines = raw.split("\n").filter((l) => l.trim());
     const events = [];
     for (const line of lines) {
@@ -4282,7 +4341,7 @@ async function killPortProcess(port) {
         await execAsync(`kill -9 ${pids.join(" ")}`);
       }
     }
-    await new Promise((resolve2) => setTimeout(resolve2, 600));
+    await new Promise((resolve) => setTimeout(resolve, 600));
   } catch {
   }
 }
@@ -4534,10 +4593,27 @@ async function start(opts = {}) {
         case "list_project_sessions": {
           const histResult = await getHistoricalSessions(event.projectPath);
           if (histResult.ok) {
+            const sessions = histResult.value;
+            const codexProvider = providerFactory.getProvider("codex");
+            if (codexProvider instanceof CodexProvider) {
+              const codexSessions = codexProvider.getPersistedSessionsForProject(event.projectPath);
+              const existingIds = new Set(sessions.map((s) => s.sessionId));
+              for (const cs of codexSessions) {
+                if (!existingIds.has(cs.sessionId)) {
+                  sessions.push({
+                    sessionId: cs.sessionId,
+                    lastModified: cs.lastModified,
+                    summary: cs.summary,
+                    agentType: "codex"
+                  });
+                }
+              }
+              sessions.sort((a, b) => b.lastModified - a.lastModified);
+            }
             wsBridge.send(ws, {
               type: "project_sessions",
               projectPath: event.projectPath,
-              sessions: histResult.value
+              sessions
             });
           } else {
             wsBridge.send(ws, {

package/dist/server.js

@@ -331,14 +331,14 @@ var import_node_os = require("os");
 var import_node_child_process = require("child_process");
 var isWindows = process.platform === "win32";
 function killProcessCrossPlatform(proc, timeoutMs = 3e3) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve) => {
     if (proc.exitCode !== null || proc.signalCode !== null) {
-      resolve2();
+      resolve();
       return;
     }
     const onExit = () => {
       clearTimeout(timer);
-      resolve2();
+      resolve();
     };
     proc.once("exit", onExit);
     if (isWindows) {
@@ -354,7 +354,7 @@ function killProcessCrossPlatform(proc, timeoutMs = 3e3) {
           proc.kill("SIGKILL");
         }
       }
-      resolve2();
+      resolve();
     }, timeoutMs);
   });
 }
@@ -786,7 +786,7 @@ var ProcessProvider = class {
     const prompt = `You are an AI coding assistant. Based on the following Claude Code conversation context, suggest the most valuable next instruction for the user (give the instruction directly, no explanation, no quotes):
 
 ${context}`;
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       const env = { ...process.env };
       delete env.CLAUDECODE;
       const proc = (0, import_child_process.spawn)(CLAUDE_PATH, ["-p", prompt, "--output-format", "text"], {
@@ -801,7 +801,7 @@ ${context}`;
       });
       proc.once("exit", (code) => {
         if (code === 0) {
-          resolve2(output.trim());
+          resolve(output.trim());
         } else {
           reject(new Error(`generateSuggestion process exit code: ${code}`));
         }
@@ -828,10 +828,10 @@ ${context}`;
       tool_use_id: toolUseId,
       content: answer
     });
-    await new Promise((resolve2, reject) => {
+    await new Promise((resolve, reject) => {
       entry.process.stdin.write(toolResult + "\n", (err) => {
         if (err) reject(err);
-        else resolve2();
+        else resolve();
       });
     });
     console.log(`[ProcessProvider] Session ${sessionId}: AskUserQuestion answered (toolUseId=${toolUseId})`);
@@ -901,15 +901,7 @@ function findCodexPath() {
 }
 function resolveCodexJsEntry(codexPath) {
   try {
-    let realPath;
-    try {
-      realPath = (0, import_node_fs2.readlinkSync)(codexPath);
-      if (!realPath.startsWith("/")) {
-        realPath = (0, import_node_path2.resolve)((0, import_node_path2.dirname)(codexPath), realPath);
-      }
-    } catch {
-      realPath = codexPath;
-    }
+    const realPath = (0, import_node_fs2.realpathSync)(codexPath);
     const head = (0, import_node_fs2.readFileSync)(realPath, { encoding: "utf-8", flag: "r" }).slice(0, 100);
     if (head.startsWith("#!/usr/bin/env node") || head.startsWith("#!/usr/bin/node")) {
       return realPath;
@@ -1009,6 +1001,7 @@ var CodexProvider = class {
       session_id: sessionId
     };
     this.emitter.emit(this.getEventName(sessionId), initEvent);
+    this.emitUserMessage(sessionId, message);
     proc.on("error", (err) => {
       console.error(`[CodexProvider] Session ${sessionId} process error:`, err.message);
       this.activeSessions.delete(sessionId);
@@ -1049,7 +1042,7 @@ var CodexProvider = class {
         summary: persisted.summary,
         agentType: "codex"
       };
-      const placeholderProc = (0, import_child_process2.spawn)("true", [], { stdio: "ignore" });
+      const placeholderProc = (0, import_child_process2.spawn)(process.execPath, ["-e", ""], { stdio: "ignore" });
       entry = {
         session,
         process: placeholderProc,
@@ -1070,6 +1063,7 @@ var CodexProvider = class {
     if (!threadId) {
       console.warn(`[CodexProvider] Session ${sessionId} has no thread ID, falling back to new thread`);
     }
+    this.emitUserMessage(sessionId, message);
     const proc = this.spawnCodexProcess(entry.session.projectPath, message, threadId ?? void 0);
     entry.session.status = "running";
     entry.session.lastActiveAt = Date.now();
@@ -1093,7 +1087,26 @@ var CodexProvider = class {
     };
   }
   getActiveSessions() {
-    return Array.from(this.activeSessions.values()).map((e) => e.session);
+    const active = /* @__PURE__ */ new Map();
+    for (const [id, entry] of this.activeSessions) {
+      active.set(id, entry.session);
+    }
+    for (const [id, persisted] of this.persistedSessions) {
+      if (!active.has(id) && persisted.threadId) {
+        const projectId = persisted.projectPath.split("/").filter(Boolean).pop() ?? "unknown";
+        active.set(id, {
+          id,
+          projectId,
+          projectPath: persisted.projectPath,
+          status: "idle",
+          createdAt: persisted.createdAt,
+          lastActiveAt: persisted.lastActiveAt,
+          summary: persisted.summary,
+          agentType: "codex"
+        });
+      }
+    }
+    return Array.from(active.values());
   }
   async generateSuggestion(_context) {
     return "";
@@ -1218,6 +1231,15 @@ var CodexProvider = class {
           usage: event.usage
         };
         this.emitter.emit(this.getEventName(sessionId), resultEvent);
+        if (entry.threadId) {
+          this.persistSession(sessionId, {
+            threadId: entry.threadId,
+            projectPath: entry.session.projectPath,
+            summary: entry.session.summary,
+            createdAt: entry.session.createdAt,
+            lastActiveAt: Date.now()
+          });
+        }
         break;
       }
       case "turn.failed": {
@@ -1380,6 +1402,20 @@ var CodexProvider = class {
       this.emitter.emit(this.getEventName(sessionId), syntheticResult);
     });
   }
+  /**
+   * 合成用户消息事件（Codex CLI 不会在 stdout 回显用户输入，需手动补充到事件流）
+   */
+  emitUserMessage(sessionId, message) {
+    const event = {
+      type: "user",
+      session_id: sessionId,
+      message: {
+        role: "user",
+        content: [{ type: "text", text: message }]
+      }
+    };
+    this.emitter.emit(this.getEventName(sessionId), event);
+  }
   emitError(sessionId, message) {
     const event = {
       type: "result",
@@ -1443,6 +1479,22 @@ var CodexProvider = class {
   isKnownSession(sessionId) {
     return this.activeSessions.has(sessionId) || this.persistedSessions.has(sessionId);
   }
+  /**
+   * 获取指定项目路径下的 Codex 持久化会话列表（供 project_sessions 合并）
+   */
+  getPersistedSessionsForProject(projectPath) {
+    const result = [];
+    for (const [sessionId, meta] of this.persistedSessions) {
+      if (meta.projectPath === projectPath && meta.threadId) {
+        result.push({
+          sessionId,
+          lastModified: meta.lastActiveAt,
+          summary: meta.summary
+        });
+      }
+    }
+    return result;
+  }
 };
 
 // src/providers/ProviderFactory.ts
@@ -1554,8 +1606,15 @@ var SessionManager = class {
    * 调用 provider.startSession()，订阅事件流，
    * 将 ClaudeStreamEvent 包装为 ServerEvent 转发。
    */
-  async createSession(projectPath, message, resumeSessionId, newSessionId, model, permissionMode, effort, images, agentType = "claude-code") {
-    const provider = this.providerFactory ? this.providerFactory.getProvider(agentType) : this.provider;
+  async createSession(projectPath, message, resumeSessionId, newSessionId, model, permissionMode, effort, images, agentType) {
+    let resolvedAgentType = agentType ?? "claude-code";
+    if (!agentType && resumeSessionId && this.providerFactory) {
+      const codexProvider = this.providerFactory.getProvider("codex");
+      if (codexProvider instanceof CodexProvider && codexProvider.isKnownSession(resumeSessionId)) {
+        resolvedAgentType = "codex";
+      }
+    }
+    const provider = this.providerFactory ? this.providerFactory.getProvider(resolvedAgentType) : this.provider;
     const session = await provider.startSession({
       projectPath,
       message,
@@ -1566,7 +1625,7 @@ var SessionManager = class {
       effort,
       images
     });
-    this.sessionAgentType.set(session.id, agentType);
+    this.sessionAgentType.set(session.id, resolvedAgentType);
     this.lastBroadcastStatus.set(session.id, session.status);
     this.sessionProjectPaths.set(session.id, projectPath);
     this.unsubscribeSession(session.id);
@@ -1922,8 +1981,8 @@ var SessionManager = class {
     };
     this.updateSessionStatus(sessionId, "waiting_question");
     this.emit({ type: "question_request", request });
-    const answerPromise = new Promise((resolve2) => {
-      this.pendingQuestions.set(requestId, { sessionId, toolUseId, question, options, createdAt: request.createdAt, resolve: resolve2 });
+    const answerPromise = new Promise((resolve) => {
+      this.pendingQuestions.set(requestId, { sessionId, toolUseId, question, options, createdAt: request.createdAt, resolve });
     });
     answerPromise.then(async (answer) => {
       try {
@@ -2165,11 +2224,11 @@ var WsBridge = class _WsBridge {
    * 使用此方法代替 new WsBridge()，确保 EADDRINUSE 等错误能被调用方的 try-catch 捕获。
    */
   static async create(options) {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       const bridge = new _WsBridge(options);
       bridge.wss.once("listening", () => {
         bridge.wss.on("error", (err) => console.error(`[WsBridge] ${t("ws.serverError")}:`, err));
-        resolve2(bridge);
+        resolve(bridge);
       });
       bridge.wss.once("error", reject);
     });
@@ -2232,7 +2291,7 @@ var WsBridge = class _WsBridge {
   }
   /** 优雅关闭 WebSocket 服务 */
   close() {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       if (this.heartbeatTimer) {
         clearInterval(this.heartbeatTimer);
         this.heartbeatTimer = null;
@@ -2245,7 +2304,7 @@ var WsBridge = class _WsBridge {
           reject(err);
         } else {
           console.log("[WsBridge] WebSocket server closed");
-          resolve2();
+          resolve();
         }
       });
     });
@@ -2385,11 +2444,11 @@ var ApprovalProxy = class _ApprovalProxy {
    * 异步工厂方法：等待端口监听成功后 resolve，端口占用等错误时 reject。
    */
   static async create(options) {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       const proxy = new _ApprovalProxy(options);
       proxy.server.once("listening", () => {
         proxy.server.on("error", (err) => console.error(`[ApprovalProxy] ${t("approval.serverError")}:`, err));
-        resolve2(proxy);
+        resolve(proxy);
       });
       proxy.server.once("error", reject);
     });
@@ -2546,7 +2605,7 @@ var ApprovalProxy = class _ApprovalProxy {
   }
   /** 优雅关闭 HTTP 服务 */
   close() {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       const pendingEntries = Array.from(this.pendingApprovals.entries());
       for (const [, pending] of pendingEntries) {
         clearTimeout(pending.timer);
@@ -2558,7 +2617,7 @@ var ApprovalProxy = class _ApprovalProxy {
           reject(err);
         } else {
           console.log(`[ApprovalProxy] ${t("approval.httpClosed")}`);
-          resolve2();
+          resolve();
         }
       });
     });
@@ -2629,13 +2688,13 @@ var ApprovalProxy = class _ApprovalProxy {
         return;
       }
       this.notifyApprovalRequest(approvalRequest);
-      const decision = await new Promise((resolve2) => {
+      const decision = await new Promise((resolve) => {
         const timer = setTimeout(() => {
           console.log(`[ApprovalProxy] ${t("approval.timeout", { id: requestId })}`);
           this.pendingApprovals.delete(requestId);
-          resolve2({ decision: "allow" });
+          resolve({ decision: "allow" });
         }, 325e3);
-        this.pendingApprovals.set(requestId, { resolve: resolve2, timer, request: approvalRequest });
+        this.pendingApprovals.set(requestId, { resolve, timer, request: approvalRequest });
       });
       this.sendJson(res, 200, decision);
     } catch (err) {
@@ -2696,7 +2755,7 @@ var ApprovalProxy = class _ApprovalProxy {
   /** 手动解析请求的 JSON body（限制最大 1MB 防止滥用） */
   parseJsonBody(req) {
     const MAX_BODY_SIZE = 1024 * 1024;
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       const chunks = [];
       let totalSize = 0;
       let destroyed = false;
@@ -2714,7 +2773,7 @@ var ApprovalProxy = class _ApprovalProxy {
         try {
           const raw = Buffer.concat(chunks).toString("utf-8");
           const parsed = JSON.parse(raw);
-          resolve2(parsed);
+          resolve(parsed);
         } catch {
           reject(new Error(t("approval.invalidJson")));
         }
@@ -3381,12 +3440,12 @@ var DesktopNotificationChannel = class {
     const body = payload.body.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
     const sound = payload.sound ?? "Ping";
     const script = `display notification "${body}" with title "${title}" sound name "${sound}"`;
-    return new Promise((resolve2) => {
+    return new Promise((resolve) => {
       (0, import_node_child_process6.execFile)("osascript", ["-e", script], (err) => {
         if (err) {
           console.warn("[DesktopNotificationChannel] Send notification failed:", err.message);
         }
-        resolve2();
+        resolve();
       });
     });
   }
@@ -3586,7 +3645,7 @@ var ActivityPushChannel = class {
     const topic = "com.kachun.sessix.push-type.liveactivity";
     const jwt = this.getJWT();
     const payloadStr = JSON.stringify(payload);
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       let client;
       try {
         client = this.getHttp2Client();
@@ -3614,7 +3673,7 @@ var ActivityPushChannel = class {
       });
       req.on("end", () => {
         if (statusCode === 200) {
-          resolve2();
+          resolve();
         } else {
           if (statusCode === 0) {
             this.http2Client?.destroy();
@@ -3797,7 +3856,7 @@ async function getSessionHistory(projectPath, sessionId) {
       if (err.code === "ENOENT") return null;
       throw err;
     });
-    if (raw === null) return { ok: false, error: new Error("ENOENT") };
+    if (raw === null) return { ok: true, value: [] };
     const lines = raw.split("\n").filter((l) => l.trim());
     const events = [];
     for (const line of lines) {
@@ -4287,7 +4346,7 @@ async function killPortProcess(port) {
         await execAsync(`kill -9 ${pids.join(" ")}`);
       }
     }
-    await new Promise((resolve2) => setTimeout(resolve2, 600));
+    await new Promise((resolve) => setTimeout(resolve, 600));
   } catch {
   }
 }
@@ -4539,10 +4598,27 @@ async function start(opts = {}) {
         case "list_project_sessions": {
           const histResult = await getHistoricalSessions(event.projectPath);
           if (histResult.ok) {
+            const sessions = histResult.value;
+            const codexProvider = providerFactory.getProvider("codex");
+            if (codexProvider instanceof CodexProvider) {
+              const codexSessions = codexProvider.getPersistedSessionsForProject(event.projectPath);
+              const existingIds = new Set(sessions.map((s) => s.sessionId));
+              for (const cs of codexSessions) {
+                if (!existingIds.has(cs.sessionId)) {
+                  sessions.push({
+                    sessionId: cs.sessionId,
+                    lastModified: cs.lastModified,
+                    summary: cs.summary,
+                    agentType: "codex"
+                  });
+                }
+              }
+              sessions.sort((a, b) => b.lastModified - a.lastModified);
+            }
             wsBridge.send(ws, {
               type: "project_sessions",
               projectPath: event.projectPath,
-              sessions: histResult.value
+              sessions
             });
           } else {
             wsBridge.send(ws, {

package/package.json

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