From c40d6a7fa40de08df23683e4278bd4095482a576 Mon Sep 17 00:00:00 2001
From: nytemodeonly <contact@nytemode.com>
Date: Fri, 24 Jul 2026 14:25:07 -0500
Subject: [PATCH 1/2] feat(desktop): show local Codex usage in sidebar

Co-authored-by: nytemodeonly <contact@nytemode.com>
Signed-off-by: nytemodeonly <contact@nytemode.com>
---
 desktop/src-tauri/src/commands/mod.rs         |   2 +
 .../src-tauri/src/commands/provider_usage.rs  | 347 ++++++++++++++++++
 desktop/src-tauri/src/lib.rs                  |   1 +
 .../provider-usage/providerUsageDisplay.d.mts |  11 +
 .../provider-usage/providerUsageDisplay.mjs   |  56 +++
 .../providerUsageDisplay.test.mjs             |  33 ++
 .../ui/SidebarProviderUsageIndicator.tsx      | 240 ++++++++++++
 .../src/features/settings/ui/SettingsView.tsx |   5 +
 .../src/features/sidebar/ui/AppSidebar.tsx    |   4 +
 desktop/src/shared/api/tauriProviderUsage.ts  |  20 +
 preview-features.json                         |   9 +
 11 files changed, 728 insertions(+)
 create mode 100644 desktop/src-tauri/src/commands/provider_usage.rs
 create mode 100644 desktop/src/features/provider-usage/providerUsageDisplay.d.mts
 create mode 100644 desktop/src/features/provider-usage/providerUsageDisplay.mjs
 create mode 100644 desktop/src/features/provider-usage/providerUsageDisplay.test.mjs
 create mode 100644 desktop/src/features/provider-usage/ui/SidebarProviderUsageIndicator.tsx
 create mode 100644 desktop/src/shared/api/tauriProviderUsage.ts

diff --git a/desktop/src-tauri/src/commands/mod.rs b/desktop/src-tauri/src/commands/mod.rs
index 7e9d916be6..bb7e92756c 100644
--- a/desktop/src-tauri/src/commands/mod.rs
+++ b/desktop/src-tauri/src/commands/mod.rs
@@ -46,6 +46,7 @@ mod project_git_push;
 mod project_git_workflow;
 mod project_repo_paths;
 mod project_terminal;
+mod provider_usage;
 mod qr_download;
 mod relay_members;
 mod relay_reconnect;
@@ -96,6 +97,7 @@ pub use project_git_branches::*;
 pub use project_git_diff::*;
 pub use project_git_workflow::*;
 pub use project_terminal::*;
+pub use provider_usage::*;
 pub use qr_download::*;
 pub use relay_members::*;
 pub use relay_reconnect::*;
diff --git a/desktop/src-tauri/src/commands/provider_usage.rs b/desktop/src-tauri/src/commands/provider_usage.rs
new file mode 100644
index 0000000000..234944f9f7
--- /dev/null
+++ b/desktop/src-tauri/src/commands/provider_usage.rs
@@ -0,0 +1,347 @@
+use serde::Serialize;
+use serde_json::{json, Value};
+use std::io::{BufRead, BufReader, Write};
+use std::process::{Child, Command, Stdio};
+use std::sync::mpsc;
+use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
+
+const RESPONSE_TIMEOUT: Duration = Duration::from_secs(10);
+
+#[derive(Debug, Serialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct CodexProviderUsage {
+    provider: &'static str,
+    plan_type: Option<String>,
+    used_percent: u64,
+    remaining_percent: u64,
+    resets_at: Option<i64>,
+    window_duration_minutes: Option<u64>,
+    credit_balance: Option<String>,
+    reset_credits_available: Option<u64>,
+    lifetime_tokens: Option<u64>,
+    latest_daily_tokens: Option<u64>,
+    latest_daily_date: Option<String>,
+    fetched_at: u64,
+}
+
+#[tauri::command]
+pub async fn get_codex_provider_usage() -> Result<CodexProviderUsage, String> {
+    let codex_path = crate::managed_agents::resolve_command("codex")
+        .ok_or_else(|| "codex_not_installed".to_string())?;
+
+    tokio::task::spawn_blocking(move || read_codex_provider_usage(&codex_path))
+        .await
+        .map_err(|_| "codex_usage_task_failed".to_string())?
+}
+
+fn read_codex_provider_usage(codex_path: &std::path::Path) -> Result<CodexProviderUsage, String> {
+    let mut command = Command::new(codex_path);
+    command
+        .args(["app-server", "--stdio"])
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        // App-server stderr can contain local configuration details. The
+        // indicator exposes stable error codes instead of forwarding it.
+        .stderr(Stdio::null());
+    if let Some(workdir) = crate::managed_agents::default_agent_workdir() {
+        command.current_dir(workdir);
+    }
+    if let Some(path) = crate::managed_agents::login_shell_path() {
+        command.env("PATH", path);
+    }
+    // The npm/Homebrew Codex launcher can hand off to a native binary. Keep
+    // the whole launcher tree in one process group so timeout/error cleanup
+    // also closes descendants that inherited stdout.
+    #[cfg(unix)]
+    {
+        use std::os::unix::process::CommandExt;
+        command.process_group(0);
+    }
+    crate::util::configure_no_window(&mut command);
+
+    let mut child = command
+        .spawn()
+        .map_err(|_| "codex_app_server_start_failed".to_string())?;
+    let mut stdin = child
+        .stdin
+        .take()
+        .ok_or_else(|| finish_with_error(&mut child, "codex_app_server_stdin_unavailable"))?;
+    let stdout = child
+        .stdout
+        .take()
+        .ok_or_else(|| finish_with_error(&mut child, "codex_app_server_stdout_unavailable"))?;
+
+    for message in app_server_requests() {
+        writeln!(stdin, "{message}")
+            .map_err(|_| finish_with_error(&mut child, "codex_app_server_write_failed"))?;
+    }
+    stdin
+        .flush()
+        .map_err(|_| finish_with_error(&mut child, "codex_app_server_write_failed"))?;
+
+    let (sender, receiver) = mpsc::channel();
+    let reader = std::thread::spawn(move || {
+        for line in BufReader::new(stdout).lines() {
+            if sender.send(line).is_err() {
+                break;
+            }
+        }
+    });
+
+    let deadline = Instant::now() + RESPONSE_TIMEOUT;
+    let mut rate_limits = None;
+    let mut token_usage = None;
+
+    while rate_limits.is_none() || token_usage.is_none() {
+        let now = Instant::now();
+        if now >= deadline {
+            stop_child(&mut child);
+            let _ = reader.join();
+            return Err("codex_usage_timeout".to_string());
+        }
+
+        match receiver.recv_timeout(deadline.saturating_duration_since(now)) {
+            Ok(Ok(line)) => {
+                let Ok(message) = serde_json::from_str::<Value>(&line) else {
+                    continue;
+                };
+                if let Some(error_code) = response_error_code(&message) {
+                    stop_child(&mut child);
+                    let _ = reader.join();
+                    return Err(error_code);
+                }
+                match message.get("id").and_then(Value::as_u64) {
+                    Some(2) => rate_limits = message.get("result").cloned(),
+                    Some(3) => token_usage = message.get("result").cloned(),
+                    _ => {}
+                }
+            }
+            Ok(Err(_)) => {
+                stop_child(&mut child);
+                let _ = reader.join();
+                return Err("codex_app_server_read_failed".to_string());
+            }
+            Err(mpsc::RecvTimeoutError::Timeout) => {
+                stop_child(&mut child);
+                let _ = reader.join();
+                return Err("codex_usage_timeout".to_string());
+            }
+            Err(mpsc::RecvTimeoutError::Disconnected) => {
+                stop_child(&mut child);
+                let _ = reader.join();
+                return Err("codex_app_server_closed".to_string());
+            }
+        }
+    }
+
+    stop_child(&mut child);
+    let _ = reader.join();
+    normalize_usage(
+        rate_limits.as_ref().expect("rate limits checked above"),
+        token_usage.as_ref().expect("token usage checked above"),
+        unix_timestamp(),
+    )
+}
+
+fn app_server_requests() -> [Value; 4] {
+    [
+        json!({
+            "method": "initialize",
+            "id": 1,
+            "params": {
+                "clientInfo": {
+                    "name": "buzz_desktop",
+                    "title": "Buzz Desktop",
+                    "version": env!("CARGO_PKG_VERSION")
+                },
+                "capabilities": {
+                    "experimentalApi": true,
+                    "optOutNotificationMethods": [
+                        "thread/started",
+                        "item/agentMessage/delta"
+                    ]
+                }
+            }
+        }),
+        json!({"method": "initialized", "params": {}}),
+        json!({"method": "account/rateLimits/read", "id": 2, "params": null}),
+        json!({"method": "account/usage/read", "id": 3, "params": null}),
+    ]
+}
+
+fn response_error_code(message: &Value) -> Option<String> {
+    let error = message.get("error")?;
+    let detail = error
+        .get("message")
+        .and_then(Value::as_str)
+        .unwrap_or_default()
+        .to_ascii_lowercase();
+    if detail.contains("auth") || detail.contains("login") {
+        return Some("codex_not_authenticated".to_string());
+    }
+    if detail.contains("experimental") || detail.contains("method") {
+        return Some("codex_usage_protocol_unsupported".to_string());
+    }
+    Some("codex_usage_unavailable".to_string())
+}
+
+fn normalize_usage(
+    rate_limits_result: &Value,
+    token_usage_result: &Value,
+    fetched_at: u64,
+) -> Result<CodexProviderUsage, String> {
+    let snapshot = rate_limits_result
+        .get("rateLimits")
+        .ok_or_else(|| "codex_usage_invalid_response".to_string())?;
+    let primary = snapshot
+        .get("primary")
+        .filter(|value| !value.is_null())
+        .ok_or_else(|| "codex_usage_limit_unavailable".to_string())?;
+    let used_percent = primary
+        .get("usedPercent")
+        .and_then(Value::as_u64)
+        .ok_or_else(|| "codex_usage_invalid_response".to_string())?
+        .min(100);
+
+    let latest_bucket = token_usage_result
+        .get("dailyUsageBuckets")
+        .and_then(Value::as_array)
+        .and_then(|buckets| {
+            buckets.iter().max_by_key(|bucket| {
+                bucket
+                    .get("startDate")
+                    .and_then(Value::as_str)
+                    .unwrap_or_default()
+            })
+        });
+
+    Ok(CodexProviderUsage {
+        provider: "openai",
+        plan_type: snapshot
+            .get("planType")
+            .and_then(Value::as_str)
+            .map(str::to_owned),
+        used_percent,
+        remaining_percent: 100 - used_percent,
+        resets_at: primary.get("resetsAt").and_then(Value::as_i64),
+        window_duration_minutes: primary.get("windowDurationMins").and_then(Value::as_u64),
+        credit_balance: snapshot
+            .get("credits")
+            .and_then(|credits| credits.get("balance"))
+            .and_then(Value::as_str)
+            .map(str::to_owned),
+        reset_credits_available: rate_limits_result
+            .get("rateLimitResetCredits")
+            .and_then(|credits| credits.get("availableCount"))
+            .and_then(Value::as_u64),
+        lifetime_tokens: token_usage_result
+            .get("summary")
+            .and_then(|summary| summary.get("lifetimeTokens"))
+            .and_then(Value::as_u64),
+        latest_daily_tokens: latest_bucket
+            .and_then(|bucket| bucket.get("tokens"))
+            .and_then(Value::as_u64),
+        latest_daily_date: latest_bucket
+            .and_then(|bucket| bucket.get("startDate"))
+            .and_then(Value::as_str)
+            .map(str::to_owned),
+        fetched_at,
+    })
+}
+
+fn unix_timestamp() -> u64 {
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .unwrap_or_default()
+        .as_secs()
+}
+
+fn finish_with_error(child: &mut Child, code: &str) -> String {
+    stop_child(child);
+    code.to_string()
+}
+
+fn stop_child(child: &mut Child) {
+    let _ = crate::managed_agents::terminate_process(child.id());
+    let _ = child.kill();
+    let _ = child.wait();
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn normalizes_live_app_server_shape() {
+        let rate_limits = json!({
+            "rateLimits": {
+                "primary": {
+                    "usedPercent": 38,
+                    "windowDurationMins": 10080,
+                    "resetsAt": 1785258777
+                },
+                "credits": {
+                    "balance": "0"
+                },
+                "planType": "pro"
+            },
+            "rateLimitResetCredits": {
+                "availableCount": 3
+            }
+        });
+        let tokens = json!({
+            "summary": {
+                "lifetimeTokens": 13597623776_u64
+            },
+            "dailyUsageBuckets": [
+                {"startDate": "2026-07-23", "tokens": 373817016},
+                {"startDate": "2026-07-24", "tokens": 61038450}
+            ]
+        });
+
+        let usage = normalize_usage(&rate_limits, &tokens, 123).unwrap();
+        assert_eq!(usage.provider, "openai");
+        assert_eq!(usage.plan_type.as_deref(), Some("pro"));
+        assert_eq!(usage.used_percent, 38);
+        assert_eq!(usage.remaining_percent, 62);
+        assert_eq!(usage.resets_at, Some(1785258777));
+        assert_eq!(usage.window_duration_minutes, Some(10080));
+        assert_eq!(usage.credit_balance.as_deref(), Some("0"));
+        assert_eq!(usage.reset_credits_available, Some(3));
+        assert_eq!(usage.lifetime_tokens, Some(13_597_623_776));
+        assert_eq!(usage.latest_daily_tokens, Some(61_038_450));
+        assert_eq!(usage.latest_daily_date.as_deref(), Some("2026-07-24"));
+        assert_eq!(usage.fetched_at, 123);
+    }
+
+    #[test]
+    fn clamps_invalid_percentage_and_tolerates_optional_usage() {
+        let rate_limits = json!({
+            "rateLimits": {
+                "primary": {"usedPercent": 140}
+            }
+        });
+        let tokens = json!({"summary": {}, "dailyUsageBuckets": null});
+
+        let usage = normalize_usage(&rate_limits, &tokens, 1).unwrap();
+        assert_eq!(usage.used_percent, 100);
+        assert_eq!(usage.remaining_percent, 0);
+        assert_eq!(usage.lifetime_tokens, None);
+        assert_eq!(usage.latest_daily_tokens, None);
+    }
+
+    #[test]
+    fn maps_auth_errors_without_forwarding_details() {
+        let response = json!({
+            "id": 2,
+            "error": {
+                "code": -32000,
+                "message": "Login required for alice@example.com"
+            }
+        });
+        assert_eq!(
+            response_error_code(&response).as_deref(),
+            Some("codex_not_authenticated")
+        );
+    }
+}
diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
index 3b47866ac4..e124e04ad9 100644
--- a/desktop/src-tauri/src/lib.rs
+++ b/desktop/src-tauri/src/lib.rs
@@ -662,6 +662,7 @@ pub fn run() {
             transfer_builderlab_community,
             title_bar_double_click,
             get_identity,
+            get_codex_provider_usage,
             get_nsec,
             import_identity,
             persist_current_identity,
diff --git a/desktop/src/features/provider-usage/providerUsageDisplay.d.mts b/desktop/src/features/provider-usage/providerUsageDisplay.d.mts
new file mode 100644
index 0000000000..a6fb14684b
--- /dev/null
+++ b/desktop/src/features/provider-usage/providerUsageDisplay.d.mts
@@ -0,0 +1,11 @@
+export type ProviderUsageTone = "healthy" | "warning" | "critical";
+
+export function providerUsageTone(remainingPercent: number): ProviderUsageTone;
+
+export function formatTokenCount(value: number | null | undefined): string;
+
+export function formatUsageReset(
+  epochSeconds: number | null | undefined,
+): string;
+
+export function providerUsageErrorMessage(error: unknown): string;
diff --git a/desktop/src/features/provider-usage/providerUsageDisplay.mjs b/desktop/src/features/provider-usage/providerUsageDisplay.mjs
new file mode 100644
index 0000000000..61299f669e
--- /dev/null
+++ b/desktop/src/features/provider-usage/providerUsageDisplay.mjs
@@ -0,0 +1,56 @@
+// @ts-check
+
+/**
+ * @param {number} remainingPercent
+ * @returns {"healthy" | "warning" | "critical"}
+ */
+export function providerUsageTone(remainingPercent) {
+  if (remainingPercent < 20) return "critical";
+  if (remainingPercent <= 50) return "warning";
+  return "healthy";
+}
+
+/**
+ * @param {number | null | undefined} value
+ * @returns {string}
+ */
+export function formatTokenCount(value) {
+  if (typeof value !== "number" || !Number.isFinite(value)) return "—";
+  return new Intl.NumberFormat(undefined, {
+    notation: "compact",
+    maximumFractionDigits: 1,
+  }).format(value);
+}
+
+/**
+ * @param {number | null | undefined} epochSeconds
+ * @returns {string}
+ */
+export function formatUsageReset(epochSeconds) {
+  if (typeof epochSeconds !== "number" || !Number.isFinite(epochSeconds)) {
+    return "Reset unavailable";
+  }
+  return new Intl.DateTimeFormat(undefined, {
+    weekday: "short",
+    month: "short",
+    day: "numeric",
+    hour: "numeric",
+    minute: "2-digit",
+  }).format(new Date(epochSeconds * 1000));
+}
+
+/**
+ * @param {unknown} error
+ * @returns {string}
+ */
+export function providerUsageErrorMessage(error) {
+  const code = typeof error === "string" ? error : String(error ?? "");
+  if (code.includes("codex_not_installed")) return "Codex is not installed";
+  if (code.includes("codex_not_authenticated")) {
+    return "Sign in with Codex to show usage";
+  }
+  if (code.includes("protocol_unsupported")) {
+    return "Update Codex to show usage";
+  }
+  return "Usage temporarily unavailable";
+}
diff --git a/desktop/src/features/provider-usage/providerUsageDisplay.test.mjs b/desktop/src/features/provider-usage/providerUsageDisplay.test.mjs
new file mode 100644
index 0000000000..1c90bb637e
--- /dev/null
+++ b/desktop/src/features/provider-usage/providerUsageDisplay.test.mjs
@@ -0,0 +1,33 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  formatTokenCount,
+  providerUsageErrorMessage,
+  providerUsageTone,
+} from "./providerUsageDisplay.mjs";
+
+test("providerUsageTone follows the remaining-usage thresholds", () => {
+  assert.equal(providerUsageTone(62), "healthy");
+  assert.equal(providerUsageTone(50), "warning");
+  assert.equal(providerUsageTone(20), "warning");
+  assert.equal(providerUsageTone(19), "critical");
+});
+
+test("formatTokenCount stays compact and handles missing values", () => {
+  assert.equal(formatTokenCount(null), "—");
+  assert.match(formatTokenCount(13_597_623_776), /13[.,]?6B/i);
+});
+
+test("providerUsageErrorMessage never exposes raw app-server details", () => {
+  assert.equal(
+    providerUsageErrorMessage(
+      "codex_not_authenticated: alice@example.com should not render",
+    ),
+    "Sign in with Codex to show usage",
+  );
+  assert.equal(
+    providerUsageErrorMessage("unknown failure with local path /Users/alice"),
+    "Usage temporarily unavailable",
+  );
+});
diff --git a/desktop/src/features/provider-usage/ui/SidebarProviderUsageIndicator.tsx b/desktop/src/features/provider-usage/ui/SidebarProviderUsageIndicator.tsx
new file mode 100644
index 0000000000..268550ff73
--- /dev/null
+++ b/desktop/src/features/provider-usage/ui/SidebarProviderUsageIndicator.tsx
@@ -0,0 +1,240 @@
+import { useQuery } from "@tanstack/react-query";
+import { AlertTriangle, RefreshCw } from "lucide-react";
+
+import { getCodexProviderUsage } from "@/shared/api/tauriProviderUsage";
+import { Button } from "@/shared/ui/button";
+import { Popover, PopoverContent, PopoverTrigger } from "@/shared/ui/popover";
+import { Progress } from "@/shared/ui/progress";
+import { Spinner } from "@/shared/ui/spinner";
+import { cn } from "@/shared/lib/cn";
+import {
+  formatTokenCount,
+  formatUsageReset,
+  providerUsageErrorMessage,
+  providerUsageTone,
+} from "@/features/provider-usage/providerUsageDisplay.mjs";
+
+const FIVE_MINUTES = 5 * 60 * 1000;
+
+const toneClasses = {
+  healthy: {
+    stroke: "stroke-emerald-500",
+    text: "text-emerald-600 dark:text-emerald-400",
+    progress: "[&>div]:bg-emerald-500",
+  },
+  warning: {
+    stroke: "stroke-amber-500",
+    text: "text-amber-600 dark:text-amber-400",
+    progress: "[&>div]:bg-amber-500",
+  },
+  critical: {
+    stroke: "stroke-red-500",
+    text: "text-red-600 dark:text-red-400",
+    progress: "[&>div]:bg-red-500",
+  },
+} as const;
+
+function UsageRing({
+  isLoading,
+  remainingPercent,
+}: {
+  isLoading: boolean;
+  remainingPercent?: number;
+}) {
+  if (isLoading) {
+    return <Spinner aria-hidden="true" className="h-8 w-8 border-2" />;
+  }
+
+  if (remainingPercent === undefined) {
+    return (
+      <span className="flex h-8 w-8 items-center justify-center rounded-full bg-destructive/10 text-destructive">
+        <AlertTriangle aria-hidden="true" className="h-4 w-4" />
+      </span>
+    );
+  }
+
+  const tone = providerUsageTone(remainingPercent);
+  const circumference = 2 * Math.PI * 14;
+  const dashOffset = circumference * (1 - remainingPercent / 100);
+
+  return (
+    <span className="relative h-8 w-8 shrink-0" aria-hidden="true">
+      <svg className="-rotate-90 h-8 w-8" viewBox="0 0 32 32">
+        <title>Codex usage remaining</title>
+        <circle
+          className="stroke-muted"
+          cx="16"
+          cy="16"
+          fill="none"
+          r="14"
+          strokeWidth="3"
+        />
+        <circle
+          className={cn(
+            "transition-[stroke-dashoffset] duration-300",
+            toneClasses[tone].stroke,
+          )}
+          cx="16"
+          cy="16"
+          fill="none"
+          r="14"
+          strokeDasharray={circumference}
+          strokeDashoffset={dashOffset}
+          strokeLinecap="round"
+          strokeWidth="3"
+        />
+      </svg>
+    </span>
+  );
+}
+
+export function SidebarProviderUsageIndicator() {
+  const query = useQuery({
+    queryKey: ["provider-usage", "codex"],
+    queryFn: getCodexProviderUsage,
+    staleTime: FIVE_MINUTES,
+    refetchOnWindowFocus: true,
+    retry: 1,
+  });
+
+  const usage = query.data;
+  const tone =
+    usage === undefined ? undefined : providerUsageTone(usage.remainingPercent);
+  const planLabel =
+    usage?.planType === undefined || usage.planType === null
+      ? "Codex"
+      : `Codex ${usage.planType.charAt(0).toUpperCase()}${usage.planType.slice(1)}`;
+  const errorMessage = query.isError
+    ? providerUsageErrorMessage(query.error)
+    : null;
+
+  return (
+    <Popover>
+      <PopoverTrigger asChild>
+        <button
+          aria-label={
+            usage
+              ? `${planLabel}: ${usage.remainingPercent}% remaining`
+              : (errorMessage ?? "Loading Codex usage")
+          }
+          className="mb-2 flex w-full items-center gap-2 rounded-lg border border-sidebar-border/70 bg-sidebar-accent/35 px-2 py-2 text-left transition-colors hover:bg-sidebar-accent focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-sidebar-ring group-data-[collapsible=icon]:h-10 group-data-[collapsible=icon]:w-10 group-data-[collapsible=icon]:justify-center group-data-[collapsible=icon]:p-1"
+          data-testid="sidebar-provider-usage"
+          type="button"
+        >
+          <UsageRing
+            isLoading={query.isPending}
+            remainingPercent={usage?.remainingPercent}
+          />
+          <span className="min-w-0 flex-1 group-data-[collapsible=icon]:hidden">
+            <span className="block truncate text-xs font-medium">
+              {errorMessage ?? planLabel}
+            </span>
+            <span
+              className={cn(
+                "block truncate text-sm font-semibold tabular-nums",
+                tone ? toneClasses[tone].text : "text-muted-foreground",
+              )}
+            >
+              {usage ? `${usage.remainingPercent}% left` : "Checking usage…"}
+            </span>
+          </span>
+        </button>
+      </PopoverTrigger>
+
+      <PopoverContent align="end" className="w-80" side="right" sideOffset={10}>
+        <div className="flex items-start justify-between gap-3">
+          <div>
+            <p className="font-semibold">{planLabel}</p>
+            <p className="text-xs text-muted-foreground">
+              Local subscription usage
+            </p>
+          </div>
+          <Button
+            aria-label="Refresh Codex usage"
+            disabled={query.isFetching}
+            onClick={() => void query.refetch()}
+            size="icon-xs"
+            type="button"
+            variant="ghost"
+          >
+            <RefreshCw
+              aria-hidden="true"
+              className={cn(query.isFetching && "animate-spin")}
+            />
+          </Button>
+        </div>
+
+        {usage ? (
+          <div className="mt-4 space-y-4">
+            <div>
+              <div className="mb-1.5 flex items-baseline justify-between">
+                <span className="text-2xl font-semibold tabular-nums">
+                  {usage.remainingPercent}%
+                </span>
+                <span className="text-xs text-muted-foreground">
+                  {usage.usedPercent}% used
+                </span>
+              </div>
+              <Progress
+                aria-label={`${usage.remainingPercent}% remaining`}
+                className={cn(
+                  "h-2 bg-muted",
+                  tone && toneClasses[tone].progress,
+                )}
+                value={usage.remainingPercent}
+              />
+              <p className="mt-2 text-xs text-muted-foreground">
+                Resets {formatUsageReset(usage.resetsAt)}
+              </p>
+            </div>
+
+            <dl className="grid grid-cols-2 gap-3 rounded-lg bg-muted/45 p-3 text-xs">
+              <div>
+                <dt className="text-muted-foreground">Latest daily usage</dt>
+                <dd className="mt-0.5 font-medium tabular-nums">
+                  {formatTokenCount(usage.latestDailyTokens)} tokens
+                </dd>
+                {usage.latestDailyDate ? (
+                  <dd className="text-muted-foreground">
+                    {usage.latestDailyDate}
+                  </dd>
+                ) : null}
+              </div>
+              <div>
+                <dt className="text-muted-foreground">Lifetime usage</dt>
+                <dd className="mt-0.5 font-medium tabular-nums">
+                  {formatTokenCount(usage.lifetimeTokens)} tokens
+                </dd>
+              </div>
+              <div>
+                <dt className="text-muted-foreground">Credit balance</dt>
+                <dd className="mt-0.5 font-medium tabular-nums">
+                  {usage.creditBalance ?? "—"}
+                </dd>
+              </div>
+              <div>
+                <dt className="text-muted-foreground">Reset credits</dt>
+                <dd className="mt-0.5 font-medium tabular-nums">
+                  {usage.resetCreditsAvailable ?? "—"}
+                </dd>
+              </div>
+            </dl>
+
+            <p className="text-2xs text-muted-foreground">
+              Updated{" "}
+              {new Date(usage.fetchedAt * 1000).toLocaleTimeString([], {
+                hour: "numeric",
+                minute: "2-digit",
+              })}
+              {query.isError ? " · refresh failed; showing last result" : ""}
+            </p>
+          </div>
+        ) : (
+          <div className="mt-4 rounded-lg bg-muted/45 p-3 text-sm text-muted-foreground">
+            {errorMessage ?? "Reading Codex usage…"}
+          </div>
+        )}
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/desktop/src/features/settings/ui/SettingsView.tsx b/desktop/src/features/settings/ui/SettingsView.tsx
index 90634e01f4..14c4d371b5 100644
--- a/desktop/src/features/settings/ui/SettingsView.tsx
+++ b/desktop/src/features/settings/ui/SettingsView.tsx
@@ -7,6 +7,8 @@ import {
   canEditCommunityProfile,
   shouldWarnMissingMembershipSnapshot,
 } from "@/shared/api/relayMembers";
+import { SidebarProviderUsageIndicator } from "@/features/provider-usage/ui/SidebarProviderUsageIndicator";
+import { FeatureGate } from "@/shared/features";
 import { getFeature } from "@/shared/features/manifest";
 import {
   resolveEnabled,
@@ -294,6 +296,9 @@ export function SettingsView({
         </SidebarContent>
 
         <SidebarFooter>
+          <FeatureGate feature="providerUsage">
+            <SidebarProviderUsageIndicator />
+          </FeatureGate>
           {appVersion ? (
             <p
               className="px-2 pb-1 text-xs text-sidebar-foreground/45"
diff --git a/desktop/src/features/sidebar/ui/AppSidebar.tsx b/desktop/src/features/sidebar/ui/AppSidebar.tsx
index c4552bb54d..be0b8851f9 100644
--- a/desktop/src/features/sidebar/ui/AppSidebar.tsx
+++ b/desktop/src/features/sidebar/ui/AppSidebar.tsx
@@ -53,6 +53,7 @@ import {
 } from "@/features/sidebar/ui/sidebarLoadingSkeleton";
 import { useDeferredModalOpen } from "@/shared/ui/deferredModalOpen";
 import { SidebarUpdateCard } from "@/features/settings/SidebarUpdateCard";
+import { SidebarProviderUsageIndicator } from "@/features/provider-usage/ui/SidebarProviderUsageIndicator";
 import { useUpdaterContext } from "@/features/settings/hooks/UpdaterProvider";
 import { shouldShowSidebarUpdateCard } from "@/features/settings/sidebarUpdateCardVisibility";
 import type {
@@ -885,6 +886,9 @@ export function AppSidebar({
                 />
               </div>
             ) : null}
+            <FeatureGate feature="providerUsage">
+              <SidebarProviderUsageIndicator />
+            </FeatureGate>
             <SidebarMenu>
               <SidebarMenuItem>
                 <SidebarProfileCard
diff --git a/desktop/src/shared/api/tauriProviderUsage.ts b/desktop/src/shared/api/tauriProviderUsage.ts
new file mode 100644
index 0000000000..f498456d21
--- /dev/null
+++ b/desktop/src/shared/api/tauriProviderUsage.ts
@@ -0,0 +1,20 @@
+import { invoke } from "@tauri-apps/api/core";
+
+export type CodexProviderUsage = {
+  provider: "openai";
+  planType: string | null;
+  usedPercent: number;
+  remainingPercent: number;
+  resetsAt: number | null;
+  windowDurationMinutes: number | null;
+  creditBalance: string | null;
+  resetCreditsAvailable: number | null;
+  lifetimeTokens: number | null;
+  latestDailyTokens: number | null;
+  latestDailyDate: string | null;
+  fetchedAt: number;
+};
+
+export function getCodexProviderUsage(): Promise<CodexProviderUsage> {
+  return invoke<CodexProviderUsage>("get_codex_provider_usage");
+}
diff --git a/preview-features.json b/preview-features.json
index ad8090d5ad..ce549adeea 100644
--- a/preview-features.json
+++ b/preview-features.json
@@ -40,6 +40,15 @@
       "platforms": [
         "desktop"
       ]
+    },
+    {
+      "id": "providerUsage",
+      "name": "Provider usage indicator",
+      "description": "Show local Codex subscription usage and reset timing in the sidebar",
+      "defaultEnabled": true,
+      "platforms": [
+        "desktop"
+      ]
     }
   ]
 }

From 83a9e156ca773bb542244b6d359c7666427544ab Mon Sep 17 00:00:00 2001
From: nytemodeonly <contact@nytemode.com>
Date: Fri, 24 Jul 2026 15:57:47 -0500
Subject: [PATCH 2/2] feat(desktop): add provider allowance registry

Co-authored-by: nytemodeonly <contact@nytemode.com>
Signed-off-by: nytemodeonly <contact@nytemode.com>
---
 desktop/playwright.config.ts                  |   1 +
 .../src-tauri/src/commands/provider_usage.rs  | 639 +++++++++++++-----
 desktop/src-tauri/src/lib.rs                  |   3 +-
 .../provider-usage/providerUsageDisplay.mjs   |   3 +
 .../providerUsagePreference.test.mjs          |  56 ++
 .../provider-usage/providerUsagePreference.ts |  71 ++
 .../ui/ProviderUsageExperimentSettings.tsx    | 150 ++++
 .../ui/SidebarProviderUsageIndicator.tsx      | 149 ++--
 .../settings/ui/ExperimentalFeaturesCard.tsx  |  50 +-
 desktop/src/shared/api/tauriProviderUsage.ts  |  58 +-
 desktop/src/testing/e2eBridge.ts              |  55 ++
 desktop/tests/e2e/provider-usage.spec.ts      |  46 ++
 12 files changed, 1038 insertions(+), 243 deletions(-)
 create mode 100644 desktop/src/features/provider-usage/providerUsagePreference.test.mjs
 create mode 100644 desktop/src/features/provider-usage/providerUsagePreference.ts
 create mode 100644 desktop/src/features/provider-usage/ui/ProviderUsageExperimentSettings.tsx
 create mode 100644 desktop/tests/e2e/provider-usage.spec.ts

diff --git a/desktop/playwright.config.ts b/desktop/playwright.config.ts
index 5046b29688..b4921b56d8 100644
--- a/desktop/playwright.config.ts
+++ b/desktop/playwright.config.ts
@@ -116,6 +116,7 @@ export default defineConfig({
         "**/inbox-live-update.spec.ts",
         "**/mesh-compute.spec.ts",
         "**/observer-archive-policy.spec.ts",
+        "**/provider-usage.spec.ts",
       ],
       use: {
         ...devices["Desktop Chrome"],
diff --git a/desktop/src-tauri/src/commands/provider_usage.rs b/desktop/src-tauri/src/commands/provider_usage.rs
index 234944f9f7..2e9b0a3bd0 100644
--- a/desktop/src-tauri/src/commands/provider_usage.rs
+++ b/desktop/src-tauri/src/commands/provider_usage.rs
@@ -1,47 +1,146 @@
 use serde::Serialize;
 use serde_json::{json, Value};
-use std::io::{BufRead, BufReader, Write};
+use std::io::{BufRead, BufReader, Read, Write};
 use std::process::{Child, Command, Stdio};
 use std::sync::mpsc;
 use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
 
 const RESPONSE_TIMEOUT: Duration = Duration::from_secs(10);
+const MAX_FRAME_BYTES: usize = 256 * 1024;
+const MAX_TOTAL_BYTES: usize = 2 * 1024 * 1024;
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+enum ProviderUsageId {
+    Codex,
+    Claude,
+    Grok,
+}
+
+impl ProviderUsageId {
+    fn parse(value: &str) -> Option<Self> {
+        match value {
+            "codex" => Some(Self::Codex),
+            "claude" => Some(Self::Claude),
+            "grok" => Some(Self::Grok),
+            _ => None,
+        }
+    }
+
+    fn as_str(self) -> &'static str {
+        match self {
+            Self::Codex => "codex",
+            Self::Claude => "claude",
+            Self::Grok => "grok",
+        }
+    }
+}
 
 #[derive(Debug, Serialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
-pub struct CodexProviderUsage {
-    provider: &'static str,
-    plan_type: Option<String>,
+/// A provider shown in the provider-allowance experiment picker.
+pub struct ProviderUsageCapability {
+    id: &'static str,
+    name: &'static str,
+    availability: &'static str,
+    detail: &'static str,
+}
+
+#[derive(Debug, Serialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+/// One independently resetting personal-allowance window.
+pub struct ProviderUsageWindow {
+    id: String,
+    label: String,
     used_percent: u64,
     remaining_percent: u64,
     resets_at: Option<i64>,
-    window_duration_minutes: Option<u64>,
+    duration_minutes: Option<u64>,
+}
+
+#[derive(Debug, Serialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+/// Optional provider totals that are not tied to one allowance window.
+pub struct ProviderUsageTotals {
     credit_balance: Option<String>,
     reset_credits_available: Option<u64>,
     lifetime_tokens: Option<u64>,
     latest_daily_tokens: Option<u64>,
     latest_daily_date: Option<String>,
+}
+
+#[derive(Debug, Serialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+/// A normalized local personal-allowance snapshot safe to expose over IPC.
+pub struct ProviderUsageSnapshot {
+    provider: &'static str,
+    vendor: &'static str,
+    product: &'static str,
+    source: &'static str,
+    plan_type: Option<String>,
+    windows: Vec<ProviderUsageWindow>,
+    totals: ProviderUsageTotals,
     fetched_at: u64,
 }
 
 #[tauri::command]
-pub async fn get_codex_provider_usage() -> Result<CodexProviderUsage, String> {
-    let codex_path = crate::managed_agents::resolve_command("codex")
-        .ok_or_else(|| "codex_not_installed".to_string())?;
+/// Lists supported and explicitly unsupported personal-allowance adapters.
+pub async fn list_provider_usage_capabilities() -> Vec<ProviderUsageCapability> {
+    let codex_availability = if crate::managed_agents::resolve_command("codex").is_some() {
+        ("available", "Uses your existing local Codex sign-in")
+    } else {
+        ("not_installed", "Install and sign in to the Codex CLI")
+    };
 
-    tokio::task::spawn_blocking(move || read_codex_provider_usage(&codex_path))
-        .await
-        .map_err(|_| "codex_usage_task_failed".to_string())?
+    vec![
+        ProviderUsageCapability {
+            id: ProviderUsageId::Codex.as_str(),
+            name: "Codex",
+            availability: codex_availability.0,
+            detail: codex_availability.1,
+        },
+        ProviderUsageCapability {
+            id: ProviderUsageId::Claude.as_str(),
+            name: "Claude",
+            availability: "unsupported",
+            detail: "No supported standalone personal allowance reader yet",
+        },
+        ProviderUsageCapability {
+            id: ProviderUsageId::Grok.as_str(),
+            name: "Grok",
+            availability: "unsupported",
+            detail: "Consumer allowance is available in Grok Settings",
+        },
+    ]
 }
 
-fn read_codex_provider_usage(codex_path: &std::path::Path) -> Result<CodexProviderUsage, String> {
+#[tauri::command]
+/// Reads a normalized personal-allowance snapshot for a selected provider.
+pub async fn get_provider_usage(provider: String) -> Result<ProviderUsageSnapshot, String> {
+    let provider =
+        ProviderUsageId::parse(&provider).ok_or_else(|| "provider_usage_unknown".to_string())?;
+    match provider {
+        ProviderUsageId::Codex => {
+            let codex_path = crate::managed_agents::resolve_command("codex")
+                .ok_or_else(|| "codex_not_installed".to_string())?;
+            tokio::task::spawn_blocking(move || read_codex_provider_usage(&codex_path))
+                .await
+                .map_err(|_| "codex_usage_task_failed".to_string())?
+        }
+        ProviderUsageId::Claude => Err("claude_usage_unsupported".to_string()),
+        ProviderUsageId::Grok => Err("grok_usage_unsupported".to_string()),
+    }
+}
+
+fn read_codex_provider_usage(
+    codex_path: &std::path::Path,
+) -> Result<ProviderUsageSnapshot, String> {
     let mut command = Command::new(codex_path);
     command
         .args(["app-server", "--stdio"])
         .stdin(Stdio::piped())
         .stdout(Stdio::piped())
-        // App-server stderr can contain local configuration details. The
-        // indicator exposes stable error codes instead of forwarding it.
+        // App-server stderr can contain local configuration details. Only
+        // stable error codes cross the command boundary.
         .stderr(Stdio::null());
     if let Some(workdir) = crate::managed_agents::default_agent_workdir() {
         command.current_dir(workdir);
@@ -49,12 +148,11 @@ fn read_codex_provider_usage(codex_path: &std::path::Path) -> Result<CodexProvid
     if let Some(path) = crate::managed_agents::login_shell_path() {
         command.env("PATH", path);
     }
-    // The npm/Homebrew Codex launcher can hand off to a native binary. Keep
-    // the whole launcher tree in one process group so timeout/error cleanup
-    // also closes descendants that inherited stdout.
     #[cfg(unix)]
     {
         use std::os::unix::process::CommandExt;
+        // Keep launchers and native descendants together so every exit path
+        // can reap the complete local app-server process tree.
         command.process_group(0);
     }
     crate::util::configure_no_window(&mut command);
@@ -71,102 +169,176 @@ fn read_codex_provider_usage(codex_path: &std::path::Path) -> Result<CodexProvid
         .take()
         .ok_or_else(|| finish_with_error(&mut child, "codex_app_server_stdout_unavailable"))?;
 
-    for message in app_server_requests() {
-        writeln!(stdin, "{message}")
-            .map_err(|_| finish_with_error(&mut child, "codex_app_server_write_failed"))?;
-    }
-    stdin
-        .flush()
-        .map_err(|_| finish_with_error(&mut child, "codex_app_server_write_failed"))?;
+    write_message(&mut child, &mut stdin, &initialize_request())?;
 
     let (sender, receiver) = mpsc::channel();
-    let reader = std::thread::spawn(move || {
-        for line in BufReader::new(stdout).lines() {
-            if sender.send(line).is_err() {
+    let mut reader = Some(std::thread::spawn(move || {
+        read_bounded_jsonl(stdout, sender)
+    }));
+    let deadline = Instant::now() + RESPONSE_TIMEOUT;
+
+    if let Err(code) = wait_for_response(&receiver, deadline, 1) {
+        stop_child(&mut child);
+        join_reader(&mut reader);
+        return Err(code);
+    }
+
+    let account_requests = post_initialize_requests();
+    for message in &account_requests[..2] {
+        if let Err(code) = write_message(&mut child, &mut stdin, message) {
+            join_reader(&mut reader);
+            return Err(code);
+        }
+    }
+
+    let rate_limits = match wait_for_response(&receiver, deadline, 2) {
+        Ok(result) => result,
+        Err(code) => {
+            stop_child(&mut child);
+            join_reader(&mut reader);
+            return Err(code);
+        }
+    };
+    if let Err(code) = write_message(&mut child, &mut stdin, &account_requests[2]) {
+        join_reader(&mut reader);
+        return Err(code);
+    }
+    let token_usage = match wait_for_response(&receiver, deadline, 3) {
+        Ok(result) => result,
+        Err(code) => {
+            stop_child(&mut child);
+            join_reader(&mut reader);
+            return Err(code);
+        }
+    };
+
+    stop_child(&mut child);
+    join_reader(&mut reader);
+    normalize_usage(&rate_limits, &token_usage, unix_timestamp())
+}
+
+fn join_reader(reader: &mut Option<std::thread::JoinHandle<()>>) {
+    if let Some(reader) = reader.take() {
+        let _ = reader.join();
+    }
+}
+
+fn write_message(child: &mut Child, stdin: &mut impl Write, message: &Value) -> Result<(), String> {
+    writeln!(stdin, "{message}")
+        .and_then(|_| stdin.flush())
+        .map_err(|_| finish_with_error(child, "codex_app_server_write_failed"))
+}
+
+fn initialize_request() -> Value {
+    json!({
+        "method": "initialize",
+        "id": 1,
+        "params": {
+            "clientInfo": {
+                "name": "buzz_desktop",
+                "title": "Buzz Desktop",
+                "version": env!("CARGO_PKG_VERSION")
+            },
+            "capabilities": {
+                "optOutNotificationMethods": [
+                    "thread/started",
+                    "item/agentMessage/delta"
+                ]
+            }
+        }
+    })
+}
+
+fn post_initialize_requests() -> [Value; 3] {
+    [
+        json!({"method": "initialized", "params": {}}),
+        json!({"method": "account/rateLimits/read", "id": 2, "params": null}),
+        json!({"method": "account/usage/read", "id": 3, "params": null}),
+    ]
+}
+
+fn read_bounded_jsonl(stdout: impl Read, sender: mpsc::Sender<Result<String, String>>) {
+    let mut reader = BufReader::new(stdout);
+    let mut total = 0_usize;
+    let mut frame = Vec::new();
+    loop {
+        let buffer = match reader.fill_buf() {
+            Ok(buffer) => buffer,
+            Err(_) => {
+                let _ = sender.send(Err("codex_app_server_read_failed".to_string()));
                 break;
             }
+        };
+        if buffer.is_empty() {
+            if !frame.is_empty() {
+                let _ = sender.send(Err("codex_app_server_read_failed".to_string()));
+            }
+            break;
         }
-    });
 
-    let deadline = Instant::now() + RESPONSE_TIMEOUT;
-    let mut rate_limits = None;
-    let mut token_usage = None;
+        let newline = buffer.iter().position(|byte| *byte == b'\n');
+        let bytes = newline.map_or(buffer.len(), |position| position + 1);
+        total = total.saturating_add(bytes);
+        if frame.len().saturating_add(bytes) > MAX_FRAME_BYTES || total > MAX_TOTAL_BYTES {
+            let _ = sender.send(Err("codex_usage_response_too_large".to_string()));
+            break;
+        }
+        frame.extend_from_slice(&buffer[..bytes]);
+        reader.consume(bytes);
+
+        if newline.is_none() {
+            continue;
+        }
+        while matches!(frame.last(), Some(b'\n' | b'\r')) {
+            frame.pop();
+        }
+        let completed = std::mem::take(&mut frame);
+        match String::from_utf8(completed) {
+            Ok(line) => {
+                if sender.send(Ok(line)).is_err() {
+                    break;
+                }
+            }
+            Err(_) => {
+                let _ = sender.send(Err("codex_app_server_read_failed".to_string()));
+                break;
+            }
+        }
+    }
+}
 
-    while rate_limits.is_none() || token_usage.is_none() {
+fn wait_for_response(
+    receiver: &mpsc::Receiver<Result<String, String>>,
+    deadline: Instant,
+    expected_id: u64,
+) -> Result<Value, String> {
+    loop {
         let now = Instant::now();
         if now >= deadline {
-            stop_child(&mut child);
-            let _ = reader.join();
             return Err("codex_usage_timeout".to_string());
         }
-
         match receiver.recv_timeout(deadline.saturating_duration_since(now)) {
             Ok(Ok(line)) => {
-                let Ok(message) = serde_json::from_str::<Value>(&line) else {
+                let message = serde_json::from_str::<Value>(&line)
+                    .map_err(|_| "codex_usage_invalid_response".to_string())?;
+                if message.get("id").and_then(Value::as_u64) != Some(expected_id) {
                     continue;
-                };
+                }
                 if let Some(error_code) = response_error_code(&message) {
-                    stop_child(&mut child);
-                    let _ = reader.join();
                     return Err(error_code);
                 }
-                match message.get("id").and_then(Value::as_u64) {
-                    Some(2) => rate_limits = message.get("result").cloned(),
-                    Some(3) => token_usage = message.get("result").cloned(),
-                    _ => {}
-                }
-            }
-            Ok(Err(_)) => {
-                stop_child(&mut child);
-                let _ = reader.join();
-                return Err("codex_app_server_read_failed".to_string());
-            }
-            Err(mpsc::RecvTimeoutError::Timeout) => {
-                stop_child(&mut child);
-                let _ = reader.join();
-                return Err("codex_usage_timeout".to_string());
+                return message
+                    .get("result")
+                    .cloned()
+                    .ok_or_else(|| "codex_usage_invalid_response".to_string());
             }
+            Ok(Err(code)) => return Err(code),
+            Err(mpsc::RecvTimeoutError::Timeout) => return Err("codex_usage_timeout".to_string()),
             Err(mpsc::RecvTimeoutError::Disconnected) => {
-                stop_child(&mut child);
-                let _ = reader.join();
-                return Err("codex_app_server_closed".to_string());
+                return Err("codex_app_server_closed".to_string())
             }
         }
     }
-
-    stop_child(&mut child);
-    let _ = reader.join();
-    normalize_usage(
-        rate_limits.as_ref().expect("rate limits checked above"),
-        token_usage.as_ref().expect("token usage checked above"),
-        unix_timestamp(),
-    )
-}
-
-fn app_server_requests() -> [Value; 4] {
-    [
-        json!({
-            "method": "initialize",
-            "id": 1,
-            "params": {
-                "clientInfo": {
-                    "name": "buzz_desktop",
-                    "title": "Buzz Desktop",
-                    "version": env!("CARGO_PKG_VERSION")
-                },
-                "capabilities": {
-                    "experimentalApi": true,
-                    "optOutNotificationMethods": [
-                        "thread/started",
-                        "item/agentMessage/delta"
-                    ]
-                }
-            }
-        }),
-        json!({"method": "initialized", "params": {}}),
-        json!({"method": "account/rateLimits/read", "id": 2, "params": null}),
-        json!({"method": "account/usage/read", "id": 3, "params": null}),
-    ]
 }
 
 fn response_error_code(message: &Value) -> Option<String> {
@@ -189,20 +361,48 @@ fn normalize_usage(
     rate_limits_result: &Value,
     token_usage_result: &Value,
     fetched_at: u64,
-) -> Result<CodexProviderUsage, String> {
-    let snapshot = rate_limits_result
+) -> Result<ProviderUsageSnapshot, String> {
+    let legacy_snapshot = rate_limits_result
         .get("rateLimits")
         .ok_or_else(|| "codex_usage_invalid_response".to_string())?;
-    let primary = snapshot
-        .get("primary")
-        .filter(|value| !value.is_null())
-        .ok_or_else(|| "codex_usage_limit_unavailable".to_string())?;
-    let used_percent = primary
-        .get("usedPercent")
-        .and_then(Value::as_u64)
-        .ok_or_else(|| "codex_usage_invalid_response".to_string())?
-        .min(100);
+    let bucket_map = rate_limits_result
+        .get("rateLimitsByLimitId")
+        .and_then(Value::as_object);
+    let snapshots: Vec<(&str, &Value)> = match bucket_map {
+        Some(map) if !map.is_empty() => {
+            map.iter().map(|(id, value)| (id.as_str(), value)).collect()
+        }
+        _ => vec![("codex", legacy_snapshot)],
+    };
+
+    let mut windows = Vec::new();
+    for (fallback_id, snapshot) in &snapshots {
+        let limit_id = snapshot
+            .get("limitId")
+            .and_then(Value::as_str)
+            .unwrap_or(fallback_id);
+        let limit_name = snapshot
+            .get("limitName")
+            .and_then(Value::as_str)
+            .unwrap_or(limit_id);
+        for (window_id, default_label) in [("primary", "Primary"), ("secondary", "Secondary")] {
+            let Some(window) = snapshot.get(window_id).filter(|value| !value.is_null()) else {
+                continue;
+            };
+            windows.push(normalize_window(
+                limit_id,
+                limit_name,
+                window_id,
+                default_label,
+                window,
+            )?);
+        }
+    }
+    if windows.is_empty() {
+        return Err("codex_usage_limit_unavailable".to_string());
+    }
 
+    let first_snapshot = snapshots.first().map(|(_, snapshot)| *snapshot);
     let latest_bucket = token_usage_result
         .get("dailyUsageBuckets")
         .and_then(Value::as_array)
@@ -215,37 +415,87 @@ fn normalize_usage(
             })
         });
 
-    Ok(CodexProviderUsage {
-        provider: "openai",
-        plan_type: snapshot
+    Ok(ProviderUsageSnapshot {
+        provider: ProviderUsageId::Codex.as_str(),
+        vendor: "openai",
+        product: "codex",
+        source: "personalAllowance",
+        plan_type: legacy_snapshot
             .get("planType")
             .and_then(Value::as_str)
+            .or_else(|| {
+                first_snapshot
+                    .and_then(|snapshot| snapshot.get("planType"))
+                    .and_then(Value::as_str)
+            })
             .map(str::to_owned),
+        windows,
+        totals: ProviderUsageTotals {
+            credit_balance: legacy_snapshot
+                .get("credits")
+                .and_then(|credits| credits.get("balance"))
+                .and_then(Value::as_str)
+                .or_else(|| {
+                    first_snapshot
+                        .and_then(|snapshot| snapshot.get("credits"))
+                        .and_then(|credits| credits.get("balance"))
+                        .and_then(Value::as_str)
+                })
+                .map(str::to_owned),
+            reset_credits_available: rate_limits_result
+                .get("rateLimitResetCredits")
+                .and_then(|credits| credits.get("availableCount"))
+                .and_then(Value::as_u64),
+            lifetime_tokens: token_usage_result
+                .get("summary")
+                .and_then(|summary| summary.get("lifetimeTokens"))
+                .and_then(Value::as_u64),
+            latest_daily_tokens: latest_bucket
+                .and_then(|bucket| bucket.get("tokens"))
+                .and_then(Value::as_u64),
+            latest_daily_date: latest_bucket
+                .and_then(|bucket| bucket.get("startDate"))
+                .and_then(Value::as_str)
+                .map(str::to_owned),
+        },
+        fetched_at,
+    })
+}
+
+fn normalize_window(
+    limit_id: &str,
+    limit_name: &str,
+    window_id: &str,
+    default_label: &str,
+    window: &Value,
+) -> Result<ProviderUsageWindow, String> {
+    let used_percent = window
+        .get("usedPercent")
+        .and_then(Value::as_i64)
+        .filter(|value| (0..=100).contains(value))
+        .map(|value| value as u64)
+        .ok_or_else(|| "codex_usage_invalid_response".to_string())?;
+    let duration_minutes = window.get("windowDurationMins").and_then(Value::as_u64);
+    let window_label = match duration_minutes {
+        Some(300) => "5-hour".to_string(),
+        Some(1_440) => "Daily".to_string(),
+        Some(10_080) => "Weekly".to_string(),
+        Some(minutes) if minutes % 1_440 == 0 => format!("{}-day", minutes / 1_440),
+        Some(minutes) if minutes % 60 == 0 => format!("{}-hour", minutes / 60),
+        _ => default_label.to_string(),
+    };
+    let label = if limit_name.eq_ignore_ascii_case("codex") {
+        window_label
+    } else {
+        format!("{limit_name} · {window_label}")
+    };
+    Ok(ProviderUsageWindow {
+        id: format!("{limit_id}:{window_id}"),
+        label,
         used_percent,
         remaining_percent: 100 - used_percent,
-        resets_at: primary.get("resetsAt").and_then(Value::as_i64),
-        window_duration_minutes: primary.get("windowDurationMins").and_then(Value::as_u64),
-        credit_balance: snapshot
-            .get("credits")
-            .and_then(|credits| credits.get("balance"))
-            .and_then(Value::as_str)
-            .map(str::to_owned),
-        reset_credits_available: rate_limits_result
-            .get("rateLimitResetCredits")
-            .and_then(|credits| credits.get("availableCount"))
-            .and_then(Value::as_u64),
-        lifetime_tokens: token_usage_result
-            .get("summary")
-            .and_then(|summary| summary.get("lifetimeTokens"))
-            .and_then(Value::as_u64),
-        latest_daily_tokens: latest_bucket
-            .and_then(|bucket| bucket.get("tokens"))
-            .and_then(Value::as_u64),
-        latest_daily_date: latest_bucket
-            .and_then(|bucket| bucket.get("startDate"))
-            .and_then(Value::as_str)
-            .map(str::to_owned),
-        fetched_at,
+        resets_at: window.get("resetsAt").and_then(Value::as_i64),
+        duration_minutes,
     })
 }
 
@@ -272,27 +522,56 @@ mod tests {
     use super::*;
 
     #[test]
-    fn normalizes_live_app_server_shape() {
+    fn initializes_before_account_reads_without_experimental_flag() {
+        assert_eq!(
+            initialize_request().get("id").and_then(Value::as_u64),
+            Some(1)
+        );
+        assert!(initialize_request()
+            .pointer("/params/capabilities/experimentalApi")
+            .is_none());
+        let requests = post_initialize_requests();
+        assert_eq!(
+            requests[0].get("method").and_then(Value::as_str),
+            Some("initialized")
+        );
+        assert_eq!(requests[1].get("id").and_then(Value::as_u64), Some(2));
+        assert_eq!(requests[2].get("id").and_then(Value::as_u64), Some(3));
+    }
+
+    #[test]
+    fn normalizes_all_multi_bucket_windows() {
         let rate_limits = json!({
             "rateLimits": {
-                "primary": {
-                    "usedPercent": 38,
-                    "windowDurationMins": 10080,
-                    "resetsAt": 1785258777
-                },
-                "credits": {
-                    "balance": "0"
-                },
+                "primary": {"usedPercent": 38},
+                "credits": {"balance": "0"},
                 "planType": "pro"
             },
-            "rateLimitResetCredits": {
-                "availableCount": 3
-            }
+            "rateLimitsByLimitId": {
+                "codex": {
+                    "limitId": "codex",
+                    "limitName": "Codex",
+                    "primary": {
+                        "usedPercent": 38,
+                        "windowDurationMins": 300,
+                        "resetsAt": 1785258777
+                    },
+                    "secondary": {
+                        "usedPercent": 52,
+                        "windowDurationMins": 10080,
+                        "resetsAt": 1785658777
+                    }
+                },
+                "review": {
+                    "limitId": "review",
+                    "limitName": "Code review",
+                    "primary": {"usedPercent": 12}
+                }
+            },
+            "rateLimitResetCredits": {"availableCount": 3}
         });
         let tokens = json!({
-            "summary": {
-                "lifetimeTokens": 13597623776_u64
-            },
+            "summary": {"lifetimeTokens": 13597623776_u64},
             "dailyUsageBuckets": [
                 {"startDate": "2026-07-23", "tokens": 373817016},
                 {"startDate": "2026-07-24", "tokens": 61038450}
@@ -300,34 +579,30 @@ mod tests {
         });
 
         let usage = normalize_usage(&rate_limits, &tokens, 123).unwrap();
-        assert_eq!(usage.provider, "openai");
+        assert_eq!(usage.provider, "codex");
         assert_eq!(usage.plan_type.as_deref(), Some("pro"));
-        assert_eq!(usage.used_percent, 38);
-        assert_eq!(usage.remaining_percent, 62);
-        assert_eq!(usage.resets_at, Some(1785258777));
-        assert_eq!(usage.window_duration_minutes, Some(10080));
-        assert_eq!(usage.credit_balance.as_deref(), Some("0"));
-        assert_eq!(usage.reset_credits_available, Some(3));
-        assert_eq!(usage.lifetime_tokens, Some(13_597_623_776));
-        assert_eq!(usage.latest_daily_tokens, Some(61_038_450));
-        assert_eq!(usage.latest_daily_date.as_deref(), Some("2026-07-24"));
+        assert_eq!(usage.windows.len(), 3);
+        assert_eq!(usage.windows[0].remaining_percent, 62);
+        assert_eq!(usage.windows[1].remaining_percent, 48);
+        assert_eq!(usage.windows[0].label, "5-hour");
+        assert_eq!(usage.windows[1].label, "Weekly");
+        assert_eq!(usage.windows[2].label, "Code review · Primary");
+        assert_eq!(usage.totals.credit_balance.as_deref(), Some("0"));
+        assert_eq!(usage.totals.reset_credits_available, Some(3));
+        assert_eq!(usage.totals.lifetime_tokens, Some(13_597_623_776));
+        assert_eq!(usage.totals.latest_daily_tokens, Some(61_038_450));
         assert_eq!(usage.fetched_at, 123);
     }
 
     #[test]
-    fn clamps_invalid_percentage_and_tolerates_optional_usage() {
+    fn rejects_out_of_range_percentage() {
         let rate_limits = json!({
-            "rateLimits": {
-                "primary": {"usedPercent": 140}
-            }
+            "rateLimits": {"primary": {"usedPercent": 140}}
         });
-        let tokens = json!({"summary": {}, "dailyUsageBuckets": null});
-
-        let usage = normalize_usage(&rate_limits, &tokens, 1).unwrap();
-        assert_eq!(usage.used_percent, 100);
-        assert_eq!(usage.remaining_percent, 0);
-        assert_eq!(usage.lifetime_tokens, None);
-        assert_eq!(usage.latest_daily_tokens, None);
+        assert_eq!(
+            normalize_usage(&rate_limits, &json!({}), 1).unwrap_err(),
+            "codex_usage_invalid_response"
+        );
     }
 
     #[test]
@@ -344,4 +619,40 @@ mod tests {
             Some("codex_not_authenticated")
         );
     }
+
+    #[test]
+    fn response_reader_correlates_ids_and_ignores_notifications() {
+        let (sender, receiver) = mpsc::channel();
+        sender
+            .send(Ok(json!({"method": "account/updated"}).to_string()))
+            .unwrap();
+        sender
+            .send(Ok(json!({"id": 2, "result": {"ok": true}}).to_string()))
+            .unwrap();
+        assert_eq!(
+            wait_for_response(&receiver, Instant::now() + Duration::from_secs(1), 2).unwrap(),
+            json!({"ok": true})
+        );
+    }
+
+    #[test]
+    fn response_reader_rejects_malformed_json() {
+        let (sender, receiver) = mpsc::channel();
+        sender.send(Ok("{not-json".to_string())).unwrap();
+        assert_eq!(
+            wait_for_response(&receiver, Instant::now() + Duration::from_secs(1), 1).unwrap_err(),
+            "codex_usage_invalid_response"
+        );
+    }
+
+    #[test]
+    fn bounded_reader_rejects_oversized_frame() {
+        let oversized = vec![b'a'; MAX_FRAME_BYTES + 1];
+        let (sender, receiver) = mpsc::channel();
+        read_bounded_jsonl(oversized.as_slice(), sender);
+        assert_eq!(
+            receiver.recv().unwrap().unwrap_err(),
+            "codex_usage_response_too_large"
+        );
+    }
 }
diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
index e124e04ad9..f1f1ed401c 100644
--- a/desktop/src-tauri/src/lib.rs
+++ b/desktop/src-tauri/src/lib.rs
@@ -662,7 +662,8 @@ pub fn run() {
             transfer_builderlab_community,
             title_bar_double_click,
             get_identity,
-            get_codex_provider_usage,
+            list_provider_usage_capabilities,
+            get_provider_usage,
             get_nsec,
             import_identity,
             persist_current_identity,
diff --git a/desktop/src/features/provider-usage/providerUsageDisplay.mjs b/desktop/src/features/provider-usage/providerUsageDisplay.mjs
index 61299f669e..df68493f62 100644
--- a/desktop/src/features/provider-usage/providerUsageDisplay.mjs
+++ b/desktop/src/features/provider-usage/providerUsageDisplay.mjs
@@ -52,5 +52,8 @@ export function providerUsageErrorMessage(error) {
   if (code.includes("protocol_unsupported")) {
     return "Update Codex to show usage";
   }
+  if (code.includes("response_too_large")) {
+    return "Codex returned an unsafe response";
+  }
   return "Usage temporarily unavailable";
 }
diff --git a/desktop/src/features/provider-usage/providerUsagePreference.test.mjs b/desktop/src/features/provider-usage/providerUsagePreference.test.mjs
new file mode 100644
index 0000000000..a803551ec2
--- /dev/null
+++ b/desktop/src/features/provider-usage/providerUsagePreference.test.mjs
@@ -0,0 +1,56 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+const listeners = new Map();
+const values = new Map();
+globalThis.window = {
+  localStorage: {
+    getItem: (key) => values.get(key) ?? null,
+    setItem: (key, value) => values.set(key, value),
+  },
+  addEventListener: (name, listener) => listeners.set(name, listener),
+  removeEventListener: (name) => listeners.delete(name),
+  dispatchEvent: () => true,
+};
+
+const {
+  getProviderUsagePreference,
+  resolveProviderUsagePreference,
+  setProviderUsagePreference,
+} = await import("./providerUsagePreference.ts");
+
+test("provider preference defaults to Auto and persists supported values", () => {
+  assert.equal(getProviderUsagePreference(), "auto");
+  setProviderUsagePreference("codex");
+  assert.equal(getProviderUsagePreference(), "codex");
+});
+
+test("provider preference rejects malformed storage", () => {
+  values.set("buzz-provider-usage-preference", "secret-provider");
+  assert.equal(getProviderUsagePreference(), "auto");
+});
+
+test("provider preference tolerates unavailable storage", () => {
+  const original = globalThis.window.localStorage.getItem;
+  globalThis.window.localStorage.getItem = () => {
+    throw new Error("unavailable");
+  };
+  assert.equal(getProviderUsagePreference(), "auto");
+  globalThis.window.localStorage.getItem = original;
+});
+
+test("Auto resolves to the supported Codex adapter", () => {
+  assert.equal(resolveProviderUsagePreference("auto"), "codex");
+  assert.equal(resolveProviderUsagePreference("grok"), "grok");
+  assert.equal(
+    resolveProviderUsagePreference("auto", [
+      {
+        id: "claude",
+        name: "Claude",
+        availability: "available",
+        detail: "Future supported adapter",
+      },
+    ]),
+    "claude",
+  );
+});
diff --git a/desktop/src/features/provider-usage/providerUsagePreference.ts b/desktop/src/features/provider-usage/providerUsagePreference.ts
new file mode 100644
index 0000000000..c88596590c
--- /dev/null
+++ b/desktop/src/features/provider-usage/providerUsagePreference.ts
@@ -0,0 +1,71 @@
+import { useSyncExternalStore } from "react";
+
+import type {
+  ProviderUsageCapability,
+  ProviderUsageId,
+  ProviderUsagePreference,
+} from "@/shared/api/tauriProviderUsage";
+
+const STORAGE_KEY = "buzz-provider-usage-preference";
+const CHANGE_EVENT = "buzz-provider-usage-preference-change";
+
+function parsePreference(value: string | null): ProviderUsagePreference {
+  if (
+    value === "codex" ||
+    value === "claude" ||
+    value === "grok" ||
+    value === "auto"
+  ) {
+    return value;
+  }
+  return "auto";
+}
+
+export function getProviderUsagePreference(): ProviderUsagePreference {
+  if (typeof window === "undefined") return "auto";
+  try {
+    return parsePreference(window.localStorage.getItem(STORAGE_KEY));
+  } catch {
+    return "auto";
+  }
+}
+
+export function setProviderUsagePreference(
+  preference: ProviderUsagePreference,
+): void {
+  if (typeof window === "undefined") return;
+  try {
+    window.localStorage.setItem(STORAGE_KEY, preference);
+  } catch {
+    // Device-level UI preference. Storage failure safely falls back to Auto.
+  }
+  window.dispatchEvent(new Event(CHANGE_EVENT));
+}
+
+function subscribe(onStoreChange: () => void): () => void {
+  window.addEventListener(CHANGE_EVENT, onStoreChange);
+  window.addEventListener("storage", onStoreChange);
+  return () => {
+    window.removeEventListener(CHANGE_EVENT, onStoreChange);
+    window.removeEventListener("storage", onStoreChange);
+  };
+}
+
+export function useProviderUsagePreference(): ProviderUsagePreference {
+  return useSyncExternalStore(
+    subscribe,
+    getProviderUsagePreference,
+    () => "auto",
+  );
+}
+
+export function resolveProviderUsagePreference(
+  preference: ProviderUsagePreference,
+  capabilities: ProviderUsageCapability[] = [],
+): ProviderUsageId {
+  if (preference !== "auto") return preference;
+  return (
+    capabilities.find((capability) => capability.availability === "available")
+      ?.id ?? "codex"
+  );
+}
diff --git a/desktop/src/features/provider-usage/ui/ProviderUsageExperimentSettings.tsx b/desktop/src/features/provider-usage/ui/ProviderUsageExperimentSettings.tsx
new file mode 100644
index 0000000000..2235646b6b
--- /dev/null
+++ b/desktop/src/features/provider-usage/ui/ProviderUsageExperimentSettings.tsx
@@ -0,0 +1,150 @@
+import { useQuery } from "@tanstack/react-query";
+import { Check, CircleSlash2, Sparkles } from "lucide-react";
+
+import {
+  listProviderUsageCapabilities,
+  type ProviderUsageCapability,
+  type ProviderUsagePreference,
+} from "@/shared/api/tauriProviderUsage";
+import { cn } from "@/shared/lib/cn";
+import {
+  setProviderUsagePreference,
+  useProviderUsagePreference,
+} from "@/features/provider-usage/providerUsagePreference";
+
+const FALLBACK_CAPABILITIES: ProviderUsageCapability[] = [
+  {
+    id: "codex",
+    name: "Codex",
+    availability: "temporarily_unavailable",
+    detail: "Local capability check unavailable",
+  },
+  {
+    id: "claude",
+    name: "Claude",
+    availability: "unsupported",
+    detail: "No supported standalone personal allowance reader yet",
+  },
+  {
+    id: "grok",
+    name: "Grok",
+    availability: "unsupported",
+    detail: "Consumer allowance is available in Grok Settings",
+  },
+];
+
+function ProviderChoice({
+  capability,
+  selected,
+  onSelect,
+}: {
+  capability: ProviderUsageCapability;
+  selected: boolean;
+  onSelect: (preference: ProviderUsagePreference) => void;
+}) {
+  const disabled = capability.availability !== "available";
+  return (
+    <button
+      aria-pressed={selected}
+      className={cn(
+        "flex min-h-20 items-start gap-3 rounded-lg border p-3 text-left transition-colors",
+        selected
+          ? "border-primary bg-primary/5"
+          : "border-border/70 bg-background hover:bg-muted/50",
+        disabled && "cursor-not-allowed opacity-65 hover:bg-background",
+      )}
+      disabled={disabled}
+      onClick={() => onSelect(capability.id)}
+      type="button"
+    >
+      <span
+        className={cn(
+          "mt-0.5 flex h-5 w-5 shrink-0 items-center justify-center rounded-full border",
+          selected && "border-primary bg-primary text-primary-foreground",
+        )}
+      >
+        {selected ? (
+          <Check aria-hidden="true" className="h-3 w-3" />
+        ) : disabled ? (
+          <CircleSlash2 aria-hidden="true" className="h-3 w-3" />
+        ) : null}
+      </span>
+      <span>
+        <span className="block text-sm font-medium">{capability.name}</span>
+        <span className="mt-1 block text-xs text-muted-foreground">
+          {capability.detail}
+        </span>
+      </span>
+    </button>
+  );
+}
+
+export function ProviderUsageExperimentSettings({
+  enabled,
+}: {
+  enabled: boolean;
+}) {
+  const preference = useProviderUsagePreference();
+  const capabilitiesQuery = useQuery({
+    queryKey: ["provider-usage-capabilities"],
+    queryFn: listProviderUsageCapabilities,
+    enabled,
+    staleTime: Number.POSITIVE_INFINITY,
+  });
+  const capabilities = capabilitiesQuery.data ?? FALLBACK_CAPABILITIES;
+
+  if (!enabled) return null;
+
+  return (
+    <div className="mt-3 border-t border-border/60 pt-3">
+      <p className="mb-2 text-xs font-medium text-muted-foreground">
+        Allowance provider
+      </p>
+      <div className="grid gap-2 sm:grid-cols-2">
+        <button
+          aria-pressed={preference === "auto"}
+          className={cn(
+            "flex min-h-20 items-start gap-3 rounded-lg border p-3 text-left transition-colors hover:bg-muted/50",
+            preference === "auto"
+              ? "border-primary bg-primary/5"
+              : "border-border/70 bg-background",
+          )}
+          onClick={() => setProviderUsagePreference("auto")}
+          type="button"
+        >
+          <span
+            className={cn(
+              "mt-0.5 flex h-5 w-5 shrink-0 items-center justify-center rounded-full border",
+              preference === "auto" &&
+                "border-primary bg-primary text-primary-foreground",
+            )}
+          >
+            {preference === "auto" ? (
+              <Check aria-hidden="true" className="h-3 w-3" />
+            ) : (
+              <Sparkles aria-hidden="true" className="h-3 w-3" />
+            )}
+          </span>
+          <span>
+            <span className="block text-sm font-medium">Auto</span>
+            <span className="mt-1 block text-xs text-muted-foreground">
+              Use the first supported local provider
+            </span>
+          </span>
+        </button>
+        {capabilities.map((capability) => (
+          <ProviderChoice
+            capability={capability}
+            key={capability.id}
+            onSelect={setProviderUsagePreference}
+            selected={preference === capability.id}
+          />
+        ))}
+      </div>
+      <p className="mt-2 text-2xs text-muted-foreground">
+        Personal allowance only. Buzz stores no provider credentials or raw
+        usage responses and never publishes this data to Nostr.
+      </p>
+    </div>
+  );
+}
diff --git a/desktop/src/features/provider-usage/ui/SidebarProviderUsageIndicator.tsx b/desktop/src/features/provider-usage/ui/SidebarProviderUsageIndicator.tsx
index 268550ff73..874e2aeb37 100644
--- a/desktop/src/features/provider-usage/ui/SidebarProviderUsageIndicator.tsx
+++ b/desktop/src/features/provider-usage/ui/SidebarProviderUsageIndicator.tsx
@@ -1,7 +1,10 @@
 import { useQuery } from "@tanstack/react-query";
 import { AlertTriangle, RefreshCw } from "lucide-react";
 
-import { getCodexProviderUsage } from "@/shared/api/tauriProviderUsage";
+import {
+  getProviderUsage,
+  listProviderUsageCapabilities,
+} from "@/shared/api/tauriProviderUsage";
 import { Button } from "@/shared/ui/button";
 import { Popover, PopoverContent, PopoverTrigger } from "@/shared/ui/popover";
 import { Progress } from "@/shared/ui/progress";
@@ -13,6 +16,10 @@ import {
   providerUsageErrorMessage,
   providerUsageTone,
 } from "@/features/provider-usage/providerUsageDisplay.mjs";
+import {
+  resolveProviderUsagePreference,
+  useProviderUsagePreference,
+} from "@/features/provider-usage/providerUsagePreference";
 
 const FIVE_MINUTES = 5 * 60 * 1000;
 
@@ -37,14 +44,15 @@ const toneClasses = {
 function UsageRing({
   isLoading,
   remainingPercent,
+  label,
 }: {
   isLoading: boolean;
   remainingPercent?: number;
+  label: string;
 }) {
   if (isLoading) {
     return <Spinner aria-hidden="true" className="h-8 w-8 border-2" />;
   }
-
   if (remainingPercent === undefined) {
     return (
       <span className="flex h-8 w-8 items-center justify-center rounded-full bg-destructive/10 text-destructive">
@@ -56,11 +64,10 @@ function UsageRing({
   const tone = providerUsageTone(remainingPercent);
   const circumference = 2 * Math.PI * 14;
   const dashOffset = circumference * (1 - remainingPercent / 100);
-
   return (
     <span className="relative h-8 w-8 shrink-0" aria-hidden="true">
       <svg className="-rotate-90 h-8 w-8" viewBox="0 0 32 32">
-        <title>Codex usage remaining</title>
+        <title>{label} allowance remaining</title>
         <circle
           className="stroke-muted"
           cx="16"
@@ -89,41 +96,67 @@ function UsageRing({
 }
 
 export function SidebarProviderUsageIndicator() {
+  const preference = useProviderUsagePreference();
+  const capabilitiesQuery = useQuery({
+    queryKey: ["provider-usage-capabilities"],
+    queryFn: listProviderUsageCapabilities,
+    staleTime: Number.POSITIVE_INFINITY,
+  });
+  const provider = resolveProviderUsagePreference(
+    preference,
+    capabilitiesQuery.data,
+  );
+  const supported = provider === "codex";
   const query = useQuery({
-    queryKey: ["provider-usage", "codex"],
-    queryFn: getCodexProviderUsage,
+    queryKey: ["provider-usage", provider],
+    queryFn: () => getProviderUsage(provider),
+    enabled: supported,
     staleTime: FIVE_MINUTES,
     refetchOnWindowFocus: true,
     retry: 1,
   });
 
   const usage = query.data;
+  const constrainingWindow = usage?.windows.reduce((lowest, window) =>
+    window.remainingPercent < lowest.remainingPercent ? window : lowest,
+  );
+  const remainingPercent = constrainingWindow?.remainingPercent;
   const tone =
-    usage === undefined ? undefined : providerUsageTone(usage.remainingPercent);
+    remainingPercent === undefined
+      ? undefined
+      : providerUsageTone(remainingPercent);
+  const productLabel =
+    provider === "codex" ? "Codex" : provider === "claude" ? "Claude" : "Grok";
   const planLabel =
     usage?.planType === undefined || usage.planType === null
-      ? "Codex"
-      : `Codex ${usage.planType.charAt(0).toUpperCase()}${usage.planType.slice(1)}`;
-  const errorMessage = query.isError
-    ? providerUsageErrorMessage(query.error)
-    : null;
+      ? productLabel
+      : `${productLabel} ${usage.planType.charAt(0).toUpperCase()}${usage.planType.slice(1)}`;
+  const unsupportedMessage = supported
+    ? null
+    : `${productLabel} personal allowance is not supported yet`;
+  const errorMessage = unsupportedMessage
+    ? unsupportedMessage
+    : query.isError
+      ? providerUsageErrorMessage(query.error)
+      : null;
 
   return (
     <Popover>
       <PopoverTrigger asChild>
         <button
           aria-label={
-            usage
-              ? `${planLabel}: ${usage.remainingPercent}% remaining`
-              : (errorMessage ?? "Loading Codex usage")
+            remainingPercent !== undefined
+              ? `${planLabel}: ${remainingPercent}% remaining`
+              : (errorMessage ?? `Loading ${productLabel} allowance`)
           }
           className="mb-2 flex w-full items-center gap-2 rounded-lg border border-sidebar-border/70 bg-sidebar-accent/35 px-2 py-2 text-left transition-colors hover:bg-sidebar-accent focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-sidebar-ring group-data-[collapsible=icon]:h-10 group-data-[collapsible=icon]:w-10 group-data-[collapsible=icon]:justify-center group-data-[collapsible=icon]:p-1"
           data-testid="sidebar-provider-usage"
           type="button"
         >
           <UsageRing
-            isLoading={query.isPending}
-            remainingPercent={usage?.remainingPercent}
+            isLoading={query.isPending && supported}
+            label={productLabel}
+            remainingPercent={remainingPercent}
           />
           <span className="min-w-0 flex-1 group-data-[collapsible=icon]:hidden">
             <span className="block truncate text-xs font-medium">
@@ -135,7 +168,11 @@ export function SidebarProviderUsageIndicator() {
                 tone ? toneClasses[tone].text : "text-muted-foreground",
               )}
             >
-              {usage ? `${usage.remainingPercent}% left` : "Checking usage…"}
+              {remainingPercent !== undefined
+                ? `${remainingPercent}% left`
+                : supported
+                  ? "Checking allowance…"
+                  : "Unavailable"}
             </span>
           </span>
         </button>
@@ -146,76 +183,98 @@ export function SidebarProviderUsageIndicator() {
           <div>
             <p className="font-semibold">{planLabel}</p>
             <p className="text-xs text-muted-foreground">
-              Local subscription usage
+              Personal subscription allowance
             </p>
           </div>
-          <Button
-            aria-label="Refresh Codex usage"
-            disabled={query.isFetching}
-            onClick={() => void query.refetch()}
-            size="icon-xs"
-            type="button"
-            variant="ghost"
-          >
-            <RefreshCw
-              aria-hidden="true"
-              className={cn(query.isFetching && "animate-spin")}
-            />
-          </Button>
+          {supported ? (
+            <Button
+              aria-label={`Refresh ${productLabel} allowance`}
+              disabled={query.isFetching}
+              onClick={() => void query.refetch()}
+              size="icon-xs"
+              type="button"
+              variant="ghost"
+            >
+              <RefreshCw
+                aria-hidden="true"
+                className={cn(query.isFetching && "animate-spin")}
+              />
+            </Button>
+          ) : null}
         </div>
 
-        {usage ? (
+        {usage && constrainingWindow ? (
           <div className="mt-4 space-y-4">
             <div>
               <div className="mb-1.5 flex items-baseline justify-between">
                 <span className="text-2xl font-semibold tabular-nums">
-                  {usage.remainingPercent}%
+                  {constrainingWindow.remainingPercent}%
                 </span>
                 <span className="text-xs text-muted-foreground">
-                  {usage.usedPercent}% used
+                  {constrainingWindow.usedPercent}% used
                 </span>
               </div>
               <Progress
-                aria-label={`${usage.remainingPercent}% remaining`}
+                aria-label={`${constrainingWindow.remainingPercent}% remaining`}
                 className={cn(
                   "h-2 bg-muted",
                   tone && toneClasses[tone].progress,
                 )}
-                value={usage.remainingPercent}
+                value={constrainingWindow.remainingPercent}
               />
               <p className="mt-2 text-xs text-muted-foreground">
-                Resets {formatUsageReset(usage.resetsAt)}
+                {constrainingWindow.label} · Resets{" "}
+                {formatUsageReset(constrainingWindow.resetsAt)}
               </p>
             </div>
 
+            {usage.windows.length > 1 ? (
+              <dl className="space-y-2 rounded-lg bg-muted/45 p-3 text-xs">
+                {usage.windows.map((window) => (
+                  <div
+                    className="flex items-start justify-between gap-3"
+                    key={window.id}
+                  >
+                    <dt className="text-muted-foreground">{window.label}</dt>
+                    <dd className="text-right font-medium tabular-nums">
+                      {window.remainingPercent}% left
+                      <span className="block font-normal text-muted-foreground">
+                        {formatUsageReset(window.resetsAt)}
+                      </span>
+                    </dd>
+                  </div>
+                ))}
+              </dl>
+            ) : null}
+
             <dl className="grid grid-cols-2 gap-3 rounded-lg bg-muted/45 p-3 text-xs">
               <div>
                 <dt className="text-muted-foreground">Latest daily usage</dt>
                 <dd className="mt-0.5 font-medium tabular-nums">
-                  {formatTokenCount(usage.latestDailyTokens)} tokens
+                  {formatTokenCount(usage.totals.latestDailyTokens)} tokens
                 </dd>
-                {usage.latestDailyDate ? (
+                {usage.totals.latestDailyDate ? (
                   <dd className="text-muted-foreground">
-                    {usage.latestDailyDate}
+                    {usage.totals.latestDailyDate}
                   </dd>
                 ) : null}
               </div>
               <div>
                 <dt className="text-muted-foreground">Lifetime usage</dt>
                 <dd className="mt-0.5 font-medium tabular-nums">
-                  {formatTokenCount(usage.lifetimeTokens)} tokens
+                  {formatTokenCount(usage.totals.lifetimeTokens)} tokens
                 </dd>
               </div>
               <div>
                 <dt className="text-muted-foreground">Credit balance</dt>
                 <dd className="mt-0.5 font-medium tabular-nums">
-                  {usage.creditBalance ?? "—"}
+                  {usage.totals.creditBalance ?? "—"}
                 </dd>
               </div>
               <div>
                 <dt className="text-muted-foreground">Reset credits</dt>
                 <dd className="mt-0.5 font-medium tabular-nums">
-                  {usage.resetCreditsAvailable ?? "—"}
+                  {usage.totals.resetCreditsAvailable ?? "—"}
                 </dd>
               </div>
             </dl>
@@ -231,7 +290,7 @@ export function SidebarProviderUsageIndicator() {
           </div>
         ) : (
           <div className="mt-4 rounded-lg bg-muted/45 p-3 text-sm text-muted-foreground">
-            {errorMessage ?? "Reading Codex usage…"}
+            {errorMessage ?? `Reading ${productLabel} allowance…`}
           </div>
         )}
       </PopoverContent>
diff --git a/desktop/src/features/settings/ui/ExperimentalFeaturesCard.tsx b/desktop/src/features/settings/ui/ExperimentalFeaturesCard.tsx
index 5476f151d0..75fef68598 100644
--- a/desktop/src/features/settings/ui/ExperimentalFeaturesCard.tsx
+++ b/desktop/src/features/settings/ui/ExperimentalFeaturesCard.tsx
@@ -2,6 +2,7 @@ import { setAgentManagedProfiles } from "@/shared/api/tauri";
 import { desktopFeatures, useFeatureToggle } from "@/shared/features";
 import type { FeatureDefinition } from "@/shared/features";
 import { Switch } from "@/shared/ui/switch";
+import { ProviderUsageExperimentSettings } from "@/features/provider-usage/ui/ProviderUsageExperimentSettings";
 import { SettingsSectionHeader } from "./SettingsSectionHeader";
 
 function FeatureRow({ feature }: { feature: FeatureDefinition }) {
@@ -9,29 +10,34 @@ function FeatureRow({ feature }: { feature: FeatureDefinition }) {
   const switchId = `feature-toggle-${feature.id}`;
 
   return (
-    <div className="flex items-center justify-between gap-3 rounded-lg border border-border/70 bg-background/70 px-4 py-3">
-      <div className="min-w-0 flex-1">
-        <p className="text-sm font-medium" id={`${switchId}-label`}>
-          {feature.name}
-        </p>
-        <p className="text-xs text-muted-foreground">{feature.description}</p>
+    <div className="rounded-lg border border-border/70 bg-background/70 px-4 py-3">
+      <div className="flex items-center justify-between gap-3">
+        <div className="min-w-0 flex-1">
+          <p className="text-sm font-medium" id={`${switchId}-label`}>
+            {feature.name}
+          </p>
+          <p className="text-xs text-muted-foreground">{feature.description}</p>
+        </div>
+        <Switch
+          aria-labelledby={`${switchId}-label`}
+          checked={enabled}
+          data-testid={switchId}
+          onCheckedChange={(value) => {
+            toggle(value);
+            if (feature.id === "agentManagedProfiles") {
+              void setAgentManagedProfiles(value).catch((error) => {
+                console.error(
+                  "Failed to apply agent-managed profiles setting:",
+                  error,
+                );
+              });
+            }
+          }}
+        />
       </div>
-      <Switch
-        aria-labelledby={`${switchId}-label`}
-        checked={enabled}
-        data-testid={switchId}
-        onCheckedChange={(value) => {
-          toggle(value);
-          if (feature.id === "agentManagedProfiles") {
-            void setAgentManagedProfiles(value).catch((error) => {
-              console.error(
-                "Failed to apply agent-managed profiles setting:",
-                error,
-              );
-            });
-          }
-        }}
-      />
+      {feature.id === "providerUsage" ? (
+        <ProviderUsageExperimentSettings enabled={enabled} />
+      ) : null}
     </div>
   );
 }
diff --git a/desktop/src/shared/api/tauriProviderUsage.ts b/desktop/src/shared/api/tauriProviderUsage.ts
index f498456d21..b25d9a1232 100644
--- a/desktop/src/shared/api/tauriProviderUsage.ts
+++ b/desktop/src/shared/api/tauriProviderUsage.ts
@@ -1,20 +1,56 @@
 import { invoke } from "@tauri-apps/api/core";
 
-export type CodexProviderUsage = {
-  provider: "openai";
-  planType: string | null;
+export type ProviderUsageId = "codex" | "claude" | "grok";
+export type ProviderUsagePreference = "auto" | ProviderUsageId;
+export type ProviderUsageAvailability =
+  | "available"
+  | "not_installed"
+  | "not_authenticated"
+  | "unsupported"
+  | "incompatible_version"
+  | "temporarily_unavailable";
+
+export type ProviderUsageCapability = {
+  id: ProviderUsageId;
+  name: string;
+  availability: ProviderUsageAvailability;
+  detail: string;
+};
+
+export type ProviderUsageWindow = {
+  id: string;
+  label: string;
   usedPercent: number;
   remainingPercent: number;
   resetsAt: number | null;
-  windowDurationMinutes: number | null;
-  creditBalance: string | null;
-  resetCreditsAvailable: number | null;
-  lifetimeTokens: number | null;
-  latestDailyTokens: number | null;
-  latestDailyDate: string | null;
+  durationMinutes: number | null;
+};
+
+export type ProviderUsageSnapshot = {
+  provider: ProviderUsageId;
+  vendor: "openai" | "anthropic" | "xai";
+  product: string;
+  source: "personalAllowance";
+  planType: string | null;
+  windows: ProviderUsageWindow[];
+  totals: {
+    creditBalance: string | null;
+    resetCreditsAvailable: number | null;
+    lifetimeTokens: number | null;
+    latestDailyTokens: number | null;
+    latestDailyDate: string | null;
+  };
   fetchedAt: number;
 };
 
-export function getCodexProviderUsage(): Promise<CodexProviderUsage> {
-  return invoke<CodexProviderUsage>("get_codex_provider_usage");
+export function listProviderUsageCapabilities(): Promise<
+  ProviderUsageCapability[]
+> {
+  return invoke<ProviderUsageCapability[]>("list_provider_usage_capabilities");
+}
+
+export function getProviderUsage(
+  provider: ProviderUsageId,
+): Promise<ProviderUsageSnapshot> {
+  return invoke<ProviderUsageSnapshot>("get_provider_usage", { provider });
 }
diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts
index a7d58e70cc..e647da736f 100644
--- a/desktop/src/testing/e2eBridge.ts
+++ b/desktop/src/testing/e2eBridge.ts
@@ -9363,6 +9363,61 @@ export function maybeInstallE2eTauriMocks() {
 
         return { ...DEFAULT_MOCK_IDENTITY, lost: isLost, locked: isLocked };
       }
+      case "list_provider_usage_capabilities":
+        return [
+          {
+            id: "codex",
+            name: "Codex",
+            availability: "available",
+            detail: "Uses your existing local Codex sign-in",
+          },
+          {
+            id: "claude",
+            name: "Claude",
+            availability: "unsupported",
+            detail: "No supported standalone personal allowance reader yet",
+          },
+          {
+            id: "grok",
+            name: "Grok",
+            availability: "unsupported",
+            detail: "Consumer allowance is available in Grok Settings",
+          },
+        ];
+      case "get_provider_usage":
+        return {
+          provider: "codex",
+          vendor: "openai",
+          product: "codex",
+          source: "personalAllowance",
+          planType: "pro",
+          windows: [
+            {
+              id: "codex:primary",
+              label: "5-hour",
+              usedPercent: 38,
+              remainingPercent: 62,
+              resetsAt: 1_785_258_777,
+              durationMinutes: 300,
+            },
+            {
+              id: "codex:secondary",
+              label: "Weekly",
+              usedPercent: 52,
+              remainingPercent: 48,
+              resetsAt: 1_785_658_777,
+              durationMinutes: 10_080,
+            },
+          ],
+          totals: {
+            creditBalance: "0",
+            resetCreditsAvailable: 3,
+            lifetimeTokens: 13_597_623_776,
+            latestDailyTokens: 61_038_450,
+            latestDailyDate: "2026-07-24",
+          },
+          fetchedAt: 1_753_390_800,
+        };
       case "sign_nostr_identity_binding": {
         const request = payload as {
           challengeId: string;
diff --git a/desktop/tests/e2e/provider-usage.spec.ts b/desktop/tests/e2e/provider-usage.spec.ts
new file mode 100644
index 0000000000..bf82f5b7b4
--- /dev/null
+++ b/desktop/tests/e2e/provider-usage.spec.ts
@@ -0,0 +1,46 @@
+import { expect, test } from "@playwright/test";
+
+import { installMockBridge } from "../helpers/bridge";
+
+test("provider allowance picker and multi-window sidebar stay provider-scoped", async ({
+  page,
+}) => {
+  await installMockBridge(page);
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+
+  const indicator = page.getByTestId("sidebar-provider-usage").first();
+  await expect(indicator).toContainText("48% left");
+  await indicator.click();
+  await expect(page.getByText("Weekly · Resets")).toBeVisible();
+  await expect(page.getByText("5-hour")).toBeVisible();
+
+  await page.getByTestId("open-settings").click();
+  await page.getByTestId("profile-popover-settings").click();
+  await page.getByTestId("settings-nav-experimental").click();
+
+  const experiments = page.getByTestId("settings-experimental");
+  await expect(experiments.getByText("Allowance provider")).toBeVisible();
+  await expect(
+    experiments.getByRole("button", { name: /Auto/ }),
+  ).toHaveAttribute("aria-pressed", "true");
+  await expect(
+    experiments.getByRole("button", { name: /Claude/ }),
+  ).toBeDisabled();
+  await expect(
+    experiments.getByRole("button", { name: /Grok/ }),
+  ).toBeDisabled();
+
+  await experiments.getByRole("button", { name: /Codex/ }).click();
+  await expect(
+    experiments.getByRole("button", { name: /Codex/ }),
+  ).toHaveAttribute("aria-pressed", "true");
+  await page.reload({ waitUntil: "domcontentloaded" });
+  await expect(
+    page.getByTestId("sidebar-provider-usage").first(),
+  ).toContainText("48% left");
+  await expect(
+    page
+      .getByTestId("settings-experimental")
+      .getByRole("button", { name: /Codex/ }),
+  ).toHaveAttribute("aria-pressed", "true");
+});