@oh-my-pi/omp-stats 18.10.2 → 18.10.4

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [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/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/omp-stats",
-	"version": "18.10.2",
+	"version": "18.10.4",
 	"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.2",
-		"@oh-my-pi/pi-catalog": "18.10.2",
-		"@oh-my-pi/pi-utils": "18.10.2",
+		"@oh-my-pi/pi-ai": "18.10.4",
+		"@oh-my-pi/pi-catalog": "18.10.4",
+		"@oh-my-pi/pi-utils": "18.10.4",
 		"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 [];
 	}