Revert workflow to git push now that ruleset is fixed

- Menubar shows ↑ Update alongside limits when an update is available
- Removed × dismiss button from update banner; it stays until installed

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/workflows/release-beta.yml

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

.github/workflows/release.yml

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

CONTRIBUTING.md

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

ClaudeChecker/ClaudeCheckerApp.swift

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

ClaudeChecker/ContentView.swift

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

ClaudeChecker/Info.plist

@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.0.2</string>
+    <string>1.1.4-beta.1</string>
     <key>CFBundleVersion</key>
-    <string>21</string>
+    <string>41</string>
     <key>LSMinimumSystemVersion</key>
     <string>13.0</string>
     <key>LSUIElement</key>

ClaudeChecker/LoginView.swift

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

ClaudeChecker/UpdateManager.swift

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

ClaudeChecker/UpdateNotificationWindow.swift

@@ -14,7 +14,7 @@ class UpdateNotificationWindowController: NSWindowController {
 
     // Called when a new update is detected while running
     static func showUpdate(version: String, notes: String, near statusItem: NSStatusItem?) {
-        showWindow(version: version, subtitle: notes.isEmpty ? "Tap to update now." : notes, near: statusItem, isUpdate: true)
+        showWindow(version: version, subtitle: "Tap to view release notes & update now!", near: statusItem, isUpdate: true)
     }
 
     static func showLimitWarning(windowName: String, percent: Int, near statusItem: NSStatusItem?) {
@@ -39,7 +39,12 @@ class UpdateNotificationWindowController: NSWindowController {
         sharedLimit?.close()
         let content = UpdateNotificationView(
             version: "", subtitle: subtitle, isUpdate: false,
-            titleText: title, badgeIcon: badgeIcon, badgeColor: badgeColor
+            titleText: title, badgeIcon: badgeIcon, badgeColor: badgeColor,
+            onTap: {
+                sharedLimit?.close()
+                sharedLimit = nil
+                NotificationCenter.default.post(name: .showPopover, object: nil)
+            }
         ) {
             sharedLimit?.close()
             sharedLimit = nil
@@ -53,7 +58,16 @@ class UpdateNotificationWindowController: NSWindowController {
 
     private static func showWindow(version: String, subtitle: String, near statusItem: NSStatusItem?, isUpdate: Bool) {
         shared?.close()
-        let content = UpdateNotificationView(version: version, subtitle: subtitle, isUpdate: isUpdate) {
+        let content = UpdateNotificationView(version: version, subtitle: subtitle, isUpdate: isUpdate,
+            onTap: {
+                shared?.close()
+                shared = nil
+                NotificationCenter.default.post(name: .showPopover, object: nil)
+                if isUpdate {
+                    NotificationCenter.default.post(name: .openUpdateSheet, object: nil)
+                }
+            }
+        ) {
             shared?.close()
             shared = nil
         }
@@ -129,6 +143,7 @@ struct UpdateNotificationView: View {
     var titleText: String? = nil
     var badgeIcon: String? = nil
     var badgeColor: Color? = nil
+    var onTap: (() -> Void)? = nil
     let onDismiss: () -> Void
 
     private var effectiveTitle: String {
@@ -142,6 +157,8 @@ struct UpdateNotificationView: View {
     }
 
     var body: some View {
+        ZStack(alignment: .topTrailing) {
+            Button(action: { onTap?() }) {
                 HStack(spacing: 12) {
                     ZStack(alignment: .bottomTrailing) {
                         Image(nsImage: NSImage(named: "AppIcon") ?? NSImage())
@@ -159,13 +176,21 @@ struct UpdateNotificationView: View {
                     VStack(alignment: .leading, spacing: 3) {
                         Text(effectiveTitle)
                             .font(.system(size: 13, weight: .semibold))
+                            .foregroundColor(.primary)
                         Text(subtitle)
                             .font(.system(size: 11))
                             .foregroundColor(.secondary)
                             .fixedSize(horizontal: false, vertical: true)
                     }
 
-            Spacer(minLength: 8)
+                    Spacer(minLength: 24)
+                }
+                .padding(.horizontal, 14)
+                .padding(.vertical, 14)
+                .frame(width: 340, alignment: .leading)
+                .contentShape(Rectangle())
+            }
+            .buttonStyle(.plain)
 
             Button(action: onDismiss) {
                 Image(systemName: "xmark")
@@ -173,10 +198,8 @@ struct UpdateNotificationView: View {
                     .foregroundColor(.secondary)
             }
             .buttonStyle(.plain)
+            .padding(14)
         }
-        .padding(.horizontal, 14)
-        .padding(.vertical, 14)
-        .frame(width: 340, alignment: .leading)
         .background(
             RoundedRectangle(cornerRadius: 13)
                 .fill(Color(nsColor: .windowBackgroundColor))

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?
@@ -26,17 +25,20 @@ class UsageViewModel: ObservableObject {
         }
     }
 
+    private var cachedOrgId: String?
     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
+        cachedOrgId = UserDefaults.standard.string(forKey: "claude_org_id")
         let saved = UserDefaults.standard.double(forKey: "refresh_interval")
         refreshInterval = saved > 0 ? saved : 60
         showInMenuBar = UserDefaults.standard.object(forKey: "show_in_menubar") as? Bool ?? true
+        if let saved = UserDefaults.standard.object(forKey: "burn_history") as? [String: [Double]] {
+            burnHistoryStore = saved
+        }
         loadPlaceholderData()
     }
 
@@ -46,6 +48,8 @@ class UsageViewModel: ObservableObject {
         let records = await store.dataRecords(ofTypes: types)
         let claudeRecords = records.filter { $0.displayName.contains("claude.ai") }
         await store.removeData(ofTypes: types, for: claudeRecords)
+        cachedOrgId = nil
+        UserDefaults.standard.removeObject(forKey: "claude_org_id")
         isSignedIn = false
         isNotAuthenticated = true
         lastUpdated = nil
@@ -63,7 +67,17 @@ class UsageViewModel: ObservableObject {
         defer { isLoading = false }
 
         do {
-            let orgId = cachedOrgId!
+            // Fetch org ID dynamically if not cached
+            if cachedOrgId == nil {
+                cachedOrgId = try await fetchOrgId()
+                if let id = cachedOrgId {
+                    UserDefaults.standard.set(id, forKey: "claude_org_id")
+                }
+            }
+            guard let orgId = cachedOrgId else {
+                throw AppError.notAuthenticated
+            }
+
             async let usageFetch   = fetchUsage(orgId: orgId)
             async let prepaidFetch = fetchPrepaidCredits(orgId: orgId)
             async let overageFetch = fetchOverageSpendLimit(orgId: orgId)
@@ -84,8 +98,9 @@ class UsageViewModel: ObservableObject {
                 history.append(limits[i].usedPercent)
                 if history.count > maxHistorySamples { history.removeFirst() }
                 burnHistoryStore[key] = history
-                if history.count > 1 { limits[i].burnHistory = history }
+                limits[i].burnHistory = history
             }
+            UserDefaults.standard.set(burnHistoryStore, forKey: "burn_history")
             checkLimitNotifications(for: limits)
         } catch AppError.notAuthenticated {
             isNotAuthenticated = true
@@ -106,25 +121,62 @@ class UsageViewModel: ObservableObject {
         }
     }
 
+    // MARK: - Fetch org ID from bootstrap
+
+    private func fetchOrgId() async throws -> String? {
+        let url = URL(string: "https://claude.ai/api/bootstrap")!
+        var req = URLRequest(url: url)
+        req.setValue("application/json", forHTTPHeaderField: "accept")
+        let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
+        let claudeCookies = cookies.filter { $0.domain.contains("claude.ai") }
+        if claudeCookies.isEmpty { throw AppError.notAuthenticated }
+        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 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 }
+
+        // account.memberships[0].organization.uuid
+        if let account = json["account"] as? [String: Any],
+           let memberships = account["memberships"] as? [[String: Any]],
+           let org = memberships.first?["organization"] as? [String: Any],
+           let uuid = org["uuid"] as? String {
+            return uuid
+        }
+        // root memberships (older API shape)
+        if let memberships = json["memberships"] as? [[String: Any]],
+           let org = memberships.first?["organization"] as? [String: Any],
+           let uuid = org["uuid"] as? String {
+            return uuid
+        }
+        // root organizations array
+        if let orgs = json["organizations"] as? [[String: Any]],
+           let uuid = orgs.first?["uuid"] as? String {
+            return uuid
+        }
+        return nil
+    }
+
     // MARK: - Fetch usage
 
+    private func claudeCookieHeader() async -> String? {
+        let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
+        let claudeCookies = cookies.filter { $0.domain.contains("claude.ai") }
+        return HTTPCookie.requestHeaderFields(with: claudeCookies)["Cookie"]
+    }
+
     private func fetchUsage(orgId: String) async throws -> UsageResponse {
         let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/usage")!
         var req = URLRequest(url: url)
         req.setValue("application/json", forHTTPHeaderField: "accept")
-
+        if let cookie = await claudeCookieHeader() { req.setValue(cookie, forHTTPHeaderField: "Cookie") }
-        // Inject cookies from WKWebsiteDataStore (shared with browser/Claude app)
-        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 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)
     }
 
@@ -132,11 +184,7 @@ class UsageViewModel: ObservableObject {
         let url = URL(string: "https://claude.ai/api/bootstrap")!
         var req = URLRequest(url: url)
         req.setValue("application/json", forHTTPHeaderField: "accept")
-        let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
+        if let cookie = await claudeCookieHeader() { req.setValue(cookie, forHTTPHeaderField: "Cookie") }
-        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 }
         guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
@@ -149,11 +197,7 @@ class UsageViewModel: ObservableObject {
         let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/prepaid/credits")!
         var req = URLRequest(url: url)
         req.setValue("application/json", forHTTPHeaderField: "accept")
-        let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
+        if let cookie = await claudeCookieHeader() { req.setValue(cookie, forHTTPHeaderField: "Cookie") }
-        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)
@@ -163,11 +207,7 @@ class UsageViewModel: ObservableObject {
         let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/overage_spend_limit")!
         var req = URLRequest(url: url)
         req.setValue("application/json", forHTTPHeaderField: "accept")
-        let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
+        if let cookie = await claudeCookieHeader() { req.setValue(cookie, forHTTPHeaderField: "Cookie") }
-        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)
@@ -241,14 +281,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 }
@@ -259,8 +296,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(
@@ -269,7 +304,6 @@ class UsageViewModel: ObservableObject {
                     userInfo: ["windowName": limit.window.displayName]
                 )
             }
-
             firedThresholds[key] = fired
             previousPercents[key] = curr
         }
@@ -307,7 +341,9 @@ extension Notification.Name {
     static let refreshIntervalChanged = Notification.Name("refreshIntervalChanged")
     static let closePopover = Notification.Name("closePopover")
     static let showPopover = Notification.Name("showPopover")
+    static let popoverWillOpen = Notification.Name("popoverWillOpen")
     static let updateDetected = Notification.Name("updateDetected")
     static let limitWarning = Notification.Name("limitWarning")
     static let limitReset = Notification.Name("limitReset")
+    static let openUpdateSheet = Notification.Name("openUpdateSheet")
 }

README.md

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

RELEASE_NOTES.md

@@ -0,0 +1,4 @@
+## What's new in v1.1.4-beta.1
+
+### Bug fix
+- Org ID is now fetched dynamically from the bootstrap API instead of being hardcoded — the app now works for all users, not just the developer's account

version-beta.json

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

version-windows-beta.json

@@ -0,0 +1,5 @@
+{
+  "version": "0.0.1-beta.33",
+  "url": "https://github.com/superdooper86/claudechecker/releases/download/win-v0.0.1-beta.33/ClaudeChecker-Windows.zip",
+  "notes": "## What's new in beta.33\r\n\r\n- Fix: gauge percentage text is now vertically centered within the dial\r\n- Remove: debug banner no longer appears on the main panel"
+}

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.1",
+  "version": "1.1.3",
-  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.0.1/ClaudeChecker.zip",
+  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.3/ClaudeChecker.zip",
-  "notes": "Update banner can now be dismissed. Fixes update state not clearing correctly."
+  "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"
 }