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

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [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

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.4",
+	"version": "18.11.1",
 	"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.4",
-		"@oh-my-pi/pi-catalog": "18.10.4",
-		"@oh-my-pi/pi-utils": "18.10.4",
+		"@oh-my-pi/pi-ai": "18.11.1",
+		"@oh-my-pi/pi-catalog": "18.11.1",
+		"@oh-my-pi/pi-utils": "18.11.1",
 		"lucide-react": "^1.24.0",
 		"react": "19.2.7",
 		"react-dom": "19.2.7"

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