Fix installer OutputDir: use . relative to SourceDir

Read lastActiveOrg cookie in both the browser JS path and HttpClient
fallback, then prefer the matching org in ParseBootstrap for both
org ID and plan label selection — same fix as macOS v1.3.0.

Add Settings → Diagnostics panel showing app state, last request
details, cookie store counts/domains, and stored cookie names.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Report something that isn't working correctly
+title: ''
+labels: bug
+assignees: ''
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behaviour:
+1.
+2.
+3.
+
+**Expected behaviour**
+What you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment**
+- macOS version: [e.g. Sequoia 15.4]
+- ClaudeChecker version: [e.g. 1.1.3]
+- Claude plan: [e.g. Pro, Max]
+
+**Additional context**
+Any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest an idea or improvement
+title: ''
+labels: enhancement
+assignees: ''
+---
+
+**What problem does this solve?**
+A clear and concise description of the problem or limitation you're running into.
+
+**Describe the solution you'd like**
+What you'd like to happen.
+
+**Alternatives considered**
+Any other approaches you've thought about.
+
+**Screenshots or mockups**
+If applicable, add visuals to help explain your idea.
+
+**Additional context**
+Any other context here.

.github/workflows/release-beta.yml

@@ -0,0 +1,79 @@
+name: Release Beta
+
+on:
+  push:
+    tags:
+      - 'v*-beta*'
+
+jobs:
+  release-beta:
+    runs-on: macos-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version from tag
+        id: version
+        run: echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT
+
+      - name: Build
+        run: |
+          xcodebuild \
+            -project ClaudeChecker.xcodeproj \
+            -scheme ClaudeChecker \
+            -configuration Release \
+            -derivedDataPath build \
+            clean build
+
+      - name: Zip app
+        run: |
+          ditto -c -k --keepParent \
+            build/Build/Products/Release/ClaudeChecker.app \
+            ClaudeChecker.zip
+
+      - name: Create GitHub pre-release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release create "$GITHUB_REF_NAME" ClaudeChecker.zip \
+            --title "$GITHUB_REF_NAME" \
+            --prerelease \
+            --notes "$(cat RELEASE_NOTES.md 2>/dev/null || echo 'Beta release ${{ steps.version.outputs.version }}')"
+
+      - name: Update version-beta.json
+        run: |
+          notes=$(cat RELEASE_NOTES.md 2>/dev/null || echo "Beta release ${{ steps.version.outputs.version }}")
+          jq -n \
+            --arg version "${{ steps.version.outputs.version }}" \
+            --arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker.zip" \
+            --arg notes "$notes" \
+            '{version: $version, url: $url, notes: $notes}' > version-beta.json
+
+      - name: Update beta badge in README
+        run: |
+          shields_version=$(echo "${{ steps.version.outputs.version }}" | sed 's/-/--/g')
+          tag="${{ github.ref_name }}"
+          export BADGE="[![Beta](https://img.shields.io/badge/beta-${shields_version}-orange?style=flat)](https://github.com/${{ github.repository }}/releases/tag/${tag}) <!-- BETA_BADGE -->"
+          python3 -c "
+          import os
+          badge = os.environ['BADGE']
+          lines = open('README.md').readlines()
+          out = []
+          for line in lines:
+              out.append(badge + chr(10) if '<!-- BETA_BADGE -->' in line else line)
+          open('README.md', 'w').writelines(out)
+          "
+
+      - name: Commit version-beta.json and README
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add version-beta.json README.md
+          git commit -m "Beta release ${{ github.ref_name }}"
+          git pull --rebase origin main
+          git push origin HEAD:main

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

@@ -0,0 +1,102 @@
+name: Release Windows Beta
+
+on:
+  push:
+    tags:
+      - 'win-v*-beta*'
+
+jobs:
+  release-windows-beta:
+    runs-on: windows-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Get version from tag
+        id: version
+        shell: bash
+        run: echo "version=${GITHUB_REF_NAME#win-v}" >> $GITHUB_OUTPUT
+
+      - name: Publish
+        run: |
+          dotnet publish windows/ClaudeCheckerWindows.csproj `
+            -c Release -r win-x64 `
+            --self-contained true `
+            -p:PublishSingleFile=true `
+            -p:Version=${{ steps.version.outputs.version }} `
+            -o publish
+
+      - name: Build installer
+        shell: pwsh
+        run: |
+          Copy-Item -Recurse windows/Assets publish/Assets
+          & "C:\Program Files (x86)\Inno Setup 6\iscc.exe" /DAppVersion="${{ steps.version.outputs.version }}" windows\installer.iss
+
+      - name: Create GitHub pre-release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: |
+          notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows beta ${{ steps.version.outputs.version }}")
+          gh release create "$GITHUB_REF_NAME" ClaudeChecker-Installer.exe \
+            --title "$GITHUB_REF_NAME" \
+            --prerelease \
+            --notes "$notes"
+
+      - name: Update version-windows-beta.json on main
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        shell: bash
+        run: |
+          notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows beta ${{ steps.version.outputs.version }}")
+          content=$(jq -n \
+            --arg version "${{ steps.version.outputs.version }}" \
+            --arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker-Installer.exe" \
+            --arg notes "$notes" \
+            '{version: $version, url: $url, notes: $notes}' | base64 -w0)
+          sha=$(gh api "repos/${{ github.repository }}/contents/version-windows-beta.json?ref=main" --jq .sha 2>/dev/null || echo "")
+          if [ -n "$sha" ]; then
+            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
+
+      - name: Update Windows beta badge in README on main
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        shell: bash
+        run: |
+          version="${{ steps.version.outputs.version }}"
+          tag="${{ github.ref_name }}"
+          shields_version=$(echo "$version" | sed 's/-/--/g')
+          export WIN_BADGE="[![Win Beta](https://img.shields.io/badge/Win_Beta-${shields_version}-blue?style=flat)](https://github.com/${{ github.repository }}/releases/tag/${tag}) <!-- WIN_BETA_BADGE -->"
+          sha=$(gh api "repos/${{ github.repository }}/contents/README.md?ref=main" --jq .sha)
+          content=$(gh api "repos/${{ github.repository }}/contents/README.md?ref=main" --jq .content | python3 -c "
+          import sys, base64, os
+          raw = sys.stdin.read().strip()
+          text = base64.b64decode(raw).decode()
+          badge = os.environ['WIN_BADGE']
+          lines = text.splitlines(keepends=True)
+          out = [badge + chr(10) if '<!-- WIN_BETA_BADGE -->' in line else line for line in lines]
+          print(base64.b64encode(''.join(out).encode()).decode(), end='')
+          ")
+          gh api --method PUT "repos/${{ github.repository }}/contents/README.md" \
+            --field "message=Windows beta badge $tag" \
+            --field "content=$content" \
+            --field "branch=main" \
+            --field "sha=$sha"

.github/workflows/release-windows.yml

@@ -0,0 +1,114 @@
+name: Release Windows
+
+on:
+  push:
+    tags:
+      - 'win-v[0-9]*'
+      - '!win-v*-*'
+
+jobs:
+  release-windows:
+    runs-on: windows-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Get version from tag
+        id: version
+        shell: bash
+        run: echo "version=${GITHUB_REF_NAME#win-v}" >> $GITHUB_OUTPUT
+
+      - name: Publish
+        run: |
+          dotnet publish windows/ClaudeCheckerWindows.csproj `
+            -c Release -r win-x64 `
+            --self-contained true `
+            -p:PublishSingleFile=true `
+            -p:Version=${{ steps.version.outputs.version }} `
+            -o publish
+
+      - name: Build installer
+        shell: pwsh
+        run: |
+          Copy-Item -Recurse windows/Assets publish/Assets
+          & "C:\Program Files (x86)\Inno Setup 6\iscc.exe" /DAppVersion="${{ steps.version.outputs.version }}" windows\installer.iss
+
+      - name: Create GitHub release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: |
+          notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows release ${{ steps.version.outputs.version }}")
+          gh release create "$GITHUB_REF_NAME" ClaudeChecker-Installer.exe \
+            --title "$GITHUB_REF_NAME" \
+            --notes "$notes"
+
+      - name: Update version-windows.json on main
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        shell: bash
+        run: |
+          notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows release ${{ steps.version.outputs.version }}")
+          content=$(jq -n \
+            --arg version "${{ steps.version.outputs.version }}" \
+            --arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker-Installer.exe" \
+            --arg notes "$notes" \
+            '{version: $version, url: $url, notes: $notes}' | base64 -w0)
+          sha=$(gh api "repos/${{ github.repository }}/contents/version-windows.json?ref=main" --jq .sha 2>/dev/null || echo "")
+          if [ -n "$sha" ]; then
+            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
+
+      - name: Update Windows stable badge in README on main
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        shell: bash
+        run: |
+          version="${{ steps.version.outputs.version }}"
+          tag="${{ github.ref_name }}"
+          shields_version=$(echo "$version" | sed 's/-/--/g')
+          export WIN_STABLE_BADGE="[![Win Stable](https://img.shields.io/badge/Win_Stable-${shields_version}-blue?style=flat)](https://github.com/${{ github.repository }}/releases/tag/${tag}) <!-- WIN_STABLE_BADGE -->"
+          sha=$(gh api "repos/${{ github.repository }}/contents/README.md?ref=main" --jq .sha)
+          content=$(gh api "repos/${{ github.repository }}/contents/README.md?ref=main" --jq .content | python3 -c "
+          import sys, base64, os
+          raw = sys.stdin.read().strip()
+          text = base64.b64decode(raw).decode()
+          stable_badge = os.environ['WIN_STABLE_BADGE']
+          lines = text.splitlines(keepends=True)
+          out = []
+          for line in lines:
+              if '<!-- WIN_STABLE_BADGE -->' in line:
+                  out.append(stable_badge + chr(10))
+                  rest = line.replace(' <!-- WIN_STABLE_BADGE -->', '').replace('<!-- WIN_STABLE_BADGE -->', '')
+                  if rest.strip() and '<!-- WIN_BETA_BADGE -->' in rest:
+                      out.append('<!-- WIN_BETA_BADGE -->' + chr(10))
+                  elif rest.strip():
+                      out.append(rest)
+              elif '<!-- WIN_BETA_BADGE -->' in line:
+                  out.append('<!-- WIN_BETA_BADGE -->' + chr(10))
+              else:
+                  out.append(line)
+          print(base64.b64encode(''.join(out).encode()).decode(), end='')
+          ")
+          gh api --method PUT "repos/${{ github.repository }}/contents/README.md" \
+            --field "message=Windows stable badge $tag" \
+            --field "content=$content" \
+            --field "branch=main" \
+            --field "sha=$sha"

.github/workflows/release.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   release:
+    if: ${{ !contains(github.ref_name, '-') }}
     runs-on: macos-latest
     permissions:
       contents: write
@@ -50,13 +51,12 @@ jobs:
 
       - name: Update version.json
         run: |
-          cat > version.json << JSON
+          notes=$(cat RELEASE_NOTES.md 2>/dev/null || echo "Release ${{ steps.version.outputs.version }}")
-          {
+          jq -n \
-            "version": "${{ steps.version.outputs.version }}",
+            --arg version "${{ steps.version.outputs.version }}" \
-            "url": "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker.zip",
+            --arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker.zip" \
-            "notes": "$(cat RELEASE_NOTES.md 2>/dev/null || echo 'Release ${{ steps.version.outputs.version }}')"
+            --arg notes "$notes" \
-          }
+            '{version: $version, url: $url, notes: $notes}' > version.json
-          JSON
 
       - name: Update Homebrew cask
         run: |
@@ -66,10 +66,24 @@ jobs:
             ../homebrew-tap/Casks/claudechecker.rb 2>/dev/null || true
 
       - name: Update README badge
+        env:
+          NEW_VERSION: ${{ steps.version.outputs.version }}
         run: |
-          sed -i '' \
+          python3 -c "
-            's/version-[0-9][^-]*-orange/version-${{ steps.version.outputs.version }}-orange/' \
+          import os, re
-            README.md
+          v = os.environ['NEW_VERSION']
+          content = open('README.md').read()
+          content = re.sub(r'version-[0-9][^-]*-orange', 'version-' + v + '-orange', content)
+          lines = content.splitlines(keepends=True)
+          out = []
+          for line in lines:
+              if '<!-- BETA_BADGE -->' in line:
+                  continue
+              out.append(line)
+              if 'license-MIT-blue' in line:
+                  out.append('<!-- BETA_BADGE -->' + chr(10))
+          open('README.md', 'w').writelines(out)
+          "
 
       - name: Commit version.json and README
         run: |
@@ -77,6 +91,7 @@ jobs:
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git add version.json README.md
           git commit -m "Release ${{ github.ref_name }}"
+          git pull --rebase origin main
           git push origin HEAD:main
 
       - name: Update Homebrew tap

CONTRIBUTING.md

@@ -0,0 +1,19 @@
+# Contributing
+
+Thanks for your interest in ClaudeChecker!
+
+## Reporting bugs & requesting features
+
+Please use the [issue templates](https://github.com/superdooper86/claudechecker/issues/new/choose) — they keep reports consistent and easy to act on.
+
+## Pull requests
+
+- Open an issue first to discuss anything non-trivial. This avoids wasted effort if the direction isn't a fit.
+- Keep changes focused — one fix or feature per PR.
+- Follow the existing Swift code style in the repo.
+- There's no guarantee PRs will be merged; this is a personal project maintained in spare time.
+
+## Notes
+
+- This app targets macOS 13+
+- No external dependencies — keep it that way

ClaudeChecker/ClaudeCheckerApp.swift

@@ -40,14 +40,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
         // Popover
         popover = NSPopover()
-        popover?.contentSize = NSSize(width: 480, height: 640)
         popover?.behavior = .transient
         popover?.animates = true
-        popover?.contentViewController = NSHostingController(
+        let hc = NSHostingController(
             rootView: ContentView()
                 .environmentObject(usageViewModel)
                 .environmentObject(updateManager)
         )
+        hc.sizingOptions = .preferredContentSize
+        hc.view.wantsLayer = true
+        hc.view.layer?.backgroundColor = NSColor.windowBackgroundColor.cgColor
+        popover?.contentViewController = hc
 
         // React to limits or menubar toggle changes
         usageViewModel.$limits
@@ -60,6 +63,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             .sink { [weak self] _ in self?.updateStatusItem() }
             .store(in: &cancellables)
 
+        updateManager.$updateAvailable
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in self?.updateStatusItem() }
+            .store(in: &cancellables)
+
         // Refresh timer
         scheduleTimer(interval: usageViewModel.refreshInterval)
 
@@ -166,7 +174,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             let sdStr = sd.map { "\(Int($0.usedPercent.rounded()))%" } ?? "—"
             button.image = nil
             button.attributedTitle = NSAttributedString(string: "")
-            button.title = "◔ \(fhStr)  \(sdStr)"
+            let updatePrefix = updateManager.updateAvailable ? "↑ Update  " : "◔ "
+            button.title = "\(updatePrefix)\(fhStr)  \(sdStr)"
+            button.font = NSFont.monospacedDigitSystemFont(ofSize: 12, weight: .medium)
+        } else if updateManager.updateAvailable {
+            button.image = nil
+            button.attributedTitle = NSAttributedString(string: "")
+            button.title = "↑ Update"
             button.font = NSFont.monospacedDigitSystemFont(ofSize: 12, weight: .medium)
         } else {
             button.title = ""
@@ -199,6 +213,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     @objc func showPopover() {
         guard let button = statusItem?.button, let popover else { return }
         if !popover.isShown {
+            NotificationCenter.default.post(name: .popoverWillOpen, object: nil)
             popover.show(relativeTo: button.bounds, of: button, preferredEdge: .minY)
             NSApp.activate(ignoringOtherApps: true)
         }
@@ -209,6 +224,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         if popover.isShown {
             popover.performClose(nil)
         } else {
+            NotificationCenter.default.post(name: .popoverWillOpen, object: nil)
             popover.show(relativeTo: button.bounds, of: button, preferredEdge: .minY)
             NSApp.activate(ignoringOtherApps: true)
         }
@@ -223,3 +239,5 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
 }
+
+

ClaudeChecker/ContentView.swift

@@ -47,13 +47,29 @@ struct ContentView: View {
                                 EmptyStateView()
                                     .padding(.vertical, 40)
                             } else {
-                                VStack(spacing: 1) {
+                                VStack(spacing: 8) {
                                     ForEach(vm.limits) { limit in
+                                        VStack(spacing: 0) {
+                                            HStack {
+                                                Text(limit.window == .fiveHour ? "5 Hour Limit" : "7 Day Limit")
+                                                    .font(.system(size: 11, weight: .semibold))
+                                                    .foregroundColor(.secondary)
+                                                    .textCase(.uppercase)
+                                                Spacer()
+                                            }
+                                            .padding(.horizontal, 16)
+                                            .padding(.top, 10)
+                                            .padding(.bottom, 4)
+
                                             LimitCard(limit: limit)
+                                                .background(Color(nsColor: .controlBackgroundColor))
+                                                .cornerRadius(8)
+                                                .overlay(RoundedRectangle(cornerRadius: 8).stroke(Color.primary.opacity(0.08), lineWidth: 0.5))
+                                                .padding(.horizontal, 8)
                                         }
                                     }
-                                .background(Color.primary.opacity(0.05))
+                                }
-                                .padding(.vertical, 1)
+                                .padding(.bottom, 4)
 
                                 // Extra credits row
                                 if let extra = vm.extraUsage, extra.isEnabled {
@@ -94,6 +110,9 @@ struct ContentView: View {
         }
         .frame(width: 480)
         .animation(.easeInOut(duration: 0.2), value: showSettings)
+        .onReceive(NotificationCenter.default.publisher(for: .popoverWillOpen)) { _ in
+            showSettings = false
+        }
         .onReceive(NotificationCenter.default.publisher(for: .openUpdateSheet)) { _ in
             showSettings = false
             showUpdateSheet = true
@@ -193,7 +212,7 @@ struct LimitCard: View {
                     AgentIconView(agent: .claude, size: 14)
                     Text("Claude")
                         .font(.system(size: 13, weight: .semibold))
-                    Text("·  \(vm.planLabel)  ·  \(limit.window.label)")
+                    Text("·  \(vm.planLabel)")
                         .font(.system(size: 11))
                         .foregroundColor(.secondary)
                     Spacer()
@@ -410,7 +429,9 @@ struct SparklineView: View {
 
     var body: some View {
         GeometryReader { geo in
-            if data.count > 1 {
+            let plotData = data.count == 1 ? [data[0], data[0]] : data
+            if plotData.count > 1 {
+                let data = plotData
                 let w = geo.size.width
                 let h = geo.size.height
                 let minV = data.min() ?? 0
@@ -770,6 +791,7 @@ struct SettingsView: View {
                             .padding(.vertical, 1)
                             .background(Color.primary.opacity(0.06))
                             .cornerRadius(4)
+                    }
                     if updater.updateAvailable {
                         Text("v\(updater.latestVersion) available")
                             .font(.system(size: 10, weight: .medium))
@@ -778,7 +800,6 @@ struct SettingsView: View {
                             .padding(.vertical, 2)
                             .background(Color.blue)
                             .cornerRadius(4)
-                                .fixedSize()
                     } else if updater.betaAvailable {
                         Text("v\(updater.latestBetaVersion) available")
                             .font(.system(size: 10, weight: .medium))
@@ -787,8 +808,6 @@ struct SettingsView: View {
                             .padding(.vertical, 2)
                             .background(Color.orange)
                             .cornerRadius(4)
-                                .fixedSize()
-                        }
                     }
                     Text("Built by superdooper86 & claude")
                         .font(.system(size: 11))
@@ -977,6 +996,36 @@ struct UpdateSuccessBanner: View {
     }
 }
 
+// MARK: - Markdown notes renderer
+
+struct ReleaseNotesText: View {
+    let text: String
+    var font: Font = .system(size: 12)
+
+    var body: some View {
+        let processed = text
+            .split(separator: "\n", omittingEmptySubsequences: false)
+            .map { line -> String in
+                let s = String(line)
+                if s.hasPrefix("### ") { return "**\(s.dropFirst(4))**" }
+                if s.hasPrefix("## ")  { return "**\(s.dropFirst(3))**" }
+                if s.hasPrefix("# ")   { return "**\(s.dropFirst(2))**" }
+                if s.hasPrefix("- ")   { return "• \(s.dropFirst(2))" }
+                return s
+            }
+            .joined(separator: "\n")
+
+        if let attr = try? AttributedString(markdown: processed,
+               options: .init(interpretedSyntax: .inlineOnlyPreservingWhitespace)) {
+            Text(attr).font(font).foregroundColor(.secondary)
+                .fixedSize(horizontal: false, vertical: true)
+        } else {
+            Text(text).font(font).foregroundColor(.secondary)
+                .fixedSize(horizontal: false, vertical: true)
+        }
+    }
+}
+
 // MARK: - Update Banner
 
 struct UpdateBanner: View {
@@ -991,28 +1040,20 @@ struct UpdateBanner: View {
             VStack(alignment: .leading, spacing: 1) {
                 Text("Update available — v\(updater.latestVersion)")
                     .font(.system(size: 12, weight: .semibold))
-                if !updater.releaseNotes.isEmpty {
+                Text("Tap Update to view what's new & install.")
-                    Text(updater.releaseNotes)
                     .font(.system(size: 11))
                     .foregroundColor(.secondary)
-                        .fixedSize(horizontal: false, vertical: true)
-                }
             }
             Spacer()
             Button("Update") { showSheet = true }
                 .buttonStyle(.borderedProminent)
                 .controlSize(.small)
-            Button { updater.updateAvailable = false } label: {
-                Image(systemName: "xmark")
-                    .font(.system(size: 10, weight: .medium))
-                    .foregroundColor(.secondary)
-            }
-            .buttonStyle(.plain)
         }
         .padding(.horizontal, 16)
         .padding(.vertical, 10)
         .background(Color.blue.opacity(0.08))
         .overlay(Divider(), alignment: .bottom)
+        .onTapGesture { showSheet = true }
     }
 }
 
@@ -1061,9 +1102,7 @@ struct UpdateSheet: View {
                                 .foregroundColor(.blue)
                         }
                         if !updater.releaseNotes.isEmpty {
-                            Text(updater.releaseNotes)
+                            ReleaseNotesText(text: updater.releaseNotes)
-                                .font(.system(size: 12))
-                                .foregroundColor(.secondary)
                         }
                     }
                     Spacer()
@@ -1132,3 +1171,5 @@ struct UpdateSheet: View {
         .frame(width: 380)
     }
 }
+
+

ClaudeChecker/Info.plist

@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.0.4</string>
+    <string>1.1.3</string>
     <key>CFBundleVersion</key>
-    <string>23</string>
+    <string>40</string>
     <key>LSMinimumSystemVersion</key>
     <string>13.0</string>
     <key>LSUIElement</key>
@@ -45,3 +45,7 @@
     </dict>
 </dict>
 </plist>
+
+
+
+

ClaudeChecker/LoginView.swift

@@ -24,25 +24,31 @@ struct LoginWebView: NSViewRepresentable {
 
     class Coordinator: NSObject, WKNavigationDelegate {
         let onAuthenticated: () -> Void
+        var didAuthenticate = false
 
         init(onAuthenticated: @escaping () -> Void) {
             self.onAuthenticated = onAuthenticated
         }
 
         func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+            guard !didAuthenticate else { return }
+            // Don't fire on the login/auth pages themselves
+            if let url = webView.url?.absoluteString,
+               url.contains("/login") || url.contains("/auth") { return }
+
             WKWebsiteDataStore.default().httpCookieStore.getAllCookies { cookies in
                 let hasSession = cookies.contains {
                     $0.domain.contains("claude.ai") &&
                     ($0.name == "sessionKey" || $0.name == "__Secure-next-auth.session-token")
                 }
-                if hasSession {
+                guard hasSession, !self.didAuthenticate else { return }
+                self.didAuthenticate = true
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                     self.onAuthenticated()
                 }
             }
         }
     }
-    }
 }
 
 // MARK: - Login Sheet View
@@ -58,10 +64,19 @@ struct LoginSheetView: View {
                 Text(authenticated ? "✓ Signed in — loading data…" : "Sign in to Claude")
                     .font(.system(size: 13, weight: .semibold))
                 Spacer()
+                if authenticated {
+                    Button("Done") {
+                        isPresented = false
+                        onDone()
+                    }
+                    .buttonStyle(.borderedProminent)
+                    .controlSize(.small)
+                } else {
                     Button("Cancel") { isPresented = false }
                         .buttonStyle(.bordered)
                         .controlSize(.small)
                 }
+            }
             .padding(.horizontal, 14)
             .padding(.vertical, 10)
             .background(Color(nsColor: .windowBackgroundColor))

ClaudeChecker/UpdateManager.swift

@@ -318,13 +318,31 @@ class UpdateManager: ObservableObject {
     }
 
     private func isNewer(_ version: String, than current: String) -> Bool {
-        let toInts = { (v: String) in v.split(separator: ".").compactMap { Int($0) } }
+        func parse(_ v: String) -> (base: [Int], pre: [Int]?) {
-        let a = toInts(version), b = toInts(current)
+            guard !v.isEmpty else { return ([], nil) }
-        for i in 0..<max(a.count, b.count) {
+            let halves = v.split(separator: "-", maxSplits: 1)
-            let av = i < a.count ? a[i] : 0
+            let base = halves[0].split(separator: ".").compactMap { Int($0) }
-            let bv = i < b.count ? b[i] : 0
+            let pre = halves.count > 1 ? String(halves[1]).split(separator: ".").compactMap { Int($0) } : nil
+            return (base, pre)
+        }
+        let a = parse(version), b = parse(current)
+        // Compare base version numbers
+        for i in 0..<max(a.base.count, b.base.count) {
+            let av = i < a.base.count ? a.base[i] : 0
+            let bv = i < b.base.count ? b.base[i] : 0
             if av != bv { return av > bv }
         }
+        // Base equal: stable beats pre-release
+        if a.pre == nil && b.pre != nil { return true }
+        if a.pre != nil && b.pre == nil { return false }
+        // Both pre-release: compare pre-release numbers
+        if let ap = a.pre, let bp = b.pre {
+            for i in 0..<max(ap.count, bp.count) {
+                let av = i < ap.count ? ap[i] : 0
+                let bv = i < bp.count ? bp[i] : 0
+                if av != bv { return av > bv }
+            }
+        }
         return false
     }
 }

ClaudeChecker/UpdateNotificationWindow.swift

@@ -14,7 +14,7 @@ class UpdateNotificationWindowController: NSWindowController {
 
     // Called when a new update is detected while running
     static func showUpdate(version: String, notes: String, near statusItem: NSStatusItem?) {
-        showWindow(version: version, subtitle: notes.isEmpty ? "Tap to update now." : notes, near: statusItem, isUpdate: true)
+        showWindow(version: version, subtitle: "Tap to view release notes & update now!", near: statusItem, isUpdate: true)
     }
 
     static func showLimitWarning(windowName: String, percent: Int, near statusItem: NSStatusItem?) {

ClaudeChecker/UsageViewModel.swift

@@ -37,6 +37,9 @@ class UsageViewModel: ObservableObject {
         let saved = UserDefaults.standard.double(forKey: "refresh_interval")
         refreshInterval = saved > 0 ? saved : 60
         showInMenuBar = UserDefaults.standard.object(forKey: "show_in_menubar") as? Bool ?? true
+        if let saved = UserDefaults.standard.object(forKey: "burn_history") as? [String: [Double]] {
+            burnHistoryStore = saved
+        }
         loadPlaceholderData()
     }
 
@@ -84,8 +87,9 @@ class UsageViewModel: ObservableObject {
                 history.append(limits[i].usedPercent)
                 if history.count > maxHistorySamples { history.removeFirst() }
                 burnHistoryStore[key] = history
-                if history.count > 1 { limits[i].burnHistory = history }
+                limits[i].burnHistory = history
             }
+            UserDefaults.standard.set(burnHistoryStore, forKey: "burn_history")
             checkLimitNotifications(for: limits)
         } catch AppError.notAuthenticated {
             isNotAuthenticated = true
@@ -307,8 +311,10 @@ extension Notification.Name {
     static let refreshIntervalChanged = Notification.Name("refreshIntervalChanged")
     static let closePopover = Notification.Name("closePopover")
     static let showPopover = Notification.Name("showPopover")
+    static let popoverWillOpen = Notification.Name("popoverWillOpen")
     static let updateDetected = Notification.Name("updateDetected")
     static let limitWarning = Notification.Name("limitWarning")
     static let limitReset = Notification.Name("limitReset")
     static let openUpdateSheet = Notification.Name("openUpdateSheet")
 }
+

README.md

@@ -8,8 +8,9 @@
 
 [![macOS](https://img.shields.io/badge/macOS-13.0+-000000?style=flat&logo=apple&logoColor=white)](https://www.apple.com/macos/)
 [![Swift](https://img.shields.io/badge/Swift-5.9-F05138?style=flat&logo=swift&logoColor=white)](https://swift.org)
-[![Version](https://img.shields.io/badge/version-1.0.3-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases)
+[![Version](https://img.shields.io/badge/version-1.1.3-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases)
 [![License](https://img.shields.io/badge/license-MIT-blue?style=flat)](LICENSE)
+<!-- BETA_BADGE -->
 
 </div>
 
@@ -29,21 +30,21 @@ No API key required. It reads directly from your `claude.ai` session using a bui
 
 <table>
   <tr>
-    <td align="center"><img src="screenshots/main-v2.png" width="280" alt="Main window" /><br/><sub>Main window</sub></td>
+    <td align="center"><img src="screenshots/main-v3.png" width="280" alt="Main window" /><br/><sub>Main window</sub></td>
-    <td align="center"><img src="screenshots/settings-v2.png" width="280" alt="Settings" /><br/><sub>Settings</sub></td>
+    <td align="center"><img src="screenshots/settings-v3.png" width="280" alt="Settings" /><br/><sub>Settings</sub></td>
   </tr>
   <tr>
-    <td align="center"><img src="screenshots/update-banner.png" width="280" alt="Update banner" /><br/><sub>Update available</sub></td>
+    <td align="center"><img src="screenshots/update-banner.png" width="280" alt="Update available" /><br/><sub>Update available</sub></td>
-    <td align="center"><img src="screenshots/notification.png" width="280" alt="Update notification" /><br/><sub>System notification</sub></td>
+    <td align="center"><img src="screenshots/release-notes.png" width="280" alt="Release notes" /><br/><sub>Release notes</sub></td>
+  </tr>
+  <tr>
+    <td align="center"><img src="screenshots/notification.png" width="280" alt="Update notification" /><br/><sub>Update notification</sub></td>
+    <td align="center"><img src="screenshots/notif-reset.png" width="280" alt="Limit reset" /><br/><sub>Limit reset</sub></td>
   </tr>
   <tr>
     <td align="center"><img src="screenshots/notif-limit-80.png" width="280" alt="80% limit warning" /><br/><sub>80% limit warning</sub></td>
     <td align="center"><img src="screenshots/notif-limit-95.png" width="280" alt="95% limit warning" /><br/><sub>95% limit warning</sub></td>
   </tr>
-  <tr>
-    <td align="center"><img src="screenshots/notif-reset.png" width="280" alt="Limit reset" /><br/><sub>Limit reset</sub></td>
-    <td></td>
-  </tr>
 </table>
 
 <br/>

RELEASE_NOTES.md

@@ -1,9 +1,12 @@
-## What's new in v1.0.4
+## What's new in v1.1.3
 
-### Clickable notifications
+### UI polish
-Notifications are now interactive — tap to act, not just read:
+- Limit headers now read "5 Hour Limit" and "7 Day Limit"
+- Tapping anywhere on the blue update banner opens the update window
 
-- **Limit warnings & resets** (80%, 95%, reset) — tapping the notification opens the main ClaudeChecker window so you can see your current usage at a glance
+### Session Diary fix
-- **Update available** — tapping the notification opens the main window with the update sheet already showing, so you can install in one click
+- Burn history is persisted across app launches — the sparkline populates immediately on first open instead of requiring a manual refresh
 
-Previously notifications were display-only and required manually clicking the menubar icon to take action. This removes that friction.
+### Window sizing fixes
+- The popover now resizes correctly when switching between the main view and settings
+- Background colour no longer shows through during the resize animation

version-beta.json

@@ -0,0 +1,5 @@
+{
+  "version": "1.1.3-beta.5",
+  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.3-beta.5/ClaudeChecker.zip",
+  "notes": "## What's new in v1.1.3\n\n### UI polish\n- Limit headers now read \"5 Hour Limit\" and \"7 Day Limit\" instead of \"5hr\"\n- Tapping anywhere on the blue update banner opens the update window\n\n### Session Diary fix\n- Burn history is persisted across app launches \u2014 the sparkline populates immediately on first open instead of requiring a manual refresh\n\n### Window sizing fixes\n- The popover now resizes correctly when switching between the main view and settings\n- Background colour no longer shows through during the resize animation"
+}

version-windows-beta.json

@@ -0,0 +1,5 @@
+{
+  "version": "0.0.0",
+  "url": "",
+  "notes": ""
+}

version-windows.json

@@ -0,0 +1,5 @@
+{
+  "version": "0.0.0",
+  "url": "",
+  "notes": ""
+}

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.3",
+  "version": "1.1.3",
-  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.0.3/ClaudeChecker.zip",
+  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.3/ClaudeChecker.zip",
-  "notes": "Release 1.0.3"
+  "notes": "## What's new in v1.1.3\n\n### UI polish\n- Limit headers now read \"5 Hour Limit\" and \"7 Day Limit\"\n- Tapping anywhere on the blue update banner opens the update window\n\n### Session Diary fix\n- Burn history is persisted across app launches — the sparkline populates immediately on first open instead of requiring a manual refresh\n\n### Window sizing fixes\n- The popover now resizes correctly when switching between the main view and settings\n- Background colour no longer shows through during the resize animation"
 }

windows/App.xaml

@@ -0,0 +1,198 @@
+<Application x:Class="ClaudeCheckerWindows.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+             ShutdownMode="OnExplicitShutdown">
+    <Application.Resources>
+        <SolidColorBrush x:Key="BackgroundBrush"   Color="#F3F3F3" po:Freeze="False"/>
+        <SolidColorBrush x:Key="CardBrush"         Color="#FFFFFF" po:Freeze="False"/>
+        <SolidColorBrush x:Key="AccentBrush"       Color="#F97316" po:Freeze="False"/>
+        <SolidColorBrush x:Key="TextBrush"         Color="#1C1C1C" po:Freeze="False"/>
+        <SolidColorBrush x:Key="SecondaryBrush"    Color="#6E6E6E" po:Freeze="False"/>
+        <SolidColorBrush x:Key="BorderBrush"       Color="#E0E0E0" po:Freeze="False"/>
+        <SolidColorBrush x:Key="BlueBrush"         Color="#0078D4" po:Freeze="False"/>
+        <SolidColorBrush x:Key="ButtonBrush"       Color="#FFFFFF" po:Freeze="False"/>
+        <SolidColorBrush x:Key="SurfaceBrush"      Color="#FAFAFA" po:Freeze="False"/>
+        <SolidColorBrush x:Key="BannerBgBrush"     Color="#E8F2FB" po:Freeze="False"/>
+        <SolidColorBrush x:Key="BannerBorderBrush" Color="#B3D6F5" po:Freeze="False"/>
+        <SolidColorBrush x:Key="HoverBrush"        Color="#EBEBEB" po:Freeze="False"/>
+        <SolidColorBrush x:Key="PressedBrush"      Color="#D6D6D6" po:Freeze="False"/>
+        <SolidColorBrush x:Key="BadgeBrush"        Color="#F0F0F0" po:Freeze="False"/>
+
+        <Style x:Key="HeaderText" TargetType="TextBlock">
+            <Setter Property="FontSize"   Value="10"/>
+            <Setter Property="FontWeight" Value="SemiBold"/>
+            <Setter Property="Foreground" Value="{DynamicResource SecondaryBrush}"/>
+            <Setter Property="FontFamily" Value="Segoe UI"/>
+        </Style>
+
+        <Style x:Key="PrimaryButton" TargetType="Button">
+            <Setter Property="Background"        Value="{DynamicResource BlueBrush}"/>
+            <Setter Property="Foreground"        Value="White"/>
+            <Setter Property="BorderThickness"   Value="0"/>
+            <Setter Property="Padding"           Value="14,6"/>
+            <Setter Property="FontSize"          Value="12"/>
+            <Setter Property="FontWeight"        Value="SemiBold"/>
+            <Setter Property="FontFamily"        Value="Segoe UI"/>
+            <Setter Property="Cursor"            Value="Hand"/>
+            <Setter Property="FocusVisualStyle"  Value="{x:Null}"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="Bd" Background="{TemplateBinding Background}"
+                                CornerRadius="4" Padding="{TemplateBinding Padding}">
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="#106EBE"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="#005A9E"/>
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="Bd" Property="Background" Value="#BDBDBD"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="SmallButton" TargetType="Button">
+            <Setter Property="Background"       Value="{DynamicResource ButtonBrush}"/>
+            <Setter Property="BorderBrush"      Value="{DynamicResource BorderBrush}"/>
+            <Setter Property="BorderThickness"  Value="1"/>
+            <Setter Property="Foreground"       Value="{DynamicResource TextBrush}"/>
+            <Setter Property="Padding"          Value="10,4"/>
+            <Setter Property="FontSize"         Value="12"/>
+            <Setter Property="FontFamily"       Value="Segoe UI"/>
+            <Setter Property="Cursor"           Value="Hand"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="Bd"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="4" Padding="{TemplateBinding Padding}">
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource HoverBrush}"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource PressedBrush}"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style TargetType="ComboBox">
+            <Setter Property="FontFamily"       Value="Segoe UI"/>
+            <Setter Property="FontSize"         Value="12"/>
+            <Setter Property="Background"       Value="{DynamicResource CardBrush}"/>
+            <Setter Property="Foreground"       Value="{DynamicResource TextBrush}"/>
+            <Setter Property="BorderBrush"      Value="{DynamicResource BorderBrush}"/>
+            <Setter Property="BorderThickness"  Value="1"/>
+            <Setter Property="Padding"          Value="8,4"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ComboBox">
+                        <Grid>
+                            <Border x:Name="Bd"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="4">
+                                <Grid>
+                                    <ContentPresenter x:Name="ContentSite"
+                                        IsHitTestVisible="False"
+                                        Content="{TemplateBinding SelectionBoxItem}"
+                                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                        Margin="{TemplateBinding Padding}"
+                                        VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                                    <TextBlock Text="&#x25BE;" FontSize="10"
+                                               Foreground="{DynamicResource SecondaryBrush}"
+                                               HorizontalAlignment="Right" VerticalAlignment="Center"
+                                               Margin="0,0,8,0" IsHitTestVisible="False"/>
+                                    <!-- Fully transparent toggle — no system chrome bleeds through -->
+                                    <ToggleButton Focusable="False" ClickMode="Press"
+                                                  FocusVisualStyle="{x:Null}"
+                                                  IsChecked="{Binding IsDropDownOpen, Mode=TwoWay,
+                                                      RelativeSource={RelativeSource TemplatedParent}}">
+                                        <ToggleButton.Template>
+                                            <ControlTemplate TargetType="ToggleButton">
+                                                <Border Background="Transparent"/>
+                                            </ControlTemplate>
+                                        </ToggleButton.Template>
+                                    </ToggleButton>
+                                </Grid>
+                            </Border>
+                            <Popup x:Name="Popup" Placement="Bottom"
+                                   IsOpen="{TemplateBinding IsDropDownOpen}"
+                                   AllowsTransparency="True" Focusable="False"
+                                   PopupAnimation="Slide">
+                                <Border SnapsToDevicePixels="True"
+                                        MinWidth="{TemplateBinding ActualWidth}"
+                                        MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                        Background="{DynamicResource CardBrush}"
+                                        BorderBrush="{DynamicResource BorderBrush}"
+                                        BorderThickness="1" CornerRadius="4">
+                                    <ScrollViewer Margin="0,2">
+                                        <ItemsPresenter/>
+                                    </ScrollViewer>
+                                </Border>
+                            </Popup>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource HoverBrush}"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="ItemContainerStyle">
+                <Setter.Value>
+                    <Style TargetType="ComboBoxItem">
+                        <Setter Property="Foreground"       Value="{DynamicResource TextBrush}"/>
+                        <Setter Property="Background"       Value="{DynamicResource CardBrush}"/>
+                        <Setter Property="Padding"          Value="10,5"/>
+                        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="ComboBoxItem">
+                                    <Border x:Name="Bd"
+                                            Background="{TemplateBinding Background}"
+                                            Padding="{TemplateBinding Padding}">
+                                        <ContentPresenter/>
+                                    </Border>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsHighlighted" Value="True">
+                                            <Setter TargetName="Bd" Property="Background"
+                                                    Value="{DynamicResource HoverBrush}"/>
+                                        </Trigger>
+                                        <Trigger Property="IsSelected" Value="True">
+                                            <Setter TargetName="Bd" Property="Background"
+                                                    Value="{DynamicResource HoverBrush}"/>
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style TargetType="ScrollViewer">
+            <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        </Style>
+    </Application.Resources>
+</Application>

windows/App.xaml.cs

@@ -0,0 +1,151 @@
+using System;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Threading;
+using Forms = System.Windows.Forms;
+
+namespace ClaudeCheckerWindows;
+
+public partial class App : Application
+{
+    public static UsageViewModel    ViewModel       { get; } = new();
+    public static UpdateManager     Updater         { get; } = new();
+    // Persistent hidden WebView2 — shares the same user data folder as LoginWindow
+    // so its cookies (including cf_clearance) are always live. Used on every refresh
+    // for endpoints that need a real browser session (overage, prepaid).
+    public static WebViewFetchWindow BackgroundBrowser { get; } = new();
+
+    private Forms.NotifyIcon? _tray;
+    private PopupWindow?      _popup;
+    private DispatcherTimer?  _timer;
+
+    protected override void OnStartup(StartupEventArgs e)
+    {
+        var logPath = System.IO.Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            "ClaudeChecker", "startup_crash.txt");
+
+        AppDomain.CurrentDomain.UnhandledException += (_, ex) =>
+            System.IO.File.WriteAllText(logPath, ex.ExceptionObject?.ToString() ?? "unknown");
+
+        DispatcherUnhandledException += (_, ex) =>
+        {
+            System.IO.File.WriteAllText(logPath, ex.Exception?.ToString() ?? "unknown");
+            ex.Handled = false;
+        };
+
+        base.OnStartup(e);
+        ThemeManager.Initialize();
+        SetupTray();
+        ShowPopup();
+        ScheduleTimer(ViewModel.RefreshInterval);
+
+        // Show background browser window on the UI thread before Task.Run
+        BackgroundBrowser.Show();
+
+        _ = Task.Run(async () =>
+        {
+            await ViewModel.LoadFromCacheAsync();
+            // Initialize the persistent background browser (navigates to claude.ai once)
+            await Application.Current.Dispatcher.InvokeAsync(
+                () => BackgroundBrowser.InitAsync()).Task.Unwrap();
+            await ViewModel.RefreshAsync();
+            await Updater.CheckForUpdatesAsync();
+        });
+    }
+
+    private void SetupTray()
+    {
+        _tray = new Forms.NotifyIcon
+        {
+            Text    = "ClaudeChecker",
+            Visible = true,
+            Icon    = LoadIcon(),
+        };
+
+        _tray.MouseClick += (_, e) =>
+        {
+            if (e.Button == Forms.MouseButtons.Left)
+                Dispatcher.InvokeAsync(TogglePopup);
+        };
+
+        _tray.ContextMenuStrip = BuildContextMenu();
+
+        ViewModel.PropertyChanged += (_, _) => UpdateTrayText();
+        Updater.PropertyChanged   += (_, _) => UpdateTrayText();
+    }
+
+    private static System.Drawing.Icon LoadIcon()
+    {
+        try { return new System.Drawing.Icon("Assets/icon.ico"); }
+        catch { return System.Drawing.SystemIcons.Application; }
+    }
+
+    private Forms.ContextMenuStrip BuildContextMenu()
+    {
+        var menu = new Forms.ContextMenuStrip();
+        menu.Items.Add("Show ClaudeChecker", null, (_, _) => Dispatcher.InvokeAsync(ShowPopup));
+        menu.Items.Add(new Forms.ToolStripSeparator());
+        menu.Items.Add("Quit", null, (_, _) => Dispatcher.InvokeAsync(Quit));
+        return menu;
+    }
+
+    private void TogglePopup()
+    {
+        if (_popup == null || !_popup.IsVisible)
+            ShowPopup();
+        else
+            _popup.Hide();
+    }
+
+    private void ShowPopup()
+    {
+        if (_popup == null)
+        {
+            _popup = new PopupWindow();
+        }
+        _popup.Show();
+        _popup.Activate();
+    }
+
+    public void ScheduleTimer(int seconds)
+    {
+        _timer?.Stop();
+        _timer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(seconds) };
+        _timer.Tick += async (_, _) =>
+        {
+            await ViewModel.RefreshAsync();
+            await Updater.CheckForUpdatesAsync();
+        };
+        _timer.Start();
+    }
+
+    private void UpdateTrayText()
+    {
+        if (_tray == null) return;
+        var limits = ViewModel.Limits;
+        if (ViewModel.ShowInTaskbar && limits.Count >= 2)
+        {
+            var fh = limits.Find(l => l.Window == WindowKind.FiveHour);
+            var sd = limits.Find(l => l.Window == WindowKind.SevenDay);
+            if (fh != null && sd != null && fh.IsLive)
+            {
+                _tray.Text = $"ClaudeChecker  {(int)fh.UsedPercent}%  {(int)sd.UsedPercent}%";
+                return;
+            }
+        }
+        _tray.Text = "ClaudeChecker";
+    }
+
+    private void Quit()
+    {
+        _tray?.Dispose();
+        Shutdown();
+    }
+
+    protected override void OnExit(ExitEventArgs e)
+    {
+        _tray?.Dispose();
+        base.OnExit(e);
+    }
+}

windows/AppSettings.cs

@@ -0,0 +1,49 @@
+using System;
+using System.IO;
+using System.Text.Json;
+
+namespace ClaudeCheckerWindows;
+
+public class AppSettings
+{
+    // Auth signal — non-empty means the user has completed sign-in at least once.
+    // The WebView2 user-data folder holds the live session; this is only for startup.
+    public string CookieStore     { get; set; } = "";
+
+    // Accumulated sparkline data — built up over multiple refreshes.
+    public string BurnHistory     { get; set; } = "";
+
+    // User preferences
+    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

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <AssemblyName>ClaudeChecker</AssemblyName>
+    <RootNamespace>ClaudeCheckerWindows</RootNamespace>
+    <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
+    <Version>1.0.0</Version>
+    <Platforms>x64</Platforms>
+  </PropertyGroup>
+
+  <!-- WinForms referenced explicitly so NotifyIcon is available without polluting global namespace -->
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2651.64"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Assets\icon.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <Resource Include="Assets\icon.png"/>
+  </ItemGroup>
+
+</Project>

windows/Controls/GaugeControl.cs

@@ -0,0 +1,84 @@
+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;
+using System.Windows.Media;
+
+namespace ClaudeCheckerWindows.Controls;
+
+public class GaugeControl : FrameworkElement
+{
+    public static readonly DependencyProperty PercentProperty =
+        DependencyProperty.Register(nameof(Percent), typeof(double), typeof(GaugeControl),
+            new FrameworkPropertyMetadata(0.0, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static readonly DependencyProperty AccentProperty =
+        DependencyProperty.Register(nameof(Accent), typeof(Brush), typeof(GaugeControl),
+            new FrameworkPropertyMetadata(Brushes.Orange, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public double Percent { get => (double)GetValue(PercentProperty); set => SetValue(PercentProperty, value); }
+    public Brush  Accent  { get => (Brush)GetValue(AccentProperty);   set => SetValue(AccentProperty, value); }
+
+    public GaugeControl()
+    {
+        ThemeManager.ThemeChanged += InvalidateVisual;
+    }
+
+    private const double StartAngleDeg = 135;
+    private const double SweepDeg      = 270;
+    private const double StrokeWidth   = 6;
+
+    protected override void OnRender(DrawingContext dc)
+    {
+        var cx     = RenderSize.Width  / 2;
+        var cy     = RenderSize.Height / 2;
+        var radius = Math.Min(cx, cy) - StrokeWidth / 2 - 1;
+
+        var trackColor = ThemeManager.IsDark
+            ? Color.FromArgb(40, 255, 255, 255)
+            : Color.FromArgb(30, 0, 0, 0);
+        DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg,
+            new Pen(new SolidColorBrush(trackColor), StrokeWidth));
+
+        if (Percent > 0)
+            DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg * (Percent / 100.0),
+                new Pen(Accent, StrokeWidth));
+
+        var dpi       = VisualTreeHelper.GetDpi(this).PixelsPerDip;
+        var textColor = ThemeManager.IsDark ? Color.FromRgb(0xF5, 0xF5, 0xF5) : Color.FromRgb(0x1C, 0x1C, 0x1C);
+
+        var pctText = new FormattedText(
+            $"{(int)Math.Round(Percent)}%",
+            CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
+            new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
+            18, new SolidColorBrush(textColor), dpi);
+
+        dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height / 2));
+    }
+
+    private static void DrawArc(DrawingContext dc, double cx, double cy, double r,
+        double startDeg, double sweepDeg, Pen pen)
+    {
+        if (sweepDeg <= 0) return;
+        var start   = PointOnCircle(cx, cy, r, startDeg);
+        var end     = PointOnCircle(cx, cy, r, startDeg + sweepDeg);
+        var isLarge = sweepDeg > 180;
+
+        var geo = new StreamGeometry();
+        using (var ctx = geo.Open())
+        {
+            ctx.BeginFigure(start, false, false);
+            ctx.ArcTo(end, new Size(r, r), 0, isLarge, SweepDirection.Clockwise, true, false);
+        }
+        geo.Freeze();
+        dc.DrawGeometry(null, pen, geo);
+    }
+
+    private static Point PointOnCircle(double cx, double cy, double r, double deg)
+    {
+        var rad = deg * Math.PI / 180;
+        return new Point(cx + r * Math.Cos(rad), cy + r * Math.Sin(rad));
+    }
+}

windows/Controls/SparklineControl.cs

@@ -0,0 +1,60 @@
+using Point = System.Windows.Point;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Media;
+
+namespace ClaudeCheckerWindows.Controls;
+
+public class SparklineControl : FrameworkElement
+{
+    public static readonly DependencyProperty DataProperty =
+        DependencyProperty.Register(nameof(Data), typeof(IList<double>), typeof(SparklineControl),
+            new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static readonly DependencyProperty LineColorProperty =
+        DependencyProperty.Register(nameof(LineColor), typeof(Color), typeof(SparklineControl),
+            new FrameworkPropertyMetadata(Colors.Orange, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public IList<double>? Data      { get => (IList<double>?)GetValue(DataProperty); set => SetValue(DataProperty, value); }
+    public Color          LineColor { get => (Color)GetValue(LineColorProperty);      set => SetValue(LineColorProperty, value); }
+
+    protected override void OnRender(DrawingContext dc)
+    {
+        var data = Data;
+        if (data == null || data.Count < 1) return;
+
+        var plot = data.Count == 1 ? new[] { data[0], data[0] } : [.. data];
+
+        var w    = RenderSize.Width;
+        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; }
+        var range = System.Math.Max(maxV - minV, 1);
+
+        Point Pt(int i) => new(
+            i / (double)(plot.Length - 1) * w,
+            h - (plot[i] - minV) / range * (h - 6) - 3);
+
+        var fill = new StreamGeometry();
+        using (var ctx = fill.Open())
+        {
+            ctx.BeginFigure(new Point(0, h), true, true);
+            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);
+
+        var line = new StreamGeometry();
+        using (var ctx = line.Open())
+        {
+            ctx.BeginFigure(Pt(0), false, false);
+            for (var i = 1; i < plot.Length; i++) ctx.LineTo(Pt(i), true, false);
+        }
+        line.Freeze();
+        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

@@ -0,0 +1,42 @@
+<Window x:Class="ClaudeCheckerWindows.LoginWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:wv2="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
+        Title="Sign in to claude.ai"
+        Width="520" Height="680"
+        WindowStartupLocation="CenterOwner"
+        Background="#1C1C1E">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <Border Grid.Row="0" Background="#2C2C2E" Padding="16,12">
+            <StackPanel>
+                <TextBlock Text="Sign in to claude.ai" FontSize="14" FontWeight="SemiBold"
+                           Foreground="White"/>
+                <TextBlock Text="Sign in below. ClaudeChecker will save your session cookies to fetch usage data."
+                           FontSize="11" Foreground="#888888" TextWrapping="Wrap" Margin="0,4,0,0"/>
+            </StackPanel>
+        </Border>
+
+        <wv2:WebView2 x:Name="Browser" Grid.Row="1"/>
+
+        <Border Grid.Row="2" Background="#2C2C2E" Padding="16,10">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock x:Name="StatusText" FontSize="11" Foreground="#888888"
+                           VerticalAlignment="Center" Text="Waiting for sign-in…"/>
+                <Button Grid.Column="1" Content="Done — I'm signed in"
+                        Style="{StaticResource PrimaryButton}" Click="Done_Click"
+                        x:Name="DoneButton" IsEnabled="False"/>
+            </Grid>
+        </Border>
+    </Grid>
+</Window>

windows/LoginWindow.xaml.cs

@@ -0,0 +1,70 @@
+using Microsoft.Web.WebView2.Core;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace ClaudeCheckerWindows;
+
+public partial class LoginWindow : Window
+{
+    private bool _closing;
+
+    public LoginWindow()
+    {
+        InitializeComponent();
+        Loaded += async (_, _) => await InitBrowserAsync();
+    }
+
+    private async Task InitBrowserAsync()
+    {
+        var env = await CoreWebView2Environment.CreateAsync(userDataFolder:
+            System.IO.Path.Combine(
+                System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData),
+                "ClaudeChecker", "WebView2"));
+
+        await Browser.EnsureCoreWebView2Async(env);
+        Browser.CoreWebView2.Navigate("https://claude.ai");
+
+        Browser.CoreWebView2.NavigationCompleted += async (_, e) =>
+        {
+            if (!e.IsSuccess || _closing) return;
+            var uri = Browser.CoreWebView2.Source;
+            if (!uri.Contains("claude.ai")) return;
+
+            var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
+            var signedIn = System.Linq.Enumerable.Any(cookies, c =>
+                c.Name.Equals("sessionKey", System.StringComparison.OrdinalIgnoreCase) ||
+                c.Name.StartsWith("sk-ant",  System.StringComparison.OrdinalIgnoreCase));
+
+            await Dispatcher.InvokeAsync(() =>
+            {
+                DoneButton.IsEnabled = !uri.Contains("/login") && !uri.Contains("/signin");
+                StatusText.Text = signedIn
+                    ? "Signed in — click Done to continue."
+                    : "Complete sign-in, then click Done.";
+            });
+
+            if (!uri.Contains("/login") && !uri.Contains("/signin") && signedIn)
+                await SaveAndClose(cookies);
+        };
+    }
+
+    private async void Done_Click(object sender, RoutedEventArgs e)
+    {
+        if (_closing) return;
+        var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
+        await SaveAndClose(cookies);
+    }
+
+    private async Task SaveAndClose(IReadOnlyList<CoreWebView2Cookie> cookies)
+    {
+        if (_closing) return;
+        _closing = true;
+
+        // Persist cookies so the app knows the user is signed in on next startup.
+        // All live data is fetched by the background WebView2 on the next refresh.
+        UsageViewModel.SaveCookies(cookies);
+
+        await Dispatcher.InvokeAsync(() => DialogResult = true);
+    }
+}

windows/Models.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace ClaudeCheckerWindows;
+
+public enum WindowKind { FiveHour, SevenDay }
+
+public class AgentLimit
+{
+    public WindowKind Window { get; init; }
+    public double UsedPercent { get; set; }
+    public string TimeRemaining { get; set; } = "";
+    public DateTime ResetDate { get; set; }
+    public double BurnRate { get; set; }
+    public List<double> BurnHistory { get; set; } = [];
+    public bool IsLive { get; set; }
+    public string UsageLabel => UsedPercent switch { < 33 => "low", < 66 => "med", _ => "high" };
+    public string WindowLabel => Window == WindowKind.FiveHour ? "5 HOUR LIMIT" : "7 DAY LIMIT";
+}
+
+public class UsageResponse
+{
+    [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
+{
+    [JsonPropertyName("utilization")] public double Utilization { get; set; }
+    [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; }
+    [JsonPropertyName("used_credits")]  public double? UsedCredits  { get; set; }
+    [JsonPropertyName("monthly_limit")] public double? MonthlyLimit { get; set; }
+}
+
+public class BootstrapResponse
+{
+    [JsonPropertyName("account")] public AccountInfo? Account { get; set; }
+}
+
+public class AccountInfo
+{
+    [JsonPropertyName("email_address")] public string? EmailAddress { get; set; }
+}
+
+public class OverageSpendLimit
+{
+    [JsonPropertyName("monthly_credit_limit")] public double? MonthlyCreditLimit { get; set; }
+    [JsonPropertyName("used_credits")]         public double? UsedCredits         { get; set; }
+    [JsonPropertyName("currency")]             public string? Currency            { get; set; }
+}
+
+public class PrepaidCredits
+{
+    [JsonPropertyName("amount")]   public double? Amount   { get; set; }
+    [JsonPropertyName("currency")] public string? Currency { get; set; }
+}
+
+public class VersionInfo
+{
+    [JsonPropertyName("version")] public string  Version { get; set; } = "";
+    [JsonPropertyName("url")]     public string  Url     { get; set; } = "";
+    [JsonPropertyName("notes")]   public string? Notes   { get; set; }
+}

windows/PopupWindow.xaml

@@ -0,0 +1,295 @@
+<Window x:Class="ClaudeCheckerWindows.PopupWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:ctrl="clr-namespace:ClaudeCheckerWindows.Controls"
+        Title="ClaudeChecker"
+        Width="480" Height="660"
+        WindowStartupLocation="CenterScreen"
+        Background="{DynamicResource BackgroundBrush}"
+        FontFamily="Segoe UI"
+        ShowInTaskbar="True"
+        ResizeMode="NoResize">
+
+    <Grid>
+        <!-- Main panel -->
+        <DockPanel x:Name="MainPanel">
+
+            <!-- Update banner -->
+            <Border x:Name="UpdateBanner" DockPanel.Dock="Top" Visibility="Collapsed"
+                    Background="{DynamicResource BannerBgBrush}"
+                    BorderBrush="{DynamicResource BannerBorderBrush}" BorderThickness="0,0,0,1"
+                    Cursor="Hand" MouseLeftButtonUp="UpdateBanner_Click">
+                <Grid Margin="16,10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0" Text="⬇" FontSize="14"
+                               Foreground="{DynamicResource BlueBrush}" VerticalAlignment="Center"/>
+                    <StackPanel Grid.Column="1" Margin="10,0">
+                        <TextBlock x:Name="UpdateBannerTitle" FontSize="12" FontWeight="SemiBold"
+                                   Foreground="{DynamicResource TextBrush}"/>
+                        <TextBlock Text="Click to view release notes and install."
+                                   FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
+                    </StackPanel>
+                    <Button Grid.Column="2" Content="Update" Style="{StaticResource SmallButton}"
+                            Foreground="{DynamicResource BlueBrush}" Click="UpdateBanner_Click"/>
+                </Grid>
+            </Border>
+
+            <!-- Footer -->
+            <Border DockPanel.Dock="Bottom" BorderBrush="{DynamicResource BorderBrush}"
+                    BorderThickness="0,1,0,0" Background="{DynamicResource SurfaceBrush}">
+                <Grid Margin="12,8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="8"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="8"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
+                        <ProgressBar x:Name="LoadingBar" IsIndeterminate="True"
+                                     Width="12" Height="12" Visibility="Collapsed"
+                                     Style="{x:Null}" Margin="0,0,6,0"/>
+                        <TextBlock x:Name="LastUpdatedText" FontSize="11"
+                                   Foreground="{DynamicResource SecondaryBrush}" VerticalAlignment="Center"/>
+                    </StackPanel>
+                    <Button Grid.Column="1" Content="↻  Refresh"
+                            Style="{StaticResource SmallButton}" Click="Refresh_Click"/>
+                    <Button Grid.Column="3" x:Name="SettingsButton" Content="⚙  Settings"
+                            Style="{StaticResource SmallButton}" Click="Settings_Click"/>
+                </Grid>
+            </Border>
+
+            <!-- Cards scroll area -->
+            <ScrollViewer VerticalScrollBarVisibility="Auto">
+                <StackPanel x:Name="CardsPanel" Margin="0,4,0,4"/>
+            </ScrollViewer>
+        </DockPanel>
+
+        <!-- Settings panel -->
+        <Border x:Name="SettingsPanel" Visibility="Collapsed"
+                Background="{DynamicResource BackgroundBrush}">
+            <DockPanel>
+                <Border DockPanel.Dock="Top" BorderBrush="{DynamicResource BorderBrush}"
+                        BorderThickness="0,0,0,1" Background="{DynamicResource SurfaceBrush}" Padding="12,10">
+                    <Grid>
+                        <Button Content="← Back" HorizontalAlignment="Left"
+                                Style="{StaticResource SmallButton}" BorderThickness="0"
+                                Foreground="{DynamicResource BlueBrush}" Background="Transparent"
+                                Click="BackFromSettings_Click"/>
+                        <TextBlock Text="Settings" FontSize="14" FontWeight="SemiBold"
+                                   Foreground="{DynamicResource TextBrush}"
+                                   HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Grid>
+                </Border>
+
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                    <StackPanel Margin="20,16,20,20">
+
+                        <TextBlock Text="AUTHENTICATION" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
+                        <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                                Padding="14,12" Margin="0,0,0,16">
+                            <StackPanel>
+                                <StackPanel x:Name="AuthPanel" Margin="0,0,0,10"/>
+                                <TextBlock Text="Your session is stored locally and persists across restarts."
+                                           FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
+                                           TextWrapping="Wrap" Margin="0,0,0,10"/>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button x:Name="SignInButton" Content="Sign In"
+                                            Style="{StaticResource SmallButton}"
+                                            Click="SignIn_Click" Margin="0,0,8,0"/>
+                                    <Button x:Name="SignOutButton" Content="Sign Out"
+                                            Style="{StaticResource SmallButton}"
+                                            Click="SignOut_Click" Foreground="#C42B1C"
+                                            Visibility="Collapsed"/>
+                                </StackPanel>
+                            </StackPanel>
+                        </Border>
+
+                        <TextBlock Text="UPDATE CHANNEL" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
+                        <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                                Padding="14,12" Margin="0,0,0,16">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <StackPanel>
+                                    <TextBlock Text="Beta updates" FontSize="12" FontWeight="SemiBold"
+                                               Foreground="{DynamicResource TextBrush}"/>
+                                    <TextBlock Text="Receive early access builds — may be less stable"
+                                               FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
+                                </StackPanel>
+                                <CheckBox Grid.Column="1" x:Name="BetaToggle" VerticalAlignment="Center"
+                                          Checked="BetaToggle_Changed" Unchecked="BetaToggle_Changed"/>
+                            </Grid>
+                        </Border>
+
+                        <TextBlock Text="AUTO-REFRESH" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
+                        <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                                Padding="14,12" Margin="0,0,0,16">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Text="Refresh interval" FontSize="12" FontWeight="SemiBold"
+                                           Foreground="{DynamicResource TextBrush}" VerticalAlignment="Center"/>
+                                <ComboBox Grid.Column="1" x:Name="RefreshPicker" Width="100"
+                                          SelectionChanged="RefreshPicker_Changed"/>
+                            </Grid>
+                        </Border>
+
+                        <TextBlock Text="ABOUT" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
+                        <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                                Padding="14,12" Margin="0,0,0,16">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <Image Width="36" Height="36" Source="Assets/icon.png"
+                                       RenderOptions.BitmapScalingMode="HighQuality" Margin="0,0,12,0"/>
+                                <StackPanel Grid.Column="1" VerticalAlignment="Center">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="ClaudeChecker" FontSize="12" FontWeight="SemiBold"
+                                                   Foreground="{DynamicResource TextBrush}"/>
+                                        <Border Background="{DynamicResource BadgeBrush}" CornerRadius="3"
+                                                Margin="6,0,0,0" Padding="5,1">
+                                            <TextBlock x:Name="VersionLabel" FontSize="11"
+                                                       Foreground="{DynamicResource SecondaryBrush}"
+                                                       FontFamily="Consolas"/>
+                                        </Border>
+                                    </StackPanel>
+                                    <TextBlock Text="Built by superdooper86 &amp; claude"
+                                               FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
+                                </StackPanel>
+                                <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 Text="DIAGNOSTICS" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
+                        <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                                Padding="14,12">
+                            <StackPanel>
+                                <TextBlock Text="View app state, last request details, and stored cookies."
+                                           FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
+                                           TextWrapping="Wrap" Margin="0,0,0,10"/>
+                                <Button Content="Open diagnostics" Style="{StaticResource SmallButton}"
+                                        HorizontalAlignment="Left" Click="Diagnostics_Click"/>
+                            </StackPanel>
+                        </Border>
+
+                    </StackPanel>
+                </ScrollViewer>
+            </DockPanel>
+        </Border>
+
+        <!-- Update panel -->
+        <Border x:Name="UpdatePanel" Visibility="Collapsed"
+                Background="{DynamicResource BackgroundBrush}">
+            <DockPanel>
+                <Border DockPanel.Dock="Top" BorderBrush="{DynamicResource BorderBrush}"
+                        BorderThickness="0,0,0,1" Background="{DynamicResource SurfaceBrush}" Padding="12,10">
+                    <Grid>
+                        <Button Content="← Back" HorizontalAlignment="Left"
+                                Style="{StaticResource SmallButton}" BorderThickness="0"
+                                Foreground="{DynamicResource BlueBrush}" Background="Transparent"
+                                Click="CloseUpdate_Click"/>
+                        <TextBlock Text="Update Available" FontSize="14" FontWeight="SemiBold"
+                                   Foreground="{DynamicResource TextBrush}"
+                                   HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <Button x:Name="NotNowButton" Content="Not Now" HorizontalAlignment="Right"
+                                Style="{StaticResource SmallButton}" Click="CloseUpdate_Click"/>
+                    </Grid>
+                </Border>
+
+                <StackPanel Margin="20,16">
+                    <Border Background="{DynamicResource CardBrush}" CornerRadius="6"
+                            BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                            Padding="14,12" Margin="0,0,0,12">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Image Width="44" Height="44" Source="Assets/icon.png"
+                                   RenderOptions.BitmapScalingMode="HighQuality" Margin="0,0,14,0"/>
+                            <StackPanel Grid.Column="1" VerticalAlignment="Center">
+                                <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
+                                    <TextBlock x:Name="CurrentVerLabel" FontSize="12" FontFamily="Consolas"
+                                               Foreground="{DynamicResource SecondaryBrush}" VerticalAlignment="Center"/>
+                                    <TextBlock Text=" → " FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
+                                               VerticalAlignment="Center"/>
+                                    <TextBlock x:Name="NewVerLabel" FontSize="13" FontWeight="SemiBold"
+                                               FontFamily="Consolas" Foreground="{DynamicResource BlueBrush}"
+                                               VerticalAlignment="Center"/>
+                                </StackPanel>
+                                <TextBlock x:Name="ReleaseNotesText" FontSize="11" TextWrapping="Wrap"
+                                           Foreground="{DynamicResource SecondaryBrush}" MaxHeight="160"/>
+                            </StackPanel>
+                        </Grid>
+                    </Border>
+
+                    <TextBlock x:Name="UpdateStatusText" Foreground="{DynamicResource SecondaryBrush}"
+                               FontSize="11" TextWrapping="Wrap" TextAlignment="Center"
+                               Visibility="Collapsed" Margin="0,0,0,8"/>
+                    <ProgressBar x:Name="UpdateProgress" Visibility="Collapsed"
+                                 Height="4" Margin="0,0,0,12" Foreground="{DynamicResource BlueBrush}"/>
+                    <TextBlock Text="ClaudeChecker will download, replace itself, and relaunch automatically."
+                               FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
+                               TextWrapping="Wrap" TextAlignment="Center" Margin="0,0,0,12"/>
+                    <Button x:Name="InstallButton" Content="⬇  Download &amp; Install"
+                            Style="{StaticResource PrimaryButton}" HorizontalAlignment="Stretch"
+                            Click="Install_Click"/>
+                </StackPanel>
+            </DockPanel>
+        </Border>
+
+        <!-- Diagnostics panel -->
+        <Border x:Name="DiagnosticsPanel" Visibility="Collapsed"
+                Background="{DynamicResource BackgroundBrush}">
+            <DockPanel>
+                <Border DockPanel.Dock="Top" BorderBrush="{DynamicResource BorderBrush}"
+                        BorderThickness="0,0,0,1" Background="{DynamicResource SurfaceBrush}" Padding="12,10">
+                    <Grid>
+                        <Button Content="← Back" HorizontalAlignment="Left"
+                                Style="{StaticResource SmallButton}" BorderThickness="0"
+                                Foreground="{DynamicResource BlueBrush}" Background="Transparent"
+                                Click="BackFromDiag_Click"/>
+                        <TextBlock Text="Diagnostics" FontSize="14" FontWeight="SemiBold"
+                                   Foreground="{DynamicResource TextBrush}"
+                                   HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <Button x:Name="CopyDiagButton" Content="Copy All" HorizontalAlignment="Right"
+                                Style="{StaticResource SmallButton}" Click="CopyDiag_Click"/>
+                    </Grid>
+                </Border>
+                <TextBlock DockPanel.Dock="Top" Text="Org IDs are redacted when copied."
+                           FontSize="10" Foreground="{DynamicResource SecondaryBrush}"
+                           Margin="14,6,14,6"/>
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                    <StackPanel x:Name="DiagContentPanel" Margin="16,4,16,16"/>
+                </ScrollViewer>
+            </DockPanel>
+        </Border>
+
+    </Grid>
+</Window>

windows/PopupWindow.xaml.cs

@@ -0,0 +1,740 @@
+using ClaudeCheckerWindows.Controls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Threading;
+
+namespace ClaudeCheckerWindows;
+
+public partial class PopupWindow : Window
+{
+    private static readonly UsageViewModel VM      = App.ViewModel;
+    private static readonly UpdateManager  Updater = App.Updater;
+    private readonly DispatcherTimer _clockTimer;
+
+    [DllImport("dwmapi.dll")]
+    private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int value, int size);
+
+    private void ApplyTitleBarTheme()
+    {
+        var hwnd = new WindowInteropHelper(this).Handle;
+        if (hwnd == IntPtr.Zero) return;
+        int dark = ThemeManager.IsDark ? 1 : 0;
+        DwmSetWindowAttribute(hwnd, 20, ref dark, sizeof(int));
+    }
+
+    public PopupWindow()
+    {
+        InitializeComponent();
+
+        VM.PropertyChanged      += (_, e) => Dispatcher.InvokeAsync(() => OnVmChanged(e.PropertyName));
+        Updater.PropertyChanged += (_, e) => Dispatcher.InvokeAsync(() => OnUpdaterChanged(e.PropertyName));
+
+        _clockTimer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(1) };
+        _clockTimer.Tick += (_, _) => UpdateFooter();
+        _clockTimer.Start();
+
+        InitSettings();
+        RebuildCards();
+        UpdateBannerState();
+        UpdateFooter();
+
+        Closing += (_, e) => { e.Cancel = true; Hide(); };
+        SourceInitialized += (_, _) => ApplyTitleBarTheme();
+        ThemeManager.ThemeChanged += () => { ApplyTitleBarTheme(); RebuildCards(); };
+    }
+
+    // ── Card rendering ───────────────────────────────────────────────
+
+    private void RebuildCards()
+    {
+        CardsPanel.Children.Clear();
+        foreach (var limit in VM.Limits)
+            CardsPanel.Children.Add(BuildCard(limit));
+
+        if (VM.ExtraUsage?.IsEnabled == true)
+            CardsPanel.Children.Add(BuildExtraUsageSection());
+
+        var fiveHour = VM.Limits.FirstOrDefault(l => l.Window == WindowKind.FiveHour);
+        if (fiveHour != null && fiveHour.BurnHistory.Count > 0)
+            CardsPanel.Children.Add(BuildDiarySection(fiveHour));
+    }
+
+    private static UIElement BuildCard(AgentLimit limit)
+    {
+        var accent    = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
+        var text      = (SolidColorBrush)Application.Current.Resources["TextBrush"];
+        var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
+
+        var gauge = new GaugeControl { Width = 76, Height = 76, Percent = limit.UsedPercent, Accent = accent };
+
+        var liveBadge = new Border
+        {
+            Background   = new SolidColorBrush(Color.FromArgb(30, 0, 160, 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(Color.FromRgb(0, 120, 0)) }
+        };
+
+        var usageBadge = new Border
+        {
+            Background   = new SolidColorBrush(Color.FromArgb(18, 0, 0, 0)),
+            CornerRadius = new CornerRadius(4),
+            Padding      = new Thickness(6, 2, 6, 2),
+            Child        = new TextBlock { Text = $"Usg: {limit.UsageLabel}", FontSize = 10,
+                               FontWeight = FontWeights.Medium, Foreground = secondary }
+        };
+
+        var badgeStack = new StackPanel { Orientation = Orientation.Horizontal };
+        badgeStack.Children.Add(liveBadge);
+        badgeStack.Children.Add(usageBadge);
+
+        var nameStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
+        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,
+            Foreground = text, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
+        nameStack.Children.Add(new TextBlock { Text = $"·  {VM.PlanLabel}", FontSize = 11,
+            Foreground = secondary, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
+
+        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 progress = new ProgressBar
+        {
+            Value = limit.UsedPercent, Maximum = 100, Height = 4,
+            Margin = new Thickness(0, 4, 0, 4),
+            Foreground = accent,
+            Background = new SolidColorBrush(Color.FromArgb(20, 0, 0, 0)),
+            BorderThickness = new Thickness(0),
+        };
+
+        // Left: time remaining + reset date inline
+        var timeLeft = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
+        timeLeft.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
+        timeLeft.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
+            FontWeight = FontWeights.Medium, Foreground = text, VerticalAlignment = VerticalAlignment.Center });
+        timeLeft.Children.Add(new TextBlock
+        {
+            Text = $"   Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
+            FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
+        });
+
+        // Right: projected limit-hit time, or "after reset" if burn rate won't reach 100% before reset.
+        // BurnRate is stored as usedPercent / windowHours, so hoursToFull = remainingPercent / BurnRate.
+        string? refreshLabel;
+        if (limit.BurnRate <= 0)
+            refreshLabel = "after reset";
+        else
+        {
+            var projectedHit = DateTime.Now.AddHours((100.0 - limit.UsedPercent) / limit.BurnRate);
+            refreshLabel = projectedHit > limit.ResetDate
+                ? "after reset"
+                : projectedHit.Date == DateTime.Today
+                    ? projectedHit.ToString("h:mm tt")
+                    : projectedHit.ToString("d MMM h:mm tt");
+        }
+
+        UIElement timeRight;
+        if (refreshLabel != null)
+        {
+            var inner = new StackPanel { Orientation = Orientation.Horizontal };
+            inner.Children.Add(new TextBlock { Text = "↗ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
+            inner.Children.Add(new TextBlock { Text = refreshLabel, FontSize = 10, FontWeight = FontWeights.Medium,
+                Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
+            timeRight = new Border
+            {
+                Background   = new SolidColorBrush(Color.FromArgb(18, 0, 0, 0)),
+                CornerRadius = new CornerRadius(4),
+                Padding      = new Thickness(6, 2, 6, 2),
+                Child        = inner
+            };
+        }
+        else
+        {
+            timeRight = new TextBlock();
+        }
+
+        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(timeLeft,  0);
+        Grid.SetColumn(timeRight, 1);
+        timeRow.Children.Add(timeLeft);
+        timeRow.Children.Add(timeRight);
+
+        var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
+        infoPanel.Children.Add(headerRow);
+        infoPanel.Children.Add(progress);
+        infoPanel.Children.Add(timeRow);
+
+        var cardGrid = new Grid { Margin = new Thickness(16, 12, 16, 12) };
+        cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        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(infoPanel, 2);
+        cardGrid.Children.Add(gauge);
+        cardGrid.Children.Add(infoPanel);
+
+        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           = cardGrid,
+        };
+
+        var sectionLabel = new TextBlock
+        {
+            Text   = limit.WindowLabel,
+            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;
+    }
+
+    private static UIElement BuildDiarySection(AgentLimit limit)
+    {
+        var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
+
+        var statsRow = new Grid { Margin = new Thickness(12, 10, 12, 6) };
+        statsRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        statsRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        var samplesText = new TextBlock
+        {
+            Text = $"{limit.BurnHistory.Count} samples",
+            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
+        };
+        var burnText = new TextBlock
+        {
+            Text = $"Avg burn rate: {limit.BurnRate:F1}%/h",
+            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
+        };
+        Grid.SetColumn(samplesText, 0);
+        Grid.SetColumn(burnText,    1);
+        statsRow.Children.Add(samplesText);
+        statsRow.Children.Add(burnText);
+
+        var sparkline = new SparklineControl
+        {
+            Height    = 40,
+            Margin    = new Thickness(8, 0, 8, 8),
+            LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
+            Data      = limit.BurnHistory,
+        };
+
+        var cardContent = new StackPanel();
+        cardContent.Children.Add(statsRow);
+        cardContent.Children.Add(sparkline);
+
+        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           = cardContent,
+        };
+
+        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(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        / 100.0) ?? (VM.ExtraUsage?.UsedCredits  / 100.0) ?? 0;
+        var limit   = (overage?.MonthlyCreditLimit / 100.0) ?? (VM.ExtraUsage?.MonthlyLimit / 100.0) ?? 0;
+        var balance = (prepaid?.Amount             / 100.0) ?? 0;
+
+        bool unlimited = overage?.MonthlyCreditLimit == null && VM.ExtraUsage?.MonthlyLimit == null;
+
+        UIElement MakeRow(string label, string value, bool highlight = false)
+        {
+            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 = highlight ? new SolidColorBrush(Color.FromRgb(0x4C, 0xAF, 0x50)) : 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}", spent > 0));
+        if (unlimited)      contentPanel.Children.Add(MakeRow("Limit",   "Unlimited"));
+        else 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.ExtraUsage) or nameof(UsageViewModel.Overage) or nameof(UsageViewModel.Prepaid))
+        {
+            RebuildCards();
+            UpdateFooter();
+        }
+        if (prop is nameof(UsageViewModel.IsSignedIn) or nameof(UsageViewModel.UserEmail))
+        {
+            InitSettings();
+        }
+    }
+
+    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))
+            UpdateStatusText.Text = Updater.StatusMessage;
+        if (prop is nameof(UpdateManager.UpdateComplete) && Updater.UpdateComplete)
+            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;
+        UpdateBanner.Visibility = visible ? Visibility.Visible : Visibility.Collapsed;
+        if (visible) UpdateBannerTitle.Text = $"Update available — v{Updater.LatestVersion}";
+    }
+
+    private void UpdateFooter()
+    {
+        if (VM.LastUpdated.HasValue)
+        {
+            var diff = DateTime.Now - VM.LastUpdated.Value;
+            string age;
+            if (diff.TotalSeconds < 10)
+                age = "just now";
+            else if (diff.TotalMinutes < 1)
+                age = $"{(int)diff.TotalSeconds} sec ago";
+            else
+                age = $"{(int)diff.TotalMinutes} min, {diff.Seconds} sec ago";
+            LastUpdatedText.Text = $"Updated {age}";
+        }
+        else
+        {
+            LastUpdatedText.Text = "Not yet updated";
+        }
+        LoadingBar.Visibility = VM.IsLoading ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    // ── Settings ─────────────────────────────────────────────────────
+
+    private static readonly (string Label, int Seconds)[] RefreshIntervals =
+    [
+        ("1 min",  60),
+        ("2 min",  120),
+        ("3 min",  180),
+        ("4 min",  240),
+        ("5 min",  300),
+        ("10 min", 600),
+    ];
+
+    private void InitSettings()
+    {
+        VersionLabel.Text    = $"v{Updater.CurrentVersion}";
+        BetaToggle.IsChecked = Updater.BetaChannel;
+        UpdateAboutSection();
+
+        RefreshPicker.SelectionChanged -= RefreshPicker_Changed;
+        RefreshPicker.Items.Clear();
+        int selectIdx = 1;
+        for (int i = 0; i < RefreshIntervals.Length; i++)
+        {
+            var (label, seconds) = RefreshIntervals[i];
+            RefreshPicker.Items.Add(new ComboBoxItem { Content = label, Tag = seconds });
+            if (seconds == VM.RefreshInterval) selectIdx = i;
+        }
+        RefreshPicker.SelectedIndex = selectIdx;
+        RefreshPicker.SelectionChanged += RefreshPicker_Changed;
+
+        AuthPanel.Children.Clear();
+        var dot = new System.Windows.Shapes.Ellipse
+        {
+            Width = 7, Height = 7, Margin = new Thickness(0, 0, 6, 0),
+            Fill = VM.IsSignedIn ? Brushes.LimeGreen : Brushes.Orange,
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+        var label2 = new TextBlock
+        {
+            Text = VM.IsSignedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
+            FontSize = 13, FontWeight = FontWeights.SemiBold,
+            Foreground = (SolidColorBrush)Application.Current.Resources["TextBrush"],
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+        var authRow = new StackPanel { Orientation = Orientation.Horizontal };
+        authRow.Children.Add(dot);
+        authRow.Children.Add(label2);
+        AuthPanel.Children.Add(authRow);
+
+        SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
+        SignInButton.Content     = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
+    }
+
+    // ── Diagnostics ──────────────────────────────────────────────────
+
+    private void Diagnostics_Click(object s, RoutedEventArgs e)
+    {
+        RebuildDiag();
+        MainPanel.Visibility        = Visibility.Collapsed;
+        SettingsPanel.Visibility    = Visibility.Collapsed;
+        UpdatePanel.Visibility      = Visibility.Collapsed;
+        DiagnosticsPanel.Visibility = Visibility.Visible;
+    }
+
+    private void BackFromDiag_Click(object s, RoutedEventArgs e)
+    {
+        DiagnosticsPanel.Visibility = Visibility.Collapsed;
+        SettingsPanel.Visibility    = Visibility.Visible;
+    }
+
+    private void CopyDiag_Click(object s, RoutedEventArgs e)
+    {
+        var diagText = BuildDiagText();
+        for (int i = 0; i < 5; i++)
+        {
+            try { Clipboard.SetText(diagText); break; }
+            catch (Exception) { System.Threading.Thread.Sleep(100); }
+        }
+        CopyDiagButton.Content = "Copied! (IDs redacted)";
+        var t = new DispatcherTimer { Interval = TimeSpan.FromSeconds(1.5) };
+        t.Tick += (_, _) => { CopyDiagButton.Content = "Copy All"; t.Stop(); };
+        t.Start();
+    }
+
+    private void RebuildDiag()
+    {
+        DiagContentPanel.Children.Clear();
+        var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
+        var text      = (SolidColorBrush)Application.Current.Resources["TextBrush"];
+
+        FrameworkElement MakeRow(string label, string value)
+        {
+            var grid = new Grid { Margin = new Thickness(0, 3, 0, 3) };
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(110) });
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+            var lbl = new TextBlock
+            {
+                Text = label, FontSize = 11, Foreground = secondary,
+                VerticalAlignment = VerticalAlignment.Top,
+            };
+            var val = new TextBlock
+            {
+                Text = value, FontSize = 11, FontFamily = new FontFamily("Consolas"),
+                Foreground = text, TextWrapping = TextWrapping.Wrap,
+            };
+            Grid.SetColumn(lbl, 0);
+            Grid.SetColumn(val, 1);
+            grid.Children.Add(lbl);
+            grid.Children.Add(val);
+            return grid;
+        }
+
+        void AddSection(string title, IEnumerable<FrameworkElement> rows)
+        {
+            DiagContentPanel.Children.Add(new TextBlock
+            {
+                Text = title, Style = (Style)Application.Current.Resources["HeaderText"],
+                Margin = new Thickness(0, 12, 0, 6),
+            });
+            var panel = new StackPanel { Margin = new Thickness(12, 10, 12, 10) };
+            foreach (var row in rows) panel.Children.Add(row);
+            DiagContentPanel.Children.Add(new Border
+            {
+                Background      = (SolidColorBrush)Application.Current.Resources["CardBrush"],
+                CornerRadius    = new CornerRadius(6),
+                BorderBrush     = border, BorderThickness = new Thickness(1),
+                Child           = panel,
+            });
+        }
+
+        // APP
+        AddSection("APP",
+        [
+            MakeRow("Version",       Updater.CurrentVersion),
+            MakeRow("Signed in",     VM.IsSignedIn ? "Yes" : "No"),
+            MakeRow("Org ID",        string.IsNullOrEmpty(VM.DiagOrgId)          ? "(none)"     : VM.DiagOrgId),
+            MakeRow("lastActiveOrg", string.IsNullOrEmpty(VM.DiagLastActiveOrg)  ? "(not read)" : VM.DiagLastActiveOrg),
+            MakeRow("Error",         VM.ErrorMessage ?? "(none)"),
+        ]);
+
+        // LAST REQUEST
+        var reqRows = new List<FrameworkElement>
+        {
+            MakeRow("Path",   string.IsNullOrEmpty(VM.DiagLastPath)  ? "(none)" : VM.DiagLastPath),
+            MakeRow("Status", VM.DiagLastStatus == 0 ? "(none)" : VM.DiagLastStatus.ToString()),
+            MakeRow("Error",  string.IsNullOrEmpty(VM.DiagLastError) ? "(none)" : VM.DiagLastError),
+        };
+        if (VM.DiagLastFetch.HasValue)
+            reqRows.Add(MakeRow("Time", VM.DiagLastFetch.Value.ToString("HH:mm:ss")));
+        AddSection("LAST REQUEST", reqRows);
+
+        // STORED COOKIE NAMES
+        var storedNames = GetStoredCookieNames();
+        var nameRows = new List<FrameworkElement>();
+        if (storedNames.Count == 0)
+        {
+            nameRows.Add(MakeRow("(none)", ""));
+        }
+        else
+        {
+            var claudeC = storedNames.Where(c =>
+                c.Domain.Contains("claude.ai") || c.Domain.Contains("anthropic.com")).ToList();
+            var otherC  = storedNames.Where(c =>
+                !c.Domain.Contains("claude.ai") && !c.Domain.Contains("anthropic.com")).ToList();
+            foreach (var c in claudeC)
+                nameRows.Add(MakeRow(c.Domain, c.Name));
+            if (otherC.Count > 0)
+                nameRows.Add(MakeRow($"other ({otherC.Count})",
+                    string.Join(", ", otherC.Take(5).Select(c => c.Name))));
+        }
+        AddSection("STORED COOKIE NAMES", nameRows);
+    }
+
+    private static List<(string Name, string Domain)> GetStoredCookieNames()
+    {
+        try
+        {
+            var raw = AppSettings.Default.CookieStore;
+            if (string.IsNullOrEmpty(raw)) return [];
+            using var doc = JsonDocument.Parse(raw);
+            var list = new List<(string Name, string Domain)>();
+            foreach (var elem in doc.RootElement.EnumerateArray())
+            {
+                var name   = elem.TryGetProperty("Name",   out var n) ? n.GetString() ?? "" : "";
+                var domain = elem.TryGetProperty("Domain", out var d) ? d.GetString() ?? "" : "";
+                list.Add((name, domain));
+            }
+            return list;
+        }
+        catch { return []; }
+    }
+
+    private static string BuildDiagText()
+    {
+        var storedNames = GetStoredCookieNames();
+        var sb = new StringBuilder();
+        sb.AppendLine("=== ClaudeChecker Diagnostics (Windows) ===");
+        sb.AppendLine($"Version: {Updater.CurrentVersion}");
+        sb.AppendLine($"Signed in: {(VM.IsSignedIn ? "Yes" : "No")}");
+        sb.AppendLine($"Org ID: {(string.IsNullOrEmpty(VM.DiagOrgId) ? "(none)" : VM.DiagOrgId)}");
+        sb.AppendLine($"lastActiveOrg: {(string.IsNullOrEmpty(VM.DiagLastActiveOrg) ? "(not read)" : VM.DiagLastActiveOrg)}");
+        sb.AppendLine($"Error: {VM.ErrorMessage ?? "(none)"}");
+        sb.AppendLine();
+        sb.AppendLine($"Last path: {VM.DiagLastPath}");
+        sb.AppendLine($"Last status: {VM.DiagLastStatus}");
+        sb.AppendLine($"Last error: {(string.IsNullOrEmpty(VM.DiagLastError) ? "(none)" : VM.DiagLastError)}");
+        if (VM.DiagLastFetch.HasValue)
+            sb.AppendLine($"Last fetch: {VM.DiagLastFetch.Value:HH:mm:ss}");
+        sb.AppendLine();
+        sb.AppendLine();
+        sb.AppendLine("Stored cookies:");
+        foreach (var c in storedNames)
+            sb.AppendLine($"  {c.Domain}  {c.Name}");
+        return RedactUUIDs(sb.ToString());
+    }
+
+    private static string RedactUUIDs(string text) =>
+        Regex.Replace(text, @"[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}", "****");
+
+    // ── Event handlers ───────────────────────────────────────────────
+
+    private void Settings_Click(object s, RoutedEventArgs e)
+    {
+        InitSettings();
+        MainPanel.Visibility        = Visibility.Collapsed;
+        SettingsPanel.Visibility    = Visibility.Visible;
+        UpdatePanel.Visibility      = Visibility.Collapsed;
+        DiagnosticsPanel.Visibility = Visibility.Collapsed;
+    }
+
+    private void BackFromSettings_Click(object s, RoutedEventArgs e) => ShowMain();
+
+    private void ShowMain()
+    {
+        MainPanel.Visibility        = Visibility.Visible;
+        SettingsPanel.Visibility    = Visibility.Collapsed;
+        UpdatePanel.Visibility      = Visibility.Collapsed;
+        DiagnosticsPanel.Visibility = Visibility.Collapsed;
+    }
+
+    private async void Refresh_Click(object s, RoutedEventArgs e) => await VM.RefreshAsync();
+
+    private void UpdateBanner_Click(object s, RoutedEventArgs e) => ShowUpdatePanel();
+
+    private void ShowUpdatePanel()
+    {
+        CurrentVerLabel.Text  = $"v{Updater.CurrentVersion}";
+        NewVerLabel.Text      = $"v{Updater.LatestVersion}";
+        ReleaseNotesText.Text = Updater.ReleaseNotes;
+        MainPanel.Visibility        = Visibility.Collapsed;
+        SettingsPanel.Visibility    = Visibility.Collapsed;
+        UpdatePanel.Visibility      = Visibility.Visible;
+        DiagnosticsPanel.Visibility = Visibility.Collapsed;
+    }
+
+    private void CloseUpdate_Click(object s, RoutedEventArgs e) => ShowMain();
+
+    private async void Install_Click(object s, RoutedEventArgs e)
+    {
+        NotNowButton.Visibility     = Visibility.Collapsed;
+        UpdateStatusText.Visibility = Visibility.Visible;
+        UpdateProgress.Visibility   = Visibility.Visible;
+        await Updater.DownloadAndInstallAsync();
+    }
+
+    private async void SignIn_Click(object s, RoutedEventArgs e)
+    {
+        var login = new LoginWindow { Owner = this };
+        if (login.ShowDialog() == true)
+        {
+            await VM.LoadFromCacheAsync();
+            InitSettings();
+            ShowMain();
+
+            _ = Task.Run(async () =>
+            {
+                await Task.Delay(3000);
+                await VM.RefreshAsync();
+                await Application.Current.Dispatcher.InvokeAsync(InitSettings);
+            });
+        }
+        Show();
+        Activate();
+    }
+
+    private async void SignOut_Click(object s, RoutedEventArgs e)
+    {
+        await VM.SignOutAsync();
+        InitSettings();
+    }
+
+    private void BetaToggle_Changed(object s, RoutedEventArgs e)
+    {
+        Updater.BetaChannel = BetaToggle.IsChecked == true;
+        _ = Updater.CheckForUpdatesAsync();
+    }
+
+    private void RefreshPicker_Changed(object s, SelectionChangedEventArgs e)
+    {
+        if (RefreshPicker.SelectedItem is ComboBoxItem item && item.Tag is int seconds)
+        {
+            VM.RefreshInterval = seconds;
+            ((App)Application.Current).ScheduleTimer(seconds);
+        }
+    }
+
+    private async void CheckUpdate_Click(object s, RoutedEventArgs e)
+    {
+        if (Updater.UpdateAvailable) { ShowUpdatePanel(); return; }
+        CheckUpdateButton.Content = "…";
+        await Updater.CheckForUpdatesAsync();
+        CheckUpdateButton.Content = Updater.UpdateAvailable ? "Install" : "Check";
+    }
+}

windows/Properties/Settings.settings

@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)"/>
+  </Profiles>
+  <Settings>
+    <Setting Name="CookieStore" Type="System.String" Scope="User">
+      <Value Profile="(Default)"></Value>
+    </Setting>
+    <Setting Name="BurnHistory" Type="System.String" Scope="User">
+      <Value Profile="(Default)"></Value>
+    </Setting>
+    <Setting Name="RefreshInterval" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">120</Value>
+    </Setting>
+    <Setting Name="ShowInTaskbar" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="BetaChannel" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+  </Settings>
+</SettingsFile>

windows/README.md

@@ -0,0 +1,50 @@
+# ClaudeChecker for Windows
+
+A native Windows port of ClaudeChecker — a system tray app for monitoring your Claude AI usage limits in real time.
+
+## Requirements
+
+- Windows 10 / 11 (x64)
+- [.NET 8 Runtime](https://dotnet.microsoft.com/download/dotnet/8.0)
+- [WebView2 Runtime](https://developer.microsoft.com/microsoft-edge/webview2/) (usually pre-installed on Windows 11)
+
+## Building
+
+```powershell
+cd windows
+dotnet build -c Release
+```
+
+The output is a single `ClaudeChecker.exe` in `bin\Release\net8.0-windows\`.
+
+> **Assets:** You need to supply `Assets/icon.ico` and `Assets/icon.png` (128×128) before building.
+> Copy them from the macOS project's `ClaudeChecker/Assets.xcassets/AppIcon.appiconset/`.
+
+## Features
+
+- System tray icon — left-click to show/hide the popup
+- 5-hour and 7-day usage gauges with burn rate sparklines
+- Cookie-based auth via embedded WebView2 browser (sign in once, session persists)
+- Auto-refresh on a configurable interval (1–10 min)
+- Update checking against the same `version.json` / `version-beta.json` as the macOS app
+- Beta channel toggle
+- Settings panel (auth, refresh interval, update channel)
+
+## Architecture
+
+| File | Purpose |
+|---|---|
+| `App.xaml.cs` | Tray icon, popup lifecycle, refresh timer |
+| `PopupWindow.xaml/cs` | Main UI — limit cards, settings, update sheet |
+| `LoginWindow.xaml/cs` | WebView2 browser for claude.ai auth |
+| `UsageViewModel.cs` | Data fetching, cookie handling, state |
+| `UpdateManager.cs` | Version checking, download and install |
+| `Models.cs` | Data models |
+| `Controls/GaugeControl.cs` | Custom circular gauge |
+| `Controls/SparklineControl.cs` | Burn history sparkline |
+
+## Notes
+
+- Cookies are stored in user settings (via `Properties.Settings`), not the WebView2 profile, so they survive WebView2 cache clears.
+- Updates download a `.zip`, extract, and run a `.bat` script that replaces the exe after the app exits.
+- The popup positions itself in the bottom-right corner near the system tray.

windows/RELEASE_NOTES.md

@@ -0,0 +1,23 @@
+## What's new in beta.49
+
+### Architecture
+- All data (usage, plan, overage, prepaid credits) now fetched via the persistent background WebView2 — the same always-live session as the macOS app, so Cloudflare cookies never expire between refreshes
+- HttpClient path kept only as a brief startup fallback before the browser is ready
+- Settings file simplified: only stores session signal, burn history, and user preferences — no more cached API responses
+
+### Bug fixes
+- Plan label (e.g. "Pro") now updates on every refresh, not just at login
+- Extra Usage Credits values now correct (were 100× too large)
+- Limit and balance now update live on every refresh
+- Refresh interval dropdown now shows "1 min", "2 min" etc. correctly
+- ComboBox no longer flashes bright blue when clicked
+- Buttons now show a visible pressed state
+- Footer "Updated X ago" counter now ticks every second; shows "X min, Y sec ago" past 60 s
+- Removed stray sparkline bars from the 5 h and 7 d limit cards
+- App window now shown on launch
+
+### UI improvements
+- Gauge percentage larger, "used" label removed
+- Each limit card now shows an "after reset" or "today HH:MM" badge
+- Session Diary card redesigned to match macOS layout (stats row + sparkline, no Claude header)
+- Reset date moved inline with time remaining

windows/ThemeManager.cs

@@ -0,0 +1,81 @@
+using Microsoft.Win32;
+using System;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Threading;
+
+namespace ClaudeCheckerWindows;
+
+public static class ThemeManager
+{
+    public static bool IsDark { get; private set; }
+    public static event Action? ThemeChanged;
+
+    public static void Initialize()
+    {
+        IsDark = ReadIsDark();
+        Apply();
+
+        var timer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(5) };
+        timer.Tick += (_, _) =>
+        {
+            var nowDark = ReadIsDark();
+            if (nowDark == IsDark) return;
+            IsDark = nowDark;
+            Apply();
+            ThemeChanged?.Invoke();
+        };
+        timer.Start();
+    }
+
+    private static bool ReadIsDark()
+    {
+        try
+        {
+            using var key = Registry.CurrentUser.OpenSubKey(
+                @"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
+            return (int)(key?.GetValue("AppsUseLightTheme") ?? 1) == 0;
+        }
+        catch { return false; }
+    }
+
+    private static void Apply()
+    {
+        var res = Application.Current.Resources;
+        if (IsDark)
+        {
+            Set(res, "BackgroundBrush",   Color.FromRgb(0x1C, 0x1C, 0x1E));
+            Set(res, "CardBrush",         Color.FromRgb(0x2C, 0x2C, 0x2E));
+            Set(res, "TextBrush",         Color.FromRgb(0xF5, 0xF5, 0xF5));
+            Set(res, "SecondaryBrush",    Color.FromRgb(0x8A, 0x8A, 0x8E));
+            Set(res, "BorderBrush",       Color.FromRgb(0x3A, 0x3A, 0x3C));
+            Set(res, "BlueBrush",         Color.FromRgb(0x3B, 0x82, 0xF6));
+            Set(res, "ButtonBrush",       Color.FromRgb(0x3A, 0x3A, 0x3C));
+            Set(res, "SurfaceBrush",      Color.FromRgb(0x25, 0x25, 0x27));
+            Set(res, "BannerBgBrush",     Color.FromRgb(0x1A, 0x31, 0x52));
+            Set(res, "BannerBorderBrush", Color.FromRgb(0x2A, 0x4A, 0x72));
+            Set(res, "HoverBrush",        Color.FromRgb(0x4A, 0x4A, 0x4C));
+            Set(res, "BadgeBrush",        Color.FromRgb(0x3A, 0x3A, 0x3C));
+        }
+        else
+        {
+            Set(res, "BackgroundBrush",   Color.FromRgb(0xF3, 0xF3, 0xF3));
+            Set(res, "CardBrush",         Colors.White);
+            Set(res, "TextBrush",         Color.FromRgb(0x1C, 0x1C, 0x1C));
+            Set(res, "SecondaryBrush",    Color.FromRgb(0x6E, 0x6E, 0x6E));
+            Set(res, "BorderBrush",       Color.FromRgb(0xE0, 0xE0, 0xE0));
+            Set(res, "BlueBrush",         Color.FromRgb(0x00, 0x78, 0xD4));
+            Set(res, "ButtonBrush",       Colors.White);
+            Set(res, "SurfaceBrush",      Color.FromRgb(0xFA, 0xFA, 0xFA));
+            Set(res, "BannerBgBrush",     Color.FromRgb(0xE8, 0xF2, 0xFB));
+            Set(res, "BannerBorderBrush", Color.FromRgb(0xB3, 0xD6, 0xF5));
+            Set(res, "HoverBrush",        Color.FromRgb(0xEB, 0xEB, 0xEB));
+            Set(res, "BadgeBrush",        Color.FromRgb(0xF0, 0xF0, 0xF0));
+        }
+    }
+
+    private static void Set(ResourceDictionary res, string key, Color color)
+    {
+        res[key] = new SolidColorBrush(color);
+    }
+}

windows/UpdateManager.cs

@@ -0,0 +1,229 @@
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using System.IO;
+using System.Net.Http;
+using System.Text.Json;
+using System.Threading.Tasks;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Collections.Generic;
+using System.Windows;
+
+namespace ClaudeCheckerWindows;
+
+public class UpdateManager : INotifyPropertyChanged
+{
+    private const string StableUrl = "https://raw.githubusercontent.com/superdooper86/claudechecker/refs/heads/main/version-windows.json";
+    private const string BetaUrl   = "https://raw.githubusercontent.com/superdooper86/claudechecker/refs/heads/main/version-windows-beta.json";
+
+    private bool   _updateAvailable;
+    private string _latestVersion  = "";
+    private string _releaseNotes   = "";
+    private string _downloadUrl    = "";
+    private bool   _betaAvailable;
+    private string _latestBetaVersion = "";
+    private bool   _isDownloading;
+    private double _downloadProgress;
+    private string _statusMessage  = "";
+    private string? _updateError;
+    private bool   _updateComplete;
+
+    public bool   UpdateAvailable      { get => _updateAvailable;     set => Set(ref _updateAvailable, value); }
+    public string LatestVersion        { get => _latestVersion;       set => Set(ref _latestVersion, value); }
+    public string ReleaseNotes         { get => _releaseNotes;        set => Set(ref _releaseNotes, value); }
+    public string DownloadUrl          { get => _downloadUrl;         set => Set(ref _downloadUrl, value); }
+    public bool   BetaAvailable        { get => _betaAvailable;       set => Set(ref _betaAvailable, value); }
+    public string LatestBetaVersion    { get => _latestBetaVersion;   set => Set(ref _latestBetaVersion, value); }
+    public bool   IsDownloading        { get => _isDownloading;       set => Set(ref _isDownloading, value); }
+    public double DownloadProgress     { get => _downloadProgress;    set => Set(ref _downloadProgress, value); }
+    public string StatusMessage        { get => _statusMessage;       set => Set(ref _statusMessage, value); }
+    public string? UpdateError         { get => _updateError;         set => Set(ref _updateError, value); }
+    public bool   UpdateComplete       { get => _updateComplete;      set => Set(ref _updateComplete, value); }
+
+    private bool _betaChannel;
+    public bool BetaChannel
+    {
+        get => _betaChannel;
+        set
+        {
+            Set(ref _betaChannel, value);
+            AppSettings.Default.BetaChannel = value;
+            AppSettings.Default.Save();
+        }
+    }
+
+    public string CurrentVersion =>
+        System.Reflection.Assembly.GetExecutingAssembly()
+              .GetCustomAttribute<System.Reflection.AssemblyInformationalVersionAttribute>()
+              ?.InformationalVersion.Split('+')[0]
+              ?? "1.0.0";
+
+    private bool IsPreReleaseBuild => CurrentVersion.Contains('-');
+
+    public UpdateManager()
+    {
+        _betaChannel = AppSettings.Default.BetaChannel;
+    }
+
+    public async Task CheckForUpdatesAsync()
+    {
+        using var http = new HttpClient();
+        http.DefaultRequestHeaders.CacheControl =
+            new System.Net.Http.Headers.CacheControlHeaderValue { NoCache = true };
+
+        var stable = await FetchVersionAsync(http, StableUrl);
+        var beta   = await FetchVersionAsync(http, BetaUrl);
+
+        await Application.Current.Dispatcher.InvokeAsync(() =>
+        {
+            if (stable != null && IsNewer(stable.Version, CurrentVersion))
+            {
+                LatestVersion   = stable.Version;
+                ReleaseNotes    = stable.Notes ?? "";
+                DownloadUrl     = stable.Url;
+                UpdateAvailable = true;
+            }
+            else
+            {
+                UpdateAvailable = false;
+                LatestVersion   = "";
+            }
+
+            if (beta != null && IsNewer(beta.Version, CurrentVersion))
+            {
+                LatestBetaVersion = beta.Version;
+                BetaAvailable     = true;
+
+                // Show beta update if user opted in, or if they're already running a beta
+                if ((BetaChannel || IsPreReleaseBuild) && IsNewer(beta.Version, LatestVersion))
+                {
+                    LatestVersion   = beta.Version;
+                    ReleaseNotes    = beta.Notes ?? "";
+                    DownloadUrl     = beta.Url;
+                    UpdateAvailable = true;
+                }
+            }
+            else
+            {
+                BetaAvailable     = false;
+                LatestBetaVersion = "";
+            }
+        });
+    }
+
+    private static async Task<VersionInfo?> FetchVersionAsync(HttpClient http, string url)
+    {
+        try
+        {
+            var bust = $"{url}?t={DateTimeOffset.UtcNow.ToUnixTimeSeconds()}";
+            var json = await http.GetStringAsync(bust);
+            return JsonSerializer.Deserialize<VersionInfo>(json,
+                new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+        }
+        catch { return null; }
+    }
+
+    public async Task DownloadAndInstallAsync()
+    {
+        if (string.IsNullOrEmpty(DownloadUrl)) return;
+
+        IsDownloading  = true;
+        UpdateError    = null;
+        UpdateComplete = false;
+        StatusMessage  = "Downloading…";
+
+        try
+        {
+            var installerPath = Path.Combine(Path.GetTempPath(), $"ClaudeCheckerInstaller_{Guid.NewGuid():N}.exe");
+
+            using var http = new HttpClient();
+            var response   = await http.GetAsync(DownloadUrl, HttpCompletionOption.ResponseHeadersRead);
+            response.EnsureSuccessStatusCode();
+
+            var total    = response.Content.Headers.ContentLength ?? 0;
+            var received = 0L;
+
+            await using (var stream = await response.Content.ReadAsStreamAsync())
+            await using (var file   = File.Create(installerPath))
+            {
+                var buffer = new byte[81920];
+                int read;
+                while ((read = await stream.ReadAsync(buffer)) > 0)
+                {
+                    await file.WriteAsync(buffer.AsMemory(0, read));
+                    received += read;
+                    if (total > 0)
+                        DownloadProgress = (double)received / total;
+                }
+            }
+
+            DownloadProgress = 1.0;
+            StatusMessage    = "Installing…";
+            UpdateComplete   = true;
+
+            await Task.Delay(500);
+
+            Process.Start(new ProcessStartInfo
+            {
+                FileName        = installerPath,
+                Arguments       = "/SILENT /CLOSEAPPLICATIONS",
+                UseShellExecute = true,
+            });
+
+            Application.Current.Dispatcher.Invoke(() => Application.Current.Shutdown());
+        }
+        catch (Exception ex)
+        {
+            UpdateError   = ex.Message;
+            IsDownloading = false;
+            StatusMessage = "";
+        }
+    }
+
+    public static bool IsNewer(string version, string current)
+    {
+        static (int[] Base, int[]? Pre) Parse(string v)
+        {
+            if (string.IsNullOrEmpty(v)) return ([], null);
+            var halves = v.Split('-', 2);
+            var baseP  = Array.ConvertAll(halves[0].Split('.'), p => int.TryParse(p, out var n) ? n : 0);
+            int[]? pre = halves.Length > 1
+                ? Array.ConvertAll(halves[1].Split('.'), p => int.TryParse(p, out var n) ? n : 0)
+                : null;
+            return (baseP, pre);
+        }
+
+        var (ab, ap) = Parse(version);
+        var (bb, bp) = Parse(current);
+
+        for (var i = 0; i < Math.Max(ab.Length, bb.Length); i++)
+        {
+            var av = i < ab.Length ? ab[i] : 0;
+            var bv = i < bb.Length ? bb[i] : 0;
+            if (av != bv) return av > bv;
+        }
+
+        if (ap == null && bp != null) return true;
+        if (ap != null && bp == null) return false;
+        if (ap != null && bp != null)
+        {
+            for (var i = 0; i < Math.Max(ap.Length, bp.Length); i++)
+            {
+                var av = i < ap.Length ? ap[i] : 0;
+                var bv = i < bp.Length ? bp[i] : 0;
+                if (av != bv) return av > bv;
+            }
+        }
+        return false;
+    }
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+    private void Set<T>(ref T field, T value, [CallerMemberName] string? name = null)
+    {
+        if (EqualityComparer<T>.Default.Equals(field, value)) return;
+        field = value;
+        Application.Current.Dispatcher.InvokeAsync(()
+            => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name)));
+    }
+}

windows/UsageViewModel.cs

@@ -0,0 +1,609 @@
+using Microsoft.Web.WebView2.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Net.Http;
+using System.Runtime.CompilerServices;
+using System.Text.Json;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace ClaudeCheckerWindows;
+
+public class UsageViewModel : INotifyPropertyChanged
+{
+    private static readonly JsonSerializerOptions JsonOpts = new() { PropertyNameCaseInsensitive = true };
+
+    private List<AgentLimit> _limits = [];
+    private bool _isLoading;
+    private string? _errorMessage;
+    private bool _isSignedIn;
+    private string _userEmail = "";
+    private string _planLabel = "Claude";
+    private DateTime? _lastUpdated;
+    private OverageSpendLimit? _overage;
+    private PrepaidCredits? _prepaid;
+    private ExtraUsage? _extraUsage;
+
+    private readonly Dictionary<string, List<double>> _burnHistory = [];
+    private const int MaxHistorySamples = 24;
+
+    public List<AgentLimit> Limits          { get => _limits;       set => Set(ref _limits, value); }
+    public bool IsLoading                   { get => _isLoading;    set => Set(ref _isLoading, value); }
+    public string? ErrorMessage             { get => _errorMessage; set => Set(ref _errorMessage, value); }
+    public bool IsSignedIn                  { get => _isSignedIn;   set => Set(ref _isSignedIn, value); }
+    public string UserEmail                 { get => _userEmail;    set => Set(ref _userEmail, value); }
+    public string PlanLabel                 { get => _planLabel;    set => Set(ref _planLabel, value); }
+    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); }
+
+    // Diagnostics — updated after each refresh, read by DiagnosticsPanel on demand
+    public string       DiagLastActiveOrg     { get; private set; } = "";
+    public string       DiagOrgId             { get; private set; } = "";
+    public string       DiagLastPath          { get; private set; } = "";
+    public int          DiagLastStatus        { get; private set; }
+    public string       DiagLastError         { get; private set; } = "";
+    public int          DiagCookieCount       { get; private set; }
+    public int          DiagClaudeCookieCount { get; private set; }
+    public List<string> DiagCookieDomains     { get; private set; } = [];
+    public DateTime?    DiagLastFetch         { get; private set; }
+
+    private int _refreshInterval = 120;
+    public int RefreshInterval
+    {
+        get => _refreshInterval;
+        set
+        {
+            Set(ref _refreshInterval, value);
+            AppSettings.Default.RefreshInterval = value;
+            AppSettings.Default.Save();
+        }
+    }
+
+    private bool _showInTaskbar = true;
+    public bool ShowInTaskbar
+    {
+        get => _showInTaskbar;
+        set
+        {
+            Set(ref _showInTaskbar, value);
+            AppSettings.Default.ShowInTaskbar = value;
+            AppSettings.Default.Save();
+        }
+    }
+
+    public UsageViewModel()
+    {
+        _refreshInterval = AppSettings.Default.RefreshInterval > 0
+            ? AppSettings.Default.RefreshInterval : 120;
+        _showInTaskbar = AppSettings.Default.ShowInTaskbar;
+        LoadBurnHistory();
+        LoadPlaceholders();
+    }
+
+    public async Task RefreshAsync()
+    {
+        await Application.Current.Dispatcher.InvokeAsync(() => IsLoading = true);
+
+        // Snapshot stored cookies once — used for both diag and HttpClient fallback path.
+        var storedCookies = await GetCookiesAsync();
+
+        try
+        {
+            // CookieStore being non-empty is our signal that the user has signed in.
+            if (string.IsNullOrEmpty(AppSettings.Default.CookieStore))
+            {
+                await Application.Current.Dispatcher.InvokeAsync(() =>
+                {
+                    IsSignedIn   = false;
+                    ErrorMessage = "Not signed in — click Sign In to authenticate.";
+                    IsLoading    = false;
+                });
+                return;
+            }
+
+            List<AgentLimit> limits    = [];
+            OverageSpendLimit? overage = null;
+            PrepaidCredits?    prepaid = null;
+            ExtraUsage?     extraUsage = null;
+            string? email = null, orgId = null, planLabel = null;
+            string? refreshError = null;
+
+            // Primary: persistent background WebView2 — always-live cookies, same as macOS.
+            // Fallback: HttpClient with saved cookies, only if the browser isn't ready yet
+            // (the brief window while InitAsync is still navigating at startup).
+            if (App.BackgroundBrowser.IsReady)
+            {
+                try
+                {
+                    (limits, overage, prepaid, extraUsage, email, orgId, planLabel) =
+                        await TryBrowserRefreshAsync();
+                }
+                catch (Exception ex)
+                {
+                    refreshError = ex.Message;
+                }
+            }
+            else
+            {
+                if (storedCookies.Count > 0)
+                {
+                    try
+                    {
+                        (limits, overage, prepaid, extraUsage, email, orgId, planLabel, _) =
+                            await TryHttpRefreshAsync(storedCookies);
+                    }
+                    catch (Exception ex)
+                    {
+                        refreshError = ex.Message;
+                    }
+                }
+            }
+
+            foreach (var limit in limits)
+            {
+                var key = limit.Window.ToString();
+                if (!_burnHistory.ContainsKey(key)) _burnHistory[key] = [];
+                _burnHistory[key].Add(limit.UsedPercent);
+                if (_burnHistory[key].Count > MaxHistorySamples)
+                    _burnHistory[key].RemoveAt(0);
+                limit.BurnHistory = [.. _burnHistory[key]];
+            }
+            SaveBurnHistory();
+
+            await Application.Current.Dispatcher.InvokeAsync(() =>
+            {
+                if (limits.Count > 0)
+                {
+                    Limits    = limits;
+                    Overage   = overage;
+                    Prepaid   = prepaid;
+                    if (extraUsage != null) ExtraUsage = extraUsage;
+                }
+                if (!string.IsNullOrEmpty(planLabel)) PlanLabel = planLabel;
+                if (!string.IsNullOrEmpty(email))     UserEmail = email;
+                IsSignedIn   = true;
+                ErrorMessage = refreshError;
+                LastUpdated  = DateTime.Now;
+                IsLoading    = false;
+
+                // Update diagnostics
+                if (!string.IsNullOrEmpty(orgId)) DiagOrgId = orgId;
+                DiagLastFetch         = DateTime.Now;
+                DiagLastError         = refreshError ?? "";
+                DiagCookieCount       = storedCookies.Count;
+                DiagClaudeCookieCount = storedCookies.Count(c =>
+                    c.Domain.Contains("claude.ai") || c.Domain.Contains("anthropic.com"));
+                DiagCookieDomains     = storedCookies
+                    .Select(c => c.Domain).Distinct().OrderBy(d => d).ToList();
+            });
+        }
+        catch (Exception ex)
+        {
+            await Application.Current.Dispatcher.InvokeAsync(() =>
+            {
+                ErrorMessage = ex.Message;
+                IsLoading    = false;
+            });
+        }
+    }
+
+    // ── Browser-based refresh (primary) ───────────────────────────────────────
+    // Runs JS on the persistent claude.ai page. Same live cookies as macOS WKWebView.
+
+    private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, ExtraUsage?, string?, string?, string?)>
+        TryBrowserRefreshAsync()
+    {
+        // Read lastActiveOrg from document.cookie — the only reliable org source when the
+        // user belongs to multiple orgs. memberships[0] is always the "Individual Org" and
+        // would return 403 on usage endpoints if the paid plan is on a different org.
+        const string script = @"(async()=>{try{
+            const h={headers:{accept:'application/json'}};
+            const b=await(await fetch('/api/bootstrap',h)).json();
+            if(b?.error_type==='authentication_error'){window.chrome.webview.postMessage({authError:true});return;}
+            const lastActiveOrg=(document.cookie.split(';').map(c=>c.trim().split('=')).find(p=>p[0]==='lastActiveOrg')||[])[1]||null;
+            const allOrgs=(b?.account?.memberships||b?.memberships||[]).map(m=>m?.organization).filter(Boolean);
+            const activeOrg=(lastActiveOrg?allOrgs.find(o=>o?.uuid===lastActiveOrg):null)||allOrgs[0];
+            let id=activeOrg?.uuid||b?.organizations?.[0]?.uuid||null;
+            const email=b?.account?.email_address||b?.account?.email||null;
+            const caps=activeOrg?.capabilities||[];
+            const capStr=caps.find(c=>typeof c==='string'&&c.startsWith('claude_'))||null;
+            const planLabel=capStr?(capStr.slice(7,8).toUpperCase()+capStr.slice(8).toLowerCase()):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){window.chrome.webview.postMessage({noOrg:true,email});return;}
+            const [u,ov,pp]=await Promise.all([
+                fetch('/api/organizations/'+id+'/usage',h).then(r=>r.json()),
+                fetch('/api/organizations/'+id+'/overage_spend_limit',h).then(r=>r.ok?r.json():null).catch(()=>null),
+                fetch('/api/organizations/'+id+'/prepaid/credits',h).then(r=>r.ok?r.json():null).catch(()=>null)
+            ]);
+            window.chrome.webview.postMessage({email,orgId:id,planLabel,lastActiveOrg,usage:u,overage:ov,prepaid:pp});
+        }catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
+
+        var json = await Application.Current.Dispatcher.InvokeAsync(
+            () => App.BackgroundBrowser.RunScriptAsync(script)).Task.Unwrap();
+
+        if (string.IsNullOrEmpty(json) || json == "null")
+            throw new Exception("Browser refresh returned no data.");
+
+        using var doc = JsonDocument.Parse(json);
+        var root = doc.RootElement;
+
+        if (root.TryGetProperty("authError", out _))
+            throw new Exception("Session expired — please re-authenticate.");
+        if (root.TryGetProperty("error", out var errEl))
+            throw new Exception("Browser script error: " + errEl.GetString());
+        if (root.TryGetProperty("noOrg", out _))
+            throw new Exception("Could not determine organization ID.");
+
+        string? email     = root.TryGetProperty("email",     out var em) && em.ValueKind == JsonValueKind.String ? em.GetString() : null;
+        string? orgId     = root.TryGetProperty("orgId",     out var oi) && oi.ValueKind == JsonValueKind.String ? oi.GetString() : null;
+        string? planLabel = root.TryGetProperty("planLabel", out var pl) && pl.ValueKind == JsonValueKind.String ? pl.GetString() : null;
+        string? lao       = root.TryGetProperty("lastActiveOrg", out var laoProp) && laoProp.ValueKind == JsonValueKind.String ? laoProp.GetString() : null;
+
+        DiagLastActiveOrg = lao ?? "";
+        DiagLastPath      = $"/api/bootstrap + /api/organizations/…/usage (browser)";
+        DiagLastStatus    = 200;
+
+        UsageResponse?     usage       = null;
+        OverageSpendLimit? overage     = null;
+        PrepaidCredits?    prepaid     = null;
+
+        if (root.TryGetProperty("usage",   out var us) && us.ValueKind == JsonValueKind.Object)
+            usage   = JsonSerializer.Deserialize<UsageResponse>(us.GetRawText(), JsonOpts);
+        if (root.TryGetProperty("overage", out var ov) && ov.ValueKind == JsonValueKind.Object)
+            overage = JsonSerializer.Deserialize<OverageSpendLimit>(ov.GetRawText(), JsonOpts);
+        if (root.TryGetProperty("prepaid", out var pp) && pp.ValueKind == JsonValueKind.Object)
+            prepaid = JsonSerializer.Deserialize<PrepaidCredits>(pp.GetRawText(), JsonOpts);
+
+        return (BuildLimits(usage), overage, prepaid, usage?.ExtraUsage, email, orgId, planLabel);
+    }
+
+    // ── HttpClient refresh (fallback — before browser is ready) ──────────────
+
+    private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, ExtraUsage?, string?, string?, string?, bool)>
+        TryHttpRefreshAsync(List<(string Name, string Value, string Domain, string Path)> cookies)
+    {
+        // Prefer the org the user last had active, not necessarily memberships[0].
+        var lastActiveOrg = cookies.FirstOrDefault(c => c.Name == "lastActiveOrg").Value;
+        DiagLastActiveOrg = lastActiveOrg ?? "";
+
+        using var http = BuildClient(cookies);
+
+        var bootstrapResp = await http.GetAsync("https://claude.ai/api/bootstrap");
+        DiagLastPath   = "/api/bootstrap";
+        DiagLastStatus = (int)bootstrapResp.StatusCode;
+        if ((int)bootstrapResp.StatusCode is 401 or 403)
+            throw new Exception("Session expired — please re-authenticate.");
+        if (!bootstrapResp.IsSuccessStatusCode)
+            throw new Exception($"Bootstrap failed ({(int)bootstrapResp.StatusCode}).");
+
+        var bootstrapJson = await bootstrapResp.Content.ReadAsStringAsync();
+        var (email, orgId, planLabel) = ParseBootstrap(bootstrapJson, lastActiveOrg);
+
+        if (string.IsNullOrEmpty(orgId))
+            orgId = await FetchOrgIdFromListAsync(http);
+
+        if (string.IsNullOrEmpty(orgId))
+            return ([], null, null, null, email, orgId, planLabel, true);
+
+        var ut = http.GetAsync($"https://claude.ai/api/organizations/{orgId}/usage");
+        var ot = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
+        var pt = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
+        await Task.WhenAll(ut, ot, pt);
+
+        var usageResp = ut.Result;
+        DiagLastPath   = $"/api/organizations/{orgId}/usage";
+        DiagLastStatus = (int)usageResp.StatusCode;
+        if (!usageResp.IsSuccessStatusCode)
+            throw new Exception($"Usage fetch failed ({(int)usageResp.StatusCode}).");
+
+        var usageJson = await usageResp.Content.ReadAsStringAsync();
+        var usage     = JsonSerializer.Deserialize<UsageResponse>(usageJson, JsonOpts);
+
+        return (BuildLimits(usage), ot.Result, pt.Result, usage?.ExtraUsage, email, orgId, planLabel, true);
+    }
+
+    // ── Startup cache ─────────────────────────────────────────────────────────
+    // Called before the browser is ready. Sets sign-in state and shows placeholders
+    // with any previously accumulated burn history so the popup isn't blank.
+
+    public async Task LoadFromCacheAsync()
+    {
+        if (string.IsNullOrEmpty(AppSettings.Default.CookieStore)) return;
+
+        var placeholders = LoadPlaceholderLimits();
+        foreach (var limit in placeholders)
+        {
+            var key = limit.Window.ToString();
+            if (_burnHistory.TryGetValue(key, out var hist) && hist.Count > 0)
+                limit.BurnHistory = [.. hist];
+        }
+
+        await Application.Current.Dispatcher.InvokeAsync(() =>
+        {
+            Limits     = placeholders;
+            IsSignedIn = true;
+        });
+    }
+
+    public async Task SignOutAsync()
+    {
+        AppSettings.Default.CookieStore = "";
+        AppSettings.Default.Save();
+
+        await Application.Current.Dispatcher.InvokeAsync(() =>
+        {
+            IsSignedIn   = false;
+            UserEmail    = "";
+            PlanLabel    = "Claude";
+            ErrorMessage = "Signed out.";
+            Limits       = [];
+        });
+    }
+
+    public static async Task<List<(string Name, string Value, string Domain, string Path)>> GetCookiesAsync()
+    {
+        var raw = AppSettings.Default.CookieStore;
+        if (string.IsNullOrEmpty(raw)) return [];
+        try
+        {
+            return JsonSerializer.Deserialize<List<CookieEntry>>(raw)
+                ?.Select(c => (c.Name, c.Value, c.Domain, c.Path))
+                .ToList() ?? [];
+        }
+        catch { return []; }
+    }
+
+    public static void SaveCookies(IEnumerable<CoreWebView2Cookie> cookies)
+    {
+        var entries = cookies
+            .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);
+        AppSettings.Default.Save();
+    }
+
+    private static HttpClient BuildClient(List<(string Name, string Value, string Domain, string Path)> cookies)
+    {
+        var handler = new HttpClientHandler { UseCookies = false };
+        var http    = new HttpClient(handler);
+        http.DefaultRequestHeaders.Add("accept", "application/json");
+        http.DefaultRequestHeaders.Add("User-Agent",
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
+            "(KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36");
+        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;
+    }
+
+    private static async Task<T?> FetchAsync<T>(HttpClient http, string url) where T : class
+    {
+        try
+        {
+            var resp = await http.GetAsync(url);
+            if (!resp.IsSuccessStatusCode) return null;
+            var json = await resp.Content.ReadAsStringAsync();
+            return JsonSerializer.Deserialize<T>(json, JsonOpts);
+        }
+        catch { return null; }
+    }
+
+    // Parses bootstrap JSON and returns email, org ID, and plan label.
+    // preferredOrgId (from the lastActiveOrg cookie) selects the correct org when the
+    // user belongs to multiple — memberships[0] is always the "Individual Org" which
+    // returns 403 on usage endpoints if the paid plan is on a different org.
+    private static (string? Email, string? OrgId, string? PlanLabel) ParseBootstrap(string json, string? preferredOrgId = null)
+    {
+        try
+        {
+            using var doc = JsonDocument.Parse(json);
+            var root = doc.RootElement;
+
+            string? email = null;
+            if (root.TryGetProperty("account", out var acct) &&
+                acct.TryGetProperty("email_address", out var em))
+                email = em.GetString();
+
+            // Collect all org objects from memberships
+            var allOrgs = new List<JsonElement>();
+            if (root.TryGetProperty("account", out var acctNode) &&
+                acctNode.TryGetProperty("memberships", out var mems))
+            {
+                foreach (var mem in mems.EnumerateArray())
+                    if (mem.TryGetProperty("organization", out var org))
+                        allOrgs.Add(org);
+            }
+            if (allOrgs.Count == 0 && root.TryGetProperty("memberships", out var rootMems))
+            {
+                foreach (var mem in rootMems.EnumerateArray())
+                    if (mem.TryGetProperty("organization", out var org))
+                        allOrgs.Add(org);
+            }
+
+            // Prefer the org matching preferredOrgId, fall back to first
+            JsonElement activeOrg = default;
+            if (!string.IsNullOrEmpty(preferredOrgId))
+            {
+                foreach (var org in allOrgs)
+                {
+                    if (org.TryGetProperty("uuid", out var u) && u.GetString() == preferredOrgId)
+                    {
+                        activeOrg = org;
+                        break;
+                    }
+                }
+            }
+            if (activeOrg.ValueKind == JsonValueKind.Undefined && allOrgs.Count > 0)
+                activeOrg = allOrgs[0];
+
+            string? orgId = null;
+            if (activeOrg.ValueKind != JsonValueKind.Undefined &&
+                activeOrg.TryGetProperty("uuid", out var uuid))
+                orgId = uuid.GetString();
+
+            if (string.IsNullOrEmpty(orgId) &&
+                root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
+            {
+                if (orgs[0].TryGetProperty("uuid", out var u))
+                    orgId = u.GetString();
+            }
+
+            string? planLabel = null;
+            if (activeOrg.ValueKind != JsonValueKind.Undefined &&
+                activeOrg.TryGetProperty("capabilities", out var caps) &&
+                caps.ValueKind == JsonValueKind.Array)
+            {
+                foreach (var cap in caps.EnumerateArray())
+                {
+                    var s = cap.GetString() ?? "";
+                    if (s.StartsWith("claude_", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var name = s.Substring("claude_".Length);
+                        if (name.Length > 0)
+                            planLabel = char.ToUpper(name[0]) + name.Substring(1).ToLower();
+                        break;
+                    }
+                }
+            }
+            return (email, orgId, planLabel);
+        }
+        catch { return (null, null, null); }
+    }
+
+    private static async Task<string?> FetchOrgIdFromListAsync(HttpClient http)
+    {
+        try
+        {
+            var resp = await http.GetAsync("https://claude.ai/api/organizations");
+            if (!resp.IsSuccessStatusCode) return null;
+            var json = await resp.Content.ReadAsStringAsync();
+            using var doc = JsonDocument.Parse(json);
+            var root = doc.RootElement;
+            if (root.ValueKind == JsonValueKind.Array && root.GetArrayLength() > 0)
+            {
+                var first = root[0];
+                if (first.TryGetProperty("uuid", out var uuid))
+                    return uuid.GetString();
+            }
+            return null;
+        }
+        catch { return null; }
+    }
+
+    private static List<AgentLimit> BuildLimits(UsageResponse? usage)
+    {
+        if (usage == null) return [];
+        var now    = DateTime.Now;
+        var result = new List<AgentLimit>();
+
+        if (usage.FiveHour != null)
+        {
+            var reset = ParseDate(usage.FiveHour.ResetsAt, now);
+            var pct   = Math.Clamp(usage.FiveHour.Utilization, 0, 100);
+            result.Add(new AgentLimit
+            {
+                Window        = WindowKind.FiveHour,
+                UsedPercent   = pct,
+                TimeRemaining = TimeLeft(reset, now),
+                ResetDate     = reset,
+                BurnRate      = pct / 5.0,
+                IsLive        = true,
+            });
+        }
+
+        if (usage.SevenDay != null)
+        {
+            var reset = ParseDate(usage.SevenDay.ResetsAt, now);
+            var pct   = Math.Clamp(usage.SevenDay.Utilization, 0, 100);
+            result.Add(new AgentLimit
+            {
+                Window        = WindowKind.SevenDay,
+                UsedPercent   = pct,
+                TimeRemaining = TimeLeft(reset, now),
+                ResetDate     = reset,
+                BurnRate      = pct / (7 * 24.0),
+                IsLive        = true,
+            });
+        }
+
+        return result;
+    }
+
+    private static DateTime ParseDate(string? s, DateTime fallback)
+    {
+        if (s == null) return fallback.AddHours(1);
+        return DateTime.TryParse(s, null, System.Globalization.DateTimeStyles.RoundtripKind, out var d)
+            ? d.ToLocalTime() : fallback.AddHours(1);
+    }
+
+    private static string TimeLeft(DateTime reset, DateTime now)
+    {
+        var diff = reset - now;
+        if (diff <= TimeSpan.Zero) return "resetting...";
+        if (diff.TotalDays >= 1)
+            return $"{(int)diff.TotalDays}d {diff.Hours}h";
+        return $"{diff.Hours}h {diff.Minutes}m";
+    }
+
+    private static List<AgentLimit> LoadPlaceholderLimits()
+    {
+        var now = DateTime.Now;
+        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
+        {
+            var raw = AppSettings.Default.BurnHistory;
+            if (string.IsNullOrEmpty(raw)) return;
+            var saved = JsonSerializer.Deserialize<Dictionary<string, List<double>>>(raw);
+            if (saved != null)
+                foreach (var kv in saved) _burnHistory[kv.Key] = kv.Value;
+        }
+        catch { }
+    }
+
+    private void SaveBurnHistory()
+    {
+        AppSettings.Default.BurnHistory = JsonSerializer.Serialize(_burnHistory);
+        AppSettings.Default.Save();
+    }
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+    private void Set<T>(ref T field, T value, [CallerMemberName] string? name = null)
+    {
+        if (EqualityComparer<T>.Default.Equals(field, value)) return;
+        field = value;
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
+    }
+
+    private class CookieEntry
+    {
+        public string Name   { get; set; } = "";
+        public string Value  { get; set; } = "";
+        public string Domain { get; set; } = "";
+        public string Path   { get; set; } = "/";
+    }
+}

windows/WebViewFetchWindow.cs

@@ -0,0 +1,145 @@
+using Microsoft.Web.WebView2.Core;
+using Microsoft.Web.WebView2.Wpf;
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace ClaudeCheckerWindows;
+
+// Invisible 1×1 window that hosts a WebView2 for authenticated API calls.
+// Uses the same user data folder as LoginWindow so the session (including
+// cf_clearance) is always shared and fresh — equivalent to macOS's WKWebsiteDataStore.
+//
+// Two usage modes:
+//   • Persistent (App.BackgroundBrowser): created once at startup, navigates to
+//     claude.ai once, then scripts run directly on the live page every refresh.
+//     No re-navigation = no memory accumulation.
+//   • One-shot (LoginWindow): created, used, closed — same as before.
+public sealed class WebViewFetchWindow : Window
+{
+    private readonly WebView2 _wv = new();
+    private bool _initialized;
+    private bool _readyForScript; // true after first navigation to claude.ai completes
+
+    private static readonly string UserDataFolder =
+        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            "ClaudeChecker", "WebView2");
+
+    public bool IsReady => _readyForScript;
+
+    public WebViewFetchWindow()
+    {
+        Width              = 1;
+        Height             = 1;
+        Left               = -9999;
+        Top                = -9999;
+        ShowInTaskbar      = false;
+        WindowStyle        = WindowStyle.None;
+        AllowsTransparency = true;
+        Opacity            = 0;
+        Content            = _wv;
+    }
+
+    // ── Persistent-mode init ──────────────────────────────────────────────────
+
+    // Call once at startup. Navigates to claude.ai so the session/cookies are
+    // established and cf_clearance is fresh. Subsequent RunScriptAsync calls
+    // skip navigation and just execute JS on the live page.
+    public async Task InitAsync()
+    {
+        await EnsureInitAsync();
+
+        var navDone = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+        EventHandler<CoreWebView2NavigationCompletedEventArgs>? h = null;
+        h = (_, e) => { _wv.CoreWebView2.NavigationCompleted -= h; navDone.TrySetResult(e.IsSuccess); };
+        _wv.CoreWebView2.NavigationCompleted += h;
+        _wv.CoreWebView2.Navigate("https://claude.ai");
+
+        // Wait up to 15 s for initial navigation
+        await Task.WhenAny(navDone.Task, Task.Delay(15000));
+        _readyForScript = navDone.Task.IsCompletedSuccessfully && navDone.Task.Result;
+    }
+
+    // Run a JS script on the already-loaded claude.ai page.
+    // The script must call window.chrome.webview.postMessage(result).
+    public async Task<string?> RunScriptAsync(string script, int timeoutMs = 10000)
+    {
+        if (!_readyForScript) return null;
+
+        var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
+        EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
+        msgHandler = (_, args) =>
+        {
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
+            tcs.TrySetResult(args.WebMessageAsJson);
+        };
+        _wv.CoreWebView2.WebMessageReceived += msgHandler;
+
+        try { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
+        catch
+        {
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
+            return null;
+        }
+
+        _ = Task.Delay(timeoutMs).ContinueWith(_ =>
+        {
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
+            tcs.TrySetResult(null);
+        });
+
+        return await tcs.Task;
+    }
+
+    // ── One-shot mode (LoginWindow) ───────────────────────────────────────────
+
+    public async Task<string?> FetchAsync(string navigateUrl, string script, int timeoutMs = 20000)
+    {
+        await EnsureInitAsync();
+
+        var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
+        msgHandler = (_, args) =>
+        {
+            _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   { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
+            catch { tcs.TrySetResult(null); }
+        };
+        _wv.CoreWebView2.NavigationCompleted += navHandler;
+        _wv.CoreWebView2.Navigate(navigateUrl);
+
+        _ = Task.Delay(timeoutMs).ContinueWith(_ =>
+        {
+            _wv.CoreWebView2.WebMessageReceived -= msgHandler;
+            tcs.TrySetResult(null);
+        });
+
+        return await tcs.Task;
+    }
+
+    // ── Shared init ───────────────────────────────────────────────────────────
+
+    private int _initGuard;
+
+    private async Task EnsureInitAsync()
+    {
+        if (_initialized) return;
+        if (Interlocked.Exchange(ref _initGuard, 1) != 0) return;
+
+        var env = await CoreWebView2Environment.CreateAsync(userDataFolder: UserDataFolder);
+        await _wv.EnsureCoreWebView2Async(env);
+        _initialized = true;
+    }
+}

windows/installer.iss

@@ -0,0 +1,42 @@
+#ifndef AppVersion
+  #define AppVersion "0.0.1"
+#endif
+
+[Setup]
+AppName=ClaudeChecker
+AppVersion={#AppVersion}
+AppPublisher=superdooper86
+AppPublisherURL=https://github.com/superdooper86/claudechecker
+AppSupportURL=https://github.com/superdooper86/claudechecker/issues
+AppUpdatesURL=https://github.com/superdooper86/claudechecker/releases
+DefaultDirName={localappdata}\ClaudeChecker
+DefaultGroupName=ClaudeChecker
+DisableProgramGroupPage=yes
+PrivilegesRequired=lowest
+OutputDir=.
+OutputBaseFilename=ClaudeChecker-Installer
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+UninstallDisplayIcon={app}\ClaudeChecker.exe
+SourceDir=..
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "publish\ClaudeChecker.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "publish\Assets\*"; DestDir: "{app}\Assets"; Flags: ignoreversion recursesubdirs
+
+[Icons]
+Name: "{group}\ClaudeChecker"; Filename: "{app}\ClaudeChecker.exe"
+Name: "{commondesktop}\ClaudeChecker"; Filename: "{app}\ClaudeChecker.exe"; Tasks: desktopicon
+
+[Run]
+; Silent install (auto-update): launch automatically
+Filename: "{app}\ClaudeChecker.exe"; Flags: nowait; Check: WizardSilent
+; Manual install: show launch checkbox on final page
+Filename: "{app}\ClaudeChecker.exe"; Description: "{cm:LaunchProgram,ClaudeChecker}"; Flags: nowait postinstall skipifsilent