letmecode 0.1.15 → 0.1.16

package/ink-app/dist/providers/claude.js

@@ -125,7 +125,7 @@ export class ClaudeUsageProvider extends UsageProviderBase {
             warnings.push(`Collapsed ${parsedEvents.duplicateUsageKeys} duplicate Claude usage event(s) by request/message key.`);
         }
         if (options.verbose && parsedEvents.duplicateUsageKeyCollisions > 0) {
-            warnings.push(`Detected ${parsedEvents.duplicateUsageKeyCollisions} Claude usage key collision(s) with different token usage; keeping the highest-cost/latest event per key.`);
+            warnings.push(`Detected ${parsedEvents.duplicateUsageKeyCollisions} Claude usage key collision(s) with different token usage; merged same-key rows by per-field maxima to avoid double-counting cumulative snapshots.`);
         }
         if (options.verbose && parsedEvents.duplicateUnkeyedEvents > 0) {
             warnings.push(`Collapsed ${parsedEvents.duplicateUnkeyedEvents} duplicate unkeyed Claude usage event(s) by usage signature.`);
@@ -455,6 +455,7 @@ async function parseSessionFile(filePath, sessionsRoot) {
             usageSignature,
             timestampMs: eventTimeMs,
             modelId,
+            usage: normalizedUsage,
             totals: usageToTotals(modelId, normalizedUsage),
             rateLimits
         });
@@ -565,8 +566,11 @@ function buildUsageEventKey(payloadObject, message) {
     return `${sessionId}|${requestId || messageId}`;
 }
 function buildUsageSignature(payloadObject, modelId, usage) {
+    return buildUsageSignatureFromParts(String(payloadObject.sessionId ?? ""), modelId, usage);
+}
+function buildUsageSignatureFromParts(sessionId, modelId, usage) {
     return [
-        String(payloadObject.sessionId ?? ""),
+        sessionId,
         modelId,
         usage.inputTokens,
         usage.cacheCreationInputTokens,
@@ -597,9 +601,7 @@ function recordParsedUsageEvent(parsedEvents, event) {
         if (previous.usageSignature !== event.usageSignature) {
             parsedEvents.duplicateUsageKeyCollisions += 1;
         }
-        if (shouldReplaceUsageEvent(previous, event)) {
-            parsedEvents.keyedEvents.set(event.usageKey, event);
-        }
+        parsedEvents.keyedEvents.set(event.usageKey, mergeParsedUsageEvents(previous, event));
         return;
     }
     const previous = parsedEvents.unkeyedEvents.get(event.usageSignature);
@@ -608,18 +610,57 @@ function recordParsedUsageEvent(parsedEvents, event) {
         return;
     }
     parsedEvents.duplicateUnkeyedEvents += 1;
-    if (shouldReplaceUsageEvent(previous, event)) {
+    if (normalizeTimestamp(event.timestampMs) > normalizeTimestamp(previous.timestampMs)) {
         parsedEvents.unkeyedEvents.set(event.usageSignature, event);
     }
 }
-function shouldReplaceUsageEvent(previous, next) {
-    if (next.totals.estimatedCredits > previous.totals.estimatedCredits) {
-        return true;
+function mergeParsedUsageEvents(previous, next) {
+    const mergedUsage = mergeClaudeUsage(previous.usage, next.usage);
+    const modelId = selectMergedEventModelId(previous, next);
+    const latestEvent = normalizeTimestamp(next.timestampMs) >= normalizeTimestamp(previous.timestampMs) ? next : previous;
+    const sessionId = extractUsageKeySessionId(previous.usageKey) || extractUsageKeySessionId(next.usageKey);
+    return {
+        entrypoint: latestEvent.entrypoint || previous.entrypoint || next.entrypoint,
+        usageKey: previous.usageKey ?? next.usageKey,
+        usageSignature: buildUsageSignatureFromParts(sessionId, modelId, mergedUsage),
+        timestampMs: Math.max(normalizeTimestamp(previous.timestampMs), normalizeTimestamp(next.timestampMs)),
+        modelId,
+        usage: mergedUsage,
+        totals: usageToTotals(modelId, mergedUsage),
+        rateLimits: latestEvent.rateLimits ?? previous.rateLimits ?? next.rateLimits
+    };
+}
+function mergeClaudeUsage(previous, next) {
+    return {
+        inputTokens: Math.max(previous.inputTokens, next.inputTokens),
+        cacheReadInputTokens: Math.max(previous.cacheReadInputTokens, next.cacheReadInputTokens),
+        cacheCreationInputTokens: Math.max(previous.cacheCreationInputTokens, next.cacheCreationInputTokens),
+        cacheCreation5mInputTokens: Math.max(previous.cacheCreation5mInputTokens, next.cacheCreation5mInputTokens),
+        cacheCreation1hInputTokens: Math.max(previous.cacheCreation1hInputTokens, next.cacheCreation1hInputTokens),
+        outputTokens: Math.max(previous.outputTokens, next.outputTokens),
+        inferenceGeo: next.inferenceGeo || previous.inferenceGeo
+    };
+}
+function selectMergedEventModelId(previous, next) {
+    if (previous.modelId === next.modelId) {
+        return previous.modelId;
+    }
+    if (isInternalClaudeModel(previous.modelId) && !isInternalClaudeModel(next.modelId)) {
+        return next.modelId;
     }
-    if (next.totals.estimatedCredits === previous.totals.estimatedCredits) {
-        return normalizeTimestamp(next.timestampMs) > normalizeTimestamp(previous.timestampMs);
+    if (isInternalClaudeModel(next.modelId) && !isInternalClaudeModel(previous.modelId)) {
+        return previous.modelId;
+    }
+    return next.totals.estimatedCredits >= previous.totals.estimatedCredits
+        ? next.modelId
+        : previous.modelId;
+}
+function extractUsageKeySessionId(usageKey) {
+    if (!usageKey) {
+        return "";
     }
-    return false;
+    const separatorIndex = usageKey.indexOf("|");
+    return separatorIndex >= 0 ? usageKey.slice(0, separatorIndex) : usageKey;
 }
 function normalizeTimestamp(value) {
     return Number.isFinite(value) ? value : Number.NEGATIVE_INFINITY;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "letmecode",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "Provider-based terminal usage dashboard for LetMeCode.",
   "author": "devforth.io",
   "license": "MIT",