sessix-server 0.3.0 → 0.3.2

package/dist/index.js

@@ -861,6 +861,9 @@ ${context}`;
 var import_child_process2 = require("child_process");
 var import_readline2 = require("readline");
 var import_events2 = require("events");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_os = require("os");
 var import_uuid2 = require("uuid");
 
 // src/utils/codexPath.ts
@@ -891,10 +894,23 @@ function findCodexPath() {
   }
   return "codex";
 }
+function resolveCodexJsEntry(codexPath) {
+  try {
+    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;
+    }
+  } catch {
+  }
+  return void 0;
+}
 var CODEX_PATH = findCodexPath();
+var CODEX_JS_ENTRY = resolveCodexJsEntry(CODEX_PATH);
 async function getCodexVersion() {
   try {
-    const output = (0, import_node_child_process3.execSync)(`"${CODEX_PATH}" --version`, {
+    const cmd = CODEX_JS_ENTRY ? `"${process.execPath}" "${CODEX_JS_ENTRY}" --version` : `"${CODEX_PATH}" --version`;
+    const output = (0, import_node_child_process3.execSync)(cmd, {
       encoding: "utf-8",
       timeout: 5e3
     }).trim();
@@ -904,6 +920,14 @@ async function getCodexVersion() {
   }
 }
 function isCodexAvailable() {
+  if (CODEX_JS_ENTRY) {
+    try {
+      (0, import_node_fs2.accessSync)(CODEX_JS_ENTRY, import_node_fs2.constants.R_OK);
+      return true;
+    } catch {
+      return false;
+    }
+  }
   try {
     (0, import_node_fs2.accessSync)(CODEX_PATH, import_node_fs2.constants.X_OK);
     return true;
@@ -918,11 +942,18 @@ 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 CodexProvider = class {
   activeSessions = /* @__PURE__ */ new Map();
   emitter = new import_events2.EventEmitter();
+  /** 持久化的会话元数据（sessionId → metadata） */
+  persistedSessions = /* @__PURE__ */ new Map();
   /** 自增 ID 计数器，用于生成 ClaudeStreamEvent 中的 message/block ID */
   idCounter = 0;
+  constructor() {
+    this.loadPersistedSessions();
+  }
   async startSession(opts) {
     const { projectPath, message, sessionId: existingSessionId } = opts;
     const sessionId = existingSessionId ?? (0, import_uuid2.v4)();
@@ -941,12 +972,22 @@ var CodexProvider = class {
       agentType: "codex"
     };
     const resume = opts.resume ?? !!existingSessionId;
-    const proc = this.spawnCodexProcess(projectPath, message, void 0);
+    let resumeThreadId;
+    if (resume && existingSessionId) {
+      const persisted = this.persistedSessions.get(existingSessionId);
+      if (persisted?.threadId) {
+        resumeThreadId = persisted.threadId;
+        console.log(`[CodexProvider] Resuming session ${sessionId} with threadId: ${resumeThreadId}`);
+      } else {
+        console.warn(`[CodexProvider] Session ${sessionId} resume requested but no persisted threadId found, creating new session`);
+      }
+    }
+    const proc = this.spawnCodexProcess(projectPath, message, resumeThreadId, opts.model);
     session.pid = proc.pid;
     this.activeSessions.set(sessionId, {
       session,
       process: proc,
-      threadId: void 0,
+      threadId: resumeThreadId,
       turnStartTime: Date.now()
     });
     const initEvent = {
@@ -955,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);
@@ -978,22 +1020,46 @@ var CodexProvider = class {
     this.activeSessions.delete(sessionId);
   }
   async sendMessage(sessionId, message) {
-    const entry = this.activeSessions.get(sessionId);
+    let entry = this.activeSessions.get(sessionId);
     if (!entry) {
-      throw new Error(`Session ${sessionId} not found or already ended`);
+      const persisted = this.persistedSessions.get(sessionId);
+      if (!persisted?.threadId) {
+        throw new Error(`Session ${sessionId} not found or already ended`);
+      }
+      const projectId = persisted.projectPath.split("/").filter(Boolean).pop() ?? "unknown";
+      const session = {
+        id: sessionId,
+        projectId,
+        projectPath: persisted.projectPath,
+        status: "running",
+        createdAt: persisted.createdAt,
+        lastActiveAt: Date.now(),
+        summary: persisted.summary,
+        agentType: "codex"
+      };
+      const placeholderProc = (0, import_child_process2.spawn)(process.execPath, ["-e", ""], { stdio: "ignore" });
+      entry = {
+        session,
+        process: placeholderProc,
+        threadId: persisted.threadId,
+        turnStartTime: Date.now()
+      };
+      this.activeSessions.set(sessionId, entry);
     }
-    if (entry.process.exitCode === null && entry.process.signalCode === null) {
+    const procAlive = entry.process.exitCode === null && entry.process.signalCode === null;
+    if (procAlive) {
       try {
         entry.process.stdin?.end();
       } catch {
       }
       await killProcessCrossPlatform(entry.process);
     }
-    const threadId = entry.threadId;
+    const threadId = entry.threadId ?? this.persistedSessions.get(sessionId)?.threadId;
     if (!threadId) {
-      throw new Error(`Session ${sessionId} has no thread ID, cannot resume`);
+      console.warn(`[CodexProvider] Session ${sessionId} has no thread ID, falling back to new thread`);
     }
-    const proc = this.spawnCodexProcess(entry.session.projectPath, message, threadId);
+    this.emitUserMessage(sessionId, message);
+    const proc = this.spawnCodexProcess(entry.session.projectPath, message, threadId ?? void 0);
     entry.session.status = "running";
     entry.session.lastActiveAt = Date.now();
     entry.session.pid = proc.pid;
@@ -1016,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 "";
@@ -1040,16 +1125,29 @@ var CodexProvider = class {
    * @param message 用户消息
    * @param resumeThreadId 如果提供，则使用 `codex exec resume` 恢复会话
    */
-  spawnCodexProcess(projectPath, message, resumeThreadId) {
+  spawnCodexProcess(projectPath, message, resumeThreadId, model) {
     const args = ["exec", "--json", "--full-auto"];
+    if (model) {
+      args.push("-m", model);
+    }
+    args.push("-C", projectPath);
     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, {
+    let cmd;
+    let spawnArgs;
+    if (CODEX_JS_ENTRY) {
+      cmd = process.execPath;
+      spawnArgs = [CODEX_JS_ENTRY, ...args];
+      console.log(`[CodexProvider] Spawning via node: ${cmd} ${CODEX_JS_ENTRY} ${args.join(" ")}`);
+    } else {
+      cmd = CODEX_PATH;
+      spawnArgs = args;
+      console.log(`[CodexProvider] Spawning: ${CODEX_PATH} ${args.join(" ")}`);
+    }
+    const proc = (0, import_child_process2.spawn)(cmd, spawnArgs, {
       cwd: projectPath,
       env,
       stdio: ["pipe", "pipe", "pipe"]
@@ -1071,6 +1169,7 @@ var CodexProvider = class {
     rl.on("line", (line) => {
       const trimmed = line.trim();
       if (!trimmed) return;
+      console.log(`[CodexProvider] Session ${sessionId} stdout: ${trimmed.substring(0, 200)}`);
       let event;
       try {
         event = JSON.parse(trimmed);
@@ -1092,6 +1191,14 @@ var CodexProvider = class {
       case "thread.started": {
         if (event.thread_id) {
           entry.threadId = event.thread_id;
+          this.persistSession(sessionId, {
+            threadId: event.thread_id,
+            projectPath: entry.session.projectPath,
+            summary: entry.session.summary,
+            createdAt: entry.session.createdAt,
+            lastActiveAt: Date.now()
+          });
+          console.log(`[CodexProvider] Session ${sessionId} threadId persisted: ${event.thread_id}`);
         }
         break;
       }
@@ -1119,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": {
@@ -1255,6 +1371,7 @@ var CodexProvider = class {
       const entry = this.activeSessions.get(sessionId);
       if (!entry) return;
       if (entry.process !== proc) return;
+      console.log(`[CodexProvider] Session ${sessionId} process exited: code=${code} signal=${signal} threadId=${entry.threadId ?? "NONE"}`);
       if (entry.rl) {
         entry.rl.close();
         entry.rl = void 0;
@@ -1280,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",
@@ -1295,6 +1426,70 @@ var CodexProvider = class {
   getEventName(sessionId) {
     return `claude:${sessionId}`;
   }
+  // ============================================
+  // 持久化方法
+  // ============================================
+  /**
+   * 从磁盘加载持久化的 Codex 会话元数据
+   */
+  loadPersistedSessions() {
+    try {
+      if (!(0, import_fs.existsSync)(CODEX_SESSIONS_FILE)) return;
+      const data = JSON.parse((0, import_fs.readFileSync)(CODEX_SESSIONS_FILE, "utf-8"));
+      for (const [sessionId, meta] of Object.entries(data)) {
+        this.persistedSessions.set(sessionId, meta);
+      }
+      console.log(`[CodexProvider] Loaded ${this.persistedSessions.size} persisted sessions`);
+    } catch (err) {
+      console.warn("[CodexProvider] Failed to load persisted sessions:", err);
+    }
+  }
+  /**
+   * 持久化单个会话的元数据到磁盘
+   */
+  persistSession(sessionId, meta) {
+    this.persistedSessions.set(sessionId, meta);
+    this.flushPersistedSessions();
+  }
+  /**
+   * 将所有持久化数据写入磁盘
+   */
+  flushPersistedSessions() {
+    try {
+      if (!(0, import_fs.existsSync)(SESSIX_DIR)) {
+        (0, import_fs.mkdirSync)(SESSIX_DIR, { recursive: true });
+      }
+      const data = {};
+      for (const [sessionId, meta] of this.persistedSessions) {
+        data[sessionId] = meta;
+      }
+      (0, import_fs.writeFileSync)(CODEX_SESSIONS_FILE, JSON.stringify(data, null, 2), "utf-8");
+    } catch (err) {
+      console.error("[CodexProvider] Failed to persist sessions:", err);
+    }
+  }
+  /**
+   * 检查某个 sessionId 是否为已知的 Codex 会话（供 SessionManager 查询 agentType）
+   */
+  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
@@ -1387,8 +1582,15 @@ var SessionManager = class {
   }
   getProviderForSession(sessionId) {
     if (!this.providerFactory) return this.provider;
-    const agentType = this.sessionAgentType.get(sessionId) ?? "claude-code";
-    return this.providerFactory.getProvider(agentType);
+    let agentType = this.sessionAgentType.get(sessionId);
+    if (!agentType) {
+      const codexProvider = this.providerFactory.getProvider("codex");
+      if (codexProvider instanceof CodexProvider && codexProvider.isKnownSession(sessionId)) {
+        agentType = "codex";
+        this.sessionAgentType.set(sessionId, agentType);
+      }
+    }
+    return this.providerFactory.getProvider(agentType ?? "claude-code");
   }
   // ============================================
   // 公开 API
@@ -3502,11 +3704,11 @@ var ActivityPushChannel = class {
 // src/session/ProjectReader.ts
 var import_promises3 = require("fs/promises");
 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");
+var import_path2 = require("path");
+var import_os2 = require("os");
+var CLAUDE_PROJECTS_DIR = (0, import_path2.join)((0, import_os2.homedir)(), ".claude", "projects");
 function getSessionFilePath(projectPath, sessionId) {
-  return (0, import_path.join)(CLAUDE_PROJECTS_DIR, encodeDirName(projectPath), `${sessionId}.jsonl`);
+  return (0, import_path2.join)(CLAUDE_PROJECTS_DIR, encodeDirName(projectPath), `${sessionId}.jsonl`);
 }
 async function getProjects() {
   try {
@@ -3523,7 +3725,7 @@ async function getProjects() {
       const encodedPath = entry.name;
       const decodedPath = decodeDirName(encodedPath);
       const name = decodedPath.split("/").filter(Boolean).pop() ?? encodedPath;
-      const projectDir = (0, import_path.join)(CLAUDE_PROJECTS_DIR, encodedPath);
+      const projectDir = (0, import_path2.join)(CLAUDE_PROJECTS_DIR, encodedPath);
       const { count: sessionCount, latestMtime } = await countJsonlFilesWithMtime(projectDir);
       projects.push({
         id: encodedPath,
@@ -3545,7 +3747,7 @@ async function getProjects() {
 async function getHistoricalSessions(projectPath) {
   try {
     const encodedPath = encodeDirName(projectPath);
-    const projectDir = (0, import_path.join)(CLAUDE_PROJECTS_DIR, encodedPath);
+    const projectDir = (0, import_path2.join)(CLAUDE_PROJECTS_DIR, encodedPath);
     const dirExists = await directoryExists(projectDir);
     if (!dirExists) {
       return { ok: true, value: [] };
@@ -3556,7 +3758,7 @@ async function getHistoricalSessions(projectPath) {
     await Promise.all(
       jsonlFiles.map(async (entry) => {
         const sessionId = entry.name.slice(0, -6);
-        const filePath = (0, import_path.join)(projectDir, entry.name);
+        const filePath = (0, import_path2.join)(projectDir, entry.name);
         try {
           const contentTs = await extractLastTimestamp(filePath);
           if (contentTs) {
@@ -3575,13 +3777,13 @@ async function getHistoricalSessions(projectPath) {
     );
     for (const entry of uuidDirs) {
       try {
-        const fileStat = await (0, import_promises3.stat)((0, import_path.join)(projectDir, entry.name));
+        const fileStat = await (0, import_promises3.stat)((0, import_path2.join)(projectDir, entry.name));
         mtimeMap.set(entry.name, fileStat.mtimeMs);
       } catch {
         mtimeMap.set(entry.name, 0);
       }
     }
-    const indexPath = (0, import_path.join)(projectDir, "sessions-index.json");
+    const indexPath = (0, import_path2.join)(projectDir, "sessions-index.json");
     const sessionMap = /* @__PURE__ */ new Map();
     try {
       const indexContent = await (0, import_promises3.readFile)(indexPath, "utf-8");
@@ -3599,7 +3801,7 @@ async function getHistoricalSessions(projectPath) {
         }
         await Promise.all(
           Array.from(sessionMap.values()).filter((s) => (s.messageCount ?? 0) > 0 && !s.summary && !s.firstPrompt).map(async (s) => {
-            const filePath = (0, import_path.join)(projectDir, `${s.sessionId}.jsonl`);
+            const filePath = (0, import_path2.join)(projectDir, `${s.sessionId}.jsonl`);
             const firstPrompt = await extractFirstPrompt(filePath).catch(() => void 0);
             if (firstPrompt) s.firstPrompt = firstPrompt;
           })
@@ -3613,7 +3815,7 @@ async function getHistoricalSessions(projectPath) {
         if (uuidDirSet.has(sessionId)) {
           sessionMap.set(sessionId, { sessionId, lastModified: mtime, messageCount: -1 });
         } else {
-          const filePath = (0, import_path.join)(projectDir, `${sessionId}.jsonl`);
+          const filePath = (0, import_path2.join)(projectDir, `${sessionId}.jsonl`);
           const firstPrompt = await extractFirstPrompt(filePath).catch(() => void 0);
           sessionMap.set(sessionId, { sessionId, lastModified: mtime, firstPrompt });
         }
@@ -3637,7 +3839,7 @@ async function getHistoricalSessions(projectPath) {
 async function getSessionHistory(projectPath, sessionId) {
   try {
     const encodedPath = encodeDirName(projectPath);
-    const filePath = (0, import_path.join)(CLAUDE_PROJECTS_DIR, encodedPath, `${sessionId}.jsonl`);
+    const filePath = (0, import_path2.join)(CLAUDE_PROJECTS_DIR, encodedPath, `${sessionId}.jsonl`);
     const raw = await (0, import_promises3.readFile)(filePath, "utf-8").catch((err) => {
       if (err.code === "ENOENT") return null;
       throw err;
@@ -3818,15 +4020,15 @@ async function countJsonlFilesWithMtime(dirPath) {
     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;
+          const contentTs = await extractLastTimestamp((0, import_path2.join)(dirPath, entry.name));
+          const ts = contentTs ?? (await (0, import_promises3.stat)((0, import_path2.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));
+          const fileStat = await (0, import_promises3.stat)((0, import_path2.join)(dirPath, entry.name));
           if (fileStat.mtimeMs > latestMtime) latestMtime = fileStat.mtimeMs;
         } catch {
         }
@@ -4384,10 +4586,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

@@ -866,6 +866,9 @@ ${context}`;
 var import_child_process2 = require("child_process");
 var import_readline2 = require("readline");
 var import_events2 = require("events");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_os = require("os");
 var import_uuid2 = require("uuid");
 
 // src/utils/codexPath.ts
@@ -896,10 +899,23 @@ function findCodexPath() {
   }
   return "codex";
 }
+function resolveCodexJsEntry(codexPath) {
+  try {
+    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;
+    }
+  } catch {
+  }
+  return void 0;
+}
 var CODEX_PATH = findCodexPath();
+var CODEX_JS_ENTRY = resolveCodexJsEntry(CODEX_PATH);
 async function getCodexVersion() {
   try {
-    const output = (0, import_node_child_process3.execSync)(`"${CODEX_PATH}" --version`, {
+    const cmd = CODEX_JS_ENTRY ? `"${process.execPath}" "${CODEX_JS_ENTRY}" --version` : `"${CODEX_PATH}" --version`;
+    const output = (0, import_node_child_process3.execSync)(cmd, {
       encoding: "utf-8",
       timeout: 5e3
     }).trim();
@@ -909,6 +925,14 @@ async function getCodexVersion() {
   }
 }
 function isCodexAvailable() {
+  if (CODEX_JS_ENTRY) {
+    try {
+      (0, import_node_fs2.accessSync)(CODEX_JS_ENTRY, import_node_fs2.constants.R_OK);
+      return true;
+    } catch {
+      return false;
+    }
+  }
   try {
     (0, import_node_fs2.accessSync)(CODEX_PATH, import_node_fs2.constants.X_OK);
     return true;
@@ -923,11 +947,18 @@ 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 CodexProvider = class {
   activeSessions = /* @__PURE__ */ new Map();
   emitter = new import_events2.EventEmitter();
+  /** 持久化的会话元数据（sessionId → metadata） */
+  persistedSessions = /* @__PURE__ */ new Map();
   /** 自增 ID 计数器，用于生成 ClaudeStreamEvent 中的 message/block ID */
   idCounter = 0;
+  constructor() {
+    this.loadPersistedSessions();
+  }
   async startSession(opts) {
     const { projectPath, message, sessionId: existingSessionId } = opts;
     const sessionId = existingSessionId ?? (0, import_uuid2.v4)();
@@ -946,12 +977,22 @@ var CodexProvider = class {
       agentType: "codex"
     };
     const resume = opts.resume ?? !!existingSessionId;
-    const proc = this.spawnCodexProcess(projectPath, message, void 0);
+    let resumeThreadId;
+    if (resume && existingSessionId) {
+      const persisted = this.persistedSessions.get(existingSessionId);
+      if (persisted?.threadId) {
+        resumeThreadId = persisted.threadId;
+        console.log(`[CodexProvider] Resuming session ${sessionId} with threadId: ${resumeThreadId}`);
+      } else {
+        console.warn(`[CodexProvider] Session ${sessionId} resume requested but no persisted threadId found, creating new session`);
+      }
+    }
+    const proc = this.spawnCodexProcess(projectPath, message, resumeThreadId, opts.model);
     session.pid = proc.pid;
     this.activeSessions.set(sessionId, {
       session,
       process: proc,
-      threadId: void 0,
+      threadId: resumeThreadId,
       turnStartTime: Date.now()
     });
     const initEvent = {
@@ -960,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);
@@ -983,22 +1025,46 @@ var CodexProvider = class {
     this.activeSessions.delete(sessionId);
   }
   async sendMessage(sessionId, message) {
-    const entry = this.activeSessions.get(sessionId);
+    let entry = this.activeSessions.get(sessionId);
     if (!entry) {
-      throw new Error(`Session ${sessionId} not found or already ended`);
+      const persisted = this.persistedSessions.get(sessionId);
+      if (!persisted?.threadId) {
+        throw new Error(`Session ${sessionId} not found or already ended`);
+      }
+      const projectId = persisted.projectPath.split("/").filter(Boolean).pop() ?? "unknown";
+      const session = {
+        id: sessionId,
+        projectId,
+        projectPath: persisted.projectPath,
+        status: "running",
+        createdAt: persisted.createdAt,
+        lastActiveAt: Date.now(),
+        summary: persisted.summary,
+        agentType: "codex"
+      };
+      const placeholderProc = (0, import_child_process2.spawn)(process.execPath, ["-e", ""], { stdio: "ignore" });
+      entry = {
+        session,
+        process: placeholderProc,
+        threadId: persisted.threadId,
+        turnStartTime: Date.now()
+      };
+      this.activeSessions.set(sessionId, entry);
     }
-    if (entry.process.exitCode === null && entry.process.signalCode === null) {
+    const procAlive = entry.process.exitCode === null && entry.process.signalCode === null;
+    if (procAlive) {
       try {
         entry.process.stdin?.end();
       } catch {
       }
       await killProcessCrossPlatform(entry.process);
     }
-    const threadId = entry.threadId;
+    const threadId = entry.threadId ?? this.persistedSessions.get(sessionId)?.threadId;
     if (!threadId) {
-      throw new Error(`Session ${sessionId} has no thread ID, cannot resume`);
+      console.warn(`[CodexProvider] Session ${sessionId} has no thread ID, falling back to new thread`);
     }
-    const proc = this.spawnCodexProcess(entry.session.projectPath, message, threadId);
+    this.emitUserMessage(sessionId, message);
+    const proc = this.spawnCodexProcess(entry.session.projectPath, message, threadId ?? void 0);
     entry.session.status = "running";
     entry.session.lastActiveAt = Date.now();
     entry.session.pid = proc.pid;
@@ -1021,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 "";
@@ -1045,16 +1130,29 @@ var CodexProvider = class {
    * @param message 用户消息
    * @param resumeThreadId 如果提供，则使用 `codex exec resume` 恢复会话
    */
-  spawnCodexProcess(projectPath, message, resumeThreadId) {
+  spawnCodexProcess(projectPath, message, resumeThreadId, model) {
     const args = ["exec", "--json", "--full-auto"];
+    if (model) {
+      args.push("-m", model);
+    }
+    args.push("-C", projectPath);
     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, {
+    let cmd;
+    let spawnArgs;
+    if (CODEX_JS_ENTRY) {
+      cmd = process.execPath;
+      spawnArgs = [CODEX_JS_ENTRY, ...args];
+      console.log(`[CodexProvider] Spawning via node: ${cmd} ${CODEX_JS_ENTRY} ${args.join(" ")}`);
+    } else {
+      cmd = CODEX_PATH;
+      spawnArgs = args;
+      console.log(`[CodexProvider] Spawning: ${CODEX_PATH} ${args.join(" ")}`);
+    }
+    const proc = (0, import_child_process2.spawn)(cmd, spawnArgs, {
       cwd: projectPath,
       env,
       stdio: ["pipe", "pipe", "pipe"]
@@ -1076,6 +1174,7 @@ var CodexProvider = class {
     rl.on("line", (line) => {
       const trimmed = line.trim();
       if (!trimmed) return;
+      console.log(`[CodexProvider] Session ${sessionId} stdout: ${trimmed.substring(0, 200)}`);
       let event;
       try {
         event = JSON.parse(trimmed);
@@ -1097,6 +1196,14 @@ var CodexProvider = class {
       case "thread.started": {
         if (event.thread_id) {
           entry.threadId = event.thread_id;
+          this.persistSession(sessionId, {
+            threadId: event.thread_id,
+            projectPath: entry.session.projectPath,
+            summary: entry.session.summary,
+            createdAt: entry.session.createdAt,
+            lastActiveAt: Date.now()
+          });
+          console.log(`[CodexProvider] Session ${sessionId} threadId persisted: ${event.thread_id}`);
         }
         break;
       }
@@ -1124,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": {
@@ -1260,6 +1376,7 @@ var CodexProvider = class {
       const entry = this.activeSessions.get(sessionId);
       if (!entry) return;
       if (entry.process !== proc) return;
+      console.log(`[CodexProvider] Session ${sessionId} process exited: code=${code} signal=${signal} threadId=${entry.threadId ?? "NONE"}`);
       if (entry.rl) {
         entry.rl.close();
         entry.rl = void 0;
@@ -1285,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",
@@ -1300,6 +1431,70 @@ var CodexProvider = class {
   getEventName(sessionId) {
     return `claude:${sessionId}`;
   }
+  // ============================================
+  // 持久化方法
+  // ============================================
+  /**
+   * 从磁盘加载持久化的 Codex 会话元数据
+   */
+  loadPersistedSessions() {
+    try {
+      if (!(0, import_fs.existsSync)(CODEX_SESSIONS_FILE)) return;
+      const data = JSON.parse((0, import_fs.readFileSync)(CODEX_SESSIONS_FILE, "utf-8"));
+      for (const [sessionId, meta] of Object.entries(data)) {
+        this.persistedSessions.set(sessionId, meta);
+      }
+      console.log(`[CodexProvider] Loaded ${this.persistedSessions.size} persisted sessions`);
+    } catch (err) {
+      console.warn("[CodexProvider] Failed to load persisted sessions:", err);
+    }
+  }
+  /**
+   * 持久化单个会话的元数据到磁盘
+   */
+  persistSession(sessionId, meta) {
+    this.persistedSessions.set(sessionId, meta);
+    this.flushPersistedSessions();
+  }
+  /**
+   * 将所有持久化数据写入磁盘
+   */
+  flushPersistedSessions() {
+    try {
+      if (!(0, import_fs.existsSync)(SESSIX_DIR)) {
+        (0, import_fs.mkdirSync)(SESSIX_DIR, { recursive: true });
+      }
+      const data = {};
+      for (const [sessionId, meta] of this.persistedSessions) {
+        data[sessionId] = meta;
+      }
+      (0, import_fs.writeFileSync)(CODEX_SESSIONS_FILE, JSON.stringify(data, null, 2), "utf-8");
+    } catch (err) {
+      console.error("[CodexProvider] Failed to persist sessions:", err);
+    }
+  }
+  /**
+   * 检查某个 sessionId 是否为已知的 Codex 会话（供 SessionManager 查询 agentType）
+   */
+  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
@@ -1392,8 +1587,15 @@ var SessionManager = class {
   }
   getProviderForSession(sessionId) {
     if (!this.providerFactory) return this.provider;
-    const agentType = this.sessionAgentType.get(sessionId) ?? "claude-code";
-    return this.providerFactory.getProvider(agentType);
+    let agentType = this.sessionAgentType.get(sessionId);
+    if (!agentType) {
+      const codexProvider = this.providerFactory.getProvider("codex");
+      if (codexProvider instanceof CodexProvider && codexProvider.isKnownSession(sessionId)) {
+        agentType = "codex";
+        this.sessionAgentType.set(sessionId, agentType);
+      }
+    }
+    return this.providerFactory.getProvider(agentType ?? "claude-code");
   }
   // ============================================
   // 公开 API
@@ -3507,11 +3709,11 @@ var ActivityPushChannel = class {
 // src/session/ProjectReader.ts
 var import_promises3 = require("fs/promises");
 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");
+var import_path2 = require("path");
+var import_os2 = require("os");
+var CLAUDE_PROJECTS_DIR = (0, import_path2.join)((0, import_os2.homedir)(), ".claude", "projects");
 function getSessionFilePath(projectPath, sessionId) {
-  return (0, import_path.join)(CLAUDE_PROJECTS_DIR, encodeDirName(projectPath), `${sessionId}.jsonl`);
+  return (0, import_path2.join)(CLAUDE_PROJECTS_DIR, encodeDirName(projectPath), `${sessionId}.jsonl`);
 }
 async function getProjects() {
   try {
@@ -3528,7 +3730,7 @@ async function getProjects() {
       const encodedPath = entry.name;
       const decodedPath = decodeDirName(encodedPath);
       const name = decodedPath.split("/").filter(Boolean).pop() ?? encodedPath;
-      const projectDir = (0, import_path.join)(CLAUDE_PROJECTS_DIR, encodedPath);
+      const projectDir = (0, import_path2.join)(CLAUDE_PROJECTS_DIR, encodedPath);
       const { count: sessionCount, latestMtime } = await countJsonlFilesWithMtime(projectDir);
       projects.push({
         id: encodedPath,
@@ -3550,7 +3752,7 @@ async function getProjects() {
 async function getHistoricalSessions(projectPath) {
   try {
     const encodedPath = encodeDirName(projectPath);
-    const projectDir = (0, import_path.join)(CLAUDE_PROJECTS_DIR, encodedPath);
+    const projectDir = (0, import_path2.join)(CLAUDE_PROJECTS_DIR, encodedPath);
     const dirExists = await directoryExists(projectDir);
     if (!dirExists) {
       return { ok: true, value: [] };
@@ -3561,7 +3763,7 @@ async function getHistoricalSessions(projectPath) {
     await Promise.all(
       jsonlFiles.map(async (entry) => {
         const sessionId = entry.name.slice(0, -6);
-        const filePath = (0, import_path.join)(projectDir, entry.name);
+        const filePath = (0, import_path2.join)(projectDir, entry.name);
         try {
           const contentTs = await extractLastTimestamp(filePath);
           if (contentTs) {
@@ -3580,13 +3782,13 @@ async function getHistoricalSessions(projectPath) {
     );
     for (const entry of uuidDirs) {
       try {
-        const fileStat = await (0, import_promises3.stat)((0, import_path.join)(projectDir, entry.name));
+        const fileStat = await (0, import_promises3.stat)((0, import_path2.join)(projectDir, entry.name));
         mtimeMap.set(entry.name, fileStat.mtimeMs);
       } catch {
         mtimeMap.set(entry.name, 0);
       }
     }
-    const indexPath = (0, import_path.join)(projectDir, "sessions-index.json");
+    const indexPath = (0, import_path2.join)(projectDir, "sessions-index.json");
     const sessionMap = /* @__PURE__ */ new Map();
     try {
       const indexContent = await (0, import_promises3.readFile)(indexPath, "utf-8");
@@ -3604,7 +3806,7 @@ async function getHistoricalSessions(projectPath) {
         }
         await Promise.all(
           Array.from(sessionMap.values()).filter((s) => (s.messageCount ?? 0) > 0 && !s.summary && !s.firstPrompt).map(async (s) => {
-            const filePath = (0, import_path.join)(projectDir, `${s.sessionId}.jsonl`);
+            const filePath = (0, import_path2.join)(projectDir, `${s.sessionId}.jsonl`);
             const firstPrompt = await extractFirstPrompt(filePath).catch(() => void 0);
             if (firstPrompt) s.firstPrompt = firstPrompt;
           })
@@ -3618,7 +3820,7 @@ async function getHistoricalSessions(projectPath) {
         if (uuidDirSet.has(sessionId)) {
           sessionMap.set(sessionId, { sessionId, lastModified: mtime, messageCount: -1 });
         } else {
-          const filePath = (0, import_path.join)(projectDir, `${sessionId}.jsonl`);
+          const filePath = (0, import_path2.join)(projectDir, `${sessionId}.jsonl`);
           const firstPrompt = await extractFirstPrompt(filePath).catch(() => void 0);
           sessionMap.set(sessionId, { sessionId, lastModified: mtime, firstPrompt });
         }
@@ -3642,7 +3844,7 @@ async function getHistoricalSessions(projectPath) {
 async function getSessionHistory(projectPath, sessionId) {
   try {
     const encodedPath = encodeDirName(projectPath);
-    const filePath = (0, import_path.join)(CLAUDE_PROJECTS_DIR, encodedPath, `${sessionId}.jsonl`);
+    const filePath = (0, import_path2.join)(CLAUDE_PROJECTS_DIR, encodedPath, `${sessionId}.jsonl`);
     const raw = await (0, import_promises3.readFile)(filePath, "utf-8").catch((err) => {
       if (err.code === "ENOENT") return null;
       throw err;
@@ -3823,15 +4025,15 @@ async function countJsonlFilesWithMtime(dirPath) {
     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;
+          const contentTs = await extractLastTimestamp((0, import_path2.join)(dirPath, entry.name));
+          const ts = contentTs ?? (await (0, import_promises3.stat)((0, import_path2.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));
+          const fileStat = await (0, import_promises3.stat)((0, import_path2.join)(dirPath, entry.name));
           if (fileStat.mtimeMs > latestMtime) latestMtime = fileStat.mtimeMs;
         } catch {
         }
@@ -4389,10 +4591,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.0",
+  "version": "0.3.2",
   "bin": {
     "sessix-server": "./dist/index.js"
   },