Skip to content

Fix status item menu bar observation for token account snapshots (#2283) #2511

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
Yuxin-Qiao wants to merge 4 commits into
base: main
Choose a base branch
from
+221 −0
Open

Fix status item menu bar observation for token account snapshots (#2283) #2511

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
a895280
Fix menu bar status indicator observation for token accounts
Yuxin-Qiao Jul 30, 2026
ce475ec
Add Observation invalidation unit tests for account snapshot collecti…
Yuxin-Qiao Jul 30, 2026
0b7e280
Include accountSnapshots in storeIconObservationSignature to trigger …
Yuxin-Qiao Jul 30, 2026
1abe620
Include mutable snapshot state in store icon observation signature (#…
Yuxin-Qiao Jul 31, 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
37 changes: 37 additions & 0 deletions Sources/CodexBar/StatusItemController+IconObservation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,46 @@ extension StatusItemController {
"text=\(displayText ?? "nil")",
"layoutCost=\(layoutCostSignature ?? "nil")",
"layoutAccount=\(layoutAccountSignature ?? "nil")",
"accountSnapshots=\(self.accountSnapshotSignature(for: provider))",
].joined(separator: "|")
}

private func accountSnapshotSignature(for provider: UsageProvider) -> String {
let accountSnapshots = self.store.accountSnapshots[provider] ?? []
let accountPart = accountSnapshots.map { snap in
let label = snap.account.label
let usage = Self.usageSnapshotSignature(snap.snapshot)
return "\(snap.account.id.uuidString):\(label):\(usage):\(snap.error ?? "nil"):\(snap.sourceLabel ?? "nil")"
}.joined(separator: ",")

let codexPart: String = if provider == .codex {
self.store.codexAccountSnapshots.map { snap in
let email = snap.account.email
let active = snap.account.isActive ? "1" : "0"
let usage = Self.usageSnapshotSignature(snap.snapshot)
return "\(snap.id):\(email):\(active):\(usage):\(snap.error ?? "nil"):\(snap.sourceLabel ?? "nil")"
}.joined(separator: ",")
} else {
""
}

return "\(accountPart)|\(codexPart)"
}

private static func usageSnapshotSignature(_ snapshot: UsageSnapshot?) -> String {
guard let snapshot else { return "nil" }
return [
Self.rateWindowSignature(snapshot.primary),
Self.rateWindowSignature(snapshot.secondary),
Self.rateWindowSignature(snapshot.tertiary),
].joined(separator: ";")
}

private static func rateWindowSignature(_ window: RateWindow?) -> String {
guard let window else { return "nil" }
return "\(window.usedPercent)/\(window.windowMinutes ?? -1)/\(window.resetsAt?.timeIntervalSince1970 ?? -1)"
}

private func storedMenuBarLayoutAccountSignature(
for provider: UsageProvider,
snapshot: UsageSnapshot?)
Expand Down
2 changes: 2 additions & 0 deletions Sources/CodexBar/UsageStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ extension UsageStore {
_ = self.statuses
_ = self.tokenSnapshotPublications
_ = self.historicalPaceRevision
_ = self.accountSnapshots
_ = self.codexAccountSnapshots
Comment on lines +59 to +60

@chatgpt-codex-connector chatgpt-codex-connector Bot Jul 30, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Feed account snapshots into the icon work signature

Once the initial icon signature is stored, a refresh that changes only either per-account collection triggers this observation but still does no icon work: observeStoreIconChanges() recomputes storeIconObservationSignature() and returns because that signature reads store.snapshot(for:) and never accountSnapshots or codexAccountSnapshots. The status indicator therefore remains stale in the scenario these dependencies are intended to fix; include the relevant account state in the signature/render source (or publish it into snapshots) and test through the controller's signature gate rather than only asserting raw Observation invalidation.

AGENTS.md reference: AGENTS.md:L4-L5

Useful? React with 👍 / 👎.

return 0
}

Expand Down
182 changes: 182 additions & 0 deletions Tests/CodexBarTests/StatusItemIconObservationSignatureTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,188 @@ struct StatusItemIconObservationSignatureTests {
#expect(controller.storeIconObservationSignature() != baseline)
}

@Test
func `store icon observation token invalidates when account snapshots change`() {
let (_, store, controller) = self.makeController(
suiteName: "StatusItemIconObservationSignatureTests-account-snapshots")
defer { controller.releaseStatusItemsForTesting() }

let baselineSignature = controller.storeIconObservationSignature()

nonisolated(unsafe) var invalidated = false
withObservationTracking {
_ = store.iconObservationToken
} onChange: {
invalidated = true
}

let account = ProviderTokenAccount(
id: UUID(),
label: "Account 1",
token: "token1",
addedAt: 1,
lastUsed: nil)

store.accountSnapshots[.codex] = [
TokenAccountUsageSnapshot(
account: account,
snapshot: nil,
error: nil,
sourceLabel: "fixture",
cacheKey: store.tokenAccountSnapshotCacheKey(provider: .codex, account: account)),
]

#expect(invalidated)
#expect(controller.storeIconObservationSignature() != baselineSignature)
}

@Test
func `store icon observation token invalidates when codex account snapshots change`() {
let (_, store, controller) = self.makeController(
suiteName: "StatusItemIconObservationSignatureTests-codex-account-snapshots")
defer { controller.releaseStatusItemsForTesting() }

let baselineSignature = controller.storeIconObservationSignature()

nonisolated(unsafe) var invalidated = false
withObservationTracking {
_ = store.iconObservationToken
} onChange: {
invalidated = true
}

let visibleAccount = CodexVisibleAccount(
id: "test-codex-account",
email: "email@example.com",
authFingerprint: nil,
storedAccountID: nil,
selectionSource: .profileHome(path: "/tmp"),
isActive: true,
isLive: true,
canReauthenticate: true,
canRemove: true)

store.codexAccountSnapshots = [
CodexAccountUsageSnapshot(
account: visibleAccount,
snapshot: nil,
error: nil,
sourceLabel: "cached"),
]

#expect(invalidated)
#expect(controller.storeIconObservationSignature() != baselineSignature)
}

@Test
func `store icon observation signature changes when existing account snapshot usage is replaced`() {
let (_, store, controller) = self.makeController(
suiteName: "StatusItemIconObservationSignatureTests-account-usage-replacement")
defer { controller.releaseStatusItemsForTesting() }

let account = ProviderTokenAccount(
id: UUID(),
label: "Account 1",
token: "token1",
addedAt: 1,
lastUsed: nil)
let cacheKey = store.tokenAccountSnapshotCacheKey(provider: .codex, account: account)

store.accountSnapshots[.codex] = [
TokenAccountUsageSnapshot(
account: account,
snapshot: Self.makeSnapshot(provider: .codex, email: "account@example.com", primaryUsedPercent: 10),
error: nil,
sourceLabel: "fixture",
cacheKey: cacheKey),
]
let baseline = controller.storeIconObservationSignature()

store.accountSnapshots[.codex] = [
TokenAccountUsageSnapshot(
account: account,
snapshot: Self.makeSnapshot(provider: .codex, email: "account@example.com", primaryUsedPercent: 42),
error: nil,
sourceLabel: "fixture",
cacheKey: cacheKey),
]

#expect(controller.storeIconObservationSignature() != baseline)
}

@Test
func `store icon observation signature changes when existing account snapshot error is replaced`() {
let (_, store, controller) = self.makeController(
suiteName: "StatusItemIconObservationSignatureTests-account-error-replacement")
defer { controller.releaseStatusItemsForTesting() }

let account = ProviderTokenAccount(
id: UUID(),
label: "Account 1",
token: "token1",
addedAt: 1,
lastUsed: nil)
let cacheKey = store.tokenAccountSnapshotCacheKey(provider: .codex, account: account)

store.accountSnapshots[.codex] = [
TokenAccountUsageSnapshot(
account: account,
snapshot: nil,
error: nil,
sourceLabel: "fixture",
cacheKey: cacheKey),
]
let baseline = controller.storeIconObservationSignature()

store.accountSnapshots[.codex] = [
TokenAccountUsageSnapshot(
account: account,
snapshot: nil,
error: "rate limited",
sourceLabel: "fixture",
cacheKey: cacheKey),
]

#expect(controller.storeIconObservationSignature() != baseline)
}

@Test
func `store icon observation signature changes when existing codex account snapshot is replaced`() {
let (_, store, controller) = self.makeController(
suiteName: "StatusItemIconObservationSignatureTests-codex-account-replacement")
defer { controller.releaseStatusItemsForTesting() }

let visibleAccount = CodexVisibleAccount(
id: "test-codex-account",
email: "email@example.com",
authFingerprint: nil,
storedAccountID: nil,
selectionSource: .profileHome(path: "/tmp"),
isActive: true,
isLive: true,
canReauthenticate: true,
canRemove: true)

store.codexAccountSnapshots = [
CodexAccountUsageSnapshot(
account: visibleAccount,
snapshot: Self.makeSnapshot(provider: .codex, email: "email@example.com", primaryUsedPercent: 10),
error: nil,
sourceLabel: "cached"),
]
let baseline = controller.storeIconObservationSignature()

store.codexAccountSnapshots = [
CodexAccountUsageSnapshot(
account: visibleAccount,
snapshot: Self.makeSnapshot(provider: .codex, email: "email@example.com", primaryUsedPercent: 66),
error: nil,
sourceLabel: "cached"),
]

#expect(controller.storeIconObservationSignature() != baseline)
}

@Test
func `store icon observation signature changes when hide critters toggles`() {
let (settings, _, controller) = self.makeController(
Expand Down