oh-my-knowledge 0.22.0 → 0.24.0

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

@@ -0,0 +1,254 @@
+import { extractCodexTrace, isCodexResultEvent } from './codex-cli-trace.js';
+import { buildExecEnv, DEFAULT_TIMEOUT_MS, errorMessage, interruptedExecResult, MAX_BUFFER, spawnWithSigintPropagation, timeoutExecResult, } from './shared.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 切到隔离空目录避免
+//
+//   undefined         → 不传 -C(原行为,看 cwd 里有什么 codex 自己决定)
+//   []                → 必须提供 cwd 非空(否则 throw),caller 应传一个
+//                       isolated 空目录(如 ~/.oh-my-knowledge/isolated-cwd/)
+//   [...] (length>0)  → throw,codex CLI 没有 partial 白名单 flag
+export function isolateCodexCwd(allowedSkills, cwd, executorName = 'codex-cli') {
+    if (allowedSkills === undefined)
+        return;
+    if (allowedSkills.length > 0) {
+        throw new Error(`${executorName} executor 不支持 partial skill 白名单(allowedSkills=${JSON.stringify(allowedSkills)})。\n`
+            + `  仅支持 [](强制 cwd 隔离,需提供 cwd 非空)或 undefined(默认)。\n`
+            + `  codex CLI 无 partial 白名单 flag,请改用其他 executor 或显式 cwd 隔离。`);
+    }
+    // allowedSkills === [] 时必须有 cwd(channel 3 cwd 隔离是 codex 唯一 channel)
+    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'
+            + '  caller 应传一个 isolated 空目录(如 ~/.oh-my-knowledge/isolated-cwd/)。');
+    }
+}
+// codex 的 verbose 降级提示是 binary 能力快照(无 --system-prompt flag / 不报 cost),
+// 不会逐次调用变化。executor 在 sample × variant × judge_repeat × dimension 多次被调,
+// 每次都打两行会让 stderr 被同样文本刷屏(140-280 行)。模块级 flag 一个 process 只打一次。
+let hasWarnedSystem = false;
+let hasWarnedCost = false;
+function parseCodexJsonl(stdout) {
+    const events = [];
+    for (const line of stdout.split('\n')) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        try {
+            events.push(JSON.parse(trimmed));
+        }
+        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;
+}
+// exported for arg-shape regression tests
+export function buildCodexArgs({ model, cwd, prompt }) {
+    // codex exec [OPTIONS] [PROMPT];prompt 走 positional(execFile 不走 shell,自动 escape)
+    // approval_policy 走 -c config override:codex CLI 0.125 起去掉了 `--ask-for-approval` flag,
+    // 但 approval_policy 这个 config key 仍在,通过 -c 透传不依赖 flag 表面 schema。
+    const args = [
+        'exec',
+        '--json',
+        '--ephemeral', // 不持久化 session 文件
+        '--ignore-user-config', // 不读 $CODEX_HOME/config.toml
+        '--skip-git-repo-check', // 允许 isolated cwd 不是 git 仓库
+        '--sandbox', 'read-only', // 评测场景不需要写文件
+        '-c', 'approval_policy="never"', // non-interactive 必须;TOML 字符串需要 quote
+    ];
+    if (model)
+        args.push('--model', model);
+    if (cwd)
+        args.push('-C', cwd);
+    args.push(prompt);
+    return args;
+}
+// codex 看到 stdin 是 pipe 就当作 `<stdin>` 块读,会卡到 timeout。spawn 后立刻
+// child.stdin.end() 发 EOF。SIGINT 传播 / timeout / maxBuffer / kill 由 helper 统一处理。
+function runCodexExec(args, options) {
+    const { child, done } = spawnWithSigintPropagation('codex', args, {
+        env: options.env,
+        cwd: options.cwd,
+        timeoutMs: options.timeout,
+        maxBuffer: options.maxBuffer,
+    });
+    child.stdin?.end();
+    return done.then((r) => ({ stdout: r.stdout, stderr: r.stderr }));
+}
+export async function codexCliExecutor({ model, system, prompt, cwd, skillDir, timeoutMs = DEFAULT_TIMEOUT_MS, allowedSkills, verbose }) {
+    isolateCodexCwd(allowedSkills, cwd);
+    // codex CLI 没有 --system-prompt flag。降级:把 system 拼到 prompt 头部,
+    // verbose 输出降级提示。reproducibility 略受影响,但语义大致等价。
+    const finalPrompt = system ? `${system}\n\n---\n\n${prompt}` : prompt;
+    if (system && verbose && !hasWarnedSystem) {
+        process.stderr.write('[codex] system prompt prepended (codex CLI lacks --system-prompt flag)\n');
+        hasWarnedSystem = true;
+    }
+    if (verbose && !hasWarnedCost) {
+        process.stderr.write('[codex] cost not reported by binary; costReportedByExecutor=false (renderer shows 「—」 instead of $0.0000)\n');
+        hasWarnedCost = true;
+    }
+    const args = buildCodexArgs({ model, cwd, prompt: finalPrompt });
+    const env = buildExecEnv(skillDir);
+    const start = Date.now();
+    try {
+        const { stdout } = await runCodexExec(args, {
+            maxBuffer: MAX_BUFFER,
+            timeout: timeoutMs,
+            env,
+            ...(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 }),
+        };
+    }
+    catch (err) {
+        const durationMs = Date.now() - start;
+        const details = err;
+        if (details.killedByTimeout)
+            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,
+        };
+    }
+}
+//# sourceMappingURL=codex-cli.js.map

package/dist/src/executors/codex-cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-cli.js","sourceRoot":"","sources":["../../../src/executors/codex-cli.ts"],"names":[],"mappings":"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"}

package/dist/src/executors/codex-sdk.d.ts

@@ -0,0 +1,18 @@
+import type { Codex, CodexOptions } from '@openai/codex-sdk';
+import type { ExecResult, ExecutorInput } from '../types/index.js';
+export declare function getIsolatedCodexHome(): Promise<string>;
+export declare function __resetCodexSdkStateForTest(): void;
+export declare function buildCodexSdkThreadOptions({ model, cwd }: {
+    model: string;
+    cwd?: string | null;
+}): {
+    model?: string;
+    sandboxMode: 'read-only';
+    workingDirectory?: string;
+    skipGitRepoCheck: true;
+    approvalPolicy: 'never';
+};
+export declare function buildCodexSdkClientOptions(env: NodeJS.ProcessEnv): CodexOptions;
+export declare function createCodexSdkClient(env: NodeJS.ProcessEnv): Promise<Codex>;
+export declare function codexSdkExecutor({ model, system, prompt, cwd, skillDir, timeoutMs, allowedSkills, verbose }: ExecutorInput): Promise<ExecResult>;
+//# sourceMappingURL=codex-sdk.d.ts.map

package/dist/src/executors/codex-sdk.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-sdk.d.ts","sourceRoot":"","sources":["../../../src/executors/codex-sdk.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAe,MAAM,mBAAmB,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAiDnE,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CAiB5D;AAGD,wBAAgB,2BAA2B,IAAI,IAAI,CAKlD;AAED,wBAAgB,0BAA0B,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG;IAClG,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,IAAI,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;CACzB,CAQA;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,YAAY,CAM/E;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,CAGjF;AAMD,wBAAsB,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,SAA8B,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,CA0I3K"}

package/dist/src/executors/codex-sdk.js

@@ -0,0 +1,214 @@
+import { existsSync } from 'node:fs';
+import { mkdtemp, symlink } from 'node:fs/promises';
+import { homedir, tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { extractCodexTrace, isCodexResultEvent } from './codex-cli-trace.js';
+import { asErrorLike, buildExecEnv, DEFAULT_TIMEOUT_MS, errorMessage, timeoutExecResult, } from './shared.js';
+import { extractCodexFinalOutput, extractCodexStopReason, extractCodexUsage, isolateCodexCwd, sumCodexElapsed, } from './codex-cli.js';
+let CodexCtor = null;
+let codexHomePromise = null;
+let hasWarnedSystem = false;
+let hasWarnedCost = false;
+async function getCodexCtor() {
+    if (!CodexCtor) {
+        const sdk = await import('@openai/codex-sdk');
+        CodexCtor = sdk.Codex;
+    }
+    return CodexCtor;
+}
+// Construct-validity invariant: codex-cli passes `--ephemeral`(no session
+// persistence)+ `--ignore-user-config`(skip $CODEX_HOME/config.toml)so eval
+// runs are independent of the user's local codex profile. @openai/codex-sdk's
+// ThreadOptions does NOT expose either flag, so without intervention codex-sdk
+// runs would leak `~/.codex/config.toml`(custom model_reasoning_effort,
+// instructions, tool config)into the eval and pollute `~/.codex/sessions/`
+// across runs.
+//
+// Mitigation: redirect $CODEX_HOME to a per-process tmp dir for codex-sdk only.
+// auth.json is symlinked from the real CODEX_HOME so the SDK can still
+// authenticate; config.toml + sessions/ stay isolated. Tmp dir stays alive for
+// the OS to rotate(no explicit cleanup, matches DEFAULT_TIMEOUT_MS scope).
+//
+// Best-effort on Windows where symlink may need elevated privileges; on
+// failure, the codex-sdk executor still runs but lands in the user's real
+// CODEX_HOME with a stderr warning.
+export async function getIsolatedCodexHome() {
+    if (!codexHomePromise) {
+        codexHomePromise = (async () => {
+            const tmpHome = await mkdtemp(join(tmpdir(), 'omk-codex-sdk-'));
+            const realHome = process.env.CODEX_HOME || join(homedir(), '.codex');
+            const realAuth = join(realHome, 'auth.json');
+            if (existsSync(realAuth)) {
+                try {
+                    await symlink(realAuth, join(tmpHome, 'auth.json'));
+                }
+                catch (err) {
+                    process.stderr.write(`[codex-sdk] CODEX_HOME isolation: auth.json symlink failed (${err.message}); SDK will use bare tmp home and may fail to authenticate\n`);
+                }
+            }
+            return tmpHome;
+        })();
+    }
+    return codexHomePromise;
+}
+// exported for test isolation
+export function __resetCodexSdkStateForTest() {
+    CodexCtor = null;
+    codexHomePromise = null;
+    hasWarnedSystem = false;
+    hasWarnedCost = false;
+}
+export function buildCodexSdkThreadOptions({ model, cwd }) {
+    return {
+        ...(model && { model }),
+        sandboxMode: 'read-only',
+        ...(cwd && { workingDirectory: cwd }),
+        skipGitRepoCheck: true,
+        approvalPolicy: 'never',
+    };
+}
+export function buildCodexSdkClientOptions(env) {
+    return {
+        // Leave codexPathOverride unset: the SDK should use its bundled @openai/codex
+        // binary, matching the SDK executor contract instead of delegating to PATH.
+        env: env,
+    };
+}
+export async function createCodexSdkClient(env) {
+    const CodexClient = await getCodexCtor();
+    return new CodexClient(buildCodexSdkClientOptions(env));
+}
+function normalizeSdkEvent(event) {
+    return event;
+}
+export async function codexSdkExecutor({ model, system, prompt, cwd, skillDir, timeoutMs = DEFAULT_TIMEOUT_MS, allowedSkills, verbose }) {
+    isolateCodexCwd(allowedSkills, cwd, 'codex-sdk');
+    const finalPrompt = system ? `${system}\n\n---\n\n${prompt}` : prompt;
+    if (system && verbose && !hasWarnedSystem) {
+        process.stderr.write('[codex-sdk] system prompt prepended (codex CLI/SDK lacks a system-prompt option)\n');
+        hasWarnedSystem = true;
+    }
+    if (verbose && !hasWarnedCost) {
+        process.stderr.write('[codex-sdk] cost not reported by binary; costReportedByExecutor=false (renderer shows 「—」 instead of $0.0000)\n');
+        hasWarnedCost = true;
+    }
+    const env = buildExecEnv(skillDir);
+    const start = Date.now();
+    const abortController = new AbortController();
+    const timer = setTimeout(() => abortController.abort(), timeoutMs);
+    // SIGINT propagation: PR #33 helper only tracks child process refs registered
+    // via spawnWithSigintPropagation; @openai/codex-sdk does its own spawn()
+    // internally and the SDK child is not in that registry. Hook the
+    // AbortController to SIGINT so the SDK kills its child via the standard
+    // abortSignal pipeline (SDK passes `signal: args.signal` to spawn). Without
+    // this, Ctrl+C in a nested host orphans the codex SDK child until DEFAULT
+    // timeout elapses, regressing PR #33's nested-host fix.
+    const sigintListener = () => abortController.abort();
+    process.on('SIGINT', sigintListener);
+    const events = [];
+    try {
+        env.CODEX_HOME = await getIsolatedCodexHome();
+        const codex = await createCodexSdkClient(env);
+        const thread = codex.startThread(buildCodexSdkThreadOptions({ model, cwd }));
+        const streamed = await thread.runStreamed(finalPrompt, { signal: abortController.signal });
+        for await (const event of streamed.events) {
+            events.push(normalizeSdkEvent(event));
+        }
+        const durationMs = Date.now() - start;
+        const resultEvents = events.filter(isCodexResultEvent);
+        if (resultEvents.length === 0) {
+            return {
+                ok: false,
+                error: 'no turn.completed/turn.failed event in codex-sdk 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,
+            durationMs: sumCodexElapsed(resultEvents, durationMs),
+            durationApiMs: 0,
+            inputTokens: usage.input,
+            outputTokens: usage.output,
+            cacheReadTokens: usage.cached,
+            cacheCreationTokens: 0,
+            costUSD: 0,
+            costReportedByExecutor: false,
+            output: finalOutput,
+            stopReason,
+            ...(!ok && { error: last.error?.message || 'codex-sdk 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 }),
+        };
+    }
+    catch (err) {
+        const durationMs = Date.now() - start;
+        const details = asErrorLike(err);
+        const isAbort = details.name === 'AbortError' || abortController.signal.aborted;
+        if (isAbort)
+            return { ...timeoutExecResult(timeoutMs, durationMs), costReportedByExecutor: false };
+        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,
+        };
+    }
+    finally {
+        clearTimeout(timer);
+        process.removeListener('SIGINT', sigintListener);
+    }
+}
+//# sourceMappingURL=codex-sdk.js.map

package/dist/src/executors/codex-sdk.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-sdk.js","sourceRoot":"","sources":["../../../src/executors/codex-sdk.ts"],"names":[],"mappings":"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"}

package/dist/src/executors/gemini.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../../../src/executors/gemini.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGnE,wBAAsB,cAAc,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAA8B,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,CAuElI"}
+{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../../../src/executors/gemini.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAYnE,wBAAsB,cAAc,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAA8B,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,CAyElI"}

package/dist/src/executors/gemini.js

@@ -1,32 +1,36 @@
-import { spawn } from 'node:child_process';
-import { DEFAULT_TIMEOUT_MS, errorMessage, parseJson } from './shared.js';
+import { DEFAULT_TIMEOUT_MS, errorMessage, interruptedExecResult, parseJson, spawnWithSigintPropagation, timeoutExecResult, } from './shared.js';
 export async function geminiExecutor({ model, system, prompt, timeoutMs = DEFAULT_TIMEOUT_MS }) {
     const fullPrompt = system ? `${system}\n\n${prompt}` : prompt;
     const start = Date.now();
     try {
-        const output = await new Promise((resolve, reject) => {
-            const args = [];
-            if (model)
-                args.push('--model', model);
-            const child = spawn('gemini', args, {
-                stdio: ['pipe', 'pipe', 'pipe'],
-                env: { ...process.env },
-                timeout: timeoutMs,
-            });
-            let stdout = '';
-            let stderr = '';
-            child.stdout.on('data', (chunk) => { stdout += chunk; });
-            child.stderr.on('data', (chunk) => { stderr += chunk; });
-            child.on('error', (err) => reject(err));
-            child.on('close', (code) => {
-                if (code !== 0 && !stdout)
-                    reject(new Error(stderr || `gemini exited with code ${code}`));
-                else
-                    resolve(stdout);
-            });
-            child.stdin.write(fullPrompt);
-            child.stdin.end();
+        const args = [];
+        if (model)
+            args.push('--model', model);
+        const { child, done } = spawnWithSigintPropagation('gemini', args, {
+            env: { ...process.env },
+            timeoutMs,
         });
+        child.stdin?.write(fullPrompt);
+        child.stdin?.end();
+        let output;
+        try {
+            const r = await done;
+            output = r.stdout;
+        }
+        catch (err) {
+            const details = err;
+            if (details.killedByTimeout)
+                return timeoutExecResult(timeoutMs, Date.now() - start);
+            if (details.killedBySignal)
+                return interruptedExecResult(Date.now() - start);
+            // gemini 退出码非 0 但有 stdout 时仍按成功路径解析(原行为);只在 stdout 为空时才视为失败
+            if (details.stdout && details.stdout.length > 0) {
+                output = details.stdout;
+            }
+            else {
+                throw err;
+            }
+        }
         const durationMs = Date.now() - start;
         let text = output;
         let inputTokens = 0;

package/dist/src/executors/gemini.js.map

@@ -1 +1 @@
-{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../../src/executors/gemini.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../../src/executors/gemini.ts"],"names":[],"mappings":"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"}

package/dist/src/executors/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/executors/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAI1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAWzD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,CAAC;AAE/E,wBAAgB,cAAc,CAAC,IAAI,GAAE,MAAiB,GAAG,UAAU,CAElE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/executors/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAK1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAezD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,CAAC;AAE/E,wBAAgB,cAAc,CAAC,IAAI,GAAE,MAAiB,GAAG,UAAU,CAElE"}

package/dist/src/executors/index.js

@@ -2,15 +2,20 @@ import { anthropicApiExecutor } from './anthropic-api.js';
 import { claudeCliExecutor } from './claude-cli.js';
 import { claudeSdkExecutor } from './claude-sdk.js';
 import { extractAgentTrace } from './claude-sdk-trace.js';
+import { codexCliExecutor } from './codex-cli.js';
+import { codexSdkExecutor } from './codex-sdk.js';
 import { geminiExecutor } from './gemini.js';
 import { openAiApiExecutor } from './openai-api.js';
-import { openAiCliExecutor } from './openai-cli.js';
 import { createScriptExecutor } from './script.js';
 import { DEFAULT_MODEL, JUDGE_MODEL } from './shared.js';
+// 命名一致性:provider HTTP 路径统一用 `<vendor>-api`(`anthropic-api` / `openai-api`),
+// vendor coding agent CLI 用 vendor 名(`claude` / `codex`)。`openai` 这个不带 -api 后缀的
+// 旧 alias 历史上指 openai-cli 子进程实现,删除后不再设别名 — 用 `--executor openai-api`。
 const EXECUTOR_REGISTRY = {
     claude: claudeCliExecutor,
     'claude-sdk': claudeSdkExecutor,
-    openai: openAiCliExecutor,
+    codex: codexCliExecutor,
+    'codex-sdk': codexSdkExecutor,
     gemini: geminiExecutor,
     'anthropic-api': anthropicApiExecutor,
     'openai-api': openAiApiExecutor,

package/dist/src/executors/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/executors/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEzD,MAAM,iBAAiB,GAA+B;IACpD,MAAM,EAAE,iBAAiB;IACzB,YAAY,EAAE,iBAAiB;IAC/B,MAAM,EAAE,iBAAiB;IACzB,MAAM,EAAE,cAAc;IACtB,eAAe,EAAE,oBAAoB;IACrC,YAAY,EAAE,iBAAiB;CAChC,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,CAAC;AAE/E,MAAM,UAAU,cAAc,CAAC,OAAe,QAAQ;IACpD,OAAO,iBAAiB,CAAC,IAAI,CAAC,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/executors/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEzD,4EAA4E;AAC5E,gFAAgF;AAChF,sEAAsE;AACtE,MAAM,iBAAiB,GAA+B;IACpD,MAAM,EAAE,iBAAiB;IACzB,YAAY,EAAE,iBAAiB;IAC/B,KAAK,EAAE,gBAAgB;IACvB,WAAW,EAAE,gBAAgB;IAC7B,MAAM,EAAE,cAAc;IACtB,eAAe,EAAE,oBAAoB;IACrC,YAAY,EAAE,iBAAiB;CAChC,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,CAAC;AAE/E,MAAM,UAAU,cAAc,CAAC,OAAe,QAAQ;IACpD,OAAO,iBAAiB,CAAC,IAAI,CAAC,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC;AAC/D,CAAC"}