@robhowley/pi-openrouter 0.8.2 → 0.8.3

package/extensions/openrouter/__tests__/fixtures.ts

@@ -132,3 +132,30 @@ export function createPiModelConfig(overrides?: Partial<PiModelConfig>): PiModel
     ...overrides,
   };
 }
+
+// =============================================================================
+// LocalUsageEvent Fixtures
+// =============================================================================
+
+import type { LocalUsageEvent } from '../types.js';
+
+/**
+ * Creates LocalUsageEvent objects for testing local usage aggregation.
+ * Use daysAgo=0 for today, daysAgo=3 for within 7d window, etc.
+ */
+export function createLocalEvents(
+  events: Array<{ daysAgo: number; cost: number; model?: string; provider?: string }>,
+): LocalUsageEvent[] {
+  return events.map((e, i) => ({
+    id: `local-${i}`,
+    sessionId: 'test-session',
+    generationId: `gen-${i}`,
+    completedAt: `${createTestDate(e.daysAgo)}T12:00:00.000Z`,
+    requests: 1,
+    model: e.model ?? 'gpt-4',
+    provider: e.provider ?? 'openai',
+    promptTokens: 100,
+    completionTokens: 50,
+    cost: e.cost,
+  }));
+}

package/extensions/openrouter/__tests__/format.test.ts

@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest';
 import { aggregateUsage } from '../format.js';
 import { renderSpendSparkline } from '../chart.js';
-import { createTestDate, createActivityItem } from './fixtures.js';
+import { createTestDate, createActivityItem, createLocalEvents } from './fixtures.js';
 import type { ActivityItem } from '@openrouter/sdk/models/index.js';
 
 describe('aggregateUsage', () => {
@@ -224,6 +224,54 @@ describe('aggregateUsage', () => {
     expect(result.byProvider[0]?.tokens.output).toBe(80); // 50 + 30
     expect(result.byProvider[0]?.requests).toBe(8); // 5 + 3
   });
+
+  it.each([
+    {
+      name: 'local today included in 7d model stats',
+      api: { daysAgo: 3, cost: 5, model: 'gpt-4' },
+      local: { daysAgo: 0, cost: 2.5, model: 'gpt-4' },
+      expectSpend7d: 7.5,
+    },
+    {
+      name: 'local outside 7d window excluded from 7d stats',
+      api: { daysAgo: 3, cost: 5, model: 'gpt-4' },
+      local: { daysAgo: 10, cost: 100, model: 'gpt-4' },
+      expectSpend7d: 5,
+    },
+    {
+      name: 'different models tracked separately',
+      api: { daysAgo: 1, cost: 5, model: 'gpt-4' },
+      local: { daysAgo: 0, cost: 3, model: 'claude-3' },
+      expectSpend7d: null,
+      expectModels: [
+        { name: 'gpt-4', spend7d: 5 },
+        { name: 'claude-3', spend7d: 3 },
+      ],
+    },
+  ])('$name', ({ api, local, expectSpend7d, expectModels }) => {
+    const credits = { totalUsage: 1000, totalCredits: 2000 };
+
+    const result = aggregateUsage(
+      credits,
+      [
+        createActivityItem({
+          date: createTestDate(api.daysAgo),
+          usage: api.cost,
+          model: api.model,
+        }),
+      ],
+      Date.now(),
+      createLocalEvents([local]),
+    );
+
+    if (expectModels) {
+      for (const { name, spend7d } of expectModels) {
+        expect(result.topModels.find((m) => m.name === name)?.spend7d).toBe(spend7d);
+      }
+    } else {
+      expect(result.topModels[0]?.spend7d).toBe(expectSpend7d);
+    }
+  });
 });
 
 describe('renderSpendSparkline', () => {

package/extensions/openrouter/format.ts

@@ -25,13 +25,10 @@ export function aggregateUsage(
     return d.date >= utcISODate(startOfWeek);
   });
 
-  const todayData = analytics.filter((d) => {
-    // API dates are YYYY-MM-DD in UTC; compare by UTC date boundary
-    return d.date >= utcISODate(startOfDay);
-  });
-
   const weekFromAnalytics = sumSpend(weekData);
-  const todayFromAnalytics = sumSpend(todayData);
+  const todayFromAnalytics = analytics
+    .filter((d) => d.date >= utcISODate(startOfDay))
+    .reduce((sum, d) => sum + d.usage, 0);
   const month = credits.totalUsage;
 
   // Add local events to compute combined totals
@@ -65,8 +62,10 @@ export function aggregateUsage(
   const allData = [...analytics, ...localItems];
 
   // Build model stats for both 7d and 30d windows
-  // Use allData (combined API + local) for 30d, weekData (combined) for 7d
-  const modelStatsMap = buildModelStats(weekData, allData);
+  // Combine weekData with local events in the 7d window
+  const weekLocalItems = localItems.filter((e) => e.date >= utcISODate(startOfWeek));
+  const weekAllData = [...weekData, ...weekLocalItems];
+  const modelStatsMap = buildModelStats(weekAllData, allData);
   const topModels = Array.from(modelStatsMap.values())
     .sort((a, b) => b.spend30d - a.spend30d)
     .slice(0, 10);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robhowley/pi-openrouter",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "type": "module",
   "description": "Live OpenRouter spend/account TUI overlays, user-scoped model sync, and session tagging for Pi.",
   "license": "MIT",