Show account email, token-account label and Codex credits on cards

apps/desktop-tauri/src-tauri/src/commands/bridge.rs

@@ -307,6 +307,10 @@ pub struct ProviderUsageSnapshot {
     pub plan_name: Option<String>,
     #[serde(default)]
     pub account_email: Option<String>,
+    /// Header-only label of the active token account (upstream shows it when
+    /// the provider reports no email). Never used for history or warning keys.
+    #[serde(default)]
+    pub account_label: Option<String>,
     #[serde(default)]
     pub subscription: Option<SubscriptionMetadataSnapshot>,
     #[serde(default = "default_source_label")]
@@ -569,6 +573,7 @@ impl ProviderUsageSnapshot {
             }),
             plan_name: usage.login_method.clone(),
             account_email: usage.account_email.clone(),
+            account_label: None,
             subscription: usage.subscription.as_ref().map(|subscription| {
                 SubscriptionMetadataSnapshot {
                     starts_at: subscription.starts_at.map(|date| date.to_rfc3339()),
@@ -630,6 +635,7 @@ impl ProviderUsageSnapshot {
             cost: None,
             plan_name: None,
             account_email: None,
+            account_label: None,
             subscription: None,
             source_label: String::new(),
             has_successful_claude_cli_quota: false,

apps/desktop-tauri/src-tauri/src/commands/providers.rs

@@ -745,11 +745,12 @@ fn spawn_provider_refreshes(
         );
         // Resolved here rather than inside the fetch: forecast history is keyed by
         // account, and the managed-account id is the only discriminator Codex exposes.
-        let token_account_id = inputs
+        let active_account = inputs
             .token_accounts
             .get(&id)
-            .and_then(ProviderAccountData::active_account)
-            .map(|account| account.id);
+            .and_then(ProviderAccountData::active_account);
+        let token_account_id = active_account.map(|account| account.id);
+        let token_account_label = active_account.and_then(|account| header_label(&account.label));
         let hooks_enabled = inputs.settings.hooks_enabled;
 
         handles.push(tokio::spawn(async move {
@@ -761,7 +762,10 @@ fn spawn_provider_refreshes(
                 id,
                 ctx,
                 generation,
-                token_account_id,
+                ActiveTokenAccount {
+                    id: token_account_id,
+                    label: token_account_label,
+                },
                 hooks_enabled,
             )
             .await;
@@ -797,16 +801,31 @@ fn spawn_provider_refreshes(
     handles
 }
 
+/// The active token account a refresh runs under: its id scopes forecast
+/// history; its label is header display only.
+struct ActiveTokenAccount {
+    id: Option<uuid::Uuid>,
+    label: Option<String>,
+}
+
+/// A token-account label fit for the card header, or `None` when blank.
+fn header_label(label: &str) -> Option<String> {
+    let label = label.trim();
+    (!label.is_empty()).then(|| label.to_string())
+}
+
 async fn refresh_provider(
     app: tauri::AppHandle,
     id: ProviderId,
     ctx: FetchContext,
     generation: u64,
-    token_account_id: Option<uuid::Uuid>,
+    token_account: ActiveTokenAccount,
     hooks_enabled: bool,
 ) {
-    let (snapshot, account_identity, retention) =
-        fetch_provider_snapshot(id, ctx, token_account_id).await;
+    let (mut snapshot, account_identity, retention) =
+        fetch_provider_snapshot(id, ctx, token_account.id).await;
+    snapshot.account_label = token_account.label;
+    let token_account_id = token_account.id;
     let fresh_snapshot = snapshot.error.is_none();
     // Captured before last-good preservation can swap in a cached snapshot.
     let fetch_attempt = FetchAttempt::of(&snapshot);
@@ -1600,6 +1619,50 @@ mod predictive_warning_tests {
             }
         }
     }
+
+    /// Codex OAuth now publishes the auth.json email. Ambient Codex moves from
+    /// the unscoped key (process-local history only) to the lowercased email;
+    /// a managed token account still wins, and the header-only token-account
+    /// label never feeds any scoping key.
+    #[test]
+    fn codex_email_scopes_forecast_and_warnings_but_label_does_not() {
+        use crate::commands::bridge::forecast_account_key;
+
+        let token = uuid::Uuid::parse_str("bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb").unwrap();
+        let mut usage = codexbar::core::UsageSnapshot::new(codexbar::core::RateWindow::new(1.0));
+        let mut snapshot = empty_snapshot();
+        snapshot.provider_id = "codex".to_string();
+
+        assert_eq!(forecast_account_key(&usage, None), None);
+        assert_eq!(quota_notification_account_identity(&snapshot, None), "");
+
+        snapshot.account_label = Some("Work account".to_string());
+        assert_eq!(quota_notification_account_identity(&snapshot, None), "");
+
+        usage.account_email = Some("Parity.User@Example.com".to_string());
+        snapshot.account_email = usage.account_email.clone();
+        assert_eq!(
+            forecast_account_key(&usage, None).as_deref(),
+            Some("parity.user@example.com")
+        );
+        assert_eq!(
+            quota_notification_account_identity(&snapshot, None),
+            "parity.user@example.com"
+        );
+        assert_eq!(
+            forecast_account_key(&usage, Some(token)).as_deref(),
+            Some("token-account:bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb")
+        );
+    }
+
+    #[test]
+    fn header_label_trims_and_drops_blank_labels() {
+        assert_eq!(
+            header_label("  parity-github "),
+            Some("parity-github".to_string())
+        );
+        assert_eq!(header_label("   "), None);
+    }
 }
 #[cfg(test)]
 mod reset_backfill_tests {
@@ -1640,6 +1703,7 @@ mod reset_backfill_tests {
             cost: None,
             plan_name: None,
             account_email: None,
+            account_label: None,
             subscription: None,
             source_label: String::new(),
             has_successful_claude_cli_quota: false,

apps/desktop-tauri/src-tauri/src/commands/providers/reset_backfill.rs

@@ -133,6 +133,7 @@ mod tests {
             cost: None,
             plan_name: None,
             account_email: None,
+            account_label: None,
             subscription: None,
             source_label: String::new(),
             has_successful_claude_cli_quota: false,

apps/desktop-tauri/src-tauri/src/powertoys.rs

@@ -206,6 +206,7 @@ mod tests {
             cost: None,
             plan_name: Some("Team".to_string()),
             account_email: Some("dev@example.com".to_string()),
+            account_label: None,
             subscription: None,
             source_label: "web".to_string(),
             has_successful_claude_cli_quota: false,
@@ -263,6 +264,7 @@ mod tests {
             cost: None,
             plan_name: None,
             account_email: None,
+            account_label: None,
             subscription: None,
             source_label: "web".to_string(),
             has_successful_claude_cli_quota: false,

apps/desktop-tauri/src-tauri/src/tray_bridge.rs

@@ -755,6 +755,7 @@ mod tests {
             }),
             plan_name: None,
             account_email: None,
+            account_label: None,
             subscription: None,
             source_label: String::new(),
             has_successful_claude_cli_quota: false,

apps/desktop-tauri/src-tauri/src/tray_presentation_tests.rs

@@ -62,6 +62,7 @@ fn fake_snapshot_with(
         }),
         plan_name: None,
         account_email: None,
+        account_label: None,
         subscription: None,
         source_label: String::new(),
         has_successful_claude_cli_quota: false,

apps/desktop-tauri/src-tauri/src/usage_metric.rs

@@ -478,6 +478,7 @@ mod tests {
             cost: None,
             plan_name: None,
             account_email: None,
+            account_label: None,
             subscription: None,
             source_label: "test".to_string(),
             has_successful_claude_cli_quota: false,

apps/desktop-tauri/src/components/MenuCard.headerAccount.test.ts

@@ -0,0 +1,40 @@
+import { describe, expect, it } from "vitest";
+import { headerAccount, maskEmail } from "./MenuCard";
+
+describe("headerAccount", () => {
+  it("prefers the provider email over the token-account label", () => {
+    expect(
+      headerAccount({ accountEmail: "parity.user@example.com", accountLabel: "Work" }, false),
+    ).toBe("parity.user@example.com");
+  });
+
+  it("falls back to the active token-account label", () => {
+    expect(headerAccount({ accountEmail: null, accountLabel: "parity-github" }, false)).toBe(
+      "parity-github",
+    );
+    expect(headerAccount({ accountEmail: "  ", accountLabel: " parity-github " }, false)).toBe(
+      "parity-github",
+    );
+  });
+
+  it("masks the email and hides the label under Hide Personal Info", () => {
+    expect(headerAccount({ accountEmail: "parity.user@example.com" }, true)).toBe(
+      "p••••••••••@example.com",
+    );
+    expect(
+      headerAccount({ accountEmail: null, accountLabel: "parity-github" }, true),
+    ).toBeNull();
+    expect(
+      headerAccount({ accountEmail: null, accountLabel: "parity.user@example.com" }, true),
+    ).toBeNull();
+  });
+
+  it("shows nothing without an email or label", () => {
+    expect(headerAccount({ accountEmail: null }, false)).toBeNull();
+    expect(headerAccount({ accountEmail: null, accountLabel: "" }, true)).toBeNull();
+  });
+
+  it("masks a non-email label completely", () => {
+    expect(maskEmail("parity-github")).toBe("••••@••••");
+  });
+});

apps/desktop-tauri/src/components/MenuCard.tsx

@@ -54,6 +54,21 @@ export function maskEmail(email: string): string {
   return email[0] + "•".repeat(at - 1) + email.slice(at);
 }
 
+/**
+ * Upstream `MenuCardView.email(from:)`: the provider-reported email, else the
+ * active token-account label. Hide Personal Info masks the email and drops the
+ * label, as upstream `PersonalInfoRedactor.redactAccountLabel` blanks it.
+ */
+export function headerAccount(
+  provider: Pick<ProviderUsageSnapshot, "accountEmail" | "accountLabel">,
+  hideEmail: boolean,
+): string | null {
+  const email = provider.accountEmail?.trim();
+  if (email) return hideEmail ? maskEmail(email) : email;
+  if (hideEmail) return null;
+  return provider.accountLabel?.trim() || null;
+}
+
 function cardMetrics(
   provider: ProviderUsageSnapshot,
   t: ReturnType<typeof useLocale>["t"],
@@ -164,12 +179,7 @@ export default function MenuCard({
   }, [provider.providerId, provider.accountEmail, localDay, onLayoutChange]);
 
   const isWayfinder = provider.providerId === "wayfinder";
-  const email =
-    !isWayfinder && provider.accountEmail
-      ? hideEmail
-        ? maskEmail(provider.accountEmail)
-        : provider.accountEmail
-      : null;
+  const email = isWayfinder ? null : headerAccount(provider, hideEmail);
   const plan = isWayfinder
     ? null
     : hideOpenAiApiProjectId(

apps/desktop-tauri/src/components/card/ExtraUsageBlock.tsx

@@ -20,7 +20,7 @@ export default function ExtraUsageBlock({
   resetTimeRelative: boolean;
 }) {
   const { t } = useLocale();
-  const section = cardCostSection(cost, style, t);
+  const section = cardCostSection(cost, style, t, providerId);
   const resetText = useFormattedResetTime(
     section && !section.inline && style !== "compact" ? cost.resetsAt : null,
     null,

apps/desktop-tauri/src/lib/accountMenuRow.test.ts

@@ -39,7 +39,13 @@ function snapshot(overrides: Partial<ProviderUsageSnapshot>): ProviderUsageSnaps
 }
 
 describe("accountMenuAction", () => {
-  it.each(["codex", "claude", "grok"])("offers Switch Account... for a signed-in %s", (providerId) => {
+  it("keeps Add Account... for a signed-in Codex, as upstream loginMenuAction does", () => {
+    expect(
+      accountMenuAction(snapshot({ providerId: "codex", accountEmail: "parity.user@example.com" })),
+    ).toEqual({ labelKey: "AddAccountEllipsis", settingsTab: "providers:codex" });
+  });
+
+  it.each(["claude", "grok"])("offers Switch Account... for a signed-in %s", (providerId) => {
     expect(accountMenuAction(snapshot({ providerId, accountEmail: "a@example.com" }))).toEqual({
       labelKey: "TrayMenuSwitchAccount",
       settingsTab: `providers:${providerId}`,

apps/desktop-tauri/src/lib/accountMenuRow.ts

@@ -21,10 +21,13 @@ export function accountMenuAction(
   provider: ProviderUsageSnapshot | null,
 ): AccountMenuAction | null {
   if (!provider || !ACCOUNT_MANAGER_PROVIDERS.has(provider.providerId)) return null;
+  // Upstream `CodexProviderImplementation.loginMenuAction` always offers
+  // "Add Account..." for Codex, signed in or not.
   const hasAccount =
-    Boolean(provider.accountEmail?.trim()) ||
-    hasLiveClaudeIdentity(provider) ||
-    hasSuccessfulClaudeCliQuota(provider);
+    provider.providerId !== "codex" &&
+    (Boolean(provider.accountEmail?.trim()) ||
+      hasLiveClaudeIdentity(provider) ||
+      hasSuccessfulClaudeCliQuota(provider));
   return {
     labelKey: hasAccount ? "TrayMenuSwitchAccount" : "AddAccountEllipsis",
     settingsTab: providersTabRequest(provider.providerId),

apps/desktop-tauri/src/lib/cardCost.test.ts

@@ -14,6 +14,7 @@ const STRINGS: Partial<Record<LocaleKey, string>> = {
   CostPeriodThisMonth: "This month",
   PanelToday: "Today",
   ProviderLabelMonthly: "Monthly",
+  WindowLabelMonthlyCredits: "Monthly credits",
 };
 const t = (key: LocaleKey) => STRINGS[key] ?? key;
 
@@ -142,6 +143,25 @@ describe("cardCostSection", () => {
     expect(section?.inline).toBe(true);
   });
 
+  it("prints Codex credits unitless, as upstream creditsUsageSection does", () => {
+    const balance = cardCostSection(
+      cost({ used: 125.5, period: "Credits", formattedUsed: "$125.50" }),
+      "detailed",
+      t,
+      "codex",
+    );
+    expect(balance?.spendLine).toBe("Balance: 125.5");
+    expect(balance?.inline).toBe(true);
+
+    const capped = cardCostSection(
+      cost({ used: 1234.567, limit: 2000, period: "Monthly credits", formattedUsed: "$1,234.57" }),
+      "detailed",
+      t,
+      "codex",
+    );
+    expect(capped?.spendLine).toBe("Monthly credits: 1,234.57 / 2,000");
+  });
+
   it("shows an uncapped spend with its period", () => {
     const section = cardCostSection(
       cost({ used: 2, currencyCode: "EUR", period: "Monthly", currencySymbol: "€" }),

apps/desktop-tauri/src/lib/cardCost.ts

@@ -55,6 +55,16 @@ function periodLabel(raw: string | null | undefined, fallback: string, t: Transl
   }
 }
 
+const creditsFormatter = new Intl.NumberFormat("en-US", { maximumFractionDigits: 2 });
+
+/** Mac `UsageFormatter.creditsNumberString`: a unitless credit count, max 2 decimals. */
+export function formatCreditsNumber(value: number): string {
+  return creditsFormatter.format(value);
+}
+
+/** Codex costs are credits; upstream `creditsUsageSection` prints them unitless. */
+const CREDIT_COST_PROVIDERS = new Set(["codex"]);
+
 /** A cost whose period names a balance carries the balance in `used`. */
 function periodNamesBalance(period: string): boolean {
   const normalized = period.trim().toLowerCase();
@@ -65,13 +75,19 @@ export function cardCostSection(
   cost: CostSnapshotBridge | null | undefined,
   style: CostSummaryDisplayStyle | undefined,
   t: Translate,
+  providerId?: string,
 ): CardCostSection | null {
   if (!cost) return null;
   if (style === "hidden" && cost.alwaysVisible !== true) return null;
 
   const isQuota = cost.currencyCode === "Quota";
+  const isCredits = providerId !== undefined && CREDIT_COST_PROVIDERS.has(providerId);
   const money = (value: number, formatted?: string | null) =>
-    isQuota ? value.toFixed(0) : formatted || formatCostAmount(value, cost.currencyCode);
+    isQuota
+      ? value.toFixed(0)
+      : isCredits
+        ? formatCreditsNumber(value)
+        : formatted || formatCostAmount(value, cost.currencyCode);
   const balanceText = (value: number) =>
     `${t("DetailCostBalance")}: ${money(value, cost.formattedBalance)}`;
   const limit = cost.limit ?? 0;

apps/desktop-tauri/src/types/bridge.ts

@@ -782,6 +782,11 @@ export interface ProviderUsageSnapshot {
   cost: CostSnapshotBridge | null;
   planName: string | null;
   accountEmail: string | null;
+  /**
+   * Active token-account label, shown in the header only when the provider
+   * reports no email (upstream account fallback). Never a scoping key.
+   */
+  accountLabel?: string | null;
   subscription?: SubscriptionMetadataSnapshot | null;
   sourceLabel: string;
   /** Backend proof of a live successful Claude CLI quota fetch; only true is proof. */