fix: persistent background WebView2 for live overage/prepaid on every refresh

windows/App.xaml.cs

@@ -8,8 +8,12 @@ namespace ClaudeCheckerWindows;
 
 public partial class App : Application
 {
-    public static UsageViewModel ViewModel { get; } = new();
-    public static UpdateManager  Updater   { get; } = new();
+    public static UsageViewModel    ViewModel       { get; } = new();
+    public static UpdateManager     Updater         { get; } = new();
+    // Persistent hidden WebView2 — shares the same user data folder as LoginWindow
+    // so its cookies (including cf_clearance) are always live. Used on every refresh
+    // for endpoints that need a real browser session (overage, prepaid).
+    public static WebViewFetchWindow BackgroundBrowser { get; } = new();
 
     private Forms.NotifyIcon? _tray;
     private PopupWindow?      _popup;
@@ -33,11 +37,18 @@ public partial class App : Application
         base.OnStartup(e);
         ThemeManager.Initialize();
         SetupTray();
+        ShowPopup();
         ScheduleTimer(ViewModel.RefreshInterval);
 
+        // Show background browser window on the UI thread before Task.Run
+        BackgroundBrowser.Show();
+
         _ = Task.Run(async () =>
         {
-            await Task.Delay(1000);
+            await ViewModel.LoadFromCacheAsync();
+            // Initialize the persistent background browser (navigates to claude.ai once)
+            await Application.Current.Dispatcher.InvokeAsync(
+                () => BackgroundBrowser.InitAsync()).Task.Unwrap();
             await ViewModel.RefreshAsync();
             await Updater.CheckForUpdatesAsync();
         });

windows/AppSettings.cs

@@ -14,6 +14,10 @@ public class AppSettings
     public int    RefreshInterval { get; set; } = 120;
     public bool   ShowInTaskbar   { get; set; } = true;
     public bool   BetaChannel     { get; set; } = false;
+    public string DebugInfo       { get; set; } = "";
+    public string PlanLabel       { get; set; } = "";
+    public string OverageJson     { get; set; } = "";
+    public string PrepaidJson     { get; set; } = "";
 
     private static readonly string FilePath = Path.Combine(
         Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),

windows/Controls/GaugeControl.cs

@@ -56,17 +56,19 @@ public class GaugeControl : FrameworkElement
             CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
             new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
             14, new SolidColorBrush(textColor), dpi);
-        dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
-
         var sub = new FormattedText(
-            "Updated\nnow",
+            "used",
             CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-            new Typeface("Segoe UI"), 7,
+            new Typeface("Segoe UI"), 8,
             new SolidColorBrush(subColor), dpi)
         {
             TextAlignment = TextAlignment.Center
         };
-        dc.DrawText(sub, new Point(cx - sub.Width / 2, cy + 2));
+
+        var totalHeight = pctText.Height + 2 + sub.Height;
+        var startY      = cy - totalHeight / 2;
+        dc.DrawText(pctText, new Point(cx - pctText.Width / 2, startY));
+        dc.DrawText(sub,     new Point(cx - sub.Width     / 2, startY + pctText.Height + 2));
     }
 
     private static void DrawArc(DrawingContext dc, double cx, double cy, double r,

windows/LoginWindow.xaml.cs

@@ -47,7 +47,6 @@ public partial class LoginWindow : Window
                     : "Complete sign-in, then click Done.";
             });
 
-            // Auto-close once we land on any claude.ai page that isn't the login flow
             if (!uri.Contains("/login") && !uri.Contains("/signin") && signedIn)
                 await SaveAndClose(cookies);
         };
@@ -67,30 +66,55 @@ public partial class LoginWindow : Window
 
         UsageViewModel.SaveCookies(cookies);
 
-        // Fetch bootstrap + usage from within WebView2 (already authenticated, no header issues)
         try
         {
+            // Use WebMessageReceived so the async script can post back without relying
+            // on Promise-awaiting support in the WebView2 runtime version.
+            var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
+            EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
+            msgHandler = (_, args) =>
+            {
+                Browser.CoreWebView2.WebMessageReceived -= msgHandler;
+                tcs.TrySetResult(args.WebMessageAsJson);
+            };
+            Browser.CoreWebView2.WebMessageReceived += msgHandler;
+
             const string script = @"(async()=>{try{
                 const h={headers:{accept:'application/json'}};
                 const b=await(await fetch('/api/bootstrap',h)).json();
-                let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
-                        ||b?.default_organization?.uuid||null;
+                const org0=b?.account?.memberships?.[0]?.organization;
+                let id=org0?.uuid||b?.memberships?.[0]?.organization?.uuid
+                        ||b?.organizations?.[0]?.uuid||b?.default_organization?.uuid||null;
                 const e=b?.account?.email_address||b?.account?.email||b?.email||null;
+                const caps=org0?.capabilities||[];
+                const capStr=caps.find(c=>typeof c==='string'&&c.startsWith('claude_'))||null;
+                const planLabel=capStr?(capStr.slice(7,8).toUpperCase()+capStr.slice(8).toLowerCase()):null;
+                let orgSrc='bootstrap';
                 if(!id){
                     try{const ol=await(await fetch('/api/organizations',h)).json();
-                        if(Array.isArray(ol)&&ol.length>0)id=ol[0]?.uuid||null;}catch(e2){}
+                        if(Array.isArray(ol)&&ol.length>0){id=ol[0]?.uuid||null;orgSrc='orgs-list';}}catch(e2){}
                 }
                 if(!id){
-                    try{const pu=await(await fetch('/api/usage',h)).json();
-                        if(pu&&!pu.error)return{email:e,orgId:null,usage:pu};}catch(e3){}
-                    return{email:e,orgId:null,usage:null};
+                    let pu=null;
+                    try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){}
+                    window.chrome.webview.postMessage({email:e,orgId:null,planLabel,usage:(pu&&!pu.error?pu:null),debug:'no-org'});
+                    return;
                 }
-                const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
-                return{email:e,orgId:id,usage:u};
-            }catch(ex){return{error:String(ex)};}})()";
+                const [u,ov,pp]=await Promise.all([
+                    fetch('/api/organizations/'+id+'/usage',h).then(r=>r.json()).catch(()=>null),
+                    fetch('/api/organizations/'+id+'/overage_spend_limit',h).then(r=>r.ok?r.json():null).catch(()=>null),
+                    fetch('/api/organizations/'+id+'/prepaid/credits',h).then(r=>r.ok?r.json():null).catch(()=>null)
+                ]);
+                window.chrome.webview.postMessage({email:e,orgId:id,planLabel,usage:u,overage:ov,prepaid:pp,debug:'src:'+orgSrc+'|plan:'+(planLabel||'none')});
+            }catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
 
-            var json = await Browser.CoreWebView2.ExecuteScriptAsync(script);
-            if (json != "null" && !string.IsNullOrEmpty(json))
+            await Browser.CoreWebView2.ExecuteScriptAsync(script);
+
+            // Wait up to 15 s for the script to post its message
+            var completed = await Task.WhenAny(tcs.Task, Task.Delay(15000));
+            var json = completed == tcs.Task ? tcs.Task.Result : null;
+
+            if (!string.IsNullOrEmpty(json))
             {
                 using var doc = JsonDocument.Parse(json);
                 var root = doc.RootElement;
@@ -104,10 +128,36 @@ public partial class LoginWindow : Window
                 if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
                     AppSettings.Default.UsageJson = us.GetRawText();
 
+                if (root.TryGetProperty("planLabel", out var pl) && pl.ValueKind == JsonValueKind.String
+                    && !string.IsNullOrEmpty(pl.GetString()))
+                    AppSettings.Default.PlanLabel = pl.GetString()!;
+
+                if (root.TryGetProperty("overage", out var ov) && ov.ValueKind == JsonValueKind.Object)
+                    AppSettings.Default.OverageJson = ov.GetRawText();
+
+                if (root.TryGetProperty("prepaid", out var pp) && pp.ValueKind == JsonValueKind.Object)
+                    AppSettings.Default.PrepaidJson = pp.GetRawText();
+
+                if (root.TryGetProperty("debug", out var dbg) && dbg.ValueKind == JsonValueKind.String)
+                    AppSettings.Default.DebugInfo = dbg.GetString() ?? "";
+                else if (root.TryGetProperty("error", out var err))
+                    AppSettings.Default.DebugInfo = "JS error: " + err.GetRawText();
+                else
+                    AppSettings.Default.DebugInfo = "timeout or empty message";
+
+                AppSettings.Default.Save();
+            }
+            else
+            {
+                AppSettings.Default.DebugInfo = json == null ? "script timeout (15s)" : "empty message";
                 AppSettings.Default.Save();
             }
         }
-        catch { }
+        catch (Exception ex)
+        {
+            AppSettings.Default.DebugInfo = "exception: " + ex.Message;
+            AppSettings.Default.Save();
+        }
 
         await Dispatcher.InvokeAsync(() => DialogResult = true);
     }

windows/Models.cs

@@ -21,8 +21,9 @@ public class AgentLimit
 
 public class UsageResponse
 {
-    [JsonPropertyName("claude_ai_default_5h")] public WindowData? FiveHour { get; set; }
-    [JsonPropertyName("claude_ai_default")]    public WindowData? SevenDay  { get; set; }
+    [JsonPropertyName("five_hour")]   public WindowData?  FiveHour   { get; set; }
+    [JsonPropertyName("seven_day")]   public WindowData?  SevenDay   { get; set; }
+    [JsonPropertyName("extra_usage")] public ExtraUsage?  ExtraUsage { get; set; }
 }
 
 public class WindowData
@@ -31,6 +32,14 @@ public class WindowData
     [JsonPropertyName("resets_at")]   public string? ResetsAt   { get; set; }
 }
 
+public class ExtraUsage
+{
+    [JsonPropertyName("is_enabled")]    public bool    IsEnabled    { get; set; }
+    [JsonPropertyName("currency")]      public string? Currency     { get; set; }
+    [JsonPropertyName("used_credits")]  public double? UsedCredits  { get; set; }
+    [JsonPropertyName("monthly_limit")] public double? MonthlyLimit { get; set; }
+}
+
 public class BootstrapResponse
 {
     [JsonPropertyName("account")] public AccountInfo? Account { get; set; }

windows/PopupWindow.xaml.cs

@@ -55,6 +55,13 @@ public partial class PopupWindow : Window
         CardsPanel.Children.Clear();
         foreach (var limit in VM.Limits)
             CardsPanel.Children.Add(BuildCard(limit));
+
+        if (VM.ExtraUsage?.IsEnabled == true)
+            CardsPanel.Children.Add(BuildExtraUsageSection());
+
+        var fiveHour = VM.Limits.FirstOrDefault(l => l.Window == WindowKind.FiveHour);
+        if (fiveHour != null && fiveHour.BurnHistory.Count > 0)
+            CardsPanel.Children.Add(BuildDiarySection(fiveHour));
     }
 
     private static UIElement BuildCard(AgentLimit limit)
@@ -180,12 +187,139 @@ public partial class PopupWindow : Window
         return section;
     }
 
+    private static UIElement BuildDiarySection(AgentLimit limit)
+    {
+        var text      = (SolidColorBrush)Application.Current.Resources["TextBrush"];
+        var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
+
+        var samples = limit.BurnHistory.Count;
+        var avgBurn = limit.BurnRate;
+
+        var subtitle = new TextBlock
+        {
+            Text       = $"{samples} samples · {avgBurn:F1}%/h avg burn rate",
+            FontSize   = 11,
+            Foreground = secondary,
+            Margin     = new Thickness(16, 0, 16, 6),
+        };
+
+        var sparkline = new SparklineControl
+        {
+            Height    = 32,
+            Margin    = new Thickness(8, 8, 8, 8),
+            LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
+            Data      = limit.BurnHistory,
+        };
+
+        var card = new Border
+        {
+            Background      = (SolidColorBrush)Application.Current.Resources["CardBrush"],
+            CornerRadius    = new CornerRadius(6),
+            BorderBrush     = border,
+            BorderThickness = new Thickness(1),
+            Margin          = new Thickness(12, 0, 12, 0),
+            Child           = sparkline,
+        };
+
+        var sectionLabel = new TextBlock
+        {
+            Text   = "SESSION DIARY",
+            Style  = (Style)Application.Current.Resources["HeaderText"],
+            Margin = new Thickness(16, 12, 16, 6),
+        };
+
+        var section = new StackPanel();
+        section.Children.Add(sectionLabel);
+        section.Children.Add(subtitle);
+        section.Children.Add(card);
+        return section;
+    }
+
+    private UIElement BuildExtraUsageSection()
+    {
+        var text      = (SolidColorBrush)Application.Current.Resources["TextBrush"];
+        var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
+        var accent    = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
+
+        var overage  = VM.Overage;
+        var prepaid  = VM.Prepaid;
+        var currency = VM.ExtraUsage?.Currency ?? overage?.Currency ?? "$";
+
+        // Fall back to extra_usage fields when the overage/prepaid endpoints return nothing.
+        // extra_usage.used_credits is in cents (e.g. 5231 = EUR 52.31); overage endpoint
+        // already returns the value in currency units, so only divide for the fallback path.
+        var spent   = overage?.UsedCredits        ?? (VM.ExtraUsage?.UsedCredits  / 100.0) ?? 0;
+        var limit   = overage?.MonthlyCreditLimit ?? VM.ExtraUsage?.MonthlyLimit ?? 0;
+        var balance = prepaid?.Amount             ?? 0;
+        // Show "Unlimited" when no limit is configured (null monthly_limit)
+        bool unlimited = overage?.MonthlyCreditLimit == null && VM.ExtraUsage?.MonthlyLimit == null;
+
+        UIElement MakeRow(string label, string value, bool highlight = false)
+        {
+            var row = new Grid { Margin = new Thickness(0, 3, 0, 3) };
+            row.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+            row.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+            var lbl = new TextBlock { Text = label, FontSize = 12, Foreground = secondary };
+            var val = new TextBlock { Text = value, FontSize = 12, FontWeight = FontWeights.Medium,
+                                      Foreground = highlight ? new SolidColorBrush(Color.FromRgb(0x4C, 0xAF, 0x50)) : text };
+            Grid.SetColumn(lbl, 0);
+            Grid.SetColumn(val, 1);
+            row.Children.Add(lbl);
+            row.Children.Add(val);
+            return row;
+        }
+
+        var contentPanel = new StackPanel { Margin = new Thickness(12, 10, 12, 10) };
+        contentPanel.Children.Add(MakeRow("Spent",   $"{currency} {spent:F2}", spent > 0));
+        if (unlimited)    contentPanel.Children.Add(MakeRow("Limit",   "Unlimited"));
+        else if (limit > 0) contentPanel.Children.Add(MakeRow("Limit", $"{currency} {limit:F2}"));
+        if (balance > 0)  contentPanel.Children.Add(MakeRow("Balance", $"{currency} {balance:F2}"));
+
+        if (limit > 0)
+        {
+            var pct = Math.Min(spent / limit * 100, 100);
+            contentPanel.Children.Add(new ProgressBar
+            {
+                Value           = pct, Maximum = 100, Height = 4,
+                Margin          = new Thickness(0, 6, 0, 0),
+                Foreground      = accent,
+                Background      = new SolidColorBrush(Color.FromArgb(20, 0, 0, 0)),
+                BorderThickness = new Thickness(0),
+            });
+        }
+
+        var card = new Border
+        {
+            Background      = (SolidColorBrush)Application.Current.Resources["CardBrush"],
+            CornerRadius    = new CornerRadius(6),
+            BorderBrush     = border,
+            BorderThickness = new Thickness(1),
+            Margin          = new Thickness(12, 0, 12, 0),
+            Child           = contentPanel,
+        };
+
+        var sectionLabel = new TextBlock
+        {
+            Text   = "EXTRA USAGE CREDITS",
+            Style  = (Style)Application.Current.Resources["HeaderText"],
+            Margin = new Thickness(16, 12, 16, 6),
+        };
+
+        var section = new StackPanel();
+        section.Children.Add(sectionLabel);
+        section.Children.Add(card);
+        return section;
+    }
+
     // ── State updates ────────────────────────────────────────────────
 
     private void OnVmChanged(string? prop)
     {
         if (prop is nameof(UsageViewModel.Limits) or nameof(UsageViewModel.IsLoading)
-                 or nameof(UsageViewModel.LastUpdated) or nameof(UsageViewModel.ErrorMessage))
+                 or nameof(UsageViewModel.LastUpdated) or nameof(UsageViewModel.ErrorMessage)
+                 or nameof(UsageViewModel.ExtraUsage) or nameof(UsageViewModel.Overage) or nameof(UsageViewModel.Prepaid))
         {
             RebuildCards();
             UpdateFooter();

windows/RELEASE_NOTES.md

@@ -1,6 +1,8 @@
-## What's new in beta.24
+## What's new in beta.36
 
-- Sign-in now shows email and data immediately after login (loads from cache set during login flow)
-- Background refresh runs 3 seconds after login — avoids WebView2 user data folder lock race
-- Added /api/organizations and personal /api/usage fallbacks when bootstrap has no org ID
-- Broader JS paths for email and org ID
+### Bug fixes
+- Settings no longer incorrectly shows "Not signed in" when limits are working
+- Session Diary now shows correctly after the first successful refresh
+- Extra Usage Credits section now restored from cache on startup
+- Plan name, overage, and prepaid credits are now cached and shown immediately on launch
+- App now loads cached state instantly on startup before the background refresh completes

windows/UsageViewModel.cs

@@ -20,10 +20,11 @@ public class UsageViewModel : INotifyPropertyChanged
     private string? _errorMessage;
     private bool _isSignedIn;
     private string _userEmail = "";
-    private string _planLabel = "Pro";
+    private string _planLabel = "Claude";
     private DateTime? _lastUpdated;
     private OverageSpendLimit? _overage;
     private PrepaidCredits? _prepaid;
+    private ExtraUsage? _extraUsage;
 
     private readonly Dictionary<string, List<double>> _burnHistory = [];
     private const int MaxHistorySamples = 24;
@@ -37,6 +38,7 @@ public class UsageViewModel : INotifyPropertyChanged
     public DateTime? LastUpdated            { get => _lastUpdated;  set => Set(ref _lastUpdated, value); }
     public OverageSpendLimit? Overage       { get => _overage;      set => Set(ref _overage, value); }
     public PrepaidCredits? Prepaid          { get => _prepaid;      set => Set(ref _prepaid, value); }
+    public ExtraUsage? ExtraUsage           { get => _extraUsage;   set => Set(ref _extraUsage, value); }
 
     private int _refreshInterval = 120;
     public int RefreshInterval
@@ -95,14 +97,28 @@ public class UsageViewModel : INotifyPropertyChanged
                 return;
             }
 
-            // Try HttpClient first (fast path) — may be rejected by server CORS/header checks
-            var (limits, overage, prepaid, email, orgId, ok) = hasCookies
-                ? await TryHttpRefreshAsync(cookies)
-                : ([], null, null, null, null, false);
+            // HttpClient refresh — WebView2 is NOT used here to avoid spawning a heavy
+            // browser process every refresh cycle (causes memory accumulation).
+            // SaveAndClose at login time is responsible for fetching live data via WebView2.
+            List<AgentLimit> limits    = [];
+            OverageSpendLimit? overage = null;
+            PrepaidCredits?    prepaid = null;
+            ExtraUsage?     extraUsage = null;
+            string? email = null, orgId = null, planLabel = null;
+            string? refreshError = null;
 
-            // Fall back to WebView2 (uses the shared browser session, not HttpClient)
-            if (!ok)
-                (limits, email, orgId) = await TryWebView2RefreshAsync();
+            if (hasCookies)
+            {
+                try
+                {
+                    (limits, overage, prepaid, extraUsage, email, orgId, planLabel, _) =
+                        await TryHttpRefreshAsync(cookies);
+                }
+                catch (Exception ex)
+                {
+                    refreshError = ex.Message;
+                }
+            }
 
             // Fill in any blanks from cached values saved at login time
             if (string.IsNullOrEmpty(email))  email  = AppSettings.Default.Email;
@@ -131,14 +147,19 @@ public class UsageViewModel : INotifyPropertyChanged
 
             await Application.Current.Dispatcher.InvokeAsync(() =>
             {
-                Limits       = limits;
-                Overage      = overage;
-                Prepaid      = prepaid;
+                if (limits.Count > 0)
+                {
+                    Limits    = limits;
+                    Overage   = overage;
+                    Prepaid   = prepaid;
+                    // Only clear ExtraUsage if the API explicitly disables it; keep cached value
+                    // if the HTTP endpoint omits the field (it often does for non-browser clients)
+                    if (extraUsage != null) ExtraUsage = extraUsage;
+                }
+                if (!string.IsNullOrEmpty(planLabel)) PlanLabel = planLabel;
                 if (!string.IsNullOrEmpty(email)) UserEmail = email;
-                // Trust that cookies / cached auth mean the user IS signed in,
-                // even if the live fetch failed this cycle.
                 IsSignedIn   = true;
-                ErrorMessage = null;
+                ErrorMessage = refreshError;
                 LastUpdated  = DateTime.Now;
                 IsLoading    = false;
             });
@@ -153,17 +174,47 @@ public class UsageViewModel : INotifyPropertyChanged
         }
     }
 
-    private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, string?, string?, bool)>
+    private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, ExtraUsage?, string?, string?, string?, bool)>
         TryHttpRefreshAsync(List<(string Name, string Value, string Domain, string Path)> cookies)
     {
         try
         {
             using var http = BuildClient(cookies);
             var bootstrapResp = await http.GetAsync("https://claude.ai/api/bootstrap");
+            if ((int)bootstrapResp.StatusCode is 401 or 403)
+                throw new Exception("Session expired — please re-authenticate.");
             if (!bootstrapResp.IsSuccessStatusCode)
-                return ([], null, null, null, null, false);
+                throw new Exception($"Bootstrap failed ({(int)bootstrapResp.StatusCode}).");
 
-            var (email, orgId) = ParseBootstrap(await bootstrapResp.Content.ReadAsStringAsync());
+            var bootstrapJson = await bootstrapResp.Content.ReadAsStringAsync();
+            // Targeted debug: log org property names + capabilities value so we can see
+            // exactly what the HttpClient bootstrap response contains
+            try
+            {
+                using var dbgDoc = System.Text.Json.JsonDocument.Parse(bootstrapJson);
+                var dbgRoot = dbgDoc.RootElement;
+                var dbg = $"len:{bootstrapJson.Length}";
+                if (dbgRoot.TryGetProperty("account", out var dbgAcct) &&
+                    dbgAcct.TryGetProperty("memberships", out var dbgMems) &&
+                    dbgMems.GetArrayLength() > 0 &&
+                    dbgMems[0].TryGetProperty("organization", out var dbgOrg))
+                {
+                    var keys = string.Join(",", dbgOrg.EnumerateObject().Select(p => p.Name));
+                    dbg += $"|org_keys:{keys}";
+                    if (dbgOrg.TryGetProperty("capabilities", out var dbgCaps))
+                        dbg += $"|caps:{dbgCaps.GetRawText()}";
+                    else
+                        dbg += "|caps:MISSING";
+                }
+                else
+                {
+                    dbg += "|no_memberships";
+                }
+                AppSettings.Default.DebugInfo = dbg;
+                AppSettings.Default.Save();
+            }
+            catch { /* debug only — never block refresh */ }
+            var (email, orgId, planLabel) = ParseBootstrap(bootstrapJson);
 
             if (string.IsNullOrEmpty(orgId))
                 orgId = await FetchOrgIdFromListAsync(http);
@@ -171,19 +222,101 @@ public class UsageViewModel : INotifyPropertyChanged
                 orgId = AppSettings.Default.OrgId;
 
             if (string.IsNullOrEmpty(orgId))
-                return ([], null, null, email, orgId, true);
+                return ([], null, null, null, email, orgId, planLabel, true);
 
             AppSettings.Default.OrgId = orgId;
             AppSettings.Default.Save();
 
-            var ut = FetchAsync<UsageResponse>(http, $"https://claude.ai/api/organizations/{orgId}/usage");
-            var ot = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
-            var pt = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
-            await Task.WhenAll(ut, ot, pt);
+            var usageUrl  = $"https://claude.ai/api/organizations/{orgId}/usage";
+            var ut  = http.GetAsync(usageUrl);
+            var ot  = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
+            var pt  = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
+            // Fetch org details as a fallback source for capabilities (bootstrap omits them via HttpClient)
+            var odt = http.GetAsync($"https://claude.ai/api/organizations/{orgId}");
+            await Task.WhenAll(ut, ot, pt, odt);
 
-            return (BuildLimits(ut.Result), ot.Result, pt.Result, email, orgId, true);
+            var usageResp = ut.Result;
+            if (!usageResp.IsSuccessStatusCode)
+                throw new Exception($"Usage fetch failed ({(int)usageResp.StatusCode}).");
+
+            var usageJson = await usageResp.Content.ReadAsStringAsync();
+            var usage     = JsonSerializer.Deserialize<UsageResponse>(usageJson, JsonOpts);
+
+            // Try org endpoint for capabilities if bootstrap didn't return them
+            if (string.IsNullOrEmpty(planLabel) && odt.Result.IsSuccessStatusCode)
+            {
+                try
+                {
+                    var orgJson = await odt.Result.Content.ReadAsStringAsync();
+                    using var orgDoc = JsonDocument.Parse(orgJson);
+                    if (orgDoc.RootElement.TryGetProperty("capabilities", out var orgCaps) &&
+                        orgCaps.ValueKind == JsonValueKind.Array)
+                    {
+                        foreach (var cap in orgCaps.EnumerateArray())
+                        {
+                            var s = cap.GetString() ?? "";
+                            if (s.StartsWith("claude_", StringComparison.OrdinalIgnoreCase))
+                            {
+                                var name = s.Substring("claude_".Length);
+                                if (name.Length > 0)
+                                    planLabel = char.ToUpper(name[0]) + name.Substring(1).ToLower();
+                                break;
+                            }
+                        }
+                    }
+                }
+                catch { /* best-effort */ }
+            }
+
+            // If HttpClient couldn't reach overage/prepaid endpoints (expired cf_clearance),
+            // fall back to the persistent background WebView2 which always has live cookies.
+            var overageResult = ot.Result;
+            var prepaidResult = pt.Result;
+            if ((overageResult == null || prepaidResult == null) && orgId != null)
+            {
+                try
+                {
+                    var browser = App.BackgroundBrowser;
+                    if (browser != null)
+                    {
+                        var wvScript = $@"(async()=>{{try{{
+                            const h={{headers:{{accept:'application/json'}}}};
+                            const [ov,pp]=await Promise.all([
+                                fetch('/api/organizations/{orgId}/overage_spend_limit',h).then(r=>r.ok?r.json():null).catch(()=>null),
+                                fetch('/api/organizations/{orgId}/prepaid/credits',h).then(r=>r.ok?r.json():null).catch(()=>null)
+                            ]);
+                            window.chrome.webview.postMessage({{overage:ov,prepaid:pp}});
+                        }}catch(ex){{window.chrome.webview.postMessage(null);}}}})()";
+
+                        var wvJson = await Application.Current.Dispatcher.InvokeAsync(
+                            () => browser.RunScriptAsync(wvScript)).Task.Unwrap();
+
+                        if (!string.IsNullOrEmpty(wvJson) && wvJson != "null")
+                        {
+                            using var wvDoc = JsonDocument.Parse(wvJson);
+                            var wvRoot = wvDoc.RootElement;
+                            if (overageResult == null && wvRoot.TryGetProperty("overage", out var ovEl)
+                                && ovEl.ValueKind == JsonValueKind.Object)
+                                overageResult = JsonSerializer.Deserialize<OverageSpendLimit>(ovEl.GetRawText(), JsonOpts);
+                            if (prepaidResult == null && wvRoot.TryGetProperty("prepaid", out var ppEl)
+                                && ppEl.ValueKind == JsonValueKind.Object)
+                                prepaidResult = JsonSerializer.Deserialize<PrepaidCredits>(ppEl.GetRawText(), JsonOpts);
+                        }
+                    }
+                }
+                catch { /* best-effort — never block the refresh */ }
+            }
+
+            // Persist fresh usage so cache reflects live data
+            AppSettings.Default.UsageJson = usageJson;
+            if (!string.IsNullOrEmpty(planLabel))  AppSettings.Default.PlanLabel   = planLabel;
+            if (overageResult != null) AppSettings.Default.OverageJson = JsonSerializer.Serialize(overageResult);
+            if (prepaidResult != null) AppSettings.Default.PrepaidJson = JsonSerializer.Serialize(prepaidResult);
+            AppSettings.Default.Save();
+
+            return (BuildLimits(usage), overageResult, prepaidResult, usage?.ExtraUsage, email, orgId, planLabel, true);
         }
-        catch { return ([], null, null, null, null, false); }
+        catch { throw; }
     }
 
     private static async Task<(List<AgentLimit>, string?, string?)> TryWebView2RefreshAsync()
@@ -193,7 +326,8 @@ public class UsageViewModel : INotifyPropertyChanged
             const string script = @"(async()=>{try{
                 const h={headers:{accept:'application/json'}};
                 const b=await(await fetch('/api/bootstrap',h)).json();
-                let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
+                let id=b?.account?.memberships?.[0]?.organization?.uuid
+                        ||b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
                         ||b?.default_organization?.uuid||null;
                 const em=b?.account?.email_address||b?.account?.email||b?.email||null;
                 if(!id){
@@ -201,13 +335,14 @@ public class UsageViewModel : INotifyPropertyChanged
                         if(Array.isArray(ol)&&ol.length>0)id=ol[0]?.uuid||null;}catch(e2){}
                 }
                 if(!id){
-                    try{const pu=await(await fetch('/api/usage',h)).json();
-                        if(pu&&!pu.error)return{email:em,orgId:null,usage:pu};}catch(e3){}
-                    return{email:em,orgId:null,usage:null};
+                    let pu=null;
+                    try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){}
+                    window.chrome.webview.postMessage({email:em,orgId:null,usage:(pu&&!pu.error?pu:null)});
+                    return;
                 }
                 const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
-                return{email:em,orgId:id,usage:u};
-            }catch(ex){return null;}})()";
+                window.chrome.webview.postMessage({email:em,orgId:id,usage:u});
+            }catch(ex){window.chrome.webview.postMessage(null);}})();";
 
             var resultJson = await Application.Current.Dispatcher.InvokeAsync(async () =>
             {
@@ -257,23 +392,50 @@ public class UsageViewModel : INotifyPropertyChanged
         if (!isAuth) return;
 
         List<AgentLimit> limits = [];
+        ExtraUsage?     extraUsage = null;
+        OverageSpendLimit? overage = null;
+        PrepaidCredits?    prepaid = null;
+
         if (!string.IsNullOrEmpty(AppSettings.Default.UsageJson))
         {
             try
             {
                 var cached = JsonSerializer.Deserialize<UsageResponse>(
                     AppSettings.Default.UsageJson, JsonOpts);
-                limits = BuildLimits(cached);
+                limits     = BuildLimits(cached);
+                extraUsage = cached?.ExtraUsage;
             }
             catch { }
         }
+        if (!string.IsNullOrEmpty(AppSettings.Default.OverageJson))
+        {
+            try { overage = JsonSerializer.Deserialize<OverageSpendLimit>(AppSettings.Default.OverageJson, JsonOpts); }
+            catch { }
+        }
+        if (!string.IsNullOrEmpty(AppSettings.Default.PrepaidJson))
+        {
+            try { prepaid = JsonSerializer.Deserialize<PrepaidCredits>(AppSettings.Default.PrepaidJson, JsonOpts); }
+            catch { }
+        }
+
+        // Attach persisted burn history to cached limits
+        foreach (var limit in limits)
+        {
+            var key = limit.Window.ToString();
+            if (_burnHistory.TryGetValue(key, out var hist) && hist.Count > 0)
+                limit.BurnHistory = [.. hist];
+        }
 
         await Application.Current.Dispatcher.InvokeAsync(() =>
         {
-            if (!string.IsNullOrEmpty(email)) UserEmail = email;
-            if (limits.Count > 0)             Limits    = limits;
+            if (!string.IsNullOrEmpty(email))                   UserEmail = email;
+            if (!string.IsNullOrEmpty(AppSettings.Default.PlanLabel)) PlanLabel = AppSettings.Default.PlanLabel;
+            Limits       = limits.Count > 0 ? limits : LoadPlaceholderLimits();
+            Overage      = overage;
+            Prepaid      = prepaid;
+            ExtraUsage   = extraUsage;
             IsSignedIn   = true;
-            ErrorMessage = limits.Count == 0 ? "Signed in — refreshing data…" : null;
+            ErrorMessage = null;
             LastUpdated  = limits.Count > 0 ? DateTime.Now : LastUpdated;
         });
     }
@@ -326,6 +488,14 @@ public class UsageViewModel : INotifyPropertyChanged
         http.DefaultRequestHeaders.Add("User-Agent",
             "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
             "(KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36");
+        http.DefaultRequestHeaders.Add("Origin",           "https://claude.ai");
+        http.DefaultRequestHeaders.Add("Referer",          "https://claude.ai/");
+        http.DefaultRequestHeaders.Add("sec-fetch-dest",   "empty");
+        http.DefaultRequestHeaders.Add("sec-fetch-mode",   "cors");
+        http.DefaultRequestHeaders.Add("sec-fetch-site",   "same-origin");
+        http.DefaultRequestHeaders.Add("sec-ch-ua",        "\"Chromium\";v=\"124\", \"Google Chrome\";v=\"124\"");
+        http.DefaultRequestHeaders.Add("sec-ch-ua-mobile", "?0");
+        http.DefaultRequestHeaders.Add("sec-ch-ua-platform", "\"Windows\"");
         var cookieHeader = string.Join("; ", cookies.Select(c => $"{c.Name}={c.Value}"));
         http.DefaultRequestHeaders.Add("Cookie", cookieHeader);
         return http;
@@ -344,7 +514,7 @@ public class UsageViewModel : INotifyPropertyChanged
     }
 
     // Parse email and org ID out of bootstrap JSON (multiple fallback paths for org ID)
-    private static (string? Email, string? OrgId) ParseBootstrap(string json)
+    private static (string? Email, string? OrgId, string? PlanLabel) ParseBootstrap(string json)
     {
         try
         {
@@ -358,8 +528,9 @@ public class UsageViewModel : INotifyPropertyChanged
                 acct.TryGetProperty("email_address", out var em))
                 email = em.GetString();
 
-            // Path 1: memberships[0].organization.uuid
-            if (root.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
+            // Path 1: account.memberships[0].organization.uuid  (Claude.ai personal/pro accounts)
+            if (root.TryGetProperty("account", out var acctNode) &&
+                acctNode.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
             {
                 var first = mems[0];
                 if (first.TryGetProperty("organization", out var org) &&
@@ -367,7 +538,17 @@ public class UsageViewModel : INotifyPropertyChanged
                     orgId = uuid.GetString();
             }
 
-            // Path 2: organizations[0].uuid (flat list on root)
+            // Path 2: memberships[0].organization.uuid  (root-level, older API shape)
+            if (string.IsNullOrEmpty(orgId) &&
+                root.TryGetProperty("memberships", out var rootMems) && rootMems.GetArrayLength() > 0)
+            {
+                var first = rootMems[0];
+                if (first.TryGetProperty("organization", out var org) &&
+                    org.TryGetProperty("uuid", out var uuid))
+                    orgId = uuid.GetString();
+            }
+
+            // Path 3: organizations[0].uuid  (flat list on root)
             if (string.IsNullOrEmpty(orgId) &&
                 root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
             {
@@ -375,9 +556,28 @@ public class UsageViewModel : INotifyPropertyChanged
                     orgId = uuid.GetString();
             }
 
-            return (email, orgId);
+            string? planLabel = null;
+            if (root.TryGetProperty("account", out var acctPlan) &&
+                acctPlan.TryGetProperty("memberships", out var plMems) && plMems.GetArrayLength() > 0 &&
+                plMems[0].TryGetProperty("organization", out var plOrg) &&
+                plOrg.TryGetProperty("capabilities", out var caps) &&
+                caps.ValueKind == System.Text.Json.JsonValueKind.Array)
+            {
+                foreach (var cap in caps.EnumerateArray())
+                {
+                    var s = cap.GetString() ?? "";
+                    if (s.StartsWith("claude_", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var name = s.Substring("claude_".Length);
+                        if (name.Length > 0)
+                            planLabel = char.ToUpper(name[0]) + name.Substring(1).ToLower();
+                        break;
+                    }
+                }
+            }
+            return (email, orgId, planLabel);
         }
-        catch { return (null, null); }
+        catch { return (null, null, null); }
     }
 
     private static async Task<string?> FetchOrgIdFromListAsync(HttpClient http)
@@ -455,16 +655,18 @@ public class UsageViewModel : INotifyPropertyChanged
         return $"{diff.Hours}h {diff.Minutes}m";
     }
 
-    private void LoadPlaceholders()
+    private static List<AgentLimit> LoadPlaceholderLimits()
     {
         var now = DateTime.Now;
-        Limits =
+        return
         [
             new() { Window = WindowKind.FiveHour, UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddHours(1) },
             new() { Window = WindowKind.SevenDay,  UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddDays(7) },
         ];
     }
 
+    private void LoadPlaceholders() => Limits = LoadPlaceholderLimits();
+
     private void LoadBurnHistory()
     {
         try

windows/WebViewFetchWindow.cs

@@ -2,58 +2,142 @@ using Microsoft.Web.WebView2.Core;
 using Microsoft.Web.WebView2.Wpf;
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 
 namespace ClaudeCheckerWindows;
 
 // Invisible 1×1 window that hosts a WebView2 for authenticated API calls.
-// Uses the same user data folder as LoginWindow so the session is shared.
+// Uses the same user data folder as LoginWindow so the session (including
+// cf_clearance) is always shared and fresh — equivalent to macOS's WKWebsiteDataStore.
+//
+// Two usage modes:
+//   • Persistent (App.BackgroundBrowser): created once at startup, navigates to
+//     claude.ai once, then scripts run directly on the live page every refresh.
+//     No re-navigation = no memory accumulation.
+//   • One-shot (LoginWindow): created, used, closed — same as before.
 internal sealed class WebViewFetchWindow : Window
 {
     private readonly WebView2 _wv = new();
+    private bool _initialized;
+    private bool _readyForScript; // true after first navigation to claude.ai completes
+
+    private static readonly string UserDataFolder =
+        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            "ClaudeChecker", "WebView2");
 
     public WebViewFetchWindow()
     {
-        Width          = 1;
-        Height         = 1;
-        Left           = -9999;
-        Top            = -9999;
-        ShowInTaskbar  = false;
-        WindowStyle    = WindowStyle.None;
+        Width              = 1;
+        Height             = 1;
+        Left               = -9999;
+        Top                = -9999;
+        ShowInTaskbar      = false;
+        WindowStyle        = WindowStyle.None;
         AllowsTransparency = true;
-        Opacity        = 0;
-        Content        = _wv;
+        Opacity            = 0;
+        Content            = _wv;
     }
 
-    public async Task<string?> FetchAsync(string navigateUrl, string script, int timeoutMs = 20000)
+    // ── Persistent-mode init ──────────────────────────────────────────────────
+
+    // Call once at startup. Navigates to claude.ai so the session/cookies are
+    // established and cf_clearance is fresh. Subsequent RunScriptAsync calls
+    // skip navigation and just execute JS on the live page.
+    public async Task InitAsync()
     {
-        var env = await CoreWebView2Environment.CreateAsync(userDataFolder:
-            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                "ClaudeChecker", "WebView2"));
+        await EnsureInitAsync();
 
-        await _wv.EnsureCoreWebView2Async(env);
+        var navDone = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+        EventHandler<CoreWebView2NavigationCompletedEventArgs>? h = null;
+        h = (_, e) => { _wv.CoreWebView2.NavigationCompleted -= h; navDone.TrySetResult(e.IsSuccess); };
+        _wv.CoreWebView2.NavigationCompleted += h;
+        _wv.CoreWebView2.Navigate("https://claude.ai");
 
-        var tcs = new TaskCompletionSource<string?>();
+        // Wait up to 15 s for initial navigation
+        await Task.WhenAny(navDone.Task, Task.Delay(15000));
+        _readyForScript = navDone.Task.IsCompletedSuccessfully && navDone.Task.Result;
+    }
 
-        EventHandler<CoreWebView2NavigationCompletedEventArgs>? handler = null;
-        handler = async (_, e) =>
+    // Run a JS script on the already-loaded claude.ai page.
+    // The script must call window.chrome.webview.postMessage(result).
+    public async Task<string?> RunScriptAsync(string script, int timeoutMs = 10000)
+    {
+        if (!_readyForScript) return null;
+
+        var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
+        EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
+        msgHandler = (_, args) =>
         {
-            _wv.CoreWebView2.NavigationCompleted -= handler;
-            if (!e.IsSuccess) { tcs.TrySetResult(null); return; }
-            try
-            {
-                var result = await _wv.CoreWebView2.ExecuteScriptAsync(script);
-                tcs.TrySetResult(result);
-            }
-            catch { tcs.TrySetResult(null); }
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
+            tcs.TrySetResult(args.WebMessageAsJson);
         };
+        _wv.CoreWebView2.WebMessageReceived += msgHandler;
 
-        _wv.CoreWebView2.NavigationCompleted += handler;
-        _wv.CoreWebView2.Navigate(navigateUrl);
+        try { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
+        catch
+        {
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
+            return null;
+        }
 
-        _ = Task.Delay(timeoutMs).ContinueWith(_ => tcs.TrySetResult(null));
+        _ = Task.Delay(timeoutMs).ContinueWith(_ =>
+        {
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
+            tcs.TrySetResult(null);
+        });
 
         return await tcs.Task;
     }
+
+    // ── One-shot mode (LoginWindow) ───────────────────────────────────────────
+
+    public async Task<string?> FetchAsync(string navigateUrl, string script, int timeoutMs = 20000)
+    {
+        await EnsureInitAsync();
+
+        var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
+        msgHandler = (_, args) =>
+        {
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
+            tcs.TrySetResult(args.WebMessageAsJson);
+        };
+        _wv.CoreWebView2.WebMessageReceived += msgHandler;
+
+        EventHandler<CoreWebView2NavigationCompletedEventArgs>? navHandler = null;
+        navHandler = async (_, e) =>
+        {
+            _wv.CoreWebView2.NavigationCompleted -= navHandler;
+            if (!e.IsSuccess) { tcs.TrySetResult(null); return; }
+            try   { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
+            catch { tcs.TrySetResult(null); }
+        };
+        _wv.CoreWebView2.NavigationCompleted += navHandler;
+        _wv.CoreWebView2.Navigate(navigateUrl);
+
+        _ = Task.Delay(timeoutMs).ContinueWith(_ =>
+        {
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
+            tcs.TrySetResult(null);
+        });
+
+        return await tcs.Task;
+    }
+
+    // ── Shared init ───────────────────────────────────────────────────────────
+
+    private int _initGuard;
+
+    private async Task EnsureInitAsync()
+    {
+        if (_initialized) return;
+        if (Interlocked.Exchange(ref _initGuard, 1) != 0) return;
+
+        var env = await CoreWebView2Environment.CreateAsync(userDataFolder: UserDataFolder);
+        await _wv.EnsureCoreWebView2Async(env);
+        _initialized = true;
+    }
 }