Add Session Diary and Extra Usage Credits sections to Windows app

windows/AppSettings.cs

@@ -14,6 +14,7 @@ public class AppSettings
     public int    RefreshInterval { get; set; } = 120;
     public bool   ShowInTaskbar   { get; set; } = true;
     public bool   BetaChannel     { get; set; } = false;
+    public string DebugInfo       { get; set; } = "";
 
     private static readonly string FilePath = Path.Combine(
         Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),

windows/Controls/GaugeControl.cs

@@ -56,17 +56,19 @@ public class GaugeControl : FrameworkElement
             CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
             new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
             14, new SolidColorBrush(textColor), dpi);
-        dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
-
         var sub = new FormattedText(
-            "Updated\nnow",
+            "used",
             CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-            new Typeface("Segoe UI"), 7,
+            new Typeface("Segoe UI"), 8,
             new SolidColorBrush(subColor), dpi)
         {
             TextAlignment = TextAlignment.Center
         };
-        dc.DrawText(sub, new Point(cx - sub.Width / 2, cy + 2));
+
+        var totalHeight = pctText.Height + 2 + sub.Height;
+        var startY      = cy - totalHeight / 2;
+        dc.DrawText(pctText, new Point(cx - pctText.Width / 2, startY));
+        dc.DrawText(sub,     new Point(cx - sub.Width     / 2, startY + pctText.Height + 2));
     }
 
     private static void DrawArc(DrawingContext dc, double cx, double cy, double r,

windows/LoginWindow.xaml.cs

@@ -47,8 +47,7 @@ public partial class LoginWindow : Window
                     : "Complete sign-in, then click Done.";
             });
 
-            // Auto-close as soon as we detect sign-in on any claude.ai page
-            if (signedIn && !uri.Contains("/login") && !uri.Contains("/signin"))
+            if (!uri.Contains("/login") && !uri.Contains("/signin") && signedIn)
                 await SaveAndClose(cookies);
         };
     }
@@ -67,20 +66,50 @@ public partial class LoginWindow : Window
 
         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)};}})()";
+            // Use WebMessageReceived so the async script can post back without relying
+            // on Promise-awaiting support in the WebView2 runtime version.
+            var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
+            EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
+            msgHandler = (_, args) =>
+            {
+                Browser.CoreWebView2.WebMessageReceived -= msgHandler;
+                tcs.TrySetResult(args.WebMessageAsJson);
+            };
+            Browser.CoreWebView2.WebMessageReceived += msgHandler;
 
-            var json = await Browser.CoreWebView2.ExecuteScriptAsync(script);
-            if (json != "null" && !string.IsNullOrEmpty(json))
+            const string script = @"(async()=>{try{
+                const h={headers:{accept:'application/json'}};
+                const b=await(await fetch('/api/bootstrap',h)).json();
+                const rawB=JSON.stringify(b).slice(0,600);
+                let id=b?.account?.memberships?.[0]?.organization?.uuid
+                        ||b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
+                        ||b?.default_organization?.uuid||null;
+                const e=b?.account?.email_address||b?.account?.email||b?.email||null;
+                let orgSrc='bootstrap';
+                if(!id){
+                    try{const ol=await(await fetch('/api/organizations',h)).json();
+                        if(Array.isArray(ol)&&ol.length>0){id=ol[0]?.uuid||null;orgSrc='orgs-list';}}catch(e2){}
+                }
+                if(!id){
+                    let pu=null;
+                    try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){}
+                    window.chrome.webview.postMessage({email:e,orgId:null,usage:(pu&&!pu.error?pu:null),debug:'no-org|raw:'+rawB});
+                    return;
+                }
+                const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
+                const rawU=JSON.stringify(u).slice(0,400);
+                window.chrome.webview.postMessage({email:e,orgId:id,usage:u,debug:'src:'+orgSrc+'|ukeys:'+Object.keys(u||{}).join(',')+'|rawU:'+rawU+'|rawB:'+rawB});
+            }catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
+
+            await Browser.CoreWebView2.ExecuteScriptAsync(script);
+
+            // Wait up to 15 s for the script to post its message
+            var completed = await Task.WhenAny(tcs.Task, Task.Delay(15000));
+            var json = completed == tcs.Task ? tcs.Task.Result : null;
+
+            if (!string.IsNullOrEmpty(json))
             {
                 using var doc = JsonDocument.Parse(json);
                 var root = doc.RootElement;
@@ -94,10 +123,26 @@ public partial class LoginWindow : Window
                 if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
                     AppSettings.Default.UsageJson = us.GetRawText();
 
+                if (root.TryGetProperty("debug", out var dbg) && dbg.ValueKind == JsonValueKind.String)
+                    AppSettings.Default.DebugInfo = dbg.GetString() ?? "";
+                else if (root.TryGetProperty("error", out var err))
+                    AppSettings.Default.DebugInfo = "JS error: " + err.GetRawText();
+                else
+                    AppSettings.Default.DebugInfo = "timeout or empty message";
+
+                AppSettings.Default.Save();
+            }
+            else
+            {
+                AppSettings.Default.DebugInfo = json == null ? "script timeout (15s)" : "empty message";
                 AppSettings.Default.Save();
             }
         }
-        catch { }
+        catch (Exception ex)
+        {
+            AppSettings.Default.DebugInfo = "exception: " + ex.Message;
+            AppSettings.Default.Save();
+        }
 
         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,12 @@ 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; }
+}
+
 public class BootstrapResponse
 {
     [JsonPropertyName("account")] public AccountInfo? Account { get; set; }

windows/PopupWindow.xaml

@@ -173,9 +173,15 @@
                                     <TextBlock Text="Built by superdooper86 &amp; claude"
                                                FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
                                 </StackPanel>
-                                <Button Grid.Column="2" x:Name="CheckUpdateButton"
-                                        Style="{StaticResource SmallButton}"
-                                        Click="CheckUpdate_Click" VerticalAlignment="Center"/>
+                                <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>
 

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);
@@ -55,6 +55,13 @@ public partial class PopupWindow : Window
         CardsPanel.Children.Clear();
         foreach (var limit in VM.Limits)
             CardsPanel.Children.Add(BuildCard(limit));
+
+        var fiveHour = VM.Limits.FirstOrDefault(l => l.Window == WindowKind.FiveHour);
+        if (fiveHour != null && fiveHour.BurnHistory.Count > 0)
+            CardsPanel.Children.Add(BuildDiarySection(fiveHour));
+
+        if (VM.ExtraUsage?.IsEnabled == true)
+            CardsPanel.Children.Add(BuildExtraUsageSection());
     }
 
     private static UIElement BuildCard(AgentLimit limit)
@@ -180,12 +187,132 @@ public partial class PopupWindow : Window
         return section;
     }
 
+    private static UIElement BuildDiarySection(AgentLimit limit)
+    {
+        var text      = (SolidColorBrush)Application.Current.Resources["TextBrush"];
+        var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
+
+        var samples = limit.BurnHistory.Count;
+        var avgBurn = limit.BurnRate;
+
+        var subtitle = new TextBlock
+        {
+            Text       = $"{samples} samples · {avgBurn:F1}%/h avg burn rate",
+            FontSize   = 11,
+            Foreground = secondary,
+            Margin     = new Thickness(16, 0, 16, 6),
+        };
+
+        var sparkline = new SparklineControl
+        {
+            Height    = 32,
+            Margin    = new Thickness(8, 8, 8, 8),
+            LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
+            Data      = limit.BurnHistory,
+        };
+
+        var card = new Border
+        {
+            Background      = (SolidColorBrush)Application.Current.Resources["CardBrush"],
+            CornerRadius    = new CornerRadius(6),
+            BorderBrush     = border,
+            BorderThickness = new Thickness(1),
+            Margin          = new Thickness(12, 0, 12, 0),
+            Child           = sparkline,
+        };
+
+        var sectionLabel = new TextBlock
+        {
+            Text   = "SESSION DIARY",
+            Style  = (Style)Application.Current.Resources["HeaderText"],
+            Margin = new Thickness(16, 12, 16, 6),
+        };
+
+        var section = new StackPanel();
+        section.Children.Add(sectionLabel);
+        section.Children.Add(subtitle);
+        section.Children.Add(card);
+        return section;
+    }
+
+    private UIElement BuildExtraUsageSection()
+    {
+        var text      = (SolidColorBrush)Application.Current.Resources["TextBrush"];
+        var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
+        var accent    = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
+
+        var overage  = VM.Overage;
+        var prepaid  = VM.Prepaid;
+        var currency = VM.ExtraUsage?.Currency ?? overage?.Currency ?? "$";
+
+        var spent   = overage?.UsedCredits         ?? 0;
+        var limit   = overage?.MonthlyCreditLimit  ?? 0;
+        var balance = prepaid?.Amount              ?? 0;
+
+        UIElement MakeRow(string label, string value)
+        {
+            var row = new Grid { Margin = new Thickness(0, 3, 0, 3) };
+            row.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+            row.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+            var lbl = new TextBlock { Text = label, FontSize = 12, Foreground = secondary };
+            var val = new TextBlock { Text = value, FontSize = 12, FontWeight = FontWeights.Medium, Foreground = text };
+            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}"));
+        if (limit   > 0) contentPanel.Children.Add(MakeRow("Limit",   $"{currency}{limit:F2}"));
+        if (balance > 0) contentPanel.Children.Add(MakeRow("Balance", $"{currency}{balance:F2}"));
+
+        if (limit > 0)
+        {
+            var pct = Math.Min(spent / limit * 100, 100);
+            contentPanel.Children.Add(new ProgressBar
+            {
+                Value           = pct, Maximum = 100, Height = 4,
+                Margin          = new Thickness(0, 6, 0, 0),
+                Foreground      = accent,
+                Background      = new SolidColorBrush(Color.FromArgb(20, 0, 0, 0)),
+                BorderThickness = new Thickness(0),
+            });
+        }
+
+        var card = new Border
+        {
+            Background      = (SolidColorBrush)Application.Current.Resources["CardBrush"],
+            CornerRadius    = new CornerRadius(6),
+            BorderBrush     = border,
+            BorderThickness = new Thickness(1),
+            Margin          = new Thickness(12, 0, 12, 0),
+            Child           = contentPanel,
+        };
+
+        var sectionLabel = new TextBlock
+        {
+            Text   = "EXTRA USAGE CREDITS",
+            Style  = (Style)Application.Current.Resources["HeaderText"],
+            Margin = new Thickness(16, 12, 16, 6),
+        };
+
+        var section = new StackPanel();
+        section.Children.Add(sectionLabel);
+        section.Children.Add(card);
+        return section;
+    }
+
     // ── State updates ────────────────────────────────────────────────
 
     private void OnVmChanged(string? prop)
     {
         if (prop is nameof(UsageViewModel.Limits) or nameof(UsageViewModel.IsLoading)
-                 or nameof(UsageViewModel.LastUpdated) or nameof(UsageViewModel.ErrorMessage))
+                 or nameof(UsageViewModel.LastUpdated) or nameof(UsageViewModel.ErrorMessage)
+                 or nameof(UsageViewModel.ExtraUsage) or nameof(UsageViewModel.Overage) or nameof(UsageViewModel.Prepaid))
         {
             RebuildCards();
             UpdateFooter();
@@ -199,7 +326,10 @@ public partial class PopupWindow : Window
     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))
@@ -208,6 +338,21 @@ 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;
@@ -236,7 +381,7 @@ public partial class PopupWindow : Window
     {
         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) };
@@ -312,14 +457,22 @@ 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();
+            // Show cached data from SaveAndClose immediately (no WebView2 needed)
+            await VM.LoadFromCacheAsync();
             InitSettings();
+            ShowMain();
+
+            // Full refresh in background after WebView2 folder is definitely released
+            _ = Task.Run(async () =>
+            {
+                await Task.Delay(3000);
+                await VM.RefreshAsync();
+                await Application.Current.Dispatcher.InvokeAsync(InitSettings);
+            });
         }
-        _dialogOpen = false;
         Show();
         Activate();
     }

windows/RELEASE_NOTES.md

@@ -1,6 +1,3 @@
-## What's new in beta.21
-
-- Fixed: clicking Sign In now auto-closes as soon as you are detected as signed in (no need to click Done)
-- Fixed: login now fetches and caches your data directly via the browser session (no more authentication failures)
-- Fixed: periodic refresh falls back to browser-session API calls when HttpClient is rejected
-- Fixed: cached usage from login is shown immediately while refreshing
+## What's new in beta.34
+- Add: Session Diary section showing 5h burn rate history sparkline
+- Add: Extra Usage Credits section showing spent/limit/balance (when enabled)

windows/UsageViewModel.cs

@@ -24,6 +24,7 @@ public class UsageViewModel : INotifyPropertyChanged
     private DateTime? _lastUpdated;
     private OverageSpendLimit? _overage;
     private PrepaidCredits? _prepaid;
+    private ExtraUsage? _extraUsage;
 
     private readonly Dictionary<string, List<double>> _burnHistory = [];
     private const int MaxHistorySamples = 24;
@@ -37,6 +38,7 @@ public class UsageViewModel : INotifyPropertyChanged
     public DateTime? LastUpdated            { get => _lastUpdated;  set => Set(ref _lastUpdated, value); }
     public OverageSpendLimit? Overage       { get => _overage;      set => Set(ref _overage, value); }
     public PrepaidCredits? Prepaid          { get => _prepaid;      set => Set(ref _prepaid, value); }
+    public ExtraUsage? ExtraUsage           { get => _extraUsage;   set => Set(ref _extraUsage, value); }
 
     private int _refreshInterval = 120;
     public int RefreshInterval
@@ -78,7 +80,13 @@ public class UsageViewModel : INotifyPropertyChanged
         try
         {
             var cookies = await GetCookiesAsync();
-            if (cookies.Count == 0)
+
+            // Check if we have any persistent proof that the user authenticated
+            bool hasCookies    = cookies.Count > 0;
+            bool hasCachedAuth = !string.IsNullOrEmpty(AppSettings.Default.Email) ||
+                                 !string.IsNullOrEmpty(AppSettings.Default.OrgId);
+
+            if (!hasCookies && !hasCachedAuth)
             {
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
@@ -89,20 +97,16 @@ public class UsageViewModel : INotifyPropertyChanged
                 return;
             }
 
-            // Try HttpClient first (fast path)
-            var (limits, overage, prepaid, email, orgId, ok) = await TryHttpRefreshAsync(cookies);
+            // HttpClient refresh — WebView2 is NOT used here to avoid spawning a heavy
+            // browser process every refresh cycle (causes memory accumulation).
+            // SaveAndClose at login time is responsible for fetching live data via WebView2.
+            var (limits, overage, prepaid, extraUsage, email, orgId, ok) = hasCookies
+                ? await TryHttpRefreshAsync(cookies)
+                : ([], null, null, null, null, null, false);
 
-            // If HttpClient failed, fall back to WebView2 (uses existing browser session)
-            if (!ok)
-                (limits, email, orgId) = await TryWebView2RefreshAsync();
-
-            // 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;
-
-            // If we have cached usage from login and still got nothing live, use that
+            // Fill in any blanks from cached values saved at login time
+            if (string.IsNullOrEmpty(email))  email  = AppSettings.Default.Email;
+            if (string.IsNullOrEmpty(orgId))  orgId  = AppSettings.Default.OrgId;
             if (limits.Count == 0 && !string.IsNullOrEmpty(AppSettings.Default.UsageJson))
             {
                 try
@@ -114,19 +118,6 @@ public class UsageViewModel : INotifyPropertyChanged
                 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)
             {
                 var key = limit.Window.ToString();
@@ -140,9 +131,7 @@ public class UsageViewModel : INotifyPropertyChanged
 
             await Application.Current.Dispatcher.InvokeAsync(() =>
             {
-                Limits       = limits;
-                Overage      = overage;
-                Prepaid      = prepaid;
+                if (limits.Count > 0) { Limits = limits; Overage = overage; Prepaid = prepaid; ExtraUsage = extraUsage; }
                 if (!string.IsNullOrEmpty(email)) UserEmail = email;
                 IsSignedIn   = true;
                 ErrorMessage = null;
@@ -160,7 +149,7 @@ public class UsageViewModel : INotifyPropertyChanged
         }
     }
 
-    private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, string?, string?, bool)>
+    private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, ExtraUsage?, string?, string?, bool)>
         TryHttpRefreshAsync(List<(string Name, string Value, string Domain, string Path)> cookies)
     {
         try
@@ -178,7 +167,7 @@ public class UsageViewModel : INotifyPropertyChanged
                 orgId = AppSettings.Default.OrgId;
 
             if (string.IsNullOrEmpty(orgId))
-                return ([], null, null, email, orgId, true);
+                return ([], null, null, null, email, orgId, true);
 
             AppSettings.Default.OrgId = orgId;
             AppSettings.Default.Save();
@@ -188,9 +177,9 @@ public class UsageViewModel : INotifyPropertyChanged
             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);
+            return (BuildLimits(ut.Result), ot.Result, pt.Result, ut.Result?.ExtraUsage, email, orgId, true);
         }
-        catch { return ([], null, null, null, null, false); }
+        catch { return ([], null, null, null, null, null, false); }
     }
 
     private static async Task<(List<AgentLimit>, string?, string?)> TryWebView2RefreshAsync()
@@ -198,13 +187,25 @@ public class UsageViewModel : INotifyPropertyChanged
         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;}})()";
+                const h={headers:{accept:'application/json'}};
+                const b=await(await fetch('/api/bootstrap',h)).json();
+                let id=b?.account?.memberships?.[0]?.organization?.uuid
+                        ||b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
+                        ||b?.default_organization?.uuid||null;
+                const em=b?.account?.email_address||b?.account?.email||b?.email||null;
+                if(!id){
+                    try{const ol=await(await fetch('/api/organizations',h)).json();
+                        if(Array.isArray(ol)&&ol.length>0)id=ol[0]?.uuid||null;}catch(e2){}
+                }
+                if(!id){
+                    let pu=null;
+                    try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){}
+                    window.chrome.webview.postMessage({email:em,orgId:null,usage:(pu&&!pu.error?pu:null)});
+                    return;
+                }
+                const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
+                window.chrome.webview.postMessage({email:em,orgId:id,usage:u});
+            }catch(ex){window.chrome.webview.postMessage(null);}})();";
 
             var resultJson = await Application.Current.Dispatcher.InvokeAsync(async () =>
             {
@@ -212,7 +213,7 @@ public class UsageViewModel : INotifyPropertyChanged
                 host.Show();
                 try   { return await host.FetchAsync("https://claude.ai", script); }
                 finally { host.Close(); }
-            }).Task;
+            }).Task.Unwrap();
 
             if (resultJson == null || resultJson == "null") return ([], null, null);
 
@@ -243,6 +244,39 @@ public class UsageViewModel : INotifyPropertyChanged
         catch { return ([], null, null); }
     }
 
+    public async Task LoadFromCacheAsync()
+    {
+        var email  = AppSettings.Default.Email;
+        var orgId  = AppSettings.Default.OrgId;
+        var cookie = AppSettings.Default.CookieStore;
+
+        bool isAuth = !string.IsNullOrEmpty(email) || !string.IsNullOrEmpty(orgId)
+                   || !string.IsNullOrEmpty(cookie);
+        if (!isAuth) return;
+
+        List<AgentLimit> limits = [];
+        if (!string.IsNullOrEmpty(AppSettings.Default.UsageJson))
+        {
+            try
+            {
+                var cached = JsonSerializer.Deserialize<UsageResponse>(
+                    AppSettings.Default.UsageJson, JsonOpts);
+                limits = BuildLimits(cached);
+            }
+            catch { }
+        }
+
+        await Application.Current.Dispatcher.InvokeAsync(() =>
+        {
+            if (!string.IsNullOrEmpty(email)) UserEmail = email;
+            // Always show cards — real data if available, placeholders if not
+            Limits       = limits.Count > 0 ? limits : LoadPlaceholderLimits();
+            IsSignedIn   = true;
+            ErrorMessage = null;
+            LastUpdated  = limits.Count > 0 ? DateTime.Now : LastUpdated;
+        });
+    }
+
     public async Task SignOutAsync()
     {
         AppSettings.Default.CookieStore = "";
@@ -276,7 +310,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);
@@ -291,6 +325,14 @@ public class UsageViewModel : INotifyPropertyChanged
         http.DefaultRequestHeaders.Add("User-Agent",
             "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
             "(KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36");
+        http.DefaultRequestHeaders.Add("Origin",           "https://claude.ai");
+        http.DefaultRequestHeaders.Add("Referer",          "https://claude.ai/");
+        http.DefaultRequestHeaders.Add("sec-fetch-dest",   "empty");
+        http.DefaultRequestHeaders.Add("sec-fetch-mode",   "cors");
+        http.DefaultRequestHeaders.Add("sec-fetch-site",   "same-origin");
+        http.DefaultRequestHeaders.Add("sec-ch-ua",        "\"Chromium\";v=\"124\", \"Google Chrome\";v=\"124\"");
+        http.DefaultRequestHeaders.Add("sec-ch-ua-mobile", "?0");
+        http.DefaultRequestHeaders.Add("sec-ch-ua-platform", "\"Windows\"");
         var cookieHeader = string.Join("; ", cookies.Select(c => $"{c.Name}={c.Value}"));
         http.DefaultRequestHeaders.Add("Cookie", cookieHeader);
         return http;
@@ -323,8 +365,9 @@ public class UsageViewModel : INotifyPropertyChanged
                 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)
+            // Path 1: account.memberships[0].organization.uuid  (Claude.ai personal/pro accounts)
+            if (root.TryGetProperty("account", out var acctNode) &&
+                acctNode.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
             {
                 var first = mems[0];
                 if (first.TryGetProperty("organization", out var org) &&
@@ -332,7 +375,17 @@ public class UsageViewModel : INotifyPropertyChanged
                     orgId = uuid.GetString();
             }
 
-            // Path 2: organizations[0].uuid (flat list on root)
+            // Path 2: memberships[0].organization.uuid  (root-level, older API shape)
+            if (string.IsNullOrEmpty(orgId) &&
+                root.TryGetProperty("memberships", out var rootMems) && rootMems.GetArrayLength() > 0)
+            {
+                var first = rootMems[0];
+                if (first.TryGetProperty("organization", out var org) &&
+                    org.TryGetProperty("uuid", out var uuid))
+                    orgId = uuid.GetString();
+            }
+
+            // Path 3: organizations[0].uuid  (flat list on root)
             if (string.IsNullOrEmpty(orgId) &&
                 root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
             {
@@ -420,16 +473,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

@@ -34,25 +34,34 @@ internal sealed class WebViewFetchWindow : Window
 
         await _wv.EnsureCoreWebView2Async(env);
 
-        var tcs = new TaskCompletionSource<string?>();
+        var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
 
-        EventHandler<CoreWebView2NavigationCompletedEventArgs>? handler = null;
-        handler = async (_, e) =>
+        // Use WebMessageReceived so the script can post back asynchronously without
+        // relying on Promise-awaiting support in the WebView2 runtime version.
+        EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
+        msgHandler = (_, args) =>
         {
-            _wv.CoreWebView2.NavigationCompleted -= handler;
+            _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
-            {
-                var result = await _wv.CoreWebView2.ExecuteScriptAsync(script);
-                tcs.TrySetResult(result);
-            }
+            try   { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
             catch { tcs.TrySetResult(null); }
         };
-
-        _wv.CoreWebView2.NavigationCompleted += handler;
+        _wv.CoreWebView2.NavigationCompleted += navHandler;
         _wv.CoreWebView2.Navigate(navigateUrl);
 
-        _ = Task.Delay(timeoutMs).ContinueWith(_ => tcs.TrySetResult(null));
+        _ = Task.Delay(timeoutMs).ContinueWith(_ =>
+        {
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
+            tcs.TrySetResult(null);
+        });
 
         return await tcs.Task;
     }