beta.21: diagnostics view, cookie polling, detailed error messages

didFinish only fires for cross-document (full page) navigations. After
loading https://claude.ai/login the SPA redirects authenticated users
via history.pushState to /new — this changes the URL visually but never
fires didFinish, so auth was never detected.

KVO on webView.url fires for every URL change including SPA pushState,
covering the case where the app routes client-side after the initial
page load. Both KVO and didFinish now call the same checkCurrentURL
helper so detection is not missed regardless of navigation type.

ClaudeChecker.xcodeproj/project.pbxproj

@@ -10,6 +10,13 @@
 	<string>77</string>
 	<key>objects</key>
 	<dict>
+		<key>AAAAAA009</key>
+		<dict>
+			<key>isa</key>
+			<string>PBXBuildFile</string>
+			<key>fileRef</key>
+			<string>AAAAAA109</string>
+		</dict>
 		<key>AAAAAA007</key>
 		<dict>
 			<key>isa</key>
@@ -88,6 +95,17 @@
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
+		<key>AAAAAA109</key>
+		<dict>
+			<key>isa</key>
+			<string>PBXFileReference</string>
+			<key>lastKnownFileType</key>
+			<string>sourcecode.swift</string>
+			<key>path</key>
+			<string>DiagnosticsView.swift</string>
+			<key>sourceTree</key>
+			<string>&lt;group&gt;</string>
+		</dict>
 		<key>AAAAAA101</key>
 		<dict>
 			<key>isa</key>
@@ -179,6 +197,7 @@
 				<string>AAAAAA106</string>
 				<string>AAAAAA107</string>
 				<string>AAAAAA108</string>
+				<string>AAAAAA109</string>
 			</array>
 			<key>path</key>
 			<string>ClaudeChecker</string>
@@ -292,6 +311,7 @@
 				<string>AAAAAA005</string>
 				<string>AAAAAA007</string>
 				<string>AAAAAA008</string>
+				<string>AAAAAA009</string>
 			</array>
 			<key>runOnlyForDeploymentPostprocessing</key>
 			<string>0</string>

ClaudeChecker/ContentView.swift

@@ -116,8 +116,8 @@ struct ContentView: View {
             showUpdateSheet = true
         }
         .sheet(isPresented: $showLogin) {
-            LoginSheetView(isPresented: $showLogin) {
+            LoginSheetView(isPresented: $showLogin) { webView in
-                Task { await vm.refresh() }
+                Task { await vm.adoptAndRefresh(webView) }
             }
         }
         .sheet(isPresented: $showUpdateSheet) {
@@ -584,6 +584,7 @@ struct SettingsView: View {
     @Binding var showSettings: Bool
     @Binding var showUpdateSheet: Bool
     @State private var checkingForUpdates = false
+    @State private var showDiagnostics = false
 
     let refreshOptions: [(label: String, seconds: TimeInterval)] = [
         ("1 min",  60),
@@ -770,6 +771,23 @@ struct SettingsView: View {
 
             Divider()
 
+            // Diagnostics
+            HStack {
+                Label("Diagnostics", systemImage: "stethoscope")
+                    .font(.system(size: 12, weight: .medium))
+                    .foregroundColor(.secondary)
+                Spacer()
+                Button("Open") { showDiagnostics = true }
+                    .buttonStyle(.bordered)
+                    .controlSize(.small)
+            }
+            .sheet(isPresented: $showDiagnostics) {
+                DiagnosticsView(isPresented: $showDiagnostics)
+                    .environmentObject(vm)
+            }
+
+            Divider()
+
             // About
             HStack(spacing: 12) {
                 Image(nsImage: NSImage(named: "AppIcon") ?? NSImage())

ClaudeChecker/DiagnosticsView.swift

@@ -0,0 +1,226 @@
+import SwiftUI
+import WebKit
+
+struct DiagnosticsView: View {
+    @EnvironmentObject var vm: UsageViewModel
+    @Binding var isPresented: Bool
+    @State private var liveAllCookies: [HTTPCookie] = []
+    @State private var loadingCookies = false
+    @State private var copied = false
+
+    var body: some View {
+        VStack(spacing: 0) {
+            // Header
+            HStack {
+                Text("Diagnostics")
+                    .font(.system(size: 13, weight: .semibold))
+                Spacer()
+                Button("Copy All") {
+                    NSPasteboard.general.clearContents()
+                    NSPasteboard.general.setString(fullDiagText, forType: .string)
+                    copied = true
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) { copied = false }
+                }
+                .buttonStyle(.bordered)
+                .controlSize(.small)
+                if copied {
+                    Text("Copied!")
+                        .font(.system(size: 11))
+                        .foregroundColor(.green)
+                }
+                Button("Close") { isPresented = false }
+                    .buttonStyle(.bordered)
+                    .controlSize(.small)
+            }
+            .padding(.horizontal, 14)
+            .padding(.vertical, 10)
+            .background(Color(nsColor: .windowBackgroundColor))
+
+            Divider()
+
+            ScrollView {
+                VStack(alignment: .leading, spacing: 14) {
+
+                    // App info
+                    DiagSection(title: "App") {
+                        DiagRow("Version", Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "?")
+                        DiagRow("Build",   Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "?")
+                        DiagRow("Signed in", vm.isSignedIn ? "Yes" : "No")
+                        DiagRow("Email",   vm.userEmail.isEmpty ? "(none)" : vm.userEmail)
+                        DiagRow("Org ID",  UserDefaults.standard.string(forKey: "claude_org_id") ?? "(none)")
+                        DiagRow("Error",   vm.errorMessage ?? "(none)")
+                    }
+
+                    Divider()
+
+                    // Last request
+                    DiagSection(title: "Last Request") {
+                        DiagRow("Path",    vm.diagLastPath.isEmpty ? "(none)" : vm.diagLastPath)
+                        DiagRow("Status",  vm.diagLastStatus == 0 ? "(none)" : "\(vm.diagLastStatus)")
+                        DiagRow("Error",   vm.diagLastError.isEmpty ? "(none)" : vm.diagLastError)
+                        if let t = vm.diagLastFetch {
+                            DiagRow("Time", t.formatted(date: .omitted, time: .standard))
+                        }
+                    }
+
+                    Divider()
+
+                    // Response body
+                    if !vm.diagLastBody.isEmpty {
+                        DiagSection(title: "Response Body (first 500 chars)") {
+                            Text(vm.diagLastBody)
+                                .font(.system(size: 10, design: .monospaced))
+                                .foregroundColor(.secondary)
+                                .textSelection(.enabled)
+                                .frame(maxWidth: .infinity, alignment: .leading)
+                                .padding(8)
+                                .background(Color.primary.opacity(0.04))
+                                .cornerRadius(5)
+                        }
+                        Divider()
+                    }
+
+                    // Cookie summary
+                    DiagSection(title: "Cookie Store") {
+                        DiagRow("Total cookies",       "\(vm.diagCookieCount)")
+                        DiagRow("claude.ai cookies",   "\(vm.diagClaudeCookieCount)")
+                        DiagRow("All domains", vm.diagCookieDomains.isEmpty
+                            ? "(none — never fetched)"
+                            : vm.diagCookieDomains.joined(separator: ", "))
+                    }
+
+                    Divider()
+
+                    // Live cookie list
+                    DiagSection(title: "Live Cookie Names (WKWebsiteDataStore.default)") {
+                        if loadingCookies {
+                            ProgressView().scaleEffect(0.7)
+                        } else if liveAllCookies.isEmpty {
+                            Text("No cookies found")
+                                .font(.system(size: 11))
+                                .foregroundColor(.secondary)
+                        } else {
+                            let claudeCookies = liveAllCookies.filter {
+                                $0.domain.contains("claude.ai") || $0.domain.contains("anthropic.com")
+                            }
+                            let otherCookies = liveAllCookies.filter {
+                                !$0.domain.contains("claude.ai") && !$0.domain.contains("anthropic.com")
+                            }
+                            if !claudeCookies.isEmpty {
+                                Text("claude.ai / anthropic.com (\(claudeCookies.count))")
+                                    .font(.system(size: 10, weight: .medium))
+                                    .foregroundColor(.orange)
+                                ForEach(claudeCookies, id: \.name) { c in
+                                    Text("• \(c.domain)  \(c.name)")
+                                        .font(.system(size: 10, design: .monospaced))
+                                        .foregroundColor(.secondary)
+                                }
+                            }
+                            if !otherCookies.isEmpty {
+                                Text("Other domains (\(otherCookies.count))")
+                                    .font(.system(size: 10, weight: .medium))
+                                    .foregroundColor(.secondary)
+                                    .padding(.top, 4)
+                                ForEach(otherCookies.prefix(10), id: \.name) { c in
+                                    Text("• \(c.domain)  \(c.name)")
+                                        .font(.system(size: 10, design: .monospaced))
+                                        .foregroundColor(Color.secondary.opacity(0.6))
+                                }
+                                if otherCookies.count > 10 {
+                                    Text("… and \(otherCookies.count - 10) more")
+                                        .font(.system(size: 10))
+                                        .foregroundColor(Color.secondary.opacity(0.5))
+                                }
+                            }
+                        }
+
+                        Button("Refresh cookies") { loadLiveCookies() }
+                            .buttonStyle(.bordered)
+                            .controlSize(.small)
+                            .padding(.top, 4)
+                    }
+                }
+                .padding(14)
+            }
+        }
+        .frame(width: 480, height: 560)
+        .onAppear { loadLiveCookies() }
+    }
+
+    private func loadLiveCookies() {
+        loadingCookies = true
+        WKWebsiteDataStore.default().httpCookieStore.getAllCookies { cookies in
+            DispatchQueue.main.async {
+                liveAllCookies = cookies.sorted { $0.domain < $1.domain }
+                loadingCookies = false
+            }
+        }
+    }
+
+    private var fullDiagText: String {
+        var lines: [String] = []
+        lines.append("=== ClaudeChecker Diagnostics ===")
+        lines.append("Version: \(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "?") (\(Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "?"))")
+        lines.append("Signed in: \(vm.isSignedIn ? "Yes" : "No")")
+        lines.append("Email: \(vm.userEmail.isEmpty ? "(none)" : vm.userEmail)")
+        lines.append("Org ID: \(UserDefaults.standard.string(forKey: "claude_org_id") ?? "(none)")")
+        lines.append("Error: \(vm.errorMessage ?? "(none)")")
+        lines.append("")
+        lines.append("Last path: \(vm.diagLastPath)")
+        lines.append("Last status: \(vm.diagLastStatus)")
+        lines.append("Last error: \(vm.diagLastError)")
+        lines.append("Total cookies: \(vm.diagCookieCount)")
+        lines.append("Claude cookies: \(vm.diagClaudeCookieCount)")
+        lines.append("Domains: \(vm.diagCookieDomains.joined(separator: ", "))")
+        lines.append("")
+        lines.append("Response body:")
+        lines.append(vm.diagLastBody)
+        lines.append("")
+        lines.append("Live cookies:")
+        for c in liveAllCookies {
+            lines.append("  \(c.domain)  \(c.name)  httpOnly=\(c.isHTTPOnly)  secure=\(c.isSecure)")
+        }
+        return lines.joined(separator: "\n")
+    }
+}
+
+// MARK: - Helpers
+
+private struct DiagSection<Content: View>: View {
+    let title: String
+    @ViewBuilder let content: () -> Content
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 6) {
+            Text(title)
+                .font(.system(size: 11, weight: .semibold))
+                .foregroundColor(.secondary)
+                .textCase(.uppercase)
+            content()
+        }
+    }
+}
+
+private struct DiagRow: View {
+    let label: String
+    let value: String
+
+    init(_ label: String, _ value: String) {
+        self.label = label
+        self.value = value
+    }
+
+    var body: some View {
+        HStack(alignment: .top, spacing: 8) {
+            Text(label)
+                .font(.system(size: 11))
+                .foregroundColor(.secondary)
+                .frame(width: 100, alignment: .leading)
+            Text(value)
+                .font(.system(size: 11, design: .monospaced))
+                .foregroundColor(.primary)
+                .textSelection(.enabled)
+                .frame(maxWidth: .infinity, alignment: .leading)
+        }
+    }
+}

ClaudeChecker/Info.plist

@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.2.1-beta.9</string>
+    <string>1.2.1-beta.21</string>
     <key>CFBundleVersion</key>
-    <string>57</string>
+    <string>69</string>
     <key>LSMinimumSystemVersion</key>
     <string>13.0</string>
     <key>LSUIElement</key>

ClaudeChecker/LoginView.swift

@@ -4,7 +4,7 @@ import WebKit
 // MARK: - Login Web View
 
 struct LoginWebView: NSViewRepresentable {
-    let onAuthenticated: () -> Void
+    let onAuthenticated: (WKWebView) -> Void
 
     func makeNSView(context: Context) -> WKWebView {
         let config = WKWebViewConfiguration()
@@ -12,6 +12,13 @@ struct LoginWebView: NSViewRepresentable {
 
         let webView = WKWebView(frame: .zero, configuration: config)
         webView.navigationDelegate = context.coordinator
+        context.coordinator.webView = webView
+
+        // KVO on url catches SPA pushState navigations that don't fire didFinish
+        context.coordinator.urlObservation = webView.observe(\.url, options: [.new]) { [weak coordinator = context.coordinator] wv, _ in
+            coordinator?.checkCurrentURL(wv.url?.absoluteString)
+        }
+
         webView.load(URLRequest(url: URL(string: "https://claude.ai/login")!))
         return webView
     }
@@ -23,37 +30,31 @@ struct LoginWebView: NSViewRepresentable {
     }
 
     class Coordinator: NSObject, WKNavigationDelegate {
-        let onAuthenticated: () -> Void
+        let onAuthenticated: (WKWebView) -> Void
+        weak var webView: WKWebView?
         var didAuthenticate = false
+        var urlObservation: NSKeyValueObservation?
 
-        init(onAuthenticated: @escaping () -> Void) {
+        init(onAuthenticated: @escaping (WKWebView) -> Void) {
             self.onAuthenticated = onAuthenticated
         }
 
-        func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        func checkCurrentURL(_ url: String?) {
-            guard !didAuthenticate else { return }
+            guard !didAuthenticate, let url, let wv = webView else { return }
-            // Don't fire on the login/auth pages themselves
+            // Ignore navigations to external OAuth providers (Google, etc.) —
-            if let url = webView.url?.absoluteString,
+            // only consider auth complete when we land back on claude.ai/anthropic.com
-               url.contains("/login") || url.contains("/auth") { return }
+            guard url.contains("claude.ai") || url.contains("anthropic.com") else { return }
-
+            if url.contains("/login") || url.contains("/auth") { return }
-            // Ask the WebView itself whether we're authenticated — it uses its own
+            didAuthenticate = true
-            // session (cookies, localStorage, etc.) so we don't need to know the
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-            // cookie domain or name.
+                self.onAuthenticated(wv)
-            webView.callAsyncJavaScript(
-                "const r = await fetch('/api/bootstrap', {credentials: 'include'}); return r.status;",
-                arguments: [:], in: nil, in: .page
-            ) { [weak self] result in
-                guard let self, !self.didAuthenticate else { return }
-                // JS numbers arrive as NSNumber (Double-backed), not Swift Int
-                if case .success(let val) = result,
-                   let n = val as? NSNumber, n.intValue == 200 {
-                    self.didAuthenticate = true
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-                        self.onAuthenticated()
-                    }
-                }
             }
         }
+
+        // Covers full cross-document navigations
+        func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+            checkCurrentURL(webView.url?.absoluteString)
+        }
     }
 }
 
@@ -61,7 +62,7 @@ struct LoginWebView: NSViewRepresentable {
 
 struct LoginSheetView: View {
     @Binding var isPresented: Bool
-    let onDone: () -> Void
+    let onDone: (WKWebView) -> Void
     @State private var authenticated = false
 
     var body: some View {
@@ -71,12 +72,9 @@ struct LoginSheetView: View {
                     .font(.system(size: 13, weight: .semibold))
                 Spacer()
                 if authenticated {
-                    Button("Done") {
+                    Button("Done") { isPresented = false }
-                        isPresented = false
+                        .buttonStyle(.borderedProminent)
-                        onDone()
+                        .controlSize(.small)
-                    }
-                    .buttonStyle(.borderedProminent)
-                    .controlSize(.small)
                 } else {
                     Button("Cancel") { isPresented = false }
                         .buttonStyle(.bordered)
@@ -89,12 +87,13 @@ struct LoginSheetView: View {
 
             Divider()
 
-            LoginWebView {
+            LoginWebView { webView in
                 authenticated = true
-                // Auto-dismiss and refresh after brief delay
+                // Adopt the authenticated WebView immediately (before sheet tears it down),
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.8) {
+                // then auto-dismiss after a moment so the user sees confirmation.
+                onDone(webView)
+                DispatchQueue.main.asyncAfter(deadline: .now() + 1.2) {
                     isPresented = false
-                    onDone()
                 }
             }
         }

ClaudeChecker/UsageViewModel.swift

@@ -30,6 +30,16 @@ class UsageViewModel: ObservableObject {
     private var previousPercents: [String: Double] = [:]
     private var firedThresholds: [String: Set<Int>] = [:]
 
+    // Diagnostics — populated on every urlFetch call
+    @Published var diagCookieCount: Int = 0
+    @Published var diagClaudeCookieCount: Int = 0
+    @Published var diagCookieDomains: [String] = []
+    @Published var diagLastPath: String = ""
+    @Published var diagLastStatus: Int = 0
+    @Published var diagLastBody: String = ""
+    @Published var diagLastError: String = ""
+    @Published var diagLastFetch: Date? = nil
+
     init() {
         let saved = UserDefaults.standard.double(forKey: "refresh_interval")
         refreshInterval = saved > 0 ? saved : 60
@@ -41,6 +51,78 @@ class UsageViewModel: ObservableObject {
         Task { await checkInitialSignInState() }
     }
 
+    // Called after login: poll until session cookies appear (they may commit slightly
+    // after the auth redirect fires), then refresh.
+    func adoptAndRefresh(_ loginWebView: WKWebView) async {
+        for _ in 0..<30 {
+            let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
+            if cookies.contains(where: { $0.domain.contains("claude.ai") }) { break }
+            try? await Task.sleep(nanoseconds: 300_000_000)
+        }
+        await refresh()
+    }
+
+    // Fetches an API path via URLSession with browser-like headers.
+    // Claude.ai's API requires sec-fetch-*, Origin, Referer, and a browser User-Agent
+    // to avoid 401 — matching how the Windows version (HttpClient) handles this.
+    private func urlFetch(_ path: String) async throws -> (Int, String) {
+        let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
+        let claudeCookies = cookies.filter {
+            $0.domain.contains("claude.ai") || $0.domain.contains("anthropic.com")
+        }
+
+        // Record cookie diagnostics
+        diagCookieCount = cookies.count
+        diagClaudeCookieCount = claudeCookies.count
+        diagCookieDomains = Array(Set(cookies.map { $0.domain })).sorted()
+        diagLastPath = path
+        diagLastFetch = Date()
+        diagLastError = ""
+
+        guard !claudeCookies.isEmpty else {
+            let msg = "No claude.ai cookies (\(cookies.count) total in store)"
+            diagLastError = msg
+            throw AppError.detail(msg)
+        }
+
+        var req = URLRequest(url: URL(string: "https://claude.ai\(path)")!)
+        req.httpShouldHandleCookies = false
+        if let cookieHeader = HTTPCookie.requestHeaderFields(with: claudeCookies)["Cookie"] {
+            req.setValue(cookieHeader, forHTTPHeaderField: "Cookie")
+        }
+        req.setValue("application/json", forHTTPHeaderField: "Accept")
+        req.setValue("https://claude.ai", forHTTPHeaderField: "Origin")
+        req.setValue("https://claude.ai/", forHTTPHeaderField: "Referer")
+        req.setValue("empty",       forHTTPHeaderField: "sec-fetch-dest")
+        req.setValue("cors",        forHTTPHeaderField: "sec-fetch-mode")
+        req.setValue("same-origin", forHTTPHeaderField: "sec-fetch-site")
+        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")
+        req.setValue(
+            "\"Chromium\";v=\"124\", \"Google Chrome\";v=\"124\", \"Not-A.Brand\";v=\"99\"",
+            forHTTPHeaderField: "sec-ch-ua")
+        req.setValue("?0",        forHTTPHeaderField: "sec-ch-ua-mobile")
+        req.setValue("\"macOS\"", forHTTPHeaderField: "sec-ch-ua-platform")
+
+        do {
+            let (data, response) = try await URLSession.shared.data(for: req)
+            guard let http = response as? HTTPURLResponse else { throw AppError.networkError }
+            let body = String(data: data, encoding: .utf8) ?? ""
+            diagLastStatus = http.statusCode
+            diagLastBody   = String(body.prefix(500))
+            if http.statusCode != 200 {
+                diagLastError = "HTTP \(http.statusCode)"
+            }
+            return (http.statusCode, body)
+        } catch let e as AppError { throw e }
+        catch {
+            let msg = error.localizedDescription
+            diagLastError = msg
+            throw AppError.detail(msg)
+        }
+    }
+
     private func checkInitialSignInState() async {
         let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
         if !cookies.isEmpty { isSignedIn = true }
@@ -90,8 +172,8 @@ class UsageViewModel: ObservableObject {
             async let overageFetch = fetchOverageSpendLimit(orgId: orgId)
             let (usage, prepaid, overage) = try await (usageFetch, prepaidFetch, overageFetch)
             limits = buildLimits(from: usage)
-            extraUsage = usage.extraUsage
+            extraUsage        = usage.extraUsage
-            prepaidCredits = prepaid
+            prepaidCredits    = prepaid
             overageSpendLimit = overage
             lastUpdated = Date()
             isSignedIn = true
@@ -126,50 +208,34 @@ class UsageViewModel: ObservableObject {
         }
     }
 
-    // MARK: - Bootstrap (org ID + email + plan label in one call)
+    // MARK: - Bootstrap
-
-    private func claudeAPIRequest(for url: URL) async -> URLRequest {
-        var req = URLRequest(url: url)
-        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")
-        req.setValue("https://claude.ai", forHTTPHeaderField: "Origin")
-        req.setValue("https://claude.ai/", forHTTPHeaderField: "Referer")
-        req.setValue("same-origin", forHTTPHeaderField: "sec-fetch-site")
-        req.setValue("cors", forHTTPHeaderField: "sec-fetch-mode")
-        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")!
+        let (status, body) = try await urlFetch("/api/bootstrap")
-        var req = await claudeAPIRequest(for: url)
+        if status == 401 || status == 403 {
-        guard req.value(forHTTPHeaderField: "Cookie") != nil else { throw AppError.notAuthenticated }
+            throw AppError.detail("HTTP \(status) — \(body.prefix(120))")
-        let (data, response) = try await URLSession.shared.data(for: req)
+        }
-        guard let http = response as? HTTPURLResponse else { throw AppError.networkError }
+        guard status == 200 else { throw AppError.detail("HTTP \(status): \(body.prefix(80))") }
-        if http.statusCode == 401 || http.statusCode == 403 { throw AppError.notAuthenticated }
+        guard body.trimmingCharacters(in: .whitespacesAndNewlines).hasPrefix("{") else {
-        guard http.statusCode == 200 else { throw AppError.networkError }
+            throw AppError.detail("Non-JSON response (HTML?): \(body.prefix(80))")
-        guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+        }
+        guard let data = body.data(using: .utf8),
+              let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
             return (nil, nil, nil)
         }
 
         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
+            if let (orgsStatus, orgsBody) = try? await urlFetch("/api/organizations"),
-            let orgsReq = await claudeAPIRequest(for: URL(string: "https://claude.ai/api/organizations")!)
+               orgsStatus == 200,
-            if let (orgsData, orgsResp) = try? await URLSession.shared.data(for: orgsReq),
+               let orgsData = orgsBody.data(using: .utf8),
-               let orgsHttp = orgsResp as? HTTPURLResponse, orgsHttp.statusCode == 200,
                let orgs = try? JSONSerialization.jsonObject(with: orgsData) as? [[String: Any]] {
                 orgId = orgs.first?["uuid"] as? String
             }
@@ -177,7 +243,6 @@ class UsageViewModel: ObservableObject {
 
         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_") }) {
@@ -190,37 +255,25 @@ class UsageViewModel: ObservableObject {
 
     // MARK: - Fetch usage
 
-    private func claudeCookieHeader() async -> String? {
-        let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
-        guard !cookies.isEmpty else { return nil }
-        // Send all cookies from the app's WebView store — the session token may be
-        // 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 (status, body) = try await urlFetch("/api/organizations/\(orgId)/usage")
-        let req = await claudeAPIRequest(for: url)
+        if status == 401 || status == 403 { throw AppError.notAuthenticated }
-        let (data, response) = try await URLSession.shared.data(for: req)
+        guard status == 200 else { throw AppError.networkError }
-        guard let http = response as? HTTPURLResponse else { throw AppError.networkError }
+        guard let data = body.data(using: .utf8) else { throw AppError.networkError }
-        if http.statusCode == 401 || http.statusCode == 403 { throw AppError.notAuthenticated }
-        guard http.statusCode == 200 else { throw AppError.networkError }
         return try JSONDecoder().decode(UsageResponse.self, from: data)
     }
 
     private func fetchPrepaidCredits(orgId: String) async throws -> PrepaidCredits? {
-        let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/prepaid/credits")!
+        guard let (status, body) = try? await urlFetch("/api/organizations/\(orgId)/prepaid/credits"),
-        let req = await claudeAPIRequest(for: url)
+              status == 200,
-        let (data, response) = try await URLSession.shared.data(for: req)
+              let data = body.data(using: .utf8) else { return nil }
-        guard let http = response as? HTTPURLResponse, http.statusCode == 200 else { return nil }
         return try? JSONDecoder().decode(PrepaidCredits.self, from: data)
     }
 
     private func fetchOverageSpendLimit(orgId: String) async throws -> OverageSpendLimit? {
-        let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/overage_spend_limit")!
+        guard let (status, body) = try? await urlFetch("/api/organizations/\(orgId)/overage_spend_limit"),
-        let req = await claudeAPIRequest(for: url)
+              status == 200,
-        let (data, response) = try await URLSession.shared.data(for: req)
+              let data = body.data(using: .utf8) else { return nil }
-        guard let http = response as? HTTPURLResponse, http.statusCode == 200 else { return nil }
         return try? JSONDecoder().decode(OverageSpendLimit.self, from: data)
     }
 
@@ -337,13 +390,16 @@ class UsageViewModel: ObservableObject {
     }
 }
 
+
 enum AppError: LocalizedError {
     case notAuthenticated
     case networkError
+    case detail(String)
     var errorDescription: String? {
         switch self {
-        case .notAuthenticated: return "Not signed into claude.ai — open claude.ai in your browser first."
+        case .notAuthenticated:   return "Not signed into claude.ai — open claude.ai in your browser first."
-        case .networkError:     return "Network error fetching usage data."
+        case .networkError:       return "Network error fetching usage data."
+        case .detail(let msg):    return msg
         }
     }
 }

README.md

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

RELEASE_NOTES.md

@@ -1,12 +1,20 @@
+## What's new in v1.2.1-beta.18
+
+### Bug fixes
+- Replaced callAsyncJavaScript fetch approach with WebKit navigation: instead of running `fetch()` in the page's JS context (which was returning 401 because it bypasses the SPA's auth interceptors), each API call now navigates the WebView to the API URL directly. WebKit sends full browser headers and cookies automatically at the HTTP layer, the same way a real browser navigation works. This is more reliable regardless of what server-side auth mechanism claude.ai uses.
+- API calls are now sequential to share a single WebView for all navigations
+- Added redirect detection: if WebKit follows a 302 to /login, the response is treated as an auth failure rather than returning HTML to the JSON parser
+
+## What's new in v1.2.1-beta.17
+
+### Bug fixes
+- Fixed "Not signed in" after login by adopting the login WebView directly for API calls
+- Added diagnostic error messages for JS errors and unexpected responses
+
 ## What's new in v1.2.1
 
 ### Bug fixes
-- Fixed "Not signed in" showing incorrectly on launch when the session was already active
+- Fixed WebKit suspending the background WKWebView: anchored in a transparent 1×1 NSWindow
-- Sign-in state is now detected immediately from stored cookies on startup, before the first data refresh completes
+- Fixed login window auto-closing before sign-in 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
+- Added /api/organizations as a final fallback for org ID resolution
-- Fixed "No API key configured" showing after signing out — now correctly shows "Not signed in" with a prompt to sign in
+- Fixed Settings incorrectly showing "Signed in" after a failed 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)
-- Fixed Settings incorrectly showing "Signed in" after a failed refresh — sign-in state now resets when authentication fails
-- 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
-- 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.2.1-beta.8",
+  "version": "1.2.1-beta.20",
-  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.2.1-beta.8/ClaudeChecker.zip",
+  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.2.1-beta.20/ClaudeChecker.zip",
-  "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 Settings incorrectly showing \"Signed in\" after a failed refresh — sign-in state now resets when authentication fails\n- 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\n- Fixed API requests not including session cookies — now sends all cookies from the app's WebView store rather than filtering by domain"
+  "notes": "## What's new in v1.2.1-beta.18\n\n### Bug fixes\n- Replaced callAsyncJavaScript fetch approach with WebKit navigation: instead of running `fetch()` in the page's JS context (which was returning 401 because it bypasses the SPA's auth interceptors), each API call now navigates the WebView to the API URL directly. WebKit sends full browser headers and cookies automatically at the HTTP layer, the same way a real browser navigation works. This is more reliable regardless of what server-side auth mechanism claude.ai uses.\n- API calls are now sequential to share a single WebView for all navigations\n- Added redirect detection: if WebKit follows a 302 to /login, the response is treated as an auth failure rather than returning HTML to the JSON parser\n\n## What's new in v1.2.1-beta.17\n\n### Bug fixes\n- Fixed \"Not signed in\" after login by adopting the login WebView directly for API calls\n- Added diagnostic error messages for JS errors and unexpected responses\n\n## What's new in v1.2.1\n\n### Bug fixes\n- Fixed WebKit suspending the background WKWebView: anchored in a transparent 1×1 NSWindow\n- Fixed login window auto-closing before sign-in completes\n- Added /api/organizations as a final fallback for org ID resolution\n- Fixed Settings incorrectly showing \"Signed in\" after a failed refresh"
 }