oh-my-knowledge 0.52.3 → 0.53.0

package/dist/executors/{shared.js → core/subprocess.js}

@@ -1,155 +1,19 @@
-import { execFile, spawn } from 'node:child_process';
-import { existsSync } from 'node:fs';
-import { delimiter, join } from 'node:path';
-import { promisify } from 'node:util';
-export const execFileAsync = promisify(execFile);
-// 系统默认任务执行模型。用 alias 'sonnet' — 性价比最优,eval/sample/evolve 统一默认。
-// 需要更高质量时显式传 --model opus。report.meta.executorRuntime 记录实际模型 ID。
-export const DEFAULT_MODEL = 'sonnet';
-export const JUDGE_MODEL = 'haiku';
-export const DEFAULT_TIMEOUT_MS = 600_000;
-export const MAX_BUFFER = 10 * 1024 * 1024;
-// 把 executor 名归到模型厂商家族,用于评委独立性判断(同厂商评委 = 自我偏好敞口)。
-// codex 是 OpenAI 的代码模型,故 codex* 归 OpenAI。自定义 script executor 无法归类 → unknown
-// (调用方据此跳过判断,不误报)。
-const EXECUTOR_VENDOR = {
-    claude: 'anthropic',
-    'claude-sdk': 'anthropic',
-    'anthropic-api': 'anthropic',
-    codex: 'openai',
-    'codex-sdk': 'openai',
-    'openai-api': 'openai',
-    gemini: 'google',
-};
-export function executorVendor(executor) {
-    return EXECUTOR_VENDOR[executor] ?? 'unknown';
-}
-/**
- * Translate Codex's external event shape into omk's internal protocol model.
- * Codex currently calls file-change discriminators `kind`; omk reserves bare
- * `kind` for ArtifactKind, so the raw field is qualified at the boundary.
- */
-export function normalizeCodexProtocolEvent(value) {
-    if (typeof value !== 'object' || value === null || Array.isArray(value))
-        return null;
-    const event = value;
-    const rawItem = event.item;
-    if (typeof rawItem !== 'object' || rawItem === null || Array.isArray(rawItem)) {
-        return event;
-    }
-    const item = rawItem;
-    const rawChanges = item.changes;
-    const normalizedItem = {
-        ...item,
-        ...(Array.isArray(rawChanges) && {
-            changes: rawChanges.flatMap((change) => {
-                if (typeof change !== 'object' || change === null || Array.isArray(change))
-                    return [];
-                const rawChange = change;
-                return [{
-                        ...(typeof rawChange.path === 'string' && { path: rawChange.path }),
-                        ...(typeof rawChange.kind === 'string' && { changeKind: rawChange.kind }),
-                    }];
-            }),
-        }),
-    };
-    return { ...event, item: normalizedItem };
-}
-export function asErrorLike(err) {
-    return typeof err === 'object' && err !== null ? err : {};
-}
-export function errorMessage(err, fallback = 'unknown error') {
-    const details = asErrorLike(err);
-    return details.message || fallback;
-}
-export function parseJson(content) {
-    return JSON.parse(content);
-}
-export async function readJsonResponse(response) {
-    const rawBody = await response.text();
-    if (!rawBody.trim())
-        return { data: null, rawBody };
-    try {
-        return { data: JSON.parse(rawBody), rawBody };
-    }
-    catch {
-        return { data: null, rawBody };
-    }
-}
-export function responseBodyPreview(rawBody, maxLength = 500) {
-    const normalized = rawBody.replace(/\s+/g, ' ').trim();
-    if (!normalized)
-        return '';
-    return normalized.length > maxLength
-        ? `${normalized.slice(0, maxLength)}...`
-        : normalized;
-}
-export function buildExecEnv(skillDir) {
-    const proxyUrl = process.env.CCV_PROXY_URL || undefined;
-    const env = proxyUrl
-        ? { ...process.env, ANTHROPIC_BASE_URL: proxyUrl }
-        : { ...process.env };
-    if (skillDir) {
-        const nodeBin = join(skillDir, 'node_modules', '.bin');
-        if (existsSync(nodeBin)) {
-            env.PATH = `${nodeBin}${env.PATH ? delimiter + env.PATH : ''}`;
-        }
-    }
-    return env;
-}
-export function timeoutExecResult(timeoutMs, durationMs) {
-    return {
-        ok: false,
-        error: `execution timed out after ${timeoutMs / 1000}s`,
-        durationMs,
-        durationApiMs: 0,
-        inputTokens: 0,
-        outputTokens: 0,
-        cacheReadTokens: 0,
-        cacheCreationTokens: 0,
-        tokenUsageReportedByExecutor: false,
-        costUSD: 0,
-        costReportedByExecutor: false,
-        output: null,
-        stopReason: 'timeout',
-        numTurns: 0,
-    };
-}
-// SIGINT-killed child(用户在 host 按 Ctrl+C,parent 收到 SIGINT 后广播 SIGTERM 给 children)
-// 跟 timeout-killed 区分:stopReason='interrupted',跟 'timeout' / 'error' 都不一样,
-// caller / renderer 可以据此显示不同的语义("用户中断" vs "超时" vs "执行错误")。
-export function interruptedExecResult(durationMs) {
-    return {
-        ok: false,
-        error: 'execution interrupted (SIGINT)',
-        durationMs,
-        durationApiMs: 0,
-        inputTokens: 0,
-        outputTokens: 0,
-        cacheReadTokens: 0,
-        cacheCreationTokens: 0,
-        tokenUsageReportedByExecutor: false,
-        costUSD: 0,
-        costReportedByExecutor: false,
-        output: null,
-        stopReason: 'interrupted',
-        numTurns: 0,
-    };
-}
+import { spawn } from 'node:child_process';
+import { MAX_BUFFER } from './limits.js';
 // ===========================================================================
-// SIGINT propagation:统一让 spawn 出来的 child 在 parent 收到 SIGINT 时被 kill,
-// 避免 host CLI(codex / claude code)Ctrl+C 后内层子进程成为 orphan。
+// SIGINT propagation：统一让 spawn 出来的 child 在 parent 收到 SIGINT 时被 kill，
+// 避免 host CLI（codex / claude code）Ctrl+C 后内层子进程成为 orphan。
 // ===========================================================================
 //
-// 设计要点:
-// - 单一进程级 process.on('SIGINT', ...) listener,惰性首次 spawn 时安装一次(零 leak)
-// - 模块级 Set<ChildProcess> registry,child 退出 / 出错时立即 delete
-// - SIGTERM 先发(child 一般会做 telemetry flush),500ms grace,然后 SIGKILL fallback
-// - handler 用具名 function + process.removeListener(self),不动 host 自己的 listener;
+// 设计要点：
+// - 单一进程级 process.on('SIGINT', ...) listener，惰性首次 spawn 时安装一次（零 leak）
+// - 模块级 Set<ChildProcess> registry，child 退出 / 出错时立即 delete
+// - SIGTERM 先发（child 一般会做 telemetry flush），500ms grace，然后 SIGKILL fallback
+// - handler 用具名 function + process.removeListener(self)，不动 host 自己的 listener；
 //   然后 process.kill(pid, 'SIGINT') re-raise 让 default action / host listener 接管
-// - shuttingDown flag:第一次 SIGINT 进 handler 后置 true,第二次按 Ctrl+C 走 default action
-//   立即退出(软关 → 硬关两段式)
-// - 同时支持 timeout 跟 abortSignal 两条 kill 路径,跟 SIGINT 共用 grace 逻辑
+// - shuttingDown flag：第一次 SIGINT 进 handler 后置 true，第二次按 Ctrl+C 走 default action
+//   立即退出（软关 → 硬关两段式）
+// - 同时支持 timeout 跟 abortSignal 两条 kill 路径，跟 SIGINT 共用 grace 逻辑
 const activeChildren = new Set();
 const sigintSubscribers = new Set();
 let sigintListenerInstalled = false;
@@ -178,7 +42,7 @@ function broadcastShutdown() {
             catch { /* */ }
         }, SIGTERM_GRACE_MS).unref();
     }
-    // 卸载自己,re-raise SIGINT 让 host listener / default action(exit code 130)接管
+    // 卸载自己，re-raise SIGINT 让 host listener / default action（exit code 130）接管
     process.removeListener('SIGINT', sigintHandler);
     sigintListenerInstalled = false;
     process.kill(process.pid, 'SIGINT');
@@ -209,7 +73,7 @@ export function registerSigintSubscriber(subscriber) {
         sigintSubscribers.delete(subscriber);
     };
 }
-// test-only:重置模块级状态,让 vitest 之间互不污染
+// test-only：重置模块级状态，让 vitest 之间互不污染
 export function __resetSigintRegistryForTest() {
     activeChildren.clear();
     sigintSubscribers.clear();
@@ -221,10 +85,10 @@ export function __resetSigintRegistryForTest() {
 }
 /**
  * spawn child + 注册到全局 SIGINT registry。返回 { child, done } 让 caller 自己
- * 操作 stdin(写入 / 关闭),通过 done 等结果。
+ * 操作 stdin（写入 / 关闭），通过 done 等结果。
  *
- * 适用:claude / codex / gemini / script CLI 子进程。HTTP executor(*-api)用 fetch +
- * AbortSignal.timeout,自带 abort,不走这个。claude-sdk in-process 也不走。
+ * 适用：claude / codex / script CLI 子进程。HTTP executor（*-api）用 fetch +
+ * AbortSignal.timeout，自带 abort，不走这个。claude-sdk in-process 也不走。
  */
 export function spawnWithSigintPropagation(command, args, options = {}) {
     const { cwd, env, timeoutMs, maxBuffer = MAX_BUFFER, abortSignal } = options;
@@ -245,7 +109,7 @@ export function spawnWithSigintPropagation(command, args, options = {}) {
     let graceTimer = null;
     let timeoutTimer = null;
     function killWithGrace(reason) {
-        // 优先级:abort 跟 timeout 互不覆盖(谁先设谁赢);buffer 不重写已有 reason
+        // 优先级：abort 跟 timeout 互不覆盖（谁先设谁赢）；buffer 不重写已有 reason
         if (reason === 'timeout' && !killedBySignalReason)
             killedByTimeout = true;
         if (reason === 'abort' && !killedByTimeout)
@@ -256,7 +120,7 @@ export function spawnWithSigintPropagation(command, args, options = {}) {
         catch { /* already dead */ }
         if (graceTimer)
             return;
-        // 即使 child trap SIGTERM 不退出,500ms 后强 SIGKILL 兜底
+        // 即使 child trap SIGTERM 不退出，500ms 后强 SIGKILL 兜底
         graceTimer = setTimeout(() => {
             try {
                 if (child.exitCode === null && child.signalCode === null)
@@ -357,7 +221,7 @@ export function spawnWithSigintPropagation(command, args, options = {}) {
                 reject(e);
                 return;
             }
-            // code === null && signal === null:罕见,fallback resolve
+            // code === null && signal === null：罕见，fallback resolve
             resolve(result);
         });
     });

package/dist/executors/index.d.ts

@@ -1,6 +1,6 @@
 import type { ExecutorFn } from '../types/index.js';
-import { extractAgentTrace } from './claude-sdk-trace.js';
-import { createScriptExecutor } from './script.js';
-export { extractAgentTrace, createScriptExecutor };
-export { assertExecutorInputCapabilities, assertSamplesCompatibleWithExecutor, executorSupportsSampleMocks, getExecutorCapabilities, } from './capabilities.js';
+import { extractClaudeTrace } from './anthropic/claude/trace.js';
+import { createScriptExecutor } from './script/index.js';
+export { extractClaudeTrace, createScriptExecutor };
+export { assertExecutorInputCapabilities, assertSamplesCompatibleWithExecutor, executorSupportsSampleMocks, getExecutorCapabilities, } from './core/capabilities.js';
 export declare function createExecutor(name: string): ExecutorFn;

package/dist/executors/index.js

@@ -1,31 +1,42 @@
-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 { createScriptExecutor } from './script.js';
-import { enforceExecutorCapabilities } from './capabilities.js';
+import { anthropicApiExecutor } from './anthropic/api.js';
+import { claudeCliExecutor } from './anthropic/claude/cli.js';
+import { claudeSdkExecutor } from './anthropic/claude/sdk.js';
+import { extractClaudeTrace } from './anthropic/claude/trace.js';
+import { openAiApiExecutor } from './openai/api.js';
+import { codexCliExecutor } from './openai/codex/cli.js';
+import { codexSdkExecutor } from './openai/codex/sdk.js';
+import { createScriptExecutor } from './script/index.js';
+import { enforceExecutorCapabilities } from './core/capabilities.js';
+import { getExecutorDescriptor, } from './core/registry.js';
+import { assertOptionalExecutorDependency } from './core/optional-dependencies.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 = {
+const EXECUTOR_FACTORIES = {
     claude: claudeCliExecutor,
     'claude-sdk': claudeSdkExecutor,
     codex: codexCliExecutor,
     'codex-sdk': codexSdkExecutor,
-    gemini: geminiExecutor,
     'anthropic-api': anthropicApiExecutor,
     'openai-api': openAiApiExecutor,
 };
-export { extractAgentTrace, createScriptExecutor };
-export { assertExecutorInputCapabilities, assertSamplesCompatibleWithExecutor, executorSupportsSampleMocks, getExecutorCapabilities, } from './capabilities.js';
+export { extractClaudeTrace, createScriptExecutor };
+export { assertExecutorInputCapabilities, assertSamplesCompatibleWithExecutor, executorSupportsSampleMocks, getExecutorCapabilities, } from './core/capabilities.js';
 export function createExecutor(name) {
     if (name.trim().length === 0) {
         throw new Error('executor name or script command is required');
     }
-    const executor = EXECUTOR_REGISTRY[name] || createScriptExecutor(name);
+    if (name === 'gemini') {
+        throw new Error('内置 gemini 执行器已移除；请改用自定义执行器适配脚本，并显式填写脚本命令。');
+    }
+    const descriptor = getExecutorDescriptor(name);
+    if (descriptor?.execution === 'host-only') {
+        throw new Error('dsh-host 仅供 DeepSeek Harness 宿主插件内部使用；请在 DSH 中运行 /omk eval。');
+    }
+    if (descriptor)
+        assertOptionalExecutorDependency(descriptor.name);
+    const executor = descriptor
+        ? EXECUTOR_FACTORIES[descriptor.name]
+        : createScriptExecutor(name);
     return enforceExecutorCapabilities(name, executor);
 }

package/dist/executors/{openai-api.d.ts → openai/api.d.ts}

@@ -1,2 +1,2 @@
-import type { ExecResult, ExecutorInput } from '../types/index.js';
+import type { ExecResult, ExecutorInput } from '../../types/index.js';
 export declare function openAiApiExecutor({ model, system, prompt, timeoutMs }: ExecutorInput): Promise<ExecResult>;

package/dist/executors/{openai-api.js → openai/api.js}

@@ -1,5 +1,7 @@
-import { asErrorLike, DEFAULT_TIMEOUT_MS, errorMessage, readJsonResponse, responseBodyPreview, } from './shared.js';
-import { optionalTokenCount, splitInclusiveInputTokens } from '../shared/token-usage.js';
+import { optionalTokenCount, splitInclusiveInputTokens } from '../../shared/token-usage.js';
+import { DEFAULT_TIMEOUT_MS } from '../core/limits.js';
+import { readJsonResponse, responseBodyPreview } from '../core/http.js';
+import { asErrorLike, errorMessage } from '../core/runtime.js';
 export async function openAiApiExecutor({ model, system, prompt, timeoutMs = DEFAULT_TIMEOUT_MS }) {
     const apiKey = process.env.OPENAI_API_KEY;
     if (!apiKey)

package/dist/executors/{codex-cli.d.ts → openai/codex/cli.d.ts}

@@ -1,6 +1,6 @@
-import type { ExecResult, ExecutorInput } from '../types/index.js';
-import type { CodexEvent } from './shared.js';
-export { extractCodexFinalOutput, extractCodexProtocolError, extractCodexStopReason, extractCodexUsage, sumCodexElapsed, } from './codex-protocol.js';
+import type { ExecResult, ExecutorInput } from '../../../types/index.js';
+import { type CodexEvent } from './protocol.js';
+export { extractCodexFinalOutput, extractCodexProtocolError, extractCodexStopReason, extractCodexUsage, sumCodexElapsed, } from './protocol.js';
 export declare function isolateCodexCwd(allowedSkills: string[] | undefined, cwd: string | null | undefined, executorName?: string): void;
 export interface CodexJsonlParseResult {
     events: CodexEvent[];

package/dist/executors/{codex-cli.js → openai/codex/cli.js}

@@ -1,6 +1,8 @@
-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';
+import { buildCodexResult, normalizeCodexProtocolEvent, } from './protocol.js';
+import { DEFAULT_TIMEOUT_MS, MAX_BUFFER } from '../../core/limits.js';
+import { buildExecEnv, errorMessage, interruptedExecResult, timeoutExecResult, } from '../../core/runtime.js';
+import { spawnWithSigintPropagation } from '../../core/subprocess.js';
+export { extractCodexFinalOutput, extractCodexProtocolError, extractCodexStopReason, extractCodexUsage, sumCodexElapsed, } from './protocol.js';
 // codex CLI(0.125)隔离能力对比 claude-cli:
 //   Claude:三条 channel(SDK skills auto-discovery / subagent Skill 工具 /
 //          cwd 文件系统),`--disable-slash-commands` + `--disallowedTools Skill`

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

@@ -0,0 +1,72 @@
+import type { ExecResult } from '../../../types/index.js';
+export interface CodexEvent {
+    type?: string;
+    turn_id?: string;
+    usage?: {
+        input_tokens?: number;
+        cached_input_tokens?: number;
+        output_tokens?: number;
+        reasoning_output_tokens?: number;
+    };
+    elapsed_ms?: number;
+    stop_reason?: string;
+    item?: {
+        id?: string;
+        type?: string;
+        text?: string;
+        command?: string;
+        aggregated_output?: string;
+        exit_code?: number | null;
+        status?: string;
+        path?: string;
+        content?: string;
+        query?: string;
+        results?: unknown[];
+        changes?: Array<{
+            path?: string;
+            changeKind?: string;
+        }>;
+        server?: string;
+        tool?: string;
+        name?: string;
+        arguments?: unknown;
+        result?: unknown;
+        message?: string;
+        error?: {
+            message?: string;
+        };
+    };
+    error?: {
+        message?: string;
+    };
+    message?: string;
+    ts?: number;
+}
+/**
+ * Translate Codex's external event shape into omk's internal protocol model.
+ * Codex currently calls file-change discriminators `kind`; omk reserves bare
+ * `kind` for ArtifactKind, so the raw field is qualified at the boundary.
+ */
+export declare function normalizeCodexProtocolEvent(value: unknown): CodexEvent | null;
+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;

package/dist/executors/{codex-protocol.js → openai/codex/protocol.js}

@@ -1,5 +1,36 @@
-import { checkedSumTokenCounts, optionalTokenCount, splitInclusiveInputTokens, sumTokenCounts, } from '../shared/token-usage.js';
-import { extractCodexTrace, isCodexResultEvent } from './codex-cli-trace.js';
+import { checkedSumTokenCounts, optionalTokenCount, splitInclusiveInputTokens, sumTokenCounts, } from '../../../shared/token-usage.js';
+import { extractCodexTrace, isCodexResultEvent } from './trace.js';
+/**
+ * Translate Codex's external event shape into omk's internal protocol model.
+ * Codex currently calls file-change discriminators `kind`; omk reserves bare
+ * `kind` for ArtifactKind, so the raw field is qualified at the boundary.
+ */
+export function normalizeCodexProtocolEvent(value) {
+    if (typeof value !== 'object' || value === null || Array.isArray(value))
+        return null;
+    const event = value;
+    const rawItem = event.item;
+    if (typeof rawItem !== 'object' || rawItem === null || Array.isArray(rawItem)) {
+        return event;
+    }
+    const item = rawItem;
+    const rawChanges = item.changes;
+    const normalizedItem = {
+        ...item,
+        ...(Array.isArray(rawChanges) && {
+            changes: rawChanges.flatMap((change) => {
+                if (typeof change !== 'object' || change === null || Array.isArray(change))
+                    return [];
+                const rawChange = change;
+                return [{
+                        ...(typeof rawChange.path === 'string' && { path: rawChange.path }),
+                        ...(typeof rawChange.kind === 'string' && { changeKind: rawChange.kind }),
+                    }];
+            }),
+        }),
+    };
+    return { ...event, item: normalizedItem };
+}
 const CODEX_EVENT_TYPES = new Set([
     'thread.started',
     'turn.started',

package/dist/executors/{codex-sdk.d.ts → openai/codex/sdk.d.ts}

@@ -1,5 +1,18 @@
-import type { Codex, CodexOptions } from '@openai/codex-sdk';
-import type { ExecResult, ExecutorInput } from '../types/index.js';
+import type { ExecResult, ExecutorInput } from '../../../types/index.js';
+interface CodexSdkThread {
+    runStreamed(input: string, options?: {
+        signal?: AbortSignal;
+    }): Promise<{
+        events: AsyncIterable<unknown>;
+    }>;
+}
+export interface CodexSdkClient {
+    startThread(options: ReturnType<typeof buildCodexSdkThreadOptions>): CodexSdkThread;
+}
+export interface CodexSdkClientOptions {
+    env: Record<string, string>;
+    codexPathOverride?: string;
+}
 export declare function getIsolatedCodexHome(): Promise<string>;
 export declare function __resetCodexSdkStateForTest(): void;
 export declare function buildCodexSdkThreadOptions({ model, cwd }: {
@@ -12,6 +25,7 @@ export declare function buildCodexSdkThreadOptions({ model, cwd }: {
     skipGitRepoCheck: true;
     approvalPolicy: 'never';
 };
-export declare function buildCodexSdkClientOptions(env: NodeJS.ProcessEnv): CodexOptions;
-export declare function createCodexSdkClient(env: NodeJS.ProcessEnv): Promise<Codex>;
+export declare function buildCodexSdkClientOptions(env: NodeJS.ProcessEnv): CodexSdkClientOptions;
+export declare function createCodexSdkClient(env: NodeJS.ProcessEnv): Promise<CodexSdkClient>;
 export declare function codexSdkExecutor({ model, system, prompt, cwd, skillDir, timeoutMs, allowedSkills, verbose }: ExecutorInput): Promise<ExecResult>;
+export {};

package/dist/executors/{codex-sdk.js → openai/codex/sdk.js}

@@ -2,15 +2,18 @@ import { existsSync } from 'node:fs';
 import { copyFile, mkdtemp, rm } from 'node:fs/promises';
 import { homedir, tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { buildCodexResult } from './codex-protocol.js';
-import { asErrorLike, buildExecEnv, DEFAULT_TIMEOUT_MS, errorMessage, interruptedExecResult, normalizeCodexProtocolEvent, registerSigintSubscriber, timeoutExecResult, } from './shared.js';
-import { isolateCodexCwd } from './codex-cli.js';
+import { buildCodexResult, normalizeCodexProtocolEvent, } from './protocol.js';
+import { DEFAULT_TIMEOUT_MS } from '../../core/limits.js';
+import { asErrorLike, buildExecEnv, errorMessage, interruptedExecResult, timeoutExecResult, } from '../../core/runtime.js';
+import { registerSigintSubscriber } from '../../core/subprocess.js';
+import { isolateCodexCwd } from './cli.js';
+const CODEX_SDK_PACKAGE = '@openai/codex-sdk';
 let CodexCtor = null;
 let hasWarnedSystem = false;
 let hasWarnedCost = false;
 async function getCodexCtor() {
     if (!CodexCtor) {
-        const sdk = await import('@openai/codex-sdk');
+        const sdk = await import(CODEX_SDK_PACKAGE);
         CodexCtor = sdk.Codex;
     }
     return CodexCtor;

package/dist/executors/{codex-cli-trace.d.ts → openai/codex/trace.d.ts}

@@ -1,5 +1,5 @@
-import type { ToolCallInfo, TurnInfo } from '../types/index.js';
-import type { CodexEvent } from './shared.js';
+import type { ToolCallInfo, TurnInfo } from '../../../types/index.js';
+import type { CodexEvent } from './protocol.js';
 export declare function isCodexResultEvent(event: CodexEvent): boolean;
 export declare function extractCodexTrace(events: CodexEvent[]): {
     turns: TurnInfo[];

package/dist/executors/{codex-cli-trace.js → openai/codex/trace.js}

@@ -1,7 +1,7 @@
-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 不同源:
+import { safeSliceForJson } from '../../../util/safe-slice.js';
+import { normalizeToolIdentity } from '../../../shared/tool-identity.js';
+// Codex CLI(codex 0.125)`exec --json` 与 SDK ThreadEvent 共用的 omk trace 抽取器。
+// 跟 Claude message trace 不同源:
 //   Claude SDK 是 message[block] 嵌套结构,有 tool_use / tool_result 配对;
 //   Codex 是事件流(turn.started → turn.completed,夹杂 item.* 事件),每个
 //   item.completed 事件直接生成完整 ToolCallInfo,**不需要 use/result 配对**。

package/dist/executors/{script.d.ts → script/index.d.ts}

@@ -1,2 +1,2 @@
-import type { ExecutorFn } from '../types/index.js';
+import type { ExecutorFn } from '../../types/index.js';
 export declare function createScriptExecutor(command: string): ExecutorFn;

package/dist/executors/{script.js → script/index.js}

@@ -1,7 +1,9 @@
-import { materializeForCliConfigDir } from '../eval-core/mocks-runtime.js';
-import { executorResultValidationError, normalizeExecResultToolIdentities, } from '../shared/executor-result.js';
-import { resolveScriptCommand } from './script-command.js';
-import { DEFAULT_TIMEOUT_MS, interruptedExecResult, spawnWithSigintPropagation, timeoutExecResult, } from './shared.js';
+import { materializeForCliConfigDir } from '../../eval-core/mocks-runtime.js';
+import { executorResultValidationError, normalizeExecResultToolIdentities, } from '../../shared/executor-result.js';
+import { resolveScriptCommand } from './command.js';
+import { DEFAULT_TIMEOUT_MS } from '../core/limits.js';
+import { interruptedExecResult, timeoutExecResult, } from '../core/runtime.js';
+import { spawnWithSigintPropagation } from '../core/subprocess.js';
 // script executor 由用户自定义,omk 无法保证它实现 skill 隔离。
 // 任何 allowedSkills(包括 [])下都 stderr 一次性 warn,不阻塞执行,
 // 让用户知道 strict-baseline / 显式 allowedSkills 在 script executor 下静默无效。

package/dist/grading/judge.d.ts

@@ -53,7 +53,7 @@ export declare function judgeId(config: JudgeConfig): string;
 export declare function computeJudgeAgreement(judgeScores: number[][]): JudgeAgreement;
 /**
  * Judge a single (output, rubric) pair with N judge models in parallel. Each judge
- * may use a different executor (e.g. claude:opus + openai-api:gpt-4o + gemini:pro). Each
+ * may use a different executor (e.g. claude:opus + openai-api:gpt-4o). Each
  * judge can also be repeated `judgeRepeat` times — final per-judge score is its mean.
  *
  * Returns: aggregate DimensionResult (score = mean across judges; this is the "consensus"

package/dist/grading/judge.js

@@ -342,7 +342,7 @@ export function computeJudgeAgreement(judgeScores) {
 }
 /**
  * Judge a single (output, rubric) pair with N judge models in parallel. Each judge
- * may use a different executor (e.g. claude:opus + openai-api:gpt-4o + gemini:pro). Each
+ * may use a different executor (e.g. claude:opus + openai-api:gpt-4o). Each
  * judge can also be repeated `judgeRepeat` times — final per-judge score is its mean.
  *
  * Returns: aggregate DimensionResult (score = mean across judges; this is the "consensus"