Add Antigravity agy CLI fallback (#1313)

* Add Antigravity CLI usage source

* Fix Antigravity session record ownership

* Scope ambient Antigravity probes to selected account

In auto mode the local desktop and agy CLI probes report whichever account is signed into the local session, which can differ from a selected token account. Validate ambient snapshots against the selected account's identity and fall through to the account-scoped OAuth fetch on mismatch. Explicit cli/oauth source modes stay authoritative.

* Scope desktop-local probe to IDE-only, keep serve agy session warm, add serve last-good cache

Fixes three flakiness sources in the Antigravity pipeline and codexbar serve:

1. Desktop-local probe attached to any Antigravity process, including the
   agy CLI language server owned by AntigravityCLIHTTPSFetchStrategy. A
   stale/initializing agy accepts the connection but fails GetUserStatus,
   burning the probe timeout before the CLI strategy's readiness loop runs.
   Add AntigravityStatusProbe.ProcessScope and scope the local strategy to
   .ideOnly; it now only handles the running-desktop case and otherwise
   fails over to the CLI strategy. isRunning() keeps .ideAndCLI for status.

2. codexbar serve reset the warm agy session after every refresh because
   shouldResetSessionAfterFetch keyed only on runtime == .cli, which serve
   shares with one-shot CLI usage. Every 60s poll cold-started agy and
   raced its readiness deadline, timing out. Add
   ProviderFetchContext.persistsCLISessions (set true by serve via
   UsageCommandContext.persistCLISessions); shouldResetSessionAfterFetch
   now keeps the warm session for long-lived hosts and resets only for
   one-shot CLI. The 180s session idle window covers the 60s refresh.

3. serve discarded the last good payload on transient failures.
   CLIServeResponseCache now records the last good response per key and
   serves it for failed refreshes, bounded by serveStaleTTL (ten refresh
   intervals, five-minute floor; disabled when --refresh-interval 0).

Tests: probe ideOnly scope (2), serve last-good fallback + TTL bounds (2),
session reset honors persistsCLISessions (extended).

* fix: harden Antigravity CLI fallback

* fix: harden Antigravity helper process isolation

* fix: prevent hidden Antigravity sign-in flows

* fix: merge serve stale usage per account

* Mark unknown Antigravity model usage

* fix: render unknown Antigravity usage safely

* fix: preserve Antigravity reset causes

* fix: isolate CLI usage fallback by account

* ci: refresh exact-head checks

* fix: harden Antigravity fallback integration

* fix: gate Antigravity CLI fallback on Linux

* fix: preserve Antigravity plan debug session

* fix: clean up CLI helpers on termination

* refactor: split TTY shutdown helpers

---------

Co-authored-by: Peter Steinberger <steipete@gmail.com>

Author: enieuwy

CHANGELOG.md

@@ -13,6 +13,7 @@
 - Menu bar: reserve quota-bar space consistently across Overview and provider switcher segments so selection no longer changes segment height (#1445). Thanks @Zihao-Qi!
 - Cost usage: accept normal models.dev catalog churn while retaining prior model prices as fallbacks, so newly priced models appear without requiring a manual cache reset (#1438). Thanks @tom-rigelblu!
 - Menu bar: anchor merged provider dropdowns to the status item's trailing edge without marking preserved in-flight refresh content fresh, preventing horizontal drift while keeping deferred updates visible (#1288). Thanks @Yuxin-Qiao!
+- Antigravity: fall back to the CLI usage server when the desktop app is closed, keep helper sessions owned and bounded without hidden sign-in flows, and show model rows with missing usage as unavailable instead of exhausted (#1313). Thanks @enieuwy!
 - Cost usage: replace repeated Foundation metadata/root checks with one portable file-stat pass so expired Codex history refreshes stay responsive on very large session archives (#1392). Thanks @TheAngryPit and @ProspectOre!
 - Cursor: show the Safari Full Disk Access recovery hint before the long browser login list so permission guidance remains visible when menu errors truncate (#1419, fixes #1417). Thanks @hhh2210!
 - Cursor: present legacy request-based plans as one Requests quota with the raw used/limit count instead of unrelated token-based Auto/API bars (#1420, fixes #1418). Thanks @hhh2210!

Sources/CodexBar/MenuCardView+ModelHelpers.swift

@@ -211,6 +211,18 @@ extension UsageMenuCardView.Model {
                 provider: input.provider,
                 window: namedWindow.window,
                 input: input)
+            let usageKnown = namedWindow.usageKnown
+            let resetText = Self.resetText(
+                for: namedWindow.window,
+                style: input.resetTimeDisplayStyle,
+                now: input.now)
+            let statusText: String? = if usageKnown {
+                nil
+            } else if let resetText {
+                "\(L("Unavailable")) - \(resetText)"
+            } else {
+                L("Unavailable")
+            }
             return Metric(
                 id: namedWindow.id,
                 title: namedWindow.title,
@@ -219,14 +231,12 @@ extension UsageMenuCardView.Model {
                         ? namedWindow.window.usedPercent
                         : namedWindow.window.remainingPercent),
                 percentStyle: percentStyle,
-                resetText: Self.resetText(
-                    for: namedWindow.window,
-                    style: input.resetTimeDisplayStyle,
-                    now: input.now),
+                statusText: statusText,
+                resetText: usageKnown ? resetText : nil,
                 detailText: nil,
-                detailLeftText: paceDetail?.leftLabel,
-                detailRightText: paceDetail?.rightLabel,
-                pacePercent: paceDetail?.pacePercent,
+                detailLeftText: usageKnown ? paceDetail?.leftLabel : nil,
+                detailRightText: usageKnown ? paceDetail?.rightLabel : nil,
+                pacePercent: usageKnown ? paceDetail?.pacePercent : nil,
                 paceOnTop: paceDetail?.paceOnTop ?? true)
         }
     }

Sources/CodexBar/PreferencesProviderDetailView.swift

@@ -1,6 +1,11 @@
 import CodexBarCore
 import SwiftUI
 
+enum ProviderMetricInlinePresentation: Equatable {
+    case progress
+    case status(String)
+}
+
 @MainActor
 struct ProviderDetailView<SupplementaryContent: View>: View {
     let provider: UsageProvider
@@ -63,6 +68,15 @@ struct ProviderDetailView<SupplementaryContent: View>: View {
         L(UsageMenuCardView.popupMetricTitle(provider: provider, metric: metric))
     }
 
+    static func metricInlinePresentation(
+        _ metric: UsageMenuCardView.Model.Metric) -> ProviderMetricInlinePresentation
+    {
+        if let statusText = metric.statusText {
+            return .status(statusText)
+        }
+        return .progress
+    }
+
     static func planRow(provider: UsageProvider, planText: String?) -> (label: String, value: String)? {
         guard let rawPlan = planText?.trimmingCharacters(in: .whitespacesAndNewlines),
               !rawPlan.isEmpty
@@ -455,50 +469,57 @@ private struct ProviderMetricInlineRow: View {
                 .frame(width: self.labelWidth, alignment: .leading)
 
             VStack(alignment: .leading, spacing: 4) {
-                UsageProgressBar(
-                    percent: self.metric.percent,
-                    tint: self.progressColor,
-                    accessibilityLabel: self.metric.percentStyle.accessibilityLabel,
-                    pacePercent: self.metric.pacePercent,
-                    paceOnTop: self.metric.paceOnTop,
-                    warningMarkerPercents: self.metric.warningMarkerPercents)
-                    .frame(minWidth: ProviderSettingsMetrics.metricBarWidth, maxWidth: .infinity)
-
-                HStack(alignment: .firstTextBaseline, spacing: 8) {
-                    Text(self.metric.percentLabel)
+                switch ProviderDetailView<EmptyView>.metricInlinePresentation(self.metric) {
+                case let .status(statusText):
+                    Text(statusText)
                         .font(.footnote)
                         .foregroundStyle(.secondary)
-                        .monospacedDigit()
-                    Spacer(minLength: 8)
-                    if let resetText = self.metric.resetText, !resetText.isEmpty {
-                        Text(resetText)
-                            .font(.footnote)
-                            .foregroundStyle(.secondary)
-                    }
-                }
+                case .progress:
+                    UsageProgressBar(
+                        percent: self.metric.percent,
+                        tint: self.progressColor,
+                        accessibilityLabel: self.metric.percentStyle.accessibilityLabel,
+                        pacePercent: self.metric.pacePercent,
+                        paceOnTop: self.metric.paceOnTop,
+                        warningMarkerPercents: self.metric.warningMarkerPercents)
+                        .frame(minWidth: ProviderSettingsMetrics.metricBarWidth, maxWidth: .infinity)
 
-                let hasLeftDetail = self.metric.detailLeftText?.isEmpty == false
-                let hasRightDetail = self.metric.detailRightText?.isEmpty == false
-                if hasLeftDetail || hasRightDetail {
                     HStack(alignment: .firstTextBaseline, spacing: 8) {
-                        if let leftDetail = self.metric.detailLeftText, !leftDetail.isEmpty {
-                            Text(leftDetail)
-                                .font(.footnote)
-                                .foregroundStyle(.secondary)
-                        }
+                        Text(self.metric.percentLabel)
+                            .font(.footnote)
+                            .foregroundStyle(.secondary)
+                            .monospacedDigit()
                         Spacer(minLength: 8)
-                        if let rightDetail = self.metric.detailRightText, !rightDetail.isEmpty {
-                            Text(rightDetail)
+                        if let resetText = self.metric.resetText, !resetText.isEmpty {
+                            Text(resetText)
                                 .font(.footnote)
                                 .foregroundStyle(.secondary)
                         }
                     }
-                }
 
-                if let detail = self.detailText, !detail.isEmpty {
-                    Text(detail)
-                        .font(.footnote)
-                        .foregroundStyle(.tertiary)
+                    let hasLeftDetail = self.metric.detailLeftText?.isEmpty == false
+                    let hasRightDetail = self.metric.detailRightText?.isEmpty == false
+                    if hasLeftDetail || hasRightDetail {
+                        HStack(alignment: .firstTextBaseline, spacing: 8) {
+                            if let leftDetail = self.metric.detailLeftText, !leftDetail.isEmpty {
+                                Text(leftDetail)
+                                    .font(.footnote)
+                                    .foregroundStyle(.secondary)
+                            }
+                            Spacer(minLength: 8)
+                            if let rightDetail = self.metric.detailRightText, !rightDetail.isEmpty {
+                                Text(rightDetail)
+                                    .font(.footnote)
+                                    .foregroundStyle(.secondary)
+                            }
+                        }
+                    }
+
+                    if let detail = self.detailText, !detail.isEmpty {
+                        Text(detail)
+                            .font(.footnote)
+                            .foregroundStyle(.tertiary)
+                    }
                 }
             }
             .frame(maxWidth: .infinity, alignment: .leading)

Sources/CodexBar/ProviderRegistry.swift

@@ -81,14 +81,21 @@ struct ProviderRegistry {
                                 }
                             }
                         },
-                        costUsageHistoryDays: settings.costUsageHistoryDays)
+                        costUsageHistoryDays: settings.costUsageHistoryDays,
+                        persistsCLISessions: true,
+                        persistentCLISessionIdleWindow: Self.persistentCLISessionIdleWindow(
+                            refreshInterval: settings.refreshFrequency.seconds))
                 })
             specs[provider] = spec
         }
 
         return specs
     }
 
+    static func persistentCLISessionIdleWindow(refreshInterval: TimeInterval?) -> TimeInterval {
+        max(180, (refreshInterval ?? 120) + 60)
+    }
+
     @MainActor
     static func makeSettingsSnapshot(
         settings: SettingsStore,

Sources/CodexBar/Providers/Antigravity/AntigravityProviderImplementation.swift

@@ -42,7 +42,7 @@ struct AntigravityProviderImplementation: ProviderImplementation {
             ProviderSettingsPickerDescriptor(
                 id: "antigravity-usage-source",
                 title: "Usage source",
-                subtitle: "Auto uses the local IDE API first, then Google OAuth when the IDE is closed.",
+                subtitle: "Auto uses the desktop local API first, then agy CLI, then Google OAuth.",
                 binding: usageBinding,
                 options: usageOptions,
                 isVisible: nil,

Sources/CodexBar/UsageStore+HighestUsage.swift

@@ -9,8 +9,10 @@ extension UsageStore {
         var highest: (provider: UsageProvider, usedPercent: Double)?
         for provider in self.enabledProviders() {
             guard let snapshot = self.snapshots[provider] else { continue }
-            let window = self.menuBarMetricWindowForHighestUsage(provider: provider, snapshot: snapshot)
-            let percent = window?.usedPercent ?? 0
+            guard let window = self.menuBarMetricWindowForHighestUsage(provider: provider, snapshot: snapshot) else {
+                continue
+            }
+            let percent = window.usedPercent
             guard !self.shouldExcludeFromHighestUsage(
                 provider: provider,
                 snapshot: snapshot,
@@ -49,18 +51,7 @@ extension UsageStore {
             // In automatic mode Copilot can have one depleted lane while another still has quota.
             return primary.usedPercent >= 100 && secondary.usedPercent >= 100
         }
-        if provider == .cursor,
-           effectivePreference == .automatic
-        {
-            let percents = [
-                snapshot.primary?.usedPercent,
-                snapshot.secondary?.usedPercent,
-                snapshot.tertiary?.usedPercent,
-            ].compactMap(\.self)
-            guard !percents.isEmpty else { return true }
-            return percents.allSatisfy { $0 >= 100 }
-        }
-        if provider == .antigravity,
+        if provider == .cursor || provider == .antigravity,
            effectivePreference == .automatic
         {
             let percents = [
@@ -71,6 +62,7 @@ extension UsageStore {
             guard !percents.isEmpty else { return true }
             return percents.allSatisfy { $0 >= 100 }
         }
+
         return true
     }
 }

Sources/CodexBar/UsageStore+TokenAccounts.swift

@@ -680,7 +680,10 @@ extension UsageStore {
                     self.settings.stepfunToken = token
                 }
             },
-            costUsageHistoryDays: self.settings.costUsageHistoryDays)
+            costUsageHistoryDays: self.settings.costUsageHistoryDays,
+            persistsCLISessions: true,
+            persistentCLISessionIdleWindow: ProviderRegistry.persistentCLISessionIdleWindow(
+                refreshInterval: self.settings.refreshFrequency.seconds))
     }
 
     func sourceMode(for provider: UsageProvider) -> ProviderSourceMode {

Sources/CodexBarCLI/CLIEntry.swift

@@ -33,6 +33,10 @@ enum CodexBarCLI {
             Self.bootstrapLogging(path: invocation.path, values: invocation.parsedValues)
             switch invocation.path {
             case ["usage"]:
+                let signalMonitor = CLITerminationSignalMonitor { signalNumber in
+                    CLITerminationSignalMonitor.terminateActiveHelpersAndReraise(signalNumber)
+                }
+                defer { signalMonitor.cancel() }
                 await self.runUsage(invocation.parsedValues)
             case ["cost"]:
                 await self.runCost(invocation.parsedValues)
@@ -53,6 +57,10 @@ enum CodexBarCLI {
             case ["cache", "clear"]:
                 self.runCacheClear(invocation.parsedValues)
             case ["diagnose"]:
+                let signalMonitor = CLITerminationSignalMonitor { signalNumber in
+                    CLITerminationSignalMonitor.terminateActiveHelpersAndReraise(signalNumber)
+                }
+                defer { signalMonitor.cancel() }
                 await self.runDiagnose(invocation.parsedValues)
             default:
                 Self.exit(

Sources/CodexBarCLI/CLIErrorReporting.swift

@@ -49,6 +49,7 @@ extension CodexBarCLI {
     static func makeProviderErrorPayload(
         provider: UsageProvider,
         account: String?,
+        cacheAccountKey: String? = nil,
         source: String,
         status: ProviderStatusPayload?,
         error: Error,
@@ -57,6 +58,7 @@ extension CodexBarCLI {
         ProviderPayload(
             provider: provider,
             account: account,
+            cacheAccountKey: cacheAccountKey,
             version: nil,
             source: source,
             status: status,