fix: use WebView JS fetch for auth detection; send all cookies to API

Cookie domain filtering was wrong — the session token domain is unknown
and was never found by claude.ai/anthropic.com filters.

LoginView: replace getAllCookies domain check with callAsyncJavaScript
that fetches /api/bootstrap directly from the WebView. The WebView uses
its own full session (all cookies, any domain) so auth is detected
correctly regardless of where the token lives.

UsageViewModel: claudeCookieHeader now sends all cookies from the app's
WKWebsiteDataStore instead of filtering by domain. checkInitialSignInState
likewise checks for any cookie.

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

@@ -1,77 +0,0 @@
-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: Zip
-        shell: pwsh
-        run: |
-          Copy-Item -Recurse windows/Assets publish/Assets
-          Compress-Archive -Path publish/* -DestinationPath ClaudeChecker-Windows.zip
-
-      - 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-Windows.zip \
-            --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-Windows.zip" \
-            --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

.github/workflows/release-windows.yml

@@ -1,77 +0,0 @@
-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: Zip
-        shell: pwsh
-        run: |
-          Copy-Item -Recurse windows/Assets publish/Assets
-          Compress-Archive -Path publish/* -DestinationPath ClaudeChecker-Windows.zip
-
-      - 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-Windows.zip \
-            --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-Windows.zip" \
-            --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

ClaudeChecker/ClaudeCheckerApp.swift

@@ -27,7 +27,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         let config = WKWebViewConfiguration()
         config.websiteDataStore = WKWebsiteDataStore.default()
         cookiePrimerView = WKWebView(frame: .zero, configuration: config)
-        cookiePrimerView?.load(URLRequest(url: URL(string: "https://claude.ai/api/organizations/\(UsageViewModel.orgId)/usage")!))
+        cookiePrimerView?.load(URLRequest(url: URL(string: "https://claude.ai")!))
 
         // Status item
         statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)

ClaudeChecker/ContentView.swift

@@ -40,8 +40,7 @@ struct ContentView: View {
                         .environmentObject(updater)
                         .transition(.move(edge: .trailing).combined(with: .opacity))
                 } else {
-                    ScrollView(.vertical, showsIndicators: false) {
+                    VStack(spacing: 0) {
-                        VStack(spacing: 0) {
                             // Cards grid
                             if vm.limits.isEmpty {
                                 EmptyStateView()
@@ -96,7 +95,6 @@ struct ContentView: View {
                                         .padding(.bottom, 8)
                                 }
                             }
-                        }
                     }
                     .transition(.opacity)
 
@@ -398,12 +396,11 @@ struct DiaryRow: View {
     var body: some View {
         VStack(alignment: .leading, spacing: 5) {
             HStack {
-                AgentIconView(agent: .claude, size: 12)
+                Text("\(totalSaved) samples")
-                Text("Claude")
+                    .font(.system(size: 10.5))
-                    .font(.system(size: 12, weight: .medium))
+                    .foregroundColor(.secondary)
-                    .foregroundColor(color)
                 Spacer()
-                Text("\(totalSaved) samples · Avg Burn Rate: +\(String(format: "%.1f", burnRate))%/h")
+                Text("Avg burn rate: \(String(format: "%.1f", burnRate))%/h")
                     .font(.system(size: 10.5))
                     .foregroundColor(.secondary)
             }
@@ -914,12 +911,12 @@ struct ErrorBanner: View {
 struct EmptyStateView: View {
     var body: some View {
         VStack(spacing: 10) {
-            Image(systemName: "key.slash")
+            Image(systemName: "person.crop.circle.badge.questionmark")
                 .font(.system(size: 28))
                 .foregroundColor(.secondary)
-            Text("No API key configured")
+            Text("Not signed in")
                 .font(.system(size: 13, weight: .medium))
-            Text("Open Settings to add your Anthropic API key.")
+            Text("Sign in to claude.ai to see your usage.")
                 .font(.system(size: 11.5))
                 .foregroundColor(.secondary)
                 .multilineTextAlignment(.center)

ClaudeChecker/Info.plist

@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.1.3</string>
+    <string>1.2.1-beta.8</string>
     <key>CFBundleVersion</key>
-    <string>40</string>
+    <string>56</string>
     <key>LSMinimumSystemVersion</key>
     <string>13.0</string>
     <key>LSUIElement</key>
@@ -45,7 +45,3 @@
     </dict>
 </dict>
 </plist>
-
-
-
-

ClaudeChecker/LoginView.swift

@@ -36,15 +36,19 @@ struct LoginWebView: NSViewRepresentable {
             if let url = webView.url?.absoluteString,
                url.contains("/login") || url.contains("/auth") { return }
 
-            WKWebsiteDataStore.default().httpCookieStore.getAllCookies { cookies in
+            // Ask the WebView itself whether we're authenticated — it uses its own
-                let hasSession = cookies.contains {
+            // session (cookies, localStorage, etc.) so we don't need to know the
-                    $0.domain.contains("claude.ai") &&
+            // cookie domain or name.
-                    ($0.name == "sessionKey" || $0.name == "__Secure-next-auth.session-token")
+            webView.callAsyncJavaScript(
-                }
+                "const r = await fetch('/api/bootstrap', {credentials: 'include'}); return r.status;",
-                guard hasSession, !self.didAuthenticate else { return }
+                arguments: [:], in: nil, in: .defaultClient
-                self.didAuthenticate = true
+            ) { [weak self] result in
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                guard let self, !self.didAuthenticate else { return }
-                    self.onAuthenticated()
+                if case .success(let val) = result, let status = val as? Int, status == 200 {
+                    self.didAuthenticate = true
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+                        self.onAuthenticated()
+                    }
                 }
             }
         }

ClaudeChecker/UsageViewModel.swift

@@ -3,7 +3,6 @@ import WebKit
 
 @MainActor
 class UsageViewModel: ObservableObject {
-    static let orgId = "daf626a9-4924-4ff3-ba98-23b523062f8e"
     @Published var limits: [AgentLimit] = []
     @Published var isLoading = false
     @Published var lastUpdated: Date?
@@ -28,12 +27,10 @@ class UsageViewModel: ObservableObject {
 
     private var burnHistoryStore: [String: [Double]] = [:]
     private let maxHistorySamples = 24
-    private var cachedOrgId: String?
     private var previousPercents: [String: Double] = [:]
     private var firedThresholds: [String: Set<Int>] = [:]
 
     init() {
-        cachedOrgId = UserDefaults.standard.string(forKey: "claude_org_id") ?? Self.orgId
         let saved = UserDefaults.standard.double(forKey: "refresh_interval")
         refreshInterval = saved > 0 ? saved : 60
         showInMenuBar = UserDefaults.standard.object(forKey: "show_in_menubar") as? Bool ?? true
@@ -41,14 +38,21 @@ class UsageViewModel: ObservableObject {
             burnHistoryStore = saved
         }
         loadPlaceholderData()
+        Task { await checkInitialSignInState() }
+    }
+
+    private func checkInitialSignInState() async {
+        let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
+        if !cookies.isEmpty { isSignedIn = true }
     }
 
     func signOut() async {
         let store = WKWebsiteDataStore.default()
         let types = WKWebsiteDataStore.allWebsiteDataTypes()
         let records = await store.dataRecords(ofTypes: types)
-        let claudeRecords = records.filter { $0.displayName.contains("claude.ai") }
+        let claudeRecords = records.filter { $0.displayName.contains("claude.ai") || $0.displayName.contains("anthropic.com") }
         await store.removeData(ofTypes: types, for: claudeRecords)
+        UserDefaults.standard.removeObject(forKey: "claude_org_id")
         isSignedIn = false
         isNotAuthenticated = true
         lastUpdated = nil
@@ -66,18 +70,29 @@ class UsageViewModel: ObservableObject {
         defer { isLoading = false }
 
         do {
-            let orgId = cachedOrgId!
+            let (fetchedOrgId, fetchedEmail, fetchedPlan) = try await fetchBootstrap()
-            async let usageFetch        = fetchUsage(orgId: orgId)
+
-            async let prepaidFetch      = fetchPrepaidCredits(orgId: orgId)
+            let orgId: String
-            async let overageFetch      = fetchOverageSpendLimit(orgId: orgId)
+            if let id = fetchedOrgId {
-            async let emailFetch        = fetchUserEmail()
+                UserDefaults.standard.set(id, forKey: "claude_org_id")
-            let (usage, prepaid, overage, email) = try await (usageFetch, prepaidFetch, overageFetch, emailFetch)
+                orgId = id
-            if let email { userEmail = email }
+            } else if let cached = UserDefaults.standard.string(forKey: "claude_org_id") {
+                orgId = cached
+            } else {
+                throw AppError.notAuthenticated
+            }
+
+            if let email = fetchedEmail { userEmail = email }
+            if let plan = fetchedPlan   { planLabel = plan }
+
+            async let usageFetch   = fetchUsage(orgId: orgId)
+            async let prepaidFetch = fetchPrepaidCredits(orgId: orgId)
+            async let overageFetch = fetchOverageSpendLimit(orgId: orgId)
+            let (usage, prepaid, overage) = try await (usageFetch, prepaidFetch, overageFetch)
             limits = buildLimits(from: usage)
             extraUsage = usage.extraUsage
             prepaidCredits = prepaid
             overageSpendLimit = overage
-            planLabel = "Pro"
             lastUpdated = Date()
             isSignedIn = true
 
@@ -93,6 +108,7 @@ class UsageViewModel: ObservableObject {
             checkLimitNotifications(for: limits)
         } catch AppError.notAuthenticated {
             isNotAuthenticated = true
+            isSignedIn = false
             errorMessage = "Not signed in"
         } catch let error as DecodingError {
             switch error {
@@ -110,54 +126,91 @@ class UsageViewModel: ObservableObject {
         }
     }
 
-    // MARK: - Fetch usage
+    // MARK: - Bootstrap (org ID + email + plan label in one call)
 
-    private func fetchUsage(orgId: String) async throws -> UsageResponse {
+    private func claudeAPIRequest(for url: URL) async -> URLRequest {
-        let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/usage")!
         var req = URLRequest(url: url)
-        req.setValue("application/json", forHTTPHeaderField: "accept")
+        req.setValue("application/json, text/plain, */*", forHTTPHeaderField: "accept")
-
+        req.setValue("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36", forHTTPHeaderField: "User-Agent")
-        // Inject cookies from WKWebsiteDataStore (shared with browser/Claude app)
+        req.setValue("https://claude.ai", forHTTPHeaderField: "Origin")
-        let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
+        req.setValue("https://claude.ai/", forHTTPHeaderField: "Referer")
-        let claudeCookies = cookies.filter { $0.domain.contains("claude.ai") }
+        req.setValue("same-origin", forHTTPHeaderField: "sec-fetch-site")
-        if let header = HTTPCookie.requestHeaderFields(with: claudeCookies)["Cookie"] {
+        req.setValue("cors", forHTTPHeaderField: "sec-fetch-mode")
-            req.setValue(header, forHTTPHeaderField: "Cookie")
+        req.setValue("empty", forHTTPHeaderField: "sec-fetch-dest")
+        if let cookie = await claudeCookieHeader() {
+            req.setValue(cookie, forHTTPHeaderField: "Cookie")
         }
+        return req
+    }
 
+    private func fetchBootstrap() async throws -> (orgId: String?, email: String?, planLabel: String?) {
+        let url = URL(string: "https://claude.ai/api/bootstrap")!
+        var req = await claudeAPIRequest(for: url)
+        guard req.value(forHTTPHeaderField: "Cookie") != nil else { throw AppError.notAuthenticated }
         let (data, response) = try await URLSession.shared.data(for: req)
         guard let http = response as? HTTPURLResponse else { throw AppError.networkError }
         if http.statusCode == 401 || http.statusCode == 403 { throw AppError.notAuthenticated }
         guard http.statusCode == 200 else { throw AppError.networkError }
+        guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+            return (nil, nil, nil)
+        }
 
-        return try JSONDecoder().decode(UsageResponse.self, from: data)
+        let account  = json["account"] as? [String: Any]
+        // memberships may live under account or at root (older API shape)
+        let memberships = (account?["memberships"] ?? json["memberships"]) as? [[String: Any]]
+        let firstOrg = memberships?.first?["organization"] as? [String: Any]
+
+        // org ID — primary path then flat-list fallback then dedicated endpoint
+        var orgId: String? = firstOrg?["uuid"] as? String
+        if orgId == nil {
+            orgId = (json["organizations"] as? [[String: Any]])?.first?["uuid"] as? String
+        }
+        if orgId == nil {
+            // Final fallback: fetch /api/organizations directly
+            let orgsReq = await claudeAPIRequest(for: URL(string: "https://claude.ai/api/organizations")!)
+            if let (orgsData, orgsResp) = try? await URLSession.shared.data(for: orgsReq),
+               let orgsHttp = orgsResp as? HTTPURLResponse, orgsHttp.statusCode == 200,
+               let orgs = try? JSONSerialization.jsonObject(with: orgsData) as? [[String: Any]] {
+                orgId = orgs.first?["uuid"] as? String
+            }
+        }
+
+        let email = account?["email_address"] as? String
+
+        // plan label from capabilities e.g. "claude_pro" -> "Pro"
+        var planLabel: String? = nil
+        if let caps = firstOrg?["capabilities"] as? [String],
+           let cap = caps.first(where: { $0.hasPrefix("claude_") }) {
+            let name = String(cap.dropFirst("claude_".count))
+            planLabel = name.prefix(1).uppercased() + name.dropFirst().lowercased()
+        }
+
+        return (orgId, email, planLabel)
     }
 
-    private func fetchUserEmail() async throws -> String? {
+    // MARK: - Fetch usage
-        let url = URL(string: "https://claude.ai/api/bootstrap")!
+
-        var req = URLRequest(url: url)
+    private func claudeCookieHeader() async -> String? {
-        req.setValue("application/json", forHTTPHeaderField: "accept")
         let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
-        let claudeCookies = cookies.filter { $0.domain.contains("claude.ai") }
+        guard !cookies.isEmpty else { return nil }
-        if let header = HTTPCookie.requestHeaderFields(with: claudeCookies)["Cookie"] {
+        // Send all cookies from the app's WebView store — the session token may be
-            req.setValue(header, forHTTPHeaderField: "Cookie")
+        // on any domain (claude.ai, anthropic.com, or an auth sub-service).
-        }
+        return HTTPCookie.requestHeaderFields(with: cookies)["Cookie"]
+    }
+
+    private func fetchUsage(orgId: String) async throws -> UsageResponse {
+        let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/usage")!
+        let req = await claudeAPIRequest(for: url)
         let (data, response) = try await URLSession.shared.data(for: req)
-        guard let http = response as? HTTPURLResponse, http.statusCode == 200 else { return nil }
+        guard let http = response as? HTTPURLResponse else { throw AppError.networkError }
-        guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+        if http.statusCode == 401 || http.statusCode == 403 { throw AppError.notAuthenticated }
-              let account = json["account"] as? [String: Any],
+        guard http.statusCode == 200 else { throw AppError.networkError }
-              let email = account["email_address"] as? String else { return nil }
+        return try JSONDecoder().decode(UsageResponse.self, from: data)
-        return email
     }
 
     private func fetchPrepaidCredits(orgId: String) async throws -> PrepaidCredits? {
         let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/prepaid/credits")!
-        var req = URLRequest(url: url)
+        let req = await claudeAPIRequest(for: url)
-        req.setValue("application/json", forHTTPHeaderField: "accept")
-        let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
-        let claudeCookies = cookies.filter { $0.domain.contains("claude.ai") }
-        if let header = HTTPCookie.requestHeaderFields(with: claudeCookies)["Cookie"] {
-            req.setValue(header, forHTTPHeaderField: "Cookie")
-        }
         let (data, response) = try await URLSession.shared.data(for: req)
         guard let http = response as? HTTPURLResponse, http.statusCode == 200 else { return nil }
         return try? JSONDecoder().decode(PrepaidCredits.self, from: data)
@@ -165,13 +218,7 @@ class UsageViewModel: ObservableObject {
 
     private func fetchOverageSpendLimit(orgId: String) async throws -> OverageSpendLimit? {
         let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/overage_spend_limit")!
-        var req = URLRequest(url: url)
+        let req = await claudeAPIRequest(for: url)
-        req.setValue("application/json", forHTTPHeaderField: "accept")
-        let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
-        let claudeCookies = cookies.filter { $0.domain.contains("claude.ai") }
-        if let header = HTTPCookie.requestHeaderFields(with: claudeCookies)["Cookie"] {
-            req.setValue(header, forHTTPHeaderField: "Cookie")
-        }
         let (data, response) = try await URLSession.shared.data(for: req)
         guard let http = response as? HTTPURLResponse, http.statusCode == 200 else { return nil }
         return try? JSONDecoder().decode(OverageSpendLimit.self, from: data)
@@ -245,14 +292,11 @@ class UsageViewModel: ObservableObject {
 
     private func checkLimitNotifications(for limits: [AgentLimit]) {
         let thresholds = [80, 95]
-
         for limit in limits {
             let key = limit.window.rawValue
             let curr = limit.usedPercent
             let prev = previousPercents[key]
             var fired = firedThresholds[key] ?? []
-
-            // Threshold warnings (80% and 95%)
             for t in thresholds {
                 let threshold = Double(t)
                 guard curr >= threshold, prev ?? threshold < threshold, !fired.contains(t) else { continue }
@@ -263,8 +307,6 @@ class UsageViewModel: ObservableObject {
                     userInfo: ["windowName": limit.window.displayName, "percent": t]
                 )
             }
-
-            // Reset detection: was high, now low
             if let prev, prev > 50, curr < 20 {
                 fired.removeAll()
                 NotificationCenter.default.post(
@@ -273,7 +315,6 @@ class UsageViewModel: ObservableObject {
                     userInfo: ["windowName": limit.window.displayName]
                 )
             }
-
             firedThresholds[key] = fired
             previousPercents[key] = curr
         }
@@ -317,4 +358,3 @@ extension Notification.Name {
     static let limitReset = Notification.Name("limitReset")
     static let openUpdateSheet = Notification.Name("openUpdateSheet")
 }
-

README.md

@@ -8,9 +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.1.3-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases)
+[![Version](https://img.shields.io/badge/version-1.2.0-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases)
 [![License](https://img.shields.io/badge/license-MIT-blue?style=flat)](LICENSE)
-<!-- BETA_BADGE -->
+[![Beta](https://img.shields.io/badge/beta-1.2.1--beta.7-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases/tag/v1.2.1-beta.7) <!-- BETA_BADGE -->
 
 </div>
 

RELEASE_NOTES.md

@@ -1,12 +1,12 @@
-## What's new in v1.1.3
+## What's new in v1.2.1
 
-### UI polish
+### Bug fixes
-- Limit headers now read "5 Hour Limit" and "7 Day Limit"
+- Fixed "Not signed in" showing incorrectly on launch when the session was already active
-- Tapping anywhere on the blue update banner opens the update window
+- Sign-in state is now detected immediately from stored cookies on startup, before the first data refresh completes
-
+- Fixed login window auto-closing before the user could sign in — the login window now correctly loads the `/login` page so it only detects auth after the actual sign-in redirect
-### Session Diary fix
+- Fixed "No API key configured" showing after signing out — now correctly shows "Not signed in" with a prompt to sign in
-- Burn history is persisted across app launches — the sparkline populates immediately on first open instead of requiring a manual refresh
+- Added `/api/organizations` as a final fallback for org ID resolution when the bootstrap API response doesn't include it
-
+- Fixed usage data not loading — API requests now include required browser-like headers (Origin, Referer, User-Agent)
-### Window sizing fixes
+- Fixed Settings incorrectly showing "Signed in" after a failed refresh — sign-in state now resets when authentication fails
-- The popover now resizes correctly when switching between the main view and settings
+- Rewrote login detection to use the WebView's own fetch call instead of inspecting cookie domains — correctly detects auth regardless of which domain the session token is stored on
-- Background colour no longer shows through during the resize animation
+- Fixed API requests not including session cookies — now sends all cookies from the app's WebView store rather than filtering by domain

version-beta.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.3-beta.5",
+  "version": "1.2.1-beta.7",
-  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.3-beta.5/ClaudeChecker.zip",
+  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.2.1-beta.7/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"
+  "notes": "## What's new in v1.2.1\n\n### Bug fixes\n- Fixed \"Not signed in\" showing incorrectly on launch when the session was already active\n- Sign-in state is now detected immediately from stored cookies on startup, before the first data refresh completes\n- Fixed login window auto-closing before the user could sign in — the login window now correctly loads the `/login` page so it only detects auth after the actual sign-in redirect\n- Fixed \"No API key configured\" showing after signing out — now correctly shows \"Not signed in\" with a prompt to sign in\n- Added `/api/organizations` as a final fallback for org ID resolution when the bootstrap API response doesn't include it\n- Fixed usage data not loading — API requests now include required browser-like headers (Origin, Referer, User-Agent)\n- Fixed sign-in detection and cookie handling for accounts whose session cookies are on the `anthropic.com` domain rather than `claude.ai`\n- Fixed Settings incorrectly showing \"Signed in\" after a failed refresh — sign-in state now resets when authentication fails"
-}
+}

version-windows-beta.json

@@ -1,5 +1,5 @@
-{
+{
-  "version": "0.0.0",
+  "version": "0.0.1-beta.49",
-  "url": "",
+  "url": "https://github.com/superdooper86/claudechecker/releases/download/win-v0.0.1-beta.49/ClaudeChecker-Windows.zip",
-  "notes": ""
+  "notes": "## What's new in beta.36\r\n\r\n### Bug fixes\r\n- Settings no longer incorrectly shows \"Not signed in\" when limits are working\r\n- Session Diary now shows correctly after the first successful refresh\r\n- Extra Usage Credits section now restored from cache on startup\r\n- Plan name, overage, and prepaid credits are now cached and shown immediately on launch\r\n- App now loads cached state instantly on startup before the background refresh completes"
-}
+}

version-windows.json

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

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.3",
+  "version": "1.2.0",
-  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.3/ClaudeChecker.zip",
+  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.2.0/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\"\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"
+  "notes": "## What's new in v1.2.0\n\n### Bug fixes\n- App now works for all users — org ID is fetched dynamically from the API instead of being hardcoded\n- Plan name (e.g. Pro, Max) now updates correctly on every refresh\n\n### Improvements\n- Plan name is read from the API rather than hardcoded\n- Bootstrap API call consolidated — org ID, email, and plan name fetched in a single request per refresh\n- Main panel no longer scrolls — popover auto-sizes to fit content\n- Session Diary card redesigned — sample count and avg burn rate shown left/right above the sparkline, Claude header removed"
 }

windows/App.xaml

@@ -1,170 +0,0 @@
-<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="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="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}" CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#106EBE"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter 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="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border 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 Property="Background" Value="{DynamicResource HoverBrush}"/>
-                            </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="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ComboBox">
-                        <Grid>
-                            <Border x:Name="Border"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="4">
-                                <Grid>
-                                    <ContentPresenter x:Name="ContentSite"
-                                        IsHitTestVisible="False"
-                                        Content="{TemplateBinding SelectionBoxItem}"
-                                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                                        Margin="{TemplateBinding Padding}"
-                                        VerticalAlignment="Center" HorizontalAlignment="Left"/>
-                                    <TextBlock Text="▾" FontSize="10"
-                                               Foreground="{DynamicResource SecondaryBrush}"
-                                               HorizontalAlignment="Right" VerticalAlignment="Center"
-                                               Margin="0,0,8,0" IsHitTestVisible="False"/>
-                                    <ToggleButton Focusable="False" ClickMode="Press"
-                                                  IsChecked="{Binding IsDropDownOpen, Mode=TwoWay,
-                                                      RelativeSource={RelativeSource TemplatedParent}}"
-                                                  Background="Transparent" BorderThickness="0"/>
-                                </Grid>
-                            </Border>
-                            <Popup x:Name="Popup" Placement="Bottom"
-                                   IsOpen="{TemplateBinding IsDropDownOpen}"
-                                   AllowsTransparency="True" Focusable="False"
-                                   PopupAnimation="Slide">
-                                <Border SnapsToDevicePixels="True"
-                                        MinWidth="{TemplateBinding ActualWidth}"
-                                        MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                                        Background="{DynamicResource CardBrush}"
-                                        BorderBrush="{DynamicResource BorderBrush}"
-                                        BorderThickness="1" CornerRadius="4">
-                                    <ScrollViewer Margin="0,2">
-                                        <ItemsPresenter/>
-                                    </ScrollViewer>
-                                </Border>
-                            </Popup>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="ItemContainerStyle">
-                <Setter.Value>
-                    <Style TargetType="ComboBoxItem">
-                        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-                        <Setter Property="Background" Value="{DynamicResource CardBrush}"/>
-                        <Setter Property="Padding"    Value="10,5"/>
-                        <Setter Property="Template">
-                            <Setter.Value>
-                                <ControlTemplate TargetType="ComboBoxItem">
-                                    <Border x:Name="Bd"
-                                            Background="{TemplateBinding Background}"
-                                            Padding="{TemplateBinding Padding}">
-                                        <ContentPresenter/>
-                                    </Border>
-                                    <ControlTemplate.Triggers>
-                                        <Trigger Property="IsHighlighted" Value="True">
-                                            <Setter TargetName="Bd" Property="Background"
-                                                    Value="{DynamicResource HoverBrush}"/>
-                                        </Trigger>
-                                    </ControlTemplate.Triggers>
-                                </ControlTemplate>
-                            </Setter.Value>
-                        </Setter>
-                    </Style>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style TargetType="ScrollViewer">
-            <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
-        </Style>
-    </Application.Resources>
-</Application>

windows/App.xaml.cs

@@ -1,140 +0,0 @@
-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();
-
-    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();
-        ScheduleTimer(ViewModel.RefreshInterval);
-
-        _ = Task.Run(async () =>
-        {
-            await Task.Delay(1000);
-            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

@@ -1,47 +0,0 @@
-using System;
-using System.IO;
-using System.Text.Json;
-
-namespace ClaudeCheckerWindows;
-
-public class AppSettings
-{
-    public string CookieStore     { get; set; } = "";
-    public string BurnHistory     { get; set; } = "";
-    public string OrgId           { get; set; } = "";
-    public string Email           { get; set; } = "";
-    public string UsageJson       { get; set; } = "";
-    public int    RefreshInterval { get; set; } = 120;
-    public bool   ShowInTaskbar   { get; set; } = true;
-    public bool   BetaChannel     { get; set; } = false;
-    public string DebugInfo       { get; set; } = "";
-
-    private static readonly string FilePath = Path.Combine(
-        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-        "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

@@ -1,32 +0,0 @@
-<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

@@ -1,95 +0,0 @@
-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 subColor  = Color.FromRgb(0x9E, 0x9E, 0x9E);
-
-        var pctText = new FormattedText(
-            $"{(int)Math.Round(Percent)}%",
-            CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-            new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
-            14, new SolidColorBrush(textColor), dpi);
-        dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
-
-        var sub = new FormattedText(
-            "Updated\nnow",
-            CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-            new Typeface("Segoe UI"), 7,
-            new SolidColorBrush(subColor), dpi)
-        {
-            TextAlignment = TextAlignment.Center
-        };
-        dc.DrawText(sub, new Point(cx - sub.Width / 2, cy + 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

@@ -1,60 +0,0 @@
-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

@@ -1,9 +0,0 @@
-// 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

@@ -1,42 +0,0 @@
-<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

@@ -1,148 +0,0 @@
-using Microsoft.Web.WebView2.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-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(
-                Environment.GetFolderPath(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 = cookies.Any(c =>
-                c.Name.Equals("sessionKey", StringComparison.OrdinalIgnoreCase) ||
-                c.Name.StartsWith("sk-ant", 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;
-
-        UsageViewModel.SaveCookies(cookies);
-
-        try
-        {
-            // Use WebMessageReceived so the async script can post back without relying
-            // on Promise-awaiting support in the WebView2 runtime version.
-            var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
-            EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
-            msgHandler = (_, args) =>
-            {
-                Browser.CoreWebView2.WebMessageReceived -= msgHandler;
-                tcs.TrySetResult(args.WebMessageAsJson);
-            };
-            Browser.CoreWebView2.WebMessageReceived += msgHandler;
-
-            const string script = @"(async()=>{try{
-                const h={headers:{accept:'application/json'}};
-                const b=await(await fetch('/api/bootstrap',h)).json();
-                const bkeys=Object.keys(b||{}).join(',');
-                const akeys=Object.keys(b?.account||{}).join(',');
-                let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
-                        ||b?.default_organization?.uuid||null;
-                const e=b?.account?.email_address||b?.account?.email||b?.email||null;
-                let orgSrc='bootstrap';
-                if(!id){
-                    try{const ol=await(await fetch('/api/organizations',h)).json();
-                        if(Array.isArray(ol)&&ol.length>0){id=ol[0]?.uuid||null;orgSrc='orgs-list';}}catch(e2){}
-                }
-                if(!id){
-                    let pu=null;
-                    try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){}
-                    window.chrome.webview.postMessage({email:e,orgId:null,usage:(pu&&!pu.error?pu:null),debug:'no-org|bkeys:'+bkeys+'|akeys:'+akeys});
-                    return;
-                }
-                const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
-                window.chrome.webview.postMessage({email:e,orgId:id,usage:u,debug:'orgSrc:'+orgSrc+'|bkeys:'+bkeys+'|akeys:'+akeys});
-            }catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
-
-            await Browser.CoreWebView2.ExecuteScriptAsync(script);
-
-            // Wait up to 15 s for the script to post its message
-            var completed = await Task.WhenAny(tcs.Task, Task.Delay(15000));
-            var json = completed == tcs.Task ? tcs.Task.Result : null;
-
-            if (!string.IsNullOrEmpty(json))
-            {
-                using var doc = JsonDocument.Parse(json);
-                var root = doc.RootElement;
-
-                if (root.TryGetProperty("email", out var em) && em.ValueKind == JsonValueKind.String)
-                    AppSettings.Default.Email = em.GetString() ?? "";
-
-                if (root.TryGetProperty("orgId", out var oi) && oi.ValueKind == JsonValueKind.String)
-                    AppSettings.Default.OrgId = oi.GetString() ?? "";
-
-                if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
-                    AppSettings.Default.UsageJson = us.GetRawText();
-
-                if (root.TryGetProperty("debug", out var dbg) && dbg.ValueKind == JsonValueKind.String)
-                    AppSettings.Default.DebugInfo = dbg.GetString() ?? "";
-                else if (root.TryGetProperty("error", out var err))
-                    AppSettings.Default.DebugInfo = "JS error: " + err.GetRawText();
-                else
-                    AppSettings.Default.DebugInfo = "timeout or empty message";
-
-                AppSettings.Default.Save();
-            }
-            else
-            {
-                AppSettings.Default.DebugInfo = json == null ? "script timeout (15s)" : "empty message";
-                AppSettings.Default.Save();
-            }
-        }
-        catch (Exception ex)
-        {
-            AppSettings.Default.DebugInfo = "exception: " + ex.Message;
-            AppSettings.Default.Save();
-        }
-
-        await Dispatcher.InvokeAsync(() => DialogResult = true);
-    }
-}

windows/Models.cs

@@ -1,62 +0,0 @@
-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("claude_ai_default_5h")] public WindowData? FiveHour { get; set; }
-    [JsonPropertyName("claude_ai_default")]    public WindowData? SevenDay  { get; set; }
-}
-
-public class WindowData
-{
-    [JsonPropertyName("utilization")] public double Utilization { get; set; }
-    [JsonPropertyName("resets_at")]   public string? ResetsAt   { 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

@@ -1,258 +0,0 @@
-<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">
-                            <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 x:Name="DebugText" FontSize="10" Foreground="{DynamicResource SecondaryBrush}"
-                                   TextWrapping="Wrap" Margin="0,12,0,0" FontFamily="Consolas"
-                                   Visibility="Collapsed"/>
-
-                    </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>
-    </Grid>
-</Window>

windows/PopupWindow.xaml.cs

@@ -1,392 +0,0 @@
-using ClaudeCheckerWindows.Controls;
-using System;
-using System.Runtime.InteropServices;
-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(5) };
-        _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));
-    }
-
-    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"];
-
-        // Gauge
-        var gauge = new GaugeControl { Width = 76, Height = 76, Percent = limit.UsedPercent, Accent = accent };
-
-        // Live badge
-        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)) }
-        };
-
-        // Usage badge
-        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),
-        };
-
-        var timeStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
-        timeStack.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
-        timeStack.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
-            FontWeight = FontWeights.Medium, Foreground = text, VerticalAlignment = VerticalAlignment.Center });
-
-        var resetText = new TextBlock
-        {
-            Text = $"Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
-            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
-        };
-
-        var timeRow = new Grid();
-        timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-        timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
-        Grid.SetColumn(timeStack, 0);
-        Grid.SetColumn(resetText, 1);
-        timeRow.Children.Add(timeStack);
-        timeRow.Children.Add(resetText);
-
-        var sparkline = new SparklineControl
-        {
-            Height = 28, Margin = new Thickness(0, 8, 0, 0), LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
-            Data = limit.BurnHistory.Count > 0 ? limit.BurnHistory : null,
-        };
-
-        var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
-        infoPanel.Children.Add(headerRow);
-        infoPanel.Children.Add(progress);
-        infoPanel.Children.Add(timeRow);
-        infoPanel.Children.Add(sparkline);
-
-        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;
-    }
-
-    // ── 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))
-        {
-            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;
-            LastUpdatedText.Text = diff.TotalSeconds < 10 ? "Updated just now"
-                                                          : $"Updated {(int)diff.TotalSeconds}s ago";
-        }
-        else
-        {
-            LastUpdatedText.Text = "Not yet updated";
-        }
-        LoadingBar.Visibility = VM.IsLoading ? Visibility.Visible : Visibility.Collapsed;
-    }
-
-    // ── Settings ─────────────────────────────────────────────────────
-
-    private void InitSettings()
-    {
-        VersionLabel.Text    = $"v{Updater.CurrentVersion}";
-        BetaToggle.IsChecked = Updater.BetaChannel;
-        UpdateAboutSection();
-
-        var intervals = new[] { ("1 min", 60), ("2 min", 120), ("3 min", 180),
-                                ("4 min", 240), ("5 min", 300), ("10 min", 600) };
-        RefreshPicker.ItemsSource        = intervals;
-        RefreshPicker.DisplayMemberPath  = "Item1";
-        var idx = Array.FindIndex(intervals, x => x.Item2 == VM.RefreshInterval);
-        RefreshPicker.SelectedIndex      = idx < 0 ? 1 : idx;
-
-        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 label = 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(label);
-        AuthPanel.Children.Add(authRow);
-
-        SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
-        SignInButton.Content     = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
-
-        var dbg = AppSettings.Default.DebugInfo;
-        if (!string.IsNullOrEmpty(dbg))
-        {
-            DebugText.Text       = dbg;
-            DebugText.Visibility = Visibility.Visible;
-        }
-        else
-        {
-            DebugText.Visibility = Visibility.Collapsed;
-        }
-    }
-
-    // ── Event handlers ───────────────────────────────────────────────
-
-    private void Settings_Click(object s, RoutedEventArgs e)
-    {
-        InitSettings();
-        MainPanel.Visibility     = Visibility.Collapsed;
-        SettingsPanel.Visibility = Visibility.Visible;
-        UpdatePanel.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;
-    }
-
-    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;
-    }
-
-    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)
-        {
-            // Show cached data from SaveAndClose immediately (no WebView2 needed)
-            await VM.LoadFromCacheAsync();
-            InitSettings();
-            ShowMain();
-
-            // Full refresh in background after WebView2 folder is definitely released
-            _ = Task.Run(async () =>
-            {
-                await Task.Delay(3000);
-                await VM.RefreshAsync();
-                await Application.Current.Dispatcher.InvokeAsync(InitSettings);
-            });
-        }
-        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 ValueTuple<string, int> selected)
-        {
-            VM.RefreshInterval = selected.Item2;
-            ((App)Application.Current).ScheduleTimer(selected.Item2);
-        }
-    }
-
-    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

@@ -1,23 +0,0 @@
-<?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

@@ -1,50 +0,0 @@
-# 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

@@ -1,3 +0,0 @@
-## What's new in beta.27
-
-- Fix build error: use WebMessageAsJson (not WebMessageAsString) and post plain JS objects via postMessage

windows/ThemeManager.cs

@@ -1,81 +0,0 @@
-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

@@ -1,266 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Reflection;
-using System.IO;
-using System.IO.Compression;
-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 tmpDir  = Path.Combine(Path.GetTempPath(), $"CCUpdate_{Guid.NewGuid():N}");
-            Directory.CreateDirectory(tmpDir);
-            var zipPath = Path.Combine(tmpDir, "ClaudeChecker.zip");
-
-            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(zipPath))
-            {
-                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 * 0.8;
-                }
-            }
-
-            StatusMessage    = "Unpacking…";
-            DownloadProgress = 0.85;
-
-            var extractDir = Path.Combine(tmpDir, "extracted");
-            ZipFile.ExtractToDirectory(zipPath, extractDir, overwriteFiles: true);
-
-            // Find the installer exe
-            var newExe = FindExe(extractDir);
-            if (newExe == null) throw new Exception("ClaudeChecker.exe not found in update package.");
-
-            DownloadProgress = 0.95;
-            StatusMessage    = "Installing…";
-
-            // Write a batch script to replace the exe after we exit
-            var currentExe = Process.GetCurrentProcess().MainModule!.FileName;
-            var script = $"""
-                @echo off
-                timeout /t 2 /nobreak > nul
-                copy /Y "{newExe}" "{currentExe}"
-                start "" "{currentExe}"
-                rmdir /S /Q "{tmpDir}"
-                """;
-
-            var scriptPath = Path.Combine(Path.GetTempPath(), "claudechecker_update.bat");
-            await File.WriteAllTextAsync(scriptPath, script);
-
-            DownloadProgress = 1.0;
-            StatusMessage    = "Installed! Relaunching…";
-            UpdateComplete   = true;
-
-            await Task.Delay(800);
-
-            Process.Start(new ProcessStartInfo
-            {
-                FileName        = "cmd.exe",
-                Arguments       = $"/C \"{scriptPath}\"",
-                CreateNoWindow  = true,
-                UseShellExecute = false,
-            });
-
-            Application.Current.Dispatcher.Invoke(() => Application.Current.Shutdown());
-        }
-        catch (Exception ex)
-        {
-            UpdateError   = ex.Message;
-            IsDownloading = false;
-            StatusMessage = "";
-        }
-    }
-
-    private static string? FindExe(string dir)
-    {
-        foreach (var f in Directory.EnumerateFiles(dir, "ClaudeChecker.exe", SearchOption.AllDirectories))
-            return f;
-        return null;
-    }
-
-    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

@@ -1,503 +0,0 @@
-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 = "Pro";
-    private DateTime? _lastUpdated;
-    private OverageSpendLimit? _overage;
-    private PrepaidCredits? _prepaid;
-
-    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); }
-
-    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);
-
-        try
-        {
-            var cookies = await GetCookiesAsync();
-
-            // Check if we have any persistent proof that the user authenticated
-            bool hasCookies    = cookies.Count > 0;
-            bool hasCachedAuth = !string.IsNullOrEmpty(AppSettings.Default.Email) ||
-                                 !string.IsNullOrEmpty(AppSettings.Default.OrgId);
-
-            if (!hasCookies && !hasCachedAuth)
-            {
-                await Application.Current.Dispatcher.InvokeAsync(() =>
-                {
-                    IsSignedIn   = false;
-                    ErrorMessage = "Not signed in — click Sign In to authenticate.";
-                    IsLoading    = false;
-                });
-                return;
-            }
-
-            // Try HttpClient first (fast path) — may be rejected by server CORS/header checks
-            var (limits, overage, prepaid, email, orgId, ok) = hasCookies
-                ? await TryHttpRefreshAsync(cookies)
-                : ([], null, null, null, null, false);
-
-            // Fall back to WebView2 (uses the shared browser session, not HttpClient)
-            if (!ok)
-                (limits, email, orgId) = await TryWebView2RefreshAsync();
-
-            // Fill in any blanks from cached values saved at login time
-            if (string.IsNullOrEmpty(email))  email  = AppSettings.Default.Email;
-            if (string.IsNullOrEmpty(orgId))  orgId  = AppSettings.Default.OrgId;
-            if (limits.Count == 0 && !string.IsNullOrEmpty(AppSettings.Default.UsageJson))
-            {
-                try
-                {
-                    var cached = System.Text.Json.JsonSerializer.Deserialize<UsageResponse>(
-                        AppSettings.Default.UsageJson, JsonOpts);
-                    limits = BuildLimits(cached);
-                }
-                catch { }
-            }
-
-            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(() =>
-            {
-                Limits       = limits;
-                Overage      = overage;
-                Prepaid      = prepaid;
-                if (!string.IsNullOrEmpty(email)) UserEmail = email;
-                // Trust that cookies / cached auth mean the user IS signed in,
-                // even if the live fetch failed this cycle.
-                IsSignedIn   = true;
-                ErrorMessage = null;
-                LastUpdated  = DateTime.Now;
-                IsLoading    = false;
-            });
-        }
-        catch (Exception ex)
-        {
-            await Application.Current.Dispatcher.InvokeAsync(() =>
-            {
-                ErrorMessage = ex.Message;
-                IsLoading    = false;
-            });
-        }
-    }
-
-    private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, string?, string?, bool)>
-        TryHttpRefreshAsync(List<(string Name, string Value, string Domain, string Path)> cookies)
-    {
-        try
-        {
-            using var http = BuildClient(cookies);
-            var bootstrapResp = await http.GetAsync("https://claude.ai/api/bootstrap");
-            if (!bootstrapResp.IsSuccessStatusCode)
-                return ([], null, null, null, null, false);
-
-            var (email, orgId) = ParseBootstrap(await bootstrapResp.Content.ReadAsStringAsync());
-
-            if (string.IsNullOrEmpty(orgId))
-                orgId = await FetchOrgIdFromListAsync(http);
-            if (string.IsNullOrEmpty(orgId) && !string.IsNullOrEmpty(AppSettings.Default.OrgId))
-                orgId = AppSettings.Default.OrgId;
-
-            if (string.IsNullOrEmpty(orgId))
-                return ([], null, null, email, orgId, true);
-
-            AppSettings.Default.OrgId = orgId;
-            AppSettings.Default.Save();
-
-            var ut = FetchAsync<UsageResponse>(http, $"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);
-
-            return (BuildLimits(ut.Result), ot.Result, pt.Result, email, orgId, true);
-        }
-        catch { return ([], null, null, null, null, false); }
-    }
-
-    private static async Task<(List<AgentLimit>, string?, string?)> TryWebView2RefreshAsync()
-    {
-        try
-        {
-            const string script = @"(async()=>{try{
-                const h={headers:{accept:'application/json'}};
-                const b=await(await fetch('/api/bootstrap',h)).json();
-                let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
-                        ||b?.default_organization?.uuid||null;
-                const em=b?.account?.email_address||b?.account?.email||b?.email||null;
-                if(!id){
-                    try{const ol=await(await fetch('/api/organizations',h)).json();
-                        if(Array.isArray(ol)&&ol.length>0)id=ol[0]?.uuid||null;}catch(e2){}
-                }
-                if(!id){
-                    let pu=null;
-                    try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){}
-                    window.chrome.webview.postMessage({email:em,orgId:null,usage:(pu&&!pu.error?pu:null)});
-                    return;
-                }
-                const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
-                window.chrome.webview.postMessage({email:em,orgId:id,usage:u});
-            }catch(ex){window.chrome.webview.postMessage(null);}})();";
-
-            var resultJson = await Application.Current.Dispatcher.InvokeAsync(async () =>
-            {
-                var host = new WebViewFetchWindow();
-                host.Show();
-                try   { return await host.FetchAsync("https://claude.ai", script); }
-                finally { host.Close(); }
-            }).Task.Unwrap();
-
-            if (resultJson == null || resultJson == "null") return ([], null, null);
-
-            using var doc = System.Text.Json.JsonDocument.Parse(resultJson);
-            var root = doc.RootElement;
-
-            string? email = root.TryGetProperty("email", out var em) && em.ValueKind == System.Text.Json.JsonValueKind.String
-                ? em.GetString() : null;
-            string? orgId = root.TryGetProperty("orgId", out var oi) && oi.ValueKind == System.Text.Json.JsonValueKind.String
-                ? oi.GetString() : null;
-
-            List<AgentLimit> limits = [];
-            if (root.TryGetProperty("usage", out var us) && us.ValueKind == System.Text.Json.JsonValueKind.Object)
-            {
-                var usage = System.Text.Json.JsonSerializer.Deserialize<UsageResponse>(
-                    us.GetRawText(), new System.Text.Json.JsonSerializerOptions { PropertyNameCaseInsensitive = true });
-                limits = BuildLimits(usage);
-
-                // Cache for next time
-                AppSettings.Default.UsageJson = us.GetRawText();
-                if (!string.IsNullOrEmpty(orgId)) AppSettings.Default.OrgId = orgId;
-                if (!string.IsNullOrEmpty(email)) AppSettings.Default.Email = email;
-                AppSettings.Default.Save();
-            }
-
-            return (limits, email, orgId);
-        }
-        catch { return ([], null, null); }
-    }
-
-    public async Task LoadFromCacheAsync()
-    {
-        var email  = AppSettings.Default.Email;
-        var orgId  = AppSettings.Default.OrgId;
-        var cookie = AppSettings.Default.CookieStore;
-
-        bool isAuth = !string.IsNullOrEmpty(email) || !string.IsNullOrEmpty(orgId)
-                   || !string.IsNullOrEmpty(cookie);
-        if (!isAuth) return;
-
-        List<AgentLimit> limits = [];
-        if (!string.IsNullOrEmpty(AppSettings.Default.UsageJson))
-        {
-            try
-            {
-                var cached = JsonSerializer.Deserialize<UsageResponse>(
-                    AppSettings.Default.UsageJson, JsonOpts);
-                limits = BuildLimits(cached);
-            }
-            catch { }
-        }
-
-        await Application.Current.Dispatcher.InvokeAsync(() =>
-        {
-            if (!string.IsNullOrEmpty(email)) UserEmail = email;
-            if (limits.Count > 0)             Limits    = limits;
-            IsSignedIn   = true;
-            ErrorMessage = limits.Count == 0 ? "Signed in — refreshing data…" : null;
-            LastUpdated  = limits.Count > 0 ? DateTime.Now : LastUpdated;
-        });
-    }
-
-    public async Task SignOutAsync()
-    {
-        AppSettings.Default.CookieStore = "";
-        AppSettings.Default.OrgId       = "";
-        AppSettings.Default.Email       = "";
-        AppSettings.Default.UsageJson   = "";
-        AppSettings.Default.Save();
-
-        await Application.Current.Dispatcher.InvokeAsync(() =>
-        {
-            IsSignedIn   = false;
-            UserEmail    = "";
-            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");
-        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; }
-    }
-
-    // Parse email and org ID out of bootstrap JSON (multiple fallback paths for org ID)
-    private static (string? Email, string? OrgId) ParseBootstrap(string json)
-    {
-        try
-        {
-            using var doc = JsonDocument.Parse(json);
-            var root = doc.RootElement;
-
-            string? email = null;
-            string? orgId = null;
-
-            if (root.TryGetProperty("account", out var acct) &&
-                acct.TryGetProperty("email_address", out var em))
-                email = em.GetString();
-
-            // Path 1: memberships[0].organization.uuid
-            if (root.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
-            {
-                var first = mems[0];
-                if (first.TryGetProperty("organization", out var org) &&
-                    org.TryGetProperty("uuid", out var uuid))
-                    orgId = uuid.GetString();
-            }
-
-            // Path 2: organizations[0].uuid (flat list on root)
-            if (string.IsNullOrEmpty(orgId) &&
-                root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
-            {
-                if (orgs[0].TryGetProperty("uuid", out var uuid))
-                    orgId = uuid.GetString();
-            }
-
-            return (email, orgId);
-        }
-        catch { return (null, null); }
-    }
-
-    private static async Task<string?> FetchOrgIdFromListAsync(HttpClient http)
-    {
-        try
-        {
-            var resp = await http.GetAsync("https://claude.ai/api/organizations");
-            if (!resp.IsSuccessStatusCode) return null;
-            var json = await resp.Content.ReadAsStringAsync();
-            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 void LoadPlaceholders()
-    {
-        var now = DateTime.Now;
-        Limits =
-        [
-            new() { Window = WindowKind.FiveHour, UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddHours(1) },
-            new() { Window = WindowKind.SevenDay,  UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddDays(7) },
-        ];
-    }
-
-    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

@@ -1,68 +0,0 @@
-using Microsoft.Web.WebView2.Core;
-using Microsoft.Web.WebView2.Wpf;
-using System;
-using System.IO;
-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 is shared.
-internal sealed class WebViewFetchWindow : Window
-{
-    private readonly WebView2 _wv = new();
-
-    public WebViewFetchWindow()
-    {
-        Width          = 1;
-        Height         = 1;
-        Left           = -9999;
-        Top            = -9999;
-        ShowInTaskbar  = false;
-        WindowStyle    = WindowStyle.None;
-        AllowsTransparency = true;
-        Opacity        = 0;
-        Content        = _wv;
-    }
-
-    public async Task<string?> FetchAsync(string navigateUrl, string script, int timeoutMs = 20000)
-    {
-        var env = await CoreWebView2Environment.CreateAsync(userDataFolder:
-            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                "ClaudeChecker", "WebView2"));
-
-        await _wv.EnsureCoreWebView2Async(env);
-
-        var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-        // Use WebMessageReceived so the script can post back asynchronously without
-        // relying on Promise-awaiting support in the WebView2 runtime version.
-        EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
-        msgHandler = (_, args) =>
-        {
-            _wv.CoreWebView2.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;
-    }
-}