letmecode 0.1.16 → 0.1.18

package/ink-app/dist/index.js

@@ -195,7 +195,7 @@ function App(props) {
             moveSelectedTableRow(-1);
         }
     });
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, height: viewportHeight, overflow: "hidden", children: [_jsx(Text, { bold: true, color: "cyan", children: "LetMeCode Usage Dashboard" }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: "gray", children: "Provider  " }), sortedProviderStates.map((state) => (_jsx(ProviderTab, { label: state.provider.label, active: state.provider.id === selectedProvider.provider.id, status: state.status, regionRef: getRegionRef(`provider:${state.provider.id}`) }, state.provider.id)))] }), _jsxs(Box, { children: [_jsx(Text, { color: "gray", children: "View      " }), DETAIL_TABS.map((tab, index) => (_jsx(DetailTab, { label: tab.label, active: index === selectedDetailTabIndex, regionRef: getRegionRef(`vtab:${index}`) }, tab.id)))] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", flexGrow: 1, overflow: "hidden", children: [_jsx(Box, { flexGrow: 1, overflow: "hidden", children: _jsx(Box, { ref: contentPanelRef, flexDirection: "column", flexGrow: 1, overflow: "hidden", children: _jsx(ContentPanel, { providerState: selectedProvider, tabId: selectedDetailTab.id, selectedLimitRowKey: selectedLimitRow ? getLimitRowKey(selectedLimitRow) : undefined, selectedDayKey: selectedDayRow?.dayKey, selectedModelId: selectedModelRow?.modelId, availableHeight: contentPanelHeight }) }) }), _jsx(SelectionDetailsPanel, { providerState: selectedProvider, tabId: selectedDetailTab.id, selectedLimitRow: selectedLimitRow, selectedDayRow: selectedDayRow, selectedModelRow: selectedModelRow }), _jsx(CopilotActionsPanel, { providerState: selectedProvider, actionMessage: copilotActionMessage, selectedActionIndex: selectedCopilotActionIndex }), selectedProvider.status === "ready" && selectedProvider.stats.warnings.length > 0 ? (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: "yellow", paddingX: 1, flexDirection: "column", overflow: "hidden", children: [_jsx(Text, { color: "yellow", children: "Warnings" }), selectedProvider.stats.warnings.map((warning) => (_jsx(Text, { children: warning }, warning)))] })) : null] }), _jsx(Text, { color: "gray", children: "Tab provider \u00B7 \u2190/\u2192 view \u00B7 \u2191/\u2193 row \u00B7 q quit" })] }));
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, height: viewportHeight, overflow: "hidden", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, color: "cyan", children: "LetMeCode Usage Dashboard" }), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, color: "black", backgroundColor: "green", children: " beta " })] }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: "gray", children: "Provider  " }), sortedProviderStates.map((state) => (_jsx(ProviderTab, { label: state.provider.label, active: state.provider.id === selectedProvider.provider.id, status: state.status, regionRef: getRegionRef(`provider:${state.provider.id}`) }, state.provider.id)))] }), _jsxs(Box, { children: [_jsx(Text, { color: "gray", children: "View      " }), DETAIL_TABS.map((tab, index) => (_jsx(DetailTab, { label: tab.label, active: index === selectedDetailTabIndex, regionRef: getRegionRef(`vtab:${index}`) }, tab.id)))] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", flexGrow: 1, overflow: "hidden", children: [_jsx(Box, { flexGrow: 1, overflow: "hidden", children: _jsx(Box, { ref: contentPanelRef, flexDirection: "column", flexGrow: 1, overflow: "hidden", children: _jsx(ContentPanel, { providerState: selectedProvider, tabId: selectedDetailTab.id, selectedLimitRowKey: selectedLimitRow ? getLimitRowKey(selectedLimitRow) : undefined, selectedDayKey: selectedDayRow?.dayKey, selectedModelId: selectedModelRow?.modelId, availableHeight: contentPanelHeight }) }) }), _jsx(SelectionDetailsPanel, { providerState: selectedProvider, tabId: selectedDetailTab.id, selectedLimitRow: selectedLimitRow, selectedDayRow: selectedDayRow, selectedModelRow: selectedModelRow }), _jsx(CopilotActionsPanel, { providerState: selectedProvider, actionMessage: copilotActionMessage, selectedActionIndex: selectedCopilotActionIndex }), selectedProvider.status === "ready" && selectedProvider.stats.warnings.length > 0 ? (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: "yellow", paddingX: 1, flexDirection: "column", overflow: "hidden", children: [_jsx(Text, { color: "yellow", children: "Warnings" }), selectedProvider.stats.warnings.map((warning) => (_jsx(Text, { children: warning }, warning)))] })) : null] }), _jsx(Text, { color: "gray", children: "Tab provider \u00B7 \u2190/\u2192 view \u00B7 \u2191/\u2193 row \u00B7 q quit" })] }));
 }
 function CopilotActionsPanel(props) {
     if (props.providerState.provider.id !== "copilot") {

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

@@ -97,8 +97,8 @@ export class ClaudeUsageProvider extends UsageProviderBase {
             }
         }
         const selectedEvents = [
-            ...parsedEvents.keyedEvents.values(),
-            ...parsedEvents.unkeyedEvents.values()
+            ...new Set(parsedEvents.keyedEvents.values()),
+            ...parsedEvents.unkeyedEvents
         ];
         traceClaude(options.traceLogger, [
             `Transcript selection summary: filesWithMatches=${parseTotals.filesScanned}/${parsedSessionFiles.length}`,
@@ -128,7 +128,7 @@ export class ClaudeUsageProvider extends UsageProviderBase {
             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.`);
+            warnings.push(`Collapsed ${parsedEvents.duplicateUnkeyedEvents} adjacent duplicate unkeyed Claude usage event(s) by usage signature.`);
         }
         const modelUsage = [...byModel.entries()]
             .map(([modelId, totals]) => ({ modelId, totals }))
@@ -446,12 +446,14 @@ async function parseSessionFile(filePath, sessionsRoot) {
         const entrypoint = typeof payloadObject.entrypoint === "string" ? payloadObject.entrypoint : "";
         const rateLimits = extractRateLimits(payloadObject, message);
         const normalizedUsage = normalizeUsage(usage);
-        const usageKey = buildUsageEventKey(payloadObject, message);
+        const usageKeys = buildUsageEventKeys(payloadObject, message);
         const usageSignature = buildUsageSignature(payloadObject, modelId, normalizedUsage);
         assistantEntryPoints.add(entrypoint);
         events.push({
             entrypoint,
-            usageKey,
+            filePath,
+            lineNumber: linesRead,
+            usageKeys,
             usageSignature,
             timestampMs: eventTimeMs,
             modelId,
@@ -556,14 +558,14 @@ function extractStringArray(value) {
     }
     return value.filter((item) => typeof item === "string");
 }
-function buildUsageEventKey(payloadObject, message) {
+function buildUsageEventKeys(payloadObject, message) {
     const sessionId = String(payloadObject.sessionId ?? "");
     const requestId = typeof payloadObject.requestId === "string" ? payloadObject.requestId : "";
     const messageId = typeof message?.id === "string" ? message.id : "";
-    if (!requestId && !messageId) {
-        return null;
-    }
-    return `${sessionId}|${requestId || messageId}`;
+    return [...new Set([
+            requestId ? `${sessionId}|request:${requestId}` : "",
+            messageId ? `${sessionId}|message:${messageId}` : ""
+        ].filter(Boolean))];
 }
 function buildUsageSignature(payloadObject, modelId, usage) {
     return buildUsageSignatureFromParts(String(payloadObject.sessionId ?? ""), modelId, usage);
@@ -584,44 +586,66 @@ function buildUsageSignatureFromParts(sessionId, modelId, usage) {
 function createParsedUsageEventAccumulator() {
     return {
         keyedEvents: new Map(),
-        unkeyedEvents: new Map(),
+        unkeyedEvents: [],
+        lastUnkeyedEventsBySignature: new Map(),
         duplicateUsageKeys: 0,
         duplicateUsageKeyCollisions: 0,
         duplicateUnkeyedEvents: 0
     };
 }
 function recordParsedUsageEvent(parsedEvents, event) {
-    if (event.usageKey) {
-        const previous = parsedEvents.keyedEvents.get(event.usageKey);
-        if (!previous) {
-            parsedEvents.keyedEvents.set(event.usageKey, event);
+    if (event.usageKeys.length > 0) {
+        const previousMatches = [...new Set(event.usageKeys
+                .map((usageKey) => parsedEvents.keyedEvents.get(usageKey))
+                .filter((candidate) => Boolean(candidate)))];
+        if (previousMatches.length === 0) {
+            for (const usageKey of event.usageKeys) {
+                parsedEvents.keyedEvents.set(usageKey, event);
+            }
             return;
         }
         parsedEvents.duplicateUsageKeys += 1;
-        if (previous.usageSignature !== event.usageSignature) {
+        const distinctUsageSignatures = new Set([
+            event.usageSignature,
+            ...previousMatches.map((candidate) => candidate.usageSignature)
+        ]);
+        if (distinctUsageSignatures.size > 1) {
             parsedEvents.duplicateUsageKeyCollisions += 1;
         }
-        parsedEvents.keyedEvents.set(event.usageKey, mergeParsedUsageEvents(previous, event));
+        const mergedEvent = previousMatches.reduce(mergeParsedUsageEvents, event);
+        for (const usageKey of mergedEvent.usageKeys) {
+            parsedEvents.keyedEvents.set(usageKey, mergedEvent);
+        }
         return;
     }
-    const previous = parsedEvents.unkeyedEvents.get(event.usageSignature);
-    if (!previous) {
-        parsedEvents.unkeyedEvents.set(event.usageSignature, event);
+    const previousRecord = parsedEvents.lastUnkeyedEventsBySignature.get(event.usageSignature);
+    if (!previousRecord || !canCollapseAdjacentUnkeyedUsageEvents(previousRecord.event, event)) {
+        parsedEvents.unkeyedEvents.push(event);
+        parsedEvents.lastUnkeyedEventsBySignature.set(event.usageSignature, {
+            event,
+            index: parsedEvents.unkeyedEvents.length - 1
+        });
         return;
     }
     parsedEvents.duplicateUnkeyedEvents += 1;
-    if (normalizeTimestamp(event.timestampMs) > normalizeTimestamp(previous.timestampMs)) {
-        parsedEvents.unkeyedEvents.set(event.usageSignature, event);
+    if (normalizeTimestamp(event.timestampMs) > normalizeTimestamp(previousRecord.event.timestampMs)) {
+        parsedEvents.unkeyedEvents[previousRecord.index] = event;
+        parsedEvents.lastUnkeyedEventsBySignature.set(event.usageSignature, {
+            event,
+            index: previousRecord.index
+        });
     }
 }
 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);
+    const sessionId = extractUsageKeySessionId(previous.usageKeys) || extractUsageKeySessionId(next.usageKeys);
     return {
         entrypoint: latestEvent.entrypoint || previous.entrypoint || next.entrypoint,
-        usageKey: previous.usageKey ?? next.usageKey,
+        filePath: latestEvent.filePath,
+        lineNumber: latestEvent.lineNumber,
+        usageKeys: [...new Set([...previous.usageKeys, ...next.usageKeys])],
         usageSignature: buildUsageSignatureFromParts(sessionId, modelId, mergedUsage),
         timestampMs: Math.max(normalizeTimestamp(previous.timestampMs), normalizeTimestamp(next.timestampMs)),
         modelId,
@@ -655,7 +679,11 @@ function selectMergedEventModelId(previous, next) {
         ? next.modelId
         : previous.modelId;
 }
-function extractUsageKeySessionId(usageKey) {
+function canCollapseAdjacentUnkeyedUsageEvents(previous, next) {
+    return previous.filePath === next.filePath && next.lineNumber === previous.lineNumber + 1;
+}
+function extractUsageKeySessionId(usageKeys) {
+    const usageKey = usageKeys[0];
     if (!usageKey) {
         return "";
     }

package/package.json

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