Add rebase before push in both workflows to handle concurrent commits

.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
@@ -65,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 '' \
-            's/version-[0-9][^-]*-orange/version-${{ steps.version.outputs.version }}-orange/' \
-            README.md
+          python3 -c "
+          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)
+          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: |
@@ -76,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

ClaudeChecker/ContentView.swift

@@ -212,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()
@@ -789,25 +789,23 @@ 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))
-                                .foregroundColor(.white)
-                                .padding(.horizontal, 6)
-                                .padding(.vertical, 2)
-                                .background(Color.blue)
-                                .cornerRadius(4)
-                                .fixedSize()
-                        } else if updater.betaAvailable {
-                            Text("v\(updater.latestBetaVersion) available")
-                                .font(.system(size: 10, weight: .medium))
-                                .foregroundColor(.white)
-                                .padding(.horizontal, 6)
-                                .padding(.vertical, 2)
-                                .background(Color.orange)
-                                .cornerRadius(4)
-                                .fixedSize()
-                        }
+                    }
+                    if updater.updateAvailable {
+                        Text("v\(updater.latestVersion) available")
+                            .font(.system(size: 10, weight: .medium))
+                            .foregroundColor(.white)
+                            .padding(.horizontal, 6)
+                            .padding(.vertical, 2)
+                            .background(Color.blue)
+                            .cornerRadius(4)
+                    } else if updater.betaAvailable {
+                        Text("v\(updater.latestBetaVersion) available")
+                            .font(.system(size: 10, weight: .medium))
+                            .foregroundColor(.white)
+                            .padding(.horizontal, 6)
+                            .padding(.vertical, 2)
+                            .background(Color.orange)
+                            .cornerRadius(4)
                     }
                     Text("Built by superdooper86 & claude")
                         .font(.system(size: 11))
@@ -1040,9 +1038,9 @@ struct UpdateBanner: View {
             VStack(alignment: .leading, spacing: 1) {
                 Text("Update available — v\(updater.latestVersion)")
                     .font(.system(size: 12, weight: .semibold))
-                if !updater.releaseNotes.isEmpty {
-                    ReleaseNotesText(text: updater.releaseNotes, font: .system(size: 11))
-                }
+                Text("Tap Update to view what's new & install.")
+                    .font(.system(size: 11))
+                    .foregroundColor(.secondary)
             }
             Spacer()
             Button("Update") { showSheet = true }

ClaudeChecker/Info.plist

@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.1.1</string>
+    <string>1.1.3-beta.1</string>
     <key>CFBundleVersion</key>
-    <string>34</string>
+    <string>35</string>
     <key>LSMinimumSystemVersion</key>
     <string>13.0</string>
     <key>LSUIElement</key>

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) } }
-        let a = toInts(version), b = toInts(current)
-        for i in 0..<max(a.count, b.count) {
-            let av = i < a.count ? a[i] : 0
-            let bv = i < b.count ? b[i] : 0
+        func parse(_ v: String) -> (base: [Int], pre: [Int]?) {
+            guard !v.isEmpty else { return ([], nil) }
+            let halves = v.split(separator: "-", maxSplits: 1)
+            let base = halves[0].split(separator: ".").compactMap { Int($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
     }
 }

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.1.0-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases)
+[![Version](https://img.shields.io/badge/version-1.1.2-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases)
 [![License](https://img.shields.io/badge/license-MIT-blue?style=flat)](LICENSE)
+<!-- BETA_BADGE -->
 
 </div>
 

RELEASE_NOTES.md

@@ -1,7 +1,4 @@
-## What's new in v1.1.1
+## What's new in v1.1.3
 
-### Clearer limit labels
-The 5hr and 7 Day usage cards now have clear section headers so it's immediately obvious which limit is which.
-
-### Login window fix
-The 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.
+### Compact update banner
+The in-app update banner no longer shows full release notes — it now shows a short message and lets you tap Update to read what's new in the install sheet. This prevents the banner from pushing content around when release notes are long.

version-beta.json

@@ -0,0 +1,5 @@
+{
+  "version": "1.1.2-beta.7",
+  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.2-beta.7/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.1.0",
-  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.0/ClaudeChecker.zip",
-  "notes": "## What's new in v1.1.0\n\n### Clickable notifications\nTapping a limit warning or reset notification opens the main window. Tapping an update notification opens the update sheet directly — no need to manually click the menubar icon.\n\n### Update indicator in menubar\nWhen an update is available, the menubar shows **↑ Update** alongside your usage percentages so you know at a glance without opening the app.\n\n### Release notes render correctly\nThe update banner and update sheet now render markdown formatting — headers, **bold text**, and bullet points display properly.\n\n### Update notification improved\nThe update popup now reads **\"Tap to view release notes & update now!\"** making it clear you can read what changed before installing.\n\n### Main window always opens on click\nClosing the app while Settings was open would cause the next click to reopen straight to Settings. The app now always returns to the main window."
+  "version": "1.1.2",
+  "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.2/ClaudeChecker.zip",
+  "notes": "## What's new in v1.1.2\n\n### Cleaner usage cards\nRemoved the redundant \"5h\" / \"7d\" labels from each card row — the section headers already make it clear which limit is which.\n\n### Beta update support\nThe app now correctly detects and compares beta versions (e.g. v1.1.2-beta.2 > v1.1.2-beta.1) when the beta channel is enabled in Settings. Stable releases also correctly supersede beta builds of the same version — so users on a beta are prompted to install the final release.\n\n### Fixed crash when enabling beta channel\nEnabling the beta toggle could crash the app if no stable update was available. This is now fixed.\n\n### Fixed settings panel truncation\nThe app name and version number no longer get cut off when an update badge is displayed in Settings."
 }