chore: release notes for beta.22

windows/App.xaml

@@ -1,29 +1,32 @@
 <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="#F3F3F3"/>
-        <SolidColorBrush x:Key="CardBrush"         Color="#FFFFFF"/>
-        <SolidColorBrush x:Key="AccentBrush"       Color="#F97316"/>
-        <SolidColorBrush x:Key="TextBrush"         Color="#1C1C1C"/>
-        <SolidColorBrush x:Key="SecondaryBrush"    Color="#6E6E6E"/>
-        <SolidColorBrush x:Key="BorderBrush"       Color="#E0E0E0"/>
-        <SolidColorBrush x:Key="BlueBrush"         Color="#0078D4"/>
-        <SolidColorBrush x:Key="ButtonBrush"       Color="#FFFFFF"/>
-        <SolidColorBrush x:Key="SurfaceBrush"      Color="#FAFAFA"/>
-        <SolidColorBrush x:Key="BannerBgBrush"     Color="#E8F2FB"/>
-        <SolidColorBrush x:Key="BannerBorderBrush" Color="#B3D6F5"/>
+        <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="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}"/>
+            <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="Background"      Value="{DynamicResource BlueBrush}"/>
             <Setter Property="Foreground"      Value="White"/>
             <Setter Property="BorderThickness" Value="0"/>
             <Setter Property="Padding"         Value="14,6"/>
@@ -52,10 +55,10 @@
         </Style>
 
         <Style x:Key="SmallButton" TargetType="Button">
-            <Setter Property="Background"      Value="{StaticResource ButtonBrush}"/>
-            <Setter Property="BorderBrush"     Value="{StaticResource BorderBrush}"/>
+            <Setter Property="Background"      Value="{DynamicResource ButtonBrush}"/>
+            <Setter Property="BorderBrush"     Value="{DynamicResource BorderBrush}"/>
             <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Foreground"      Value="{StaticResource TextBrush}"/>
+            <Setter Property="Foreground"      Value="{DynamicResource TextBrush}"/>
             <Setter Property="Padding"         Value="10,4"/>
             <Setter Property="FontSize"        Value="12"/>
             <Setter Property="FontFamily"      Value="Segoe UI"/>
@@ -71,7 +74,7 @@
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#F0F0F0"/>
+                                <Setter Property="Background" Value="{DynamicResource HoverBrush}"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -80,8 +83,84 @@
         </Style>
 
         <Style TargetType="ComboBox">
-            <Setter Property="FontFamily" Value="Segoe UI"/>
-            <Setter Property="FontSize"   Value="12"/>
+            <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="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ComboBox">
+                        <Grid>
+                            <Border x:Name="Border"
+                                    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="▾" FontSize="10"
+                                               Foreground="{DynamicResource SecondaryBrush}"
+                                               HorizontalAlignment="Right" VerticalAlignment="Center"
+                                               Margin="0,0,8,0" IsHitTestVisible="False"/>
+                                    <ToggleButton Focusable="False" ClickMode="Press"
+                                                  IsChecked="{Binding IsDropDownOpen, Mode=TwoWay,
+                                                      RelativeSource={RelativeSource TemplatedParent}}"
+                                                  Background="Transparent" BorderThickness="0"/>
+                                </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>
+                </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="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>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </Setter.Value>
+            </Setter>
         </Style>
 
         <Style TargetType="ScrollViewer">

windows/App.xaml.cs

@@ -17,6 +17,19 @@ 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();

windows/AppSettings.cs

@@ -8,6 +8,9 @@ public class AppSettings
 {
     public string CookieStore     { get; set; } = "";
     public string BurnHistory     { get; set; } = "";
+    public string OrgId           { get; set; } = "";
+    public string Email           { get; set; } = "";
+    public string UsageJson       { get; set; } = "";
     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/LoginWindow.xaml.cs

@@ -2,6 +2,7 @@ using Microsoft.Web.WebView2.Core;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using System.Windows;
 
@@ -9,6 +10,8 @@ namespace ClaudeCheckerWindows;
 
 public partial class LoginWindow : Window
 {
+    private bool _closing;
+
     public LoginWindow()
     {
         InitializeComponent();
@@ -27,7 +30,7 @@ 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")) return;
 
@@ -44,23 +47,58 @@ public partial class LoginWindow : Window
                     : "Complete sign-in, then click Done.";
             });
 
-            // Auto-close only on explicit post-login redirects, not on initial load
-            if (signedIn && (uri.Contains("/chats") || uri.Contains("/new")))
-            {
+            // Auto-close as soon as we detect sign-in on any claude.ai page
+            if (signedIn && !uri.Contains("/login") && !uri.Contains("/signin"))
                 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;
+
         UsageViewModel.SaveCookies(cookies);
+
+        // Fetch bootstrap + usage from within WebView2 (already authenticated, no header issues)
+        try
+        {
+            const string script = @"(async()=>{try{
+                const b=await(await fetch('/api/bootstrap',{headers:{accept:'application/json'}})).json();
+                const id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid||null;
+                const e=b?.account?.email_address||null;
+                if(!id)return{email:e,orgId:null,usage:null};
+                const u=await(await fetch('/api/organizations/'+id+'/usage',{headers:{accept:'application/json'}})).json();
+                return{email:e,orgId:id,usage:u};
+            }catch(ex){return{error:String(ex)};}})()";
+
+            var json = await Browser.CoreWebView2.ExecuteScriptAsync(script);
+            if (json != "null" && !string.IsNullOrEmpty(json))
+            {
+                using var doc = JsonDocument.Parse(json);
+                var root = doc.RootElement;
+
+                if (root.TryGetProperty("email", out var em) && em.ValueKind == JsonValueKind.String)
+                    AppSettings.Default.Email = em.GetString() ?? "";
+
+                if (root.TryGetProperty("orgId", out var oi) && oi.ValueKind == JsonValueKind.String)
+                    AppSettings.Default.OrgId = oi.GetString() ?? "";
+
+                if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
+                    AppSettings.Default.UsageJson = us.GetRawText();
+
+                AppSettings.Default.Save();
+            }
+        }
+        catch { }
+
         await Dispatcher.InvokeAsync(() => DialogResult = true);
     }
 }

windows/PopupWindow.xaml

@@ -5,7 +5,7 @@
         Title="ClaudeChecker"
         Width="480" Height="660"
         WindowStartupLocation="CenterScreen"
-        Background="{StaticResource BackgroundBrush}"
+        Background="{DynamicResource BackgroundBrush}"
         FontFamily="Segoe UI"
         ShowInTaskbar="True"
         ResizeMode="NoResize">
@@ -16,8 +16,8 @@
 
             <!-- Update banner -->
             <Border x:Name="UpdateBanner" DockPanel.Dock="Top" Visibility="Collapsed"
-                    Background="{StaticResource BannerBgBrush}"
-                    BorderBrush="{StaticResource BannerBorderBrush}" BorderThickness="0,0,0,1"
+                    Background="{DynamicResource BannerBgBrush}"
+                    BorderBrush="{DynamicResource BannerBorderBrush}" BorderThickness="0,0,0,1"
                     Cursor="Hand" MouseLeftButtonUp="UpdateBanner_Click">
                 <Grid Margin="16,10">
                     <Grid.ColumnDefinitions>
@@ -26,21 +26,21 @@
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0" Text="⬇" FontSize="14"
-                               Foreground="{StaticResource BlueBrush}" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource BlueBrush}" VerticalAlignment="Center"/>
                     <StackPanel Grid.Column="1" Margin="10,0">
                         <TextBlock x:Name="UpdateBannerTitle" FontSize="12" FontWeight="SemiBold"
-                                   Foreground="{StaticResource TextBrush}"/>
+                                   Foreground="{DynamicResource TextBrush}"/>
                         <TextBlock Text="Click to view release notes and install."
-                                   FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
+                                   FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
                     </StackPanel>
                     <Button Grid.Column="2" Content="Update" Style="{StaticResource SmallButton}"
-                            Foreground="{StaticResource BlueBrush}" Click="UpdateBanner_Click"/>
+                            Foreground="{DynamicResource BlueBrush}" Click="UpdateBanner_Click"/>
                 </Grid>
             </Border>
 
             <!-- Footer -->
-            <Border DockPanel.Dock="Bottom" BorderBrush="{StaticResource BorderBrush}"
-                    BorderThickness="0,1,0,0" Background="{StaticResource SurfaceBrush}">
+            <Border DockPanel.Dock="Bottom" BorderBrush="{DynamicResource BorderBrush}"
+                    BorderThickness="0,1,0,0" Background="{DynamicResource SurfaceBrush}">
                 <Grid Margin="12,8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -55,7 +55,7 @@
                                      Width="12" Height="12" Visibility="Collapsed"
                                      Style="{x:Null}" Margin="0,0,6,0"/>
                         <TextBlock x:Name="LastUpdatedText" FontSize="11"
-                                   Foreground="{StaticResource SecondaryBrush}" VerticalAlignment="Center"/>
+                                   Foreground="{DynamicResource SecondaryBrush}" VerticalAlignment="Center"/>
                     </StackPanel>
                     <Button Grid.Column="1" Content="↻  Refresh"
                             Style="{StaticResource SmallButton}" Click="Refresh_Click"/>
@@ -72,17 +72,17 @@
 
         <!-- Settings panel -->
         <Border x:Name="SettingsPanel" Visibility="Collapsed"
-                Background="{StaticResource BackgroundBrush}">
+                Background="{DynamicResource BackgroundBrush}">
             <DockPanel>
-                <Border DockPanel.Dock="Top" BorderBrush="{StaticResource BorderBrush}"
-                        BorderThickness="0,0,0,1" Background="{StaticResource SurfaceBrush}" Padding="12,10">
+                <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}" Background="Transparent"
+                                Foreground="{DynamicResource BlueBrush}" Background="Transparent"
                                 Click="BackFromSettings_Click"/>
                         <TextBlock Text="Settings" FontSize="14" FontWeight="SemiBold"
-                                   Foreground="{StaticResource TextBrush}"
+                                   Foreground="{DynamicResource TextBrush}"
                                    HorizontalAlignment="Center" VerticalAlignment="Center"/>
                     </Grid>
                 </Border>
@@ -91,13 +91,13 @@
                     <StackPanel Margin="20,16,20,20">
 
                         <TextBlock Text="AUTHENTICATION" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
-                        <Border Background="{StaticResource CardBrush}" CornerRadius="6"
-                                BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
+                        <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
                                 Padding="14,12" Margin="0,0,0,16">
                             <StackPanel>
                                 <StackPanel x:Name="AuthPanel" Margin="0,0,0,10"/>
                                 <TextBlock Text="Your session is stored locally and persists across restarts."
-                                           FontSize="11" Foreground="{StaticResource SecondaryBrush}"
+                                           FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
                                            TextWrapping="Wrap" Margin="0,0,0,10"/>
                                 <StackPanel Orientation="Horizontal">
                                     <Button x:Name="SignInButton" Content="Sign In"
@@ -112,8 +112,8 @@
                         </Border>
 
                         <TextBlock Text="UPDATE CHANNEL" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
-                        <Border Background="{StaticResource CardBrush}" CornerRadius="6"
-                                BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
+                        <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
                                 Padding="14,12" Margin="0,0,0,16">
                             <Grid>
                                 <Grid.ColumnDefinitions>
@@ -122,9 +122,9 @@
                                 </Grid.ColumnDefinitions>
                                 <StackPanel>
                                     <TextBlock Text="Beta updates" FontSize="12" FontWeight="SemiBold"
-                                               Foreground="{StaticResource TextBrush}"/>
+                                               Foreground="{DynamicResource TextBrush}"/>
                                     <TextBlock Text="Receive early access builds — may be less stable"
-                                               FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
+                                               FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
                                 </StackPanel>
                                 <CheckBox Grid.Column="1" x:Name="BetaToggle" VerticalAlignment="Center"
                                           Checked="BetaToggle_Changed" Unchecked="BetaToggle_Changed"/>
@@ -132,8 +132,8 @@
                         </Border>
 
                         <TextBlock Text="AUTO-REFRESH" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
-                        <Border Background="{StaticResource CardBrush}" CornerRadius="6"
-                                BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
+                        <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
                                 Padding="14,12" Margin="0,0,0,16">
                             <Grid>
                                 <Grid.ColumnDefinitions>
@@ -141,15 +141,15 @@
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Text="Refresh interval" FontSize="12" FontWeight="SemiBold"
-                                           Foreground="{StaticResource TextBrush}" VerticalAlignment="Center"/>
+                                           Foreground="{DynamicResource TextBrush}" VerticalAlignment="Center"/>
                                 <ComboBox Grid.Column="1" x:Name="RefreshPicker" Width="100"
                                           SelectionChanged="RefreshPicker_Changed"/>
                             </Grid>
                         </Border>
 
                         <TextBlock Text="ABOUT" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
-                        <Border Background="{StaticResource CardBrush}" CornerRadius="6"
-                                BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
+                        <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
                                 Padding="14,12">
                             <Grid>
                                 <Grid.ColumnDefinitions>
@@ -162,16 +162,16 @@
                                 <StackPanel Grid.Column="1" VerticalAlignment="Center">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock Text="ClaudeChecker" FontSize="12" FontWeight="SemiBold"
-                                                   Foreground="{StaticResource TextBrush}"/>
-                                        <Border Background="#F0F0F0" CornerRadius="3"
+                                                   Foreground="{DynamicResource TextBrush}"/>
+                                        <Border Background="{DynamicResource BadgeBrush}" CornerRadius="3"
                                                 Margin="6,0,0,0" Padding="5,1">
                                             <TextBlock x:Name="VersionLabel" FontSize="11"
-                                                       Foreground="{StaticResource SecondaryBrush}"
+                                                       Foreground="{DynamicResource SecondaryBrush}"
                                                        FontFamily="Consolas"/>
                                         </Border>
                                     </StackPanel>
                                     <TextBlock Text="Built by superdooper86 &amp; claude"
-                                               FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
+                                               FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
                                 </StackPanel>
                                 <Button Grid.Column="2" x:Name="CheckUpdateButton"
                                         Style="{StaticResource SmallButton}"
@@ -186,17 +186,17 @@
 
         <!-- Update panel -->
         <Border x:Name="UpdatePanel" Visibility="Collapsed"
-                Background="{StaticResource BackgroundBrush}">
+                Background="{DynamicResource BackgroundBrush}">
             <DockPanel>
-                <Border DockPanel.Dock="Top" BorderBrush="{StaticResource BorderBrush}"
-                        BorderThickness="0,0,0,1" Background="{StaticResource SurfaceBrush}" Padding="12,10">
+                <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}" Background="Transparent"
+                                Foreground="{DynamicResource BlueBrush}" Background="Transparent"
                                 Click="CloseUpdate_Click"/>
                         <TextBlock Text="Update Available" FontSize="14" FontWeight="SemiBold"
-                                   Foreground="{StaticResource TextBrush}"
+                                   Foreground="{DynamicResource TextBrush}"
                                    HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         <Button x:Name="NotNowButton" Content="Not Now" HorizontalAlignment="Right"
                                 Style="{StaticResource SmallButton}" Click="CloseUpdate_Click"/>
@@ -204,8 +204,8 @@
                 </Border>
 
                 <StackPanel Margin="20,16">
-                    <Border Background="{StaticResource CardBrush}" CornerRadius="6"
-                            BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
+                    <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                            BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
                             Padding="14,12" Margin="0,0,0,12">
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -217,26 +217,26 @@
                             <StackPanel Grid.Column="1" VerticalAlignment="Center">
                                 <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
                                     <TextBlock x:Name="CurrentVerLabel" FontSize="12" FontFamily="Consolas"
-                                               Foreground="{StaticResource SecondaryBrush}" VerticalAlignment="Center"/>
-                                    <TextBlock Text=" → " FontSize="11" Foreground="{StaticResource SecondaryBrush}"
+                                               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}" MaxHeight="160"/>
+                                           Foreground="{DynamicResource SecondaryBrush}" MaxHeight="160"/>
                             </StackPanel>
                         </Grid>
                     </Border>
 
-                    <TextBlock x:Name="UpdateStatusText" Foreground="{StaticResource SecondaryBrush}"
+                    <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="{StaticResource BlueBrush}"/>
+                                 Height="4" Margin="0,0,0,12" Foreground="{DynamicResource BlueBrush}"/>
                     <TextBlock Text="ClaudeChecker will download, replace itself, and relaunch automatically."
-                               FontSize="11" Foreground="{StaticResource SecondaryBrush}"
+                               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"

windows/PopupWindow.xaml.cs

@@ -14,7 +14,7 @@ public partial class PopupWindow : Window
     private static readonly UsageViewModel VM      = App.ViewModel;
     private static readonly UpdateManager  Updater = App.Updater;
     private readonly DispatcherTimer _clockTimer;
-    private bool _dialogOpen;
+
 
     [DllImport("dwmapi.dll")]
     private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int value, int size);
@@ -255,7 +255,7 @@ public partial class PopupWindow : Window
         var label = 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 };
@@ -312,14 +312,12 @@ public partial class PopupWindow : Window
 
     private async void SignIn_Click(object s, RoutedEventArgs e)
     {
-        _dialogOpen = true;
         var login = new LoginWindow { Owner = this };
         if (login.ShowDialog() == true)
         {
             await VM.RefreshAsync();
             InitSettings();
         }
-        _dialogOpen = false;
         Show();
         Activate();
     }

windows/RELEASE_NOTES.md

@@ -1,3 +1,4 @@
-## What's new
+## What's new in beta.22
 
-Initial Windows release.
+- Fixed build error: Task unwrap for Dispatcher.InvokeAsync with async lambda
+- Removed unused field warning

windows/ThemeManager.cs

@@ -2,6 +2,7 @@ using Microsoft.Win32;
 using System;
 using System.Windows;
 using System.Windows.Media;
+using System.Windows.Threading;
 
 namespace ClaudeCheckerWindows;
 
@@ -14,20 +15,17 @@ public static class ThemeManager
     {
         IsDark = ReadIsDark();
         Apply();
-        SystemEvents.UserPreferenceChanged += OnPreferenceChanged;
-    }
 
-    private static void OnPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
-    {
-        if (e.Category != UserPreferenceCategory.General) return;
-        var nowDark = ReadIsDark();
-        if (nowDark == IsDark) return;
-        IsDark = nowDark;
-        Application.Current.Dispatcher.Invoke(() =>
+        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()
@@ -56,6 +54,8 @@ public static class ThemeManager
             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
         {
@@ -69,11 +69,13 @@ public static class ThemeManager
             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)
     {
-        if (res[key] is SolidColorBrush b) b.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;

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 = [];
@@ -83,24 +82,50 @@ public class UsageViewModel : INotifyPropertyChanged
             {
                 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);
+            // Try HttpClient first (fast path)
+            var (limits, overage, prepaid, email, orgId, ok) = await TryHttpRefreshAsync(cookies);
 
-            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);
+            // If HttpClient failed, fall back to WebView2 (uses existing browser session)
+            if (!ok)
+                (limits, email, orgId) = await TryWebView2RefreshAsync();
 
-            await Task.WhenAll(usageTask, overageTask, prepaidTask, emailTask);
+            // Still no org ID? Use cached values from last successful login
+            if (string.IsNullOrEmpty(orgId) && !string.IsNullOrEmpty(AppSettings.Default.OrgId))
+                orgId = AppSettings.Default.OrgId;
+            if (string.IsNullOrEmpty(email) && !string.IsNullOrEmpty(AppSettings.Default.Email))
+                email = AppSettings.Default.Email;
 
-            var usage  = usageTask.Result;
-            var limits = BuildLimits(usage);
+            // If we have cached usage from login and still got nothing live, use that
+            if (limits.Count == 0 && !string.IsNullOrEmpty(AppSettings.Default.UsageJson))
+            {
+                try
+                {
+                    var cached = System.Text.Json.JsonSerializer.Deserialize<UsageResponse>(
+                        AppSettings.Default.UsageJson, JsonOpts);
+                    limits = BuildLimits(cached);
+                }
+                catch { }
+            }
+
+            bool isAuth = !string.IsNullOrEmpty(email) || !string.IsNullOrEmpty(orgId) || limits.Count > 0;
+            if (!isAuth && cookies.Count > 0)
+            {
+                // Cookies exist but nothing worked — session likely expired
+                await Application.Current.Dispatcher.InvokeAsync(() =>
+                {
+                    IsSignedIn   = false;
+                    ErrorMessage = "Session expired — click Sign In to re-authenticate.";
+                    IsLoading    = false;
+                });
+                return;
+            }
 
             foreach (var limit in limits)
             {
@@ -115,14 +140,14 @@ 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;
+                Limits       = limits;
+                Overage      = overage;
+                Prepaid      = prepaid;
+                if (!string.IsNullOrEmpty(email)) UserEmail = email;
+                IsSignedIn   = true;
+                ErrorMessage = null;
+                LastUpdated  = DateTime.Now;
+                IsLoading    = false;
             });
         }
         catch (Exception ex)
@@ -135,9 +160,95 @@ public class UsageViewModel : INotifyPropertyChanged
         }
     }
 
+    private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, string?, string?, bool)>
+        TryHttpRefreshAsync(List<(string Name, string Value, string Domain, string Path)> cookies)
+    {
+        try
+        {
+            using var http = BuildClient(cookies);
+            var bootstrapResp = await http.GetAsync("https://claude.ai/api/bootstrap");
+            if (!bootstrapResp.IsSuccessStatusCode)
+                return ([], null, null, null, null, false);
+
+            var (email, orgId) = ParseBootstrap(await bootstrapResp.Content.ReadAsStringAsync());
+
+            if (string.IsNullOrEmpty(orgId))
+                orgId = await FetchOrgIdFromListAsync(http);
+            if (string.IsNullOrEmpty(orgId) && !string.IsNullOrEmpty(AppSettings.Default.OrgId))
+                orgId = AppSettings.Default.OrgId;
+
+            if (string.IsNullOrEmpty(orgId))
+                return ([], null, null, email, orgId, true);
+
+            AppSettings.Default.OrgId = orgId;
+            AppSettings.Default.Save();
+
+            var ut = FetchAsync<UsageResponse>(http, $"https://claude.ai/api/organizations/{orgId}/usage");
+            var ot = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
+            var pt = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
+            await Task.WhenAll(ut, ot, pt);
+
+            return (BuildLimits(ut.Result), ot.Result, pt.Result, email, orgId, true);
+        }
+        catch { return ([], null, null, null, null, false); }
+    }
+
+    private static async Task<(List<AgentLimit>, string?, string?)> TryWebView2RefreshAsync()
+    {
+        try
+        {
+            const string script = @"(async()=>{try{
+                const b=await(await fetch('/api/bootstrap',{headers:{accept:'application/json'}})).json();
+                const id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid||null;
+                const em=b?.account?.email_address||null;
+                if(!id)return{email:em,orgId:null,usage:null};
+                const u=await(await fetch('/api/organizations/'+id+'/usage',{headers:{accept:'application/json'}})).json();
+                return{email:em,orgId:id,usage:u};
+            }catch(ex){return null;}})()";
+
+            var resultJson = await Application.Current.Dispatcher.InvokeAsync(async () =>
+            {
+                var host = new WebViewFetchWindow();
+                host.Show();
+                try   { return await host.FetchAsync("https://claude.ai", script); }
+                finally { host.Close(); }
+            }).Task.Unwrap();
+
+            if (resultJson == null || resultJson == "null") return ([], null, null);
+
+            using var doc = System.Text.Json.JsonDocument.Parse(resultJson);
+            var root = doc.RootElement;
+
+            string? email = root.TryGetProperty("email", out var em) && em.ValueKind == System.Text.Json.JsonValueKind.String
+                ? em.GetString() : null;
+            string? orgId = root.TryGetProperty("orgId", out var oi) && oi.ValueKind == System.Text.Json.JsonValueKind.String
+                ? oi.GetString() : null;
+
+            List<AgentLimit> limits = [];
+            if (root.TryGetProperty("usage", out var us) && us.ValueKind == System.Text.Json.JsonValueKind.Object)
+            {
+                var usage = System.Text.Json.JsonSerializer.Deserialize<UsageResponse>(
+                    us.GetRawText(), new System.Text.Json.JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+                limits = BuildLimits(usage);
+
+                // Cache for next time
+                AppSettings.Default.UsageJson = us.GetRawText();
+                if (!string.IsNullOrEmpty(orgId)) AppSettings.Default.OrgId = orgId;
+                if (!string.IsNullOrEmpty(email)) AppSettings.Default.Email = email;
+                AppSettings.Default.Save();
+            }
+
+            return (limits, email, orgId);
+        }
+        catch { return ([], null, null); }
+    }
+
     public async Task SignOutAsync()
     {
         AppSettings.Default.CookieStore = "";
+        AppSettings.Default.OrgId       = "";
+        AppSettings.Default.Email       = "";
+        AppSettings.Default.UsageJson   = "";
         AppSettings.Default.Save();
 
         await Application.Current.Dispatcher.InvokeAsync(() =>
@@ -149,7 +260,6 @@ public class UsageViewModel : INotifyPropertyChanged
         });
     }
 
-    // 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;
@@ -178,6 +288,9 @@ 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");
         var cookieHeader = string.Join("; ", cookies.Select(c => $"{c.Name}={c.Value}"));
         http.DefaultRequestHeaders.Add("Cookie", cookieHeader);
         return http;
@@ -195,20 +308,64 @@ public class UsageViewModel : INotifyPropertyChanged
         catch { return null; }
     }
 
-    private static async Task<string?> FetchEmailAsync(HttpClient http)
+    // Parse email and org ID out of bootstrap JSON (multiple fallback paths for org ID)
+    private static (string? Email, string? OrgId) ParseBootstrap(string json)
     {
         try
         {
-            var resp = await http.GetAsync("https://claude.ai/api/bootstrap");
+            using var doc = JsonDocument.Parse(json);
+            var root = doc.RootElement;
+
+            string? email = null;
+            string? orgId = null;
+
+            if (root.TryGetProperty("account", out var acct) &&
+                acct.TryGetProperty("email_address", out var em))
+                email = em.GetString();
+
+            // Path 1: memberships[0].organization.uuid
+            if (root.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
+            {
+                var first = mems[0];
+                if (first.TryGetProperty("organization", out var org) &&
+                    org.TryGetProperty("uuid", out var uuid))
+                    orgId = uuid.GetString();
+            }
+
+            // Path 2: organizations[0].uuid (flat list on root)
+            if (string.IsNullOrEmpty(orgId) &&
+                root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
+            {
+                if (orgs[0].TryGetProperty("uuid", out var uuid))
+                    orgId = uuid.GetString();
+            }
+
+            return (email, orgId);
+        }
+        catch { return (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;

windows/WebViewFetchWindow.cs

@@ -0,0 +1,59 @@
+using Microsoft.Web.WebView2.Core;
+using Microsoft.Web.WebView2.Wpf;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace ClaudeCheckerWindows;
+
+// Invisible 1×1 window that hosts a WebView2 for authenticated API calls.
+// Uses the same user data folder as LoginWindow so the session is shared.
+internal sealed class WebViewFetchWindow : Window
+{
+    private readonly WebView2 _wv = new();
+
+    public WebViewFetchWindow()
+    {
+        Width          = 1;
+        Height         = 1;
+        Left           = -9999;
+        Top            = -9999;
+        ShowInTaskbar  = false;
+        WindowStyle    = WindowStyle.None;
+        AllowsTransparency = true;
+        Opacity        = 0;
+        Content        = _wv;
+    }
+
+    public async Task<string?> FetchAsync(string navigateUrl, string script, int timeoutMs = 20000)
+    {
+        var env = await CoreWebView2Environment.CreateAsync(userDataFolder:
+            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                "ClaudeChecker", "WebView2"));
+
+        await _wv.EnsureCoreWebView2Async(env);
+
+        var tcs = new TaskCompletionSource<string?>();
+
+        EventHandler<CoreWebView2NavigationCompletedEventArgs>? handler = null;
+        handler = async (_, e) =>
+        {
+            _wv.CoreWebView2.NavigationCompleted -= handler;
+            if (!e.IsSuccess) { tcs.TrySetResult(null); return; }
+            try
+            {
+                var result = await _wv.CoreWebView2.ExecuteScriptAsync(script);
+                tcs.TrySetResult(result);
+            }
+            catch { tcs.TrySetResult(null); }
+        };
+
+        _wv.CoreWebView2.NavigationCompleted += handler;
+        _wv.CoreWebView2.Navigate(navigateUrl);
+
+        _ = Task.Delay(timeoutMs).ContinueWith(_ => tcs.TrySetResult(null));
+
+        return await tcs.Task;
+    }
+}