@ramarivera/coding-agent-langfuse 0.1.45 → 0.1.46

package/dist/backfill.js

@@ -7,7 +7,7 @@ import { dirname, join } from "node:path";
 const allAgents = ["claude", "codex", "grok", "opencode", "pi"];
 const importStateIdentityVersion = "v9-cost-details";
 const importStateIdentityVersions = {
-    claude: "v12-cost-details",
+    claude: "v13-claude-message-snapshot-dedupe",
     codex: "v11-codex-token-accounting-nonbillable",
     grok: "v12-cost-details",
     opencode: "v11-cost-details",
@@ -23,6 +23,7 @@ const langfuseIdIdentityVersions = {
 };
 const importPayloadVersion = "v10-cost-details";
 const importPayloadVersions = {
+    claude: "v11-claude-message-snapshot-dedupe",
     codex: "v11-codex-token-accounting-nonbillable",
 };
 const defaultEndpoint = "https://langfuse.ai.roxasroot.net/otel/v1/traces";
@@ -690,6 +691,25 @@ function usageDetails(usage) {
         details.total = usage.total;
     return Object.keys(details).length > 0 ? details : undefined;
 }
+function usageTokenTotal(usage) {
+    if (!usage)
+        return 0;
+    return usage.total ??
+        (usage.input ?? 0) +
+            (usage.output ?? 0) +
+            (usage.reasoning ?? 0) +
+            (usage.cacheRead ?? 0) +
+            (usage.cacheWrite ?? 0) +
+            (usage.cacheWrite5m ?? 0) +
+            (usage.cacheWrite1h ?? 0);
+}
+function textLength(value) {
+    if (typeof value === "string")
+        return value.length;
+    if (value === undefined || value === null)
+        return 0;
+    return JSON.stringify(value).length;
+}
 function calculateCost(event, usage, costRates) {
     if (!usage)
         return undefined;
@@ -1373,6 +1393,7 @@ function genericJsonlEvents(agent, files, sessionName) {
                 startMs,
             },
         ];
+        const claudeAssistantEventsByMessageId = new Map();
         for (const [index, row] of rows.entries()) {
             const message = asRecord(row.message);
             const role = asString(message.role) ?? asString(row.type);
@@ -1380,11 +1401,31 @@ function genericJsonlEvents(agent, files, sessionName) {
                 asString(row.id) ??
                 asString(row.toolUseID) ??
                 `row-${index}`;
+            let childParentRecordId = recordId;
             const toolUseId = asString(row.toolUseID) ?? asString(row.tool_use_id);
             const content = message.content ?? row.content;
             const timestamp = getTimestampMs(row.timestamp ?? row.time_created, startMs + index);
             const usage = normalizeUsage(message.usage ?? row.usage);
-            events.push({
+            const claudeMessageId = agent === "claude" && role === "assistant"
+                ? asString(message.id)
+                : undefined;
+            const eventMetadata = {
+                ...pick(row, [
+                    "type",
+                    "entrypoint",
+                    "version",
+                    "gitBranch",
+                    "error",
+                ]),
+                ...(claudeMessageId
+                    ? {
+                        claude_message_id: claudeMessageId,
+                        claude_snapshot_count: 1,
+                        claude_usage_dedupe: "message_id_max_usage",
+                    }
+                    : {}),
+            };
+            const event = {
                 agent,
                 sourcePath: path,
                 sessionId: asString(row.sessionId) ?? asString(row.session_id) ??
@@ -1408,14 +1449,36 @@ function genericJsonlEvents(agent, files, sessionName) {
                     ? extractText(content)
                     : undefined,
                 usage,
-                metadata: pick(row, [
-                    "type",
-                    "entrypoint",
-                    "version",
-                    "gitBranch",
-                    "error",
-                ]),
-            });
+                metadata: eventMetadata,
+            };
+            if (claudeMessageId) {
+                const existing = claudeAssistantEventsByMessageId.get(claudeMessageId);
+                if (existing) {
+                    childParentRecordId = existing.recordId;
+                    if (usageTokenTotal(event.usage) > usageTokenTotal(existing.usage)) {
+                        existing.usage = event.usage;
+                    }
+                    if (event.output && textLength(event.output) > textLength(existing.output)) {
+                        existing.output = event.output;
+                    }
+                    if (!existing.model && event.model)
+                        existing.model = event.model;
+                    if (!existing.cwd && event.cwd)
+                        existing.cwd = event.cwd;
+                    existing.startMs = Math.min(existing.startMs, event.startMs);
+                    existing.metadata = {
+                        ...existing.metadata,
+                        claude_snapshot_count: (asNumber(existing.metadata?.claude_snapshot_count) ?? 1) + 1,
+                    };
+                }
+                else {
+                    claudeAssistantEventsByMessageId.set(claudeMessageId, event);
+                    events.push(event);
+                }
+            }
+            else {
+                events.push(event);
+            }
             for (const reasoning of reasoningFromContent(content)) {
                 events.push({
                     agent,
@@ -1425,7 +1488,7 @@ function genericJsonlEvents(agent, files, sessionName) {
                     name: `${agent} reasoning`,
                     cwd,
                     startMs: timestamp,
-                    parentRecordId: recordId,
+                    parentRecordId: childParentRecordId,
                     output: reasoning.text,
                     metadata: { has_signature: reasoning.hasSignature },
                 });
@@ -1439,7 +1502,7 @@ function genericJsonlEvents(agent, files, sessionName) {
                     name: `${agent} tool ${tool.name}`,
                     cwd,
                     startMs: timestamp,
-                    parentRecordId: asString(row.uuid) ?? asString(row.id),
+                    parentRecordId: childParentRecordId,
                     input: tool.arguments,
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ramarivera/coding-agent-langfuse",
-  "version": "0.1.45",
+  "version": "0.1.46",
   "description": "Universal coding-agent Langfuse backfiller and live OTLP helpers",
   "type": "module",
   "license": "MIT",