Refresh custom account labels

Author: kiranmagic7

Sources/CodexBar/StatusItemController+IconObservation.swift

@@ -47,6 +47,9 @@ extension StatusItemController {
         let layoutCostSignature = showBrandPercent
             ? self.storedMenuBarLayoutCostSignature(for: provider)
             : nil
+        let layoutAccountSignature = showBrandPercent
+            ? self.storedMenuBarLayoutAccountSignature(for: provider, snapshot: snapshot)
+            : nil
 
         return [
             provider.rawValue,
@@ -60,9 +63,26 @@ extension StatusItemController {
             "refreshing=\(self.store.refreshingProviders.contains(provider) ? "1" : "0")",
             "text=\(displayText ?? "nil")",
             "layoutCost=\(layoutCostSignature ?? "nil")",
+            "layoutAccount=\(layoutAccountSignature ?? "nil")",
         ].joined(separator: "|")
     }
 
+    private func storedMenuBarLayoutAccountSignature(
+        for provider: UsageProvider,
+        snapshot: UsageSnapshot?)
+        -> String?
+    {
+        let resolution = self.settings.menuBarLayoutResolution(for: provider)
+        guard !resolution.usesLegacyRendering,
+              resolution.layout.lines.joined().contains(.accountLabel),
+              let accountLabel = self.menuBarLayoutAccountLabel(provider: provider, snapshot: snapshot)
+        else { return nil }
+
+        var hasher = Hasher()
+        hasher.combine(accountLabel)
+        return String(hasher.finalize())
+    }
+
     private func storedMenuBarLayoutCostSignature(for provider: UsageProvider) -> String? {
         let resolution = self.settings.menuBarLayoutResolution(for: provider)
         guard !resolution.usesLegacyRendering else { return nil }

Sources/CodexBar/StatusItemController+MenuBarLayout.swift

@@ -62,11 +62,7 @@ extension StatusItemController {
             .flatMap { UsagePaceText.weeklyDetail(provider: provider, pace: $0, now: now).rightLabel }
         let costStrings = self.menuBarLayoutCostStrings(provider: provider, now: now)
         let providerName = L(self.store.metadata(for: provider).displayName)
-        let rawAccountLabel = snapshot?.accountEmail(for: provider)?
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-        let accountLabel = self.settings.hidePersonalInfo || rawAccountLabel?.isEmpty != false
-            ? nil
-            : rawAccountLabel
+        let accountLabel = self.menuBarLayoutAccountLabel(provider: provider, snapshot: snapshot)
 
         return MenuBarLayoutRenderData(
             iconKey: "\(provider.rawValue):\(warningFlash ? "warning" : "normal")",
@@ -80,6 +76,14 @@ extension StatusItemController {
             cost30d: costStrings.last30Days)
     }
 
+    func menuBarLayoutAccountLabel(provider: UsageProvider, snapshot: UsageSnapshot?) -> String? {
+        let rawAccountLabel = snapshot?.accountEmail(for: provider)?
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+        return self.settings.hidePersonalInfo || rawAccountLabel?.isEmpty != false
+            ? nil
+            : rawAccountLabel
+    }
+
     func menuBarLayoutCostStrings(
         provider: UsageProvider,
         now: Date = .init())

Tests/CodexBarTests/StatusItemIconObservationSignatureTests.swift

@@ -86,6 +86,52 @@ struct StatusItemIconObservationSignatureTests {
             suiteName: "StatusItemIconObservationSignatureTests-snapshot-metadata")
         defer { controller.releaseStatusItemsForTesting() }
 
+        let baseline = controller.storeIconObservationSignature()
+        #expect(!baseline.contains("icon@example.com"))
+
+        store._setSnapshotForTesting(
+            Self.makeSnapshot(
+                provider: .codex,
+                email: "rotated-account@example.com",
+                updatedAt: Date(timeIntervalSince1970: 200)),
+            provider: .codex)
+
+        let signature = controller.storeIconObservationSignature()
+
+        #expect(signature == baseline)
+        #expect(!signature.contains("rotated-account@example.com"))
+    }
+
+    @Test
+    func `custom account label changes the store icon observation signature`() {
+        let (_, store, controller) = self.makeController(
+            suiteName: "StatusItemIconObservationSignatureTests-custom-account-label",
+            menuBarLayout: MenuBarLayout(lines: [[.accountLabel]]))
+        defer { controller.releaseStatusItemsForTesting() }
+
+        let baseline = controller.storeIconObservationSignature()
+        #expect(!baseline.contains("icon@example.com"))
+
+        store._setSnapshotForTesting(
+            Self.makeSnapshot(
+                provider: .codex,
+                email: "rotated-account@example.com",
+                updatedAt: Date(timeIntervalSince1970: 200)),
+            provider: .codex)
+
+        let signature = controller.storeIconObservationSignature()
+
+        #expect(signature != baseline)
+        #expect(!signature.contains("rotated-account@example.com"))
+    }
+
+    @Test
+    func `hidden custom account label ignores account changes`() {
+        let (settings, store, controller) = self.makeController(
+            suiteName: "StatusItemIconObservationSignatureTests-hidden-custom-account-label",
+            menuBarLayout: MenuBarLayout(lines: [[.accountLabel]]))
+        defer { controller.releaseStatusItemsForTesting() }
+        settings.hidePersonalInfo = true
         let baseline = controller.storeIconObservationSignature()
 
         store._setSnapshotForTesting(