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

package/dist/types/client/data/formatters.d.ts

@@ -4,8 +4,13 @@ export declare function formatCompact(value: number): string;
 export declare function formatCost(value: number, digits?: number): string;
 /** Format an API-equivalent estimate, using N/A when all usage is unpriced. */
 export declare function formatEstimatedCost(value: number, unpricedRequests: number, digits?: number): string;
-/** Format one request's cost, distinguishing unpriced SuperGrok usage from free usage. */
-export declare function formatMessageCost(message: Pick<MessageStats, "provider" | "usage">, digits?: number): string;
+/**
+ * Format one request's cost, distinguishing unpriced usage from free usage.
+ * Mirrors the server's `unpricedRequestSql`: `xai-oauth` is billed through a
+ * subscription, and `costUnpriced` marks a row the ingest path could not price
+ * (a scheduled card with no recoverable request timestamp).
+ */
+export declare function formatMessageCost(message: Pick<MessageStats, "provider" | "usage" | "costUnpriced">, digits?: number): string;
 export declare function formatPercent(value: number, digits?: number): string;
 export declare function formatDurationMs(value: number | null, digits?: number): string;
 export declare function formatTokensPerSecond(value: number | null): string;

package/dist/types/client/types.d.ts

@@ -42,6 +42,8 @@ export interface MessageStats {
     stopReason: string;
     errorMessage: string | null;
     usage: Usage;
+    /** Ingest found no tariff to price this request from; its zero is unknown spend. */
+    costUnpriced?: boolean;
 }
 export interface RequestDetails extends MessageStats {
     messages: unknown[];

package/dist/types/db.d.ts

@@ -1,9 +1,11 @@
 import { Database } from "bun:sqlite";
-import type { AgentTypeStats, AggregatedStats, BehaviorModelStats, BehaviorOverallStats, BehaviorTimeSeriesPoint, CostTimeSeriesPoint, DailyActivityPoint, FolderStats, MessageStats, ModelPerformancePoint, ModelStats, ModelTimeSeriesPoint, ProviderAggregate, ProviderHourlyPoint, ProviderTimeSeriesPoint, TimeSeriesPoint, ToolCallStats, ToolModelStats, ToolResultLink, ToolTimeSeriesPoint, ToolUsageStats, UserMessageLink, UserMessageStats } from "./types.js";
+import type { AgentTypeStats, AggregatedStats, BehaviorModelStats, BehaviorOverallStats, BehaviorTimeSeriesPoint, CostTimeSeriesPoint, DailyActivityPoint, FolderStats, MessageStats, MessageStatsInput, ModelPerformancePoint, ModelStats, ModelTimeSeriesPoint, ProviderAggregate, ProviderHourlyPoint, ProviderTimeSeriesPoint, TimeSeriesPoint, ToolCallStats, ToolModelStats, ToolResultLink, ToolTimeSeriesPoint, ToolUsageStats, UserMessageLink, UserMessageStats } from "./types.js";
 /**
  * Initialize the database and create tables.
  */
 export declare function initDb(): Promise<Database>;
+/** Whether the catalog prices this model on a time-based (scheduled) card. */
+export declare function isScheduledCatalogModel(provider: string, modelId: string): boolean;
 /**
  * Get the stored offset for a session file.
  */
@@ -31,7 +33,7 @@ export declare function setFileOffset(sessionFile: string, offset: number, lastM
  * stored cost (orchestration-aware) and keeps `premium_requests` monotonic, so
  * a forced re-parse repairs historical `premium_requests` and cost fix-ups.
  */
-export declare function insertMessageStats(stats: MessageStats[]): number;
+export declare function insertMessageStats(stats: MessageStatsInput[]): number;
 /**
  * Get overall aggregated stats.
  */
@@ -98,6 +100,7 @@ export interface SessionRollupRow {
     endedAt: number;
     totalTokens: number;
     costTotal: number;
+    unpricedRequests: number;
     /** Comma-joined DISTINCT models. */
     models: string;
 }

package/dist/types/parser.d.ts

@@ -1,4 +1,4 @@
-import type { AgentType, MessageStats, SessionEntry, ToolCallStats, ToolResultLink, UserMessageLink, UserMessageStats } from "./types.js";
+import type { AgentType, MessageStatsInput, SessionEntry, ToolCallStats, ToolResultLink, UserMessageLink, UserMessageStats } from "./types.js";
 /**
  * Classify which agent produced a transcript from its path within the sessions
  * directory. Layout: `<sessionsDir>/<project>/<file>.jsonl` is the `main`
@@ -16,6 +16,32 @@ export declare function classifyAgentType(sessionPath: string): AgentType;
  * The folder part uses -- as path separator.
  */
 export declare function extractFolderFromPath(sessionPath: string): string;
+/**
+ * Token-bucket view for total derivation. Persisted session payloads are
+ * outside-controlled (old versions, foreign producers), so every counter is
+ * `unknown` and validated at read time.
+ */
+export interface UsageBucketView {
+    totalTokens?: unknown;
+    input?: unknown;
+    output?: unknown;
+    cacheRead?: unknown;
+    cacheWrite?: unknown;
+    orchestration?: {
+        input?: unknown;
+        output?: unknown;
+        cacheRead?: unknown;
+    } | null;
+}
+/**
+ * Total tokens for one usage payload, per the documented contract: the
+ * conversation buckets plus provider-reported orchestration tokens. A present
+ * finite provider total stays authoritative; a missing or malformed one
+ * (absent, string, NaN) is derived from the buckets, which would otherwise
+ * persist a zero total next to real token counts. Shared by ingest and the
+ * trace builder so stored and displayed totals cannot disagree.
+ */
+export declare function resolveUsageTotal(usage: UsageBucketView | null | undefined): number;
 /** Parse every well-formed entry in a transcript buffer (malformed lines skipped). */
 export declare function parseAllSessionEntries(bytes: Uint8Array): SessionEntry[];
 /**
@@ -35,7 +61,7 @@ export declare function parseAllSessionEntries(bytes: Uint8Array): SessionEntry[
  * entries, preserving offset-based memory behavior for large sessions.
  */
 export interface ParseSessionResult {
-    stats: MessageStats[];
+    stats: MessageStatsInput[];
     userStats: UserMessageStats[];
     userLinks: UserMessageLink[];
     toolCalls: ToolCallStats[];

package/dist/types/shared-types.d.ts

@@ -454,6 +454,8 @@ export interface SessionSummary {
     subagents: number;
     totalTokens: number;
     costTotal: number;
+    /** Requests whose zero cost is unknown spend (scheduled card, no timestamp). */
+    unpricedRequests: number;
     models: string[];
 }
 export type TraceSpanKind = "turn" | "model" | "tool" | "subagent" | "background";
@@ -533,6 +535,8 @@ export interface TraceSummary {
     subagents: number;
     totalTokens: number;
     costTotal: number;
+    /** Model requests whose zero cost is unknown spend, not free usage. */
+    unpricedRequests: number;
     /** Sorted totalMs desc. */
     toolStats: TraceToolStat[];
 }

package/dist/types/trace.d.ts

@@ -17,7 +17,7 @@ export declare class TracePathError extends Error {
  * span assembly changes so browsers don't revalidate stale cached bodies
  * against an unchanged transcript mtime.
  */
-export declare const TRACE_ETAG_VERSION = 2;
+export declare const TRACE_ETAG_VERSION = 3;
 /**
  * Assemble the full span tree for one root session transcript.
  * Throws {@link TracePathError} for paths outside the sessions root; ENOENT

package/dist/types/types.d.ts

@@ -33,6 +33,27 @@ 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"]>;
+    };
 }
 /**
  * Full details of a request, including content.

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/omp-stats",
-	"version": "18.1.16",
+	"version": "18.1.18",
 	"description": "Local observability dashboard for pi AI usage statistics",
 	"homepage": "https://omp.sh",
 	"author": "Stencil Labs, Inc.",
@@ -39,9 +39,9 @@
 		"fmt": "oxfmt --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts'"
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-ai": "18.1.16",
-		"@oh-my-pi/pi-catalog": "18.1.16",
-		"@oh-my-pi/pi-utils": "18.1.16",
+		"@oh-my-pi/pi-ai": "18.1.18",
+		"@oh-my-pi/pi-catalog": "18.1.18",
+		"@oh-my-pi/pi-utils": "18.1.18",
 		"@tailwindcss/node": "^4.3.2",
 		"chart.js": "^4.5.1",
 		"lucide-react": "^1.24.0",

package/src/client/data/formatters.ts

@@ -23,10 +23,22 @@ export function formatEstimatedCost(value: number, unpricedRequests: number, dig
 	return value === 0 && unpricedRequests > 0 ? "N/A" : formatCost(value, digits);
 }
 
-/** Format one request's cost, distinguishing unpriced SuperGrok usage from free usage. */
-export function formatMessageCost(message: Pick<MessageStats, "provider" | "usage">, digits?: number): string {
+/**
+ * Format one request's cost, distinguishing unpriced usage from free usage.
+ * Mirrors the server's `unpricedRequestSql`: `xai-oauth` is billed through a
+ * subscription, and `costUnpriced` marks a row the ingest path could not price
+ * (a scheduled card with no recoverable request timestamp).
+ */
+export function formatMessageCost(
+	message: Pick<MessageStats, "provider" | "usage" | "costUnpriced">,
+	digits?: number,
+): string {
 	const unpricedRequests =
-		message.provider === "xai-oauth" && message.usage.totalTokens > 0 && message.usage.cost.total === 0 ? 1 : 0;
+		message.usage.totalTokens > 0 &&
+		message.usage.cost.total === 0 &&
+		(message.provider === "xai-oauth" || message.costUnpriced === true)
+			? 1
+			: 0;
 	return formatEstimatedCost(message.usage.cost.total, unpricedRequests, digits);
 }
 

package/src/client/routes/TracesRoute.tsx

@@ -5,7 +5,7 @@
 
 import { useMemo, useState } from "react";
 import { getSessions } from "../api";
-import { formatCompact, formatCost, formatDurationMs, formatRelativeTime } from "../data/formatters";
+import { formatCompact, formatDurationMs, formatEstimatedCost, formatRelativeTime } from "../data/formatters";
 import { useResource } from "../data/useResource";
 import { TraceView } from "../traces/TraceView";
 import type { SessionSummary } from "../types";
@@ -110,7 +110,12 @@ export function TracesRoute({ active, session, onOpenSession, refreshTrigger }:
 				numeric: true,
 				render: (item: SessionSummary) => formatCompact(item.totalTokens),
 			},
-			{ key: "cost", header: "Cost", numeric: true, render: (item: SessionSummary) => formatCost(item.costTotal) },
+			{
+				key: "cost",
+				header: "Cost",
+				numeric: true,
+				render: (item: SessionSummary) => formatEstimatedCost(item.costTotal, item.unpricedRequests),
+			},
 			{ key: "models", header: "Models", render: (item: SessionSummary) => <ModelChips models={item.models} /> },
 		],
 		[],
@@ -138,7 +143,9 @@ export function TracesRoute({ active, session, onOpenSession, refreshTrigger }:
 				</div>
 				<div>
 					<div className="stats-mobile-card-label">Cost</div>
-					<div className="stats-mobile-card-value">{formatCost(item.costTotal)}</div>
+					<div className="stats-mobile-card-value">
+						{formatEstimatedCost(item.costTotal, item.unpricedRequests)}
+					</div>
 				</div>
 			</div>
 		</div>

package/src/client/traces/SummaryStrip.tsx

@@ -3,7 +3,7 @@
  * tool calls, agents, tokens, cost.
  */
 
-import { formatCompact, formatCost, formatDurationMs, formatInteger } from "../data/formatters";
+import { formatCompact, formatDurationMs, formatEstimatedCost, formatInteger } from "../data/formatters";
 import type { TraceSummary } from "../types";
 
 export interface SummaryStripProps {
@@ -21,7 +21,7 @@ export function SummaryStrip({ summary }: SummaryStripProps) {
 		{ label: "Tool Calls", value: formatInteger(summary.toolCalls) },
 		{ label: "Agents", value: formatInteger(summary.subagents) },
 		{ label: "Tokens", value: formatCompact(summary.totalTokens) },
-		{ label: "Cost", value: formatCost(summary.costTotal) },
+		{ label: "Cost", value: formatEstimatedCost(summary.costTotal, summary.unpricedRequests) },
 	];
 
 	return (

package/src/client/types.ts

@@ -54,6 +54,8 @@ export interface MessageStats {
 	stopReason: string;
 	errorMessage: string | null;
 	usage: Usage;
+	/** Ingest found no tariff to price this request from; its zero is unknown spend. */
+	costUnpriced?: boolean;
 }
 
 export interface RequestDetails extends MessageStats {