Skip to content

Fix Antigravity model selection and placeholder quota display #536 #486 #577 #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skainguyen1412 wants to merge 4 commits into
base: main
Choose a base branch
from
+712 −68
Open

Fix Antigravity model selection and placeholder quota display #536 #486 #577 #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ebe92e
feat: refine Antigravity model usage calculation and menu card displa…
skainguyen1412 Mar 18, 2026
5be8634
Preserve Antigravity reset time at zero percent
skainguyen1412 Mar 18, 2026
c9e8647
Fix Antigravity used-mode placeholders
skainguyen1412 Mar 18, 2026
3b8b3c3
Handle filtered Antigravity quotas
skainguyen1412 Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 131 additions & 34 deletions Sources/CodexBar/MenuCardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,40 @@ struct UsageMenuCardView: View {
let title: String
let percent: Double
let percentStyle: PercentStyle
let statusText: String?
let resetText: String?
let detailText: String?
let detailLeftText: String?
let detailRightText: String?
let pacePercent: Double?
let paceOnTop: Bool

init(
id: String,
title: String,
percent: Double,
percentStyle: PercentStyle,
statusText: String? = nil,
resetText: String?,
detailText: String?,
detailLeftText: String?,
detailRightText: String?,
pacePercent: Double?,
paceOnTop: Bool)
{
self.id = id
self.title = title
self.percent = percent
self.percentStyle = percentStyle
self.statusText = statusText
self.resetText = resetText
self.detailText = detailText
self.detailLeftText = detailLeftText
self.detailRightText = detailRightText
self.pacePercent = pacePercent
self.paceOnTop = paceOnTop
}

var percentLabel: String {
String(format: "%.0f%% %@", self.percent, self.percentStyle.labelSuffix)
}
Expand Down Expand Up @@ -330,49 +357,56 @@ private struct MetricRow: View {
Text(self.title)
.font(.body)
.fontWeight(.medium)
UsageProgressBar(
percent: self.metric.percent,
tint: self.progressColor,
accessibilityLabel: self.metric.percentStyle.accessibilityLabel,
pacePercent: self.metric.pacePercent,
paceOnTop: self.metric.paceOnTop)
VStack(alignment: .leading, spacing: 2) {
HStack(alignment: .firstTextBaseline) {
Text(self.metric.percentLabel)
.font(.footnote)
.lineLimit(1)
Spacer()
if let rightLabel = self.metric.resetText {
Text(rightLabel)
if let statusText = self.metric.statusText {
Text(statusText)
.font(.footnote)
.foregroundStyle(MenuHighlightStyle.secondary(self.isHighlighted))
.lineLimit(1)
} else {
UsageProgressBar(
percent: self.metric.percent,
tint: self.progressColor,
accessibilityLabel: self.metric.percentStyle.accessibilityLabel,
pacePercent: self.metric.pacePercent,
paceOnTop: self.metric.paceOnTop)
VStack(alignment: .leading, spacing: 2) {
HStack(alignment: .firstTextBaseline) {
Text(self.metric.percentLabel)
.font(.footnote)
.foregroundStyle(MenuHighlightStyle.secondary(self.isHighlighted))
.lineLimit(1)
}
}
if self.metric.detailLeftText != nil || self.metric.detailRightText != nil {
HStack(alignment: .firstTextBaseline) {
if let detailLeft = self.metric.detailLeftText {
Text(detailLeft)
.font(.footnote)
.foregroundStyle(MenuHighlightStyle.primary(self.isHighlighted))
.lineLimit(1)
}
Spacer()
if let detailRight = self.metric.detailRightText {
Text(detailRight)
if let rightLabel = self.metric.resetText {
Text(rightLabel)
.font(.footnote)
.foregroundStyle(MenuHighlightStyle.secondary(self.isHighlighted))
.lineLimit(1)
}
}
if self.metric.detailLeftText != nil || self.metric.detailRightText != nil {
HStack(alignment: .firstTextBaseline) {
if let detailLeft = self.metric.detailLeftText {
Text(detailLeft)
.font(.footnote)
.foregroundStyle(MenuHighlightStyle.primary(self.isHighlighted))
.lineLimit(1)
}
Spacer()
if let detailRight = self.metric.detailRightText {
Text(detailRight)
.font(.footnote)
.foregroundStyle(MenuHighlightStyle.secondary(self.isHighlighted))
.lineLimit(1)
}
}
}
}
.frame(maxWidth: .infinity, alignment: .leading)
if let detail = self.metric.detailText {
Text(detail)
.font(.footnote)
.foregroundStyle(MenuHighlightStyle.secondary(self.isHighlighted))
.lineLimit(1)
}
}
.frame(maxWidth: .infinity, alignment: .leading)
if let detail = self.metric.detailText {
Text(detail)
.font(.footnote)
.foregroundStyle(MenuHighlightStyle.secondary(self.isHighlighted))
.lineLimit(1)
}
}
.frame(maxWidth: .infinity, alignment: .leading)
Expand Down Expand Up @@ -898,6 +932,9 @@ extension UsageMenuCardView.Model {

private static func metrics(input: Input) -> [Metric] {
guard let snapshot = input.snapshot else { return [] }
if input.provider == .antigravity {
return Self.antigravityMetrics(input: input, snapshot: snapshot)
}
var metrics: [Metric] = []
let percentStyle: PercentStyle = input.usageBarsShowUsed ? .used : .left
let zaiUsage = input.provider == .zai ? snapshot.zaiUsage : nil
Expand Down Expand Up @@ -1013,6 +1050,66 @@ extension UsageMenuCardView.Model {
return metrics
}

private static func antigravityMetrics(input: Input, snapshot: UsageSnapshot) -> [Metric] {
let percentStyle: PercentStyle = input.usageBarsShowUsed ? .used : .left
return [
Self.antigravityMetric(
id: "primary",
title: input.metadata.sessionLabel,
window: snapshot.primary,
input: input,
percentStyle: percentStyle),
Self.antigravityMetric(
id: "secondary",
title: input.metadata.weeklyLabel,
window: snapshot.secondary,
input: input,
percentStyle: percentStyle),
Self.antigravityMetric(
id: "tertiary",
title: input.metadata.opusLabel ?? "Gemini Flash",
window: snapshot.tertiary,
input: input,
percentStyle: percentStyle),
]
}

private static func antigravityMetric(
id: String,
title: String,
window: RateWindow?,
input: Input,
percentStyle: PercentStyle) -> Metric
{
guard let window else {
let placeholderPercent = input.usageBarsShowUsed ? 100.0 : 0.0
return Metric(
id: id,
title: title,
percent: placeholderPercent,
percentStyle: percentStyle,
statusText: nil,
resetText: nil,
detailText: nil,
detailLeftText: nil,
detailRightText: nil,
pacePercent: nil,
paceOnTop: true)
}
let percent = input.usageBarsShowUsed ? window.usedPercent : window.remainingPercent
return Metric(
id: id,
title: title,
percent: Self.clamped(percent),
percentStyle: percentStyle,
resetText: Self.resetText(for: window, style: input.resetTimeDisplayStyle, now: input.now),
detailText: nil,
detailLeftText: nil,
detailRightText: nil,
pacePercent: nil,
paceOnTop: true)
}

private static func zaiLimitDetailText(limit: ZaiLimitEntry?) -> String? {
guard let limit else { return nil }

Expand Down
3 changes: 3 additions & 0 deletions Sources/CodexBar/Providers/Antigravity/AntigravityProviderImplementation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ struct AntigravityProviderImplementation: ProviderImplementation {
await AntigravityStatusProbe.detectVersion()
}

@MainActor
func appendUsageMenuEntries(context _: ProviderMenuUsageContext, entries _: inout [ProviderMenuEntry]) {}

@MainActor
func runLoginFlow(context: ProviderLoginContext) async -> Bool {
await context.controller.runAntigravityLoginFlow()
Expand Down
Loading