@tracemarketplace/shared 0.0.6 → 0.0.9

package/dist/validators.d.ts

@@ -6,6 +6,9 @@ export declare const NormalizedTraceSchema: z.ZodObject<{
     source_session_id: z.ZodString;
     chunk_index: z.ZodDefault<z.ZodNumber>;
     chunk_start_turn: z.ZodDefault<z.ZodNumber>;
+    chunk_complete: z.ZodOptional<z.ZodBoolean>;
+    chunk_close_reason: z.ZodOptional<z.ZodEnum<["100k_tokens", "idle_2d"]>>;
+    chunk_closed_at: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     source_version: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     submitted_by: z.ZodOptional<z.ZodString>;
     submitted_at: z.ZodOptional<z.ZodString>;
@@ -37,6 +40,9 @@ export declare const NormalizedTraceSchema: z.ZodObject<{
     chunk_start_turn: number;
     trace_id?: string | undefined;
     schema_version?: string | undefined;
+    chunk_complete?: boolean | undefined;
+    chunk_close_reason?: "100k_tokens" | "idle_2d" | undefined;
+    chunk_closed_at?: string | null | undefined;
     source_version?: string | null | undefined;
     submitted_by?: string | undefined;
     submitted_at?: string | undefined;
@@ -68,6 +74,9 @@ export declare const NormalizedTraceSchema: z.ZodObject<{
     schema_version?: string | undefined;
     chunk_index?: number | undefined;
     chunk_start_turn?: number | undefined;
+    chunk_complete?: boolean | undefined;
+    chunk_close_reason?: "100k_tokens" | "idle_2d" | undefined;
+    chunk_closed_at?: string | null | undefined;
     source_version?: string | null | undefined;
     submitted_by?: string | undefined;
     submitted_at?: string | undefined;
@@ -102,6 +111,9 @@ export declare const BatchSubmitSchema: z.ZodObject<{
         source_session_id: z.ZodString;
         chunk_index: z.ZodDefault<z.ZodNumber>;
         chunk_start_turn: z.ZodDefault<z.ZodNumber>;
+        chunk_complete: z.ZodOptional<z.ZodBoolean>;
+        chunk_close_reason: z.ZodOptional<z.ZodEnum<["100k_tokens", "idle_2d"]>>;
+        chunk_closed_at: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         source_version: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         submitted_by: z.ZodOptional<z.ZodString>;
         submitted_at: z.ZodOptional<z.ZodString>;
@@ -133,6 +145,9 @@ export declare const BatchSubmitSchema: z.ZodObject<{
         chunk_start_turn: number;
         trace_id?: string | undefined;
         schema_version?: string | undefined;
+        chunk_complete?: boolean | undefined;
+        chunk_close_reason?: "100k_tokens" | "idle_2d" | undefined;
+        chunk_closed_at?: string | null | undefined;
         source_version?: string | null | undefined;
         submitted_by?: string | undefined;
         submitted_at?: string | undefined;
@@ -164,6 +179,9 @@ export declare const BatchSubmitSchema: z.ZodObject<{
         schema_version?: string | undefined;
         chunk_index?: number | undefined;
         chunk_start_turn?: number | undefined;
+        chunk_complete?: boolean | undefined;
+        chunk_close_reason?: "100k_tokens" | "idle_2d" | undefined;
+        chunk_closed_at?: string | null | undefined;
         source_version?: string | null | undefined;
         submitted_by?: string | undefined;
         submitted_at?: string | undefined;
@@ -198,6 +216,9 @@ export declare const BatchSubmitSchema: z.ZodObject<{
         chunk_start_turn: number;
         trace_id?: string | undefined;
         schema_version?: string | undefined;
+        chunk_complete?: boolean | undefined;
+        chunk_close_reason?: "100k_tokens" | "idle_2d" | undefined;
+        chunk_closed_at?: string | null | undefined;
         source_version?: string | null | undefined;
         submitted_by?: string | undefined;
         submitted_at?: string | undefined;
@@ -232,6 +253,9 @@ export declare const BatchSubmitSchema: z.ZodObject<{
         schema_version?: string | undefined;
         chunk_index?: number | undefined;
         chunk_start_turn?: number | undefined;
+        chunk_complete?: boolean | undefined;
+        chunk_close_reason?: "100k_tokens" | "idle_2d" | undefined;
+        chunk_closed_at?: string | null | undefined;
         source_version?: string | null | undefined;
         submitted_by?: string | undefined;
         submitted_at?: string | undefined;

package/dist/validators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../src/validators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+BhC,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEzE,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAG5B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../src/validators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkChC,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEzE,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAG5B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC"}

package/dist/validators.js

@@ -6,6 +6,9 @@ export const NormalizedTraceSchema = z.object({
     source_session_id: z.string().min(1),
     chunk_index: z.number().int().nonnegative().default(0),
     chunk_start_turn: z.number().int().nonnegative().default(0),
+    chunk_complete: z.boolean().optional(),
+    chunk_close_reason: z.enum(["100k_tokens", "idle_2d"]).optional(),
+    chunk_closed_at: z.string().nullable().optional(),
     source_version: z.string().nullable().optional(),
     submitted_by: z.string().optional(),
     submitted_at: z.string().optional(),

package/dist/validators.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tracemarketplace/shared",
-  "version": "0.0.6",
+  "version": "0.0.9",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,6 +20,10 @@
     "./types": {
       "import": "./dist/types.js",
       "types": "./dist/types.d.ts"
+    },
+    "./turn-actors": {
+      "import": "./dist/turn-actors.js",
+      "types": "./dist/turn-actors.d.ts"
     }
   },
   "scripts": {

package/src/chunker.ts

@@ -69,14 +69,29 @@ export function chunkTrace(
     return [{ ...trace, chunk_index: 0, chunk_start_turn: 0 }];
   }
 
+  // If per-turn usage isn't populated, distribute total_output_tokens uniformly
+  // across assistant turns so the chunk boundary logic still fires correctly.
+  const perTurnSum = sumOutputTokens(trace.turns);
+  const turns: Turn[] = perTurnSum > 0
+    ? trace.turns
+    : (() => {
+        const assistantTurns = trace.turns.filter(t => t.role === "assistant").length || 1;
+        const tokensPerAssistantTurn = Math.ceil(totalOutput / assistantTurns);
+        return trace.turns.map(t =>
+          t.role === "assistant" && (t.usage?.output_tokens ?? 0) === 0
+            ? { ...t, usage: { input_tokens: t.usage?.input_tokens ?? 0, output_tokens: tokensPerAssistantTurn, cache_read_input_tokens: t.usage?.cache_read_input_tokens ?? null, cache_creation_input_tokens: t.usage?.cache_creation_input_tokens ?? null, reasoning_tokens: t.usage?.reasoning_tokens ?? null } } as Turn
+            : t
+        );
+      })();
+
   const chunks: NormalizedTrace[] = [];
   let chunkStartTurn = 0;
   let chunkOutputTokens = 0;
   let chunkTurns: Turn[] = [];
   let chunkIndex = 0;
 
-  for (let i = 0; i < trace.turns.length; i++) {
-    const turn = trace.turns[i];
+  for (let i = 0; i < turns.length; i++) {
+    const turn = turns[i];
 
     // Break at user-turn boundary once we've accumulated enough
     if (

package/src/extractor-claude-code.test.ts

@@ -0,0 +1,326 @@
+import { describe, it, expect, beforeAll } from "vitest";
+import { writeFileSync, mkdirSync } from "fs";
+import { tmpdir } from "os";
+import { join } from "path";
+import { extractClaudeCode } from "./extractors/claude-code.js";
+
+// Build a JSONL fixture on disk once, then test against it.
+// The fixture exercises the key bugs that were fixed:
+//   1. Chained assistant entries (thinking+tool_use) must be merged into one turn
+//   2. Cache tokens (cache_creation + cache_read) must be included in total_input_tokens
+//   3. Output tokens must be summed across all chain entries, not just the root
+
+const FIXTURE_PATH = join(tmpdir(), "tracemp-extractor-test.jsonl");
+
+const FIXTURE_LINES = [
+  // Skipped: file-history-snapshot
+  { type: "file-history-snapshot", messageId: "snap1", snapshot: {} },
+
+  // Turn 0 — user initial message (string content)
+  {
+    type: "user",
+    uuid: "u1",
+    parentUuid: null,
+    timestamp: "2024-01-01T00:00:00.000Z",
+    gitBranch: "main",
+    cwd: "/home/user/project",
+    message: { role: "user", content: "Please help me with a task" },
+  },
+
+  // Turn 1 — assistant: thinking (root) → tool_use (child), must MERGE
+  {
+    type: "assistant",
+    uuid: "a1",
+    parentUuid: "u1",
+    timestamp: "2024-01-01T00:00:01.000Z",
+    message: {
+      role: "assistant",
+      model: "claude-sonnet-4-5",
+      content: [{ type: "thinking", thinking: "Let me think..." }],
+      usage: {
+        input_tokens: 5,
+        cache_creation_input_tokens: 1000,
+        cache_read_input_tokens: 500,
+        output_tokens: 10,
+      },
+    },
+  },
+  {
+    type: "assistant",
+    uuid: "a2",
+    parentUuid: "a1",
+    timestamp: "2024-01-01T00:00:01.000Z",
+    message: {
+      role: "assistant",
+      model: "claude-sonnet-4-5",
+      content: [{ type: "tool_use", id: "tu1", name: "Bash", input: { command: "ls" } }],
+      usage: {
+        input_tokens: 5,
+        cache_creation_input_tokens: 1000,
+        cache_read_input_tokens: 500,
+        output_tokens: 25,
+      },
+    },
+  },
+
+  // Skipped: progress entries
+  { type: "progress", uuid: "p1", parentUuid: "a2" },
+  { type: "progress", uuid: "p2", parentUuid: "p1" },
+
+  // Turn 2 — user tool_result
+  {
+    type: "user",
+    uuid: "u2",
+    parentUuid: "a2",
+    timestamp: "2024-01-01T00:00:02.000Z",
+    message: {
+      role: "user",
+      content: [
+        {
+          type: "tool_result",
+          tool_use_id: "tu1",
+          content: [{ type: "text", text: "file1.ts\nfile2.ts" }],
+          is_error: false,
+        },
+      ],
+    },
+  },
+
+  // Turn 3 — assistant: text (root) → tool_use (child), must MERGE
+  {
+    type: "assistant",
+    uuid: "a3",
+    parentUuid: "u2",
+    timestamp: "2024-01-01T00:00:03.000Z",
+    message: {
+      role: "assistant",
+      model: "claude-sonnet-4-5",
+      content: [{ type: "text", text: "Here is what I found:" }],
+      usage: {
+        input_tokens: 3,
+        cache_creation_input_tokens: 0,
+        cache_read_input_tokens: 1500,
+        output_tokens: 8,
+      },
+    },
+  },
+  {
+    type: "assistant",
+    uuid: "a4",
+    parentUuid: "a3",
+    timestamp: "2024-01-01T00:00:03.000Z",
+    message: {
+      role: "assistant",
+      model: "claude-sonnet-4-5",
+      content: [{ type: "tool_use", id: "tu2", name: "Read", input: { file_path: "file1.ts" } }],
+      usage: {
+        input_tokens: 3,
+        cache_creation_input_tokens: 0,
+        cache_read_input_tokens: 1500,
+        output_tokens: 15,
+      },
+    },
+  },
+
+  // Turn 4 — user tool_result
+  {
+    type: "user",
+    uuid: "u3",
+    parentUuid: "a4",
+    timestamp: "2024-01-01T00:00:04.000Z",
+    message: {
+      role: "user",
+      content: [
+        {
+          type: "tool_result",
+          tool_use_id: "tu2",
+          content: [{ type: "text", text: "const x = 1;" }],
+          is_error: false,
+        },
+      ],
+    },
+  },
+
+  // Turn 5 — simple assistant text, no chain
+  {
+    type: "assistant",
+    uuid: "a5",
+    parentUuid: "u3",
+    timestamp: "2024-01-01T00:00:05.000Z",
+    message: {
+      role: "assistant",
+      model: "claude-sonnet-4-5",
+      content: [{ type: "text", text: "Done! The file contains a constant." }],
+      usage: {
+        input_tokens: 2,
+        cache_creation_input_tokens: 0,
+        cache_read_input_tokens: 2000,
+        output_tokens: 20,
+      },
+    },
+  },
+
+  // Skipped: last-prompt
+  { type: "last-prompt", uuid: "" },
+];
+
+beforeAll(() => {
+  mkdirSync(tmpdir(), { recursive: true });
+  writeFileSync(
+    FIXTURE_PATH,
+    FIXTURE_LINES.map((l) => JSON.stringify(l)).join("\n") + "\n"
+  );
+});
+
+describe("extractClaudeCode", () => {
+  it("merges chained assistant entries into one turn", async () => {
+    const trace = await extractClaudeCode(FIXTURE_PATH, "test@test.com");
+
+    // Should have 6 turns: user, assistant(merged), user, assistant(merged), user, assistant
+    expect(trace.turn_count).toBe(6);
+
+    // Roles must strictly alternate
+    const roles = trace.turns.map((t) => t.role);
+    for (let i = 1; i < roles.length; i++) {
+      expect(roles[i]).not.toBe(roles[i - 1]);
+    }
+
+    // Turn 1: thinking+tool_use merged from two chained entries
+    expect(trace.turns[1].role).toBe("assistant");
+    const t1Types = trace.turns[1].content.map((c) => c.type);
+    expect(t1Types).toContain("thinking");
+    expect(t1Types).toContain("tool_use");
+
+    // Turn 3: text+tool_use merged
+    expect(trace.turns[3].role).toBe("assistant");
+    const t3Types = trace.turns[3].content.map((c) => c.type);
+    expect(t3Types).toContain("text");
+    expect(t3Types).toContain("tool_use");
+  });
+
+  it("counts tool calls correctly", async () => {
+    const trace = await extractClaudeCode(FIXTURE_PATH, "test@test.com");
+    expect(trace.tool_call_count).toBe(2);
+  });
+
+  it("includes cache tokens in total_input_tokens", async () => {
+    const trace = await extractClaudeCode(FIXTURE_PATH, "test@test.com");
+
+    // Turn 1: input=5 + cache_create=1000 + cache_read=500 = 1505 (counted once, not twice)
+    // Turn 3: input=3 + cache_create=0 + cache_read=1500 = 1503
+    // Turn 5: input=2 + cache_create=0 + cache_read=2000 = 2002
+    // Total: 1505 + 1503 + 2002 = 5010
+    expect(trace.total_input_tokens).toBe(5010);
+  });
+
+  it("does not double-count input tokens from chained entries", async () => {
+    const trace = await extractClaudeCode(FIXTURE_PATH, "test@test.com");
+
+    // Turn 1 root (a1) and child (a2) both carry the same input/cache usage (same API call).
+    // We must count it only once from the root.
+    // If double-counted: 1505 * 2 + 1503 + 2002 = 6010. Correct: 5010.
+    expect(trace.total_input_tokens).toBe(5010);
+  });
+
+  it("sums output tokens across all chain entries", async () => {
+    const trace = await extractClaudeCode(FIXTURE_PATH, "test@test.com");
+
+    // Turn 1: root output=10 (thinking) + child output=25 (tool_use) = 35
+    // Turn 3: root output=8 (text) + child output=15 (tool_use) = 23
+    // Turn 5: output=20
+    // Total: 35 + 23 + 20 = 78
+    expect(trace.total_output_tokens).toBe(78);
+
+    // Turn 1's per-turn usage should also reflect the summed output
+    expect(trace.turns[1].usage?.output_tokens).toBe(35);
+  });
+
+  it("skips progress, file-history-snapshot, and last-prompt entries", async () => {
+    const trace = await extractClaudeCode(FIXTURE_PATH, "test@test.com");
+    // All entries that should be skipped produce no turns
+    expect(trace.turn_count).toBe(6);
+  });
+
+  it("captures git branch and session metadata", async () => {
+    const trace = await extractClaudeCode(FIXTURE_PATH, "test@test.com");
+    expect(trace.git_branch).toBe("main");
+    expect(trace.cwd_hash).toBeTruthy();
+    expect(trace.source_tool).toBe("claude_code");
+    expect(trace.submitted_by).toBe("test@test.com");
+  });
+
+  it("sets started_at and ended_at from first and last turn timestamps", async () => {
+    const trace = await extractClaudeCode(FIXTURE_PATH, "test@test.com");
+    expect(trace.started_at).toBe("2024-01-01T00:00:00.000Z");
+    expect(trace.ended_at).toBe("2024-01-01T00:00:05.000Z");
+  });
+
+  it("marks skill context chained off tool output as tool-authored", async () => {
+    const skillFixturePath = join(tmpdir(), "tracemp-extractor-skill-test.jsonl");
+    writeFileSync(
+      skillFixturePath,
+      [
+        {
+          type: "user",
+          uuid: "u1",
+          parentUuid: null,
+          timestamp: "2024-01-01T00:00:00.000Z",
+          message: { role: "user", content: "why is lazyvim failing" },
+        },
+        {
+          type: "assistant",
+          uuid: "a1",
+          parentUuid: "u1",
+          timestamp: "2024-01-01T00:00:01.000Z",
+          message: {
+            role: "assistant",
+            model: "claude-sonnet-4-5",
+            content: [{ type: "tool_use", id: "skill-1", name: "Skill", input: { skill_name: "trent-lazyvim" } }],
+            usage: {
+              input_tokens: 10,
+              cache_creation_input_tokens: 0,
+              cache_read_input_tokens: 0,
+              output_tokens: 5,
+            },
+          },
+        },
+        {
+          type: "user",
+          uuid: "u2",
+          parentUuid: "a1",
+          timestamp: "2024-01-01T00:00:02.000Z",
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: "skill-1",
+                content: [{ type: "text", text: "Launching skill: trent-lazyvim" }],
+                is_error: false,
+              },
+            ],
+          },
+        },
+        {
+          type: "user",
+          uuid: "u3",
+          parentUuid: "u2",
+          timestamp: "2024-01-01T00:00:03.000Z",
+          message: {
+            role: "user",
+            content: "Base directory for this skill: ~/.claude/skills/trent-lazyvim",
+          },
+        },
+      ].map((line) => JSON.stringify(line)).join("\n") + "\n",
+    );
+
+    const trace = await extractClaudeCode(skillFixturePath, "test@test.com");
+
+    expect(trace.turns.map((turn) => turn.actor)).toEqual([
+      "human",
+      "assistant",
+      "tool",
+      "tool",
+    ]);
+  });
+});