@agentex/agent 0.0.7 → 0.0.8

package/dist/providers/codex/index.js

@@ -1,54 +1,12 @@
 import { executeCodexProvider } from "./execute.js";
 import { createCodexSession } from "./session.js";
 import { codexSessionCodec } from "./codec.js";
-import { findBinary } from "../../utils/binary.js";
-import { buildEnv, ensurePathInEnv } from "../../utils/env.js";
 import { resolveAuthForProvider } from "../../utils/auth.js";
-import { ModelCache } from "../../utils/model-cache.js";
-import { runChildProcess } from "../../utils/process.js";
-const FALLBACK_MODELS = [
-    { id: "o3", name: "o3", provider: "openai" },
-    { id: "o4-mini", name: "o4-mini", provider: "openai" },
-    { id: "codex-mini-latest", name: "Codex Mini", provider: "openai" },
-];
-const cache = new ModelCache();
-async function fetchModels() {
-    try {
-        const resolved = await findBinary("codex");
-        const env = buildEnv();
-        ensurePathInEnv(env);
-        const proc = await runChildProcess({
-            runId: "list-models",
-            command: resolved.bin,
-            args: [...resolved.prefixArgs, "models"],
-            cwd: process.cwd(),
-            env,
-            timeoutSec: 10,
-        });
-        if ((proc.exitCode ?? 1) === 0 && proc.stdout.trim()) {
-            return proc.stdout
-                .trim()
-                .split(/\r?\n/)
-                .filter((line) => line.trim())
-                .map((line) => {
-                const id = line.trim();
-                return { id, name: id, provider: "openai" };
-            });
-        }
-    }
-    catch {
-        // Fallback
-    }
-    return FALLBACK_MODELS;
-}
-async function listModels(options) {
-    return cache.get(options?.cacheTtlMs ?? 0, fetchModels);
-}
 export const codexProvider = {
     type: "codex",
     capabilities: {
         sessions: true,
-        modelDiscovery: true,
+        modelDiscovery: false,
         quotaProbing: false,
         mcp: false,
         skills: true,
@@ -59,6 +17,5 @@ export const codexProvider = {
     createSession: (ctx) => createCodexSession(ctx),
     resolveAuth: (ctx) => resolveAuthForProvider("codex", ctx),
     sessionCodec: codexSessionCodec,
-    listModels,
 };
 //# sourceMappingURL=index.js.map

package/dist/providers/codex/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/providers/codex/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/providers/codex/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,CAAC,MAAM,aAAa,GAAmB;IAC3C,IAAI,EAAE,OAAO;IACb,YAAY,EAAE;QACZ,QAAQ,EAAE,IAAI;QACd,cAAc,EAAE,KAAK;QACrB,YAAY,EAAE,KAAK;QACnB,GAAG,EAAE,KAAK;QACV,MAAM,EAAE,IAAI;QACZ,YAAY,EAAE,IAAI;QAClB,SAAS,EAAE,IAAI;KAChB;IACD,OAAO,EAAE,oBAAoB;IAC7B,aAAa,EAAE,CAAC,GAAmB,EAAyB,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC;IACtF,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,CAAC;IAC1D,YAAY,EAAE,iBAAiB;CAChC,CAAC"}

package/dist/providers/codex/parse.d.ts

@@ -1,19 +1,31 @@
-import type { StreamEvent } from "../../types.js";
+import type { StreamEvent, TokenUsage } from "../../types.js";
 export interface CodexParsedResult {
     sessionId: string | null;
+    /**
+     * Codex doesn't emit `model` in its NDJSON output — always null from
+     * stdout. Executors should fall back to the requested model.
+     */
     model: string | null;
-    usage: {
-        inputTokens: number;
-        outputTokens: number;
-    } | null;
+    usage: TokenUsage | null;
     costUsd: number | null;
     summary: string | null;
     isError: boolean;
     errorCode: string | null;
     errorMessage: string | null;
+    /** Final `turn.completed` / `turn.failed` / `error` event verbatim. */
+    finalEvent: Record<string, unknown> | null;
 }
 export declare function parseCodexJsonl(stdout: string): CodexParsedResult;
-export declare function parseCodexStreamLine(line: string): StreamEvent | null;
+/**
+ * Parse a single Codex line into a StreamEvent.
+ *
+ * @param line   Raw JSON text.
+ * @param sessionId  Caller-tracked thread id (NDJSON emits it once on
+ *                   `thread.started` and the executor threads it through).
+ *                   v2 parses it from `params.threadId` directly and
+ *                   ignores this arg.
+ */
+export declare function parseCodexStreamLine(line: string, sessionId?: string | null): StreamEvent | null;
 export declare function stripCodexRolloutNoise(text: string): string;
 export declare function isCodexAuthRequired(stdout: string, stderr: string): boolean;
 export declare function isCodexUnknownSessionError(stdout: string, stderr: string): boolean;

package/dist/providers/codex/parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../src/providers/codex/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC5D,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AA6BD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAmFjE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAsGrE;AAKD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAS3D;AAID,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAE3E;AAID,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAElF"}
+{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../src/providers/codex/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,WAAW,EACX,UAAU,EACX,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB;;;OAGG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,uEAAuE;IACvE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC5C;AAkED,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CA4FjE;AAUD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,SAAS,GAAE,MAAM,GAAG,IAAW,GAC9B,WAAW,GAAG,IAAI,CAWpB;AAyXD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAS3D;AAID,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAE3E;AAID,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAElF"}

package/dist/providers/codex/parse.js

@@ -1,3 +1,4 @@
+const PROVIDER_TYPE = "codex";
 function parseJson(line) {
     try {
         const parsed = JSON.parse(line);
@@ -13,25 +14,53 @@ function parseJson(line) {
 function asString(value, fallback) {
     return typeof value === "string" ? value : fallback;
 }
+function asNullableString(value) {
+    return typeof value === "string" && value.length > 0 ? value : null;
+}
 function asNumber(value, fallback) {
     return typeof value === "number" && Number.isFinite(value) ? value : fallback;
 }
+function asNullableNumber(value) {
+    return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
 function parseObject(value) {
     if (typeof value === "object" && value !== null && !Array.isArray(value)) {
         return value;
     }
     return {};
 }
+/**
+ * Build base fields. For Codex, `eventId` is always null (neither wire
+ * format emits a per-line UUID). `sessionId` and `turnId` come from the
+ * caller — the v2 parser extracts them from the event's `params`; the
+ * NDJSON parser tracks sessionId across lines and leaves turnId null.
+ */
+function baseFields(event, sessionId, messageId, turnId) {
+    return {
+        timestamp: new Date().toISOString(),
+        providerType: PROVIDER_TYPE,
+        sessionId,
+        messageId,
+        eventId: null,
+        turnId,
+        parentToolCallId: null,
+        raw: event,
+    };
+}
+// ---------------------------------------------------------------------------
+// Run-level parser used by executeCodexProvider to summarize a full stdout.
+// Operates on NDJSON only (executor uses `codex exec --json`).
+// ---------------------------------------------------------------------------
 export function parseCodexJsonl(stdout) {
     let sessionId = null;
-    let model = null;
     let totalInputTokens = 0;
     let totalOutputTokens = 0;
+    let totalCachedInputTokens = 0;
     let hasUsage = false;
     let summary = null;
     let isError = false;
-    let errorCode = null;
     let errorMessage = null;
+    let finalEvent = null;
     for (const rawLine of stdout.split(/\r?\n/)) {
         const line = rawLine.trim();
         if (!line)
@@ -41,19 +70,17 @@ export function parseCodexJsonl(stdout) {
             continue;
         const type = asString(event["type"], "");
         if (type === "thread.started") {
-            sessionId = asString(event["thread_id"], "") || sessionId;
+            sessionId = asNullableString(event["thread_id"]) ?? sessionId;
             continue;
         }
         if (type === "item.completed") {
             const item = parseObject(event["item"]);
             if (asString(item["type"], "") === "agent_message") {
-                // Direct text field (Codex 0.30+)
                 const directText = asString(item["text"], "");
                 if (directText) {
                     summary = directText;
                 }
                 else {
-                    // Fallback: content array with output_text blocks
                     const content = Array.isArray(item["content"]) ? item["content"] : [];
                     for (const entry of content) {
                         if (typeof entry !== "object" || entry === null || Array.isArray(entry))
@@ -73,134 +100,405 @@ export function parseCodexJsonl(stdout) {
             const usage = parseObject(event["usage"]);
             const inputTokens = asNumber(usage["input_tokens"], 0);
             const outputTokens = asNumber(usage["output_tokens"], 0);
-            if (inputTokens > 0 || outputTokens > 0) {
+            const cachedInputTokens = asNumber(usage["cached_input_tokens"], 0);
+            if (inputTokens > 0 || outputTokens > 0 || cachedInputTokens > 0) {
                 totalInputTokens += inputTokens;
                 totalOutputTokens += outputTokens;
+                totalCachedInputTokens += cachedInputTokens;
                 hasUsage = true;
             }
-            model = asString(event["model"], "") || model;
+            finalEvent = event;
             continue;
         }
         if (type === "turn.failed") {
             isError = true;
-            errorMessage = asString(event["message"], "") || asString(event["error"], "") || null;
+            errorMessage = asNullableString(event["message"]) ?? asNullableString(event["error"]);
+            finalEvent = event;
             continue;
         }
         if (type === "error") {
             isError = true;
-            errorMessage = asString(event["message"], "") || null;
+            errorMessage = asNullableString(event["message"]);
+            finalEvent = event;
             continue;
         }
     }
+    const usage = hasUsage ? {
+        inputTokens: totalInputTokens,
+        outputTokens: totalOutputTokens,
+        ...(totalCachedInputTokens > 0 ? { cachedInputTokens: totalCachedInputTokens } : {}),
+    } : null;
     return {
         sessionId,
-        model,
-        usage: hasUsage ? { inputTokens: totalInputTokens, outputTokens: totalOutputTokens } : null,
-        costUsd: null, // Codex JSONL doesn't report cost
+        model: null,
+        usage,
+        costUsd: null, // Codex doesn't report cost
         summary,
         isError,
-        errorCode,
+        errorCode: null,
         errorMessage,
+        finalEvent,
     };
 }
-export function parseCodexStreamLine(line) {
+// ---------------------------------------------------------------------------
+// Stream-line parser. Auto-detects wire format:
+//  - `codex exec --json` NDJSON: `{"type":"...","...": ...}`
+//  - `codex --json` v2 JSON-RPC: `{"jsonrpc":"2.0","method":"...","params":{...}}`
+// Both shapes produce the same StreamEvent variants so downstream
+// consumers don't branch on format.
+// ---------------------------------------------------------------------------
+/**
+ * Parse a single Codex line into a StreamEvent.
+ *
+ * @param line   Raw JSON text.
+ * @param sessionId  Caller-tracked thread id (NDJSON emits it once on
+ *                   `thread.started` and the executor threads it through).
+ *                   v2 parses it from `params.threadId` directly and
+ *                   ignores this arg.
+ */
+export function parseCodexStreamLine(line, sessionId = null) {
     const event = parseJson(line);
     if (!event)
         return null;
+    // v2 JSON-RPC notification: has `method` + `params`.
+    if (typeof event["method"] === "string") {
+        return parseV2Notification(event);
+    }
+    // NDJSON legacy format: has `type`.
+    return parseNdjsonEvent(event, sessionId);
+}
+// ---------------------------------------------------------------------------
+// v2 JSON-RPC notifications (codex --json app-server mode)
+// ---------------------------------------------------------------------------
+function parseV2Notification(event) {
+    const method = asString(event["method"], "");
+    const params = parseObject(event["params"]);
+    // Extract thread + turn scope. Most notifications carry threadId at the
+    // top of params; thread/started nests it under thread.id.
+    const thread = parseObject(params["thread"]);
+    const threadId = asNullableString(params["threadId"]) ??
+        asNullableString(thread["id"]);
+    // turn/started + turn/completed nest the turn object; everything else
+    // puts turnId at the top of params.
+    const turn = parseObject(params["turn"]);
+    const turnId = asNullableString(params["turnId"]) ??
+        asNullableString(turn["id"]);
+    const makeBase = (messageId) => baseFields(event, threadId, messageId, turnId);
+    // ---- Thread lifecycle ----
+    if (method === "thread/started") {
+        return {
+            type: "system",
+            subtype: "init",
+            model: null,
+            cwd: asNullableString(thread["cwd"]),
+            tools: null,
+            permissionMode: null,
+            ...makeBase(null),
+        };
+    }
+    // ---- Turn lifecycle ----
+    if (method === "turn/started") {
+        // Lifecycle marker; items will follow. Skip to reduce noise.
+        return null;
+    }
+    if (method === "turn/completed") {
+        return {
+            type: "result",
+            text: "",
+            costUsd: null,
+            isError: false,
+            stopReason: null,
+            terminalReason: asNullableString(turn["status"]),
+            numTurns: null,
+            durationMs: asNullableNumber(turn["durationMs"]),
+            ...makeBase(null),
+        };
+    }
+    if (method === "turn/failed") {
+        return {
+            type: "result",
+            text: asString(params["message"], ""),
+            costUsd: null,
+            isError: true,
+            stopReason: null,
+            terminalReason: asNullableString(turn["status"]),
+            numTurns: null,
+            durationMs: asNullableNumber(turn["durationMs"]),
+            ...makeBase(null),
+        };
+    }
+    // ---- Item lifecycle ----
+    if (method === "item/started" || method === "item/completed") {
+        const item = parseObject(params["item"]);
+        const itemType = asString(item["type"], "");
+        const itemId = asNullableString(item["id"]) ??
+            asNullableString(item["call_id"]);
+        const base = makeBase(itemId);
+        // Tool starts — emit tool_call on item/started only.
+        if (method === "item/started") {
+            if (itemType === "command_execution") {
+                return {
+                    type: "tool_call",
+                    toolCallId: itemId,
+                    name: "command_execution",
+                    input: asString(item["command"], ""),
+                    ...base,
+                };
+            }
+            if (itemType === "function_call") {
+                return {
+                    type: "tool_call",
+                    toolCallId: itemId,
+                    name: asString(item["name"], "function_call"),
+                    input: item["arguments"] ?? item["input"] ?? "",
+                    ...base,
+                };
+            }
+            // reasoning, agentMessage, userMessage — wait for item/completed.
+            return null;
+        }
+        // item/completed — emit the terminal event for each item type.
+        if (itemType === "command_execution") {
+            const exitCode = asNullableNumber(item["exit_code"]);
+            return {
+                type: "tool_result",
+                toolCallId: itemId,
+                content: asString(item["aggregated_output"], ""),
+                isError: exitCode !== null && exitCode !== 0,
+                exitCode,
+                ...base,
+            };
+        }
+        if (itemType === "function_call") {
+            const output = item["output"] ?? item["result"] ?? "";
+            return {
+                type: "tool_result",
+                toolCallId: itemId,
+                content: typeof output === "string" ? output : JSON.stringify(output),
+                isError: item["status"] === "failed",
+                exitCode: null,
+                ...base,
+            };
+        }
+        if (itemType === "agentMessage") {
+            const directText = asString(item["text"], "");
+            if (directText || directText === "") {
+                return {
+                    type: "assistant",
+                    text: directText,
+                    ...base,
+                };
+            }
+        }
+        if (itemType === "reasoning") {
+            // Reasoning content may be empty / encrypted out-of-band — consumers
+            // that need the raw payload read it from `raw`.
+            const text = asString(item["text"], "") ||
+                extractReasoningText(item);
+            return {
+                type: "thinking",
+                text,
+                ...base,
+            };
+        }
+        if (itemType === "userMessage") {
+            // Consumer persists user input on the write path before calling send().
+            // We don't re-emit it here to keep a single source of truth.
+            return null;
+        }
+        // Unknown item type — surface as unknown.
+        return {
+            type: "unknown",
+            subtype: `item/completed:${itemType}`,
+            ...base,
+        };
+    }
+    // ---- Streaming deltas: block-level only for v1; skip token deltas. ----
+    if (method === "item/agentMessage/delta" || method === "item/reasoning/delta") {
+        return null;
+    }
+    // ---- Rate limits ----
+    if (method === "account/rateLimits/updated") {
+        const rateLimits = parseObject(params["rateLimits"]);
+        const primary = parseObject(rateLimits["primary"]);
+        const usedPercent = asNullableNumber(primary["usedPercent"]);
+        return {
+            type: "rate_limit",
+            status: usedPercent !== null && usedPercent >= 100 ? "rejected" : "allowed",
+            limitType: asNullableString(rateLimits["limitId"]),
+            resetAt: null,
+            overageStatus: null,
+            isUsingOverage: null,
+            ...makeBase(null),
+        };
+    }
+    // ---- Pure telemetry / status ----
+    if (method === "thread/tokenUsage/updated" ||
+        method === "thread/status/changed" ||
+        method === "mcpServer/startupStatus/updated") {
+        return null;
+    }
+    // ---- Forward-compat: unknown method ----
+    return {
+        type: "unknown",
+        subtype: method,
+        ...makeBase(null),
+    };
+}
+function extractReasoningText(item) {
+    // Codex reasoning items carry summary and content arrays. Concatenate
+    // any visible text fragments for display; fall back to "" if all empty
+    // or encrypted.
+    const parts = [];
+    for (const key of ["summary", "content"]) {
+        const arr = Array.isArray(item[key]) ? item[key] : [];
+        for (const entry of arr) {
+            if (typeof entry !== "object" || entry === null || Array.isArray(entry))
+                continue;
+            const block = entry;
+            const text = asString(block["text"], "");
+            if (text)
+                parts.push(text);
+        }
+    }
+    return parts.join("\n").trim();
+}
+// ---------------------------------------------------------------------------
+// NDJSON format (codex exec --json)
+// ---------------------------------------------------------------------------
+function parseNdjsonEvent(event, sessionId) {
     const type = asString(event["type"], "");
-    const timestamp = new Date().toISOString();
     if (type === "thread.started") {
+        const threadId = asNullableString(event["thread_id"]);
         return {
             type: "system",
             subtype: "init",
-            sessionId: asString(event["thread_id"], "") || null,
             model: null,
-            timestamp,
+            cwd: null,
+            tools: null,
+            permissionMode: null,
+            ...baseFields(event, threadId, null, null),
         };
     }
     if (type === "item.started") {
         const item = parseObject(event["item"]);
         const itemType = asString(item["type"], "");
+        const itemId = asNullableString(item["id"]) ?? asNullableString(item["call_id"]);
+        const base = baseFields(event, sessionId, itemId, null);
         if (itemType === "command_execution") {
             return {
                 type: "tool_call",
-                callId: asString(item["id"], "") || undefined,
+                toolCallId: itemId,
                 name: "command_execution",
                 input: asString(item["command"], ""),
-                timestamp,
+                ...base,
             };
         }
         if (itemType === "function_call") {
             return {
                 type: "tool_call",
-                callId: asString(item["id"], "") || asString(item["call_id"], "") || undefined,
+                toolCallId: itemId,
                 name: asString(item["name"], "function_call"),
                 input: item["arguments"] ?? item["input"] ?? "",
-                timestamp,
+                ...base,
             };
         }
     }
     if (type === "item.completed") {
         const item = parseObject(event["item"]);
         const itemType = asString(item["type"], "");
+        const itemId = asNullableString(item["id"]) ?? asNullableString(item["call_id"]);
+        const base = baseFields(event, sessionId, itemId, null);
         if (itemType === "command_execution") {
-            const exitCode = typeof item["exit_code"] === "number" ? item["exit_code"] : null;
+            const exitCode = asNullableNumber(item["exit_code"]);
             return {
                 type: "tool_result",
-                toolCallId: asString(item["id"], ""),
+                toolCallId: itemId,
                 content: asString(item["aggregated_output"], ""),
                 isError: exitCode !== null && exitCode !== 0,
-                timestamp,
+                exitCode,
+                ...base,
             };
         }
         if (itemType === "function_call") {
             const output = item["output"] ?? item["result"] ?? "";
             return {
                 type: "tool_result",
-                toolCallId: asString(item["id"], "") || asString(item["call_id"], ""),
+                toolCallId: itemId,
                 content: typeof output === "string" ? output : JSON.stringify(output),
                 isError: item["status"] === "failed",
-                timestamp,
+                exitCode: null,
+                ...base,
             };
         }
         if (itemType === "agent_message") {
-            // Direct text field (Codex 0.30+)
             const directText = asString(item["text"], "");
             if (directText) {
-                return { type: "assistant", text: directText, timestamp };
+                return {
+                    type: "assistant",
+                    text: directText,
+                    ...base,
+                };
             }
-            // Fallback: content array with output_text blocks
             const content = Array.isArray(item["content"]) ? item["content"] : [];
             for (const entry of content) {
                 if (typeof entry !== "object" || entry === null || Array.isArray(entry))
                     continue;
                 const block = entry;
                 if (asString(block["type"], "") === "output_text") {
-                    return { type: "assistant", text: asString(block["text"], ""), timestamp };
+                    return {
+                        type: "assistant",
+                        text: asString(block["text"], ""),
+                        ...base,
+                    };
                 }
             }
         }
+        if (itemType === "reasoning") {
+            const text = asString(item["text"], "") || extractReasoningText(item);
+            return {
+                type: "thinking",
+                text,
+                ...base,
+            };
+        }
     }
     if (type === "turn.completed") {
         return {
             type: "result",
             text: "",
-            cost: null,
+            costUsd: null,
             isError: false,
-            timestamp,
+            stopReason: null,
+            terminalReason: null,
+            numTurns: null,
+            durationMs: null,
+            ...baseFields(event, sessionId, null, null),
         };
     }
     if (type === "error" || type === "turn.failed") {
         return {
             type: "result",
             text: asString(event["message"], ""),
-            cost: null,
+            costUsd: null,
             isError: true,
-            timestamp,
+            stopReason: null,
+            terminalReason: null,
+            numTurns: null,
+            durationMs: null,
+            ...baseFields(event, sessionId, null, null),
         };
     }
-    return null;
+    // Forward-compat: surface unknown event types.
+    return {
+        type: "unknown",
+        subtype: type,
+        ...baseFields(event, sessionId, null, null),
+    };
 }
+// ---------------------------------------------------------------------------
+// Error detection utilities (unchanged)
+// ---------------------------------------------------------------------------
 const CODEX_ROLLOUT_NOISE_RE = /^\d{4}-\d{2}-\d{2}T\S+\s+ERROR\s+codex_core::rollout::list:/i;
 export function stripCodexRolloutNoise(text) {
     return text