@osfactory/har 0.64.2 → 0.64.3

package/dist/index.js

@@ -4774,7 +4774,7 @@ var init_schema = __esm({
       attemptId: WorkAttemptIdSchema.optional()
     }).passthrough();
     AgentTrajectoryRecordSchema = AgentTrajectoryRecordV1Schema;
-    USAGE_HARVEST_VERSION = 1;
+    USAGE_HARVEST_VERSION = 2;
     PRE_DEDUPE_HARVEST_VERSION = 0;
     AgentSessionUsageSchema = external_exports.object({
       sessionKey: external_exports.string().min(1),
@@ -28243,10 +28243,8 @@ function toGenaiPricesUsage(totals) {
   const rawInput = num(totals.tokensInput);
   const cacheRead = num(totals.tokensCacheRead);
   const cacheWrite = num(totals.tokensCacheCreation);
-  const uncached = rawInput >= cacheRead ? rawInput - cacheRead : rawInput;
-  const inclusiveInput = uncached + cacheRead + cacheWrite;
   return {
-    input_tokens: inclusiveInput,
+    input_tokens: rawInput + cacheRead + cacheWrite,
     output_tokens: num(totals.tokensOutput),
     cache_read_tokens: cacheRead,
     cache_write_tokens: cacheWrite
@@ -32314,6 +32312,33 @@ var init_workspace_path_match = __esm({
   }
 });
 
+// src/core/usage-harvest/record-time-range.ts
+function recordTimestamp(record2) {
+  if (!record2 || typeof record2 !== "object") return null;
+  const payload = record2;
+  const raw = typeof payload.timestamp === "string" ? payload.timestamp : payload.ts;
+  if (typeof raw !== "string") return null;
+  const ms = Date.parse(raw);
+  return Number.isFinite(ms) ? ms : null;
+}
+function recordTimeRange(records) {
+  let first = null;
+  let last = null;
+  for (const record2 of records) {
+    const ms = recordTimestamp(record2);
+    if (ms === null) continue;
+    if (first === null || ms < first) first = ms;
+    if (last === null || ms > last) last = ms;
+  }
+  if (first === null || last === null) return null;
+  return { firstAt: new Date(first).toISOString(), lastAt: new Date(last).toISOString() };
+}
+var init_record_time_range = __esm({
+  "src/core/usage-harvest/record-time-range.ts"() {
+    "use strict";
+  }
+});
+
 // src/core/usage-harvest/claude.ts
 function claudeProjectsRoot() {
   return process.env.HAR_CLAUDE_PROJECTS_DIR ? path25.resolve(process.env.HAR_CLAUDE_PROJECTS_DIR) : path25.join(os11.homedir(), ".claude", "projects");
@@ -32340,8 +32365,12 @@ function extractClaudeUsageFromRecords(records) {
   let tokensOutput = 0;
   let tokensCacheRead = 0;
   let tokensCacheCreation = 0;
-  let costUsd = null;
   const modelBreakdown = {};
+  let resultInput = 0;
+  let resultOutput = 0;
+  let resultCacheRead = 0;
+  let resultCacheCreation = 0;
+  let resultCostUsd = null;
   const billed = /* @__PURE__ */ new Map();
   const unkeyed = [];
   for (const record2 of records) {
@@ -32349,11 +32378,13 @@ function extractClaudeUsageFromRecords(records) {
     const payload = record2;
     if (payload.type === "result") {
       const usage2 = payload.usage ?? {};
-      tokensInput = Number(usage2.input_tokens ?? 0) + Number(usage2.cache_read_input_tokens ?? 0);
-      tokensOutput = Number(usage2.output_tokens ?? 0);
-      tokensCacheRead = Number(usage2.cache_read_input_tokens ?? 0);
-      tokensCacheCreation = Number(usage2.cache_creation_input_tokens ?? 0);
-      if (payload.total_cost_usd != null) costUsd = Number(payload.total_cost_usd);
+      resultInput += Number(usage2.input_tokens ?? 0);
+      resultOutput += Number(usage2.output_tokens ?? 0);
+      resultCacheRead += Number(usage2.cache_read_input_tokens ?? 0);
+      resultCacheCreation += Number(usage2.cache_creation_input_tokens ?? 0);
+      if (payload.total_cost_usd != null) {
+        resultCostUsd = (resultCostUsd ?? 0) + Number(payload.total_cost_usd);
+      }
     }
     const message = payload.message;
     const nestedUsage = payload.usage ?? message?.usage;
@@ -32388,7 +32419,21 @@ function extractClaudeUsageFromRecords(records) {
       totals.tokensTotal += i + o + cr + cc;
     }
   }
-  return { tokensInput, tokensOutput, tokensCacheRead, tokensCacheCreation, costUsd, modelBreakdown };
+  const resultTotal = resultInput + resultOutput + resultCacheRead + resultCacheCreation;
+  if (resultTotal > 0) {
+    tokensInput = resultInput;
+    tokensOutput = resultOutput;
+    tokensCacheRead = resultCacheRead;
+    tokensCacheCreation = resultCacheCreation;
+  }
+  return {
+    tokensInput,
+    tokensOutput,
+    tokensCacheRead,
+    tokensCacheCreation,
+    costUsd: resultCostUsd,
+    modelBreakdown
+  };
 }
 function findMatchingClaudeTranscripts(slot) {
   const primaryTargets = [slot.workDir, slot.worktreePath].filter(Boolean);
@@ -32485,11 +32530,13 @@ function harvestClaudeUsage(slot) {
   });
   const own = matches.filter((match) => match.primary);
   const usable = own.length > 0 ? own : matches;
-  const usage2 = extractClaudeUsageFromRecords(usable.flatMap((match) => match.records));
+  const records = usable.flatMap((match) => match.records);
+  const usage2 = extractClaudeUsageFromRecords(records);
   if (usage2.tokensInput + usage2.tokensOutput + usage2.tokensCacheRead === 0 && (usage2.costUsd == null || usage2.costUsd === 0)) {
     return null;
   }
   const now = (/* @__PURE__ */ new Date()).toISOString();
+  const seen = recordTimeRange(records);
   const tokensTotal = usage2.tokensInput + usage2.tokensOutput + usage2.tokensCacheRead + usage2.tokensCacheCreation;
   return {
     sessionKey,
@@ -32507,8 +32554,8 @@ function harvestClaudeUsage(slot) {
     ...Object.keys(usage2.modelBreakdown).length > 0 ? { modelBreakdown: usage2.modelBreakdown } : {},
     sources: ["harvest"],
     harvestVersion: USAGE_HARVEST_VERSION,
-    firstSeenAt: slot.sessionCreatedAt ?? now,
-    lastSeenAt: now
+    firstSeenAt: seen?.firstAt ?? slot.sessionCreatedAt ?? now,
+    lastSeenAt: seen?.lastAt ?? now
   };
 }
 function harvestClaudeEvents(slot) {
@@ -32534,6 +32581,7 @@ var init_claude = __esm({
     init_telemetry_config();
     init_telemetry_env();
     init_workspace_path_match();
+    init_record_time_range();
   }
 });
 
@@ -32594,7 +32642,7 @@ function extractCodexTokens(records) {
       tokensCacheRead = Math.max(tokensCacheRead, Number(payload.cached_token_count ?? 0));
     }
   }
-  return { tokensInput, tokensOutput, tokensCacheRead, cwd };
+  return { tokensInput, tokensOutput, tokensCacheRead, cwd, seen: recordTimeRange(records) };
 }
 function harvestCodexUsage(slot) {
   const primaryTargets = [slot.workDir, slot.worktreePath].filter(Boolean);
@@ -32650,8 +32698,8 @@ function harvestCodexUsage(slot) {
     costUsd: null,
     sources: ["harvest"],
     harvestVersion: USAGE_HARVEST_VERSION,
-    firstSeenAt: slot.sessionCreatedAt ?? now,
-    lastSeenAt: now
+    firstSeenAt: best.seen?.firstAt ?? slot.sessionCreatedAt ?? now,
+    lastSeenAt: best.seen?.lastAt ?? now
   };
 }
 var fs24, os12, path26;
@@ -32664,6 +32712,7 @@ var init_codex = __esm({
     init_schema2();
     init_telemetry_env();
     init_workspace_path_match();
+    init_record_time_range();
   }
 });
 

package/package.json

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