chore: release notes for beta.28

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/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,49 @@ 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?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
+                        ||b?.default_organization?.uuid||b?.account?.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,300);
+                window.chrome.webview.postMessage({email:e,orgId:id,usage:u,debug:'src:'+orgSrc+'|ukeys:'+Object.keys(u||{}).join(',')+'|raw:'+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 +122,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/PopupWindow.xaml

@@ -66,7 +66,16 @@
 
             <!-- Cards scroll area -->
             <ScrollViewer VerticalScrollBarVisibility="Auto">
-                <StackPanel x:Name="CardsPanel" Margin="0,4,0,4"/>
+                <StackPanel Margin="0,4,0,4">
+                    <Border x:Name="DebugBanner" Visibility="Collapsed"
+                            Background="{DynamicResource CardBrush}"
+                            BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                            CornerRadius="6" Margin="12,4,12,4" Padding="12,8">
+                        <TextBlock x:Name="DebugBannerText" FontSize="10" FontFamily="Consolas"
+                                   Foreground="{DynamicResource SecondaryBrush}" TextWrapping="Wrap"/>
+                    </Border>
+                    <StackPanel x:Name="CardsPanel"/>
+                </StackPanel>
             </ScrollViewer>
         </DockPanel>
 
@@ -173,12 +182,22 @@
                                     <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>
 
+                        <TextBlock x:Name="DebugText" FontSize="10" Foreground="{DynamicResource SecondaryBrush}"
+                                   TextWrapping="Wrap" Margin="0,12,0,0" FontFamily="Consolas"
+                                   Visibility="Collapsed"/>
+
                     </StackPanel>
                 </ScrollViewer>
             </DockPanel>

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);
@@ -199,7 +199,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 +211,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 +254,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) };
@@ -265,6 +283,20 @@ public partial class PopupWindow : Window
 
         SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
         SignInButton.Content     = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
+
+        var dbg = AppSettings.Default.DebugInfo;
+        if (!string.IsNullOrEmpty(dbg))
+        {
+            DebugText.Text         = dbg;
+            DebugText.Visibility   = Visibility.Visible;
+            DebugBannerText.Text   = dbg;
+            DebugBanner.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            DebugText.Visibility   = Visibility.Collapsed;
+            DebugBanner.Visibility = Visibility.Collapsed;
+        }
     }
 
     // ── Event handlers ───────────────────────────────────────────────
@@ -312,14 +344,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,5 @@
-## What's new in beta.21
+## What's new in beta.28
 
-- 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
+- Debug banner now appears on the main panel after sign-in showing raw bootstrap data — paste this here so we can fix org ID parsing
+- Fix: limits no longer wiped when a refresh cycle returns no data (placeholders stay until real data arrives)
+- Try account.uuid as org ID fallback when no org found in bootstrap

windows/UsageViewModel.cs

@@ -78,7 +78,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 +95,18 @@ public class UsageViewModel : INotifyPropertyChanged
                 return;
             }
 
-            // Try HttpClient first (fast path)
-            var (limits, overage, prepaid, email, orgId, ok) = await TryHttpRefreshAsync(cookies);
+            // Try HttpClient first (fast path) — may be rejected by server CORS/header checks
+            var (limits, overage, prepaid, email, orgId, ok) = hasCookies
+                ? await TryHttpRefreshAsync(cookies)
+                : ([], null, null, null, null, false);
 
-            // If HttpClient failed, fall back to WebView2 (uses existing browser session)
+            // Fall back to WebView2 (uses the shared browser session, not HttpClient)
             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; }
                 if (!string.IsNullOrEmpty(email)) UserEmail = email;
                 IsSignedIn   = true;
                 ErrorMessage = null;
@@ -198,13 +187,24 @@ 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?.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 +212,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 +243,38 @@ 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;
+            if (limits.Count > 0)             Limits    = limits;
+            IsSignedIn   = true;
+            ErrorMessage = limits.Count == 0 ? "Signed in — refreshing data…" : null;
+            LastUpdated  = limits.Count > 0 ? DateTime.Now : LastUpdated;
+        });
+    }
+
     public async Task SignOutAsync()
     {
         AppSettings.Default.CookieStore = "";
@@ -276,7 +308,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);

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