fix(codex): improve session attribution and manual triggering

.gitignore

@@ -95,6 +95,10 @@ temp/
 # Vite
 .vite/
 
+# Local toolchains / installers
+.node/
+node-v*-win-*.zip
+
 # Local Netlify folder
 .netlify
 

package.json

@@ -79,7 +79,6 @@
     "mime-types": "^3.0.1",
     "multer": "^2.0.1",
     "node-fetch": "^2.7.0",
-    "node-pty": "^1.1.0-beta34",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-dropzone": "^14.2.3",
@@ -95,7 +94,11 @@
     "tailwind-merge": "^3.3.1",
     "ws": "^8.14.2"
   },
+  "optionalDependencies": {
+    "node-pty": "^1.1.0-beta34"
+  },
   "devDependencies": {
+    "@rollup/rollup-win32-x64-msvc": "^4.55.3",
     "@types/react": "^18.2.43",
     "@types/react-dom": "^18.2.17",
     "@vitejs/plugin-react": "^4.6.0",

server/index.js

@@ -53,7 +53,6 @@ import http from 'http';
 import cors from 'cors';
 import { promises as fsPromises } from 'fs';
 import { spawn } from 'child_process';
-import pty from 'node-pty';
 import fetch from 'node-fetch';
 import mime from 'mime-types';
 
@@ -77,6 +76,16 @@ import codexRoutes from './routes/codex.js';
 import { initializeDatabase } from './database/db.js';
 import { validateApiKey, authenticateToken, authenticateWebSocket } from './middleware/auth.js';
 
+let ptyModulePromise = null;
+async function getPtyModule() {
+    if (!ptyModulePromise) {
+        ptyModulePromise = import('node-pty')
+            .then((mod) => mod?.default || mod)
+            .catch(() => null);
+    }
+    return ptyModulePromise;
+}
+
 // File system watcher for projects folder
 let projectsWatcher = null;
 const connectedClients = new Set();
@@ -1051,7 +1060,16 @@ function handleShellConnection(ws) {
                     const termRows = data.rows || 24;
                     console.log('📐 Using terminal dimensions:', termCols, 'x', termRows);
 
-                    shellProcess = pty.spawn(shell, shellArgs, {
+                    const ptyModule = await getPtyModule();
+                    if (!ptyModule) {
+                        ws.send(JSON.stringify({
+                            type: 'output',
+                            data: '[ERROR] node-pty 不可用，无法启动交互终端。请使用 Node 20 并在具备 C++ Build Tools 的环境重新安装依赖，或跳过终端功能。'
+                        }));
+                        return;
+                    }
+
+                    shellProcess = ptyModule.spawn(shell, shellArgs, {
                         name: 'xterm-256color',
                         cols: termCols,
                         rows: termRows,

server/openai-codex.js

@@ -177,11 +177,52 @@ function mapPermissionModeToCodexOptions(permissionMode) {
     default:
       return {
         sandboxMode: 'workspace-write',
-        approvalPolicy: 'untrusted'
+        // UI 暂未实现 Codex 的审批交互，默认避免进入“等待审批/卡住”的状态
+        approvalPolicy: 'never'
       };
   }
 }
 
+function codexErrorToPayload(error) {
+  const rawMessage = String(error?.message || 'Unknown error');
+  const status = error?.status || error?.response?.status;
+
+  const lower = rawMessage.toLowerCase();
+  const looksLikeNotFound =
+    status === 404 ||
+    lower.includes('not found') ||
+    lower.includes('thread') && lower.includes('missing');
+
+  if (looksLikeNotFound) {
+    return {
+      code: 'CODEX_THREAD_NOT_FOUND',
+      message: 'Codex 会话不存在或已失效：请在侧边栏选择一个有效会话，或新建会话后重试。',
+      details: rawMessage
+    };
+  }
+
+  const looksLikeAuth =
+    status === 401 ||
+    status === 403 ||
+    lower.includes('api key') ||
+    lower.includes('unauthorized') ||
+    lower.includes('forbidden');
+
+  if (looksLikeAuth) {
+    return {
+      code: 'CODEX_AUTH_FAILED',
+      message: 'Codex 认证失败：请检查环境变量/配置（如 OPENAI_API_KEY），或确认本机已完成 Codex 登录。',
+      details: rawMessage
+    };
+  }
+
+  return {
+    code: 'CODEX_ERROR',
+    message: rawMessage,
+    details: rawMessage
+  };
+}
+
 /**
  * Execute a Codex query with streaming
  * @param {string} command - The prompt to send
@@ -205,6 +246,16 @@ export async function queryCodex(command, options = {}, ws) {
   let currentSessionId = sessionId;
 
   try {
+    console.info('[Codex] query', {
+      projectPath,
+      cwd,
+      sessionId,
+      model,
+      permissionMode,
+      mapped: { sandboxMode, approvalPolicy },
+      workingDirectory
+    });
+
     // Initialize Codex SDK
     codex = new Codex();
 
@@ -219,7 +270,15 @@ export async function queryCodex(command, options = {}, ws) {
 
     // Start or resume thread
     if (sessionId) {
-      thread = codex.resumeThread(sessionId, threadOptions);
+      try {
+        thread = codex.resumeThread(sessionId, threadOptions);
+      } catch (resumeError) {
+        const payload = codexErrorToPayload(resumeError);
+        const err = new Error(payload.message);
+        err.code = payload.code;
+        err.details = payload.details;
+        throw err;
+      }
     } else {
       thread = codex.startThread(threadOptions);
     }
@@ -285,11 +344,14 @@ export async function queryCodex(command, options = {}, ws) {
     });
 
   } catch (error) {
-    console.error('[Codex] Error:', error);
+    const payload = codexErrorToPayload(error);
+    console.error('[Codex] Error:', { code: payload.code, message: payload.message, details: payload.details });
 
     sendMessage(ws, {
       type: 'codex-error',
-      error: error.message,
+      error: payload.message,
+      code: payload.code,
+      details: payload.details,
       sessionId: currentSessionId
     });