Fix automatic quota display priority for exhausted windows & Antigravity session preference - #2352
Conversation
clawsweeper
Bot
added
rating: 🦪 silver shellfish
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 39bcea869d
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| return self.mostConstrainedWindow( | ||
| primary: snapshot.primary, | ||
| secondary: snapshot.secondary, | ||
| tertiary: snapshot.tertiary) |
There was a problem hiding this comment.
When this returns an exhausted lane for default multi-window providers (for example Kimi weekly at 100% with the 5-hour lane still active, or LiteLLM personal at 100% with team budget still active), the merged "show highest usage" path calls this resolver in UsageStore+HighestUsage.swift:55 and then shouldExcludeFromHighestUsage drops any non-special provider with metricPercent >= 100 by falling through to return true at lines 71-126. That means the exact exhausted quota this change is meant to surface is hidden from the unified icon/rotation unless all lanes are exhausted; add all-lanes-exhausted handling for the newly generalized providers or avoid feeding partial 100% windows into that exclusion path.
Useful? React with 👍 / 👎.
| let numberText = String( | ||
| format: L("≈%d full 5h windows of weekly left · %d windows until reset"), | ||
| locale: codexBarLocalizedLocale(), |
There was a problem hiding this comment.
These strings are backed by Localizable.stringsdict entries with %#@...@ plural variables (en.lproj/Localizable.stringsdict:5-45). String.localizedStringWithFormat is the plural-aware path that expands those stringsdict variants; replacing it with plain String(format:locale:) no longer applies the singular/plural selections, so forecasts like 1 window regress from the expected singular text in SessionEquivalentForecastTests.swift:292-293 and localized plural forms are lost. Use a plural-aware formatting path while still controlling the app locale.
Useful? React with 👍 / 👎.
clawsweeper
Bot
added
rating: 🧂 unranked krab
|
Codex review: needs real behavior proof before merge. Reviewed July 21, 2026, 6:03 AM ET / 10:03 UTC. Summary Reviewed head: Reproducibility: yes. from source: configure Antigravity Automatic mode with Review metrics: 2 noteworthy metrics.
Merge readiness Overall follows the weaker of proof and patch quality, so missing proof can cap an otherwise strong patch. Rank-up moves:
Proof guidance:
Risk before merge
Maintainer options:
Copy recommended automerge instructionNext step before merge
Maintainer decision needed
Security Review findings
Review detailsBest possible solution: Keep the existing Antigravity preference effective unless a maintainer explicitly retires it with an upgrade path, derive labels from actual parsed cadence, and add focused regression coverage plus redacted after-fix runtime proof for exhausted-window selection and Antigravity display. Do we have a high-confidence way to reproduce the issue? Yes, from source: configure Antigravity Automatic mode with Is this the best way to solve the issue? No, not yet. The generic exhausted-window correction can remain, but silently making an existing Antigravity preference ineffective is not the narrowest compatible solution, and cadence-unknown quotas need neutral labeling. Full review comments:
Overall correctness: patch is incorrect AGENTS.md: found and applied where relevant. Codex review notes: model internal, reasoning high; reviewed against cc8da27cec92. Label changesLabel justifications:
Evidence reviewedWhat I checked:
Likely related people:
What the crustacean ranks mean
Shiny media proof means a screenshot, video, or linked artifact directly shows the changed behavior. Runtime, network, CSP, and security claims still need visible diagnostics. How this review workflow works
Review history (6 earlier review cycles)
|
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 289349ab10
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| let windows = [snapshot.primary, snapshot.secondary, snapshot.tertiary].compactMap(\.self) | ||
| if let exhausted = windows.filter({ $0.usedPercent >= 100 }).max(by: { $0.usedPercent < $1.usedPercent }) { | ||
| return exhausted |
There was a problem hiding this comment.
For default providers with independent lanes, such as Gemini's Pro/Flash/Flash Lite quotas, this exhausted-first branch now lets an exhausted lower-priority tertiary lane win automatic selection even though Gemini's automatic behavior is expected to stay on the primary lane (see StatusItemAnimationTests.swift:578-612, which only covers the 95% case). In merged-icon/highest-usage mode that chosen 100% metric then falls through to UsageStore+HighestUsage.swift:126 and excludes the provider entirely, so a user with Pro still usable but Flash Lite exhausted loses Gemini from the unified icon instead of seeing the usable primary quota; limit this default exhausted-first behavior to providers whose partial exhaustion is handled, or add matching all-lanes-exhausted exclusion logic.
Useful? React with 👍 / 👎.
7d2a263 to
5939580
Compare
Yuxin-Qiao
changed the title
|
@clawsweeper re-review |
|
🦞🧹 I asked ClawSweeper to review this item again. Re-review progress:
|
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 5939580582
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| let sessionWindows = usableWindows.filter { | ||
| $0.windowMinutes == Self.antigravitySessionCadence | ||
| } |
There was a problem hiding this comment.
When Antigravity has a usable 5-hour quota at 0% and a usable weekly quota at 99% with the default antigravityPrioritizeExhaustedQuotas == false, this new session-window preference makes the rendered automatic metric choose the 5-hour window. However UsageStore.menuBarMetricWindowForHighestUsage still calls its own unchanged Antigravity helper in Sources/CodexBar/UsageStore+HighestUsage.swift:41-139, which ranks the highest-used usable quota, so highest-usage mode can select Antigravity based on 99% weekly usage while the status item renders 0% 5-hour usage. Keep the ranking and rendering paths on the same resolver/rule so unified selection does not display a different quota than the one it selected.
Useful? React with 👍 / 👎.
|
@clawsweeper re-review |
|
🦞🧹 I asked ClawSweeper to review this item again. Re-review progress:
|
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 3a56c65ca6
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| ]]) | ||
| case .pace: | ||
| return MenuBarLayout(lines: [[icon, .runsOut]]) | ||
| return MenuBarLayout(lines: [[icon, .pacePercent]]) |
There was a problem hiding this comment.
When a provider cannot compute weeklyPace (missing weekly/reset metadata; the legacy .pace path explicitly falls back to the selected percent in MenuBarDisplayText.displayText), this migrated layout now renders only .pacePercent, whose renderer shows – when data.pacePercent is nil. If a legacy Pace user opens the layout editor or changes size/gap, that migration is persisted and the menu bar regresses from icon + quota percent to icon + placeholder for providers without pace data; keep the percent fallback when translating legacy .pace into a stored layout.
Useful? React with 👍 / 👎.
| let pacePercent = pace | ||
| .flatMap { MenuBarDisplayText.paceText(pace: $0) } |
There was a problem hiding this comment.
This new stored-layout value depends on weeklyPace, but storeIconObservationSignature() only signs the legacy menuBarDisplayText and cost tokens. For a user with a custom layout containing Pace % while the legacy display mode remains Percent, historicalPaceRevision changes wake the icon observer but the signature is unchanged, so updateIcons is skipped and the menu bar keeps showing the old pace value until some unrelated signed field changes; add a layout pace signature like the existing cost signature path.
Useful? React with 👍 / 👎.
|
@clawsweeper Simplified Antigravity logic: the menu bar now only tracks Gemini's quota (primary = 5h, secondary = weekly). Claude/GPT limits are kept parsed under extraRateWindows so they still render in the dropdown menu card. Removed over 1,100 lines of complex cross-family merging code. Ready for review. |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: eed654fe58
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| matching: { $0.lowercased().contains("claude") || $0.lowercased().contains("gpt") }, | ||
| in: namedWindows) | ||
| matching: { name in | ||
| name.lowercased().contains("gemini") |
There was a problem hiding this comment.
When the quota-summary payload contains both Gemini and Claude/GPT weekly buckets, this secondary representative now filters for Gemini again, even though Antigravity's metadata still labels the secondary lane as Claude and GPT (AntigravityProviderDescriptor.swift:12-13). That makes the menu/status surfaces show Gemini weekly usage under the Claude/GPT label and completely ignore a more constrained Claude/GPT quota; keep this predicate on the Claude/GPT family unless the rest of the UI is migrated to session/weekly semantics too.
Useful? React with 👍 / 👎.
| } | ||
| return windows.max(by: { $0.usedPercent < $1.usedPercent }) | ||
| // 2. Otherwise, fall back to the default order | ||
| return snapshot.primary ?? snapshot.secondary |
There was a problem hiding this comment.
For Antigravity local probes with only an unrecognized selectable text model, AntigravityStatusProbe still creates an antigravity-compact-fallback-* extra window, but after deleting the provider-specific branch this default fallback only returns snapshot.primary ?? snapshot.secondary. In that scenario both are nil, so Automatic produces no metric and the provider disappears from menu-bar/Overview ranking despite having usable quota data; include the compact fallback extra window before returning nil.
Useful? React with 👍 / 👎.
clawsweeper
Bot
added
rating: 🦪 silver shellfish
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: ec48432cfc
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| // Default path: | ||
| // 1. Prioritize any exhausted window (usedPercent >= 100) | ||
| let windows = [snapshot.primary, snapshot.secondary, snapshot.tertiary].compactMap(\.self) | ||
| if let exhausted = windows.filter({ $0.usedPercent >= 100 }).max(by: { $0.usedPercent < $1.usedPercent }) { |
There was a problem hiding this comment.
When Antigravity is in Automatic mode with the default antigravityPrioritizeExhaustedQuotas == false, this default branch is still reached and returns any 100% lane before the normal session/primary preference; the setting is no longer consulted. In accounts with one exhausted Antigravity lane and another still usable, the “Prioritize exhausted quotas” toggle now behaves as if it is always enabled for the menu bar and highest-usage ranking, so gate this exhausted-first return for Antigravity on the setting or restore the provider-specific non-exhausted selection.
Useful? React with 👍 / 👎.
| let pace = paceWindow | ||
| .flatMap { self.store.weeklyPace(provider: provider, window: $0, now: now) } | ||
| let runsOut = pace | ||
| .flatMap { UsagePaceText.weeklyDetail(provider: provider, pace: $0, now: now).rightLabel } | ||
| let pacePercent = pace |
There was a problem hiding this comment.
For stored layouts migrated from legacy Both/Pace with an explicit lane selection, this new Pace % value uses the shared pace computed from windows.weekly ?? windows.automatic, but legacy menuBarPaceWindow used the selected percent window for non-combined providers/modes. For example, Claude with Primary selected can keep showing the session percent while this token shows weekly pace instead of the selected session pace after the user opens/saves the layout editor; make the token carry the intended window or reuse the legacy pace-window resolver during migration/rendering.
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: d64334f000
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| let primary = primaryQuota.map(Self.rateWindow(for:)) | ||
| let secondary = secondaryQuota.map(Self.rateWindow(for:)) | ||
| let secondary: RateWindow? = nil |
There was a problem hiding this comment.
When a local Antigravity payload has no recognized Gemini quota but does include an unrecognized selectable text model plus any Claude/GPT quota, secondaryQuota is non-nil so the fallback guard above never sets compactFallbackModelID; this line then drops the Claude/GPT lane anyway. Since Claude/GPT is no longer rendered as a menu-bar lane, its presence suppresses the only compact fallback for new/unclassified local Gemini-style quotas, leaving automatic display with no usable primary/secondary metric.
Useful? React with 👍 / 👎.
| .percent(window: Self.percentWindow(for: metricPreference, provider: provider)), | ||
| .separatorDot, | ||
| .runsOut, | ||
| .pacePercent, |
There was a problem hiding this comment.
For legacy Both users whose provider cannot compute pace, persisting this migrated layout (for example via the layout editor or size/gap controls) renders the percent token and then .pacePercent, whose renderer falls back to the automatic percent when pace is nil. That changes the legacy fallback from a single quota like 42% to 42% · 42%; keep the pace fallback out of the sibling token or omit the separator/pace token when no pace is available.
Useful? React with 👍 / 👎.
0248f83 to
f1341f1
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 0248f836b7
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| displayName: "Antigravity", | ||
| sessionLabel: "Gemini Models", | ||
| weeklyLabel: "Claude and GPT", | ||
| sessionLabel: "Gemini 5-hour", |
There was a problem hiding this comment.
When Antigravity uses the remote/local modelQuotas path rather than quotaSummary, the primary window is built from a representative Gemini model with windowMinutes: nil in rateWindow(for:), but menu/card/widget fallback rendering titles that primary row from this metadata. This new label therefore shows a model-level Gemini quota as “Gemini 5-hour” even though no 5-hour cadence was parsed; keep a neutral label for non-quota-summary snapshots or derive the label from the window cadence.
Useful? React with 👍 / 👎.
f1341f1 to
94e168c
Compare
clawsweeper
Bot
added
rating: 🦪 silver shellfish
Co-authored-by: Yuxin Qiao <104957188+Yuxin-Qiao@users.noreply.github.com>
aaa268c to
da343ce
Compare
|
Merged after maintainer repair and exact-head verification. The final review found the generic exhausted-window priority fix sound once the change was reduced to the resolver and highest-usage ownership boundary. The existing default-off Antigravity “Prioritize exhausted quotas” preference remains effective for both disabled and enabled states, and cadence-unknown Antigravity model data keeps its neutral label. Verification on final head
Thank you, @Yuxin-Qiao, for identifying the exhausted-window problem and contributing the original implementation and tests. |
2 participants
Fix automatic quota display priority for exhausted windows & Simplify Antigravity to Gemini-only
Problem
1. Exhausted Quota Display (all default-path providers)
When a provider has multiple quota windows (e.g., weekly + 5-hour rate limit), the menu bar should display the exhausted window when any quota is used up. Instead, the default resolution logic (
snapshot.primary ?? snapshot.secondary) blindly returned the primary window if it existed, hiding an exhausted secondary window from the user.Example: Kimi's weekly quota is exhausted (0% remaining), but the menu bar still shows the 5-hour rate limit (96% remaining), misleading users into thinking they can still use the service.
2. Antigravity Quota Display Complexity
Previously, Antigravity attempted to merge, rank, and prioritize multiple distinct quota families (Gemini, Claude, GPT) across different cadences (5-hour session, weekly) within the unified menu bar icon and text.
This resulted in over 1,000 lines of complex special-case logic that:
Solution
Commit 1-3: Base fixes
usedPercent >= 100) first, then fall back tosnapshot.primary ?? snapshot.secondary. Custom overrides for Kimi/Factory/LiteLLM, Copilot, and MiniMax are fully preserved.UsagePaceText.swiftto usecodexBarLocalizedLocale()instead of implicitLocale.current.Commit 4-5: Simplify Antigravity to Gemini-Only
We realized that trying to merge multiple different model families in the menu bar was over-engineering. Users primarily use Antigravity for Gemini (the Claude/GPT quota is tiny and runs out instantly).
Thus, we made a major simplification:
extraRateWindows), so the user does not lose visibility.primary ?? secondary).This significantly reduces maintenance overhead and makes the menu bar behavior predictable and robust.
Provider Audit
Providers affected by default-path fix
Providers NOT affected (custom overrides preserved)
automaticPerplexityWindow()mostConstrainedWindowVerification Evidence
make test— 673/673 tests passed, 0 failures ✅make check— 0 violations ✅Files changed
Sources/CodexBarCore/Providers/Antigravity/AntigravityStatusProbe.swift— Directly maps Gemini 5-hour to primary and Gemini weekly to secondary.Sources/CodexBar/IconRemainingResolver.swift— Reverted custom Antigravity code and signature modifications.Sources/CodexBar/MenuBarMetricWindowResolver.swift— Removed all complex custom Antigravity ranking and helper methods.Sources/CodexBar/UsageStore+HighestUsage.swift— Reverted all custom Antigravity automatic metrics checks and static helpers.Tests/CodexBarTests/MenuBarMetricWindowResolverTests.swift&Tests/CodexBarTests/UsageStoreHighestUsageTests.swift&Tests/CodexBarTests/CodexbarTests.swift— Cleaned up obsolete Antigravity tests and added standard Gemini session vs weekly checks.