@wu529778790/open-im 1.3.1 → 1.3.2-beta.0

package/README.md

@@ -55,6 +55,8 @@ open-im start
 | `ALLOWED_USER_IDS` | 白名单（逗号分隔，空=所有人） |
 | `CLAUDE_WORK_DIR` | 工作目录，默认当前目录 |
 | `ALLOWED_BASE_DIRS` | 允许访问的目录（逗号分隔） |
+| `CURSOR_API_KEY` | Cursor Agent API Key（使用 cursor 时必填，或先运行 agent login） |
+| `CODEX_PROXY` | Codex 访问 chatgpt.com 的代理（如 http://127.0.0.1:7890） |
 
 ### Claude API 配置
 
@@ -69,13 +71,17 @@ open-im init
 # 方式 2：编辑配置文件
 cat > ~/.open-im/config.json << 'EOF'
 {
-  # 工作目录 默认当前目录
-  "claudeWorkDir": "YOUR_WORK_DIR",
-  # 是否跳过权限确认 默认 true
-  "claudeSkipPermissions": true,
-  # 使用的 AI 命令 默认 claude
   "aiCommand": "claude",
-  # 平台配置
+  "tools": {
+    "claude": {
+      "cliPath": "claude",
+      "workDir": "YOUR_WORK_DIR",
+      "skipPermissions": true,
+      "timeoutMs": 600000
+    },
+    "cursor": { "cliPath": "agent", "skipPermissions": true },
+    "codex": { "cliPath": "codex", "workDir": "YOUR_WORK_DIR", "skipPermissions": true, "proxy": "http://127.0.0.1:7890" }
+  },
   "platforms": {
     # 企业微信配置
     "wework": {
@@ -160,3 +166,7 @@ EOF
 **飞书卡片报错**：未配置卡片回调，使用命令替代：`/mode ask`、`/mode yolo`
 
 **企业微信收不到通知**：需先发一条消息给机器人，才能接收启动通知
+
+**Cursor 报 Authentication required**：需先认证。方式 1：在终端运行 `agent login`；方式 2：在 `~/.open-im/config.json` 的 `env` 中添加 `"CURSOR_API_KEY": "你的 API Key"`
+
+**Codex 报 stream disconnected / error sending request**：网络无法访问 chatgpt.com，需配置代理。在 `tools.codex` 中添加 `"proxy": "http://127.0.0.1:7890"`，或设置环境变量 `CODEX_PROXY`

package/dist/adapters/codex-adapter.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Codex Adapter - run tasks through OpenAI Codex CLI (`codex exec`)
+ */
+import type { RunCallbacks, RunHandle, RunOptions, ToolAdapter } from "./tool-adapter.interface.js";
+export declare class CodexAdapter implements ToolAdapter {
+    private cliPath;
+    readonly toolId = "codex";
+    constructor(cliPath: string);
+    run(prompt: string, sessionId: string | undefined, workDir: string, callbacks: RunCallbacks, options?: RunOptions): RunHandle;
+}

package/dist/adapters/codex-adapter.js

@@ -0,0 +1,59 @@
+/**
+ * Codex Adapter - run tasks through OpenAI Codex CLI (`codex exec`)
+ */
+import { runCodex } from "../codex/cli-runner.js";
+export class CodexAdapter {
+    cliPath;
+    toolId = "codex";
+    constructor(cliPath) {
+        this.cliPath = cliPath;
+    }
+    run(prompt, sessionId, workDir, callbacks, options) {
+        const opts = {
+            skipPermissions: options?.skipPermissions,
+            permissionMode: options?.permissionMode,
+            timeoutMs: options?.timeoutMs,
+            model: options?.model,
+            chatId: options?.chatId,
+            hookPort: options?.hookPort,
+            proxy: options?.proxy,
+        };
+        return runCodex(this.cliPath, prompt, sessionId, workDir, {
+            onText: callbacks.onText,
+            onThinking: callbacks.onThinking,
+            onToolUse: callbacks.onToolUse,
+            onComplete: (raw) => {
+                const result = {
+                    success: raw.success,
+                    result: raw.result,
+                    accumulated: raw.accumulated,
+                    cost: raw.cost,
+                    durationMs: raw.durationMs,
+                    model: raw.model,
+                    numTurns: raw.numTurns,
+                    toolStats: raw.toolStats,
+                };
+                callbacks.onComplete(result);
+            },
+            onError: (err) => {
+                const msg = typeof err === "string" ? err : String(err);
+                const friendly = msg.includes("Authentication") || msg.includes("login")
+                    ? "Codex 需要先登录。请在终端运行 codex login，或在 ~/.open-im/config.json 的 env 中添加 OPENAI_API_KEY。"
+                    : msg.includes("stream disconnected") ||
+                        msg.includes("error sending request") ||
+                        msg.includes("Connection refused") ||
+                        msg.includes("ENOTFOUND") ||
+                        msg.includes("ETIMEDOUT")
+                        ? "Codex 网络请求失败。如无法访问 chatgpt.com，请在 tools.codex.proxy 或 CODEX_PROXY 中配置代理。"
+                        : msg.includes("No session found") ||
+                            msg.includes("No conversation found") ||
+                            msg.includes("Unable to find session")
+                            ? "Codex 会话已失效，旧 session 已清理。请直接重试当前请求。"
+                            : msg;
+                callbacks.onError(friendly);
+            },
+            onSessionId: callbacks.onSessionId,
+            onSessionInvalid: callbacks.onSessionInvalid,
+        }, opts);
+    }
+}

package/dist/adapters/cursor-adapter.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Cursor Adapter - 通过 Cursor Agent CLI 执行任务
+ * 需要预先安装: curl https://cursor.com/install -fsSL | bash
+ */
+import type { ToolAdapter, RunCallbacks, RunOptions, RunHandle } from './tool-adapter.interface.js';
+export declare class CursorAdapter implements ToolAdapter {
+    private cliPath;
+    readonly toolId = "cursor";
+    constructor(cliPath: string);
+    run(prompt: string, sessionId: string | undefined, workDir: string, callbacks: RunCallbacks, options?: RunOptions): RunHandle;
+}

package/dist/adapters/cursor-adapter.js

@@ -0,0 +1,50 @@
+/**
+ * Cursor Adapter - 通过 Cursor Agent CLI 执行任务
+ * 需要预先安装: curl https://cursor.com/install -fsSL | bash
+ */
+import { runCursor } from '../cursor/cli-runner.js';
+import { createLogger } from '../logger.js';
+const log = createLogger('CursorAdapter');
+export class CursorAdapter {
+    cliPath;
+    toolId = 'cursor';
+    constructor(cliPath) {
+        this.cliPath = cliPath;
+    }
+    run(prompt, sessionId, workDir, callbacks, options) {
+        const opts = {
+            skipPermissions: options?.skipPermissions,
+            permissionMode: options?.permissionMode,
+            timeoutMs: options?.timeoutMs,
+            model: options?.model,
+            chatId: options?.chatId,
+            hookPort: options?.hookPort,
+        };
+        return runCursor(this.cliPath, prompt, sessionId, workDir, {
+            onText: callbacks.onText,
+            onThinking: callbacks.onThinking,
+            onToolUse: callbacks.onToolUse,
+            onComplete: (raw) => {
+                const result = {
+                    success: raw.success,
+                    result: raw.result,
+                    accumulated: raw.accumulated,
+                    cost: raw.cost,
+                    durationMs: raw.durationMs,
+                    model: raw.model,
+                    numTurns: raw.numTurns,
+                    toolStats: raw.toolStats,
+                };
+                callbacks.onComplete(result);
+            },
+            onError: (err) => {
+                const msg = typeof err === 'string' ? err : String(err);
+                const friendly = msg.includes('Authentication required') || msg.includes('agent login')
+                    ? 'Cursor 需要先登录。请在终端运行 agent login，或在 ~/.open-im/config.json 的 env 中添加 "CURSOR_API_KEY"。'
+                    : msg;
+                callbacks.onError(friendly);
+            },
+            onSessionId: callbacks.onSessionId,
+        }, opts);
+    }
+}

package/dist/adapters/registry.js

@@ -1,5 +1,7 @@
 import { ClaudeAdapter } from './claude-adapter.js';
 import { ClaudeSDKAdapter } from './claude-sdk-adapter.js';
+import { CursorAdapter } from './cursor-adapter.js';
+import { CodexAdapter } from './codex-adapter.js';
 const adapters = new Map();
 export function initAdapters(config) {
     adapters.clear();
@@ -16,6 +18,14 @@ export function initAdapters(config) {
             }));
         }
     }
+    else if (config.aiCommand === 'cursor') {
+        console.log('🖱️ 使用 Cursor Agent CLI 适配器');
+        adapters.set('cursor', new CursorAdapter(config.cursorCliPath));
+    }
+    else if (config.aiCommand === 'codex') {
+        console.log('📦 使用 Codex CLI 适配器');
+        adapters.set('codex', new CodexAdapter(config.codexCliPath));
+    }
 }
 export function getAdapter(aiCommand) {
     return adapters.get(aiCommand);

package/dist/adapters/tool-adapter.interface.d.ts

@@ -29,6 +29,8 @@ export interface RunOptions {
     model?: string;
     chatId?: string;
     hookPort?: number;
+    /** Codex 专用：HTTP/HTTPS 代理地址，如 http://127.0.0.1:7890 */
+    proxy?: string;
 }
 export interface RunHandle {
     abort: () => void;

package/dist/codex/cli-runner.d.ts

@@ -0,0 +1,37 @@
+/**
+ * Codex CLI Runner - 解析 codex exec --json 的 JSONL 输出
+ * 参考: https://developers.openai.com/codex/cli/reference/
+ *       https://takopi.dev/reference/runners/codex/exec-json-cheatsheet/
+ */
+export interface CodexRunCallbacks {
+    onText: (accumulated: string) => void;
+    onThinking?: (accumulated: string) => void;
+    onToolUse?: (toolName: string, toolInput?: Record<string, unknown>) => void;
+    onComplete: (result: {
+        success: boolean;
+        result: string;
+        accumulated: string;
+        cost: number;
+        durationMs: number;
+        model?: string;
+        numTurns: number;
+        toolStats: Record<string, number>;
+    }) => void;
+    onError: (error: string) => void;
+    onSessionId?: (sessionId: string) => void;
+    onSessionInvalid?: () => void;
+}
+export interface CodexRunOptions {
+    skipPermissions?: boolean;
+    permissionMode?: 'default' | 'acceptEdits' | 'plan';
+    timeoutMs?: number;
+    model?: string;
+    chatId?: string;
+    hookPort?: number;
+    /** HTTP/HTTPS 代理，用于访问 chatgpt.com */
+    proxy?: string;
+}
+export interface CodexRunHandle {
+    abort: () => void;
+}
+export declare function runCodex(cliPath: string, prompt: string, sessionId: string | undefined, workDir: string, callbacks: CodexRunCallbacks, options?: CodexRunOptions): CodexRunHandle;

package/dist/codex/cli-runner.js

@@ -0,0 +1,394 @@
+/**
+ * Codex CLI Runner - 解析 codex exec --json 的 JSONL 输出
+ * 参考: https://developers.openai.com/codex/cli/reference/
+ *       https://takopi.dev/reference/runners/codex/exec-json-cheatsheet/
+ */
+import { spawn } from 'node:child_process';
+import { execFileSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { createInterface } from 'node:readline';
+import { createLogger } from '../logger.js';
+const log = createLogger('CodexCli');
+function parseCodexEvent(line) {
+    const trimmed = line.trim();
+    if (!trimmed)
+        return null;
+    try {
+        return JSON.parse(trimmed);
+    }
+    catch {
+        return null;
+    }
+}
+function buildCodexArgs(_prompt, sessionId, workDir, options) {
+    const commonOptions = ["--json", "--skip-git-repo-check"];
+    const newSessionOptions = [...commonOptions, "--cd", workDir];
+    const resumeOptions = [...commonOptions];
+    const canResume = Boolean(sessionId) && options?.permissionMode !== "plan";
+    if (options?.skipPermissions) {
+        newSessionOptions.push("--dangerously-bypass-approvals-and-sandbox");
+        resumeOptions.push("--dangerously-bypass-approvals-and-sandbox");
+    }
+    else if (options?.permissionMode === "plan") {
+        // `codex exec resume` 当前不支持 `--sandbox` / `--cd`，plan 模式统一新开只读会话。
+        newSessionOptions.push("--sandbox", "read-only");
+    }
+    else {
+        newSessionOptions.push("--full-auto");
+        resumeOptions.push("--full-auto");
+    }
+    if (options?.model) {
+        newSessionOptions.push("--model", options.model);
+        resumeOptions.push("--model", options.model);
+    }
+    if (sessionId && !canResume) {
+        log.warn("Codex plan mode does not support resume; starting a new read-only session");
+    }
+    return canResume
+        ? ["exec", "resume", ...resumeOptions, sessionId, "-"]
+        : ["exec", ...newSessionOptions, "-"];
+}
+function quoteForWindowsCmd(arg) {
+    // 普通 flag / sessionId / 无空格路径不需要加引号，否则引号可能被原样传给子进程。
+    if (/^[A-Za-z0-9_./:=+\\-]+$/.test(arg)) {
+        return arg;
+    }
+    const escaped = arg
+        .replace(/(\\*)"/g, '$1$1\\"')
+        .replace(/(\\+)$/g, '$1$1')
+        .replace(/%/g, '%%');
+    return `"${escaped}"`;
+}
+function formatWindowsCommandName(command) {
+    // 裸命令名（如 codex）依赖 PATH 查找，不能再包双引号，否则 cmd 会按字面量查找。
+    if (/^[A-Za-z0-9_.-]+$/.test(command)) {
+        return command;
+    }
+    return quoteForWindowsCmd(command);
+}
+function extractCodexJsFromCmdShim(cmdPath) {
+    try {
+        const content = readFileSync(cmdPath, 'utf-8');
+        const match = content.match(/"%~dp0\\([^"\r\n]*codex\\bin\\codex\.js)"/i);
+        if (!match)
+            return null;
+        const relativeJsPath = match[1].replace(/\\/g, '/');
+        return join(dirname(cmdPath), relativeJsPath);
+    }
+    catch {
+        return null;
+    }
+}
+function resolveWindowsCodexLaunch(cliPath, args) {
+    try {
+        const whereOutput = execFileSync('where', [cliPath], { stdio: 'pipe' })
+            .toString()
+            .split(/\r?\n/)
+            .map((line) => line.trim())
+            .filter(Boolean);
+        const cmdShimPath = whereOutput.find((line) => /\.cmd$/i.test(line)) ?? null;
+        if (!cmdShimPath)
+            return null;
+        const codexJsPath = extractCodexJsFromCmdShim(cmdShimPath);
+        if (!codexJsPath)
+            return null;
+        return {
+            command: process.execPath,
+            args: [codexJsPath, ...args],
+        };
+    }
+    catch {
+        return null;
+    }
+}
+export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options) {
+    // codex exec --json 非交互模式
+    const args = buildCodexArgs(prompt, sessionId, workDir, options);
+    const env = {};
+    for (const [k, v] of Object.entries(process.env)) {
+        if (v !== undefined)
+            env[k] = v;
+    }
+    if (options?.chatId)
+        env.CC_IM_CHAT_ID = options.chatId;
+    if (options?.hookPort)
+        env.CC_IM_HOOK_PORT = String(options.hookPort);
+    if (options?.proxy) {
+        env.HTTPS_PROXY = options.proxy;
+        env.HTTP_PROXY = options.proxy;
+        env.https_proxy = options.proxy;
+        env.http_proxy = options.proxy;
+        env.ALL_PROXY = options.proxy;
+        env.all_proxy = options.proxy;
+    }
+    if (process.platform === 'win32') {
+        // 强制子进程在 Windows 下使用 UTF-8，避免中文源码/命令输出乱码。
+        env.LANG = env.LANG || 'C.UTF-8';
+        env.LC_ALL = env.LC_ALL || 'C.UTF-8';
+    }
+    const argsForLog = args.join(' ');
+    log.info(`Spawning Codex CLI: path=${cliPath}, cwd=${workDir}, session=${sessionId ?? 'new'}, args=${argsForLog}`);
+    // Windows: .cmd/.bat 或简单命令名（如 codex）需通过 cmd.exe 执行，否则 spawn 报 ENOENT
+    const isWinCmd = process.platform === 'win32' &&
+        (/\.(cmd|bat)$/i.test(cliPath) || cliPath === 'codex');
+    const directWindowsLaunch = isWinCmd
+        ? resolveWindowsCodexLaunch(cliPath, args)
+        : null;
+    const spawnCmd = directWindowsLaunch
+        ? directWindowsLaunch.command
+        : isWinCmd
+            ? 'cmd.exe'
+            : cliPath;
+    const spawnArgs = directWindowsLaunch
+        ? directWindowsLaunch.args
+        : isWinCmd
+            ? [
+                '/d',
+                '/s',
+                '/c',
+                `chcp 65001>nul && ${formatWindowsCommandName(cliPath)} ${args.map(quoteForWindowsCmd).join(' ')}`,
+            ]
+            : args;
+    const child = spawn(spawnCmd, spawnArgs, {
+        cwd: workDir,
+        stdio: ['pipe', 'pipe', 'pipe'],
+        env,
+        windowsHide: process.platform === 'win32',
+    });
+    // 通过 stdin 传 prompt，避免 Windows 下命令行参数引用导致中文/路径/空格被拆分。
+    child.stdin?.write(prompt);
+    child.stdin?.end();
+    let accumulated = '';
+    let accumulatedThinking = '';
+    let completed = false;
+    let threadId = '';
+    const toolStats = {};
+    const startTime = Date.now();
+    const MAX_TIMEOUT = 2_147_483_647;
+    const timeoutMs = options?.timeoutMs && options.timeoutMs > 0
+        ? Math.min(options.timeoutMs, MAX_TIMEOUT)
+        : 0;
+    let timeoutHandle = null;
+    if (timeoutMs > 0) {
+        timeoutHandle = setTimeout(() => {
+            if (!completed && !child.killed) {
+                completed = true;
+                log.warn(`Codex CLI timeout after ${timeoutMs}ms, killing pid=${child.pid}`);
+                child.kill('SIGTERM');
+                callbacks.onError(`执行超时（${timeoutMs}ms），已终止进程`);
+            }
+        }, timeoutMs);
+    }
+    const MAX_STDERR_HEAD = 4 * 1024;
+    const MAX_STDERR_TAIL = 6 * 1024;
+    let stderrHead = '';
+    let stderrTail = '';
+    let stderrTotal = 0;
+    let stderrHeadFull = false;
+    child.stderr?.on('data', (chunk) => {
+        const text = chunk.toString();
+        stderrTotal += text.length;
+        if (!stderrHeadFull) {
+            const room = MAX_STDERR_HEAD - stderrHead.length;
+            if (room > 0) {
+                stderrHead += text.slice(0, room);
+                if (stderrHead.length >= MAX_STDERR_HEAD)
+                    stderrHeadFull = true;
+            }
+        }
+        stderrTail += text;
+        if (stderrTail.length > MAX_STDERR_TAIL) {
+            stderrTail = stderrTail.slice(-MAX_STDERR_TAIL);
+        }
+        log.debug(`[stderr] ${text.trimEnd()}`);
+    });
+    const rl = createInterface({ input: child.stdout });
+    rl.on('line', (line) => {
+        const event = parseCodexEvent(line);
+        if (!event)
+            return;
+        const type = event.type;
+        log.debug(`[Codex event] type=${type}`);
+        if (type === 'thread.started') {
+            threadId = event.thread_id ?? '';
+            if (threadId)
+                callbacks.onSessionId?.(threadId);
+            return;
+        }
+        if (type === 'turn.failed') {
+            completed = true;
+            if (timeoutHandle)
+                clearTimeout(timeoutHandle);
+            const err = event.error;
+            callbacks.onError(err?.message ?? 'Codex turn failed');
+            return;
+        }
+        if (type === 'error') {
+            const msg = event.message;
+            if (msg?.includes('Reconnecting')) {
+                return;
+            }
+            completed = true;
+            if (timeoutHandle)
+                clearTimeout(timeoutHandle);
+            callbacks.onError(msg ?? 'Codex stream error');
+            return;
+        }
+        if (type === 'item.started' || type === 'item.updated' || type === 'item.completed') {
+            const item = event.item;
+            if (!item)
+                return;
+            const itemType = item.type;
+            if (itemType === 'reasoning' && type === 'item.completed') {
+                const text = item.text;
+                if (text) {
+                    accumulatedThinking += (accumulatedThinking ? '\n\n' : '') + text;
+                    callbacks.onThinking?.(accumulatedThinking);
+                }
+                return;
+            }
+            if (itemType === 'command_execution') {
+                const cmd = item.command;
+                const status = item.status;
+                if (cmd) {
+                    if (type === 'item.started') {
+                        const toolName = 'Bash';
+                        toolStats[toolName] = (toolStats[toolName] || 0) + 1;
+                        callbacks.onToolUse?.(toolName, { command: cmd });
+                    }
+                    if (type === 'item.completed' && status === 'completed') {
+                        const out = item.aggregated_output;
+                        const exitCode = item.exit_code;
+                        if (out) {
+                            accumulated += (accumulated ? '\n\n' : '') + '```\n' + out + '\n```';
+                            callbacks.onText(accumulated);
+                        }
+                        const exitMsg = `\n\n✓ 命令执行完成 (exit ${exitCode ?? 0})`;
+                        accumulated += exitMsg;
+                        callbacks.onText(accumulated);
+                    }
+                }
+                return;
+            }
+            if (itemType === 'file_change' && type === 'item.completed') {
+                const changes = item.changes;
+                const toolName = 'Edit';
+                toolStats[toolName] = (toolStats[toolName] || 0) + 1;
+                callbacks.onToolUse?.(toolName, { changes });
+                return;
+            }
+            if (itemType === 'mcp_tool_call' && type === 'item.started') {
+                const tool = item.tool;
+                const server = item.server;
+                if (tool) {
+                    const displayName = server ? `${server}/${tool}` : tool;
+                    toolStats[displayName] = (toolStats[displayName] || 0) + 1;
+                    callbacks.onToolUse?.(displayName, item.arguments);
+                }
+                return;
+            }
+            if (itemType === 'agent_message' && type === 'item.completed') {
+                const text = item.text;
+                if (text) {
+                    accumulated += (accumulated ? '\n\n' : '') + text;
+                    callbacks.onText(accumulated);
+                }
+                return;
+            }
+        }
+        if (type === 'turn.completed') {
+            completed = true;
+            if (timeoutHandle)
+                clearTimeout(timeoutHandle);
+            const usage = event.usage;
+            const durationMs = Date.now() - startTime;
+            callbacks.onComplete({
+                success: true,
+                result: accumulated,
+                accumulated,
+                cost: 0,
+                durationMs,
+                numTurns: 1,
+                toolStats,
+            });
+        }
+    });
+    let exitCode = null;
+    let rlClosed = false;
+    let childClosed = false;
+    const finalize = () => {
+        if (!rlClosed || !childClosed)
+            return;
+        if (timeoutHandle)
+            clearTimeout(timeoutHandle);
+        if (!completed) {
+            if (exitCode !== null && exitCode !== 0) {
+                let errMsg = '';
+                if (stderrTotal > 0) {
+                    if (!stderrHeadFull) {
+                        errMsg = stderrHead;
+                    }
+                    else if (stderrTotal <= MAX_STDERR_HEAD + MAX_STDERR_TAIL) {
+                        errMsg = stderrHead + stderrTail.slice(stderrTail.length - (stderrTotal - MAX_STDERR_HEAD));
+                    }
+                    else {
+                        errMsg =
+                            stderrHead +
+                                `\n\n... (省略 ${stderrTotal - MAX_STDERR_HEAD - MAX_STDERR_TAIL} 字节) ...\n\n` +
+                                stderrTail;
+                    }
+                }
+                if (sessionId &&
+                    (errMsg.includes("No session found") ||
+                        errMsg.includes("No conversation found") ||
+                        errMsg.includes("Unable to find session"))) {
+                    callbacks.onSessionInvalid?.();
+                }
+                callbacks.onError(errMsg || `Codex CLI exited with code ${exitCode}`);
+            }
+            else {
+                callbacks.onComplete({
+                    success: true,
+                    result: accumulated,
+                    accumulated,
+                    cost: 0,
+                    durationMs: Date.now() - startTime,
+                    numTurns: 0,
+                    toolStats,
+                });
+            }
+        }
+    };
+    child.on('close', (code) => {
+        log.info(`Codex CLI closed: exitCode=${code}, pid=${child.pid}`);
+        exitCode = code;
+        childClosed = true;
+        finalize();
+    });
+    rl.on('close', () => {
+        rlClosed = true;
+        finalize();
+    });
+    child.on('error', (err) => {
+        const errorCode = err.code;
+        log.error(`Codex CLI spawn error: ${err.message}, code=${errorCode}, path=${cliPath}`);
+        if (timeoutHandle)
+            clearTimeout(timeoutHandle);
+        if (!completed) {
+            completed = true;
+            callbacks.onError(`Failed to start Codex CLI: ${err.message}`);
+        }
+        childClosed = true;
+        finalize();
+    });
+    return {
+        abort: () => {
+            if (timeoutHandle)
+                clearTimeout(timeoutHandle);
+            rl.close();
+            if (!child.killed)
+                child.kill('SIGTERM');
+        },
+    };
+}

package/dist/commands/handler.d.ts

@@ -31,7 +31,7 @@ export declare class CommandHandler {
     private handleCd;
     private handleAllow;
     private handleDeny;
-    private getClaudeVersion;
+    private getAiVersion;
 }
 /**
  * 列出目录并返回目录信息

package/dist/commands/handler.js

@@ -107,7 +107,7 @@ export class CommandHandler {
         return true;
     }
     async handleStatus(chatId, userId) {
-        const version = await this.getClaudeVersion();
+        const version = await this.getAiVersion();
         const workDir = this.deps.sessionManager.getWorkDir(userId);
         const convId = this.deps.sessionManager.getConvId(userId);
         const sessionId = this.deps.sessionManager.getSessionIdForConv(userId, convId);
@@ -166,9 +166,14 @@ export class CommandHandler {
         }
         return true;
     }
-    getClaudeVersion() {
+    getAiVersion() {
+        const cmd = this.deps.config.aiCommand === 'cursor'
+            ? this.deps.config.cursorCliPath
+            : this.deps.config.aiCommand === 'codex'
+                ? this.deps.config.codexCliPath
+                : this.deps.config.claudeCliPath;
         return new Promise((resolve) => {
-            execFile(this.deps.config.claudeCliPath, ['--version'], { timeout: 5000 }, (err, stdout) => {
+            execFile(cmd, ['--version'], { timeout: 5000 }, (err, stdout) => {
                 resolve(err ? '未知' : (stdout?.toString().trim() || '未知'));
             });
         });