From 46abd34444f620a75962626ba9b221c34797cee5 Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Fri, 23 Jan 2026 18:23:08 +0530
Subject: [PATCH] fix: base usage indicator on provider window limits

---
 apps/ui/src/components/usage-popover.tsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/ui/src/components/usage-popover.tsx b/apps/ui/src/components/usage-popover.tsx
index 5515d7af..e2991a1d 100644
--- a/apps/ui/src/components/usage-popover.tsx
+++ b/apps/ui/src/components/usage-popover.tsx
@@ -244,10 +244,19 @@ export function UsagePopover() {
     return 'bg-green-500';
   };
 
-  const codexWindowMinutes = codexUsage?.rateLimits?.primary?.windowDurationMins ?? null;
+  const codexPrimaryWindowMinutes = codexUsage?.rateLimits?.primary?.windowDurationMins ?? null;
+  const codexSecondaryWindowMinutes = codexUsage?.rateLimits?.secondary?.windowDurationMins ?? null;
+  const codexWindowMinutes =
+    codexSecondaryWindowMinutes && codexPrimaryWindowMinutes
+      ? Math.min(codexPrimaryWindowMinutes, codexSecondaryWindowMinutes)
+      : (codexSecondaryWindowMinutes ?? codexPrimaryWindowMinutes);
   const codexWindowLabel = codexWindowMinutes
     ? getCodexWindowLabel(codexWindowMinutes).title
     : 'Window';
+  const codexWindowUsage =
+    codexWindowMinutes === codexSecondaryWindowMinutes
+      ? codexUsage?.rateLimits?.secondary?.usedPercent
+      : codexUsage?.rateLimits?.primary?.usedPercent;
 
   // Determine which provider icon and percentage to show based on active tab
   const indicatorInfo =
@@ -260,7 +269,7 @@ export function UsagePopover() {
         }
       : {
           icon: OpenAIIcon,
-          percentage: codexMaxPercentage,
+          percentage: codexWindowUsage ?? 0,
           isStale: isCodexStale,
           title: `Usage (${codexWindowLabel})`,
         };