Skip to content
TypeScript

fix(web): rank usage provider summaries by the selected metric (#15632)

Dharmeshe9233b01bbbc
diff --git a/apps/web/src/components/usage/UsagePage.tsx b/apps/web/src/components/usage/UsagePage.tsx
index b4ec17a8940..2e7a4bd0143 100644
--- a/apps/web/src/components/usage/UsagePage.tsx
+++ b/apps/web/src/components/usage/UsagePage.tsx
@@ -100,7 +100,12 @@ import {
resolveUsageShortcut,
type UsageMetric,
} from "./usageShortcuts";
-import { PROVIDER_ORDER, PROVIDER_PRESENTATION, providersWithUsage } from "./usageProviders";
+import {
+ PROVIDER_ORDER,
+ PROVIDER_PRESENTATION,
+ providersWithUsage,
+ rankProvidersByMetric,
+} from "./usageProviders";
import {
readUsagePagePreferences,
saveUsagePagePreferences,
@@ -670,17 +675,18 @@ function UsageOverview({
(peak, model) => Math.max(peak, metric === "tokens" ? model.totalTokens : model.costUsd),
0,
);
+ const rankedProviders = rankProvidersByMetric(activeProviders, merged.providers, metric);
const cursorInsertAt =
- Math.max(activeProviders.indexOf("codex"), activeProviders.indexOf("claude")) + 1;
+ Math.max(rankedProviders.indexOf("codex"), rankedProviders.indexOf("claude")) + 1;
const summaryRows: ReadonlyArray<
| { readonly kind: "usage"; readonly provider: UsageProviderKind }
| { readonly kind: "enable"; readonly environment: EnvironmentUsageStatus }
> = [
- ...activeProviders
+ ...rankedProviders
.slice(0, cursorInsertAt)
.map((provider) => ({ kind: "usage" as const, provider })),
...cursorAccessEnvironments.map((environment) => ({ kind: "enable" as const, environment })),
- ...activeProviders
+ ...rankedProviders
.slice(cursorInsertAt)
.map((provider) => ({ kind: "usage" as const, provider })),
];
diff --git a/apps/web/src/components/usage/usageProviders.test.ts b/apps/web/src/components/usage/usageProviders.test.ts
new file mode 100644
index 00000000000..48e4545e805
--- /dev/null
+++ b/apps/web/src/components/usage/usageProviders.test.ts
@@ -0,0 +1,28 @@
+import { describe, expect, it } from "vite-plus/test";
+
+import { rankProvidersByMetric } from "./usageProviders";
+
+describe("rankProvidersByMetric", () => {
+ it("ranks by the selected metric, highest first", () => {
+ const totals = [
+ { provider: "codex" as const, totalTokens: 100, costUsd: 20 },
+ { provider: "claude" as const, totalTokens: 200, costUsd: 10 },
+ ];
+ const providers = ["codex", "claude"] as const;
+
+ expect(rankProvidersByMetric(providers, totals, "tokens")).toEqual(["claude", "codex"]);
+ expect(rankProvidersByMetric(providers, totals, "cost")).toEqual(["codex", "claude"]);
+ });
+
+ it("keeps ties in input order without reordering the shared provider list", () => {
+ const totals = [
+ { provider: "codex" as const, totalTokens: 10, costUsd: 1 },
+ { provider: "claude" as const, totalTokens: 10, costUsd: 1 },
+ { provider: "grok" as const, totalTokens: 20, costUsd: 2 },
+ ];
+ const providers = ["claude", "codex", "grok"] as const;
+
+ expect(rankProvidersByMetric(providers, totals, "tokens")).toEqual(["grok", "claude", "codex"]);
+ expect(providers).toEqual(["claude", "codex", "grok"]);
+ });
+});
diff --git a/apps/web/src/components/usage/usageProviders.ts b/apps/web/src/components/usage/usageProviders.ts
index 408327f3cc2..ba86171e87a 100644
--- a/apps/web/src/components/usage/usageProviders.ts
+++ b/apps/web/src/components/usage/usageProviders.ts
@@ -2,6 +2,8 @@ import type { UsageProviderKind } from "@t3tools/contracts";
import { ProviderDriverKind } from "@t3tools/contracts";
+import type { UsageMetric } from "./usageShortcuts";
+
type UsageProviderPresentation = {
readonly label: string;
readonly color: string;
@@ -63,3 +65,18 @@ export function providersWithUsage(
);
return PROVIDER_ORDER.filter((provider) => active.has(provider));
}
+
+export function rankProvidersByMetric(
+ providers: readonly UsageProviderKind[],
+ totals: readonly {
+ readonly provider: UsageProviderKind;
+ readonly costUsd: number;
+ readonly totalTokens: number;
+ }[],
+ metric: UsageMetric,
+): readonly UsageProviderKind[] {
+ const field = metric === "cost" ? "costUsd" : "totalTokens";
+ const value = (provider: UsageProviderKind) =>
+ totals.find((entry) => entry.provider === provider)?.[field] ?? 0;
+ return providers.toSorted((left, right) => value(right) - value(left));
+}