sessix-server 0.3.2 → 0.3.4

package/dist/index.js

@@ -655,9 +655,33 @@ var ProcessProvider = class {
               const isQuestion = block.name === "AskUserQuestion" || block.name === "AskFollowupQuestion";
               if (!isQuestion) continue;
               const input = block.input;
-              const question = input.question ?? "";
+              let question = "";
+              let options;
+              let questions;
+              if (typeof input.question === "string") {
+                question = input.question;
+                options = Array.isArray(input.options) ? input.options : void 0;
+              } else if (Array.isArray(input.questions) && input.questions.length > 0) {
+                questions = input.questions.map((q) => {
+                  const item = {
+                    question: typeof q.question === "string" ? q.question : "",
+                    header: typeof q.header === "string" ? q.header : void 0,
+                    multiSelect: typeof q.multiSelect === "boolean" ? q.multiSelect : void 0
+                  };
+                  if (Array.isArray(q.options)) {
+                    item.options = q.options.map((o) => ({
+                      label: typeof o.label === "string" ? o.label : String(o),
+                      description: typeof o.description === "string" ? o.description : void 0
+                    }));
+                  }
+                  return item;
+                });
+                const first = questions[0];
+                question = first.question;
+                options = first.options?.map((o) => o.label);
+              }
               if (!question) continue;
-              const prevKey = `${block.id}:${question}:${JSON.stringify(input.options ?? [])}`;
+              const prevKey = `${block.id}:${question}:${JSON.stringify(options ?? [])}`;
               let sessionSet = this.emittedQuestionToolUseIds.get(sessionId);
               if (!sessionSet) {
                 sessionSet = /* @__PURE__ */ new Set();
@@ -669,7 +693,8 @@ var ProcessProvider = class {
               this.emitter.emit(this.getQuestionEventName(sessionId), {
                 toolUseId: block.id,
                 question,
-                options: input.options
+                options,
+                questions
               });
             }
           }
@@ -944,11 +969,15 @@ function isCodexAvailable() {
 // src/providers/CodexProvider.ts
 var SESSIX_DIR = (0, import_path.join)((0, import_os.homedir)(), ".sessix");
 var CODEX_SESSIONS_FILE = (0, import_path.join)(SESSIX_DIR, "codex-sessions.json");
+var CODEX_EVENTS_DIR = (0, import_path.join)(SESSIX_DIR, "codex-events");
+var SESSION_EXPIRY_MS = 30 * 24 * 60 * 60 * 1e3;
 var CodexProvider = class {
   activeSessions = /* @__PURE__ */ new Map();
   emitter = new import_events2.EventEmitter();
   /** 持久化的会话元数据（sessionId → metadata） */
   persistedSessions = /* @__PURE__ */ new Map();
+  /** 会话事件缓存（sessionId → events），用于历史回放 */
+  sessionEvents = /* @__PURE__ */ new Map();
   /** 自增 ID 计数器，用于生成 ClaudeStreamEvent 中的 message/block ID */
   idCounter = 0;
   constructor() {
@@ -995,7 +1024,7 @@ var CodexProvider = class {
       subtype: "init",
       session_id: sessionId
     };
-    this.emitter.emit(this.getEventName(sessionId), initEvent);
+    this.emitAndRecord(sessionId, initEvent);
     this.emitUserMessage(sessionId, message);
     proc.on("error", (err) => {
       console.error(`[CodexProvider] Session ${sessionId} process error:`, err.message);
@@ -1082,26 +1111,7 @@ var CodexProvider = class {
     };
   }
   getActiveSessions() {
-    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());
+    return Array.from(this.activeSessions.values()).map((entry) => entry.session);
   }
   async generateSuggestion(_context) {
     return "";
@@ -1225,7 +1235,7 @@ var CodexProvider = class {
           num_turns: 1,
           usage: event.usage
         };
-        this.emitter.emit(this.getEventName(sessionId), resultEvent);
+        this.emitAndRecord(sessionId, resultEvent);
         if (entry.threadId) {
           this.persistSession(sessionId, {
             threadId: entry.threadId,
@@ -1235,6 +1245,7 @@ var CodexProvider = class {
             lastActiveAt: Date.now()
           });
         }
+        this.persistSessionEvents(sessionId);
         break;
       }
       case "turn.failed": {
@@ -1248,7 +1259,8 @@ var CodexProvider = class {
           duration_ms: entry.turnStartTime ? Date.now() - entry.turnStartTime : 0,
           num_turns: 1
         };
-        this.emitter.emit(this.getEventName(sessionId), failEvent);
+        this.emitAndRecord(sessionId, failEvent);
+        this.persistSessionEvents(sessionId);
         break;
       }
     }
@@ -1269,7 +1281,7 @@ var CodexProvider = class {
             content: [{ type: "text", text: item.text ?? "" }]
           }
         };
-        this.emitter.emit(this.getEventName(sessionId), msgEvent);
+        this.emitAndRecord(sessionId, msgEvent);
         break;
       }
       case "command_execution": {
@@ -1289,7 +1301,7 @@ var CodexProvider = class {
             }]
           }
         };
-        this.emitter.emit(this.getEventName(sessionId), toolEvent);
+        this.emitAndRecord(sessionId, toolEvent);
         const resultContent = item.aggregated_output ?? "";
         const isError = item.exit_code != null && item.exit_code !== 0;
         const toolResultEvent = {
@@ -1305,7 +1317,7 @@ var CodexProvider = class {
             }]
           }
         };
-        this.emitter.emit(this.getEventName(sessionId), toolResultEvent);
+        this.emitAndRecord(sessionId, toolResultEvent);
         break;
       }
       case "file_change": {
@@ -1325,7 +1337,7 @@ var CodexProvider = class {
             }]
           }
         };
-        this.emitter.emit(this.getEventName(sessionId), toolEvent);
+        this.emitAndRecord(sessionId, toolEvent);
         const toolResultEvent = {
           type: "user",
           session_id: sessionId,
@@ -1338,7 +1350,7 @@ var CodexProvider = class {
             }]
           }
         };
-        this.emitter.emit(this.getEventName(sessionId), toolResultEvent);
+        this.emitAndRecord(sessionId, toolResultEvent);
         break;
       }
       case "reasoning": {
@@ -1352,7 +1364,7 @@ var CodexProvider = class {
             content: [{ type: "thinking", thinking: item.text ?? "" }]
           }
         };
-        this.emitter.emit(this.getEventName(sessionId), thinkEvent);
+        this.emitAndRecord(sessionId, thinkEvent);
         break;
       }
     }
@@ -1394,7 +1406,7 @@ var CodexProvider = class {
         duration_ms: 0,
         num_turns: 0
       };
-      this.emitter.emit(this.getEventName(sessionId), syntheticResult);
+      this.emitAndRecord(sessionId, syntheticResult);
     });
   }
   /**
@@ -1409,7 +1421,7 @@ var CodexProvider = class {
         content: [{ type: "text", text: message }]
       }
     };
-    this.emitter.emit(this.getEventName(sessionId), event);
+    this.emitAndRecord(sessionId, event);
   }
   emitError(sessionId, message) {
     const event = {
@@ -1421,11 +1433,59 @@ var CodexProvider = class {
       is_error: true,
       num_turns: 0
     };
-    this.emitter.emit(this.getEventName(sessionId), event);
+    this.emitAndRecord(sessionId, event);
   }
   getEventName(sessionId) {
     return `claude:${sessionId}`;
   }
+  /**
+   * 发射事件并同时记录到 sessionEvents 缓存
+   */
+  emitAndRecord(sessionId, event) {
+    this.emitter.emit(this.getEventName(sessionId), event);
+    let events = this.sessionEvents.get(sessionId);
+    if (!events) {
+      events = [];
+      this.sessionEvents.set(sessionId, events);
+    }
+    events.push(event);
+  }
+  /**
+   * 获取 Codex 会话的历史事件（供 load_session_history 调用）
+   * 优先从内存读，miss 时从磁盘加载
+   */
+  getSessionHistory(sessionId) {
+    const cached = this.sessionEvents.get(sessionId);
+    if (cached && cached.length > 0) return cached;
+    const filePath = (0, import_path.join)(CODEX_EVENTS_DIR, `${sessionId}.json`);
+    try {
+      if (!(0, import_fs.existsSync)(filePath)) return [];
+      const data = JSON.parse((0, import_fs.readFileSync)(filePath, "utf-8"));
+      this.sessionEvents.set(sessionId, data);
+      return data;
+    } catch {
+      return [];
+    }
+  }
+  /**
+   * 将会话事件持久化到磁盘
+   */
+  persistSessionEvents(sessionId) {
+    const events = this.sessionEvents.get(sessionId);
+    if (!events || events.length === 0) return;
+    try {
+      if (!(0, import_fs.existsSync)(CODEX_EVENTS_DIR)) {
+        (0, import_fs.mkdirSync)(CODEX_EVENTS_DIR, { recursive: true });
+      }
+      (0, import_fs.writeFileSync)(
+        (0, import_path.join)(CODEX_EVENTS_DIR, `${sessionId}.json`),
+        JSON.stringify(events),
+        "utf-8"
+      );
+    } catch (err) {
+      console.error(`[CodexProvider] Failed to persist events for ${sessionId}:`, err);
+    }
+  }
   // ============================================
   // 持久化方法
   // ============================================
@@ -1436,8 +1496,24 @@ var CodexProvider = class {
     try {
       if (!(0, import_fs.existsSync)(CODEX_SESSIONS_FILE)) return;
       const data = JSON.parse((0, import_fs.readFileSync)(CODEX_SESSIONS_FILE, "utf-8"));
+      const now = Date.now();
+      let expiredCount = 0;
       for (const [sessionId, meta] of Object.entries(data)) {
-        this.persistedSessions.set(sessionId, meta);
+        const m = meta;
+        if (now - m.lastActiveAt > SESSION_EXPIRY_MS) {
+          expiredCount++;
+          try {
+            const eventsFile = (0, import_path.join)(CODEX_EVENTS_DIR, `${sessionId}.json`);
+            if ((0, import_fs.existsSync)(eventsFile)) (0, import_fs.unlinkSync)(eventsFile);
+          } catch {
+          }
+          continue;
+        }
+        this.persistedSessions.set(sessionId, m);
+      }
+      if (expiredCount > 0) {
+        console.log(`[CodexProvider] Cleaned up ${expiredCount} expired sessions`);
+        this.flushPersistedSessions();
       }
       console.log(`[CodexProvider] Loaded ${this.persistedSessions.size} persisted sessions`);
     } catch (err) {
@@ -1601,8 +1677,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,
@@ -1613,7 +1696,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);
@@ -1678,10 +1761,13 @@ var SessionManager = class {
       console.warn(`[SessionManager] Question request not found: ${requestId}`);
       return;
     }
+    const { sessionId } = pending;
     this.pendingQuestions.delete(requestId);
-    this.updateSessionStatus(pending.sessionId, "running");
     pending.resolve(answer);
     console.log(`[SessionManager] Question answered: ${requestId}`);
+    if (!this.hasPendingQuestionsForSession(sessionId)) {
+      this.updateSessionStatus(sessionId, "running");
+    }
   }
   /**
    * 获取指定会话的所有待回答问题（用于重连时恢复）
@@ -1696,6 +1782,7 @@ var SessionManager = class {
           toolUseId: pending.toolUseId,
           question: pending.question,
           options: pending.options,
+          questions: pending.questions,
           createdAt: pending.createdAt
         });
       }
@@ -1706,6 +1793,13 @@ var SessionManager = class {
   isQuestionPending(requestId) {
     return this.pendingQuestions.has(requestId);
   }
+  /** 检查指定会话是否有待回答问题 */
+  hasPendingQuestionsForSession(sessionId) {
+    for (const pending of this.pendingQuestions.values()) {
+      if (pending.sessionId === sessionId) return true;
+    }
+    return false;
+  }
   /**
    * 获取所有待回答问题（用于客户端重连时恢复状态）
    */
@@ -1718,6 +1812,7 @@ var SessionManager = class {
         toolUseId: pending.toolUseId,
         question: pending.question,
         options: pending.options,
+        questions: pending.questions,
         createdAt: pending.createdAt
       });
     }
@@ -1785,8 +1880,8 @@ var SessionManager = class {
     });
     const unsubscribeQuestion = provider.onQuestion(
       sessionId,
-      ({ toolUseId, question, options }) => {
-        this.handleAskUserQuestion(sessionId, toolUseId, question, options);
+      ({ toolUseId, question, options, questions }) => {
+        this.handleAskUserQuestion(sessionId, toolUseId, question, options, questions);
       }
     );
     this.unsubscribeMap.set(sessionId, () => {
@@ -1856,7 +1951,9 @@ var SessionManager = class {
           stats.totalCostUsd = (stats.totalCostUsd ?? 0) + event.total_cost_usd;
         }
         this.sessionStats.set(sessionId, stats);
-        if (event.is_error) {
+        if (this.hasPendingQuestionsForSession(sessionId)) {
+          console.log(`[SessionManager] Session ${sessionId}: result received but questions pending, keeping waiting_question`);
+        } else if (event.is_error) {
           this.updateSessionStatus(sessionId, "error");
         } else {
           this.updateSessionStatus(sessionId, "idle");
@@ -1940,19 +2037,24 @@ var SessionManager = class {
   /**
    * 处理 AskUserQuestion 事件：广播问题请求到手机，等待用户回答
    */
-  handleAskUserQuestion(sessionId, toolUseId, question, options) {
+  handleAskUserQuestion(sessionId, toolUseId, question, options, questions) {
     const existingEntry = Array.from(this.pendingQuestions.entries()).find(
       ([, v]) => v.toolUseId === toolUseId
     );
     if (existingEntry) {
-      const [existingRequestId] = existingEntry;
+      const [existingRequestId, existingPending] = existingEntry;
+      existingPending.question = question;
+      existingPending.options = options;
+      existingPending.questions = questions;
+      existingPending.createdAt = Date.now();
       const updatedRequest = {
         id: existingRequestId,
         sessionId,
         toolUseId,
         question,
         options,
-        createdAt: Date.now()
+        questions,
+        createdAt: existingPending.createdAt
       };
       this.emit({ type: "question_request", request: updatedRequest });
       console.log(`[SessionManager] Session ${sessionId}: AskUserQuestion updated (requestId=${existingRequestId})`);
@@ -1965,12 +2067,13 @@ var SessionManager = class {
       toolUseId,
       question,
       options,
+      questions,
       createdAt: Date.now()
     };
     this.updateSessionStatus(sessionId, "waiting_question");
     this.emit({ type: "question_request", request });
     const answerPromise = new Promise((resolve) => {
-      this.pendingQuestions.set(requestId, { sessionId, toolUseId, question, options, createdAt: request.createdAt, resolve });
+      this.pendingQuestions.set(requestId, { sessionId, toolUseId, question, options, questions, createdAt: request.createdAt, resolve });
     });
     answerPromise.then(async (answer) => {
       try {
@@ -3844,7 +3947,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) {
@@ -4619,18 +4722,25 @@ async function start(opts = {}) {
         }
         case "load_session_history": {
           const historyResult = await getSessionHistory(event.projectPath, event.sessionId);
-          if (!historyResult.ok) {
+          let historyEvents = historyResult.ok ? historyResult.value : [];
+          if (historyEvents.length === 0) {
+            const codexProv = providerFactory.getProvider("codex");
+            if (codexProv instanceof CodexProvider && codexProv.isKnownSession(event.sessionId)) {
+              historyEvents = codexProv.getSessionHistory(event.sessionId);
+            }
+          }
+          if (!historyResult.ok && historyEvents.length === 0) {
             wsBridge.send(ws, {
               type: "error",
               message: t("server.readHistoryFailed", { error: historyResult.error.message }),
               code: "SESSION_HISTORY_ERROR",
               sessionId: event.sessionId
             });
-          } else if (historyResult.value.length > 0) {
+          } else if (historyEvents.length > 0) {
             wsBridge.send(ws, {
               type: "session_history",
               sessionId: event.sessionId,
-              events: historyResult.value
+              events: historyEvents
             });
             const activeSession = sessionManager.getActiveSessions().find((s) => s.id === event.sessionId);
             const isStreaming = activeSession?.status === "running" || activeSession?.status === "waiting_approval";

package/dist/server.js

@@ -660,9 +660,33 @@ var ProcessProvider = class {
               const isQuestion = block.name === "AskUserQuestion" || block.name === "AskFollowupQuestion";
               if (!isQuestion) continue;
               const input = block.input;
-              const question = input.question ?? "";
+              let question = "";
+              let options;
+              let questions;
+              if (typeof input.question === "string") {
+                question = input.question;
+                options = Array.isArray(input.options) ? input.options : void 0;
+              } else if (Array.isArray(input.questions) && input.questions.length > 0) {
+                questions = input.questions.map((q) => {
+                  const item = {
+                    question: typeof q.question === "string" ? q.question : "",
+                    header: typeof q.header === "string" ? q.header : void 0,
+                    multiSelect: typeof q.multiSelect === "boolean" ? q.multiSelect : void 0
+                  };
+                  if (Array.isArray(q.options)) {
+                    item.options = q.options.map((o) => ({
+                      label: typeof o.label === "string" ? o.label : String(o),
+                      description: typeof o.description === "string" ? o.description : void 0
+                    }));
+                  }
+                  return item;
+                });
+                const first = questions[0];
+                question = first.question;
+                options = first.options?.map((o) => o.label);
+              }
               if (!question) continue;
-              const prevKey = `${block.id}:${question}:${JSON.stringify(input.options ?? [])}`;
+              const prevKey = `${block.id}:${question}:${JSON.stringify(options ?? [])}`;
               let sessionSet = this.emittedQuestionToolUseIds.get(sessionId);
               if (!sessionSet) {
                 sessionSet = /* @__PURE__ */ new Set();
@@ -674,7 +698,8 @@ var ProcessProvider = class {
               this.emitter.emit(this.getQuestionEventName(sessionId), {
                 toolUseId: block.id,
                 question,
-                options: input.options
+                options,
+                questions
               });
             }
           }
@@ -949,11 +974,15 @@ function isCodexAvailable() {
 // src/providers/CodexProvider.ts
 var SESSIX_DIR = (0, import_path.join)((0, import_os.homedir)(), ".sessix");
 var CODEX_SESSIONS_FILE = (0, import_path.join)(SESSIX_DIR, "codex-sessions.json");
+var CODEX_EVENTS_DIR = (0, import_path.join)(SESSIX_DIR, "codex-events");
+var SESSION_EXPIRY_MS = 30 * 24 * 60 * 60 * 1e3;
 var CodexProvider = class {
   activeSessions = /* @__PURE__ */ new Map();
   emitter = new import_events2.EventEmitter();
   /** 持久化的会话元数据（sessionId → metadata） */
   persistedSessions = /* @__PURE__ */ new Map();
+  /** 会话事件缓存（sessionId → events），用于历史回放 */
+  sessionEvents = /* @__PURE__ */ new Map();
   /** 自增 ID 计数器，用于生成 ClaudeStreamEvent 中的 message/block ID */
   idCounter = 0;
   constructor() {
@@ -1000,7 +1029,7 @@ var CodexProvider = class {
       subtype: "init",
       session_id: sessionId
     };
-    this.emitter.emit(this.getEventName(sessionId), initEvent);
+    this.emitAndRecord(sessionId, initEvent);
     this.emitUserMessage(sessionId, message);
     proc.on("error", (err) => {
       console.error(`[CodexProvider] Session ${sessionId} process error:`, err.message);
@@ -1087,26 +1116,7 @@ var CodexProvider = class {
     };
   }
   getActiveSessions() {
-    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());
+    return Array.from(this.activeSessions.values()).map((entry) => entry.session);
   }
   async generateSuggestion(_context) {
     return "";
@@ -1230,7 +1240,7 @@ var CodexProvider = class {
           num_turns: 1,
           usage: event.usage
         };
-        this.emitter.emit(this.getEventName(sessionId), resultEvent);
+        this.emitAndRecord(sessionId, resultEvent);
         if (entry.threadId) {
           this.persistSession(sessionId, {
             threadId: entry.threadId,
@@ -1240,6 +1250,7 @@ var CodexProvider = class {
             lastActiveAt: Date.now()
           });
         }
+        this.persistSessionEvents(sessionId);
         break;
       }
       case "turn.failed": {
@@ -1253,7 +1264,8 @@ var CodexProvider = class {
           duration_ms: entry.turnStartTime ? Date.now() - entry.turnStartTime : 0,
           num_turns: 1
         };
-        this.emitter.emit(this.getEventName(sessionId), failEvent);
+        this.emitAndRecord(sessionId, failEvent);
+        this.persistSessionEvents(sessionId);
         break;
       }
     }
@@ -1274,7 +1286,7 @@ var CodexProvider = class {
             content: [{ type: "text", text: item.text ?? "" }]
           }
         };
-        this.emitter.emit(this.getEventName(sessionId), msgEvent);
+        this.emitAndRecord(sessionId, msgEvent);
         break;
       }
       case "command_execution": {
@@ -1294,7 +1306,7 @@ var CodexProvider = class {
             }]
           }
         };
-        this.emitter.emit(this.getEventName(sessionId), toolEvent);
+        this.emitAndRecord(sessionId, toolEvent);
         const resultContent = item.aggregated_output ?? "";
         const isError = item.exit_code != null && item.exit_code !== 0;
         const toolResultEvent = {
@@ -1310,7 +1322,7 @@ var CodexProvider = class {
             }]
           }
         };
-        this.emitter.emit(this.getEventName(sessionId), toolResultEvent);
+        this.emitAndRecord(sessionId, toolResultEvent);
         break;
       }
       case "file_change": {
@@ -1330,7 +1342,7 @@ var CodexProvider = class {
             }]
           }
         };
-        this.emitter.emit(this.getEventName(sessionId), toolEvent);
+        this.emitAndRecord(sessionId, toolEvent);
         const toolResultEvent = {
           type: "user",
           session_id: sessionId,
@@ -1343,7 +1355,7 @@ var CodexProvider = class {
             }]
           }
         };
-        this.emitter.emit(this.getEventName(sessionId), toolResultEvent);
+        this.emitAndRecord(sessionId, toolResultEvent);
         break;
       }
       case "reasoning": {
@@ -1357,7 +1369,7 @@ var CodexProvider = class {
             content: [{ type: "thinking", thinking: item.text ?? "" }]
           }
         };
-        this.emitter.emit(this.getEventName(sessionId), thinkEvent);
+        this.emitAndRecord(sessionId, thinkEvent);
         break;
       }
     }
@@ -1399,7 +1411,7 @@ var CodexProvider = class {
         duration_ms: 0,
         num_turns: 0
       };
-      this.emitter.emit(this.getEventName(sessionId), syntheticResult);
+      this.emitAndRecord(sessionId, syntheticResult);
     });
   }
   /**
@@ -1414,7 +1426,7 @@ var CodexProvider = class {
         content: [{ type: "text", text: message }]
       }
     };
-    this.emitter.emit(this.getEventName(sessionId), event);
+    this.emitAndRecord(sessionId, event);
   }
   emitError(sessionId, message) {
     const event = {
@@ -1426,11 +1438,59 @@ var CodexProvider = class {
       is_error: true,
       num_turns: 0
     };
-    this.emitter.emit(this.getEventName(sessionId), event);
+    this.emitAndRecord(sessionId, event);
   }
   getEventName(sessionId) {
     return `claude:${sessionId}`;
   }
+  /**
+   * 发射事件并同时记录到 sessionEvents 缓存
+   */
+  emitAndRecord(sessionId, event) {
+    this.emitter.emit(this.getEventName(sessionId), event);
+    let events = this.sessionEvents.get(sessionId);
+    if (!events) {
+      events = [];
+      this.sessionEvents.set(sessionId, events);
+    }
+    events.push(event);
+  }
+  /**
+   * 获取 Codex 会话的历史事件（供 load_session_history 调用）
+   * 优先从内存读，miss 时从磁盘加载
+   */
+  getSessionHistory(sessionId) {
+    const cached = this.sessionEvents.get(sessionId);
+    if (cached && cached.length > 0) return cached;
+    const filePath = (0, import_path.join)(CODEX_EVENTS_DIR, `${sessionId}.json`);
+    try {
+      if (!(0, import_fs.existsSync)(filePath)) return [];
+      const data = JSON.parse((0, import_fs.readFileSync)(filePath, "utf-8"));
+      this.sessionEvents.set(sessionId, data);
+      return data;
+    } catch {
+      return [];
+    }
+  }
+  /**
+   * 将会话事件持久化到磁盘
+   */
+  persistSessionEvents(sessionId) {
+    const events = this.sessionEvents.get(sessionId);
+    if (!events || events.length === 0) return;
+    try {
+      if (!(0, import_fs.existsSync)(CODEX_EVENTS_DIR)) {
+        (0, import_fs.mkdirSync)(CODEX_EVENTS_DIR, { recursive: true });
+      }
+      (0, import_fs.writeFileSync)(
+        (0, import_path.join)(CODEX_EVENTS_DIR, `${sessionId}.json`),
+        JSON.stringify(events),
+        "utf-8"
+      );
+    } catch (err) {
+      console.error(`[CodexProvider] Failed to persist events for ${sessionId}:`, err);
+    }
+  }
   // ============================================
   // 持久化方法
   // ============================================
@@ -1441,8 +1501,24 @@ var CodexProvider = class {
     try {
       if (!(0, import_fs.existsSync)(CODEX_SESSIONS_FILE)) return;
       const data = JSON.parse((0, import_fs.readFileSync)(CODEX_SESSIONS_FILE, "utf-8"));
+      const now = Date.now();
+      let expiredCount = 0;
       for (const [sessionId, meta] of Object.entries(data)) {
-        this.persistedSessions.set(sessionId, meta);
+        const m = meta;
+        if (now - m.lastActiveAt > SESSION_EXPIRY_MS) {
+          expiredCount++;
+          try {
+            const eventsFile = (0, import_path.join)(CODEX_EVENTS_DIR, `${sessionId}.json`);
+            if ((0, import_fs.existsSync)(eventsFile)) (0, import_fs.unlinkSync)(eventsFile);
+          } catch {
+          }
+          continue;
+        }
+        this.persistedSessions.set(sessionId, m);
+      }
+      if (expiredCount > 0) {
+        console.log(`[CodexProvider] Cleaned up ${expiredCount} expired sessions`);
+        this.flushPersistedSessions();
       }
       console.log(`[CodexProvider] Loaded ${this.persistedSessions.size} persisted sessions`);
     } catch (err) {
@@ -1606,8 +1682,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,
@@ -1618,7 +1701,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);
@@ -1683,10 +1766,13 @@ var SessionManager = class {
       console.warn(`[SessionManager] Question request not found: ${requestId}`);
       return;
     }
+    const { sessionId } = pending;
     this.pendingQuestions.delete(requestId);
-    this.updateSessionStatus(pending.sessionId, "running");
     pending.resolve(answer);
     console.log(`[SessionManager] Question answered: ${requestId}`);
+    if (!this.hasPendingQuestionsForSession(sessionId)) {
+      this.updateSessionStatus(sessionId, "running");
+    }
   }
   /**
    * 获取指定会话的所有待回答问题（用于重连时恢复）
@@ -1701,6 +1787,7 @@ var SessionManager = class {
           toolUseId: pending.toolUseId,
           question: pending.question,
           options: pending.options,
+          questions: pending.questions,
           createdAt: pending.createdAt
         });
       }
@@ -1711,6 +1798,13 @@ var SessionManager = class {
   isQuestionPending(requestId) {
     return this.pendingQuestions.has(requestId);
   }
+  /** 检查指定会话是否有待回答问题 */
+  hasPendingQuestionsForSession(sessionId) {
+    for (const pending of this.pendingQuestions.values()) {
+      if (pending.sessionId === sessionId) return true;
+    }
+    return false;
+  }
   /**
    * 获取所有待回答问题（用于客户端重连时恢复状态）
    */
@@ -1723,6 +1817,7 @@ var SessionManager = class {
         toolUseId: pending.toolUseId,
         question: pending.question,
         options: pending.options,
+        questions: pending.questions,
         createdAt: pending.createdAt
       });
     }
@@ -1790,8 +1885,8 @@ var SessionManager = class {
     });
     const unsubscribeQuestion = provider.onQuestion(
       sessionId,
-      ({ toolUseId, question, options }) => {
-        this.handleAskUserQuestion(sessionId, toolUseId, question, options);
+      ({ toolUseId, question, options, questions }) => {
+        this.handleAskUserQuestion(sessionId, toolUseId, question, options, questions);
       }
     );
     this.unsubscribeMap.set(sessionId, () => {
@@ -1861,7 +1956,9 @@ var SessionManager = class {
           stats.totalCostUsd = (stats.totalCostUsd ?? 0) + event.total_cost_usd;
         }
         this.sessionStats.set(sessionId, stats);
-        if (event.is_error) {
+        if (this.hasPendingQuestionsForSession(sessionId)) {
+          console.log(`[SessionManager] Session ${sessionId}: result received but questions pending, keeping waiting_question`);
+        } else if (event.is_error) {
           this.updateSessionStatus(sessionId, "error");
         } else {
           this.updateSessionStatus(sessionId, "idle");
@@ -1945,19 +2042,24 @@ var SessionManager = class {
   /**
    * 处理 AskUserQuestion 事件：广播问题请求到手机，等待用户回答
    */
-  handleAskUserQuestion(sessionId, toolUseId, question, options) {
+  handleAskUserQuestion(sessionId, toolUseId, question, options, questions) {
     const existingEntry = Array.from(this.pendingQuestions.entries()).find(
       ([, v]) => v.toolUseId === toolUseId
     );
     if (existingEntry) {
-      const [existingRequestId] = existingEntry;
+      const [existingRequestId, existingPending] = existingEntry;
+      existingPending.question = question;
+      existingPending.options = options;
+      existingPending.questions = questions;
+      existingPending.createdAt = Date.now();
       const updatedRequest = {
         id: existingRequestId,
         sessionId,
         toolUseId,
         question,
         options,
-        createdAt: Date.now()
+        questions,
+        createdAt: existingPending.createdAt
       };
       this.emit({ type: "question_request", request: updatedRequest });
       console.log(`[SessionManager] Session ${sessionId}: AskUserQuestion updated (requestId=${existingRequestId})`);
@@ -1970,12 +2072,13 @@ var SessionManager = class {
       toolUseId,
       question,
       options,
+      questions,
       createdAt: Date.now()
     };
     this.updateSessionStatus(sessionId, "waiting_question");
     this.emit({ type: "question_request", request });
     const answerPromise = new Promise((resolve) => {
-      this.pendingQuestions.set(requestId, { sessionId, toolUseId, question, options, createdAt: request.createdAt, resolve });
+      this.pendingQuestions.set(requestId, { sessionId, toolUseId, question, options, questions, createdAt: request.createdAt, resolve });
     });
     answerPromise.then(async (answer) => {
       try {
@@ -3849,7 +3952,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) {
@@ -4624,18 +4727,25 @@ async function start(opts = {}) {
         }
         case "load_session_history": {
           const historyResult = await getSessionHistory(event.projectPath, event.sessionId);
-          if (!historyResult.ok) {
+          let historyEvents = historyResult.ok ? historyResult.value : [];
+          if (historyEvents.length === 0) {
+            const codexProv = providerFactory.getProvider("codex");
+            if (codexProv instanceof CodexProvider && codexProv.isKnownSession(event.sessionId)) {
+              historyEvents = codexProv.getSessionHistory(event.sessionId);
+            }
+          }
+          if (!historyResult.ok && historyEvents.length === 0) {
             wsBridge.send(ws, {
               type: "error",
               message: t("server.readHistoryFailed", { error: historyResult.error.message }),
               code: "SESSION_HISTORY_ERROR",
               sessionId: event.sessionId
             });
-          } else if (historyResult.value.length > 0) {
+          } else if (historyEvents.length > 0) {
             wsBridge.send(ws, {
               type: "session_history",
               sessionId: event.sessionId,
-              events: historyResult.value
+              events: historyEvents
             });
             const activeSession = sessionManager.getActiveSessions().find((s) => s.id === event.sessionId);
             const isStreaming = activeSession?.status === "running" || activeSession?.status === "waiting_approval";

package/package.json

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