fix: credit values /100; add after-reset/today badge to cards

windows/App.xaml.cs

@@ -8,8 +8,12 @@ namespace ClaudeCheckerWindows;
 
 public partial class App : Application
 {
-    public static UsageViewModel ViewModel { get; } = new();
+    public static UsageViewModel    ViewModel       { get; } = new();
-    public static UpdateManager  Updater   { 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

@@ -6,11 +6,14 @@ namespace ClaudeCheckerWindows;
 
 public class AppSettings
 {
+    // Auth signal — non-empty means the user has completed sign-in at least once.
+    // The WebView2 user-data folder holds the live session; this is only for startup.
     public string CookieStore     { get; set; } = "";
+
+    // Accumulated sparkline data — built up over multiple refreshes.
     public string BurnHistory     { get; set; } = "";
-    public string OrgId           { get; set; } = "";
+
-    public string Email           { get; set; } = "";
+    // User preferences
-    public string UsageJson       { get; set; } = "";
     public int    RefreshInterval { get; set; } = 120;
     public bool   ShowInTaskbar   { get; set; } = true;
     public bool   BetaChannel     { get; set; } = false;

windows/Controls/GaugeControl.cs

@@ -46,27 +46,16 @@ public class GaugeControl : FrameworkElement
             DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg * (Percent / 100.0),
                 new Pen(Accent, StrokeWidth));
 
-        var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip;
+        var dpi       = VisualTreeHelper.GetDpi(this).PixelsPerDip;
-
         var textColor = ThemeManager.IsDark ? Color.FromRgb(0xF5, 0xF5, 0xF5) : Color.FromRgb(0x1C, 0x1C, 0x1C);
-        var subColor  = Color.FromRgb(0x9E, 0x9E, 0x9E);
 
         var pctText = new FormattedText(
             $"{(int)Math.Round(Percent)}%",
             CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
             new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
-            14, new SolidColorBrush(textColor), dpi);
+            18, new SolidColorBrush(textColor), dpi);
-        dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
 
-        var sub = new FormattedText(
+        dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height / 2));
-            "Updated\nnow",
-            CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-            new Typeface("Segoe UI"), 7,
-            new SolidColorBrush(subColor), dpi)
-        {
-            TextAlignment = TextAlignment.Center
-        };
-        dc.DrawText(sub, new Point(cx - sub.Width / 2, cy + 2));
     }
 
     private static void DrawArc(DrawingContext dc, double cx, double cy, double r,

windows/LoginWindow.xaml.cs

@@ -1,8 +1,5 @@
 using Microsoft.Web.WebView2.Core;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
 using System.Threading.Tasks;
 using System.Windows;
 
@@ -22,7 +19,7 @@ public partial class LoginWindow : Window
     {
         var env = await CoreWebView2Environment.CreateAsync(userDataFolder:
             System.IO.Path.Combine(
-                Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData),
                 "ClaudeChecker", "WebView2"));
 
         await Browser.EnsureCoreWebView2Async(env);
@@ -35,9 +32,9 @@ public partial class LoginWindow : Window
             if (!uri.Contains("claude.ai")) return;
 
             var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
-            var signedIn = cookies.Any(c =>
+            var signedIn = System.Linq.Enumerable.Any(cookies, c =>
-                c.Name.Equals("sessionKey", StringComparison.OrdinalIgnoreCase) ||
+                c.Name.Equals("sessionKey", System.StringComparison.OrdinalIgnoreCase) ||
-                c.Name.StartsWith("sk-ant", StringComparison.OrdinalIgnoreCase));
+                c.Name.StartsWith("sk-ant",  System.StringComparison.OrdinalIgnoreCase));
 
             await Dispatcher.InvokeAsync(() =>
             {
@@ -47,7 +44,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);
         };
@@ -65,41 +61,10 @@ public partial class LoginWindow : Window
         if (_closing) return;
         _closing = true;
 
+        // Persist cookies so the app knows the user is signed in on next startup.
+        // All live data is fetched by the background WebView2 on the next refresh.
         UsageViewModel.SaveCookies(cookies);
 
-        // Fetch bootstrap + usage from within WebView2 (already authenticated, no header issues)
-        try
-        {
-            const string script = @"(async()=>{try{
-                const b=await(await fetch('/api/bootstrap',{headers:{accept:'application/json'}})).json();
-                const id=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;
-                if(!id)return{email:e,orgId:null,usage:null};
-                const u=await(await fetch('/api/organizations/'+id+'/usage',{headers:{accept:'application/json'}})).json();
-                return{email:e,orgId:id,usage:u};
-            }catch(ex){return{error:String(ex)};}})()";
-
-            var json = await Browser.CoreWebView2.ExecuteScriptAsync(script);
-            if (json != "null" && !string.IsNullOrEmpty(json))
-            {
-                using var doc = JsonDocument.Parse(json);
-                var root = doc.RootElement;
-
-                if (root.TryGetProperty("email", out var em) && em.ValueKind == JsonValueKind.String)
-                    AppSettings.Default.Email = em.GetString() ?? "";
-
-                if (root.TryGetProperty("orgId", out var oi) && oi.ValueKind == JsonValueKind.String)
-                    AppSettings.Default.OrgId = oi.GetString() ?? "";
-
-                if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
-                    AppSettings.Default.UsageJson = us.GetRawText();
-
-                AppSettings.Default.Save();
-            }
-        }
-        catch { }
-
         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("five_hour")]   public WindowData?  FiveHour   { get; set; }
-    [JsonPropertyName("claude_ai_default")]    public WindowData? SevenDay  { 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)
@@ -117,24 +124,51 @@ public partial class PopupWindow : Window
             BorderThickness = new Thickness(0),
         };
 
-        var timeStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
+        // Left side of time row: "⏱ Xh Ym   Resets D MMM YYYY at HH:mm"
-        timeStack.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
+        var timeLeft = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
-        timeStack.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
+        timeLeft.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
+        timeLeft.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
             FontWeight = FontWeights.Medium, Foreground = text, VerticalAlignment = VerticalAlignment.Center });
-
+        timeLeft.Children.Add(new TextBlock
-        var resetText = new TextBlock
         {
-            Text = $"Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
+            Text = $"   Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
-            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
+            FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
-        };
+        });
+
+        // Right side: "after reset" when 0%, "today HH:MM" when refreshed today
+        string? refreshLabel = limit.UsedPercent == 0
+            ? "after reset"
+            : VM.LastUpdated?.Date == DateTime.Today
+                ? "today " + VM.LastUpdated.Value.ToString("h:mm tt")
+                : null;
+
+        UIElement timeRight;
+        if (refreshLabel != null)
+        {
+            var inner = new StackPanel { Orientation = Orientation.Horizontal };
+            inner.Children.Add(new TextBlock { Text = "↗ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
+            inner.Children.Add(new TextBlock { Text = refreshLabel, FontSize = 10, FontWeight = FontWeights.Medium,
+                Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
+            timeRight = new Border
+            {
+                Background   = new SolidColorBrush(Color.FromArgb(18, 0, 0, 0)),
+                CornerRadius = new CornerRadius(4),
+                Padding      = new Thickness(6, 2, 6, 2),
+                Child        = inner
+            };
+        }
+        else
+        {
+            timeRight = new TextBlock(); // empty placeholder
+        }
 
         var timeRow = new Grid();
         timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
         timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
-        Grid.SetColumn(timeStack, 0);
+        Grid.SetColumn(timeLeft,  0);
-        Grid.SetColumn(resetText, 1);
+        Grid.SetColumn(timeRight, 1);
-        timeRow.Children.Add(timeStack);
+        timeRow.Children.Add(timeLeft);
-        timeRow.Children.Add(resetText);
+        timeRow.Children.Add(timeRight);
 
         var sparkline = new SparklineControl
         {
@@ -180,12 +214,137 @@ 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 ?? "$";
+
+        // All credit values from the API are in cents — divide by 100.
+        var spent   = (overage?.UsedCredits        / 100.0) ?? (VM.ExtraUsage?.UsedCredits  / 100.0) ?? 0;
+        var limit   = (overage?.MonthlyCreditLimit / 100.0) ?? (VM.ExtraUsage?.MonthlyLimit / 100.0) ?? 0;
+        var balance = (prepaid?.Amount             / 100.0) ?? 0;
+
+        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();
@@ -333,11 +492,16 @@ public partial class PopupWindow : Window
         var login = new LoginWindow { Owner = this };
         if (login.ShowDialog() == true)
         {
-            // Brief pause so the LoginWindow WebView2 fully releases its user data folder lock
+            await VM.LoadFromCacheAsync();
-            // before RefreshAsync may create another WebView2 on the same folder.
-            await Task.Delay(1500);
-            await VM.RefreshAsync();
             InitSettings();
+            ShowMain();
+
+            _ = Task.Run(async () =>
+            {
+                await Task.Delay(3000);
+                await VM.RefreshAsync();
+                await Application.Current.Dispatcher.InvokeAsync(InitSettings);
+            });
         }
         Show();
         Activate();

windows/RELEASE_NOTES.md

@@ -1,7 +1,8 @@
-## What's new in beta.23
+## What's new in beta.36
 
-- About section now shows "vX.X.X available" label when an update is available (not just button label change)
+### Bug fixes
-- Sign-in: fixed app showing signed out after login window closes — cookies and cached auth now correctly set IsSignedIn=true
+- Settings no longer incorrectly shows "Not signed in" when limits are working
-- Sign-in: added brief delay before refresh so WebView2 user data folder is fully released by LoginWindow before reuse
+- Session Diary now shows correctly after the first successful refresh
-- Wider cookie domain filter (anthropic.com included alongside claude.ai)
+- Extra Usage Credits section now restored from cache on startup
-- Broader JS paths for email and org ID in bootstrap response
+- 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
@@ -77,14 +79,8 @@ public class UsageViewModel : INotifyPropertyChanged
 
         try
         {
-            var cookies = await GetCookiesAsync();
+            // CookieStore being non-empty is our signal that the user has signed in.
-
+            if (string.IsNullOrEmpty(AppSettings.Default.CookieStore))
-            // Check if we have any persistent proof that the user authenticated
-            bool hasCookies    = cookies.Count > 0;
-            bool hasCachedAuth = !string.IsNullOrEmpty(AppSettings.Default.Email) ||
-                                 !string.IsNullOrEmpty(AppSettings.Default.OrgId);
-
-            if (!hasCookies && !hasCachedAuth)
             {
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
@@ -95,27 +91,43 @@ public class UsageViewModel : INotifyPropertyChanged
                 return;
             }
 
-            // Try HttpClient first (fast path) — may be rejected by server CORS/header checks
+            List<AgentLimit> limits    = [];
-            var (limits, overage, prepaid, email, orgId, ok) = hasCookies
+            OverageSpendLimit? overage = null;
-                ? await TryHttpRefreshAsync(cookies)
+            PrepaidCredits?    prepaid = null;
-                : ([], null, null, null, null, false);
+            ExtraUsage?     extraUsage = null;
+            string? email = null, orgId = null, planLabel = null;
+            string? refreshError = null;
 
-            // Fall back to WebView2 (uses the shared browser session, not HttpClient)
+            // Primary: persistent background WebView2 — always-live cookies, same as macOS.
-            if (!ok)
+            // Fallback: HttpClient with saved cookies, only if the browser isn't ready yet
-                (limits, email, orgId) = await TryWebView2RefreshAsync();
+            // (the brief window while InitAsync is still navigating at startup).
-
+            if (App.BackgroundBrowser.IsReady)
-            // Fill in any blanks from cached values saved at login time
-            if (string.IsNullOrEmpty(email))  email  = AppSettings.Default.Email;
-            if (string.IsNullOrEmpty(orgId))  orgId  = AppSettings.Default.OrgId;
-            if (limits.Count == 0 && !string.IsNullOrEmpty(AppSettings.Default.UsageJson))
             {
                 try
                 {
-                    var cached = System.Text.Json.JsonSerializer.Deserialize<UsageResponse>(
+                    (limits, overage, prepaid, extraUsage, email, orgId, planLabel) =
-                        AppSettings.Default.UsageJson, JsonOpts);
+                        await TryBrowserRefreshAsync();
-                    limits = BuildLimits(cached);
+                }
+                catch (Exception ex)
+                {
+                    refreshError = ex.Message;
+                }
+            }
+            else
+            {
+                var cookies = await GetCookiesAsync();
+                if (cookies.Count > 0)
+                {
+                    try
+                    {
+                        (limits, overage, prepaid, extraUsage, email, orgId, planLabel, _) =
+                            await TryHttpRefreshAsync(cookies);
+                    }
+                    catch (Exception ex)
+                    {
+                        refreshError = ex.Message;
+                    }
                 }
-                catch { }
             }
 
             foreach (var limit in limits)
@@ -131,14 +143,17 @@ public class UsageViewModel : INotifyPropertyChanged
 
             await Application.Current.Dispatcher.InvokeAsync(() =>
             {
-                Limits       = limits;
+                if (limits.Count > 0)
-                Overage      = overage;
+                {
-                Prepaid      = prepaid;
+                    Limits    = limits;
-                if (!string.IsNullOrEmpty(email)) UserEmail = email;
+                    Overage   = overage;
-                // Trust that cookies / cached auth mean the user IS signed in,
+                    Prepaid   = prepaid;
-                // even if the live fetch failed this cycle.
+                    if (extraUsage != null) ExtraUsage = extraUsage;
+                }
+                if (!string.IsNullOrEmpty(planLabel)) PlanLabel = planLabel;
+                if (!string.IsNullOrEmpty(email))     UserEmail = email;
                 IsSignedIn   = true;
-                ErrorMessage = null;
+                ErrorMessage = refreshError;
                 LastUpdated  = DateTime.Now;
                 IsLoading    = false;
             });
@@ -153,102 +168,138 @@ public class UsageViewModel : INotifyPropertyChanged
         }
     }
 
-    private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, string?, string?, bool)>
+    // ── Browser-based refresh (primary) ───────────────────────────────────────
-        TryHttpRefreshAsync(List<(string Name, string Value, string Domain, string Path)> cookies)
+    // Runs JS on the persistent claude.ai page. Same live cookies as macOS WKWebView.
+
+    private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, ExtraUsage?, string?, string?, string?)>
+        TryBrowserRefreshAsync()
     {
-        try
+        const string script = @"(async()=>{try{
-        {
+            const h={headers:{accept:'application/json'}};
-            using var http = BuildClient(cookies);
+            const b=await(await fetch('/api/bootstrap',h)).json();
-            var bootstrapResp = await http.GetAsync("https://claude.ai/api/bootstrap");
+            if(b?.error_type==='authentication_error'){window.chrome.webview.postMessage({authError:true});return;}
-            if (!bootstrapResp.IsSuccessStatusCode)
+            const org0=b?.account?.memberships?.[0]?.organization;
-                return ([], null, null, null, null, false);
+            let id=org0?.uuid||b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid||null;
+            const email=b?.account?.email_address||b?.account?.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;
+            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(!id){window.chrome.webview.postMessage({noOrg:true,email});return;}
+            const [u,ov,pp]=await Promise.all([
+                fetch('/api/organizations/'+id+'/usage',h).then(r=>r.json()),
+                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,orgId:id,planLabel,usage:u,overage:ov,prepaid:pp});
+        }catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
 
-            var (email, orgId) = ParseBootstrap(await bootstrapResp.Content.ReadAsStringAsync());
+        var json = await Application.Current.Dispatcher.InvokeAsync(
+            () => App.BackgroundBrowser.RunScriptAsync(script)).Task.Unwrap();
 
-            if (string.IsNullOrEmpty(orgId))
+        if (string.IsNullOrEmpty(json) || json == "null")
-                orgId = await FetchOrgIdFromListAsync(http);
+            throw new Exception("Browser refresh returned no data.");
-            if (string.IsNullOrEmpty(orgId) && !string.IsNullOrEmpty(AppSettings.Default.OrgId))
-                orgId = AppSettings.Default.OrgId;
 
-            if (string.IsNullOrEmpty(orgId))
+        using var doc = JsonDocument.Parse(json);
-                return ([], null, null, email, orgId, true);
+        var root = doc.RootElement;
 
-            AppSettings.Default.OrgId = orgId;
+        if (root.TryGetProperty("authError", out _))
-            AppSettings.Default.Save();
+            throw new Exception("Session expired — please re-authenticate.");
+        if (root.TryGetProperty("error", out var errEl))
+            throw new Exception("Browser script error: " + errEl.GetString());
+        if (root.TryGetProperty("noOrg", out _))
+            throw new Exception("Could not determine organization ID.");
 
-            var ut = FetchAsync<UsageResponse>(http, $"https://claude.ai/api/organizations/{orgId}/usage");
+        string? email     = root.TryGetProperty("email",     out var em) && em.ValueKind == JsonValueKind.String ? em.GetString() : null;
-            var ot = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
+        string? orgId     = root.TryGetProperty("orgId",     out var oi) && oi.ValueKind == JsonValueKind.String ? oi.GetString() : null;
-            var pt = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
+        string? planLabel = root.TryGetProperty("planLabel", out var pl) && pl.ValueKind == JsonValueKind.String ? pl.GetString() : null;
-            await Task.WhenAll(ut, ot, pt);
 
-            return (BuildLimits(ut.Result), ot.Result, pt.Result, email, orgId, true);
+        UsageResponse?     usage       = null;
-        }
+        OverageSpendLimit? overage     = null;
-        catch { return ([], null, null, null, null, false); }
+        PrepaidCredits?    prepaid     = null;
+
+        if (root.TryGetProperty("usage",   out var us) && us.ValueKind == JsonValueKind.Object)
+            usage   = JsonSerializer.Deserialize<UsageResponse>(us.GetRawText(), JsonOpts);
+        if (root.TryGetProperty("overage", out var ov) && ov.ValueKind == JsonValueKind.Object)
+            overage = JsonSerializer.Deserialize<OverageSpendLimit>(ov.GetRawText(), JsonOpts);
+        if (root.TryGetProperty("prepaid", out var pp) && pp.ValueKind == JsonValueKind.Object)
+            prepaid = JsonSerializer.Deserialize<PrepaidCredits>(pp.GetRawText(), JsonOpts);
+
+        return (BuildLimits(usage), overage, prepaid, usage?.ExtraUsage, email, orgId, planLabel);
     }
 
-    private static async Task<(List<AgentLimit>, string?, string?)> TryWebView2RefreshAsync()
+    // ── HttpClient refresh (fallback — before browser is ready) ──────────────
+
+    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)
+            throw new Exception($"Bootstrap failed ({(int)bootstrapResp.StatusCode}).");
+
+        var bootstrapJson = await bootstrapResp.Content.ReadAsStringAsync();
+        var (email, orgId, planLabel) = ParseBootstrap(bootstrapJson);
+
+        if (string.IsNullOrEmpty(orgId))
+            orgId = await FetchOrgIdFromListAsync(http);
+
+        if (string.IsNullOrEmpty(orgId))
+            return ([], null, null, null, email, orgId, planLabel, true);
+
+        var ut = http.GetAsync($"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 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);
+
+        return (BuildLimits(usage), ot.Result, pt.Result, usage?.ExtraUsage, email, orgId, planLabel, true);
+    }
+
+    // ── Startup cache ─────────────────────────────────────────────────────────
+    // Called before the browser is ready. Sets sign-in state and shows placeholders
+    // with any previously accumulated burn history so the popup isn't blank.
+
+    public async Task LoadFromCacheAsync()
+    {
+        if (string.IsNullOrEmpty(AppSettings.Default.CookieStore)) return;
+
+        var placeholders = LoadPlaceholderLimits();
+        foreach (var limit in placeholders)
         {
-            const string script = @"(async()=>{try{
+            var key = limit.Window.ToString();
-                const b=await(await fetch('/api/bootstrap',{headers:{accept:'application/json'}})).json();
+            if (_burnHistory.TryGetValue(key, out var hist) && hist.Count > 0)
-                const id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
+                limit.BurnHistory = [.. hist];
-                         ||b?.default_organization?.uuid||null;
-                const em=b?.account?.email_address||b?.account?.email||b?.email||null;
-                if(!id)return{email:em,orgId:null,usage:null};
-                const u=await(await fetch('/api/organizations/'+id+'/usage',{headers:{accept:'application/json'}})).json();
-                return{email:em,orgId:id,usage:u};
-            }catch(ex){return null;}})()";
-
-            var resultJson = await Application.Current.Dispatcher.InvokeAsync(async () =>
-            {
-                var host = new WebViewFetchWindow();
-                host.Show();
-                try   { return await host.FetchAsync("https://claude.ai", script); }
-                finally { host.Close(); }
-            }).Task.Unwrap();
-
-            if (resultJson == null || resultJson == "null") return ([], null, null);
-
-            using var doc = System.Text.Json.JsonDocument.Parse(resultJson);
-            var root = doc.RootElement;
-
-            string? email = root.TryGetProperty("email", out var em) && em.ValueKind == System.Text.Json.JsonValueKind.String
-                ? em.GetString() : null;
-            string? orgId = root.TryGetProperty("orgId", out var oi) && oi.ValueKind == System.Text.Json.JsonValueKind.String
-                ? oi.GetString() : null;
-
-            List<AgentLimit> limits = [];
-            if (root.TryGetProperty("usage", out var us) && us.ValueKind == System.Text.Json.JsonValueKind.Object)
-            {
-                var usage = System.Text.Json.JsonSerializer.Deserialize<UsageResponse>(
-                    us.GetRawText(), new System.Text.Json.JsonSerializerOptions { PropertyNameCaseInsensitive = true });
-                limits = BuildLimits(usage);
-
-                // Cache for next time
-                AppSettings.Default.UsageJson = us.GetRawText();
-                if (!string.IsNullOrEmpty(orgId)) AppSettings.Default.OrgId = orgId;
-                if (!string.IsNullOrEmpty(email)) AppSettings.Default.Email = email;
-                AppSettings.Default.Save();
-            }
-
-            return (limits, email, orgId);
         }
-        catch { return ([], null, null); }
+
+        await Application.Current.Dispatcher.InvokeAsync(() =>
+        {
+            Limits     = placeholders;
+            IsSignedIn = true;
+        });
     }
 
     public async Task SignOutAsync()
     {
         AppSettings.Default.CookieStore = "";
-        AppSettings.Default.OrgId       = "";
-        AppSettings.Default.Email       = "";
-        AppSettings.Default.UsageJson   = "";
         AppSettings.Default.Save();
 
         await Application.Current.Dispatcher.InvokeAsync(() =>
         {
             IsSignedIn   = false;
             UserEmail    = "";
+            PlanLabel    = "Claude";
             ErrorMessage = "Signed out.";
             Limits       = [];
         });
@@ -285,6 +336,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;
@@ -302,8 +361,7 @@ public class UsageViewModel : INotifyPropertyChanged
         catch { return null; }
     }
 
-    // Parse email and org ID out of bootstrap JSON (multiple fallback paths for org ID)
+    private static (string? Email, string? OrgId, string? PlanLabel) ParseBootstrap(string json)
-    private static (string? Email, string? OrgId) ParseBootstrap(string json)
     {
         try
         {
@@ -317,8 +375,8 @@ public class UsageViewModel : INotifyPropertyChanged
                 acct.TryGetProperty("email_address", out var em))
                 email = em.GetString();
 
-            // Path 1: memberships[0].organization.uuid
+            if (root.TryGetProperty("account", out var acctNode) &&
-            if (root.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
+                acctNode.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
             {
                 var first = mems[0];
                 if (first.TryGetProperty("organization", out var org) &&
@@ -326,7 +384,15 @@ public class UsageViewModel : INotifyPropertyChanged
                     orgId = uuid.GetString();
             }
 
-            // Path 2: organizations[0].uuid (flat list on root)
+            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();
+            }
+
             if (string.IsNullOrEmpty(orgId) &&
                 root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
             {
@@ -334,9 +400,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 == 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)
@@ -414,16 +499,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,144 @@ 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
-internal sealed class WebViewFetchWindow : Window
+// 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.
+public 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 bool IsReady => _readyForScript;
 
     public WebViewFetchWindow()
     {
-        Width          = 1;
+        Width              = 1;
-        Height         = 1;
+        Height             = 1;
-        Left           = -9999;
+        Left               = -9999;
-        Top            = -9999;
+        Top                = -9999;
-        ShowInTaskbar  = false;
+        ShowInTaskbar      = false;
-        WindowStyle    = WindowStyle.None;
+        WindowStyle        = WindowStyle.None;
         AllowsTransparency = true;
-        Opacity        = 0;
+        Opacity            = 0;
-        Content        = _wv;
+        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:
+        await EnsureInitAsync();
-            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                "ClaudeChecker", "WebView2"));
 
-        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;
+    // Run a JS script on the already-loaded claude.ai page.
-        handler = async (_, e) =>
+    // 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;
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
-            if (!e.IsSuccess) { tcs.TrySetResult(null); return; }
+            tcs.TrySetResult(args.WebMessageAsJson);
-            try
-            {
-                var result = await _wv.CoreWebView2.ExecuteScriptAsync(script);
-                tcs.TrySetResult(result);
-            }
-            catch { tcs.TrySetResult(null); }
         };
+        _wv.CoreWebView2.WebMessageReceived += msgHandler;
 
-        _wv.CoreWebView2.NavigationCompleted += handler;
+        try { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
-        _wv.CoreWebView2.Navigate(navigateUrl);
+        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;
+    }
 }