Diagnostics: remove email, redact IDs on copy

Read lastActiveOrg cookie in both the browser JS path and HttpClient
fallback, then prefer the matching org in ParseBootstrap for both
org ID and plan label selection — same fix as macOS v1.3.0.

Add Settings → Diagnostics panel showing app state, last request
details, cookie store counts/domains, and stored cookie names.

windows/App.xaml

@@ -15,7 +15,8 @@
         <SolidColorBrush x:Key="SurfaceBrush"      Color="#FAFAFA" po:Freeze="False"/>
         <SolidColorBrush x:Key="BannerBgBrush"     Color="#E8F2FB" po:Freeze="False"/>
         <SolidColorBrush x:Key="BannerBorderBrush" Color="#B3D6F5" po:Freeze="False"/>
-        <SolidColorBrush x:Key="HoverBrush"       Color="#EBEBEB" po:Freeze="False"/>
+        <SolidColorBrush x:Key="HoverBrush"        Color="#EBEBEB" po:Freeze="False"/>
+        <SolidColorBrush x:Key="PressedBrush"      Color="#D6D6D6" po:Freeze="False"/>
         <SolidColorBrush x:Key="BadgeBrush"        Color="#F0F0F0" po:Freeze="False"/>
 
         <Style x:Key="HeaderText" TargetType="TextBlock">
@@ -26,27 +27,31 @@
         </Style>
 
         <Style x:Key="PrimaryButton" TargetType="Button">
-            <Setter Property="Background"      Value="{DynamicResource BlueBrush}"/>
+            <Setter Property="Background"        Value="{DynamicResource BlueBrush}"/>
-            <Setter Property="Foreground"      Value="White"/>
+            <Setter Property="Foreground"        Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="BorderThickness"   Value="0"/>
-            <Setter Property="Padding"         Value="14,6"/>
+            <Setter Property="Padding"           Value="14,6"/>
-            <Setter Property="FontSize"        Value="12"/>
+            <Setter Property="FontSize"          Value="12"/>
-            <Setter Property="FontWeight"      Value="SemiBold"/>
+            <Setter Property="FontWeight"        Value="SemiBold"/>
-            <Setter Property="FontFamily"      Value="Segoe UI"/>
+            <Setter Property="FontFamily"        Value="Segoe UI"/>
-            <Setter Property="Cursor"          Value="Hand"/>
+            <Setter Property="Cursor"            Value="Hand"/>
+            <Setter Property="FocusVisualStyle"  Value="{x:Null}"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}" CornerRadius="4"
+                        <Border x:Name="Bd" Background="{TemplateBinding Background}"
-                                Padding="{TemplateBinding Padding}">
+                                CornerRadius="4" Padding="{TemplateBinding Padding}">
                             <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#106EBE"/>
+                                <Setter TargetName="Bd" Property="Background" Value="#106EBE"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="#005A9E"/>
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="Background" Value="#BDBDBD"/>
+                                <Setter TargetName="Bd" Property="Background" Value="#BDBDBD"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -55,18 +60,20 @@
         </Style>
 
         <Style x:Key="SmallButton" TargetType="Button">
-            <Setter Property="Background"      Value="{DynamicResource ButtonBrush}"/>
+            <Setter Property="Background"       Value="{DynamicResource ButtonBrush}"/>
-            <Setter Property="BorderBrush"     Value="{DynamicResource BorderBrush}"/>
+            <Setter Property="BorderBrush"      Value="{DynamicResource BorderBrush}"/>
-            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="BorderThickness"  Value="1"/>
-            <Setter Property="Foreground"      Value="{DynamicResource TextBrush}"/>
+            <Setter Property="Foreground"       Value="{DynamicResource TextBrush}"/>
-            <Setter Property="Padding"         Value="10,4"/>
+            <Setter Property="Padding"          Value="10,4"/>
-            <Setter Property="FontSize"        Value="12"/>
+            <Setter Property="FontSize"         Value="12"/>
-            <Setter Property="FontFamily"      Value="Segoe UI"/>
+            <Setter Property="FontFamily"       Value="Segoe UI"/>
-            <Setter Property="Cursor"          Value="Hand"/>
+            <Setter Property="Cursor"           Value="Hand"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}"
+                        <Border x:Name="Bd"
+                                Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 CornerRadius="4" Padding="{TemplateBinding Padding}">
@@ -74,7 +81,10 @@
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="{DynamicResource HoverBrush}"/>
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource HoverBrush}"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource PressedBrush}"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -83,18 +93,19 @@
         </Style>
 
         <Style TargetType="ComboBox">
-            <Setter Property="FontFamily"      Value="Segoe UI"/>
+            <Setter Property="FontFamily"       Value="Segoe UI"/>
-            <Setter Property="FontSize"        Value="12"/>
+            <Setter Property="FontSize"         Value="12"/>
-            <Setter Property="Background"      Value="{DynamicResource CardBrush}"/>
+            <Setter Property="Background"       Value="{DynamicResource CardBrush}"/>
-            <Setter Property="Foreground"      Value="{DynamicResource TextBrush}"/>
+            <Setter Property="Foreground"       Value="{DynamicResource TextBrush}"/>
-            <Setter Property="BorderBrush"     Value="{DynamicResource BorderBrush}"/>
+            <Setter Property="BorderBrush"      Value="{DynamicResource BorderBrush}"/>
-            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="BorderThickness"  Value="1"/>
-            <Setter Property="Padding"         Value="8,4"/>
+            <Setter Property="Padding"          Value="8,4"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="ComboBox">
                         <Grid>
-                            <Border x:Name="Border"
+                            <Border x:Name="Bd"
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="{TemplateBinding BorderBrush}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
@@ -106,14 +117,21 @@
                                         ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
                                         Margin="{TemplateBinding Padding}"
                                         VerticalAlignment="Center" HorizontalAlignment="Left"/>
-                                    <TextBlock Text="▾" FontSize="10"
+                                    <TextBlock Text="&#x25BE;" FontSize="10"
                                                Foreground="{DynamicResource SecondaryBrush}"
                                                HorizontalAlignment="Right" VerticalAlignment="Center"
                                                Margin="0,0,8,0" IsHitTestVisible="False"/>
+                                    <!-- Fully transparent toggle — no system chrome bleeds through -->
                                     <ToggleButton Focusable="False" ClickMode="Press"
+                                                  FocusVisualStyle="{x:Null}"
                                                   IsChecked="{Binding IsDropDownOpen, Mode=TwoWay,
-                                                      RelativeSource={RelativeSource TemplatedParent}}"
+                                                      RelativeSource={RelativeSource TemplatedParent}}">
-                                                  Background="Transparent" BorderThickness="0"/>
+                                        <ToggleButton.Template>
+                                            <ControlTemplate TargetType="ToggleButton">
+                                                <Border Background="Transparent"/>
+                                            </ControlTemplate>
+                                        </ToggleButton.Template>
+                                    </ToggleButton>
                                 </Grid>
                             </Border>
                             <Popup x:Name="Popup" Placement="Bottom"
@@ -132,15 +150,21 @@
                                 </Border>
                             </Popup>
                         </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource HoverBrush}"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
             <Setter Property="ItemContainerStyle">
                 <Setter.Value>
                     <Style TargetType="ComboBoxItem">
-                        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+                        <Setter Property="Foreground"       Value="{DynamicResource TextBrush}"/>
-                        <Setter Property="Background" Value="{DynamicResource CardBrush}"/>
+                        <Setter Property="Background"       Value="{DynamicResource CardBrush}"/>
-                        <Setter Property="Padding"    Value="10,5"/>
+                        <Setter Property="Padding"          Value="10,5"/>
+                        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
                         <Setter Property="Template">
                             <Setter.Value>
                                 <ControlTemplate TargetType="ComboBoxItem">
@@ -154,6 +178,10 @@
                                             <Setter TargetName="Bd" Property="Background"
                                                     Value="{DynamicResource HoverBrush}"/>
                                         </Trigger>
+                                        <Trigger Property="IsSelected" Value="True">
+                                            <Setter TargetName="Bd" Property="Background"
+                                                    Value="{DynamicResource HoverBrush}"/>
+                                        </Trigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>
                             </Setter.Value>

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,12 +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 ViewModel.LoadFromCacheAsync();
-            await Task.Delay(1000);
+            // 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,18 +6,17 @@ 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;
-    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

@@ -46,29 +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);
-        var sub = new FormattedText(
-            "used",
-            CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-            new Typeface("Segoe UI"), 8,
-            new SolidColorBrush(subColor), dpi)
-        {
-            TextAlignment = TextAlignment.Center
-        };
 
-        var totalHeight = pctText.Height + 2 + sub.Height;
+        dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height / 2));
-        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

@@ -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(() =>
             {
@@ -64,91 +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);
 
-        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();
-                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;orgSrc='orgs-list';}}catch(e2){}
-                }
-                if(!id){
-                    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();
-                window.chrome.webview.postMessage({email:e,orgId:id,planLabel,usage:u,debug:'src:'+orgSrc+'|plan:'+(planLabel||'none')});
-            }catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
-
-            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;
-
-                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();
-
-                if (root.TryGetProperty("planLabel", out var pl) && pl.ValueKind == JsonValueKind.String
-                    && !string.IsNullOrEmpty(pl.GetString()))
-                    AppSettings.Default.PlanLabel = pl.GetString()!;
-
-                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 (Exception ex)
-        {
-            AppSettings.Default.DebugInfo = "exception: " + ex.Message;
-            AppSettings.Default.Save();
-        }
-
         await Dispatcher.InvokeAsync(() => DialogResult = true);
     }
 }

windows/PopupWindow.xaml

@@ -150,7 +150,7 @@
                         <TextBlock Text="ABOUT" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
                         <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
                                 BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
-                                Padding="14,12">
+                                Padding="14,12" Margin="0,0,0,16">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto"/>
@@ -185,6 +185,19 @@
                             </Grid>
                         </Border>
 
+                        <TextBlock Text="DIAGNOSTICS" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
+                        <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                                Padding="14,12">
+                            <StackPanel>
+                                <TextBlock Text="View app state, last request details, and stored cookies."
+                                           FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
+                                           TextWrapping="Wrap" Margin="0,0,0,10"/>
+                                <Button Content="Open diagnostics" Style="{StaticResource SmallButton}"
+                                        HorizontalAlignment="Left" Click="Diagnostics_Click"/>
+                            </StackPanel>
+                        </Border>
+
                     </StackPanel>
                 </ScrollViewer>
             </DockPanel>
@@ -250,5 +263,30 @@
                 </StackPanel>
             </DockPanel>
         </Border>
+
+        <!-- Diagnostics panel -->
+        <Border x:Name="DiagnosticsPanel" Visibility="Collapsed"
+                Background="{DynamicResource BackgroundBrush}">
+            <DockPanel>
+                <Border DockPanel.Dock="Top" BorderBrush="{DynamicResource BorderBrush}"
+                        BorderThickness="0,0,0,1" Background="{DynamicResource SurfaceBrush}" Padding="12,10">
+                    <Grid>
+                        <Button Content="← Back" HorizontalAlignment="Left"
+                                Style="{StaticResource SmallButton}" BorderThickness="0"
+                                Foreground="{DynamicResource BlueBrush}" Background="Transparent"
+                                Click="BackFromDiag_Click"/>
+                        <TextBlock Text="Diagnostics" FontSize="14" FontWeight="SemiBold"
+                                   Foreground="{DynamicResource TextBrush}"
+                                   HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <Button x:Name="CopyDiagButton" Content="Copy All" HorizontalAlignment="Right"
+                                Style="{StaticResource SmallButton}" Click="CopyDiag_Click"/>
+                    </Grid>
+                </Border>
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                    <StackPanel x:Name="DiagContentPanel" Margin="16,4,16,16"/>
+                </ScrollViewer>
+            </DockPanel>
+        </Border>
+
     </Grid>
 </Window>

windows/PopupWindow.xaml.cs

@@ -1,6 +1,11 @@
 using ClaudeCheckerWindows.Controls;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Interop;
@@ -15,7 +20,6 @@ public partial class PopupWindow : Window
     private static readonly UpdateManager  Updater = App.Updater;
     private readonly DispatcherTimer _clockTimer;
 
-
     [DllImport("dwmapi.dll")]
     private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int value, int size);
 
@@ -34,7 +38,7 @@ public partial class PopupWindow : Window
         VM.PropertyChanged      += (_, e) => Dispatcher.InvokeAsync(() => OnVmChanged(e.PropertyName));
         Updater.PropertyChanged += (_, e) => Dispatcher.InvokeAsync(() => OnUpdaterChanged(e.PropertyName));
 
-        _clockTimer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(5) };
+        _clockTimer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(1) };
         _clockTimer.Tick += (_, _) => UpdateFooter();
         _clockTimer.Start();
 
@@ -56,12 +60,12 @@ public partial class PopupWindow : Window
         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));
-
-        if (VM.ExtraUsage?.IsEnabled == true)
-            CardsPanel.Children.Add(BuildExtraUsageSection());
     }
 
     private static UIElement BuildCard(AgentLimit limit)
@@ -71,10 +75,8 @@ public partial class PopupWindow : Window
         var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
         var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
 
-        // Gauge
         var gauge = new GaugeControl { Width = 76, Height = 76, Percent = limit.UsedPercent, Accent = accent };
 
-        // Live badge
         var liveBadge = new Border
         {
             Background   = new SolidColorBrush(Color.FromArgb(30, 0, 160, 0)),
@@ -86,7 +88,6 @@ public partial class PopupWindow : Window
                                Foreground = new SolidColorBrush(Color.FromRgb(0, 120, 0)) }
         };
 
-        // Usage badge
         var usageBadge = new Border
         {
             Background   = new SolidColorBrush(Color.FromArgb(18, 0, 0, 0)),
@@ -101,7 +102,7 @@ public partial class PopupWindow : Window
         badgeStack.Children.Add(usageBadge);
 
         var nameStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
-        nameStack.Children.Add(new TextBlock { Text = "✦", FontSize = 11, Foreground = accent, VerticalAlignment = VerticalAlignment.Center });
+        nameStack.Children.Add(new TextBlock { Text = "✶", FontSize = 11, Foreground = accent, VerticalAlignment = VerticalAlignment.Center });
         nameStack.Children.Add(new TextBlock { Text = "Claude", FontSize = 13, FontWeight = FontWeights.SemiBold,
             Foreground = text, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
         nameStack.Children.Add(new TextBlock { Text = $"·  {VM.PlanLabel}", FontSize = 11,
@@ -124,36 +125,64 @@ public partial class PopupWindow : Window
             BorderThickness = new Thickness(0),
         };
 
-        var timeStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
+        // Left: time remaining + reset date inline
-        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: projected limit-hit time, or "after reset" if burn rate won't reach 100% before reset.
+        // BurnRate is stored as usedPercent / windowHours, so hoursToFull = remainingPercent / BurnRate.
+        string? refreshLabel;
+        if (limit.BurnRate <= 0)
+            refreshLabel = "after reset";
+        else
+        {
+            var projectedHit = DateTime.Now.AddHours((100.0 - limit.UsedPercent) / limit.BurnRate);
+            refreshLabel = projectedHit > limit.ResetDate
+                ? "after reset"
+                : projectedHit.Date == DateTime.Today
+                    ? projectedHit.ToString("h:mm tt")
+                    : projectedHit.ToString("d MMM h:mm tt");
+        }
+
+        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();
+        }
 
         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
-        {
-            Height = 28, Margin = new Thickness(0, 8, 0, 0), LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
-            Data = limit.BurnHistory.Count > 0 ? limit.BurnHistory : null,
-        };
 
         var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
         infoPanel.Children.Add(headerRow);
         infoPanel.Children.Add(progress);
         infoPanel.Children.Add(timeRow);
-        infoPanel.Children.Add(sparkline);
 
         var cardGrid = new Grid { Margin = new Thickness(16, 12, 16, 12) };
         cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
@@ -189,29 +218,39 @@ public partial class PopupWindow : Window
 
     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 statsRow = new Grid { Margin = new Thickness(12, 10, 12, 6) };
-        var avgBurn = limit.BurnRate;
+        statsRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-
+        statsRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
-        var subtitle = new TextBlock
+        var samplesText = new TextBlock
         {
-            Text       = $"{samples} samples · {avgBurn:F1}%/h avg burn rate",
+            Text = $"{limit.BurnHistory.Count} samples",
-            FontSize   = 11,
+            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
-            Foreground = secondary,
-            Margin     = new Thickness(16, 0, 16, 6),
         };
+        var burnText = new TextBlock
+        {
+            Text = $"Avg burn rate: {limit.BurnRate:F1}%/h",
+            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
+        };
+        Grid.SetColumn(samplesText, 0);
+        Grid.SetColumn(burnText,    1);
+        statsRow.Children.Add(samplesText);
+        statsRow.Children.Add(burnText);
 
         var sparkline = new SparklineControl
         {
-            Height    = 32,
+            Height    = 40,
-            Margin    = new Thickness(8, 8, 8, 8),
+            Margin    = new Thickness(8, 0, 8, 8),
             LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
             Data      = limit.BurnHistory,
         };
 
+        var cardContent = new StackPanel();
+        cardContent.Children.Add(statsRow);
+        cardContent.Children.Add(sparkline);
+
         var card = new Border
         {
             Background      = (SolidColorBrush)Application.Current.Resources["CardBrush"],
@@ -219,7 +258,7 @@ public partial class PopupWindow : Window
             BorderBrush     = border,
             BorderThickness = new Thickness(1),
             Margin          = new Thickness(12, 0, 12, 0),
-            Child           = sparkline,
+            Child           = cardContent,
         };
 
         var sectionLabel = new TextBlock
@@ -231,7 +270,6 @@ public partial class PopupWindow : Window
 
         var section = new StackPanel();
         section.Children.Add(sectionLabel);
-        section.Children.Add(subtitle);
         section.Children.Add(card);
         return section;
     }
@@ -247,18 +285,20 @@ public partial class PopupWindow : Window
         var prepaid  = VM.Prepaid;
         var currency = VM.ExtraUsage?.Currency ?? overage?.Currency ?? "$";
 
-        // Fall back to extra_usage fields when the overage/prepaid endpoints return nothing
+        var spent   = (overage?.UsedCredits        / 100.0) ?? (VM.ExtraUsage?.UsedCredits  / 100.0) ?? 0;
-        var spent   = overage?.UsedCredits        ?? VM.ExtraUsage?.UsedCredits  ?? 0;
+        var limit   = (overage?.MonthlyCreditLimit / 100.0) ?? (VM.ExtraUsage?.MonthlyLimit / 100.0) ?? 0;
-        var limit   = overage?.MonthlyCreditLimit ?? VM.ExtraUsage?.MonthlyLimit ?? 0;
+        var balance = (prepaid?.Amount             / 100.0) ?? 0;
-        var balance = prepaid?.Amount             ?? 0;
 
-        UIElement MakeRow(string label, string value)
+        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 = text };
+            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);
@@ -267,9 +307,10 @@ public partial class PopupWindow : Window
         }
 
         var contentPanel = new StackPanel { Margin = new Thickness(12, 10, 12, 10) };
-        contentPanel.Children.Add(MakeRow("Spent",   $"{currency}{spent:F2}"));
+        contentPanel.Children.Add(MakeRow("Spent",   $"{currency} {spent:F2}", spent > 0));
-        if (limit   > 0) contentPanel.Children.Add(MakeRow("Limit",   $"{currency}{limit:F2}"));
+        if (unlimited)      contentPanel.Children.Add(MakeRow("Limit",   "Unlimited"));
-        if (balance > 0) contentPanel.Children.Add(MakeRow("Balance", $"{currency}{balance:F2}"));
+        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)
         {
@@ -366,8 +407,14 @@ public partial class PopupWindow : Window
         if (VM.LastUpdated.HasValue)
         {
             var diff = DateTime.Now - VM.LastUpdated.Value;
-            LastUpdatedText.Text = diff.TotalSeconds < 10 ? "Updated just now"
+            string age;
-                                                          : $"Updated {(int)diff.TotalSeconds}s ago";
+            if (diff.TotalSeconds < 10)
+                age = "just now";
+            else if (diff.TotalMinutes < 1)
+                age = $"{(int)diff.TotalSeconds} sec ago";
+            else
+                age = $"{(int)diff.TotalMinutes} min, {diff.Seconds} sec ago";
+            LastUpdatedText.Text = $"Updated {age}";
         }
         else
         {
@@ -378,18 +425,33 @@ public partial class PopupWindow : Window
 
     // ── Settings ─────────────────────────────────────────────────────
 
+    private static readonly (string Label, int Seconds)[] RefreshIntervals =
+    [
+        ("1 min",  60),
+        ("2 min",  120),
+        ("3 min",  180),
+        ("4 min",  240),
+        ("5 min",  300),
+        ("10 min", 600),
+    ];
+
     private void InitSettings()
     {
         VersionLabel.Text    = $"v{Updater.CurrentVersion}";
         BetaToggle.IsChecked = Updater.BetaChannel;
         UpdateAboutSection();
 
-        var intervals = new[] { ("1 min", 60), ("2 min", 120), ("3 min", 180),
+        RefreshPicker.SelectionChanged -= RefreshPicker_Changed;
-                                ("4 min", 240), ("5 min", 300), ("10 min", 600) };
+        RefreshPicker.Items.Clear();
-        RefreshPicker.ItemsSource        = intervals;
+        int selectIdx = 1;
-        RefreshPicker.DisplayMemberPath  = "Item1";
+        for (int i = 0; i < RefreshIntervals.Length; i++)
-        var idx = Array.FindIndex(intervals, x => x.Item2 == VM.RefreshInterval);
+        {
-        RefreshPicker.SelectedIndex      = idx < 0 ? 1 : idx;
+            var (label, seconds) = RefreshIntervals[i];
+            RefreshPicker.Items.Add(new ComboBoxItem { Content = label, Tag = seconds });
+            if (seconds == VM.RefreshInterval) selectIdx = i;
+        }
+        RefreshPicker.SelectedIndex = selectIdx;
+        RefreshPicker.SelectionChanged += RefreshPicker_Changed;
 
         AuthPanel.Children.Clear();
         var dot = new System.Windows.Shapes.Ellipse
@@ -398,38 +460,215 @@ public partial class PopupWindow : Window
             Fill = VM.IsSignedIn ? Brushes.LimeGreen : Brushes.Orange,
             VerticalAlignment = VerticalAlignment.Center,
         };
-        var label = new TextBlock
+        var label2 = new TextBlock
         {
             Text = VM.IsSignedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
-            FontSize = 13, FontWeight = FontWeights.SemiBold, Foreground = (SolidColorBrush)Application.Current.Resources["TextBrush"],
+            FontSize = 13, FontWeight = FontWeights.SemiBold,
+            Foreground = (SolidColorBrush)Application.Current.Resources["TextBrush"],
             VerticalAlignment = VerticalAlignment.Center,
         };
         var authRow = new StackPanel { Orientation = Orientation.Horizontal };
         authRow.Children.Add(dot);
-        authRow.Children.Add(label);
+        authRow.Children.Add(label2);
         AuthPanel.Children.Add(authRow);
 
         SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
         SignInButton.Content     = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
     }
 
+    // ── Diagnostics ──────────────────────────────────────────────────
+
+    private void Diagnostics_Click(object s, RoutedEventArgs e)
+    {
+        RebuildDiag();
+        MainPanel.Visibility        = Visibility.Collapsed;
+        SettingsPanel.Visibility    = Visibility.Collapsed;
+        UpdatePanel.Visibility      = Visibility.Collapsed;
+        DiagnosticsPanel.Visibility = Visibility.Visible;
+    }
+
+    private void BackFromDiag_Click(object s, RoutedEventArgs e)
+    {
+        DiagnosticsPanel.Visibility = Visibility.Collapsed;
+        SettingsPanel.Visibility    = Visibility.Visible;
+    }
+
+    private void CopyDiag_Click(object s, RoutedEventArgs e)
+    {
+        Clipboard.SetText(BuildDiagText());
+        CopyDiagButton.Content = "Copied! (IDs redacted)";
+        var t = new DispatcherTimer { Interval = TimeSpan.FromSeconds(1.5) };
+        t.Tick += (_, _) => { CopyDiagButton.Content = "Copy All"; t.Stop(); };
+        t.Start();
+    }
+
+    private void RebuildDiag()
+    {
+        DiagContentPanel.Children.Clear();
+        var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
+        var text      = (SolidColorBrush)Application.Current.Resources["TextBrush"];
+
+        FrameworkElement MakeRow(string label, string value)
+        {
+            var grid = new Grid { Margin = new Thickness(0, 3, 0, 3) };
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(110) });
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+            var lbl = new TextBlock
+            {
+                Text = label, FontSize = 11, Foreground = secondary,
+                VerticalAlignment = VerticalAlignment.Top,
+            };
+            var val = new TextBlock
+            {
+                Text = value, FontSize = 11, FontFamily = new FontFamily("Consolas"),
+                Foreground = text, TextWrapping = TextWrapping.Wrap,
+            };
+            Grid.SetColumn(lbl, 0);
+            Grid.SetColumn(val, 1);
+            grid.Children.Add(lbl);
+            grid.Children.Add(val);
+            return grid;
+        }
+
+        void AddSection(string title, IEnumerable<FrameworkElement> rows)
+        {
+            DiagContentPanel.Children.Add(new TextBlock
+            {
+                Text = title, Style = (Style)Application.Current.Resources["HeaderText"],
+                Margin = new Thickness(0, 12, 0, 6),
+            });
+            var panel = new StackPanel { Margin = new Thickness(12, 10, 12, 10) };
+            foreach (var row in rows) panel.Children.Add(row);
+            DiagContentPanel.Children.Add(new Border
+            {
+                Background      = (SolidColorBrush)Application.Current.Resources["CardBrush"],
+                CornerRadius    = new CornerRadius(6),
+                BorderBrush     = border, BorderThickness = new Thickness(1),
+                Child           = panel,
+            });
+        }
+
+        // APP
+        AddSection("APP",
+        [
+            MakeRow("Version",       Updater.CurrentVersion),
+            MakeRow("Signed in",     VM.IsSignedIn ? "Yes" : "No"),
+            MakeRow("Org ID",        string.IsNullOrEmpty(VM.DiagOrgId)          ? "(none)"     : VM.DiagOrgId),
+            MakeRow("lastActiveOrg", string.IsNullOrEmpty(VM.DiagLastActiveOrg)  ? "(not read)" : VM.DiagLastActiveOrg),
+            MakeRow("Error",         VM.ErrorMessage ?? "(none)"),
+        ]);
+
+        // LAST REQUEST
+        var reqRows = new List<FrameworkElement>
+        {
+            MakeRow("Path",   string.IsNullOrEmpty(VM.DiagLastPath)  ? "(none)" : VM.DiagLastPath),
+            MakeRow("Status", VM.DiagLastStatus == 0 ? "(none)" : VM.DiagLastStatus.ToString()),
+            MakeRow("Error",  string.IsNullOrEmpty(VM.DiagLastError) ? "(none)" : VM.DiagLastError),
+        };
+        if (VM.DiagLastFetch.HasValue)
+            reqRows.Add(MakeRow("Time", VM.DiagLastFetch.Value.ToString("HH:mm:ss")));
+        AddSection("LAST REQUEST", reqRows);
+
+        // COOKIE STORE
+        AddSection("COOKIE STORE",
+        [
+            MakeRow("Total cookies",  VM.DiagCookieCount.ToString()),
+            MakeRow("Claude cookies", VM.DiagClaudeCookieCount.ToString()),
+            MakeRow("All domains",    VM.DiagCookieDomains.Count == 0
+                ? "(none)" : string.Join(", ", VM.DiagCookieDomains)),
+        ]);
+
+        // STORED COOKIE NAMES
+        var storedNames = GetStoredCookieNames();
+        var nameRows = new List<FrameworkElement>();
+        if (storedNames.Count == 0)
+        {
+            nameRows.Add(MakeRow("(none)", ""));
+        }
+        else
+        {
+            var claudeC = storedNames.Where(c =>
+                c.Domain.Contains("claude.ai") || c.Domain.Contains("anthropic.com")).ToList();
+            var otherC  = storedNames.Where(c =>
+                !c.Domain.Contains("claude.ai") && !c.Domain.Contains("anthropic.com")).ToList();
+            foreach (var c in claudeC)
+                nameRows.Add(MakeRow(c.Domain, c.Name));
+            if (otherC.Count > 0)
+                nameRows.Add(MakeRow($"other ({otherC.Count})",
+                    string.Join(", ", otherC.Take(5).Select(c => c.Name))));
+        }
+        AddSection("STORED COOKIE NAMES", nameRows);
+    }
+
+    private static List<(string Name, string Domain)> GetStoredCookieNames()
+    {
+        try
+        {
+            var raw = AppSettings.Default.CookieStore;
+            if (string.IsNullOrEmpty(raw)) return [];
+            using var doc = JsonDocument.Parse(raw);
+            var list = new List<(string Name, string Domain)>();
+            foreach (var elem in doc.RootElement.EnumerateArray())
+            {
+                var name   = elem.TryGetProperty("Name",   out var n) ? n.GetString() ?? "" : "";
+                var domain = elem.TryGetProperty("Domain", out var d) ? d.GetString() ?? "" : "";
+                list.Add((name, domain));
+            }
+            return list;
+        }
+        catch { return []; }
+    }
+
+    private static string BuildDiagText()
+    {
+        var storedNames = GetStoredCookieNames();
+        var sb = new StringBuilder();
+        sb.AppendLine("=== ClaudeChecker Diagnostics (Windows) ===");
+        sb.AppendLine($"Version: {Updater.CurrentVersion}");
+        sb.AppendLine($"Signed in: {(VM.IsSignedIn ? "Yes" : "No")}");
+        sb.AppendLine($"Org ID: {(string.IsNullOrEmpty(VM.DiagOrgId) ? "(none)" : VM.DiagOrgId)}");
+        sb.AppendLine($"lastActiveOrg: {(string.IsNullOrEmpty(VM.DiagLastActiveOrg) ? "(not read)" : VM.DiagLastActiveOrg)}");
+        sb.AppendLine($"Error: {VM.ErrorMessage ?? "(none)"}");
+        sb.AppendLine();
+        sb.AppendLine($"Last path: {VM.DiagLastPath}");
+        sb.AppendLine($"Last status: {VM.DiagLastStatus}");
+        sb.AppendLine($"Last error: {VM.DiagLastError}");
+        if (VM.DiagLastFetch.HasValue)
+            sb.AppendLine($"Last fetch: {VM.DiagLastFetch.Value:HH:mm:ss}");
+        sb.AppendLine();
+        sb.AppendLine($"Total cookies: {VM.DiagCookieCount}");
+        sb.AppendLine($"Claude cookies: {VM.DiagClaudeCookieCount}");
+        sb.AppendLine($"Domains: {string.Join(", ", VM.DiagCookieDomains)}");
+        sb.AppendLine();
+        sb.AppendLine("Stored cookies:");
+        foreach (var c in storedNames)
+            sb.AppendLine($"  {c.Domain}  {c.Name}");
+        return RedactUUIDs(sb.ToString());
+    }
+
+    private static string RedactUUIDs(string text) =>
+        Regex.Replace(text, @"[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}", "****");
+
     // ── Event handlers ───────────────────────────────────────────────
 
     private void Settings_Click(object s, RoutedEventArgs e)
     {
         InitSettings();
-        MainPanel.Visibility     = Visibility.Collapsed;
+        MainPanel.Visibility        = Visibility.Collapsed;
-        SettingsPanel.Visibility = Visibility.Visible;
+        SettingsPanel.Visibility    = Visibility.Visible;
-        UpdatePanel.Visibility   = Visibility.Collapsed;
+        UpdatePanel.Visibility      = Visibility.Collapsed;
+        DiagnosticsPanel.Visibility = Visibility.Collapsed;
     }
 
     private void BackFromSettings_Click(object s, RoutedEventArgs e) => ShowMain();
 
     private void ShowMain()
     {
-        MainPanel.Visibility     = Visibility.Visible;
+        MainPanel.Visibility        = Visibility.Visible;
-        SettingsPanel.Visibility = Visibility.Collapsed;
+        SettingsPanel.Visibility    = Visibility.Collapsed;
-        UpdatePanel.Visibility   = Visibility.Collapsed;
+        UpdatePanel.Visibility      = Visibility.Collapsed;
+        DiagnosticsPanel.Visibility = Visibility.Collapsed;
     }
 
     private async void Refresh_Click(object s, RoutedEventArgs e) => await VM.RefreshAsync();
@@ -441,9 +680,10 @@ public partial class PopupWindow : Window
         CurrentVerLabel.Text  = $"v{Updater.CurrentVersion}";
         NewVerLabel.Text      = $"v{Updater.LatestVersion}";
         ReleaseNotesText.Text = Updater.ReleaseNotes;
-        MainPanel.Visibility     = Visibility.Collapsed;
+        MainPanel.Visibility        = Visibility.Collapsed;
-        SettingsPanel.Visibility = Visibility.Collapsed;
+        SettingsPanel.Visibility    = Visibility.Collapsed;
-        UpdatePanel.Visibility   = Visibility.Visible;
+        UpdatePanel.Visibility      = Visibility.Visible;
+        DiagnosticsPanel.Visibility = Visibility.Collapsed;
     }
 
     private void CloseUpdate_Click(object s, RoutedEventArgs e) => ShowMain();
@@ -461,12 +701,10 @@ public partial class PopupWindow : Window
         var login = new LoginWindow { Owner = this };
         if (login.ShowDialog() == true)
         {
-            // Show cached data from SaveAndClose immediately (no WebView2 needed)
             await VM.LoadFromCacheAsync();
             InitSettings();
             ShowMain();
 
-            // Full refresh in background after WebView2 folder is definitely released
             _ = Task.Run(async () =>
             {
                 await Task.Delay(3000);
@@ -492,10 +730,10 @@ public partial class PopupWindow : Window
 
     private void RefreshPicker_Changed(object s, SelectionChangedEventArgs e)
     {
-        if (RefreshPicker.SelectedItem is ValueTuple<string, int> selected)
+        if (RefreshPicker.SelectedItem is ComboBoxItem item && item.Tag is int seconds)
         {
-            VM.RefreshInterval = selected.Item2;
+            VM.RefreshInterval = seconds;
-            ((App)Application.Current).ScheduleTimer(selected.Item2);
+            ((App)Application.Current).ScheduleTimer(seconds);
         }
     }
 

windows/RELEASE_NOTES.md

@@ -1,8 +1,23 @@
-## What's new in beta.36
+## What's new in beta.49
+
+### Architecture
+- All data (usage, plan, overage, prepaid credits) now fetched via the persistent background WebView2 — the same always-live session as the macOS app, so Cloudflare cookies never expire between refreshes
+- HttpClient path kept only as a brief startup fallback before the browser is ready
+- Settings file simplified: only stores session signal, burn history, and user preferences — no more cached API responses
 
 ### Bug fixes
-- Settings no longer incorrectly shows "Not signed in" when limits are working
+- Plan label (e.g. "Pro") now updates on every refresh, not just at login
-- Session Diary now shows correctly after the first successful refresh
+- Extra Usage Credits values now correct (were 100× too large)
-- Extra Usage Credits section now restored from cache on startup
+- Limit and balance now update live on every refresh
-- Plan name, overage, and prepaid credits are now cached and shown immediately on launch
+- Refresh interval dropdown now shows "1 min", "2 min" etc. correctly
-- App now loads cached state instantly on startup before the background refresh completes
+- ComboBox no longer flashes bright blue when clicked
+- Buttons now show a visible pressed state
+- Footer "Updated X ago" counter now ticks every second; shows "X min, Y sec ago" past 60 s
+- Removed stray sparkline bars from the 5 h and 7 d limit cards
+- App window now shown on launch
+
+### UI improvements
+- Gauge percentage larger, "used" label removed
+- Each limit card now shows an "after reset" or "today HH:MM" badge
+- Session Diary card redesigned to match macOS layout (stats row + sparkline, no Claude header)
+- Reset date moved inline with time remaining

windows/UsageViewModel.cs

@@ -40,6 +40,17 @@ public class UsageViewModel : INotifyPropertyChanged
     public PrepaidCredits? Prepaid          { get => _prepaid;      set => Set(ref _prepaid, value); }
     public ExtraUsage? ExtraUsage           { get => _extraUsage;   set => Set(ref _extraUsage, value); }
 
+    // Diagnostics — updated after each refresh, read by DiagnosticsPanel on demand
+    public string       DiagLastActiveOrg     { get; private set; } = "";
+    public string       DiagOrgId             { get; private set; } = "";
+    public string       DiagLastPath          { get; private set; } = "";
+    public int          DiagLastStatus        { get; private set; }
+    public string       DiagLastError         { get; private set; } = "";
+    public int          DiagCookieCount       { get; private set; }
+    public int          DiagClaudeCookieCount { get; private set; }
+    public List<string> DiagCookieDomains     { get; private set; } = [];
+    public DateTime?    DiagLastFetch         { get; private set; }
+
     private int _refreshInterval = 120;
     public int RefreshInterval
     {
@@ -77,16 +88,13 @@ public class UsageViewModel : INotifyPropertyChanged
     {
         await Application.Current.Dispatcher.InvokeAsync(() => IsLoading = true);
 
+        // Snapshot stored cookies once — used for both diag and HttpClient fallback path.
+        var storedCookies = await GetCookiesAsync();
+
         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(() =>
                 {
@@ -97,9 +105,6 @@ public class UsageViewModel : INotifyPropertyChanged
                 return;
             }
 
-            // 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;
@@ -107,31 +112,35 @@ public class UsageViewModel : INotifyPropertyChanged
             string? email = null, orgId = null, planLabel = null;
             string? refreshError = null;
 
-            if (hasCookies)
+            // Primary: persistent background WebView2 — always-live cookies, same as macOS.
+            // Fallback: HttpClient with saved cookies, only if the browser isn't ready yet
+            // (the brief window while InitAsync is still navigating at startup).
+            if (App.BackgroundBrowser.IsReady)
             {
                 try
                 {
-                    (limits, overage, prepaid, extraUsage, email, orgId, planLabel, _) =
+                    (limits, overage, prepaid, extraUsage, email, orgId, planLabel) =
-                        await TryHttpRefreshAsync(cookies);
+                        await TryBrowserRefreshAsync();
                 }
                 catch (Exception ex)
                 {
                     refreshError = ex.Message;
                 }
             }
-
+            else
-            // 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
+                if (storedCookies.Count > 0)
                 {
-                    var cached = System.Text.Json.JsonSerializer.Deserialize<UsageResponse>(
+                    try
-                        AppSettings.Default.UsageJson, JsonOpts);
+                    {
-                    limits = BuildLimits(cached);
+                        (limits, overage, prepaid, extraUsage, email, orgId, planLabel, _) =
+                            await TryHttpRefreshAsync(storedCookies);
+                    }
+                    catch (Exception ex)
+                    {
+                        refreshError = ex.Message;
+                    }
                 }
-                catch { }
             }
 
             foreach (var limit in limits)
@@ -152,16 +161,24 @@ public class UsageViewModel : INotifyPropertyChanged
                     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;
+                if (!string.IsNullOrEmpty(email))     UserEmail = email;
                 IsSignedIn   = true;
                 ErrorMessage = refreshError;
                 LastUpdated  = DateTime.Now;
                 IsLoading    = false;
+
+                // Update diagnostics
+                if (!string.IsNullOrEmpty(orgId)) DiagOrgId = orgId;
+                DiagLastFetch         = DateTime.Now;
+                DiagLastError         = refreshError ?? "";
+                DiagCookieCount       = storedCookies.Count;
+                DiagClaudeCookieCount = storedCookies.Count(c =>
+                    c.Domain.Contains("claude.ai") || c.Domain.Contains("anthropic.com"));
+                DiagCookieDomains     = storedCookies
+                    .Select(c => c.Domain).Distinct().OrderBy(d => d).ToList();
             });
         }
         catch (Exception ex)
@@ -174,213 +191,134 @@ public class UsageViewModel : INotifyPropertyChanged
         }
     }
 
+    // ── Browser-based refresh (primary) ───────────────────────────────────────
+    // 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()
+    {
+        // Read lastActiveOrg from document.cookie — the only reliable org source when the
+        // user belongs to multiple orgs. memberships[0] is always the "Individual Org" and
+        // would return 403 on usage endpoints if the paid plan is on a different org.
+        const string script = @"(async()=>{try{
+            const h={headers:{accept:'application/json'}};
+            const b=await(await fetch('/api/bootstrap',h)).json();
+            if(b?.error_type==='authentication_error'){window.chrome.webview.postMessage({authError:true});return;}
+            const lastActiveOrg=(document.cookie.split(';').map(c=>c.trim().split('=')).find(p=>p[0]==='lastActiveOrg')||[])[1]||null;
+            const allOrgs=(b?.account?.memberships||b?.memberships||[]).map(m=>m?.organization).filter(Boolean);
+            const activeOrg=(lastActiveOrg?allOrgs.find(o=>o?.uuid===lastActiveOrg):null)||allOrgs[0];
+            let id=activeOrg?.uuid||b?.organizations?.[0]?.uuid||null;
+            const email=b?.account?.email_address||b?.account?.email||null;
+            const caps=activeOrg?.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,lastActiveOrg,usage:u,overage:ov,prepaid:pp});
+        }catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
+
+        var json = await Application.Current.Dispatcher.InvokeAsync(
+            () => App.BackgroundBrowser.RunScriptAsync(script)).Task.Unwrap();
+
+        if (string.IsNullOrEmpty(json) || json == "null")
+            throw new Exception("Browser refresh returned no data.");
+
+        using var doc = JsonDocument.Parse(json);
+        var root = doc.RootElement;
+
+        if (root.TryGetProperty("authError", out _))
+            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.");
+
+        string? email     = root.TryGetProperty("email",     out var em) && em.ValueKind == JsonValueKind.String ? em.GetString() : null;
+        string? orgId     = root.TryGetProperty("orgId",     out var oi) && oi.ValueKind == JsonValueKind.String ? oi.GetString() : null;
+        string? planLabel = root.TryGetProperty("planLabel", out var pl) && pl.ValueKind == JsonValueKind.String ? pl.GetString() : null;
+        string? lao       = root.TryGetProperty("lastActiveOrg", out var laoProp) && laoProp.ValueKind == JsonValueKind.String ? laoProp.GetString() : null;
+
+        DiagLastActiveOrg = lao ?? "";
+        DiagLastPath      = $"/api/bootstrap + /api/organizations/…/usage (browser)";
+        DiagLastStatus    = 200;
+
+        UsageResponse?     usage       = null;
+        OverageSpendLimit? overage     = null;
+        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);
+    }
+
+    // ── 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
+        // Prefer the org the user last had active, not necessarily memberships[0].
-        {
+        var lastActiveOrg = cookies.FirstOrDefault(c => c.Name == "lastActiveOrg").Value;
-            using var http = BuildClient(cookies);
+        DiagLastActiveOrg = lastActiveOrg ?? "";
-            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();
+        using var http = BuildClient(cookies);
-            // 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))
+        var bootstrapResp = await http.GetAsync("https://claude.ai/api/bootstrap");
-                orgId = await FetchOrgIdFromListAsync(http);
+        DiagLastPath   = "/api/bootstrap";
-            if (string.IsNullOrEmpty(orgId) && !string.IsNullOrEmpty(AppSettings.Default.OrgId))
+        DiagLastStatus = (int)bootstrapResp.StatusCode;
-                orgId = AppSettings.Default.OrgId;
+        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}).");
 
-            if (string.IsNullOrEmpty(orgId))
+        var bootstrapJson = await bootstrapResp.Content.ReadAsStringAsync();
-                return ([], null, null, null, email, orgId, planLabel, true);
+        var (email, orgId, planLabel) = ParseBootstrap(bootstrapJson, lastActiveOrg);
 
-            AppSettings.Default.OrgId = orgId;
+        if (string.IsNullOrEmpty(orgId))
-            AppSettings.Default.Save();
+            orgId = await FetchOrgIdFromListAsync(http);
 
-            var usageUrl  = $"https://claude.ai/api/organizations/{orgId}/usage";
+        if (string.IsNullOrEmpty(orgId))
-            var ut  = http.GetAsync(usageUrl);
+            return ([], null, null, null, email, orgId, planLabel, true);
-            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);
 
-            var usageResp = ut.Result;
+        var ut = http.GetAsync($"https://claude.ai/api/organizations/{orgId}/usage");
-            if (!usageResp.IsSuccessStatusCode)
+        var ot = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
-                throw new Exception($"Usage fetch failed ({(int)usageResp.StatusCode}).");
+        var pt = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
+        await Task.WhenAll(ut, ot, pt);
 
-            var usageJson = await usageResp.Content.ReadAsStringAsync();
+        var usageResp = ut.Result;
-            var usage     = JsonSerializer.Deserialize<UsageResponse>(usageJson, JsonOpts);
+        DiagLastPath   = $"/api/organizations/{orgId}/usage";
+        DiagLastStatus = (int)usageResp.StatusCode;
+        if (!usageResp.IsSuccessStatusCode)
+            throw new Exception($"Usage fetch failed ({(int)usageResp.StatusCode}).");
 
-            // Try org endpoint for capabilities if bootstrap didn't return them
+        var usageJson = await usageResp.Content.ReadAsStringAsync();
-            if (string.IsNullOrEmpty(planLabel) && odt.Result.IsSuccessStatusCode)
+        var usage     = JsonSerializer.Deserialize<UsageResponse>(usageJson, JsonOpts);
-            {
-                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 */ }
-            }
 
-            // Persist fresh usage so cache reflects live data
+        return (BuildLimits(usage), ot.Result, pt.Result, usage?.ExtraUsage, email, orgId, planLabel, true);
-            AppSettings.Default.UsageJson = usageJson;
-            if (!string.IsNullOrEmpty(planLabel)) AppSettings.Default.PlanLabel = planLabel;
-            if (ot.Result != null) AppSettings.Default.OverageJson = JsonSerializer.Serialize(ot.Result);
-            if (pt.Result != null) AppSettings.Default.PrepaidJson = JsonSerializer.Serialize(pt.Result);
-            AppSettings.Default.Save();
-
-            return (BuildLimits(usage), ot.Result, pt.Result, usage?.ExtraUsage, email, orgId, planLabel, true);
-        }
-        catch { throw; }
     }
 
-    private static async Task<(List<AgentLimit>, string?, string?)> TryWebView2RefreshAsync()
+    // ── Startup cache ─────────────────────────────────────────────────────────
-    {
+    // Called before the browser is ready. Sets sign-in state and shows placeholders
-        try
+    // with any previously accumulated burn history so the popup isn't blank.
-        {
-            const string script = @"(async()=>{try{
-                const h={headers:{accept:'application/json'}};
-                const b=await(await fetch('/api/bootstrap',h)).json();
-                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){
-                    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){
-                    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();
-                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 () =>
-            {
-                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); }
-    }
 
     public async Task LoadFromCacheAsync()
     {
-        var email  = AppSettings.Default.Email;
+        if (string.IsNullOrEmpty(AppSettings.Default.CookieStore)) return;
-        var orgId  = AppSettings.Default.OrgId;
-        var cookie = AppSettings.Default.CookieStore;
 
-        bool isAuth = !string.IsNullOrEmpty(email) || !string.IsNullOrEmpty(orgId)
+        var placeholders = LoadPlaceholderLimits();
-                   || !string.IsNullOrEmpty(cookie);
+        foreach (var limit in placeholders)
-        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);
-                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)
@@ -389,30 +327,21 @@ public class UsageViewModel : INotifyPropertyChanged
 
         await Application.Current.Dispatcher.InvokeAsync(() =>
         {
-            if (!string.IsNullOrEmpty(email))                   UserEmail = email;
+            Limits     = placeholders;
-            if (!string.IsNullOrEmpty(AppSettings.Default.PlanLabel)) PlanLabel = AppSettings.Default.PlanLabel;
+            IsSignedIn = true;
-            Limits       = limits.Count > 0 ? limits : LoadPlaceholderLimits();
-            Overage      = overage;
-            Prepaid      = prepaid;
-            ExtraUsage   = extraUsage;
-            IsSignedIn   = true;
-            ErrorMessage = null;
-            LastUpdated  = limits.Count > 0 ? DateTime.Now : LastUpdated;
         });
     }
 
     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       = [];
         });
@@ -449,14 +378,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("Origin",              "https://claude.ai");
-        http.DefaultRequestHeaders.Add("Referer",          "https://claude.ai/");
+        http.DefaultRequestHeaders.Add("Referer",             "https://claude.ai/");
-        http.DefaultRequestHeaders.Add("sec-fetch-dest",   "empty");
+        http.DefaultRequestHeaders.Add("sec-fetch-dest",      "empty");
-        http.DefaultRequestHeaders.Add("sec-fetch-mode",   "cors");
+        http.DefaultRequestHeaders.Add("sec-fetch-mode",      "cors");
-        http.DefaultRequestHeaders.Add("sec-fetch-site",   "same-origin");
+        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",           "\"Chromium\";v=\"124\", \"Google Chrome\";v=\"124\"");
-        http.DefaultRequestHeaders.Add("sec-ch-ua-mobile", "?0");
+        http.DefaultRequestHeaders.Add("sec-ch-ua-mobile",    "?0");
-        http.DefaultRequestHeaders.Add("sec-ch-ua-platform", "\"Windows\"");
+        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;
@@ -474,8 +403,11 @@ public class UsageViewModel : INotifyPropertyChanged
         catch { return null; }
     }
 
-    // Parse email and org ID out of bootstrap JSON (multiple fallback paths for org ID)
+    // Parses bootstrap JSON and returns email, org ID, and plan label.
-    private static (string? Email, string? OrgId, string? PlanLabel) ParseBootstrap(string json)
+    // preferredOrgId (from the lastActiveOrg cookie) selects the correct org when the
+    // user belongs to multiple — memberships[0] is always the "Individual Org" which
+    // returns 403 on usage endpoints if the paid plan is on a different org.
+    private static (string? Email, string? OrgId, string? PlanLabel) ParseBootstrap(string json, string? preferredOrgId = null)
     {
         try
         {
@@ -483,46 +415,58 @@ public class UsageViewModel : INotifyPropertyChanged
             var root = doc.RootElement;
 
             string? email = null;
-            string? orgId = null;
-
             if (root.TryGetProperty("account", out var acct) &&
                 acct.TryGetProperty("email_address", out var em))
                 email = em.GetString();
 
-            // Path 1: account.memberships[0].organization.uuid  (Claude.ai personal/pro accounts)
+            // Collect all org objects from memberships
+            var allOrgs = new List<JsonElement>();
             if (root.TryGetProperty("account", out var acctNode) &&
-                acctNode.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
+                acctNode.TryGetProperty("memberships", out var mems))
             {
-                var first = mems[0];
+                foreach (var mem in mems.EnumerateArray())
-                if (first.TryGetProperty("organization", out var org) &&
+                    if (mem.TryGetProperty("organization", out var org))
-                    org.TryGetProperty("uuid", out var uuid))
+                        allOrgs.Add(org);
-                    orgId = uuid.GetString();
+            }
+            if (allOrgs.Count == 0 && root.TryGetProperty("memberships", out var rootMems))
+            {
+                foreach (var mem in rootMems.EnumerateArray())
+                    if (mem.TryGetProperty("organization", out var org))
+                        allOrgs.Add(org);
             }
 
-            // Path 2: memberships[0].organization.uuid  (root-level, older API shape)
+            // Prefer the org matching preferredOrgId, fall back to first
-            if (string.IsNullOrEmpty(orgId) &&
+            JsonElement activeOrg = default;
-                root.TryGetProperty("memberships", out var rootMems) && rootMems.GetArrayLength() > 0)
+            if (!string.IsNullOrEmpty(preferredOrgId))
             {
-                var first = rootMems[0];
+                foreach (var org in allOrgs)
-                if (first.TryGetProperty("organization", out var org) &&
+                {
-                    org.TryGetProperty("uuid", out var uuid))
+                    if (org.TryGetProperty("uuid", out var u) && u.GetString() == preferredOrgId)
-                    orgId = uuid.GetString();
+                    {
+                        activeOrg = org;
+                        break;
+                    }
+                }
             }
+            if (activeOrg.ValueKind == JsonValueKind.Undefined && allOrgs.Count > 0)
+                activeOrg = allOrgs[0];
+
+            string? orgId = null;
+            if (activeOrg.ValueKind != JsonValueKind.Undefined &&
+                activeOrg.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)
             {
-                if (orgs[0].TryGetProperty("uuid", out var uuid))
+                if (orgs[0].TryGetProperty("uuid", out var u))
-                    orgId = uuid.GetString();
+                    orgId = u.GetString();
             }
 
             string? planLabel = null;
-            if (root.TryGetProperty("account", out var acctPlan) &&
+            if (activeOrg.ValueKind != JsonValueKind.Undefined &&
-                acctPlan.TryGetProperty("memberships", out var plMems) && plMems.GetArrayLength() > 0 &&
+                activeOrg.TryGetProperty("capabilities", out var caps) &&
-                plMems[0].TryGetProperty("organization", out var plOrg) &&
+                caps.ValueKind == JsonValueKind.Array)
-                plOrg.TryGetProperty("capabilities", out var caps) &&
-                caps.ValueKind == System.Text.Json.JsonValueKind.Array)
             {
                 foreach (var cap in caps.EnumerateArray())
                 {

windows/WebViewFetchWindow.cs

@@ -2,42 +2,105 @@ 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;
     }
 
+    // ── 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()
+    {
+        await EnsureInitAsync();
+
+        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");
+
+        // Wait up to 15 s for initial navigation
+        await Task.WhenAny(navDone.Task, Task.Delay(15000));
+        _readyForScript = navDone.Task.IsCompletedSuccessfully && navDone.Task.Result;
+    }
+
+    // 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.WebMessageReceived -= msgHandler;
+            tcs.TrySetResult(args.WebMessageAsJson);
+        };
+        _wv.CoreWebView2.WebMessageReceived += msgHandler;
+
+        try { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
+        catch
+        {
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
+            return 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)
     {
-        var env = await CoreWebView2Environment.CreateAsync(userDataFolder:
+        await EnsureInitAsync();
-            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                "ClaudeChecker", "WebView2"));
-
-        await _wv.EnsureCoreWebView2Async(env);
 
         var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
 
-        // Use WebMessageReceived so the script can post back asynchronously without
-        // relying on Promise-awaiting support in the WebView2 runtime version.
         EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
         msgHandler = (_, args) =>
         {
@@ -65,4 +128,18 @@ internal sealed class WebViewFetchWindow : Window
 
         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;
+    }
 }