fix(codex): tokscale parity for token counts - max cached, clamped, reasoning split, stale

.github/pr-proof/3106-dashboard-snapshot.json

@@ -0,0 +1,147 @@
+{
+  "generatedAt" : "2026-08-23T05:39:37Z",
+  "host" : {
+    "codexBarVersion" : null,
+    "refreshIntervalSeconds" : 0
+  },
+  "providers" : [
+    {
+      "cost" : null,
+      "credits" : null,
+      "display" : {
+        "accentColor" : "#49A3B0",
+        "priority" : "normal",
+        "sortKey" : 0
+      },
+      "enabled" : true,
+      "error" : {
+        "code" : 1,
+        "kind" : "provider",
+        "message" : "Network error: The operation couldn’t be completed. Operation not permitted"
+      },
+      "id" : "codex",
+      "identity" : null,
+      "name" : "Codex",
+      "source" : "auto",
+      "status" : null,
+      "updatedAt" : "2026-08-23T05:39:36Z",
+      "windows" : [
+
+      ]
+    },
+    {
+      "cost" : null,
+      "credits" : null,
+      "display" : {
+        "accentColor" : "#3B82F6",
+        "priority" : "normal",
+        "sortKey" : 10
+      },
+      "enabled" : true,
+      "error" : null,
+      "id" : "opencodego",
+      "identity" : null,
+      "name" : "OpenCode Go",
+      "source" : "local",
+      "status" : null,
+      "updatedAt" : "2026-08-23T05:39:32Z",
+      "windows" : [
+        {
+          "kind" : "session",
+          "label" : "5-hour",
+          "remainingPercent" : 100,
+          "resetAt" : "2026-08-23T10:39:32Z",
+          "usedPercent" : 0
+        },
+        {
+          "kind" : "weekly",
+          "label" : "Weekly",
+          "remainingPercent" : 92.1,
+          "resetAt" : "2026-08-23T23:59:59Z",
+          "usedPercent" : 7.9
+        },
+        {
+          "kind" : "tertiary",
+          "label" : "Monthly",
+          "remainingPercent" : 96,
+          "resetAt" : "2026-09-20T04:11:23Z",
+          "usedPercent" : 4
+        }
+      ]
+    },
+    {
+      "cost" : null,
+      "credits" : null,
+      "display" : {
+        "accentColor" : "#60BA7E",
+        "priority" : "normal",
+        "sortKey" : 20
+      },
+      "enabled" : true,
+      "error" : {
+        "code" : 1,
+        "kind" : "provider",
+        "message" : "antigravity usage timed out"
+      },
+      "id" : "antigravity",
+      "identity" : null,
+      "name" : "Antigravity",
+      "source" : "auto",
+      "status" : null,
+      "updatedAt" : "2026-08-23T05:39:37Z",
+      "windows" : [
+
+      ]
+    },
+    {
+      "cost" : null,
+      "credits" : null,
+      "display" : {
+        "accentColor" : "#00BFA5",
+        "priority" : "normal",
+        "sortKey" : 30
+      },
+      "enabled" : true,
+      "error" : {
+        "code" : 1,
+        "kind" : "provider",
+        "message" : "The operation couldn’t be completed. Operation not permitted"
+      },
+      "id" : "cursor",
+      "identity" : null,
+      "name" : "Cursor",
+      "source" : "auto",
+      "status" : null,
+      "updatedAt" : "2026-08-23T05:39:37Z",
+      "windows" : [
+
+      ]
+    },
+    {
+      "cost" : null,
+      "credits" : null,
+      "display" : {
+        "accentColor" : "#527DF0",
+        "priority" : "normal",
+        "sortKey" : 40
+      },
+      "enabled" : true,
+      "error" : {
+        "code" : 1,
+        "kind" : "provider",
+        "message" : "The operation couldn’t be completed. Operation not permitted"
+      },
+      "id" : "deepseek",
+      "identity" : null,
+      "name" : "DeepSeek",
+      "source" : "auto",
+      "status" : null,
+      "updatedAt" : "2026-08-23T05:39:37Z",
+      "windows" : [
+
+      ]
+    }
+  ],
+  "schemaVersion" : 1,
+  "staleAfterSeconds" : 180
+}

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.54.2 — Unreleased
+
+- Fixed single-quota menu-bar icons understating remaining usage: a provider's only meaningful quota now renders as one prominent meter instead of half an icon next to a reserved empty lane, including when it arrives in the secondary slot (#3154, #3155). Thanks @akshayprabhu200!
+- Grok: report period-only CLI-proxy responses as unknown usage instead of 0% when Grok Build has hit its free limit, keeping identity and reset metadata (#3157, #3159). Thanks @anupamchugh!
+- OpenRouter: request the latest completed UTC day from the Activity API instead of the current date, fixing the HTTP 400 that suppressed spend history (#3133, #3138). Thanks @kiranmagic7!
+- Qwen Cloud: restored Brave browser support in cookie import (#3148). Thanks @umutkeltek!
+- CLI install: report success even when unrelated PATH directories are non-writable, while still listing genuine `codexbar` conflicts from earlier PATH entries (#3153). Thanks @yicone!
+
+- Fixed the Codex cost card blanking Today and recent days when priority processing is in use: row-ownership evidence now accepts the trace database's tier classification instead of discarding whole (day, model) groups (#3150). Thanks @olddonkey!
+- Stopped re-merging the Codex plan-utilization history with itself on every refresh and menu open — the legacy-bucket migration now runs only when a non-canonical bucket actually exists (#3141). Thanks @olddonkey!
+
 ## 0.54.1 — 2026-08-21
 
 ### Highlights

Sources/CodexBar/IconRenderer.swift

@@ -3,6 +3,23 @@ import CodexBarCore
 
 // swiftlint:disable:next type_body_length
 enum IconRenderer {
+    struct QuotaLayoutPolicy: Hashable {
+        let reservesMissingSecondaryLane: Bool
+        let treatsExhaustedSecondaryAsMissing: Bool
+
+        static func provider(_ provider: UsageProvider) -> Self {
+            let presentation = ProviderDescriptorRegistry.descriptor(for: provider).presentation
+            return Self(
+                reservesMissingSecondaryLane: presentation.reservesMissingSecondaryIconLane,
+                treatsExhaustedSecondaryAsMissing: presentation.treatsExhaustedSecondaryIconWindowAsMissing)
+        }
+
+        static func style(_ style: IconStyle) -> Self {
+            UsageProvider(rawValue: style.rawValue).map(self.provider)
+                ?? Self(reservesMissingSecondaryLane: false, treatsExhaustedSecondaryAsMissing: false)
+        }
+    }
+
     private static let creditsCap: Double = 1000
     private static let baseSize = NSSize(width: 18, height: 18)
     // Render to an 18×18 pt template (36×36 px at 2×) to match the system menu bar size.
@@ -28,6 +45,11 @@ enum IconRenderer {
 
     private static let grid = PixelGrid(scale: outputScale)
 
+    static func fillWidthPixels(remaining: Double, rectWidth: Int) -> Int {
+        let clamped = max(0, min(remaining / 100, 1))
+        return max(0, min(rectWidth, Int((CGFloat(rectWidth) * CGFloat(clamped)).rounded())))
+    }
+
     private struct IconCacheKey: Hashable {
         let primary: Int
         let weekly: Int
@@ -36,6 +58,7 @@ enum IconRenderer {
         let style: Int
         let indicator: Int
         let hideCritters: Bool
+        let quotaLayoutPolicy: QuotaLayoutPolicy
     }
 
     private final class IconCacheStore: @unchecked Sendable {
@@ -120,8 +143,10 @@ enum IconRenderer {
         wiggle: CGFloat = 0,
         tilt: CGFloat = 0,
         statusIndicator: ProviderStatusIndicator = .none,
-        hideCritters: Bool = false) -> NSImage
+        hideCritters: Bool = false,
+        quotaLayoutPolicy: QuotaLayoutPolicy? = nil) -> NSImage
     {
+        let quotaLayoutPolicy = quotaLayoutPolicy ?? .style(style)
         let shouldCache = blink <= 0.0001 && wiggle <= 0.0001 && tilt <= 0.0001
         let render = {
             self.renderImage {
@@ -178,8 +203,7 @@ enum IconRenderer {
 
                     // Fill: clip to the capsule and paint a left-to-right rect so the progress edge is straight.
                     if let remaining {
-                        let clamped = max(0, min(remaining / 100, 1))
-                        let fillWidthPx = max(0, min(rectPx.w, Int((CGFloat(rectPx.w) * CGFloat(clamped)).rounded())))
+                        let fillWidthPx = Self.fillWidthPixels(remaining: remaining, rectWidth: rectPx.w)
                         if fillWidthPx > 0 {
                             NSGraphicsContext.current?.cgContext.saveGState()
                             trackPath.addClip()
@@ -638,8 +662,7 @@ enum IconRenderer {
 
                 let providerPresentation = UsageProvider(rawValue: style.rawValue)
                     .map { ProviderDescriptorRegistry.descriptor(for: $0).presentation }
-                let usesMissingSecondaryLayout =
-                    providerPresentation?.treatsExhaustedSecondaryIconWindowAsMissing == true
+                let usesMissingSecondaryLayout = quotaLayoutPolicy.treatsExhaustedSecondaryAsMissing
                 let effectiveWeeklyRemaining: Double? = {
                     if usesMissingSecondaryLayout, let weeklyRemaining, weeklyRemaining <= 0 {
                         return nil
@@ -670,7 +693,22 @@ enum IconRenderer {
                 let twistFactory = decorations.contains(.factory)
                 let twistWarp = decorations.contains(.warp)
 
-                if weeklyAvailable {
+                if let bottomValue, bottomValue > 0, topValue == nil,
+                   !quotaLayoutPolicy.reservesMissingSecondaryLane,
+                   !usesMissingSecondaryLayout
+                {
+                    // Some providers surface their only meaningful quota in the secondary slot.
+                    drawBar(
+                        rectPx: creditsRectPx,
+                        remaining: bottomValue,
+                        addNotches: twistNotches,
+                        addFace: twistFace,
+                        addGeminiTwist: twistGemini,
+                        addAntigravityTwist: twistAntigravity,
+                        addFactoryTwist: twistFactory,
+                        addWarpTwist: twistWarp,
+                        blink: blink)
+                } else if weeklyAvailable {
                     // Normal: top=primary, bottom=secondary (bonus/weekly).
                     drawBar(
                         rectPx: topRectPx,
@@ -693,8 +731,6 @@ enum IconRenderer {
                             blink: blink)
                         drawBar(rectPx: bottomRectPx, remaining: nil, alpha: 0.45)
                     } else {
-                        // Weekly missing (e.g. Claude enterprise): keep normal layout but
-                        // dim the bottom track to indicate N/A.
                         if topValue == nil, let ratio = creditsRatio {
                             // Credits-only: show credits prominently (e.g. credits loaded before usage).
                             drawBar(
@@ -709,7 +745,22 @@ enum IconRenderer {
                                 addWarpTwist: twistWarp,
                                 blink: blink)
                             drawBar(rectPx: creditsBottomRectPx, remaining: nil, alpha: 0.45)
+                        } else if !quotaLayoutPolicy.reservesMissingSecondaryLane, let topValue {
+                            // One meaningful quota should read as one meter. Reserving an unavailable second
+                            // lane makes (for example) 46% remaining look like roughly 23% of the icon.
+                            drawBar(
+                                rectPx: creditsRectPx,
+                                remaining: topValue,
+                                addNotches: twistNotches,
+                                addFace: twistFace,
+                                addGeminiTwist: twistGemini,
+                                addAntigravityTwist: twistAntigravity,
+                                addFactoryTwist: twistFactory,
+                                addWarpTwist: twistWarp,
+                                blink: blink)
                         } else {
+                            // Missing secondary (for example Claude Enterprise): preserve the normal two-lane
+                            // layout and dim the unavailable lane.
                             drawBar(
                                 rectPx: topRectPx,
                                 remaining: topValue,
@@ -765,7 +816,8 @@ enum IconRenderer {
                 stale: stale,
                 style: self.styleKey(style),
                 indicator: self.indicatorKey(statusIndicator),
-                hideCritters: hideCritters)
+                hideCritters: hideCritters,
+                quotaLayoutPolicy: quotaLayoutPolicy)
             if let cached = self.cachedIcon(for: key) {
                 return cached
             }

Sources/CodexBar/MenuContent.swift

@@ -262,6 +262,7 @@ struct StatusIconView: View {
             stale: self.store.isStale(provider: self.provider),
             style: self.store.style(for: self.provider),
             statusIndicator: self.store.statusIndicator(for: self.provider),
-            hideCritters: self.store.settings.menuBarHidesCritters)
+            hideCritters: self.store.settings.menuBarHidesCritters,
+            quotaLayoutPolicy: .provider(self.provider))
     }
 }

Sources/CodexBar/PlanUtilizationHistoryStore.swift

@@ -40,6 +40,12 @@ struct PlanUtilizationSeriesHistory: Codable, Equatable, Sendable {
     let windowMinutes: Int
     let entries: [PlanUtilizationHistoryEntry]
 
+    private enum CodingKeys: String, CodingKey {
+        case name
+        case windowMinutes
+        case entries
+    }
+
     init(name: PlanUtilizationSeriesName, windowMinutes: Int, entries: [PlanUtilizationHistoryEntry]) {
         self.name = name
         self.windowMinutes = windowMinutes
@@ -56,6 +62,14 @@ struct PlanUtilizationSeriesHistory: Codable, Equatable, Sendable {
         }
     }
 
+    init(from decoder: any Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let name = try container.decode(PlanUtilizationSeriesName.self, forKey: .name)
+        let windowMinutes = try container.decode(Int.self, forKey: .windowMinutes)
+        let entries = try container.decode([PlanUtilizationHistoryEntry].self, forKey: .entries)
+        self.init(name: name, windowMinutes: windowMinutes, entries: entries)
+    }
+
     var latestCapturedAt: Date? {
         self.entries.last?.capturedAt
     }