@linxiraos/pi-stats 1.2.0 → 1.3.0

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

@@ -5,7 +5,7 @@ export declare function getLocale(): StatsLocale;
 /** Install a locale by tag (`zh`, `zh-CN`, `zh-Hans`; anything else is English). */
 export declare function setLocale(tag: string | undefined | null): StatsLocale;
 /**
- * The locale to boot with: the host's language when `zeta-c stats` injected it,
+ * The locale to boot with: the host's language when `zetacode stats` injected it,
  * then the browser's own preference, then English.
  */
 export declare function resolveInitialLocale(): StatsLocale;

package/dist/types/client/i18n/messages/en.d.ts

@@ -217,7 +217,7 @@ export declare const enMessages: {
     readonly "providers.exhaustions-title": "Transitions into an exhausted state observed in range";
     readonly "providers.exhausted-n": "{count} exhausted";
     readonly "providers.no-snapshots-in-range": "No usage snapshots in this range";
-    readonly "providers.snapshot-hint": "Usage snapshots accumulate whenever usage limits are fetched (TUI footer, /usage, zeta-c usage).";
+    readonly "providers.snapshot-hint": "Usage snapshots accumulate whenever usage limits are fetched (TUI footer, /usage, zetacode usage).";
     readonly "providers.utilization": "Window utilization";
     readonly "providers.utilization-description": "{window} used fraction per account, {from} – {to}";
     readonly "providers.utilization-description-plain": "Recorded limit utilization per account";
@@ -846,7 +846,7 @@ export declare const enLocale: {
         readonly "providers.exhaustions-title": "Transitions into an exhausted state observed in range";
         readonly "providers.exhausted-n": "{count} exhausted";
         readonly "providers.no-snapshots-in-range": "No usage snapshots in this range";
-        readonly "providers.snapshot-hint": "Usage snapshots accumulate whenever usage limits are fetched (TUI footer, /usage, zeta-c usage).";
+        readonly "providers.snapshot-hint": "Usage snapshots accumulate whenever usage limits are fetched (TUI footer, /usage, zetacode usage).";
         readonly "providers.utilization": "Window utilization";
         readonly "providers.utilization-description": "{window} used fraction per account, {from} – {to}";
         readonly "providers.utilization-description-plain": "Recorded limit utilization per account";

package/dist/types/client/i18n/messages/providers.d.ts

@@ -56,7 +56,7 @@ export declare const providers: {
         readonly "providers.exhaustions-title": "Transitions into an exhausted state observed in range";
         readonly "providers.exhausted-n": "{count} exhausted";
         readonly "providers.no-snapshots-in-range": "No usage snapshots in this range";
-        readonly "providers.snapshot-hint": "Usage snapshots accumulate whenever usage limits are fetched (TUI footer, /usage, zeta-c usage).";
+        readonly "providers.snapshot-hint": "Usage snapshots accumulate whenever usage limits are fetched (TUI footer, /usage, zetacode usage).";
         readonly "providers.utilization": "Window utilization";
         readonly "providers.utilization-description": "{window} used fraction per account, {from} – {to}";
         readonly "providers.utilization-description-plain": "Recorded limit utilization per account";
@@ -124,7 +124,7 @@ export declare const providers: {
         readonly "providers.exhaustions-title": "该时间范围内观测到的进入耗尽状态的次数";
         readonly "providers.exhausted-n": "{count} 次耗尽";
         readonly "providers.no-snapshots-in-range": "该时间范围内没有用量快照";
-        readonly "providers.snapshot-hint": "每当获取用量限额时都会累积用量快照（TUI 底部、/usage、zeta-c usage）。";
+        readonly "providers.snapshot-hint": "每当获取用量限额时都会累积用量快照（TUI 底部、/usage、zetacode usage）。";
         readonly "providers.utilization": "窗口利用率";
         readonly "providers.utilization-description": "{window} 各账号的已用比例，{from} – {to}";
         readonly "providers.utilization-description-plain": "各账号已记录的限额利用率";

package/dist/types/index.d.ts

@@ -8,7 +8,7 @@ export { formatStatsDashboardUrl, type StartServerOptions, startServer } from ".
 export type { GainDashboardStats, GainSource, GainSourceTotals, GainTimeSeriesPoint } from "./shared-types.js";
 export type { AggregatedStats, DashboardStats, FolderStats, MessageStats, ModelPerformancePoint, ModelStats, ModelTimeSeriesPoint, TimeSeriesPoint, ToolDashboardStats, ToolModelStats, ToolTimeSeriesPoint, ToolUsageStats, } from "./types.js";
 /**
- * Print the dashboard summary to the console. Shared by `zeta-c stats --summary`
+ * Print the dashboard summary to the console. Shared by `zetacode stats --summary`
  * and the standalone `zeta-stats --sync`.
  */
 export declare function printStatsSummary(): Promise<void>;

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 `zetacode 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 `zetacode 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
+ * `zetacode gc --compress` scratch directories.
  */
 export declare function listSessionFiles(folderPath: string): Promise<string[]>;
 /**

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

@@ -416,7 +416,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;
@@ -429,7 +429,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": "@linxiraos/pi-stats",
-	"version": "1.2.0",
+	"version": "1.3.0",
 	"description": "Local observability dashboard for omp AI usage statistics",
 	"homepage": "https://linxira-os.github.io/zeta/",
 	"author": "Linxira-OS",
@@ -33,23 +33,23 @@
 		"build": "bun run build.ts",
 		"dev": "bun run src/index.ts",
 		"check": "oxlint . && oxfmt --check --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts' && bun run check:types",
-		"check:types": "tsgo -p tsconfig.json --noEmit && tsgo -p tsconfig.client.json --noEmit",
+		"check:types": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.client.json --noEmit",
 		"lint": "oxlint .",
 		"fix": "oxlint --fix --fix-suggestions . && bun run fmt",
 		"fmt": "oxfmt --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts'"
 	},
 	"dependencies": {
-		"@linxiraos/pi-ai": "1.2.0",
-		"@linxiraos/pi-catalog": "1.2.0",
-		"@linxiraos/pi-utils": "1.2.0",
+		"@linxiraos/pi-ai": "1.3.0",
+		"@linxiraos/pi-catalog": "1.3.0",
+		"@linxiraos/pi-utils": "1.3.0",
 		"lucide-react": "^1.24.0",
 		"react": "19.2.7",
 		"react-dom": "19.2.7"
 	},
 	"devDependencies": {
-		"@types/bun": "^1.3.14",
-		"@types/react": "^19.2.17",
-		"@types/react-dom": "^19.2.3"
+		"@types/bun": "1.4.3",
+		"@types/react": "19.3.0",
+		"@types/react-dom": "19.3.0"
 	},
 	"engines": {
 		"bun": ">=1.3.14"

package/src/client/i18n/index.ts

@@ -31,7 +31,7 @@ export function setLocale(tag: string | undefined | null): StatsLocale {
 }
 
 /**
- * The locale to boot with: the host's language when `zeta-c stats` injected it,
+ * The locale to boot with: the host's language when `zetacode stats` injected it,
  * then the browser's own preference, then English.
  */
 export function resolveInitialLocale(): StatsLocale {

package/src/client/i18n/messages/providers.ts

@@ -69,7 +69,7 @@ export const providers = {
 		"providers.exhausted-n": "{count} exhausted",
 		"providers.no-snapshots-in-range": "No usage snapshots in this range",
 		"providers.snapshot-hint":
-			"Usage snapshots accumulate whenever usage limits are fetched (TUI footer, /usage, zeta-c usage).",
+			"Usage snapshots accumulate whenever usage limits are fetched (TUI footer, /usage, zetacode usage).",
 		// ── window utilization card + accounts table ────────────────────────
 		"providers.utilization": "Window utilization",
 		"providers.utilization-description": "{window} used fraction per account, {from} – {to}",
@@ -146,7 +146,7 @@ export const providers = {
 		"providers.exhaustions-title": "该时间范围内观测到的进入耗尽状态的次数",
 		"providers.exhausted-n": "{count} 次耗尽",
 		"providers.no-snapshots-in-range": "该时间范围内没有用量快照",
-		"providers.snapshot-hint": "每当获取用量限额时都会累积用量快照（TUI 底部、/usage、zeta-c usage）。",
+		"providers.snapshot-hint": "每当获取用量限额时都会累积用量快照（TUI 底部、/usage、zetacode usage）。",
 		// ── window utilization card + accounts table ────────────────────────
 		"providers.utilization": "窗口利用率",
 		"providers.utilization-description": "{window} 各账号的已用比例，{from} – {to}",

package/src/client/routes/FrustrationRoute.tsx

@@ -197,7 +197,7 @@ interface JudgePanelProps {
 }
 
 const UNAVAILABLE_HINT =
-	"Judging needs the zeta host process: open the dashboard with zeta-c stats and configure a judge model. Until then messages are classified by regex signals.";
+	"Judging needs the zeta host process: open the dashboard with zetacode stats and configure a judge model. Until then messages are classified by regex signals.";
 
 function JudgePanel({ active, range, judgeAvailable, job, onRunStarted, onRunChanged }: JudgePanelProps) {
 	const [modalOpen, setModalOpen] = useState(false);

package/src/db.ts

@@ -1,11 +1,13 @@
 import { Database } from "bun:sqlite";
 import * as fs from "node:fs/promises";
 import type { ServiceTier, Usage } from "@linxiraos/pi-ai";
+import { pricingPeerFor } from "@linxiraos/pi-catalog/compat/behavior";
 import {
 	calculateUncachedInputCost,
 	calculateUsageCost,
 	type GeneratedProvider,
 	getBundledModel,
+	hasRecurringTariff,
 } from "@linxiraos/pi-catalog/models";
 import type { ModelCost } from "@linxiraos/pi-catalog/types";
 import { getConfigRootDir, getStatsDbPath, VERSION } from "@linxiraos/pi-utils";
@@ -395,9 +397,16 @@ function getCatalogCost(provider: string, modelId: string): ModelCost | null {
 		return primaryCost;
 	}
 
-	const fallbackProvider = provider === "openai-codex" ? "openai" : provider === "xai-oauth" ? "xai" : null;
-	if (fallbackProvider) {
-		const fallbackCost = getBundledModelCost(fallbackProvider, modelId);
+	// openai-codex has no catalog pricing-peer row (its bundled rows carry
+	// their own prices); keep its first-party fallback here.
+	const peer = pricingPeerFor(provider, modelId);
+	const fallbacks = peer
+		? peer.peers.map(peerProvider => [peerProvider, peer.peerId] as const)
+		: provider === "openai-codex"
+			? [["openai", modelId] as const]
+			: [];
+	for (const [fallbackProvider, fallbackId] of fallbacks) {
+		const fallbackCost = getBundledModelCost(fallbackProvider, fallbackId);
 		if (fallbackCost && hasBillableCost(fallbackCost)) {
 			return fallbackCost;
 		}
@@ -473,9 +482,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 };
 	}
 
@@ -538,12 +549,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 "@linxiraos/pi-ai";
 import { compareRevision, parseRevision } from "@linxiraos/pi-catalog/compat/revision";
 import { classifyModel } from "@linxiraos/pi-catalog/compat/taxonomy";
+import { getEffectiveTokenCost } from "@linxiraos/pi-catalog/models";
 import { logger } from "@linxiraos/pi-utils";
 import { getTimeRangeConfig } from "./aggregator";
 import {
@@ -78,7 +79,7 @@ const ATTEMPTS_PER_TEXT = 3;
 const CIRCUIT_BREAKER_FAILURES = 25;
 
 const NO_PROVIDER_REASON =
-	"This dashboard was started without a judge (standalone zetacode stats). Run `zeta-c stats` to classify.";
+	"This dashboard was started without a judge (standalone zetacode stats). Run `zetacode stats` to classify.";
 const NO_MODEL_REASON = "No judge model is available. Configure the `judge` model role.";
 
 let judgeProvider: StatsJudgeProvider | undefined;
@@ -216,8 +217,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/index.ts

@@ -48,7 +48,7 @@ function formatCost(n: number, unpricedRequests = 0): string {
 }
 
 /**
- * Print the dashboard summary to the console. Shared by `zeta-c stats --summary`
+ * Print the dashboard summary to the console. Shared by `zetacode stats --summary`
  * and the standalone `zeta-stats --sync`.
  */
 export async function printStatsSummary(): Promise<void> {

package/src/live.ts

@@ -15,6 +15,7 @@ import * as path from "node:path";
 import { getSessionsDir, logger } from "@linxiraos/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

@@ -687,12 +687,33 @@ export async function listSessionFolders(): Promise<string[]> {
 }
 
 /**
- * List all session files in a folder.
+ * Name prefix of the scratch directories `zetacode 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 `zetacode 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
+ * `zetacode 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/port-conflict.ts

@@ -11,8 +11,6 @@ const STATS_RUNTIME_IMAGES: Record<string, true> = {
 	bun: true,
 	node: true,
 	// Zeta runtime images: the compiled CLI and the standalone npm bin.
-	"zeta-c": true,
-	"zeta-cli": true,
 	zetacode: true,
 	"zeta-stats": true,
 	// Upstream OMP images kept so a leftover upstream dashboard is still reclaimable.
@@ -257,12 +255,9 @@ async function reclaimStatsPort(port: number, hasDashboardIdentity = false): Pro
 		normalizedImage === "omp-stats" ||
 		/(?:^|[/"'\s])(?:zeta|omp)-stats(?:\.exe)?(?:["'\s]|$)/.test(normalizedCommand) ||
 		/\/packages\/stats\/src\/index\.ts(?:["'\s]|$)/.test(normalizedCommand) ||
-		((normalizedImage === "zeta-c" ||
-			normalizedImage === "zeta-cli" ||
-			normalizedImage === "zetacode" ||
-			normalizedImage === "omp") &&
+		((normalizedImage === "zetacode" || normalizedImage === "omp") &&
 			/(?:^|\s)stats(?:\s|$)/.test(normalizedCommand)) ||
-		/(?:^|\/)(?:zeta-c|zeta-cli|zetacode|omp)(?:\.exe)?["'\s]+stats(?:["'\s]|$)/.test(normalizedCommand);
+		/(?:^|\/)(?:zetacode|omp)(?:\.exe)?["'\s]+stats(?:["'\s]|$)/.test(normalizedCommand);
 	if (!STATS_RUNTIME_IMAGES[normalizedImage] || (!hasStatsIdentity && !hasDashboardIdentity)) {
 		throw new Error(
 			`Port ${port} is in use by ${holder.image} (PID ${holder.pid}), which is not identifiable as a zetacode stats dashboard; refusing to stop it.`,

package/src/shared-types.ts

@@ -445,7 +445,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;
@@ -459,7 +459,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/trace.ts

@@ -11,6 +11,7 @@
 
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import { pricingPeerFor } from "@linxiraos/pi-catalog/compat/behavior";
 import { getBundledModel, type GeneratedProvider } from "@linxiraos/pi-catalog/models";
 import { getSessionsDir, isEnoent } from "@linxiraos/pi-utils";
 import { initDb, isScheduledCatalogModel } from "./db";
@@ -393,11 +394,13 @@ function scanTranscript(
 			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++;
-					}
+				const peer = provider && model ? pricingPeerFor(provider, model) : undefined;
+				if (peer) {
+					const priced = peer.peers.some(peerProvider => {
+						const ref = getBundledModel(peerProvider as GeneratedProvider, peer.peerId)?.cost;
+						return ref && (ref.input !== 0 || ref.output !== 0 || ref.cacheRead !== 0 || ref.cacheWrite !== 0);
+					});
+					if (!priced) unpricedRequests++;
 				} else if (costObj == null && provider && model) {
 					const hasTimestamp =
 						(typeof msg.timestamp === "number" && Number.isFinite(msg.timestamp) && msg.timestamp > 0) ||

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(),
 			};