@pify/usage 0.9.1 → 0.9.2

package/README.md

@@ -40,7 +40,7 @@ By project (all time)
   D--project-shop-api       $6.60 · 3.6M tok
 ```
 
-History counts every usage-bearing entry in pi's session JSONL — assistant turns plus the tool-result usage pi persists, and the summariser's own call, which pi records on the compaction and branch-summary entries themselves rather than on a message. Those summary calls are among the most expensive in a session, so counting them is what makes a session's total match what you were billed rather than what the visible messages add up to; they have no model of their own, so they group under a `compaction` / `branch_summary` label in the by-model view. The live footer and session totals fold the same summariser usage in as it happens (on compaction and tree navigation), so the number does not jump only after a reload. Negative and NaN fields clamp to zero, days are your **local** calendar days, and a per-file mtime cache keeps repeat scans instant.
+History counts every usage-bearing entry in pi's session JSONL — assistant turns plus the tool-result usage pi persists, and the summariser's own call, which pi records on the compaction and branch-summary entries themselves rather than on a message. Those summary calls are among the most expensive in a session, so counting them is what makes a session's total match what you were billed rather than what the visible messages add up to; they have no model of their own, so they group under a `compaction` / `branch_summary` label in the by-model view. The live footer and session totals fold the same summariser usage in as it happens (on compaction and tree navigation), so the number does not jump only after a reload. pi 0.87's cache warmer spends real money outside any message too, as standalone `usage` entries; those are counted under their own model on reload and in history (pi raises no extension event for them, so the live footer picks them up at the next session start). Negative and NaN fields clamp to zero, days are your **local** calendar days, and a per-file mtime cache keeps repeat scans instant.
 
 Per-project totals come for free: pi stores sessions one directory per project, so the dashboard can show where the money actually went.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pify/usage",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Token and cost reporting for pi sessions: live footer, local-history dashboard with per-project costs, opt-in provider quota",
   "keywords": [
     "pi-package",

package/src/aggregate.ts

@@ -76,18 +76,24 @@ export function windowTotals(byDay: Map<string, UsageTotals>, days: number, now:
  * summariser's usage one level up, on the compaction / branch_summary entry
  * itself (these entries have no `message`), so those are read from
  * `entry.usage` — otherwise the most expensive calls in a session go
- * uncounted. Returns null for entries without usage; negative/NaN fields clamp
- * to 0.
+ * uncounted. pi 0.87's standalone `usage` entries (cache warming) also carry
+ * their usage on the entry. Returns null for entries without usage;
+ * negative/NaN fields clamp to 0.
  */
 export function recordFromEntry(entry: unknown): UsageRecord | null {
   if (!isRecord(entry)) return null;
   const message = isRecord(entry.message) ? entry.message : null;
   const entryType = typeof entry.type === "string" ? entry.type : "";
   const isSummary = entryType === "compaction" || entryType === "branch_summary";
+  // pi 0.87 adds a standalone UsageEntry ({type:"usage", kind:"cache_warm",
+  // provider, model, usage}) for spend that belongs to no message — the cache
+  // warmer writes one per refresh, and pi folds it into its own session
+  // totals. It carries its own provider/model, unlike the summaries.
+  const isUsageEntry = entryType === "usage";
   const usage =
     message && isRecord(message.usage)
       ? message.usage
-      : isSummary && isRecord(entry.usage)
+      : (isSummary || isUsageEntry) && isRecord(entry.usage)
         ? entry.usage
         : null;
   if (!usage) return null;
@@ -105,9 +111,17 @@ export function recordFromEntry(entry: unknown): UsageRecord | null {
 
   // A summary entry has no model/provider of its own; label the bucket by the
   // entry type rather than threading a running "last model" through the scan.
+  // A usage entry names its model/provider itself; fall back to its kind.
+  const own = message ?? (isUsageEntry ? entry : null);
   const model =
-    message && typeof message.model === "string" ? message.model : isSummary ? entryType : "unknown";
-  const provider = message && typeof message.provider === "string" ? message.provider : "unknown";
+    own && typeof own.model === "string"
+      ? own.model
+      : isSummary
+        ? entryType
+        : isUsageEntry && typeof entry.kind === "string"
+          ? entry.kind
+          : "unknown";
+  const provider = own && typeof own.provider === "string" ? own.provider : "unknown";
 
   return {
     timestamp: Number.isFinite(ts) ? ts : 0,