@post-print/agent-harness 1.1.9 → 2.0.0

package/dist/mcp.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../src/mcp.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../src/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AA2B7C,MAAM,iBAAiB,GAAG,iCAAiC,CAAC;AAE5D,8EAA8E;AAC9E,MAAM,UAAU,qBAAqB,CAAC,KAAa,EAAE,GAAG,GAAsB,OAAO,CAAC,GAAG;IACxF,OAAO,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,IAAY,EAAE,EAAE;QAChE,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,qDAAqD,IAAI,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,QAAQ,CAAC;IACjB,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CACpB,MAA0C,EAC1C,GAAsB;IAEtB,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACnD,GAAG,CAAC,GAAG,CAAC,GAAG,qBAAqB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,GAAG,CAAC;AACZ,CAAC;AAID,SAAS,UAAU,CAAC,IAAqB,EAAE,GAAsB;IAChE,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAC5B,OAAO;QACN,SAAS,EAAE,qBAAqB,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC;QACrD,aAAa,EACZ,IAAI,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC;QAC9F,MAAM,EAAE,IAAI,CAAC,MAAM;KACnB,CAAC;AACH,CAAC;AACD,SAAS,YAAY,CAAC,MAAgB,EAAE,GAAW,EAAE,GAAsB;IAC1E,MAAM,SAAS,GACd,MAAM,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC9F,OAAO;QACN,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,OAAO;QAC5B,OAAO,EAAE,qBAAqB,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC;QACnD,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAChE,GAAG,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;QAClC,GAAG,EAAE,SAAS;KACd,CAAC;AACH,CAAC;AACD,SAAS,aAAa,CACrB,MAAuB,EACvB,OAA8D;IAE9D,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACnC,IAAI,SAAS,IAAI,MAAM,IAAI,MAAM,CAAC,OAAO;QAAE,OAAO,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACjF,IAAI,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG;QAChC,OAAO;YACN,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,MAAM;YAC3B,GAAG,EAAE,qBAAqB,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;YAC3C,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC;YAC1C,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC;SAClC,CAAC;IACH,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,2CAA2C,CAAC,CAAC;AACzF,CAAC;AACD,qFAAqF;AACrF,MAAM,UAAU,iBAAiB,CAChC,OAAoD,EACpD,OAAO,GAA6C,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE;IAE1E,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACpE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,OAAO,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;QAC/C,IAAI;QACJ,aAAa,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;KACtD,CAAC,CACF,CAAC;AACH,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,eAAe,CAC9B,QAA0C,EAC1C,SAA2C;IAE3C,IAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;QAC7B,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,MAAM,GAAG,EAAE,GAAG,QAAQ,EAAE,GAAG,SAAS,EAAE,CAAC;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5D,CAAC"}

package/dist/openai-capture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-capture.d.ts","sourceRoot":"","sources":["../src/openai-capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAON,KAAK,gBAAgB,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEzD,+CAA+C;AAC/C,MAAM,WAAW,gBAAgB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC/D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,wBAAgB,4BAA4B,IAAI,sBAAsB,CAKrE;AAwCD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAU/E;AAsFD,uDAAuD;AACvD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,sBAAsB,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI,CA4BhG;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,sBAAsB,GAAG,UAAU,CAWtF;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAQ3D;AAED,YAAY,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"openai-capture.d.ts","sourceRoot":"","sources":["../src/openai-capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAON,KAAK,gBAAgB,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEzD,+CAA+C;AAC/C,MAAM,WAAW,gBAAgB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC/D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,wBAAgB,4BAA4B,IAAI,sBAAsB,CAKrE;AA6CD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAU/E;AAmGD,uDAAuD;AACvD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,sBAAsB,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAsBhG;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,sBAAsB,GAAG,UAAU,CAWtF;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAQ3D;AAED,YAAY,EAAE,UAAU,EAAE,CAAC"}

package/dist/openai-capture.js

@@ -11,6 +11,20 @@ function normalizeOpenaiUsage(raw) {
         return camel;
     }
     const record = raw;
+    const snake = openaiUsageFields(record);
+    const merged = mergeAgentUsage(camel, Object.keys(snake).length > 0 ? snake : undefined);
+    if (!merged) {
+        return undefined;
+    }
+    if (merged.totalTokens === undefined) {
+        const derived = resolvedTotalTokens(merged);
+        if (derived !== undefined) {
+            merged.totalTokens = derived;
+        }
+    }
+    return merged;
+}
+function openaiUsageFields(record) {
     const snake = {};
     if (typeof record.input_tokens === "number") {
         snake.inputTokens = record.input_tokens;
@@ -30,17 +44,7 @@ function normalizeOpenaiUsage(raw) {
     if (typeof record.reasoning_output_tokens === "number") {
         snake.reasoningTokens = record.reasoning_output_tokens;
     }
-    const merged = mergeAgentUsage(camel, Object.keys(snake).length > 0 ? snake : undefined);
-    if (!merged) {
-        return undefined;
-    }
-    if (merged.totalTokens === undefined) {
-        const derived = resolvedTotalTokens(merged);
-        if (derived !== undefined) {
-            merged.totalTokens = derived;
-        }
-    }
-    return merged;
+    return snake;
 }
 export function parseOpenaiJsonlLine(line) {
     const trimmed = line.trim();
@@ -77,6 +81,47 @@ function toolNameForFileChange(kind) {
     }
     return "Edit";
 }
+function applyCommand(acc, item) {
+    if (!item.command)
+        return;
+    const exitCode = typeof item.exit_code === "number" && Number.isFinite(item.exit_code)
+        ? item.exit_code
+        : undefined;
+    acc.shellCommands.push(item.command);
+    acc.toolCalls.push({
+        name: "Shell",
+        args: { command: item.command, cwd: item.path },
+        result: item.aggregated_output,
+        ...(exitCode !== undefined ? { exitCode, succeeded: exitCode === 0 } : {}),
+        seq: acc.nextSeq++,
+    });
+}
+function applyFileChanges(acc, item) {
+    const changes = item.changes?.length
+        ? item.changes
+        : item.path
+            ? [{ path: item.path, kind: "update" }]
+            : [];
+    for (const change of changes) {
+        if (!change.path) {
+            continue;
+        }
+        acc.toolCalls.push({
+            name: toolNameForFileChange(change.kind),
+            args: { path: change.path },
+            seq: acc.nextSeq++,
+        });
+    }
+}
+function applyMcpTool(acc, item) {
+    const name = item.server && item.tool ? `${item.server}:${item.tool}` : (item.tool ?? item.server ?? "mcp");
+    acc.toolCalls.push({
+        name,
+        args: item.arguments ?? {},
+        result: serializeToolResult(item.result),
+        seq: acc.nextSeq++,
+    });
+}
 function applyItem(acc, item) {
     const type = (item.type ?? "").toLowerCase();
     if (type === "agent_message" && item.text) {
@@ -88,48 +133,20 @@ function applyItem(acc, item) {
         return;
     }
     if (type === "command_execution" && item.command) {
-        const exitCode = typeof item.exit_code === "number" && Number.isFinite(item.exit_code)
-            ? item.exit_code
-            : undefined;
-        acc.shellCommands.push(item.command);
-        acc.toolCalls.push({
-            name: "Shell",
-            args: { command: item.command, cwd: item.path },
-            result: item.aggregated_output,
-            ...(exitCode !== undefined ? { exitCode, succeeded: exitCode === 0 } : {}),
-            seq: acc.nextSeq++,
-        });
+        applyCommand(acc, item);
         return;
     }
     if (type === "file_change") {
-        const changes = item.changes?.length
-            ? item.changes
-            : item.path
-                ? [{ path: item.path, kind: "update" }]
-                : [];
-        for (const change of changes) {
-            if (!change.path) {
-                continue;
-            }
-            acc.toolCalls.push({
-                name: toolNameForFileChange(change.kind),
-                args: { path: change.path },
-                seq: acc.nextSeq++,
-            });
-        }
+        applyFileChanges(acc, item);
         return;
     }
-    if (type === "mcp_tool_call" && (item.tool || item.server)) {
-        const name = item.server && item.tool
-            ? `${item.server}:${item.tool}`
-            : (item.tool ?? item.server ?? "mcp");
-        acc.toolCalls.push({
-            name,
-            args: item.arguments ?? {},
-            result: serializeToolResult(item.result),
-            seq: acc.nextSeq++,
-        });
-    }
+    if (type === "mcp_tool_call" && (item.tool || item.server))
+        applyMcpTool(acc, item);
+}
+function openaiEventError(event) {
+    if (typeof event.error === "string")
+        return event.error;
+    return event.error?.message || event.message || undefined;
 }
 /** Fold one Codex JSONL event into the accumulator. */
 export function accumulateOpenaiEvent(acc, event) {
@@ -140,15 +157,7 @@ export function accumulateOpenaiEvent(acc, event) {
     }
     if (type === "turn.failed" || type === "error" || type === "thread.error") {
         acc.rawStatus = type;
-        if (typeof event.error === "string") {
-            acc.resultError = event.error;
-        }
-        else if (event.error?.message) {
-            acc.resultError = event.error.message;
-        }
-        else if (event.message) {
-            acc.resultError = event.message;
-        }
+        acc.resultError = openaiEventError(event) ?? acc.resultError;
         return;
     }
     if (type !== "item.completed" && type !== "item.started" && !itemFromEvent(event)) {

package/dist/openai-capture.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai-capture.js","sourceRoot":"","sources":["../src/openai-capture.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openai-capture.js","sourceRoot":"","sources":["../src/openai-capture.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,sBAAsB,EACtB,wBAAwB,EACxB,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,GAEnB,MAAM,cAAc,CAAC;AAkCtB,MAAM,UAAU,4BAA4B;IAC3C,OAAO;QACN,GAAG,sBAAsB,EAAE;QAC3B,aAAa,EAAE,EAAE;KACjB,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,GAAY;IACzC,MAAM,KAAK,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC;IACd,CAAC;IACD,MAAM,MAAM,GAAG,GAA8B,CAAC;IAC9C,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACzF,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,CAAC,WAAW,GAAG,OAAO,CAAC;QAC9B,CAAC;IACF,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,iBAAiB,CAAC,MAA+B;IACzD,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,IAAI,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC7C,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC;IACzC,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;QAC9C,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,aAAa,CAAC;IAC3C,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC7C,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC;IACzC,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,mBAAmB,KAAK,QAAQ,EAAE,CAAC;QACpD,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC,mBAAmB,CAAC;IACpD,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,wBAAwB,KAAK,QAAQ,EAAE,CAAC;QACzD,KAAK,CAAC,gBAAgB,GAAG,MAAM,CAAC,wBAAwB,CAAC;IAC1D,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,uBAAuB,KAAK,QAAQ,EAAE,CAAC;QACxD,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC,uBAAuB,CAAC;IACxD,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAChD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,IAAI,CAAC;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAqB,CAAC;IAChD,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,SAAS,CAAC;IAClB,CAAC;AACF,CAAC;AAED,SAAS,aAAa,CAAC,KAAuB;IAC7C,IAAI,KAAK,CAAC,IAAI,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAClD,OAAO,KAAK,CAAC,IAAI,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;IAC9B,IACC,IAAI,KAAK,eAAe;QACxB,IAAI,KAAK,mBAAmB;QAC5B,IAAI,KAAK,aAAa;QACtB,IAAI,KAAK,eAAe,EACvB,CAAC;QACF,OAAO,KAAyB,CAAC;IAClC,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAwB;IACtD,MAAM,UAAU,GAAG,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;IACpD,IAAI,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QACrD,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,IAAI,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QACxD,OAAO,QAAQ,CAAC;IACjB,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,YAAY,CAAC,GAA2B,EAAE,IAAsB;IACxE,IAAI,CAAC,IAAI,CAAC,OAAO;QAAE,OAAO;IAE1B,MAAM,QAAQ,GACb,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC;QACpE,CAAC,CAAC,IAAI,CAAC,SAAS;QAChB,CAAC,CAAC,SAAS,CAAC;IACd,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC;QAClB,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE;QAC/C,MAAM,EAAE,IAAI,CAAC,iBAAiB;QAC9B,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE;KAClB,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,GAA2B,EAAE,IAAsB;IAC5E,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM;QACnC,CAAC,CAAC,IAAI,CAAC,OAAO;QACd,CAAC,CAAC,IAAI,CAAC,IAAI;YACV,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;YACvC,CAAC,CAAC,EAAE,CAAC;IACP,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAClB,SAAS;QACV,CAAC;QACD,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC;YACxC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE;YAC3B,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE;SAClB,CAAC,CAAC;IACJ,CAAC;AACF,CAAC;AAED,SAAS,YAAY,CAAC,GAA2B,EAAE,IAAsB;IACxE,MAAM,IAAI,GACT,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC;IAChG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC;QAClB,IAAI;QACJ,IAAI,EAAG,IAAI,CAAC,SAAiD,IAAI,EAAE;QACnE,MAAM,EAAE,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC;QACxC,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE;KAClB,CAAC,CAAC;AACJ,CAAC;AACD,SAAS,SAAS,CAAC,GAA2B,EAAE,IAAsB;IACrE,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAC7C,IAAI,IAAI,KAAK,eAAe,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QAC3C,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE;SAClB,CAAC,CAAC;QACH,OAAO;IACR,CAAC;IACD,IAAI,IAAI,KAAK,mBAAmB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QAClD,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACxB,OAAO;IACR,CAAC;IACD,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;QAC5B,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC5B,OAAO;IACR,CAAC;IACD,IAAI,IAAI,KAAK,eAAe,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC;QAAE,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AACrF,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAuB;IAChD,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC,KAAK,CAAC;IACxD,OAAO,KAAK,CAAC,KAAK,EAAE,OAAO,IAAI,KAAK,CAAC,OAAO,IAAI,SAAS,CAAC;AAC3D,CAAC;AACD,uDAAuD;AACvD,MAAM,UAAU,qBAAqB,CAAC,GAA2B,EAAE,KAAuB;IACzF,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;IAC9B,IAAI,IAAI,KAAK,gBAAgB,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC9C,GAAG,CAAC,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1E,OAAO;IACR,CAAC;IACD,IAAI,IAAI,KAAK,aAAa,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;QAC3E,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;QACrB,GAAG,CAAC,WAAW,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,WAAW,CAAC;QAC7D,OAAO;IACR,CAAC;IACD,IAAI,IAAI,KAAK,gBAAgB,IAAI,IAAI,KAAK,cAAc,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACnF,OAAO;IACR,CAAC;IACD,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;QAC7B,OAAO;IACR,CAAC;IACD,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IAClC,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,OAAO;IACR,CAAC;IACD,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,GAA2B;IACzE,MAAM,KAAK,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;IAC5C,OAAO;QACN,GAAG,KAAK;QACR,aAAa,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;QAC3E,SAAS,EAAE;YACV,GAAG,KAAK,CAAC,SAAS;YAClB,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClE;KACD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAiB;IAClD,KAAK,IAAI,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACjE,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,OAAO,EAAE,IAAI,KAAK,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7D,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;IACF,CAAC;IACD,OAAO,EAAE,CAAC;AACX,CAAC"}

package/dist/openai-run.d.ts

@@ -1,7 +1,6 @@
 import { type HostAuthMode } from "./auth-mode.js";
-import type { JudgeClassifierResult } from "./cursor-run.js";
 import { type McpServerConfig } from "./mcp.js";
-import type { AgentTrace, JudgeWorkspaceContext, LiveAgentEvent } from "./types.js";
+import type { AgentTrace, LiveAgentEvent } from "./types.js";
 export type OpenaiAuthMode = HostAuthMode;
 export declare const OPENAI_AUTH_MODE_ENV = "OPENAI_AUTH_MODE";
 export declare const OPENAI_MISSING_KEY_MESSAGE = "OPENAI_API_KEY or CODEX_API_KEY required for --auth-mode api-key";
@@ -22,7 +21,7 @@ export interface OpenaiRunOptions {
     /** Inline MCP servers for this `codex exec` via `-c mcp_servers.<name>=…`. */
     mcpServers?: Record<string, McpServerConfig>;
     /** Load `~/.codex` user config and skills. Default false. */
-    allowUserSkills?: boolean;
+    includeGlobalSkills?: boolean;
     /** Allow network access in a workspace-write sandbox. Default false. */
     networkAccess?: boolean;
 }
@@ -68,19 +67,11 @@ export declare function buildOpenaiExecArgs(options: {
     model?: string;
     sandbox?: "workspace-write" | "read-only";
     mcpServers?: Record<string, McpServerConfig>;
-    allowUserSkills?: boolean;
+    includeGlobalSkills?: boolean;
     networkAccess?: boolean;
 }): string[];
 /** Shared Codex CLI path — `codex exec --json` → AgentTrace. */
 export declare function runOpenaiAgent(options: OpenaiRunOptions): Promise<OpenaiRunResult>;
-/** Classifier-only Codex path — read-only sandbox, last assistant text. */
-export declare function runOpenaiClassifier(options: {
-    cwd: string;
-    prompt: string;
-    workspaces?: readonly JudgeWorkspaceContext[];
-    apiKey?: string;
-    bin?: string;
-    onText?: (text: string) => void;
-}): Promise<JudgeClassifierResult>;
 export {};
+/** Classifier-only Codex path — read-only sandbox, last assistant text. */
 //# sourceMappingURL=openai-run.d.ts.map

package/dist/openai-run.d.ts.map

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