@osfactory/har 0.64.0 → 0.64.1

package/dist/index.js

@@ -32313,6 +32313,8 @@ function extractClaudeUsageFromRecords(records) {
   let tokensCacheCreation = 0;
   let costUsd = null;
   const modelBreakdown = {};
+  const billed = /* @__PURE__ */ new Map();
+  const unkeyed = [];
   for (const record2 of records) {
     if (!record2 || typeof record2 !== "object") continue;
     const payload = record2;
@@ -32327,29 +32329,34 @@ function extractClaudeUsageFromRecords(records) {
     const message = payload.message;
     const nestedUsage = payload.usage ?? message?.usage;
     if (nestedUsage && payload.type !== "result") {
-      const i = Number(nestedUsage.input_tokens ?? 0);
-      const o = Number(nestedUsage.output_tokens ?? 0);
-      const cr = Number(nestedUsage.cache_read_input_tokens ?? 0);
-      const cc = Number(nestedUsage.cache_creation_input_tokens ?? 0);
-      tokensInput += i;
-      tokensOutput += o;
-      tokensCacheRead += cr;
-      tokensCacheCreation += cc;
       const model = typeof message?.model === "string" ? message.model : void 0;
-      if (model && model !== "<synthetic>") {
-        const totals = modelBreakdown[model] ??= {
-          tokensInput: 0,
-          tokensOutput: 0,
-          tokensCacheRead: 0,
-          tokensCacheCreation: 0,
-          tokensTotal: 0
-        };
-        totals.tokensInput += i;
-        totals.tokensOutput += o;
-        totals.tokensCacheRead += cr;
-        totals.tokensCacheCreation += cc;
-        totals.tokensTotal += i + o + cr + cc;
-      }
+      const entry = { usage: nestedUsage, model };
+      if (typeof message?.id === "string" && message.id) billed.set(message.id, entry);
+      else unkeyed.push(entry);
+    }
+  }
+  for (const { usage: usage2, model } of [...billed.values(), ...unkeyed]) {
+    const i = Number(usage2.input_tokens ?? 0);
+    const o = Number(usage2.output_tokens ?? 0);
+    const cr = Number(usage2.cache_read_input_tokens ?? 0);
+    const cc = Number(usage2.cache_creation_input_tokens ?? 0);
+    tokensInput += i;
+    tokensOutput += o;
+    tokensCacheRead += cr;
+    tokensCacheCreation += cc;
+    if (model && model !== "<synthetic>") {
+      const totals = modelBreakdown[model] ??= {
+        tokensInput: 0,
+        tokensOutput: 0,
+        tokensCacheRead: 0,
+        tokensCacheCreation: 0,
+        tokensTotal: 0
+      };
+      totals.tokensInput += i;
+      totals.tokensOutput += o;
+      totals.tokensCacheRead += cr;
+      totals.tokensCacheCreation += cc;
+      totals.tokensTotal += i + o + cr + cc;
     }
   }
   return { tokensInput, tokensOutput, tokensCacheRead, tokensCacheCreation, costUsd, modelBreakdown };
@@ -32388,8 +32395,9 @@ function findMatchingClaudeTranscripts(slot) {
           }
         }
       }
-      if (primaryHit) primary.push({ filePath, records, mtimeMs: stat.mtimeMs });
-      else if (fallbackHit) fallback.push({ filePath, records, mtimeMs: stat.mtimeMs });
+      if (primaryHit) primary.push({ filePath, records, mtimeMs: stat.mtimeMs, primary: true });
+      else if (fallbackHit)
+        fallback.push({ filePath, records, mtimeMs: stat.mtimeMs, primary: false });
     }
   }
   primary.sort((a, b2) => b2.mtimeMs - a.mtimeMs);
@@ -32446,18 +32454,14 @@ function harvestClaudeUsage(slot) {
     suffix: slot.suffix,
     createdAt: slot.sessionCreatedAt
   });
-  let best = null;
-  for (const match of matches) {
-    const usage2 = extractClaudeUsageFromRecords(match.records);
-    if (usage2.tokensInput + usage2.tokensOutput + usage2.tokensCacheRead === 0 && (usage2.costUsd == null || usage2.costUsd === 0)) {
-      continue;
-    }
-    best = usage2;
-    break;
+  const own = matches.filter((match) => match.primary);
+  const usable = own.length > 0 ? own : matches;
+  const usage2 = extractClaudeUsageFromRecords(usable.flatMap((match) => match.records));
+  if (usage2.tokensInput + usage2.tokensOutput + usage2.tokensCacheRead === 0 && (usage2.costUsd == null || usage2.costUsd === 0)) {
+    return null;
   }
-  if (!best) return null;
   const now = (/* @__PURE__ */ new Date()).toISOString();
-  const tokensTotal = best.tokensInput + best.tokensOutput + best.tokensCacheRead + best.tokensCacheCreation;
+  const tokensTotal = usage2.tokensInput + usage2.tokensOutput + usage2.tokensCacheRead + usage2.tokensCacheCreation;
   return {
     sessionKey,
     agentId: slot.agentId,
@@ -32465,13 +32469,13 @@ function harvestClaudeUsage(slot) {
     workDir: slot.workDir,
     branch: slot.branch,
     suffix: slot.suffix,
-    tokensInput: best.tokensInput,
-    tokensOutput: best.tokensOutput,
-    tokensCacheRead: best.tokensCacheRead,
-    tokensCacheCreation: best.tokensCacheCreation,
+    tokensInput: usage2.tokensInput,
+    tokensOutput: usage2.tokensOutput,
+    tokensCacheRead: usage2.tokensCacheRead,
+    tokensCacheCreation: usage2.tokensCacheCreation,
     tokensTotal,
-    costUsd: best.costUsd,
-    ...Object.keys(best.modelBreakdown).length > 0 ? { modelBreakdown: best.modelBreakdown } : {},
+    costUsd: usage2.costUsd,
+    ...Object.keys(usage2.modelBreakdown).length > 0 ? { modelBreakdown: usage2.modelBreakdown } : {},
     sources: ["harvest"],
     firstSeenAt: slot.sessionCreatedAt ?? now,
     lastSeenAt: now

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osfactory/har",
-  "version": "0.64.0",
+  "version": "0.64.1",
   "description": "HAR: open agent harness CLI and MCP server for coding agents, isolated worktrees, and software-factory workflows",
   "keywords": [
     "har",