@tracemarketplace/shared 0.0.6 → 0.0.9

package/dist/extractor-cursor.test.js

@@ -0,0 +1,120 @@
+import { mkdtempSync, rmSync } from "fs";
+import { join } from "path";
+import { tmpdir } from "os";
+import Database from "better-sqlite3";
+import { afterEach, describe, expect, it } from "vitest";
+import { extractCursor } from "./extractors/cursor.js";
+const tempDirs = [];
+function makeCursorDb(sessionId, headers, values) {
+    const dir = mkdtempSync(join(tmpdir(), "tracemp-cursor-"));
+    tempDirs.push(dir);
+    const dbPath = join(dir, "state.vscdb");
+    const db = new Database(dbPath);
+    db.exec("CREATE TABLE cursorDiskKV (key TEXT PRIMARY KEY, value TEXT NOT NULL)");
+    db.prepare("INSERT INTO cursorDiskKV (key, value) VALUES (?, ?)").run(`composerData:${sessionId}`, JSON.stringify({
+        _v: 14,
+        createdAt: Date.parse("2026-03-21T00:00:00.000Z"),
+        fullConversationHeadersOnly: headers,
+    }));
+    const insert = db.prepare("INSERT INTO cursorDiskKV (key, value) VALUES (?, ?)");
+    for (const [key, value] of values) {
+        insert.run(key, JSON.stringify(value));
+    }
+    db.close();
+    return dbPath;
+}
+afterEach(() => {
+    while (tempDirs.length > 0) {
+        rmSync(tempDirs.pop(), { force: true, recursive: true });
+    }
+});
+describe("extractCursor", () => {
+    it("supports the modern bubbleId:<session>:<bubble> storage format", async () => {
+        const sessionId = "cursor-modern";
+        const dbPath = makeCursorDb(sessionId, [
+            { bubbleId: "user-1", type: 1 },
+            { bubbleId: "assistant-1", type: 2 },
+        ], [
+            [
+                `bubbleId:${sessionId}:user-1`,
+                {
+                    type: 1,
+                    text: "Help me debug the repo",
+                    createdAt: "2026-03-21T00:00:01.000Z",
+                    tokenCount: { inputTokens: 0, outputTokens: 0 },
+                },
+            ],
+            [
+                `bubbleId:${sessionId}:assistant-1`,
+                {
+                    type: 2,
+                    text: "I will inspect src/main.ts",
+                    thinking: { text: "Start with the entrypoint." },
+                    createdAt: "2026-03-21T00:00:02.000Z",
+                    modelName: "gpt-5.4",
+                    tokenCount: { inputTokens: 200, outputTokens: 80 },
+                    relevantFiles: [{ path: "src/main.ts" }],
+                    workspaceUris: ["file:///Users/test/project"],
+                },
+            ],
+        ]);
+        const trace = await extractCursor(dbPath, sessionId, "test@example.com");
+        expect(trace.turn_count).toBe(2);
+        expect(trace.source_version).toBe("14");
+        expect(trace.total_input_tokens).toBe(200);
+        expect(trace.total_output_tokens).toBe(80);
+        expect(trace.has_thinking_blocks).toBe(true);
+        expect(trace.turns[0]).toMatchObject({
+            role: "user",
+            content: [{ type: "text", text: "Help me debug the repo" }],
+        });
+        expect(trace.turns[1].role).toBe("assistant");
+        expect(trace.turns[1].model).toBe("gpt-5.4");
+        expect(trace.turns[1].content.map((block) => block.type)).toEqual([
+            "thinking",
+            "text",
+        ]);
+        expect(trace.turns[1].usage).toMatchObject({
+            input_tokens: 200,
+            output_tokens: 80,
+        });
+        expect(trace.env_state?.open_files_in_editor).toEqual(expect.arrayContaining(["src/main.ts", "/Users/test/project"]));
+    });
+    it("falls back to the legacy agentKv:blob:<bubble> storage format", async () => {
+        const sessionId = "cursor-legacy";
+        const dbPath = makeCursorDb(sessionId, [
+            { bubbleId: "user-1", type: 1 },
+            { bubbleId: "assistant-1", type: 2 },
+        ], [
+            [
+                `agentKv:blob:user-1`,
+                {
+                    role: "user",
+                    type: "user",
+                    text: "Open app.py",
+                    createdAt: "2026-03-21T01:00:01.000Z",
+                },
+            ],
+            [
+                `agentKv:blob:assistant-1`,
+                {
+                    role: "assistant",
+                    message: "Opened the file.",
+                    createdAt: "2026-03-21T01:00:02.000Z",
+                    usage: { promptTokens: 55, completionTokens: 21 },
+                    context: { openFiles: [{ path: "/tmp/app.py" }] },
+                },
+            ],
+        ]);
+        const trace = await extractCursor(dbPath, sessionId, "test@example.com");
+        expect(trace.turn_count).toBe(2);
+        expect(trace.total_input_tokens).toBe(55);
+        expect(trace.total_output_tokens).toBe(21);
+        expect(trace.turns[1]).toMatchObject({
+            role: "assistant",
+            content: [{ type: "text", text: "Opened the file." }],
+        });
+        expect(trace.env_state?.open_files_in_editor).toEqual(["/tmp/app.py"]);
+    });
+});
+//# sourceMappingURL=extractor-cursor.test.js.map

package/dist/extractor-cursor.test.js.map

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

package/dist/extractors/claude-code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../../src/extractors/claude-code.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,eAAe,EAIhB,MAAM,aAAa,CAAC;AAErB,wBAAsB,iBAAiB,CACrC,eAAe,EAAE,MAAM,EACvB,WAAW,SAAY,GACtB,OAAO,CAAC,eAAe,CAAC,CAmK1B"}
+{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../../src/extractors/claude-code.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,eAAe,EAIhB,MAAM,aAAa,CAAC;AAGrB,wBAAsB,iBAAiB,CACrC,eAAe,EAAE,MAAM,EACvB,WAAW,SAAY,GACtB,OAAO,CAAC,eAAe,CAAC,CAiR1B"}

package/dist/extractors/claude-code.js

@@ -2,6 +2,7 @@ import { createReadStream } from "fs";
 import { createInterface } from "readline";
 import { randomUUID } from "crypto";
 import { hashString, computeContentHash } from "../hash.js";
+import { deriveTurnActors } from "../turn-actors.js";
 export async function extractClaudeCode(sessionFilePath, submittedBy = "unknown") {
     const lines = [];
     const rl = createInterface({
@@ -17,95 +18,193 @@ export async function extractClaudeCode(sessionFilePath, submittedBy = "unknown"
         catch { }
     }
     const sessionId = sessionFilePath.split("/").pop()?.replace(".jsonl", "") ?? randomUUID();
+    // Build uuid→entry map for parent lookups
+    const uuidMap = new Map();
+    for (const line of lines) {
+        if (line.uuid)
+            uuidMap.set(line.uuid, line);
+    }
+    // Filter to lines that carry message content (skip progress, snapshots, etc.)
+    const SKIP_TYPES = new Set([
+        "progress",
+        "file-history-snapshot",
+        "system",
+        "last-prompt",
+    ]);
+    const entries = lines.filter((l) => !SKIP_TYPES.has(l.type) && l.message);
+    // Claude Code splits a single logical turn into multiple chained JSONL entries:
+    //
+    // 1. Assistant turns: thinking → tool_use → text each parent the next
+    //    (assistant→assistant parentage). Merge into one turn.
+    //
+    // 2. User tool_results for parallel tool calls: each result is a separate entry
+    //    whose parentUuid points to a different entry in the same assistant chain.
+    //    Merge into one user turn.
+    // For assistant entries: walk up until the parent is NOT an assistant entry.
+    function getAssistantRoot(entry) {
+        let cur = entry;
+        while (cur.message?.role === "assistant") {
+            const parent = uuidMap.get(cur.parentUuid);
+            if (!parent?.message || parent.message.role !== "assistant")
+                break;
+            cur = parent;
+        }
+        return cur;
+    }
+    // For a user entry: return the uuid of the assistant group root that it responds to
+    // (null if its parent is not an assistant).
+    function parentAssistantRootUuid(entry) {
+        const parent = uuidMap.get(entry.parentUuid);
+        if (!parent?.message || parent.message.role !== "assistant")
+            return null;
+        return getAssistantRoot(parent).uuid ?? null;
+    }
+    // Group entries in file order.
+    // Key: root uuid for assistant groups; entry uuid for user groups.
+    const groupMap = new Map();
+    const rootOrder = [];
+    for (const entry of entries) {
+        const role = entry.message?.role;
+        if (role === "assistant") {
+            const root = getAssistantRoot(entry);
+            const rootUuid = root.uuid ?? randomUUID();
+            if (!groupMap.has(rootUuid)) {
+                groupMap.set(rootUuid, [root]);
+                rootOrder.push(rootUuid);
+            }
+            else if (entry !== root) {
+                groupMap.get(rootUuid).push(entry);
+            }
+        }
+        else {
+            // User entry: merge with the previous user group if they share the same
+            // parent assistant root (i.e., parallel tool results for the same tool call batch).
+            const myParentRoot = parentAssistantRootUuid(entry);
+            const lastKey = rootOrder[rootOrder.length - 1];
+            const lastGroup = lastKey ? groupMap.get(lastKey) : undefined;
+            const lastRole = lastGroup?.[0]?.message?.role;
+            if (myParentRoot &&
+                lastRole === "user" &&
+                parentAssistantRootUuid(lastGroup[0]) === myParentRoot) {
+                lastGroup.push(entry);
+            }
+            else {
+                const groupKey = entry.uuid ?? randomUUID();
+                groupMap.set(groupKey, [entry]);
+                rootOrder.push(groupKey);
+            }
+        }
+    }
     const turns = [];
     let totalInputTokens = 0;
     let totalOutputTokens = 0;
     let totalCacheReadTokens = 0;
     let gitBranch = null;
     let cwdHash = null;
-    for (const line of lines) {
-        if (!line.message)
-            continue;
-        const { role, content, usage, model } = line.message;
-        const tokenUsage = usage
-            ? {
-                input_tokens: usage.input_tokens ?? 0,
-                output_tokens: usage.output_tokens ?? 0,
-                cache_read_input_tokens: usage.cache_read_input_tokens ?? null,
-                cache_creation_input_tokens: usage.cache_creation_input_tokens ?? null,
-                reasoning_tokens: null,
-            }
-            : null;
-        if (tokenUsage) {
-            totalInputTokens += tokenUsage.input_tokens;
-            totalOutputTokens += tokenUsage.output_tokens;
-            totalCacheReadTokens += tokenUsage.cache_read_input_tokens ?? 0;
-        }
-        if (line.gitBranch)
-            gitBranch = line.gitBranch;
-        if (line.cwd && !cwdHash)
-            cwdHash = hashString(line.cwd);
+    for (const rootUuid of rootOrder) {
+        const group = groupMap.get(rootUuid);
+        const root = group[0];
+        if (root.gitBranch)
+            gitBranch = root.gitBranch;
+        if (root.cwd && !cwdHash)
+            cwdHash = hashString(root.cwd);
+        const role = root.message.role === "assistant" ? "assistant" : "user";
+        // Collect content blocks from all entries in the group
         const contentBlocks = [];
-        const rawContent = Array.isArray(content)
-            ? content
-            : typeof content === "string"
-                ? [{ type: "text", text: content }]
-                : [];
-        for (const block of rawContent) {
-            if (!block || !block.type)
-                continue;
-            if (block.type === "file-history-snapshot")
-                continue;
-            if (block.type === "text") {
-                contentBlocks.push({ type: "text", text: block.text ?? "" });
-            }
-            else if (block.type === "thinking") {
-                contentBlocks.push({
-                    type: "thinking",
-                    text: block.thinking ?? block.text ?? "",
-                });
-            }
-            else if (block.type === "tool_use") {
-                contentBlocks.push({
-                    type: "tool_use",
-                    tool_call_id: block.id ?? randomUUID(),
-                    tool_name: block.name ?? "",
-                    tool_input: block.input ?? {},
-                });
-            }
-            else if (block.type === "tool_result") {
-                const resultContent = Array.isArray(block.content)
-                    ? block.content.map((c) => c.text ?? "").join("\n")
-                    : block.content ?? null;
-                contentBlocks.push({
-                    type: "tool_result",
-                    tool_call_id: block.tool_use_id ?? "",
-                    is_error: block.is_error ?? false,
-                    result_content: resultContent,
-                    exit_code: null,
-                });
+        for (const entry of group) {
+            const raw = entry.message.content;
+            const rawContent = Array.isArray(raw)
+                ? raw
+                : typeof raw === "string"
+                    ? [{ type: "text", text: raw }]
+                    : [];
+            for (const block of rawContent) {
+                if (!block || !block.type)
+                    continue;
+                if (block.type === "file-history-snapshot")
+                    continue;
+                if (block.type === "text") {
+                    contentBlocks.push({ type: "text", text: block.text ?? "" });
+                }
+                else if (block.type === "thinking") {
+                    contentBlocks.push({
+                        type: "thinking",
+                        text: block.thinking ?? block.text ?? "",
+                    });
+                }
+                else if (block.type === "tool_use") {
+                    contentBlocks.push({
+                        type: "tool_use",
+                        tool_call_id: block.id ?? randomUUID(),
+                        tool_name: block.name ?? "",
+                        tool_input: block.input ?? {},
+                    });
+                }
+                else if (block.type === "tool_result") {
+                    const resultContent = Array.isArray(block.content)
+                        ? block.content.map((c) => c.text ?? "").join("\n")
+                        : block.content ?? null;
+                    contentBlocks.push({
+                        type: "tool_result",
+                        tool_call_id: block.tool_use_id ?? "",
+                        is_error: block.is_error ?? false,
+                        result_content: resultContent,
+                        exit_code: null,
+                    });
+                }
             }
         }
         if (contentBlocks.length === 0)
             continue;
+        // Token accounting for assistant turns:
+        // - input/cache tokens come from the root entry only (same API call repeated on each chain entry)
+        // - output tokens must be summed across all chain entries (each has its own generated content)
+        let tokenUsage = null;
+        if (role === "assistant") {
+            const rootUsage = root.message.usage;
+            if (rootUsage) {
+                const inputTokens = rootUsage.input_tokens ?? 0;
+                const cacheCreate = rootUsage.cache_creation_input_tokens ?? 0;
+                const cacheRead = rootUsage.cache_read_input_tokens ?? 0;
+                // Sum output tokens across all chain entries
+                const outputTokens = group.reduce((sum, entry) => {
+                    return sum + (entry.message.usage?.output_tokens ?? 0);
+                }, 0);
+                tokenUsage = {
+                    input_tokens: inputTokens + cacheCreate + cacheRead,
+                    output_tokens: outputTokens,
+                    cache_read_input_tokens: cacheRead,
+                    cache_creation_input_tokens: cacheCreate,
+                    reasoning_tokens: null,
+                };
+                totalInputTokens += inputTokens + cacheCreate + cacheRead;
+                totalOutputTokens += outputTokens;
+                totalCacheReadTokens += cacheRead;
+            }
+        }
         turns.push({
-            turn_id: line.uuid ?? randomUUID(),
-            parent_turn_id: line.parentUuid ?? null,
-            role: role === "assistant" ? "assistant" : "user",
-            timestamp: line.timestamp ?? null,
+            turn_id: root.uuid ?? randomUUID(),
+            parent_turn_id: root.parentUuid ?? null,
+            role,
+            timestamp: root.timestamp ?? null,
             content: contentBlocks,
-            model: model ?? null,
+            model: root.message.model ?? null,
             usage: tokenUsage,
             source_metadata: {
-                uuid: line.uuid,
-                parentUuid: line.parentUuid,
-                gitBranch: line.gitBranch,
+                uuid: root.uuid,
+                parentUuid: root.parentUuid,
+                gitBranch: root.gitBranch,
             },
         });
     }
-    const startedAt = turns[0]?.timestamp ?? new Date().toISOString();
-    const endedAt = turns[turns.length - 1]?.timestamp ?? new Date().toISOString();
-    const allBlocks = turns.flatMap((t) => t.content);
+    const turnActors = deriveTurnActors(turns);
+    const normalizedTurns = turns.map((turn) => ({
+        ...turn,
+        actor: turnActors[turn.turn_id],
+    }));
+    const startedAt = normalizedTurns[0]?.timestamp ?? new Date().toISOString();
+    const endedAt = normalizedTurns[normalizedTurns.length - 1]?.timestamp ?? new Date().toISOString();
+    const allBlocks = normalizedTurns.flatMap((t) => t.content);
     const toolCallCount = allBlocks.filter((b) => b.type === "tool_use").length;
     const hasFileChanges = allBlocks.some((b) => b.type === "tool_use" &&
         (b.tool_name?.toLowerCase().includes("write") ||
@@ -127,8 +226,8 @@ export async function extractClaudeCode(sessionFilePath, submittedBy = "unknown"
         working_language: null,
         started_at: startedAt,
         ended_at: endedAt,
-        turns,
-        turn_count: turns.length,
+        turns: normalizedTurns,
+        turn_count: normalizedTurns.length,
         tool_call_count: toolCallCount,
         has_tool_calls: toolCallCount > 0,
         has_thinking_blocks: hasThinking,

package/dist/extractors/claude-code.js.map

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

package/dist/extractors/codex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/extractors/codex.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB,wBAAsB,YAAY,CAChC,iBAAiB,EAAE,MAAM,EACzB,WAAW,SAAY,GACtB,OAAO,CAAC,eAAe,CAAC,CAoM1B"}
+{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/extractors/codex.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,EAGhB,MAAM,aAAa,CAAC;AAkBrB,wBAAsB,YAAY,CAChC,iBAAiB,EAAE,MAAM,EACzB,WAAW,SAAY,GACtB,OAAO,CAAC,eAAe,CAAC,CAmN1B"}

package/dist/extractors/codex.js

@@ -1,5 +1,15 @@
 import { randomUUID } from "crypto";
 import { hashString, computeContentHash } from "../hash.js";
+import { collectTraceMetrics, createPassiveEnvState, extractTextFragments, pushUniqueTextBlock, } from "./common.js";
+function toNumber(value) {
+    return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
+function extractExitCode(output) {
+    if (!output)
+        return null;
+    const match = output.match(/Process exited with code (\d+)/);
+    return match ? Number.parseInt(match[1], 10) : null;
+}
 export async function extractCodex(rolloutFileBuffer, submittedBy = "unknown") {
     const events = [];
     for (const line of rolloutFileBuffer.toString("utf-8").split("\n")) {
@@ -21,6 +31,10 @@ export async function extractCodex(rolloutFileBuffer, submittedBy = "unknown") {
     let currentBlocks = [];
     let taskTimestamp = null;
     let currentModel = null;
+    let currentTaskLastTimestamp = null;
+    let totalInputTokens = null;
+    let totalOutputTokens = null;
+    let totalCacheReadTokens = null;
     for (const event of events) {
         const type = event["type"];
         const payload = (event["payload"] ?? {});
@@ -31,6 +45,7 @@ export async function extractCodex(rolloutFileBuffer, submittedBy = "unknown") {
             currentUserMessage = null;
             currentBlocks = [];
             taskTimestamp = timestamp;
+            currentTaskLastTimestamp = timestamp;
             continue;
         }
         if (type === "event_msg" && payload["type"] === "task_complete") {
@@ -49,16 +64,14 @@ export async function extractCodex(rolloutFileBuffer, submittedBy = "unknown") {
                 }
                 const lastMsg = payload["last_agent_message"];
                 if (lastMsg) {
-                    const alreadyCaptured = currentBlocks.some(b => b.type === "text" && b.text === lastMsg);
-                    if (!alreadyCaptured)
-                        currentBlocks.push({ type: "text", text: lastMsg });
+                    pushUniqueTextBlock(currentBlocks, "text", lastMsg);
                 }
                 if (currentBlocks.length > 0) {
                     turns.push({
                         turn_id: currentTurnId ?? randomUUID(),
                         parent_turn_id: currentUserMessage ? "user_" + currentTurnId : null,
                         role: "assistant",
-                        timestamp: taskTimestamp,
+                        timestamp: currentTaskLastTimestamp ?? timestamp ?? taskTimestamp,
                         content: currentBlocks,
                         model: currentModel,
                         usage: null,
@@ -72,10 +85,13 @@ export async function extractCodex(rolloutFileBuffer, submittedBy = "unknown") {
             currentBlocks = [];
             taskTimestamp = null;
             currentModel = null;
+            currentTaskLastTimestamp = null;
             continue;
         }
         if (!inTask)
             continue;
+        if (timestamp)
+            currentTaskLastTimestamp = timestamp;
         if (type === "turn_context") {
             currentModel = payload["model"] ?? null;
             continue;
@@ -86,17 +102,43 @@ export async function extractCodex(rolloutFileBuffer, submittedBy = "unknown") {
                     currentUserMessage = payload["message"] ?? "";
                     break;
                 case "agent_reasoning":
-                    if (payload["text"])
-                        currentBlocks.push({ type: "thinking", text: payload["text"] });
+                    pushUniqueTextBlock(currentBlocks, "thinking", payload["text"]);
                     break;
                 case "agent_message":
-                    if (payload["message"])
-                        currentBlocks.push({ type: "text", text: payload["message"] });
+                    pushUniqueTextBlock(currentBlocks, "text", payload["message"]);
                     break;
+                case "token_count": {
+                    const info = (payload["info"] ?? {});
+                    const usage = (info["total_token_usage"] ?? {});
+                    totalInputTokens = toNumber(usage["input_tokens"]) ?? totalInputTokens;
+                    totalOutputTokens = toNumber(usage["output_tokens"]) ?? totalOutputTokens;
+                    totalCacheReadTokens =
+                        toNumber(usage["cached_input_tokens"]) ?? totalCacheReadTokens;
+                    break;
+                }
             }
         }
         else if (type === "response_item") {
             switch (payload["type"]) {
+                case "message": {
+                    const role = payload["role"];
+                    const texts = extractTextFragments(payload["content"]);
+                    if (role === "assistant") {
+                        for (const text of texts) {
+                            pushUniqueTextBlock(currentBlocks, "text", text);
+                        }
+                    }
+                    else if (role === "user" && !currentUserMessage) {
+                        currentUserMessage = texts.join("\n\n") || currentUserMessage;
+                    }
+                    break;
+                }
+                case "reasoning": {
+                    const reasoningText = extractTextFragments(payload["content"]).join("\n\n") ||
+                        extractTextFragments(payload["summary"]).join("\n\n");
+                    pushUniqueTextBlock(currentBlocks, "thinking", reasoningText);
+                    break;
+                }
                 case "function_call": {
                     const callId = payload["call_id"] ?? randomUUID();
                     let toolInput = {};
@@ -116,15 +158,13 @@ export async function extractCodex(rolloutFileBuffer, submittedBy = "unknown") {
                 }
                 case "function_call_output": {
                     const output = payload["output"];
-                    const isError = typeof output === "string"
-                        && output.includes("Process exited with code")
-                        && !output.includes("code 0");
+                    const exitCode = extractExitCode(output);
                     currentBlocks.push({
                         type: "tool_result",
                         tool_call_id: payload["call_id"] ?? "",
-                        is_error: isError,
+                        is_error: exitCode !== null ? exitCode !== 0 : false,
                         result_content: output ?? null,
-                        exit_code: null,
+                        exit_code: exitCode,
                     });
                     break;
                 }
@@ -141,11 +181,7 @@ export async function extractCodex(rolloutFileBuffer, submittedBy = "unknown") {
             }
         }
     }
-    const allBlocks = turns.flatMap(t => t.content);
-    const toolCallCount = allBlocks.filter(b => b.type === "tool_use").length;
-    const hasFileChanges = allBlocks.some(b => b.type === "tool_use" && ["write_file", "file_change", "create_file"].includes(b.tool_name));
-    const hasShellCommands = allBlocks.some(b => b.type === "tool_use" && ["exec_command", "bash", "shell"].includes(b.tool_name));
-    const hasThinking = allBlocks.some(b => b.type === "thinking");
+    const metrics = collectTraceMetrics(turns);
     const startedAt = sessionMetaPayload["timestamp"] ?? events[0]?.["timestamp"] ?? new Date().toISOString();
     const endedAt = events[events.length - 1]?.["timestamp"] ?? new Date().toISOString();
     const partialTrace = {
@@ -163,24 +199,16 @@ export async function extractCodex(rolloutFileBuffer, submittedBy = "unknown") {
         ended_at: endedAt,
         turns,
         turn_count: turns.length,
-        tool_call_count: toolCallCount,
-        has_tool_calls: toolCallCount > 0,
-        has_thinking_blocks: hasThinking,
-        has_file_changes: hasFileChanges,
-        has_shell_commands: hasShellCommands,
-        total_input_tokens: null,
-        total_output_tokens: null,
-        total_cache_read_tokens: null,
+        tool_call_count: metrics.toolCallCount,
+        has_tool_calls: metrics.toolCallCount > 0,
+        has_thinking_blocks: metrics.hasThinkingBlocks,
+        has_file_changes: metrics.hasFileChanges,
+        has_shell_commands: metrics.hasShellCommands,
+        total_input_tokens: totalInputTokens,
+        total_output_tokens: totalOutputTokens,
+        total_cache_read_tokens: totalCacheReadTokens,
         content_fidelity: "full",
-        env_state: {
-            git_branch: null,
-            inferred_file_tree: null,
-            inferred_changed_files: null,
-            inferred_error_files: null,
-            shell_exit_codes: null,
-            open_files_in_editor: null,
-            extraction_method: "passive",
-        },
+        env_state: createPassiveEnvState(),
         score: null,
         raw_r2_key: "",
         normalized_r2_key: "",