@oh-my-pi/omp-stats 18.10.3 → 18.11.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [18.11.0] - 2026-10-14
+
+### Fixed
+
+- Providers → Subscription windows no longer mixes Codex 5-hour and 7-day quotas across plans: Team and weekly-only (ProLite) accounts now share the 7-day row, the 5-hour row counts only accounts that have one, and labels no longer flip with whichever account reported last ([#15664](https://github.com/can1357/oh-my-pi/issues/15664))
+
+## [18.10.4] - 2026-10-13
+
+### Fixed
+
+- Usage recorded at $0 for a model whose catalog price changes on a date (Gemini 4 Argon, Devin SWE-2) is now priced at the rate in force on the request's date, instead of staying $0 like peak/off-peak tariff usage ([#15620](https://github.com/can1357/oh-my-pi/pull/15620) by [@eggpeat](https://github.com/eggpeat))
+
 ## [18.9.0] - 2026-10-11
 
 ### Fixed

package/dist/types/parser.d.ts

@@ -75,7 +75,17 @@ export declare function parseSessionFile(sessionPath: string, fromOffset?: numbe
  */
 export declare function listSessionFolders(): Promise<string[]>;
 /**
- * List all session files in a folder.
+ * Name prefix of the scratch directories `omp gc --compress` creates beside
+ * the files it copies on APFS. Their `.jsonl` files are transient copies of
+ * transcripts, never transcripts of their own; a killed run can leave one
+ * behind until the next `omp gc --compress --apply` removes it.
+ */
+export declare const COMPRESS_SCRATCH_PREFIX = ".omp-gc-compress-";
+/** Whether `relativePath` (from any ancestor directory) lies inside a compress scratch directory. */
+export declare function isCompressScratchPath(relativePath: string): boolean;
+/**
+ * List all session files in a folder, excluding copies inside
+ * `omp gc --compress` scratch directories.
  */
 export declare function listSessionFiles(folderPath: string): Promise<string[]>;
 /**

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

@@ -409,7 +409,7 @@ export interface UsageWindowSeries {
     accountKey: string;
     /** Email/account id when known, else the stable account key. */
     accountLabel: string;
-    /** Groups the same limit window across accounts (the provider limit id). */
+    /** Groups the same limit window across accounts: the limit id, or quota family + window for positional Codex slots. */
     windowKey: string;
     /** Human label of the limit (distinguishes same-duration windows). */
     windowLabel: string;
@@ -422,7 +422,7 @@ export interface UsageWindowSeries {
  */
 export interface ProviderWindowInsight {
     provider: string;
-    /** Groups the same limit window across accounts (the provider limit id). */
+    /** Groups the same limit window across accounts: the limit id, or quota family + window for positional Codex slots. */
     windowKey: string;
     /** Human label of the limit (distinguishes same-duration windows). */
     windowLabel: string;

package/dist/types/usage-windows.d.ts

@@ -57,10 +57,12 @@ export declare function sumFleetTokens(clients: ClientUsageClientSummary[]): Map
 /**
  * Derive utilization series and per-window insights from raw snapshots.
  *
- * Windows are grouped by `(provider, limitId)` — never by display label.
- * Distinct limits can share a duration label (Anthropic's overall and
- * model-scoped 7-day windows, Codex's base and Spark weeklies); merging them
- * interleaves unrelated fractions per account and wildly inflates consumption.
+ * Windows are grouped by `(provider, windowKeyOf(row))` — never by display
+ * label alone. Distinct limits can share a duration label (Anthropic's overall
+ * and model-scoped 7-day windows, Codex's base and Spark weeklies); merging
+ * them interleaves unrelated fractions per account and wildly inflates
+ * consumption. Conversely, one window reported under different positional
+ * slots by different accounts must merge (see {@link windowKeyOf}).
  *
  * `tokensByProvider` supplies each provider's token burn over the same time
  * range (fleet-wide broker client reports when available, else local message

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/omp-stats",
-	"version": "18.10.3",
+	"version": "18.11.0",
 	"description": "Local observability dashboard for omp AI usage statistics",
 	"homepage": "https://omp.sh",
 	"author": {
@@ -42,9 +42,9 @@
 		"fmt": "oxfmt --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts'"
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-ai": "18.10.3",
-		"@oh-my-pi/pi-catalog": "18.10.3",
-		"@oh-my-pi/pi-utils": "18.10.3",
+		"@oh-my-pi/pi-ai": "18.11.0",
+		"@oh-my-pi/pi-catalog": "18.11.0",
+		"@oh-my-pi/pi-utils": "18.11.0",
 		"lucide-react": "^1.24.0",
 		"react": "19.2.7",
 		"react-dom": "19.2.7"

package/src/db.ts

@@ -6,6 +6,7 @@ import {
 	calculateUsageCost,
 	type GeneratedProvider,
 	getBundledModel,
+	hasRecurringTariff,
 } from "@oh-my-pi/pi-catalog/models";
 import type { ModelCost } from "@oh-my-pi/pi-catalog/types";
 import { getConfigRootDir, getStatsDbPath, VERSION } from "@oh-my-pi/pi-utils";
@@ -463,9 +464,11 @@ function resolveStoredCost(stats: MessageStatsInput): ResolvedCost {
 	const storedCost = raw ? normalizeUsageCost(raw) : undefined;
 	const catalogCost = getCatalogCost(stats.provider, stats.model);
 
-	// Scheduled prices are frozen per request, including explicitly free usage.
-	// Preserve legacy zero-cost subscription correction for unscheduled models.
-	if (storedCost && Number.isFinite(storedCost.total) && (storedCost.total !== 0 || catalogCost?.timeBased)) {
+	// Recurring-tariff prices are frozen per request, including explicitly free
+	// usage. Preserve legacy zero-cost subscription correction for other models;
+	// dated rate cards reprice it at the card for the request's timestamp.
+	const recurring = catalogCost?.timeBased !== undefined && hasRecurringTariff(catalogCost.timeBased);
+	if (storedCost && Number.isFinite(storedCost.total) && (storedCost.total !== 0 || recurring)) {
 		return { cost: storedCost, unpriced: false };
 	}
 
@@ -528,12 +531,14 @@ function backfillMissingCatalogCosts(database: Database): void {
 	const applyBackfill = database.transaction(() => {
 		for (const row of rows) {
 			// A stored zero cannot distinguish missing historical prices from an
-			// explicitly free request. Never reprice recorded scheduled usage: a
-			// zero ingested for a scheduled card is permanent, because this
+			// explicitly free request. Never reprice recorded recurring-tariff
+			// usage: a zero ingested for such a card is permanent, because this
 			// backfill skips those rows. Re-parsing the session file is the only
 			// repair, and it works only once the entry's absent `cost` reaches
 			// `resolveStoredCost` as absence rather than as a synthesized zero.
-			if (getCatalogCost(row.provider, row.model)?.timeBased) continue;
+			// Dated rate cards need the row's timestamp to pick their card.
+			const schedule = getCatalogCost(row.provider, row.model)?.timeBased;
+			if (schedule && (hasRecurringTariff(schedule) || !hasRequestTimestamp(row.timestamp))) continue;
 			const cost = calculateCatalogCost(
 				row.provider,
 				row.model,

package/src/frustration.ts

@@ -19,6 +19,7 @@
 import { type Judge, judgeQuestions, type Model } from "@oh-my-pi/pi-ai";
 import { compareRevision, parseRevision } from "@oh-my-pi/pi-catalog/compat/revision";
 import { classifyModel } from "@oh-my-pi/pi-catalog/compat/taxonomy";
+import { getEffectiveTokenCost } from "@oh-my-pi/pi-catalog/models";
 import { logger } from "@oh-my-pi/pi-utils";
 import { getTimeRangeConfig } from "./aggregator";
 import {
@@ -214,8 +215,8 @@ export async function estimateFrustrationRun(range?: string | null): Promise<Fru
 	const { cutoff } = getTimeRangeConfig(range);
 	const { messages, chars } = getPendingFrustrationTotals(cutoff);
 	const inputTokens = messages * REQUEST_OVERHEAD_TOKENS + Math.ceil(chars / CHARS_PER_TOKEN);
-	const cost =
-		(inputTokens * model.cost.input) / 1e6 + (messages * OUTPUT_TOKENS_PER_REQUEST * model.cost.output) / 1e6;
+	const rates = getEffectiveTokenCost(model.cost);
+	const cost = (inputTokens * rates.input) / 1e6 + (messages * OUTPUT_TOKENS_PER_REQUEST * rates.output) / 1e6;
 	return { available: true, messages, chars, inputTokens, cost, judge: `${model.provider}/${model.id}` };
 }
 

package/src/live.ts

@@ -15,6 +15,7 @@ import * as path from "node:path";
 import { getSessionsDir, logger } from "@oh-my-pi/pi-utils";
 import { syncAllSessions } from "./aggregator";
 import { getDataVersion, initDb } from "./db";
+import { isCompressScratchPath } from "./parser";
 import { getRollupStatus, refreshRollups } from "./rollup";
 import type { LiveStatus, LiveSyncStatus } from "./shared-types";
 
@@ -231,7 +232,7 @@ export class StatsLive {
 		const pending = new Set<string>();
 		try {
 			this.#watcher = fs.watch(root, { recursive: true }, (_event, filename) => {
-				if (!filename?.endsWith(".jsonl")) return;
+				if (!filename?.endsWith(".jsonl") || isCompressScratchPath(filename)) return;
 				pending.add(path.join(root, filename));
 				clearTimeout(this.#debounceTimer ?? undefined);
 				this.#debounceTimer = setTimeout(() => {

package/src/parser.ts

@@ -672,12 +672,33 @@ export async function listSessionFolders(): Promise<string[]> {
 }
 
 /**
- * List all session files in a folder.
+ * Name prefix of the scratch directories `omp gc --compress` creates beside
+ * the files it copies on APFS. Their `.jsonl` files are transient copies of
+ * transcripts, never transcripts of their own; a killed run can leave one
+ * behind until the next `omp gc --compress --apply` removes it.
+ */
+export const COMPRESS_SCRATCH_PREFIX = ".omp-gc-compress-";
+
+/** Whether `relativePath` (from any ancestor directory) lies inside a compress scratch directory. */
+export function isCompressScratchPath(relativePath: string): boolean {
+	return relativePath.split(/[\\/]/).some(part => part.startsWith(COMPRESS_SCRATCH_PREFIX));
+}
+
+/**
+ * List all session files in a folder, excluding copies inside
+ * `omp gc --compress` scratch directories.
  */
 export async function listSessionFiles(folderPath: string): Promise<string[]> {
 	try {
 		const entries = await fs.readdir(folderPath, { recursive: true, withFileTypes: true });
-		return entries.filter(e => e.isFile() && e.name.endsWith(".jsonl")).map(e => path.join(e.parentPath, e.name));
+		return entries
+			.filter(
+				e =>
+					e.isFile() &&
+					e.name.endsWith(".jsonl") &&
+					!isCompressScratchPath(path.relative(folderPath, e.parentPath)),
+			)
+			.map(e => path.join(e.parentPath, e.name));
 	} catch {
 		return [];
 	}

package/src/shared-types.ts

@@ -438,7 +438,7 @@ export interface UsageWindowSeries {
 	accountKey: string;
 	/** Email/account id when known, else the stable account key. */
 	accountLabel: string;
-	/** Groups the same limit window across accounts (the provider limit id). */
+	/** Groups the same limit window across accounts: the limit id, or quota family + window for positional Codex slots. */
 	windowKey: string;
 	/** Human label of the limit (distinguishes same-duration windows). */
 	windowLabel: string;
@@ -452,7 +452,7 @@ export interface UsageWindowSeries {
  */
 export interface ProviderWindowInsight {
 	provider: string;
-	/** Groups the same limit window across accounts (the provider limit id). */
+	/** Groups the same limit window across accounts: the limit id, or quota family + window for positional Codex slots. */
 	windowKey: string;
 	/** Human label of the limit (distinguishes same-duration windows). */
 	windowLabel: string;

package/src/usage-windows.ts

@@ -241,13 +241,33 @@ function windowDisplayLabel(row: UsageSnapshotRow): string {
 	return `${label} · ${windowLabel}`;
 }
 
+/** Trailing limit-id segment naming the report slot a window arrived in, not the quota itself. */
+const POSITIONAL_SLOT = /:(?:primary|secondary)$/;
+
+/**
+ * Cross-account identity of one limit window: usually the limit id. Positional
+ * ids (Codex's `openai-codex:primary`) name a slot, not a window — a Team plan
+ * reports its 5-hour window as `primary` and its 7-day one as `secondary`,
+ * while a weekly-only plan reports its 7-day window as `primary`. For those,
+ * the quota family (the id minus the slot) plus the recorded window label is
+ * the identity, so both plans' weeklies share a group while Spark's
+ * (`openai-codex:spark:*`) stays apart. A row without a window label keeps its
+ * raw id rather than having its window guessed from the slot.
+ */
+function windowKeyOf(row: UsageSnapshotRow): string {
+	if (!row.windowLabel || !POSITIONAL_SLOT.test(row.limitId)) return row.limitId;
+	return `${row.limitId.replace(POSITIONAL_SLOT, "")}:${row.windowLabel}`;
+}
+
 /**
  * Derive utilization series and per-window insights from raw snapshots.
  *
- * Windows are grouped by `(provider, limitId)` — never by display label.
- * Distinct limits can share a duration label (Anthropic's overall and
- * model-scoped 7-day windows, Codex's base and Spark weeklies); merging them
- * interleaves unrelated fractions per account and wildly inflates consumption.
+ * Windows are grouped by `(provider, windowKeyOf(row))` — never by display
+ * label alone. Distinct limits can share a duration label (Anthropic's overall
+ * and model-scoped 7-day windows, Codex's base and Spark weeklies); merging
+ * them interleaves unrelated fractions per account and wildly inflates
+ * consumption. Conversely, one window reported under different positional
+ * slots by different accounts must merge (see {@link windowKeyOf}).
  *
  * `tokensByProvider` supplies each provider's token burn over the same time
  * range (fleet-wide broker client reports when available, else local message
@@ -262,12 +282,13 @@ export function computeUsageWindowStats(
 ): UsageWindowStats {
 	const groups = new Map<string, WindowGroup>();
 	for (const row of rows) {
-		const groupKey = `${row.provider}\u0000${row.limitId}`;
+		const windowKey = windowKeyOf(row);
+		const groupKey = `${row.provider}\u0000${windowKey}`;
 		let group = groups.get(groupKey);
 		if (!group) {
 			group = {
 				provider: row.provider,
-				windowKey: row.limitId,
+				windowKey,
 				windowLabel: windowDisplayLabel(row),
 				accounts: new Map(),
 			};