steipete · VACInc · Aug 10, 2026
diff --git a/Sources/CodexBarCLI/CLICardsCommand.swift b/Sources/CodexBarCLI/CLICardsCommand.swift
@@ -167,7 +167,7 @@ extension CodexBarCLI {
             resetStyle: resetStyle,
             weeklyWorkDays: weeklyWorkDays,
             jsonOnly: output.jsonOnly,
-            includeAllCodexAccounts: tokenSelection.allAccounts && providerList == [.codex],
+            includeAllAccounts: tokenSelection.allAccounts,
             fetcher: fetcher,
             claudeFetcher: claudeFetcher,
             browserDetection: browserDetection,

diff --git a/Sources/CodexBarCLI/CLIDashboardCommand.swift b/Sources/CodexBarCLI/CLIDashboardCommand.swift
@@ -211,7 +211,9 @@ extension CodexBarCLI {
                     startedAt: startedAt,
                     requestTimeout: timeout),
                 providerOperations: providerOperations,
-                includeAllCodexAccounts: false,
+                selectedAccountOnlyProviders: Self.dashboardClaudeSwapIsEligible(config: configSnapshot.config)
+                    ? [.claude]
+                    : [],
                 persistCLISessions: false),
             costCollection: ServeCostCollectionContext(
                 configFingerprint: configSnapshot.cacheToken,

diff --git a/Sources/CodexBarCLI/CLIErrorReporting.swift b/Sources/CodexBarCLI/CLIErrorReporting.swift
@@ -50,6 +50,8 @@ extension CodexBarCLI {
         provider: UsageProvider,
         account: String?,
         cacheAccountKey: String? = nil,
+        accountIsActive: Bool? = nil,
+        accountCollectionError: String? = nil,
         source: String,
         status: ProviderStatusPayload?,
         error: Error,
@@ -59,6 +61,8 @@ extension CodexBarCLI {
             provider: provider,
             account: account,
             cacheAccountKey: cacheAccountKey,
+            accountIsActive: accountIsActive,
+            accountCollectionError: accountCollectionError,
             version: nil,
             source: source,
             status: status,

diff --git a/Sources/CodexBarCLI/CLIHelp.swift b/Sources/CodexBarCLI/CLIHelp.swift
@@ -217,6 +217,8 @@ extension CodexBarCLI {
           beyond a trusted network segment.
           Snapshot identity defaults to full account emails. --identity redacted hides
           email local parts and is recommended whenever responses cross a network.
+          /usage fetches every configured account; dashboard snapshots nest providers
+          with multiple accounts under providers[].accounts.
 
         Endpoints:
           GET /                    Built-in web dashboard

diff --git a/Sources/CodexBarCLI/CLIPayloads.swift b/Sources/CodexBarCLI/CLIPayloads.swift
@@ -8,6 +8,10 @@ struct ProviderPayload: Encodable {
     let provider: String
     let account: String?
     let cacheAccountKey: String?
+    /// Internal account-selection metadata for dashboard projection. This is deliberately
+    /// excluded from the public `/usage` payload, whose schema remains unchanged.
+    let accountIsActive: Bool?
+    let accountCollectionError: String?
     let version: String?
     let source: String
     let status: ProviderStatusPayload?
@@ -38,6 +42,8 @@ struct ProviderPayload: Encodable {
         provider: UsageProvider,
         account: String?,
         cacheAccountKey: String? = nil,
+        accountIsActive: Bool? = nil,
+        accountCollectionError: String? = nil,
         version: String?,
         source: String,
         status: ProviderStatusPayload?,
@@ -52,6 +58,8 @@ struct ProviderPayload: Encodable {
         self.provider = provider.rawValue
         self.account = account
         self.cacheAccountKey = cacheAccountKey
+        self.accountIsActive = accountIsActive
+        self.accountCollectionError = accountCollectionError
         self.version = version
         self.source = source
         self.status = status
@@ -68,6 +76,8 @@ struct ProviderPayload: Encodable {
         providerID: String,
         account: String?,
         cacheAccountKey: String? = nil,
+        accountIsActive: Bool? = nil,
+        accountCollectionError: String? = nil,
         version: String?,
         source: String,
         status: ProviderStatusPayload?,
@@ -82,6 +92,8 @@ struct ProviderPayload: Encodable {
         self.provider = providerID
         self.account = account
         self.cacheAccountKey = cacheAccountKey
+        self.accountIsActive = accountIsActive
+        self.accountCollectionError = accountCollectionError
         self.version = version
         self.source = source
         self.status = status

diff --git a/Sources/CodexBarCLI/CLIServeCommand.swift b/Sources/CodexBarCLI/CLIServeCommand.swift
@@ -179,7 +179,8 @@ struct ServeUsageContext: Sendable {
     let providerTimeout: TimeInterval?
     let providerDeadline: ContinuousClock.Instant?
     let providerOperations: CLIServeOperationCoordinator<UsageCommandOutput>
-    let includeAllCodexAccounts: Bool
+    let includeAllAccounts: Bool
+    let selectedAccountOnlyProviders: Set<UsageProvider>
     let persistCLISessions: Bool
 
     init(
@@ -189,7 +190,8 @@ struct ServeUsageContext: Sendable {
         providerTimeout: TimeInterval?,
         providerDeadline: ContinuousClock.Instant?,
         providerOperations: CLIServeOperationCoordinator<UsageCommandOutput>,
-        includeAllCodexAccounts: Bool = true,
+        includeAllAccounts: Bool = true,
+        selectedAccountOnlyProviders: Set<UsageProvider> = [],
         persistCLISessions: Bool = true)
     {
         self.config = config
@@ -198,7 +200,8 @@ struct ServeUsageContext: Sendable {
         self.providerTimeout = providerTimeout
         self.providerDeadline = providerDeadline
         self.providerOperations = providerOperations
-        self.includeAllCodexAccounts = includeAllCodexAccounts
+        self.includeAllAccounts = includeAllAccounts
+        self.selectedAccountOnlyProviders = selectedAccountOnlyProviders
         self.persistCLISessions = persistCLISessions
     }
 }
@@ -997,7 +1000,10 @@ extension CodexBarCLI {
                                 providerTimeout: providerTimeout,
                                 providerDeadline: providerDeadline,
                                 providerOperations: runtime.providerOperations,
-                                includeAllCodexAccounts: false),
+                                selectedAccountOnlyProviders: Self.dashboardClaudeSwapIsEligible(
+                                    config: snapshot.config)
+                                    ? [.claude]
+                                    : []),
                             costCollection: ServeCostCollectionContext(
                                 configFingerprint: snapshot.cacheToken,
                                 providerTimeout: providerTimeout,
@@ -1267,7 +1273,7 @@ extension CodexBarCLI {
             resetStyle: Self.resetTimeDisplayStyleFromDefaults(),
             weeklyWorkDays: Self.weeklyProgressWorkDaysFromDefaults(),
             jsonOnly: true,
-            includeAllCodexAccounts: context.includeAllCodexAccounts,
+            includeAllAccounts: context.includeAllAccounts,
             fetcher: UsageFetcher(),
             claudeFetcher: ClaudeUsageFetcher(browserDetection: browserDetection),
             browserDetection: browserDetection,
@@ -1279,25 +1285,32 @@ extension CodexBarCLI {
             providers: selection.asList,
             configFingerprint: Self.serveUsageOperationFingerprint(
                 configFingerprint: context.configFingerprint,
-                includeAllCodexAccounts: context.includeAllCodexAccounts),
+                includeAllAccounts: context.includeAllAccounts,
+                selectedAccountOnlyProviders: context.selectedAccountOnlyProviders),
             deadline: context.providerDeadline,
             operations: context.providerOperations)
         { provider in
-            await ProviderInteractionContext.$current.withValue(.background) {
+            var scopedCommand = command
+            scopedCommand.includeAllAccounts = context.includeAllAccounts
+                && !context.selectedAccountOnlyProviders.contains(provider)
+            let providerCommand = scopedCommand
+            return await ProviderInteractionContext.$current.withValue(.background) {
                 await Self.fetchUsageOutputs(
                     provider: provider,
                     status: nil,
                     tokenContext: tokenContext,
-                    command: command)
+                    command: providerCommand)
             }
         }
     }
 
     static func serveUsageOperationFingerprint(
         configFingerprint: String,
-        includeAllCodexAccounts: Bool) -> String
+        includeAllAccounts: Bool,
+        selectedAccountOnlyProviders: Set<UsageProvider> = []) -> String
     {
-        "\(configFingerprint):codex-accounts=\(includeAllCodexAccounts ? "all" : "selected")"
+        let selectedOnly = selectedAccountOnlyProviders.map(\.rawValue).sorted().joined(separator: ",")
+        return "\(configFingerprint):accounts=\(includeAllAccounts ? "all" : "selected"):selected-only=\(selectedOnly)"
     }
 
     /// Adapts the shared dashboard snapshot producer to the authenticated HTTP

diff --git a/Sources/CodexBarCLI/CLIUsageCommand.swift b/Sources/CodexBarCLI/CLIUsageCommand.swift
@@ -15,7 +15,7 @@ struct UsageCommandContext {
     let resetStyle: ResetTimeDisplayStyle
     let weeklyWorkDays: Int?
     let jsonOnly: Bool
-    let includeAllCodexAccounts: Bool
+    var includeAllAccounts: Bool
     let fetcher: UsageFetcher
     let claudeFetcher: ClaudeUsageFetcher
     let browserDetection: BrowserDetection
@@ -41,6 +41,8 @@ private struct UsageSuccessRenderInput {
     let provider: UsageProvider
     let accountLabel: String?
     let cacheAccountKey: String?
+    let accountIsActive: Bool?
+    let accountCollectionError: String?
     let version: String?
     let source: String
     let status: ProviderStatusPayload?
@@ -179,7 +181,7 @@ extension CodexBarCLI {
             resetStyle: resetStyle,
             weeklyWorkDays: weeklyWorkDays,
             jsonOnly: output.jsonOnly,
-            includeAllCodexAccounts: tokenSelection.allAccounts && providerList == [.codex],
+            includeAllAccounts: tokenSelection.allAccounts,
             fetcher: fetcher,
             claudeFetcher: claudeFetcher,
             browserDetection: browserDetection,
@@ -257,16 +259,22 @@ extension CodexBarCLI {
         tokenContext: TokenAccountCLIContext,
         command: UsageCommandContext) async -> UsageCommandOutput
     {
-        // Provider-specific by design: Codex can enumerate reconciled live, managed, and profile-home accounts.
-        if provider == .codex, command.includeAllCodexAccounts {
+        // Provider-specific by design: Codex reconciles accounts beyond token-account config.
+        if provider == .codex, command.includeAllAccounts {
             var output = UsageCommandOutput()
-            let accounts = tokenContext.visibleCodexAccounts().visibleAccounts
+            let projection = tokenContext.visibleCodexAccounts()
+            let accounts = projection.visibleAccounts
+            let accountCollectionError = projection.hasUnreadableAddedAccountStore
+                ? "Managed Codex account storage is unreadable."
+                : nil
             let selections: [CodexVisibleAccount?] = accounts.isEmpty ? [nil] : accounts.map { Optional($0) }
             for visibleAccount in selections {
                 let result = await Self.fetchUsageOutput(
                     provider: provider,
                     account: nil,
                     codexVisibleAccount: visibleAccount,
+                    accountIsActive: visibleAccount.map { projection.activeVisibleAccountID == $0.id },
+                    accountCollectionError: accountCollectionError,
                     status: status,
                     tokenContext: tokenContext,
                     command: command)
@@ -277,7 +285,9 @@ extension CodexBarCLI {
 
         let accounts: [ProviderTokenAccount]
         do {
-            accounts = try tokenContext.resolvedAccounts(for: provider)
+            accounts = try tokenContext.resolvedAccounts(
+                for: provider,
+                includeAllAccounts: command.includeAllAccounts)
         } catch {
             return Self.usageOutputForAccountResolutionError(
                 provider: provider,
@@ -288,6 +298,7 @@ extension CodexBarCLI {
 
         let selections = Self.accountSelections(from: accounts)
         var output = UsageCommandOutput()
+        let activeAccountID = tokenContext.activeConfiguredAccountID(for: provider)
         let accountRefreshDelay = TokenAccountSupportCatalog
             .support(for: provider)?.minimumDelayBetweenAccountRefreshes
         for (index, account) in selections.enumerated() {
@@ -301,6 +312,7 @@ extension CodexBarCLI {
             let result = await Self.fetchUsageOutput(
                 provider: provider,
                 account: account,
+                accountIsActive: account.map { activeAccountID == $0.id },
                 status: status,
                 tokenContext: tokenContext,
                 command: command)
@@ -348,6 +360,8 @@ extension CodexBarCLI {
         provider: UsageProvider,
         accountLabel: String?,
         cacheAccountKey: String?,
+        accountIsActive: Bool?,
+        accountCollectionError: String?,
         version: String?,
         source: String,
         status: ProviderStatusPayload?,
@@ -362,6 +376,8 @@ extension CodexBarCLI {
             provider: provider,
             account: accountLabel,
             cacheAccountKey: cacheAccountKey,
+            accountIsActive: accountIsActive,
+            accountCollectionError: accountCollectionError,
             version: version,
             source: source,
             status: status,
@@ -418,6 +434,8 @@ extension CodexBarCLI {
                 provider: input.provider,
                 accountLabel: input.accountLabel,
                 cacheAccountKey: input.cacheAccountKey,
+                accountIsActive: input.accountIsActive,
+                accountCollectionError: input.accountCollectionError,
                 version: input.version,
                 source: input.source,
                 status: input.status,
@@ -434,6 +452,8 @@ extension CodexBarCLI {
         provider: UsageProvider,
         account: ProviderTokenAccount?,
         codexVisibleAccount: CodexVisibleAccount? = nil,
+        accountIsActive: Bool? = nil,
+        accountCollectionError: String? = nil,
         status: ProviderStatusPayload?,
         tokenContext: TokenAccountCLIContext,
         command: UsageCommandContext) async -> UsageCommandOutput
@@ -470,7 +490,9 @@ extension CodexBarCLI {
                 provider: provider,
                 account: (
                     label: account?.label ?? codexVisibleAccount?.menuDisplayName,
-                    cacheKey: cacheAccountKey),
+                    cacheKey: cacheAccountKey,
+                    isActive: accountIsActive,
+                    collectionError: accountCollectionError),
                 source: effectiveSourceMode.rawValue,
                 status: status,
                 command: command)
@@ -539,6 +561,8 @@ extension CodexBarCLI {
                     provider: provider,
                     accountLabel: account?.label ?? codexVisibleAccount?.menuDisplayName,
                     cacheAccountKey: cacheAccountKey,
+                    accountIsActive: accountIsActive,
+                    accountCollectionError: accountCollectionError,
                     version: version,
                     source: source,
                     status: status,
@@ -558,6 +582,8 @@ extension CodexBarCLI {
                     provider: provider,
                     account: account?.label ?? codexVisibleAccount?.menuDisplayName,
                     cacheAccountKey: cacheAccountKey,
+                    accountIsActive: accountIsActive,
+                    accountCollectionError: accountCollectionError,
                     source: effectiveSourceMode.rawValue,
                     status: status,
                     error: error,
@@ -671,7 +697,7 @@ extension CodexBarCLI {
 
     private static func webSourceUnsupportedOutput(
         provider: UsageProvider,
-        account: (label: String?, cacheKey: String?),
+        account: (label: String?, cacheKey: String?, isActive: Bool?, collectionError: String?),
         source: String,
         status: ProviderStatusPayload?,
         command: UsageCommandContext) -> UsageCommandOutput
@@ -688,6 +714,8 @@ extension CodexBarCLI {
                 provider: provider,
                 account: account.label,
                 cacheAccountKey: account.cacheKey,
+                accountIsActive: account.isActive,
+                accountCollectionError: account.collectionError,
                 source: source,
                 status: status,
                 error: error,

diff --git a/Sources/CodexBarCLI/DashboardPayloads.swift b/Sources/CodexBarCLI/DashboardPayloads.swift
@@ -51,8 +51,8 @@ struct DashboardProviderPayload: Encodable {
     let display: DashboardDisplayPayload
     let error: ProviderErrorPayload?
     let updatedAt: Date?
-    /// Per-account entries from a local multi-account source (today: claude-swap).
-    /// Additive schema-v1 data; absent for providers without such a source.
+    /// Per-account entries from the provider's reconciled multi-account source.
+    /// Additive schema-v1 data; absent for single-account providers.
     let accounts: [DashboardAccountPayload]?
     /// Row-local failure of the multi-account source; the ambient provider row stays intact.
     let accountsError: String?