@wu529778790/open-im 1.11.8-beta.24 → 1.11.8-beta.25

package/dist/codex/cli-runner.js

@@ -217,22 +217,27 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
         const event = parseCodexEvent(line);
         if (!event)
             return;
-        const type = event.type;
-        log.debug(`[Codex event] type=${type}`);
-        if (type === 'thread.started') {
-            const threadId = event.thread_id ?? '';
+        // Codex CLI JSONL 格式是嵌套的：顶层 type 为 "event_msg" / "response_item"，
+        // 真正的子类型在 payload.type 里。旧版扁平格式也兼容。
+        const topType = event.type;
+        const payload = event.payload ?? event;
+        const type = payload.type ?? topType;
+        log.debug(`[Codex event] topType=${topType} type=${type}`);
+        // thread.started / session_meta → 拿 session ID
+        if (type === 'thread.started' || type === 'session_meta') {
+            const threadId = payload.thread_id ?? payload.session_id ?? event.thread_id ?? '';
             if (threadId)
                 callbacks.onSessionId?.(threadId);
             return;
         }
         if (type === 'turn.failed') {
             completed = true;
-            const err = event.error;
+            const err = payload.error ?? event.error;
             callbacks.onError(err?.message ?? 'Codex turn failed');
             return;
         }
         if (type === 'error') {
-            const msg = event.message;
+            const msg = payload.message ?? event.message;
             if (msg?.includes('Reconnecting')) {
                 return;
             }
@@ -240,12 +245,12 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
             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') {
+        // item 事件：payload 里可能有 item 字段，或者 payload 本身就是 item
+        if (topType === 'response_item' || type === 'item.started' || type === 'item.updated' || type === 'item.completed') {
+            const item = payload.item ?? payload;
+            const itemType = item.type ?? type;
+            if (itemType === 'reasoning') {
+                // Codex 的 reasoning 可能是 encrypted_content（不可读），只在有 text 时累加
                 const text = item.text;
                 if (text) {
                     accumulatedThinking += (accumulatedThinking ? '\n\n' : '') + text;
@@ -253,23 +258,41 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
                 }
                 return;
             }
+            // function_call（Codex 新格式：response_item.type=function_call）
+            if (itemType === 'function_call') {
+                const name = item.name ?? 'unknown';
+                const args = item.arguments;
+                const toolName = name === 'exec_command' ? 'Bash' : name === 'apply_patch' ? 'Edit' : name;
+                toolStats[toolName] = (toolStats[toolName] || 0) + 1;
+                callbacks.onToolUse?.(toolName, args ? { arguments: args } : {});
+                return;
+            }
+            // custom_tool_call（apply_patch 等）
+            if (itemType === 'custom_tool_call') {
+                const name = item.name ?? 'unknown';
+                const toolName = name === 'apply_patch' ? 'Edit' : name;
+                toolStats[toolName] = (toolStats[toolName] || 0) + 1;
+                callbacks.onToolUse?.(toolName, { input: item.input });
+                return;
+            }
+            // command_execution（旧格式）
             if (itemType === 'command_execution') {
                 const cmd = item.command;
-                if (cmd && type === 'item.started') {
-                    const toolName = 'Bash';
-                    toolStats[toolName] = (toolStats[toolName] || 0) + 1;
-                    callbacks.onToolUse?.(toolName, { command: cmd });
+                if (cmd) {
+                    toolStats['Bash'] = (toolStats['Bash'] || 0) + 1;
+                    callbacks.onToolUse?.('Bash', { command: cmd });
                 }
                 return;
             }
-            if (itemType === 'file_change' && type === 'item.completed') {
+            // file_change（旧格式）
+            if (itemType === 'file_change') {
                 const changes = item.changes;
-                const toolName = 'Edit';
-                toolStats[toolName] = (toolStats[toolName] || 0) + 1;
-                callbacks.onToolUse?.(toolName, { changes });
+                toolStats['Edit'] = (toolStats['Edit'] || 0) + 1;
+                callbacks.onToolUse?.('Edit', { changes });
                 return;
             }
-            if (itemType === 'mcp_tool_call' && type === 'item.started') {
+            // mcp_tool_call（旧格式）
+            if (itemType === 'mcp_tool_call') {
                 const tool = item.tool;
                 const server = item.server;
                 if (tool) {
@@ -279,16 +302,41 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
                 }
                 return;
             }
-            if (itemType === 'agent_message' && type === 'item.completed') {
-                const text = item.text;
+            // agent_message / message — 最终回复文本
+            // Codex 新格式：event_msg.payload.type=agent_message, payload.message=文本
+            //              response_item.payload.type=message, payload.content=[{type:output_text,text:...}]
+            if (itemType === 'agent_message' || itemType === 'message') {
+                let text;
+                if (itemType === 'agent_message') {
+                    text = item.message ?? item.text;
+                }
+                else {
+                    // message 类型，content 是数组
+                    const content = item.content;
+                    if (Array.isArray(content)) {
+                        text = content
+                            .filter((c) => c.type === 'output_text' && c.text)
+                            .map((c) => c.text)
+                            .join('\n');
+                    }
+                }
                 if (text) {
+                    // 只累加 final_answer 或 commentary，避免重复
+                    const phase = item.phase ?? payload.phase;
                     accumulated += (accumulated ? '\n\n' : '') + text;
                     callbacks.onText(accumulated);
                 }
                 return;
             }
         }
-        if (type === 'turn.completed') {
+        // task_complete / turn.completed
+        if (type === 'task_complete' || type === 'turn.completed') {
+            // task_complete 里可能有 last_agent_message
+            const lastMsg = payload.last_agent_message;
+            if (lastMsg && !accumulated) {
+                accumulated = lastMsg;
+                callbacks.onText(accumulated);
+            }
             completed = true;
             callbacks.onComplete({
                 success: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.11.8-beta.24",
+  "version": "1.11.8-beta.25",
   "description": "Your AI coding assistant, in every chat app. Multi-platform IM bridge for Claude Code, Codex, and CodeBuddy.",
   "type": "module",
   "main": "dist/index.js",