Port upstream CodexBar 0.56.0 [review]

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

@@ -102,6 +102,8 @@ pub struct CostSnapshotBridge {
     pub formatted_balance: Option<String>,
     #[serde(default)]
     pub daily: Vec<CostDailyPointBridge>,
+    #[serde(default)]
+    pub always_visible: bool,
 }
 
 fn default_currency() -> String {
@@ -333,10 +335,12 @@ impl ProviderUsageSnapshot {
                     .unwrap_or_else(|| metadata.session_label.to_string()),
             ),
             secondary: secondary_snap,
-            secondary_label: usage
-                .secondary
-                .as_ref()
-                .map(|_| metadata.weekly_label.to_string()),
+            secondary_label: usage.secondary.as_ref().map(|_| {
+                usage
+                    .secondary_label
+                    .clone()
+                    .unwrap_or_else(|| metadata.weekly_label.to_string())
+            }),
             model_specific: usage
                 .model_specific
                 .as_ref()
@@ -385,6 +389,7 @@ impl ProviderUsageSnapshot {
                         amount: point.amount,
                     })
                     .collect(),
+                always_visible: c.always_visible,
             }),
             plan_name: usage.login_method.clone(),
             account_email: usage.account_email.clone(),

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

@@ -137,6 +137,7 @@ fn cookie_source_provider(provider_id: &str) -> Option<codexbar::core::ProviderI
         "opencode" => ProviderId::OpenCode,
         "factory" => ProviderId::Factory,
         "alibaba" => ProviderId::Alibaba,
+        "alibabatokenplan" => ProviderId::AlibabaTokenPlan,
         "kimi" | "kimik2" => ProviderId::Kimi,
         "minimax" => ProviderId::MiniMax,
         "augment" => ProviderId::Augment,
@@ -547,7 +548,7 @@ pub fn cookie_source_options_for(provider_id: &str, lang: Language) -> Vec<Cooki
                 None,
             ),
         ],
-        "alibaba" => vec![
+        "alibaba" | "alibabatokenplan" => vec![
             cookie_option(
                 lang,
                 "auto",

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

@@ -179,15 +179,15 @@ fn build_usage_spend_summary(
     let include_opencodex = settings.open_codex_usage_logs_enabled;
     let hide_native = settings.hide_native_codex_cost_when_open_codex_present;
 
-    let codex_cache =
-        codexbar::core::JsonlScanner::load_cache(codexbar::core::ProviderId::Codex, None);
-    let codex_stale = !codex_cache.days.is_empty() && codex_cache.previous_report.is_some();
+    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
+            codex_cache_status
                 .previous_report
                 .as_ref()
-                .and_then(|r| r.updated_at.clone())
+                .and_then(|report| report.updated_at.clone())
         })
         .flatten();
 
@@ -351,13 +351,16 @@ fn build_usage_spend_summary(
                 spend
             }
             "antigravity" => {
+                use codexbar::providers::antigravity::local_sessions::LocalHistoryCoverage;
                 let seven = codexbar::providers::antigravity::local_sessions::summarize(7);
                 let thirty = codexbar::providers::antigravity::local_sessions::summarize(30);
                 let mut spend = cached_spend(cached_snapshot);
-                spend.seven_day_tokens = (seven.session_count > 0).then_some(seven.total_tokens);
-                spend.thirty_day_tokens = (thirty.session_count > 0).then_some(thirty.total_tokens);
-                if thirty.session_count > 0 {
-                    spend.source = "local Antigravity sessions".to_string();
+                spend.seven_day_tokens = matches!(seven.coverage, LocalHistoryCoverage::Complete)
+                    .then_some(seven.total_tokens);
+                spend.thirty_day_tokens = matches!(thirty.coverage, LocalHistoryCoverage::Complete)
+                    .then_some(thirty.total_tokens);
+                if matches!(thirty.coverage, LocalHistoryCoverage::Complete) {
+                    spend.source = "local Antigravity history".to_string();
                 }
                 spend
             }

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

@@ -1079,6 +1079,7 @@ mod tests {
                 balance: None,
                 formatted_balance: None,
                 daily: Vec::new(),
+                always_visible: false,
             }),
             plan_name: None,
             account_email: None,

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

@@ -86,6 +86,7 @@ function renderCard(
     showResetWhenExhausted?: boolean;
     showPace?: boolean;
     onLayoutChange?: () => void;
+    costSummaryDisplayStyle?: "compact" | "detailed" | "hidden";
   } = {},
 ) {
   return render(
@@ -98,6 +99,7 @@ function renderCard(
           showAsUsed: opts.showAsUsed,
           showResetWhenExhausted: opts.showResetWhenExhausted,
           showPace: opts.showPace,
+          costSummaryDisplayStyle: opts.costSummaryDisplayStyle,
         }}
         onLayoutChange={opts.onLayoutChange}
       />
@@ -111,6 +113,7 @@ describe("MenuCard", () => {
     tauriMocks.getLocaleStrings.mockResolvedValue(
       buildBundle({
         ActionCopyError: "Copy error",
+        ApiSpendTitle: "API spend",
         DetailPaceRunsOutIn: "Runs out in",
         PanelEstimatedFromLocalLogs: "Estimated from local logs",
         PanelLeftSuffix: "left",
@@ -167,6 +170,31 @@ describe("MenuCard", () => {
     eventMocks.listen.mockResolvedValue(() => {});
   });
 
+  it("keeps Fireworks vendor API spend visible when local cost summaries are hidden", async () => {
+    const snapshot = provider(null, 0);
+    snapshot.providerId = "fireworks";
+    snapshot.displayName = "Fireworks";
+    snapshot.cost = {
+      used: 12.34,
+      limit: null,
+      remaining: null,
+      currencyCode: "USD",
+      currencySymbol: "$",
+      period: "30 days",
+      resetsAt: null,
+      formattedUsed: "$12.34",
+      formattedLimit: null,
+      balance: null,
+      formattedBalance: null,
+      daily: [],
+      alwaysVisible: true,
+    };
+
+    renderCard(snapshot, { costSummaryDisplayStyle: "hidden" });
+
+    expect(await screen.findByText("API spend")).toBeInTheDocument();
+    expect(document.querySelector(".menu-card__cost-line")).toHaveTextContent("$12.34");
+  });
   it("does not mix stale local usage into an error card", async () => {
     const { container } = renderCard(
       provider("OAuth error: Claude OAuth credentials not found."),

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

@@ -453,7 +453,9 @@ export function describeCard(
   const localUsage = provider.error ? null : chartData?.localUsage ?? null;
   const wayfinderUsage = isWayfinder ? provider.wayfinderUsage : null;
   const hasMetrics = visibleMetrics.length > 0;
-  const hasCost = !!provider.cost && costSummaryDisplayStyle !== "hidden";
+  const hasCost =
+    !!provider.cost &&
+    (costSummaryDisplayStyle !== "hidden" || provider.cost.alwaysVisible === true);
   const hasPace = showPace && !!provider.pace;
   const hasDetails =
     !provider.error &&
@@ -538,13 +540,15 @@ export default function MenuCardDetails({
         />
       )}
 
-      {hasMetrics && hasCost && costStyle !== "hidden" && <div className="menu-card__divider" />}
+      {hasMetrics && hasCost && <div className="menu-card__divider" />}
 
-      {provider.cost && costStyle !== "hidden" && (
+      {hasCost && provider.cost && (
         <section className="menu-card__group menu-card__cost">
           <div className="menu-card__group-title">
-            {provider.cost.balance != null && provider.cost.limit == null
-              ? provider.cost.period || t("CreditsLabel")
+            {provider.cost.alwaysVisible === true && (provider.cost.limit ?? 0) <= 0
+              ? t("ApiSpendTitle")
+              : provider.cost.balance != null && provider.cost.limit == null
+                ? provider.cost.period || t("CreditsLabel")
               : `${t("DetailCostTitle")} — ${provider.cost.period}`}
           </div>
           {provider.cost.balance != null && provider.cost.limit == null ? (

apps/desktop-tauri/src/i18n/keys.ts

@@ -570,6 +570,7 @@ export const ALL_LOCALE_KEYS = [
   "DetailPaceRunsOutIn",
   "DetailPaceWillLastToReset",
   "DetailCostTitle",
+  "ApiSpendTitle",
   "DetailCostUsed",
   "DetailCostLimit",
   "DetailCostRemaining",

apps/desktop-tauri/src/surfaces/settings/providers/ProviderDetailPane.tsx

@@ -28,7 +28,7 @@ import { CostSection } from "./sections/CostSection";
 import { QuickActionsSection } from "./sections/QuickActionsSection";
 import { ChartsSection } from "./sections/charts/ChartsSection";
 import { CookieSourceSection } from "./sections/CookieSourceSection";
-import { GrokUsageSourceSection } from "./sections/GrokUsageSourceSection";
+import { UsageSourceSection } from "./sections/UsageSourceSection";
 import { RegionSection } from "./sections/RegionSection";
 import { CodexUsageOptions } from "./sections/credentials/CodexUsageOptions";
 import { CodexAccountsSection } from "./sections/credentials/CodexAccountsSection";
@@ -302,19 +302,21 @@ export function ProviderDetailPane({
       <PaceSection pace={detail.pace} t={t} />
       <CostSection cost={detail.cost} t={t} />
 
-      <GrokUsageSourceSection
+      <UsageSourceSection
         providerId={detail.id}
         currentValue={detail.usageSource}
         t={t}
         onChanged={reload}
       />
-      <CookieSourceSection
-        providerId={detail.id}
-        currentValue={detail.cookieSource}
-        options={cookieOptions}
-        t={t}
-        onChanged={reload}
-      />
+      {!(detail.id === "alibabatokenplan" && detail.usageSource === "cli") && (
+        <CookieSourceSection
+          providerId={detail.id}
+          currentValue={detail.cookieSource}
+          options={cookieOptions}
+          t={t}
+          onChanged={reload}
+        />
+      )}
       <RegionSection
         providerId={detail.id}
         currentValue={detail.region}

apps/desktop-tauri/src/surfaces/settings/providers/sections/MenuBarMetricSection.test.tsx

@@ -48,6 +48,36 @@ function rateWindow(usedPercent: number) {
 }
 
 describe("MenuBarMetricSection", () => {
+  it("offers Monthly for OpenCode Go only after a tertiary window is observed", () => {
+    const base = provider(false);
+    base.id = "opencodego";
+    base.displayName = "OpenCode Go";
+    base.tertiary = null;
+    const { rerender } = render(
+      <MenuBarMetricSection
+        provider={base}
+        providerMetrics={{}}
+        disabled={false}
+        t={(key) => key}
+        onChange={vi.fn()}
+      />,
+    );
+
+    expect(screen.queryByRole("option", { name: "DetailWindowTertiary" })).not.toBeInTheDocument();
+
+    const observed = { ...base, tertiary: rateWindow(37) };
+    rerender(
+      <MenuBarMetricSection
+        provider={observed}
+        providerMetrics={{}}
+        disabled={false}
+        t={(key) => key}
+        onChange={vi.fn()}
+      />,
+    );
+
+    expect(screen.getByRole("option", { name: "DetailWindowTertiary" })).toBeInTheDocument();
+  });
   it("offers extra usage when a provider has extra rate windows", () => {
     const onChange = vi.fn();
     render(

apps/desktop-tauri/src/surfaces/settings/providers/sections/UsageSourceSection.test.tsx

@@ -0,0 +1,44 @@
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+
+const tauriMocks = vi.hoisted(() => ({
+  setProviderUsageSource: vi.fn(),
+}));
+
+vi.mock("../../../../lib/tauri", () => tauriMocks);
+
+import { UsageSourceSection } from "./UsageSourceSection";
+
+describe("UsageSourceSection", () => {
+  it("offers Bailian Auto, CLI, and Web and persists explicit CLI selection", async () => {
+    const onChanged = vi.fn();
+    tauriMocks.setProviderUsageSource.mockResolvedValue(undefined);
+
+    render(
+      <UsageSourceSection
+        providerId="alibabatokenplan"
+        currentValue="auto"
+        t={(key) => key}
+        onChanged={onChanged}
+      />,
+    );
+
+    expect(screen.getByRole("radio", { name: "Auto" })).toHaveAttribute("aria-checked", "true");
+    expect(screen.getByRole("radio", { name: "Bailian CLI" })).toBeInTheDocument();
+    expect(screen.getByRole("radio", { name: "Browser cookies" })).toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole("radio", { name: "Bailian CLI" }));
+
+    await waitFor(() => {
+      expect(tauriMocks.setProviderUsageSource).toHaveBeenCalledWith("alibabatokenplan", "cli");
+      expect(onChanged).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  it("does not render for unrelated providers", () => {
+    const { container } = render(
+      <UsageSourceSection providerId="codex" currentValue="auto" t={(key) => key} onChanged={vi.fn()} />,
+    );
+    expect(container).toBeEmptyDOMElement();
+  });
+});

apps/desktop-tauri/src/surfaces/settings/providers/sections/GrokUsageSourceSection.tsx → apps/desktop-tauri/src/surfaces/settings/providers/sections/UsageSourceSection.tsx

@@ -31,8 +31,26 @@ const GROK_OPTIONS = [
     description: "Uses the configured grok.com browser session only.",
   },
 ] as const;
+const ALIBABA_TOKEN_PLAN_OPTIONS = [
+  {
+    value: "auto",
+    label: "Auto",
+    description: "Tries the signed-in Bailian CLI first, then browser cookies.",
+  },
+  {
+    value: "cli",
+    label: "Bailian CLI",
+    description: "Uses the locally signed-in Bailian CLI only.",
+  },
+  {
+    value: "web",
+    label: "Browser cookies",
+    description: "Uses the configured Model Studio / Bailian browser session only.",
+  },
+] as const;
+
 
-export function GrokUsageSourceSection({
+export function UsageSourceSection({
   providerId,
   currentValue,
   t,
@@ -41,10 +59,16 @@ export function GrokUsageSourceSection({
   const [busy, setBusy] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
-  if (providerId !== "grok") return null;
+  const options =
+    providerId === "grok"
+      ? GROK_OPTIONS
+      : providerId === "alibabatokenplan"
+        ? ALIBABA_TOKEN_PLAN_OPTIONS
+        : null;
+  if (!options) return null;
 
   const selected = currentValue ?? "auto";
-  const selectedOption = GROK_OPTIONS.find((option) => option.value === selected) ?? GROK_OPTIONS[0];
+  const selectedOption = options.find((option) => option.value === selected) ?? options[0];
 
   const handleSelect = async (value: string) => {
     if (value === selected || busy) return;
@@ -64,7 +88,7 @@ export function GrokUsageSourceSection({
     <section className="provider-detail-section provider-detail-usage-source">
       <h4>{t("UsageSource")}</h4>
       <div role="radiogroup" aria-label={t("UsageSource")} className="provider-detail-segmented">
-        {GROK_OPTIONS.map((option) => {
+        {options.map((option) => {
           const isActive = option.value === selected;
           return (
             <button

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

@@ -551,6 +551,8 @@ export interface CostSnapshotBridge {
   balance?: number | null;
   formattedBalance?: string | null;
   daily?: CostDailyPoint[];
+  /** Provider-metered spend that is itself a primary usage signal. */
+  alwaysVisible?: boolean;
 }
 
 export interface PaceSnapshot {

rust/Cargo.toml

@@ -91,6 +91,7 @@ windows = { version = "0.58", features = [
     "Win32_Media_Audio",
     "Win32_System_LibraryLoader",
     "Win32_UI_WindowsAndMessaging",
+    "Win32_Storage_FileSystem",
 ] }
 
 winreg = "0.55"