Upstream sync: keyboard chords, system hotkey, Cursor/Gemini, PR polling refactor

.claude/commands/release-local.md

@@ -38,10 +38,12 @@ Full end-to-end release built locally. Bumps version, updates changelog, tags, t
 
 - Run: `./scripts/bump-version.sh` (bumps minor by default)
 
-### 5. Commit, tag, and push
+### 5. Commit, run the pre-tag guard, then tag and push
 
 - Stage: `CHANGELOG.md`, `GhosttyTabs.xcodeproj/project.pbxproj`
 - Commit message: `Bump version to X.Y.Z`
+- Run: `./scripts/release-pretag-guard.sh`
+- If it fails, run `./scripts/bump-version.sh`, commit the build-number bump, and rerun the guard
 - Create tag: `git tag vX.Y.Z`
 - Push: `git push origin main && git push origin vX.Y.Z`
 

.claude/commands/release.md

@@ -56,7 +56,9 @@ Prepare a new release for cmux. This command updates the changelog, bumps the ve
    - Merge: `gh pr merge --squash --delete-branch`
    - Switch back to main: `git checkout main && git pull`
 
-10. **Create and push the tag**
+10. **Run the pre-tag guard, then create and push the tag**
+    - Run: `./scripts/release-pretag-guard.sh`
+    - If it fails, run `./scripts/bump-version.sh`, commit the build-number bump, push/merge that change, and retry the tag
     - Create tag: `git tag vX.Y.Z`
     - Push tag: `git push origin vX.Y.Z`
 

.github/FUNDING.yml

@@ -0,0 +1,16 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: ['https://github.com/manaflow-ai/cmux#founders-edition']
+# custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/ci.yml

@@ -38,9 +38,6 @@ jobs:
       - name: Validate current GhosttyKit checksum pin
         run: ./tests/test_ci_ghosttykit_checksum_present.sh
 
-      - name: Validate Sparkle build number is monotonic
-        run: ./tests/test_ci_sparkle_build_monotonic.sh
-
   remote-daemon-tests:
     runs-on: ubuntu-latest
     steps:

.github/workflows/release.yml

@@ -24,6 +24,9 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Validate Sparkle build number is monotonic
+        run: ./tests/test_ci_sparkle_build_monotonic.sh
+
       - name: Guard immutable release assets
         id: guard_release_assets
         uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
@@ -79,30 +82,6 @@ jobs:
               throw error;
             }
 
-      - name: Guard Sparkle build number is monotonic
-        if: steps.guard_release_assets.outputs.skip_all != 'true'
-        run: |
-          set -euo pipefail
-          LOCAL_BUILD=$(grep -m1 'CURRENT_PROJECT_VERSION = ' GhosttyTabs.xcodeproj/project.pbxproj | sed 's/.*= //;s/;.*//')
-          if ! [[ "$LOCAL_BUILD" =~ ^[0-9]+$ ]]; then
-            echo "Could not parse CURRENT_PROJECT_VERSION (got '$LOCAL_BUILD')" >&2
-            exit 1
-          fi
-          echo "Local CURRENT_PROJECT_VERSION=$LOCAL_BUILD"
-          PUBLISHED_BUILD=$(curl -fsSL --max-time 15 \
-            https://github.com/manaflow-ai/cmux/releases/latest/download/appcast.xml 2>/dev/null \
-            | sed -n 's#.*<sparkle:version>\([0-9][0-9]*\)</sparkle:version>.*#\1#p' \
-            | head -n1 || true)
-          if [[ "$PUBLISHED_BUILD" =~ ^[0-9]+$ ]]; then
-            echo "Latest published Sparkle build=$PUBLISHED_BUILD"
-            if (( LOCAL_BUILD <= PUBLISHED_BUILD )); then
-              echo "::error::CURRENT_PROJECT_VERSION ($LOCAL_BUILD) must be > latest published Sparkle build ($PUBLISHED_BUILD). Run scripts/bump-version.sh to bump the build number before tagging." >&2
-              exit 1
-            fi
-          else
-            echo "Latest published appcast unavailable; skipping monotonic check"
-          fi
-
       - name: Select Xcode
         if: steps.guard_release_assets.outputs.skip_all != 'true'
         run: |

CLAUDE.md

@@ -235,7 +235,7 @@ Use the `/release` command to prepare a new release. This will:
 2. Gather commits since the last tag and update the changelog
 3. Update `CHANGELOG.md` (the docs changelog page at `web/app/docs/changelog/page.tsx` reads from it)
 4. Run `./scripts/bump-version.sh` to update both versions
-5. Commit, tag, and push
+5. Commit, run `./scripts/release-pretag-guard.sh`, tag, and push
 
 Version bumping:
 
@@ -248,9 +248,18 @@ Version bumping:
 
 This updates both `MARKETING_VERSION` and `CURRENT_PROJECT_VERSION` (build number). The build number is auto-incremented and is required for Sparkle auto-update to work.
 
+Before creating a release tag, run:
+
+```bash
+./scripts/release-pretag-guard.sh
+```
+
+If it fails, run `./scripts/bump-version.sh`, commit the build-number bump, then retry tagging.
+
 Manual release steps (if not using the command):
 
 ```bash
+./scripts/release-pretag-guard.sh
 git tag vX.Y.Z
 git push origin vX.Y.Z
 gh run watch --repo manaflow-ai/cmux