Diagnostics: update privacy note

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.

.github/workflows/release-windows-beta.yml

@@ -53,7 +53,7 @@ jobs:
 
       - name: Update version-windows-beta.json on main
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
         shell: bash
         run: |
           notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows beta ${{ steps.version.outputs.version }}")
@@ -75,3 +75,28 @@ jobs:
               --field "content=$content" \
               --field "branch=main"
           fi
+
+      - name: Update Windows beta badge in README on main
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        shell: bash
+        run: |
+          version="${{ steps.version.outputs.version }}"
+          tag="${{ github.ref_name }}"
+          shields_version=$(echo "$version" | sed 's/-/--/g')
+          export WIN_BADGE="[![Win Beta](https://img.shields.io/badge/Win_Beta-${shields_version}-blue?style=flat)](https://github.com/${{ github.repository }}/releases/tag/${tag}) <!-- WIN_BETA_BADGE -->"
+          sha=$(gh api "repos/${{ github.repository }}/contents/README.md?ref=main" --jq .sha)
+          content=$(gh api "repos/${{ github.repository }}/contents/README.md?ref=main" --jq .content | python3 -c "
+          import sys, base64, os
+          raw = sys.stdin.read().strip()
+          text = base64.b64decode(raw).decode()
+          badge = os.environ['WIN_BADGE']
+          lines = text.splitlines(keepends=True)
+          out = [badge + chr(10) if '<!-- WIN_BETA_BADGE -->' in line else line for line in lines]
+          print(base64.b64encode(''.join(out).encode()).decode(), end='')
+          ")
+          gh api --method PUT "repos/${{ github.repository }}/contents/README.md" \
+            --field "message=Windows beta badge $tag" \
+            --field "content=$content" \
+            --field "branch=main" \
+            --field "sha=$sha"

.github/workflows/release-windows.yml

@@ -53,7 +53,7 @@ jobs:
 
       - name: Update version-windows.json on main
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
         shell: bash
         run: |
           notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows release ${{ steps.version.outputs.version }}")
@@ -75,3 +75,40 @@ jobs:
               --field "content=$content" \
               --field "branch=main"
           fi
+
+      - name: Update Windows stable badge in README on main
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        shell: bash
+        run: |
+          version="${{ steps.version.outputs.version }}"
+          tag="${{ github.ref_name }}"
+          shields_version=$(echo "$version" | sed 's/-/--/g')
+          export WIN_STABLE_BADGE="[![Win Stable](https://img.shields.io/badge/Win_Stable-${shields_version}-blue?style=flat)](https://github.com/${{ github.repository }}/releases/tag/${tag}) <!-- WIN_STABLE_BADGE -->"
+          sha=$(gh api "repos/${{ github.repository }}/contents/README.md?ref=main" --jq .sha)
+          content=$(gh api "repos/${{ github.repository }}/contents/README.md?ref=main" --jq .content | python3 -c "
+          import sys, base64, os
+          raw = sys.stdin.read().strip()
+          text = base64.b64decode(raw).decode()
+          stable_badge = os.environ['WIN_STABLE_BADGE']
+          lines = text.splitlines(keepends=True)
+          out = []
+          for line in lines:
+              if '<!-- WIN_STABLE_BADGE -->' in line:
+                  out.append(stable_badge + chr(10))
+                  rest = line.replace(' <!-- WIN_STABLE_BADGE -->', '').replace('<!-- WIN_STABLE_BADGE -->', '')
+                  if rest.strip() and '<!-- WIN_BETA_BADGE -->' in rest:
+                      out.append('<!-- WIN_BETA_BADGE -->' + chr(10))
+                  elif rest.strip():
+                      out.append(rest)
+              elif '<!-- WIN_BETA_BADGE -->' in line:
+                  out.append('<!-- WIN_BETA_BADGE -->' + chr(10))
+              else:
+                  out.append(line)
+          print(base64.b64encode(''.join(out).encode()).decode(), end='')
+          ")
+          gh api --method PUT "repos/${{ github.repository }}/contents/README.md" \
+            --field "message=Windows stable badge $tag" \
+            --field "content=$content" \
+            --field "branch=main" \
+            --field "sha=$sha"

windows/App.xaml

@@ -1,66 +1,57 @@
 <Application x:Class="ClaudeCheckerWindows.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
              ShutdownMode="OnExplicitShutdown">
     <Application.Resources>
-        <SolidColorBrush x:Key="BackgroundBrush"    Color="#1C1C1E"/>
-        <SolidColorBrush x:Key="CardBrush"          Color="#2C2C2E"/>
-        <SolidColorBrush x:Key="AccentBrush"        Color="#F97316"/>
-        <SolidColorBrush x:Key="SecondaryBrush"     Color="#888888"/>
-        <SolidColorBrush x:Key="BorderBrush"        Color="#38383A"/>
-        <SolidColorBrush x:Key="BlueBrush"          Color="#3B82F6"/>
+        <SolidColorBrush x:Key="BackgroundBrush"   Color="#F3F3F3" po:Freeze="False"/>
+        <SolidColorBrush x:Key="CardBrush"         Color="#FFFFFF" po:Freeze="False"/>
+        <SolidColorBrush x:Key="AccentBrush"       Color="#F97316" po:Freeze="False"/>
+        <SolidColorBrush x:Key="TextBrush"         Color="#1C1C1C" po:Freeze="False"/>
+        <SolidColorBrush x:Key="SecondaryBrush"    Color="#6E6E6E" po:Freeze="False"/>
+        <SolidColorBrush x:Key="BorderBrush"       Color="#E0E0E0" po:Freeze="False"/>
+        <SolidColorBrush x:Key="BlueBrush"         Color="#0078D4" po:Freeze="False"/>
+        <SolidColorBrush x:Key="ButtonBrush"       Color="#FFFFFF" po:Freeze="False"/>
+        <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="PressedBrush"      Color="#D6D6D6" po:Freeze="False"/>
+        <SolidColorBrush x:Key="BadgeBrush"        Color="#F0F0F0" po:Freeze="False"/>
 
         <Style x:Key="HeaderText" TargetType="TextBlock">
             <Setter Property="FontSize"   Value="10"/>
             <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Foreground" Value="{StaticResource SecondaryBrush}"/>
-        </Style>
-
-        <Style x:Key="IconButton" TargetType="Button">
-            <Setter Property="Background"  Value="Transparent"/>
-            <Setter Property="BorderBrush" Value="#33FFFFFF"/>
-            <Setter Property="BorderThickness" Value="0.5"/>
-            <Setter Property="Foreground"  Value="{StaticResource SecondaryBrush}"/>
-            <Setter Property="Width"       Value="26"/>
-            <Setter Property="Height"      Value="26"/>
-            <Setter Property="Cursor"      Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="5">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#1AFFFFFF"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
+            <Setter Property="Foreground" Value="{DynamicResource SecondaryBrush}"/>
+            <Setter Property="FontFamily" Value="Segoe UI"/>
         </Style>
 
         <Style x:Key="PrimaryButton" TargetType="Button">
-            <Setter Property="Background"  Value="{StaticResource BlueBrush}"/>
-            <Setter Property="Foreground"  Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding"     Value="14,6"/>
-            <Setter Property="FontSize"    Value="12"/>
-            <Setter Property="FontWeight"  Value="SemiBold"/>
-            <Setter Property="Cursor"      Value="Hand"/>
+            <Setter Property="Background"        Value="{DynamicResource BlueBrush}"/>
+            <Setter Property="Foreground"        Value="White"/>
+            <Setter Property="BorderThickness"   Value="0"/>
+            <Setter Property="Padding"           Value="14,6"/>
+            <Setter Property="FontSize"          Value="12"/>
+            <Setter Property="FontWeight"        Value="SemiBold"/>
+            <Setter Property="FontFamily"        Value="Segoe UI"/>
+            <Setter Property="Cursor"            Value="Hand"/>
+            <Setter Property="FocusVisualStyle"  Value="{x:Null}"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}" CornerRadius="6"
-                                Padding="{TemplateBinding Padding}">
+                        <Border x:Name="Bd" Background="{TemplateBinding Background}"
+                                CornerRadius="4" Padding="{TemplateBinding Padding}">
                             <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#2563EB"/>
+                                <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 TargetName="Bd" Property="Background" Value="#BDBDBD"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -69,25 +60,31 @@
         </Style>
 
         <Style x:Key="SmallButton" TargetType="Button">
-            <Setter Property="Background"    Value="Transparent"/>
-            <Setter Property="BorderBrush"   Value="#33FFFFFF"/>
-            <Setter Property="BorderThickness" Value="0.5"/>
-            <Setter Property="Foreground"    Value="{StaticResource SecondaryBrush}"/>
-            <Setter Property="Padding"       Value="8,4"/>
-            <Setter Property="FontSize"      Value="11"/>
-            <Setter Property="Cursor"        Value="Hand"/>
+            <Setter Property="Background"       Value="{DynamicResource ButtonBrush}"/>
+            <Setter Property="BorderBrush"      Value="{DynamicResource BorderBrush}"/>
+            <Setter Property="BorderThickness"  Value="1"/>
+            <Setter Property="Foreground"       Value="{DynamicResource TextBrush}"/>
+            <Setter Property="Padding"          Value="10,4"/>
+            <Setter Property="FontSize"         Value="12"/>
+            <Setter Property="FontFamily"       Value="Segoe UI"/>
+            <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="5" 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="#1AFFFFFF"/>
+                                <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>
@@ -95,8 +92,107 @@
             </Setter>
         </Style>
 
+        <Style TargetType="ComboBox">
+            <Setter Property="FontFamily"       Value="Segoe UI"/>
+            <Setter Property="FontSize"         Value="12"/>
+            <Setter Property="Background"       Value="{DynamicResource CardBrush}"/>
+            <Setter Property="Foreground"       Value="{DynamicResource TextBrush}"/>
+            <Setter Property="BorderBrush"      Value="{DynamicResource BorderBrush}"/>
+            <Setter Property="BorderThickness"  Value="1"/>
+            <Setter Property="Padding"          Value="8,4"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ComboBox">
+                        <Grid>
+                            <Border x:Name="Bd"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="4">
+                                <Grid>
+                                    <ContentPresenter x:Name="ContentSite"
+                                        IsHitTestVisible="False"
+                                        Content="{TemplateBinding SelectionBoxItem}"
+                                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                        Margin="{TemplateBinding Padding}"
+                                        VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                                    <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}}">
+                                        <ToggleButton.Template>
+                                            <ControlTemplate TargetType="ToggleButton">
+                                                <Border Background="Transparent"/>
+                                            </ControlTemplate>
+                                        </ToggleButton.Template>
+                                    </ToggleButton>
+                                </Grid>
+                            </Border>
+                            <Popup x:Name="Popup" Placement="Bottom"
+                                   IsOpen="{TemplateBinding IsDropDownOpen}"
+                                   AllowsTransparency="True" Focusable="False"
+                                   PopupAnimation="Slide">
+                                <Border SnapsToDevicePixels="True"
+                                        MinWidth="{TemplateBinding ActualWidth}"
+                                        MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                        Background="{DynamicResource CardBrush}"
+                                        BorderBrush="{DynamicResource BorderBrush}"
+                                        BorderThickness="1" CornerRadius="4">
+                                    <ScrollViewer Margin="0,2">
+                                        <ItemsPresenter/>
+                                    </ScrollViewer>
+                                </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="Background"       Value="{DynamicResource CardBrush}"/>
+                        <Setter Property="Padding"          Value="10,5"/>
+                        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="ComboBoxItem">
+                                    <Border x:Name="Bd"
+                                            Background="{TemplateBinding Background}"
+                                            Padding="{TemplateBinding Padding}">
+                                        <ContentPresenter/>
+                                    </Border>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsHighlighted" Value="True">
+                                            <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>
+                        </Setter>
+                    </Style>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
         <Style TargetType="ScrollViewer">
-            <Setter Property="VerticalScrollBarVisibility" Value="Hidden"/>
+            <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
         </Style>
     </Application.Resources>
 </Application>

windows/App.xaml.cs

@@ -8,8 +8,12 @@ namespace ClaudeCheckerWindows;
 
 public partial class App : Application
 {
-    public static UsageViewModel ViewModel { get; } = new();
-    public static UpdateManager  Updater   { get; } = new();
+    public static UsageViewModel    ViewModel       { get; } = new();
+    public static UpdateManager     Updater         { get; } = new();
+    // Persistent hidden WebView2 — shares the same user data folder as LoginWindow
+    // so its cookies (including cf_clearance) are always live. Used on every refresh
+    // for endpoints that need a real browser session (overage, prepaid).
+    public static WebViewFetchWindow BackgroundBrowser { get; } = new();
 
     private Forms.NotifyIcon? _tray;
     private PopupWindow?      _popup;
@@ -17,13 +21,34 @@ public partial class App : Application
 
     protected override void OnStartup(StartupEventArgs e)
     {
+        var logPath = System.IO.Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            "ClaudeChecker", "startup_crash.txt");
+
+        AppDomain.CurrentDomain.UnhandledException += (_, ex) =>
+            System.IO.File.WriteAllText(logPath, ex.ExceptionObject?.ToString() ?? "unknown");
+
+        DispatcherUnhandledException += (_, ex) =>
+        {
+            System.IO.File.WriteAllText(logPath, ex.Exception?.ToString() ?? "unknown");
+            ex.Handled = false;
+        };
+
         base.OnStartup(e);
+        ThemeManager.Initialize();
         SetupTray();
+        ShowPopup();
         ScheduleTimer(ViewModel.RefreshInterval);
 
+        // Show background browser window on the UI thread before Task.Run
+        BackgroundBrowser.Show();
+
         _ = Task.Run(async () =>
         {
-            await Task.Delay(1000);
+            await ViewModel.LoadFromCacheAsync();
+            // Initialize the persistent background browser (navigates to claude.ai once)
+            await Application.Current.Dispatcher.InvokeAsync(
+                () => BackgroundBrowser.InitAsync()).Task.Unwrap();
             await ViewModel.RefreshAsync();
             await Updater.CheckForUpdatesAsync();
         });
@@ -78,21 +103,11 @@ public partial class App : Application
         if (_popup == null)
         {
             _popup = new PopupWindow();
-            _popup.Closed += (_, _) => _popup = null;
         }
-        PositionPopup();
         _popup.Show();
         _popup.Activate();
     }
 
-    private void PositionPopup()
-    {
-        if (_popup == null) return;
-        var workArea = SystemParameters.WorkArea;
-        _popup.Left = workArea.Right  - _popup.Width  - 8;
-        _popup.Top  = workArea.Bottom - _popup.Height - 8;
-    }
-
     public void ScheduleTimer(int seconds)
     {
         _timer?.Stop();

windows/AppSettings.cs

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

windows/ClaudeCheckerWindows.csproj

@@ -26,9 +26,7 @@
     <None Update="Assets\icon.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\icon.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <Resource Include="Assets\icon.png"/>
   </ItemGroup>
 
 </Project>

windows/Controls/GaugeControl.cs

@@ -21,6 +21,11 @@ public class GaugeControl : FrameworkElement
     public double Percent { get => (double)GetValue(PercentProperty); set => SetValue(PercentProperty, value); }
     public Brush  Accent  { get => (Brush)GetValue(AccentProperty);   set => SetValue(AccentProperty, value); }
 
+    public GaugeControl()
+    {
+        ThemeManager.ThemeChanged += InvalidateVisual;
+    }
+
     private const double StartAngleDeg = 135;
     private const double SweepDeg      = 270;
     private const double StrokeWidth   = 6;
@@ -31,31 +36,26 @@ public class GaugeControl : FrameworkElement
         var cy     = RenderSize.Height / 2;
         var radius = Math.Min(cx, cy) - StrokeWidth / 2 - 1;
 
+        var trackColor = ThemeManager.IsDark
+            ? Color.FromArgb(40, 255, 255, 255)
+            : Color.FromArgb(30, 0, 0, 0);
         DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg,
-            new Pen(new SolidColorBrush(Color.FromArgb(28, 255, 255, 255)), StrokeWidth));
+            new Pen(new SolidColorBrush(trackColor), StrokeWidth));
 
         if (Percent > 0)
             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 pctText = new FormattedText(
             $"{(int)Math.Round(Percent)}%",
             CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
             new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
-            14, Brushes.White, dpi);
-        dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
+            18, new SolidColorBrush(textColor), dpi);
 
-        var sub = new FormattedText(
-            "Updated\nnow",
-            CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-            new Typeface("Segoe UI"), 7,
-            new SolidColorBrush(Color.FromRgb(0x88, 0x88, 0x88)), dpi)
-        {
-            TextAlignment = TextAlignment.Center
-        };
-        dc.DrawText(sub, new Point(cx - sub.Width / 2, cy + 2));
+        dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height / 2));
     }
 
     private static void DrawArc(DrawingContext dc, double cx, double cy, double r,

windows/LoginWindow.xaml.cs

@@ -1,6 +1,5 @@
 using Microsoft.Web.WebView2.Core;
-using System;
-using System.Linq;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows;
 
@@ -8,6 +7,8 @@ namespace ClaudeCheckerWindows;
 
 public partial class LoginWindow : Window
 {
+    private bool _closing;
+
     public LoginWindow()
     {
         InitializeComponent();
@@ -18,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);
@@ -26,28 +27,44 @@ public partial class LoginWindow : Window
 
         Browser.CoreWebView2.NavigationCompleted += async (_, e) =>
         {
-            if (!e.IsSuccess) return;
+            if (!e.IsSuccess || _closing) return;
             var uri = Browser.CoreWebView2.Source;
-            if (uri.Contains("claude.ai") && !uri.Contains("/login"))
+            if (!uri.Contains("claude.ai")) return;
+
+            var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
+            var signedIn = System.Linq.Enumerable.Any(cookies, c =>
+                c.Name.Equals("sessionKey", System.StringComparison.OrdinalIgnoreCase) ||
+                c.Name.StartsWith("sk-ant",  System.StringComparison.OrdinalIgnoreCase));
+
+            await Dispatcher.InvokeAsync(() =>
             {
-                // Likely signed in — enable done button
-                var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
-                var hasSess = cookies.Any(c => c.Name.Contains("session") || c.Name.Contains("sk-"));
-                await Dispatcher.InvokeAsync(() =>
-                {
-                    DoneButton.IsEnabled = hasSess || uri.Contains("/chats") || uri.Contains("/new");
-                    StatusText.Text      = DoneButton.IsEnabled
-                        ? "Signed in! Click Done to continue."
-                        : "Waiting for sign-in…";
-                });
-            }
+                DoneButton.IsEnabled = !uri.Contains("/login") && !uri.Contains("/signin");
+                StatusText.Text = signedIn
+                    ? "Signed in — click Done to continue."
+                    : "Complete sign-in, then click Done.";
+            });
+
+            if (!uri.Contains("/login") && !uri.Contains("/signin") && signedIn)
+                await SaveAndClose(cookies);
         };
     }
 
     private async void Done_Click(object sender, RoutedEventArgs e)
     {
+        if (_closing) return;
         var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
+        await SaveAndClose(cookies);
+    }
+
+    private async Task SaveAndClose(IReadOnlyList<CoreWebView2Cookie> cookies)
+    {
+        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);
-        DialogResult = true;
+
+        await Dispatcher.InvokeAsync(() => DialogResult = true);
     }
 }

windows/Models.cs

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

windows/PopupWindow.xaml

@@ -3,249 +3,293 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:ctrl="clr-namespace:ClaudeCheckerWindows.Controls"
         Title="ClaudeChecker"
-        Width="480"
-        SizeToContent="Height"
-        WindowStyle="None"
-        AllowsTransparency="True"
-        Background="Transparent"
-        ShowInTaskbar="False"
-        Topmost="True"
+        Width="480" Height="660"
+        WindowStartupLocation="CenterScreen"
+        Background="{DynamicResource BackgroundBrush}"
+        FontFamily="Segoe UI"
+        ShowInTaskbar="True"
         ResizeMode="NoResize">
 
-    <Border Background="{StaticResource BackgroundBrush}"
-            CornerRadius="12"
-            BorderBrush="{StaticResource BorderBrush}"
-            BorderThickness="0.5">
-        <Border.Effect>
-            <DropShadowEffect BlurRadius="24" ShadowDepth="4" Opacity="0.5" Color="Black"/>
-        </Border.Effect>
+    <Grid>
+        <!-- Main panel -->
+        <DockPanel x:Name="MainPanel">
 
-        <Grid>
-            <!-- Main panel -->
-            <StackPanel x:Name="MainPanel">
-
-                <!-- Header -->
-                <Grid Margin="16,11">
+            <!-- Update banner -->
+            <Border x:Name="UpdateBanner" DockPanel.Dock="Top" Visibility="Collapsed"
+                    Background="{DynamicResource BannerBgBrush}"
+                    BorderBrush="{DynamicResource BannerBorderBrush}" BorderThickness="0,0,0,1"
+                    Cursor="Hand" MouseLeftButtonUp="UpdateBanner_Click">
+                <Grid Margin="16,10">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="6"/>
-                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-
-                    <Image Grid.Column="0" Width="24" Height="24"
-                           Source="Assets/icon.png" RenderOptions.BitmapScalingMode="HighQuality"/>
-
-                    <TextBlock Grid.Column="1" Text="ClaudeChecker"
-                               FontSize="14" FontWeight="SemiBold" Foreground="White"
-                               VerticalAlignment="Center" Margin="10,0,0,0"/>
-
-                    <Button Grid.Column="2" Style="{StaticResource IconButton}"
-                            Click="Settings_Click" x:Name="SettingsButton">
-                        <TextBlock Text="⚙" FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
-                    </Button>
-                    <Button Grid.Column="4" Style="{StaticResource IconButton}"
-                            Click="Close_Click">
-                        <TextBlock Text="✕" FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
-                    </Button>
+                    <TextBlock Grid.Column="0" Text="⬇" FontSize="14"
+                               Foreground="{DynamicResource BlueBrush}" VerticalAlignment="Center"/>
+                    <StackPanel Grid.Column="1" Margin="10,0">
+                        <TextBlock x:Name="UpdateBannerTitle" FontSize="12" FontWeight="SemiBold"
+                                   Foreground="{DynamicResource TextBrush}"/>
+                        <TextBlock Text="Click to view release notes and install."
+                                   FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
+                    </StackPanel>
+                    <Button Grid.Column="2" Content="Update" Style="{StaticResource SmallButton}"
+                            Foreground="{DynamicResource BlueBrush}" Click="UpdateBanner_Click"/>
                 </Grid>
+            </Border>
 
-                <Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Opacity="0.4"/>
-
-                <!-- Update banner -->
-                <Border x:Name="UpdateBanner" Visibility="Collapsed"
-                        Background="#0A3B82F6" Cursor="Hand" MouseLeftButtonUp="UpdateBanner_Click">
-                    <Grid Margin="16,10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Grid.Column="0" Text="⬇" FontSize="14"
-                                   Foreground="{StaticResource BlueBrush}" VerticalAlignment="Center"/>
-                        <StackPanel Grid.Column="1" Margin="10,0">
-                            <TextBlock x:Name="UpdateBannerTitle" FontSize="12" FontWeight="SemiBold" Foreground="White"/>
-                            <TextBlock Text="Tap to view what's new &amp; install."
-                                       FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
-                        </StackPanel>
-                        <Button Grid.Column="2" Content="Update"
-                                Style="{StaticResource SmallButton}"
-                                Background="{StaticResource BlueBrush}"
-                                Foreground="White" Click="UpdateBanner_Click"/>
-                    </Grid>
-                    <Border.Effect>
-                        <DropShadowEffect ShadowDepth="0" BlurRadius="0" Opacity="0"/>
-                    </Border.Effect>
-                </Border>
-                <Rectangle x:Name="UpdateBannerDiv" Height="0.5" Fill="{StaticResource BorderBrush}"
-                           Opacity="0.3" Visibility="Collapsed"/>
-
-                <!-- Limit cards -->
-                <ScrollViewer VerticalScrollBarVisibility="Hidden" MaxHeight="600">
-                    <StackPanel x:Name="CardsPanel" Margin="0,0,0,4"/>
-                </ScrollViewer>
-
-                <Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Opacity="0.3"/>
-
-                <!-- Footer -->
-                <Grid Margin="16,9">
+            <!-- Footer -->
+            <Border DockPanel.Dock="Bottom" BorderBrush="{DynamicResource BorderBrush}"
+                    BorderThickness="0,1,0,0" Background="{DynamicResource SurfaceBrush}">
+                <Grid Margin="12,8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="8"/>
                         <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="8"/>
+                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <TextBlock x:Name="LastUpdatedText" Grid.Column="0"
-                               FontSize="10" Foreground="#60888888" VerticalAlignment="Center"/>
-                    <ProgressBar x:Name="LoadingBar" Grid.Column="1"
-                                 IsIndeterminate="True" Width="14" Height="14"
-                                 Visibility="Collapsed" Style="{x:Null}"/>
-                    <Button Grid.Column="3" Content="↻  Refresh"
+                    <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
+                        <ProgressBar x:Name="LoadingBar" IsIndeterminate="True"
+                                     Width="12" Height="12" Visibility="Collapsed"
+                                     Style="{x:Null}" Margin="0,0,6,0"/>
+                        <TextBlock x:Name="LastUpdatedText" FontSize="11"
+                                   Foreground="{DynamicResource SecondaryBrush}" VerticalAlignment="Center"/>
+                    </StackPanel>
+                    <Button Grid.Column="1" Content="↻  Refresh"
                             Style="{StaticResource SmallButton}" Click="Refresh_Click"/>
+                    <Button Grid.Column="3" x:Name="SettingsButton" Content="⚙  Settings"
+                            Style="{StaticResource SmallButton}" Click="Settings_Click"/>
                 </Grid>
-            </StackPanel>
+            </Border>
 
-            <!-- Settings panel -->
-            <Border x:Name="SettingsPanel" Visibility="Collapsed"
-                    Background="{StaticResource BackgroundBrush}" CornerRadius="12">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" MaxHeight="700">
-                    <StackPanel Margin="16">
+            <!-- Cards scroll area -->
+            <ScrollViewer VerticalScrollBarVisibility="Auto">
+                <StackPanel x:Name="CardsPanel" Margin="0,4,0,4"/>
+            </ScrollViewer>
+        </DockPanel>
 
+        <!-- Settings panel -->
+        <Border x:Name="SettingsPanel" 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="{StaticResource BlueBrush}"
-                                Click="BackFromSettings_Click" Margin="0,0,0,12"/>
+                                Style="{StaticResource SmallButton}" BorderThickness="0"
+                                Foreground="{DynamicResource BlueBrush}" Background="Transparent"
+                                Click="BackFromSettings_Click"/>
+                        <TextBlock Text="Settings" FontSize="14" FontWeight="SemiBold"
+                                   Foreground="{DynamicResource TextBrush}"
+                                   HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Grid>
+                </Border>
 
-                        <TextBlock Text="Settings" FontSize="16" FontWeight="SemiBold"
-                                   Foreground="White" Margin="0,0,0,16"/>
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                    <StackPanel Margin="20,16,20,20">
 
-                        <!-- Auth -->
-                        <TextBlock Text="🔐  Authentication" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
-                        <StackPanel x:Name="AuthPanel" Margin="0,0,0,8"/>
-                        <TextBlock Text="Your session is stored locally and persists across restarts."
-                                   FontSize="11" Foreground="{StaticResource SecondaryBrush}"
-                                   TextWrapping="Wrap" Margin="0,0,0,8"/>
-                        <StackPanel Orientation="Horizontal" Margin="0,0,0,16">
-                            <Button x:Name="SignInButton" Content="Sign In"
-                                    Style="{StaticResource SmallButton}" Click="SignIn_Click" Margin="0,0,8,0"/>
-                            <Button x:Name="SignOutButton" Content="Sign Out"
-                                    Style="{StaticResource SmallButton}" Click="SignOut_Click"
-                                    Foreground="#EF4444" Visibility="Collapsed"/>
-                        </StackPanel>
-
-                        <Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Margin="0,0,0,16"/>
-
-                        <!-- Beta channel -->
-                        <TextBlock Text="📡  Update channel" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
-                        <Grid Margin="0,0,0,16">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
+                        <TextBlock Text="AUTHENTICATION" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
+                        <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                                Padding="14,12" Margin="0,0,0,16">
                             <StackPanel>
-                                <TextBlock Text="Beta updates" FontSize="12" Foreground="White"/>
-                                <TextBlock Text="Receive early access builds — may be less stable"
-                                           FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
+                                <StackPanel x:Name="AuthPanel" Margin="0,0,0,10"/>
+                                <TextBlock Text="Your session is stored locally and persists across restarts."
+                                           FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
+                                           TextWrapping="Wrap" Margin="0,0,0,10"/>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button x:Name="SignInButton" Content="Sign In"
+                                            Style="{StaticResource SmallButton}"
+                                            Click="SignIn_Click" Margin="0,0,8,0"/>
+                                    <Button x:Name="SignOutButton" Content="Sign Out"
+                                            Style="{StaticResource SmallButton}"
+                                            Click="SignOut_Click" Foreground="#C42B1C"
+                                            Visibility="Collapsed"/>
+                                </StackPanel>
                             </StackPanel>
-                            <CheckBox Grid.Column="1" x:Name="BetaToggle" VerticalAlignment="Center"
-                                      Checked="BetaToggle_Changed" Unchecked="BetaToggle_Changed"/>
-                        </Grid>
+                        </Border>
 
-                        <Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Margin="0,0,0,16"/>
+                        <TextBlock Text="UPDATE CHANNEL" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
+                        <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                                Padding="14,12" Margin="0,0,0,16">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <StackPanel>
+                                    <TextBlock Text="Beta updates" FontSize="12" FontWeight="SemiBold"
+                                               Foreground="{DynamicResource TextBrush}"/>
+                                    <TextBlock Text="Receive early access builds — may be less stable"
+                                               FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
+                                </StackPanel>
+                                <CheckBox Grid.Column="1" x:Name="BetaToggle" VerticalAlignment="Center"
+                                          Checked="BetaToggle_Changed" Unchecked="BetaToggle_Changed"/>
+                            </Grid>
+                        </Border>
 
-                        <!-- Refresh interval -->
-                        <TextBlock Text="⏱  Auto-refresh interval" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
-                        <ComboBox x:Name="RefreshPicker" SelectionChanged="RefreshPicker_Changed"
-                                  Margin="0,0,0,16" FontSize="12"/>
+                        <TextBlock Text="AUTO-REFRESH" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
+                        <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                                Padding="14,12" Margin="0,0,0,16">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Text="Refresh interval" FontSize="12" FontWeight="SemiBold"
+                                           Foreground="{DynamicResource TextBrush}" VerticalAlignment="Center"/>
+                                <ComboBox Grid.Column="1" x:Name="RefreshPicker" Width="100"
+                                          SelectionChanged="RefreshPicker_Changed"/>
+                            </Grid>
+                        </Border>
 
-                        <Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Margin="0,0,0,16"/>
+                        <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" Margin="0,0,0,16">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <Image Width="36" Height="36" Source="Assets/icon.png"
+                                       RenderOptions.BitmapScalingMode="HighQuality" Margin="0,0,12,0"/>
+                                <StackPanel Grid.Column="1" VerticalAlignment="Center">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="ClaudeChecker" FontSize="12" FontWeight="SemiBold"
+                                                   Foreground="{DynamicResource TextBrush}"/>
+                                        <Border Background="{DynamicResource BadgeBrush}" CornerRadius="3"
+                                                Margin="6,0,0,0" Padding="5,1">
+                                            <TextBlock x:Name="VersionLabel" FontSize="11"
+                                                       Foreground="{DynamicResource SecondaryBrush}"
+                                                       FontFamily="Consolas"/>
+                                        </Border>
+                                    </StackPanel>
+                                    <TextBlock Text="Built by superdooper86 &amp; claude"
+                                               FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
+                                </StackPanel>
+                                <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">
+                                    <Button x:Name="CheckUpdateButton"
+                                            Style="{StaticResource SmallButton}"
+                                            Click="CheckUpdate_Click"/>
+                                    <TextBlock x:Name="UpdateAvailableText" FontSize="10"
+                                               Foreground="{DynamicResource BlueBrush}"
+                                               HorizontalAlignment="Center"
+                                               Visibility="Collapsed" Margin="0,4,0,0"/>
+                                </StackPanel>
+                            </Grid>
+                        </Border>
 
-                        <!-- About -->
+                        <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>
+        </Border>
+
+        <!-- Update panel -->
+        <Border x:Name="UpdatePanel" 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="CloseUpdate_Click"/>
+                        <TextBlock Text="Update Available" FontSize="14" FontWeight="SemiBold"
+                                   Foreground="{DynamicResource TextBrush}"
+                                   HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <Button x:Name="NotNowButton" Content="Not Now" HorizontalAlignment="Right"
+                                Style="{StaticResource SmallButton}" Click="CloseUpdate_Click"/>
+                    </Grid>
+                </Border>
+
+                <StackPanel Margin="20,16">
+                    <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                            BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                            Padding="14,12" Margin="0,0,0,12">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
-                            <Image Width="36" Height="36" Source="Assets/icon.png"
-                                   RenderOptions.BitmapScalingMode="HighQuality" Margin="0,0,12,0"/>
-                            <StackPanel Grid.Column="1" VerticalAlignment="Center">
-                                <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="ClaudeChecker" FontSize="12" FontWeight="SemiBold" Foreground="White"/>
-                                    <Border Background="#0FFFFFFF" CornerRadius="4" Margin="6,0,0,0" Padding="5,1">
-                                        <TextBlock x:Name="VersionLabel" FontSize="11"
-                                                   Foreground="{StaticResource SecondaryBrush}"
-                                                   FontFamily="Consolas"/>
-                                    </Border>
-                                </StackPanel>
-                                <TextBlock Text="Built by superdooper86 &amp; claude"
-                                           FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
-                            </StackPanel>
-                            <Button Grid.Column="2" x:Name="CheckUpdateButton"
-                                    Style="{StaticResource SmallButton}" Click="CheckUpdate_Click"
-                                    VerticalAlignment="Center"/>
-                        </Grid>
-
-                    </StackPanel>
-                </ScrollViewer>
-            </Border>
-
-            <!-- Update sheet -->
-            <Border x:Name="UpdatePanel" Visibility="Collapsed"
-                    Background="{StaticResource BackgroundBrush}" CornerRadius="12">
-                <StackPanel>
-                    <Grid Margin="16,12">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Text="Update ClaudeChecker" FontSize="14" FontWeight="SemiBold"
-                                   Foreground="White" VerticalAlignment="Center"/>
-                        <Button Grid.Column="1" Content="Not Now" Style="{StaticResource SmallButton}"
-                                Click="CloseUpdate_Click" x:Name="NotNowButton"/>
-                    </Grid>
-                    <Rectangle Height="0.5" Fill="{StaticResource BorderBrush}"/>
-                    <StackPanel Margin="20">
-                        <Grid Margin="0,0,0,16">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <Image Width="48" Height="48" Source="Assets/icon.png"
+                            <Image Width="44" Height="44" Source="Assets/icon.png"
                                    RenderOptions.BitmapScalingMode="HighQuality" Margin="0,0,14,0"/>
                             <StackPanel Grid.Column="1" VerticalAlignment="Center">
-                                <StackPanel Orientation="Horizontal">
+                                <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
                                     <TextBlock x:Name="CurrentVerLabel" FontSize="12" FontFamily="Consolas"
-                                               Foreground="{StaticResource SecondaryBrush}"/>
-                                    <TextBlock Text=" → " FontSize="10"
-                                               Foreground="{StaticResource SecondaryBrush}" VerticalAlignment="Center"/>
+                                               Foreground="{DynamicResource SecondaryBrush}" VerticalAlignment="Center"/>
+                                    <TextBlock Text=" → " FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
+                                               VerticalAlignment="Center"/>
                                     <TextBlock x:Name="NewVerLabel" FontSize="13" FontWeight="SemiBold"
-                                               FontFamily="Consolas" Foreground="{StaticResource BlueBrush}"/>
+                                               FontFamily="Consolas" Foreground="{DynamicResource BlueBrush}"
+                                               VerticalAlignment="Center"/>
                                 </StackPanel>
                                 <TextBlock x:Name="ReleaseNotesText" FontSize="11" TextWrapping="Wrap"
-                                           Foreground="{StaticResource SecondaryBrush}" Margin="0,4,0,0"
-                                           MaxHeight="180"/>
+                                           Foreground="{DynamicResource SecondaryBrush}" MaxHeight="160"/>
                             </StackPanel>
                         </Grid>
+                    </Border>
 
-                        <TextBlock x:Name="UpdateStatusText" Foreground="{StaticResource SecondaryBrush}"
-                                   FontSize="11" TextWrapping="Wrap" TextAlignment="Center"
-                                   Visibility="Collapsed" Margin="0,0,0,10"/>
-
-                        <ProgressBar x:Name="UpdateProgress" Visibility="Collapsed"
-                                     Height="4" Margin="0,0,0,12" Foreground="{StaticResource BlueBrush}"/>
-
-                        <TextBlock Text="ClaudeChecker will download the update, replace itself, and relaunch automatically."
-                                   FontSize="11" Foreground="{StaticResource SecondaryBrush}"
-                                   TextWrapping="Wrap" TextAlignment="Center" Margin="0,0,0,12"/>
-
-                        <Button x:Name="InstallButton" Content="⬇  Install Update"
-                                Style="{StaticResource PrimaryButton}" HorizontalAlignment="Stretch"
-                                Click="Install_Click"/>
-                    </StackPanel>
+                    <TextBlock x:Name="UpdateStatusText" Foreground="{DynamicResource SecondaryBrush}"
+                               FontSize="11" TextWrapping="Wrap" TextAlignment="Center"
+                               Visibility="Collapsed" Margin="0,0,0,8"/>
+                    <ProgressBar x:Name="UpdateProgress" Visibility="Collapsed"
+                                 Height="4" Margin="0,0,0,12" Foreground="{DynamicResource BlueBrush}"/>
+                    <TextBlock Text="ClaudeChecker will download, replace itself, and relaunch automatically."
+                               FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
+                               TextWrapping="Wrap" TextAlignment="Center" Margin="0,0,0,12"/>
+                    <Button x:Name="InstallButton" Content="⬇  Download &amp; Install"
+                            Style="{StaticResource PrimaryButton}" HorizontalAlignment="Stretch"
+                            Click="Install_Click"/>
                 </StackPanel>
-            </Border>
-        </Grid>
-    </Border>
+            </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>
+                <TextBlock DockPanel.Dock="Top" Text="Org IDs are redacted when copied."
+                           FontSize="10" Foreground="{DynamicResource SecondaryBrush}"
+                           Margin="14,6,14,6"/>
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                    <StackPanel x:Name="DiagContentPanel" Margin="16,4,16,16"/>
+                </ScrollViewer>
+            </DockPanel>
+        </Border>
+
+    </Grid>
 </Window>

windows/PopupWindow.xaml.cs

@@ -1,7 +1,14 @@
 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;
 using System.Windows.Media;
 using System.Windows.Threading;
 
@@ -13,6 +20,17 @@ 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);
+
+    private void ApplyTitleBarTheme()
+    {
+        var hwnd = new WindowInteropHelper(this).Handle;
+        if (hwnd == IntPtr.Zero) return;
+        int dark = ThemeManager.IsDark ? 1 : 0;
+        DwmSetWindowAttribute(hwnd, 20, ref dark, sizeof(int));
+    }
+
     public PopupWindow()
     {
         InitializeComponent();
@@ -20,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();
 
@@ -29,7 +47,9 @@ public partial class PopupWindow : Window
         UpdateBannerState();
         UpdateFooter();
 
-        Deactivated += (_, _) => Hide();
+        Closing += (_, e) => { e.Cancel = true; Hide(); };
+        SourceInitialized += (_, _) => ApplyTitleBarTheme();
+        ThemeManager.ThemeChanged += () => { ApplyTitleBarTheme(); RebuildCards(); };
     }
 
     // ── Card rendering ───────────────────────────────────────────────
@@ -39,47 +59,52 @@ public partial class PopupWindow : Window
         CardsPanel.Children.Clear();
         foreach (var limit in VM.Limits)
             CardsPanel.Children.Add(BuildCard(limit));
+
+        if (VM.ExtraUsage?.IsEnabled == true)
+            CardsPanel.Children.Add(BuildExtraUsageSection());
+
+        var fiveHour = VM.Limits.FirstOrDefault(l => l.Window == WindowKind.FiveHour);
+        if (fiveHour != null && fiveHour.BurnHistory.Count > 0)
+            CardsPanel.Children.Add(BuildDiarySection(fiveHour));
     }
 
     private static UIElement BuildCard(AgentLimit limit)
     {
-        var accent     = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
-        var secondary  = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var accent    = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
+        var text      = (SolidColorBrush)Application.Current.Resources["TextBrush"];
+        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(26, 0, 200, 0)),
+            Background   = new SolidColorBrush(Color.FromArgb(30, 0, 160, 0)),
             CornerRadius = new CornerRadius(4),
             Padding      = new Thickness(6, 2, 6, 2),
             Margin       = new Thickness(0, 0, 6, 0),
             Visibility   = limit.IsLive ? Visibility.Visible : Visibility.Collapsed,
             Child        = new TextBlock { Text = "Live", FontSize = 10, FontWeight = FontWeights.Medium,
-                               Foreground = new SolidColorBrush(Colors.LightGreen) }
+                               Foreground = new SolidColorBrush(Color.FromRgb(0, 120, 0)) }
         };
 
-        // Usage badge
         var usageBadge = new Border
         {
-            Background   = new SolidColorBrush(Color.FromArgb(15, 255, 255, 255)),
+            Background   = new SolidColorBrush(Color.FromArgb(18, 0, 0, 0)),
             CornerRadius = new CornerRadius(4),
             Padding      = new Thickness(6, 2, 6, 2),
             Child        = new TextBlock { Text = $"Usg: {limit.UsageLabel}", FontSize = 10,
                                FontWeight = FontWeights.Medium, Foreground = secondary }
         };
 
-        // Header row: Claude · Pro | [Live] [Usg]
         var badgeStack = new StackPanel { Orientation = Orientation.Horizontal };
         badgeStack.Children.Add(liveBadge);
         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 = Brushes.White, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
+            Foreground = text, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
         nameStack.Children.Add(new TextBlock { Text = $"·  {VM.PlanLabel}", FontSize = 11,
             Foreground = secondary, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
 
@@ -91,51 +116,74 @@ public partial class PopupWindow : Window
         headerRow.Children.Add(nameStack);
         headerRow.Children.Add(badgeStack);
 
-        // Progress bar
         var progress = new ProgressBar
         {
             Value = limit.UsedPercent, Maximum = 100, Height = 4,
             Margin = new Thickness(0, 4, 0, 4),
             Foreground = accent,
-            Background = new SolidColorBrush(Color.FromArgb(18, 255, 255, 255)),
+            Background = new SolidColorBrush(Color.FromArgb(20, 0, 0, 0)),
             BorderThickness = new Thickness(0),
         };
 
-        // Time row
-        var timeStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
-        timeStack.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
-        timeStack.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
-            FontWeight = FontWeights.Medium, Foreground = Brushes.White, VerticalAlignment = VerticalAlignment.Center });
-
-        var resetText = new TextBlock
+        // Left: time remaining + reset date inline
+        var timeLeft = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
+        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
         {
-            Text = $"Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
-            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
-        };
+            Text = $"   Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
+            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(resetText,  1);
-        timeRow.Children.Add(timeStack);
-        timeRow.Children.Add(resetText);
+        Grid.SetColumn(timeLeft,  0);
+        Grid.SetColumn(timeRight, 1);
+        timeRow.Children.Add(timeLeft);
+        timeRow.Children.Add(timeRight);
 
-        // Sparkline
-        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,
-        };
-
-        // Info panel
         var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
         infoPanel.Children.Add(headerRow);
         infoPanel.Children.Add(progress);
         infoPanel.Children.Add(timeRow);
-        infoPanel.Children.Add(sparkline);
 
-        // Card content grid
         var cardGrid = new Grid { Margin = new Thickness(16, 12, 16, 12) };
         cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
         cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(16, GridUnitType.Pixel) });
@@ -148,10 +196,10 @@ public partial class PopupWindow : Window
         var card = new Border
         {
             Background      = (SolidColorBrush)Application.Current.Resources["CardBrush"],
-            CornerRadius    = new CornerRadius(8),
-            BorderBrush     = new SolidColorBrush(Color.FromArgb(20, 255, 255, 255)),
-            BorderThickness = new Thickness(0.5),
-            Margin          = new Thickness(8, 0, 8, 0),
+            CornerRadius    = new CornerRadius(6),
+            BorderBrush     = border,
+            BorderThickness = new Thickness(1),
+            Margin          = new Thickness(12, 0, 12, 0),
             Child           = cardGrid,
         };
 
@@ -159,7 +207,139 @@ public partial class PopupWindow : Window
         {
             Text   = limit.WindowLabel,
             Style  = (Style)Application.Current.Resources["HeaderText"],
-            Margin = new Thickness(16, 10, 16, 4),
+            Margin = new Thickness(16, 12, 16, 6),
+        };
+
+        var section = new StackPanel();
+        section.Children.Add(sectionLabel);
+        section.Children.Add(card);
+        return section;
+    }
+
+    private static UIElement BuildDiarySection(AgentLimit limit)
+    {
+        var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
+
+        var statsRow = new Grid { Margin = new Thickness(12, 10, 12, 6) };
+        statsRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        statsRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        var samplesText = new TextBlock
+        {
+            Text = $"{limit.BurnHistory.Count} samples",
+            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
+        };
+        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    = 40,
+            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"],
+            CornerRadius    = new CornerRadius(6),
+            BorderBrush     = border,
+            BorderThickness = new Thickness(1),
+            Margin          = new Thickness(12, 0, 12, 0),
+            Child           = cardContent,
+        };
+
+        var sectionLabel = new TextBlock
+        {
+            Text   = "SESSION DIARY",
+            Style  = (Style)Application.Current.Resources["HeaderText"],
+            Margin = new Thickness(16, 12, 16, 6),
+        };
+
+        var section = new StackPanel();
+        section.Children.Add(sectionLabel);
+        section.Children.Add(card);
+        return section;
+    }
+
+    private UIElement BuildExtraUsageSection()
+    {
+        var text      = (SolidColorBrush)Application.Current.Resources["TextBrush"];
+        var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
+        var accent    = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
+
+        var overage  = VM.Overage;
+        var prepaid  = VM.Prepaid;
+        var currency = VM.ExtraUsage?.Currency ?? overage?.Currency ?? "$";
+
+        var spent   = (overage?.UsedCredits        / 100.0) ?? (VM.ExtraUsage?.UsedCredits  / 100.0) ?? 0;
+        var limit   = (overage?.MonthlyCreditLimit / 100.0) ?? (VM.ExtraUsage?.MonthlyLimit / 100.0) ?? 0;
+        var balance = (prepaid?.Amount             / 100.0) ?? 0;
+
+        bool unlimited = overage?.MonthlyCreditLimit == null && VM.ExtraUsage?.MonthlyLimit == null;
+
+        UIElement MakeRow(string label, string value, bool highlight = false)
+        {
+            var row = new Grid { Margin = new Thickness(0, 3, 0, 3) };
+            row.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+            row.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+            var lbl = new TextBlock { Text = label, FontSize = 12, Foreground = secondary };
+            var val = new TextBlock { Text = value, FontSize = 12, FontWeight = FontWeights.Medium,
+                                      Foreground = highlight ? new SolidColorBrush(Color.FromRgb(0x4C, 0xAF, 0x50)) : text };
+            Grid.SetColumn(lbl, 0);
+            Grid.SetColumn(val, 1);
+            row.Children.Add(lbl);
+            row.Children.Add(val);
+            return row;
+        }
+
+        var contentPanel = new StackPanel { Margin = new Thickness(12, 10, 12, 10) };
+        contentPanel.Children.Add(MakeRow("Spent",   $"{currency} {spent:F2}", spent > 0));
+        if (unlimited)      contentPanel.Children.Add(MakeRow("Limit",   "Unlimited"));
+        else if (limit > 0) contentPanel.Children.Add(MakeRow("Limit",   $"{currency} {limit:F2}"));
+        if (balance > 0)    contentPanel.Children.Add(MakeRow("Balance", $"{currency} {balance:F2}"));
+
+        if (limit > 0)
+        {
+            var pct = Math.Min(spent / limit * 100, 100);
+            contentPanel.Children.Add(new ProgressBar
+            {
+                Value           = pct, Maximum = 100, Height = 4,
+                Margin          = new Thickness(0, 6, 0, 0),
+                Foreground      = accent,
+                Background      = new SolidColorBrush(Color.FromArgb(20, 0, 0, 0)),
+                BorderThickness = new Thickness(0),
+            });
+        }
+
+        var card = new Border
+        {
+            Background      = (SolidColorBrush)Application.Current.Resources["CardBrush"],
+            CornerRadius    = new CornerRadius(6),
+            BorderBrush     = border,
+            BorderThickness = new Thickness(1),
+            Margin          = new Thickness(12, 0, 12, 0),
+            Child           = contentPanel,
+        };
+
+        var sectionLabel = new TextBlock
+        {
+            Text   = "EXTRA USAGE CREDITS",
+            Style  = (Style)Application.Current.Resources["HeaderText"],
+            Margin = new Thickness(16, 12, 16, 6),
         };
 
         var section = new StackPanel();
@@ -173,17 +353,25 @@ public partial class PopupWindow : Window
     private void OnVmChanged(string? prop)
     {
         if (prop is nameof(UsageViewModel.Limits) or nameof(UsageViewModel.IsLoading)
-                 or nameof(UsageViewModel.LastUpdated) or nameof(UsageViewModel.ErrorMessage))
+                 or nameof(UsageViewModel.LastUpdated) or nameof(UsageViewModel.ErrorMessage)
+                 or nameof(UsageViewModel.ExtraUsage) or nameof(UsageViewModel.Overage) or nameof(UsageViewModel.Prepaid))
         {
             RebuildCards();
             UpdateFooter();
         }
+        if (prop is nameof(UsageViewModel.IsSignedIn) or nameof(UsageViewModel.UserEmail))
+        {
+            InitSettings();
+        }
     }
 
     private void OnUpdaterChanged(string? prop)
     {
         if (prop is nameof(UpdateManager.UpdateAvailable) or nameof(UpdateManager.LatestVersion))
+        {
             UpdateBannerState();
+            UpdateAboutSection();
+        }
         if (prop is nameof(UpdateManager.DownloadProgress))
             UpdateProgress.Value = Updater.DownloadProgress * 100;
         if (prop is nameof(UpdateManager.StatusMessage))
@@ -192,11 +380,25 @@ public partial class PopupWindow : Window
             InstallButton.Visibility = Visibility.Collapsed;
     }
 
+    private void UpdateAboutSection()
+    {
+        if (Updater.UpdateAvailable)
+        {
+            UpdateAvailableText.Text       = $"v{Updater.LatestVersion} available";
+            UpdateAvailableText.Visibility = Visibility.Visible;
+            CheckUpdateButton.Content      = "Install";
+        }
+        else
+        {
+            UpdateAvailableText.Visibility = Visibility.Collapsed;
+            CheckUpdateButton.Content      = "Check";
+        }
+    }
+
     private void UpdateBannerState()
     {
         var visible = Updater.UpdateAvailable;
-        UpdateBanner.Visibility    = visible ? Visibility.Visible : Visibility.Collapsed;
-        UpdateBannerDiv.Visibility = visible ? Visibility.Visible : Visibility.Collapsed;
+        UpdateBanner.Visibility = visible ? Visibility.Visible : Visibility.Collapsed;
         if (visible) UpdateBannerTitle.Text = $"Update available — v{Updater.LatestVersion}";
     }
 
@@ -205,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"
-                                                          : $"Updated {(int)diff.TotalSeconds}s ago";
+            string age;
+            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
         {
@@ -217,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;
-        CheckUpdateButton.Content = Updater.UpdateAvailable ? "Install" : "Check";
+        UpdateAboutSection();
 
-        var intervals = new[] { ("1 min", 60), ("2 min", 120), ("3 min", 180),
-                                ("4 min", 240), ("5 min", 300), ("10 min", 600) };
-        RefreshPicker.ItemsSource        = intervals;
-        RefreshPicker.DisplayMemberPath  = "Item1";
-        var idx = Array.FindIndex(intervals, x => x.Item2 == VM.RefreshInterval);
-        RefreshPicker.SelectedIndex      = idx < 0 ? 1 : idx;
+        RefreshPicker.SelectionChanged -= RefreshPicker_Changed;
+        RefreshPicker.Items.Clear();
+        int selectIdx = 1;
+        for (int i = 0; i < RefreshIntervals.Length; i++)
+        {
+            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
@@ -237,42 +460,205 @@ 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 = Brushes.White,
+            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);
+
+        // 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: {(string.IsNullOrEmpty(VM.DiagLastError) ? "(none)" : VM.DiagLastError)}");
+        if (VM.DiagLastFetch.HasValue)
+            sb.AppendLine($"Last fetch: {VM.DiagLastFetch.Value:HH:mm:ss}");
+        sb.AppendLine();
+        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;
-        SettingsPanel.Visibility = Visibility.Visible;
-        UpdatePanel.Visibility   = Visibility.Collapsed;
+        MainPanel.Visibility        = Visibility.Collapsed;
+        SettingsPanel.Visibility    = Visibility.Visible;
+        UpdatePanel.Visibility      = Visibility.Collapsed;
+        DiagnosticsPanel.Visibility = Visibility.Collapsed;
     }
 
     private void BackFromSettings_Click(object s, RoutedEventArgs e) => ShowMain();
 
     private void ShowMain()
     {
-        MainPanel.Visibility     = Visibility.Visible;
-        SettingsPanel.Visibility = Visibility.Collapsed;
-        UpdatePanel.Visibility   = Visibility.Collapsed;
+        MainPanel.Visibility        = Visibility.Visible;
+        SettingsPanel.Visibility    = Visibility.Collapsed;
+        UpdatePanel.Visibility      = Visibility.Collapsed;
+        DiagnosticsPanel.Visibility = Visibility.Collapsed;
     }
 
-    private void Close_Click(object s, RoutedEventArgs e) => Hide();
-
     private async void Refresh_Click(object s, RoutedEventArgs e) => await VM.RefreshAsync();
 
     private void UpdateBanner_Click(object s, RoutedEventArgs e) => ShowUpdatePanel();
@@ -282,9 +668,10 @@ public partial class PopupWindow : Window
         CurrentVerLabel.Text  = $"v{Updater.CurrentVersion}";
         NewVerLabel.Text      = $"v{Updater.LatestVersion}";
         ReleaseNotesText.Text = Updater.ReleaseNotes;
-        MainPanel.Visibility     = Visibility.Collapsed;
-        SettingsPanel.Visibility = Visibility.Collapsed;
-        UpdatePanel.Visibility   = Visibility.Visible;
+        MainPanel.Visibility        = Visibility.Collapsed;
+        SettingsPanel.Visibility    = Visibility.Collapsed;
+        UpdatePanel.Visibility      = Visibility.Visible;
+        DiagnosticsPanel.Visibility = Visibility.Collapsed;
     }
 
     private void CloseUpdate_Click(object s, RoutedEventArgs e) => ShowMain();
@@ -297,14 +684,24 @@ public partial class PopupWindow : Window
         await Updater.DownloadAndInstallAsync();
     }
 
-    private void SignIn_Click(object s, RoutedEventArgs e)
+    private async void SignIn_Click(object s, RoutedEventArgs e)
     {
         var login = new LoginWindow { Owner = this };
         if (login.ShowDialog() == true)
         {
-            _ = VM.RefreshAsync();
+            await VM.LoadFromCacheAsync();
             InitSettings();
+            ShowMain();
+
+            _ = Task.Run(async () =>
+            {
+                await Task.Delay(3000);
+                await VM.RefreshAsync();
+                await Application.Current.Dispatcher.InvokeAsync(InitSettings);
+            });
         }
+        Show();
+        Activate();
     }
 
     private async void SignOut_Click(object s, RoutedEventArgs e)
@@ -321,10 +718,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;
-            ((App)Application.Current).ScheduleTimer(selected.Item2);
+            VM.RefreshInterval = seconds;
+            ((App)Application.Current).ScheduleTimer(seconds);
         }
     }
 

windows/RELEASE_NOTES.md

@@ -1,3 +1,23 @@
-## What's new
+## What's new in beta.49
 
-Initial Windows release.
+### 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
+- Plan label (e.g. "Pro") now updates on every refresh, not just at login
+- Extra Usage Credits values now correct (were 100× too large)
+- Limit and balance now update live on every refresh
+- Refresh interval dropdown now shows "1 min", "2 min" etc. correctly
+- 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/ThemeManager.cs

@@ -0,0 +1,81 @@
+using Microsoft.Win32;
+using System;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Threading;
+
+namespace ClaudeCheckerWindows;
+
+public static class ThemeManager
+{
+    public static bool IsDark { get; private set; }
+    public static event Action? ThemeChanged;
+
+    public static void Initialize()
+    {
+        IsDark = ReadIsDark();
+        Apply();
+
+        var timer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(5) };
+        timer.Tick += (_, _) =>
+        {
+            var nowDark = ReadIsDark();
+            if (nowDark == IsDark) return;
+            IsDark = nowDark;
+            Apply();
+            ThemeChanged?.Invoke();
+        };
+        timer.Start();
+    }
+
+    private static bool ReadIsDark()
+    {
+        try
+        {
+            using var key = Registry.CurrentUser.OpenSubKey(
+                @"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
+            return (int)(key?.GetValue("AppsUseLightTheme") ?? 1) == 0;
+        }
+        catch { return false; }
+    }
+
+    private static void Apply()
+    {
+        var res = Application.Current.Resources;
+        if (IsDark)
+        {
+            Set(res, "BackgroundBrush",   Color.FromRgb(0x1C, 0x1C, 0x1E));
+            Set(res, "CardBrush",         Color.FromRgb(0x2C, 0x2C, 0x2E));
+            Set(res, "TextBrush",         Color.FromRgb(0xF5, 0xF5, 0xF5));
+            Set(res, "SecondaryBrush",    Color.FromRgb(0x8A, 0x8A, 0x8E));
+            Set(res, "BorderBrush",       Color.FromRgb(0x3A, 0x3A, 0x3C));
+            Set(res, "BlueBrush",         Color.FromRgb(0x3B, 0x82, 0xF6));
+            Set(res, "ButtonBrush",       Color.FromRgb(0x3A, 0x3A, 0x3C));
+            Set(res, "SurfaceBrush",      Color.FromRgb(0x25, 0x25, 0x27));
+            Set(res, "BannerBgBrush",     Color.FromRgb(0x1A, 0x31, 0x52));
+            Set(res, "BannerBorderBrush", Color.FromRgb(0x2A, 0x4A, 0x72));
+            Set(res, "HoverBrush",        Color.FromRgb(0x4A, 0x4A, 0x4C));
+            Set(res, "BadgeBrush",        Color.FromRgb(0x3A, 0x3A, 0x3C));
+        }
+        else
+        {
+            Set(res, "BackgroundBrush",   Color.FromRgb(0xF3, 0xF3, 0xF3));
+            Set(res, "CardBrush",         Colors.White);
+            Set(res, "TextBrush",         Color.FromRgb(0x1C, 0x1C, 0x1C));
+            Set(res, "SecondaryBrush",    Color.FromRgb(0x6E, 0x6E, 0x6E));
+            Set(res, "BorderBrush",       Color.FromRgb(0xE0, 0xE0, 0xE0));
+            Set(res, "BlueBrush",         Color.FromRgb(0x00, 0x78, 0xD4));
+            Set(res, "ButtonBrush",       Colors.White);
+            Set(res, "SurfaceBrush",      Color.FromRgb(0xFA, 0xFA, 0xFA));
+            Set(res, "BannerBgBrush",     Color.FromRgb(0xE8, 0xF2, 0xFB));
+            Set(res, "BannerBorderBrush", Color.FromRgb(0xB3, 0xD6, 0xF5));
+            Set(res, "HoverBrush",        Color.FromRgb(0xEB, 0xEB, 0xEB));
+            Set(res, "BadgeBrush",        Color.FromRgb(0xF0, 0xF0, 0xF0));
+        }
+    }
+
+    private static void Set(ResourceDictionary res, string key, Color color)
+    {
+        res[key] = new SolidColorBrush(color);
+    }
+}

windows/UpdateManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Reflection;
 using System.IO;
 using System.IO.Compression;
 using System.Net.Http;
@@ -55,7 +56,11 @@ public class UpdateManager : INotifyPropertyChanged
 
     public string CurrentVersion =>
         System.Reflection.Assembly.GetExecutingAssembly()
-              .GetName().Version?.ToString(3) ?? "1.0.0";
+              .GetCustomAttribute<System.Reflection.AssemblyInformationalVersionAttribute>()
+              ?.InformationalVersion.Split('+')[0]
+              ?? "1.0.0";
+
+    private bool IsPreReleaseBuild => CurrentVersion.Contains('-');
 
     public UpdateManager()
     {
@@ -91,7 +96,8 @@ public class UpdateManager : INotifyPropertyChanged
                 LatestBetaVersion = beta.Version;
                 BetaAvailable     = true;
 
-                if (BetaChannel && IsNewer(beta.Version, LatestVersion))
+                // Show beta update if user opted in, or if they're already running a beta
+                if ((BetaChannel || IsPreReleaseBuild) && IsNewer(beta.Version, LatestVersion))
                 {
                     LatestVersion   = beta.Version;
                     ReleaseNotes    = beta.Notes ?? "";

windows/UsageViewModel.cs

@@ -13,7 +13,6 @@ namespace ClaudeCheckerWindows;
 
 public class UsageViewModel : INotifyPropertyChanged
 {
-    private static readonly string OrgId = "daf626a9-4924-4ff3-ba98-23b523062f8e";
     private static readonly JsonSerializerOptions JsonOpts = new() { PropertyNameCaseInsensitive = true };
 
     private List<AgentLimit> _limits = [];
@@ -21,10 +20,11 @@ public class UsageViewModel : INotifyPropertyChanged
     private string? _errorMessage;
     private bool _isSignedIn;
     private string _userEmail = "";
-    private string _planLabel = "Pro";
+    private string _planLabel = "Claude";
     private DateTime? _lastUpdated;
     private OverageSpendLimit? _overage;
     private PrepaidCredits? _prepaid;
+    private ExtraUsage? _extraUsage;
 
     private readonly Dictionary<string, List<double>> _burnHistory = [];
     private const int MaxHistorySamples = 24;
@@ -38,6 +38,18 @@ public class UsageViewModel : INotifyPropertyChanged
     public DateTime? LastUpdated            { get => _lastUpdated;  set => Set(ref _lastUpdated, value); }
     public OverageSpendLimit? Overage       { get => _overage;      set => Set(ref _overage, value); }
     public PrepaidCredits? Prepaid          { get => _prepaid;      set => Set(ref _prepaid, value); }
+    public ExtraUsage? ExtraUsage           { get => _extraUsage;   set => Set(ref _extraUsage, value); }
+
+    // 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
@@ -76,31 +88,60 @@ 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();
-            if (cookies.Count == 0)
+            // CookieStore being non-empty is our signal that the user has signed in.
+            if (string.IsNullOrEmpty(AppSettings.Default.CookieStore))
             {
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
-                    IsSignedIn = false;
+                    IsSignedIn   = false;
                     ErrorMessage = "Not signed in — click Sign In to authenticate.";
-                    IsLoading = false;
+                    IsLoading    = false;
                 });
                 return;
             }
 
-            using var http = BuildClient(cookies);
+            List<AgentLimit> limits    = [];
+            OverageSpendLimit? overage = null;
+            PrepaidCredits?    prepaid = null;
+            ExtraUsage?     extraUsage = null;
+            string? email = null, orgId = null, planLabel = null;
+            string? refreshError = null;
 
-            var usageTask   = FetchAsync<UsageResponse>(http, $"https://claude.ai/api/organizations/{OrgId}/usage");
-            var overageTask = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{OrgId}/overage_spend_limit");
-            var prepaidTask = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{OrgId}/prepaid/credits");
-            var emailTask   = FetchEmailAsync(http);
-
-            await Task.WhenAll(usageTask, overageTask, prepaidTask, emailTask);
-
-            var usage  = usageTask.Result;
-            var limits = BuildLimits(usage);
+            // 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) =
+                        await TryBrowserRefreshAsync();
+                }
+                catch (Exception ex)
+                {
+                    refreshError = ex.Message;
+                }
+            }
+            else
+            {
+                if (storedCookies.Count > 0)
+                {
+                    try
+                    {
+                        (limits, overage, prepaid, extraUsage, email, orgId, planLabel, _) =
+                            await TryHttpRefreshAsync(storedCookies);
+                    }
+                    catch (Exception ex)
+                    {
+                        refreshError = ex.Message;
+                    }
+                }
+            }
 
             foreach (var limit in limits)
             {
@@ -115,14 +156,29 @@ public class UsageViewModel : INotifyPropertyChanged
 
             await Application.Current.Dispatcher.InvokeAsync(() =>
             {
-                Limits        = limits;
-                Overage       = overageTask.Result;
-                Prepaid       = prepaidTask.Result;
-                UserEmail     = emailTask.Result ?? UserEmail;
-                IsSignedIn    = true;
-                ErrorMessage  = null;
-                LastUpdated   = DateTime.Now;
-                IsLoading     = false;
+                if (limits.Count > 0)
+                {
+                    Limits    = limits;
+                    Overage   = overage;
+                    Prepaid   = prepaid;
+                    if (extraUsage != null) ExtraUsage = extraUsage;
+                }
+                if (!string.IsNullOrEmpty(planLabel)) PlanLabel = planLabel;
+                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)
@@ -135,6 +191,147 @@ 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)
+    {
+        // Prefer the org the user last had active, not necessarily memberships[0].
+        var lastActiveOrg = cookies.FirstOrDefault(c => c.Name == "lastActiveOrg").Value;
+        DiagLastActiveOrg = lastActiveOrg ?? "";
+
+        using var http = BuildClient(cookies);
+
+        var bootstrapResp = await http.GetAsync("https://claude.ai/api/bootstrap");
+        DiagLastPath   = "/api/bootstrap";
+        DiagLastStatus = (int)bootstrapResp.StatusCode;
+        if ((int)bootstrapResp.StatusCode is 401 or 403)
+            throw new Exception("Session expired — please re-authenticate.");
+        if (!bootstrapResp.IsSuccessStatusCode)
+            throw new Exception($"Bootstrap failed ({(int)bootstrapResp.StatusCode}).");
+
+        var bootstrapJson = await bootstrapResp.Content.ReadAsStringAsync();
+        var (email, orgId, planLabel) = ParseBootstrap(bootstrapJson, lastActiveOrg);
+
+        if (string.IsNullOrEmpty(orgId))
+            orgId = await FetchOrgIdFromListAsync(http);
+
+        if (string.IsNullOrEmpty(orgId))
+            return ([], null, null, null, email, orgId, planLabel, true);
+
+        var ut = http.GetAsync($"https://claude.ai/api/organizations/{orgId}/usage");
+        var ot = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
+        var pt = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
+        await Task.WhenAll(ut, ot, pt);
+
+        var usageResp = ut.Result;
+        DiagLastPath   = $"/api/organizations/{orgId}/usage";
+        DiagLastStatus = (int)usageResp.StatusCode;
+        if (!usageResp.IsSuccessStatusCode)
+            throw new Exception($"Usage fetch failed ({(int)usageResp.StatusCode}).");
+
+        var usageJson = await usageResp.Content.ReadAsStringAsync();
+        var usage     = JsonSerializer.Deserialize<UsageResponse>(usageJson, JsonOpts);
+
+        return (BuildLimits(usage), ot.Result, pt.Result, usage?.ExtraUsage, email, orgId, planLabel, true);
+    }
+
+    // ── Startup cache ─────────────────────────────────────────────────────────
+    // Called before the browser is ready. Sets sign-in state and shows placeholders
+    // with any previously accumulated burn history so the popup isn't blank.
+
+    public async Task LoadFromCacheAsync()
+    {
+        if (string.IsNullOrEmpty(AppSettings.Default.CookieStore)) return;
+
+        var placeholders = LoadPlaceholderLimits();
+        foreach (var limit in placeholders)
+        {
+            var key = limit.Window.ToString();
+            if (_burnHistory.TryGetValue(key, out var hist) && hist.Count > 0)
+                limit.BurnHistory = [.. hist];
+        }
+
+        await Application.Current.Dispatcher.InvokeAsync(() =>
+        {
+            Limits     = placeholders;
+            IsSignedIn = true;
+        });
+    }
+
     public async Task SignOutAsync()
     {
         AppSettings.Default.CookieStore = "";
@@ -144,12 +341,12 @@ public class UsageViewModel : INotifyPropertyChanged
         {
             IsSignedIn   = false;
             UserEmail    = "";
+            PlanLabel    = "Claude";
             ErrorMessage = "Signed out.";
             Limits       = [];
         });
     }
 
-    // Cookie store: we persist cookies as JSON in settings after login
     public static async Task<List<(string Name, string Value, string Domain, string Path)>> GetCookiesAsync()
     {
         var raw = AppSettings.Default.CookieStore;
@@ -166,7 +363,7 @@ public class UsageViewModel : INotifyPropertyChanged
     public static void SaveCookies(IEnumerable<CoreWebView2Cookie> cookies)
     {
         var entries = cookies
-            .Where(c => c.Domain.Contains("claude.ai"))
+            .Where(c => c.Domain.Contains("claude.ai") || c.Domain.Contains("anthropic.com"))
             .Select(c => new CookieEntry { Name = c.Name, Value = c.Value, Domain = c.Domain, Path = c.Path })
             .ToList();
         AppSettings.Default.CookieStore = JsonSerializer.Serialize(entries);
@@ -178,6 +375,17 @@ public class UsageViewModel : INotifyPropertyChanged
         var handler = new HttpClientHandler { UseCookies = false };
         var http    = new HttpClient(handler);
         http.DefaultRequestHeaders.Add("accept", "application/json");
+        http.DefaultRequestHeaders.Add("User-Agent",
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
+            "(KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36");
+        http.DefaultRequestHeaders.Add("Origin",              "https://claude.ai");
+        http.DefaultRequestHeaders.Add("Referer",             "https://claude.ai/");
+        http.DefaultRequestHeaders.Add("sec-fetch-dest",      "empty");
+        http.DefaultRequestHeaders.Add("sec-fetch-mode",      "cors");
+        http.DefaultRequestHeaders.Add("sec-fetch-site",      "same-origin");
+        http.DefaultRequestHeaders.Add("sec-ch-ua",           "\"Chromium\";v=\"124\", \"Google Chrome\";v=\"124\"");
+        http.DefaultRequestHeaders.Add("sec-ch-ua-mobile",    "?0");
+        http.DefaultRequestHeaders.Add("sec-ch-ua-platform",  "\"Windows\"");
         var cookieHeader = string.Join("; ", cookies.Select(c => $"{c.Name}={c.Value}"));
         http.DefaultRequestHeaders.Add("Cookie", cookieHeader);
         return http;
@@ -195,20 +403,109 @@ public class UsageViewModel : INotifyPropertyChanged
         catch { return null; }
     }
 
-    private static async Task<string?> FetchEmailAsync(HttpClient http)
+    // Parses bootstrap JSON and returns email, org ID, and plan label.
+    // 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
         {
-            var resp = await http.GetAsync("https://claude.ai/api/bootstrap");
+            using var doc = JsonDocument.Parse(json);
+            var root = doc.RootElement;
+
+            string? email = null;
+            if (root.TryGetProperty("account", out var acct) &&
+                acct.TryGetProperty("email_address", out var em))
+                email = em.GetString();
+
+            // Collect all org objects from memberships
+            var allOrgs = new List<JsonElement>();
+            if (root.TryGetProperty("account", out var acctNode) &&
+                acctNode.TryGetProperty("memberships", out var mems))
+            {
+                foreach (var mem in mems.EnumerateArray())
+                    if (mem.TryGetProperty("organization", out var org))
+                        allOrgs.Add(org);
+            }
+            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);
+            }
+
+            // Prefer the org matching preferredOrgId, fall back to first
+            JsonElement activeOrg = default;
+            if (!string.IsNullOrEmpty(preferredOrgId))
+            {
+                foreach (var org in allOrgs)
+                {
+                    if (org.TryGetProperty("uuid", out var u) && u.GetString() == preferredOrgId)
+                    {
+                        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();
+
+            if (string.IsNullOrEmpty(orgId) &&
+                root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
+            {
+                if (orgs[0].TryGetProperty("uuid", out var u))
+                    orgId = u.GetString();
+            }
+
+            string? planLabel = null;
+            if (activeOrg.ValueKind != JsonValueKind.Undefined &&
+                activeOrg.TryGetProperty("capabilities", out var caps) &&
+                caps.ValueKind == JsonValueKind.Array)
+            {
+                foreach (var cap in caps.EnumerateArray())
+                {
+                    var s = cap.GetString() ?? "";
+                    if (s.StartsWith("claude_", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var name = s.Substring("claude_".Length);
+                        if (name.Length > 0)
+                            planLabel = char.ToUpper(name[0]) + name.Substring(1).ToLower();
+                        break;
+                    }
+                }
+            }
+            return (email, orgId, planLabel);
+        }
+        catch { return (null, null, null); }
+    }
+
+    private static async Task<string?> FetchOrgIdFromListAsync(HttpClient http)
+    {
+        try
+        {
+            var resp = await http.GetAsync("https://claude.ai/api/organizations");
             if (!resp.IsSuccessStatusCode) return null;
             var json = await resp.Content.ReadAsStringAsync();
-            var boot = JsonSerializer.Deserialize<BootstrapResponse>(json, JsonOpts);
-            return boot?.Account?.EmailAddress;
+            using var doc = JsonDocument.Parse(json);
+            var root = doc.RootElement;
+            if (root.ValueKind == JsonValueKind.Array && root.GetArrayLength() > 0)
+            {
+                var first = root[0];
+                if (first.TryGetProperty("uuid", out var uuid))
+                    return uuid.GetString();
+            }
+            return null;
         }
         catch { return null; }
     }
 
-    private List<AgentLimit> BuildLimits(UsageResponse? usage)
+    private static List<AgentLimit> BuildLimits(UsageResponse? usage)
     {
         if (usage == null) return [];
         var now    = DateTime.Now;
@@ -263,16 +560,18 @@ public class UsageViewModel : INotifyPropertyChanged
         return $"{diff.Hours}h {diff.Minutes}m";
     }
 
-    private void LoadPlaceholders()
+    private static List<AgentLimit> LoadPlaceholderLimits()
     {
         var now = DateTime.Now;
-        Limits =
+        return
         [
             new() { Window = WindowKind.FiveHour, UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddHours(1) },
             new() { Window = WindowKind.SevenDay,  UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddDays(7) },
         ];
     }
 
+    private void LoadPlaceholders() => Limits = LoadPlaceholderLimits();
+
     private void LoadBurnHistory()
     {
         try

windows/WebViewFetchWindow.cs

@@ -0,0 +1,145 @@
+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 (including
+// cf_clearance) is always shared and fresh — equivalent to macOS's WKWebsiteDataStore.
+//
+// Two usage modes:
+//   • Persistent (App.BackgroundBrowser): created once at startup, navigates to
+//     claude.ai once, then scripts run directly on the live page every refresh.
+//     No re-navigation = no memory accumulation.
+//   • One-shot (LoginWindow): created, used, closed — same as before.
+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;
+        Height             = 1;
+        Left               = -9999;
+        Top                = -9999;
+        ShowInTaskbar      = false;
+        WindowStyle        = WindowStyle.None;
+        AllowsTransparency = true;
+        Opacity            = 0;
+        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)
+    {
+        await EnsureInitAsync();
+
+        var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
+        msgHandler = (_, args) =>
+        {
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
+            tcs.TrySetResult(args.WebMessageAsJson);
+        };
+        _wv.CoreWebView2.WebMessageReceived += msgHandler;
+
+        EventHandler<CoreWebView2NavigationCompletedEventArgs>? navHandler = null;
+        navHandler = async (_, e) =>
+        {
+            _wv.CoreWebView2.NavigationCompleted -= navHandler;
+            if (!e.IsSuccess) { tcs.TrySetResult(null); return; }
+            try   { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
+            catch { tcs.TrySetResult(null); }
+        };
+        _wv.CoreWebView2.NavigationCompleted += navHandler;
+        _wv.CoreWebView2.Navigate(navigateUrl);
+
+        _ = Task.Delay(timeoutMs).ContinueWith(_ =>
+        {
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
+            tcs.TrySetResult(null);
+        });
+
+        return await tcs.Task;
+    }
+
+    // ── Shared init ───────────────────────────────────────────────────────────
+
+    private int _initGuard;
+
+    private async Task EnsureInitAsync()
+    {
+        if (_initialized) return;
+        if (Interlocked.Exchange(ref _initGuard, 1) != 0) return;
+
+        var env = await CoreWebView2Environment.CreateAsync(userDataFolder: UserDataFolder);
+        await _wv.EnsureCoreWebView2Async(env);
+        _initialized = true;
+    }
+}