Fix crash in isNewer when latestVersion is empty; bump to 1.1.2-beta.4

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

.github/workflows/release-beta.yml

@@ -0,0 +1,63 @@
+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: Commit version-beta.json
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add version-beta.json
+          git commit -m "Beta release ${{ github.ref_name }}"
+          git push origin HEAD:main

.github/workflows/release.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - 'v*'
+      - '!v*-*'
 
 jobs:
   release:
@@ -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: |

ClaudeChecker/ClaudeCheckerApp.swift

@@ -60,6 +60,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 +171,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 +210,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 +221,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)
         }

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
-                                        LimitCard(limit: limit)
+                                        VStack(spacing: 0) {
+                                            HStack {
+                                                Text(limit.window == .fiveHour ? "5hr 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(.bottom, 4)
-                                .padding(.vertical, 1)
 
                                 // 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()
@@ -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 {
@@ -988,22 +1041,13 @@ struct UpdateBanner: View {
                 Text("Update available — v\(updater.latestVersion)")
                     .font(.system(size: 12, weight: .semibold))
                 if !updater.releaseNotes.isEmpty {
-                    Text(updater.releaseNotes)
+                    ReleaseNotesText(text: updater.releaseNotes, font: .system(size: 11))
-                        .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)
@@ -1057,9 +1101,7 @@ struct UpdateSheet: View {
                                 .foregroundColor(.blue)
                         }
                         if !updater.releaseNotes.isEmpty {
-                            Text(updater.releaseNotes)
+                            ReleaseNotesText(text: updater.releaseNotes)
-                                .font(.system(size: 12))
-                                .foregroundColor(.secondary)
                         }
                     }
                     Spacer()

ClaudeChecker/Info.plist

@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.0.2</string>
+    <string>1.1.2-beta.4</string>
     <key>CFBundleVersion</key>
-    <string>21</string>
+    <string>35</string>
     <key>LSMinimumSystemVersion</key>
     <string>13.0</string>
     <key>LSUIElement</key>

ClaudeChecker/LoginView.swift

@@ -24,21 +24,27 @@ 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 }
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                self.didAuthenticate = true
-                        self.onAuthenticated()
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                    }
+                    self.onAuthenticated()
                 }
             }
         }
@@ -58,9 +64,18 @@ struct LoginSheetView: View {
                 Text(authenticated ? "✓ Signed in — loading data…" : "Sign in to Claude")
                     .font(.system(size: 13, weight: .semibold))
                 Spacer()
-                Button("Cancel") { isPresented = false }
+                if authenticated {
-                    .buttonStyle(.bordered)
+                    Button("Done") {
+                        isPresented = false
+                        onDone()
+                    }
+                    .buttonStyle(.borderedProminent)
                     .controlSize(.small)
+                } else {
+                    Button("Cancel") { isPresented = false }
+                        .buttonStyle(.bordered)
+                        .controlSize(.small)
+                }
             }
             .padding(.horizontal, 14)
             .padding(.vertical, 10)

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,30 +157,40 @@ struct UpdateNotificationView: View {
     }
 
     var body: some View {
-        HStack(spacing: 12) {
+        ZStack(alignment: .topTrailing) {
-            ZStack(alignment: .bottomTrailing) {
+            Button(action: { onTap?() }) {
-                Image(nsImage: NSImage(named: "AppIcon") ?? NSImage())
+                HStack(spacing: 12) {
-                    .resizable()
+                    ZStack(alignment: .bottomTrailing) {
-                    .frame(width: 44, height: 44)
+                        Image(nsImage: NSImage(named: "AppIcon") ?? NSImage())
-                    .cornerRadius(10)
+                            .resizable()
+                            .frame(width: 44, height: 44)
+                            .cornerRadius(10)
 
-                Image(systemName: effectiveBadgeIcon)
+                        Image(systemName: effectiveBadgeIcon)
-                    .font(.system(size: 16, weight: .semibold))
+                            .font(.system(size: 16, weight: .semibold))
-                    .foregroundColor(effectiveBadgeColor)
+                            .foregroundColor(effectiveBadgeColor)
-                    .background(Color(nsColor: .windowBackgroundColor).clipShape(Circle()))
+                            .background(Color(nsColor: .windowBackgroundColor).clipShape(Circle()))
-                    .offset(x: 4, y: 4)
+                            .offset(x: 4, y: 4)
+                    }
+
+                    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: 24)
+                }
+                .padding(.horizontal, 14)
+                .padding(.vertical, 14)
+                .frame(width: 340, alignment: .leading)
+                .contentShape(Rectangle())
             }
-
+            .buttonStyle(.plain)
-            VStack(alignment: .leading, spacing: 3) {
-                Text(effectiveTitle)
-                    .font(.system(size: 13, weight: .semibold))
-                Text(subtitle)
-                    .font(.system(size: 11))
-                    .foregroundColor(.secondary)
-                    .fixedSize(horizontal: false, vertical: true)
-            }
-
-            Spacer(minLength: 8)
 
             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

@@ -307,7 +307,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,7 +8,7 @@
 
 [![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.1-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases)
 [![License](https://img.shields.io/badge/license-MIT-blue?style=flat)](LICENSE)
 
 </div>

RELEASE_NOTES.md

@@ -0,0 +1,4 @@
+## What's new in v1.1.2
+
+### Cleaner card headers
+Removed the redundant "5h" / "7d" window labels from each card row — the section headers already make it clear which limit is which.

version-beta.json

@@ -0,0 +1,5 @@
+{
+  "version": "1.1.2-beta.3",
+  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.2-beta.3/ClaudeChecker.zip",
+  "notes": "## What's new in v1.1.2\n\n### Cleaner card headers\nRemoved the redundant \"5h\" / \"7d\" window labels from each card row — the section headers already make it clear which limit is which."
+}

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.1",
+  "version": "1.1.1",
-  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.0.1/ClaudeChecker.zip",
+  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.1/ClaudeChecker.zip",
-  "notes": "Update banner can now be dismissed. Fixes update state not clearing correctly."
+  "notes": "## What's new in v1.1.1\n\n### Clearer limit labels\nThe 5hr and 7 Day usage cards now have clear section headers so it's immediately obvious which limit is which.\n\n### Login window fix\nThe sign-in sheet now reliably closes after a successful login. A **Done** button also appears as a fallback once authentication is detected — no more being stuck with only a Cancel button."
 }