Bump version to 1.3.3-beta.5 (build 81)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -18,12 +18,18 @@ Steps to reproduce the behaviour:
 **Expected behaviour**
 What you expected to happen.
 
+**Diagnostics**
+Open the app → Settings → Diagnostics, then click "Copy All" and paste the output here.
+This shows the error, request state, and cookie info. Email and org IDs are automatically redacted when you click Copy All.
+
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
 **Environment**
-- macOS version: [e.g. Sequoia 15.4]
-- ClaudeChecker version: [e.g. 1.1.3]
+- Platform: [macOS / Windows]
+- macOS version: [e.g. Sequoia 15.4] *(if applicable)*
+- Windows version: [e.g. Windows 11 24H2] *(if applicable)*
+- ClaudeChecker version: [e.g. 1.3.2]
 - Claude plan: [e.g. Pro, Max]
 
 **Additional context**

.github/workflows/release-beta.yml

@@ -58,7 +58,7 @@ jobs:
         run: |
           shields_version=$(echo "${{ steps.version.outputs.version }}" | sed 's/-/--/g')
           tag="${{ github.ref_name }}"
-          export BADGE="[![Beta](https://img.shields.io/badge/beta-${shields_version}-orange?style=flat)](https://github.com/${{ github.repository }}/releases/tag/${tag}) <!-- BETA_BADGE -->"
+          export BADGE="[![macOS Beta](https://img.shields.io/badge/macOS_Beta-${shields_version}-orange?style=flat)](https://github.com/${{ github.repository }}/releases/tag/${tag}) <!-- BETA_BADGE -->"
           python3 -c "
           import os
           badge = os.environ['BADGE']
@@ -75,5 +75,7 @@ jobs:
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git add version-beta.json README.md
           git commit -m "Beta release ${{ github.ref_name }}"
-          git pull --rebase origin main
-          git push origin HEAD:main
+          for i in 1 2 3 4 5; do
+            git pull --rebase origin main && git push origin HEAD:main && break
+            echo "Push attempt $i failed, retrying..."; sleep 3
+          done

.github/workflows/release.yml

@@ -73,15 +73,9 @@ jobs:
           import os, re
           v = os.environ['NEW_VERSION']
           content = open('README.md').read()
-          content = re.sub(r'version-[0-9][^-]*-orange', 'version-' + v + '-orange', content)
+          content = re.sub(r'macOS_Stable-[^-]+-orange', 'macOS_Stable-' + v + '-orange', content)
           lines = content.splitlines(keepends=True)
-          out = []
-          for line in lines:
-              if '<!-- BETA_BADGE -->' in line:
-                  continue
-              out.append(line)
-              if 'license-MIT-blue' in line:
-                  out.append('<!-- BETA_BADGE -->' + chr(10))
+          out = ['<!-- BETA_BADGE -->' + chr(10) if '<!-- BETA_BADGE -->' in line else line for line in lines]
           open('README.md', 'w').writelines(out)
           "
 

ClaudeChecker/DiagnosticsView.swift

@@ -24,7 +24,7 @@ struct DiagnosticsView: View {
                 .buttonStyle(.bordered)
                 .controlSize(.small)
                 if copied {
-                    Text("Copied!")
+                    Text("Copied! (IDs redacted)")
                         .font(.system(size: 11))
                         .foregroundColor(.green)
                 }
@@ -38,6 +38,15 @@ struct DiagnosticsView: View {
 
             Divider()
 
+            Text("Org IDs are redacted when copied.")
+                .font(.system(size: 10))
+                .foregroundColor(.secondary)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .padding(.horizontal, 14)
+                .padding(.vertical, 6)
+
+            Divider()
+
             ScrollView {
                 VStack(alignment: .leading, spacing: 14) {
 
@@ -46,7 +55,6 @@ struct DiagnosticsView: View {
                         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("lastActiveOrg", vm.diagLastActiveOrg.isEmpty ? "(not read)" : vm.diagLastActiveOrg)
                         DiagRow("Error",   vm.errorMessage ?? "(none)")
@@ -66,17 +74,6 @@ struct DiagnosticsView: View {
 
                     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 {
@@ -144,28 +141,39 @@ struct DiagnosticsView: View {
     }
 
     private var fullDiagText: String {
+        let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "?"
+        let build   = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "?"
+        let orgId   = UserDefaults.standard.string(forKey: "claude_org_id") ?? "(none)"
+        let lastOrg = vm.diagLastActiveOrg.isEmpty ? "(not read)" : vm.diagLastActiveOrg
+        let lastErr = vm.diagLastError.isEmpty ? "(none)" : vm.diagLastError
         var lines: [String] = []
         lines.append("=== ClaudeChecker Diagnostics ===")
-        lines.append("Version: \(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "?") (\(Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "?"))")
+        lines.append("Version: \(version) (\(build))")
         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("lastActiveOrg: \(vm.diagLastActiveOrg.isEmpty ? "(not read)" : vm.diagLastActiveOrg)")
+        lines.append("Org ID: \(orgId)")
+        lines.append("lastActiveOrg: \(lastOrg)")
         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("Last error: \(lastErr)")
+        if let t = vm.diagLastFetch {
+            lines.append("Time: \(t.formatted(date: .omitted, time: .standard))")
+        }
         lines.append("")
         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")
+        return redactUUIDs(lines.joined(separator: "\n"))
+    }
+
+    private func redactUUIDs(_ text: String) -> String {
+        let pattern = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"
+        guard let regex = try? NSRegularExpression(pattern: pattern) else { return text }
+        let range = NSRange(text.startIndex..., in: text)
+        return regex.stringByReplacingMatches(in: text, range: range, withTemplate: "****")
     }
 }
 

ClaudeChecker/Info.plist

@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.3.2</string>
+    <string>1.3.3-beta.5</string>
     <key>CFBundleVersion</key>
-    <string>76</string>
+    <string>81</string>
     <key>LSMinimumSystemVersion</key>
     <string>13.0</string>
     <key>LSUIElement</key>

README.md

@@ -7,10 +7,13 @@
 **A native macOS menubar app for monitoring your Claude AI usage limits in real time.**
 
 [![macOS](https://img.shields.io/badge/macOS-13.0+-000000?style=flat&logo=apple&logoColor=white)](https://www.apple.com/macos/)
+[![Windows](https://img.shields.io/badge/Windows-10%2B-0078D4?style=flat&logo=windows&logoColor=white)](https://www.microsoft.com/windows/)
 [![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.3.1-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases)
 [![License](https://img.shields.io/badge/license-MIT-blue?style=flat)](LICENSE)
-<!-- BETA_BADGE -->
+<br/>
+[![macOS Stable](https://img.shields.io/badge/macOS_Stable-1.3.2-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases)
+[![macOS Beta](https://img.shields.io/badge/macOS_Beta-1.3.3--beta.3-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases/tag/v1.3.3-beta.3) <!-- BETA_BADGE -->
+[![Win Beta](https://img.shields.io/badge/Win_Beta-0.0.1--beta.55-blue?style=flat)](https://github.com/superdooper86/claudechecker/releases/tag/win-v0.0.1-beta.55) <!-- WIN_BETA_BADGE -->
 
 </div>
 

version-beta.json

@@ -1,5 +1 @@
-{
-  "version": "1.2.1-beta.25",
-  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.2.1-beta.25/ClaudeChecker.zip",
-  "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"
-}
+{"version": "1.3.3-beta.3", "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.3.3-beta.3/ClaudeChecker.zip", "notes": "## What's new in v1.3.2\n\n### Reliability\n- Data now loads automatically on every app launch without requiring manual re-authentication. The background WebView is anchored in a hidden window so macOS no longer throttles its JavaScript execution."}

version-windows-beta.json

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

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.1",
-  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.3.1/ClaudeChecker.zip",
-  "notes": "## What's new in v1.3.1\n\n### Privacy\n- Diagnostics panel no longer displays API response bodies, which could contain account and financial data. Status codes, error messages, cookie names, and request paths are still shown."
+  "version": "1.3.2",
+  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.3.2/ClaudeChecker.zip",
+  "notes": "## What's new in v1.3.2\n\n### Reliability\n- Data now loads automatically on every app launch without requiring manual re-authentication. The background WebView is anchored in a hidden window so macOS no longer throttles its JavaScript execution."
 }