@oh-my-pi/omp-stats 16.4.6 → 16.4.8

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/omp-stats",
-	"version": "16.4.6",
+	"version": "16.4.8",
 	"description": "Local observability dashboard for pi AI usage statistics",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -39,9 +39,9 @@
 		"fmt": "biome format --write ."
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-ai": "16.4.6",
-		"@oh-my-pi/pi-catalog": "16.4.6",
-		"@oh-my-pi/pi-utils": "16.4.6",
+		"@oh-my-pi/pi-ai": "16.4.8",
+		"@oh-my-pi/pi-catalog": "16.4.8",
+		"@oh-my-pi/pi-utils": "16.4.8",
 		"@tailwindcss/node": "^4.3.0",
 		"chart.js": "^4.5.1",
 		"date-fns": "^4.4.0",

package/src/parser.ts

@@ -6,7 +6,9 @@ import {
 	getPriorityPremiumRequests,
 	resolveModelServiceTier,
 	type ServiceTierByFamily,
+	type ToolCall,
 	type ToolResultMessage,
+	type Usage,
 } from "@oh-my-pi/pi-ai";
 import { getSessionsDir, isEnoent, readLines } from "@oh-my-pi/pi-utils";
 import type {
@@ -142,6 +144,14 @@ function extractUserStats(sessionFile: string, folder: string, entry: SessionMes
 
 /**
  * Extract stats from an assistant message entry.
+ *
+ * Session JSONL on disk is not guaranteed to match the current
+ * `AssistantMessage` shape: crash-truncated turns, sessions written by older
+ * versions, and foreign producers all flow through this parser. Every field
+ * returned here feeds a NOT NULL column in stats.db, so malformed entries are
+ * coerced (missing `stopReason`, token counts, `timestamp`) or skipped
+ * (missing `model`/`provider`/`api`/`usage`) instead of crashing the whole
+ * sync with a constraint violation.
  */
 function extractStats(
 	sessionFile: string,
@@ -152,6 +162,9 @@ function extractStats(
 ): MessageStats | null {
 	const msg = entry.message as AssistantMessage;
 	if (msg?.role !== "assistant") return null;
+	if (typeof msg.model !== "string" || typeof msg.provider !== "string" || typeof msg.api !== "string") return null;
+	const rawUsage = msg.usage as Partial<Usage> | undefined;
+	if (!rawUsage || typeof rawUsage !== "object") return null;
 
 	// Backfill: when the session recorded `priority` as the active service tier
 	// at this point but the AI usage payload was captured before priority
@@ -159,11 +172,29 @@ function extractStats(
 	// "Premium Reqs" stat aggregates priority traffic on re-sync. Trust any
 	// non-zero value already in `usage.premiumRequests` (Copilot multipliers or
 	// the new AI code path) and only synthesise when the field is missing/zero.
-	const recorded = msg.usage.premiumRequests ?? 0;
+	const recorded = rawUsage.premiumRequests ?? 0;
 	const model = { provider: msg.provider, api: msg.api, id: msg.model };
 	const tier = resolveModelServiceTier(currentServiceTier, model);
 	const derived = recorded > 0 ? recorded : getPriorityPremiumRequests(tier, model);
-	const usage = derived === recorded ? msg.usage : { ...msg.usage, premiumRequests: derived };
+	const wellFormed =
+		typeof rawUsage.input === "number" &&
+		typeof rawUsage.output === "number" &&
+		typeof rawUsage.cacheRead === "number" &&
+		typeof rawUsage.cacheWrite === "number" &&
+		typeof rawUsage.totalTokens === "number";
+	const usage: Usage =
+		wellFormed && derived === recorded
+			? (rawUsage as Usage)
+			: {
+					...rawUsage,
+					input: rawUsage.input ?? 0,
+					output: rawUsage.output ?? 0,
+					cacheRead: rawUsage.cacheRead ?? 0,
+					cacheWrite: rawUsage.cacheWrite ?? 0,
+					totalTokens: rawUsage.totalTokens ?? 0,
+					cost: rawUsage.cost ?? { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
+					premiumRequests: derived,
+				};
 
 	return {
 		sessionFile,
@@ -172,16 +203,25 @@ function extractStats(
 		model: msg.model,
 		provider: msg.provider,
 		api: msg.api,
-		timestamp: msg.timestamp,
+		timestamp: coerceEntryTimestamp(msg.timestamp, entry),
 		duration: msg.duration ?? null,
 		ttft: msg.ttft ?? null,
-		stopReason: msg.stopReason,
+		// A message persisted without a terminal stop reason never completed
+		// normally: classify by whether it carried an error.
+		stopReason: msg.stopReason ?? (msg.errorMessage ? "error" : "aborted"),
 		errorMessage: msg.errorMessage ?? null,
 		usage,
 		agentType,
 	};
 }
 
+/** Message timestamp, falling back to the entry's ISO timestamp, then 0. */
+function coerceEntryTimestamp(timestamp: number | undefined, entry: SessionMessageEntry): number {
+	if (typeof timestamp === "number" && Number.isFinite(timestamp)) return timestamp;
+	const ts = Date.parse(entry.timestamp);
+	return Number.isFinite(ts) ? ts : 0;
+}
+
 /**
  * Extract one {@link ToolCallStats} per `toolCall` content block of an
  * assistant message. Returns an empty array for turns without tool calls.
@@ -194,8 +234,14 @@ function extractToolCalls(
 ): ToolCallStats[] {
 	const msg = entry.message as AssistantMessage;
 	if (msg?.role !== "assistant" || !Array.isArray(msg.content)) return [];
+	// `tool_calls` columns are NOT NULL: skip turns that can't be attributed
+	// (malformed persisted entries — see extractStats) and blocks missing ids.
+	if (typeof msg.model !== "string" || typeof msg.provider !== "string") return [];
 
-	const blocks = msg.content.filter(block => block.type === "toolCall");
+	const blocks = msg.content.filter(
+		(block): block is ToolCall =>
+			block.type === "toolCall" && typeof block.id === "string" && typeof block.name === "string",
+	);
 	if (blocks.length === 0) return [];
 
 	return blocks.map(block => {
@@ -213,7 +259,7 @@ function extractToolCalls(
 			toolName: block.name,
 			model: msg.model,
 			provider: msg.provider,
-			timestamp: msg.timestamp,
+			timestamp: coerceEntryTimestamp(msg.timestamp, entry),
 			agentType,
 			callsInTurn: blocks.length,
 			argsChars,