Port upstream CodexBar 0.56.5 [review]

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

@@ -103,6 +103,10 @@ pub struct CostSnapshotBridge {
     #[serde(default)]
     pub balance: Option<f64>,
     #[serde(default)]
+    pub balance_updated_at: Option<String>,
+    #[serde(default)]
+    pub account_id: Option<String>,
+    #[serde(default)]
     pub formatted_balance: Option<String>,
     #[serde(default)]
     pub daily: Vec<CostDailyPointBridge>,
@@ -195,6 +199,8 @@ pub struct ProviderUsageSnapshot {
     pub account_email: Option<String>,
     #[serde(default = "default_source_label")]
     pub source_label: String,
+    #[serde(default)]
+    pub has_successful_claude_cli_quota: bool,
     /// Defaults to launch time when absent so the card renders as fresh.
     #[serde(default)]
     pub updated_at: String,
@@ -378,6 +384,8 @@ impl ProviderUsageSnapshot {
                 formatted_used: c.format_used(),
                 formatted_limit: c.format_limit(),
                 balance: c.balance,
+                balance_updated_at: c.balance_updated_at.map(|dt| dt.to_rfc3339()),
+                account_id: c.account_id.clone(),
                 formatted_balance: c.format_balance(),
                 daily: c
                     .daily
@@ -392,6 +400,7 @@ impl ProviderUsageSnapshot {
             plan_name: usage.login_method.clone(),
             account_email: usage.account_email.clone(),
             source_label: result.source_label.clone(),
+            has_successful_claude_cli_quota: result.has_successful_claude_cli_quota,
             updated_at: usage.updated_at.to_rfc3339(),
             error: None,
             error_state: codexbar::core::ProviderStateKind::Ready,
@@ -438,6 +447,7 @@ impl ProviderUsageSnapshot {
             plan_name: None,
             account_email: None,
             source_label: String::new(),
+            has_successful_claude_cli_quota: false,
             updated_at: chrono::Utc::now().to_rfc3339(),
             error: Some(error),
             error_state: state_kind,

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

@@ -447,11 +447,13 @@ async fn refresh_provider(
 
 /// F6 (upstream 0.48.0 UsageStore+CodexResetBackfill): backfill missing
 /// `resets_at` / `reset_description` on fresh Codex windows from the cached
-/// lane data when the cached reset is still future. Fresh `used_percent` is
-/// untouched; only the reset timestamp/description are backfilled.
+/// lane data when the cached reset is still future. z.ai five-hour cached
+/// resets use the same plausibility bound as the provider parser, so an
+/// impossible rejected reset cannot be restored from the cache. Fresh
+/// `used_percent` is untouched; only reset metadata is backfilled.
 ///
-/// This is Codex-scoped by design (upstream: "Provider-specific by design"):
-/// other providers do not carry bounded resume state.
+/// This remains provider-scoped by design (upstream: "Provider-specific by
+/// design"): only Codex and z.ai carry the relevant bounded reset semantics.
 ///
 /// Applies to the bridge snapshot before publishing so every surface (tray,
 /// CLI, frontend) sees the backfilled reset instead of a missing one.
@@ -460,26 +462,31 @@ pub(super) fn codex_reset_backfill(
     cached: Option<&ProviderUsageSnapshot>,
 ) {
     let Some(cached) = cached else { return };
-    if snapshot.provider_id != "codex" {
+    if !matches!(snapshot.provider_id.as_str(), "codex" | "zai") {
         return;
     }
 
     // Backfill each slot from the corresponding cached slot.
-    backfill_slot_window(&mut snapshot.primary, &cached.primary);
+    backfill_slot_window(
+        &snapshot.provider_id,
+        &mut snapshot.primary,
+        &cached.primary,
+    );
     if let (Some(fresh), Some(cached_sec)) = (&mut snapshot.secondary, &cached.secondary) {
-        backfill_slot_window(fresh, cached_sec);
+        backfill_slot_window(&snapshot.provider_id, fresh, cached_sec);
     }
     // Tertiary (monthly/other): the Codex bridge doesn't normally populate this,
     // but the slot exists for forward-compat. Backfill when available.
     if let (Some(fresh), Some(cached_ter)) = (&mut snapshot.tertiary, &cached.tertiary) {
-        backfill_slot_window(fresh, cached_ter);
+        backfill_slot_window(&snapshot.provider_id, fresh, cached_ter);
     }
 }
 
 /// Backfill `resets_at` and `reset_description` on a fresh window from the
 /// cached window whose reset is still in the future. `used_percent` is never
 /// overwritten (upstream: "fresh used_percent untouched").
 fn backfill_slot_window(
+    provider_id: &str,
     fresh: &mut bridge::RateWindowSnapshot,
     cached: &bridge::RateWindowSnapshot,
 ) {
@@ -491,11 +498,20 @@ fn backfill_slot_window(
     };
     // Only backfill when the cached reset is still future — a stale reset is
     // worse than a missing one.
-    if let Ok(cached_dt) = chrono::DateTime::parse_from_rfc3339(cached_reset) {
-        if cached_dt <= chrono::Utc::now() {
-            return;
-        }
-    } else {
+    let Ok(cached_dt) = chrono::DateTime::parse_from_rfc3339(cached_reset) else {
+        return;
+    };
+    let now = chrono::Utc::now();
+    if cached_dt <= now {
+        return;
+    }
+    // A missing z.ai five-hour reset can mean the provider rejected an
+    // impossible future timestamp. Do not let equally impossible cached
+    // evidence undo that rejection, but preserve a plausible cached reset.
+    if provider_id == "zai"
+        && fresh.window_minutes == Some(300)
+        && cached_dt > now + chrono::Duration::minutes(5 * 60 + 1)
+    {
         return;
     }
     fresh.resets_at = Some(cached_reset.clone());
@@ -521,14 +537,17 @@ pub(super) fn preserve_last_good_transient_failure(
         return snapshot;
     }
 
-    let Some(previous) = guard
+    let Some(mut previous) = guard
         .provider_cache
         .iter()
         .find(|cached| cached.provider_id == id.cli_name() && cached.error.is_none())
         .cloned()
     else {
         return snapshot;
     };
+    // Preserved quota remains useful for display, but the failed current
+    // attempt cannot prove that Claude CLI is available for account actions.
+    previous.has_successful_claude_cli_quota = false;
 
     let count = guard
         .transient_provider_failure_counts
@@ -1133,6 +1152,7 @@ mod reset_backfill_tests {
             plan_name: None,
             account_email: None,
             source_label: String::new(),
+            has_successful_claude_cli_quota: false,
             updated_at: "2026-01-01T00:00:00Z".into(),
             error: None,
             error_state: codexbar::core::ProviderStateKind::Ready,
@@ -1192,6 +1212,24 @@ mod reset_backfill_tests {
         assert!(fresh.primary.resets_at.is_none(), "non-codex skip");
     }
 
+    #[test]
+    fn zai_five_hour_backfill_rejects_impossible_cached_reset() {
+        for (offset, should_backfill) in [
+            (chrono::Duration::hours(1), true),
+            (chrono::Duration::hours(10), false),
+        ] {
+            let future = (chrono::Utc::now() + offset).to_rfc3339();
+            let mut cached = codex_snapshot(win(50.0, Some(&future)));
+            cached.provider_id = "zai".into();
+            let mut fresh = codex_snapshot(win(30.0, None));
+            fresh.provider_id = "zai".into();
+            fresh.primary.reset_description = Some("5-hour".into());
+            codex_reset_backfill(&mut fresh, Some(&cached));
+            assert_eq!(fresh.primary.resets_at.is_some(), should_backfill);
+            assert!((fresh.primary.used_percent - 30.0).abs() < f64::EPSILON);
+        }
+    }
+
     #[test]
     fn f6_skips_when_no_cached_snapshot() {
         let mut fresh = codex_snapshot(win(30.0, None));

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

@@ -939,6 +939,7 @@ fn provider_cache_upsert_replaces_existing_provider() {
         cost: None,
         wayfinder_usage: None,
         source_label: "CLI".to_string(),
+        has_successful_claude_cli_quota: false,
         pace_authoritative: true,
     };
     let mut first =
@@ -963,6 +964,7 @@ fn provider_cache_prunes_disabled_providers() {
         cost: None,
         wayfinder_usage: None,
         source_label: "CLI".to_string(),
+        has_successful_claude_cli_quota: false,
         pace_authoritative: true,
     };
     let codex =
@@ -994,6 +996,7 @@ fn hiding_codex_spark_rows_preserves_other_extra_usage() {
         cost: None,
         wayfinder_usage: None,
         source_label: "CLI".to_string(),
+        has_successful_claude_cli_quota: false,
         pace_authoritative: true,
     };
     let mut snapshot =
@@ -1025,6 +1028,7 @@ fn claude_transient_auth_failure_preserves_first_last_good_snapshot() {
         cost: None,
         wayfinder_usage: None,
         source_label: "OAuth".to_string(),
+        has_successful_claude_cli_quota: false,
         pace_authoritative: true,
     };
     let good =
@@ -1056,6 +1060,7 @@ fn claude_repeated_auth_failure_surfaces_error() {
         cost: None,
         wayfinder_usage: None,
         source_label: "OAuth".to_string(),
+        has_successful_claude_cli_quota: false,
         pace_authoritative: true,
     };
     let good =
@@ -1092,6 +1097,7 @@ fn claude_cloudflare_challenge_retains_prior_usage_while_surfaceing_guidance() {
         cost: None,
         wayfinder_usage: None,
         source_label: "OAuth".to_string(),
+        has_successful_claude_cli_quota: false,
         pace_authoritative: true,
     };
     let good =
@@ -1139,6 +1145,7 @@ fn claude_cloudflare_challenge_keeps_prior_usage_when_guidance_surfaces() {
         cost: None,
         wayfinder_usage: None,
         source_label: "Web".to_string(),
+        has_successful_claude_cli_quota: false,
         pace_authoritative: true,
     };
     let mut good =
@@ -1182,6 +1189,7 @@ fn claude_cli_parse_failure_keeps_last_good_every_time() {
         cost: None,
         wayfinder_usage: None,
         source_label: "CLI".to_string(),
+        has_successful_claude_cli_quota: true,
         pace_authoritative: true,
     };
     let good =
@@ -1205,6 +1213,7 @@ fn claude_cli_parse_failure_keeps_last_good_every_time() {
 
     assert_eq!(first.error, None);
     assert_eq!(first.primary.used_percent, 17.0);
+    assert!(!first.has_successful_claude_cli_quota);
     // Parse failures keep last-good on every refresh (upstream #2247), unlike one-shot auth.
     assert_eq!(second.error, None);
     assert_eq!(second.primary.used_percent, 17.0);
@@ -1218,6 +1227,7 @@ fn claude_hard_credentials_missing_does_not_preserve_stale() {
         cost: None,
         wayfinder_usage: None,
         source_label: "OAuth".to_string(),
+        has_successful_claude_cli_quota: false,
         pace_authoritative: true,
     };
     let good =
@@ -1379,6 +1389,7 @@ fn japanese_provider_snapshot_localizes_weekly_label() {
         cost: None,
         wayfinder_usage: None,
         source_label: "OAuth".to_string(),
+        has_successful_claude_cli_quota: false,
         pace_authoritative: true,
     };
 
@@ -1409,6 +1420,7 @@ fn japanese_provider_snapshot_localizes_pace_reserve_description() {
         cost: None,
         wayfinder_usage: None,
         source_label: "OAuth".to_string(),
+        has_successful_claude_cli_quota: false,
         pace_authoritative: true,
     };