chore: release notes for beta.20

windows/App.xaml

@@ -15,6 +15,8 @@
         <SolidColorBrush x:Key="SurfaceBrush"      Color="#FAFAFA" po:Freeze="False"/>
         <SolidColorBrush x:Key="BannerBgBrush"     Color="#E8F2FB" po:Freeze="False"/>
         <SolidColorBrush x:Key="BannerBorderBrush" Color="#B3D6F5" po:Freeze="False"/>
+        <SolidColorBrush x:Key="HoverBrush"       Color="#EBEBEB" po:Freeze="False"/>
+        <SolidColorBrush x:Key="BadgeBrush"        Color="#F0F0F0" po:Freeze="False"/>
 
         <Style x:Key="HeaderText" TargetType="TextBlock">
             <Setter Property="FontSize"   Value="10"/>
@@ -72,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>
@@ -81,8 +83,84 @@
         </Style>
 
         <Style TargetType="ComboBox">
-            <Setter Property="FontFamily" Value="Segoe UI"/>
+            <Setter Property="FontFamily"      Value="Segoe UI"/>
-            <Setter Property="FontSize"   Value="12"/>
+            <Setter Property="FontSize"        Value="12"/>
+            <Setter Property="Background"      Value="{DynamicResource CardBrush}"/>
+            <Setter Property="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/AppSettings.cs

@@ -8,6 +8,7 @@ public class AppSettings
 {
     public string CookieStore     { get; set; } = "";
     public string BurnHistory     { get; set; } = "";
+    public string OrgId           { 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">
+    <Resource Include="Assets\icon.png"/>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
 
 </Project>

windows/PopupWindow.xaml

@@ -163,7 +163,7 @@
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock Text="ClaudeChecker" FontSize="12" FontWeight="SemiBold"
                                                    Foreground="{DynamicResource TextBrush}"/>
-                                        <Border Background="#F0F0F0" CornerRadius="3"
+                                        <Border Background="{DynamicResource BadgeBrush}" CornerRadius="3"
                                                 Margin="6,0,0,0" Padding="5,1">
                                             <TextBlock x:Name="VersionLabel" FontSize="11"
                                                        Foreground="{DynamicResource SecondaryBrush}"

windows/PopupWindow.xaml.cs

@@ -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 };

windows/RELEASE_NOTES.md

@@ -1,6 +1,6 @@
-## What's new in beta.18
+## What's new in beta.20
 
-- Fixed startup crash caused by frozen WPF brushes
+- Fixed: app now correctly shows you as signed in after login
-- Added system dark/light theme support (auto-detected, updates every 5 seconds)
+- Fixed: org ID is fetched from API rather than hardcoded; tries multiple JSON paths
-- Native centered window instead of menubar popup
+- Fixed: auth check now uses HTTP 200 from bootstrap (not whether org ID was found)
-- Update notifications now work correctly for pre-release builds
+- Added browser User-Agent header so API responds correctly

windows/ThemeManager.cs

@@ -54,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
         {
@@ -67,6 +69,8 @@ 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));
         }
     }
 

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,56 @@ 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);
 
-            var usageTask   = FetchAsync<UsageResponse>(http, $"https://claude.ai/api/organizations/{OrgId}/usage");
+            // Bootstrap: 200 = authenticated. Non-200 = session expired.
-            var overageTask = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{OrgId}/overage_spend_limit");
+            var bootstrapResp = await http.GetAsync("https://claude.ai/api/bootstrap");
-            var prepaidTask = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{OrgId}/prepaid/credits");
+            if (!bootstrapResp.IsSuccessStatusCode)
-            var emailTask   = FetchEmailAsync(http);
+            {
+                await Application.Current.Dispatcher.InvokeAsync(() =>
+                {
+                    IsSignedIn   = false;
+                    ErrorMessage = "Session expired — click Sign In to re-authenticate.";
+                    IsLoading    = false;
+                });
+                return;
+            }
 
-            await Task.WhenAll(usageTask, overageTask, prepaidTask, emailTask);
+            // Parse email and org ID (best-effort — don't fail auth if org ID is missing)
+            var bootstrapJson = await bootstrapResp.Content.ReadAsStringAsync();
+            var (email, orgId) = ParseBootstrap(bootstrapJson);
 
-            var usage  = usageTask.Result;
+            // Resolve org ID through fallback chain
-            var limits = BuildLimits(usage);
+            if (string.IsNullOrEmpty(orgId))
+                orgId = await FetchOrgIdFromListAsync(http);
+            if (string.IsNullOrEmpty(orgId) && !string.IsNullOrEmpty(AppSettings.Default.OrgId))
+                orgId = AppSettings.Default.OrgId;
+
+            List<AgentLimit> limits = [];
+            OverageSpendLimit? overage = null;
+            PrepaidCredits? prepaid = null;
+
+            if (!string.IsNullOrEmpty(orgId))
+            {
+                AppSettings.Default.OrgId = orgId;
+                AppSettings.Default.Save();
+
+                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");
+                await Task.WhenAll(usageTask, overageTask, prepaidTask);
+
+                limits = BuildLimits(usageTask.Result);
+                overage = overageTask.Result;
+                prepaid = prepaidTask.Result;
+            }
 
             foreach (var limit in limits)
             {
@@ -115,14 +146,14 @@ public class UsageViewModel : INotifyPropertyChanged
 
             await Application.Current.Dispatcher.InvokeAsync(() =>
             {
-                Limits        = limits;
+                Limits       = limits;
-                Overage       = overageTask.Result;
+                Overage      = overage;
-                Prepaid       = prepaidTask.Result;
+                Prepaid      = prepaid;
-                UserEmail     = emailTask.Result ?? UserEmail;
+                UserEmail    = email ?? UserEmail;
-                IsSignedIn    = true;
+                IsSignedIn   = true;
-                ErrorMessage  = null;
+                ErrorMessage = string.IsNullOrEmpty(orgId) ? "Signed in, but couldn't find your organization data." : null;
-                LastUpdated   = DateTime.Now;
+                LastUpdated  = DateTime.Now;
-                IsLoading     = false;
+                IsLoading    = false;
             });
         }
         catch (Exception ex)
@@ -138,6 +169,7 @@ public class UsageViewModel : INotifyPropertyChanged
     public async Task SignOutAsync()
     {
         AppSettings.Default.CookieStore = "";
+        AppSettings.Default.OrgId       = "";
         AppSettings.Default.Save();
 
         await Application.Current.Dispatcher.InvokeAsync(() =>
@@ -149,7 +181,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 +209,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,15 +229,59 @@ 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);
+            using var doc = JsonDocument.Parse(json);
-            return boot?.Account?.EmailAddress;
+            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; }
     }