Port upstream CodexBar 0.56.1 [review]

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

@@ -25,7 +25,7 @@ const LOCAL_USAGE_TTL: Duration = Duration::from_secs(30);
 #[serde(rename_all = "camelCase")]
 pub struct DailyCostPoint {
     pub date: String,
-    pub value: f64,
+    pub value: Option<f64>,
 }
 
 /// A single (date, tokens) point for the Tokens chart mode (upstream 0.50.0
@@ -494,7 +494,7 @@ fn load_openai_dashboard_chart_data(
         .iter()
         .map(|d| DailyCostPoint {
             date: d.day.clone(),
-            value: d.total_credits_used,
+            value: Some(d.total_credits_used),
         })
         .collect();
 

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

@@ -33,6 +33,7 @@ pub async fn get_spend_contract(
             history_days,
             include_import,
             settings.hide_native_codex_cost_when_open_codex_present && provider == "codex",
+            settings.hide_personal_info,
             summary,
         )
     })

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

@@ -1117,16 +1117,16 @@ fn chart_data_serde_roundtrip_preserves_fields() {
         cost_history: vec![
             DailyCostPoint {
                 date: "2025-01-01".into(),
-                value: 1.25,
+                value: Some(1.25),
             },
             DailyCostPoint {
                 date: "2025-01-02".into(),
-                value: 0.0,
+                value: Some(0.0),
             },
         ],
         credits_history: vec![DailyCostPoint {
             date: "2025-01-01".into(),
-            value: 42.0,
+            value: Some(42.0),
         }],
         usage_breakdown: vec![DailyUsageBreakdown {
             day: "2025-01-01".into(),
@@ -1169,7 +1169,7 @@ fn chart_data_serde_roundtrip_preserves_fields() {
     assert_eq!(back.provider_id, "codex");
     assert_eq!(back.cost_history.len(), 2);
     assert_eq!(back.cost_history[0].date, "2025-01-01");
-    assert_eq!(back.credits_history[0].value, 42.0);
+    assert_eq!(back.credits_history[0].value, Some(42.0));
     assert_eq!(back.usage_breakdown[0].services.len(), 2);
     assert_eq!(back.usage_breakdown[0].total_credits_used, 13.5);
     assert_eq!(back.tokens_history[0].tokens, 123_456);

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

@@ -113,7 +113,8 @@ fn build_usage_spend_summary_cached(
     selected_days: u32,
     force_refresh: bool,
 ) -> Result<UsageSpendSummary, String> {
-    let key = usage_spend_cache_key(cached, selected_days);
+    let settings = codexbar::settings::Settings::load();
+    let key = usage_spend_cache_key(cached, selected_days, &settings);
     let mut guard = usage_spend_summary_cache()
         .lock()
         .map_err(|error| error.to_string())?;
@@ -125,16 +126,35 @@ fn build_usage_spend_summary_cached(
     }
     // Hold the cache mutex while building: callers for the same app revision
     // coalesce behind this single scan instead of starting parallel rescans.
-    let summary = build_usage_spend_summary(cached, selected_days);
+    let summary = build_usage_spend_summary(cached, selected_days, &settings);
     *guard = Some(CachedUsageSpendSummary {
         key,
         summary: summary.clone(),
     });
     Ok(summary)
 }
 
-fn usage_spend_cache_key(cached: &[ProviderUsageSnapshot], selected_days: u32) -> String {
-    let settings = codexbar::settings::Settings::load();
+fn usage_spend_cache_key(
+    cached: &[ProviderUsageSnapshot],
+    selected_days: u32,
+    settings: &codexbar::settings::Settings,
+) -> String {
+    usage_spend_cache_key_with_privacy(
+        cached,
+        selected_days,
+        settings.open_codex_usage_logs_enabled,
+        settings.hide_native_codex_cost_when_open_codex_present,
+        settings.hide_personal_info,
+    )
+}
+
+fn usage_spend_cache_key_with_privacy(
+    cached: &[ProviderUsageSnapshot],
+    selected_days: u32,
+    include_opencodex: bool,
+    hide_native: bool,
+    hide_personal_info: bool,
+) -> String {
     let mut revisions: Vec<String> = cached
         .iter()
         .map(|snapshot| {
@@ -162,35 +182,24 @@ fn usage_spend_cache_key(cached: &[ProviderUsageSnapshot], selected_days: u32) -
         .collect();
     revisions.sort();
     format!(
-        "{}|{}|{}|{}|{}",
+        "{}|{}|{}|{}|{}|{}",
         chrono::Local::now().date_naive(),
         selected_days,
-        settings.open_codex_usage_logs_enabled,
-        settings.hide_native_codex_cost_when_open_codex_present,
+        include_opencodex,
+        hide_native,
+        hide_personal_info,
         revisions.join(";")
     )
 }
 
 fn build_usage_spend_summary(
     cached: &[ProviderUsageSnapshot],
     selected_days: u32,
+    settings: &codexbar::settings::Settings,
 ) -> UsageSpendSummary {
-    let settings = codexbar::settings::Settings::load();
     let include_opencodex = settings.open_codex_usage_logs_enabled;
     let hide_native = settings.hide_native_codex_cost_when_open_codex_present;
 
-    let codex_cache_status =
-        codexbar::core::JsonlScanner::load_cache_status(codexbar::core::ProviderId::Codex, None);
-    let codex_stale = codex_cache_status.has_days && codex_cache_status.previous_report.is_some();
-    let codex_stale_updated_at = codex_stale
-        .then(|| {
-            codex_cache_status
-                .previous_report
-                .as_ref()
-                .and_then(|report| report.updated_at.clone())
-        })
-        .flatten();
-
     // Upstream 0.55.0 #3105: independent provider baselines load in parallel.
     // Keep each provider's 7d/30d scans serial so they can safely share that
     // provider's incremental cache, while Codex and Claude run concurrently.
@@ -214,18 +223,29 @@ fn build_usage_spend_summary(
             )
         });
 
+    let codex_stale = !codex_30_summary.history_coverage_established;
+    let codex_stale_updated_at = codex_stale
+        .then(|| {
+            codexbar::core::JsonlScanner::load_cache_status(codexbar::core::ProviderId::Codex, None)
+                .previous_report
+                .and_then(|report| report.updated_at)
+        })
+        .flatten();
+
     let codex_7_contract = build_local_spend_contract_from_summary(
         "codex",
         7,
         include_opencodex,
         hide_native,
+        settings.hide_personal_info,
         codex_7_summary.clone(),
     );
     let codex_30_contract = build_local_spend_contract_from_summary(
         "codex",
         30,
         include_opencodex,
         hide_native,
+        settings.hide_personal_info,
         codex_30_summary.clone(),
     );
 
@@ -415,6 +435,7 @@ fn build_usage_spend_summary(
         history_days,
         include_opencodex,
         hide_native,
+        settings.hide_personal_info,
         selected_summary,
     );
     UsageSpendSummary { rows, contract }
@@ -507,3 +528,15 @@ fn cached_spend(snapshot: Option<&ProviderUsageSnapshot>) -> SpendValues {
         stale_updated_at: None,
     }
 }
+
+#[cfg(test)]
+mod cache_key_tests {
+    use super::*;
+
+    #[test]
+    fn privacy_mode_is_part_of_usage_spend_cache_identity() {
+        let public = usage_spend_cache_key_with_privacy(&[], 30, false, false, false);
+        let private = usage_spend_cache_key_with_privacy(&[], 30, false, false, true);
+        assert_ne!(public, private);
+    }
+}

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

@@ -108,10 +108,11 @@ function LocalUsageBlock({
 }) {
   const { t } = useLocale();
   const isCodex = providerId === "codex";
-  const visibleHistory = costHistory
-    .slice(-30)
-    .filter((point) => point.value > 0);
-  const maxCost = Math.max(...visibleHistory.map((point) => point.value), 0);
+  const visibleHistory = costHistory.slice(-30);
+  const maxCost = Math.max(
+    ...visibleHistory.flatMap((point) => (point.value == null ? [] : [point.value])),
+    0,
+  );
 
   return (
     <section className="menu-card__group menu-card__local-usage">
@@ -148,9 +149,10 @@ function LocalUsageBlock({
             <span
               key={`${point.date}-${index}`}
               style={{
-                height: `${Math.max(4, Math.round((point.value / maxCost) * 64))}px`,
+                height: `${point.value == null || maxCost <= 0 ? 1 : Math.max(4, Math.round((point.value / maxCost) * 64))}px`,
+                opacity: point.value == null ? 0 : undefined,
               }}
-              title={`${point.date}: ${formatCurrency(point.value, "USD")}`}
+              title={point.value == null ? point.date : `${point.date}: ${formatCurrency(point.value, "USD")}`}
             />
           ))}
         </div>
@@ -443,7 +445,7 @@ export function describeCard(
   showPace = true,
 ): MenuCardPresence {
   const hasCostHistory =
-    chartData !== null && chartData.costHistory.some((point) => point.value > 0);
+    chartData !== null && chartData.costHistory.some((point) => point.value != null);
   const hasCreditsHistory =
     chartData !== null && chartData.creditsHistory.length > 0;
   const hasUsageBreakdown =

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

@@ -31,7 +31,8 @@ export function SimpleBarChart({
     );
   }
 
-  const max = Math.max(...points.map((p) => p.value), 0.0001);
+  const knownValues = points.flatMap((p) => (p.value == null ? [] : [p.value]));
+  const max = Math.max(...knownValues, 0.0001);
   const BAR_GAP = 2;
   const fmt = formatValue ?? ((v: number) => v.toFixed(2));
 
@@ -55,7 +56,7 @@ export function SimpleBarChart({
         aria-label={label ?? t("BarChartAriaLabel")}
       >
         {visible.map((p, i) => {
-          const barH = Math.max(1, (p.value / max) * (height - 4));
+          const barH = p.value == null ? 1 : Math.max(1, (p.value / max) * (height - 4));
           const x = i * (barWidth + BAR_GAP);
           const y = height - barH;
           return (
@@ -66,11 +67,11 @@ export function SimpleBarChart({
               width={barWidth}
               height={barH}
               fill={color}
-              opacity={p.value === 0 ? 0.25 : 0.9}
+              opacity={p.value == null ? 0 : p.value === 0 ? 0.25 : 0.9}
               rx={1}
             >
               <title>
-                {p.date}: {fmt(p.value)}
+                {p.value == null ? p.date : `${p.date}: ${fmt(p.value)}`}
               </title>
             </rect>
           );

apps/desktop-tauri/src/components/charts/BarChart.test.tsx

@@ -0,0 +1,25 @@
+import { render } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
+import { BarChart } from "./BarChart";
+
+describe("BarChart calendar slots", () => {
+  it("keeps unknown and known-zero slots distinct", () => {
+    const { container } = render(
+      <BarChart
+        data={[
+          { label: "unknown", value: null },
+          { label: "zero", value: 0 },
+          { label: "known", value: 2 },
+        ]}
+        ariaLabel="history"
+        animations={false}
+      />,
+    );
+    const bars = container.querySelectorAll(".chart__bar");
+    expect(bars).toHaveLength(3);
+    expect(bars[0]).toHaveAttribute("opacity", "0");
+    expect(bars[1]).toHaveAttribute("opacity", "0.25");
+    expect(container).toHaveTextContent("unknown");
+    expect(container).toHaveTextContent("zero: 0.00");
+  });
+});

apps/desktop-tauri/src/components/charts/BarChart.tsx

@@ -15,7 +15,7 @@ import { useChartAnimation } from "./useChartAnimation";
 
 export interface BarChartPoint {
   label: string;
-  value: number;
+  value: number | null;
 }
 
 export interface BarChartProps {
@@ -59,7 +59,7 @@ export function BarChart({
     let p = -1;
     for (let i = 0; i < data.length; i++) {
       const v = data[i].value;
-      if (v > m) {
+      if (v != null && v > m) {
         m = v;
         p = i;
       }
@@ -101,7 +101,7 @@ export function BarChart({
         aria-label={ariaLabel}
       >
         {data.map((p, i) => {
-          const base = p.value === 0 ? 1 : Math.max(3, (p.value / max) * plotHeight);
+          const base = p.value == null ? 1 : p.value === 0 ? 1 : Math.max(3, (p.value / max) * plotHeight);
           const eased = anim.barProgress(i);
           const barH = base * eased;
           const x = i * (barWidth + BAR_GAP);
@@ -119,14 +119,14 @@ export function BarChart({
                 width={barWidth}
                 height={bodyH}
                 fill={color}
-                opacity={p.value === 0 ? 0.25 : isHovered ? 1 : 0.9}
+                opacity={p.value == null ? 0 : p.value === 0 ? 0.25 : isHovered ? 1 : 0.9}
                 rx={1}
                 className="chart__bar"
-                onMouseMove={(e) => onMove(e, i)}
+                onMouseMove={p.value == null ? undefined : (e) => onMove(e, i)}
                 onMouseLeave={onLeave}
               >
                 <title>
-                  {p.label}: {fmt(p.value)}
+                  {p.value == null ? p.label : `${p.label}: ${fmt(p.value)}`}
                 </title>
               </rect>
               {isPeak && (
@@ -157,7 +157,7 @@ export function BarChart({
           role="tooltip"
         >
           <span className="chart__tooltip-label">{data[hover.i].label}</span>
-          <strong>{fmt(data[hover.i].value)}</strong>
+          <strong>{fmt(data[hover.i].value ?? 0)}</strong>
         </div>
       )}
     </div>

apps/desktop-tauri/src/components/charts/LineChart.test.tsx

@@ -0,0 +1,26 @@
+import { render } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
+import { LineChart } from "./LineChart";
+
+describe("LineChart unknown values", () => {
+  it("renders gaps for unknown values while preserving known zero", () => {
+    const { container } = render(
+      <LineChart
+        data={[
+          { label: "2026-09-01", value: 1 },
+          { label: "2026-09-02", value: 0 },
+          { label: "2026-09-03", value: null },
+          { label: "2026-09-04", value: 2 },
+          { label: "2026-09-05", value: 3 },
+        ]}
+        ariaLabel="credits history"
+        animations={false}
+      />,
+    );
+
+    expect(container.querySelectorAll(".chart__point")).toHaveLength(4);
+    expect(container.querySelectorAll(".chart__line")).toHaveLength(2);
+    expect(container).toHaveTextContent("2026-09-02: 0.00");
+    expect(container).not.toHaveTextContent("2026-09-03: 0.00");
+  });
+});