@oh-my-pi/omp-stats 18.1.16 → 18.1.18

package/src/trace.ts

@@ -11,9 +11,10 @@
 
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import { getBundledModel, type GeneratedProvider } from "@oh-my-pi/pi-catalog/models";
 import { getSessionsDir, isEnoent } from "@oh-my-pi/pi-utils";
-import { getSessionRollups, getToolCallCountsBySession } from "./db";
-import { extractFolderFromPath, parseAllSessionEntries } from "./parser";
+import { getSessionRollups, getToolCallCountsBySession, isScheduledCatalogModel } from "./db";
+import { extractFolderFromPath, parseAllSessionEntries, resolveUsageTotal } from "./parser";
 import type {
 	SessionEntry,
 	SessionSummary,
@@ -32,7 +33,7 @@ export class TracePathError extends Error {}
  * span assembly changes so browsers don't revalidate stale cached bodies
  * against an unchanged transcript mtime.
  */
-export const TRACE_ETAG_VERSION = 2;
+export const TRACE_ETAG_VERSION = 3;
 
 const MAX_TRACK_DEPTH = 6;
 const LABEL_MAX = 80;
@@ -84,7 +85,15 @@ interface MessageView {
 	completedAt?: number;
 	duration?: number;
 	ttft?: number;
-	usage?: { totalTokens?: number; cost?: { total?: number } };
+	usage?: {
+		input?: unknown;
+		output?: unknown;
+		cacheRead?: unknown;
+		cacheWrite?: unknown;
+		totalTokens?: unknown;
+		orchestration?: { input?: unknown; output?: unknown; cacheRead?: unknown };
+		cost?: { total?: unknown };
+	};
 	model?: string;
 	provider?: string;
 	stopReason?: string;
@@ -115,13 +124,14 @@ interface TaskResultFact {
 	resultEntryId: string;
 	toolSpanEnd: number;
 }
-
 /** Everything one transcript contributes before cross-track assembly. */
 interface TrackScan {
 	track: TraceTrack;
 	taskResults: TaskResultFact[];
 	requests: number;
 	toolCalls: number;
+	/** Model requests whose zero cost is unknown spend (mirrors db's unpriced predicate). */
+	unpricedRequests: number;
 	cwd: string | null;
 	title: string | null;
 	/** Session-header envelope timestamp (ms), for spanless traces. */
@@ -284,6 +294,7 @@ function scanTranscript(
 	let initModel: string | null = null;
 	let firstAssistantModel: string | null = null;
 	let requests = 0;
+	let unpricedRequests = 0;
 	let lastChainTs = 0;
 
 	// Title slot and session header may sit outside the id chain — scan all entries.
@@ -358,6 +369,32 @@ function scanTranscript(
 
 		if (msg.role === "assistant") {
 			requests++;
+			// Mirror the db's unpriced predicate so the trace headline agrees
+			// with Costs/Recent Requests: a zero that is unknown spend, not free.
+			// Counted before the span-timing `continue` below so a fully
+			// dateless entry still surfaces as N/A rather than vanishing.
+			// Derive a missing total from the buckets via the shared ingest
+			// helper, so a legacy entry with tokens but no total still
+			// classifies as unpriced.
+			const totalTokens = resolveUsageTotal(msg.usage);
+			const costObj = msg.usage?.cost;
+			const costTotal =
+				typeof costObj?.total === "number" && Number.isFinite(costObj.total) ? costObj.total : undefined;
+			if (totalTokens > 0 && (costTotal === undefined || costTotal === 0)) {
+				const provider = typeof msg.provider === "string" ? msg.provider : "";
+				const model = typeof msg.model === "string" ? msg.model : "";
+				if (provider === "xai-oauth" && model) {
+					const ref = getBundledModel("xai" as GeneratedProvider, model)?.cost;
+					if (!(ref && (ref.input !== 0 || ref.output !== 0 || ref.cacheRead !== 0 || ref.cacheWrite !== 0))) {
+						unpricedRequests++;
+					}
+				} else if (costObj == null && provider && model) {
+					const hasTimestamp =
+						(typeof msg.timestamp === "number" && Number.isFinite(msg.timestamp) && msg.timestamp > 0) ||
+						envelopeTs !== undefined;
+					if (!hasTimestamp && isScheduledCatalogModel(provider, model)) unpricedRequests++;
+				}
+			}
 			let start = typeof msg.timestamp === "number" && Number.isFinite(msg.timestamp) ? msg.timestamp : undefined;
 			let end =
 				typeof msg.completedAt === "number" && Number.isFinite(msg.completedAt)
@@ -386,12 +423,12 @@ function scanTranscript(
 			if (detail) span.detail = detail;
 			if (entry.id) span.entryId = entry.id;
 			if (typeof msg.model === "string") span.model = msg.model;
-			if (typeof msg.usage?.totalTokens === "number") span.tokens = msg.usage.totalTokens;
-			if (typeof msg.usage?.cost?.total === "number") span.cost = msg.usage.cost.total;
+			if (totalTokens > 0) span.tokens = totalTokens;
+
+			if (costTotal !== undefined) span.cost = costTotal;
 			if (typeof msg.ttft === "number") span.ttft = msg.ttft;
 			if (msg.stopReason === "error" || msg.errorMessage) span.isError = true;
 			spans.push(span);
-
 			if (Array.isArray(msg.content)) {
 				for (const block of msg.content) {
 					if (!block || typeof block !== "object" || !("type" in block) || block.type !== "toolCall") continue;
@@ -572,6 +609,7 @@ function scanTranscript(
 		taskResults,
 		requests,
 		toolCalls: pendingTools.length,
+		unpricedRequests,
 		cwd,
 		title: slotTitle ?? headerTitle,
 		headerTs,
@@ -722,11 +760,13 @@ export async function buildSessionTrace(fileParam: string): Promise<SessionTrace
 	let requests = 0;
 	let totalTokens = 0;
 	let costTotal = 0;
+	let unpricedRequests = 0;
 	const toolStats = new Map<string, TraceToolStat>();
 
 	for (const scan of scans) {
 		requests += scan.requests;
 		toolCalls += scan.toolCalls;
+		unpricedRequests += scan.unpricedRequests;
 		for (const span of scan.track.spans) {
 			intervals.push([span.start, span.end]);
 			if (startedAt === undefined || span.start < startedAt) startedAt = span.start;
@@ -779,6 +819,7 @@ export async function buildSessionTrace(fileParam: string): Promise<SessionTrace
 		subagents: tracks.length - 1,
 		totalTokens,
 		costTotal,
+		unpricedRequests,
 		toolStats: [...toolStats.values()].sort((a, b) => b.totalMs - a.totalMs),
 	};
 
@@ -936,6 +977,7 @@ export async function listSessionSummaries(limit = 100, q?: string): Promise<Ses
 				subagents: 0,
 				totalTokens: 0,
 				costTotal: 0,
+				unpricedRequests: 0,
 				models: [],
 				modelSet: new Set(),
 			};
@@ -948,6 +990,7 @@ export async function listSessionSummaries(limit = 100, q?: string): Promise<Ses
 		if (row.endedAt > fold.endedAt) fold.endedAt = row.endedAt;
 		fold.totalTokens += row.totalTokens ?? 0;
 		fold.costTotal += row.costTotal ?? 0;
+		fold.unpricedRequests += row.unpricedRequests ?? 0;
 		if (row.models) {
 			for (const model of row.models.split(",")) {
 				if (model) fold.modelSet.add(model);
@@ -975,6 +1018,7 @@ export async function listSessionSummaries(limit = 100, q?: string): Promise<Ses
 			subagents: 0,
 			totalTokens: 0,
 			costTotal: 0,
+			unpricedRequests: 0,
 			models: [],
 			modelSet: new Set(),
 		});

package/src/types.ts

@@ -35,6 +35,26 @@ export interface MessageStats {
 	usage: Usage;
 	/** Which agent produced this message (main agent, task subagent, advisor) */
 	agentType: AgentType;
+	/**
+	 * Ingest refused to price this request: a scheduled (time-based) card with no
+	 * recoverable request timestamp, so `usage.cost.total` of 0 is unknown spend
+	 * rather than a free request. Always written by `rowToMessageStats`; optional
+	 * only because session fixtures that stand in for ingest input are typed as
+	 * `MessageStats` too.
+	 */
+	costUnpriced?: boolean;
+}
+
+/**
+ * Session-recorded token usage before pricing: counters are coerced to numbers
+ * because their columns are NOT NULL, but `cost` is only present when the
+ * session entry actually recorded one. Absence is meaningful — `resolveStoredCost`
+ * estimates a request with no recorded price, whereas a recorded zero is a real
+ * charge that scheduled cards freeze. `costUnpriced` is omitted because it is a
+ * decision of the ingest path, not something the parser or a caller supplies.
+ */
+export interface MessageStatsInput extends Omit<MessageStats, "usage" | "costUnpriced"> {
+	usage: Omit<Usage, "cost"> & { cost?: Partial<Usage["cost"]> };
 }
 
 /**