Merge remote-tracking branch 'origin/main' into pr-ssh-stack-main

# Conflicts:
#	.github/workflows/ci.yml
#	CLI/cmux.swift
#	Sources/GhosttyTerminalView.swift
#	Sources/SocketControlSettings.swift
#	Sources/TabManager.swift
#	Sources/TerminalController.swift
#	Sources/Workspace.swift
#	ghostty
#	scripts/reload.sh

.github/workflows/ci.yml

@@ -31,6 +31,9 @@ jobs:
       - name: Validate release asset guard
         run: node scripts/release_asset_guard.test.js
 
+      - name: Validate current GhosttyKit checksum pin
+        run: ./tests/test_ci_ghosttykit_checksum_present.sh
+
   remote-daemon-tests:
     runs-on: ubuntu-latest
     steps:

.github/workflows/nightly.yml

@@ -510,16 +510,13 @@ jobs:
             cmux-nightly-macos-${{ github.run_id }}*.dmg
             cmux-nightly-macos.dmg
             appcast.xml
-<<<<<<< HEAD
             remote-daemon-assets/cmuxd-remote-darwin-arm64
             remote-daemon-assets/cmuxd-remote-darwin-amd64
             remote-daemon-assets/cmuxd-remote-linux-arm64
             remote-daemon-assets/cmuxd-remote-linux-amd64
             remote-daemon-assets/cmuxd-remote-checksums.txt
             remote-daemon-assets/cmuxd-remote-manifest.json
-=======
             appcast-universal.xml
->>>>>>> origin/main
           overwrite_files: true
 
       - name: Cleanup keychain