oh-my-knowledge 0.48.0 → 0.49.0

package/dist/executors/codex-cli-trace.js

@@ -1,3 +1,5 @@
+import { safeSliceForJson } from '../util/safe-slice.js';
+import { normalizeToolIdentity } from '../shared/tool-identity.js';
 // Codex CLI(codex 0.125)`exec --json` 事件流 → omk trace 抽取器。
 // 跟 claude-sdk-trace.ts 不同源:
 //   Claude SDK 是 message[block] 嵌套结构,有 tool_use / tool_result 配对;
@@ -7,45 +9,134 @@
 // schema(基于 codex 0.125 实测,fixture 测试锁住假设;漂移时 fixture 先红):
 //   - {type:'thread.started' | 'turn.started'} 划 turn 边界
 //   - {type:'turn.completed', usage} / {type:'turn.failed', error} 收尾
-//   - {type:'item.started', item:{type, status:'in_progress', ...}} 是 in_progress 占位 → 跳过
+//   - {type:'item.started', item:{type, status:'in_progress', ...}} 暂存；缺 completed 时保留为 unknown
 //   - {type:'item.completed', item:{type:'agent_message', text:'...'}} → assistant 文本
 //   - {type:'item.completed', item:{type:'command_execution', command, aggregated_output, exit_code, status}} → ToolCallInfo
-//   - 其他 item.type(file_read/file_write/web_search 等)best-effort 抽 input/output
-// codex 无 sub-agent 概念,numSubAgents 恒 0。字段缺失静默 skip 不 throw。
+//   - 其他 item.type(file_read/file_write/web_search/agent tools 等)best-effort 抽 input/output
+// 子代理统计只认事件流里的具体 spawn 工具事实；旧协议没有这类事件时自然为 0。
 const TOOL_INPUT_LIMIT = 500;
 const TOOL_OUTPUT_LIMIT = 500;
 export function isCodexResultEvent(event) {
     return event.type === 'turn.completed' || event.type === 'turn.failed';
 }
 function extractToolInput(item, itemType) {
-    if (itemType === 'command_execution')
-        return (item.command || '').slice(0, TOOL_INPUT_LIMIT);
-    if (itemType === 'file_read' || itemType === 'file_write')
-        return item.path || null;
+    if (itemType === 'command_execution') {
+        return { command: safeSliceForJson(item.command || '', TOOL_INPUT_LIMIT, '') };
+    }
+    if (itemType === 'file_read' || itemType === 'file_write') {
+        return { file_path: item.path || null };
+    }
+    if (itemType === 'file_change') {
+        return item.changes?.slice(0, 50).map((change) => ({
+            path: safeSliceForJson(change.path || '', TOOL_INPUT_LIMIT, ''),
+            ...(change.changeKind && { kind: change.changeKind }),
+        })) ?? [];
+    }
     if (itemType === 'web_search')
-        return item.query || null;
+        return { query: item.query || null };
+    if (itemType === 'mcp_tool_call')
+        return item.arguments ?? null;
     return null;
 }
+function stringifyToolValue(value) {
+    try {
+        const json = JSON.stringify(value);
+        return safeSliceForJson(json ?? String(value), TOOL_OUTPUT_LIMIT, '');
+    }
+    catch {
+        return safeSliceForJson(String(value), TOOL_OUTPUT_LIMIT, '');
+    }
+}
 function extractToolOutput(item, itemType) {
     if (itemType === 'command_execution' && item.aggregated_output) {
-        return item.aggregated_output.slice(0, TOOL_OUTPUT_LIMIT);
+        return safeSliceForJson(item.aggregated_output, TOOL_OUTPUT_LIMIT, '');
     }
     if (itemType === 'file_read' && item.content)
-        return item.content.slice(0, TOOL_OUTPUT_LIMIT);
+        return safeSliceForJson(item.content, TOOL_OUTPUT_LIMIT, '');
+    if (itemType === 'file_change')
+        return item.status || '';
+    if (itemType === 'mcp_tool_call') {
+        if (item.error?.message)
+            return safeSliceForJson(item.error.message, TOOL_OUTPUT_LIMIT, '');
+        if (item.result !== undefined)
+            return stringifyToolValue(item.result);
+    }
+    if (itemType === 'error' && item.message)
+        return safeSliceForJson(item.message, TOOL_OUTPUT_LIMIT, '');
     if (item.results)
-        return JSON.stringify(item.results).slice(0, TOOL_OUTPUT_LIMIT);
+        return stringifyToolValue(item.results);
     return '';
 }
+function codexItemStatus(event, item) {
+    if (event.error
+        || item.error
+        || item.type === 'error'
+        || (typeof item.exit_code === 'number' && item.exit_code !== 0))
+        return 'failure';
+    const status = item.status?.toLowerCase();
+    if (status === 'failed' || status === 'error')
+        return 'failure';
+    if (status === 'cancelled' || status === 'canceled')
+        return 'cancelled';
+    if (status === 'completed'
+        || status === 'complete'
+        || status === 'success'
+        || status === 'succeeded')
+        return 'success';
+    if (status)
+        return 'unknown';
+    if (typeof item.exit_code === 'number' && item.exit_code === 0)
+        return 'success';
+    // `item.completed` is the legacy success signal when older Codex events omit
+    // item.status. Keep that compatibility while preferring explicit status above.
+    return 'success';
+}
 export function extractCodexTrace(events) {
     const turns = [];
     const toolCalls = [];
     let fullNumTurns = 0;
-    // codex 没有 Agent 工具(像 Claude 的 sub-agent),恒 0
-    const numSubAgents = 0;
+    let numSubAgents = 0;
     let currentTurnText = '';
     let currentTurnTools = [];
     let currentTurnHasContent = false;
     let lastTurnTs;
+    const pendingItems = new Map();
+    const appendToolCall = (item, status, statusSource, callInstanceId) => {
+        const itemType = item.type;
+        if (!itemType || isNonToolItem(itemType))
+            return;
+        if (isAgentSpawnItem(item))
+            numSubAgents += 1;
+        const toolIdentity = normalizeToolIdentity({
+            sourceName: itemType,
+            provider: itemType === 'mcp_tool_call' ? item.server : undefined,
+            authoritativeName: itemType === 'mcp_tool_call' ? item.tool ?? item.name : undefined,
+        });
+        const tc = {
+            tool: toolIdentity.name,
+            ...(toolIdentity.sourceName ? { sourceTool: toolIdentity.sourceName } : {}),
+            ...(toolIdentity.namespace ? { toolNamespace: toolIdentity.namespace } : {}),
+            ...(toolIdentity.provider ? { toolProvider: toolIdentity.provider } : {}),
+            input: extractToolInput(item, itemType),
+            output: extractToolOutput(item, itemType),
+            status,
+            statusSource,
+            success: status === 'success',
+            callInstanceId,
+            toolUseId: item.id,
+        };
+        currentTurnTools.push(tc);
+        toolCalls.push(tc);
+        currentTurnHasContent = true;
+    };
+    const materializePendingItems = () => {
+        for (const queue of pendingItems.values()) {
+            for (const pending of queue) {
+                appendToolCall(pending.item, 'unknown', 'unknown', pending.callInstanceId);
+            }
+        }
+        pendingItems.clear();
+    };
     const flushTurn = (closingEvent) => {
         if (!currentTurnHasContent && currentTurnTools.length === 0)
             return;
@@ -65,11 +156,13 @@ export function extractCodexTrace(events) {
         if (closingEvent?.ts)
             lastTurnTs = closingEvent.ts;
     };
-    for (const event of events) {
+    for (let eventIndex = 0; eventIndex < events.length; eventIndex += 1) {
+        const event = events[eventIndex];
         const t = event.type;
         if (!t)
             continue;
         if (t === 'thread.started' || t === 'turn.started') {
+            materializePendingItems();
             if (currentTurnHasContent || currentTurnTools.length > 0)
                 flushTurn();
             if (event.ts)
@@ -77,25 +170,59 @@ export function extractCodexTrace(events) {
             continue;
         }
         if (t === 'turn.completed') {
+            materializePendingItems();
             flushTurn(event);
             continue;
         }
         if (t === 'turn.failed') {
-            if (currentTurnTools.length > 0) {
-                currentTurnTools[currentTurnTools.length - 1].success = false;
-            }
+            materializePendingItems();
             flushTurn(event);
             continue;
         }
-        // 只关心 item.completed —— item.started 是 in_progress 占位,后面会被 completed 覆盖
+        if (t === 'item.started') {
+            const item = event.item;
+            if (item?.id && item.type && item.type !== 'agent_message') {
+                const pending = pendingItems.get(item.id) ?? [];
+                pending.push({
+                    item,
+                    callInstanceId: `codex-exec:${eventIndex}:started`,
+                });
+                pendingItems.set(item.id, pending);
+            }
+            continue;
+        }
+        if (t === 'item.updated') {
+            const item = event.item;
+            if (item?.id && item.type && item.type !== 'agent_message') {
+                const pending = pendingItems.get(item.id);
+                const current = pending?.at(-1);
+                if (current) {
+                    current.item = { ...current.item, ...item };
+                }
+                else {
+                    pendingItems.set(item.id, [{
+                            item,
+                            callInstanceId: `codex-exec:${eventIndex}:updated`,
+                        }]);
+                }
+            }
+            continue;
+        }
         if (t !== 'item.completed')
             continue;
         const item = event.item;
         if (!item || !item.type)
             continue;
-        const itemType = item.type;
+        const pendingQueue = item.id ? pendingItems.get(item.id) : undefined;
+        const started = pendingQueue?.shift();
+        if (item.id && pendingQueue?.length === 0)
+            pendingItems.delete(item.id);
+        const completedItem = started
+            ? { ...started.item, ...item, status: item.status }
+            : item;
+        const itemType = completedItem.type;
         if (itemType === 'agent_message') {
-            const txt = item.text || '';
+            const txt = completedItem.text || '';
             if (txt) {
                 if (currentTurnText)
                     currentTurnText += '\n';
@@ -104,19 +231,27 @@ export function extractCodexTrace(events) {
             }
             continue;
         }
-        // 其他 item type 当 tool call
-        const isError = !!event.error || (typeof item.exit_code === 'number' && item.exit_code !== 0);
-        const tc = {
-            tool: itemType,
-            input: extractToolInput(item, itemType),
-            output: extractToolOutput(item, itemType),
-            success: !isError,
-        };
-        currentTurnTools.push(tc);
-        toolCalls.push(tc);
-        currentTurnHasContent = true;
+        const status = codexItemStatus(event, completedItem);
+        appendToolCall(completedItem, status, 'runtime', started?.callInstanceId ?? `codex-exec:${eventIndex}:completed`);
     }
     // 流末尾 flush(防止最后一个 turn 没 turn.completed 收尾)
+    materializePendingItems();
     flushTurn();
     return { turns, toolCalls, fullNumTurns, numSubAgents };
 }
+function isAgentSpawnItem(item) {
+    const identity = [
+        item.type,
+        item.server,
+        item.tool,
+        item.name,
+    ].filter((value) => typeof value === 'string').join(' ').toLowerCase();
+    return /(?:^|[^a-z0-9])(?:spawn|create|start)[_-]?(?:sub)?agent(?:$|[^a-z0-9])/.test(identity)
+        || /^(?:agent|subagent|task)$/.test(item.type?.toLowerCase() ?? '');
+}
+function isNonToolItem(itemType) {
+    return itemType === 'agent_message'
+        || itemType === 'reasoning'
+        || itemType === 'todo_list'
+        || itemType === 'error';
+}

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

@@ -1,14 +1,12 @@
 import type { ExecResult, ExecutorInput } from '../types/index.js';
 import type { CodexEvent } from './shared.js';
+export { extractCodexFinalOutput, extractCodexProtocolError, extractCodexStopReason, extractCodexUsage, sumCodexElapsed, } from './codex-protocol.js';
 export declare function isolateCodexCwd(allowedSkills: string[] | undefined, cwd: string | null | undefined, executorName?: string): void;
-export declare function extractCodexUsage(events: CodexEvent[]): {
-    input: number;
-    cached: number;
-    output: number;
-};
-export declare function extractCodexFinalOutput(events: CodexEvent[]): string;
-export declare function extractCodexStopReason(events: CodexEvent[]): string;
-export declare function sumCodexElapsed(resultEvents: CodexEvent[], wallClock: number): number;
+export interface CodexJsonlParseResult {
+    events: CodexEvent[];
+    malformedLineCount: number;
+}
+export declare function parseCodexJsonl(stdout: string): CodexJsonlParseResult;
 export declare function buildCodexArgs({ model, cwd, prompt }: {
     model: string;
     cwd?: string | null;

package/dist/executors/codex-cli.js

@@ -1,12 +1,13 @@
-import { extractCodexTrace, isCodexResultEvent } from './codex-cli-trace.js';
-import { buildExecEnv, DEFAULT_TIMEOUT_MS, errorMessage, interruptedExecResult, MAX_BUFFER, spawnWithSigintPropagation, timeoutExecResult, } from './shared.js';
+import { buildCodexResult } from './codex-protocol.js';
+import { buildExecEnv, DEFAULT_TIMEOUT_MS, errorMessage, interruptedExecResult, MAX_BUFFER, normalizeCodexProtocolEvent, spawnWithSigintPropagation, timeoutExecResult, } from './shared.js';
+export { extractCodexFinalOutput, extractCodexProtocolError, extractCodexStopReason, extractCodexUsage, sumCodexElapsed, } from './codex-protocol.js';
 // codex CLI(0.125)隔离能力对比 claude-cli:
 //   Claude:三条 channel(SDK skills auto-discovery / subagent Skill 工具 /
 //          cwd 文件系统),`--disable-slash-commands` + `--disallowedTools Skill`
 //          堵前两条,cwd 切空目录堵第三条
-//   Codex:无 SDK 等价 channel(它就是 CLI 不是 SDK),无 subagent Skill 等价
-//          (没有 Agent 工具),只剩 cwd 文件系统这一条 channel(`-C/--cd`)
-//          → AGENTS.md / .agents/skills/ 自动加载只能靠 cwd 切到隔离空目录避免
+//   Codex:CLI / SDK 的项目指令、skills 与可能的子线程都以 cwd 工作区为
+//          发现边界；`-C/--cd` 是可验证的隔离控制面。因此把 cwd 切到
+//          隔离空目录，统一阻断 AGENTS.md / .agents/skills/ 自动加载。
 //
 //   undefined         → 不传 -C(原行为,看 cwd 里有什么 codex 自己决定)
 //   []                → 必须提供 cwd 非空(否则 throw),caller 应传一个
@@ -19,11 +20,10 @@ export function isolateCodexCwd(allowedSkills, cwd, executorName = 'codex-cli')
         throw new Error(`skill 白名单(allowedSkills=${JSON.stringify(allowedSkills)})不再支持:非空白名单无法真正隔离。\n`
             + `  仅支持 [](强制 cwd 隔离,需提供 cwd 非空,全封死)或 undefined(不隔离)。`);
     }
-    // allowedSkills === [] 时必须有 cwd(channel 3 cwd 隔离是 codex 唯一 channel)
+    // allowedSkills === [] 时必须有 cwd；工作区隔离是 Codex 的控制面。
     if (!cwd) {
-        throw new Error(`${executorName} executor allowedSkills=[] 需要提供 cwd 非空(channel 3 cwd 隔离)。\n`
-            + '  codex 没有 SDK skill 自动发现 / subagent Skill 工具这两条 channel,\n'
-            + '  cwd 文件系统隔离是它唯一能堵 AGENTS.md / .agents/skills/ 自动加载的途径。\n'
+        throw new Error(`${executorName} executor allowedSkills=[] 需要提供 cwd 非空（工作区隔离）。\n`
+            + '  主线程与可能的子线程都会继承工作区上下文；必须用隔离 cwd 阻断 AGENTS.md / .agents/skills/ 自动加载。\n'
             + '  caller 应传一个 isolated 空目录(如 ~/.oh-my-knowledge/state/isolated-cwd/)。');
     }
 }
@@ -32,67 +32,37 @@ export function isolateCodexCwd(allowedSkills, cwd, executorName = 'codex-cli')
 // 每次都打两行会让 stderr 被同样文本刷屏(140-280 行)。模块级 flag 一个 process 只打一次。
 let hasWarnedSystem = false;
 let hasWarnedCost = false;
-function parseCodexJsonl(stdout) {
+export function parseCodexJsonl(stdout) {
     const events = [];
+    let malformedLineCount = 0;
     for (const line of stdout.split('\n')) {
         const trimmed = line.trim();
         if (!trimmed)
             continue;
         try {
-            events.push(JSON.parse(trimmed));
+            const value = JSON.parse(trimmed);
+            if (!value || typeof value !== 'object' || Array.isArray(value)) {
+                malformedLineCount += 1;
+                continue;
+            }
+            const event = normalizeCodexProtocolEvent(value);
+            if (!event
+                || typeof event.type !== 'string'
+                || event.type.trim() === ''
+                || (event.type.startsWith('item.')
+                    && (!event.item
+                        || typeof event.item.type !== 'string'
+                        || event.item.type.trim() === ''))) {
+                malformedLineCount += 1;
+                continue;
+            }
+            events.push(event);
+        }
+        catch {
+            malformedLineCount += 1;
         }
-        catch { /* skip non-JSON lines */ }
-    }
-    return events;
-}
-export function extractCodexUsage(events) {
-    let input = 0;
-    let cached = 0;
-    let output = 0;
-    for (const e of events) {
-        if (!isCodexResultEvent(e) || !e.usage)
-            continue;
-        input += e.usage.input_tokens || 0;
-        cached += e.usage.cached_input_tokens || 0;
-        output += e.usage.output_tokens || 0;
-    }
-    return { input, cached, output };
-}
-// exported for unit tests
-export function extractCodexFinalOutput(events) {
-    // 抓 item.completed + item.type='agent_message' 的 text 全部拼起来。
-    // codex 同 turn 内可能 emit 多条 agent_message(如 "step 1" / "step 2" / "final answer"),
-    // 取最后一条会让 grader / assertion / LLM judge 只看到最后片段,跟 extractCodexTrace
-    // 把多条拼到 turn.content 的语义不一致(test/executors/codex-cli-trace.test.ts:120-130 锁住)。
-    // 一致化:final output 也拼,跟 trace UI 看到的内容对齐。
-    const allTexts = [];
-    for (const e of events) {
-        if (e.type !== 'item.completed')
-            continue;
-        if (e.item?.type !== 'agent_message')
-            continue;
-        const txt = e.item.text;
-        if (txt)
-            allTexts.push(txt);
     }
-    return allTexts.join('\n');
-}
-export function extractCodexStopReason(events) {
-    const last = [...events].reverse().find((e) => isCodexResultEvent(e));
-    if (!last)
-        return 'unknown';
-    if (last.type === 'turn.failed')
-        return 'error';
-    return last.stop_reason || 'end_turn';
-}
-// codex 每个 turn.completed 携带本 turn 的 elapsed_ms(per-turn delta),
-// 跟 extractCodexUsage 把 token 累加多 turn 是同一语义假设(events 是 per-turn delta,
-// 不是 cumulative)。multi-turn 只取最后一条会漏算前面 turn 的耗时。fallback:
-// 累加为 0 / 全部缺失时退到 wall-clock,避免 elapsed_ms===0 单 turn 抹平 duration。
-// exported for unit tests
-export function sumCodexElapsed(resultEvents, wallClock) {
-    const total = resultEvents.reduce((s, e) => s + (e.elapsed_ms ?? 0), 0);
-    return total > 0 ? total : wallClock;
+    return { events, malformedLineCount };
 }
 // exported for arg-shape regression tests
 export function buildCodexArgs({ model, cwd, prompt }) {
@@ -104,6 +74,7 @@ export function buildCodexArgs({ model, cwd, prompt }) {
         '--json',
         '--ephemeral', // 不持久化 session 文件
         '--ignore-user-config', // 不读 $CODEX_HOME/config.toml
+        '--ignore-rules', // 不让用户 / 项目 execpolicy 改写工具行为
         '--skip-git-repo-check', // 允许 isolated cwd 不是 git 仓库
         '--sandbox', 'read-only', // 评测场景不需要写文件
         '-c', 'approval_policy="never"', // non-interactive 必须;TOML 字符串需要 quote
@@ -155,53 +126,13 @@ export async function codexCliExecutor({ model, system, prompt, cwd, skillDir, t
             ...(cwd && { cwd }),
         });
         const durationMs = Date.now() - start;
-        const events = parseCodexJsonl(stdout);
-        const resultEvents = events.filter(isCodexResultEvent);
-        if (resultEvents.length === 0) {
-            return {
-                ok: false,
-                error: 'no turn.completed/turn.failed event in codex --json output',
-                durationMs,
-                durationApiMs: 0,
-                inputTokens: 0,
-                outputTokens: 0,
-                cacheReadTokens: 0,
-                cacheCreationTokens: 0,
-                costUSD: 0,
-                costReportedByExecutor: false,
-                output: null,
-                stopReason: 'error',
-                numTurns: 0,
-            };
-        }
-        const last = resultEvents[resultEvents.length - 1];
-        const usage = extractCodexUsage(events);
-        const trace = extractCodexTrace(events);
-        const stopReason = extractCodexStopReason(events);
-        const finalOutput = extractCodexFinalOutput(events);
-        const ok = last.type !== 'turn.failed' && !last.error;
-        return {
-            ok,
-            // multi-turn 累加 elapsed_ms(per-turn delta);全 0 fallback wall-clock。详见 sumCodexElapsed
-            durationMs: sumCodexElapsed(resultEvents, durationMs),
-            durationApiMs: 0, // codex 不报 API duration
-            inputTokens: usage.input,
-            outputTokens: usage.output,
-            cacheReadTokens: usage.cached,
-            cacheCreationTokens: 0, // codex 不报 cache creation
-            costUSD: 0, // 占位:codex 0.125 binary 不输出 cost
-            costReportedByExecutor: false, // renderer 据此显示「未报告」而非 $0.0000
-            output: finalOutput,
-            stopReason,
-            // success path:ok=false(turn.failed)时透传 last.error.message 给 caller 看到
-            // 失败原因。catch path 历史上已经透传(对称化)。
-            ...(!ok && { error: last.error?.message || 'codex turn.failed' }),
-            numTurns: resultEvents.length,
-            fullNumTurns: trace.fullNumTurns,
-            numSubAgents: trace.numSubAgents,
-            ...(trace.turns.length > 0 && { turns: trace.turns }),
-            ...(trace.toolCalls.length > 0 && { toolCalls: trace.toolCalls }),
-        };
+        const parsed = parseCodexJsonl(stdout);
+        return buildCodexResult({
+            events: parsed.events,
+            wallClockDurationMs: durationMs,
+            source: 'codex --json',
+            malformedLineCount: parsed.malformedLineCount,
+        });
     }
     catch (err) {
         const durationMs = Date.now() - start;
@@ -210,47 +141,14 @@ export async function codexCliExecutor({ model, system, prompt, cwd, skillDir, t
             return { ...timeoutExecResult(timeoutMs, durationMs), costReportedByExecutor: false };
         if (details.killedBySignal)
             return { ...interruptedExecResult(durationMs), costReportedByExecutor: false };
-        // 尝试从 stdout parse 部分结果(同 claude-cli 防御性写法)
-        const events = parseCodexJsonl(details.stdout || '');
-        const resultEvents = events.filter(isCodexResultEvent);
-        if (resultEvents.length > 0) {
-            const last = resultEvents[resultEvents.length - 1];
-            const usage = extractCodexUsage(events);
-            const trace = extractCodexTrace(events);
-            return {
-                ok: false,
-                error: last.error?.message || errorMessage(err),
-                durationMs: sumCodexElapsed(resultEvents, durationMs),
-                durationApiMs: 0,
-                inputTokens: usage.input,
-                outputTokens: usage.output,
-                cacheReadTokens: usage.cached,
-                cacheCreationTokens: 0,
-                costUSD: 0,
-                costReportedByExecutor: false,
-                output: extractCodexFinalOutput(events) || null,
-                stopReason: 'error',
-                numTurns: resultEvents.length,
-                fullNumTurns: trace.fullNumTurns,
-                numSubAgents: trace.numSubAgents,
-                ...(trace.turns.length > 0 && { turns: trace.turns }),
-                ...(trace.toolCalls.length > 0 && { toolCalls: trace.toolCalls }),
-            };
-        }
-        return {
-            ok: false,
-            error: errorMessage(err),
-            durationMs,
-            durationApiMs: 0,
-            inputTokens: 0,
-            outputTokens: 0,
-            cacheReadTokens: 0,
-            cacheCreationTokens: 0,
-            costUSD: 0,
-            costReportedByExecutor: false,
-            output: null,
-            stopReason: 'error',
-            numTurns: 0,
-        };
+        // 失败路径仍保留已完成的事件、用量与 trace，但不能反转为成功。
+        const parsed = parseCodexJsonl(details.stdout || '');
+        return buildCodexResult({
+            events: parsed.events,
+            wallClockDurationMs: durationMs,
+            source: 'codex --json',
+            malformedLineCount: parsed.malformedLineCount,
+            forcedError: details.stderr?.trim() || errorMessage(err),
+        });
     }
 }

package/dist/executors/codex-protocol.d.ts

@@ -0,0 +1,24 @@
+import type { ExecResult } from '../types/index.js';
+import type { CodexEvent } from './shared.js';
+export declare function extractCodexUsage(events: CodexEvent[]): {
+    input: number;
+    cached: number;
+    output: number;
+};
+/**
+ * Match @openai/codex-sdk's `finalResponse`: the latest completed
+ * agent_message is the answer. Earlier messages remain available in `turns`.
+ */
+export declare function extractCodexFinalOutput(events: CodexEvent[]): string;
+export declare function extractCodexProtocolError(events: CodexEvent[]): string | undefined;
+export declare function validateCodexProtocol(events: CodexEvent[]): string | undefined;
+export declare function extractCodexStopReason(events: CodexEvent[]): string;
+export declare function sumCodexElapsed(resultEvents: CodexEvent[], wallClock: number): number;
+export interface BuildCodexResultOptions {
+    events: CodexEvent[];
+    wallClockDurationMs: number;
+    source: 'codex --json' | 'codex-sdk';
+    malformedLineCount?: number;
+    forcedError?: string;
+}
+export declare function buildCodexResult({ events, wallClockDurationMs, source, malformedLineCount, forcedError, }: BuildCodexResultOptions): ExecResult;