fix: isolate provider refresh snapshots

Author: steipete

Sources/CodexBar/MenuCardRefreshMonitor.swift

@@ -33,13 +33,11 @@ final class MenuCardRefreshMonitor {
         frozenModels: [UsageProvider: UsageMenuCardView.Model],
         provider: UsageProvider? = nil)
     {
-        // Keep the existing frozen card for any provider already refreshing. `frozenManualRefreshMenuCardModels()`
-        // snapshots every enabled provider, so a second provider's begin re-supplies the first provider's
-        // now-mid-refresh model; old-wins prevents that from clobbering the pre-refresh card we froze for it.
-        self.frozenManualRefreshModels.merge(frozenModels) { existing, _ in existing }
         if let provider {
+            self.frozenManualRefreshModels[provider] = frozenModels[provider]
             self.manualRefreshProviders.insert(provider)
         } else {
+            self.frozenManualRefreshModels = frozenModels
             self.globalManualRefreshInFlight = true
         }
     }
@@ -48,11 +46,11 @@ final class MenuCardRefreshMonitor {
     func endManualRefresh(for provider: UsageProvider? = nil) {
         if let provider {
             self.manualRefreshProviders.remove(provider)
+            self.frozenManualRefreshModels[provider] = nil
         } else {
             self.globalManualRefreshInFlight = false
+            self.frozenManualRefreshModels.removeAll(keepingCapacity: true)
         }
-        guard self.manualRefreshProviders.isEmpty, !self.globalManualRefreshInFlight else { return }
-        self.frozenManualRefreshModels.removeAll(keepingCapacity: true)
     }
 
     func resetManualRefresh() {

Tests/CodexBarTests/StatusMenuPersistentRefreshTests.swift

@@ -1121,23 +1121,28 @@ extension StatusMenuPersistentRefreshTests {
                 updatedAt: updatedAt)
         }
 
-        // Claude begins refreshing: freeze its pre-refresh card (21% used -> "79% left").
+        // The snapshot helper supplies every enabled provider even for a provider-scoped refresh.
         controller.store.snapshots[.claude] = quotaSnapshot(usedPercent: 21, updatedAt: now)
+        controller.store.snapshots[.codex] = quotaSnapshot(usedPercent: 15, updatedAt: now)
         let claudeFrozen = try #require(controller.menuCardModel(for: .claude))
-        monitor.beginManualRefresh(frozenModels: [.claude: claudeFrozen], provider: .claude)
+        let codexBeforeItsRefresh = try #require(controller.menuCardModel(for: .codex))
+        monitor.beginManualRefresh(
+            frozenModels: [.claude: claudeFrozen, .codex: codexBeforeItsRefresh],
+            provider: .claude)
 
-        // Claude's snapshot moves mid-refresh; then Codex begins and re-supplies Claude's *current*
-        // model, because frozenManualRefreshMenuCardModels captures every enabled provider.
+        // Each provider must freeze the card visible when its own refresh starts.
         controller.store.snapshots[.claude] = quotaSnapshot(usedPercent: 65, updatedAt: now.addingTimeInterval(1))
+        controller.store.snapshots[.codex] = quotaSnapshot(usedPercent: 42, updatedAt: now.addingTimeInterval(1))
         let claudeMidRefresh = try #require(controller.menuCardModel(for: .claude))
         let codexFrozen = try #require(controller.menuCardModel(for: .codex))
         monitor.beginManualRefresh(
             frozenModels: [.claude: claudeMidRefresh, .codex: codexFrozen],
             provider: .codex)
 
-        // Claude must still show its pre-refresh card, not the mid-refresh one Codex's begin supplied.
         let shownClaude = monitor.model(for: .claude, fallback: claudeMidRefresh)
+        let shownCodex = monitor.model(for: .codex, fallback: codexFrozen)
         #expect(shownClaude.metrics.first?.percentLabel == "79% left")
+        #expect(shownCodex.metrics.first?.percentLabel == "58% left")
 
         // Ending Codex leaves Claude frozen; ending Claude clears it.
         monitor.endManualRefresh(for: .codex)