fix: correct session cookie detection and auto-close on login

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

@@ -53,19 +53,25 @@ jobs:
 
       - name: Update version-windows-beta.json on main
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
         shell: bash
         run: |
           notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows beta ${{ steps.version.outputs.version }}")
-          git config user.name "github-actions[bot]"
+          content=$(jq -n \
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git fetch origin main
-          git checkout main
-          jq -n \
             --arg version "${{ steps.version.outputs.version }}" \
             --arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker-Windows.zip" \
             --arg notes "$notes" \
-            '{version: $version, url: $url, notes: $notes}' > version-windows-beta.json
+            '{version: $version, url: $url, notes: $notes}' | base64 -w0)
-          git add version-windows-beta.json
+          sha=$(gh api "repos/${{ github.repository }}/contents/version-windows-beta.json?ref=main" --jq .sha 2>/dev/null || echo "")
-          git commit -m "Windows beta release ${{ github.ref_name }}"
+          if [ -n "$sha" ]; then
-          git push origin main
+            gh api --method PUT "repos/${{ github.repository }}/contents/version-windows-beta.json" \
+              --field "message=Windows beta release ${{ github.ref_name }}" \
+              --field "content=$content" \
+              --field "branch=main" \
+              --field "sha=$sha"
+          else
+            gh api --method PUT "repos/${{ github.repository }}/contents/version-windows-beta.json" \
+              --field "message=Windows beta release ${{ github.ref_name }}" \
+              --field "content=$content" \
+              --field "branch=main"
+          fi

.github/workflows/release-windows.yml

@@ -3,7 +3,7 @@ name: Release Windows
 on:
   push:
     tags:
-      - 'win-v*'
+      - 'win-v[0-9]*'
       - '!win-v*-*'
 
 jobs:
@@ -53,19 +53,25 @@ jobs:
 
       - name: Update version-windows.json on main
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
         shell: bash
         run: |
           notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows release ${{ steps.version.outputs.version }}")
-          git config user.name "github-actions[bot]"
+          content=$(jq -n \
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git fetch origin main
-          git checkout main
-          jq -n \
             --arg version "${{ steps.version.outputs.version }}" \
             --arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker-Windows.zip" \
             --arg notes "$notes" \
-            '{version: $version, url: $url, notes: $notes}' > version-windows.json
+            '{version: $version, url: $url, notes: $notes}' | base64 -w0)
-          git add version-windows.json
+          sha=$(gh api "repos/${{ github.repository }}/contents/version-windows.json?ref=main" --jq .sha 2>/dev/null || echo "")
-          git commit -m "Windows release ${{ github.ref_name }}"
+          if [ -n "$sha" ]; then
-          git push origin main
+            gh api --method PUT "repos/${{ github.repository }}/contents/version-windows.json" \
+              --field "message=Windows release ${{ github.ref_name }}" \
+              --field "content=$content" \
+              --field "branch=main" \
+              --field "sha=$sha"
+          else
+            gh api --method PUT "repos/${{ github.repository }}/contents/version-windows.json" \
+              --field "message=Windows release ${{ github.ref_name }}" \
+              --field "content=$content" \
+              --field "branch=main"
+          fi

windows/App.xaml.cs

@@ -1,10 +1,8 @@
 using System;
-using System.Drawing;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Forms;
 using System.Windows.Threading;
-using Application = System.Windows.Application;
+using Forms = System.Windows.Forms;
 
 namespace ClaudeCheckerWindows;
 
@@ -13,9 +11,9 @@ public partial class App : Application
     public static UsageViewModel ViewModel { get; } = new();
     public static UpdateManager  Updater   { get; } = new();
 
-    private NotifyIcon?   _tray;
+    private Forms.NotifyIcon? _tray;
-    private PopupWindow?  _popup;
+    private PopupWindow?      _popup;
-    private DispatcherTimer? _timer;
+    private DispatcherTimer?  _timer;
 
     protected override void OnStartup(StartupEventArgs e)
     {
@@ -33,40 +31,37 @@ public partial class App : Application
 
     private void SetupTray()
     {
-        _tray = new NotifyIcon
+        _tray = new Forms.NotifyIcon
         {
             Text    = "ClaudeChecker",
             Visible = true,
             Icon    = LoadIcon(),
         };
+
         _tray.MouseClick += (_, e) =>
         {
-            if (e.Button == MouseButtons.Left)
+            if (e.Button == Forms.MouseButtons.Left)
-                TogglePopup();
+                Dispatcher.InvokeAsync(TogglePopup);
         };
+
         _tray.ContextMenuStrip = BuildContextMenu();
 
-        ViewModel.PropertyChanged += (_, e) =>
+        ViewModel.PropertyChanged += (_, _) => UpdateTrayText();
-        {
+        Updater.PropertyChanged   += (_, _) => UpdateTrayText();
-            if (e.PropertyName is nameof(UsageViewModel.Limits) or nameof(UsageViewModel.ShowInTaskbar))
-                UpdateTrayText();
-        };
     }
 
-    private static Icon LoadIcon()
+    private static System.Drawing.Icon LoadIcon()
     {
-        try { return new Icon("Assets/icon.ico"); }
+        try { return new System.Drawing.Icon("Assets/icon.ico"); }
-        catch { return SystemIcons.Application; }
+        catch { return System.Drawing.SystemIcons.Application; }
     }
 
-    private ContextMenuStrip BuildContextMenu()
+    private Forms.ContextMenuStrip BuildContextMenu()
     {
-        var menu = new ContextMenuStrip();
+        var menu = new Forms.ContextMenuStrip();
-        menu.Items.Add("Show ClaudeChecker", null, (_, _) => ShowPopup());
+        menu.Items.Add("Show ClaudeChecker", null, (_, _) => Dispatcher.InvokeAsync(ShowPopup));
-        menu.Items.Add(new ToolStripSeparator());
+        menu.Items.Add(new Forms.ToolStripSeparator());
-        menu.Items.Add("Quit", null, (_, _) => Quit());
+        menu.Items.Add("Quit", null, (_, _) => Dispatcher.InvokeAsync(Quit));
-        menu.BackColor = System.Drawing.Color.FromArgb(40, 40, 40);
-        menu.ForeColor = System.Drawing.Color.White;
         return menu;
     }
 
@@ -85,7 +80,6 @@ public partial class App : Application
             _popup = new PopupWindow();
             _popup.Closed += (_, _) => _popup = null;
         }
-
         PositionPopup();
         _popup.Show();
         _popup.Activate();
@@ -95,8 +89,8 @@ public partial class App : Application
     {
         if (_popup == null) return;
         var workArea = SystemParameters.WorkArea;
-        _popup.Left  = workArea.Right  - _popup.Width  - 8;
+        _popup.Left = workArea.Right  - _popup.Width  - 8;
-        _popup.Top   = workArea.Bottom - _popup.Height - 8;
+        _popup.Top  = workArea.Bottom - _popup.Height - 8;
     }
 
     public void ScheduleTimer(int seconds)

windows/AppSettings.cs

@@ -0,0 +1,43 @@
+using System;
+using System.IO;
+using System.Text.Json;
+
+namespace ClaudeCheckerWindows;
+
+public class AppSettings
+{
+    public string CookieStore     { get; set; } = "";
+    public string BurnHistory     { get; set; } = "";
+    public int    RefreshInterval { get; set; } = 120;
+    public bool   ShowInTaskbar   { get; set; } = true;
+    public bool   BetaChannel     { get; set; } = false;
+
+    private static readonly string FilePath = Path.Combine(
+        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+        "ClaudeChecker", "settings.json");
+
+    private static AppSettings? _instance;
+    public static AppSettings Default => _instance ??= Load();
+
+    private static AppSettings Load()
+    {
+        try
+        {
+            if (File.Exists(FilePath))
+                return JsonSerializer.Deserialize<AppSettings>(File.ReadAllText(FilePath)) ?? new();
+        }
+        catch { }
+        return new();
+    }
+
+    public void Save()
+    {
+        try
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(FilePath)!);
+            File.WriteAllText(FilePath, JsonSerializer.Serialize(this,
+                new JsonSerializerOptions { WriteIndented = true }));
+        }
+        catch { }
+    }
+}

windows/ClaudeCheckerWindows.csproj

@@ -4,19 +4,22 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
-    <UseWindowsForms>true</UseWindowsForms>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <AssemblyName>ClaudeChecker</AssemblyName>
     <RootNamespace>ClaudeCheckerWindows</RootNamespace>
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
-    <Version>1.1.3</Version>
+    <Version>1.0.0</Version>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <Platforms>x64</Platforms>
   </PropertyGroup>
 
+  <!-- WinForms referenced explicitly so NotifyIcon is available without polluting global namespace -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2651.64" />
+    <FrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2651.64"/>
   </ItemGroup>
 
   <ItemGroup>
@@ -28,12 +31,4 @@
     </None>
   </ItemGroup>
 
-  <!-- App settings for user preferences -->
-  <ItemGroup>
-    <None Update="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-
 </Project>

windows/Controls/GaugeControl.cs

@@ -1,3 +1,6 @@
+using Brush = System.Windows.Media.Brush;
+using Pen   = System.Windows.Media.Pen;
+using Point = System.Windows.Point;
 using System;
 using System.Globalization;
 using System.Windows;
@@ -18,7 +21,6 @@ public class GaugeControl : FrameworkElement
     public double Percent { get => (double)GetValue(PercentProperty); set => SetValue(PercentProperty, value); }
     public Brush  Accent  { get => (Brush)GetValue(AccentProperty);   set => SetValue(AccentProperty, value); }
 
-    // Arc sweeps 270° starting at 135° (bottom-left to bottom-right, like macOS version)
     private const double StartAngleDeg = 135;
     private const double SweepDeg      = 270;
     private const double StrokeWidth   = 6;
@@ -29,38 +31,30 @@ public class GaugeControl : FrameworkElement
         var cy     = RenderSize.Height / 2;
         var radius = Math.Min(cx, cy) - StrokeWidth / 2 - 1;
 
-        // Track
         DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg,
             new Pen(new SolidColorBrush(Color.FromArgb(28, 255, 255, 255)), StrokeWidth));
 
-        // Fill
         if (Percent > 0)
-        {
+            DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg * (Percent / 100.0),
-            var sweep = SweepDeg * (Percent / 100.0);
+                new Pen(Accent, StrokeWidth));
-            DrawArc(dc, cx, cy, radius, StartAngleDeg, sweep, new Pen(Accent, StrokeWidth));
-        }
 
-        var dpi  = VisualTreeHelper.GetDpi(this).PixelsPerDip;
+        var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip;
 
-        // Percent label
         var pctText = new FormattedText(
             $"{(int)Math.Round(Percent)}%",
-            CultureInfo.CurrentCulture,
+            CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-            FlowDirection.LeftToRight,
             new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
             14, Brushes.White, dpi);
-
         dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
 
-        // Sub-label
         var sub = new FormattedText(
             "Updated\nnow",
-            CultureInfo.CurrentCulture,
+            CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-            FlowDirection.LeftToRight,
+            new Typeface("Segoe UI"), 7,
-            new Typeface("Segoe UI"),
+            new SolidColorBrush(Color.FromRgb(0x88, 0x88, 0x88)), dpi)
-            7, new SolidColorBrush(Color.FromRgb(0x88, 0x88, 0x88)), dpi);
+        {
-        sub.TextAlignment = TextAlignment.Center;
+            TextAlignment = TextAlignment.Center
-
+        };
         dc.DrawText(sub, new Point(cx - sub.Width / 2, cy + 2));
     }
 
@@ -68,10 +62,9 @@ public class GaugeControl : FrameworkElement
         double startDeg, double sweepDeg, Pen pen)
     {
         if (sweepDeg <= 0) return;
-
+        var start   = PointOnCircle(cx, cy, r, startDeg);
-        var start    = PointOnCircle(cx, cy, r, startDeg);
+        var end     = PointOnCircle(cx, cy, r, startDeg + sweepDeg);
-        var end      = PointOnCircle(cx, cy, r, startDeg + sweepDeg);
+        var isLarge = sweepDeg > 180;
-        var isLarge  = sweepDeg > 180;
 
         var geo = new StreamGeometry();
         using (var ctx = geo.Open())

windows/Controls/SparklineControl.cs

@@ -1,4 +1,4 @@
-using System;
+using Point = System.Windows.Point;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Media;
@@ -29,33 +29,32 @@ public class SparklineControl : FrameworkElement
         var h    = RenderSize.Height;
         var minV = double.MaxValue;
         var maxV = double.MinValue;
-
+        foreach (var v in plot) { if (v < minV) minV = v; if (v > maxV) maxV = v; }
-        foreach (var v in plot) { minV = Math.Min(minV, v); maxV = Math.Max(maxV, v); }
+        var range = System.Math.Max(maxV - minV, 1);
-        var range = Math.Max(maxV - minV, 1);
 
         Point Pt(int i) => new(
-            i / (double)(plot.Count - 1) * w,
+            i / (double)(plot.Length - 1) * w,
             h - (plot[i] - minV) / range * (h - 6) - 3);
 
-        // Fill
         var fill = new StreamGeometry();
         using (var ctx = fill.Open())
         {
             ctx.BeginFigure(new Point(0, h), true, true);
-            for (var i = 0; i < plot.Count; i++) ctx.LineTo(Pt(i), true, false);
+            for (var i = 0; i < plot.Length; i++) ctx.LineTo(Pt(i), true, false);
             ctx.LineTo(new Point(w, h), true, false);
         }
         fill.Freeze();
         dc.DrawGeometry(new SolidColorBrush(Color.FromArgb(26, LineColor.R, LineColor.G, LineColor.B)), null, fill);
 
-        // Line
         var line = new StreamGeometry();
         using (var ctx = line.Open())
         {
             ctx.BeginFigure(Pt(0), false, false);
-            for (var i = 1; i < plot.Count; i++) ctx.LineTo(Pt(i), true, false);
+            for (var i = 1; i < plot.Length; i++) ctx.LineTo(Pt(i), true, false);
         }
         line.Freeze();
-        dc.DrawGeometry(null, new Pen(new SolidColorBrush(LineColor), 1.5) { LineJoin = PenLineJoin.Round }, line);
+        dc.DrawGeometry(null,
+            new System.Windows.Media.Pen(new SolidColorBrush(LineColor), 1.5) { LineJoin = PenLineJoin.Round },
+            line);
     }
 }

windows/GlobalUsings.cs

@@ -0,0 +1,9 @@
+// Global aliases to resolve ambiguities between System.Windows.* and System.Drawing.*
+global using Application  = System.Windows.Application;
+global using Brushes      = System.Windows.Media.Brushes;
+global using Color        = System.Windows.Media.Color;
+global using FlowDirection = System.Windows.FlowDirection;
+global using FontFamily   = System.Windows.Media.FontFamily;
+global using Orientation  = System.Windows.Controls.Orientation;
+global using ProgressBar  = System.Windows.Controls.ProgressBar;
+global using Size         = System.Windows.Size;

windows/LoginWindow.xaml.cs

@@ -1,5 +1,6 @@
 using Microsoft.Web.WebView2.Core;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
@@ -28,18 +29,25 @@ public partial class LoginWindow : Window
         {
             if (!e.IsSuccess) return;
             var uri = Browser.CoreWebView2.Source;
-            if (uri.Contains("claude.ai") && !uri.Contains("/login"))
+            if (!uri.Contains("claude.ai")) return;
+
+            var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
+            var signedIn = cookies.Any(c =>
+                c.Name.Equals("sessionKey", StringComparison.OrdinalIgnoreCase) ||
+                c.Name.StartsWith("sk-ant", StringComparison.OrdinalIgnoreCase));
+
+            await Dispatcher.InvokeAsync(() =>
             {
-                // Likely signed in — enable done button
+                DoneButton.IsEnabled = !uri.Contains("/login") && !uri.Contains("/signin");
-                var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
+                StatusText.Text = signedIn
-                var hasSess = cookies.Any(c => c.Name.Contains("session") || c.Name.Contains("sk-"));
+                    ? "Signed in — click Done to continue."
-                await Dispatcher.InvokeAsync(() =>
+                    : "Complete sign-in, then click Done.";
-                {
+            });
-                    DoneButton.IsEnabled = hasSess || uri.Contains("/chats") || uri.Contains("/new");
+
-                    StatusText.Text      = DoneButton.IsEnabled
+            // Auto-close once clearly on the main app page
-                        ? "Signed in! Click Done to continue."
+            if (signedIn && (uri.Contains("/chats") || uri.Contains("/new") || uri == "https://claude.ai/"))
-                        : "Waiting for sign-in…";
+            {
-                });
+                await SaveAndClose(cookies);
             }
         };
     }
@@ -47,7 +55,12 @@ public partial class LoginWindow : Window
     private async void Done_Click(object sender, RoutedEventArgs e)
     {
         var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
+        await SaveAndClose(cookies);
+    }
+
+    private async Task SaveAndClose(IReadOnlyList<CoreWebView2Cookie> cookies)
+    {
         UsageViewModel.SaveCookies(cookies);
-        DialogResult = true;
+        await Dispatcher.InvokeAsync(() => DialogResult = true);
     }
 }

windows/PopupWindow.xaml.cs

@@ -1,11 +1,7 @@
 using ClaudeCheckerWindows.Controls;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
 
@@ -20,7 +16,6 @@ public partial class PopupWindow : Window
     public PopupWindow()
     {
         InitializeComponent();
-        DataContext = VM;
 
         VM.PropertyChanged      += (_, e) => Dispatcher.InvokeAsync(() => OnVmChanged(e.PropertyName));
         Updater.PropertyChanged += (_, e) => Dispatcher.InvokeAsync(() => OnUpdaterChanged(e.PropertyName));
@@ -37,7 +32,7 @@ public partial class PopupWindow : Window
         Deactivated += (_, _) => Hide();
     }
 
-    // ── Card rendering ──────────────────────────────────────────────
+    // ── Card rendering ───────────────────────────────────────────────
 
     private void RebuildCards()
     {
@@ -48,144 +43,107 @@ public partial class PopupWindow : Window
 
     private static UIElement BuildCard(AgentLimit limit)
     {
-        var accent = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
+        var accent     = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
+        var secondary  = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
 
-        var gauge = new GaugeControl
+        // Gauge
+        var gauge = new GaugeControl { Width = 76, Height = 76, Percent = limit.UsedPercent, Accent = accent };
+
+        // Live badge
+        var liveBadge = new Border
         {
-            Width = 76, Height = 76, Percent = limit.UsedPercent, Accent = accent,
+            Background   = new SolidColorBrush(Color.FromArgb(26, 0, 200, 0)),
+            CornerRadius = new CornerRadius(4),
+            Padding      = new Thickness(6, 2, 6, 2),
+            Margin       = new Thickness(0, 0, 6, 0),
+            Visibility   = limit.IsLive ? Visibility.Visible : Visibility.Collapsed,
+            Child        = new TextBlock { Text = "Live", FontSize = 10, FontWeight = FontWeights.Medium,
+                               Foreground = new SolidColorBrush(Colors.LightGreen) }
         };
 
-        var livePanel = new StackPanel { Orientation = Orientation.Horizontal };
+        // Usage badge
-        if (limit.IsLive)
-        {
-            livePanel.Children.Add(new Border
-            {
-                Background   = new SolidColorBrush(Color.FromArgb(26, 0, 255, 0)),
-                CornerRadius = new CornerRadius(4),
-                Padding      = new Thickness(6, 2, 6, 2),
-                Margin       = new Thickness(0, 0, 6, 0),
-                Child        = new TextBlock
-                {
-                    Text       = "Live",
-                    FontSize   = 10,
-                    FontWeight = FontWeights.Medium,
-                    Foreground = new SolidColorBrush(Colors.LightGreen),
-                }
-            });
-        }
-
         var usageBadge = new Border
         {
-            Background    = new SolidColorBrush(Color.FromArgb(15, 255, 255, 255)),
+            Background   = new SolidColorBrush(Color.FromArgb(15, 255, 255, 255)),
-            CornerRadius  = new CornerRadius(4),
+            CornerRadius = new CornerRadius(4),
-            Padding       = new Thickness(6, 2, 6, 2),
+            Padding      = new Thickness(6, 2, 6, 2),
-            Child         = new TextBlock
+            Child        = new TextBlock { Text = $"Usg: {limit.UsageLabel}", FontSize = 10,
-            {
+                               FontWeight = FontWeights.Medium, Foreground = secondary }
-                Text       = $"Usg: {limit.UsageLabel}",
-                FontSize   = 10,
-                FontWeight = FontWeights.Medium,
-                Foreground = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"],
-            }
-        };
-        livePanel.Children.Add(usageBadge);
-
-        var progressBar = new ProgressBar
-        {
-            Value      = limit.UsedPercent,
-            Maximum    = 100,
-            Height     = 4,
-            Foreground = accent,
-            Background = new SolidColorBrush(Color.FromArgb(18, 255, 255, 255)),
-            BorderThickness = new Thickness(0),
-            Margin     = new Thickness(0, 4, 0, 4),
         };
 
-        var sparkline = new SparklineControl
+        // Header row: Claude · Pro | [Live] [Usg]
-        {
+        var badgeStack = new StackPanel { Orientation = Orientation.Horizontal };
-            Height    = 28,
+        badgeStack.Children.Add(liveBadge);
-            Data      = limit.BurnHistory.Count > 0 ? limit.BurnHistory : null,
+        badgeStack.Children.Add(usageBadge);
-            LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
-            Margin    = new Thickness(0, 8, 0, 0),
-        };
 
-        var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
+        var nameStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
-        infoPanel.Children.Add(new Grid
+        nameStack.Children.Add(new TextBlock { Text = "✦", FontSize = 11, Foreground = accent, VerticalAlignment = VerticalAlignment.Center });
-        {
+        nameStack.Children.Add(new TextBlock { Text = "Claude", FontSize = 13, FontWeight = FontWeights.SemiBold,
-            Children =
+            Foreground = Brushes.White, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
-            {
+        nameStack.Children.Add(new TextBlock { Text = $"·  {VM.PlanLabel}", FontSize = 11,
-                new StackPanel
+            Foreground = secondary, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
-                {
-                    Orientation = Orientation.Horizontal,
-                    Children    =
-                    {
-                        MakeText("✦", 11, accent),
-                        MakeText("Claude", 13, Brushes.White, FontWeights.SemiBold, new Thickness(6,0,0,0)),
-                        MakeText($"·  {VM.PlanLabel}", 11,
-                            (SolidColorBrush)Application.Current.Resources["SecondaryBrush"],
-                            margin: new Thickness(6,0,0,0)),
-                    }
-                }.Also(s => Grid.SetColumn(s, 0)),
-                new StackPanel
-                {
-                    Orientation         = Orientation.Horizontal,
-                    HorizontalAlignment = HorizontalAlignment.Right,
-                    Children            = { /* live + usg */ },
-                }.Also(s => { Grid.SetColumn(s, 1); ((StackPanel)s).Children.Add(livePanel); }),
-            }.Tap(g => {
-                var gc = (Grid)g.Parent ?? (Grid)Application.Current.MainWindow;
-                ((Grid)g.Parent!).ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-                ((Grid)g.Parent!).ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
-            }),
-        });
 
-        // Simpler row approach
         var headerRow = new Grid();
         headerRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
         headerRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        Grid.SetColumn(nameStack,  0);
+        Grid.SetColumn(badgeStack, 1);
+        headerRow.Children.Add(nameStack);
+        headerRow.Children.Add(badgeStack);
 
-        var leftStack = new StackPanel { Orientation = Orientation.Horizontal };
+        // Progress bar
-        leftStack.Children.Add(MakeText("✦", 11, accent));
+        var progress = new ProgressBar
-        leftStack.Children.Add(MakeText("Claude", 13, Brushes.White, FontWeights.SemiBold, new Thickness(6, 0, 0, 0)));
+        {
-        leftStack.Children.Add(MakeText($"·  {VM.PlanLabel}", 11,
+            Value = limit.UsedPercent, Maximum = 100, Height = 4,
-            (SolidColorBrush)Application.Current.Resources["SecondaryBrush"], margin: new Thickness(6, 0, 0, 0)));
+            Margin = new Thickness(0, 4, 0, 4),
+            Foreground = accent,
+            Background = new SolidColorBrush(Color.FromArgb(18, 255, 255, 255)),
+            BorderThickness = new Thickness(0),
+        };
 
-        Grid.SetColumn(leftStack, 0);
+        // Time row
-        Grid.SetColumn(livePanel, 1);
+        var timeStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
-        headerRow.Children.Add(leftStack);
+        timeStack.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
-        headerRow.Children.Add(livePanel);
+        timeStack.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
+            FontWeight = FontWeights.Medium, Foreground = Brushes.White, VerticalAlignment = VerticalAlignment.Center });
 
-        infoPanel.Children.Clear();
+        var resetText = new TextBlock
-        infoPanel.Children.Add(headerRow);
+        {
-        infoPanel.Children.Add(progressBar);
+            Text = $"Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
+            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
+        };
 
         var timeRow = new Grid();
         timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
         timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
-
+        Grid.SetColumn(timeStack,  0);
-        var timeLeft = new StackPanel { Orientation = Orientation.Horizontal };
+        Grid.SetColumn(resetText,  1);
-        timeLeft.Children.Add(MakeText("⏱ ", 10, (SolidColorBrush)Application.Current.Resources["SecondaryBrush"]));
+        timeRow.Children.Add(timeStack);
-        timeLeft.Children.Add(MakeText(limit.TimeRemaining, 12, Brushes.White, FontWeights.Medium));
-
-        var resetText = MakeText(
-            $"Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
-            11, (SolidColorBrush)Application.Current.Resources["SecondaryBrush"]);
-
-        Grid.SetColumn(timeLeft, 0);
-        Grid.SetColumn(resetText, 1);
-        timeRow.Children.Add(timeLeft);
         timeRow.Children.Add(resetText);
+
+        // Sparkline
+        var sparkline = new SparklineControl
+        {
+            Height = 28, Margin = new Thickness(0, 8, 0, 0), LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
+            Data = limit.BurnHistory.Count > 0 ? limit.BurnHistory : null,
+        };
+
+        // Info panel
+        var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
+        infoPanel.Children.Add(headerRow);
+        infoPanel.Children.Add(progress);
         infoPanel.Children.Add(timeRow);
         infoPanel.Children.Add(sparkline);
 
-        var cardContent = new Grid { Margin = new Thickness(16, 12, 16, 12) };
+        // Card content grid
-        cardContent.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        var cardGrid = new Grid { Margin = new Thickness(16, 12, 16, 12) };
-        cardContent.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(16, GridUnitType.Pixel) });
+        cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
-        cardContent.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(16, GridUnitType.Pixel) });
-
+        cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-        Grid.SetColumn(gauge, 0);
+        Grid.SetColumn(gauge,     0);
         Grid.SetColumn(infoPanel, 2);
-        cardContent.Children.Add(gauge);
+        cardGrid.Children.Add(gauge);
-        cardContent.Children.Add(infoPanel);
+        cardGrid.Children.Add(infoPanel);
 
         var card = new Border
         {
@@ -193,15 +151,15 @@ public partial class PopupWindow : Window
             CornerRadius    = new CornerRadius(8),
             BorderBrush     = new SolidColorBrush(Color.FromArgb(20, 255, 255, 255)),
             BorderThickness = new Thickness(0.5),
-            Child           = cardContent,
             Margin          = new Thickness(8, 0, 8, 0),
+            Child           = cardGrid,
         };
 
         var sectionLabel = new TextBlock
         {
-            Text      = limit.WindowLabel,
+            Text   = limit.WindowLabel,
-            Style     = (Style)Application.Current.Resources["HeaderText"],
+            Style  = (Style)Application.Current.Resources["HeaderText"],
-            Margin    = new Thickness(16, 10, 16, 4),
+            Margin = new Thickness(16, 10, 16, 4),
         };
 
         var section = new StackPanel();
@@ -210,18 +168,6 @@ public partial class PopupWindow : Window
         return section;
     }
 
-    private static TextBlock MakeText(string text, double size, Brush fg,
-        FontWeight? weight = null, Thickness? margin = null)
-        => new()
-        {
-            Text                = text,
-            FontSize            = size,
-            Foreground          = fg,
-            FontWeight          = weight ?? FontWeights.Normal,
-            Margin              = margin ?? new Thickness(0),
-            VerticalAlignment   = VerticalAlignment.Center,
-        };
-
     // ── State updates ────────────────────────────────────────────────
 
     private void OnVmChanged(string? prop)
@@ -259,9 +205,8 @@ public partial class PopupWindow : Window
         if (VM.LastUpdated.HasValue)
         {
             var diff = DateTime.Now - VM.LastUpdated.Value;
-            LastUpdatedText.Text = diff.TotalSeconds < 10
+            LastUpdatedText.Text = diff.TotalSeconds < 10 ? "Updated just now"
-                ? "Updated just now"
+                                                          : $"Updated {(int)diff.TotalSeconds}s ago";
-                : $"Updated {(int)diff.TotalSeconds}s ago";
         }
         else
         {
@@ -274,45 +219,37 @@ public partial class PopupWindow : Window
 
     private void InitSettings()
     {
-        VersionLabel.Text = $"v{App.Updater.CurrentVersion}";
+        VersionLabel.Text    = $"v{Updater.CurrentVersion}";
         BetaToggle.IsChecked = Updater.BetaChannel;
         CheckUpdateButton.Content = Updater.UpdateAvailable ? "Install" : "Check";
 
-        RefreshPicker.ItemsSource = new[]
+        var intervals = new[] { ("1 min", 60), ("2 min", 120), ("3 min", 180),
-        {
+                                ("4 min", 240), ("5 min", 300), ("10 min", 600) };
-            ("1 min",  60),  ("2 min",  120), ("3 min",  180),
+        RefreshPicker.ItemsSource        = intervals;
-            ("4 min",  240), ("5 min",  300), ("10 min", 600),
+        RefreshPicker.DisplayMemberPath  = "Item1";
-        };
+        var idx = Array.FindIndex(intervals, x => x.Item2 == VM.RefreshInterval);
-        RefreshPicker.DisplayMemberPath = "Item1";
+        RefreshPicker.SelectedIndex      = idx < 0 ? 1 : idx;
-        RefreshPicker.SelectedIndex = Array.FindIndex(
-            new[] { 60, 120, 180, 240, 300, 600 },
-            s => s == VM.RefreshInterval).Let(i => i < 0 ? 1 : i);
 
-        var signedIn = VM.IsSignedIn;
         AuthPanel.Children.Clear();
-        AuthPanel.Children.Add(new StackPanel
+        var dot = new System.Windows.Shapes.Ellipse
         {
-            Orientation = Orientation.Horizontal,
+            Width = 7, Height = 7, Margin = new Thickness(0, 0, 6, 0),
-            Children    =
+            Fill = VM.IsSignedIn ? Brushes.LimeGreen : Brushes.Orange,
-            {
+            VerticalAlignment = VerticalAlignment.Center,
-                new Ellipse
+        };
-                {
+        var label = new TextBlock
-                    Width = 7, Height = 7,
+        {
-                    Fill  = signedIn ? Brushes.LimeGreen : Brushes.Orange,
+            Text = VM.IsSignedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
-                    Margin = new Thickness(0,0,6,0),
+            FontSize = 13, FontWeight = FontWeights.SemiBold, Foreground = Brushes.White,
-                    VerticalAlignment = VerticalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
-                },
+        };
-                new TextBlock
+        var authRow = new StackPanel { Orientation = Orientation.Horizontal };
-                {
+        authRow.Children.Add(dot);
-                    Text       = signedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
+        authRow.Children.Add(label);
-                    FontSize   = 13, FontWeight = FontWeights.SemiBold, Foreground = Brushes.White,
+        AuthPanel.Children.Add(authRow);
-                    VerticalAlignment = VerticalAlignment.Center,
-                }
-            }
-        });
 
-        SignOutButton.Visibility = signedIn ? Visibility.Visible : Visibility.Collapsed;
+        SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
-        SignInButton.Content     = signedIn ? "Re-authenticate" : "Sign In";
+        SignInButton.Content     = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
     }
 
     // ── Event handlers ───────────────────────────────────────────────
@@ -320,18 +257,18 @@ public partial class PopupWindow : Window
     private void Settings_Click(object s, RoutedEventArgs e)
     {
         InitSettings();
-        MainPanel.Visibility    = Visibility.Collapsed;
+        MainPanel.Visibility     = Visibility.Collapsed;
         SettingsPanel.Visibility = Visibility.Visible;
-        UpdatePanel.Visibility  = Visibility.Collapsed;
+        UpdatePanel.Visibility   = Visibility.Collapsed;
     }
 
     private void BackFromSettings_Click(object s, RoutedEventArgs e) => ShowMain();
 
     private void ShowMain()
     {
-        MainPanel.Visibility    = Visibility.Visible;
+        MainPanel.Visibility     = Visibility.Visible;
         SettingsPanel.Visibility = Visibility.Collapsed;
-        UpdatePanel.Visibility  = Visibility.Collapsed;
+        UpdatePanel.Visibility   = Visibility.Collapsed;
     }
 
     private void Close_Click(object s, RoutedEventArgs e) => Hide();
@@ -342,19 +279,19 @@ public partial class PopupWindow : Window
 
     private void ShowUpdatePanel()
     {
-        CurrentVerLabel.Text    = $"v{Updater.CurrentVersion}";
+        CurrentVerLabel.Text  = $"v{Updater.CurrentVersion}";
-        NewVerLabel.Text        = $"v{Updater.LatestVersion}";
+        NewVerLabel.Text      = $"v{Updater.LatestVersion}";
-        ReleaseNotesText.Text   = Updater.ReleaseNotes;
+        ReleaseNotesText.Text = Updater.ReleaseNotes;
-        MainPanel.Visibility    = Visibility.Collapsed;
+        MainPanel.Visibility     = Visibility.Collapsed;
         SettingsPanel.Visibility = Visibility.Collapsed;
-        UpdatePanel.Visibility  = Visibility.Visible;
+        UpdatePanel.Visibility   = Visibility.Visible;
     }
 
     private void CloseUpdate_Click(object s, RoutedEventArgs e) => ShowMain();
 
     private async void Install_Click(object s, RoutedEventArgs e)
     {
-        NotNowButton.Visibility  = Visibility.Collapsed;
+        NotNowButton.Visibility     = Visibility.Collapsed;
         UpdateStatusText.Visibility = Visibility.Visible;
         UpdateProgress.Visibility   = Visibility.Visible;
         await Updater.DownloadAndInstallAsync();
@@ -362,8 +299,7 @@ public partial class PopupWindow : Window
 
     private void SignIn_Click(object s, RoutedEventArgs e)
     {
-        var login = new LoginWindow();
+        var login = new LoginWindow { Owner = this };
-        login.Owner = this;
         if (login.ShowDialog() == true)
         {
             _ = VM.RefreshAsync();
@@ -385,10 +321,10 @@ public partial class PopupWindow : Window
 
     private void RefreshPicker_Changed(object s, SelectionChangedEventArgs e)
     {
-        if (RefreshPicker.SelectedItem is (string _, int seconds))
+        if (RefreshPicker.SelectedItem is ValueTuple<string, int> selected)
         {
-            VM.RefreshInterval = seconds;
+            VM.RefreshInterval = selected.Item2;
-            ((App)Application.Current).ScheduleTimer(seconds);
+            ((App)Application.Current).ScheduleTimer(selected.Item2);
         }
     }
 
@@ -400,12 +336,3 @@ public partial class PopupWindow : Window
         CheckUpdateButton.Content = Updater.UpdateAvailable ? "Install" : "Check";
     }
 }
-
-// Minimal extension helpers to avoid repeating boilerplate
-file static class Extensions
-{
-    public static T Also<T>(this T t, Action<T> f) { f(t); return t; }
-    public static TResult Let<T, TResult>(this T t, Func<T, TResult> f) => f(t);
-}
-
-file class Ellipse : System.Windows.Shapes.Ellipse { }

windows/UpdateManager.cs

@@ -48,8 +48,8 @@ public class UpdateManager : INotifyPropertyChanged
         set
         {
             Set(ref _betaChannel, value);
-            Properties.Settings.Default.BetaChannel = value;
+            AppSettings.Default.BetaChannel = value;
-            Properties.Settings.Default.Save();
+            AppSettings.Default.Save();
         }
     }
 
@@ -59,7 +59,7 @@ public class UpdateManager : INotifyPropertyChanged
 
     public UpdateManager()
     {
-        _betaChannel = Properties.Settings.Default.BetaChannel;
+        _betaChannel = AppSettings.Default.BetaChannel;
     }
 
     public async Task CheckForUpdatesAsync()

windows/UsageViewModel.cs

@@ -46,8 +46,8 @@ public class UsageViewModel : INotifyPropertyChanged
         set
         {
             Set(ref _refreshInterval, value);
-            Properties.Settings.Default.RefreshInterval = value;
+            AppSettings.Default.RefreshInterval = value;
-            Properties.Settings.Default.Save();
+            AppSettings.Default.Save();
         }
     }
 
@@ -58,16 +58,16 @@ public class UsageViewModel : INotifyPropertyChanged
         set
         {
             Set(ref _showInTaskbar, value);
-            Properties.Settings.Default.ShowInTaskbar = value;
+            AppSettings.Default.ShowInTaskbar = value;
-            Properties.Settings.Default.Save();
+            AppSettings.Default.Save();
         }
     }
 
     public UsageViewModel()
     {
-        _refreshInterval = Properties.Settings.Default.RefreshInterval > 0
+        _refreshInterval = AppSettings.Default.RefreshInterval > 0
-            ? Properties.Settings.Default.RefreshInterval : 120;
+            ? AppSettings.Default.RefreshInterval : 120;
-        _showInTaskbar = Properties.Settings.Default.ShowInTaskbar;
+        _showInTaskbar = AppSettings.Default.ShowInTaskbar;
         LoadBurnHistory();
         LoadPlaceholders();
     }
@@ -137,11 +137,8 @@ public class UsageViewModel : INotifyPropertyChanged
 
     public async Task SignOutAsync()
     {
-        var env = await CoreWebView2Environment.CreateAsync();
+        AppSettings.Default.CookieStore = "";
-        var dataManager = env.CreateCoreWebView2CookieManager();
+        AppSettings.Default.Save();
-        // Clear via settings — simplest approach is to delete the stored cookies
-        Properties.Settings.Default.CookieStore = "";
-        Properties.Settings.Default.Save();
 
         await Application.Current.Dispatcher.InvokeAsync(() =>
         {
@@ -155,7 +152,7 @@ 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 = Properties.Settings.Default.CookieStore;
+        var raw = AppSettings.Default.CookieStore;
         if (string.IsNullOrEmpty(raw)) return [];
         try
         {
@@ -172,8 +169,8 @@ public class UsageViewModel : INotifyPropertyChanged
             .Where(c => c.Domain.Contains("claude.ai"))
             .Select(c => new CookieEntry { Name = c.Name, Value = c.Value, Domain = c.Domain, Path = c.Path })
             .ToList();
-        Properties.Settings.Default.CookieStore = JsonSerializer.Serialize(entries);
+        AppSettings.Default.CookieStore = JsonSerializer.Serialize(entries);
-        Properties.Settings.Default.Save();
+        AppSettings.Default.Save();
     }
 
     private static HttpClient BuildClient(List<(string Name, string Value, string Domain, string Path)> cookies)
@@ -280,7 +277,7 @@ public class UsageViewModel : INotifyPropertyChanged
     {
         try
         {
-            var raw = Properties.Settings.Default.BurnHistory;
+            var raw = AppSettings.Default.BurnHistory;
             if (string.IsNullOrEmpty(raw)) return;
             var saved = JsonSerializer.Deserialize<Dictionary<string, List<double>>>(raw);
             if (saved != null)
@@ -291,8 +288,8 @@ public class UsageViewModel : INotifyPropertyChanged
 
     private void SaveBurnHistory()
     {
-        Properties.Settings.Default.BurnHistory = JsonSerializer.Serialize(_burnHistory);
+        AppSettings.Default.BurnHistory = JsonSerializer.Serialize(_burnHistory);
-        Properties.Settings.Default.Save();
+        AppSettings.Default.Save();
     }
 
     public event PropertyChangedEventHandler? PropertyChanged;