From 0a8c4cbf2d8ff7f8186b86bfcf4d1c6a690531bf Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Wed, 22 Jul 2026 14:23:34 -0700
Subject: [PATCH 001/124] test: require foreground-only global search shortcut

---
 Sources/KeyboardShortcutSettings.swift              | 2 +-
 cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index 36181e58abc3..f510f6577cba 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -1161,7 +1161,7 @@ final class SystemWideHotkeyController {
         .showHideAllWindows: 1,
         .globalSearch: 2,
     ]
-    private static let systemWideActions: [KeyboardShortcutSettings.Action] = [
+    static let systemWideActions: [KeyboardShortcutSettings.Action] = [
         .showHideAllWindows,
         .globalSearch,
     ]
diff --git a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
index e66b6b528657..6c0a6811b15e 100644
--- a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
+++ b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
@@ -53,6 +53,12 @@ final class SystemWideHotkeyShortcutPolicyTests {
         )
     }
 
+    @Test func registrationPolicyContainsOnlyExplicitlySystemWideActions() {
+        #expect(
+            SystemWideHotkeyController.systemWideActions == [.showHideAllWindows]
+        )
+    }
+
     @Test func globalSearchStillRejectsCommandGraveWindowCyclingHotkey() {
         let shortcut = commandGraveShortcut()
 

From ebe79a9cb09b36b0d667fb4c21c31332c534bfd1 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Wed, 22 Jul 2026 16:47:39 -0700
Subject: [PATCH 002/124] fix: scope global search shortcut to foreground

---
 Sources/App/MenuBarExtraController.swift      |   2 +-
 Sources/App/ShortcutBareStartRouting.swift    |   2 +-
 Sources/AppDelegate.swift                     |  15 +-
 Sources/KeyboardShortcutSettings.swift        | 145 +++++-----------
 .../KeyboardShortcutSettingsFileStore.swift   |   4 +-
 .../GlobalSearchShortcutSettingsTests.swift   | 155 +++++++++---------
 .../SystemWideHotkeyShortcutPolicyTests.swift |  12 +-
 skills/cmux-keyboard-shortcuts/SKILL.md       |   3 +-
 web/data/cmux-shortcuts.ts                    |   2 +-
 9 files changed, 135 insertions(+), 205 deletions(-)

diff --git a/Sources/App/MenuBarExtraController.swift b/Sources/App/MenuBarExtraController.swift
index 7c068ef50570..12653b7ca5f4 100644
--- a/Sources/App/MenuBarExtraController.swift
+++ b/Sources/App/MenuBarExtraController.swift
@@ -270,7 +270,7 @@ final class MenuBarExtraController: NSObject, NSMenuDelegate {
     }
 
     @objc private func globalSearchAction() {
-        toggleGlobalSearchPalette()
+        AppDelegate.shared?.toggleGlobalSearchPalette()
     }
 
     @objc private func showMainWindowAction() {
diff --git a/Sources/App/ShortcutBareStartRouting.swift b/Sources/App/ShortcutBareStartRouting.swift
index 12971d5807d0..cf76b099e4c1 100644
--- a/Sources/App/ShortcutBareStartRouting.swift
+++ b/Sources/App/ShortcutBareStartRouting.swift
@@ -15,7 +15,7 @@ enum KeyboardShortcutBareStartCache {
 
         let resolvedKeys = Set(
             KeyboardShortcutSettings.Action.allCases.compactMap { action -> String? in
-                guard action != .showHideAllWindows else { return nil }
+                guard !action.isSystemWideHotkey else { return nil }
                 guard !action.isBrowserContentShortcut else { return nil }
                 guard action.participatesInAppWideBareStartRouting else { return nil }
                 return KeyboardShortcutSettings.shortcut(for: action).bareShortcutStartKey
diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index 6a8d6cdfebab..f621bc44207b 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -9015,7 +9015,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         )
     }
 
-    func toggleGlobalSearchPaletteFromGlobalHotkey() {
+    func toggleGlobalSearchPalette() {
         if menuBarExtraController == nil,
            MenuBarExtraSettings.shouldInstallMenuBarExtra() {
             setupMenuBarExtra()
@@ -12525,13 +12525,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
 
     private func currentConfiguredShortcutChordActions() -> [KeyboardShortcutSettings.Action] {
         KeyboardShortcutSettings.Action.allCases.filter { action in
-            // System-wide hotkeys are dispatched via Carbon RegisterEventHotKey
-            // and never routed through AppKit's local key handler. If a managed
-            // cmux.json entry somehow stores one as a chord, arming the prefix
-            // here would swallow the first stroke and leave the second one
-            // orphaned, breaking that keystroke for the focused terminal/browser
-            // input.
-            guard action != .showHideAllWindows && action != .globalSearch && action.allowsChordShortcut else { return false }
+            // Carbon owns the opt-in hotkey and never routes through AppKit's local handler.
+            guard !action.isSystemWideHotkey && action.allowsChordShortcut else { return false }
             guard !action.isBrowserContentShortcut else { return false }
             return KeyboardShortcutSettings.shortcut(for: action).hasChord
         }
@@ -12882,6 +12877,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             return false
         }
 
+        if matchConfiguredShortcut(event: event, action: .globalSearch) { toggleGlobalSearchPalette(); return true }
+
         if browserFocusModePanelForShortcutEvent(event) != nil {
 #if DEBUG
             cmuxDebugLog("browser.focusMode.shortcutMonitor.bypass \(debugShortcutRouteSnapshot(event: event))")
@@ -15534,7 +15531,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
     }
 
     private func isMenuBackedShortcutAction(_ action: KeyboardShortcutSettings.Action) -> Bool {
-        action != .showHideAllWindows
+        !action.isSystemWideHotkey
             && action != .globalSearch
             && action != .clearScreenKeepScrollback
             && action != .fileExplorerOpenSelection
diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index f510f6577cba..393aa0161b5a 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -628,6 +628,8 @@ enum KeyboardShortcutSettings {
             }
         }
 
+        var isSystemWideHotkey: Bool { self == .showHideAllWindows }
+
         var allowsChordShortcut: Bool {
             self != .fileExplorerOpenSelection && self != .fileExplorerOpenSelectionFinderAlias && self != .cycleTextBoxSubmitAction
         }
@@ -705,7 +707,7 @@ enum KeyboardShortcutSettings {
 
             // Preserve invalid settings-file values for the show/hide hotkey so managed configuration
             // remains visible instead of silently falling back to defaults. Runtime registration still rejects unsupported Carbon hotkey shapes.
-            if usesNumberedDigitMatching || self == .globalSearch {
+            if usesNumberedDigitMatching {
                 return nil
             }
             return shortcut
@@ -717,7 +719,7 @@ enum KeyboardShortcutSettings {
             }
 
             switch self {
-            case .showHideAllWindows, .globalSearch:
+            case .showHideAllWindows:
                 return KeyboardShortcutSettings.normalizedSystemWideHotkeyShortcutResult(
                     shortcut,
                     for: self,
@@ -930,7 +932,6 @@ enum KeyboardShortcutSettings {
         case .rejected:
             if action.usesNumberedDigitMatching ||
                 action == .showHideAllWindows ||
-                action == .globalSearch ||
                 !action.allowsChordShortcut {
                 return nil
             }
@@ -1157,16 +1158,13 @@ struct CarbonHotKeyRegistration: Equatable {
 final class SystemWideHotkeyController {
     static let shared = SystemWideHotkeyController()
     private static let hotKeySignature: OSType = 0x434D484B // "CMHK"
-    private static let hotKeyIDs: [KeyboardShortcutSettings.Action: UInt32] = [
-        .showHideAllWindows: 1,
-        .globalSearch: 2,
-    ]
-    static let systemWideActions: [KeyboardShortcutSettings.Action] = [
-        .showHideAllWindows,
-        .globalSearch,
-    ]
+    private static let hotKeyID: UInt32 = 1
+    static var systemWideActions: [KeyboardShortcutSettings.Action] {
+        KeyboardShortcutSettings.Action.allCases.filter(\.isSystemWideHotkey)
+    }
+    private static let action = SystemWideHotkeySettings.action
 
-    private var hotKeyRefs: [KeyboardShortcutSettings.Action: EventHotKeyRef] = [:]
+    private var hotKeyRef: EventHotKeyRef?
     private var hotKeyHandler: EventHandlerRef?
     private var defaultsObserver: NSObjectProtocol?
     private var shortcutObserver: NSObjectProtocol?
@@ -1174,8 +1172,8 @@ final class SystemWideHotkeyController {
     private var packageRecorderObserver: NSObjectProtocol?
     private var inputSourceObserver: NSObjectProtocol?
     private var appHideObserver: NSObjectProtocol?
-    private var registeredShortcuts: [KeyboardShortcutSettings.Action: StoredShortcut] = [:]
-    private var registeredHotKeyRegistrations: [KeyboardShortcutSettings.Action: CarbonHotKeyRegistration] = [:]
+    private var registeredShortcut: StoredShortcut?
+    private var registeredHotKeyRegistration: CarbonHotKeyRegistration?
 
     private init() {}
 
@@ -1238,44 +1236,35 @@ final class SystemWideHotkeyController {
     }
 
     private func refreshRegistration() {
+        let shortcut = SystemWideHotkeySettings.shortcut()
         // Stand down while either recorder is armed (legacy app-target recorder or the CmuxSettingsUI
-        // package recorder) so a system-wide hotkey being rebound in Settings is captured rather than fired.
+        // package recorder) so the opt-in hotkey is captured rather than fired while being rebound.
         let isShortcutRecordingActive = KeyboardShortcutRecorderActivity.isAnyRecorderActive
             || RecorderHostButton.isActivelyRecording
 
-        guard !isShortcutRecordingActive else {
-            unregisterHotKeys()
-            return
-        }
-
-        for action in Self.systemWideActions {
-            refreshRegistration(for: action)
-        }
-    }
-
-    private func refreshRegistration(for action: KeyboardShortcutSettings.Action) {
-        let configuredShortcut = shortcut(for: action)
-        guard isSystemWideActionEnabled(action, shortcut: configuredShortcut) else {
-            unregisterHotKey(for: action)
+        guard SystemWideHotkeySettings.isEnabled(),
+              !shortcut.isUnbound,
+              !isShortcutRecordingActive else {
+            unregisterHotKey()
             return
         }
 
-        guard let normalizedShortcut = action.normalizedRecordedShortcut(configuredShortcut),
+        guard let normalizedShortcut = Self.action.normalizedRecordedShortcut(shortcut),
               let registration = normalizedShortcut.carbonHotKeyRegistration else {
-            unregisterHotKey(for: action)
+            unregisterHotKey()
             return
         }
 
-        if registeredShortcuts[action] == normalizedShortcut,
-           registeredHotKeyRegistrations[action] == registration,
-           hotKeyRefs[action] != nil {
+        if registeredShortcut == normalizedShortcut,
+           registeredHotKeyRegistration == registration,
+           hotKeyRef != nil {
             return
         }
 
-        unregisterHotKey(for: action)
+        unregisterHotKey()
         installHotKeyHandlerIfNeeded()
 
-        let hotKeyID = EventHotKeyID(signature: Self.hotKeySignature, id: Self.hotKeyID(for: action))
+        let hotKeyID = EventHotKeyID(signature: Self.hotKeySignature, id: Self.hotKeyID)
         var hotKeyRef: EventHotKeyRef?
         let status = RegisterEventHotKey(
             registration.keyCode,
@@ -1289,50 +1278,25 @@ final class SystemWideHotkeyController {
         guard status == noErr, let hotKeyRef else {
 #if DEBUG
             cmuxDebugLog(
-                "globalHotkey.register failed action=\(action.rawValue) shortcut=\(normalizedShortcut.displayString) " +
+                "globalHotkey.register failed action=\(Self.action.rawValue) shortcut=\(normalizedShortcut.displayString) " +
                 "keyCode=\(registration.keyCode) modifiers=\(registration.modifiers) status=\(status)"
             )
 #endif
             return
         }
 
-        hotKeyRefs[action] = hotKeyRef
-        registeredShortcuts[action] = normalizedShortcut
-        registeredHotKeyRegistrations[action] = registration
+        self.hotKeyRef = hotKeyRef
+        registeredShortcut = normalizedShortcut
+        registeredHotKeyRegistration = registration
 
 #if DEBUG
         cmuxDebugLog(
-            "globalHotkey.register success action=\(action.rawValue) shortcut=\(normalizedShortcut.displayString) " +
+            "globalHotkey.register success action=\(Self.action.rawValue) shortcut=\(normalizedShortcut.displayString) " +
             "keyCode=\(registration.keyCode) modifiers=\(registration.modifiers)"
         )
 #endif
     }
 
-    private func shortcut(for action: KeyboardShortcutSettings.Action) -> StoredShortcut {
-        switch action {
-        case .showHideAllWindows:
-            return SystemWideHotkeySettings.shortcut()
-        default:
-            return KeyboardShortcutSettings.shortcut(for: action)
-        }
-    }
-
-    private func isSystemWideActionEnabled(
-        _ action: KeyboardShortcutSettings.Action,
-        shortcut: StoredShortcut
-    ) -> Bool {
-        guard !shortcut.isUnbound else { return false }
-        switch action {
-        case .showHideAllWindows:
-            return SystemWideHotkeySettings.isEnabled()
-        case .globalSearch:
-            return true
-        default:
-            assertionFailure("Unhandled system-wide hotkey action: \(action.rawValue)")
-            return false
-        }
-    }
-
     private func installHotKeyHandlerIfNeeded() {
         guard hotKeyHandler == nil else { return }
 
@@ -1358,18 +1322,13 @@ final class SystemWideHotkeyController {
 #endif
     }
 
-    private func unregisterHotKey(for action: KeyboardShortcutSettings.Action) {
-        if let hotKeyRef = hotKeyRefs.removeValue(forKey: action) {
+    private func unregisterHotKey() {
+        if let hotKeyRef {
             UnregisterEventHotKey(hotKeyRef)
+            self.hotKeyRef = nil
         }
-        registeredShortcuts[action] = nil
-        registeredHotKeyRegistrations[action] = nil
-    }
-
-    private func unregisterHotKeys() {
-        for action in Self.systemWideActions {
-            unregisterHotKey(for: action)
-        }
+        registeredShortcut = nil
+        registeredHotKeyRegistration = nil
     }
 
     private static let hotKeyEventHandler: EventHandlerUPP = { _, event, userInfo in
@@ -1396,32 +1355,27 @@ final class SystemWideHotkeyController {
 
         guard status == noErr,
               hotKeyID.signature == Self.hotKeySignature,
-              let action = Self.action(forHotKeyID: hotKeyID.id) else {
+              hotKeyID.id == Self.hotKeyID else {
             return OSStatus(eventNotHandledErr)
         }
 
 #if DEBUG
-        let shortcut = registeredShortcuts[action]?.displayString ?? "unknown"
-        cmuxDebugLog("globalHotkey.fire action=\(action.rawValue) shortcut=\(shortcut) active=\(NSApp.isActive ? 1 : 0)")
+        let shortcut = registeredShortcut?.displayString ?? "unknown"
+        cmuxDebugLog(
+            "globalHotkey.fire action=\(Self.action.rawValue) " +
+            "shortcut=\(shortcut) active=\(NSApp.isActive ? 1 : 0)"
+        )
 #endif
 
         Task { @MainActor [weak self] in
-            self?.perform(action)
+            self?.toggleApplicationVisibility()
         }
         return OSStatus(noErr)
     }
 
     @MainActor
-    private func perform(_ action: KeyboardShortcutSettings.Action) {
-        switch action {
-        case .showHideAllWindows:
-            AppDelegate.shared?.toggleApplicationVisibilityFromGlobalHotkey()
-        case .globalSearch:
-            AppDelegate.shared?.toggleGlobalSearchPaletteFromGlobalHotkey()
-        default:
-            assertionFailure("Unhandled system-wide hotkey action: \(action.rawValue)")
-            break
-        }
+    private func toggleApplicationVisibility() {
+        AppDelegate.shared?.toggleApplicationVisibilityFromGlobalHotkey()
     }
 
     @MainActor
@@ -1429,17 +1383,6 @@ final class SystemWideHotkeyController {
         AppDelegate.shared?.captureMainWindowVisibilityRestoreTargetsForApplicationHide()
     }
 
-    private static func hotKeyID(for action: KeyboardShortcutSettings.Action) -> UInt32 {
-        guard let hotKeyID = hotKeyIDs[action] else {
-            assertionFailure("Unhandled system-wide hotkey action: \(action.rawValue)")
-            return 0
-        }
-        return hotKeyID
-    }
-
-    private static func action(forHotKeyID hotKeyID: UInt32) -> KeyboardShortcutSettings.Action? {
-        systemWideActions.first { Self.hotKeyID(for: $0) == hotKeyID }
-    }
 }
 
 struct ShortcutStroke: Equatable, Hashable {
diff --git a/Sources/KeyboardShortcutSettingsFileStore.swift b/Sources/KeyboardShortcutSettingsFileStore.swift
index 37954d1ea134..443df2636c69 100644
--- a/Sources/KeyboardShortcutSettingsFileStore.swift
+++ b/Sources/KeyboardShortcutSettingsFileStore.swift
@@ -1061,8 +1061,8 @@ final class CmuxSettingsFileStore {
             // Object form written by the CmuxSettings package recorder (in-app
             // Settings UI): { "first": { key, command, ... }, "second": { ... }? }.
             // A Settings rebinding only reaches this store in that shape; decode it
-            // so every action resolved here — most visibly the system-wide Carbon
-            // hotkeys (globalSearch, showHideAllWindows) — honors the rebinding
+            // so every action resolved here — including foreground Global Search and the
+            // opt-in system-wide Show/Hide hotkey — honors the rebinding
             // instead of silently falling back to the built-in default.
             if let object = rawValue as? [String: Any] {
                 return parseShortcutObjectForm(object, action: action)
diff --git a/cmuxTests/GlobalSearchShortcutSettingsTests.swift b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
index 4e38287fc477..2bd0fb043091 100644
--- a/cmuxTests/GlobalSearchShortcutSettingsTests.swift
+++ b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
@@ -1,4 +1,5 @@
-import XCTest
+import Foundation
+import Testing
 
 #if canImport(cmux_DEV)
 @testable import cmux_DEV
@@ -7,11 +8,11 @@ import XCTest
 #endif
 
 @MainActor
-final class GlobalSearchShortcutSettingsTests: XCTestCase {
-    private var originalSettingsFileStore: KeyboardShortcutSettingsFileStore!
+@Suite(.serialized)
+final class GlobalSearchShortcutSettingsTests {
+    private let originalSettingsFileStore: KeyboardShortcutSettingsFileStore
 
-    override func setUp() {
-        super.setUp()
+    init() {
         originalSettingsFileStore = KeyboardShortcutSettings.settingsFileStore
         KeyboardShortcutSettings.settingsFileStore = KeyboardShortcutSettingsFileStore(
             primaryPath: FileManager.default.temporaryDirectory
@@ -24,50 +25,44 @@ final class GlobalSearchShortcutSettingsTests: XCTestCase {
         KeyboardShortcutSettings.resetAll()
     }
 
-    override func tearDown() {
+    deinit {
         KeyboardShortcutSettings.settingsFileStore = originalSettingsFileStore
         KeyboardShortcutSettings.resetAll()
-        super.tearDown()
     }
 
-    func testGlobalSearchDefaultShortcutIsRemappableAndSystemWideSafe() {
+    @Test func globalSearchDefaultShortcutIsRemappableAndForegroundScoped() {
         let defaultShortcut = KeyboardShortcutSettings.shortcut(for: .globalSearch)
 
-        XCTAssertEqual(
-            defaultShortcut,
-            StoredShortcut(key: "f", command: true, shift: false, option: true, control: false)
+        #expect(
+            defaultShortcut ==
+                StoredShortcut(key: "f", command: true, shift: false, option: true, control: false)
         )
-        XCTAssertTrue(KeyboardShortcutSettings.publicShortcutActions.contains(.globalSearch))
-        XCTAssertTrue(KeyboardShortcutSettings.settingsVisibleActions.contains(.globalSearch))
-        XCTAssertEqual(KeyboardShortcutSettings.shortcut(for: .sendFeedback), .unbound)
-        XCTAssertEqual(
-            KeyboardShortcutSettings.Action.globalSearch.normalizedRecordedShortcutResult(defaultShortcut),
-            .accepted(defaultShortcut)
+        #expect(KeyboardShortcutSettings.publicShortcutActions.contains(.globalSearch))
+        #expect(KeyboardShortcutSettings.settingsVisibleActions.contains(.globalSearch))
+        #expect(KeyboardShortcutSettings.shortcut(for: .sendFeedback) == .unbound)
+        #expect(
+            KeyboardShortcutSettings.Action.globalSearch.normalizedRecordedShortcutResult(defaultShortcut) ==
+                .accepted(defaultShortcut)
         )
     }
 
-    func testGlobalSearchRejectsBareSystemWideShortcut() {
-        let bareShortcut = StoredShortcut(key: "f", command: false, shift: false, option: false, control: false)
-
-        XCTAssertEqual(
-            KeyboardShortcutSettings.Action.globalSearch.normalizedRecordedShortcutResult(bareShortcut),
-            .rejected(.systemWideHotkeyRequiresModifier)
-        )
+    @Test func globalSearchUsesApplicationBareKeyPolicy() {
+        #expect(!KeyboardShortcutSettings.Action.globalSearch.allowsBareFirstStroke)
     }
 
-    func testGlobalSearchRejectsConfiguredShowHideHotkeyConflict() {
+    @Test func globalSearchRejectsConfiguredShowHideHotkeyConflict() {
         let reservedShortcut = StoredShortcut(key: "g", command: true, shift: false, option: true, control: true)
 
         KeyboardShortcutSettings.setShortcut(.unbound, for: .globalSearch)
         SystemWideHotkeySettings.setShortcut(reservedShortcut)
 
-        XCTAssertEqual(
-            KeyboardShortcutSettings.Action.globalSearch.normalizedRecordedShortcutResult(reservedShortcut),
-            .rejected(.reservedBySystem)
+        #expect(
+            KeyboardShortcutSettings.Action.globalSearch.normalizedRecordedShortcutResult(reservedShortcut) ==
+                .rejected(.conflictsWithAction(.showHideAllWindows))
         )
     }
 
-    func testSettingsFileStoreParsesGlobalSearchShortcut() throws {
+    @Test func settingsFileStoreParsesGlobalSearchShortcut() throws {
         let directoryURL = FileManager.default.temporaryDirectory
             .appendingPathComponent("cmux-global-search-settings-\(UUID().uuidString)", isDirectory: true)
         try FileManager.default.createDirectory(at: directoryURL, withIntermediateDirectories: true)
@@ -88,22 +83,15 @@ final class GlobalSearchShortcutSettingsTests: XCTestCase {
             startWatching: false
         )
 
-        XCTAssertEqual(
-            store.override(for: .globalSearch),
-            StoredShortcut(key: "g", command: true, shift: false, option: false, control: true)
+        #expect(
+            store.override(for: .globalSearch) ==
+                StoredShortcut(key: "g", command: true, shift: false, option: false, control: true)
         )
     }
 
-    func testSettingsFileStoreParsesPackageObjectFormGlobalSearchShortcut() throws {
-        // Regression for https://github.com/manaflow-ai/cmux/issues/5137.
-        // The in-app Settings UI (CmuxSettings package) persists every
-        // shortcut rebinding to cmux.json under `shortcuts.bindings.<action>`
-        // as a nested StoredShortcut object ({"first": {key, command, ...}}),
-        // not the legacy human-editable "cmd+opt+f" string. The file store
-        // that feeds KeyboardShortcutSettings — and therefore the system-wide
-        // Carbon hotkeys (globalSearch, showHideAllWindows) — must understand
-        // that object form. Otherwise SystemWideHotkeyController never sees the
-        // rebinding and the default ⌥⌘F keeps opening Global Search.
+    @Test func settingsFileStoreParsesPackageObjectFormGlobalSearchShortcut() throws {
+        // Regression for #5137: the Settings package writes a nested StoredShortcut object.
+        // Both foreground and system-wide routes must read that form rather than fall back.
         let directoryURL = FileManager.default.temporaryDirectory
             .appendingPathComponent("cmux-global-search-object-settings-\(UUID().uuidString)", isDirectory: true)
         try FileManager.default.createDirectory(at: directoryURL, withIntermediateDirectories: true)
@@ -128,16 +116,14 @@ final class GlobalSearchShortcutSettingsTests: XCTestCase {
             startWatching: false
         )
 
-        XCTAssertEqual(
-            store.override(for: .globalSearch),
-            StoredShortcut(key: "j", command: true, shift: false, option: false, control: true)
+        #expect(
+            store.override(for: .globalSearch) ==
+                StoredShortcut(key: "j", command: true, shift: false, option: false, control: true)
         )
     }
 
-    func testSettingsFileStoreParsesPackageObjectFormChordShortcut() throws {
-        // The package object form also encodes two-stroke chords as
-        // {"first": {...}, "second": {...}}. A non-system-wide action exercises
-        // the general path so the fix is not narrowed to global search.
+    @Test func settingsFileStoreParsesPackageObjectFormChordShortcut() throws {
+        // Package object form also encodes chords as {"first": {...}, "second": {...}}.
         let directoryURL = FileManager.default.temporaryDirectory
             .appendingPathComponent("cmux-chord-object-settings-\(UUID().uuidString)", isDirectory: true)
         try FileManager.default.createDirectory(at: directoryURL, withIntermediateDirectories: true)
@@ -163,27 +149,25 @@ final class GlobalSearchShortcutSettingsTests: XCTestCase {
             startWatching: false
         )
 
-        XCTAssertEqual(
-            store.override(for: .newTab),
-            StoredShortcut(
-                key: "b",
-                command: false,
-                shift: false,
-                option: false,
-                control: true,
-                chordKey: "n",
-                chordCommand: false,
-                chordShift: false,
-                chordOption: false,
-                chordControl: false
-            )
+        #expect(
+            store.override(for: .newTab) ==
+                StoredShortcut(
+                    key: "b",
+                    command: false,
+                    shift: false,
+                    option: false,
+                    control: true,
+                    chordKey: "n",
+                    chordCommand: false,
+                    chordShift: false,
+                    chordOption: false,
+                    chordControl: false
+                )
         )
     }
 
-    func testSettingsFileStoreParsesPackageObjectFormUnboundShortcut() throws {
-        // The package marks an explicit "no shortcut" override with an empty
-        // primary key ({"first": {"key": ""}}). The legacy reader must treat
-        // that as unbound, not as an invalid binding to be dropped.
+    @Test func settingsFileStoreParsesPackageObjectFormUnboundShortcut() throws {
+        // An empty primary key marks an explicit unbound override, not invalid data.
         let directoryURL = FileManager.default.temporaryDirectory
             .appendingPathComponent("cmux-unbound-object-settings-\(UUID().uuidString)", isDirectory: true)
         try FileManager.default.createDirectory(at: directoryURL, withIntermediateDirectories: true)
@@ -206,13 +190,11 @@ final class GlobalSearchShortcutSettingsTests: XCTestCase {
             startWatching: false
         )
 
-        XCTAssertEqual(store.override(for: .globalSearch), .unbound)
+        #expect(store.override(for: .globalSearch) == .unbound)
     }
 
-    func testSettingsFileStoreRejectsObjectFormChordWithMalformedSecondStroke() throws {
-        // A present-but-malformed `second` stroke must invalidate the whole
-        // binding rather than silently degrading the chord to a single stroke
-        // (which could create an unintended single-key shortcut).
+    @Test func settingsFileStoreRejectsObjectFormChordWithMalformedSecondStroke() throws {
+        // A malformed second stroke invalidates the chord instead of degrading it.
         let directoryURL = FileManager.default.temporaryDirectory
             .appendingPathComponent("cmux-bad-chord-object-\(UUID().uuidString)", isDirectory: true)
         try FileManager.default.createDirectory(at: directoryURL, withIntermediateDirectories: true)
@@ -238,12 +220,11 @@ final class GlobalSearchShortcutSettingsTests: XCTestCase {
             startWatching: false
         )
 
-        XCTAssertNil(store.override(for: .newTab))
+        #expect(store.override(for: .newTab) == nil)
     }
 
-    func testSettingsFileStoreRejectsObjectFormBareKeyForModifierRequiringAction() throws {
-        // Object-form parsing must apply the same bare-first-stroke rule as the
-        // string parser: an action that requires a modifier rejects a bare key.
+    @Test func settingsFileStoreRejectsObjectFormBareKeyForModifierRequiringAction() throws {
+        // Object and string parsing apply the same bare-first-stroke rule.
         let directoryURL = FileManager.default.temporaryDirectory
             .appendingPathComponent("cmux-bare-object-\(UUID().uuidString)", isDirectory: true)
         try FileManager.default.createDirectory(at: directoryURL, withIntermediateDirectories: true)
@@ -266,12 +247,12 @@ final class GlobalSearchShortcutSettingsTests: XCTestCase {
             startWatching: false
         )
 
-        XCTAssertNil(store.override(for: .newTab))
+        #expect(store.override(for: .newTab) == nil)
     }
 
-    func testSettingsFileStoreRejectsGlobalSearchChordBinding() throws {
+    @Test func settingsFileStoreParsesGlobalSearchChordBinding() throws {
         let directoryURL = FileManager.default.temporaryDirectory
-            .appendingPathComponent("cmux-global-search-invalid-settings-\(UUID().uuidString)", isDirectory: true)
+            .appendingPathComponent("cmux-global-search-chord-settings-\(UUID().uuidString)", isDirectory: true)
         try FileManager.default.createDirectory(at: directoryURL, withIntermediateDirectories: true)
         defer { try? FileManager.default.removeItem(at: directoryURL) }
 
@@ -290,6 +271,20 @@ final class GlobalSearchShortcutSettingsTests: XCTestCase {
             startWatching: false
         )
 
-        XCTAssertNil(store.override(for: .globalSearch))
+        #expect(
+            store.override(for: .globalSearch) ==
+                StoredShortcut(
+                    key: "k",
+                    command: true,
+                    shift: false,
+                    option: false,
+                    control: false,
+                    chordKey: "f",
+                    chordCommand: false,
+                    chordShift: false,
+                    chordOption: false,
+                    chordControl: false
+                )
+        )
     }
 }
diff --git a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
index 6c0a6811b15e..72d9ea571656 100644
--- a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
+++ b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
@@ -54,18 +54,12 @@ final class SystemWideHotkeyShortcutPolicyTests {
     }
 
     @Test func registrationPolicyContainsOnlyExplicitlySystemWideActions() {
-        #expect(
-            SystemWideHotkeyController.systemWideActions == [.showHideAllWindows]
-        )
+        #expect(SystemWideHotkeyController.systemWideActions == [.showHideAllWindows])
     }
 
-    @Test func globalSearchStillRejectsCommandGraveWindowCyclingHotkey() {
+    @Test func foregroundGlobalSearchDoesNotUseSystemWideReservationPolicy() {
         let shortcut = commandGraveShortcut()
-
-        #expect(
-            KeyboardShortcutSettings.Action.globalSearch.normalizedRecordedShortcutResult(shortcut) ==
-                .rejected(.reservedBySystem)
-        )
+        #expect(KeyboardShortcutSettings.Action.globalSearch.normalizedRecordedShortcutResult(shortcut) == .accepted(shortcut))
     }
 
     private func commandGraveShortcut(shift: Bool = false) -> StoredShortcut {
diff --git a/skills/cmux-keyboard-shortcuts/SKILL.md b/skills/cmux-keyboard-shortcuts/SKILL.md
index 394bd3ed9b5a..fd26e085c4b5 100644
--- a/skills/cmux-keyboard-shortcuts/SKILL.md
+++ b/skills/cmux-keyboard-shortcuts/SKILL.md
@@ -45,7 +45,8 @@ fi
 - Chord: `["ctrl+b","c"]`. The first stroke needs a modifier unless the key is Space. The second stroke can be bare.
 - Unbind: prefer `null` for explicit unbinds. `""`, `"none"`, `"clear"`, `"unbound"`, and `"disabled"` are accepted aliases, but `null` is the clearest JSON value and matches the templates below.
 - `selectSurfaceByNumber` and `selectWorkspaceByNumber` must use a digit from 1 to 9. `cmd+1` means the full `cmd+1` through `cmd+9` family.
-- `showHideAllWindows` and `globalSearch` are system-wide shortcuts. They cannot be chords, require modifiers, and may be rejected by macOS if reserved.
+- `showHideAllWindows` is the only system-wide shortcut. It cannot be a chord, requires modifiers, and may be rejected by macOS if reserved.
+- `globalSearch` is application-scoped and only fires while cmux is active.
 - `showHideAllWindows` also requires Settings > Global Hotkey > Enable System-Wide Hotkey. The binding can validate in `cmux.json` while the feature is disabled, so warn the user to enable that setting before reporting the shortcut as usable.
 - `unset` deletes a `cmux.json` override. It does not clear shortcut changes saved through the Settings UI/UserDefaults. If the user asks for true built-in defaults, tell them to use Settings > Keyboard Shortcuts > Reset Default Shortcuts after clearing file-managed overrides, then verify in the app. For `showHideAllWindows`, use Settings > Global Hotkey to restore the shortcut to `ctrl+opt+cmd+.` because Keyboard Shortcuts > Reset Default Shortcuts intentionally skips the global hotkey.
 - Saving `cmux.json` live reloads. Do not tell the user to restart cmux.
diff --git a/web/data/cmux-shortcuts.ts b/web/data/cmux-shortcuts.ts
index bbd50e3cee49..a7016e1692a3 100644
--- a/web/data/cmux-shortcuts.ts
+++ b/web/data/cmux-shortcuts.ts
@@ -42,7 +42,7 @@ export const shortcutCategories: ShortcutCategory[] = [
         id: "globalSearch",
         combos: [["⌥", "⌘", "F"]],
         description: { en: "Global search", ja: "グローバル検索" },
-        note: { en: "system-wide hotkey", ja: "システム全体のホットキー" },
+        note: { en: "when cmux is active", ja: "cmuxがアクティブな場合" },
       },
       { id: "commandPalette", combos: [["⌘", "⇧", "P"]], description: { en: "Command palette", ja: "コマンドパレット" } },
       {

From c21223c5724eb6905a2c5f69728d0a153bc9d616 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Wed, 22 Jul 2026 17:00:12 -0700
Subject: [PATCH 003/124] test: avoid production shortcut policy seam

---
 Sources/KeyboardShortcutSettings.swift              | 3 ---
 cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index 393aa0161b5a..730c326803e3 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -1159,9 +1159,6 @@ final class SystemWideHotkeyController {
     static let shared = SystemWideHotkeyController()
     private static let hotKeySignature: OSType = 0x434D484B // "CMHK"
     private static let hotKeyID: UInt32 = 1
-    static var systemWideActions: [KeyboardShortcutSettings.Action] {
-        KeyboardShortcutSettings.Action.allCases.filter(\.isSystemWideHotkey)
-    }
     private static let action = SystemWideHotkeySettings.action
 
     private var hotKeyRef: EventHotKeyRef?
diff --git a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
index 72d9ea571656..9864861e3123 100644
--- a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
+++ b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
@@ -54,7 +54,11 @@ final class SystemWideHotkeyShortcutPolicyTests {
     }
 
     @Test func registrationPolicyContainsOnlyExplicitlySystemWideActions() {
-        #expect(SystemWideHotkeyController.systemWideActions == [.showHideAllWindows])
+        #expect(SystemWideHotkeySettings.action == .showHideAllWindows)
+        #expect(
+            KeyboardShortcutSettings.Action.allCases.filter(\.isSystemWideHotkey) ==
+                [.showHideAllWindows]
+        )
     }
 
     @Test func foregroundGlobalSearchDoesNotUseSystemWideReservationPolicy() {

From a41fcd3b519ddde87afc3011888fbb0583e57f7f Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Wed, 22 Jul 2026 17:01:36 -0700
Subject: [PATCH 004/124] test: stay within hotkey policy file budget

---
 cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
index 9864861e3123..ae807f4c3a1a 100644
--- a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
+++ b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
@@ -55,12 +55,8 @@ final class SystemWideHotkeyShortcutPolicyTests {
 
     @Test func registrationPolicyContainsOnlyExplicitlySystemWideActions() {
         #expect(SystemWideHotkeySettings.action == .showHideAllWindows)
-        #expect(
-            KeyboardShortcutSettings.Action.allCases.filter(\.isSystemWideHotkey) ==
-                [.showHideAllWindows]
-        )
+        #expect(KeyboardShortcutSettings.Action.allCases.filter(\.isSystemWideHotkey) == [.showHideAllWindows])
     }
-
     @Test func foregroundGlobalSearchDoesNotUseSystemWideReservationPolicy() {
         let shortcut = commandGraveShortcut()
         #expect(KeyboardShortcutSettings.Action.globalSearch.normalizedRecordedShortcutResult(shortcut) == .accepted(shortcut))

From 315daae184aa3c2ea4cf41cd0acb901f8c9584d8 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Wed, 22 Jul 2026 18:50:43 -0700
Subject: [PATCH 005/124] test: cover foreground-scoped global search shortcut

---
 Sources/Search/MenubarSearchPopover.swift     |   1 +
 cmux.xcodeproj/project.pbxproj                |   4 +
 .../GlobalSearchForegroundScopeUITests.swift  | 123 ++++++++++++++++++
 3 files changed, 128 insertions(+)
 create mode 100644 cmuxUITests/GlobalSearchForegroundScopeUITests.swift

diff --git a/Sources/Search/MenubarSearchPopover.swift b/Sources/Search/MenubarSearchPopover.swift
index c7aed61ecbfb..93f63488830f 100644
--- a/Sources/Search/MenubarSearchPopover.swift
+++ b/Sources/Search/MenubarSearchPopover.swift
@@ -84,6 +84,7 @@ private struct GlobalSearchPaletteView: View {
                 )
                 .textFieldStyle(.plain)
                 .cmuxFont(size: 18, weight: .regular)
+                .accessibilityIdentifier("GlobalSearchSearchField")
                 .focused($searchFieldFocused)
             }
             .padding(.horizontal, 18)
diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index 9c60a0d735be..0984ce5ccb96 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -957,6 +957,7 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		FE001106 /* GitStatusProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE001006 /* GitStatusProvider.swift */; };
 		3865A0023865A0023865A002 /* GlobalSearchCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0023865B0023865B002 /* GlobalSearchCoordinator.swift */; };
 		3865A0073865A0073865A007 /* GlobalSearchDocuments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0073865B0073865B007 /* GlobalSearchDocuments.swift */; };
+		D8561001A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8561002A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift */; };
 		3865A0083865A0083865A008 /* GlobalSearchPanelCaptureManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */; };
 		3865A0053865A0053865A005 /* GlobalSearchShortcutSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */; };
 		5B11E5A100000000000000B1 /* GPUSpinner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B11E5A100000000000000B2 /* GPUSpinner.swift */; };
@@ -3131,6 +3132,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		FE001006 /* GitStatusProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GitStatusProvider.swift; sourceTree = "<group>"; };
 		3865B0023865B0023865B002 /* GlobalSearchCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchCoordinator.swift; sourceTree = "<group>"; };
 		3865B0073865B0073865B007 /* GlobalSearchDocuments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchDocuments.swift; sourceTree = "<group>"; };
+		D8561002A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchForegroundScopeUITests.swift; sourceTree = "<group>"; };
 		3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchPanelCaptureManager.swift; sourceTree = "<group>"; };
 		3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutSettingsTests.swift; sourceTree = "<group>"; };
 		5B11E5A100000000000000B2 /* GPUSpinner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sidebar/GPUSpinner.swift; sourceTree = "<group>"; };
@@ -4498,6 +4500,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				E6FA9085A1B2C3D4E5F60718 /* WorkspaceDescriptionUITests.swift */,
 				D0E0F0B1A1B2C3D4E5F60718 /* BrowserPaneNavigationKeybindUITests.swift */,
 				D0E0F0B5A1B2C3D4E5F60718 /* FindSelectionShortcutUITests.swift */,
+				D8561002A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift */,
 				D0E0F0B3A1B2C3D4E5F60718 /* BrowserOmnibarSuggestionsUITests.swift */,
 				FB100001A1B2C3D4E5F60718 /* BrowserImportProfilesUITests.swift */,
 				7B5F1A2E9C0D4B6A8E217301 /* BrowserFixtureInteractionUITests.swift */,
@@ -8578,6 +8581,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				B8F266266A1A3D9A45BD840F /* DisplayResolutionRegressionUITests.swift in Sources */,
 				FEED0000000000000000F009 /* FeedSidebarUITests.swift in Sources */,
 				D0E0F0B4A1B2C3D4E5F60718 /* FindSelectionShortcutUITests.swift in Sources */,
+				D8561001A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift in Sources */,
 				C0DE34020000000000000005 /* HelpMenuUITests.swift in Sources */,
 				B9000014A1B2C3D4E5F60719 /* JumpToUnreadUITests.swift in Sources */,
 				E1000000A1B2C3D4E5F60718 /* MenuKeyEquivalentRoutingUITests.swift in Sources */,
diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
new file mode 100644
index 000000000000..a7e7b0aeeb07
--- /dev/null
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -0,0 +1,123 @@
+import XCTest
+
+final class GlobalSearchForegroundScopeUITests: XCTestCase {
+    private var app: XCUIApplication!
+
+    override func setUpWithError() throws {
+        continueAfterFailure = false
+        app = XCUIApplication()
+        app.launch()
+
+        if app.state != .runningForeground {
+            app.activate()
+        }
+
+        XCTAssertTrue(
+            app.wait(for: .runningForeground, timeout: 10.0),
+            "Expected cmux to be foreground after launch. state=\(app.state.rawValue)"
+        )
+        XCTAssertTrue(app.windows.firstMatch.waitForExistence(timeout: 10.0), "Expected cmux main window")
+    }
+
+    override func tearDownWithError() throws {
+        app?.terminate()
+        app = nil
+    }
+
+    func testGlobalSearchShortcutIsForegroundScoped() {
+        let globalSearchField = app.textFields["GlobalSearchSearchField"].firstMatch
+        XCTAssertFalse(globalSearchField.exists, "Global Search should start closed")
+
+        let finder = XCUIApplication(bundleIdentifier: "com.apple.finder")
+        for transition in 1...2 {
+            finder.activate()
+            XCTAssertTrue(
+                finder.wait(for: .runningForeground, timeout: 8.0),
+                "Expected Finder to be foreground for transition \(transition). state=\(finder.state.rawValue)"
+            )
+            XCTAssertTrue(
+                waitForAppToLeaveForeground(app, timeout: 8.0),
+                "Expected cmux to be backgrounded for transition \(transition). state=\(app.state.rawValue)"
+            )
+
+            finder.typeKey("f", modifierFlags: [.command, .option])
+
+            let finderSearchField = finder.searchFields.firstMatch
+            XCTAssertTrue(
+                waitForKeyboardFocus(finderSearchField, timeout: 8.0),
+                "Expected Finder to receive Cmd-Option-F and focus its search field on transition \(transition)"
+            )
+            XCTAssertEqual(
+                finder.state,
+                .runningForeground,
+                "Finder should remain foreground after Cmd-Option-F on transition \(transition)"
+            )
+            XCTAssertNotEqual(
+                app.state,
+                .runningForeground,
+                "cmux must remain backgrounded after Finder receives Cmd-Option-F on transition \(transition)"
+            )
+            XCTAssertFalse(
+                globalSearchField.exists,
+                "Background Cmd-Option-F must not open cmux Global Search on transition \(transition)"
+            )
+            attachScreenshot(named: "background-transition-\(transition)")
+
+            app.activate()
+            XCTAssertTrue(
+                app.wait(for: .runningForeground, timeout: 8.0),
+                "Expected cmux to return to foreground after transition \(transition). state=\(app.state.rawValue)"
+            )
+            XCTAssertTrue(
+                waitForNonExistence(globalSearchField, timeout: 2.0),
+                "Background Cmd-Option-F must not trigger Global Search later on transition \(transition)"
+            )
+        }
+
+        app.typeKey("f", modifierFlags: [.command, .option])
+        XCTAssertTrue(
+            globalSearchField.waitForExistence(timeout: 8.0),
+            "Foreground Cmd-Option-F should open cmux Global Search"
+        )
+        attachScreenshot(named: "foreground-global-search-open")
+
+        app.typeKey("f", modifierFlags: [.command, .option])
+        XCTAssertTrue(
+            waitForNonExistence(globalSearchField, timeout: 8.0),
+            "A second foreground Cmd-Option-F should close cmux Global Search"
+        )
+        attachScreenshot(named: "foreground-global-search-closed")
+    }
+
+    private func waitForAppToLeaveForeground(_ application: XCUIApplication, timeout: TimeInterval) -> Bool {
+        waitForPredicate(
+            NSPredicate(format: "state != %d", XCUIApplication.State.runningForeground.rawValue),
+            object: application,
+            timeout: timeout
+        )
+    }
+
+    private func waitForKeyboardFocus(_ element: XCUIElement, timeout: TimeInterval) -> Bool {
+        waitForPredicate(
+            NSPredicate(format: "exists == true AND hasKeyboardFocus == true"),
+            object: element,
+            timeout: timeout
+        )
+    }
+
+    private func waitForNonExistence(_ element: XCUIElement, timeout: TimeInterval) -> Bool {
+        waitForPredicate(NSPredicate(format: "exists == false"), object: element, timeout: timeout)
+    }
+
+    private func waitForPredicate(_ predicate: NSPredicate, object: Any, timeout: TimeInterval) -> Bool {
+        let expectation = XCTNSPredicateExpectation(predicate: predicate, object: object)
+        return XCTWaiter.wait(for: [expectation], timeout: timeout) == .completed
+    }
+
+    private func attachScreenshot(named name: String) {
+        let attachment = XCTAttachment(screenshot: XCUIScreen.main.screenshot())
+        attachment.name = name
+        attachment.lifetime = .keepAlways
+        add(attachment)
+    }
+}

From 92ae691331ba540085445f44cc01d60bc64fd28c Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Wed, 22 Jul 2026 20:48:18 -0700
Subject: [PATCH 006/124] test: launch global search coverage in UI test mode

---
 cmuxUITests/GlobalSearchForegroundScopeUITests.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index a7e7b0aeeb07..e4c17cea3ab1 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -6,6 +6,7 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
     override func setUpWithError() throws {
         continueAfterFailure = false
         app = XCUIApplication()
+        app.launchEnvironment["CMUX_UI_TEST_MODE"] = "1"
         app.launch()
 
         if app.state != .runningForeground {

From 4a2aacaf4ee4a8ce900ecd60ae071b6960898089 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Thu, 23 Jul 2026 15:07:32 -0700
Subject: [PATCH 007/124] test: force main-window mode for global search UI
 coverage

---
 cmuxUITests/GlobalSearchForegroundScopeUITests.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index e4c17cea3ab1..7f57bdce54bc 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -6,6 +6,7 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
     override func setUpWithError() throws {
         continueAfterFailure = false
         app = XCUIApplication()
+        app.launchArguments += ["-ApplePersistenceIgnoreState", "YES", "-NSQuitAlwaysKeepsWindows", "NO", "-menuBarOnly", "false"]
         app.launchEnvironment["CMUX_UI_TEST_MODE"] = "1"
         app.launch()
 

From 15dd2f9d6bb1fb494c53a70c949c2e87406b5404 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Thu, 23 Jul 2026 15:34:20 -0700
Subject: [PATCH 008/124] test: verify background global search delivery
 directly

---
 .../GlobalSearchForegroundScopeUITests.swift  | 92 ++++++-------------
 1 file changed, 28 insertions(+), 64 deletions(-)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index 7f57bdce54bc..6b91808db1c8 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -8,17 +8,18 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         app = XCUIApplication()
         app.launchArguments += ["-ApplePersistenceIgnoreState", "YES", "-NSQuitAlwaysKeepsWindows", "NO", "-menuBarOnly", "false"]
         app.launchEnvironment["CMUX_UI_TEST_MODE"] = "1"
-        app.launch()
 
-        if app.state != .runningForeground {
-            app.activate()
+        let options = XCTExpectedFailure.Options()
+        options.isStrict = false
+        XCTExpectFailure("XCUITest cannot foreground cmux on headless CI runners", options: options) {
+            app.launch()
         }
 
         XCTAssertTrue(
-            app.wait(for: .runningForeground, timeout: 10.0),
-            "Expected cmux to be foreground after launch. state=\(app.state.rawValue)"
+            app.wait(for: .runningForeground, timeout: 1.0)
+                || app.wait(for: .runningBackground, timeout: 10.0),
+            "Expected cmux to launch. state=\(app.state.rawValue)"
         )
-        XCTAssertTrue(app.windows.firstMatch.waitForExistence(timeout: 10.0), "Expected cmux main window")
     }
 
     override func tearDownWithError() throws {
@@ -26,69 +27,36 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         app = nil
     }
 
-    func testGlobalSearchShortcutIsForegroundScoped() {
+    func testBackgroundGlobalSearchShortcutIsDeliveredToFinder() {
         let globalSearchField = app.textFields["GlobalSearchSearchField"].firstMatch
         XCTAssertFalse(globalSearchField.exists, "Global Search should start closed")
 
         let finder = XCUIApplication(bundleIdentifier: "com.apple.finder")
-        for transition in 1...2 {
-            finder.activate()
-            XCTAssertTrue(
-                finder.wait(for: .runningForeground, timeout: 8.0),
-                "Expected Finder to be foreground for transition \(transition). state=\(finder.state.rawValue)"
-            )
-            XCTAssertTrue(
-                waitForAppToLeaveForeground(app, timeout: 8.0),
-                "Expected cmux to be backgrounded for transition \(transition). state=\(app.state.rawValue)"
-            )
-
-            finder.typeKey("f", modifierFlags: [.command, .option])
-
-            let finderSearchField = finder.searchFields.firstMatch
-            XCTAssertTrue(
-                waitForKeyboardFocus(finderSearchField, timeout: 8.0),
-                "Expected Finder to receive Cmd-Option-F and focus its search field on transition \(transition)"
-            )
-            XCTAssertEqual(
-                finder.state,
-                .runningForeground,
-                "Finder should remain foreground after Cmd-Option-F on transition \(transition)"
-            )
-            XCTAssertNotEqual(
-                app.state,
-                .runningForeground,
-                "cmux must remain backgrounded after Finder receives Cmd-Option-F on transition \(transition)"
-            )
-            XCTAssertFalse(
-                globalSearchField.exists,
-                "Background Cmd-Option-F must not open cmux Global Search on transition \(transition)"
-            )
-            attachScreenshot(named: "background-transition-\(transition)")
-
-            app.activate()
-            XCTAssertTrue(
-                app.wait(for: .runningForeground, timeout: 8.0),
-                "Expected cmux to return to foreground after transition \(transition). state=\(app.state.rawValue)"
-            )
-            XCTAssertTrue(
-                waitForNonExistence(globalSearchField, timeout: 2.0),
-                "Background Cmd-Option-F must not trigger Global Search later on transition \(transition)"
-            )
-        }
-
-        app.typeKey("f", modifierFlags: [.command, .option])
+        finder.activate()
         XCTAssertTrue(
-            globalSearchField.waitForExistence(timeout: 8.0),
-            "Foreground Cmd-Option-F should open cmux Global Search"
+            finder.wait(for: .runningForeground, timeout: 8.0),
+            "Expected Finder to be foreground. state=\(finder.state.rawValue)"
         )
-        attachScreenshot(named: "foreground-global-search-open")
+        XCTAssertTrue(
+            waitForAppToLeaveForeground(app, timeout: 8.0),
+            "Expected cmux to be backgrounded. state=\(app.state.rawValue)"
+        )
+
+        finder.typeKey("f", modifierFlags: [.command, .option])
 
-        app.typeKey("f", modifierFlags: [.command, .option])
+        let finderSearchField = finder.searchFields.firstMatch
         XCTAssertTrue(
-            waitForNonExistence(globalSearchField, timeout: 8.0),
-            "A second foreground Cmd-Option-F should close cmux Global Search"
+            waitForKeyboardFocus(finderSearchField, timeout: 8.0),
+            "Expected Finder to receive Cmd-Option-F and focus its search field"
+        )
+        XCTAssertEqual(finder.state, .runningForeground, "Finder should remain foreground after Cmd-Option-F")
+        XCTAssertNotEqual(
+            app.state,
+            .runningForeground,
+            "cmux must remain backgrounded after Finder receives Cmd-Option-F"
         )
-        attachScreenshot(named: "foreground-global-search-closed")
+        XCTAssertFalse(globalSearchField.exists, "Background Cmd-Option-F must not open cmux Global Search")
+        attachScreenshot(named: "background-shortcut-delivered-to-finder")
     }
 
     private func waitForAppToLeaveForeground(_ application: XCUIApplication, timeout: TimeInterval) -> Bool {
@@ -107,10 +75,6 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         )
     }
 
-    private func waitForNonExistence(_ element: XCUIElement, timeout: TimeInterval) -> Bool {
-        waitForPredicate(NSPredicate(format: "exists == false"), object: element, timeout: timeout)
-    }
-
     private func waitForPredicate(_ predicate: NSPredicate, object: Any, timeout: TimeInterval) -> Bool {
         let expectation = XCTNSPredicateExpectation(predicate: predicate, object: object)
         return XCTWaiter.wait(for: [expectation], timeout: timeout) == .completed

From bca183356974327ec1b16716d5ad7b85c0902c8f Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Thu, 23 Jul 2026 15:55:51 -0700
Subject: [PATCH 009/124] test: continue after headless activation failure

---
 cmuxUITests/GlobalSearchForegroundScopeUITests.swift | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index 6b91808db1c8..485bb239e4d1 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -4,7 +4,9 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
     private var app: XCUIApplication!
 
     override func setUpWithError() throws {
-        continueAfterFailure = false
+        // Headless CI can launch cmux but fail XCTest's foreground activation handshake.
+        // Keep running long enough to exercise the background-only behavior under test.
+        continueAfterFailure = true
         app = XCUIApplication()
         app.launchArguments += ["-ApplePersistenceIgnoreState", "YES", "-NSQuitAlwaysKeepsWindows", "NO", "-menuBarOnly", "false"]
         app.launchEnvironment["CMUX_UI_TEST_MODE"] = "1"
@@ -14,6 +16,7 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         XCTExpectFailure("XCUITest cannot foreground cmux on headless CI runners", options: options) {
             app.launch()
         }
+        continueAfterFailure = false
 
         XCTAssertTrue(
             app.wait(for: .runningForeground, timeout: 1.0)
@@ -28,6 +31,8 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
     }
 
     func testBackgroundGlobalSearchShortcutIsDeliveredToFinder() {
+        defer { attachScreenshot(named: "background-shortcut-delivered-to-finder") }
+
         let globalSearchField = app.textFields["GlobalSearchSearchField"].firstMatch
         XCTAssertFalse(globalSearchField.exists, "Global Search should start closed")
 
@@ -56,7 +61,6 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
             "cmux must remain backgrounded after Finder receives Cmd-Option-F"
         )
         XCTAssertFalse(globalSearchField.exists, "Background Cmd-Option-F must not open cmux Global Search")
-        attachScreenshot(named: "background-shortcut-delivered-to-finder")
     }
 
     private func waitForAppToLeaveForeground(_ application: XCUIApplication, timeout: TimeInterval) -> Bool {

From 16cef5001ea70892b80206aedff4ba2b5d115ae0 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Thu, 23 Jul 2026 16:12:48 -0700
Subject: [PATCH 010/124] test: launch cmux without foreground activation

---
 .../GlobalSearchForegroundScopeUITests.swift  | 75 +++++++++++++++----
 1 file changed, 60 insertions(+), 15 deletions(-)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index 485bb239e4d1..a28daeb1b01c 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -2,31 +2,40 @@ import XCTest
 
 final class GlobalSearchForegroundScopeUITests: XCTestCase {
     private var app: XCUIApplication!
+    private var appProcess: Process?
 
     override func setUpWithError() throws {
-        // Headless CI can launch cmux but fail XCTest's foreground activation handshake.
-        // Keep running long enough to exercise the background-only behavior under test.
-        continueAfterFailure = true
-        app = XCUIApplication()
-        app.launchArguments += ["-ApplePersistenceIgnoreState", "YES", "-NSQuitAlwaysKeepsWindows", "NO", "-menuBarOnly", "false"]
-        app.launchEnvironment["CMUX_UI_TEST_MODE"] = "1"
-
-        let options = XCTExpectedFailure.Options()
-        options.isStrict = false
-        XCTExpectFailure("XCUITest cannot foreground cmux on headless CI runners", options: options) {
-            app.launch()
-        }
         continueAfterFailure = false
+        let process = Process()
+        process.executableURL = URL(fileURLWithPath: try builtCmuxExecutablePath())
+        process.arguments = [
+            "-ApplePersistenceIgnoreState", "YES",
+            "-NSQuitAlwaysKeepsWindows", "NO",
+            "-menuBarOnly", "false",
+        ]
+        var environment = ProcessInfo.processInfo.environment
+        environment["CMUX_UI_TEST_MODE"] = "1"
+        process.environment = environment
+
+        let logURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent("cmux-global-search-background-\(UUID().uuidString).log")
+        FileManager.default.createFile(atPath: logURL.path, contents: nil)
+        let logHandle = try FileHandle(forWritingTo: logURL)
+        process.standardOutput = logHandle
+        process.standardError = logHandle
+        try process.run()
+        appProcess = process
 
+        app = XCUIApplication(bundleIdentifier: "com.cmuxterm.app.debug")
         XCTAssertTrue(
-            app.wait(for: .runningForeground, timeout: 1.0)
-                || app.wait(for: .runningBackground, timeout: 10.0),
-            "Expected cmux to launch. state=\(app.state.rawValue)"
+            app.wait(for: .runningBackground, timeout: 10.0),
+            "Expected cmux to launch in the background. state=\(app.state.rawValue)"
         )
     }
 
     override func tearDownWithError() throws {
         app?.terminate()
+        terminateAppProcess()
         app = nil
     }
 
@@ -84,6 +93,42 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         return XCTWaiter.wait(for: [expectation], timeout: timeout) == .completed
     }
 
+    private func builtCmuxExecutablePath() throws -> String {
+        let testBundle = Bundle(for: Self.self)
+        let productsDirectory = testBundle.bundleURL
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+        let executablePath = productsDirectory
+            .appendingPathComponent("cmux DEV.app")
+            .appendingPathComponent("Contents/MacOS/cmux DEV")
+            .path
+        guard FileManager.default.fileExists(atPath: executablePath) else {
+            throw NSError(
+                domain: "GlobalSearchForegroundScopeUITests",
+                code: 1,
+                userInfo: [NSLocalizedDescriptionKey: "Could not locate the built cmux executable at \(executablePath)"]
+            )
+        }
+        return executablePath
+    }
+
+    private func terminateAppProcess() {
+        guard let appProcess else { return }
+        defer { self.appProcess = nil }
+        guard appProcess.isRunning else { return }
+
+        appProcess.terminate()
+        let deadline = Date.now.addingTimeInterval(5.0)
+        while appProcess.isRunning, Date.now < deadline {
+            RunLoop.current.run(until: Date.now.addingTimeInterval(0.1))
+        }
+        if appProcess.isRunning {
+            appProcess.interrupt()
+        }
+    }
+
     private func attachScreenshot(named name: String) {
         let attachment = XCTAttachment(screenshot: XCUIScreen.main.screenshot())
         attachment.name = name

From 0975a779735363e8b9d14e0a6024ef45a9c45c9b Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Thu, 23 Jul 2026 16:26:41 -0700
Subject: [PATCH 011/124] test: post background shortcut through system event
 tap

---
 .../GlobalSearchForegroundScopeUITests.swift  | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index a28daeb1b01c..06cc3d323884 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -1,3 +1,4 @@
+import CoreGraphics
 import XCTest
 
 final class GlobalSearchForegroundScopeUITests: XCTestCase {
@@ -56,7 +57,7 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
             "Expected cmux to be backgrounded. state=\(app.state.rawValue)"
         )
 
-        finder.typeKey("f", modifierFlags: [.command, .option])
+        postCommandOptionF()
 
         let finderSearchField = finder.searchFields.firstMatch
         XCTAssertTrue(
@@ -80,6 +81,31 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         )
     }
 
+    private func postCommandOptionF() {
+        let source = CGEventSource(stateID: .hidSystemState)
+        guard
+            let keyDown = CGEvent(
+                keyboardEventSource: source,
+                virtualKey: 0x03,
+                keyDown: true
+            ),
+            let keyUp = CGEvent(
+                keyboardEventSource: source,
+                virtualKey: 0x03,
+                keyDown: false
+            )
+        else {
+            XCTFail("Could not create Cmd-Option-F keyboard events")
+            return
+        }
+
+        let modifierFlags: CGEventFlags = [.maskCommand, .maskAlternate]
+        keyDown.flags = modifierFlags
+        keyUp.flags = modifierFlags
+        keyDown.post(tap: .cghidEventTap)
+        keyUp.post(tap: .cghidEventTap)
+    }
+
     private func waitForKeyboardFocus(_ element: XCUIElement, timeout: TimeInterval) -> Bool {
         waitForPredicate(
             NSPredicate(format: "exists == true AND hasKeyboardFocus == true"),

From 3cc930d315cb501b943d084911edf5071cfcc0ff Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Thu, 23 Jul 2026 16:31:49 -0700
Subject: [PATCH 012/124] test: log background shortcut injection

---
 cmuxUITests/GlobalSearchForegroundScopeUITests.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index 06cc3d323884..2b40060023c5 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -57,7 +57,9 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
             "Expected cmux to be backgrounded. state=\(app.state.rawValue)"
         )
 
-        postCommandOptionF()
+        XCTContext.runActivity(named: "Post Cmd-Option-F through the HID event tap") { _ in
+            postCommandOptionF()
+        }
 
         let finderSearchField = finder.searchFields.firstMatch
         XCTAssertTrue(

From ee533cab3dd542a5d4fd63f17affe1ee37cbbdc6 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 02:37:37 -0700
Subject: [PATCH 013/124] test: give Finder a keyboard target

---
 .../GlobalSearchForegroundScopeUITests.swift  | 44 ++++++-------------
 1 file changed, 13 insertions(+), 31 deletions(-)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index 2b40060023c5..bf8d149a32ed 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -1,4 +1,4 @@
-import CoreGraphics
+import AppKit
 import XCTest
 
 final class GlobalSearchForegroundScopeUITests: XCTestCase {
@@ -40,26 +40,33 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         app = nil
     }
 
-    func testBackgroundGlobalSearchShortcutIsDeliveredToFinder() {
+    func testBackgroundGlobalSearchShortcutIsDeliveredToFinder() throws {
         defer { attachScreenshot(named: "background-shortcut-delivered-to-finder") }
 
         let globalSearchField = app.textFields["GlobalSearchSearchField"].firstMatch
         XCTAssertFalse(globalSearchField.exists, "Global Search should start closed")
 
+        let finderProbeURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent("cmux-global-search-finder-probe-\(UUID().uuidString)")
+        try Data().write(to: finderProbeURL)
+        defer { try? FileManager.default.removeItem(at: finderProbeURL) }
+
         let finder = XCUIApplication(bundleIdentifier: "com.apple.finder")
-        finder.activate()
+        NSWorkspace.shared.activateFileViewerSelecting([finderProbeURL])
         XCTAssertTrue(
             finder.wait(for: .runningForeground, timeout: 8.0),
             "Expected Finder to be foreground. state=\(finder.state.rawValue)"
         )
+        XCTAssertTrue(
+            finder.windows.firstMatch.waitForExistence(timeout: 8.0),
+            "Expected Finder to open a window for keyboard input"
+        )
         XCTAssertTrue(
             waitForAppToLeaveForeground(app, timeout: 8.0),
             "Expected cmux to be backgrounded. state=\(app.state.rawValue)"
         )
 
-        XCTContext.runActivity(named: "Post Cmd-Option-F through the HID event tap") { _ in
-            postCommandOptionF()
-        }
+        finder.typeKey("f", modifierFlags: [.command, .option])
 
         let finderSearchField = finder.searchFields.firstMatch
         XCTAssertTrue(
@@ -83,31 +90,6 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         )
     }
 
-    private func postCommandOptionF() {
-        let source = CGEventSource(stateID: .hidSystemState)
-        guard
-            let keyDown = CGEvent(
-                keyboardEventSource: source,
-                virtualKey: 0x03,
-                keyDown: true
-            ),
-            let keyUp = CGEvent(
-                keyboardEventSource: source,
-                virtualKey: 0x03,
-                keyDown: false
-            )
-        else {
-            XCTFail("Could not create Cmd-Option-F keyboard events")
-            return
-        }
-
-        let modifierFlags: CGEventFlags = [.maskCommand, .maskAlternate]
-        keyDown.flags = modifierFlags
-        keyUp.flags = modifierFlags
-        keyDown.post(tap: .cghidEventTap)
-        keyUp.post(tap: .cghidEventTap)
-    }
-
     private func waitForKeyboardFocus(_ element: XCUIElement, timeout: TimeInterval) -> Bool {
         waitForPredicate(
             NSPredicate(format: "exists == true AND hasKeyboardFocus == true"),

From f63bab764a04996e03f310c9d5dab9fed9581397 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 02:53:39 -0700
Subject: [PATCH 014/124] test: use foreground app for shortcut delivery

---
 .../GlobalSearchForegroundScopeUITests.swift  | 187 +++++++++++++++---
 1 file changed, 158 insertions(+), 29 deletions(-)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index bf8d149a32ed..0ab915a09297 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -2,8 +2,12 @@ import AppKit
 import XCTest
 
 final class GlobalSearchForegroundScopeUITests: XCTestCase {
+    private static let shortcutProbeBundleIdentifier = "com.cmuxterm.tests.shortcut-probe"
+
     private var app: XCUIApplication!
     private var appProcess: Process?
+    private var shortcutProbeProcess: Process?
+    private var shortcutProbeRootURL: URL?
 
     override func setUpWithError() throws {
         continueAfterFailure = false
@@ -35,49 +39,60 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
     }
 
     override func tearDownWithError() throws {
+        terminateProcess(&shortcutProbeProcess)
         app?.terminate()
-        terminateAppProcess()
+        terminateProcess(&appProcess)
+        if let shortcutProbeRootURL {
+            try? FileManager.default.removeItem(at: shortcutProbeRootURL)
+        }
+        shortcutProbeRootURL = nil
         app = nil
     }
 
-    func testBackgroundGlobalSearchShortcutIsDeliveredToFinder() throws {
-        defer { attachScreenshot(named: "background-shortcut-delivered-to-finder") }
+    func testBackgroundGlobalSearchShortcutIsDeliveredToForegroundApp() throws {
+        defer { attachScreenshot(named: "background-shortcut-delivered-to-foreground-app") }
 
         let globalSearchField = app.textFields["GlobalSearchSearchField"].firstMatch
         XCTAssertFalse(globalSearchField.exists, "Global Search should start closed")
 
-        let finderProbeURL = FileManager.default.temporaryDirectory
-            .appendingPathComponent("cmux-global-search-finder-probe-\(UUID().uuidString)")
-        try Data().write(to: finderProbeURL)
-        defer { try? FileManager.default.removeItem(at: finderProbeURL) }
+        let probeExecutableURL = try buildShortcutProbe()
+        let probeProcess = Process()
+        probeProcess.executableURL = probeExecutableURL
+        try probeProcess.run()
+        shortcutProbeProcess = probeProcess
 
-        let finder = XCUIApplication(bundleIdentifier: "com.apple.finder")
-        NSWorkspace.shared.activateFileViewerSelecting([finderProbeURL])
+        let probe = XCUIApplication(bundleIdentifier: Self.shortcutProbeBundleIdentifier)
         XCTAssertTrue(
-            finder.wait(for: .runningForeground, timeout: 8.0),
-            "Expected Finder to be foreground. state=\(finder.state.rawValue)"
+            probe.wait(for: .runningForeground, timeout: 10.0),
+            "Expected shortcut probe to be foreground. state=\(probe.state.rawValue)"
         )
         XCTAssertTrue(
-            finder.windows.firstMatch.waitForExistence(timeout: 8.0),
-            "Expected Finder to open a window for keyboard input"
+            probe.windows.firstMatch.waitForExistence(timeout: 8.0),
+            "Expected shortcut probe to open a keyboard target window"
         )
         XCTAssertTrue(
             waitForAppToLeaveForeground(app, timeout: 8.0),
             "Expected cmux to be backgrounded. state=\(app.state.rawValue)"
         )
 
-        finder.typeKey("f", modifierFlags: [.command, .option])
+        let probeStatus = probe.staticTexts["ShortcutProbeStatus"]
+        XCTAssertTrue(
+            probeStatus.waitForExistence(timeout: 8.0),
+            "Expected shortcut probe status label"
+        )
+        XCTAssertEqual(probeStatus.label, "Waiting for Cmd-Option-F")
+
+        probe.typeKey("f", modifierFlags: [.command, .option])
 
-        let finderSearchField = finder.searchFields.firstMatch
         XCTAssertTrue(
-            waitForKeyboardFocus(finderSearchField, timeout: 8.0),
-            "Expected Finder to receive Cmd-Option-F and focus its search field"
+            waitForLabel(probeStatus, equalTo: "Received Cmd-Option-F", timeout: 8.0),
+            "Expected the foreground app to receive Cmd-Option-F"
         )
-        XCTAssertEqual(finder.state, .runningForeground, "Finder should remain foreground after Cmd-Option-F")
+        XCTAssertEqual(probe.state, .runningForeground, "Shortcut probe should remain foreground")
         XCTAssertNotEqual(
             app.state,
             .runningForeground,
-            "cmux must remain backgrounded after Finder receives Cmd-Option-F"
+            "cmux must remain backgrounded after the foreground app receives Cmd-Option-F"
         )
         XCTAssertFalse(globalSearchField.exists, "Background Cmd-Option-F must not open cmux Global Search")
     }
@@ -90,9 +105,9 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         )
     }
 
-    private func waitForKeyboardFocus(_ element: XCUIElement, timeout: TimeInterval) -> Bool {
+    private func waitForLabel(_ element: XCUIElement, equalTo label: String, timeout: TimeInterval) -> Bool {
         waitForPredicate(
-            NSPredicate(format: "exists == true AND hasKeyboardFocus == true"),
+            NSPredicate(format: "exists == true AND label == %@", label),
             object: element,
             timeout: timeout
         )
@@ -124,18 +139,73 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         return executablePath
     }
 
-    private func terminateAppProcess() {
-        guard let appProcess else { return }
-        defer { self.appProcess = nil }
-        guard appProcess.isRunning else { return }
+    private func buildShortcutProbe() throws -> URL {
+        let rootURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent("cmux-shortcut-probe-\(UUID().uuidString)", isDirectory: true)
+        let appURL = rootURL.appendingPathComponent("ShortcutProbe.app", isDirectory: true)
+        let contentsURL = appURL.appendingPathComponent("Contents", isDirectory: true)
+        let executableDirectoryURL = contentsURL.appendingPathComponent("MacOS", isDirectory: true)
+        let executableURL = executableDirectoryURL.appendingPathComponent("ShortcutProbe")
+        let sourceURL = rootURL.appendingPathComponent("main.swift")
+
+        try FileManager.default.createDirectory(at: executableDirectoryURL, withIntermediateDirectories: true)
+        try Self.shortcutProbeSource.write(to: sourceURL, atomically: true, encoding: .utf8)
+        shortcutProbeRootURL = rootURL
+
+        let compiler = Process()
+        compiler.executableURL = URL(fileURLWithPath: "/usr/bin/xcrun")
+        compiler.arguments = [
+            "swiftc",
+            sourceURL.path,
+            "-o", executableURL.path,
+            "-framework", "AppKit",
+        ]
+        let diagnostics = Pipe()
+        compiler.standardError = diagnostics
+        try compiler.run()
+        compiler.waitUntilExit()
+        guard compiler.terminationStatus == 0 else {
+            let output = String(
+                data: diagnostics.fileHandleForReading.readDataToEndOfFile(),
+                encoding: .utf8
+            ) ?? "<no compiler diagnostics>"
+            throw NSError(
+                domain: "GlobalSearchForegroundScopeUITests",
+                code: Int(compiler.terminationStatus),
+                userInfo: [NSLocalizedDescriptionKey: "Failed to build shortcut probe: \(output)"]
+            )
+        }
+
+        let info: [String: Any] = [
+            "CFBundleExecutable": "ShortcutProbe",
+            "CFBundleIdentifier": Self.shortcutProbeBundleIdentifier,
+            "CFBundleName": "ShortcutProbe",
+            "CFBundlePackageType": "APPL",
+            "CFBundleShortVersionString": "1.0",
+            "CFBundleVersion": "1",
+            "LSMinimumSystemVersion": "14.0",
+        ]
+        let infoData = try PropertyListSerialization.data(
+            fromPropertyList: info,
+            format: .xml,
+            options: 0
+        )
+        try infoData.write(to: contentsURL.appendingPathComponent("Info.plist"), options: .atomic)
+        return executableURL
+    }
 
-        appProcess.terminate()
+    private func terminateProcess(_ process: inout Process?) {
+        guard let runningProcess = process else { return }
+        defer { process = nil }
+        guard runningProcess.isRunning else { return }
+
+        runningProcess.terminate()
         let deadline = Date.now.addingTimeInterval(5.0)
-        while appProcess.isRunning, Date.now < deadline {
+        while runningProcess.isRunning, Date.now < deadline {
             RunLoop.current.run(until: Date.now.addingTimeInterval(0.1))
         }
-        if appProcess.isRunning {
-            appProcess.interrupt()
+        if runningProcess.isRunning {
+            runningProcess.interrupt()
         }
     }
 
@@ -145,4 +215,63 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         attachment.lifetime = .keepAlways
         add(attachment)
     }
+
+    private static let shortcutProbeSource = """
+    import AppKit
+
+    final class ShortcutProbeDelegate: NSObject, NSApplicationDelegate {
+        private let statusLabel = NSTextField(labelWithString: "Waiting for Cmd-Option-F")
+        private let window = NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 520, height: 220),
+            styleMask: [.titled, .closable],
+            backing: .buffered,
+            defer: false
+        )
+
+        func applicationDidFinishLaunching(_ notification: Notification) {
+            let contentView = NSView(frame: window.contentLayoutRect)
+            statusLabel.setAccessibilityIdentifier("ShortcutProbeStatus")
+            statusLabel.alignment = .center
+            statusLabel.font = .systemFont(ofSize: 24, weight: .medium)
+            statusLabel.frame = NSRect(x: 30, y: 80, width: 460, height: 40)
+            contentView.addSubview(statusLabel)
+            window.contentView = contentView
+            window.title = "Foreground Shortcut Probe"
+
+            let mainMenu = NSMenu()
+            let applicationMenuItem = NSMenuItem()
+            let applicationMenu = NSMenu()
+            let shortcutItem = NSMenuItem(
+                title: "Receive Cmd-Option-F",
+                action: #selector(receiveShortcut),
+                keyEquivalent: "f"
+            )
+            shortcutItem.keyEquivalentModifierMask = [.command, .option]
+            shortcutItem.target = self
+            applicationMenu.addItem(shortcutItem)
+            applicationMenuItem.submenu = applicationMenu
+            mainMenu.addItem(applicationMenuItem)
+            NSApp.mainMenu = mainMenu
+
+            window.center()
+            window.makeKeyAndOrderFront(nil)
+            NSApp.activate(ignoringOtherApps: true)
+        }
+
+        @objc private func receiveShortcut() {
+            statusLabel.stringValue = "Received Cmd-Option-F"
+            statusLabel.setAccessibilityLabel("Received Cmd-Option-F")
+        }
+
+        func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
+            true
+        }
+    }
+
+    let application = NSApplication.shared
+    let delegate = ShortcutProbeDelegate()
+    application.delegate = delegate
+    application.setActivationPolicy(.regular)
+    application.run()
+    """
 }

From 79164e70587816d9a40b70eef87bc97d0e1992bd Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 03:05:56 -0700
Subject: [PATCH 015/124] test: compile shortcut probe inside sandbox

---
 .../GlobalSearchForegroundScopeUITests.swift  | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index 0ab915a09297..4517c33a397d 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -152,13 +152,28 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         try Self.shortcutProbeSource.write(to: sourceURL, atomically: true, encoding: .utf8)
         shortcutProbeRootURL = rootURL
 
+        let developerDirectory = ProcessInfo.processInfo.environment["DEVELOPER_DIR"]
+            ?? "/Applications/Xcode.app/Contents/Developer"
+        let swiftCompilerURL = URL(fileURLWithPath: developerDirectory)
+            .appendingPathComponent("Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc")
+        let sdkURL = URL(fileURLWithPath: developerDirectory)
+            .appendingPathComponent("Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk")
+        guard FileManager.default.isExecutableFile(atPath: swiftCompilerURL.path) else {
+            throw NSError(
+                domain: "GlobalSearchForegroundScopeUITests",
+                code: 2,
+                userInfo: [NSLocalizedDescriptionKey: "Could not locate Swift compiler at \(swiftCompilerURL.path)"]
+            )
+        }
+
         let compiler = Process()
-        compiler.executableURL = URL(fileURLWithPath: "/usr/bin/xcrun")
+        compiler.executableURL = swiftCompilerURL
         compiler.arguments = [
-            "swiftc",
             sourceURL.path,
             "-o", executableURL.path,
             "-framework", "AppKit",
+            "-sdk", sdkURL.path,
+            "-module-cache-path", rootURL.appendingPathComponent("ModuleCache").path,
         ]
         let diagnostics = Pipe()
         compiler.standardError = diagnostics

From 6c4bbd9628e826409824f5000e598cc7861bde9a Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 03:25:06 -0700
Subject: [PATCH 016/124] test: build foreground shortcut probe target

---
 cmux.xcodeproj/project.pbxproj                | 107 +++++++++++++
 cmuxUITestSupport/ShortcutProbe/main.swift    |  56 +++++++
 .../GlobalSearchForegroundScopeUITests.swift  | 150 ++----------------
 3 files changed, 179 insertions(+), 134 deletions(-)
 create mode 100644 cmuxUITestSupport/ShortcutProbe/main.swift

diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index 0984ce5ccb96..d482e7a06bd2 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -1023,6 +1023,7 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		D1F0A00800000000000000C1 /* MacPairedMacBackupRecordWire.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1F0A00800000000000000C2 /* MacPairedMacBackupRecordWire.swift */; };
 		D1F0A00500000000000000E1 /* MacPresenceDecisionCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1F0A00500000000000000E2 /* MacPresenceDecisionCache.swift */; };
 		D1F0A00200000000000000B1 /* MacPresenceMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1F0A00200000000000000B2 /* MacPresenceMonitor.swift */; };
+		D8561A010000000000000001 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8561A020000000000000002 /* main.swift */; };
 		2F0C05000000000000000002 /* MainWindowFocusController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F0C05000000000000000001 /* MainWindowFocusController.swift */; };
 		6512F0C06512F0C06512F002 /* MainWindowFocusRestoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6512F0C06512F0C06512F001 /* MainWindowFocusRestoreTests.swift */; };
 		B37A00000000000000000005 /* MainWindowFocusTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = B37A00000000000000000006 /* MainWindowFocusTypes.swift */; };
@@ -2196,6 +2197,13 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 			remoteGlobalIDString = D1320AA0D1320AA0D1320AA8;
 			remoteInfo = CmuxDockTilePlugin;
 		};
+		D8561A050000000000000005 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A5001070 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = D8561A070000000000000007;
+			remoteInfo = ShortcutProbe;
+		};
 		F1000008A1B2C3D4E5F60718 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = A5001070 /* Project object */;
@@ -3195,6 +3203,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		D1F0A00800000000000000C2 /* MacPairedMacBackupRecordWire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MacPairedMacBackupRecordWire.swift; sourceTree = "<group>"; };
 		D1F0A00500000000000000E2 /* MacPresenceDecisionCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacPresenceDecisionCache.swift; sourceTree = "<group>"; };
 		D1F0A00200000000000000B2 /* MacPresenceMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacPresenceMonitor.swift; sourceTree = "<group>"; };
+		D8561A020000000000000002 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
 		2F0C05000000000000000001 /* MainWindowFocusController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindowFocusController.swift; sourceTree = "<group>"; };
 		6512F0C06512F0C06512F001 /* MainWindowFocusRestoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindowFocusRestoreTests.swift; sourceTree = "<group>"; };
 		B37A00000000000000000006 /* MainWindowFocusTypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindowFocusTypes.swift; sourceTree = "<group>"; };
@@ -3698,6 +3707,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		6042B0016042B0016042B001 /* ShortcutHintModifierPolicyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutHintModifierPolicyTests.swift; sourceTree = "<group>"; };
 		A080D1F6CCCBFBED8D95DD1D /* ShortcutHintPill.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutHintPill.swift; sourceTree = "<group>"; };
 		6042D0046042D0046042D004 /* ShortcutHintTitlebarPolicy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutHintTitlebarPolicy.swift; sourceTree = "<group>"; };
+		D8561A030000000000000003 /* ShortcutProbe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ShortcutProbe.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D35B00000000000000000010 /* ShortcutRecorderRejectedAttempt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutRecorderRejectedAttempt.swift; sourceTree = "<group>"; };
 		B42A82C6AA614E74873D9A5F /* ShortcutRoutingSupport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App/ShortcutRoutingSupport.swift; sourceTree = "<group>"; };
 		F6001001A1B2C3D4E5F60718 /* ShortcutUnbindingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutUnbindingTests.swift; sourceTree = "<group>"; };
@@ -4391,6 +4401,13 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		D8561A060000000000000006 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		B900000CA1B2C3D4E5F60719 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -4649,6 +4666,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				A5001016 /* GhosttyKit.xcframework */,
 				A5001017 /* ghostty.h */,
 				A5001018 /* cmux-Bridging-Header.h */,
+				D8561A040000000000000004 /* ShortcutProbe */,
 				3196C9C2D01F054C1D3385DD /* cmuxUITests */,
 				F1000003A1B2C3D4E5F60718 /* cmuxTests */,
 				A5001042 /* Products */,
@@ -5950,12 +5968,22 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				A5001000 /* cmux.app */,
 				B9000004A1B2C3D4E5F60719 /* cmux */,
 				D1320AA0D1320AA0D1320AA5 /* CmuxDockTilePlugin.plugin */,
+				D8561A030000000000000003 /* ShortcutProbe.app */,
 				7E7E6EF344A568AC7FEE3715 /* cmuxUITests.xctest */,
 				F1000002A1B2C3D4E5F60718 /* cmuxTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
+		D8561A040000000000000004 /* ShortcutProbe */ = {
+			isa = PBXGroup;
+			children = (
+				D8561A020000000000000002 /* main.swift */,
+			);
+			name = ShortcutProbe;
+			path = cmuxUITestSupport/ShortcutProbe;
+			sourceTree = "<group>";
+		};
 		B9000003A1B2C3D4E5F60719 /* CLI */ = {
 			isa = PBXGroup;
 			children = (
@@ -6748,12 +6776,30 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 			);
 			dependencies = (
 				32568B0DCFC8656BA952468E /* PBXTargetDependency */,
+				D8561A0A000000000000000A /* PBXTargetDependency */,
 			);
 			name = cmuxUITests;
 			productName = cmuxUITests;
 			productReference = 7E7E6EF344A568AC7FEE3715 /* cmuxUITests.xctest */;
 			productType = "com.apple.product-type.bundle.ui-testing";
 		};
+		D8561A070000000000000007 /* ShortcutProbe */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D8561A0D000000000000000D /* Build configuration list for PBXNativeTarget "ShortcutProbe" */;
+			buildPhases = (
+				D8561A090000000000000009 /* Sources */,
+				D8561A060000000000000006 /* Frameworks */,
+				D8561A080000000000000008 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = ShortcutProbe;
+			productName = ShortcutProbe;
+			productReference = D8561A030000000000000003 /* ShortcutProbe.app */;
+			productType = "com.apple.product-type.application";
+		};
 		D1320AA0D1320AA0D1320AA8 /* CmuxDockTilePlugin */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = D1320AA0D1320AA0D1320AB4 /* Build configuration list for PBXNativeTarget "CmuxDockTilePlugin" */;
@@ -6903,6 +6949,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				A5001050 /* cmux */,
 				D1320AA0D1320AA0D1320AA8 /* CmuxDockTilePlugin */,
 				B9000005A1B2C3D4E5F60719 /* cmux-cli */,
+				D8561A070000000000000007 /* ShortcutProbe */,
 				CB450DF0F0B3839599082C4D /* cmuxUITests */,
 				F1000004A1B2C3D4E5F60718 /* cmuxTests */,
 			);
@@ -6936,6 +6983,13 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		D8561A080000000000000008 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		EC1BC8BE24F703F6BBEAA1DE /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -8559,6 +8613,14 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		D8561A090000000000000009 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D8561A010000000000000001 /* main.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		E436EF0BA8EC9E6721A42F79 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -9216,6 +9278,11 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 			target = D1320AA0D1320AA0D1320AA8 /* CmuxDockTilePlugin */;
 			targetProxy = D1320AA0D1320AA0D1320AA3 /* PBXContainerItemProxy */;
 		};
+		D8561A0A000000000000000A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = D8561A070000000000000007 /* ShortcutProbe */;
+			targetProxy = D8561A050000000000000005 /* PBXContainerItemProxy */;
+		};
 		F1000009A1B2C3D4E5F60718 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = A5001050 /* cmux */;
@@ -9224,6 +9291,37 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
+		D8561A0B000000000000000B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 14.0;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cmuxterm.tests.shortcut-probe;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
+				SWIFT_VERSION = 5.0;
+			};
+			name = Debug;
+		};
+		D8561A0C000000000000000C /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 14.0;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cmuxterm.tests.shortcut-probe;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SWIFT_VERSION = 5.0;
+			};
+			name = Release;
+		};
 		442A6A86CAC6E8AD27FDD8F2 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -9570,6 +9668,15 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		D8561A0D000000000000000D /* Build configuration list for PBXNativeTarget "ShortcutProbe" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D8561A0B000000000000000B /* Debug */,
+				D8561A0C000000000000000C /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		B9000007A1B2C3D4E5F60719 /* Build configuration list for PBXNativeTarget "cmux-cli" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/cmuxUITestSupport/ShortcutProbe/main.swift b/cmuxUITestSupport/ShortcutProbe/main.swift
new file mode 100644
index 000000000000..8c72b69b06bf
--- /dev/null
+++ b/cmuxUITestSupport/ShortcutProbe/main.swift
@@ -0,0 +1,56 @@
+import AppKit
+
+final class ShortcutProbeDelegate: NSObject, NSApplicationDelegate {
+    private let statusLabel = NSTextField(labelWithString: "Waiting for Cmd-Option-F")
+    private let window = NSWindow(
+        contentRect: NSRect(x: 0, y: 0, width: 520, height: 220),
+        styleMask: [.titled, .closable],
+        backing: .buffered,
+        defer: false
+    )
+
+    func applicationDidFinishLaunching(_ notification: Notification) {
+        let contentView = NSView(frame: window.contentLayoutRect)
+        statusLabel.setAccessibilityIdentifier("ShortcutProbeStatus")
+        statusLabel.alignment = .center
+        statusLabel.font = .systemFont(ofSize: 24, weight: .medium)
+        statusLabel.frame = NSRect(x: 30, y: 80, width: 460, height: 40)
+        contentView.addSubview(statusLabel)
+        window.contentView = contentView
+        window.title = "Foreground Shortcut Probe"
+
+        let mainMenu = NSMenu()
+        let applicationMenuItem = NSMenuItem()
+        let applicationMenu = NSMenu()
+        let shortcutItem = NSMenuItem(
+            title: "Receive Cmd-Option-F",
+            action: #selector(receiveShortcut),
+            keyEquivalent: "f"
+        )
+        shortcutItem.keyEquivalentModifierMask = [.command, .option]
+        shortcutItem.target = self
+        applicationMenu.addItem(shortcutItem)
+        applicationMenuItem.submenu = applicationMenu
+        mainMenu.addItem(applicationMenuItem)
+        NSApp.mainMenu = mainMenu
+
+        window.center()
+        window.makeKeyAndOrderFront(nil)
+        _ = NSRunningApplication.current.activate(options: [.activateAllWindows])
+    }
+
+    @objc private func receiveShortcut() {
+        statusLabel.stringValue = "Received Cmd-Option-F"
+        statusLabel.setAccessibilityLabel("Received Cmd-Option-F")
+    }
+
+    func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
+        true
+    }
+}
+
+let application = NSApplication.shared
+let delegate = ShortcutProbeDelegate()
+application.delegate = delegate
+_ = application.setActivationPolicy(.regular)
+application.run()
diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index 4517c33a397d..7351610a4897 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -7,7 +7,6 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
     private var app: XCUIApplication!
     private var appProcess: Process?
     private var shortcutProbeProcess: Process?
-    private var shortcutProbeRootURL: URL?
 
     override func setUpWithError() throws {
         continueAfterFailure = false
@@ -42,10 +41,6 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         terminateProcess(&shortcutProbeProcess)
         app?.terminate()
         terminateProcess(&appProcess)
-        if let shortcutProbeRootURL {
-            try? FileManager.default.removeItem(at: shortcutProbeRootURL)
-        }
-        shortcutProbeRootURL = nil
         app = nil
     }
 
@@ -55,7 +50,7 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         let globalSearchField = app.textFields["GlobalSearchSearchField"].firstMatch
         XCTAssertFalse(globalSearchField.exists, "Global Search should start closed")
 
-        let probeExecutableURL = try buildShortcutProbe()
+        let probeExecutableURL = try builtShortcutProbeExecutableURL()
         let probeProcess = Process()
         probeProcess.executableURL = probeExecutableURL
         try probeProcess.run()
@@ -119,13 +114,7 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
     }
 
     private func builtCmuxExecutablePath() throws -> String {
-        let testBundle = Bundle(for: Self.self)
-        let productsDirectory = testBundle.bundleURL
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-        let executablePath = productsDirectory
+        let executablePath = builtProductsDirectory()
             .appendingPathComponent("cmux DEV.app")
             .appendingPathComponent("Contents/MacOS/cmux DEV")
             .path
@@ -139,76 +128,28 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         return executablePath
     }
 
-    private func buildShortcutProbe() throws -> URL {
-        let rootURL = FileManager.default.temporaryDirectory
-            .appendingPathComponent("cmux-shortcut-probe-\(UUID().uuidString)", isDirectory: true)
-        let appURL = rootURL.appendingPathComponent("ShortcutProbe.app", isDirectory: true)
-        let contentsURL = appURL.appendingPathComponent("Contents", isDirectory: true)
-        let executableDirectoryURL = contentsURL.appendingPathComponent("MacOS", isDirectory: true)
-        let executableURL = executableDirectoryURL.appendingPathComponent("ShortcutProbe")
-        let sourceURL = rootURL.appendingPathComponent("main.swift")
-
-        try FileManager.default.createDirectory(at: executableDirectoryURL, withIntermediateDirectories: true)
-        try Self.shortcutProbeSource.write(to: sourceURL, atomically: true, encoding: .utf8)
-        shortcutProbeRootURL = rootURL
-
-        let developerDirectory = ProcessInfo.processInfo.environment["DEVELOPER_DIR"]
-            ?? "/Applications/Xcode.app/Contents/Developer"
-        let swiftCompilerURL = URL(fileURLWithPath: developerDirectory)
-            .appendingPathComponent("Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc")
-        let sdkURL = URL(fileURLWithPath: developerDirectory)
-            .appendingPathComponent("Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk")
-        guard FileManager.default.isExecutableFile(atPath: swiftCompilerURL.path) else {
+    private func builtShortcutProbeExecutableURL() throws -> URL {
+        let executableURL = builtProductsDirectory()
+            .appendingPathComponent("ShortcutProbe.app")
+            .appendingPathComponent("Contents/MacOS/ShortcutProbe")
+        guard FileManager.default.isExecutableFile(atPath: executableURL.path) else {
             throw NSError(
                 domain: "GlobalSearchForegroundScopeUITests",
                 code: 2,
-                userInfo: [NSLocalizedDescriptionKey: "Could not locate Swift compiler at \(swiftCompilerURL.path)"]
-            )
-        }
-
-        let compiler = Process()
-        compiler.executableURL = swiftCompilerURL
-        compiler.arguments = [
-            sourceURL.path,
-            "-o", executableURL.path,
-            "-framework", "AppKit",
-            "-sdk", sdkURL.path,
-            "-module-cache-path", rootURL.appendingPathComponent("ModuleCache").path,
-        ]
-        let diagnostics = Pipe()
-        compiler.standardError = diagnostics
-        try compiler.run()
-        compiler.waitUntilExit()
-        guard compiler.terminationStatus == 0 else {
-            let output = String(
-                data: diagnostics.fileHandleForReading.readDataToEndOfFile(),
-                encoding: .utf8
-            ) ?? "<no compiler diagnostics>"
-            throw NSError(
-                domain: "GlobalSearchForegroundScopeUITests",
-                code: Int(compiler.terminationStatus),
-                userInfo: [NSLocalizedDescriptionKey: "Failed to build shortcut probe: \(output)"]
+                userInfo: [NSLocalizedDescriptionKey: "Could not locate shortcut probe at \(executableURL.path)"]
             )
         }
-
-        let info: [String: Any] = [
-            "CFBundleExecutable": "ShortcutProbe",
-            "CFBundleIdentifier": Self.shortcutProbeBundleIdentifier,
-            "CFBundleName": "ShortcutProbe",
-            "CFBundlePackageType": "APPL",
-            "CFBundleShortVersionString": "1.0",
-            "CFBundleVersion": "1",
-            "LSMinimumSystemVersion": "14.0",
-        ]
-        let infoData = try PropertyListSerialization.data(
-            fromPropertyList: info,
-            format: .xml,
-            options: 0
-        )
-        try infoData.write(to: contentsURL.appendingPathComponent("Info.plist"), options: .atomic)
         return executableURL
     }
 
+    private func builtProductsDirectory() -> URL {
+        Bundle(for: Self.self).bundleURL
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+    }
+
     private func terminateProcess(_ process: inout Process?) {
         guard let runningProcess = process else { return }
         defer { process = nil }
@@ -230,63 +171,4 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         attachment.lifetime = .keepAlways
         add(attachment)
     }
-
-    private static let shortcutProbeSource = """
-    import AppKit
-
-    final class ShortcutProbeDelegate: NSObject, NSApplicationDelegate {
-        private let statusLabel = NSTextField(labelWithString: "Waiting for Cmd-Option-F")
-        private let window = NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 520, height: 220),
-            styleMask: [.titled, .closable],
-            backing: .buffered,
-            defer: false
-        )
-
-        func applicationDidFinishLaunching(_ notification: Notification) {
-            let contentView = NSView(frame: window.contentLayoutRect)
-            statusLabel.setAccessibilityIdentifier("ShortcutProbeStatus")
-            statusLabel.alignment = .center
-            statusLabel.font = .systemFont(ofSize: 24, weight: .medium)
-            statusLabel.frame = NSRect(x: 30, y: 80, width: 460, height: 40)
-            contentView.addSubview(statusLabel)
-            window.contentView = contentView
-            window.title = "Foreground Shortcut Probe"
-
-            let mainMenu = NSMenu()
-            let applicationMenuItem = NSMenuItem()
-            let applicationMenu = NSMenu()
-            let shortcutItem = NSMenuItem(
-                title: "Receive Cmd-Option-F",
-                action: #selector(receiveShortcut),
-                keyEquivalent: "f"
-            )
-            shortcutItem.keyEquivalentModifierMask = [.command, .option]
-            shortcutItem.target = self
-            applicationMenu.addItem(shortcutItem)
-            applicationMenuItem.submenu = applicationMenu
-            mainMenu.addItem(applicationMenuItem)
-            NSApp.mainMenu = mainMenu
-
-            window.center()
-            window.makeKeyAndOrderFront(nil)
-            NSApp.activate(ignoringOtherApps: true)
-        }
-
-        @objc private func receiveShortcut() {
-            statusLabel.stringValue = "Received Cmd-Option-F"
-            statusLabel.setAccessibilityLabel("Received Cmd-Option-F")
-        }
-
-        func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
-            true
-        }
-    }
-
-    let application = NSApplication.shared
-    let delegate = ShortcutProbeDelegate()
-    application.delegate = delegate
-    application.setActivationPolicy(.regular)
-    application.run()
-    """
 }

From 019b3aa0546cd75bdd0919d17aa30fd73e4bfaaa Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 03:39:15 -0700
Subject: [PATCH 017/124] test: activate foreground shortcut probe

---
 .../GlobalSearchForegroundScopeUITests.swift  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index 7351610a4897..4ddab36221e7 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -57,6 +57,13 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         shortcutProbeProcess = probeProcess
 
         let probe = XCUIApplication(bundleIdentifier: Self.shortcutProbeBundleIdentifier)
+        XCTAssertTrue(
+            waitForAppToRun(probe, timeout: 10.0),
+            "Expected shortcut probe to launch. state=\(probe.state.rawValue)"
+        )
+        if probe.state != .runningForeground {
+            probe.activate()
+        }
         XCTAssertTrue(
             probe.wait(for: .runningForeground, timeout: 10.0),
             "Expected shortcut probe to be foreground. state=\(probe.state.rawValue)"
@@ -92,6 +99,18 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         XCTAssertFalse(globalSearchField.exists, "Background Cmd-Option-F must not open cmux Global Search")
     }
 
+    private func waitForAppToRun(_ application: XCUIApplication, timeout: TimeInterval) -> Bool {
+        waitForPredicate(
+            NSPredicate(
+                format: "state == %d OR state == %d",
+                XCUIApplication.State.runningBackground.rawValue,
+                XCUIApplication.State.runningForeground.rawValue
+            ),
+            object: application,
+            timeout: timeout
+        )
+    }
+
     private func waitForAppToLeaveForeground(_ application: XCUIApplication, timeout: TimeInterval) -> Bool {
         waitForPredicate(
             NSPredicate(format: "state != %d", XCUIApplication.State.runningForeground.rawValue),

From cc2a88a6b8d3f47335b39b887f8dc649447dd6ef Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 03:56:10 -0700
Subject: [PATCH 018/124] Fix Dock session restore import

---
 Sources/DockSplitStore+RestoredAgentLifecycle.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sources/DockSplitStore+RestoredAgentLifecycle.swift b/Sources/DockSplitStore+RestoredAgentLifecycle.swift
index 376402e702ac..a85031675f71 100644
--- a/Sources/DockSplitStore+RestoredAgentLifecycle.swift
+++ b/Sources/DockSplitStore+RestoredAgentLifecycle.swift
@@ -1,3 +1,4 @@
+import CmuxWorkspaces
 import Foundation
 
 extension DockSplitStore {

From 352f65be8656ccae806fd3744394bf3599d11e22 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 04:02:54 -0700
Subject: [PATCH 019/124] Finish Dock session restore build repair

---
 Sources/ControlSurfaceResumeTarget.swift             | 9 ++++++---
 Sources/DockSplitStore+SessionSnapshot.swift         | 4 ++--
 cmuxTests/DockWorkingDirectoryInheritanceTests.swift | 1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Sources/ControlSurfaceResumeTarget.swift b/Sources/ControlSurfaceResumeTarget.swift
index d73324129026..b12bb957b51d 100644
--- a/Sources/ControlSurfaceResumeTarget.swift
+++ b/Sources/ControlSurfaceResumeTarget.swift
@@ -279,9 +279,12 @@ extension TerminalController {
         content.apply(to: alert, presentingWindow: nil)
 
         switch alert.runModal() {
-        case .alertFirstButtonReturn: .auto
-        case .alertSecondButtonReturn: .prompt
-        default: .manual
+        case .alertFirstButtonReturn:
+            return .auto
+        case .alertSecondButtonReturn:
+            return .prompt
+        default:
+            return .manual
         }
     }
 
diff --git a/Sources/DockSplitStore+SessionSnapshot.swift b/Sources/DockSplitStore+SessionSnapshot.swift
index ce3c31324931..467b2755748c 100644
--- a/Sources/DockSplitStore+SessionSnapshot.swift
+++ b/Sources/DockSplitStore+SessionSnapshot.swift
@@ -41,7 +41,7 @@ extension DockSplitStore {
                 )
             }
         let persistedPanelIds = Set(panelSnapshots.map(\.id))
-        let sourceWorkspaceIdsByPanelId = Dictionary(uniqueKeysWithValues: panelSnapshots.compactMap {
+        let sourceWorkspaceIdsByPanelId: [UUID: UUID] = Dictionary(uniqueKeysWithValues: panelSnapshots.compactMap {
             panel in
             guard let transfer = detachedSurfaceTransfersByPanelId[panel.id] else { return nil }
             return (panel.id, transfer.sessionRestoreWorkspaceId)
@@ -329,7 +329,7 @@ extension DockSplitStore {
         let expectedSessionId = resumeBinding?.isAgentHookBinding == true
             ? resumeBinding?.checkpointId
             : restorableAgent?.sessionId
-        let relevantObservation = observation.flatMap { entry in
+        let relevantObservation: RestorableAgentSessionIndex.Entry? = observation.flatMap { entry in
             guard entry.snapshot.kind == expectedKind, entry.snapshot.sessionId == expectedSessionId else {
                 return nil
             }
diff --git a/cmuxTests/DockWorkingDirectoryInheritanceTests.swift b/cmuxTests/DockWorkingDirectoryInheritanceTests.swift
index 92d89005d561..cbf661b341eb 100644
--- a/cmuxTests/DockWorkingDirectoryInheritanceTests.swift
+++ b/cmuxTests/DockWorkingDirectoryInheritanceTests.swift
@@ -214,6 +214,7 @@ struct DockWorkingDirectoryInheritanceTests {
     ) -> Workspace.DetachedSurfaceTransfer {
         Workspace.DetachedSurfaceTransfer(
             sourceWorkspaceId: sourceWorkspaceId,
+            sessionRestoreSourceWorkspaceId: nil,
             panelId: panel.id,
             panel: panel,
             title: panel.displayTitle,

From 54acae1795e5d084ba5da0cddc8743b61bb0c4e2 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 04:23:27 -0700
Subject: [PATCH 020/124] Fix WindowDock isolation warning

---
 Sources/AppDelegate+WindowDock.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/AppDelegate+WindowDock.swift b/Sources/AppDelegate+WindowDock.swift
index 7f7e15b31e6c..4210c5a1282e 100644
--- a/Sources/AppDelegate+WindowDock.swift
+++ b/Sources/AppDelegate+WindowDock.swift
@@ -205,6 +205,6 @@ extension SessionWindowSnapshot {
         tabManager.workspaces.isEmpty &&
             dock == nil &&
             !liveWorkspaces.isEmpty &&
-            liveWorkspaces.allSatisfy(\.isRemoteTmuxMirror)
+            liveWorkspaces.allSatisfy { $0.isRemoteTmuxMirror }
     }
 }

From 1a6baa33c349b89b08b9816a55795e87660c9e07 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 04:31:28 -0700
Subject: [PATCH 021/124] Fix WindowDock snapshot actor isolation

---
 Sources/AppDelegate+WindowDock.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sources/AppDelegate+WindowDock.swift b/Sources/AppDelegate+WindowDock.swift
index 4210c5a1282e..43a7ad0c28d4 100644
--- a/Sources/AppDelegate+WindowDock.swift
+++ b/Sources/AppDelegate+WindowDock.swift
@@ -201,6 +201,7 @@ extension AppDelegate {
 }
 
 extension SessionWindowSnapshot {
+    @MainActor
     func omitsRemoteMirrorOnlyWindow(liveWorkspaces: [Workspace]) -> Bool {
         tabManager.workspaces.isEmpty &&
             dock == nil &&

From dcf2f0d0a75f59d9df84c442751783d383e882a9 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 04:32:02 -0700
Subject: [PATCH 022/124] test: cover foreground global search toggling

---
 .../GlobalSearchForegroundScopeUITests.swift  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index 4ddab36221e7..a496623debc7 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -97,6 +97,28 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
             "cmux must remain backgrounded after the foreground app receives Cmd-Option-F"
         )
         XCTAssertFalse(globalSearchField.exists, "Background Cmd-Option-F must not open cmux Global Search")
+
+        app.activate()
+        XCTAssertTrue(
+            app.wait(for: .runningForeground, timeout: 10.0),
+            "Expected cmux to become foreground. state=\(app.state.rawValue)"
+        )
+
+        app.typeKey("f", modifierFlags: [.command, .option])
+        XCTAssertTrue(
+            globalSearchField.waitForExistence(timeout: 8.0),
+            "Foreground Cmd-Option-F must open cmux Global Search"
+        )
+
+        app.typeKey("f", modifierFlags: [.command, .option])
+        XCTAssertTrue(
+            waitForPredicate(
+                NSPredicate(format: "exists == false"),
+                object: globalSearchField,
+                timeout: 8.0
+            ),
+            "A second foreground Cmd-Option-F must close cmux Global Search"
+        )
     }
 
     private func waitForAppToRun(_ application: XCUIApplication, timeout: TimeInterval) -> Bool {

From bb5e8b191b5852c185d76d7f4e865a4723b9a078 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 04:32:06 -0700
Subject: [PATCH 023/124] perf: gate shortcut context behind stroke match

---
 Sources/AppDelegate.swift | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index 0511ca665272..f7d23192bc9a 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -15175,8 +15175,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
     }
 
     func matchConfiguredShortcut(event: NSEvent, action: KeyboardShortcutSettings.Action) -> Bool {
-        if !shortcutWhenClauseAllows(action: action, event: event) { return false }
-        return matchConfiguredShortcut(event: event, shortcut: KeyboardShortcutSettings.shortcut(for: action))
+        guard matchConfiguredShortcut(
+            event: event,
+            shortcut: KeyboardShortcutSettings.shortcut(for: action)
+        ) else {
+            return false
+        }
+        return shortcutWhenClauseAllows(action: action, event: event)
     }
 
     /// Whether `action`'s effective `when` clause (its `shortcuts.when` override,

From 8261522d9587ec343c2849c768333e6e6377c9e4 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 04:46:53 -0700
Subject: [PATCH 024/124] test: cover Option-only global search routing

---
 .../GlobalSearchShortcutSettingsTests.swift   | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/cmuxTests/GlobalSearchShortcutSettingsTests.swift b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
index 2bd0fb043091..81bf6ab86687 100644
--- a/cmuxTests/GlobalSearchShortcutSettingsTests.swift
+++ b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
@@ -1,3 +1,4 @@
+import AppKit
 import Foundation
 import Testing
 
@@ -50,6 +51,37 @@ final class GlobalSearchShortcutSettingsTests {
         #expect(!KeyboardShortcutSettings.Action.globalSearch.allowsBareFirstStroke)
     }
 
+    @Test func optionOnlyGlobalSearchRoutesBeforePrintableOptionTextBypass() throws {
+        let shortcut = StoredShortcut(
+            key: "q",
+            command: false,
+            shift: false,
+            option: true,
+            control: false
+        )
+        KeyboardShortcutSettings.setShortcut(shortcut, for: .globalSearch)
+
+        let event = try #require(
+            NSEvent.keyEvent(
+                with: .keyDown,
+                location: .zero,
+                modifierFlags: [.option],
+                timestamp: ProcessInfo.processInfo.systemUptime,
+                windowNumber: 0,
+                context: nil,
+                characters: "@",
+                charactersIgnoringModifiers: "q",
+                isARepeat: false,
+                keyCode: 12
+            )
+        )
+        let appDelegate = AppDelegate.shared ?? AppDelegate()
+
+        #expect(shortcutRoutingShouldBypassForPrintableOptionText(event: event))
+        #expect(!shortcut.matches(event: event))
+        #expect(appDelegate.matchConfiguredShortcut(event: event, action: .globalSearch))
+    }
+
     @Test func globalSearchRejectsConfiguredShowHideHotkeyConflict() {
         let reservedShortcut = StoredShortcut(key: "g", command: true, shift: false, option: true, control: true)
 

From 4385da28fa15f4e6da4b56344266f561859bcd41 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 05:01:17 -0700
Subject: [PATCH 025/124] fix: preserve Option-only global search bindings

---
 Sources/AppDelegate.swift                   | 51 +++++++++++++++++----
 Sources/KeyboardShortcutActionContext.swift |  5 ++
 Sources/KeyboardShortcutSettings.swift      |  4 +-
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index f7d23192bc9a..eee68343f5e8 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -15161,23 +15161,36 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         return false
     }
 
-    private func matchConfiguredShortcut(event: NSEvent, shortcut: StoredShortcut) -> Bool {
+    private func matchConfiguredShortcut(
+        event: NSEvent,
+        shortcut: StoredShortcut,
+        allowPrintableOptionTextMatch: Bool = false
+    ) -> Bool {
         guard !shortcut.isUnbound else { return false }
         if let prefix = activeConfiguredShortcutChordPrefixForCurrentEvent {
             guard let secondStroke = shortcut.secondStroke,
                   shortcut.firstStroke == prefix else {
                 return false
             }
-            return matchShortcutStroke(event: event, stroke: secondStroke)
+            return matchShortcutStroke(
+                event: event,
+                stroke: secondStroke,
+                allowPrintableOptionTextMatch: allowPrintableOptionTextMatch
+            )
         }
         guard !shortcut.hasChord else { return false }
-        return matchShortcutStroke(event: event, stroke: shortcut.firstStroke)
+        return matchShortcutStroke(
+            event: event,
+            stroke: shortcut.firstStroke,
+            allowPrintableOptionTextMatch: allowPrintableOptionTextMatch
+        )
     }
 
     func matchConfiguredShortcut(event: NSEvent, action: KeyboardShortcutSettings.Action) -> Bool {
         guard matchConfiguredShortcut(
             event: event,
-            shortcut: KeyboardShortcutSettings.shortcut(for: action)
+            shortcut: KeyboardShortcutSettings.shortcut(for: action),
+            allowPrintableOptionTextMatch: action.allowsPrintableOptionTextMatch
         ) else {
             return false
         }
@@ -15303,12 +15316,22 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
     ) -> Bool {
         var seen = Set<StoredShortcut>()
         let configuredShortcuts = actions.map {
-            KeyboardShortcutSettings.shortcut(for: $0)
-        } + shortcuts
-        for shortcut in configuredShortcuts {
+            (
+                shortcut: KeyboardShortcutSettings.shortcut(for: $0),
+                allowPrintableOptionTextMatch: $0.allowsPrintableOptionTextMatch
+            )
+        } + shortcuts.map {
+            (shortcut: $0, allowPrintableOptionTextMatch: false)
+        }
+        for candidate in configuredShortcuts {
+            let shortcut = candidate.shortcut
             guard seen.insert(shortcut).inserted else { continue }
             guard shortcut.hasChord else { continue }
-            if matchShortcutStroke(event: event, stroke: shortcut.firstStroke) {
+            if matchShortcutStroke(
+                event: event,
+                stroke: shortcut.firstStroke,
+                allowPrintableOptionTextMatch: candidate.allowPrintableOptionTextMatch
+            ) {
                 pendingConfiguredShortcutChord = PendingConfiguredShortcutChord(
                     firstStroke: shortcut.firstStroke,
                     windowNumber: configuredShortcutChordWindowNumber(for: event)
@@ -15574,8 +15597,16 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
     }
 
     /// Match a shortcut stroke against an event, handling normal keys.
-    func matchShortcutStroke(event: NSEvent, stroke: ShortcutStroke) -> Bool {
-        stroke.matches(event: event, layoutCharacterProvider: shortcutLayoutCharacterProvider)
+    func matchShortcutStroke(
+        event: NSEvent,
+        stroke: ShortcutStroke,
+        allowPrintableOptionTextMatch: Bool = false
+    ) -> Bool {
+        stroke.matches(
+            event: event,
+            allowPrintableOptionTextMatch: allowPrintableOptionTextMatch,
+            layoutCharacterProvider: shortcutLayoutCharacterProvider
+        )
     }
 
     private func matchShortcut(event: NSEvent, shortcut: StoredShortcut) -> Bool {
diff --git a/Sources/KeyboardShortcutActionContext.swift b/Sources/KeyboardShortcutActionContext.swift
index bdf2473aa35c..c47387756f59 100644
--- a/Sources/KeyboardShortcutActionContext.swift
+++ b/Sources/KeyboardShortcutActionContext.swift
@@ -2,6 +2,11 @@ import CmuxCommandPalette
 import CmuxSettings
 
 extension KeyboardShortcutSettings.Action {
+    // An Option-only binding explicitly lets Global Search claim printable input while cmux is active.
+    var allowsPrintableOptionTextMatch: Bool {
+        self == .globalSearch
+    }
+
     var allowsBareFirstStroke: Bool {
         switch self {
         case .diffViewerScrollDown,
diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index 730c326803e3..8755b35c9429 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -1591,6 +1591,7 @@ struct ShortcutStroke: Equatable, Hashable {
 
     func matches(
         event: NSEvent,
+        allowPrintableOptionTextMatch: Bool = false,
         layoutCharacterProvider: (UInt16, NSEvent.ModifierFlags) -> String? = KeyboardLayout.character(forKeyCode:modifierFlags:)
     ) -> Bool {
         let shortcutKey = key.lowercased()
@@ -1603,7 +1604,8 @@ struct ShortcutStroke: Equatable, Hashable {
         }
 
         guard event.type == .keyDown else { return false }
-        if shortcutRoutingShouldBypassForPrintableOptionText(event: event) {
+        if !allowPrintableOptionTextMatch,
+           shortcutRoutingShouldBypassForPrintableOptionText(event: event) {
             return false
         }
 

From 82ed28eaf7b33406814514155b4c741ddcf20283 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 05:12:29 -0700
Subject: [PATCH 026/124] test: cover Option-only global search chord routing

---
 .../GlobalSearchShortcutSettingsTests.swift   | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/cmuxTests/GlobalSearchShortcutSettingsTests.swift b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
index 81bf6ab86687..4169a81e1799 100644
--- a/cmuxTests/GlobalSearchShortcutSettingsTests.swift
+++ b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
@@ -82,6 +82,64 @@ final class GlobalSearchShortcutSettingsTests {
         #expect(appDelegate.matchConfiguredShortcut(event: event, action: .globalSearch))
     }
 
+    @Test func optionOnlyGlobalSearchChordPrefixRoutesBeforePrintableOptionTextBypass() throws {
+#if DEBUG
+        let shortcut = StoredShortcut(
+            key: "q",
+            command: false,
+            shift: false,
+            option: true,
+            control: false,
+            chordKey: "f"
+        )
+        KeyboardShortcutSettings.setShortcut(shortcut, for: .globalSearch)
+
+        let prefixEvent = try #require(
+            NSEvent.keyEvent(
+                with: .keyDown,
+                location: .zero,
+                modifierFlags: [.option],
+                timestamp: ProcessInfo.processInfo.systemUptime,
+                windowNumber: 0,
+                context: nil,
+                characters: "@",
+                charactersIgnoringModifiers: "q",
+                isARepeat: false,
+                keyCode: 12
+            )
+        )
+        let suffixEvent = try #require(
+            NSEvent.keyEvent(
+                with: .keyDown,
+                location: .zero,
+                modifierFlags: [],
+                timestamp: ProcessInfo.processInfo.systemUptime,
+                windowNumber: 0,
+                context: nil,
+                characters: "f",
+                charactersIgnoringModifiers: "f",
+                isARepeat: false,
+                keyCode: 3
+            )
+        )
+        let appDelegate = try #require(AppDelegate.shared)
+        var didTogglePalette = false
+        defer {
+            if didTogglePalette {
+                appDelegate.toggleGlobalSearchPalette()
+            }
+            appDelegate.debugResetShortcutRoutingStateForTesting()
+        }
+
+        #expect(shortcutRoutingShouldBypassForPrintableOptionText(event: prefixEvent))
+        #expect(appDelegate.debugHandleCustomShortcut(event: prefixEvent))
+        didTogglePalette = appDelegate.debugHandleCustomShortcut(event: suffixEvent)
+        #expect(didTogglePalette)
+#else
+        Issue.record("Option-only Global Search chord routing requires a DEBUG build")
+#endif
+    }
+
     @Test func globalSearchRejectsConfiguredShowHideHotkeyConflict() {
         let reservedShortcut = StoredShortcut(key: "g", command: true, shift: false, option: true, control: true)
 

From b56893236057752e7acecf75d6d7628adf7b6507 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 05:23:34 -0700
Subject: [PATCH 027/124] fix: route Option-only global search chord prefixes

---
 Sources/AppDelegate.swift | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index eee68343f5e8..19e411252a2a 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13304,6 +13304,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         }
 
         if shouldBypassPrintableOptionTextForShortcutRouting(event: event) {
+            if armConfiguredGlobalSearchPrintableOptionChordIfNeeded(event: event) {
+                return true
+            }
             return false
         }
 
@@ -15263,6 +15266,27 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         return true
     }
 
+    private func armConfiguredGlobalSearchPrintableOptionChordIfNeeded(event: NSEvent) -> Bool {
+        guard activeConfiguredShortcutChordPrefixForCurrentEvent == nil else {
+            return false
+        }
+
+        let action = KeyboardShortcutSettings.Action.globalSearch
+        let shortcut = KeyboardShortcutSettings.shortcut(for: action)
+        guard action.allowsPrintableOptionTextMatch,
+              shortcut.hasChord,
+              matchShortcutStroke(
+                event: event,
+                stroke: shortcut.firstStroke,
+                allowPrintableOptionTextMatch: true
+              ),
+              shortcutWhenClauseAllows(action: action, event: event) else {
+            return false
+        }
+
+        return armConfiguredShortcutChordIfNeeded(event: event, actions: [action])
+    }
+
     private func tabManagerForNumberedShortcut(event: NSEvent) -> TabManager? {
         preferredMainWindowContextForShortcutRouting(event: event)?.tabManager ?? tabManager
     }

From 6eac2ae31ae3542c7b3135345da800cd89126569 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 05:39:10 -0700
Subject: [PATCH 028/124] test: keep global search lookup off typing path

---
 .../GlobalSearchShortcutSettingsTests.swift   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/cmuxTests/GlobalSearchShortcutSettingsTests.swift b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
index 4169a81e1799..e61e14a989e1 100644
--- a/cmuxTests/GlobalSearchShortcutSettingsTests.swift
+++ b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
@@ -82,6 +82,43 @@ final class GlobalSearchShortcutSettingsTests {
         #expect(appDelegate.matchConfiguredShortcut(event: event, action: .globalSearch))
     }
 
+    @Test func ordinaryTypingDoesNotResolveGlobalSearchBinding() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let event = try #require(
+            NSEvent.keyEvent(
+                with: .keyDown,
+                location: .zero,
+                modifierFlags: [],
+                timestamp: ProcessInfo.processInfo.systemUptime,
+                windowNumber: 0,
+                context: nil,
+                characters: "a",
+                charactersIgnoringModifiers: "a",
+                isARepeat: false,
+                keyCode: 0
+            )
+        )
+        appDelegate.debugResetShortcutRoutingStateForTesting()
+        _ = KeyboardShortcutBareStartCache.hasConfiguredBareShortcutStart(key: "a")
+        var globalSearchLookupCount = 0
+        KeyboardShortcutSettings.shortcutLookupObserver = { action in
+            if action == .globalSearch {
+                globalSearchLookupCount += 1
+            }
+        }
+        defer {
+            KeyboardShortcutSettings.shortcutLookupObserver = nil
+            appDelegate.debugResetShortcutRoutingStateForTesting()
+        }
+
+        #expect(!appDelegate.debugHandleCustomShortcut(event: event))
+        #expect(globalSearchLookupCount == 0)
+#else
+        Issue.record("Shortcut lookup instrumentation requires a DEBUG build")
+#endif
+    }
+
     @Test func optionOnlyGlobalSearchChordPrefixRoutesBeforePrintableOptionTextBypass() throws {
 #if DEBUG
         let shortcut = StoredShortcut(

From 68f7aae8e34812174eab8a163fe3ef294b864d4a Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 05:40:16 -0700
Subject: [PATCH 029/124] perf: cache foreground global search binding

---
 Sources/AppDelegate.swift                     | 22 ++++++--
 .../KeyboardShortcutSettingsFileStore.swift   | 24 +++++++--
 .../GlobalSearchShortcutSettingsTests.swift   |  3 +-
 ...eyboardShortcutSettingsObserverTests.swift | 52 +++++++++++++++++++
 4 files changed, 91 insertions(+), 10 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index 19e411252a2a..1976fa61feb6 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -12991,7 +12991,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             return false
         }
 
-        if matchConfiguredShortcut(event: event, action: .globalSearch) { toggleGlobalSearchPalette(); return true }
+        if matchCachedGlobalSearchShortcut(event: event) { toggleGlobalSearchPalette(); return true }
 
         if browserFocusModePanelForShortcutEvent(event) != nil {
 #if DEBUG
@@ -15200,6 +15200,18 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         return shortcutWhenClauseAllows(action: action, event: event)
     }
 
+    func matchCachedGlobalSearchShortcut(event: NSEvent) -> Bool {
+        let action = KeyboardShortcutSettings.Action.globalSearch
+        guard matchConfiguredShortcut(
+            event: event,
+            shortcut: KeyboardShortcutSettingsObserver.shared.globalSearchShortcut,
+            allowPrintableOptionTextMatch: action.allowsPrintableOptionTextMatch
+        ) else {
+            return false
+        }
+        return shortcutWhenClauseAllows(action: action, event: event)
+    }
+
     /// Whether `action`'s effective `when` clause (its `shortcuts.when` override,
     /// or its built-in context default) is satisfied by the event's focus state.
     /// Gates every focus-scoped shortcut, including the numbered workspace/surface
@@ -15272,7 +15284,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         }
 
         let action = KeyboardShortcutSettings.Action.globalSearch
-        let shortcut = KeyboardShortcutSettings.shortcut(for: action)
+        let shortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
         guard action.allowsPrintableOptionTextMatch,
               shortcut.hasChord,
               matchShortcutStroke(
@@ -15284,7 +15296,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             return false
         }
 
-        return armConfiguredShortcutChordIfNeeded(event: event, actions: [action])
+        pendingConfiguredShortcutChord = PendingConfiguredShortcutChord(
+            firstStroke: shortcut.firstStroke,
+            windowNumber: configuredShortcutChordWindowNumber(for: event)
+        )
+        return true
     }
 
     private func tabManagerForNumberedShortcut(event: NSEvent) -> TabManager? {
diff --git a/Sources/KeyboardShortcutSettingsFileStore.swift b/Sources/KeyboardShortcutSettingsFileStore.swift
index 443df2636c69..486a92e4d48a 100644
--- a/Sources/KeyboardShortcutSettingsFileStore.swift
+++ b/Sources/KeyboardShortcutSettingsFileStore.swift
@@ -6,23 +6,37 @@ import os
 
 nonisolated private let cmuxSettingsFileStoreLogger = Logger(subsystem: "com.cmuxterm.app", category: "SettingsStore")
 
-/// Publishes keyboard-shortcut revisions and owns the right-sidebar matcher snapshot.
+/// Publishes keyboard-shortcut revisions and owns hot-path matcher snapshots.
 @MainActor
 final class KeyboardShortcutSettingsObserver: ObservableObject {
+    typealias ShortcutProvider = (KeyboardShortcutSettings.Action) -> StoredShortcut
+
     static let shared = KeyboardShortcutSettingsObserver()
 
     @Published private(set) var revision: UInt64 = 0
-    let rightSidebarModeShortcutMatcher = RightSidebarModeShortcutMatcher()
+    private(set) var globalSearchShortcut: StoredShortcut
+    let rightSidebarModeShortcutMatcher: RightSidebarModeShortcutMatcher
+    private let shortcutProvider: ShortcutProvider
     private var settingsCancellable: AnyCancellable?
     private var recorderCancellable: AnyCancellable?
 
-    private init(notificationCenter: NotificationCenter = .default) {
+    init(
+        notificationCenter: NotificationCenter = .default,
+        shortcutProvider: @escaping ShortcutProvider = KeyboardShortcutSettings.shortcut(for:)
+    ) {
+        self.shortcutProvider = shortcutProvider
+        globalSearchShortcut = shortcutProvider(.globalSearch)
+        rightSidebarModeShortcutMatcher = RightSidebarModeShortcutMatcher(
+            shortcutProvider: shortcutProvider
+        )
         settingsCancellable = notificationCenter.publisher(
             for: KeyboardShortcutSettings.didChangeNotification
         ).sink { [weak self] _ in
             Self.deliverOnMainActor { [weak self] in
-                self?.revision &+= 1
-                self?.rightSidebarModeShortcutMatcher.reload()
+                guard let self else { return }
+                globalSearchShortcut = shortcutProvider(.globalSearch)
+                revision &+= 1
+                rightSidebarModeShortcutMatcher.reload()
             }
         }
         recorderCancellable = notificationCenter.publisher(
diff --git a/cmuxTests/GlobalSearchShortcutSettingsTests.swift b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
index e61e14a989e1..99405af6b1d4 100644
--- a/cmuxTests/GlobalSearchShortcutSettingsTests.swift
+++ b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
@@ -79,7 +79,7 @@ final class GlobalSearchShortcutSettingsTests {
 
         #expect(shortcutRoutingShouldBypassForPrintableOptionText(event: event))
         #expect(!shortcut.matches(event: event))
-        #expect(appDelegate.matchConfiguredShortcut(event: event, action: .globalSearch))
+        #expect(appDelegate.matchCachedGlobalSearchShortcut(event: event))
     }
 
     @Test func ordinaryTypingDoesNotResolveGlobalSearchBinding() throws {
@@ -100,7 +100,6 @@ final class GlobalSearchShortcutSettingsTests {
             )
         )
         appDelegate.debugResetShortcutRoutingStateForTesting()
-        _ = KeyboardShortcutBareStartCache.hasConfiguredBareShortcutStart(key: "a")
         var globalSearchLookupCount = 0
         KeyboardShortcutSettings.shortcutLookupObserver = { action in
             if action == .globalSearch {
diff --git a/cmuxTests/KeyboardShortcutSettingsObserverTests.swift b/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
index 50f0d4dedd6e..bbdbefcc31a0 100644
--- a/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
+++ b/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
@@ -21,4 +21,56 @@ struct KeyboardShortcutSettingsObserverTests {
 
         #expect(observer.revision == expectedRevision)
     }
+
+    @Test func globalSearchShortcutUsesSnapshotAndReloadsAfterSettingsChange() {
+        let notificationCenter = NotificationCenter()
+        var configuredShortcut = StoredShortcut(
+            key: "f",
+            command: true,
+            shift: false,
+            option: true,
+            control: false
+        )
+        var globalSearchLookupCount = 0
+        let observer = KeyboardShortcutSettingsObserver(
+            notificationCenter: notificationCenter,
+            shortcutProvider: { action in
+                guard action == .globalSearch else { return .unbound }
+                globalSearchLookupCount += 1
+                return configuredShortcut
+            }
+        )
+
+        #expect(observer.globalSearchShortcut == configuredShortcut)
+        let initialLookupCount = globalSearchLookupCount
+        for _ in 0..<100 {
+            _ = observer.globalSearchShortcut
+        }
+        #expect(globalSearchLookupCount == initialLookupCount)
+
+        configuredShortcut = StoredShortcut(
+            key: "g",
+            command: true,
+            shift: true,
+            option: false,
+            control: false,
+            chordKey: "s"
+        )
+        notificationCenter.post(
+            name: KeyboardShortcutSettings.didChangeNotification,
+            object: nil
+        )
+
+        #expect(observer.globalSearchShortcut == configuredShortcut)
+        #expect(globalSearchLookupCount == initialLookupCount + 1)
+
+        configuredShortcut = .unbound
+        notificationCenter.post(
+            name: KeyboardShortcutSettings.didChangeNotification,
+            object: nil
+        )
+
+        #expect(observer.globalSearchShortcut == .unbound)
+        #expect(globalSearchLookupCount == initialLookupCount + 2)
+    }
 }

From b5dbe857346be89b9de39c0d6747a8d1d5c7f196 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 06:05:33 -0700
Subject: [PATCH 030/124] Fix shortcut probe activation in UI tests

---
 cmuxUITestSupport/ShortcutProbe/main.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmuxUITestSupport/ShortcutProbe/main.swift b/cmuxUITestSupport/ShortcutProbe/main.swift
index 8c72b69b06bf..2bb9742ad099 100644
--- a/cmuxUITestSupport/ShortcutProbe/main.swift
+++ b/cmuxUITestSupport/ShortcutProbe/main.swift
@@ -36,7 +36,7 @@ final class ShortcutProbeDelegate: NSObject, NSApplicationDelegate {
 
         window.center()
         window.makeKeyAndOrderFront(nil)
-        _ = NSRunningApplication.current.activate(options: [.activateAllWindows])
+        NSApp.activate(ignoringOtherApps: true)
     }
 
     @objc private func receiveShortcut() {

From 26279818c196db77c6f5b6fc78745ae97c9bc797 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 06:16:03 -0700
Subject: [PATCH 031/124] test: preserve foreground shortcut input ownership

---
 cmux.xcodeproj/project.pbxproj                |   4 +
 .../GlobalSearchInputOwnershipTests.swift     | 202 ++++++++++++++++++
 2 files changed, 206 insertions(+)
 create mode 100644 cmuxTests/GlobalSearchInputOwnershipTests.swift

diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index 73ec420bc759..5c4bf008d512 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -976,6 +976,7 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		3865A0023865A0023865A002 /* GlobalSearchCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0023865B0023865B002 /* GlobalSearchCoordinator.swift */; };
 		3865A0073865A0073865A007 /* GlobalSearchDocuments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0073865B0073865B007 /* GlobalSearchDocuments.swift */; };
 		D8561001A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8561002A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift */; };
+		8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */; };
 		3865A0083865A0083865A008 /* GlobalSearchPanelCaptureManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */; };
 		3865A0053865A0053865A005 /* GlobalSearchShortcutSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */; };
 		5B11E5A100000000000000B1 /* GPUSpinner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B11E5A100000000000000B2 /* GPUSpinner.swift */; };
@@ -3214,6 +3215,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		3865B0023865B0023865B002 /* GlobalSearchCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchCoordinator.swift; sourceTree = "<group>"; };
 		3865B0073865B0073865B007 /* GlobalSearchDocuments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchDocuments.swift; sourceTree = "<group>"; };
 		D8561002A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchForegroundScopeUITests.swift; sourceTree = "<group>"; };
+		8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchInputOwnershipTests.swift; sourceTree = "<group>"; };
 		3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchPanelCaptureManager.swift; sourceTree = "<group>"; };
 		3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutSettingsTests.swift; sourceTree = "<group>"; };
 		5B11E5A100000000000000B2 /* GPUSpinner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sidebar/GPUSpinner.swift; sourceTree = "<group>"; };
@@ -6355,6 +6357,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				C34670040000000000000002 /* KeyboardShortcutTestSettingsIsolation.swift */,
 				F5996001A1B2C3D4E5F60002 /* AppDelegateFileExplorerShortcutRoutingTests.swift */,
 				3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */,
+				8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */,
 				65154DD251384EE0A2C8923A /* SystemWideHotkeyShortcutPolicyTests.swift */,
 				E3309A0A /* AppDelegateEqualizeSplitsShortcutTests.swift */,
 				F6001001A1B2C3D4E5F60718 /* ShortcutUnbindingTests.swift */,
@@ -9150,6 +9153,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				816400000000000000000003 /* GhosttyScrollViewTests.swift in Sources */,
 				C13519000000000000000003 /* GhosttyTerminalStartupEnvironmentTests.swift in Sources */,
 				D7AB34400000000000000003 /* GhosttyTerminalViewVisibilityPolicyTests.swift in Sources */,
+				8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */,
 				3865A0053865A0053865A005 /* GlobalSearchShortcutSettingsTests.swift in Sources */,
 				4931A11B0000000000000002 /* HiddenRightSidebarContentMountingTests.swift in Sources */,
 				B1F0C0040000000000000001 /* HostedInspectorDockControlScriptTests.swift in Sources */,
diff --git a/cmuxTests/GlobalSearchInputOwnershipTests.swift b/cmuxTests/GlobalSearchInputOwnershipTests.swift
new file mode 100644
index 000000000000..ff7526a375e3
--- /dev/null
+++ b/cmuxTests/GlobalSearchInputOwnershipTests.swift
@@ -0,0 +1,202 @@
+import AppKit
+import Foundation
+import Testing
+
+#if canImport(cmux_DEV)
+@testable import cmux_DEV
+#elseif canImport(cmux)
+@testable import cmux
+#endif
+
+@MainActor
+@Suite(.serialized)
+final class GlobalSearchInputOwnershipTests {
+    private let originalSettingsFileStore: KeyboardShortcutSettingsFileStore
+
+    init() {
+        originalSettingsFileStore = KeyboardShortcutSettings.settingsFileStore
+        KeyboardShortcutSettings.settingsFileStore = KeyboardShortcutSettingsFileStore(
+            primaryPath: FileManager.default.temporaryDirectory
+                .appendingPathComponent("cmux-global-search-input-ownership-\(UUID().uuidString).json")
+                .path,
+            fallbackPath: nil,
+            additionalFallbackPaths: [],
+            startWatching: false
+        )
+        KeyboardShortcutSettings.resetAll()
+    }
+
+    deinit {
+        KeyboardShortcutSettings.settingsFileStore = originalSettingsFileStore
+        KeyboardShortcutSettings.resetAll()
+    }
+
+    @Test func browserFocusModeOwnsGlobalSearchShortcut() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeBrowserHarness(appDelegate: appDelegate)
+        defer { closeWindow(harness.window, appDelegate: appDelegate) }
+
+        #expect(
+            harness.panel.setBrowserFocusModeActive(
+                true,
+                reason: "globalSearchInputOwnershipTest",
+                focusWebView: false
+            )
+        )
+        let event = try makeKeyDownEvent(
+            key: "f",
+            modifiers: [.command, .option],
+            keyCode: 3,
+            windowNumber: harness.window.windowNumber
+        )
+
+        let handled = appDelegate.debugHandleCustomShortcut(event: event)
+        if handled {
+            appDelegate.toggleGlobalSearchPalette()
+        }
+
+        #expect(!handled, "Browser focus mode must get the shortcut before app-scoped Global Search")
+#else
+        Issue.record("Global Search input-ownership routing requires a DEBUG build")
+#endif
+    }
+
+    @Test func markedTextOwnsOptionOnlyGlobalSearchShortcut() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeBrowserHarness(appDelegate: appDelegate)
+        defer { closeWindow(harness.window, appDelegate: appDelegate) }
+
+        let field = OmnibarNativeTextField(frame: NSRect(x: 8, y: 8, width: 240, height: 24))
+        field.identifier = browserOmnibarTextFieldIdentifier
+        field.panelId = harness.panel.id
+        field.stringValue = "かな"
+        (harness.window.contentView?.superview ?? harness.window.contentView)?.addSubview(field)
+        BrowserOmnibarNativeFieldRegistry.shared.register(field, panelId: harness.panel.id)
+        defer {
+            BrowserOmnibarNativeFieldRegistry.shared.unregister(field, panelId: harness.panel.id)
+            field.removeFromSuperview()
+        }
+
+        #expect(harness.window.makeFirstResponder(field))
+        let fieldEditor = try #require(field.currentEditor() as? NSTextView)
+        fieldEditor.setMarkedText(
+            "かな",
+            selectedRange: NSRange(location: 2, length: 0),
+            replacementRange: NSRange(location: NSNotFound, length: 0)
+        )
+        #expect(fieldEditor.hasMarkedText())
+        NotificationCenter.default.post(name: .browserDidFocusAddressBar, object: harness.panel.id)
+
+        let shortcut = StoredShortcut(
+            key: "q",
+            command: false,
+            shift: false,
+            option: true,
+            control: false
+        )
+        KeyboardShortcutSettings.setShortcut(shortcut, for: .globalSearch)
+        let event = try makeKeyDownEvent(
+            key: "q",
+            characters: "@",
+            modifiers: [.option],
+            keyCode: 12,
+            windowNumber: harness.window.windowNumber
+        )
+
+        let handled = appDelegate.debugHandleCustomShortcut(event: event)
+        if handled {
+            appDelegate.toggleGlobalSearchPalette()
+        }
+
+        #expect(!handled, "An Option-only Global Search binding must yield to active IME marked text")
+#else
+        Issue.record("Global Search input-ownership routing requires a DEBUG build")
+#endif
+    }
+
+    private func makeBrowserHarness(
+        appDelegate: AppDelegate
+    ) throws -> (window: NSWindow, panel: BrowserPanel, webView: CmuxWebView) {
+        let windowId = appDelegate.createMainWindow()
+        guard let window = window(withId: windowId),
+              let manager = appDelegate.tabManagerFor(windowId: windowId),
+              let workspace = manager.selectedWorkspace,
+              let browserURL = URL(string: "data:text/html;base64,PGh0bWw+PGJvZHk+Zm9jdXM8L2JvZHk+PC9odG1sPg=="),
+              let browserPanelId = manager.openBrowser(
+                  inWorkspace: workspace.id,
+                  url: browserURL,
+                  preferSplitRight: true
+              ),
+              let browserPanel = manager.selectedWorkspace?.browserPanel(for: browserPanelId)
+                  ?? workspace.browserPanel(for: browserPanelId),
+              let webView = browserPanel.webView as? CmuxWebView else {
+            if let window = window(withId: windowId) {
+                closeWindow(window, appDelegate: appDelegate)
+            }
+            throw TestHarnessError.browserHarnessUnavailable
+        }
+
+        workspace.focusPanel(browserPanel.id)
+        if webView.cmuxBrowserViewportAttachmentSuperview == nil,
+           let contentView = window.contentView {
+            let presentationView = webView.cmuxBrowserViewportPresentationView
+            contentView.addSubview(presentationView)
+            webView.cmuxApplyBrowserViewportLayout(in: contentView.bounds)
+        }
+        window.makeKeyAndOrderFront(nil)
+        guard window.makeFirstResponder(webView) else {
+            closeWindow(window, appDelegate: appDelegate)
+            throw TestHarnessError.browserFocusUnavailable
+        }
+        return (window, browserPanel, webView)
+    }
+
+    private func makeKeyDownEvent(
+        key: String,
+        characters: String? = nil,
+        modifiers: NSEvent.ModifierFlags,
+        keyCode: UInt16,
+        windowNumber: Int
+    ) throws -> NSEvent {
+        guard let event = NSEvent.keyEvent(
+            with: .keyDown,
+            location: .zero,
+            modifierFlags: modifiers,
+            timestamp: ProcessInfo.processInfo.systemUptime,
+            windowNumber: windowNumber,
+            context: nil,
+            characters: characters ?? key,
+            charactersIgnoringModifiers: key,
+            isARepeat: false,
+            keyCode: keyCode
+        ) else {
+            throw TestHarnessError.eventUnavailable
+        }
+        return event
+    }
+
+    private func window(withId windowId: UUID) -> NSWindow? {
+        let identifier = "cmux.main.\(windowId.uuidString)"
+        return NSApp.windows.first(where: { $0.identifier?.rawValue == identifier })
+    }
+
+    private func closeWindow(_ window: NSWindow, appDelegate: AppDelegate) {
+#if DEBUG
+        let originalConfirmationHandler = appDelegate.debugCloseMainWindowConfirmationHandler
+        appDelegate.debugCloseMainWindowConfirmationHandler = { _ in true }
+        defer { appDelegate.debugCloseMainWindowConfirmationHandler = originalConfirmationHandler }
+#endif
+        window.animationBehavior = .none
+        window.orderOut(nil)
+        window.close()
+        RunLoop.main.run(until: Date.now.addingTimeInterval(0.05))
+    }
+
+    private enum TestHarnessError: Error {
+        case browserHarnessUnavailable
+        case browserFocusUnavailable
+        case eventUnavailable
+    }
+}

From e1f4318c50933edd110edfa64b9233fd65d1926e Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 06:27:02 -0700
Subject: [PATCH 032/124] fix: preserve focused input ownership for global
 search

---
 Sources/AppDelegate.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index 1976fa61feb6..87a4456b3f5b 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -12991,8 +12991,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             return false
         }
 
-        if matchCachedGlobalSearchShortcut(event: event) { toggleGlobalSearchPalette(); return true }
-
         if browserFocusModePanelForShortcutEvent(event) != nil {
 #if DEBUG
             cmuxDebugLog("browser.focusMode.shortcutMonitor.bypass \(debugShortcutRouteSnapshot(event: event))")
@@ -13290,6 +13288,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             return false
         }
 
+        if matchCachedGlobalSearchShortcut(event: event) { toggleGlobalSearchPalette(); return true }
+
         // When the notifications popover is open, Escape should dismiss it immediately.
         if flags.isEmpty, event.keyCode == 53, titlebarAccessoryController.dismissNotificationsPopoverIfShown() {
             return true

From 43e40bad733b600dd3e7b958d94df61353d7eb0d Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 12:16:38 -0700
Subject: [PATCH 033/124] test: launch shortcut probe through workspace

---
 .../GlobalSearchForegroundScopeUITests.swift  | 58 +++++++++----------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index a496623debc7..1fc9fe20a995 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -6,7 +6,7 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
 
     private var app: XCUIApplication!
     private var appProcess: Process?
-    private var shortcutProbeProcess: Process?
+    private var shortcutProbeApplication: NSRunningApplication?
 
     override func setUpWithError() throws {
         continueAfterFailure = false
@@ -38,7 +38,8 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
     }
 
     override func tearDownWithError() throws {
-        terminateProcess(&shortcutProbeProcess)
+        shortcutProbeApplication?.terminate()
+        shortcutProbeApplication = nil
         app?.terminate()
         terminateProcess(&appProcess)
         app = nil
@@ -50,20 +51,9 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         let globalSearchField = app.textFields["GlobalSearchSearchField"].firstMatch
         XCTAssertFalse(globalSearchField.exists, "Global Search should start closed")
 
-        let probeExecutableURL = try builtShortcutProbeExecutableURL()
-        let probeProcess = Process()
-        probeProcess.executableURL = probeExecutableURL
-        try probeProcess.run()
-        shortcutProbeProcess = probeProcess
+        try launchShortcutProbe()
 
         let probe = XCUIApplication(bundleIdentifier: Self.shortcutProbeBundleIdentifier)
-        XCTAssertTrue(
-            waitForAppToRun(probe, timeout: 10.0),
-            "Expected shortcut probe to launch. state=\(probe.state.rawValue)"
-        )
-        if probe.state != .runningForeground {
-            probe.activate()
-        }
         XCTAssertTrue(
             probe.wait(for: .runningForeground, timeout: 10.0),
             "Expected shortcut probe to be foreground. state=\(probe.state.rawValue)"
@@ -121,18 +111,6 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         )
     }
 
-    private func waitForAppToRun(_ application: XCUIApplication, timeout: TimeInterval) -> Bool {
-        waitForPredicate(
-            NSPredicate(
-                format: "state == %d OR state == %d",
-                XCUIApplication.State.runningBackground.rawValue,
-                XCUIApplication.State.runningForeground.rawValue
-            ),
-            object: application,
-            timeout: timeout
-        )
-    }
-
     private func waitForAppToLeaveForeground(_ application: XCUIApplication, timeout: TimeInterval) -> Bool {
         waitForPredicate(
             NSPredicate(format: "state != %d", XCUIApplication.State.runningForeground.rawValue),
@@ -169,18 +147,34 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         return executablePath
     }
 
-    private func builtShortcutProbeExecutableURL() throws -> URL {
-        let executableURL = builtProductsDirectory()
+    private func launchShortcutProbe() throws {
+        let applicationURL = builtProductsDirectory()
             .appendingPathComponent("ShortcutProbe.app")
-            .appendingPathComponent("Contents/MacOS/ShortcutProbe")
-        guard FileManager.default.isExecutableFile(atPath: executableURL.path) else {
+        guard FileManager.default.fileExists(atPath: applicationURL.path) else {
             throw NSError(
                 domain: "GlobalSearchForegroundScopeUITests",
                 code: 2,
-                userInfo: [NSLocalizedDescriptionKey: "Could not locate shortcut probe at \(executableURL.path)"]
+                userInfo: [NSLocalizedDescriptionKey: "Could not locate shortcut probe at \(applicationURL.path)"]
             )
         }
-        return executableURL
+
+        let configuration = NSWorkspace.OpenConfiguration()
+        configuration.activates = true
+        configuration.createsNewApplicationInstance = true
+        configuration.allowsRunningApplicationSubstitution = false
+        let launchExpectation = expectation(description: "Launch shortcut probe application")
+        var launchError: Error?
+        NSWorkspace.shared.openApplication(at: applicationURL, configuration: configuration) {
+            [weak self] application, error in
+            self?.shortcutProbeApplication = application
+            launchError = error
+            launchExpectation.fulfill()
+        }
+        wait(for: [launchExpectation], timeout: 10.0)
+        if let launchError {
+            throw launchError
+        }
+        XCTAssertNotNil(shortcutProbeApplication, "Expected NSWorkspace to launch shortcut probe")
     }
 
     private func builtProductsDirectory() -> URL {

From a6f9fe7e8c50587fd6fe20f4ced8bddaa53b81b1 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 13:12:27 -0700
Subject: [PATCH 034/124] test: cover final global search ownership gaps

---
 .../GlobalSearchInputOwnershipTests.swift     | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/cmuxTests/GlobalSearchInputOwnershipTests.swift b/cmuxTests/GlobalSearchInputOwnershipTests.swift
index ff7526a375e3..9f2a6817ee35 100644
--- a/cmuxTests/GlobalSearchInputOwnershipTests.swift
+++ b/cmuxTests/GlobalSearchInputOwnershipTests.swift
@@ -116,6 +116,84 @@ final class GlobalSearchInputOwnershipTests {
 #endif
     }
 
+    @Test func genericMarkedTextResponderOwnsOptionOnlyGlobalSearchShortcut() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let windowId = appDelegate.createMainWindow()
+        let window = try #require(window(withId: windowId))
+        defer {
+            GlobalSearchCoordinator.shared.dismissPalette()
+            closeWindow(window, appDelegate: appDelegate)
+        }
+
+        let textView = NSTextView(frame: NSRect(x: 8, y: 8, width: 240, height: 24))
+        window.contentView?.addSubview(textView)
+        window.makeKeyAndOrderFront(nil)
+        #expect(window.makeFirstResponder(textView))
+        textView.setMarkedText(
+            "かな",
+            selectedRange: NSRange(location: 2, length: 0),
+            replacementRange: NSRange(location: NSNotFound, length: 0)
+        )
+        #expect(textView.hasMarkedText())
+
+        let shortcut = StoredShortcut(
+            key: "\r",
+            command: false,
+            shift: false,
+            option: true,
+            control: false
+        )
+        KeyboardShortcutSettings.setShortcut(shortcut, for: .globalSearch)
+        let event = try makeKeyDownEvent(
+            key: "\r",
+            modifiers: [.option],
+            keyCode: 36,
+            windowNumber: window.windowNumber
+        )
+
+        #expect(!shortcutRoutingShouldBypassForPrintableOptionText(event: event))
+        #expect(
+            !appDelegate.debugHandleCustomShortcut(event: event),
+            "Any marked NSTextInputClient must own non-Command input before Global Search routing"
+        )
+#else
+        Issue.record("Global Search input-ownership routing requires a DEBUG build")
+#endif
+    }
+
+    @Test func globalSearchRoutesWhileCommandPaletteIsEffective() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let windowId = appDelegate.createMainWindow()
+        let window = try #require(window(withId: windowId))
+        defer {
+            GlobalSearchCoordinator.shared.dismissPalette()
+            appDelegate.setCommandPaletteVisible(false, for: window)
+            closeWindow(window, appDelegate: appDelegate)
+        }
+
+        window.makeKeyAndOrderFront(nil)
+        appDelegate.setCommandPaletteVisible(true, for: window)
+        GlobalSearchCoordinator.shared.dismissPalette()
+        #expect(!GlobalSearchCoordinator.shared.isPaletteVisible())
+        let event = try makeKeyDownEvent(
+            key: "f",
+            modifiers: [.command, .option],
+            keyCode: 3,
+            windowNumber: window.windowNumber
+        )
+
+        #expect(appDelegate.debugHandleCustomShortcut(event: event))
+        #expect(
+            GlobalSearchCoordinator.shared.isPaletteVisible(),
+            "The foreground Global Search action must run before command-palette shortcut swallowing"
+        )
+#else
+        Issue.record("Global Search command-palette routing requires a DEBUG build")
+#endif
+    }
+
     private func makeBrowserHarness(
         appDelegate: AppDelegate
     ) throws -> (window: NSWindow, panel: BrowserPanel, webView: CmuxWebView) {

From a6fb09a34385bdb9bf4cfe513eea3f64412502d2 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 13:21:30 -0700
Subject: [PATCH 035/124] Fix merged sidebar suspension test import

---
 cmuxTests/SidebarWorkspaceRowSuspensionTests.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmuxTests/SidebarWorkspaceRowSuspensionTests.swift b/cmuxTests/SidebarWorkspaceRowSuspensionTests.swift
index 5b4dd0370c5e..caf8c95cab95 100644
--- a/cmuxTests/SidebarWorkspaceRowSuspensionTests.swift
+++ b/cmuxTests/SidebarWorkspaceRowSuspensionTests.swift
@@ -1,4 +1,5 @@
 import AppKit
+import CmuxSettings
 import CmuxSidebar
 import CmuxWorkspaces
 import Testing

From 385a12aec06d10d0a4949ecba7ced0161ce9cf33 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 13:36:51 -0700
Subject: [PATCH 036/124] test: cover global search chord palette precedence

---
 .../GlobalSearchInputOwnershipTests.swift     | 61 +++++++++++++++++--
 1 file changed, 56 insertions(+), 5 deletions(-)

diff --git a/cmuxTests/GlobalSearchInputOwnershipTests.swift b/cmuxTests/GlobalSearchInputOwnershipTests.swift
index 9f2a6817ee35..f18803c0739c 100644
--- a/cmuxTests/GlobalSearchInputOwnershipTests.swift
+++ b/cmuxTests/GlobalSearchInputOwnershipTests.swift
@@ -120,7 +120,7 @@ final class GlobalSearchInputOwnershipTests {
 #if DEBUG
         let appDelegate = try #require(AppDelegate.shared)
         let windowId = appDelegate.createMainWindow()
-        let window = try #require(window(withId: windowId))
+        let window = try #require(findWindow(withId: windowId))
         defer {
             GlobalSearchCoordinator.shared.dismissPalette()
             closeWindow(window, appDelegate: appDelegate)
@@ -166,7 +166,7 @@ final class GlobalSearchInputOwnershipTests {
 #if DEBUG
         let appDelegate = try #require(AppDelegate.shared)
         let windowId = appDelegate.createMainWindow()
-        let window = try #require(window(withId: windowId))
+        let window = try #require(findWindow(withId: windowId))
         defer {
             GlobalSearchCoordinator.shared.dismissPalette()
             appDelegate.setCommandPaletteVisible(false, for: window)
@@ -194,11 +194,62 @@ final class GlobalSearchInputOwnershipTests {
 #endif
     }
 
+    @Test func globalSearchChordRoutesWhileCommandPaletteIsEffective() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let windowId = appDelegate.createMainWindow()
+        let window = try #require(findWindow(withId: windowId))
+        defer {
+            GlobalSearchCoordinator.shared.dismissPalette()
+            appDelegate.setCommandPaletteVisible(false, for: window)
+            appDelegate.debugResetShortcutRoutingStateForTesting()
+            closeWindow(window, appDelegate: appDelegate)
+        }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "k",
+                command: true,
+                shift: false,
+                option: true,
+                control: false,
+                chordKey: "f"
+            ),
+            for: .globalSearch
+        )
+        window.makeKeyAndOrderFront(nil)
+        appDelegate.setCommandPaletteVisible(true, for: window)
+        GlobalSearchCoordinator.shared.dismissPalette()
+        let prefixEvent = try makeKeyDownEvent(
+            key: "k",
+            modifiers: [.command, .option],
+            keyCode: 40,
+            windowNumber: window.windowNumber
+        )
+        let suffixEvent = try makeKeyDownEvent(
+            key: "f",
+            modifiers: [],
+            keyCode: 3,
+            windowNumber: window.windowNumber
+        )
+
+        #expect(appDelegate.debugHandleCustomShortcut(event: prefixEvent))
+        #expect(!GlobalSearchCoordinator.shared.isPaletteVisible())
+        #expect(appDelegate.debugHandleCustomShortcut(event: suffixEvent))
+        #expect(
+            GlobalSearchCoordinator.shared.isPaletteVisible(),
+            "A configured Global Search chord must arm before command-palette shortcut swallowing"
+        )
+#else
+        Issue.record("Global Search command-palette routing requires a DEBUG build")
+#endif
+    }
+
     private func makeBrowserHarness(
         appDelegate: AppDelegate
     ) throws -> (window: NSWindow, panel: BrowserPanel, webView: CmuxWebView) {
         let windowId = appDelegate.createMainWindow()
-        guard let window = window(withId: windowId),
+        guard let window = findWindow(withId: windowId),
               let manager = appDelegate.tabManagerFor(windowId: windowId),
               let workspace = manager.selectedWorkspace,
               let browserURL = URL(string: "data:text/html;base64,PGh0bWw+PGJvZHk+Zm9jdXM8L2JvZHk+PC9odG1sPg=="),
@@ -210,7 +261,7 @@ final class GlobalSearchInputOwnershipTests {
               let browserPanel = manager.selectedWorkspace?.browserPanel(for: browserPanelId)
                   ?? workspace.browserPanel(for: browserPanelId),
               let webView = browserPanel.webView as? CmuxWebView else {
-            if let window = window(withId: windowId) {
+            if let window = findWindow(withId: windowId) {
                 closeWindow(window, appDelegate: appDelegate)
             }
             throw TestHarnessError.browserHarnessUnavailable
@@ -255,7 +306,7 @@ final class GlobalSearchInputOwnershipTests {
         return event
     }
 
-    private func window(withId windowId: UUID) -> NSWindow? {
+    private func findWindow(withId windowId: UUID) -> NSWindow? {
         let identifier = "cmux.main.\(windowId.uuidString)"
         return NSApp.windows.first(where: { $0.identifier?.rawValue == identifier })
     }

From 59cba9b4b8a07639e9f5a2dbcd6f49aa26e8d291 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 13:48:54 -0700
Subject: [PATCH 037/124] Fix merged sidebar table test import

---
 cmuxTests/SidebarWorkspaceTableSuspensionTests.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmuxTests/SidebarWorkspaceTableSuspensionTests.swift b/cmuxTests/SidebarWorkspaceTableSuspensionTests.swift
index 99dc201989fd..55529889002c 100644
--- a/cmuxTests/SidebarWorkspaceTableSuspensionTests.swift
+++ b/cmuxTests/SidebarWorkspaceTableSuspensionTests.swift
@@ -1,4 +1,5 @@
 import AppKit
+import CmuxFoundation
 import SwiftUI
 import Testing
 @testable import cmux_DEV

From 8e1a2bb2b2561fb8a0e526398fd97107eae6762c Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 13:49:25 -0700
Subject: [PATCH 038/124] fix: preserve foreground global search input
 ownership

---
 Sources/App/ShortcutRoutingSupport.swift    |  2 +-
 Sources/App/TerminalFindEscapeRouting.swift |  2 +-
 Sources/AppDelegate.swift                   | 83 +++++++++++++--------
 3 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/Sources/App/ShortcutRoutingSupport.swift b/Sources/App/ShortcutRoutingSupport.swift
index 1982236ba2e9..09720e65a319 100644
--- a/Sources/App/ShortcutRoutingSupport.swift
+++ b/Sources/App/ShortcutRoutingSupport.swift
@@ -85,7 +85,7 @@ func browserOmnibarShouldSubmitOnReturn(flags: NSEvent.ModifierFlags) -> Bool {
     return normalizedFlags == [] || normalizedFlags == [.shift]
 }
 
-func browserResponderHasMarkedText(_ responder: NSResponder?) -> Bool {
+func shortcutResponderHasMarkedText(_ responder: NSResponder?) -> Bool {
     guard let responder else { return false }
 
     // During IME composition, Return/Enter belongs to the text system so the
diff --git a/Sources/App/TerminalFindEscapeRouting.swift b/Sources/App/TerminalFindEscapeRouting.swift
index 47bd3938d9cd..cf0e08876a19 100644
--- a/Sources/App/TerminalFindEscapeRouting.swift
+++ b/Sources/App/TerminalFindEscapeRouting.swift
@@ -18,7 +18,7 @@ func cmuxCloseFocusedTerminalFindForEscape(event: NSEvent, appDelegate: AppDeleg
 
     guard let panel = (targetTabManager ?? appDelegate.tabManager)?.selectedTerminalPanel,
           panel.searchState != nil,
-          !browserResponderHasMarkedText(shortcutWindow?.firstResponder),
+          !shortcutResponderHasMarkedText(shortcutWindow?.firstResponder),
           terminalFindFieldOwnsResponder || appDelegate.allowsTerminalKeyboardFocus(
               workspaceId: panel.workspaceId,
               panelId: panel.id,
diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index 93e56e7e12e4..889d129c499c 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -12639,8 +12639,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
 
     private func currentConfiguredShortcutChordActions() -> [KeyboardShortcutSettings.Action] {
         KeyboardShortcutSettings.Action.allCases.filter { action in
-            // Carbon owns the opt-in hotkey and never routes through AppKit's local handler.
-            guard !action.isSystemWideHotkey && action.allowsChordShortcut else { return false }
+            // Carbon owns the opt-in hotkey, while Global Search has a cached
+            // foreground route before generic chord handling.
+            guard !action.isSystemWideHotkey,
+                  action != .globalSearch,
+                  action.allowsChordShortcut else {
+                return false
+            }
             guard !action.isBrowserContentShortcut else { return false }
             return KeyboardShortcutSettings.shortcut(for: action).hasChord
         }
@@ -12915,7 +12920,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
 
         if shortcutRoutingShouldBypassForPrintableOptionText(event: event) {
             let shortcutWindow = resolvedShortcutEventWindow(event) ?? shortcutRoutingActiveWindow
-            if browserResponderHasMarkedText(shortcutWindow?.firstResponder) {
+            if shortcutResponderHasMarkedText(shortcutWindow?.firstResponder) {
                 clearConfiguredShortcutChordState()
                 return false
             }
@@ -13252,6 +13257,43 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             }
         }
 
+        // Active marked text owns every non-Command event, regardless of which
+        // NSTextInputClient has focus. Command shortcuts remain available while
+        // composing because Command is not part of IME input sequences.
+        let shortcutWindowForMarkedText =
+            resolvedShortcutEventWindow(event)
+            ?? event.window
+            ?? shortcutRoutingActiveWindow
+            ?? shortcutRoutingKeyWindow
+        let shortcutResponderForMarkedText = shortcutWindowForMarkedText?.firstResponder
+        if !normalizedFlags.contains(.command) {
+            if let ghosttyView = shortcutResponderForMarkedText.cmuxStrictOwningGhosttyView(),
+               ghosttyView.hasMarkedText() {
+                return false
+            }
+            if shortcutResponderHasMarkedText(shortcutResponderForMarkedText) {
+                return false
+            }
+        }
+
+        if matchCachedGlobalSearchShortcut(event: event) {
+            toggleGlobalSearchPalette()
+            return true
+        }
+
+        let globalSearchAction = KeyboardShortcutSettings.Action.globalSearch
+        let globalSearchShortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
+        if activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
+           globalSearchShortcut.hasChord,
+           matchShortcutStroke(event: event, stroke: globalSearchShortcut.firstStroke),
+           shortcutWhenClauseAllows(action: globalSearchAction, event: event) {
+            pendingConfiguredShortcutChord = PendingConfiguredShortcutChord(
+                firstStroke: globalSearchShortcut.firstStroke,
+                windowNumber: configuredShortcutChordWindowNumber(for: event)
+            )
+            return true
+        }
+
         if shouldConsumeShortcutWhileCommandPaletteVisible(
             isCommandPaletteVisible: commandPaletteEffectiveInTargetWindow,
             normalizedFlags: normalizedFlags,
@@ -13277,27 +13319,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             }
         }
 
-        // When the terminal has active IME composition (e.g. Korean, Japanese, Chinese
-        // input), don't intercept non-Cmd key events — let them flow through to the
-        // input method. Cmd-based shortcuts (Cmd+T, Cmd+Shift+L, etc.) should still
-        // work during composition since Cmd is never part of IME input sequences.
-        if !normalizedFlags.contains(.command),
-           let ghosttyView = (shortcutRoutingKeyWindow?.firstResponder).cmuxStrictOwningGhosttyView(),
-           ghosttyView.hasMarkedText() {
-            return false
-        }
-
-        let shortcutWindowForMarkedText = resolvedShortcutEventWindow(event) ?? event.window ?? shortcutRoutingActiveWindow
-        if browserOmnibarShouldBypassShortcutRoutingForMarkedText(
-            hasFocusedAddressBar: hasFocusedAddressBarInShortcutContext,
-            firstResponderHasMarkedText: browserResponderHasMarkedText(shortcutWindowForMarkedText?.firstResponder),
-            flags: event.modifierFlags
-        ) {
-            return false
-        }
-
-        if matchCachedGlobalSearchShortcut(event: event) { toggleGlobalSearchPalette(); return true }
-
         // When the notifications popover is open, Escape should dismiss it immediately.
         if flags.isEmpty, event.keyCode == 53, titlebarAccessoryController.dismissNotificationsPopoverIfShown() {
             return true
@@ -15188,11 +15209,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
 
     func matchCachedGlobalSearchShortcut(event: NSEvent) -> Bool {
         let action = KeyboardShortcutSettings.Action.globalSearch
-        if !shortcutWhenClauseAllows(action: action, event: event) { return false }
-        return matchConfiguredShortcut(
+        guard matchConfiguredShortcut(
             event: event,
             shortcut: KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
-        )
+        ) else {
+            return false
+        }
+        return shortcutWhenClauseAllows(action: action, event: event)
     }
 
     /// Whether `action`'s effective `when` clause (its `shortcuts.when` override,
@@ -15209,7 +15232,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
     func rightSidebarModeShortcut(for event: NSEvent) -> RightSidebarMode? {
         let shortcutWindow = resolvedShortcutEventWindow(event) ?? event.window ?? shortcutRoutingActiveWindow
         if shortcutRoutingShouldBypassForPrintableOptionText(event: event),
-           browserResponderHasMarkedText(shortcutWindow?.firstResponder) {
+           shortcutResponderHasMarkedText(shortcutWindow?.firstResponder) {
             return nil
         }
         return KeyboardShortcutSettingsObserver.shared.rightSidebarModeShortcutMatcher.modeShortcut(for: event) { [self] action in
@@ -17058,7 +17081,7 @@ private extension NSWindow {
         let firstResponderWebView = self.firstResponder.flatMap {
             Self.cmuxOwningWebView(for: $0, in: self, event: event)
         }
-        let firstResponderHasMarkedText = browserResponderHasMarkedText(self.firstResponder)
+        let firstResponderHasMarkedText = shortcutResponderHasMarkedText(self.firstResponder)
         let firstResponderIsCommandPaletteFieldEditor = Self.cmuxCommandPaletteOwnsFieldEditor(
             self.firstResponder as? NSTextView,
             in: self
@@ -17340,7 +17363,7 @@ private extension NSWindow {
                 if cmuxForceDispatchKeyDownOnce(
                     event,
                     to: omnibarResponder,
-                    reason: browserResponderHasMarkedText(omnibarResponder)
+                    reason: shortcutResponderHasMarkedText(omnibarResponder)
                         ? "browser arrow restored focused omnibar with marked text"
                         : "browser arrow restored focused omnibar"
                 ) {

From 661de99ef196217c77b4adbef4cbc2b6c5a0f21b Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 14:26:04 -0700
Subject: [PATCH 039/124] test: isolate foreground shortcut verification

---
 .../GlobalSearchForegroundScopeUITests.swift  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index 1fc9fe20a995..63fb671adecd 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -6,10 +6,19 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
 
     private var app: XCUIApplication!
     private var appProcess: Process?
+    private var isolatedHomeURL: URL?
     private var shortcutProbeApplication: NSRunningApplication?
 
     override func setUpWithError() throws {
         continueAfterFailure = false
+        let isolatedHomeURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent("cmux-global-search-ui-test-\(UUID().uuidString)", isDirectory: true)
+        try FileManager.default.createDirectory(
+            at: isolatedHomeURL,
+            withIntermediateDirectories: true
+        )
+        self.isolatedHomeURL = isolatedHomeURL
+
         let process = Process()
         process.executableURL = URL(fileURLWithPath: try builtCmuxExecutablePath())
         process.arguments = [
@@ -19,6 +28,7 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         ]
         var environment = ProcessInfo.processInfo.environment
         environment["CMUX_UI_TEST_MODE"] = "1"
+        environment["CFFIXED_USER_HOME"] = isolatedHomeURL.path
         process.environment = environment
 
         let logURL = FileManager.default.temporaryDirectory
@@ -43,6 +53,10 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         app?.terminate()
         terminateProcess(&appProcess)
         app = nil
+        if let isolatedHomeURL {
+            try? FileManager.default.removeItem(at: isolatedHomeURL)
+            self.isolatedHomeURL = nil
+        }
     }
 
     func testBackgroundGlobalSearchShortcutIsDeliveredToForegroundApp() throws {
@@ -54,6 +68,13 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         try launchShortcutProbe()
 
         let probe = XCUIApplication(bundleIdentifier: Self.shortcutProbeBundleIdentifier)
+        XCTAssertTrue(
+            waitForAppToRun(probe, timeout: 10.0),
+            "Expected shortcut probe to launch. state=\(probe.state.rawValue)"
+        )
+        if probe.state != .runningForeground {
+            probe.activate()
+        }
         XCTAssertTrue(
             probe.wait(for: .runningForeground, timeout: 10.0),
             "Expected shortcut probe to be foreground. state=\(probe.state.rawValue)"
@@ -111,6 +132,18 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
         )
     }
 
+    private func waitForAppToRun(_ application: XCUIApplication, timeout: TimeInterval) -> Bool {
+        waitForPredicate(
+            NSPredicate(
+                format: "state == %d OR state == %d",
+                XCUIApplication.State.runningBackground.rawValue,
+                XCUIApplication.State.runningForeground.rawValue
+            ),
+            object: application,
+            timeout: timeout
+        )
+    }
+
     private func waitForAppToLeaveForeground(_ application: XCUIApplication, timeout: TimeInterval) -> Bool {
         waitForPredicate(
             NSPredicate(format: "state != %d", XCUIApplication.State.runningForeground.rawValue),

From 00fe27313737754186e26b995764d16c1e2e2322 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 14:35:42 -0700
Subject: [PATCH 040/124] test: preserve focused input for global search remaps

---
 .../GlobalSearchInputOwnershipTests.swift     | 123 ++++++++++++++++++
 1 file changed, 123 insertions(+)

diff --git a/cmuxTests/GlobalSearchInputOwnershipTests.swift b/cmuxTests/GlobalSearchInputOwnershipTests.swift
index f18803c0739c..fa7d649d5ac3 100644
--- a/cmuxTests/GlobalSearchInputOwnershipTests.swift
+++ b/cmuxTests/GlobalSearchInputOwnershipTests.swift
@@ -162,6 +162,129 @@ final class GlobalSearchInputOwnershipTests {
 #endif
     }
 
+    @Test func terminalEOFOwnsRemappedGlobalSearchShortcut() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let windowId = appDelegate.createMainWindow()
+        let window = try #require(findWindow(withId: windowId))
+        defer {
+            GlobalSearchCoordinator.shared.dismissPalette()
+            closeWindow(window, appDelegate: appDelegate)
+        }
+
+        window.makeKeyAndOrderFront(nil)
+        #expect(window.firstResponder.cmuxStrictOwningGhosttyView() != nil)
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "d",
+                command: false,
+                shift: false,
+                option: false,
+                control: true
+            ),
+            for: .globalSearch
+        )
+        let event = try makeKeyDownEvent(
+            key: "d",
+            characters: "\u{04}",
+            modifiers: [.control],
+            keyCode: 2,
+            windowNumber: window.windowNumber
+        )
+
+        #expect(
+            !appDelegate.debugHandleCustomShortcut(event: event),
+            "A Ctrl-D Global Search binding must yield to terminal EOF input"
+        )
+        #expect(!GlobalSearchCoordinator.shared.isPaletteVisible())
+#else
+        Issue.record("Global Search input-ownership routing requires a DEBUG build")
+#endif
+    }
+
+    @Test func browserEditingOwnsRemappedGlobalSearchShortcut() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeBrowserHarness(appDelegate: appDelegate)
+        defer {
+            GlobalSearchCoordinator.shared.dismissPalette()
+            closeWindow(harness.window, appDelegate: appDelegate)
+        }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "c",
+                command: true,
+                shift: false,
+                option: false,
+                control: false
+            ),
+            for: .globalSearch
+        )
+        let event = try makeKeyDownEvent(
+            key: "c",
+            modifiers: [.command],
+            keyCode: 8,
+            windowNumber: harness.window.windowNumber
+        )
+
+        #expect(
+            !appDelegate.debugHandleCustomShortcut(event: event),
+            "A Cmd-C Global Search binding must yield to focused browser editing"
+        )
+        #expect(!GlobalSearchCoordinator.shared.isPaletteVisible())
+#else
+        Issue.record("Global Search input-ownership routing requires a DEBUG build")
+#endif
+    }
+
+    @Test func browserEditingShortcutCompletesActiveGlobalSearchChord() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeBrowserHarness(appDelegate: appDelegate)
+        defer {
+            GlobalSearchCoordinator.shared.dismissPalette()
+            appDelegate.debugResetShortcutRoutingStateForTesting()
+            closeWindow(harness.window, appDelegate: appDelegate)
+        }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "k",
+                command: true,
+                shift: false,
+                option: true,
+                control: false,
+                chordKey: "c",
+                chordCommand: true
+            ),
+            for: .globalSearch
+        )
+        let prefixEvent = try makeKeyDownEvent(
+            key: "k",
+            modifiers: [.command, .option],
+            keyCode: 40,
+            windowNumber: harness.window.windowNumber
+        )
+        let suffixEvent = try makeKeyDownEvent(
+            key: "c",
+            modifiers: [.command],
+            keyCode: 8,
+            windowNumber: harness.window.windowNumber
+        )
+
+        #expect(appDelegate.debugHandleCustomShortcut(event: prefixEvent))
+        #expect(!GlobalSearchCoordinator.shared.isPaletteVisible())
+        #expect(
+            appDelegate.debugHandleCustomShortcut(event: suffixEvent),
+            "Cmd-C must complete an already-active Global Search chord"
+        )
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+#else
+        Issue.record("Global Search input-ownership routing requires a DEBUG build")
+#endif
+    }
+
     @Test func globalSearchRoutesWhileCommandPaletteIsEffective() throws {
 #if DEBUG
         let appDelegate = try #require(AppDelegate.shared)

From 5aeef7c126e53c0fd2dd0fdc17ac62db6832f900 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 14:37:45 -0700
Subject: [PATCH 041/124] fix: preserve focused input for global search remaps

---
 Sources/AppDelegate.swift | 72 +++++++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 25 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index 889d129c499c..5c14b3b182f1 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13276,17 +13276,30 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             }
         }
 
-        if matchCachedGlobalSearchShortcut(event: event) {
-            toggleGlobalSearchPalette()
-            return true
-        }
-
         let globalSearchAction = KeyboardShortcutSettings.Action.globalSearch
         let globalSearchShortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
-        if activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
-           globalSearchShortcut.hasChord,
-           matchShortcutStroke(event: event, stroke: globalSearchShortcut.firstStroke),
-           shortcutWhenClauseAllows(action: globalSearchAction, event: event) {
+        let matchesGlobalSearchShortcut = matchCachedGlobalSearchShortcut(event: event)
+        let matchesGlobalSearchChordPrefix =
+            activeConfiguredShortcutChordPrefixForCurrentEvent == nil
+            && globalSearchShortcut.hasChord
+            && matchShortcutStroke(event: event, stroke: globalSearchShortcut.firstStroke)
+            && shortcutWhenClauseAllows(action: globalSearchAction, event: event)
+        if matchesGlobalSearchShortcut || matchesGlobalSearchChordPrefix {
+            // An active chord owns its second stroke. Otherwise, preserve the
+            // focused-input gates that all ordinary application shortcuts use.
+            if activeConfiguredShortcutChordPrefixForCurrentEvent == nil {
+                if prepareControlDForTerminalRoutingIfNeeded(isControlD) {
+                    return false
+                }
+                if shouldRouteBrowserDocumentEditingCommandEquivalentThroughWebContentFirst(event),
+                   shortcutEventFirstResponderOwnsBrowserWebView(event) {
+                    return false
+                }
+            }
+            if matchesGlobalSearchShortcut {
+                toggleGlobalSearchPalette()
+                return true
+            }
             pendingConfiguredShortcutChord = PendingConfiguredShortcutChord(
                 firstStroke: globalSearchShortcut.firstStroke,
                 windowNumber: configuredShortcutChordWindowNumber(for: event)
@@ -13372,22 +13385,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             cmuxRememberFindSelectionBeforePanelFocusMove(tabManager: tabManager, window: shortcutWindow ?? shortcutRoutingKeyWindow); return performFindShortcutInActiveMainWindow(preferredWindow: shortcutWindow)
         }
 
-        // Keep keyboard routing deterministic after split close/reparent transitions:
-        // before processing shortcuts, converge first responder with the focused terminal panel.
-        if isControlD {
-#if DEBUG
-            let selected = tabManager?.selectedTabId?.uuidString.prefix(5) ?? "nil"
-            let focused = tabManager?.selectedWorkspace?.focusedPanelId?.uuidString.prefix(5) ?? "nil"
-            let frType = shortcutRoutingKeyWindow?.firstResponder.map { String(describing: type(of: $0)) } ?? "nil"
-            cmuxDebugLog("shortcut.ctrlD stage=preReconcile selected=\(selected) focused=\(focused) fr=\(frType)")
-#endif
-            tabManager?.reconcileFocusedPanelFromFirstResponderForKeyboard()
-            #if DEBUG
-            let frAfterType = shortcutRoutingKeyWindow?.firstResponder.map { String(describing: type(of: $0)) } ?? "nil"
-            cmuxDebugLog("shortcut.ctrlD stage=postReconcile fr=\(frAfterType)")
-            writeChildExitKeyboardProbe([:], increments: ["probeAppShortcutCtrlDPassedCount": 1])
-            #endif
-            // Ctrl+D belongs to the focused terminal surface; never treat it as an app shortcut.
+        if prepareControlDForTerminalRoutingIfNeeded(isControlD) {
             return false
         }
         // Chrome-like omnibar navigation while holding Ctrl+N / Ctrl+P.
@@ -15218,6 +15216,30 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         return shortcutWhenClauseAllows(action: action, event: event)
     }
 
+    private func prepareControlDForTerminalRoutingIfNeeded(_ isControlD: Bool) -> Bool {
+        guard isControlD else { return false }
+        // Keep keyboard routing deterministic after split close/reparent
+        // transitions before the event continues to the focused terminal.
+#if DEBUG
+        let selected = tabManager?.selectedTabId?.uuidString.prefix(5) ?? "nil"
+        let focused = tabManager?.selectedWorkspace?.focusedPanelId?.uuidString.prefix(5) ?? "nil"
+        let firstResponderType = shortcutRoutingKeyWindow?.firstResponder
+            .map { String(describing: type(of: $0)) } ?? "nil"
+        cmuxDebugLog(
+            "shortcut.ctrlD stage=preReconcile selected=\(selected) " +
+                "focused=\(focused) fr=\(firstResponderType)"
+        )
+#endif
+        tabManager?.reconcileFocusedPanelFromFirstResponderForKeyboard()
+#if DEBUG
+        let reconciledFirstResponderType = shortcutRoutingKeyWindow?.firstResponder
+            .map { String(describing: type(of: $0)) } ?? "nil"
+        cmuxDebugLog("shortcut.ctrlD stage=postReconcile fr=\(reconciledFirstResponderType)")
+        writeChildExitKeyboardProbe([:], increments: ["probeAppShortcutCtrlDPassedCount": 1])
+#endif
+        return true
+    }
+
     /// Whether `action`'s effective `when` clause (its `shortcuts.when` override,
     /// or its built-in context default) is satisfied by the event's focus state.
     /// Gates every focus-scoped shortcut, including the numbered workspace/surface

From 0570749ada0105620e6bc00f61d930f9b32160ce Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 14:41:57 -0700
Subject: [PATCH 042/124] fix: defer global search to shared input gates

---
 Sources/AppDelegate.swift | 77 ++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 42 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index 5c14b3b182f1..dd13329a7c70 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13285,26 +13285,28 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             && matchShortcutStroke(event: event, stroke: globalSearchShortcut.firstStroke)
             && shortcutWhenClauseAllows(action: globalSearchAction, event: event)
         if matchesGlobalSearchShortcut || matchesGlobalSearchChordPrefix {
-            // An active chord owns its second stroke. Otherwise, preserve the
-            // focused-input gates that all ordinary application shortcuts use.
-            if activeConfiguredShortcutChordPrefixForCurrentEvent == nil {
-                if prepareControlDForTerminalRoutingIfNeeded(isControlD) {
-                    return false
-                }
-                if shouldRouteBrowserDocumentEditingCommandEquivalentThroughWebContentFirst(event),
-                   shortcutEventFirstResponderOwnsBrowserWebView(event) {
-                    return false
+            // An active chord owns its second stroke. Otherwise, defer matching
+            // input to the shared terminal/browser ownership gates below.
+            let yieldsToFocusedInput =
+                activeConfiguredShortcutChordPrefixForCurrentEvent == nil
+                && (
+                    isControlD
+                    || (
+                        shouldRouteBrowserDocumentEditingCommandEquivalentThroughWebContentFirst(event)
+                        && shortcutEventFirstResponderOwnsBrowserWebView(event)
+                    )
+                )
+            if !yieldsToFocusedInput {
+                if matchesGlobalSearchShortcut {
+                    toggleGlobalSearchPalette()
+                    return true
                 }
-            }
-            if matchesGlobalSearchShortcut {
-                toggleGlobalSearchPalette()
+                pendingConfiguredShortcutChord = PendingConfiguredShortcutChord(
+                    firstStroke: globalSearchShortcut.firstStroke,
+                    windowNumber: configuredShortcutChordWindowNumber(for: event)
+                )
                 return true
             }
-            pendingConfiguredShortcutChord = PendingConfiguredShortcutChord(
-                firstStroke: globalSearchShortcut.firstStroke,
-                windowNumber: configuredShortcutChordWindowNumber(for: event)
-            )
-            return true
         }
 
         if shouldConsumeShortcutWhileCommandPaletteVisible(
@@ -13385,7 +13387,22 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             cmuxRememberFindSelectionBeforePanelFocusMove(tabManager: tabManager, window: shortcutWindow ?? shortcutRoutingKeyWindow); return performFindShortcutInActiveMainWindow(preferredWindow: shortcutWindow)
         }
 
-        if prepareControlDForTerminalRoutingIfNeeded(isControlD) {
+        // Keep keyboard routing deterministic after split close/reparent transitions:
+        // before processing shortcuts, converge first responder with the focused terminal panel.
+        if isControlD {
+#if DEBUG
+            let selected = tabManager?.selectedTabId?.uuidString.prefix(5) ?? "nil"
+            let focused = tabManager?.selectedWorkspace?.focusedPanelId?.uuidString.prefix(5) ?? "nil"
+            let frType = shortcutRoutingKeyWindow?.firstResponder.map { String(describing: type(of: $0)) } ?? "nil"
+            cmuxDebugLog("shortcut.ctrlD stage=preReconcile selected=\(selected) focused=\(focused) fr=\(frType)")
+#endif
+            tabManager?.reconcileFocusedPanelFromFirstResponderForKeyboard()
+            #if DEBUG
+            let frAfterType = shortcutRoutingKeyWindow?.firstResponder.map { String(describing: type(of: $0)) } ?? "nil"
+            cmuxDebugLog("shortcut.ctrlD stage=postReconcile fr=\(frAfterType)")
+            writeChildExitKeyboardProbe([:], increments: ["probeAppShortcutCtrlDPassedCount": 1])
+            #endif
+            // Ctrl+D belongs to the focused terminal surface; never treat it as an app shortcut.
             return false
         }
         // Chrome-like omnibar navigation while holding Ctrl+N / Ctrl+P.
@@ -15216,30 +15233,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         return shortcutWhenClauseAllows(action: action, event: event)
     }
 
-    private func prepareControlDForTerminalRoutingIfNeeded(_ isControlD: Bool) -> Bool {
-        guard isControlD else { return false }
-        // Keep keyboard routing deterministic after split close/reparent
-        // transitions before the event continues to the focused terminal.
-#if DEBUG
-        let selected = tabManager?.selectedTabId?.uuidString.prefix(5) ?? "nil"
-        let focused = tabManager?.selectedWorkspace?.focusedPanelId?.uuidString.prefix(5) ?? "nil"
-        let firstResponderType = shortcutRoutingKeyWindow?.firstResponder
-            .map { String(describing: type(of: $0)) } ?? "nil"
-        cmuxDebugLog(
-            "shortcut.ctrlD stage=preReconcile selected=\(selected) " +
-                "focused=\(focused) fr=\(firstResponderType)"
-        )
-#endif
-        tabManager?.reconcileFocusedPanelFromFirstResponderForKeyboard()
-#if DEBUG
-        let reconciledFirstResponderType = shortcutRoutingKeyWindow?.firstResponder
-            .map { String(describing: type(of: $0)) } ?? "nil"
-        cmuxDebugLog("shortcut.ctrlD stage=postReconcile fr=\(reconciledFirstResponderType)")
-        writeChildExitKeyboardProbe([:], increments: ["probeAppShortcutCtrlDPassedCount": 1])
-#endif
-        return true
-    }
-
     /// Whether `action`'s effective `when` clause (its `shortcuts.when` override,
     /// or its built-in context default) is satisfied by the event's focus state.
     /// Gates every focus-scoped shortcut, including the numbered workspace/surface

From b0389d643870a9f2074ee1deea4633f51eed1a22 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 14:51:44 -0700
Subject: [PATCH 043/124] test: preserve global search shortcut priority

---
 cmux.xcodeproj/project.pbxproj                |   4 +
 .../GlobalSearchShortcutPriorityTests.swift   | 339 ++++++++++++++++++
 2 files changed, 343 insertions(+)
 create mode 100644 cmuxTests/GlobalSearchShortcutPriorityTests.swift

diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index 370d4bfb8566..97fcd169c8cc 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -978,6 +978,7 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		D8561001A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8561002A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift */; };
 		8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */; };
 		3865A0083865A0083865A008 /* GlobalSearchPanelCaptureManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */; };
+		8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */; };
 		3865A0053865A0053865A005 /* GlobalSearchShortcutSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */; };
 		5B11E5A100000000000000B1 /* GPUSpinner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B11E5A100000000000000B2 /* GPUSpinner.swift */; };
 		A6AC72010000000000000001 /* GPUSpinnerNSView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6AC72010000000000000002 /* GPUSpinnerNSView.swift */; };
@@ -3236,6 +3237,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		D8561002A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchForegroundScopeUITests.swift; sourceTree = "<group>"; };
 		8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchInputOwnershipTests.swift; sourceTree = "<group>"; };
 		3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchPanelCaptureManager.swift; sourceTree = "<group>"; };
+		8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutPriorityTests.swift; sourceTree = "<group>"; };
 		3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutSettingsTests.swift; sourceTree = "<group>"; };
 		5B11E5A100000000000000B2 /* GPUSpinner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sidebar/GPUSpinner.swift; sourceTree = "<group>"; };
 		A6AC72010000000000000002 /* GPUSpinnerNSView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sidebar/GPUSpinnerNSView.swift; sourceTree = "<group>"; };
@@ -6409,6 +6411,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				F5996001A1B2C3D4E5F60002 /* AppDelegateFileExplorerShortcutRoutingTests.swift */,
 				3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */,
 				8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */,
+				8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */,
 				65154DD251384EE0A2C8923A /* SystemWideHotkeyShortcutPolicyTests.swift */,
 				E3309A0A /* AppDelegateEqualizeSplitsShortcutTests.swift */,
 				F6001001A1B2C3D4E5F60718 /* ShortcutUnbindingTests.swift */,
@@ -9223,6 +9226,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				C13519000000000000000003 /* GhosttyTerminalStartupEnvironmentTests.swift in Sources */,
 				D7AB34400000000000000003 /* GhosttyTerminalViewVisibilityPolicyTests.swift in Sources */,
 				8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */,
+				8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */,
 				3865A0053865A0053865A005 /* GlobalSearchShortcutSettingsTests.swift in Sources */,
 				4931A11B0000000000000002 /* HiddenRightSidebarContentMountingTests.swift in Sources */,
 				B1F0C0040000000000000001 /* HostedInspectorDockControlScriptTests.swift in Sources */,
diff --git a/cmuxTests/GlobalSearchShortcutPriorityTests.swift b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
new file mode 100644
index 000000000000..13c78ab0cc41
--- /dev/null
+++ b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
@@ -0,0 +1,339 @@
+import AppKit
+import Foundation
+import Testing
+
+#if canImport(cmux_DEV)
+@testable import cmux_DEV
+#elseif canImport(cmux)
+@testable import cmux
+#endif
+
+@MainActor
+@Suite(.serialized)
+final class GlobalSearchShortcutPriorityTests {
+    private let originalSettingsFileStore: KeyboardShortcutSettingsFileStore
+
+    init() {
+        originalSettingsFileStore = KeyboardShortcutSettings.settingsFileStore
+        KeyboardShortcutSettings.settingsFileStore = KeyboardShortcutSettingsFileStore(
+            primaryPath: FileManager.default.temporaryDirectory
+                .appendingPathComponent("cmux-global-search-priority-\(UUID().uuidString).json")
+                .path,
+            fallbackPath: nil,
+            additionalFallbackPaths: [],
+            startWatching: false
+        )
+        KeyboardShortcutSettings.resetAll()
+    }
+
+    deinit {
+        KeyboardShortcutSettings.settingsFileStore = originalSettingsFileStore
+        KeyboardShortcutSettings.resetAll()
+    }
+
+    @Test func rightSidebarModeOwnsOverlappingGlobalSearchShortcut() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let windowId = appDelegate.createMainWindow()
+        let window = try #require(findWindow(withId: windowId))
+        let fileExplorerState = try #require(appDelegate.fileExplorerState)
+        defer {
+            GlobalSearchCoordinator.shared.dismissPalette()
+            appDelegate.debugResetShortcutRoutingStateForTesting()
+            closeWindow(window, appDelegate: appDelegate)
+        }
+
+        window.makeKeyAndOrderFront(nil)
+        window.displayIfNeeded()
+        fileExplorerState.mode = .sessions
+        appDelegate.noteRightSidebarKeyboardFocusIntent(mode: .sessions, in: window)
+        _ = window.makeFirstResponder(nil)
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "1",
+                command: false,
+                shift: false,
+                option: false,
+                control: true
+            ),
+            for: .globalSearch
+        )
+        appDelegate.debugResetShortcutRoutingStateForTesting(clearFocusedWindowOverride: false)
+
+        let event = try makeKeyEvent(
+            type: .keyDown,
+            key: "1",
+            modifiers: [.control],
+            keyCode: 18,
+            windowNumber: window.windowNumber
+        )
+
+        #expect(appDelegate.debugHandleCustomShortcut(event: event))
+        #expect(
+            fileExplorerState.mode == .files,
+            "A focused right-sidebar mode shortcut must run before overlapping app shortcuts"
+        )
+        #expect(
+            !GlobalSearchCoordinator.shared.isPaletteVisible(),
+            "Global Search must not steal a stroke owned by the focused right sidebar"
+        )
+#else
+        Issue.record("Global Search shortcut-priority routing requires a DEBUG build")
+#endif
+    }
+
+    @Test func omnibarControlNOwnsOverlappingGlobalSearchChordPrefix() throws {
+        try assertOmnibarOwnsGlobalSearchChordPrefix(
+            key: "n",
+            keyCode: 45,
+            expectedDelta: 1
+        )
+    }
+
+    @Test func omnibarControlPOwnsOverlappingGlobalSearchChordPrefix() throws {
+        try assertOmnibarOwnsGlobalSearchChordPrefix(
+            key: "p",
+            keyCode: 35,
+            expectedDelta: -1
+        )
+    }
+
+    @Test func activeGlobalSearchChordOwnsControlNSuffixOverOmnibar() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeOmnibarHarness(appDelegate: appDelegate)
+        defer {
+            GlobalSearchCoordinator.shared.dismissPalette()
+            appDelegate.debugResetShortcutRoutingStateForTesting()
+            closeWindow(harness.window, appDelegate: appDelegate)
+        }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "k",
+                command: true,
+                shift: false,
+                option: true,
+                control: false,
+                chordKey: "n",
+                chordCommand: false,
+                chordShift: false,
+                chordOption: false,
+                chordControl: true
+            ),
+            for: .globalSearch
+        )
+        appDelegate.debugResetShortcutRoutingStateForTesting(clearFocusedWindowOverride: false)
+
+        let prefixEvent = try makeKeyEvent(
+            type: .keyDown,
+            key: "k",
+            modifiers: [.command, .option],
+            keyCode: 40,
+            windowNumber: harness.window.windowNumber
+        )
+        let suffixEvent = try makeKeyEvent(
+            type: .keyDown,
+            key: "n",
+            modifiers: [.control],
+            keyCode: 45,
+            windowNumber: harness.window.windowNumber
+        )
+
+        #expect(appDelegate.debugHandleCustomShortcut(event: prefixEvent))
+        #expect(!GlobalSearchCoordinator.shared.isPaletteVisible())
+        #expect(
+            appDelegate.debugHandleCustomShortcut(event: suffixEvent),
+            "Focused-input navigation must not steal the suffix of an already-active chord"
+        )
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+#else
+        Issue.record("Global Search shortcut-priority routing requires a DEBUG build")
+#endif
+    }
+
+    private func assertOmnibarOwnsGlobalSearchChordPrefix(
+        key: String,
+        keyCode: UInt16,
+        expectedDelta: Int
+    ) throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeOmnibarHarness(appDelegate: appDelegate)
+        defer {
+            GlobalSearchCoordinator.shared.dismissPalette()
+            appDelegate.debugResetShortcutRoutingStateForTesting()
+            closeWindow(harness.window, appDelegate: appDelegate)
+        }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: key,
+                command: false,
+                shift: false,
+                option: false,
+                control: true,
+                chordKey: "g",
+                chordCommand: true,
+                chordShift: false,
+                chordOption: false,
+                chordControl: false
+            ),
+            for: .globalSearch
+        )
+        appDelegate.debugResetShortcutRoutingStateForTesting(clearFocusedWindowOverride: false)
+
+        var observedDeltas: [Int] = []
+        let token = NotificationCenter.default.addObserver(
+            forName: .browserMoveOmnibarSelection,
+            object: nil,
+            queue: nil
+        ) { notification in
+            guard notification.object as? UUID == harness.panel.id,
+                  let delta = notification.userInfo?["delta"] as? Int else {
+                return
+            }
+            observedDeltas.append(delta)
+        }
+        defer { NotificationCenter.default.removeObserver(token) }
+
+        let prefixEvent = try makeKeyEvent(
+            type: .keyDown,
+            key: key,
+            modifiers: [.control],
+            keyCode: keyCode,
+            windowNumber: harness.window.windowNumber
+        )
+        let keyUpEvent = try makeKeyEvent(
+            type: .keyUp,
+            key: key,
+            modifiers: [.control],
+            keyCode: keyCode,
+            windowNumber: harness.window.windowNumber
+        )
+        let suffixEvent = try makeKeyEvent(
+            type: .keyDown,
+            key: "g",
+            modifiers: [.command],
+            keyCode: 5,
+            windowNumber: harness.window.windowNumber
+        )
+
+        #expect(appDelegate.debugHandleCustomShortcut(event: prefixEvent))
+        #expect(
+            observedDeltas == [expectedDelta],
+            "Ctrl-\(key.uppercased()) must navigate the focused omnibar instead of arming Global Search"
+        )
+        _ = appDelegate.debugHandleShortcutMonitorEvent(event: keyUpEvent)
+        _ = appDelegate.debugHandleCustomShortcut(event: suffixEvent)
+        #expect(
+            !GlobalSearchCoordinator.shared.isPaletteVisible(),
+            "An omnibar-owned prefix must not leave a Global Search chord armed"
+        )
+#else
+        Issue.record("Global Search shortcut-priority routing requires a DEBUG build")
+#endif
+    }
+
+    private func makeOmnibarHarness(
+        appDelegate: AppDelegate
+    ) throws -> (window: NSWindow, panel: BrowserPanel, field: OmnibarNativeTextField) {
+        let windowId = appDelegate.createMainWindow()
+        guard let window = findWindow(withId: windowId),
+              let manager = appDelegate.tabManagerFor(windowId: windowId),
+              let workspace = manager.selectedWorkspace,
+              let browserPanelId = manager.openBrowser(
+                  inWorkspace: workspace.id,
+                  url: URL(string: "about:blank"),
+                  preferSplitRight: true
+              ),
+              let panel = manager.selectedWorkspace?.browserPanel(for: browserPanelId)
+                  ?? workspace.browserPanel(for: browserPanelId) else {
+            if let window = findWindow(withId: windowId) {
+                closeWindow(window, appDelegate: appDelegate)
+            }
+            throw TestHarnessError.browserHarnessUnavailable
+        }
+
+        let field = OmnibarNativeTextField(frame: NSRect(x: 8, y: 8, width: 240, height: 24))
+        field.identifier = browserOmnibarTextFieldIdentifier
+        field.panelId = panel.id
+        field.stringValue = "example"
+        window.contentView?.addSubview(field)
+        BrowserOmnibarNativeFieldRegistry.shared.register(field, panelId: panel.id)
+
+        workspace.focusPanel(panel.id)
+        window.makeKeyAndOrderFront(nil)
+        window.displayIfNeeded()
+        guard window.makeFirstResponder(field) else {
+            BrowserOmnibarNativeFieldRegistry.shared.unregister(field, panelId: panel.id)
+            field.removeFromSuperview()
+            closeWindow(window, appDelegate: appDelegate)
+            throw TestHarnessError.omnibarFocusUnavailable
+        }
+        NotificationCenter.default.post(name: .browserDidFocusAddressBar, object: panel.id)
+        return (window, panel, field)
+    }
+
+    private func makeKeyEvent(
+        type: NSEvent.EventType,
+        key: String,
+        modifiers: NSEvent.ModifierFlags,
+        keyCode: UInt16,
+        windowNumber: Int
+    ) throws -> NSEvent {
+        guard let event = NSEvent.keyEvent(
+            with: type,
+            location: .zero,
+            modifierFlags: modifiers,
+            timestamp: ProcessInfo.processInfo.systemUptime,
+            windowNumber: windowNumber,
+            context: nil,
+            characters: key,
+            charactersIgnoringModifiers: key,
+            isARepeat: false,
+            keyCode: keyCode
+        ) else {
+            throw TestHarnessError.eventUnavailable
+        }
+        return event
+    }
+
+    private func findWindow(withId windowId: UUID) -> NSWindow? {
+        let identifier = "cmux.main.\(windowId.uuidString)"
+        return NSApp.windows.first(where: { $0.identifier?.rawValue == identifier })
+    }
+
+    private func closeWindow(_ window: NSWindow, appDelegate: AppDelegate) {
+#if DEBUG
+        let originalConfirmationHandler = appDelegate.debugCloseMainWindowConfirmationHandler
+        appDelegate.debugCloseMainWindowConfirmationHandler = { _ in true }
+        defer { appDelegate.debugCloseMainWindowConfirmationHandler = originalConfirmationHandler }
+#endif
+        if let panelId = (window.firstResponder as? OmnibarNativeTextField)?.panelId {
+            BrowserOmnibarNativeFieldRegistry.shared.unregister(
+                window.firstResponder as? OmnibarNativeTextField,
+                panelId: panelId
+            )
+        }
+        window.contentView?.subviews
+            .compactMap { $0 as? OmnibarNativeTextField }
+            .forEach { field in
+                if let panelId = field.panelId {
+                    BrowserOmnibarNativeFieldRegistry.shared.unregister(field, panelId: panelId)
+                }
+                field.removeFromSuperview()
+            }
+        window.animationBehavior = .none
+        window.orderOut(nil)
+        window.close()
+        RunLoop.main.run(until: Date.now.addingTimeInterval(0.05))
+    }
+
+    private enum TestHarnessError: Error {
+        case browserHarnessUnavailable
+        case omnibarFocusUnavailable
+        case eventUnavailable
+    }
+}

From d5d981603457bcb90769d0f94a88f46a97596645 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 15:03:39 -0700
Subject: [PATCH 044/124] test: fix global search priority harness

---
 cmuxTests/GlobalSearchShortcutPriorityTests.swift | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/cmuxTests/GlobalSearchShortcutPriorityTests.swift b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
index 13c78ab0cc41..929c77118f4c 100644
--- a/cmuxTests/GlobalSearchShortcutPriorityTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
@@ -184,13 +184,14 @@ final class GlobalSearchShortcutPriorityTests {
         )
         appDelegate.debugResetShortcutRoutingStateForTesting(clearFocusedWindowOverride: false)
 
+        let panelId = harness.panel.id
         var observedDeltas: [Int] = []
         let token = NotificationCenter.default.addObserver(
             forName: .browserMoveOmnibarSelection,
             object: nil,
             queue: nil
         ) { notification in
-            guard notification.object as? UUID == harness.panel.id,
+            guard notification.object as? UUID == panelId,
                   let delta = notification.userInfo?["delta"] as? Int else {
                 return
             }
@@ -311,12 +312,6 @@ final class GlobalSearchShortcutPriorityTests {
         appDelegate.debugCloseMainWindowConfirmationHandler = { _ in true }
         defer { appDelegate.debugCloseMainWindowConfirmationHandler = originalConfirmationHandler }
 #endif
-        if let panelId = (window.firstResponder as? OmnibarNativeTextField)?.panelId {
-            BrowserOmnibarNativeFieldRegistry.shared.unregister(
-                window.firstResponder as? OmnibarNativeTextField,
-                panelId: panelId
-            )
-        }
         window.contentView?.subviews
             .compactMap { $0 as? OmnibarNativeTextField }
             .forEach { field in

From b8ac163a646106bba5f98d99c04b64eb30f49e8c Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 15:21:15 -0700
Subject: [PATCH 045/124] fix: respect focused shortcut owners for global
 search

---
 Sources/AppDelegate.swift | 54 ++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index dd13329a7c70..2c72c70ee174 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13279,34 +13279,19 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         let globalSearchAction = KeyboardShortcutSettings.Action.globalSearch
         let globalSearchShortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
         let matchesGlobalSearchShortcut = matchCachedGlobalSearchShortcut(event: event)
-        let matchesGlobalSearchChordPrefix =
-            activeConfiguredShortcutChordPrefixForCurrentEvent == nil
-            && globalSearchShortcut.hasChord
-            && matchShortcutStroke(event: event, stroke: globalSearchShortcut.firstStroke)
-            && shortcutWhenClauseAllows(action: globalSearchAction, event: event)
-        if matchesGlobalSearchShortcut || matchesGlobalSearchChordPrefix {
-            // An active chord owns its second stroke. Otherwise, defer matching
-            // input to the shared terminal/browser ownership gates below.
-            let yieldsToFocusedInput =
-                activeConfiguredShortcutChordPrefixForCurrentEvent == nil
-                && (
-                    isControlD
-                    || (
-                        shouldRouteBrowserDocumentEditingCommandEquivalentThroughWebContentFirst(event)
-                        && shortcutEventFirstResponderOwnsBrowserWebView(event)
-                    )
-                )
-            if !yieldsToFocusedInput {
-                if matchesGlobalSearchShortcut {
-                    toggleGlobalSearchPalette()
-                    return true
-                }
-                pendingConfiguredShortcutChord = PendingConfiguredShortcutChord(
-                    firstStroke: globalSearchShortcut.firstStroke,
-                    windowNumber: configuredShortcutChordWindowNumber(for: event)
-                )
-                return true
-            }
+        if matchesGlobalSearchShortcut,
+           activeConfiguredShortcutChordPrefixForCurrentEvent != nil || commandPaletteEffectiveInTargetWindow {
+            // Once armed, the chord owns its suffix. The command palette is the
+            // only unarmed early route because it swallows unmatched input below.
+            toggleGlobalSearchPalette()
+            return true
+        }
+        if commandPaletteEffectiveInTargetWindow,
+           activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
+           globalSearchShortcut.hasChord,
+           shortcutWhenClauseAllows(action: globalSearchAction, event: event),
+           armConfiguredShortcutChordIfNeeded(event: event, actions: [], shortcuts: [globalSearchShortcut]) {
+            return true
         }
 
         if shouldConsumeShortcutWhileCommandPaletteVisible(
@@ -13447,7 +13432,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
                 // one does not swallow its first stroke elsewhere (issue #5189).
                 KeyboardShortcutSettings.effectiveWhenClause(for: action).evaluate(shortcutContext)
             }
-            if armConfiguredShortcutChordIfNeeded(event: event, actions: availableChordActions) {
+            let globalSearchChordShortcuts =
+                globalSearchShortcut.hasChord
+                && KeyboardShortcutSettings.effectiveWhenClause(for: globalSearchAction)
+                    .evaluate(shortcutContext)
+                ? [globalSearchShortcut]
+                : []
+            if armConfiguredShortcutChordIfNeeded(event: event, actions: availableChordActions, shortcuts: globalSearchChordShortcuts) {
                 return true
             }
         }
@@ -13488,6 +13479,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             return false
         }
 
+        if matchCachedGlobalSearchShortcut(event: event) {
+            toggleGlobalSearchPalette()
+            return true
+        }
+
         if matchConfiguredShortcut(event: event, action: .commandPalette) {
             let targetWindow = commandPaletteTargetWindow ?? event.window ?? shortcutRoutingActiveWindow
             requestCommandPaletteCommands(preferredWindow: targetWindow, source: "shortcut.commandPalette")

From 6535c54529501cc60390ce69439daf3b496ae314 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 15:41:39 -0700
Subject: [PATCH 046/124] test: harden global search shortcut fixtures

---
 cmuxTests/GlobalSearchInputOwnershipTests.swift | 16 +++++++++++++++-
 .../GlobalSearchForegroundScopeUITests.swift    | 17 ++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/cmuxTests/GlobalSearchInputOwnershipTests.swift b/cmuxTests/GlobalSearchInputOwnershipTests.swift
index fa7d649d5ac3..cac4bafb28b8 100644
--- a/cmuxTests/GlobalSearchInputOwnershipTests.swift
+++ b/cmuxTests/GlobalSearchInputOwnershipTests.swift
@@ -167,13 +167,27 @@ final class GlobalSearchInputOwnershipTests {
         let appDelegate = try #require(AppDelegate.shared)
         let windowId = appDelegate.createMainWindow()
         let window = try #require(findWindow(withId: windowId))
+        let manager = try #require(appDelegate.tabManagerFor(windowId: windowId))
+        let terminalPanel = try #require(manager.selectedTerminalPanel)
+        let contentView = try #require(window.contentView)
         defer {
             GlobalSearchCoordinator.shared.dismissPalette()
             closeWindow(window, appDelegate: appDelegate)
         }
 
+        let hostedView = terminalPanel.hostedView
+        if hostedView.superview !== contentView {
+            hostedView.removeFromSuperview()
+            hostedView.frame = contentView.bounds
+            contentView.addSubview(hostedView)
+        }
+        hostedView.setVisibleInUI(true)
+        hostedView.setActive(true)
         window.makeKeyAndOrderFront(nil)
-        #expect(window.firstResponder.cmuxStrictOwningGhosttyView() != nil)
+        contentView.layoutSubtreeIfNeeded()
+        hostedView.layoutSubtreeIfNeeded()
+        #expect(window.makeFirstResponder(hostedView.surfaceView))
+        #expect(window.firstResponder === hostedView.surfaceView)
         KeyboardShortcutSettings.setShortcut(
             StoredShortcut(
                 key: "d",
diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
index 63fb671adecd..d8072b9839dc 100644
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
@@ -72,9 +72,20 @@ final class GlobalSearchForegroundScopeUITests: XCTestCase {
             waitForAppToRun(probe, timeout: 10.0),
             "Expected shortcut probe to launch. state=\(probe.state.rawValue)"
         )
-        if probe.state != .runningForeground {
-            probe.activate()
-        }
+        let runningProbe = try XCTUnwrap(shortcutProbeApplication)
+        XCTAssertTrue(
+            waitForPredicate(
+                NSPredicate(format: "isFinishedLaunching == true"),
+                object: runningProbe,
+                timeout: 10.0
+            ),
+            "Expected shortcut probe to finish launching"
+        )
+        NSApplication.shared.yieldActivation(to: runningProbe)
+        XCTAssertTrue(
+            runningProbe.activate(from: .current, options: [.activateAllWindows]),
+            "Expected macOS to accept the coordinated shortcut probe activation request"
+        )
         XCTAssertTrue(
             probe.wait(for: .runningForeground, timeout: 10.0),
             "Expected shortcut probe to be foreground. state=\(probe.state.rawValue)"

From 50d304333222b2fa9afb408331032e09a79d0b63 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 16:06:45 -0700
Subject: [PATCH 047/124] test: reject inert global search media bindings

---
 .../GlobalSearchShortcutSettingsTests.swift   | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/cmuxTests/GlobalSearchShortcutSettingsTests.swift b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
index 0e1502fec59f..6ced15f1bdbc 100644
--- a/cmuxTests/GlobalSearchShortcutSettingsTests.swift
+++ b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
@@ -188,6 +188,46 @@ final class GlobalSearchShortcutSettingsTests {
         )
     }
 
+    @Test func globalSearchRejectsSystemDefinedMediaKeyBindings() {
+        let singleStroke = StoredShortcut(
+            key: "media.playPause",
+            command: true,
+            shift: false,
+            option: false,
+            control: false
+        )
+        let mediaPrefix = StoredShortcut(
+            first: singleStroke.firstStroke,
+            second: ShortcutStroke(
+                key: "f",
+                command: true,
+                shift: false,
+                option: false,
+                control: false
+            )
+        )
+        let mediaSuffix = StoredShortcut(
+            first: ShortcutStroke(
+                key: "f",
+                command: true,
+                shift: false,
+                option: false,
+                control: false
+            ),
+            second: singleStroke.firstStroke
+        )
+
+        for shortcut in [singleStroke, mediaPrefix, mediaSuffix] {
+            #expect(
+                KeyboardShortcutSettings.Action.globalSearch.normalizedRecordedShortcutResult(shortcut) ==
+                    .rejected(.reservedBySystem)
+            )
+            #expect(
+                KeyboardShortcutSettings.Action.globalSearch.normalizedSettingsFileShortcut(shortcut) == nil
+            )
+        }
+    }
+
     @Test func settingsFileStoreParsesGlobalSearchShortcut() throws {
         let directoryURL = FileManager.default.temporaryDirectory
             .appendingPathComponent("cmux-global-search-settings-\(UUID().uuidString)", isDirectory: true)

From 05dcae6f94e51e50ddb63f868d5f6fc614fbef83 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 16:07:56 -0700
Subject: [PATCH 048/124] fix: reject unsupported global search media bindings

---
 Sources/KeyboardShortcutSettings.swift | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index 0746d57027cc..887f9269c4c5 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -707,7 +707,7 @@ enum KeyboardShortcutSettings {
 
             // Preserve invalid settings-file values for the show/hide hotkey so managed configuration
             // remains visible instead of silently falling back to defaults. Runtime registration still rejects unsupported Carbon hotkey shapes.
-            if usesNumberedDigitMatching {
+            if usesNumberedDigitMatching || self == .globalSearch {
                 return nil
             }
             return shortcut
@@ -725,6 +725,11 @@ enum KeyboardShortcutSettings {
                     for: self,
                     checkingConflicts: checkingSystemWideConflicts
                 )
+            case .globalSearch:
+                guard !Self.containsSystemDefinedMediaKey(shortcut) else {
+                    return .rejected(.reservedBySystem)
+                }
+                return .accepted(shortcut)
             case .selectSurfaceByNumber, .selectWorkspaceByNumber:
                 return resolvedNumberedDigitShortcut(shortcut)
             default:
@@ -732,6 +737,11 @@ enum KeyboardShortcutSettings {
             }
         }
 
+        private static func containsSystemDefinedMediaKey(_ shortcut: StoredShortcut) -> Bool {
+            shortcut.firstStroke.key.lowercased().hasPrefix("media.")
+                || shortcut.secondStroke?.key.lowercased().hasPrefix("media.") == true
+        }
+
         private func resolvedNumberedDigitShortcut(
             _ shortcut: StoredShortcut
         ) -> RecordedShortcutResolution {
@@ -932,6 +942,7 @@ enum KeyboardShortcutSettings {
         case .rejected:
             if action.usesNumberedDigitMatching ||
                 action == .showHideAllWindows ||
+                action == .globalSearch ||
                 !action.allowsChordShortcut {
                 return nil
             }

From c07f93cddf4b2754fa5cd09bdd39000e43f4c64c Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 16:22:20 -0700
Subject: [PATCH 049/124] fix: validate shortcuts before conflicts

---
 Sources/KeyboardShortcutSettings.swift | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index 887f9269c4c5..60f270699be4 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -678,14 +678,14 @@ enum KeyboardShortcutSettings {
                 return .rejected(.reservedBySystem)
             }
 
-            if let conflictingAction = KeyboardShortcutSettings.conflictingAction(
-                for: shortcut,
-                excluding: self
-            ) {
+            let resolved = resolvedRecordedShortcutIgnoringConflicts(shortcut)
+            guard case .accepted = resolved else { return resolved }
+
+            if let conflictingAction = KeyboardShortcutSettings.conflictingAction(for: shortcut, excluding: self) {
                 return .rejected(.conflictsWithAction(conflictingAction))
             }
 
-            return resolvedRecordedShortcutIgnoringConflicts(shortcut)
+            return resolved
         }
 
         func normalizedSettingsFileShortcut(_ shortcut: StoredShortcut) -> StoredShortcut? {

From bfa654c782c308874dd2a7a62926b84f84125bd0 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 16:48:46 -0700
Subject: [PATCH 050/124] test: expose shortcut probe status to UI automation

---
 cmuxUITestSupport/ShortcutProbe/main.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmuxUITestSupport/ShortcutProbe/main.swift b/cmuxUITestSupport/ShortcutProbe/main.swift
index 2bb9742ad099..8ed36a811e14 100644
--- a/cmuxUITestSupport/ShortcutProbe/main.swift
+++ b/cmuxUITestSupport/ShortcutProbe/main.swift
@@ -12,6 +12,7 @@ final class ShortcutProbeDelegate: NSObject, NSApplicationDelegate {
     func applicationDidFinishLaunching(_ notification: Notification) {
         let contentView = NSView(frame: window.contentLayoutRect)
         statusLabel.setAccessibilityIdentifier("ShortcutProbeStatus")
+        statusLabel.setAccessibilityLabel("Waiting for Cmd-Option-F")
         statusLabel.alignment = .center
         statusLabel.font = .systemFont(ofSize: 24, weight: .medium)
         statusLabel.frame = NSRect(x: 30, y: 80, width: 460, height: 40)

From 10f1510b0bd2edc6a311b61a9132b82f29333e61 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 17:00:35 -0700
Subject: [PATCH 051/124] test: remove unreliable inter-app UI harness

---
 Sources/Search/MenubarSearchPopover.swift     |   1 -
 cmux.xcodeproj/project.pbxproj                | 111 --------
 cmuxUITestSupport/ShortcutProbe/main.swift    |  57 ----
 .../GlobalSearchForegroundScopeUITests.swift  | 253 ------------------
 4 files changed, 422 deletions(-)
 delete mode 100644 cmuxUITestSupport/ShortcutProbe/main.swift
 delete mode 100644 cmuxUITests/GlobalSearchForegroundScopeUITests.swift

diff --git a/Sources/Search/MenubarSearchPopover.swift b/Sources/Search/MenubarSearchPopover.swift
index 93f63488830f..c7aed61ecbfb 100644
--- a/Sources/Search/MenubarSearchPopover.swift
+++ b/Sources/Search/MenubarSearchPopover.swift
@@ -84,7 +84,6 @@ private struct GlobalSearchPaletteView: View {
                 )
                 .textFieldStyle(.plain)
                 .cmuxFont(size: 18, weight: .regular)
-                .accessibilityIdentifier("GlobalSearchSearchField")
                 .focused($searchFieldFocused)
             }
             .padding(.horizontal, 18)
diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index 97fcd169c8cc..7d88c5f6f7f0 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -975,7 +975,6 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		FE001106 /* GitStatusProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE001006 /* GitStatusProvider.swift */; };
 		3865A0023865A0023865A002 /* GlobalSearchCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0023865B0023865B002 /* GlobalSearchCoordinator.swift */; };
 		3865A0073865A0073865A007 /* GlobalSearchDocuments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0073865B0073865B007 /* GlobalSearchDocuments.swift */; };
-		D8561001A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8561002A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift */; };
 		8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */; };
 		3865A0083865A0083865A008 /* GlobalSearchPanelCaptureManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */; };
 		8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */; };
@@ -1044,7 +1043,6 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		D1F0A00800000000000000C1 /* MacPairedMacBackupRecordWire.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1F0A00800000000000000C2 /* MacPairedMacBackupRecordWire.swift */; };
 		D1F0A00500000000000000E1 /* MacPresenceDecisionCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1F0A00500000000000000E2 /* MacPresenceDecisionCache.swift */; };
 		D1F0A00200000000000000B1 /* MacPresenceMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1F0A00200000000000000B2 /* MacPresenceMonitor.swift */; };
-		D8561A010000000000000001 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8561A020000000000000002 /* main.swift */; };
 		875900000000000000000009 /* MainThreadHangCaptureStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87590000000000000000000A /* MainThreadHangCaptureStore.swift */; };
 		87590000000000000000000B /* MainThreadHangSampleRunner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87590000000000000000000C /* MainThreadHangSampleRunner.swift */; };
 		875900000000000000000003 /* MainThreadHangWatchdog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 875900000000000000000004 /* MainThreadHangWatchdog.swift */; };
@@ -2273,13 +2271,6 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 			remoteGlobalIDString = D1320AA0D1320AA0D1320AA8;
 			remoteInfo = CmuxDockTilePlugin;
 		};
-		D8561A050000000000000005 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = A5001070 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D8561A070000000000000007;
-			remoteInfo = ShortcutProbe;
-		};
 		F1000008A1B2C3D4E5F60718 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = A5001070 /* Project object */;
@@ -3234,7 +3225,6 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		FE001006 /* GitStatusProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GitStatusProvider.swift; sourceTree = "<group>"; };
 		3865B0023865B0023865B002 /* GlobalSearchCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchCoordinator.swift; sourceTree = "<group>"; };
 		3865B0073865B0073865B007 /* GlobalSearchDocuments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchDocuments.swift; sourceTree = "<group>"; };
-		D8561002A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchForegroundScopeUITests.swift; sourceTree = "<group>"; };
 		8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchInputOwnershipTests.swift; sourceTree = "<group>"; };
 		3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchPanelCaptureManager.swift; sourceTree = "<group>"; };
 		8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutPriorityTests.swift; sourceTree = "<group>"; };
@@ -3300,7 +3290,6 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		D1F0A00800000000000000C2 /* MacPairedMacBackupRecordWire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MacPairedMacBackupRecordWire.swift; sourceTree = "<group>"; };
 		D1F0A00500000000000000E2 /* MacPresenceDecisionCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacPresenceDecisionCache.swift; sourceTree = "<group>"; };
 		D1F0A00200000000000000B2 /* MacPresenceMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacPresenceMonitor.swift; sourceTree = "<group>"; };
-		D8561A020000000000000002 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
 		87590000000000000000000A /* MainThreadHangCaptureStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainThreadHangCaptureStore.swift; sourceTree = "<group>"; };
 		87590000000000000000000C /* MainThreadHangSampleRunner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainThreadHangSampleRunner.swift; sourceTree = "<group>"; };
 		875900000000000000000004 /* MainThreadHangWatchdog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainThreadHangWatchdog.swift; sourceTree = "<group>"; };
@@ -3830,7 +3819,6 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		6042B0016042B0016042B001 /* ShortcutHintModifierPolicyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutHintModifierPolicyTests.swift; sourceTree = "<group>"; };
 		A080D1F6CCCBFBED8D95DD1D /* ShortcutHintPill.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutHintPill.swift; sourceTree = "<group>"; };
 		6042D0046042D0046042D004 /* ShortcutHintTitlebarPolicy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutHintTitlebarPolicy.swift; sourceTree = "<group>"; };
-		D8561A030000000000000003 /* ShortcutProbe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ShortcutProbe.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D35B00000000000000000010 /* ShortcutRecorderRejectedAttempt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutRecorderRejectedAttempt.swift; sourceTree = "<group>"; };
 		B42A82C6AA614E74873D9A5F /* ShortcutRoutingSupport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App/ShortcutRoutingSupport.swift; sourceTree = "<group>"; };
 		F6001001A1B2C3D4E5F60718 /* ShortcutUnbindingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutUnbindingTests.swift; sourceTree = "<group>"; };
@@ -4553,13 +4541,6 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D8561A060000000000000006 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		B900000CA1B2C3D4E5F60719 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -4669,7 +4650,6 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				E6FA9085A1B2C3D4E5F60718 /* WorkspaceDescriptionUITests.swift */,
 				D0E0F0B1A1B2C3D4E5F60718 /* BrowserPaneNavigationKeybindUITests.swift */,
 				D0E0F0B5A1B2C3D4E5F60718 /* FindSelectionShortcutUITests.swift */,
-				D8561002A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift */,
 				D0E0F0B3A1B2C3D4E5F60718 /* BrowserOmnibarSuggestionsUITests.swift */,
 				FB100001A1B2C3D4E5F60718 /* BrowserImportProfilesUITests.swift */,
 				7B5F1A2E9C0D4B6A8E217301 /* BrowserFixtureInteractionUITests.swift */,
@@ -4822,7 +4802,6 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				A5001016 /* GhosttyKit.xcframework */,
 				A5001017 /* ghostty.h */,
 				A5001018 /* cmux-Bridging-Header.h */,
-				D8561A040000000000000004 /* ShortcutProbe */,
 				3196C9C2D01F054C1D3385DD /* cmuxUITests */,
 				F1000003A1B2C3D4E5F60718 /* cmuxTests */,
 				A5001042 /* Products */,
@@ -6176,22 +6155,12 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				A5001000 /* cmux.app */,
 				B9000004A1B2C3D4E5F60719 /* cmux */,
 				D1320AA0D1320AA0D1320AA5 /* CmuxDockTilePlugin.plugin */,
-				D8561A030000000000000003 /* ShortcutProbe.app */,
 				7E7E6EF344A568AC7FEE3715 /* cmuxUITests.xctest */,
 				F1000002A1B2C3D4E5F60718 /* cmuxTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		D8561A040000000000000004 /* ShortcutProbe */ = {
-			isa = PBXGroup;
-			children = (
-				D8561A020000000000000002 /* main.swift */,
-			);
-			name = ShortcutProbe;
-			path = cmuxUITestSupport/ShortcutProbe;
-			sourceTree = "<group>";
-		};
 		B9000003A1B2C3D4E5F60719 /* CLI */ = {
 			isa = PBXGroup;
 			children = (
@@ -7004,30 +6973,12 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 			);
 			dependencies = (
 				32568B0DCFC8656BA952468E /* PBXTargetDependency */,
-				D8561A0A000000000000000A /* PBXTargetDependency */,
 			);
 			name = cmuxUITests;
 			productName = cmuxUITests;
 			productReference = 7E7E6EF344A568AC7FEE3715 /* cmuxUITests.xctest */;
 			productType = "com.apple.product-type.bundle.ui-testing";
 		};
-		D8561A070000000000000007 /* ShortcutProbe */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = D8561A0D000000000000000D /* Build configuration list for PBXNativeTarget "ShortcutProbe" */;
-			buildPhases = (
-				D8561A090000000000000009 /* Sources */,
-				D8561A060000000000000006 /* Frameworks */,
-				D8561A080000000000000008 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = ShortcutProbe;
-			productName = ShortcutProbe;
-			productReference = D8561A030000000000000003 /* ShortcutProbe.app */;
-			productType = "com.apple.product-type.application";
-		};
 		D1320AA0D1320AA0D1320AA8 /* CmuxDockTilePlugin */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = D1320AA0D1320AA0D1320AB4 /* Build configuration list for PBXNativeTarget "CmuxDockTilePlugin" */;
@@ -7177,7 +7128,6 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				A5001050 /* cmux */,
 				D1320AA0D1320AA0D1320AA8 /* CmuxDockTilePlugin */,
 				B9000005A1B2C3D4E5F60719 /* cmux-cli */,
-				D8561A070000000000000007 /* ShortcutProbe */,
 				CB450DF0F0B3839599082C4D /* cmuxUITests */,
 				F1000004A1B2C3D4E5F60718 /* cmuxTests */,
 			);
@@ -7211,13 +7161,6 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D8561A080000000000000008 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		EC1BC8BE24F703F6BBEAA1DE /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -8897,14 +8840,6 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D8561A090000000000000009 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D8561A010000000000000001 /* main.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		E436EF0BA8EC9E6721A42F79 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -8927,7 +8862,6 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				B8F266266A1A3D9A45BD840F /* DisplayResolutionRegressionUITests.swift in Sources */,
 				FEED0000000000000000F009 /* FeedSidebarUITests.swift in Sources */,
 				D0E0F0B4A1B2C3D4E5F60718 /* FindSelectionShortcutUITests.swift in Sources */,
-				D8561001A1B2C3D4E5F60718 /* GlobalSearchForegroundScopeUITests.swift in Sources */,
 				C0DE34020000000000000005 /* HelpMenuUITests.swift in Sources */,
 				B9000014A1B2C3D4E5F60719 /* JumpToUnreadUITests.swift in Sources */,
 				E1000000A1B2C3D4E5F60718 /* MenuKeyEquivalentRoutingUITests.swift in Sources */,
@@ -9582,11 +9516,6 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 			target = D1320AA0D1320AA0D1320AA8 /* CmuxDockTilePlugin */;
 			targetProxy = D1320AA0D1320AA0D1320AA3 /* PBXContainerItemProxy */;
 		};
-		D8561A0A000000000000000A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D8561A070000000000000007 /* ShortcutProbe */;
-			targetProxy = D8561A050000000000000005 /* PBXContainerItemProxy */;
-		};
 		F1000009A1B2C3D4E5F60718 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = A5001050 /* cmux */;
@@ -9595,37 +9524,6 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		D8561A0B000000000000000B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cmuxterm.tests.shortcut-probe;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
-				SWIFT_VERSION = 5.0;
-			};
-			name = Debug;
-		};
-		D8561A0C000000000000000C /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cmuxterm.tests.shortcut-probe;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-				SWIFT_VERSION = 5.0;
-			};
-			name = Release;
-		};
 		442A6A86CAC6E8AD27FDD8F2 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -9972,15 +9870,6 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		D8561A0D000000000000000D /* Build configuration list for PBXNativeTarget "ShortcutProbe" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D8561A0B000000000000000B /* Debug */,
-				D8561A0C000000000000000C /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		B9000007A1B2C3D4E5F60719 /* Build configuration list for PBXNativeTarget "cmux-cli" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/cmuxUITestSupport/ShortcutProbe/main.swift b/cmuxUITestSupport/ShortcutProbe/main.swift
deleted file mode 100644
index 8ed36a811e14..000000000000
--- a/cmuxUITestSupport/ShortcutProbe/main.swift
+++ /dev/null
@@ -1,57 +0,0 @@
-import AppKit
-
-final class ShortcutProbeDelegate: NSObject, NSApplicationDelegate {
-    private let statusLabel = NSTextField(labelWithString: "Waiting for Cmd-Option-F")
-    private let window = NSWindow(
-        contentRect: NSRect(x: 0, y: 0, width: 520, height: 220),
-        styleMask: [.titled, .closable],
-        backing: .buffered,
-        defer: false
-    )
-
-    func applicationDidFinishLaunching(_ notification: Notification) {
-        let contentView = NSView(frame: window.contentLayoutRect)
-        statusLabel.setAccessibilityIdentifier("ShortcutProbeStatus")
-        statusLabel.setAccessibilityLabel("Waiting for Cmd-Option-F")
-        statusLabel.alignment = .center
-        statusLabel.font = .systemFont(ofSize: 24, weight: .medium)
-        statusLabel.frame = NSRect(x: 30, y: 80, width: 460, height: 40)
-        contentView.addSubview(statusLabel)
-        window.contentView = contentView
-        window.title = "Foreground Shortcut Probe"
-
-        let mainMenu = NSMenu()
-        let applicationMenuItem = NSMenuItem()
-        let applicationMenu = NSMenu()
-        let shortcutItem = NSMenuItem(
-            title: "Receive Cmd-Option-F",
-            action: #selector(receiveShortcut),
-            keyEquivalent: "f"
-        )
-        shortcutItem.keyEquivalentModifierMask = [.command, .option]
-        shortcutItem.target = self
-        applicationMenu.addItem(shortcutItem)
-        applicationMenuItem.submenu = applicationMenu
-        mainMenu.addItem(applicationMenuItem)
-        NSApp.mainMenu = mainMenu
-
-        window.center()
-        window.makeKeyAndOrderFront(nil)
-        NSApp.activate(ignoringOtherApps: true)
-    }
-
-    @objc private func receiveShortcut() {
-        statusLabel.stringValue = "Received Cmd-Option-F"
-        statusLabel.setAccessibilityLabel("Received Cmd-Option-F")
-    }
-
-    func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
-        true
-    }
-}
-
-let application = NSApplication.shared
-let delegate = ShortcutProbeDelegate()
-application.delegate = delegate
-_ = application.setActivationPolicy(.regular)
-application.run()
diff --git a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift b/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
deleted file mode 100644
index d8072b9839dc..000000000000
--- a/cmuxUITests/GlobalSearchForegroundScopeUITests.swift
+++ /dev/null
@@ -1,253 +0,0 @@
-import AppKit
-import XCTest
-
-final class GlobalSearchForegroundScopeUITests: XCTestCase {
-    private static let shortcutProbeBundleIdentifier = "com.cmuxterm.tests.shortcut-probe"
-
-    private var app: XCUIApplication!
-    private var appProcess: Process?
-    private var isolatedHomeURL: URL?
-    private var shortcutProbeApplication: NSRunningApplication?
-
-    override func setUpWithError() throws {
-        continueAfterFailure = false
-        let isolatedHomeURL = FileManager.default.temporaryDirectory
-            .appendingPathComponent("cmux-global-search-ui-test-\(UUID().uuidString)", isDirectory: true)
-        try FileManager.default.createDirectory(
-            at: isolatedHomeURL,
-            withIntermediateDirectories: true
-        )
-        self.isolatedHomeURL = isolatedHomeURL
-
-        let process = Process()
-        process.executableURL = URL(fileURLWithPath: try builtCmuxExecutablePath())
-        process.arguments = [
-            "-ApplePersistenceIgnoreState", "YES",
-            "-NSQuitAlwaysKeepsWindows", "NO",
-            "-menuBarOnly", "false",
-        ]
-        var environment = ProcessInfo.processInfo.environment
-        environment["CMUX_UI_TEST_MODE"] = "1"
-        environment["CFFIXED_USER_HOME"] = isolatedHomeURL.path
-        process.environment = environment
-
-        let logURL = FileManager.default.temporaryDirectory
-            .appendingPathComponent("cmux-global-search-background-\(UUID().uuidString).log")
-        FileManager.default.createFile(atPath: logURL.path, contents: nil)
-        let logHandle = try FileHandle(forWritingTo: logURL)
-        process.standardOutput = logHandle
-        process.standardError = logHandle
-        try process.run()
-        appProcess = process
-
-        app = XCUIApplication(bundleIdentifier: "com.cmuxterm.app.debug")
-        XCTAssertTrue(
-            app.wait(for: .runningBackground, timeout: 10.0),
-            "Expected cmux to launch in the background. state=\(app.state.rawValue)"
-        )
-    }
-
-    override func tearDownWithError() throws {
-        shortcutProbeApplication?.terminate()
-        shortcutProbeApplication = nil
-        app?.terminate()
-        terminateProcess(&appProcess)
-        app = nil
-        if let isolatedHomeURL {
-            try? FileManager.default.removeItem(at: isolatedHomeURL)
-            self.isolatedHomeURL = nil
-        }
-    }
-
-    func testBackgroundGlobalSearchShortcutIsDeliveredToForegroundApp() throws {
-        defer { attachScreenshot(named: "background-shortcut-delivered-to-foreground-app") }
-
-        let globalSearchField = app.textFields["GlobalSearchSearchField"].firstMatch
-        XCTAssertFalse(globalSearchField.exists, "Global Search should start closed")
-
-        try launchShortcutProbe()
-
-        let probe = XCUIApplication(bundleIdentifier: Self.shortcutProbeBundleIdentifier)
-        XCTAssertTrue(
-            waitForAppToRun(probe, timeout: 10.0),
-            "Expected shortcut probe to launch. state=\(probe.state.rawValue)"
-        )
-        let runningProbe = try XCTUnwrap(shortcutProbeApplication)
-        XCTAssertTrue(
-            waitForPredicate(
-                NSPredicate(format: "isFinishedLaunching == true"),
-                object: runningProbe,
-                timeout: 10.0
-            ),
-            "Expected shortcut probe to finish launching"
-        )
-        NSApplication.shared.yieldActivation(to: runningProbe)
-        XCTAssertTrue(
-            runningProbe.activate(from: .current, options: [.activateAllWindows]),
-            "Expected macOS to accept the coordinated shortcut probe activation request"
-        )
-        XCTAssertTrue(
-            probe.wait(for: .runningForeground, timeout: 10.0),
-            "Expected shortcut probe to be foreground. state=\(probe.state.rawValue)"
-        )
-        XCTAssertTrue(
-            probe.windows.firstMatch.waitForExistence(timeout: 8.0),
-            "Expected shortcut probe to open a keyboard target window"
-        )
-        XCTAssertTrue(
-            waitForAppToLeaveForeground(app, timeout: 8.0),
-            "Expected cmux to be backgrounded. state=\(app.state.rawValue)"
-        )
-
-        let probeStatus = probe.staticTexts["ShortcutProbeStatus"]
-        XCTAssertTrue(
-            probeStatus.waitForExistence(timeout: 8.0),
-            "Expected shortcut probe status label"
-        )
-        XCTAssertEqual(probeStatus.label, "Waiting for Cmd-Option-F")
-
-        probe.typeKey("f", modifierFlags: [.command, .option])
-
-        XCTAssertTrue(
-            waitForLabel(probeStatus, equalTo: "Received Cmd-Option-F", timeout: 8.0),
-            "Expected the foreground app to receive Cmd-Option-F"
-        )
-        XCTAssertEqual(probe.state, .runningForeground, "Shortcut probe should remain foreground")
-        XCTAssertNotEqual(
-            app.state,
-            .runningForeground,
-            "cmux must remain backgrounded after the foreground app receives Cmd-Option-F"
-        )
-        XCTAssertFalse(globalSearchField.exists, "Background Cmd-Option-F must not open cmux Global Search")
-
-        app.activate()
-        XCTAssertTrue(
-            app.wait(for: .runningForeground, timeout: 10.0),
-            "Expected cmux to become foreground. state=\(app.state.rawValue)"
-        )
-
-        app.typeKey("f", modifierFlags: [.command, .option])
-        XCTAssertTrue(
-            globalSearchField.waitForExistence(timeout: 8.0),
-            "Foreground Cmd-Option-F must open cmux Global Search"
-        )
-
-        app.typeKey("f", modifierFlags: [.command, .option])
-        XCTAssertTrue(
-            waitForPredicate(
-                NSPredicate(format: "exists == false"),
-                object: globalSearchField,
-                timeout: 8.0
-            ),
-            "A second foreground Cmd-Option-F must close cmux Global Search"
-        )
-    }
-
-    private func waitForAppToRun(_ application: XCUIApplication, timeout: TimeInterval) -> Bool {
-        waitForPredicate(
-            NSPredicate(
-                format: "state == %d OR state == %d",
-                XCUIApplication.State.runningBackground.rawValue,
-                XCUIApplication.State.runningForeground.rawValue
-            ),
-            object: application,
-            timeout: timeout
-        )
-    }
-
-    private func waitForAppToLeaveForeground(_ application: XCUIApplication, timeout: TimeInterval) -> Bool {
-        waitForPredicate(
-            NSPredicate(format: "state != %d", XCUIApplication.State.runningForeground.rawValue),
-            object: application,
-            timeout: timeout
-        )
-    }
-
-    private func waitForLabel(_ element: XCUIElement, equalTo label: String, timeout: TimeInterval) -> Bool {
-        waitForPredicate(
-            NSPredicate(format: "exists == true AND label == %@", label),
-            object: element,
-            timeout: timeout
-        )
-    }
-
-    private func waitForPredicate(_ predicate: NSPredicate, object: Any, timeout: TimeInterval) -> Bool {
-        let expectation = XCTNSPredicateExpectation(predicate: predicate, object: object)
-        return XCTWaiter.wait(for: [expectation], timeout: timeout) == .completed
-    }
-
-    private func builtCmuxExecutablePath() throws -> String {
-        let executablePath = builtProductsDirectory()
-            .appendingPathComponent("cmux DEV.app")
-            .appendingPathComponent("Contents/MacOS/cmux DEV")
-            .path
-        guard FileManager.default.fileExists(atPath: executablePath) else {
-            throw NSError(
-                domain: "GlobalSearchForegroundScopeUITests",
-                code: 1,
-                userInfo: [NSLocalizedDescriptionKey: "Could not locate the built cmux executable at \(executablePath)"]
-            )
-        }
-        return executablePath
-    }
-
-    private func launchShortcutProbe() throws {
-        let applicationURL = builtProductsDirectory()
-            .appendingPathComponent("ShortcutProbe.app")
-        guard FileManager.default.fileExists(atPath: applicationURL.path) else {
-            throw NSError(
-                domain: "GlobalSearchForegroundScopeUITests",
-                code: 2,
-                userInfo: [NSLocalizedDescriptionKey: "Could not locate shortcut probe at \(applicationURL.path)"]
-            )
-        }
-
-        let configuration = NSWorkspace.OpenConfiguration()
-        configuration.activates = true
-        configuration.createsNewApplicationInstance = true
-        configuration.allowsRunningApplicationSubstitution = false
-        let launchExpectation = expectation(description: "Launch shortcut probe application")
-        var launchError: Error?
-        NSWorkspace.shared.openApplication(at: applicationURL, configuration: configuration) {
-            [weak self] application, error in
-            self?.shortcutProbeApplication = application
-            launchError = error
-            launchExpectation.fulfill()
-        }
-        wait(for: [launchExpectation], timeout: 10.0)
-        if let launchError {
-            throw launchError
-        }
-        XCTAssertNotNil(shortcutProbeApplication, "Expected NSWorkspace to launch shortcut probe")
-    }
-
-    private func builtProductsDirectory() -> URL {
-        Bundle(for: Self.self).bundleURL
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-    }
-
-    private func terminateProcess(_ process: inout Process?) {
-        guard let runningProcess = process else { return }
-        defer { process = nil }
-        guard runningProcess.isRunning else { return }
-
-        runningProcess.terminate()
-        let deadline = Date.now.addingTimeInterval(5.0)
-        while runningProcess.isRunning, Date.now < deadline {
-            RunLoop.current.run(until: Date.now.addingTimeInterval(0.1))
-        }
-        if runningProcess.isRunning {
-            runningProcess.interrupt()
-        }
-    }
-
-    private func attachScreenshot(named name: String) {
-        let attachment = XCTAttachment(screenshot: XCUIScreen.main.screenshot())
-        attachment.name = name
-        attachment.lifetime = .keepAlways
-        add(attachment)
-    }
-}

From 044d41dae5c2b60b99534e5d3b76073a3596f3b9 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 17:29:39 -0700
Subject: [PATCH 052/124] test: preserve browser editing before search chords

---
 .../GlobalSearchShortcutPriorityTests.swift   | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/cmuxTests/GlobalSearchShortcutPriorityTests.swift b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
index 929c77118f4c..53d6fbd1c103 100644
--- a/cmuxTests/GlobalSearchShortcutPriorityTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
@@ -153,6 +153,69 @@ final class GlobalSearchShortcutPriorityTests {
 #endif
     }
 
+    @Test func browserEditingOwnsUnarmedGlobalSearchChordPrefix() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeOmnibarHarness(appDelegate: appDelegate)
+        let webView = try #require(harness.panel.webView as? CmuxWebView)
+        defer {
+            GlobalSearchCoordinator.shared.dismissPalette()
+            appDelegate.debugResetShortcutRoutingStateForTesting()
+            closeWindow(harness.window, appDelegate: appDelegate)
+        }
+
+        if webView.cmuxBrowserViewportAttachmentSuperview == nil,
+           let contentView = harness.window.contentView {
+            let presentationView = webView.cmuxBrowserViewportPresentationView
+            contentView.addSubview(presentationView)
+            webView.cmuxApplyBrowserViewportLayout(in: contentView.bounds)
+        }
+        #expect(harness.window.makeFirstResponder(webView))
+        #expect(harness.window.firstResponder === webView)
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "c",
+                command: true,
+                shift: false,
+                option: false,
+                control: false,
+                chordKey: "g",
+                chordCommand: true
+            ),
+            for: .globalSearch
+        )
+        appDelegate.debugResetShortcutRoutingStateForTesting(clearFocusedWindowOverride: false)
+
+        let prefixEvent = try makeKeyEvent(
+            type: .keyDown,
+            key: "c",
+            modifiers: [.command],
+            keyCode: 8,
+            windowNumber: harness.window.windowNumber
+        )
+        let suffixEvent = try makeKeyEvent(
+            type: .keyDown,
+            key: "g",
+            modifiers: [.command],
+            keyCode: 5,
+            windowNumber: harness.window.windowNumber
+        )
+
+        #expect(
+            !appDelegate.debugHandleCustomShortcut(event: prefixEvent),
+            "Focused browser editing must own Cmd-C before an unarmed Global Search chord"
+        )
+        _ = appDelegate.debugHandleCustomShortcut(event: suffixEvent)
+        #expect(
+            !GlobalSearchCoordinator.shared.isPaletteVisible(),
+            "A browser-owned editing command must not leave a Global Search chord armed"
+        )
+#else
+        Issue.record("Global Search shortcut-priority routing requires a DEBUG build")
+#endif
+    }
+
     private func assertOmnibarOwnsGlobalSearchChordPrefix(
         key: String,
         keyCode: UInt16,

From 0332842a9f21ccc84c2291c1009e727a7424bdbf Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 17:38:36 -0700
Subject: [PATCH 053/124] test: verify opt-in Carbon hotkey registration

---
 .../SystemWideHotkeyShortcutPolicyTests.swift | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
index ae807f4c3a1a..a1184f4b649c 100644
--- a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
+++ b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
@@ -27,6 +27,7 @@ final class SystemWideHotkeyShortcutPolicyTests {
         Self.clearShortcutDefaults()
         KeyboardShortcutSettings.settingsFileStore = originalSettingsFileStore
         Self.restoreDefaults(savedDefaults)
+        notifyHotkeyControllerOfDefaultsChange()
     }
 
     @Test func showHideAllWindowsAcceptsCommandGravePhysicalHotkeys() {
@@ -57,11 +58,40 @@ final class SystemWideHotkeyShortcutPolicyTests {
         #expect(SystemWideHotkeySettings.action == .showHideAllWindows)
         #expect(KeyboardShortcutSettings.Action.allCases.filter(\.isSystemWideHotkey) == [.showHideAllWindows])
     }
+
     @Test func foregroundGlobalSearchDoesNotUseSystemWideReservationPolicy() {
         let shortcut = commandGraveShortcut()
         #expect(KeyboardShortcutSettings.Action.globalSearch.normalizedRecordedShortcutResult(shortcut) == .accepted(shortcut))
     }
 
+    @Test func controllerRegistersOnlyOptInShowHideShortcut() throws {
+        let showHideRegistration = try #require(
+            SystemWideHotkeySettings.defaultShortcut.carbonHotKeyRegistration
+        )
+        let globalSearchRegistration = try #require(
+            KeyboardShortcutSettings.Action.globalSearch.defaultShortcut.carbonHotKeyRegistration
+        )
+        SystemWideHotkeyController.shared.start()
+        defer {
+            SystemWideHotkeySettings.setEnabled(false)
+            notifyHotkeyControllerOfDefaultsChange()
+        }
+
+        SystemWideHotkeySettings.setEnabled(false)
+        notifyHotkeyControllerOfDefaultsChange()
+        #expect(probeRegistrationStatus(showHideRegistration) == noErr)
+        #expect(probeRegistrationStatus(globalSearchRegistration) == noErr)
+
+        SystemWideHotkeySettings.setEnabled(true)
+        notifyHotkeyControllerOfDefaultsChange()
+        #expect(probeRegistrationStatus(showHideRegistration) == eventHotKeyExistsErr)
+        #expect(probeRegistrationStatus(globalSearchRegistration) == noErr)
+
+        SystemWideHotkeySettings.setEnabled(false)
+        notifyHotkeyControllerOfDefaultsChange()
+        #expect(probeRegistrationStatus(showHideRegistration) == noErr)
+    }
+
     private func commandGraveShortcut(shift: Bool = false) -> StoredShortcut {
         StoredShortcut(
             key: "`",
@@ -75,10 +105,36 @@ final class SystemWideHotkeyShortcutPolicyTests {
 
     private nonisolated static var shortcutDefaultsKeys: [String] {
         KeyboardShortcutSettings.Action.allCases.map(\.defaultsKey) + [
+            SystemWideHotkeySettings.enabledKey,
             SystemWideHotkeySettings.legacyShortcutKey,
         ]
     }
 
+    private func notifyHotkeyControllerOfDefaultsChange() {
+        NotificationCenter.default.post(
+            name: UserDefaults.didChangeNotification,
+            object: UserDefaults.standard
+        )
+    }
+
+    private func probeRegistrationStatus(
+        _ registration: CarbonHotKeyRegistration
+    ) -> OSStatus {
+        var hotKeyRef: EventHotKeyRef?
+        let status = RegisterEventHotKey(
+            registration.keyCode,
+            registration.modifiers,
+            EventHotKeyID(signature: 0x54455354, id: 8561),
+            GetApplicationEventTarget(),
+            0,
+            &hotKeyRef
+        )
+        if let hotKeyRef {
+            UnregisterEventHotKey(hotKeyRef)
+        }
+        return status
+    }
+
     private nonisolated static func defaultsSnapshot() -> [String: Any] {
         let defaults = UserDefaults.standard
         return shortcutDefaultsKeys.reduce(into: [:]) { snapshot, key in

From 9060ec48c229fecf3dea4e6ac91106abaa79a2c7 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 17:48:38 -0700
Subject: [PATCH 054/124] fix: preserve focused browser editing before search
 chords

---
 Sources/AppDelegate.swift | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index cdec8a8d417c..1e521d08a82b 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13440,13 +13440,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
                 // one does not swallow its first stroke elsewhere (issue #5189).
                 KeyboardShortcutSettings.effectiveWhenClause(for: action).evaluate(shortcutContext)
             }
-            let globalSearchChordShortcuts =
-                globalSearchShortcut.hasChord
-                && KeyboardShortcutSettings.effectiveWhenClause(for: globalSearchAction)
-                    .evaluate(shortcutContext)
-                ? [globalSearchShortcut]
-                : []
-            if armConfiguredShortcutChordIfNeeded(event: event, actions: availableChordActions, shortcuts: globalSearchChordShortcuts) {
+            if armConfiguredShortcutChordIfNeeded(event: event, actions: availableChordActions) {
                 return true
             }
         }
@@ -13487,6 +13481,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             return false
         }
 
+        if activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
+           globalSearchShortcut.hasChord,
+           shortcutWhenClauseAllows(action: globalSearchAction, event: event),
+           armConfiguredShortcutChordIfNeeded(event: event, actions: [], shortcuts: [globalSearchShortcut]) {
+            return true
+        }
+
         if matchCachedGlobalSearchShortcut(event: event) {
             toggleGlobalSearchPalette()
             return true

From 972beedf85afd37c56b57cf1f249c7b1c124c100 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 17:48:50 -0700
Subject: [PATCH 055/124] test: restore hotkey settings from teardown

---
 cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
index a1184f4b649c..5133ba8df4b0 100644
--- a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
+++ b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
@@ -110,7 +110,7 @@ final class SystemWideHotkeyShortcutPolicyTests {
         ]
     }
 
-    private func notifyHotkeyControllerOfDefaultsChange() {
+    private nonisolated func notifyHotkeyControllerOfDefaultsChange() {
         NotificationCenter.default.post(
             name: UserDefaults.didChangeNotification,
             object: UserDefaults.standard

From bf27d699f674881ff83c1908f132788e3e71e527 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 18:19:32 -0700
Subject: [PATCH 056/124] test: focus browser through product transition

---
 cmuxTests/GlobalSearchShortcutPriorityTests.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmuxTests/GlobalSearchShortcutPriorityTests.swift b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
index 53d6fbd1c103..25191ac0b5a1 100644
--- a/cmuxTests/GlobalSearchShortcutPriorityTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
@@ -170,7 +170,7 @@ final class GlobalSearchShortcutPriorityTests {
             contentView.addSubview(presentationView)
             webView.cmuxApplyBrowserViewportLayout(in: contentView.bounds)
         }
-        #expect(harness.window.makeFirstResponder(webView))
+        #expect(harness.panel.requestExplicitWebViewFocus())
         #expect(harness.window.firstResponder === webView)
 
         KeyboardShortcutSettings.setShortcut(

From 9d159c9d84d65828bbc8187a900c938d4997bbf6 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 20:25:36 -0700
Subject: [PATCH 057/124] test: cover visible global search shortcut routing

---
 cmux.xcodeproj/project.pbxproj                |   4 +
 ...balSearchVisiblePopoverShortcutTests.swift | 221 ++++++++++++++++++
 2 files changed, 225 insertions(+)
 create mode 100644 cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift

diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index ab8a455f1a6d..0d6545b4b73f 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -980,6 +980,7 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		3865A0083865A0083865A008 /* GlobalSearchPanelCaptureManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */; };
 		8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */; };
 		3865A0053865A0053865A005 /* GlobalSearchShortcutSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */; };
+		8561A0038561A0038561A003 /* GlobalSearchVisiblePopoverShortcutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0038561B0038561B003 /* GlobalSearchVisiblePopoverShortcutTests.swift */; };
 		5B11E5A100000000000000B1 /* GPUSpinner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B11E5A100000000000000B2 /* GPUSpinner.swift */; };
 		A6AC72010000000000000001 /* GPUSpinnerNSView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6AC72010000000000000002 /* GPUSpinnerNSView.swift */; };
 		A6AC72020000000000000001 /* GPUSpinnerStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6AC72020000000000000002 /* GPUSpinnerStyle.swift */; };
@@ -3231,6 +3232,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchPanelCaptureManager.swift; sourceTree = "<group>"; };
 		8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutPriorityTests.swift; sourceTree = "<group>"; };
 		3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutSettingsTests.swift; sourceTree = "<group>"; };
+		8561B0038561B0038561B003 /* GlobalSearchVisiblePopoverShortcutTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchVisiblePopoverShortcutTests.swift; sourceTree = "<group>"; };
 		5B11E5A100000000000000B2 /* GPUSpinner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sidebar/GPUSpinner.swift; sourceTree = "<group>"; };
 		A6AC72010000000000000002 /* GPUSpinnerNSView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sidebar/GPUSpinnerNSView.swift; sourceTree = "<group>"; };
 		A6AC72020000000000000002 /* GPUSpinnerStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sidebar/GPUSpinnerStyle.swift; sourceTree = "<group>"; };
@@ -6384,6 +6386,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */,
 				8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */,
 				8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */,
+				8561B0038561B0038561B003 /* GlobalSearchVisiblePopoverShortcutTests.swift */,
 				65154DD251384EE0A2C8923A /* SystemWideHotkeyShortcutPolicyTests.swift */,
 				E3309A0A /* AppDelegateEqualizeSplitsShortcutTests.swift */,
 				F6001001A1B2C3D4E5F60718 /* ShortcutUnbindingTests.swift */,
@@ -9166,6 +9169,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */,
 				8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */,
 				3865A0053865A0053865A005 /* GlobalSearchShortcutSettingsTests.swift in Sources */,
+				8561A0038561A0038561A003 /* GlobalSearchVisiblePopoverShortcutTests.swift in Sources */,
 				4931A11B0000000000000002 /* HiddenRightSidebarContentMountingTests.swift in Sources */,
 				B1F0C0040000000000000001 /* HostedInspectorDockControlScriptTests.swift in Sources */,
 				809100000000000000000001 /* HostSettingsShortcutNotificationTests.swift in Sources */,
diff --git a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
new file mode 100644
index 000000000000..75fc634b1790
--- /dev/null
+++ b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
@@ -0,0 +1,221 @@
+import AppKit
+import Foundation
+import Testing
+
+#if canImport(cmux_DEV)
+@testable import cmux_DEV
+#elseif canImport(cmux)
+@testable import cmux
+#endif
+
+@MainActor
+@Suite(.serialized)
+final class GlobalSearchVisiblePopoverShortcutTests {
+    private let originalSettingsFileStore: KeyboardShortcutSettingsFileStore
+
+    init() {
+        originalSettingsFileStore = KeyboardShortcutSettings.settingsFileStore
+        KeyboardShortcutSettings.settingsFileStore = KeyboardShortcutSettingsFileStore(
+            primaryPath: FileManager.default.temporaryDirectory
+                .appendingPathComponent("cmux-global-search-visible-popover-\(UUID().uuidString).json")
+                .path,
+            fallbackPath: nil,
+            additionalFallbackPaths: [],
+            startWatching: false
+        )
+        KeyboardShortcutSettings.resetAll()
+    }
+
+    deinit {
+        KeyboardShortcutSettings.settingsFileStore = originalSettingsFileStore
+        KeyboardShortcutSettings.resetAll()
+    }
+
+    @Test func visibleGlobalSearchClosesFromAuxiliaryWindowShortcut() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeHarness(appDelegate: appDelegate)
+        defer { closeHarness(harness, appDelegate: appDelegate) }
+
+        appDelegate.toggleGlobalSearchPalette()
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+
+        let event = try makeKeyDownEvent(
+            key: "f",
+            modifiers: [.command, .option],
+            keyCode: 3,
+            windowNumber: harness.auxiliaryWindow.windowNumber
+        )
+
+        #expect(
+            appDelegate.debugHandleCustomShortcut(event: event),
+            "The visible Search popover must own its configured toggle shortcut"
+        )
+        #expect(!GlobalSearchCoordinator.shared.isPaletteVisible())
+#else
+        Issue.record("Global Search visible-popover routing requires a DEBUG build")
+#endif
+    }
+
+    @Test func visibleGlobalSearchChordCompletesFromAuxiliaryWindow() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeHarness(appDelegate: appDelegate)
+        defer { closeHarness(harness, appDelegate: appDelegate) }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "k",
+                command: true,
+                shift: false,
+                option: true,
+                control: false,
+                chordKey: "f"
+            ),
+            for: .globalSearch
+        )
+        appDelegate.toggleGlobalSearchPalette()
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+
+        let prefixEvent = try makeKeyDownEvent(
+            key: "k",
+            modifiers: [.command, .option],
+            keyCode: 40,
+            windowNumber: harness.auxiliaryWindow.windowNumber
+        )
+        let suffixEvent = try makeKeyDownEvent(
+            key: "f",
+            modifiers: [],
+            keyCode: 3,
+            windowNumber: harness.auxiliaryWindow.windowNumber
+        )
+
+        #expect(
+            appDelegate.debugHandleCustomShortcut(event: prefixEvent),
+            "The visible Search popover must arm its configured chord before auxiliary-window rejection"
+        )
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+        #expect(appDelegate.debugHandleCustomShortcut(event: suffixEvent))
+        #expect(!GlobalSearchCoordinator.shared.isPaletteVisible())
+#else
+        Issue.record("Global Search visible-popover routing requires a DEBUG build")
+#endif
+    }
+
+    @Test func markedTextOwnsInputWhileGlobalSearchIsVisible() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeHarness(appDelegate: appDelegate)
+        defer { closeHarness(harness, appDelegate: appDelegate) }
+
+        let textView = NSTextView(frame: NSRect(x: 0, y: 0, width: 240, height: 24))
+        harness.auxiliaryWindow.contentView?.addSubview(textView)
+        #expect(harness.auxiliaryWindow.makeFirstResponder(textView))
+        textView.setMarkedText(
+            "かな",
+            selectedRange: NSRange(location: 2, length: 0),
+            replacementRange: NSRange(location: NSNotFound, length: 0)
+        )
+        #expect(textView.hasMarkedText())
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "q",
+                command: false,
+                shift: false,
+                option: true,
+                control: false
+            ),
+            for: .globalSearch
+        )
+        appDelegate.toggleGlobalSearchPalette()
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+
+        let event = try makeKeyDownEvent(
+            key: "q",
+            characters: "@",
+            modifiers: [.option],
+            keyCode: 12,
+            windowNumber: harness.auxiliaryWindow.windowNumber
+        )
+
+        #expect(
+            !appDelegate.debugHandleCustomShortcut(event: event),
+            "IME marked text must keep ownership before visible Search shortcut routing"
+        )
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+#else
+        Issue.record("Global Search visible-popover routing requires a DEBUG build")
+#endif
+    }
+
+    private func makeHarness(
+        appDelegate: AppDelegate
+    ) throws -> (mainWindow: NSWindow, auxiliaryWindow: NSPanel) {
+        let windowId = appDelegate.createMainWindow()
+        let mainWindow = try #require(findWindow(withId: windowId))
+        let auxiliaryWindow = NSPanel(
+            contentRect: NSRect(x: 0, y: 0, width: 320, height: 120),
+            styleMask: [.titled],
+            backing: .buffered,
+            defer: false
+        )
+        auxiliaryWindow.identifier = NSUserInterfaceItemIdentifier(
+            "cmux.test.globalSearchAuxiliaryWindow"
+        )
+        auxiliaryWindow.makeKeyAndOrderFront(nil)
+        return (mainWindow, auxiliaryWindow)
+    }
+
+    private func makeKeyDownEvent(
+        key: String,
+        characters: String? = nil,
+        modifiers: NSEvent.ModifierFlags,
+        keyCode: UInt16,
+        windowNumber: Int
+    ) throws -> NSEvent {
+        guard let event = NSEvent.keyEvent(
+            with: .keyDown,
+            location: .zero,
+            modifierFlags: modifiers,
+            timestamp: ProcessInfo.processInfo.systemUptime,
+            windowNumber: windowNumber,
+            context: nil,
+            characters: characters ?? key,
+            charactersIgnoringModifiers: key,
+            isARepeat: false,
+            keyCode: keyCode
+        ) else {
+            throw TestHarnessError.eventUnavailable
+        }
+        return event
+    }
+
+    private func findWindow(withId windowId: UUID) -> NSWindow? {
+        let identifier = "cmux.main.\(windowId.uuidString)"
+        return NSApp.windows.first(where: { $0.identifier?.rawValue == identifier })
+    }
+
+    private func closeHarness(
+        _ harness: (mainWindow: NSWindow, auxiliaryWindow: NSPanel),
+        appDelegate: AppDelegate
+    ) {
+        GlobalSearchCoordinator.shared.dismissPalette()
+        appDelegate.debugResetShortcutRoutingStateForTesting()
+        harness.auxiliaryWindow.orderOut(nil)
+        harness.auxiliaryWindow.close()
+#if DEBUG
+        let originalConfirmationHandler = appDelegate.debugCloseMainWindowConfirmationHandler
+        appDelegate.debugCloseMainWindowConfirmationHandler = { _ in true }
+        defer { appDelegate.debugCloseMainWindowConfirmationHandler = originalConfirmationHandler }
+#endif
+        harness.mainWindow.animationBehavior = .none
+        harness.mainWindow.orderOut(nil)
+        harness.mainWindow.close()
+        RunLoop.main.run(until: Date.now.addingTimeInterval(0.05))
+    }
+
+    private enum TestHarnessError: Error {
+        case eventUnavailable
+    }
+}

From d7aa02b14155762242d66d9855c1f394a10f97a6 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Fri, 24 Jul 2026 22:18:11 -0700
Subject: [PATCH 058/124] fix: route visible global search popover shortcuts

---
 Sources/AppDelegate.swift | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index 1e521d08a82b..00200d2bc915 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13288,13 +13288,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         let globalSearchShortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
         let matchesGlobalSearchShortcut = matchCachedGlobalSearchShortcut(event: event)
         if matchesGlobalSearchShortcut,
-           activeConfiguredShortcutChordPrefixForCurrentEvent != nil || commandPaletteEffectiveInTargetWindow {
-            // Once armed, the chord owns its suffix. The command palette is the
-            // only unarmed early route because it swallows unmatched input below.
+           activeConfiguredShortcutChordPrefixForCurrentEvent != nil || commandPaletteEffectiveInTargetWindow || GlobalSearchCoordinator.shared.isPaletteVisible() {
+            // An armed chord owns its suffix; the command palette routes before
+            // swallowing, and visible Search owns its auxiliary popover.
             toggleGlobalSearchPalette()
             return true
         }
-        if commandPaletteEffectiveInTargetWindow,
+        if commandPaletteEffectiveInTargetWindow || GlobalSearchCoordinator.shared.isPaletteVisible(),
            activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
            globalSearchShortcut.hasChord,
            shortcutWhenClauseAllows(action: globalSearchAction, event: event),

From f3468c6687bb675dfaf36c506dd65e8dce4de5af Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 00:31:30 -0700
Subject: [PATCH 059/124] test: wait for global search popover dismissal

---
 ...obalSearchVisiblePopoverShortcutTests.swift | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
index 75fc634b1790..c0ca7a55854b 100644
--- a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
+++ b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
@@ -51,7 +51,7 @@ final class GlobalSearchVisiblePopoverShortcutTests {
             appDelegate.debugHandleCustomShortcut(event: event),
             "The visible Search popover must own its configured toggle shortcut"
         )
-        #expect(!GlobalSearchCoordinator.shared.isPaletteVisible())
+        #expect(waitUntilGlobalSearchCloses())
 #else
         Issue.record("Global Search visible-popover routing requires a DEBUG build")
 #endif
@@ -96,7 +96,7 @@ final class GlobalSearchVisiblePopoverShortcutTests {
         )
         #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
         #expect(appDelegate.debugHandleCustomShortcut(event: suffixEvent))
-        #expect(!GlobalSearchCoordinator.shared.isPaletteVisible())
+        #expect(waitUntilGlobalSearchCloses())
 #else
         Issue.record("Global Search visible-popover routing requires a DEBUG build")
 #endif
@@ -196,6 +196,20 @@ final class GlobalSearchVisiblePopoverShortcutTests {
         return NSApp.windows.first(where: { $0.identifier?.rawValue == identifier })
     }
 
+    private func waitUntilGlobalSearchCloses(timeout: TimeInterval = 2) -> Bool {
+        let deadline = Date.now.addingTimeInterval(timeout)
+        repeat {
+            if !GlobalSearchCoordinator.shared.isPaletteVisible() {
+                return true
+            }
+            _ = RunLoop.main.run(
+                mode: .default,
+                before: min(deadline, Date.now.addingTimeInterval(0.01))
+            )
+        } while Date.now < deadline
+        return !GlobalSearchCoordinator.shared.isPaletteVisible()
+    }
+
     private func closeHarness(
         _ harness: (mainWindow: NSWindow, auxiliaryWindow: NSPanel),
         appDelegate: AppDelegate

From 9c6109644755c8fcbe3155b393ddda072b528fc5 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 00:34:07 -0700
Subject: [PATCH 060/124] perf: keep popover lookup off ordinary input

---
 Sources/AppDelegate.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index 00200d2bc915..01496ae8b60f 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13294,9 +13294,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             toggleGlobalSearchPalette()
             return true
         }
-        if commandPaletteEffectiveInTargetWindow || GlobalSearchCoordinator.shared.isPaletteVisible(),
+        if globalSearchShortcut.hasChord,
+           commandPaletteEffectiveInTargetWindow || GlobalSearchCoordinator.shared.isPaletteVisible(),
            activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
-           globalSearchShortcut.hasChord,
            shortcutWhenClauseAllows(action: globalSearchAction, event: event),
            armConfiguredShortcutChordIfNeeded(event: event, actions: [], shortcuts: [globalSearchShortcut]) {
             return true

From 3f27207ffe02edc7061e63712945549bf22ff97d Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 00:52:27 -0700
Subject: [PATCH 061/124] test: cover scoped visible global search toggles

---
 ...balSearchVisiblePopoverShortcutTests.swift | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
index c0ca7a55854b..825b0c81684f 100644
--- a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
+++ b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
@@ -31,12 +31,13 @@ final class GlobalSearchVisiblePopoverShortcutTests {
         KeyboardShortcutSettings.resetAll()
     }
 
-    @Test func visibleGlobalSearchClosesFromAuxiliaryWindowShortcut() throws {
+    @Test func scopedVisibleGlobalSearchClosesFromAuxiliaryWindowShortcut() throws {
 #if DEBUG
         let appDelegate = try #require(AppDelegate.shared)
         let harness = try makeHarness(appDelegate: appDelegate)
         defer { closeHarness(harness, appDelegate: appDelegate) }
 
+        try scopeGlobalSearchToBrowserFocus()
         appDelegate.toggleGlobalSearchPalette()
         #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
 
@@ -46,6 +47,7 @@ final class GlobalSearchVisiblePopoverShortcutTests {
             keyCode: 3,
             windowNumber: harness.auxiliaryWindow.windowNumber
         )
+        #expect(!appDelegate.shortcutWhenClauseAllows(action: .globalSearch, event: event))
 
         #expect(
             appDelegate.debugHandleCustomShortcut(event: event),
@@ -57,7 +59,7 @@ final class GlobalSearchVisiblePopoverShortcutTests {
 #endif
     }
 
-    @Test func visibleGlobalSearchChordCompletesFromAuxiliaryWindow() throws {
+    @Test func scopedVisibleGlobalSearchChordCompletesFromAuxiliaryWindow() throws {
 #if DEBUG
         let appDelegate = try #require(AppDelegate.shared)
         let harness = try makeHarness(appDelegate: appDelegate)
@@ -74,6 +76,7 @@ final class GlobalSearchVisiblePopoverShortcutTests {
             ),
             for: .globalSearch
         )
+        try scopeGlobalSearchToBrowserFocus()
         appDelegate.toggleGlobalSearchPalette()
         #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
 
@@ -89,6 +92,7 @@ final class GlobalSearchVisiblePopoverShortcutTests {
             keyCode: 3,
             windowNumber: harness.auxiliaryWindow.windowNumber
         )
+        #expect(!appDelegate.shortcutWhenClauseAllows(action: .globalSearch, event: prefixEvent))
 
         #expect(
             appDelegate.debugHandleCustomShortcut(event: prefixEvent),
@@ -149,6 +153,23 @@ final class GlobalSearchVisiblePopoverShortcutTests {
 #endif
     }
 
+    private func scopeGlobalSearchToBrowserFocus() throws {
+        try """
+        {
+          "shortcuts": {
+            "when": {
+              "globalSearch": "browserFocus"
+            }
+          }
+        }
+        """.write(
+            to: KeyboardShortcutSettings.settingsFileStore.settingsFileURLForEditing(),
+            atomically: true,
+            encoding: .utf8
+        )
+        KeyboardShortcutSettings.settingsFileStore.reload()
+    }
+
     private func makeHarness(
         appDelegate: AppDelegate
     ) throws -> (mainWindow: NSWindow, auxiliaryWindow: NSPanel) {

From d1521334b35787807eb437bc6c966d6f450eef03 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 01:04:04 -0700
Subject: [PATCH 062/124] fix: let visible search own its scoped toggle

---
 Sources/AppDelegate.swift | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index 01496ae8b60f..a92508e25551 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13284,7 +13284,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             }
         }
 
-        let globalSearchAction = KeyboardShortcutSettings.Action.globalSearch
         let globalSearchShortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
         let matchesGlobalSearchShortcut = matchCachedGlobalSearchShortcut(event: event)
         if matchesGlobalSearchShortcut,
@@ -13297,7 +13296,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         if globalSearchShortcut.hasChord,
            commandPaletteEffectiveInTargetWindow || GlobalSearchCoordinator.shared.isPaletteVisible(),
            activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
-           shortcutWhenClauseAllows(action: globalSearchAction, event: event),
+           globalSearchShortcutWhenClauseAllows(event: event),
            armConfiguredShortcutChordIfNeeded(event: event, actions: [], shortcuts: [globalSearchShortcut]) {
             return true
         }
@@ -13483,7 +13482,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
 
         if activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
            globalSearchShortcut.hasChord,
-           shortcutWhenClauseAllows(action: globalSearchAction, event: event),
+           globalSearchShortcutWhenClauseAllows(event: event),
            armConfiguredShortcutChordIfNeeded(event: event, actions: [], shortcuts: [globalSearchShortcut]) {
             return true
         }
@@ -15228,14 +15227,20 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
     }
 
     func matchCachedGlobalSearchShortcut(event: NSEvent) -> Bool {
-        let action = KeyboardShortcutSettings.Action.globalSearch
         guard matchConfiguredShortcut(
             event: event,
             shortcut: KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
         ) else {
             return false
         }
-        return shortcutWhenClauseAllows(action: action, event: event)
+        return globalSearchShortcutWhenClauseAllows(event: event)
+    }
+
+    /// `shortcuts.when` gates opening Search; visible Search owns its toggle so
+    /// the auxiliary popover's transient focus context cannot prevent dismissal.
+    private func globalSearchShortcutWhenClauseAllows(event: NSEvent) -> Bool {
+        GlobalSearchCoordinator.shared.isPaletteVisible()
+            || shortcutWhenClauseAllows(action: .globalSearch, event: event)
     }
 
     /// Whether `action`'s effective `when` clause (its `shortcuts.when` override,

From 4125458e203c3432101d53a17cd21e7624f1b679 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 01:29:58 -0700
Subject: [PATCH 063/124] test: preserve command palette editing ownership

---
 .../GlobalSearchShortcutPriorityTests.swift   | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/cmuxTests/GlobalSearchShortcutPriorityTests.swift b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
index 25191ac0b5a1..7a3436e280d5 100644
--- a/cmuxTests/GlobalSearchShortcutPriorityTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
@@ -216,6 +216,85 @@ final class GlobalSearchShortcutPriorityTests {
 #endif
     }
 
+    @Test func commandPaletteEditingOwnsOverlappingGlobalSearchShortcut() throws {
+        try assertCommandPaletteEditingOwnsUnarmedGlobalSearchBinding(
+            StoredShortcut(
+                key: "c",
+                command: true,
+                shift: false,
+                option: false,
+                control: false
+            )
+        )
+    }
+
+    @Test func commandPaletteEditingOwnsOverlappingGlobalSearchChordPrefix() throws {
+        try assertCommandPaletteEditingOwnsUnarmedGlobalSearchBinding(
+            StoredShortcut(
+                key: "c",
+                command: true,
+                shift: false,
+                option: false,
+                control: false,
+                chordKey: "g",
+                chordCommand: true
+            )
+        )
+    }
+
+    private func assertCommandPaletteEditingOwnsUnarmedGlobalSearchBinding(
+        _ shortcut: StoredShortcut
+    ) throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let windowId = appDelegate.createMainWindow()
+        let window = try #require(findWindow(withId: windowId))
+        defer {
+            GlobalSearchCoordinator.shared.dismissPalette()
+            appDelegate.setCommandPaletteVisible(false, for: window)
+            appDelegate.debugResetShortcutRoutingStateForTesting()
+            closeWindow(window, appDelegate: appDelegate)
+        }
+
+        window.makeKeyAndOrderFront(nil)
+        window.displayIfNeeded()
+        appDelegate.setCommandPaletteVisible(true, for: window)
+        #expect(appDelegate.isCommandPaletteEffectivelyVisible(for: window))
+
+        KeyboardShortcutSettings.setShortcut(shortcut, for: .globalSearch)
+        appDelegate.debugResetShortcutRoutingStateForTesting(clearFocusedWindowOverride: false)
+
+        let prefixEvent = try makeKeyEvent(
+            type: .keyDown,
+            key: "c",
+            modifiers: [.command],
+            keyCode: 8,
+            windowNumber: window.windowNumber
+        )
+        #expect(
+            !appDelegate.debugHandleCustomShortcut(event: prefixEvent),
+            "Command-palette editing must own Cmd-C before an unarmed Global Search binding"
+        )
+
+        if shortcut.hasChord {
+            let suffixEvent = try makeKeyEvent(
+                type: .keyDown,
+                key: "g",
+                modifiers: [.command],
+                keyCode: 5,
+                windowNumber: window.windowNumber
+            )
+            _ = appDelegate.debugHandleCustomShortcut(event: suffixEvent)
+        }
+        #expect(
+            !GlobalSearchCoordinator.shared.isPaletteVisible(),
+            "A command-palette editing command must not toggle or arm Global Search"
+        )
+#else
+        Issue.record("Global Search shortcut-priority routing requires a DEBUG build")
+#endif
+    }
+
     private func assertOmnibarOwnsGlobalSearchChordPrefix(
         key: String,
         keyCode: UInt16,

From 9f4a5a1a0e3108a8f03cb8fbb7ea274bce863d79 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 02:11:11 -0700
Subject: [PATCH 064/124] test: stabilize browser shortcut focus harness

---
 cmuxTests/GlobalSearchShortcutPriorityTests.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmuxTests/GlobalSearchShortcutPriorityTests.swift b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
index 7a3436e280d5..ffaf92a20162 100644
--- a/cmuxTests/GlobalSearchShortcutPriorityTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
@@ -170,7 +170,7 @@ final class GlobalSearchShortcutPriorityTests {
             contentView.addSubview(presentationView)
             webView.cmuxApplyBrowserViewportLayout(in: contentView.bounds)
         }
-        #expect(harness.panel.requestExplicitWebViewFocus())
+        #expect(harness.window.makeFirstResponder(webView))
         #expect(harness.window.firstResponder === webView)
 
         KeyboardShortcutSettings.setShortcut(

From cc7e7203ff32e86a4309f9078331066da06bb59a Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 02:11:39 -0700
Subject: [PATCH 065/124] fix: preserve command palette editing shortcuts

---
 Sources/AppDelegate.swift | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index a92508e25551..e292134f40fb 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13286,29 +13286,29 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
 
         let globalSearchShortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
         let matchesGlobalSearchShortcut = matchCachedGlobalSearchShortcut(event: event)
+        let commandPaletteConsumesShortcut = shouldConsumeShortcutWhileCommandPaletteVisible(
+            isCommandPaletteVisible: commandPaletteEffectiveInTargetWindow,
+            normalizedFlags: normalizedFlags, chars: chars, keyCode: event.keyCode
+        )
+        let commandPaletteCanRouteUnarmedGlobalSearch =
+            commandPaletteEffectiveInTargetWindow && commandPaletteConsumesShortcut
         if matchesGlobalSearchShortcut,
-           activeConfiguredShortcutChordPrefixForCurrentEvent != nil || commandPaletteEffectiveInTargetWindow || GlobalSearchCoordinator.shared.isPaletteVisible() {
-            // An armed chord owns its suffix; the command palette routes before
-            // swallowing, and visible Search owns its auxiliary popover.
+           activeConfiguredShortcutChordPrefixForCurrentEvent != nil || commandPaletteCanRouteUnarmedGlobalSearch
+            || GlobalSearchCoordinator.shared.isPaletteVisible() {
+            // Armed chords own their suffix, while visible Search owns its popover.
             toggleGlobalSearchPalette()
             return true
         }
         if globalSearchShortcut.hasChord,
-           commandPaletteEffectiveInTargetWindow || GlobalSearchCoordinator.shared.isPaletteVisible(),
+           commandPaletteCanRouteUnarmedGlobalSearch || GlobalSearchCoordinator.shared.isPaletteVisible(),
            activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
            globalSearchShortcutWhenClauseAllows(event: event),
            armConfiguredShortcutChordIfNeeded(event: event, actions: [], shortcuts: [globalSearchShortcut]) {
             return true
         }
-
-        if shouldConsumeShortcutWhileCommandPaletteVisible(
-            isCommandPaletteVisible: commandPaletteEffectiveInTargetWindow,
-            normalizedFlags: normalizedFlags,
-            chars: chars,
-            keyCode: event.keyCode
-        ) {
-            return true
-        }
+        if commandPaletteConsumesShortcut { return true }
+        if commandPaletteEffectiveInTargetWindow,
+           activeConfiguredShortcutChordPrefixForCurrentEvent == nil { return false }
 
         if isPlainEscape {
             let escapeWindow = resolvedShortcutEventWindow(event) ?? shortcutRoutingActiveWindow

From e917d43cf577e522a267c7075cdc35485582effa Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 02:21:06 -0700
Subject: [PATCH 066/124] test: isolate global hotkey registration probe

---
 .../SystemWideHotkeyShortcutPolicyTests.swift | 44 ++++++++++++++++---
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
index 5133ba8df4b0..72bf1fe05df5 100644
--- a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
+++ b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
@@ -65,20 +65,27 @@ final class SystemWideHotkeyShortcutPolicyTests {
     }
 
     @Test func controllerRegistersOnlyOptInShowHideShortcut() throws {
+        SystemWideHotkeyController.shared.start()
+        SystemWideHotkeySettings.setEnabled(false)
+        notifyHotkeyControllerOfDefaultsChange()
+
+        let syntheticShortcuts = availableSyntheticShortcuts()
+        let showHideShortcut = try #require(syntheticShortcuts.first)
+        let globalSearchShortcut = try #require(syntheticShortcuts.dropFirst().first)
+        SystemWideHotkeySettings.setShortcut(showHideShortcut)
+        KeyboardShortcutSettings.setShortcut(globalSearchShortcut, for: .globalSearch)
+
         let showHideRegistration = try #require(
-            SystemWideHotkeySettings.defaultShortcut.carbonHotKeyRegistration
+            showHideShortcut.carbonHotKeyRegistration
         )
         let globalSearchRegistration = try #require(
-            KeyboardShortcutSettings.Action.globalSearch.defaultShortcut.carbonHotKeyRegistration
+            globalSearchShortcut.carbonHotKeyRegistration
         )
-        SystemWideHotkeyController.shared.start()
         defer {
             SystemWideHotkeySettings.setEnabled(false)
             notifyHotkeyControllerOfDefaultsChange()
         }
 
-        SystemWideHotkeySettings.setEnabled(false)
-        notifyHotkeyControllerOfDefaultsChange()
         #expect(probeRegistrationStatus(showHideRegistration) == noErr)
         #expect(probeRegistrationStatus(globalSearchRegistration) == noErr)
 
@@ -92,6 +99,33 @@ final class SystemWideHotkeyShortcutPolicyTests {
         #expect(probeRegistrationStatus(showHideRegistration) == noErr)
     }
 
+    private func availableSyntheticShortcuts() -> [StoredShortcut] {
+        [
+            ("f13", 105),
+            ("f14", 107),
+            ("f15", 113),
+            ("f16", 106),
+            ("f17", 64),
+            ("f18", 79),
+            ("f19", 80),
+            ("f20", 90),
+        ].compactMap { key, keyCode in
+            let shortcut = StoredShortcut(
+                key: key,
+                command: true,
+                shift: true,
+                option: true,
+                control: true,
+                keyCode: UInt16(keyCode)
+            )
+            guard let registration = shortcut.carbonHotKeyRegistration,
+                  probeRegistrationStatus(registration) == noErr else {
+                return nil
+            }
+            return shortcut
+        }
+    }
+
     private func commandGraveShortcut(shift: Bool = false) -> StoredShortcut {
         StoredShortcut(
             key: "`",

From de93f04899dee78ab869dc6040af41fe0f93ab2c Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 02:23:43 -0700
Subject: [PATCH 067/124] test: release omnibar focus before browser shortcut
 check

---
 cmuxTests/GlobalSearchShortcutPriorityTests.swift | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmuxTests/GlobalSearchShortcutPriorityTests.swift b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
index ffaf92a20162..42607c8e37cb 100644
--- a/cmuxTests/GlobalSearchShortcutPriorityTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
@@ -170,6 +170,8 @@ final class GlobalSearchShortcutPriorityTests {
             contentView.addSubview(presentationView)
             webView.cmuxApplyBrowserViewportLayout(in: contentView.bounds)
         }
+        BrowserOmnibarNativeFieldRegistry.shared.unregister(harness.field, panelId: harness.panel.id)
+        harness.field.removeFromSuperview()
         #expect(harness.window.makeFirstResponder(webView))
         #expect(harness.window.firstResponder === webView)
 

From fa60bb04b08985912b903d49d74d6a6139fd9090 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 02:34:03 -0700
Subject: [PATCH 068/124] test: preserve visible search query editing ownership

---
 ...balSearchVisiblePopoverShortcutTests.swift | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
index 825b0c81684f..d59426af4b7a 100644
--- a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
+++ b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
@@ -106,6 +106,54 @@ final class GlobalSearchVisiblePopoverShortcutTests {
 #endif
     }
 
+    @Test func visibleGlobalSearchQueryOwnsOverlappingChordPrefix() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeHarness(appDelegate: appDelegate)
+        defer { closeHarness(harness, appDelegate: appDelegate) }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "c",
+                command: true,
+                shift: false,
+                option: false,
+                control: false,
+                chordKey: "g",
+                chordCommand: true
+            ),
+            for: .globalSearch
+        )
+        appDelegate.toggleGlobalSearchPalette()
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+
+        let prefixEvent = try makeKeyDownEvent(
+            key: "c",
+            modifiers: [.command],
+            keyCode: 8,
+            windowNumber: harness.auxiliaryWindow.windowNumber
+        )
+        #expect(
+            !appDelegate.debugHandleCustomShortcut(event: prefixEvent),
+            "The visible Search query must own Cmd-C before an unarmed Global Search chord"
+        )
+
+        let suffixEvent = try makeKeyDownEvent(
+            key: "g",
+            modifiers: [.command],
+            keyCode: 5,
+            windowNumber: harness.auxiliaryWindow.windowNumber
+        )
+        _ = appDelegate.debugHandleCustomShortcut(event: suffixEvent)
+        #expect(
+            GlobalSearchCoordinator.shared.isPaletteVisible(),
+            "A Search query editing command must not leave a Global Search chord armed"
+        )
+#else
+        Issue.record("Global Search visible-popover routing requires a DEBUG build")
+#endif
+    }
+
     @Test func markedTextOwnsInputWhileGlobalSearchIsVisible() throws {
 #if DEBUG
         let appDelegate = try #require(AppDelegate.shared)

From 35a417a0b021feed14eb600651c06fbdb9687380 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 02:48:03 -0700
Subject: [PATCH 069/124] fix: preserve visible search editing shortcuts

---
 Sources/AppDelegate.swift                 | 14 ++++----
 Sources/Search/MenubarSearchPopover.swift | 39 +++++++++++++----------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index e292134f40fb..486d3ca96b2b 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13290,21 +13290,21 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             isCommandPaletteVisible: commandPaletteEffectiveInTargetWindow,
             normalizedFlags: normalizedFlags, chars: chars, keyCode: event.keyCode
         )
-        let commandPaletteCanRouteUnarmedGlobalSearch =
-            commandPaletteEffectiveInTargetWindow && commandPaletteConsumesShortcut
+        let commandPaletteCanRouteUnarmedGlobalSearch = commandPaletteEffectiveInTargetWindow && commandPaletteConsumesShortcut
+        let globalSearchIsVisible = GlobalSearchCoordinator.shared.isPaletteVisible()
         if matchesGlobalSearchShortcut,
            activeConfiguredShortcutChordPrefixForCurrentEvent != nil || commandPaletteCanRouteUnarmedGlobalSearch
-            || GlobalSearchCoordinator.shared.isPaletteVisible() {
+            || globalSearchIsVisible {
             // Armed chords own their suffix, while visible Search owns its popover.
             toggleGlobalSearchPalette()
             return true
         }
         if globalSearchShortcut.hasChord,
-           commandPaletteCanRouteUnarmedGlobalSearch || GlobalSearchCoordinator.shared.isPaletteVisible(),
            activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
-           globalSearchShortcutWhenClauseAllows(event: event),
-           armConfiguredShortcutChordIfNeeded(event: event, actions: [], shortcuts: [globalSearchShortcut]) {
-            return true
+           commandPaletteCanRouteUnarmedGlobalSearch || globalSearchIsVisible {
+            if globalSearchIsVisible, GlobalSearchKeyEvent(event).queryOwnsEditingShortcut { return false }
+            if globalSearchShortcutWhenClauseAllows(event: event),
+               armConfiguredShortcutChordIfNeeded(event: event, actions: [], shortcuts: [globalSearchShortcut]) { return true }
         }
         if commandPaletteConsumesShortcut { return true }
         if commandPaletteEffectiveInTargetWindow,
diff --git a/Sources/Search/MenubarSearchPopover.swift b/Sources/Search/MenubarSearchPopover.swift
index c7aed61ecbfb..f1852a994fea 100644
--- a/Sources/Search/MenubarSearchPopover.swift
+++ b/Sources/Search/MenubarSearchPopover.swift
@@ -264,26 +264,12 @@ private struct GlobalSearchPaletteView: View {
             if flags.contains(.command),
                !flags.contains(.option),
                !flags.contains(.control) {
-                return !isTextEditingCommand(event) && !isSystemCommand(event)
+                return !event.queryOwnsEditingShortcut && !isSystemCommand(event)
             }
             return false
         }
     }
 
-    private func isTextEditingCommand(_ event: GlobalSearchKeyEvent) -> Bool {
-        if let characters = event.charactersIgnoringModifiers?.lowercased(),
-           ["a", "c", "v", "x", "z"].contains(characters) {
-            return true
-        }
-
-        switch event.keyCode {
-        case 51, 117, 123, 124:
-            return true
-        default:
-            return false
-        }
-    }
-
     private func isSystemCommand(_ event: GlobalSearchKeyEvent) -> Bool {
         guard let characters = event.charactersIgnoringModifiers?.lowercased() else { return false }
         return ["h", "m", "q", "w", ","].contains(characters)
@@ -300,7 +286,7 @@ private struct GlobalSearchPaletteView: View {
     }
 }
 
-private struct GlobalSearchKeyEvent: Sendable {
+struct GlobalSearchKeyEvent: Sendable {
     let keyCode: UInt16
     let charactersIgnoringModifiers: String?
     private let modifierFlagsRawValue: UInt
@@ -316,6 +302,27 @@ private struct GlobalSearchKeyEvent: Sendable {
     var modifierFlags: NSEvent.ModifierFlags {
         NSEvent.ModifierFlags(rawValue: modifierFlagsRawValue)
     }
+
+    var queryOwnsEditingShortcut: Bool {
+        let flags = modifierFlags
+        guard flags.contains(.command),
+              !flags.contains(.option),
+              !flags.contains(.control) else {
+            return false
+        }
+
+        if let characters = charactersIgnoringModifiers?.lowercased(),
+           ["a", "c", "v", "x", "z"].contains(characters) {
+            return true
+        }
+
+        switch keyCode {
+        case 51, 117, 123, 124:
+            return true
+        default:
+            return false
+        }
+    }
 }
 
 private struct GlobalSearchEmptyStateView: View {

From 925c401e38fc754dba403a1e8137156d69df917d Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 02:49:47 -0700
Subject: [PATCH 070/124] test: make browser shortcut focus deterministic

---
 cmuxTests/GlobalSearchShortcutPriorityTests.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmuxTests/GlobalSearchShortcutPriorityTests.swift b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
index 42607c8e37cb..768d6d7dfdac 100644
--- a/cmuxTests/GlobalSearchShortcutPriorityTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
@@ -172,6 +172,7 @@ final class GlobalSearchShortcutPriorityTests {
         }
         BrowserOmnibarNativeFieldRegistry.shared.unregister(harness.field, panelId: harness.panel.id)
         harness.field.removeFromSuperview()
+        webView.allowsFirstResponderAcquisition = true
         #expect(harness.window.makeFirstResponder(webView))
         #expect(harness.window.firstResponder === webView)
 

From 6d06843ff6c4415e20d48f35a510889887f1e843 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 03:15:11 -0700
Subject: [PATCH 071/124] fix: keep search visibility off typing fast path

---
 Sources/AppDelegate.swift | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index 486d3ca96b2b..a290e8107ac8 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13291,7 +13291,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             normalizedFlags: normalizedFlags, chars: chars, keyCode: event.keyCode
         )
         let commandPaletteCanRouteUnarmedGlobalSearch = commandPaletteEffectiveInTargetWindow && commandPaletteConsumesShortcut
-        let globalSearchIsVisible = GlobalSearchCoordinator.shared.isPaletteVisible()
+        let globalSearchUnarmedChordPrefixMatches = globalSearchShortcut.hasChord
+            && activeConfiguredShortcutChordPrefixForCurrentEvent == nil
+            && matchShortcutStroke(event: event, stroke: globalSearchShortcut.firstStroke)
+        let globalSearchIsVisible = (matchesGlobalSearchShortcut || globalSearchUnarmedChordPrefixMatches)
+            && GlobalSearchCoordinator.shared.isPaletteVisible()
         if matchesGlobalSearchShortcut,
            activeConfiguredShortcutChordPrefixForCurrentEvent != nil || commandPaletteCanRouteUnarmedGlobalSearch
             || globalSearchIsVisible {
@@ -13299,8 +13303,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             toggleGlobalSearchPalette()
             return true
         }
-        if globalSearchShortcut.hasChord,
-           activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
+        if globalSearchUnarmedChordPrefixMatches,
            commandPaletteCanRouteUnarmedGlobalSearch || globalSearchIsVisible {
             if globalSearchIsVisible, GlobalSearchKeyEvent(event).queryOwnsEditingShortcut { return false }
             if globalSearchShortcutWhenClauseAllows(event: event),
@@ -15205,10 +15208,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         return false
     }
 
-    private func matchConfiguredShortcut(
-        event: NSEvent,
-        shortcut: StoredShortcut
-    ) -> Bool {
+    private func matchConfiguredShortcut(event: NSEvent, shortcut: StoredShortcut) -> Bool {
         guard !shortcut.isUnbound else { return false }
         if let prefix = activeConfiguredShortcutChordPrefixForCurrentEvent {
             guard let secondStroke = shortcut.secondStroke,

From 3501f6c3fc4727357d04c94d6b19432cd3bdc293 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 03:24:43 -0700
Subject: [PATCH 072/124] test: preserve search editing and media key
 validation

---
 .../ShortcutListModelTests.swift              | 31 +++++++++++++++
 ...balSearchVisiblePopoverShortcutTests.swift | 38 +++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListModelTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListModelTests.swift
index 76de030dc97a..adb694e4de45 100644
--- a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListModelTests.swift
+++ b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListModelTests.swift
@@ -82,6 +82,37 @@ import CmuxSettings
         #expect(model.bareKeyRejections.contains(action.rawValue))
     }
 
+    @Test func globalSearchRejectsMediaKeyChordBeforePersistence() async throws {
+        // WHY: Global Search is routed through AppKit's foreground key handler,
+        // which cannot execute system-defined media-key strokes. Settings must
+        // reject the recording instead of displaying a binding runtime discards.
+        let (store, catalog, errorLog) = makeStore()
+        let action = ShortcutAction.globalSearch
+        let chord = StoredShortcut(
+            first: ShortcutStroke(
+                key: "j",
+                command: true,
+                shift: true,
+                option: true,
+                control: true
+            ),
+            second: ShortcutStroke(key: "media.playPause")
+        )
+        let model = ShortcutListModel(jsonStore: store, catalog: catalog, errorLog: errorLog)
+
+        await model.assignChord(chord, to: action)
+
+        let storeBindings = await store.value(for: catalog.shortcuts.bindings)
+        #expect(storeBindings[action.rawValue] == nil)
+        #expect(
+            model.validationMessage(for: action)
+                == String(
+                    localized: "shortcut.recorder.error.reservedBySystem",
+                    defaultValue: "This keystroke is reserved by macOS."
+                )
+        )
+    }
+
     @Test func clearThenRestoreRoundTrips() async throws {
         // WHY: clearOrRestore must snapshot the effective binding before clearing;
         // a second call on the same now-unbound action must restore exactly that snapshot.
diff --git a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
index d59426af4b7a..c4a977c2d681 100644
--- a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
+++ b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
@@ -154,6 +154,44 @@ final class GlobalSearchVisiblePopoverShortcutTests {
 #endif
     }
 
+    @Test func visibleGlobalSearchQueryOwnsSingleStrokeEditingShortcut() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeHarness(appDelegate: appDelegate)
+        defer { closeHarness(harness, appDelegate: appDelegate) }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "c",
+                command: true,
+                shift: false,
+                option: false,
+                control: false
+            ),
+            for: .globalSearch
+        )
+        appDelegate.toggleGlobalSearchPalette()
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+
+        let copyEvent = try makeKeyDownEvent(
+            key: "c",
+            modifiers: [.command],
+            keyCode: 8,
+            windowNumber: harness.auxiliaryWindow.windowNumber
+        )
+        #expect(
+            !appDelegate.debugHandleCustomShortcut(event: copyEvent),
+            "The visible Search query must own a single-stroke Cmd-C binding"
+        )
+        #expect(
+            GlobalSearchCoordinator.shared.isPaletteVisible(),
+            "Copying from the Search query must not close Global Search"
+        )
+#else
+        Issue.record("Global Search visible-popover routing requires a DEBUG build")
+#endif
+    }
+
     @Test func markedTextOwnsInputWhileGlobalSearchIsVisible() throws {
 #if DEBUG
         let appDelegate = try #require(AppDelegate.shared)

From 3d48f54f232060f656b19b996ba396bea2a57264 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 03:32:24 -0700
Subject: [PATCH 073/124] test: exercise settings media key rejection in app
 target

---
 .../ShortcutListModelTests.swift              | 31 -------------
 .../GlobalSearchShortcutSettingsTests.swift   | 43 +++++++++++++++++++
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListModelTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListModelTests.swift
index adb694e4de45..76de030dc97a 100644
--- a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListModelTests.swift
+++ b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListModelTests.swift
@@ -82,37 +82,6 @@ import CmuxSettings
         #expect(model.bareKeyRejections.contains(action.rawValue))
     }
 
-    @Test func globalSearchRejectsMediaKeyChordBeforePersistence() async throws {
-        // WHY: Global Search is routed through AppKit's foreground key handler,
-        // which cannot execute system-defined media-key strokes. Settings must
-        // reject the recording instead of displaying a binding runtime discards.
-        let (store, catalog, errorLog) = makeStore()
-        let action = ShortcutAction.globalSearch
-        let chord = StoredShortcut(
-            first: ShortcutStroke(
-                key: "j",
-                command: true,
-                shift: true,
-                option: true,
-                control: true
-            ),
-            second: ShortcutStroke(key: "media.playPause")
-        )
-        let model = ShortcutListModel(jsonStore: store, catalog: catalog, errorLog: errorLog)
-
-        await model.assignChord(chord, to: action)
-
-        let storeBindings = await store.value(for: catalog.shortcuts.bindings)
-        #expect(storeBindings[action.rawValue] == nil)
-        #expect(
-            model.validationMessage(for: action)
-                == String(
-                    localized: "shortcut.recorder.error.reservedBySystem",
-                    defaultValue: "This keystroke is reserved by macOS."
-                )
-        )
-    }
-
     @Test func clearThenRestoreRoundTrips() async throws {
         // WHY: clearOrRestore must snapshot the effective binding before clearing;
         // a second call on the same now-unbound action must restore exactly that snapshot.
diff --git a/cmuxTests/GlobalSearchShortcutSettingsTests.swift b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
index 6ced15f1bdbc..c9161706f465 100644
--- a/cmuxTests/GlobalSearchShortcutSettingsTests.swift
+++ b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
@@ -1,6 +1,8 @@
 import AppKit
+import CmuxSettings
 import Foundation
 import Testing
+@testable import CmuxSettingsUI
 
 #if canImport(cmux_DEV)
 @testable import cmux_DEV
@@ -228,6 +230,47 @@ final class GlobalSearchShortcutSettingsTests {
         }
     }
 
+    @Test func settingsModelRejectsMediaKeyChordBeforePersistence() async throws {
+        // WHY: Global Search is routed through AppKit's foreground key handler,
+        // which cannot execute system-defined media-key strokes. Settings must
+        // reject the recording instead of displaying a binding runtime discards.
+        let directory = FileManager.default.temporaryDirectory
+            .appendingPathComponent("cmux-global-search-settings-model-\(UUID().uuidString)", isDirectory: true)
+        try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
+        defer { try? FileManager.default.removeItem(at: directory) }
+
+        let store = JSONConfigStore(fileURL: directory.appendingPathComponent("cmux.json"))
+        let catalog = SettingCatalog()
+        let action = CmuxSettings.ShortcutAction.globalSearch
+        let chord = CmuxSettings.StoredShortcut(
+            first: CmuxSettings.ShortcutStroke(
+                key: "j",
+                command: true,
+                shift: true,
+                option: true,
+                control: true
+            ),
+            second: CmuxSettings.ShortcutStroke(key: "media.playPause")
+        )
+        let model = ShortcutListModel(
+            jsonStore: store,
+            catalog: catalog,
+            errorLog: SettingsErrorLog()
+        )
+
+        await model.assignChord(chord, to: action)
+
+        let storeBindings = await store.value(for: catalog.shortcuts.bindings)
+        #expect(storeBindings[action.rawValue] == nil)
+        #expect(
+            model.validationMessage(for: action)
+                == String(
+                    localized: "shortcut.recorder.error.reservedBySystem",
+                    defaultValue: "This keystroke is reserved by macOS."
+                )
+        )
+    }
+
     @Test func settingsFileStoreParsesGlobalSearchShortcut() throws {
         let directoryURL = FileManager.default.temporaryDirectory
             .appendingPathComponent("cmux-global-search-settings-\(UUID().uuidString)", isDirectory: true)

From f71dc914a319ae2fc5122328ca4994657c65060c Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 03:45:59 -0700
Subject: [PATCH 074/124] fix: preserve search editing and shortcut validation

---
 .../ShortcutListModel+Validation.swift        | 52 +++++++++++
 .../Bindings/ShortcutListModel.swift          | 87 ++++++-------------
 Sources/AppDelegate+WindowDock.swift          |  2 +-
 Sources/AppDelegate.swift                     |  6 +-
 4 files changed, 82 insertions(+), 65 deletions(-)
 create mode 100644 Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Validation.swift

diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Validation.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Validation.swift
new file mode 100644
index 000000000000..8e40e6d953cc
--- /dev/null
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Validation.swift
@@ -0,0 +1,52 @@
+import CmuxSettings
+import Foundation
+
+extension ShortcutListModel {
+    /// The red validation-banner text for `action`, or `nil` when no rejection is pending.
+    func validationMessage(for action: ShortcutAction) -> String? {
+        if systemReservedRejections.contains(action.rawValue) {
+            return String(
+                localized: "shortcut.recorder.error.reservedBySystem",
+                defaultValue: "This keystroke is reserved by macOS."
+            )
+        }
+        if numberedDigitRejections.contains(action.rawValue) {
+            return String(
+                localized: "shortcut.recorder.error.numberedShortcutRequiresDigit",
+                defaultValue: "Use a digit from 1 through 9."
+            )
+        }
+        if bareKeyRejections.contains(action.rawValue) {
+            return String(
+                localized: "shortcut.recorder.error.bareKeyNotAllowed",
+                defaultValue: "Shortcuts must include ⌘ ⌥ ⌃ or ⇧"
+            )
+        }
+        if let conflict = conflictRejections[action.rawValue] {
+            let conflictEffective = effective(for: conflict)
+            let conflictShortcutString = conflictEffective.map {
+                shortcutDisplayString($0, numbered: conflict.usesNumberedDigitMatching)
+            } ?? ""
+            let messageFormat = String(
+                localized: "shortcut.recorder.error.conflictsWithAction",
+                defaultValue: "This shortcut conflicts with %@ (%@)."
+            )
+            return String.localizedStringWithFormat(
+                messageFormat,
+                conflict.displayName,
+                conflictShortcutString
+            )
+        }
+        return nil
+    }
+
+    /// Whether the foreground-only Global Search route cannot execute this recording.
+    func rejectsSystemDefinedMediaKey(
+        _ shortcut: StoredShortcut,
+        for action: ShortcutAction
+    ) -> Bool {
+        action == .globalSearch
+            && (shortcut.first.key.lowercased().hasPrefix("media.")
+                || shortcut.second?.key.lowercased().hasPrefix("media.") == true)
+    }
+}
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
index e81edc4adc28..9bd2a54e1fd8 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
@@ -17,6 +17,7 @@ final class ShortcutListModel {
     private(set) var chordModeActions: Set<String> = []
     private(set) var restoreShortcuts: [String: StoredShortcut] = [:]
     private(set) var bareKeyRejections: Set<String> = []
+    private(set) var systemReservedRejections: Set<String> = []
     /// Per-action set marking a numbered action rejected for a non-`1…9` key.
     private(set) var numberedDigitRejections: Set<String> = []
     /// Per-action conflict target for the red validation banner.
@@ -119,38 +120,6 @@ final class ShortcutListModel {
         return isUnbound && restoreShortcuts[action.rawValue] != nil
     }
 
-    /// The red validation-banner text for `action` (bare-key, numbered-digit, or
-    /// conflict rejection), or `nil` when the row has no pending rejection.
-    func validationMessage(for action: ShortcutAction) -> String? {
-        let numberedDigitRejected = numberedDigitRejections.contains(action.rawValue)
-        let bareKeyRejected = bareKeyRejections.contains(action.rawValue)
-        let conflict = conflictRejections[action.rawValue]
-        if numberedDigitRejected {
-            return String(
-                localized: "shortcut.recorder.error.numberedShortcutRequiresDigit",
-                defaultValue: "Use a digit from 1 through 9."
-            )
-        }
-        if bareKeyRejected {
-            return String(
-                localized: "shortcut.recorder.error.bareKeyNotAllowed",
-                defaultValue: "Shortcuts must include ⌘ ⌥ ⌃ or ⇧"
-            )
-        }
-        if let conflict {
-            let conflictEffective = effective(for: conflict)
-            let conflictShortcutString = conflictEffective.map {
-                format($0, numbered: conflict.usesNumberedDigitMatching)
-            } ?? ""
-            let messageFormat = String(
-                localized: "shortcut.recorder.error.conflictsWithAction",
-                defaultValue: "This shortcut conflicts with %@ (%@)."
-            )
-            return String.localizedStringWithFormat(messageFormat, conflict.displayName, conflictShortcutString)
-        }
-        return nil
-    }
-
     // MARK: - Conflict helpers (moved verbatim from section)
 
     /// The effective focus `when` clause for `action`: its `shortcuts.when`
@@ -255,16 +224,20 @@ final class ShortcutListModel {
     /// Dismisses all rejection banners for the action (the Undo button handler).
     func clearRejections(for action: ShortcutAction) {
         bareKeyRejections.remove(action.rawValue)
+        systemReservedRejections.remove(action.rawValue)
         numberedDigitRejections.remove(action.rawValue)
         conflictRejections.removeValue(forKey: action.rawValue)
         rejectedConflictShortcuts.removeValue(forKey: action.rawValue)
     }
 
     func markBareKeyRejected(_ action: ShortcutAction) {
+        clearRejections(for: action)
         bareKeyRejections.insert(action.rawValue)
-        numberedDigitRejections.remove(action.rawValue)
-        conflictRejections.removeValue(forKey: action.rawValue)
-        rejectedConflictShortcuts.removeValue(forKey: action.rawValue)
+    }
+
+    private func markSystemReservedRejected(_ action: ShortcutAction) {
+        clearRejections(for: action)
+        systemReservedRejections.insert(action.rawValue)
     }
 
     /// The X/restore button handler: clears rejections then either restores a
@@ -273,10 +246,7 @@ final class ShortcutListModel {
     func clearOrRestore(for action: ShortcutAction) async {
         let eff = effective(for: action)
         let canRestoreAction = canRestore(for: action)
-        bareKeyRejections.remove(action.rawValue)
-        numberedDigitRejections.remove(action.rawValue)
-        conflictRejections.removeValue(forKey: action.rawValue)
-        rejectedConflictShortcuts.removeValue(forKey: action.rawValue)
+        clearRejections(for: action)
         if canRestoreAction, let restore = restoreShortcuts[action.rawValue] {
             await restoreBinding(restore, for: action)
         } else if let eff, !eff.isUnbound {
@@ -297,10 +267,8 @@ final class ShortcutListModel {
         }
         if action.usesNumberedDigitMatching {
             guard isNumberedDigitKey(stroke.key) else {
+                clearRejections(for: action)
                 numberedDigitRejections.insert(action.rawValue)
-                bareKeyRejections.remove(action.rawValue)
-                conflictRejections.removeValue(forKey: action.rawValue)
-                rejectedConflictShortcuts.removeValue(forKey: action.rawValue)
                 return
             }
             stroke = ShortcutStroke(
@@ -313,24 +281,24 @@ final class ShortcutListModel {
             )
         }
         let proposed = StoredShortcut(first: stroke)
+        if rejectsSystemDefinedMediaKey(proposed, for: action) {
+            markSystemReservedRejected(action)
+            return
+        }
         if let conflict = detectConflict(for: action, stroke: proposed) {
             // Mirror legacy `KeyboardShortcutSettings.Action.normalizedRecordedShortcutResult`:
             // never write a conflicting binding. Surface the rejection
             // through `conflictRejections` so the banner + Undo button
             // can drive the user back to a usable state.
+            clearRejections(for: action)
             conflictRejections[action.rawValue] = conflict
             rejectedConflictShortcuts[action.rawValue] = proposed
-            bareKeyRejections.remove(action.rawValue)
-            numberedDigitRejections.remove(action.rawValue)
             return
         }
         var updated = latestBindings
         updated[action.rawValue] = proposed
         restoreShortcuts.removeValue(forKey: action.rawValue)
-        bareKeyRejections.remove(action.rawValue)
-        numberedDigitRejections.remove(action.rawValue)
-        conflictRejections.removeValue(forKey: action.rawValue)
-        rejectedConflictShortcuts.removeValue(forKey: action.rawValue)
+        clearRejections(for: action)
         await write(updated, clearingLegacyFor: action)
     }
 
@@ -349,29 +317,28 @@ final class ShortcutListModel {
             return
         }
         guard let proposed = normalizedNumberedShortcutIfNeeded(chord, for: action) else {
+            clearRejections(for: action)
             numberedDigitRejections.insert(action.rawValue)
             chordModeActions.remove(action.rawValue)
-            bareKeyRejections.remove(action.rawValue)
-            conflictRejections.removeValue(forKey: action.rawValue)
-            rejectedConflictShortcuts.removeValue(forKey: action.rawValue)
+            return
+        }
+        if rejectsSystemDefinedMediaKey(proposed, for: action) {
+            markSystemReservedRejected(action)
+            chordModeActions.remove(action.rawValue)
             return
         }
         if let conflict = detectConflict(for: action, stroke: proposed) {
+            clearRejections(for: action)
             conflictRejections[action.rawValue] = conflict
             rejectedConflictShortcuts[action.rawValue] = proposed
             chordModeActions.remove(action.rawValue)
-            bareKeyRejections.remove(action.rawValue)
-            numberedDigitRejections.remove(action.rawValue)
             return
         }
         var updated = latestBindings
         updated[action.rawValue] = proposed
         chordModeActions.remove(action.rawValue)
         restoreShortcuts.removeValue(forKey: action.rawValue)
-        bareKeyRejections.remove(action.rawValue)
-        numberedDigitRejections.remove(action.rawValue)
-        conflictRejections.removeValue(forKey: action.rawValue)
-        rejectedConflictShortcuts.removeValue(forKey: action.rawValue)
+        clearRejections(for: action)
         await write(updated, clearingLegacyFor: action)
     }
 
@@ -387,10 +354,7 @@ final class ShortcutListModel {
         var updated = latestBindings
         updated[action.rawValue] = shortcut
         restoreShortcuts.removeValue(forKey: action.rawValue)
-        bareKeyRejections.remove(action.rawValue)
-        numberedDigitRejections.remove(action.rawValue)
-        conflictRejections.removeValue(forKey: action.rawValue)
-        rejectedConflictShortcuts.removeValue(forKey: action.rawValue)
+        clearRejections(for: action)
         await write(updated, clearingLegacyFor: action)
     }
 
@@ -399,6 +363,7 @@ final class ShortcutListModel {
     func resetAll() async {
         restoreShortcuts.removeAll()
         bareKeyRejections.removeAll()
+        systemReservedRejections.removeAll()
         numberedDigitRejections.removeAll()
         conflictRejections.removeAll()
         rejectedConflictShortcuts.removeAll()
diff --git a/Sources/AppDelegate+WindowDock.swift b/Sources/AppDelegate+WindowDock.swift
index 43a7ad0c28d4..e26c3420028d 100644
--- a/Sources/AppDelegate+WindowDock.swift
+++ b/Sources/AppDelegate+WindowDock.swift
@@ -206,6 +206,6 @@ extension SessionWindowSnapshot {
         tabManager.workspaces.isEmpty &&
             dock == nil &&
             !liveWorkspaces.isEmpty &&
-            liveWorkspaces.allSatisfy { $0.isRemoteTmuxMirror }
+            liveWorkspaces.allSatisfy(\.isRemoteTmuxMirror)
     }
 }
diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index a290e8107ac8..d1defc45f9cf 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13268,8 +13268,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         // Active marked text owns every non-Command event, regardless of which
         // NSTextInputClient has focus. Command shortcuts remain available while
         // composing because Command is not part of IME input sequences.
-        let shortcutWindowForMarkedText =
-            resolvedShortcutEventWindow(event)
+        let shortcutWindowForMarkedText = resolvedShortcutEventWindow(event)
             ?? event.window
             ?? shortcutRoutingActiveWindow
             ?? shortcutRoutingKeyWindow
@@ -13296,6 +13295,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             && matchShortcutStroke(event: event, stroke: globalSearchShortcut.firstStroke)
         let globalSearchIsVisible = (matchesGlobalSearchShortcut || globalSearchUnarmedChordPrefixMatches)
             && GlobalSearchCoordinator.shared.isPaletteVisible()
+        if globalSearchIsVisible, activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
+           GlobalSearchKeyEvent(event).queryOwnsEditingShortcut { return false }
         if matchesGlobalSearchShortcut,
            activeConfiguredShortcutChordPrefixForCurrentEvent != nil || commandPaletteCanRouteUnarmedGlobalSearch
             || globalSearchIsVisible {
@@ -13305,7 +13306,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         }
         if globalSearchUnarmedChordPrefixMatches,
            commandPaletteCanRouteUnarmedGlobalSearch || globalSearchIsVisible {
-            if globalSearchIsVisible, GlobalSearchKeyEvent(event).queryOwnsEditingShortcut { return false }
             if globalSearchShortcutWhenClauseAllows(event: event),
                armConfiguredShortcutChordIfNeeded(event: event, actions: [], shortcuts: [globalSearchShortcut]) { return true }
         }

From 423c4a2344badc53ef8b28fc7d7249b5dbacc3fc Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 03:59:46 -0700
Subject: [PATCH 075/124] test: cover global search settings consistency

---
 cmux.xcodeproj/project.pbxproj                |   4 +
 ...obalSearchShortcutSettingsModelTests.swift | 123 ++++++++++++++++++
 2 files changed, 127 insertions(+)
 create mode 100644 cmuxTests/GlobalSearchShortcutSettingsModelTests.swift

diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index fef0f99e1ef2..5b203480ca36 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -979,6 +979,7 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */; };
 		3865A0083865A0083865A008 /* GlobalSearchPanelCaptureManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */; };
 		8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */; };
+		8561A0048561A0048561A004 /* GlobalSearchShortcutSettingsModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0048561B0048561B004 /* GlobalSearchShortcutSettingsModelTests.swift */; };
 		3865A0053865A0053865A005 /* GlobalSearchShortcutSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */; };
 		8561A0038561A0038561A003 /* GlobalSearchVisiblePopoverShortcutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0038561B0038561B003 /* GlobalSearchVisiblePopoverShortcutTests.swift */; };
 		5B11E5A100000000000000B1 /* GPUSpinner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B11E5A100000000000000B2 /* GPUSpinner.swift */; };
@@ -3232,6 +3233,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchInputOwnershipTests.swift; sourceTree = "<group>"; };
 		3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchPanelCaptureManager.swift; sourceTree = "<group>"; };
 		8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutPriorityTests.swift; sourceTree = "<group>"; };
+		8561B0048561B0048561B004 /* GlobalSearchShortcutSettingsModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutSettingsModelTests.swift; sourceTree = "<group>"; };
 		3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutSettingsTests.swift; sourceTree = "<group>"; };
 		8561B0038561B0038561B003 /* GlobalSearchVisiblePopoverShortcutTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchVisiblePopoverShortcutTests.swift; sourceTree = "<group>"; };
 		5B11E5A100000000000000B2 /* GPUSpinner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sidebar/GPUSpinner.swift; sourceTree = "<group>"; };
@@ -6387,6 +6389,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				C34670040000000000000002 /* KeyboardShortcutTestSettingsIsolation.swift */,
 				F5996001A1B2C3D4E5F60002 /* AppDelegateFileExplorerShortcutRoutingTests.swift */,
 				3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */,
+				8561B0048561B0048561B004 /* GlobalSearchShortcutSettingsModelTests.swift */,
 				8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */,
 				8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */,
 				8561B0038561B0038561B003 /* GlobalSearchVisiblePopoverShortcutTests.swift */,
@@ -9172,6 +9175,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				D7AB34400000000000000003 /* GhosttyTerminalViewVisibilityPolicyTests.swift in Sources */,
 				8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */,
 				8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */,
+				8561A0048561A0048561A004 /* GlobalSearchShortcutSettingsModelTests.swift in Sources */,
 				3865A0053865A0053865A005 /* GlobalSearchShortcutSettingsTests.swift in Sources */,
 				8561A0038561A0038561A003 /* GlobalSearchVisiblePopoverShortcutTests.swift in Sources */,
 				4931A11B0000000000000002 /* HiddenRightSidebarContentMountingTests.swift in Sources */,
diff --git a/cmuxTests/GlobalSearchShortcutSettingsModelTests.swift b/cmuxTests/GlobalSearchShortcutSettingsModelTests.swift
new file mode 100644
index 000000000000..7eb8a88c10df
--- /dev/null
+++ b/cmuxTests/GlobalSearchShortcutSettingsModelTests.swift
@@ -0,0 +1,123 @@
+import CmuxSettings
+import Foundation
+import Testing
+@testable import CmuxSettingsUI
+
+@MainActor
+@Suite(.serialized)
+final class GlobalSearchShortcutSettingsModelTests {
+    @Test func distinctChordSuffixesCanShareAPrefix() async throws {
+        let directory = try makeTemporaryDirectory()
+        defer { try? FileManager.default.removeItem(at: directory) }
+
+        let store = JSONConfigStore(fileURL: directory.appendingPathComponent("cmux.json"))
+        let catalog = SettingCatalog()
+        let model = ShortcutListModel(
+            jsonStore: store,
+            catalog: catalog,
+            errorLog: SettingsErrorLog()
+        )
+        let prefix = ShortcutStroke(
+            key: "j",
+            command: true,
+            shift: true,
+            option: true,
+            control: true
+        )
+        let settingsChord = StoredShortcut(
+            first: prefix,
+            second: ShortcutStroke(key: "p")
+        )
+        let searchChord = StoredShortcut(
+            first: prefix,
+            second: ShortcutStroke(key: "f")
+        )
+
+        await model.assignChord(settingsChord, to: .openSettings)
+        await model.assignChord(searchChord, to: .globalSearch)
+
+        let bindings = await store.value(for: catalog.shortcuts.bindings)
+        #expect(bindings[ShortcutAction.openSettings.rawValue] == settingsChord)
+        #expect(bindings[ShortcutAction.globalSearch.rawValue] == searchChord)
+        #expect(model.conflictRejections[ShortcutAction.globalSearch.rawValue] == nil)
+    }
+
+    @Test func persistedMediaKeyGlobalSearchBindingIsNotEffective() async throws {
+        let directory = try makeTemporaryDirectory()
+        defer { try? FileManager.default.removeItem(at: directory) }
+
+        let store = JSONConfigStore(fileURL: directory.appendingPathComponent("cmux.json"))
+        let catalog = SettingCatalog()
+        let mediaShortcut = StoredShortcut(
+            first: ShortcutStroke(key: "media.playPause", command: true)
+        )
+        let observationSentinel = StoredShortcut(
+            first: ShortcutStroke(key: "j", command: true, shift: true, option: true, control: true)
+        )
+        try await store.set(
+            [
+                ShortcutAction.globalSearch.rawValue: mediaShortcut,
+                ShortcutAction.openSettings.rawValue: observationSentinel,
+            ],
+            for: catalog.shortcuts.bindings
+        )
+
+        let model = ShortcutListModel(
+            jsonStore: store,
+            catalog: catalog,
+            errorLog: SettingsErrorLog()
+        )
+        model.startObserving()
+        await spin {
+            model.bindings[ShortcutAction.openSettings.rawValue] == observationSentinel
+        }
+
+        #expect(model.bindings[ShortcutAction.globalSearch.rawValue] == nil)
+        #expect(model.effective(for: .globalSearch) == ShortcutAction.globalSearch.defaultShortcut)
+    }
+
+    @Test func mediaKeyGlobalSearchBindingCannotBeRestored() async throws {
+        let directory = try makeTemporaryDirectory()
+        defer { try? FileManager.default.removeItem(at: directory) }
+
+        let store = JSONConfigStore(fileURL: directory.appendingPathComponent("cmux.json"))
+        let catalog = SettingCatalog()
+        let model = ShortcutListModel(
+            jsonStore: store,
+            catalog: catalog,
+            errorLog: SettingsErrorLog()
+        )
+        let mediaShortcut = StoredShortcut(
+            first: ShortcutStroke(key: "j", command: true),
+            second: ShortcutStroke(key: "media.playPause")
+        )
+
+        await model.restoreBinding(mediaShortcut, for: .globalSearch)
+
+        let bindings = await store.value(for: catalog.shortcuts.bindings)
+        #expect(bindings[ShortcutAction.globalSearch.rawValue] == nil)
+        #expect(
+            model.validationMessage(for: .globalSearch)
+                == String(
+                    localized: "shortcut.recorder.error.reservedBySystem",
+                    defaultValue: "This keystroke is reserved by macOS."
+                )
+        )
+    }
+
+    private func makeTemporaryDirectory() throws -> URL {
+        let directory = FileManager.default.temporaryDirectory
+            .appendingPathComponent("cmux-global-search-model-\(UUID().uuidString)", isDirectory: true)
+        try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
+        return directory
+    }
+
+    private func spin(until condition: () -> Bool) async {
+        var attempts = 0
+        while !condition(), attempts < 100_000 {
+            await Task.yield()
+            attempts += 1
+        }
+        #expect(condition(), "spin(until:) timed out after 100,000 yields")
+    }
+}

From 7422db64aea692589a5ed402e803c8dc01a8ca20 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 04:17:42 -0700
Subject: [PATCH 076/124] fix: unify global search shortcut validation

---
 .../Values/ShortcutAction+Validation.swift    | 30 +++++++++++
 .../Dictionary+ShortcutActionValidation.swift | 11 ++++
 .../Bindings/ShortcutBindingConflict.swift    | 50 +++++++++++++++++++
 .../ShortcutListModel+Validation.swift        | 10 ----
 .../Bindings/ShortcutListModel.swift          | 25 ++++++----
 Sources/KeyboardShortcutSettings.swift        | 10 ++--
 6 files changed, 111 insertions(+), 25 deletions(-)
 create mode 100644 Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Validation.swift
 create mode 100644 Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/Dictionary+ShortcutActionValidation.swift
 create mode 100644 Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutBindingConflict.swift

diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Validation.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Validation.swift
new file mode 100644
index 000000000000..54b6d6c3d335
--- /dev/null
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Validation.swift
@@ -0,0 +1,30 @@
+extension ShortcutAction {
+    /// Whether this action rejects `shortcut` because it contains a system-defined media key.
+    ///
+    /// Global Search is handled by the foreground AppKit key path, which cannot
+    /// receive media-key events. Other actions retain their existing validation.
+    ///
+    /// - Parameter shortcut: The shortcut being validated.
+    /// - Returns: `true` when the shortcut cannot execute for this action.
+    public func rejectsSystemDefinedMediaKey(_ shortcut: StoredShortcut) -> Bool {
+        rejectsSystemDefinedMediaKey(
+            firstKey: shortcut.first.key,
+            secondKey: shortcut.second?.key
+        )
+    }
+
+    /// Whether this action rejects shortcut keys from a legacy binding representation.
+    ///
+    /// - Parameters:
+    ///   - firstKey: The persisted key identifier for the first stroke.
+    ///   - secondKey: The persisted key identifier for the optional chord suffix.
+    /// - Returns: `true` when either key is a media key this action cannot execute.
+    public func rejectsSystemDefinedMediaKey(
+        firstKey: String,
+        secondKey: String?
+    ) -> Bool {
+        guard self == .globalSearch else { return false }
+        return firstKey.lowercased().hasPrefix("media.")
+            || secondKey?.lowercased().hasPrefix("media.") == true
+    }
+}
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/Dictionary+ShortcutActionValidation.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/Dictionary+ShortcutActionValidation.swift
new file mode 100644
index 000000000000..96394fe1a09d
--- /dev/null
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/Dictionary+ShortcutActionValidation.swift
@@ -0,0 +1,11 @@
+import CmuxSettings
+
+extension Dictionary where Key == String, Value == StoredShortcut {
+    /// Removes bindings that the owning action cannot execute.
+    func removingBindingsRejectedByActionPolicy() -> Self {
+        filter { rawAction, shortcut in
+            guard let action = ShortcutAction(rawValue: rawAction) else { return true }
+            return !action.rejectsSystemDefinedMediaKey(shortcut)
+        }
+    }
+}
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutBindingConflict.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutBindingConflict.swift
new file mode 100644
index 000000000000..711cb074da53
--- /dev/null
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutBindingConflict.swift
@@ -0,0 +1,50 @@
+import CmuxSettings
+
+/// A complete runtime-overlap query for two stored shortcut bindings.
+struct ShortcutBindingConflict {
+    let proposed: StoredShortcut
+    let proposedUsesNumberedDigitMatching: Bool
+    let configured: StoredShortcut
+    let configuredUsesNumberedDigitMatching: Bool
+
+    /// Whether the bindings can consume the same keystroke sequence.
+    var exists: Bool {
+        guard !proposed.isUnbound, !configured.isUnbound else { return false }
+
+        switch (proposed.second, configured.second) {
+        case (nil, nil):
+            return numberedAwareStrokesConflict(
+                proposed.first,
+                numbered: proposedUsesNumberedDigitMatching,
+                configured.first,
+                numbered: configuredUsesNumberedDigitMatching
+            )
+        case let (proposedSecond?, configuredSecond?):
+            return numberedAwareStrokesConflict(
+                proposed.first,
+                numbered: false,
+                configured.first,
+                numbered: false
+            ) && numberedAwareStrokesConflict(
+                proposedSecond,
+                numbered: proposedUsesNumberedDigitMatching,
+                configuredSecond,
+                numbered: configuredUsesNumberedDigitMatching
+            )
+        case (_?, nil):
+            return numberedAwareStrokesConflict(
+                proposed.first,
+                numbered: false,
+                configured.first,
+                numbered: configuredUsesNumberedDigitMatching
+            )
+        case (nil, _?):
+            return numberedAwareStrokesConflict(
+                proposed.first,
+                numbered: proposedUsesNumberedDigitMatching,
+                configured.first,
+                numbered: false
+            )
+        }
+    }
+}
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Validation.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Validation.swift
index 8e40e6d953cc..edb83837e11e 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Validation.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Validation.swift
@@ -39,14 +39,4 @@ extension ShortcutListModel {
         }
         return nil
     }
-
-    /// Whether the foreground-only Global Search route cannot execute this recording.
-    func rejectsSystemDefinedMediaKey(
-        _ shortcut: StoredShortcut,
-        for action: ShortcutAction
-    ) -> Bool {
-        action == .globalSearch
-            && (shortcut.first.key.lowercased().hasPrefix("media.")
-                || shortcut.second?.key.lowercased().hasPrefix("media.") == true)
-    }
 }
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
index 9bd2a54e1fd8..5d18c0a12569 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
@@ -50,7 +50,8 @@ final class ShortcutListModel {
     ) {
         self.jsonStore = jsonStore
         self.userDefaultsStore = userDefaultsStore
-        self.legacyBindings = userDefaultsStore?.initialLegacyShortcutBindings() ?? [:]
+        self.legacyBindings = (userDefaultsStore?.initialLegacyShortcutBindings() ?? [:])
+            .removingBindingsRejectedByActionPolicy()
         self.catalog = catalog
         self.errorLog = errorLog
         self.onShortcutsChanged = onShortcutsChanged
@@ -87,6 +88,7 @@ final class ShortcutListModel {
     private var latestBindings: [String: StoredShortcut] { pendingBindings ?? bindings }
 
     private func ingestBindings(_ dictionary: [String: StoredShortcut]) {
+        let dictionary = dictionary.removingBindingsRejectedByActionPolicy()
         let changedActionIds = Set(bindings.keys).union(dictionary.keys)
             .filter { bindings[$0] != dictionary[$0] }
         bindings = dictionary
@@ -96,6 +98,7 @@ final class ShortcutListModel {
     }
 
     private func ingestLegacyBindings(_ dictionary: [String: StoredShortcut]) {
+        let dictionary = dictionary.removingBindingsRejectedByActionPolicy()
         let changedActionIds = Set(legacyBindings.keys).union(dictionary.keys)
             .filter { legacyBindings[$0] != dictionary[$0] }
         legacyBindings = dictionary
@@ -207,12 +210,12 @@ final class ShortcutListModel {
             ) else { continue }
             let effective = effective(for: other)
             guard let effective, !effective.isUnbound else { continue }
-            if numberedAwareStrokesConflict(
-                stroke.first,
-                numbered: action.usesNumberedDigitMatching,
-                effective.first,
-                numbered: other.usesNumberedDigitMatching
-            ) {
+            if ShortcutBindingConflict(
+                proposed: stroke,
+                proposedUsesNumberedDigitMatching: action.usesNumberedDigitMatching,
+                configured: effective,
+                configuredUsesNumberedDigitMatching: other.usesNumberedDigitMatching
+            ).exists {
                 return other
             }
         }
@@ -281,7 +284,7 @@ final class ShortcutListModel {
             )
         }
         let proposed = StoredShortcut(first: stroke)
-        if rejectsSystemDefinedMediaKey(proposed, for: action) {
+        if action.rejectsSystemDefinedMediaKey(proposed) {
             markSystemReservedRejected(action)
             return
         }
@@ -322,7 +325,7 @@ final class ShortcutListModel {
             chordModeActions.remove(action.rawValue)
             return
         }
-        if rejectsSystemDefinedMediaKey(proposed, for: action) {
+        if action.rejectsSystemDefinedMediaKey(proposed) {
             markSystemReservedRejected(action)
             chordModeActions.remove(action.rawValue)
             return
@@ -351,6 +354,10 @@ final class ShortcutListModel {
 
     /// Persists `shortcut` for `action` and clears its rejection/restore state.
     func restoreBinding(_ shortcut: StoredShortcut, for action: ShortcutAction) async {
+        guard !action.rejectsSystemDefinedMediaKey(shortcut) else {
+            markSystemReservedRejected(action)
+            return
+        }
         var updated = latestBindings
         updated[action.rawValue] = shortcut
         restoreShortcuts.removeValue(forKey: action.rawValue)
diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index 60f270699be4..53a0ee824932 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -726,7 +726,10 @@ enum KeyboardShortcutSettings {
                     checkingConflicts: checkingSystemWideConflicts
                 )
             case .globalSearch:
-                guard !Self.containsSystemDefinedMediaKey(shortcut) else {
+                guard !CmuxSettings.ShortcutAction.globalSearch.rejectsSystemDefinedMediaKey(
+                    firstKey: shortcut.firstStroke.key,
+                    secondKey: shortcut.secondStroke?.key
+                ) else {
                     return .rejected(.reservedBySystem)
                 }
                 return .accepted(shortcut)
@@ -737,11 +740,6 @@ enum KeyboardShortcutSettings {
             }
         }
 
-        private static func containsSystemDefinedMediaKey(_ shortcut: StoredShortcut) -> Bool {
-            shortcut.firstStroke.key.lowercased().hasPrefix("media.")
-                || shortcut.secondStroke?.key.lowercased().hasPrefix("media.") == true
-        }
-
         private func resolvedNumberedDigitShortcut(
             _ shortcut: StoredShortcut
         ) -> RecordedShortcutResolution {

From aa5897b8afc36f4dc5868cc829fdedc7023c60e7 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 04:28:57 -0700
Subject: [PATCH 077/124] test: cover global search compatibility gaps

---
 ...balSearchVisiblePopoverShortcutTests.swift | 50 +++++++++++++++++++
 ...eyboardShortcutSettingsObserverTests.swift | 34 +++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
index c4a977c2d681..6597de54f702 100644
--- a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
+++ b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
@@ -192,6 +192,56 @@ final class GlobalSearchVisiblePopoverShortcutTests {
 #endif
     }
 
+    @Test func visibleGlobalSearchQueryOwnsCocoaControlEditingShortcut() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeHarness(appDelegate: appDelegate)
+        defer { closeHarness(harness, appDelegate: appDelegate) }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "a",
+                command: false,
+                shift: false,
+                option: false,
+                control: true
+            ),
+            for: .globalSearch
+        )
+        appDelegate.toggleGlobalSearchPalette()
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+
+        let event = try makeKeyDownEvent(
+            key: "a",
+            characters: "\u{01}",
+            modifiers: [.control],
+            keyCode: 0,
+            windowNumber: harness.auxiliaryWindow.windowNumber
+        )
+        #expect(
+            !appDelegate.debugHandleCustomShortcut(event: event),
+            "The visible Search query must own Ctrl-A text navigation"
+        )
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+#else
+        Issue.record("Global Search visible-popover routing requires a DEBUG build")
+#endif
+    }
+
+    @Test func queryEditingOwnershipIncludesOptionWordNavigation() throws {
+        let event = try makeKeyDownEvent(
+            key: "←",
+            modifiers: [.option],
+            keyCode: 123,
+            windowNumber: 0
+        )
+
+        #expect(
+            GlobalSearchKeyEvent(event).queryOwnsEditingShortcut,
+            "The Search query must own Option-Left word navigation"
+        )
+    }
+
     @Test func markedTextOwnsInputWhileGlobalSearchIsVisible() throws {
 #if DEBUG
         let appDelegate = try #require(AppDelegate.shared)
diff --git a/cmuxTests/KeyboardShortcutSettingsObserverTests.swift b/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
index bbdbefcc31a0..0cbf0f7b83d5 100644
--- a/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
+++ b/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
@@ -73,4 +73,38 @@ struct KeyboardShortcutSettingsObserverTests {
         #expect(observer.globalSearchShortcut == .unbound)
         #expect(globalSearchLookupCount == initialLookupCount + 2)
     }
+
+    @Test func legacyMediaKeyGlobalSearchBindingFallsBackToDefault() throws {
+        let action = KeyboardShortcutSettings.Action.globalSearch
+        let defaults = UserDefaults.standard
+        let originalValue = defaults.object(forKey: action.defaultsKey)
+        let originalStore = KeyboardShortcutSettings.settingsFileStore
+        KeyboardShortcutSettings.settingsFileStore = KeyboardShortcutSettingsFileStore(
+            primaryPath: FileManager.default.temporaryDirectory
+                .appendingPathComponent("cmux-global-search-observer-\(UUID().uuidString).json")
+                .path,
+            fallbackPath: nil,
+            additionalFallbackPaths: [],
+            startWatching: false
+        )
+        defer {
+            KeyboardShortcutSettings.settingsFileStore = originalStore
+            if let originalValue {
+                defaults.set(originalValue, forKey: action.defaultsKey)
+            } else {
+                defaults.removeObject(forKey: action.defaultsKey)
+            }
+        }
+
+        let mediaShortcut = StoredShortcut(
+            key: "media.playPause",
+            command: true,
+            shift: false,
+            option: false,
+            control: false
+        )
+        defaults.set(try JSONEncoder().encode(mediaShortcut), forKey: action.defaultsKey)
+
+        #expect(KeyboardShortcutSettings.shortcut(for: action) == action.defaultShortcut)
+    }
 }

From 7f79228f3a241026da5159fdc4dae1176a5173d5 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 04:46:16 -0700
Subject: [PATCH 078/124] fix: preserve global search editing compatibility

---
 Sources/KeyboardShortcutSettingsLookup.swift  |  8 +++
 .../GlobalSearchKeyEvent+QueryEditing.swift   | 52 +++++++++++++++++++
 Sources/Search/MenubarSearchPopover.swift     | 27 ++--------
 cmux.xcodeproj/project.pbxproj                |  4 ++
 4 files changed, 68 insertions(+), 23 deletions(-)
 create mode 100644 Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift

diff --git a/Sources/KeyboardShortcutSettingsLookup.swift b/Sources/KeyboardShortcutSettingsLookup.swift
index 0e0ef5a9633e..59cbbda97282 100644
--- a/Sources/KeyboardShortcutSettingsLookup.swift
+++ b/Sources/KeyboardShortcutSettingsLookup.swift
@@ -17,6 +17,14 @@ extension KeyboardShortcutSettings {
             let defaultShortcut = action.defaultShortcut
             return defaultShortcut.isUnbound ? nil : defaultShortcut
         }
+        if CmuxSettings.ShortcutAction(rawValue: action.rawValue)?
+            .rejectsSystemDefinedMediaKey(
+                firstKey: shortcut.firstStroke.key,
+                secondKey: shortcut.secondStroke?.key
+            ) == true {
+            let defaultShortcut = action.defaultShortcut
+            return defaultShortcut.isUnbound ? nil : defaultShortcut
+        }
         return shortcut.isUnbound ? nil : shortcut
     }
 
diff --git a/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift b/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift
new file mode 100644
index 000000000000..de6ee9d743a1
--- /dev/null
+++ b/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift
@@ -0,0 +1,52 @@
+import AppKit
+import Foundation
+
+extension GlobalSearchKeyEvent {
+    /// Whether the search query's field editor owns this event as native text input.
+    var queryOwnsEditingShortcut: Bool {
+        let flags = modifierFlags
+        let commandControlOption = flags.intersection([.command, .control, .option])
+
+        if commandControlOption == [.command] {
+            return isCommandEditingCharacter || isTextNavigationOrDeletionKey
+        }
+        if commandControlOption == [.control] {
+            return isControlEditingCharacter || isTextNavigationOrDeletionKey
+        }
+        if commandControlOption == [.option] {
+            return isPrintableTextInput || isTextNavigationOrDeletionKey
+        }
+        if commandControlOption.isEmpty, flags.contains(.shift) {
+            return isPrintableTextInput || isTextNavigationOrDeletionKey
+        }
+        return false
+    }
+
+    private var isCommandEditingCharacter: Bool {
+        guard let character = charactersIgnoringModifiers?.lowercased() else { return false }
+        return ["a", "c", "v", "x", "z"].contains(character)
+    }
+
+    private var isControlEditingCharacter: Bool {
+        guard let character = charactersIgnoringModifiers?.lowercased() else { return false }
+        return ["a", "b", "d", "e", "f", "h", "k", "l", "n", "o", "p", "t", "v", "y"]
+            .contains(character)
+    }
+
+    private var isTextNavigationOrDeletionKey: Bool {
+        switch keyCode {
+        case 51, 115, 116, 117, 119, 121, 123, 124, 125, 126:
+            return true
+        default:
+            return false
+        }
+    }
+
+    private var isPrintableTextInput: Bool {
+        guard let characters, !characters.isEmpty else { return false }
+        return characters.unicodeScalars.allSatisfy { scalar in
+            !CharacterSet.controlCharacters.contains(scalar)
+                && (scalar.value < 0xF700 || scalar.value > 0xF8FF)
+        }
+    }
+}
diff --git a/Sources/Search/MenubarSearchPopover.swift b/Sources/Search/MenubarSearchPopover.swift
index f1852a994fea..4d52b7454b1a 100644
--- a/Sources/Search/MenubarSearchPopover.swift
+++ b/Sources/Search/MenubarSearchPopover.swift
@@ -251,10 +251,10 @@ private struct GlobalSearchPaletteView: View {
         case 53:
             coordinator.dismissPalette()
             return true
-        case 126:
+        case 126 where flags.isDisjoint(with: [.command, .shift, .option, .control]):
             selectedIndex = max(0, selectedIndex - 1)
             return true
-        case 125:
+        case 125 where flags.isDisjoint(with: [.command, .shift, .option, .control]):
             selectedIndex = min(max(results.count - 1, 0), selectedIndex + 1)
             return true
         case 36, 76:
@@ -288,11 +288,13 @@ private struct GlobalSearchPaletteView: View {
 
 struct GlobalSearchKeyEvent: Sendable {
     let keyCode: UInt16
+    let characters: String?
     let charactersIgnoringModifiers: String?
     private let modifierFlagsRawValue: UInt
 
     init(_ event: NSEvent) {
         keyCode = event.keyCode
+        characters = event.characters
         charactersIgnoringModifiers = event.charactersIgnoringModifiers
         modifierFlagsRawValue = event.modifierFlags
             .intersection(.deviceIndependentFlagsMask)
@@ -302,27 +304,6 @@ struct GlobalSearchKeyEvent: Sendable {
     var modifierFlags: NSEvent.ModifierFlags {
         NSEvent.ModifierFlags(rawValue: modifierFlagsRawValue)
     }
-
-    var queryOwnsEditingShortcut: Bool {
-        let flags = modifierFlags
-        guard flags.contains(.command),
-              !flags.contains(.option),
-              !flags.contains(.control) else {
-            return false
-        }
-
-        if let characters = charactersIgnoringModifiers?.lowercased(),
-           ["a", "c", "v", "x", "z"].contains(characters) {
-            return true
-        }
-
-        switch keyCode {
-        case 51, 117, 123, 124:
-            return true
-        default:
-            return false
-        }
-    }
 }
 
 private struct GlobalSearchEmptyStateView: View {
diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index 5b203480ca36..d2b39a915336 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -977,6 +977,7 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		3865A0023865A0023865A002 /* GlobalSearchCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0023865B0023865B002 /* GlobalSearchCoordinator.swift */; };
 		3865A0073865A0073865A007 /* GlobalSearchDocuments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0073865B0073865B007 /* GlobalSearchDocuments.swift */; };
 		8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */; };
+		8561A0058561A0058561A005 /* GlobalSearchKeyEvent+QueryEditing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0058561B0058561B005 /* GlobalSearchKeyEvent+QueryEditing.swift */; };
 		3865A0083865A0083865A008 /* GlobalSearchPanelCaptureManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */; };
 		8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */; };
 		8561A0048561A0048561A004 /* GlobalSearchShortcutSettingsModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0048561B0048561B004 /* GlobalSearchShortcutSettingsModelTests.swift */; };
@@ -3231,6 +3232,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		3865B0023865B0023865B002 /* GlobalSearchCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchCoordinator.swift; sourceTree = "<group>"; };
 		3865B0073865B0073865B007 /* GlobalSearchDocuments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchDocuments.swift; sourceTree = "<group>"; };
 		8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchInputOwnershipTests.swift; sourceTree = "<group>"; };
+		8561B0058561B0058561B005 /* GlobalSearchKeyEvent+QueryEditing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Search/GlobalSearchKeyEvent+QueryEditing.swift"; sourceTree = "<group>"; };
 		3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchPanelCaptureManager.swift; sourceTree = "<group>"; };
 		8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutPriorityTests.swift; sourceTree = "<group>"; };
 		8561B0048561B0048561B004 /* GlobalSearchShortcutSettingsModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutSettingsModelTests.swift; sourceTree = "<group>"; };
@@ -5652,6 +5654,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				3865B0073865B0073865B007 /* GlobalSearchDocuments.swift */,
 				3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */,
 				3865B0023865B0023865B002 /* GlobalSearchCoordinator.swift */,
+				8561B0058561B0058561B005 /* GlobalSearchKeyEvent+QueryEditing.swift */,
 				3865B0033865B0033865B003 /* MenubarSearchPopover.swift */,
 				A5001410 /* Panel.swift */,
 				C54860060000000000000002 /* PanelStableSurfaceIdentity.swift */,
@@ -7869,6 +7872,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				FE001106 /* GitStatusProvider.swift in Sources */,
 					3865A0023865A0023865A002 /* GlobalSearchCoordinator.swift in Sources */,
 				3865A0073865A0073865A007 /* GlobalSearchDocuments.swift in Sources */,
+					8561A0058561A0058561A005 /* GlobalSearchKeyEvent+QueryEditing.swift in Sources */,
 					3865A0083865A0083865A008 /* GlobalSearchPanelCaptureManager.swift in Sources */,
 					5B11E5A100000000000000B1 /* GPUSpinner.swift in Sources */,
 					A6AC72010000000000000001 /* GPUSpinnerNSView.swift in Sources */,

From 6fec4592e376996b70146ef58b7c7d7314f49b62 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 05:00:28 -0700
Subject: [PATCH 079/124] test: cover bare space in visible global search

---
 ...balSearchVisiblePopoverShortcutTests.swift | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
index 6597de54f702..d1255a0a6988 100644
--- a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
+++ b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
@@ -242,6 +242,44 @@ final class GlobalSearchVisiblePopoverShortcutTests {
         )
     }
 
+    @Test func visibleGlobalSearchQueryOwnsBareSpaceShortcut() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeHarness(appDelegate: appDelegate)
+        defer { closeHarness(harness, appDelegate: appDelegate) }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "space",
+                command: false,
+                shift: false,
+                option: false,
+                control: false
+            ),
+            for: .globalSearch
+        )
+        appDelegate.toggleGlobalSearchPalette()
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+
+        let event = try makeKeyDownEvent(
+            key: " ",
+            modifiers: [],
+            keyCode: 49,
+            windowNumber: harness.auxiliaryWindow.windowNumber
+        )
+        #expect(
+            !appDelegate.debugHandleCustomShortcut(event: event),
+            "The visible Search query must own an unmodified Space"
+        )
+        #expect(
+            GlobalSearchCoordinator.shared.isPaletteVisible(),
+            "Typing a space in the Search query must not close Global Search"
+        )
+#else
+        Issue.record("Global Search visible-popover routing requires a DEBUG build")
+#endif
+    }
+
     @Test func markedTextOwnsInputWhileGlobalSearchIsVisible() throws {
 #if DEBUG
         let appDelegate = try #require(AppDelegate.shared)

From baaeb96d8c5b3df781b78d7a63ece666b0fec4ef Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 05:01:02 -0700
Subject: [PATCH 080/124] fix: keep bare space in visible global search

---
 Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift b/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift
index de6ee9d743a1..32e9d222864f 100644
--- a/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift
+++ b/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift
@@ -16,7 +16,7 @@ extension GlobalSearchKeyEvent {
         if commandControlOption == [.option] {
             return isPrintableTextInput || isTextNavigationOrDeletionKey
         }
-        if commandControlOption.isEmpty, flags.contains(.shift) {
+        if commandControlOption.isEmpty {
             return isPrintableTextInput || isTextNavigationOrDeletionKey
         }
         return false

From f70fcb4235ec9bccd01e102af45f7543954b40c9 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 05:11:02 -0700
Subject: [PATCH 081/124] test: cover option dead keys in global search

---
 ...balSearchVisiblePopoverShortcutTests.swift | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
index d1255a0a6988..f3994c7c28fb 100644
--- a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
+++ b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
@@ -280,6 +280,45 @@ final class GlobalSearchVisiblePopoverShortcutTests {
 #endif
     }
 
+    @Test func visibleGlobalSearchQueryOwnsOptionDeadKeyShortcut() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let harness = try makeHarness(appDelegate: appDelegate)
+        defer { closeHarness(harness, appDelegate: appDelegate) }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "n",
+                command: false,
+                shift: false,
+                option: true,
+                control: false
+            ),
+            for: .globalSearch
+        )
+        appDelegate.toggleGlobalSearchPalette()
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+
+        let event = try makeKeyDownEvent(
+            key: "n",
+            characters: "",
+            modifiers: [.option],
+            keyCode: 45,
+            windowNumber: harness.auxiliaryWindow.windowNumber
+        )
+        #expect(
+            !appDelegate.debugHandleCustomShortcut(event: event),
+            "The visible Search query must own the first event in an Option dead-key sequence"
+        )
+        #expect(
+            GlobalSearchCoordinator.shared.isPaletteVisible(),
+            "Starting Option dead-key composition must not close Global Search"
+        )
+#else
+        Issue.record("Global Search visible-popover routing requires a DEBUG build")
+#endif
+    }
+
     @Test func markedTextOwnsInputWhileGlobalSearchIsVisible() throws {
 #if DEBUG
         let appDelegate = try #require(AppDelegate.shared)

From 76a4595d8133d3597b54e5dc2b089f5cac21bac3 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 05:13:13 -0700
Subject: [PATCH 082/124] fix: preserve global search dead-key input

---
 Sources/App/ShortcutBareStartRouting.swift    | 23 +++++++++++++++++++
 Sources/AppDelegate.swift                     | 20 ++++++----------
 .../GlobalSearchKeyEvent+QueryEditing.swift   | 16 +++++++++++--
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/Sources/App/ShortcutBareStartRouting.swift b/Sources/App/ShortcutBareStartRouting.swift
index ac774ad13c36..6b2ee283e21e 100644
--- a/Sources/App/ShortcutBareStartRouting.swift
+++ b/Sources/App/ShortcutBareStartRouting.swift
@@ -128,6 +128,29 @@ extension AppDelegate {
             $0.shortcut?.bareShortcutStartKey == bareShortcutKey
         }
     }
+
+    func matchCachedGlobalSearchShortcut(
+        event: NSEvent,
+        normalizedFlags: NSEvent.ModifierFlags? = nil
+    ) -> Bool {
+        let shortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
+        guard let stroke = activeGlobalSearchStroke(for: shortcut),
+              stroke.modifierFlags
+                  == (normalizedFlags ?? ShortcutStroke.normalizedModifierFlags(from: event.modifierFlags)),
+              matchShortcutStroke(event: event, stroke: stroke) else {
+            return false
+        }
+        return globalSearchShortcutWhenClauseAllows(event: event)
+    }
+
+    private func activeGlobalSearchStroke(for shortcut: StoredShortcut) -> ShortcutStroke? {
+        guard !shortcut.isUnbound else { return nil }
+        if let activePrefix = activeConfiguredShortcutChordPrefixForCurrentEvent {
+            guard shortcut.firstStroke == activePrefix else { return nil }
+            return shortcut.secondStroke
+        }
+        return shortcut.hasChord ? nil : shortcut.firstStroke
+    }
 }
 
 private extension NSEvent {
diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index d1defc45f9cf..d90208a0f55f 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13284,7 +13284,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         }
 
         let globalSearchShortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
-        let matchesGlobalSearchShortcut = matchCachedGlobalSearchShortcut(event: event)
+        let matchesGlobalSearchShortcut = matchCachedGlobalSearchShortcut(
+            event: event,
+            normalizedFlags: normalizedFlags
+        )
         let commandPaletteConsumesShortcut = shouldConsumeShortcutWhileCommandPaletteVisible(
             isCommandPaletteVisible: commandPaletteEffectiveInTargetWindow,
             normalizedFlags: normalizedFlags, chars: chars, keyCode: event.keyCode
@@ -13292,6 +13295,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         let commandPaletteCanRouteUnarmedGlobalSearch = commandPaletteEffectiveInTargetWindow && commandPaletteConsumesShortcut
         let globalSearchUnarmedChordPrefixMatches = globalSearchShortcut.hasChord
             && activeConfiguredShortcutChordPrefixForCurrentEvent == nil
+            && globalSearchShortcut.firstStroke.modifierFlags == normalizedFlags
             && matchShortcutStroke(event: event, stroke: globalSearchShortcut.firstStroke)
         let globalSearchIsVisible = (matchesGlobalSearchShortcut || globalSearchUnarmedChordPrefixMatches)
             && GlobalSearchCoordinator.shared.isPaletteVisible()
@@ -13490,7 +13494,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             return true
         }
 
-        if matchCachedGlobalSearchShortcut(event: event) {
+        if matchesGlobalSearchShortcut {
             toggleGlobalSearchPalette()
             return true
         }
@@ -15226,19 +15230,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         return matchConfiguredShortcut(event: event, shortcut: KeyboardShortcutSettings.shortcut(for: action))
     }
 
-    func matchCachedGlobalSearchShortcut(event: NSEvent) -> Bool {
-        guard matchConfiguredShortcut(
-            event: event,
-            shortcut: KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
-        ) else {
-            return false
-        }
-        return globalSearchShortcutWhenClauseAllows(event: event)
-    }
-
     /// `shortcuts.when` gates opening Search; visible Search owns its toggle so
     /// the auxiliary popover's transient focus context cannot prevent dismissal.
-    private func globalSearchShortcutWhenClauseAllows(event: NSEvent) -> Bool {
+    func globalSearchShortcutWhenClauseAllows(event: NSEvent) -> Bool {
         GlobalSearchCoordinator.shared.isPaletteVisible()
             || shortcutWhenClauseAllows(action: .globalSearch, event: event)
     }
diff --git a/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift b/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift
index 32e9d222864f..a18d1d222aa1 100644
--- a/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift
+++ b/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift
@@ -43,8 +43,20 @@ extension GlobalSearchKeyEvent {
     }
 
     private var isPrintableTextInput: Bool {
-        guard let characters, !characters.isEmpty else { return false }
-        return characters.unicodeScalars.allSatisfy { scalar in
+        if Self.isPrintableText(characters) {
+            return true
+        }
+        return Self.isPrintableText(
+            KeyboardLayout.textInputCharacter(
+                forKeyCode: keyCode,
+                modifierFlags: modifierFlags
+            )
+        )
+    }
+
+    private static func isPrintableText(_ text: String?) -> Bool {
+        guard let text, !text.isEmpty else { return false }
+        return text.unicodeScalars.allSatisfy { scalar in
             !CharacterSet.controlCharacters.contains(scalar)
                 && (scalar.value < 0xF700 || scalar.value > 0xF8FF)
         }

From 4510e2058645de5ec948ea60809167880273b604 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 07:14:32 -0700
Subject: [PATCH 083/124] test: reject invalid persisted global search
 shortcuts

---
 cmux.xcodeproj/project.pbxproj                |   4 +
 ...SearchShortcutPersistencePolicyTests.swift | 220 ++++++++++++++++++
 2 files changed, 224 insertions(+)
 create mode 100644 cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift

diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index d2b39a915336..afec2c2f0100 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -979,6 +979,7 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */; };
 		8561A0058561A0058561A005 /* GlobalSearchKeyEvent+QueryEditing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0058561B0058561B005 /* GlobalSearchKeyEvent+QueryEditing.swift */; };
 		3865A0083865A0083865A008 /* GlobalSearchPanelCaptureManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */; };
+		8561A0068561A0068561A006 /* GlobalSearchShortcutPersistencePolicyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0068561B0068561B006 /* GlobalSearchShortcutPersistencePolicyTests.swift */; };
 		8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */; };
 		8561A0048561A0048561A004 /* GlobalSearchShortcutSettingsModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0048561B0048561B004 /* GlobalSearchShortcutSettingsModelTests.swift */; };
 		3865A0053865A0053865A005 /* GlobalSearchShortcutSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */; };
@@ -3234,6 +3235,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchInputOwnershipTests.swift; sourceTree = "<group>"; };
 		8561B0058561B0058561B005 /* GlobalSearchKeyEvent+QueryEditing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Search/GlobalSearchKeyEvent+QueryEditing.swift"; sourceTree = "<group>"; };
 		3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchPanelCaptureManager.swift; sourceTree = "<group>"; };
+		8561B0068561B0068561B006 /* GlobalSearchShortcutPersistencePolicyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutPersistencePolicyTests.swift; sourceTree = "<group>"; };
 		8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutPriorityTests.swift; sourceTree = "<group>"; };
 		8561B0048561B0048561B004 /* GlobalSearchShortcutSettingsModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutSettingsModelTests.swift; sourceTree = "<group>"; };
 		3865B0053865B0053865B005 /* GlobalSearchShortcutSettingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutSettingsTests.swift; sourceTree = "<group>"; };
@@ -6395,6 +6397,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				8561B0048561B0048561B004 /* GlobalSearchShortcutSettingsModelTests.swift */,
 				8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */,
 				8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */,
+				8561B0068561B0068561B006 /* GlobalSearchShortcutPersistencePolicyTests.swift */,
 				8561B0038561B0038561B003 /* GlobalSearchVisiblePopoverShortcutTests.swift */,
 				65154DD251384EE0A2C8923A /* SystemWideHotkeyShortcutPolicyTests.swift */,
 				E3309A0A /* AppDelegateEqualizeSplitsShortcutTests.swift */,
@@ -9178,6 +9181,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				C13519000000000000000003 /* GhosttyTerminalStartupEnvironmentTests.swift in Sources */,
 				D7AB34400000000000000003 /* GhosttyTerminalViewVisibilityPolicyTests.swift in Sources */,
 				8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */,
+				8561A0068561A0068561A006 /* GlobalSearchShortcutPersistencePolicyTests.swift in Sources */,
 				8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */,
 				8561A0048561A0048561A004 /* GlobalSearchShortcutSettingsModelTests.swift in Sources */,
 				3865A0053865A0053865A005 /* GlobalSearchShortcutSettingsTests.swift in Sources */,
diff --git a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
new file mode 100644
index 000000000000..17798c2d9759
--- /dev/null
+++ b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
@@ -0,0 +1,220 @@
+import Foundation
+import Testing
+
+#if canImport(cmux_DEV)
+@testable import cmux_DEV
+#elseif canImport(cmux)
+@testable import cmux
+#endif
+
+@MainActor
+@Suite(.serialized)
+final class GlobalSearchShortcutPersistencePolicyTests {
+    private let originalSettingsFileStore: KeyboardShortcutSettingsFileStore
+    private let savedGlobalSearchDefault: Any?
+    private let savedShowHideDefault: Any?
+
+    init() {
+        let defaults = UserDefaults.standard
+        savedGlobalSearchDefault = defaults.object(
+            forKey: KeyboardShortcutSettings.Action.globalSearch.defaultsKey
+        )
+        savedShowHideDefault = defaults.object(
+            forKey: KeyboardShortcutSettings.Action.showHideAllWindows.defaultsKey
+        )
+        originalSettingsFileStore = KeyboardShortcutSettings.installIsolatedTestFileStore(
+            prefix: "cmux-global-search-persistence-policy"
+        )
+        clearShortcutDefaults()
+    }
+
+    deinit {
+        clearShortcutDefaults()
+        restore(
+            savedGlobalSearchDefault,
+            forKey: KeyboardShortcutSettings.Action.globalSearch.defaultsKey
+        )
+        restore(
+            savedShowHideDefault,
+            forKey: KeyboardShortcutSettings.Action.showHideAllWindows.defaultsKey
+        )
+        KeyboardShortcutSettings.settingsFileStore = originalSettingsFileStore
+    }
+
+    @Test func directSetterRejectsBareGlobalSearchShortcut() {
+        let bareSpace = StoredShortcut(
+            key: "space",
+            command: false,
+            shift: false,
+            option: false,
+            control: false
+        )
+
+        KeyboardShortcutSettings.setShortcut(bareSpace, for: .globalSearch)
+
+        #expect(
+            UserDefaults.standard.object(
+                forKey: KeyboardShortcutSettings.Action.globalSearch.defaultsKey
+            ) == nil
+        )
+        #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == defaultGlobalSearchShortcut)
+    }
+
+    @Test func rawUserDefaultsBareGlobalSearchShortcutIsNotEffective() throws {
+        let bareSpace = StoredShortcut(
+            key: "space",
+            command: false,
+            shift: false,
+            option: false,
+            control: false
+        )
+        let data = try JSONEncoder().encode(bareSpace)
+        UserDefaults.standard.set(
+            data,
+            forKey: KeyboardShortcutSettings.Action.globalSearch.defaultsKey
+        )
+
+        #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == defaultGlobalSearchShortcut)
+    }
+
+    @Test func settingsFileStringRejectsBareGlobalSearchShortcut() throws {
+        let fixture = try makeSettingsFileStore(
+            """
+            {
+              "shortcuts": {
+                "globalSearch": "space"
+              }
+            }
+            """
+        )
+        defer { try? FileManager.default.removeItem(at: fixture.directoryURL) }
+
+        #expect(fixture.store.override(for: .globalSearch) == nil)
+    }
+
+    @Test func settingsFileObjectRejectsBareGlobalSearchShortcut() throws {
+        let fixture = try makeSettingsFileStore(
+            """
+            {
+              "shortcuts": {
+                "bindings": {
+                  "globalSearch": {
+                    "first": {
+                      "key": "space",
+                      "command": false,
+                      "shift": false,
+                      "option": false,
+                      "control": false
+                    }
+                  }
+                }
+              }
+            }
+            """
+        )
+        defer { try? FileManager.default.removeItem(at: fixture.directoryURL) }
+
+        #expect(fixture.store.override(for: .globalSearch) == nil)
+    }
+
+    @Test func directSetterRejectsShowHideCollision() {
+        let collision = collisionShortcut
+        SystemWideHotkeySettings.setShortcut(collision)
+
+        KeyboardShortcutSettings.setShortcut(collision, for: .globalSearch)
+
+        #expect(
+            UserDefaults.standard.object(
+                forKey: KeyboardShortcutSettings.Action.globalSearch.defaultsKey
+            ) == nil
+        )
+        #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == defaultGlobalSearchShortcut)
+    }
+
+    @Test func rawUserDefaultsShowHideCollisionIsNotEffective() throws {
+        let collision = collisionShortcut
+        SystemWideHotkeySettings.setShortcut(collision)
+        let data = try JSONEncoder().encode(collision)
+        UserDefaults.standard.set(
+            data,
+            forKey: KeyboardShortcutSettings.Action.globalSearch.defaultsKey
+        )
+
+        #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == defaultGlobalSearchShortcut)
+    }
+
+    @Test func settingsFileShowHideCollisionIsNotEffective() throws {
+        let collision = collisionShortcut
+        SystemWideHotkeySettings.setShortcut(collision)
+        let fixture = try makeSettingsFileStore(
+            """
+            {
+              "shortcuts": {
+                "globalSearch": "cmd+opt+ctrl+g"
+              }
+            }
+            """
+        )
+        defer { try? FileManager.default.removeItem(at: fixture.directoryURL) }
+        KeyboardShortcutSettings.settingsFileStore = fixture.store
+
+        #expect(fixture.store.override(for: .globalSearch) == collision)
+        #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == defaultGlobalSearchShortcut)
+    }
+
+    private var defaultGlobalSearchShortcut: StoredShortcut {
+        KeyboardShortcutSettings.Action.globalSearch.defaultShortcut
+    }
+
+    private var collisionShortcut: StoredShortcut {
+        StoredShortcut(
+            key: "g",
+            command: true,
+            shift: false,
+            option: true,
+            control: true
+        )
+    }
+
+    private func makeSettingsFileStore(
+        _ json: String
+    ) throws -> (store: KeyboardShortcutSettingsFileStore, directoryURL: URL) {
+        let directoryURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent(
+                "cmux-global-search-persistence-\(UUID().uuidString)",
+                isDirectory: true
+            )
+        try FileManager.default.createDirectory(
+            at: directoryURL,
+            withIntermediateDirectories: true
+        )
+        let settingsFileURL = directoryURL.appendingPathComponent("cmux.json")
+        try json.write(to: settingsFileURL, atomically: true, encoding: .utf8)
+        return (
+            KeyboardShortcutSettingsFileStore(
+                primaryPath: settingsFileURL.path,
+                fallbackPath: nil,
+                startWatching: false
+            ),
+            directoryURL
+        )
+    }
+
+    private func clearShortcutDefaults() {
+        let defaults = UserDefaults.standard
+        defaults.removeObject(
+            forKey: KeyboardShortcutSettings.Action.globalSearch.defaultsKey
+        )
+        defaults.removeObject(
+            forKey: KeyboardShortcutSettings.Action.showHideAllWindows.defaultsKey
+        )
+    }
+
+    private func restore(_ value: Any?, forKey key: String) {
+        if let value {
+            UserDefaults.standard.set(value, forKey: key)
+        } else {
+            UserDefaults.standard.removeObject(forKey: key)
+        }
+    }
+}

From eba16e9d7c6fe808045bc37cd32ce15abbf91245 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 07:27:33 -0700
Subject: [PATCH 084/124] test: fix global search policy suite isolation

---
 .../GlobalSearchShortcutPersistencePolicyTests.swift | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
index 17798c2d9759..007676c30285 100644
--- a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
@@ -25,16 +25,16 @@ final class GlobalSearchShortcutPersistencePolicyTests {
         originalSettingsFileStore = KeyboardShortcutSettings.installIsolatedTestFileStore(
             prefix: "cmux-global-search-persistence-policy"
         )
-        clearShortcutDefaults()
+        Self.clearShortcutDefaults()
     }
 
     deinit {
-        clearShortcutDefaults()
-        restore(
+        Self.clearShortcutDefaults()
+        Self.restore(
             savedGlobalSearchDefault,
             forKey: KeyboardShortcutSettings.Action.globalSearch.defaultsKey
         )
-        restore(
+        Self.restore(
             savedShowHideDefault,
             forKey: KeyboardShortcutSettings.Action.showHideAllWindows.defaultsKey
         )
@@ -200,7 +200,7 @@ final class GlobalSearchShortcutPersistencePolicyTests {
         )
     }
 
-    private func clearShortcutDefaults() {
+    private static func clearShortcutDefaults() {
         let defaults = UserDefaults.standard
         defaults.removeObject(
             forKey: KeyboardShortcutSettings.Action.globalSearch.defaultsKey
@@ -210,7 +210,7 @@ final class GlobalSearchShortcutPersistencePolicyTests {
         )
     }
 
-    private func restore(_ value: Any?, forKey key: String) {
+    private static func restore(_ value: Any?, forKey key: String) {
         if let value {
             UserDefaults.standard.set(value, forKey: key)
         } else {

From 726ed9ed011012e56baa6942788f0e783170acd2 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 07:37:32 -0700
Subject: [PATCH 085/124] test: make global search cleanup nonisolated

---
 cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
index 007676c30285..ea922cd132d2 100644
--- a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
@@ -200,7 +200,7 @@ final class GlobalSearchShortcutPersistencePolicyTests {
         )
     }
 
-    private static func clearShortcutDefaults() {
+    private nonisolated static func clearShortcutDefaults() {
         let defaults = UserDefaults.standard
         defaults.removeObject(
             forKey: KeyboardShortcutSettings.Action.globalSearch.defaultsKey
@@ -210,7 +210,7 @@ final class GlobalSearchShortcutPersistencePolicyTests {
         )
     }
 
-    private static func restore(_ value: Any?, forKey key: String) {
+    private nonisolated static func restore(_ value: Any?, forKey key: String) {
         if let value {
             UserDefaults.standard.set(value, forKey: key)
         } else {

From d6e23123773e61329f76d71565cf4ce04f075fbc Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 07:40:46 -0700
Subject: [PATCH 086/124] test: cover default global search hotkey collision

---
 .../GlobalSearchShortcutPersistencePolicyTests.swift | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
index ea922cd132d2..cbc8e4ac0984 100644
--- a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
@@ -162,6 +162,18 @@ final class GlobalSearchShortcutPersistencePolicyTests {
         #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == defaultGlobalSearchShortcut)
     }
 
+    @Test func defaultGlobalSearchShortcutIsUnboundWhenRawShowHideCollides() throws {
+        let defaultShortcut = defaultGlobalSearchShortcut
+        let data = try JSONEncoder().encode(defaultShortcut)
+        UserDefaults.standard.set(
+            data,
+            forKey: KeyboardShortcutSettings.Action.showHideAllWindows.defaultsKey
+        )
+
+        #expect(SystemWideHotkeySettings.shortcut() == defaultShortcut)
+        #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == .unbound)
+    }
+
     private var defaultGlobalSearchShortcut: StoredShortcut {
         KeyboardShortcutSettings.Action.globalSearch.defaultShortcut
     }

From 83a7f4254e75f43192931f637e07209695d4816a Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 07:49:28 -0700
Subject: [PATCH 087/124] fix: enforce persisted shortcut policy

---
 ...SettingsStore+LegacyShortcutBindings.swift |  6 +-
 .../Values/ShortcutBindingPolicyResult.swift  | 51 ++++++++++
 .../Dictionary+ShortcutActionValidation.swift |  2 +-
 ...tcutSettings+PersistedShortcutPolicy.swift | 98 +++++++++++++++++++
 Sources/KeyboardShortcutSettings.swift        | 17 +---
 Sources/KeyboardShortcutSettingsLookup.swift  | 19 +---
 cmux.xcodeproj/project.pbxproj                |  4 +
 7 files changed, 167 insertions(+), 30 deletions(-)
 create mode 100644 Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
 create mode 100644 Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift

diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Stores/UserDefaultsSettingsStore+LegacyShortcutBindings.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Stores/UserDefaultsSettingsStore+LegacyShortcutBindings.swift
index 3e3efd6922ba..ac1c4ca9d49f 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Stores/UserDefaultsSettingsStore+LegacyShortcutBindings.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Stores/UserDefaultsSettingsStore+LegacyShortcutBindings.swift
@@ -13,7 +13,11 @@ extension UserDefaultsSettingsStore {
                   let payload = try? decoder.decode(LegacyStoredShortcutPayload.self, from: data) else {
                 return nil
             }
-            return (action.rawValue, payload.storedShortcut)
+            let shortcut = payload.storedShortcut
+            guard action.shortcutBindingPolicyResult(for: shortcut) == .accepted else {
+                return nil
+            }
+            return (action.rawValue, shortcut)
         })
     }
 
diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
new file mode 100644
index 000000000000..87b48fc5e3ac
--- /dev/null
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
@@ -0,0 +1,51 @@
+/// The action-owned validity of a persisted shortcut's shape.
+///
+/// Persistence adapters use this result before accepting a binding so Settings,
+/// `cmux.json`, and legacy `UserDefaults` cannot disagree about whether an
+/// action can execute the stored shortcut.
+public enum ShortcutBindingPolicyResult: Sendable, Equatable {
+    /// The action can execute the shortcut shape.
+    case accepted
+
+    /// The action requires a modifier on this first stroke.
+    case bareFirstStrokeNotAllowed
+
+    /// The action does not support two-stroke shortcuts.
+    case chordNotAllowed
+
+    /// The foreground action cannot receive a system-defined media key.
+    case systemDefinedMediaKeyNotAllowed
+}
+
+public extension ShortcutAction {
+    /// Validates the representation-independent shape of a persisted shortcut.
+    ///
+    /// This policy intentionally excludes conflicts with other actions because
+    /// conflict checks require the caller's complete effective-binding snapshot.
+    ///
+    /// - Parameter shortcut: The shortcut loaded or proposed by a persistence adapter.
+    /// - Returns: The action-owned validity of the shortcut shape.
+    func shortcutBindingPolicyResult(
+        for shortcut: StoredShortcut
+    ) -> ShortcutBindingPolicyResult {
+        guard !shortcut.isUnbound else { return .accepted }
+
+        if shortcut.hasChord && !allowsChordShortcut {
+            return .chordNotAllowed
+        }
+        if rejectsSystemDefinedMediaKey(shortcut) {
+            return .systemDefinedMediaKeyNotAllowed
+        }
+
+        let first = shortcut.first
+        let supportsLegacyBareSpace = first.key.lowercased() == "space"
+            && self != .globalSearch
+        guard allowsBareFirstStroke
+            || first.hasAnyModifier
+            || supportsLegacyBareSpace else {
+            return .bareFirstStrokeNotAllowed
+        }
+
+        return .accepted
+    }
+}
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/Dictionary+ShortcutActionValidation.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/Dictionary+ShortcutActionValidation.swift
index 96394fe1a09d..73f5289c8281 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/Dictionary+ShortcutActionValidation.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/Dictionary+ShortcutActionValidation.swift
@@ -5,7 +5,7 @@ extension Dictionary where Key == String, Value == StoredShortcut {
     func removingBindingsRejectedByActionPolicy() -> Self {
         filter { rawAction, shortcut in
             guard let action = ShortcutAction(rawValue: rawAction) else { return true }
-            return !action.rejectsSystemDefinedMediaKey(shortcut)
+            return action.shortcutBindingPolicyResult(for: shortcut) == .accepted
         }
     }
 }
diff --git a/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift b/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
new file mode 100644
index 000000000000..8ee2c503d516
--- /dev/null
+++ b/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
@@ -0,0 +1,98 @@
+import CmuxSettings
+
+/// Bridges the app target's legacy shortcut representation into the shared
+/// action-owned persistence policy.
+extension KeyboardShortcutSettings.Action {
+    func shortcutBindingPolicyRejection(
+        for shortcut: StoredShortcut
+    ) -> KeyboardShortcutSettings.ShortcutRecordingRejection? {
+        guard let settingsAction = CmuxSettings.ShortcutAction(rawValue: rawValue) else {
+            return nil
+        }
+
+        switch settingsAction.shortcutBindingPolicyResult(
+            for: shortcut.cmuxSettingsStoredShortcut
+        ) {
+        case .accepted:
+            return nil
+        case .bareFirstStrokeNotAllowed:
+            return self == .showHideAllWindows
+                ? .systemWideHotkeyRequiresModifier
+                : .bareKeyNotAllowed
+        case .chordNotAllowed, .systemDefinedMediaKeyNotAllowed:
+            return .reservedBySystem
+        }
+    }
+}
+
+extension KeyboardShortcutSettings {
+    /// Resolves one persistence layer's candidate, falling back to a valid
+    /// built-in default when the candidate cannot execute.
+    static func effectivePersistedShortcut(
+        _ candidate: StoredShortcut?,
+        for action: Action
+    ) -> StoredShortcut? {
+        if let candidate {
+            if candidate.isUnbound {
+                return nil
+            }
+            if let normalized = normalizedEffectiveShortcut(candidate, for: action) {
+                return normalized
+            }
+        }
+
+        let defaultShortcut = action.defaultShortcut
+        guard !defaultShortcut.isUnbound else { return nil }
+        return normalizedEffectiveShortcut(defaultShortcut, for: action)
+    }
+
+    private static func normalizedEffectiveShortcut(
+        _ shortcut: StoredShortcut,
+        for action: Action
+    ) -> StoredShortcut? {
+        guard case let .accepted(normalized) = action
+            .resolvedRecordedShortcutIgnoringConflicts(
+                shortcut,
+                checkingSystemWideConflicts: false
+            ),
+            !conflictsWithConfiguredSystemWideHotkey(normalized, action: action) else {
+            return nil
+        }
+        return normalized
+    }
+
+    private static func conflictsWithConfiguredSystemWideHotkey(
+        _ shortcut: StoredShortcut,
+        action: Action
+    ) -> Bool {
+        guard action == .globalSearch,
+              let proposedPrefix = shortcut.firstStroke.carbonHotKeyRegistration,
+              let systemWideHotkey = SystemWideHotkeySettings.shortcut()
+                .firstStroke.carbonHotKeyRegistration else {
+            return false
+        }
+        return proposedPrefix == systemWideHotkey
+    }
+}
+
+private extension StoredShortcut {
+    var cmuxSettingsStoredShortcut: CmuxSettings.StoredShortcut {
+        CmuxSettings.StoredShortcut(
+            first: firstStroke.cmuxSettingsShortcutStroke,
+            second: secondStroke?.cmuxSettingsShortcutStroke
+        )
+    }
+}
+
+private extension ShortcutStroke {
+    var cmuxSettingsShortcutStroke: CmuxSettings.ShortcutStroke {
+        CmuxSettings.ShortcutStroke(
+            key: key,
+            command: command,
+            shift: shift,
+            option: option,
+            control: control,
+            keyCode: keyCode
+        )
+    }
+}
diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index 53a0ee824932..6dcc3a2477ce 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -674,9 +674,6 @@ enum KeyboardShortcutSettings {
             if shortcut.isUnbound {
                 return .accepted(.unbound)
             }
-            if shortcut.hasChord && !allowsChordShortcut {
-                return .rejected(.reservedBySystem)
-            }
 
             let resolved = resolvedRecordedShortcutIgnoringConflicts(shortcut)
             guard case .accepted = resolved else { return resolved }
@@ -694,9 +691,6 @@ enum KeyboardShortcutSettings {
             if shortcut.isUnbound {
                 return .unbound
             }
-            if shortcut.hasChord && !allowsChordShortcut {
-                return nil
-            }
 
             if case let .accepted(normalized) = resolvedRecordedShortcutIgnoringConflicts(
                 shortcut,
@@ -717,6 +711,9 @@ enum KeyboardShortcutSettings {
             if shortcut.isUnbound {
                 return .accepted(.unbound)
             }
+            if let rejection = shortcutBindingPolicyRejection(for: shortcut) {
+                return .rejected(rejection)
+            }
 
             switch self {
             case .showHideAllWindows:
@@ -726,12 +723,6 @@ enum KeyboardShortcutSettings {
                     checkingConflicts: checkingSystemWideConflicts
                 )
             case .globalSearch:
-                guard !CmuxSettings.ShortcutAction.globalSearch.rejectsSystemDefinedMediaKey(
-                    firstKey: shortcut.firstStroke.key,
-                    secondKey: shortcut.secondStroke?.key
-                ) else {
-                    return .rejected(.reservedBySystem)
-                }
                 return .accepted(shortcut)
             case .selectSurfaceByNumber, .selectWorkspaceByNumber:
                 return resolvedNumberedDigitShortcut(shortcut)
@@ -934,7 +925,7 @@ enum KeyboardShortcutSettings {
         if shortcut.isUnbound { return shortcut }
         if shortcut.hasChord && !action.allowsChordShortcut { return nil }
 
-        switch action.resolvedRecordedShortcutIgnoringConflicts(shortcut) {
+        switch action.normalizedRecordedShortcutResult(shortcut) {
         case let .accepted(normalizedShortcut):
             return normalizedShortcut
         case .rejected:
diff --git a/Sources/KeyboardShortcutSettingsLookup.swift b/Sources/KeyboardShortcutSettingsLookup.swift
index 59cbbda97282..bddd567021f5 100644
--- a/Sources/KeyboardShortcutSettingsLookup.swift
+++ b/Sources/KeyboardShortcutSettingsLookup.swift
@@ -9,23 +9,12 @@ extension KeyboardShortcutSettings {
         #endif
 
         if let managedShortcut = settingsFileStore.override(for: action) {
-            return managedShortcut.isUnbound ? nil : managedShortcut
+            return effectivePersistedShortcut(managedShortcut, for: action)
         }
 
-        guard let data = UserDefaults.standard.data(forKey: action.defaultsKey),
-              let shortcut = try? JSONDecoder().decode(StoredShortcut.self, from: data) else {
-            let defaultShortcut = action.defaultShortcut
-            return defaultShortcut.isUnbound ? nil : defaultShortcut
-        }
-        if CmuxSettings.ShortcutAction(rawValue: action.rawValue)?
-            .rejectsSystemDefinedMediaKey(
-                firstKey: shortcut.firstStroke.key,
-                secondKey: shortcut.secondStroke?.key
-            ) == true {
-            let defaultShortcut = action.defaultShortcut
-            return defaultShortcut.isUnbound ? nil : defaultShortcut
-        }
-        return shortcut.isUnbound ? nil : shortcut
+        let shortcut = UserDefaults.standard.data(forKey: action.defaultsKey)
+            .flatMap { try? JSONDecoder().decode(StoredShortcut.self, from: $0) }
+        return effectivePersistedShortcut(shortcut, for: action)
     }
 
     static func shortcut(for action: Action) -> StoredShortcut {
diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index afec2c2f0100..7d169887278a 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -1019,6 +1019,7 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		A50012F7 /* KeyboardShortcutRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = A50012F6 /* KeyboardShortcutRecorder.swift */; };
 		C0DE5A100000000000000001 /* KeyboardShortcutSavedLayoutTemplateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0DE5A100000000000000002 /* KeyboardShortcutSavedLayoutTemplateTests.swift */; };
 		80410000000000000000000B /* KeyboardShortcutSettings+ActionVisibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80410000000000000000000C /* KeyboardShortcutSettings+ActionVisibility.swift */; };
+		8561A0078561A0078561A007 /* KeyboardShortcutSettings+PersistedShortcutPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0078561B0078561B007 /* KeyboardShortcutSettings+PersistedShortcutPolicy.swift */; };
 		F7216002000000000000001 /* KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7216002000000000000002 /* KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift */; };
 		A50012F3 /* KeyboardShortcutSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = A50012F2 /* KeyboardShortcutSettings.swift */; };
 		A50012F8 /* KeyboardShortcutSettingsControls.swift in Sources */ = {isa = PBXBuildFile; fileRef = A50012F9 /* KeyboardShortcutSettingsControls.swift */; };
@@ -3272,6 +3273,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		A50012F6 /* KeyboardShortcutRecorder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutRecorder.swift; sourceTree = "<group>"; };
 		C0DE5A100000000000000002 /* KeyboardShortcutSavedLayoutTemplateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutSavedLayoutTemplateTests.swift; sourceTree = "<group>"; };
 		80410000000000000000000C /* KeyboardShortcutSettings+ActionVisibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyboardShortcutSettings+ActionVisibility.swift"; sourceTree = "<group>"; };
+		8561B0078561B0078561B007 /* KeyboardShortcutSettings+PersistedShortcutPolicy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyboardShortcutSettings+PersistedShortcutPolicy.swift"; sourceTree = "<group>"; };
 		F7216002000000000000002 /* KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift"; sourceTree = "<group>"; };
 		A50012F2 /* KeyboardShortcutSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutSettings.swift; sourceTree = "<group>"; };
 		A50012F9 /* KeyboardShortcutSettingsControls.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutSettingsControls.swift; sourceTree = "<group>"; };
@@ -5137,6 +5139,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				A50012F2 /* KeyboardShortcutSettings.swift */,
 				80410000000000000000000C /* KeyboardShortcutSettings+ActionVisibility.swift */,
 				F7216002000000000000002 /* KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift */,
+				8561B0078561B0078561B007 /* KeyboardShortcutSettings+PersistedShortcutPolicy.swift */,
 				C0DE7B330000000000000002 /* TextBoxAgentDetection.swift */,
 				7898A0020000000000000002 /* TextBoxGitIgnoreProbe.swift */,
 				5330B0725330B0725330B072 /* TextBoxInlineAttachmentCell.swift */,
@@ -7895,6 +7898,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				C34670030000000000000001 /* KeyboardShortcutContext.swift in Sources */,
 				A50012F7 /* KeyboardShortcutRecorder.swift in Sources */,
 				80410000000000000000000B /* KeyboardShortcutSettings+ActionVisibility.swift in Sources */,
+				8561A0078561A0078561A007 /* KeyboardShortcutSettings+PersistedShortcutPolicy.swift in Sources */,
 				F7216002000000000000001 /* KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift in Sources */,
 				A50012F3 /* KeyboardShortcutSettings.swift in Sources */,
 				A50012F8 /* KeyboardShortcutSettingsControls.swift in Sources */,

From fab2a97a573df2e7eafac8b0c4bf8e7f33663b8d Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 08:16:57 -0700
Subject: [PATCH 088/124] test: cover shortcut ownership edge cases

---
 ...alSearchShortcutPersistencePolicyTests.swift | 17 +++++++++++++++++
 ...lobalSearchVisiblePopoverShortcutTests.swift | 14 ++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
index cbc8e4ac0984..d20aec0c3c35 100644
--- a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
@@ -174,6 +174,23 @@ final class GlobalSearchShortcutPersistencePolicyTests {
         #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == .unbound)
     }
 
+    @Test func invalidShowHideChordDoesNotSuppressGlobalSearchPrefix() throws {
+        let globalSearchShortcut = collisionShortcut
+        var invalidShowHideChord = globalSearchShortcut
+        invalidShowHideChord.chordKey = "x"
+
+        let showHideData = try JSONEncoder().encode(invalidShowHideChord)
+        UserDefaults.standard.set(
+            showHideData,
+            forKey: KeyboardShortcutSettings.Action.showHideAllWindows.defaultsKey
+        )
+        KeyboardShortcutSettings.setShortcut(globalSearchShortcut, for: .globalSearch)
+
+        #expect(invalidShowHideChord.carbonHotKeyRegistration == nil)
+        #expect(SystemWideHotkeySettings.shortcut() == invalidShowHideChord)
+        #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == globalSearchShortcut)
+    }
+
     private var defaultGlobalSearchShortcut: StoredShortcut {
         KeyboardShortcutSettings.Action.globalSearch.defaultShortcut
     }
diff --git a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
index f3994c7c28fb..d46ba4273536 100644
--- a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
+++ b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
@@ -242,6 +242,20 @@ final class GlobalSearchVisiblePopoverShortcutTests {
         )
     }
 
+    @Test func queryEditingOwnershipIncludesCombinedModifierDeletion() throws {
+        let event = try makeKeyDownEvent(
+            key: "\u{08}",
+            modifiers: [.control, .option],
+            keyCode: 51,
+            windowNumber: 0
+        )
+
+        #expect(
+            GlobalSearchKeyEvent(event).queryOwnsEditingShortcut,
+            "The Search query must own Control-Option-Delete"
+        )
+    }
+
     @Test func visibleGlobalSearchQueryOwnsBareSpaceShortcut() throws {
 #if DEBUG
         let appDelegate = try #require(AppDelegate.shared)

From 40be8abd729260dea24a5cf4a68a07654f588021 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 08:19:59 -0700
Subject: [PATCH 089/124] fix: share global search input ownership policy

---
 ...tcutSettings+PersistedShortcutPolicy.swift | 26 +++++++++++++++++--
 Sources/KeyboardShortcutSettings.swift        |  5 ++--
 .../GlobalSearchKeyEvent+QueryEditing.swift   | 11 +++++---
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift b/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
index 8ee2c503d516..6bdd309bd71a 100644
--- a/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
+++ b/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
@@ -67,14 +67,36 @@ extension KeyboardShortcutSettings {
     ) -> Bool {
         guard action == .globalSearch,
               let proposedPrefix = shortcut.firstStroke.carbonHotKeyRegistration,
-              let systemWideHotkey = SystemWideHotkeySettings.shortcut()
-                .firstStroke.carbonHotKeyRegistration else {
+              let systemWideHotkey = SystemWideHotkeySettings.registrationCandidate(
+                for: SystemWideHotkeySettings.shortcut()
+              )?.registration else {
             return false
         }
         return proposedPrefix == systemWideHotkey
     }
 }
 
+extension SystemWideHotkeySettings {
+    /// Resolves a complete Show/Hide binding into the Carbon registration shape
+    /// shared by conflict arbitration and the actual system-wide registrar.
+    ///
+    /// App-shortcut conflicts are checked after Global Search has yielded to
+    /// this candidate, avoiding a recursive lookup between the two actions.
+    static func registrationCandidate(
+        for shortcut: StoredShortcut
+    ) -> (shortcut: StoredShortcut, registration: CarbonHotKeyRegistration)? {
+        guard case let .accepted(normalizedShortcut) = action
+            .resolvedRecordedShortcutIgnoringConflicts(
+                shortcut,
+                checkingSystemWideConflicts: false
+            ),
+            let registration = normalizedShortcut.carbonHotKeyRegistration else {
+            return nil
+        }
+        return (normalizedShortcut, registration)
+    }
+}
+
 private extension StoredShortcut {
     var cmuxSettingsStoredShortcut: CmuxSettings.StoredShortcut {
         CmuxSettings.StoredShortcut(
diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index 6dcc3a2477ce..5f57be09e47a 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -1246,11 +1246,12 @@ final class SystemWideHotkeyController {
             return
         }
 
-        guard let normalizedShortcut = Self.action.normalizedRecordedShortcut(shortcut),
-              let registration = normalizedShortcut.carbonHotKeyRegistration else {
+        guard let candidate = SystemWideHotkeySettings.registrationCandidate(for: shortcut),
+              let normalizedShortcut = Self.action.normalizedRecordedShortcut(candidate.shortcut) else {
             unregisterHotKey()
             return
         }
+        let registration = candidate.registration
 
         if registeredShortcut == normalizedShortcut,
            registeredHotKeyRegistration == registration,
diff --git a/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift b/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift
index a18d1d222aa1..52beecd9d4d0 100644
--- a/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift
+++ b/Sources/Search/GlobalSearchKeyEvent+QueryEditing.swift
@@ -7,17 +7,20 @@ extension GlobalSearchKeyEvent {
         let flags = modifierFlags
         let commandControlOption = flags.intersection([.command, .control, .option])
 
+        if isTextNavigationOrDeletionKey {
+            return true
+        }
         if commandControlOption == [.command] {
-            return isCommandEditingCharacter || isTextNavigationOrDeletionKey
+            return isCommandEditingCharacter
         }
         if commandControlOption == [.control] {
-            return isControlEditingCharacter || isTextNavigationOrDeletionKey
+            return isControlEditingCharacter
         }
         if commandControlOption == [.option] {
-            return isPrintableTextInput || isTextNavigationOrDeletionKey
+            return isPrintableTextInput
         }
         if commandControlOption.isEmpty {
-            return isPrintableTextInput || isTextNavigationOrDeletionKey
+            return isPrintableTextInput
         }
         return false
     }

From d5aab5856ff095f610eb565a3642eb71140de265 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 08:48:34 -0700
Subject: [PATCH 090/124] test: cover global search local monitor routing

---
 cmux.xcodeproj/project.pbxproj                |   4 +
 .../GlobalSearchInputOwnershipTests.swift     |   6 +-
 .../GlobalSearchShortcutBehaviorTests.swift   | 205 ++++++++++++++++++
 ...SearchShortcutPersistencePolicyTests.swift |   6 +-
 .../GlobalSearchShortcutPriorityTests.swift   |   6 +-
 .../GlobalSearchShortcutSettingsTests.swift   |   6 +-
 ...balSearchVisiblePopoverShortcutTests.swift |   6 +-
 ...eyboardShortcutSettingsObserverTests.swift |   6 +-
 .../SystemWideHotkeyShortcutPolicyTests.swift |   6 +-
 9 files changed, 230 insertions(+), 21 deletions(-)
 create mode 100644 cmuxTests/GlobalSearchShortcutBehaviorTests.swift

diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index 7d169887278a..1abf64eb718f 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -979,6 +979,7 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */; };
 		8561A0058561A0058561A005 /* GlobalSearchKeyEvent+QueryEditing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0058561B0058561B005 /* GlobalSearchKeyEvent+QueryEditing.swift */; };
 		3865A0083865A0083865A008 /* GlobalSearchPanelCaptureManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */; };
+		8561A0078561A0078561A007 /* GlobalSearchShortcutBehaviorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0078561B0078561B007 /* GlobalSearchShortcutBehaviorTests.swift */; };
 		8561A0068561A0068561A006 /* GlobalSearchShortcutPersistencePolicyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0068561B0068561B006 /* GlobalSearchShortcutPersistencePolicyTests.swift */; };
 		8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */; };
 		8561A0048561A0048561A004 /* GlobalSearchShortcutSettingsModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0048561B0048561B004 /* GlobalSearchShortcutSettingsModelTests.swift */; };
@@ -3236,6 +3237,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchInputOwnershipTests.swift; sourceTree = "<group>"; };
 		8561B0058561B0058561B005 /* GlobalSearchKeyEvent+QueryEditing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Search/GlobalSearchKeyEvent+QueryEditing.swift"; sourceTree = "<group>"; };
 		3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchPanelCaptureManager.swift; sourceTree = "<group>"; };
+		8561B0078561B0078561B007 /* GlobalSearchShortcutBehaviorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutBehaviorTests.swift; sourceTree = "<group>"; };
 		8561B0068561B0068561B006 /* GlobalSearchShortcutPersistencePolicyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutPersistencePolicyTests.swift; sourceTree = "<group>"; };
 		8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutPriorityTests.swift; sourceTree = "<group>"; };
 		8561B0048561B0048561B004 /* GlobalSearchShortcutSettingsModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutSettingsModelTests.swift; sourceTree = "<group>"; };
@@ -6401,6 +6403,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */,
 				8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */,
 				8561B0068561B0068561B006 /* GlobalSearchShortcutPersistencePolicyTests.swift */,
+				8561B0078561B0078561B007 /* GlobalSearchShortcutBehaviorTests.swift */,
 				8561B0038561B0038561B003 /* GlobalSearchVisiblePopoverShortcutTests.swift */,
 				65154DD251384EE0A2C8923A /* SystemWideHotkeyShortcutPolicyTests.swift */,
 				E3309A0A /* AppDelegateEqualizeSplitsShortcutTests.swift */,
@@ -9185,6 +9188,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				C13519000000000000000003 /* GhosttyTerminalStartupEnvironmentTests.swift in Sources */,
 				D7AB34400000000000000003 /* GhosttyTerminalViewVisibilityPolicyTests.swift in Sources */,
 				8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */,
+				8561A0078561A0078561A007 /* GlobalSearchShortcutBehaviorTests.swift in Sources */,
 				8561A0068561A0068561A006 /* GlobalSearchShortcutPersistencePolicyTests.swift in Sources */,
 				8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */,
 				8561A0048561A0048561A004 /* GlobalSearchShortcutSettingsModelTests.swift in Sources */,
diff --git a/cmuxTests/GlobalSearchInputOwnershipTests.swift b/cmuxTests/GlobalSearchInputOwnershipTests.swift
index cac4bafb28b8..4cf188959b42 100644
--- a/cmuxTests/GlobalSearchInputOwnershipTests.swift
+++ b/cmuxTests/GlobalSearchInputOwnershipTests.swift
@@ -8,9 +8,8 @@ import Testing
 @testable import cmux
 #endif
 
-@MainActor
-@Suite(.serialized)
-final class GlobalSearchInputOwnershipTests {
+extension GlobalSearchShortcutBehaviorTests {
+    @MainActor @Suite final class GlobalSearchInputOwnershipTests {
     private let originalSettingsFileStore: KeyboardShortcutSettingsFileStore
 
     init() {
@@ -465,4 +464,5 @@ final class GlobalSearchInputOwnershipTests {
         case browserFocusUnavailable
         case eventUnavailable
     }
+    }
 }
diff --git a/cmuxTests/GlobalSearchShortcutBehaviorTests.swift b/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
new file mode 100644
index 000000000000..7d709960410c
--- /dev/null
+++ b/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
@@ -0,0 +1,205 @@
+import AppKit
+import Foundation
+import Testing
+
+#if canImport(cmux_DEV)
+@testable import cmux_DEV
+#elseif canImport(cmux)
+@testable import cmux
+#endif
+
+@MainActor
+@Suite(.serialized)
+final class GlobalSearchShortcutBehaviorTests {
+    private let originalSettingsFileStore: KeyboardShortcutSettingsFileStore
+
+    init() {
+        originalSettingsFileStore = KeyboardShortcutSettings.settingsFileStore
+        KeyboardShortcutSettings.settingsFileStore = KeyboardShortcutSettingsFileStore(
+            primaryPath: FileManager.default.temporaryDirectory
+                .appendingPathComponent("cmux-global-search-monitor-chain-\(UUID().uuidString).json")
+                .path,
+            fallbackPath: nil,
+            additionalFallbackPaths: [],
+            startWatching: false
+        )
+        KeyboardShortcutSettings.resetAll()
+    }
+
+    deinit {
+        KeyboardShortcutSettings.settingsFileStore = originalSettingsFileStore
+        KeyboardShortcutSettings.resetAll()
+    }
+
+    @Test func visibleSearchClosesForRemappedCommandShortcutThroughLocalMonitorChain() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let window = try makeMainWindow(appDelegate: appDelegate)
+        defer { closeWindow(window, appDelegate: appDelegate) }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "g",
+                command: true,
+                shift: false,
+                option: false,
+                control: false
+            ),
+            for: .globalSearch
+        )
+        appDelegate.toggleGlobalSearchPalette()
+        let popoverWindow = try #require(
+            waitForSearchPopoverWindow(excluding: window),
+            "The real Search popover and its local key monitor must be active"
+        )
+
+        NSApp.sendEvent(
+            try makeKeyDownEvent(
+                key: "g",
+                modifiers: [.command],
+                keyCode: 5,
+                windowNumber: popoverWindow.windowNumber
+            )
+        )
+
+        #expect(
+            waitUntilGlobalSearchCloses(),
+            "The popover monitor must route the configured toggle before consuming generic Command keys"
+        )
+#else
+        Issue.record("Global Search local-monitor routing requires a DEBUG app-host build")
+#endif
+    }
+
+    @Test func visibleSearchClosesForRemappedChordThroughLocalMonitorChain() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let window = try makeMainWindow(appDelegate: appDelegate)
+        defer { closeWindow(window, appDelegate: appDelegate) }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "k",
+                command: true,
+                shift: false,
+                option: false,
+                control: false,
+                chordKey: "g"
+            ),
+            for: .globalSearch
+        )
+        appDelegate.toggleGlobalSearchPalette()
+        let popoverWindow = try #require(
+            waitForSearchPopoverWindow(excluding: window),
+            "The real Search popover and its local key monitor must be active"
+        )
+
+        NSApp.sendEvent(
+            try makeKeyDownEvent(
+                key: "k",
+                modifiers: [.command],
+                keyCode: 40,
+                windowNumber: popoverWindow.windowNumber
+            )
+        )
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+
+        NSApp.sendEvent(
+            try makeKeyDownEvent(
+                key: "g",
+                modifiers: [],
+                keyCode: 5,
+                windowNumber: popoverWindow.windowNumber
+            )
+        )
+
+        #expect(
+            waitUntilGlobalSearchCloses(),
+            "The popover monitor must let the shared router arm and complete Global Search chords"
+        )
+#else
+        Issue.record("Global Search local-monitor routing requires a DEBUG app-host build")
+#endif
+    }
+
+    private func makeMainWindow(appDelegate: AppDelegate) throws -> NSWindow {
+        let windowId = appDelegate.createMainWindow()
+        let identifier = "cmux.main.\(windowId.uuidString)"
+        let window = try #require(
+            NSApp.windows.first(where: { $0.identifier?.rawValue == identifier })
+        )
+        window.makeKeyAndOrderFront(nil)
+        window.displayIfNeeded()
+        return window
+    }
+
+    private func waitForSearchPopoverWindow(
+        excluding mainWindow: NSWindow,
+        timeout: TimeInterval = 2
+    ) -> NSWindow? {
+        let deadline = Date.now.addingTimeInterval(timeout)
+        repeat {
+            if let window = NSApp.windows.first(where: {
+                $0 !== mainWindow
+                    && $0.isVisible
+                    && $0.firstResponder is NSTextView
+            }) {
+                return window
+            }
+            _ = RunLoop.main.run(
+                mode: .default,
+                before: min(deadline, Date.now.addingTimeInterval(0.01))
+            )
+        } while Date.now < deadline
+        return nil
+    }
+
+    private func makeKeyDownEvent(
+        key: String,
+        modifiers: NSEvent.ModifierFlags,
+        keyCode: UInt16,
+        windowNumber: Int
+    ) throws -> NSEvent {
+        try #require(
+            NSEvent.keyEvent(
+                with: .keyDown,
+                location: .zero,
+                modifierFlags: modifiers,
+                timestamp: ProcessInfo.processInfo.systemUptime,
+                windowNumber: windowNumber,
+                context: nil,
+                characters: key,
+                charactersIgnoringModifiers: key,
+                isARepeat: false,
+                keyCode: keyCode
+            )
+        )
+    }
+
+    private func waitUntilGlobalSearchCloses(timeout: TimeInterval = 2) -> Bool {
+        let deadline = Date.now.addingTimeInterval(timeout)
+        repeat {
+            if !GlobalSearchCoordinator.shared.isPaletteVisible() {
+                return true
+            }
+            _ = RunLoop.main.run(
+                mode: .default,
+                before: min(deadline, Date.now.addingTimeInterval(0.01))
+            )
+        } while Date.now < deadline
+        return !GlobalSearchCoordinator.shared.isPaletteVisible()
+    }
+
+    private func closeWindow(_ window: NSWindow, appDelegate: AppDelegate) {
+        GlobalSearchCoordinator.shared.dismissPalette()
+#if DEBUG
+        appDelegate.debugResetShortcutRoutingStateForTesting()
+        let originalConfirmationHandler = appDelegate.debugCloseMainWindowConfirmationHandler
+        appDelegate.debugCloseMainWindowConfirmationHandler = { _ in true }
+        defer { appDelegate.debugCloseMainWindowConfirmationHandler = originalConfirmationHandler }
+#endif
+        window.animationBehavior = .none
+        window.orderOut(nil)
+        window.close()
+    }
+}
diff --git a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
index d20aec0c3c35..01c090dc18d1 100644
--- a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
@@ -7,9 +7,8 @@ import Testing
 @testable import cmux
 #endif
 
-@MainActor
-@Suite(.serialized)
-final class GlobalSearchShortcutPersistencePolicyTests {
+extension GlobalSearchShortcutBehaviorTests {
+    @MainActor @Suite final class GlobalSearchShortcutPersistencePolicyTests {
     private let originalSettingsFileStore: KeyboardShortcutSettingsFileStore
     private let savedGlobalSearchDefault: Any?
     private let savedShowHideDefault: Any?
@@ -246,4 +245,5 @@ final class GlobalSearchShortcutPersistencePolicyTests {
             UserDefaults.standard.removeObject(forKey: key)
         }
     }
+    }
 }
diff --git a/cmuxTests/GlobalSearchShortcutPriorityTests.swift b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
index 768d6d7dfdac..9c062469cd30 100644
--- a/cmuxTests/GlobalSearchShortcutPriorityTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPriorityTests.swift
@@ -8,9 +8,8 @@ import Testing
 @testable import cmux
 #endif
 
-@MainActor
-@Suite(.serialized)
-final class GlobalSearchShortcutPriorityTests {
+extension GlobalSearchShortcutBehaviorTests {
+    @MainActor @Suite final class GlobalSearchShortcutPriorityTests {
     private let originalSettingsFileStore: KeyboardShortcutSettingsFileStore
 
     init() {
@@ -476,4 +475,5 @@ final class GlobalSearchShortcutPriorityTests {
         case omnibarFocusUnavailable
         case eventUnavailable
     }
+    }
 }
diff --git a/cmuxTests/GlobalSearchShortcutSettingsTests.swift b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
index c9161706f465..bc0fefe48e65 100644
--- a/cmuxTests/GlobalSearchShortcutSettingsTests.swift
+++ b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
@@ -10,9 +10,8 @@ import Testing
 @testable import cmux
 #endif
 
-@MainActor
-@Suite(.serialized)
-final class GlobalSearchShortcutSettingsTests {
+extension GlobalSearchShortcutBehaviorTests {
+    @MainActor @Suite final class GlobalSearchShortcutSettingsTests {
     private let originalSettingsFileStore: KeyboardShortcutSettingsFileStore
 
     init() {
@@ -496,4 +495,5 @@ final class GlobalSearchShortcutSettingsTests {
                 )
         )
     }
+    }
 }
diff --git a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
index d46ba4273536..bec9bb151d9c 100644
--- a/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
+++ b/cmuxTests/GlobalSearchVisiblePopoverShortcutTests.swift
@@ -8,9 +8,8 @@ import Testing
 @testable import cmux
 #endif
 
-@MainActor
-@Suite(.serialized)
-final class GlobalSearchVisiblePopoverShortcutTests {
+extension GlobalSearchShortcutBehaviorTests {
+    @MainActor @Suite final class GlobalSearchVisiblePopoverShortcutTests {
     private let originalSettingsFileStore: KeyboardShortcutSettingsFileStore
 
     init() {
@@ -480,4 +479,5 @@ final class GlobalSearchVisiblePopoverShortcutTests {
     private enum TestHarnessError: Error {
         case eventUnavailable
     }
+    }
 }
diff --git a/cmuxTests/KeyboardShortcutSettingsObserverTests.swift b/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
index 0cbf0f7b83d5..c351919009d9 100644
--- a/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
+++ b/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
@@ -7,9 +7,8 @@ import Testing
 @testable import cmux
 #endif
 
-@MainActor
-@Suite("Keyboard shortcut settings observer", .serialized)
-struct KeyboardShortcutSettingsObserverTests {
+extension GlobalSearchShortcutBehaviorTests {
+    @MainActor @Suite("Keyboard shortcut settings observer") struct KeyboardShortcutSettingsObserverTests {
     @Test func mainThreadSettingsChangeIsAuthoritativeBeforePostReturns() {
         let observer = KeyboardShortcutSettingsObserver.shared
         let expectedRevision = observer.revision &+ 1
@@ -107,4 +106,5 @@ struct KeyboardShortcutSettingsObserverTests {
 
         #expect(KeyboardShortcutSettings.shortcut(for: action) == action.defaultShortcut)
     }
+    }
 }
diff --git a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
index 72bf1fe05df5..4076ba569758 100644
--- a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
+++ b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
@@ -8,9 +8,8 @@ import Testing
 @testable import cmux
 #endif
 
-@MainActor
-@Suite(.serialized)
-final class SystemWideHotkeyShortcutPolicyTests {
+extension GlobalSearchShortcutBehaviorTests {
+    @MainActor @Suite final class SystemWideHotkeyShortcutPolicyTests {
     private let originalSettingsFileStore: KeyboardShortcutSettingsFileStore
     private let savedDefaults: [String: Any]
 
@@ -192,4 +191,5 @@ final class SystemWideHotkeyShortcutPolicyTests {
             defaults.set(value, forKey: key)
         }
     }
+    }
 }

From 1e2a1c2655229c12b7048ebfa75b64ea03361618 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 08:55:02 -0700
Subject: [PATCH 091/124] test: fix global search suite project wiring

---
 cmux.xcodeproj/project.pbxproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index 1abf64eb718f..197be2a8e9fd 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -979,7 +979,7 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */; };
 		8561A0058561A0058561A005 /* GlobalSearchKeyEvent+QueryEditing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0058561B0058561B005 /* GlobalSearchKeyEvent+QueryEditing.swift */; };
 		3865A0083865A0083865A008 /* GlobalSearchPanelCaptureManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */; };
-		8561A0078561A0078561A007 /* GlobalSearchShortcutBehaviorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0078561B0078561B007 /* GlobalSearchShortcutBehaviorTests.swift */; };
+		D5AAB5856FF095F610EB565A /* GlobalSearchShortcutBehaviorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5AAB5856FF095F610EB565B /* GlobalSearchShortcutBehaviorTests.swift */; };
 		8561A0068561A0068561A006 /* GlobalSearchShortcutPersistencePolicyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0068561B0068561B006 /* GlobalSearchShortcutPersistencePolicyTests.swift */; };
 		8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */; };
 		8561A0048561A0048561A004 /* GlobalSearchShortcutSettingsModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561B0048561B0048561B004 /* GlobalSearchShortcutSettingsModelTests.swift */; };
@@ -3237,7 +3237,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchInputOwnershipTests.swift; sourceTree = "<group>"; };
 		8561B0058561B0058561B005 /* GlobalSearchKeyEvent+QueryEditing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Search/GlobalSearchKeyEvent+QueryEditing.swift"; sourceTree = "<group>"; };
 		3865B0083865B0083865B008 /* GlobalSearchPanelCaptureManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search/GlobalSearchPanelCaptureManager.swift; sourceTree = "<group>"; };
-		8561B0078561B0078561B007 /* GlobalSearchShortcutBehaviorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutBehaviorTests.swift; sourceTree = "<group>"; };
+		D5AAB5856FF095F610EB565B /* GlobalSearchShortcutBehaviorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutBehaviorTests.swift; sourceTree = "<group>"; };
 		8561B0068561B0068561B006 /* GlobalSearchShortcutPersistencePolicyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutPersistencePolicyTests.swift; sourceTree = "<group>"; };
 		8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutPriorityTests.swift; sourceTree = "<group>"; };
 		8561B0048561B0048561B004 /* GlobalSearchShortcutSettingsModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchShortcutSettingsModelTests.swift; sourceTree = "<group>"; };
@@ -6403,7 +6403,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				8561B0018561B0018561B001 /* GlobalSearchInputOwnershipTests.swift */,
 				8561B0028561B0028561B002 /* GlobalSearchShortcutPriorityTests.swift */,
 				8561B0068561B0068561B006 /* GlobalSearchShortcutPersistencePolicyTests.swift */,
-				8561B0078561B0078561B007 /* GlobalSearchShortcutBehaviorTests.swift */,
+				D5AAB5856FF095F610EB565B /* GlobalSearchShortcutBehaviorTests.swift */,
 				8561B0038561B0038561B003 /* GlobalSearchVisiblePopoverShortcutTests.swift */,
 				65154DD251384EE0A2C8923A /* SystemWideHotkeyShortcutPolicyTests.swift */,
 				E3309A0A /* AppDelegateEqualizeSplitsShortcutTests.swift */,
@@ -9188,7 +9188,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				C13519000000000000000003 /* GhosttyTerminalStartupEnvironmentTests.swift in Sources */,
 				D7AB34400000000000000003 /* GhosttyTerminalViewVisibilityPolicyTests.swift in Sources */,
 				8561A0018561A0018561A001 /* GlobalSearchInputOwnershipTests.swift in Sources */,
-				8561A0078561A0078561A007 /* GlobalSearchShortcutBehaviorTests.swift in Sources */,
+				D5AAB5856FF095F610EB565A /* GlobalSearchShortcutBehaviorTests.swift in Sources */,
 				8561A0068561A0068561A006 /* GlobalSearchShortcutPersistencePolicyTests.swift in Sources */,
 				8561A0028561A0028561A002 /* GlobalSearchShortcutPriorityTests.swift in Sources */,
 				8561A0048561A0048561A004 /* GlobalSearchShortcutSettingsModelTests.swift in Sources */,

From ebc8cc8f46ce288b08aa626dccc40de4b333907c Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 09:15:34 -0700
Subject: [PATCH 092/124] test: isolate global search monitor chain suite

---
 cmuxTests/GlobalSearchShortcutBehaviorTests.swift | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cmuxTests/GlobalSearchShortcutBehaviorTests.swift b/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
index 7d709960410c..9a697bbf2575 100644
--- a/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
+++ b/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
@@ -8,9 +8,11 @@ import Testing
 @testable import cmux
 #endif
 
-@MainActor
 @Suite(.serialized)
-final class GlobalSearchShortcutBehaviorTests {
+struct GlobalSearchShortcutBehaviorTests {}
+
+extension GlobalSearchShortcutBehaviorTests {
+    @MainActor @Suite final class GlobalSearchLocalMonitorChainTests {
     private let originalSettingsFileStore: KeyboardShortcutSettingsFileStore
 
     init() {
@@ -202,4 +204,5 @@ final class GlobalSearchShortcutBehaviorTests {
         window.orderOut(nil)
         window.close()
     }
+    }
 }

From 951e8e40f6a103fd4a87b698c280813ae9044b09 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 09:37:28 -0700
Subject: [PATCH 093/124] fix: route visible global search shortcuts before
 popover input

---
 ...e+VisibleGlobalSearchShortcutRouting.swift | 108 ++++++++++++++++++
 Sources/AppDelegate.swift                     |  30 ++---
 Sources/Search/MenubarSearchPopover.swift     |  18 ++-
 cmux.xcodeproj/project.pbxproj                |   4 +
 4 files changed, 142 insertions(+), 18 deletions(-)
 create mode 100644 Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift

diff --git a/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift b/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
new file mode 100644
index 000000000000..e6fb5861b5b6
--- /dev/null
+++ b/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
@@ -0,0 +1,108 @@
+import AppKit
+
+extension AppDelegate {
+    enum VisibleGlobalSearchShortcutRoute {
+        case notApplicable
+        case handled
+        case queryOwnsEvent
+    }
+
+    /// Routes the visible Search palette's configured toggle before its local
+    /// monitor applies generic query-key handling.
+    func routeVisibleGlobalSearchShortcutFromLocalMonitor(
+        _ event: NSEvent
+    ) -> VisibleGlobalSearchShortcutRoute {
+        guard event.type == .keyDown,
+              GlobalSearchCoordinator.shared.isPaletteVisible() else {
+            return .notApplicable
+        }
+        guard !KeyboardShortcutRecorderActivity.isAnyRecorderActive,
+              !RecorderHostButton.isActivelyRecording else {
+            clearConfiguredShortcutChordState()
+            return .notApplicable
+        }
+
+        let shortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
+        guard !shortcut.isUnbound else { return .notApplicable }
+
+        let normalizedFlags = ShortcutStroke.normalizedModifierFlags(from: event.modifierFlags)
+        let hasMatchingChordState =
+            activeConfiguredShortcutChordPrefixForCurrentEvent == shortcut.firstStroke
+            || pendingConfiguredShortcutChord?.firstStroke == shortcut.firstStroke
+        let matchesFirstStroke =
+            activeConfiguredShortcutChordPrefixForCurrentEvent == nil
+            && shortcut.firstStroke.modifierFlags == normalizedFlags
+            && matchShortcutStroke(event: event, stroke: shortcut.firstStroke)
+        guard hasMatchingChordState || matchesFirstStroke else {
+            return .notApplicable
+        }
+
+        let eventWindowNumber = configuredShortcutChordWindowNumber(for: event)
+        if let pendingConfiguredShortcutChord,
+           pendingConfiguredShortcutChord.windowNumber == eventWindowNumber {
+            activeConfiguredShortcutChordPrefixForCurrentEvent =
+                pendingConfiguredShortcutChord.firstStroke
+        } else {
+            activeConfiguredShortcutChordPrefixForCurrentEvent = nil
+        }
+        pendingConfiguredShortcutChord = nil
+        defer { activeConfiguredShortcutChordPrefixForCurrentEvent = nil }
+
+        return routeVisibleGlobalSearchShortcut(
+            event,
+            normalizedFlags: normalizedFlags
+        )
+    }
+
+    /// Applies the single visible-palette toggle policy for every local monitor.
+    func routeVisibleGlobalSearchShortcut(
+        _ event: NSEvent,
+        normalizedFlags: NSEvent.ModifierFlags
+    ) -> VisibleGlobalSearchShortcutRoute {
+        guard GlobalSearchCoordinator.shared.isPaletteVisible() else {
+            return .notApplicable
+        }
+
+        let shortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
+        let matchesShortcut = matchCachedGlobalSearchShortcut(
+            event: event,
+            normalizedFlags: normalizedFlags
+        )
+        let matchesUnarmedChordPrefix = matchesUnarmedGlobalSearchChordPrefix(
+            event,
+            normalizedFlags: normalizedFlags
+        )
+        guard matchesShortcut || matchesUnarmedChordPrefix else {
+            return .notApplicable
+        }
+
+        if activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
+           GlobalSearchKeyEvent(event).queryOwnsEditingShortcut {
+            return .queryOwnsEvent
+        }
+        if matchesShortcut {
+            toggleGlobalSearchPalette()
+            return .handled
+        }
+        if globalSearchShortcutWhenClauseAllows(event: event),
+           armConfiguredShortcutChordIfNeeded(
+               event: event,
+               actions: [],
+               shortcuts: [shortcut]
+           ) {
+            return .handled
+        }
+        return .notApplicable
+    }
+
+    func matchesUnarmedGlobalSearchChordPrefix(
+        _ event: NSEvent,
+        normalizedFlags: NSEvent.ModifierFlags
+    ) -> Bool {
+        let shortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
+        return shortcut.hasChord
+            && activeConfiguredShortcutChordPrefixForCurrentEvent == nil
+            && shortcut.firstStroke.modifierFlags == normalizedFlags
+            && matchShortcutStroke(event: event, stroke: shortcut.firstStroke)
+    }
+}
diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index d90208a0f55f..00887e7ce2e1 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -815,11 +815,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
     private var splitButtonTooltipRefreshScheduled = false
     private var didScheduleGhosttyCrashBreadcrumbCheck = false
     private var ghosttyCrashBreadcrumbTask: Task<Void, Never>?
-    private struct PendingConfiguredShortcutChord {
+    struct PendingConfiguredShortcutChord {
         let firstStroke: ShortcutStroke
         let windowNumber: Int?
     }
-    private var pendingConfiguredShortcutChord: PendingConfiguredShortcutChord?
+    var pendingConfiguredShortcutChord: PendingConfiguredShortcutChord?
     var activeConfiguredShortcutChordPrefixForCurrentEvent: ShortcutStroke?
     var shortcutEventFocusContextCache: ShortcutEventFocusContextCache?
     private var ghosttyConfigObserver: NSObjectProtocol?
@@ -13293,23 +13293,23 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             normalizedFlags: normalizedFlags, chars: chars, keyCode: event.keyCode
         )
         let commandPaletteCanRouteUnarmedGlobalSearch = commandPaletteEffectiveInTargetWindow && commandPaletteConsumesShortcut
-        let globalSearchUnarmedChordPrefixMatches = globalSearchShortcut.hasChord
-            && activeConfiguredShortcutChordPrefixForCurrentEvent == nil
-            && globalSearchShortcut.firstStroke.modifierFlags == normalizedFlags
-            && matchShortcutStroke(event: event, stroke: globalSearchShortcut.firstStroke)
-        let globalSearchIsVisible = (matchesGlobalSearchShortcut || globalSearchUnarmedChordPrefixMatches)
-            && GlobalSearchCoordinator.shared.isPaletteVisible()
-        if globalSearchIsVisible, activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
-           GlobalSearchKeyEvent(event).queryOwnsEditingShortcut { return false }
+        let globalSearchUnarmedChordPrefixMatches = matchesUnarmedGlobalSearchChordPrefix(event, normalizedFlags: normalizedFlags)
+        switch routeVisibleGlobalSearchShortcut(event, normalizedFlags: normalizedFlags) {
+        case .handled:
+            return true
+        case .queryOwnsEvent:
+            return false
+        case .notApplicable:
+            break
+        }
         if matchesGlobalSearchShortcut,
-           activeConfiguredShortcutChordPrefixForCurrentEvent != nil || commandPaletteCanRouteUnarmedGlobalSearch
-            || globalSearchIsVisible {
-            // Armed chords own their suffix, while visible Search owns its popover.
+           activeConfiguredShortcutChordPrefixForCurrentEvent != nil
+            || commandPaletteCanRouteUnarmedGlobalSearch {
             toggleGlobalSearchPalette()
             return true
         }
         if globalSearchUnarmedChordPrefixMatches,
-           commandPaletteCanRouteUnarmedGlobalSearch || globalSearchIsVisible {
+           commandPaletteCanRouteUnarmedGlobalSearch {
             if globalSearchShortcutWhenClauseAllows(event: event),
                armConfiguredShortcutChordIfNeeded(event: event, actions: [], shortcuts: [globalSearchShortcut]) { return true }
         }
@@ -15328,7 +15328,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         )
     }
 
-    private func configuredShortcutChordWindowNumber(for event: NSEvent) -> Int? {
+    func configuredShortcutChordWindowNumber(for event: NSEvent) -> Int? {
         if let window = mainWindowForShortcutEvent(event) {
             return window.windowNumber
         }
diff --git a/Sources/Search/MenubarSearchPopover.swift b/Sources/Search/MenubarSearchPopover.swift
index 4d52b7454b1a..5e4ca9c9a768 100644
--- a/Sources/Search/MenubarSearchPopover.swift
+++ b/Sources/Search/MenubarSearchPopover.swift
@@ -219,10 +219,22 @@ private struct GlobalSearchPaletteView: View {
         guard keyMonitor == nil else { return }
         keyMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { event in
             let keyEvent = GlobalSearchKeyEvent(event)
-            let consumed = MainActor.assumeIsolated {
-                handleKeyEvent(keyEvent)
+            let route = MainActor.assumeIsolated {
+                AppDelegate.shared?
+                    .routeVisibleGlobalSearchShortcutFromLocalMonitor(event)
+                    ?? .notApplicable
+            }
+            switch route {
+            case .handled:
+                return nil
+            case .queryOwnsEvent:
+                return event
+            case .notApplicable:
+                let consumed = MainActor.assumeIsolated {
+                    handleKeyEvent(keyEvent)
+                }
+                return consumed ? nil : event
             }
-            return consumed ? nil : event
         }
     }
 
diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index 197be2a8e9fd..80f5e6289d1c 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -167,6 +167,7 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		6419A0016419A0016419A001 /* AppDelegate+ShortcutRoutingTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419A0026419A0026419A002 /* AppDelegate+ShortcutRoutingTesting.swift */; };
 		6419A0036419A0036419A003 /* AppDelegate+ShortcutRoutingWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419A0046419A0046419A004 /* AppDelegate+ShortcutRoutingWindow.swift */; };
 		A79840020000000000000002 /* AppDelegate+SocketConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79840020000000000000001 /* AppDelegate+SocketConfiguration.swift */; };
+		D5AAB5856FF095F610EB565C /* AppDelegate+VisibleGlobalSearchShortcutRouting.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5AAB5856FF095F610EB565D /* AppDelegate+VisibleGlobalSearchShortcutRouting.swift */; };
 		DCDC1000000000000000C030 /* AppDelegate+WindowDock.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCDC1000000000000000C031 /* AppDelegate+WindowDock.swift */; };
 		4805E1513D104D02B52A9807 /* AppDelegate+WindowFramePolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4085E612770476FA272C012 /* AppDelegate+WindowFramePolicy.swift */; };
 		604500100000000000000005 /* AppDelegate+WindowIdentity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 604500100000000000000006 /* AppDelegate+WindowIdentity.swift */; };
@@ -2487,6 +2488,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		6419A0026419A0026419A002 /* AppDelegate+ShortcutRoutingTesting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+ShortcutRoutingTesting.swift"; sourceTree = "<group>"; };
 		6419A0046419A0046419A004 /* AppDelegate+ShortcutRoutingWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+ShortcutRoutingWindow.swift"; sourceTree = "<group>"; };
 		A79840020000000000000001 /* AppDelegate+SocketConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+SocketConfiguration.swift"; sourceTree = "<group>"; };
+		D5AAB5856FF095F610EB565D /* AppDelegate+VisibleGlobalSearchShortcutRouting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift"; sourceTree = "<group>"; };
 		DCDC1000000000000000C031 /* AppDelegate+WindowDock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+WindowDock.swift"; sourceTree = "<group>"; };
 		B4085E612770476FA272C012 /* AppDelegate+WindowFramePolicy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+WindowFramePolicy.swift"; sourceTree = "<group>"; };
 		604500100000000000000006 /* AppDelegate+WindowIdentity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+WindowIdentity.swift"; sourceTree = "<group>"; };
@@ -5114,6 +5116,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				604500200000000000000002 /* WindowTitleTemplateContext.swift */,
 				604500100000000000000002 /* WindowTitleTemplate.swift */,
 				AB7F2E9143904957AAA70726 /* ShortcutBareStartRouting.swift */,
+				D5AAB5856FF095F610EB565D /* AppDelegate+VisibleGlobalSearchShortcutRouting.swift */,
 					E5C0F1A1E5C0F1A1E5C0F1A1 /* TerminalFindEscapeRouting.swift */,
 					C7934BB35B66491B1BCA8064 /* MenuBarExtraController.swift */,
 					C0DE70510000000000000001 /* MenuBarProfilingLauncher.swift */,
@@ -7469,6 +7472,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				6419A0016419A0016419A001 /* AppDelegate+ShortcutRoutingTesting.swift in Sources */,
 				6419A0036419A0036419A003 /* AppDelegate+ShortcutRoutingWindow.swift in Sources */,
 				A79840020000000000000002 /* AppDelegate+SocketConfiguration.swift in Sources */,
+				D5AAB5856FF095F610EB565C /* AppDelegate+VisibleGlobalSearchShortcutRouting.swift in Sources */,
 				DCDC1000000000000000C030 /* AppDelegate+WindowDock.swift in Sources */,
 				4805E1513D104D02B52A9807 /* AppDelegate+WindowFramePolicy.swift in Sources */,
 				604500100000000000000005 /* AppDelegate+WindowIdentity.swift in Sources */,

From ff2c167356607dcca15e08e07794207f8489e97f Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 09:44:22 -0700
Subject: [PATCH 094/124] fix: import settings recorder state for search
 routing

---
 Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift b/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
index e6fb5861b5b6..9d1e93689165 100644
--- a/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
+++ b/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
@@ -1,4 +1,5 @@
 import AppKit
+import CmuxSettingsUI
 
 extension AppDelegate {
     enum VisibleGlobalSearchShortcutRoute {

From 03bf429aa53571f611982442984b38d2e1341428 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 09:59:24 -0700
Subject: [PATCH 095/124] test: use valid search monitor shortcut fixture

---
 .../GlobalSearchShortcutBehaviorTests.swift   | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/cmuxTests/GlobalSearchShortcutBehaviorTests.swift b/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
index 9a697bbf2575..40a97415d064 100644
--- a/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
+++ b/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
@@ -39,15 +39,17 @@ extension GlobalSearchShortcutBehaviorTests {
         let window = try makeMainWindow(appDelegate: appDelegate)
         defer { closeWindow(window, appDelegate: appDelegate) }
 
-        KeyboardShortcutSettings.setShortcut(
-            StoredShortcut(
-                key: "g",
-                command: true,
-                shift: false,
-                option: false,
-                control: false
-            ),
-            for: .globalSearch
+        let shortcut = StoredShortcut(
+            key: "j",
+            command: true,
+            shift: false,
+            option: false,
+            control: false
+        )
+        KeyboardShortcutSettings.setShortcut(shortcut, for: .globalSearch)
+        #expect(
+            KeyboardShortcutSettings.shortcut(for: .globalSearch) == shortcut,
+            "The monitor-chain fixture must install a valid, unclaimed Command shortcut"
         )
         appDelegate.toggleGlobalSearchPalette()
         let popoverWindow = try #require(
@@ -57,9 +59,9 @@ extension GlobalSearchShortcutBehaviorTests {
 
         NSApp.sendEvent(
             try makeKeyDownEvent(
-                key: "g",
+                key: "j",
                 modifiers: [.command],
-                keyCode: 5,
+                keyCode: 38,
                 windowNumber: popoverWindow.windowNumber
             )
         )

From e977ff9fdd961065e26e03b3b84fdbfa9401a6f9 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 10:14:42 -0700
Subject: [PATCH 096/124] test: cover effective shortcut display policy

---
 .../ShortcutListModelTests.swift              | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListModelTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListModelTests.swift
index 76de030dc97a..8b0c67c7a450 100644
--- a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListModelTests.swift
+++ b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListModelTests.swift
@@ -435,4 +435,45 @@ import CmuxSettings
                 )
         )
     }
+
+    @Test func persistedGlobalSearchCollisionDisplaysRuntimeFallback() async throws {
+        let (store, catalog, errorLog) = makeStore()
+        let collision = StoredShortcut(first: ShortcutStroke(
+            key: "g", command: true, option: true, control: true
+        ))
+        try await store.set(
+            [
+                ShortcutAction.showHideAllWindows.rawValue: collision,
+                ShortcutAction.globalSearch.rawValue: collision,
+            ],
+            for: catalog.shortcuts.bindings
+        )
+        let model = ShortcutListModel(jsonStore: store, catalog: catalog, errorLog: errorLog)
+        model.startObserving()
+        await spin(until: { model.bindings.count == 2 })
+
+        #expect(model.effective(for: .showHideAllWindows) == collision)
+        #expect(model.effective(for: .globalSearch) == ShortcutAction.globalSearch.defaultShortcut)
+    }
+
+    @Test func invalidPersistedShowHideChordDisplaysNoEffectiveHotkey() async throws {
+        let (store, catalog, errorLog) = makeStore()
+        let invalidChord = StoredShortcut(
+            first: ShortcutStroke(key: "b", control: true),
+            second: ShortcutStroke(key: "c")
+        )
+        let sentinel = StoredShortcut(first: ShortcutStroke(key: "j", command: true))
+        try await store.set(
+            [
+                ShortcutAction.showHideAllWindows.rawValue: invalidChord,
+                ShortcutAction.openSettings.rawValue: sentinel,
+            ],
+            for: catalog.shortcuts.bindings
+        )
+        let model = ShortcutListModel(jsonStore: store, catalog: catalog, errorLog: errorLog)
+        model.startObserving()
+        await spin(until: { model.bindings[ShortcutAction.openSettings.rawValue] == sentinel })
+
+        #expect(model.effective(for: .showHideAllWindows) == nil)
+    }
 }

From a184573d3aa7544ac20683c53c9256875107530c Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 10:19:29 -0700
Subject: [PATCH 097/124] fix: unify effective shortcut resolution

---
 ...SettingsStore+LegacyShortcutBindings.swift |  6 +-
 .../CmuxSettings/Values/ShortcutAction.swift  |  3 +-
 .../Values/ShortcutBindingPolicyResult.swift  | 62 +++++++++++++++++++
 .../Dictionary+ShortcutActionValidation.swift | 11 ----
 .../Bindings/ShortcutListModel.swift          | 19 ++++--
 .../ShortcutListLegacyOverrideTests.swift     | 20 ++++++
 ...tcutSettings+PersistedShortcutPolicy.swift | 50 +++++++++++----
 Sources/KeyboardShortcutSettings.swift        |  2 +-
 ...SearchShortcutPersistencePolicyTests.swift |  1 +
 9 files changed, 138 insertions(+), 36 deletions(-)
 delete mode 100644 Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/Dictionary+ShortcutActionValidation.swift

diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Stores/UserDefaultsSettingsStore+LegacyShortcutBindings.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Stores/UserDefaultsSettingsStore+LegacyShortcutBindings.swift
index ac1c4ca9d49f..3e3efd6922ba 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Stores/UserDefaultsSettingsStore+LegacyShortcutBindings.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Stores/UserDefaultsSettingsStore+LegacyShortcutBindings.swift
@@ -13,11 +13,7 @@ extension UserDefaultsSettingsStore {
                   let payload = try? decoder.decode(LegacyStoredShortcutPayload.self, from: data) else {
                 return nil
             }
-            let shortcut = payload.storedShortcut
-            guard action.shortcutBindingPolicyResult(for: shortcut) == .accepted else {
-                return nil
-            }
-            return (action.rawValue, shortcut)
+            return (action.rawValue, payload.storedShortcut)
         })
     }
 
diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift
index e7ef8c571f76..7749efc16657 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift
@@ -266,7 +266,8 @@ extension ShortcutAction {
 
     /// Whether this action supports a two-stroke shortcut chord.
     public var allowsChordShortcut: Bool {
-        self != .fileExplorerOpenSelection
+        self != .showHideAllWindows
+            && self != .fileExplorerOpenSelection
             && self != .fileExplorerOpenSelectionFinderAlias
             && self != .cycleTextBoxSubmitAction
     }
diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
index 87b48fc5e3ac..73a65a849069 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
@@ -48,4 +48,66 @@ public extension ShortcutAction {
 
         return .accepted
     }
+
+    /// Resolves a persisted candidate into the shortcut the action executes.
+    ///
+    /// Unsupported Show/Hide candidates fail closed because silently registering
+    /// its default would create an unexpected system-wide hotkey. Other actions
+    /// fall back to their valid built-in default.
+    ///
+    /// - Parameters:
+    ///   - candidate: The configured shortcut, or `nil` when no override exists.
+    ///   - conflictsWithReservedShortcut: Whether a normalized shortcut is reserved
+    ///     by a higher-priority system-wide binding.
+    /// - Returns: The executable shortcut, or `nil` when the action is unbound.
+    func effectivePersistedShortcut(
+        _ candidate: StoredShortcut?,
+        conflictsWithReservedShortcut: (StoredShortcut) -> Bool = { _ in false }
+    ) -> StoredShortcut? {
+        effectivePersistedShortcut(
+            candidate,
+            normalizing: { shortcut in
+                shortcutBindingPolicyResult(for: shortcut) == .accepted
+                    ? shortcut.canonicalized()
+                    : nil
+            },
+            conflictsWithReservedShortcut: conflictsWithReservedShortcut
+        )
+    }
+
+    /// Resolves a persisted candidate using the consumer's runtime normalizer.
+    ///
+    /// - Parameters:
+    ///   - candidate: The configured shortcut, or `nil` when no override exists.
+    ///   - normalizing: Returns the executable representation of a shortcut, or
+    ///     `nil` when the consumer cannot execute it.
+    ///   - conflictsWithReservedShortcut: Whether a normalized shortcut is reserved
+    ///     by a higher-priority system-wide binding.
+    /// - Returns: The executable shortcut, or `nil` when the action is unbound.
+    func effectivePersistedShortcut(
+        _ candidate: StoredShortcut?,
+        normalizing: (StoredShortcut) -> StoredShortcut?,
+        conflictsWithReservedShortcut: (StoredShortcut) -> Bool
+    ) -> StoredShortcut? {
+        if let candidate {
+            if candidate.isUnbound {
+                return nil
+            }
+            if let normalized = normalizing(candidate),
+               !conflictsWithReservedShortcut(normalized) {
+                return normalized
+            }
+            if self == .showHideAllWindows {
+                return nil
+            }
+        }
+
+        guard let defaultShortcut,
+              !defaultShortcut.isUnbound,
+              let normalizedDefault = normalizing(defaultShortcut),
+              !conflictsWithReservedShortcut(normalizedDefault) else {
+            return nil
+        }
+        return normalizedDefault
+    }
 }
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/Dictionary+ShortcutActionValidation.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/Dictionary+ShortcutActionValidation.swift
deleted file mode 100644
index 73f5289c8281..000000000000
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/Dictionary+ShortcutActionValidation.swift
+++ /dev/null
@@ -1,11 +0,0 @@
-import CmuxSettings
-
-extension Dictionary where Key == String, Value == StoredShortcut {
-    /// Removes bindings that the owning action cannot execute.
-    func removingBindingsRejectedByActionPolicy() -> Self {
-        filter { rawAction, shortcut in
-            guard let action = ShortcutAction(rawValue: rawAction) else { return true }
-            return action.shortcutBindingPolicyResult(for: shortcut) == .accepted
-        }
-    }
-}
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
index 5d18c0a12569..1473d7700c40 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
@@ -50,8 +50,7 @@ final class ShortcutListModel {
     ) {
         self.jsonStore = jsonStore
         self.userDefaultsStore = userDefaultsStore
-        self.legacyBindings = (userDefaultsStore?.initialLegacyShortcutBindings() ?? [:])
-            .removingBindingsRejectedByActionPolicy()
+        self.legacyBindings = userDefaultsStore?.initialLegacyShortcutBindings() ?? [:]
         self.catalog = catalog
         self.errorLog = errorLog
         self.onShortcutsChanged = onShortcutsChanged
@@ -88,7 +87,6 @@ final class ShortcutListModel {
     private var latestBindings: [String: StoredShortcut] { pendingBindings ?? bindings }
 
     private func ingestBindings(_ dictionary: [String: StoredShortcut]) {
-        let dictionary = dictionary.removingBindingsRejectedByActionPolicy()
         let changedActionIds = Set(bindings.keys).union(dictionary.keys)
             .filter { bindings[$0] != dictionary[$0] }
         bindings = dictionary
@@ -98,7 +96,6 @@ final class ShortcutListModel {
     }
 
     private func ingestLegacyBindings(_ dictionary: [String: StoredShortcut]) {
-        let dictionary = dictionary.removingBindingsRejectedByActionPolicy()
         let changedActionIds = Set(legacyBindings.keys).union(dictionary.keys)
             .filter { legacyBindings[$0] != dictionary[$0] }
         legacyBindings = dictionary
@@ -112,7 +109,19 @@ final class ShortcutListModel {
     /// The effective shortcut for `action`, using the runtime's JSON, legacy
     /// UserDefaults, then built-in precedence.
     func effective(for action: ShortcutAction) -> StoredShortcut? {
-        latestBindings[action.rawValue] ?? legacyBindings[action.rawValue] ?? action.defaultShortcut
+        let candidate = latestBindings[action.rawValue] ?? legacyBindings[action.rawValue]
+        return action.effectivePersistedShortcut(candidate) { shortcut in
+            guard action == .globalSearch,
+                  let systemWideShortcut = effective(for: .showHideAllWindows) else {
+                return false
+            }
+            return ShortcutBindingConflict(
+                proposed: shortcut,
+                proposedUsesNumberedDigitMatching: action.usesNumberedDigitMatching,
+                configured: systemWideShortcut,
+                configuredUsesNumberedDigitMatching: false
+            ).exists
+        }
     }
 
     /// Whether `action` is currently unbound but has a cached stroke available to
diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListLegacyOverrideTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListLegacyOverrideTests.swift
index d0c04083d1ca..5f9f66a22930 100644
--- a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListLegacyOverrideTests.swift
+++ b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListLegacyOverrideTests.swift
@@ -90,6 +90,26 @@ import Testing
         #expect(model.effective(for: .nextSidebarTab) == legacyShortcut)
     }
 
+    @Test func invalidLegacyShowHideChordDisplaysNoEffectiveHotkey() throws {
+        let invalidChord = StoredShortcut(
+            first: ShortcutStroke(key: "b", control: true),
+            second: ShortcutStroke(key: "c")
+        )
+        let (defaultsStore, suiteName) = try makeDefaultsStore(
+            legacyBindings: [.showHideAllWindows: invalidChord]
+        )
+        defer { UserDefaults(suiteName: suiteName)?.removePersistentDomain(forName: suiteName) }
+        let model = ShortcutListModel(
+            jsonStore: makeJSONStore(),
+            userDefaultsStore: defaultsStore,
+            catalog: SettingCatalog(),
+            errorLog: SettingsErrorLog()
+        )
+
+        #expect(model.legacyBindings[ShortcutAction.showHideAllWindows.rawValue] == invalidChord)
+        #expect(model.effective(for: .showHideAllWindows) == nil)
+    }
+
     @Test func jsonOverrideTakesPrecedenceOverLegacyOverride() async throws {
         let action = ShortcutAction.nextSidebarTab
         let legacyShortcut = StoredShortcut(first: ShortcutStroke(key: "]", command: true, shift: true))
diff --git a/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift b/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
index 6bdd309bd71a..536b465e39e7 100644
--- a/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
+++ b/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
@@ -32,21 +32,28 @@ extension KeyboardShortcutSettings {
         _ candidate: StoredShortcut?,
         for action: Action
     ) -> StoredShortcut? {
-        if let candidate {
-            if candidate.isUnbound {
-                return nil
-            }
-            if let normalized = normalizedEffectiveShortcut(candidate, for: action) {
-                return normalized
-            }
+        guard let settingsAction = CmuxSettings.ShortcutAction(rawValue: action.rawValue) else {
+            return nil
         }
 
-        let defaultShortcut = action.defaultShortcut
-        guard !defaultShortcut.isUnbound else { return nil }
-        return normalizedEffectiveShortcut(defaultShortcut, for: action)
+        return settingsAction.effectivePersistedShortcut(
+            candidate?.cmuxSettingsStoredShortcut,
+            normalizing: { shortcut in
+                normalizedExecutableShortcut(
+                    StoredShortcut(cmuxSettingsStoredShortcut: shortcut),
+                    for: action
+                )?.cmuxSettingsStoredShortcut
+            },
+            conflictsWithReservedShortcut: { shortcut in
+                conflictsWithConfiguredSystemWideHotkey(
+                    StoredShortcut(cmuxSettingsStoredShortcut: shortcut),
+                    action: action
+                )
+            }
+        ).map(StoredShortcut.init(cmuxSettingsStoredShortcut:))
     }
 
-    private static func normalizedEffectiveShortcut(
+    private static func normalizedExecutableShortcut(
         _ shortcut: StoredShortcut,
         for action: Action
     ) -> StoredShortcut? {
@@ -54,8 +61,7 @@ extension KeyboardShortcutSettings {
             .resolvedRecordedShortcutIgnoringConflicts(
                 shortcut,
                 checkingSystemWideConflicts: false
-            ),
-            !conflictsWithConfiguredSystemWideHotkey(normalized, action: action) else {
+            ) else {
             return nil
         }
         return normalized
@@ -98,6 +104,13 @@ extension SystemWideHotkeySettings {
 }
 
 private extension StoredShortcut {
+    init(cmuxSettingsStoredShortcut shortcut: CmuxSettings.StoredShortcut) {
+        self.init(
+            first: ShortcutStroke(cmuxSettingsShortcutStroke: shortcut.first),
+            second: shortcut.second.map(ShortcutStroke.init(cmuxSettingsShortcutStroke:))
+        )
+    }
+
     var cmuxSettingsStoredShortcut: CmuxSettings.StoredShortcut {
         CmuxSettings.StoredShortcut(
             first: firstStroke.cmuxSettingsShortcutStroke,
@@ -107,6 +120,17 @@ private extension StoredShortcut {
 }
 
 private extension ShortcutStroke {
+    init(cmuxSettingsShortcutStroke stroke: CmuxSettings.ShortcutStroke) {
+        self.init(
+            key: stroke.key,
+            command: stroke.command,
+            shift: stroke.shift,
+            option: stroke.option,
+            control: stroke.control,
+            keyCode: stroke.keyCode
+        )
+    }
+
     var cmuxSettingsShortcutStroke: CmuxSettings.ShortcutStroke {
         CmuxSettings.ShortcutStroke(
             key: key,
diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index 5f57be09e47a..561cff93107f 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -1233,7 +1233,7 @@ final class SystemWideHotkeyController {
     }
 
     private func refreshRegistration() {
-        let shortcut = SystemWideHotkeySettings.shortcut()
+        let shortcut = KeyboardShortcutSettings.shortcut(for: Self.action)
         // Stand down while either recorder is armed (legacy app-target recorder or the CmuxSettingsUI
         // package recorder) so the opt-in hotkey is captured rather than fired while being rebound.
         let isShortcutRecordingActive = KeyboardShortcutRecorderActivity.isAnyRecorderActive
diff --git a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
index 01c090dc18d1..9eaed97f9072 100644
--- a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
@@ -187,6 +187,7 @@ extension GlobalSearchShortcutBehaviorTests {
 
         #expect(invalidShowHideChord.carbonHotKeyRegistration == nil)
         #expect(SystemWideHotkeySettings.shortcut() == invalidShowHideChord)
+        #expect(KeyboardShortcutSettings.shortcut(for: .showHideAllWindows) == .unbound)
         #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == globalSearchShortcut)
     }
 

From 697dc6c9d0835cd4935e395f6c4534c447ffa166 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 10:30:00 -0700
Subject: [PATCH 098/124] fix: avoid search visibility work for unrelated keys

---
 .../AppDelegate+VisibleGlobalSearchShortcutRouting.swift   | 7 +++----
 cmuxTests/GlobalSearchShortcutSettingsModelTests.swift     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift b/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
index 9d1e93689165..0463c2a7d50d 100644
--- a/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
+++ b/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
@@ -60,10 +60,6 @@ extension AppDelegate {
         _ event: NSEvent,
         normalizedFlags: NSEvent.ModifierFlags
     ) -> VisibleGlobalSearchShortcutRoute {
-        guard GlobalSearchCoordinator.shared.isPaletteVisible() else {
-            return .notApplicable
-        }
-
         let shortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
         let matchesShortcut = matchCachedGlobalSearchShortcut(
             event: event,
@@ -76,6 +72,9 @@ extension AppDelegate {
         guard matchesShortcut || matchesUnarmedChordPrefix else {
             return .notApplicable
         }
+        guard GlobalSearchCoordinator.shared.isPaletteVisible() else {
+            return .notApplicable
+        }
 
         if activeConfiguredShortcutChordPrefixForCurrentEvent == nil,
            GlobalSearchKeyEvent(event).queryOwnsEditingShortcut {
diff --git a/cmuxTests/GlobalSearchShortcutSettingsModelTests.swift b/cmuxTests/GlobalSearchShortcutSettingsModelTests.swift
index 7eb8a88c10df..d063f00e6d60 100644
--- a/cmuxTests/GlobalSearchShortcutSettingsModelTests.swift
+++ b/cmuxTests/GlobalSearchShortcutSettingsModelTests.swift
@@ -72,7 +72,7 @@ final class GlobalSearchShortcutSettingsModelTests {
             model.bindings[ShortcutAction.openSettings.rawValue] == observationSentinel
         }
 
-        #expect(model.bindings[ShortcutAction.globalSearch.rawValue] == nil)
+        #expect(model.bindings[ShortcutAction.globalSearch.rawValue] == mediaShortcut)
         #expect(model.effective(for: .globalSearch) == ShortcutAction.globalSearch.defaultShortcut)
     }
 

From c75ffcb865cabe53ec7a158628735ea13387b032 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 10:53:08 -0700
Subject: [PATCH 099/124] test: cover global search shortcut policy edges

---
 .../ShortcutListRestoreValidationTests.swift  |  79 +++++++++
 .../GlobalSearchShortcutBehaviorTests.swift   |  55 +++++++
 ...SearchShortcutPersistencePolicyTests.swift | 155 ++++++++++++++++++
 ...eyboardShortcutSettingsObserverTests.swift |  45 +++++
 4 files changed, 334 insertions(+)
 create mode 100644 Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListRestoreValidationTests.swift

diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListRestoreValidationTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListRestoreValidationTests.swift
new file mode 100644
index 000000000000..1ab10b015829
--- /dev/null
+++ b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListRestoreValidationTests.swift
@@ -0,0 +1,79 @@
+import CmuxSettings
+import Foundation
+import Testing
+
+@testable import CmuxSettingsUI
+
+@MainActor
+@Suite struct ShortcutListRestoreValidationTests {
+    @Test func restoreRejectsNewShowHideConflictAndKeepsCandidate() async throws {
+        let directory = FileManager.default.temporaryDirectory
+            .appendingPathComponent(
+                "shortcut-list-restore-validation-\(UUID().uuidString)",
+                isDirectory: true
+            )
+        try FileManager.default.createDirectory(
+            at: directory,
+            withIntermediateDirectories: true
+        )
+        defer { try? FileManager.default.removeItem(at: directory) }
+
+        let store = JSONConfigStore(fileURL: directory.appendingPathComponent("cmux.json"))
+        let catalog = SettingCatalog()
+        let shortcut = StoredShortcut(first: ShortcutStroke(
+            key: "g",
+            command: true,
+            option: true,
+            control: true
+        ))
+        try await store.set(
+            [ShortcutAction.globalSearch.rawValue: shortcut],
+            for: catalog.shortcuts.bindings
+        )
+        let model = ShortcutListModel(
+            jsonStore: store,
+            catalog: catalog,
+            errorLog: SettingsErrorLog()
+        )
+        model.startObserving()
+        await spin {
+            model.effective(for: .globalSearch) == shortcut
+        }
+
+        await model.clearOrRestore(for: .globalSearch)
+        await spin {
+            model.bindings[ShortcutAction.globalSearch.rawValue]?.isUnbound == true
+        }
+        #expect(model.restoreShortcuts[ShortcutAction.globalSearch.rawValue] == shortcut)
+        #expect(model.effective(for: .globalSearch) == nil)
+
+        await model.assign(stroke: shortcut.first, to: .showHideAllWindows)
+        await spin {
+            model.bindings[ShortcutAction.showHideAllWindows.rawValue] == shortcut
+        }
+        #expect(model.effective(for: .showHideAllWindows) == shortcut)
+
+        await model.clearOrRestore(for: .globalSearch)
+
+        #expect(
+            model.conflictRejections[ShortcutAction.globalSearch.rawValue]
+                == .showHideAllWindows
+        )
+        #expect(model.effective(for: .globalSearch) == nil)
+        #expect(model.restoreShortcuts[ShortcutAction.globalSearch.rawValue] == shortcut)
+        #expect(
+            await store.value(for: catalog.shortcuts.bindings)[
+                ShortcutAction.globalSearch.rawValue
+            ]?.isUnbound == true
+        )
+    }
+
+    private func spin(until condition: () -> Bool) async {
+        var spins = 0
+        while !condition(), spins < 100_000 {
+            await Task.yield()
+            spins += 1
+        }
+        #expect(condition(), "spin(until:) timed out after 100 000 yields")
+    }
+}
diff --git a/cmuxTests/GlobalSearchShortcutBehaviorTests.swift b/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
index 40a97415d064..b254fff0eee2 100644
--- a/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
+++ b/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
@@ -126,6 +126,61 @@ extension GlobalSearchShortcutBehaviorTests {
 #endif
     }
 
+    @Test func unrelatedChordSuffixPreservesPendingPrefixForDownstreamMonitor() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let window = try makeMainWindow(appDelegate: appDelegate)
+        defer { closeWindow(window, appDelegate: appDelegate) }
+
+        let shortcut = StoredShortcut(
+            key: "k",
+            command: true,
+            shift: false,
+            option: false,
+            control: false,
+            chordKey: "g"
+        )
+        KeyboardShortcutSettings.setShortcut(shortcut, for: .globalSearch)
+        appDelegate.toggleGlobalSearchPalette()
+        let popoverWindow = try #require(
+            waitForSearchPopoverWindow(excluding: window),
+            "The real Search popover and its local key monitor must be active"
+        )
+        let unrelatedSuffixEvent = try makeKeyDownEvent(
+            key: "s",
+            modifiers: [],
+            keyCode: 1,
+            windowNumber: popoverWindow.windowNumber
+        )
+        let chordWindowNumber = appDelegate.configuredShortcutChordWindowNumber(
+            for: unrelatedSuffixEvent
+        )
+        appDelegate.pendingConfiguredShortcutChord = AppDelegate.PendingConfiguredShortcutChord(
+            firstStroke: shortcut.firstStroke,
+            windowNumber: chordWindowNumber
+        )
+
+        let route = appDelegate.routeVisibleGlobalSearchShortcutFromLocalMonitor(
+            unrelatedSuffixEvent
+        )
+
+        guard case .notApplicable = route else {
+            Issue.record("An unrelated suffix must continue to the downstream shortcut monitor")
+            return
+        }
+        #expect(
+            appDelegate.pendingConfiguredShortcutChord?.firstStroke == shortcut.firstStroke,
+            "The Search popover monitor must not destroy another chord sharing the prefix"
+        )
+        #expect(
+            appDelegate.pendingConfiguredShortcutChord?.windowNumber == chordWindowNumber
+        )
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+#else
+        Issue.record("Global Search local-monitor routing requires a DEBUG app-host build")
+#endif
+    }
+
     private func makeMainWindow(appDelegate: AppDelegate) throws -> NSWindow {
         let windowId = appDelegate.createMainWindow()
         let identifier = "cmux.main.\(windowId.uuidString)"
diff --git a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
index 9eaed97f9072..51e86d002e53 100644
--- a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
@@ -116,6 +116,161 @@ extension GlobalSearchShortcutBehaviorTests {
         #expect(fixture.store.override(for: .globalSearch) == nil)
     }
 
+    @Test func invalidManagedGlobalSearchShadowsLegacyShortcut() throws {
+        let legacyShortcut = StoredShortcut(
+            key: "j",
+            command: true,
+            shift: true,
+            option: false,
+            control: false
+        )
+        UserDefaults.standard.set(
+            try JSONEncoder().encode(legacyShortcut),
+            forKey: KeyboardShortcutSettings.Action.globalSearch.defaultsKey
+        )
+        let fixture = try makeSettingsFileStore(
+            """
+            {
+              "shortcuts": {
+                "bindings": {
+                  "globalSearch": {
+                    "first": {
+                      "key": "media.playPause",
+                      "command": true,
+                      "shift": false,
+                      "option": false,
+                      "control": false
+                    }
+                  }
+                }
+              }
+            }
+            """
+        )
+        defer { try? FileManager.default.removeItem(at: fixture.directoryURL) }
+        KeyboardShortcutSettings.settingsFileStore = fixture.store
+
+        #expect(fixture.store.override(for: .globalSearch) == nil)
+        #expect(fixture.store.isManagedByFile(.globalSearch))
+        #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == defaultGlobalSearchShortcut)
+        #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) != legacyShortcut)
+    }
+
+    @Test func invalidPrimaryGlobalSearchShadowsFallbackFileShortcut() throws {
+        let fallbackShortcut = StoredShortcut(
+            key: "j",
+            command: true,
+            shift: true,
+            option: false,
+            control: false
+        )
+        let directoryURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent(
+                "cmux-global-search-primary-fallback-\(UUID().uuidString)",
+                isDirectory: true
+            )
+        try FileManager.default.createDirectory(
+            at: directoryURL,
+            withIntermediateDirectories: true
+        )
+        defer { try? FileManager.default.removeItem(at: directoryURL) }
+
+        let primaryURL = directoryURL.appendingPathComponent("cmux.json")
+        let fallbackURL = directoryURL.appendingPathComponent("settings.json")
+        try """
+        {
+          "shortcuts": {
+            "bindings": {
+              "globalSearch": "media.playPause"
+            }
+          }
+        }
+        """.write(to: primaryURL, atomically: true, encoding: .utf8)
+        try """
+        {
+          "shortcuts": {
+            "bindings": {
+              "globalSearch": "cmd+shift+j"
+            }
+          }
+        }
+        """.write(to: fallbackURL, atomically: true, encoding: .utf8)
+
+        let store = KeyboardShortcutSettingsFileStore(
+            primaryPath: primaryURL.path,
+            fallbackPath: fallbackURL.path,
+            startWatching: false
+        )
+        KeyboardShortcutSettings.settingsFileStore = store
+
+        #expect(store.override(for: .globalSearch) == nil)
+        #expect(store.isManagedByFile(.globalSearch))
+        #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == defaultGlobalSearchShortcut)
+        #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) != fallbackShortcut)
+    }
+
+    @Test func removingInvalidManagedGlobalSearchReactivatesLegacyAndNotifies() async throws {
+        let legacyShortcut = StoredShortcut(
+            key: "j",
+            command: true,
+            shift: true,
+            option: false,
+            control: false
+        )
+        UserDefaults.standard.set(
+            try JSONEncoder().encode(legacyShortcut),
+            forKey: KeyboardShortcutSettings.Action.globalSearch.defaultsKey
+        )
+        let directoryURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent(
+                "cmux-global-search-remove-invalid-\(UUID().uuidString)",
+                isDirectory: true
+            )
+        try FileManager.default.createDirectory(
+            at: directoryURL,
+            withIntermediateDirectories: true
+        )
+        defer { try? FileManager.default.removeItem(at: directoryURL) }
+
+        let settingsFileURL = directoryURL.appendingPathComponent("cmux.json")
+        try """
+        {
+          "shortcuts": {
+            "bindings": {
+              "globalSearch": "media.playPause"
+            }
+          }
+        }
+        """.write(to: settingsFileURL, atomically: true, encoding: .utf8)
+        let notificationCenter = NotificationCenter()
+        let store = KeyboardShortcutSettingsFileStore(
+            primaryPath: settingsFileURL.path,
+            fallbackPath: nil,
+            notificationCenter: notificationCenter,
+            startWatching: false
+        )
+        KeyboardShortcutSettings.settingsFileStore = store
+
+        #expect(store.isManagedByFile(.globalSearch))
+        #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == defaultGlobalSearchShortcut)
+
+        await confirmation("managed shortcut removal notification") { confirm in
+            let token = notificationCenter.addObserver(
+                forName: KeyboardShortcutSettings.didChangeNotification,
+                object: nil,
+                queue: nil
+            ) { _ in
+                confirm()
+            }
+            defer { notificationCenter.removeObserver(token) }
+            try "{}".write(to: settingsFileURL, atomically: true, encoding: .utf8)
+            #expect(store.reload())
+        }
+
+        #expect(!store.isManagedByFile(.globalSearch))
+        #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == legacyShortcut)
+    }
+
     @Test func directSetterRejectsShowHideCollision() {
         let collision = collisionShortcut
         SystemWideHotkeySettings.setShortcut(collision)
diff --git a/cmuxTests/KeyboardShortcutSettingsObserverTests.swift b/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
index c351919009d9..fb2f6db3fcbc 100644
--- a/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
+++ b/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
@@ -1,3 +1,4 @@
+import Carbon
 import Foundation
 import Testing
 
@@ -106,5 +107,49 @@ extension GlobalSearchShortcutBehaviorTests {
 
         #expect(KeyboardShortcutSettings.shortcut(for: action) == action.defaultShortcut)
     }
+
+    @Test func inputSourceChangeRefreshesGlobalSearchSnapshot() async {
+        let notificationCenter = NotificationCenter()
+        var configuredShortcut = StoredShortcut(
+            key: "f",
+            command: true,
+            shift: false,
+            option: true,
+            control: false
+        )
+        var globalSearchLookupCount = 0
+        let observer = KeyboardShortcutSettingsObserver(
+            notificationCenter: notificationCenter,
+            shortcutProvider: { action in
+                guard action == .globalSearch else { return .unbound }
+                globalSearchLookupCount += 1
+                return configuredShortcut
+            }
+        )
+        let initialLookupCount = globalSearchLookupCount
+        configuredShortcut = StoredShortcut(
+            key: "g",
+            command: true,
+            shift: true,
+            option: false,
+            control: false
+        )
+
+        DistributedNotificationCenter.default().postNotificationName(
+            Notification.Name(rawValue: kTISNotifySelectedKeyboardInputSourceChanged as String),
+            object: nil,
+            userInfo: nil,
+            deliverImmediately: true
+        )
+        var yields = 0
+        while globalSearchLookupCount == initialLookupCount, yields < 1_000 {
+            await Task.yield()
+            yields += 1
+        }
+
+        #expect(observer.globalSearchShortcut == configuredShortcut)
+        #expect(globalSearchLookupCount == initialLookupCount + 1)
+        #expect(observer.revision == 1)
+    }
     }
 }

From 5e348b6c56737109e16bbe2758268448706e428e Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 11:01:26 -0700
Subject: [PATCH 100/124] fix: harden global search shortcut policy

---
 .../Bindings/ShortcutListModel.swift          | 16 ++--
 ...e+VisibleGlobalSearchShortcutRouting.swift | 12 ++-
 .../KeyboardShortcutSettingsFileStore.swift   | 79 ++++---------------
 Sources/KeyboardShortcutSettingsLookup.swift  |  7 +-
 .../KeyboardShortcutSettingsObserver.swift    | 78 ++++++++++++++++++
 cmux.xcodeproj/project.pbxproj                |  4 +
 6 files changed, 119 insertions(+), 77 deletions(-)
 create mode 100644 Sources/KeyboardShortcutSettingsObserver.swift

diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
index 1473d7700c40..ccb5445c5b62 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
@@ -361,17 +361,13 @@ final class ShortcutListModel {
         await write(updated, clearingLegacyFor: action)
     }
 
-    /// Persists `shortcut` for `action` and clears its rejection/restore state.
+    /// Restores `shortcut` through the same validation path as a new recording.
     func restoreBinding(_ shortcut: StoredShortcut, for action: ShortcutAction) async {
-        guard !action.rejectsSystemDefinedMediaKey(shortcut) else {
-            markSystemReservedRejected(action)
-            return
+        if shortcut.hasChord {
+            await assignChord(shortcut, to: action)
+        } else {
+            await assign(stroke: shortcut.first, to: action)
         }
-        var updated = latestBindings
-        updated[action.rawValue] = shortcut
-        restoreShortcuts.removeValue(forKey: action.rawValue)
-        clearRejections(for: action)
-        await write(updated, clearingLegacyFor: action)
     }
 
     /// Clears every override and all in-memory rejection/restore state — the
@@ -472,7 +468,7 @@ final class ShortcutListModel {
         // Iterate a key snapshot because the loop mutates `restoreShortcuts`.
         for key in Array(restoreShortcuts.keys) {
             if let action = ShortcutAction(rawValue: key),
-               effective(for: action)?.isUnbound == true { continue }
+               effective(for: action)?.isUnbound ?? true { continue }
             restoreShortcuts.removeValue(forKey: key)
         }
     }
diff --git a/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift b/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
index 0463c2a7d50d..17bc3658c4fe 100644
--- a/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
+++ b/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
@@ -38,6 +38,8 @@ extension AppDelegate {
             return .notApplicable
         }
 
+        let previousPendingChord = pendingConfiguredShortcutChord
+        let previousActiveChord = activeConfiguredShortcutChordPrefixForCurrentEvent
         let eventWindowNumber = configuredShortcutChordWindowNumber(for: event)
         if let pendingConfiguredShortcutChord,
            pendingConfiguredShortcutChord.windowNumber == eventWindowNumber {
@@ -47,12 +49,18 @@ extension AppDelegate {
             activeConfiguredShortcutChordPrefixForCurrentEvent = nil
         }
         pendingConfiguredShortcutChord = nil
-        defer { activeConfiguredShortcutChordPrefixForCurrentEvent = nil }
 
-        return routeVisibleGlobalSearchShortcut(
+        let route = routeVisibleGlobalSearchShortcut(
             event,
             normalizedFlags: normalizedFlags
         )
+        if case .notApplicable = route {
+            pendingConfiguredShortcutChord = previousPendingChord
+            activeConfiguredShortcutChordPrefixForCurrentEvent = previousActiveChord
+        } else {
+            activeConfiguredShortcutChordPrefixForCurrentEvent = nil
+        }
+        return route
     }
 
     /// Applies the single visible-palette toggle policy for every local monitor.
diff --git a/Sources/KeyboardShortcutSettingsFileStore.swift b/Sources/KeyboardShortcutSettingsFileStore.swift
index 5e2049a460ff..5a97ae0fe4a3 100644
--- a/Sources/KeyboardShortcutSettingsFileStore.swift
+++ b/Sources/KeyboardShortcutSettingsFileStore.swift
@@ -6,65 +6,6 @@ import os
 
 nonisolated private let cmuxSettingsFileStoreLogger = Logger(subsystem: "com.cmuxterm.app", category: "SettingsStore")
 
-/// Publishes keyboard-shortcut revisions and owns hot-path matcher snapshots.
-@MainActor
-final class KeyboardShortcutSettingsObserver: ObservableObject {
-    typealias ShortcutProvider = (KeyboardShortcutSettings.Action) -> StoredShortcut
-
-    static let shared = KeyboardShortcutSettingsObserver()
-
-    @Published private(set) var revision: UInt64 = 0
-    private(set) var globalSearchShortcut: StoredShortcut
-    let rightSidebarModeShortcutMatcher: RightSidebarModeShortcutMatcher
-    private let shortcutProvider: ShortcutProvider
-    private var settingsCancellable: AnyCancellable?
-    private var recorderCancellable: AnyCancellable?
-
-    init(
-        notificationCenter: NotificationCenter = .default,
-        shortcutProvider: @escaping ShortcutProvider = KeyboardShortcutSettings.shortcut(for:)
-    ) {
-        self.shortcutProvider = shortcutProvider
-        globalSearchShortcut = shortcutProvider(.globalSearch)
-        rightSidebarModeShortcutMatcher = RightSidebarModeShortcutMatcher(
-            shortcutProvider: shortcutProvider
-        )
-        settingsCancellable = notificationCenter.publisher(
-            for: KeyboardShortcutSettings.didChangeNotification
-        ).sink { [weak self] _ in
-            Self.deliverOnMainActor { [weak self] in
-                guard let self else { return }
-                globalSearchShortcut = shortcutProvider(.globalSearch)
-                revision &+= 1
-                rightSidebarModeShortcutMatcher.reload()
-            }
-        }
-        recorderCancellable = notificationCenter.publisher(
-            for: KeyboardShortcutRecorderActivity.didChangeNotification
-        ).sink { [weak self] _ in
-            Self.deliverOnMainActor { [weak self] in
-                self?.revision &+= 1
-            }
-        }
-    }
-
-    /// Preserves synchronous delivery for main-thread settings mutations while
-    /// bridging background file-watcher notifications onto the main actor.
-    nonisolated private static func deliverOnMainActor(
-        _ action: @escaping @MainActor @Sendable () -> Void
-    ) {
-        if Thread.isMainThread {
-            MainActor.assumeIsolated {
-                action()
-            }
-        } else {
-            Task { @MainActor in
-                action()
-            }
-        }
-    }
-}
-
 final class CmuxSettingsFileStore {
     static let currentSchemaVersion = 1
     static let schemaURLString = "https://raw.githubusercontent.com/manaflow-ai/cmux/main/web/data/cmux.schema.json"
@@ -112,6 +53,7 @@ final class CmuxSettingsFileStore {
     private var socketPasswordObserver: NSObjectProtocol?
 
     private var shortcutsByAction: [KeyboardShortcutSettings.Action: StoredShortcut] = [:]
+    private var managedShortcutActions: Set<KeyboardShortcutSettings.Action> = []
     private var whenClausesByAction: [KeyboardShortcutSettings.Action: ShortcutWhenClause] = [:]
     private var activeManagedUserDefaults: [String: ManagedSettingsValue] = [:]
     private var importedManagedDefaults: [String: ManagedSettingsValue] = [:]
@@ -199,6 +141,7 @@ final class CmuxSettingsFileStore {
         let previousState = synchronized {
             (
                 shortcuts: shortcutsByAction,
+                managedShortcutActions: managedShortcutActions,
                 whenClauses: whenClausesByAction,
                 importedManagedDefaults: importedManagedDefaults,
                 sourcePath: activeSourcePath
@@ -217,6 +160,7 @@ final class CmuxSettingsFileStore {
         )
         synchronized {
             shortcutsByAction = resolved.shortcuts
+            managedShortcutActions = resolved.managedShortcutActions
             whenClausesByAction = resolved.whenClauses
             activeManagedUserDefaults = resolved.managedUserDefaults
             importedManagedDefaults = resolved.managedUserDefaults
@@ -227,6 +171,7 @@ final class CmuxSettingsFileStore {
         saveImportedManagedDefaults(resolved.managedUserDefaults)
 
         if previousState.shortcuts != resolved.shortcuts
+            || previousState.managedShortcutActions != resolved.managedShortcutActions
             || previousState.whenClauses != resolved.whenClauses
             || previousState.sourcePath != resolved.path {
             KeyboardShortcutSettings.notifySettingsFileDidChange(center: notificationCenter)
@@ -247,7 +192,7 @@ final class CmuxSettingsFileStore {
     }
 
     func isManagedByFile(_ action: KeyboardShortcutSettings.Action) -> Bool {
-        synchronized { shortcutsByAction[action] != nil }
+        synchronized { managedShortcutActions.contains(action) }
     }
 
     func settingsFileURLForEditing() -> URL {
@@ -310,6 +255,7 @@ final class CmuxSettingsFileStore {
                 ResolvedSettingsSnapshot(
                     path: activeSourcePath,
                     shortcuts: shortcutsByAction,
+                    managedShortcutActions: managedShortcutActions,
                     whenClauses: whenClausesByAction,
                     managedUserDefaults: activeManagedUserDefaults,
                     legacyDerivedManagedUserDefaultKeys: activeLegacyDerivedManagedUserDefaultKeys,
@@ -1018,6 +964,7 @@ final class CmuxSettingsFileStore {
                 cmuxSettingsFileStoreLogger.warning("ignoring unknown shortcut action '\(rawAction, privacy: .private(mask: .hash))' in \(sourcePath, privacy: .private(mask: .hash))")
                 continue
             }
+            snapshot.managedShortcutActions.insert(action)
             guard let shortcut = parseShortcutBindingValue(rawBinding, action: action) else {
                 cmuxSettingsFileStoreLogger.warning("ignoring invalid shortcut binding for '\(rawAction, privacy: .private(mask: .hash))' in \(sourcePath, privacy: .private(mask: .hash))")
                 continue
@@ -1842,6 +1789,7 @@ typealias KeyboardShortcutSettingsFileStore = CmuxSettingsFileStore
 struct ResolvedSettingsSnapshot {
     var path: String?
     var shortcuts: [KeyboardShortcutSettings.Action: StoredShortcut] = [:]
+    var managedShortcutActions: Set<KeyboardShortcutSettings.Action> = []
     /// Per-action `when`-clause overrides parsed from `shortcuts.when` — gate a
     /// binding to a focus context (see ``ShortcutWhenClause``).
     var whenClauses: [KeyboardShortcutSettings.Action: ShortcutWhenClause] = [:]
@@ -1850,13 +1798,18 @@ struct ResolvedSettingsSnapshot {
     var managedCustomSettings = ManagedCustomSettings()
 
     mutating func fillMissingSettings(from fallback: ResolvedSettingsSnapshot) {
-        if path == nil && (!fallback.shortcuts.isEmpty ||
+        if path == nil && (!fallback.managedShortcutActions.isEmpty ||
             !fallback.managedUserDefaults.isEmpty ||
             !fallback.managedCustomSettings.isEmpty) {
             path = fallback.path
         }
-        for (action, shortcut) in fallback.shortcuts where shortcuts[action] == nil {
-            shortcuts[action] = shortcut
+        let missingShortcutActions = fallback.managedShortcutActions
+            .subtracting(managedShortcutActions)
+        for action in missingShortcutActions {
+            managedShortcutActions.insert(action)
+            if let shortcut = fallback.shortcuts[action] {
+                shortcuts[action] = shortcut
+            }
         }
         for (action, clause) in fallback.whenClauses where whenClauses[action] == nil {
             whenClauses[action] = clause
diff --git a/Sources/KeyboardShortcutSettingsLookup.swift b/Sources/KeyboardShortcutSettingsLookup.swift
index bddd567021f5..37af18be0fa1 100644
--- a/Sources/KeyboardShortcutSettingsLookup.swift
+++ b/Sources/KeyboardShortcutSettingsLookup.swift
@@ -8,8 +8,11 @@ extension KeyboardShortcutSettings {
         shortcutLookupObserver?(action)
         #endif
 
-        if let managedShortcut = settingsFileStore.override(for: action) {
-            return effectivePersistedShortcut(managedShortcut, for: action)
+        if settingsFileStore.isManagedByFile(action) {
+            return effectivePersistedShortcut(
+                settingsFileStore.override(for: action),
+                for: action
+            )
         }
 
         let shortcut = UserDefaults.standard.data(forKey: action.defaultsKey)
diff --git a/Sources/KeyboardShortcutSettingsObserver.swift b/Sources/KeyboardShortcutSettingsObserver.swift
new file mode 100644
index 000000000000..32c3002eabfb
--- /dev/null
+++ b/Sources/KeyboardShortcutSettingsObserver.swift
@@ -0,0 +1,78 @@
+import Carbon
+import Combine
+import CmuxSettings
+import Foundation
+
+/// Publishes keyboard-shortcut revisions and owns hot-path matcher snapshots.
+@MainActor
+final class KeyboardShortcutSettingsObserver: ObservableObject {
+    typealias ShortcutProvider = (KeyboardShortcutSettings.Action) -> StoredShortcut
+
+    static let shared = KeyboardShortcutSettingsObserver()
+
+    @Published private(set) var revision: UInt64 = 0
+    private(set) var globalSearchShortcut: StoredShortcut
+    let rightSidebarModeShortcutMatcher: RightSidebarModeShortcutMatcher
+    private let shortcutProvider: ShortcutProvider
+    private var settingsCancellable: AnyCancellable?
+    private var recorderCancellable: AnyCancellable?
+    private var inputSourceCancellable: AnyCancellable?
+
+    init(
+        notificationCenter: NotificationCenter = .default,
+        shortcutProvider: @escaping ShortcutProvider = KeyboardShortcutSettings.shortcut(for:)
+    ) {
+        self.shortcutProvider = shortcutProvider
+        globalSearchShortcut = shortcutProvider(.globalSearch)
+        rightSidebarModeShortcutMatcher = RightSidebarModeShortcutMatcher(
+            shortcutProvider: shortcutProvider
+        )
+        settingsCancellable = notificationCenter.publisher(
+            for: KeyboardShortcutSettings.didChangeNotification
+        ).sink { [weak self] _ in
+            Self.deliverOnMainActor { [weak self] in
+                self?.reloadCachedShortcuts()
+            }
+        }
+        recorderCancellable = notificationCenter.publisher(
+            for: KeyboardShortcutRecorderActivity.didChangeNotification
+        ).sink { [weak self] _ in
+            Self.deliverOnMainActor { [weak self] in
+                self?.revision &+= 1
+            }
+        }
+        inputSourceCancellable = DistributedNotificationCenter.default()
+            .publisher(
+                for: Notification.Name(
+                    rawValue: kTISNotifySelectedKeyboardInputSourceChanged as String
+                )
+            )
+            .sink { [weak self] _ in
+                Self.deliverOnMainActor { [weak self] in
+                    self?.reloadCachedShortcuts()
+                }
+            }
+    }
+
+    private func reloadCachedShortcuts() {
+        globalSearchShortcut = shortcutProvider(.globalSearch)
+        revision &+= 1
+        rightSidebarModeShortcutMatcher.reload()
+    }
+
+    /// Preserves synchronous delivery for main-thread settings mutations while
+    /// bridging background notifications onto the main actor.
+    nonisolated private static func deliverOnMainActor(
+        _ action: @escaping @MainActor @Sendable () -> Void
+    ) {
+        if Thread.isMainThread {
+            MainActor.assumeIsolated {
+                action()
+            }
+        } else {
+            Task { @MainActor in
+                action()
+            }
+        }
+    }
+}
diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj
index 80f5e6289d1c..6132fd5d9a37 100644
--- a/cmux.xcodeproj/project.pbxproj
+++ b/cmux.xcodeproj/project.pbxproj
@@ -1034,6 +1034,7 @@ C0DE71B10000000000000001 /* AppDelegate+AgentChatNotifications.swift in Sources
 		C0DEF0B30000000000000001 /* KeyboardShortcutSettingsFileStoreMigrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0DEF0B30000000000000002 /* KeyboardShortcutSettingsFileStoreMigrationTests.swift */; };
 		E3337001E3337001E3337001 /* KeyboardShortcutSettingsFileStoreStartupTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3337002E3337002E3337002 /* KeyboardShortcutSettingsFileStoreStartupTests.swift */; };
 		C1713004C1713004C1713004 /* KeyboardShortcutSettingsLookup.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1713003C1713003C1713003 /* KeyboardShortcutSettingsLookup.swift */; };
+		8561C0128561C0128561C012 /* KeyboardShortcutSettingsObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561C0118561C0118561C011 /* KeyboardShortcutSettingsObserver.swift */; };
 		468160000000000000000001 /* KeyboardShortcutSettingsObserverTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 468160000000000000000002 /* KeyboardShortcutSettingsObserverTests.swift */; };
 		A17110000000000000000001 /* KeyboardShortcutSpaceKeyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A17110000000000000000002 /* KeyboardShortcutSpaceKeyTests.swift */; };
 		C34670040000000000000001 /* KeyboardShortcutTestSettingsIsolation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C34670040000000000000002 /* KeyboardShortcutTestSettingsIsolation.swift */; };
@@ -3290,6 +3291,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 		C0DEF0B30000000000000002 /* KeyboardShortcutSettingsFileStoreMigrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutSettingsFileStoreMigrationTests.swift; sourceTree = "<group>"; };
 		E3337002E3337002E3337002 /* KeyboardShortcutSettingsFileStoreStartupTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutSettingsFileStoreStartupTests.swift; sourceTree = "<group>"; };
 		C1713003C1713003C1713003 /* KeyboardShortcutSettingsLookup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutSettingsLookup.swift; sourceTree = "<group>"; };
+		8561C0118561C0118561C011 /* KeyboardShortcutSettingsObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutSettingsObserver.swift; sourceTree = "<group>"; };
 		468160000000000000000002 /* KeyboardShortcutSettingsObserverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutSettingsObserverTests.swift; sourceTree = "<group>"; };
 		A17110000000000000000002 /* KeyboardShortcutSpaceKeyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutSpaceKeyTests.swift; sourceTree = "<group>"; };
 		C34670040000000000000002 /* KeyboardShortcutTestSettingsIsolation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutTestSettingsIsolation.swift; sourceTree = "<group>"; };
@@ -5189,6 +5191,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				A50012F6 /* KeyboardShortcutRecorder.swift */,
 				A50012F9 /* KeyboardShortcutSettingsControls.swift */,
 				A5F10010A1B2C3D4E5F60719 /* KeyboardShortcutSettingsFileStore.swift */,
+				8561C0118561C0118561C011 /* KeyboardShortcutSettingsObserver.swift */,
 				A7984AC10000000000000002 /* CmuxSettingsFileStore+Live.swift */,
 				F7216003000000000000002 /* KeyboardShortcutSettingsFileStore+SectionParsers.swift */,
 				A6AC73030000000000000002 /* KeyboardShortcutSettingsFileStore+SidebarIndicators.swift */,
@@ -7915,6 +7918,7 @@ C0DE71B10000000000000002 /* AppDelegate+AgentChatNotifications.swift */ = {isa =
 				D5671301D5671301D5671301 /* KeyboardShortcutSettingsFileStore+TerminalScrollSpeed.swift in Sources */,
 				A5F10011A1B2C3D4E5F60719 /* KeyboardShortcutSettingsFileStore.swift in Sources */,
 				C1713004C1713004C1713004 /* KeyboardShortcutSettingsLookup.swift in Sources */,
+				8561C0128561C0128561C012 /* KeyboardShortcutSettingsObserver.swift in Sources */,
 				53750022A0B1C2D3E4F50022 /* MacAuthComposition.swift in Sources */,
 				D1F0A00600000000000000C1 /* MacPairedMacBackupBody.swift in Sources */,
 				D1F0A00700000000000000C1 /* MacPairedMacBackupOpWire.swift in Sources */,

From 9303fabcf9fec1d59b1b61f66bb779ef05168adc Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 11:13:23 -0700
Subject: [PATCH 101/124] test: fix managed shortcut notification coverage

---
 cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
index 51e86d002e53..6fc2e2b94334 100644
--- a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
@@ -254,7 +254,7 @@ extension GlobalSearchShortcutBehaviorTests {
         #expect(store.isManagedByFile(.globalSearch))
         #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == defaultGlobalSearchShortcut)
 
-        await confirmation("managed shortcut removal notification") { confirm in
+        try await confirmation("managed shortcut removal notification") { confirm in
             let token = notificationCenter.addObserver(
                 forName: KeyboardShortcutSettings.didChangeNotification,
                 object: nil,

From a205c5f475816b78c821da15f952f88790fb1b0f Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 14:54:23 -0700
Subject: [PATCH 102/124] test: cover shortcut policy review regressions

---
 .../ShortcutListRestoreValidationTests.swift  | 43 +++++++++++++++++++
 ...SearchShortcutPersistencePolicyTests.swift | 21 +++++++++
 2 files changed, 64 insertions(+)

diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListRestoreValidationTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListRestoreValidationTests.swift
index 1ab10b015829..3f6af2dbbb69 100644
--- a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListRestoreValidationTests.swift
+++ b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListRestoreValidationTests.swift
@@ -6,6 +6,49 @@ import Testing
 
 @MainActor
 @Suite struct ShortcutListRestoreValidationTests {
+    @Test func restorePreservesSupportedLegacyBareSpaceBinding() async throws {
+        let directory = FileManager.default.temporaryDirectory
+            .appendingPathComponent(
+                "shortcut-list-restore-bare-space-\(UUID().uuidString)",
+                isDirectory: true
+            )
+        try FileManager.default.createDirectory(
+            at: directory,
+            withIntermediateDirectories: true
+        )
+        defer { try? FileManager.default.removeItem(at: directory) }
+
+        let store = JSONConfigStore(fileURL: directory.appendingPathComponent("cmux.json"))
+        let catalog = SettingCatalog()
+        let shortcut = StoredShortcut(first: ShortcutStroke(key: "space"))
+        try await store.set(
+            [ShortcutAction.openSettings.rawValue: shortcut],
+            for: catalog.shortcuts.bindings
+        )
+        let model = ShortcutListModel(
+            jsonStore: store,
+            catalog: catalog,
+            errorLog: SettingsErrorLog()
+        )
+        model.startObserving()
+        await spin {
+            model.effective(for: .openSettings) == shortcut
+        }
+
+        await model.clearOrRestore(for: .openSettings)
+        await spin {
+            model.bindings[ShortcutAction.openSettings.rawValue]?.isUnbound == true
+        }
+        #expect(model.restoreShortcuts[ShortcutAction.openSettings.rawValue] == shortcut)
+
+        await model.clearOrRestore(for: .openSettings)
+
+        #expect(model.bindings[ShortcutAction.openSettings.rawValue] == shortcut)
+        #expect(model.effective(for: .openSettings) == shortcut)
+        #expect(model.restoreShortcuts[ShortcutAction.openSettings.rawValue] == nil)
+        #expect(!model.bareKeyRejections.contains(ShortcutAction.openSettings.rawValue))
+    }
+
     @Test func restoreRejectsNewShowHideConflictAndKeepsCandidate() async throws {
         let directory = FileManager.default.temporaryDirectory
             .appendingPathComponent(
diff --git a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
index 6fc2e2b94334..ac90b477e0ba 100644
--- a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
@@ -156,6 +156,27 @@ extension GlobalSearchShortcutBehaviorTests {
         #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) != legacyShortcut)
     }
 
+    @Test func invalidManagedShowHideFailsClosed() throws {
+        let fixture = try makeSettingsFileStore(
+            """
+            {
+              "shortcuts": {
+                "bindings": {
+                  "showHideAllWindows": "j"
+                }
+              }
+            }
+            """
+        )
+        defer { try? FileManager.default.removeItem(at: fixture.directoryURL) }
+        KeyboardShortcutSettings.settingsFileStore = fixture.store
+
+        #expect(fixture.store.override(for: .showHideAllWindows) == nil)
+        #expect(fixture.store.isManagedByFile(.showHideAllWindows))
+        #expect(SystemWideHotkeySettings.shortcut() == .unbound)
+        #expect(KeyboardShortcutSettings.shortcut(for: .showHideAllWindows) == .unbound)
+    }
+
     @Test func invalidPrimaryGlobalSearchShadowsFallbackFileShortcut() throws {
         let fallbackShortcut = StoredShortcut(
             key: "j",

From f958414566fa6065eb77ea50868d575a44cbf89b Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 14:57:14 -0700
Subject: [PATCH 103/124] fix: preserve managed shortcut policy invariants

---
 .../Bindings/ShortcutListModel.swift          | 20 ++++++++++++++++---
 .../ShortcutListRestoreValidationTests.swift  |  3 +++
 ...tcutSettings+PersistedShortcutPolicy.swift |  9 ++++++++-
 Sources/KeyboardShortcutSettingsLookup.swift  |  3 ++-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
index ccb5445c5b62..e253767e9653 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
@@ -271,9 +271,19 @@ final class ShortcutListModel {
     /// a non-digit stroke on a numbered action or a stroke that conflicts with
     /// another binding; a valid stroke is normalized, persisted, and clears the
     /// action's rejection/restore state.
-    func assign(stroke: ShortcutStroke, to action: ShortcutAction) async {
+    func assign(
+        stroke: ShortcutStroke,
+        to action: ShortcutAction,
+        preservingSupportedLegacyBareSpace: Bool = false
+    ) async {
         var stroke = stroke.canonicalized()
-        guard action.allowsBareFirstStroke || stroke.hasAnyModifier else {
+        let restoresSupportedLegacyBareSpace = preservingSupportedLegacyBareSpace
+            && action.shortcutBindingPolicyResult(
+                for: StoredShortcut(first: stroke)
+            ) == .accepted
+        guard action.allowsBareFirstStroke
+            || stroke.hasAnyModifier
+            || restoresSupportedLegacyBareSpace else {
             markBareKeyRejected(action)
             return
         }
@@ -366,7 +376,11 @@ final class ShortcutListModel {
         if shortcut.hasChord {
             await assignChord(shortcut, to: action)
         } else {
-            await assign(stroke: shortcut.first, to: action)
+            await assign(
+                stroke: shortcut.first,
+                to: action,
+                preservingSupportedLegacyBareSpace: true
+            )
         }
     }
 
diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListRestoreValidationTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListRestoreValidationTests.swift
index 3f6af2dbbb69..3fefae476365 100644
--- a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListRestoreValidationTests.swift
+++ b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListRestoreValidationTests.swift
@@ -42,6 +42,9 @@ import Testing
         #expect(model.restoreShortcuts[ShortcutAction.openSettings.rawValue] == shortcut)
 
         await model.clearOrRestore(for: .openSettings)
+        await spin {
+            model.bindings[ShortcutAction.openSettings.rawValue] == shortcut
+        }
 
         #expect(model.bindings[ShortcutAction.openSettings.rawValue] == shortcut)
         #expect(model.effective(for: .openSettings) == shortcut)
diff --git a/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift b/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
index 536b465e39e7..e6ec83b1e5d2 100644
--- a/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
+++ b/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
@@ -30,8 +30,15 @@ extension KeyboardShortcutSettings {
     /// built-in default when the candidate cannot execute.
     static func effectivePersistedShortcut(
         _ candidate: StoredShortcut?,
-        for action: Action
+        for action: Action,
+        managedBySettingsFile: Bool = false
     ) -> StoredShortcut? {
+        if managedBySettingsFile,
+           candidate == nil,
+           action == .showHideAllWindows {
+            return nil
+        }
+
         guard let settingsAction = CmuxSettings.ShortcutAction(rawValue: action.rawValue) else {
             return nil
         }
diff --git a/Sources/KeyboardShortcutSettingsLookup.swift b/Sources/KeyboardShortcutSettingsLookup.swift
index 37af18be0fa1..36cd97e9e786 100644
--- a/Sources/KeyboardShortcutSettingsLookup.swift
+++ b/Sources/KeyboardShortcutSettingsLookup.swift
@@ -11,7 +11,8 @@ extension KeyboardShortcutSettings {
         if settingsFileStore.isManagedByFile(action) {
             return effectivePersistedShortcut(
                 settingsFileStore.override(for: action),
-                for: action
+                for: action,
+                managedBySettingsFile: true
             )
         }
 

From 120b72c7942161736c68628452a6193520519a31 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 15:10:09 -0700
Subject: [PATCH 104/124] fix: route system-wide shortcut through shared policy

---
 Sources/KeyboardShortcutSettings.swift | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index 561cff93107f..ac13448e190e 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -1095,10 +1095,7 @@ enum SystemWideHotkeySettings {
 
     static func shortcut() -> StoredShortcut {
         migrateLegacyShortcutIfNeeded()
-        if let managedShortcut = KeyboardShortcutSettings.settingsFileStore.override(for: action) {
-            return managedShortcut
-        }
-        return storedShortcut() ?? defaultShortcut
+        return KeyboardShortcutSettings.shortcut(for: action)
     }
 
     static func setShortcut(_ shortcut: StoredShortcut) {

From da7fc3633fc085c4b4db5e0f7ee4bffbac6949a4 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 15:29:39 -0700
Subject: [PATCH 105/124] test: cover invalid managed shortcut display

---
 .../ShortcutListManagedBindingTests.swift     | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListManagedBindingTests.swift

diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListManagedBindingTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListManagedBindingTests.swift
new file mode 100644
index 000000000000..dadb8abf754e
--- /dev/null
+++ b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListManagedBindingTests.swift
@@ -0,0 +1,54 @@
+import CmuxSettings
+import Foundation
+import Testing
+
+@testable import CmuxSettingsUI
+
+@MainActor
+@Suite struct ShortcutListManagedBindingTests {
+    @Test func invalidManagedShowHideDoesNotDisplayBuiltInShortcut() async throws {
+        let directory = FileManager.default.temporaryDirectory
+            .appendingPathComponent(
+                "shortcut-list-invalid-managed-\(UUID().uuidString)",
+                isDirectory: true
+            )
+        try FileManager.default.createDirectory(
+            at: directory,
+            withIntermediateDirectories: true
+        )
+        defer { try? FileManager.default.removeItem(at: directory) }
+
+        let fileURL = directory.appendingPathComponent("cmux.json")
+        try """
+        {
+          "shortcuts": {
+            "bindings": {
+              "showHideAllWindows": "j"
+            }
+          }
+        }
+        """.write(to: fileURL, atomically: true, encoding: .utf8)
+
+        let model = ShortcutListModel(
+            jsonStore: JSONConfigStore(fileURL: fileURL),
+            catalog: SettingCatalog(),
+            errorLog: SettingsErrorLog()
+        )
+        model.startObserving()
+
+        await spin {
+            model.effective(for: .showHideAllWindows) == nil
+        }
+
+        #expect(model.effective(for: .showHideAllWindows) == nil)
+    }
+
+    private func spin(until condition: () -> Bool) async {
+        var spins = 0
+        while !condition(), spins < 100_000 {
+            await Task.yield()
+            spins += 1
+        }
+        #expect(condition(), "spin(until:) timed out after 100 000 yields")
+    }
+}

From 5d274909ea8ba2e4d9fb2c3946139b524b9218f4 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 15:40:54 -0700
Subject: [PATCH 106/124] fix: preserve invalid managed shortcut ownership

---
 .../KeyboardShortcutsCatalogSection.swift     |  13 ++
 .../Values/ShortcutBindingsSnapshot.swift     |  64 +++++++
 .../Values/StoredShortcut+ConfigParsing.swift | 174 ++++++++++++++++++
 .../CmuxSettings/Values/StoredShortcut.swift  |  11 +-
 .../ShortcutBindingsSnapshotTests.swift       |  36 ++++
 .../Bindings/ShortcutListModel.swift          |  18 +-
 ...SearchShortcutPersistencePolicyTests.swift |   2 +-
 7 files changed, 312 insertions(+), 6 deletions(-)
 create mode 100644 Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingsSnapshot.swift
 create mode 100644 Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/StoredShortcut+ConfigParsing.swift
 create mode 100644 Packages/macOS/CmuxSettings/Tests/CmuxSettingsTests/ShortcutBindingsSnapshotTests.swift

diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/KeyboardShortcutsCatalogSection.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/KeyboardShortcutsCatalogSection.swift
index 8a2144512798..32ccf6b6e312 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/KeyboardShortcutsCatalogSection.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/KeyboardShortcutsCatalogSection.swift
@@ -25,6 +25,19 @@ public struct KeyboardShortcutsCatalogSection: SettingCatalogSection {
         defaultValue: [:]
     )
 
+    /// Read projection that preserves every managed action ID even when its
+    /// binding is malformed. Derived from ``bindings`` so the catalog retains
+    /// one stored declaration for the `shortcuts.bindings` path.
+    public var bindingSnapshot: JSONKey<ShortcutBindingsSnapshot> {
+        JSONKey(
+            id: bindings.id,
+            defaultValue: ShortcutBindingsSnapshot(
+                bindings: [:],
+                managedActionIDs: []
+            )
+        )
+    }
+
     /// Per-action focus predicates (`shortcuts.when`), keyed by action id, as
     /// raw expression strings. The app target owns parsing/evaluation; the
     /// Settings UI only needs to know which actions are context-scoped so its
diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingsSnapshot.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingsSnapshot.swift
new file mode 100644
index 000000000000..111100fd5f97
--- /dev/null
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingsSnapshot.swift
@@ -0,0 +1,64 @@
+import Foundation
+
+/// A decoded shortcut-binding map plus every action ID managed by that map.
+///
+/// Shortcut values are decoded independently so one malformed binding cannot
+/// hide valid siblings. ``managedActionIDs`` retains malformed entries as
+/// managed, allowing consumers to suppress lower-precedence legacy values.
+public struct ShortcutBindingsSnapshot: Sendable, Equatable, SettingCodable {
+    /// Successfully decoded bindings, keyed by shortcut action ID.
+    public let bindings: [String: StoredShortcut]
+
+    /// Every action ID present in the persisted map, including invalid entries.
+    public let managedActionIDs: Set<String>
+
+    /// Creates a shortcut-binding snapshot.
+    ///
+    /// - Parameters:
+    ///   - bindings: Successfully decoded shortcut bindings.
+    ///   - managedActionIDs: Every action ID present in the persisted map.
+    public init(
+        bindings: [String: StoredShortcut],
+        managedActionIDs: Set<String>
+    ) {
+        self.bindings = bindings
+        self.managedActionIDs = managedActionIDs
+    }
+
+    /// Decodes a property-list binding map while retaining every action ID.
+    public static func decodeFromUserDefaults(_ raw: Any?) -> ShortcutBindingsSnapshot? {
+        decode(raw, using: StoredShortcut.decodeFromUserDefaults(_:))
+    }
+
+    /// Encodes the successfully decoded bindings for property-list storage.
+    public func encodeForUserDefaults() -> Any {
+        bindings.mapValues { $0.encodeForUserDefaults() }
+    }
+
+    /// Decodes a JSON binding map while retaining every action ID.
+    public static func decodeFromJSON(_ raw: Any?) -> ShortcutBindingsSnapshot? {
+        decode(raw, using: StoredShortcut.decodeFromJSON(_:))
+    }
+
+    /// Encodes the successfully decoded bindings for JSON storage.
+    public func encodeForJSON() -> Any {
+        bindings.mapValues { $0.encodeForJSON() }
+    }
+
+    private static func decode(
+        _ raw: Any?,
+        using decodeValue: (Any?) -> StoredShortcut?
+    ) -> ShortcutBindingsSnapshot? {
+        guard let dictionary = raw as? [String: Any] else { return nil }
+
+        var bindings: [String: StoredShortcut] = [:]
+        bindings.reserveCapacity(dictionary.count)
+        for (actionID, rawValue) in dictionary {
+            bindings[actionID] = decodeValue(rawValue)
+        }
+        return ShortcutBindingsSnapshot(
+            bindings: bindings,
+            managedActionIDs: Set(dictionary.keys)
+        )
+    }
+}
diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/StoredShortcut+ConfigParsing.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/StoredShortcut+ConfigParsing.swift
new file mode 100644
index 000000000000..eb4d8380d743
--- /dev/null
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/StoredShortcut+ConfigParsing.swift
@@ -0,0 +1,174 @@
+import Foundation
+
+extension StoredShortcut {
+    /// Parses the human-editable shortcut forms accepted by `cmux.json`.
+    static func parseConfig(
+        _ rawValue: String,
+        allowBareFirstStroke: Bool = false
+    ) -> StoredShortcut? {
+        if isUnboundConfigToken(rawValue) {
+            return .unbound
+        }
+        return parseConfig(
+            strokes: [rawValue],
+            allowBareFirstStroke: allowBareFirstStroke
+        )
+    }
+
+    /// Parses a one- or two-stroke human-editable shortcut binding.
+    static func parseConfig(
+        strokes: [String],
+        allowBareFirstStroke: Bool = false
+    ) -> StoredShortcut? {
+        guard !strokes.isEmpty, strokes.count <= 2 else { return nil }
+        if strokes.count == 1,
+           let rawValue = strokes.first,
+           isUnboundConfigToken(rawValue) {
+            return .unbound
+        }
+
+        let parsedStrokes = strokes.compactMap(ShortcutStroke.parseConfig(_:))
+        guard parsedStrokes.count == strokes.count,
+              let firstStroke = parsedStrokes.first else {
+            return nil
+        }
+        guard allowBareFirstStroke
+            || firstStroke.hasAnyModifier
+            || firstStroke.key == "space" else {
+            return nil
+        }
+
+        let secondStroke = parsedStrokes.count == 2 ? parsedStrokes[1] : nil
+        return StoredShortcut(first: firstStroke, second: secondStroke)
+    }
+
+    private static func isUnboundConfigToken(_ rawValue: String) -> Bool {
+        if rawValue.isEmpty { return true }
+        if rawValue == " " { return false }
+        let normalized = rawValue.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+        guard !normalized.isEmpty else { return true }
+        return normalized == "none"
+            || normalized == "clear"
+            || normalized == "unbound"
+            || normalized == "disabled"
+    }
+}
+
+private extension ShortcutStroke {
+    static func parseConfig(_ rawValue: String) -> ShortcutStroke? {
+        guard !rawValue.isEmpty else { return nil }
+
+        let rawParts = rawValue.split(
+            separator: "+",
+            omittingEmptySubsequences: false
+        ).map(String.init)
+        let parts = rawParts.map {
+            $0.trimmingCharacters(in: .whitespacesAndNewlines)
+        }
+        guard !parts.isEmpty,
+              let lastRawPart = rawParts.last,
+              !lastRawPart.isEmpty else {
+            return nil
+        }
+
+        var command = false
+        var shift = false
+        var option = false
+        var control = false
+
+        for modifier in parts.dropLast() {
+            switch modifier.lowercased() {
+            case "cmd", "command", "⌘":
+                command = true
+            case "shift", "⇧":
+                shift = true
+            case "opt", "option", "alt", "⌥":
+                option = true
+            case "ctrl", "control", "ctl", "⌃":
+                control = true
+            default:
+                return nil
+            }
+        }
+
+        guard let key = parseConfigKeyToken(lastRawPart) else { return nil }
+        return ShortcutStroke(
+            key: key,
+            command: command,
+            shift: shift,
+            option: option,
+            control: control
+        )
+    }
+
+    static func parseConfigKeyToken(_ rawValue: String) -> String? {
+        let trimmed = rawValue.trimmingCharacters(in: .whitespacesAndNewlines)
+        if trimmed.isEmpty {
+            return rawValue == " " ? "space" : nil
+        }
+
+        let lowered = trimmed.lowercased()
+        switch lowered {
+        case "left", "arrowleft", "leftarrow", "←":
+            return "←"
+        case "right", "arrowright", "rightarrow", "→":
+            return "→"
+        case "up", "arrowup", "uparrow", "↑":
+            return "↑"
+        case "down", "arrowdown", "downarrow", "↓":
+            return "↓"
+        case "tab":
+            return "\t"
+        case "return", "enter", "↩":
+            return "\r"
+        case "space", "spacebar", "<space>":
+            return "space"
+        case "comma":
+            return ","
+        case "period", "dot":
+            return "."
+        case "slash":
+            return "/"
+        case "backslash":
+            return "\\"
+        case "semicolon":
+            return ";"
+        case "quote", "apostrophe":
+            return "'"
+        case "backtick", "grave":
+            return "`"
+        case "minus", "hyphen":
+            return "-"
+        case "plus", "equals":
+            return "="
+        case "leftbracket", "openbracket":
+            return "["
+        case "rightbracket", "closebracket":
+            return "]"
+        case "volumeup", "mediavolumeup", "media.volumeup":
+            return "media.volumeUp"
+        case "volumedown", "mediavolumedown", "media.volumedown":
+            return "media.volumeDown"
+        case "brightnessup", "mediabrightnessup", "media.brightnessup":
+            return "media.brightnessUp"
+        case "brightnessdown", "mediabrightnessdown", "media.brightnessdown":
+            return "media.brightnessDown"
+        case "mute", "mediamute", "media.mute":
+            return "media.mute"
+        case "playpause", "mediaplaypause", "media.playpause":
+            return "media.playPause"
+        case "nexttrack", "medianext", "media.next", "media.nexttrack":
+            return "media.next"
+        case "previoustrack", "mediaprevious", "media.previous", "media.previoustrack":
+            return "media.previous"
+        default:
+            if lowered.hasPrefix("f"),
+               let number = Int(lowered.dropFirst()),
+               (1...20).contains(number) {
+                return "f\(number)"
+            }
+            guard lowered.count == 1 else { return nil }
+            return lowered
+        }
+    }
+}
diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/StoredShortcut.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/StoredShortcut.swift
index 48d2b6fc49ec..a6c45d4da7e5 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/StoredShortcut.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/StoredShortcut.swift
@@ -47,7 +47,16 @@ public struct StoredShortcut: Sendable, Equatable, Hashable, Codable, SettingCod
     }
 
     public static func decodeFromJSON(_ raw: Any?) -> StoredShortcut? {
-        guard let raw, !(raw is NSNull) else { return nil }
+        guard let raw else { return nil }
+        if raw is NSNull { return .unbound }
+        if let string = raw as? String {
+            return parseConfig(string, allowBareFirstStroke: true)
+        }
+        if let strings = raw as? [String] {
+            return strings.isEmpty
+                ? .unbound
+                : parseConfig(strokes: strings, allowBareFirstStroke: true)
+        }
         guard let data = try? JSONSerialization.data(withJSONObject: raw, options: .fragmentsAllowed) else {
             return nil
         }
diff --git a/Packages/macOS/CmuxSettings/Tests/CmuxSettingsTests/ShortcutBindingsSnapshotTests.swift b/Packages/macOS/CmuxSettings/Tests/CmuxSettingsTests/ShortcutBindingsSnapshotTests.swift
new file mode 100644
index 000000000000..50e57bbf1642
--- /dev/null
+++ b/Packages/macOS/CmuxSettings/Tests/CmuxSettingsTests/ShortcutBindingsSnapshotTests.swift
@@ -0,0 +1,36 @@
+import Foundation
+import Testing
+
+@testable import CmuxSettings
+
+@Suite struct ShortcutBindingsSnapshotTests {
+    @Test func decodesBindingsIndependentlyAndRetainsManagedActionIDs() throws {
+        let raw: [String: Any] = [
+            "globalSearch": "cmd+alt+f",
+            "newSurface": ["ctrl+b", "c"],
+            "showHideAllWindows": 42,
+            "openSettings": NSNull(),
+        ]
+
+        let snapshot = try #require(
+            ShortcutBindingsSnapshot.decodeFromJSON(raw)
+        )
+
+        #expect(snapshot.managedActionIDs == Set(raw.keys))
+        #expect(snapshot.bindings["globalSearch"] == StoredShortcut(
+            first: ShortcutStroke(key: "f", command: true, option: true)
+        ))
+        #expect(snapshot.bindings["newSurface"] == StoredShortcut(
+            first: ShortcutStroke(key: "b", control: true),
+            second: ShortcutStroke(key: "c")
+        ))
+        #expect(snapshot.bindings["showHideAllWindows"] == nil)
+        #expect(snapshot.bindings["openSettings"] == .unbound)
+    }
+
+    @Test func decodesBareBindingBeforeActionSpecificPolicyRuns() throws {
+        let shortcut = try #require(StoredShortcut.decodeFromJSON("j"))
+
+        #expect(shortcut == StoredShortcut(first: ShortcutStroke(key: "j")))
+    }
+}
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
index e253767e9653..f84a72196b1e 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
@@ -11,6 +11,7 @@ final class ShortcutListModel {
     // MARK: - Observed state
 
     private(set) var bindings: [String: StoredShortcut] = [:]
+    private(set) var managedBindingActionIDs: Set<String> = []
     private(set) var legacyBindings: [String: StoredShortcut]
     private(set) var whenOverrideClauses: [String: ShortcutWhenClause] = [:]
     private(set) var whenOverrideRawStrings: [String: String] = [:]
@@ -33,7 +34,7 @@ final class ShortcutListModel {
     @ObservationIgnored private let catalog: SettingCatalog
     @ObservationIgnored private let errorLog: SettingsErrorLog
     @ObservationIgnored private let onShortcutsChanged: @MainActor () -> Void
-    @ObservationIgnored private let bindingsDriver = SettingReadDriver<[String: StoredShortcut]>()
+    @ObservationIgnored private let bindingsDriver = SettingReadDriver<ShortcutBindingsSnapshot>()
     @ObservationIgnored private let legacyBindingsDriver = SettingReadDriver<[String: StoredShortcut]>()
     @ObservationIgnored private let whenDriver = SettingReadDriver<[String: String]>()
 
@@ -61,7 +62,7 @@ final class ShortcutListModel {
     /// Starts observing the store's shortcut streams. Idempotent: ``SettingReadDriver``
     /// ignores subsequent calls after the first activation.
     func startObserving() {
-        let bindingsKey = catalog.shortcuts.bindings
+        let bindingsKey = catalog.shortcuts.bindingSnapshot
         let whenKey = catalog.shortcuts.when
         bindingsDriver.activate(
             { [jsonStore, bindingsKey] in jsonStore.values(for: bindingsKey) },
@@ -86,10 +87,12 @@ final class ShortcutListModel {
 
     private var latestBindings: [String: StoredShortcut] { pendingBindings ?? bindings }
 
-    private func ingestBindings(_ dictionary: [String: StoredShortcut]) {
+    private func ingestBindings(_ snapshot: ShortcutBindingsSnapshot) {
+        let dictionary = snapshot.bindings
         let changedActionIds = Set(bindings.keys).union(dictionary.keys)
             .filter { bindings[$0] != dictionary[$0] }
         bindings = dictionary
+        managedBindingActionIDs = snapshot.managedActionIDs
         pruneRestoreShortcuts()
         pruneConflictRejections(changedActionIds: Set(changedActionIds))
         pruneNumberedDigitRejections(changedActionIds: Set(changedActionIds))
@@ -109,7 +112,14 @@ final class ShortcutListModel {
     /// The effective shortcut for `action`, using the runtime's JSON, legacy
     /// UserDefaults, then built-in precedence.
     func effective(for action: ShortcutAction) -> StoredShortcut? {
-        let candidate = latestBindings[action.rawValue] ?? legacyBindings[action.rawValue]
+        let actionID = action.rawValue
+        let candidate: StoredShortcut?
+        if pendingBindings != nil || !managedBindingActionIDs.contains(actionID) {
+            candidate = latestBindings[actionID] ?? legacyBindings[actionID]
+        } else {
+            candidate = bindings[actionID]
+            if candidate == nil, action == .showHideAllWindows { return nil }
+        }
         return action.effectivePersistedShortcut(candidate) { shortcut in
             guard action == .globalSearch,
                   let systemWideShortcut = effective(for: .showHideAllWindows) else {
diff --git a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
index ac90b477e0ba..9306dcc99945 100644
--- a/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
+++ b/cmuxTests/GlobalSearchShortcutPersistencePolicyTests.swift
@@ -362,7 +362,7 @@ extension GlobalSearchShortcutBehaviorTests {
         KeyboardShortcutSettings.setShortcut(globalSearchShortcut, for: .globalSearch)
 
         #expect(invalidShowHideChord.carbonHotKeyRegistration == nil)
-        #expect(SystemWideHotkeySettings.shortcut() == invalidShowHideChord)
+        #expect(SystemWideHotkeySettings.shortcut() == .unbound)
         #expect(KeyboardShortcutSettings.shortcut(for: .showHideAllWindows) == .unbound)
         #expect(KeyboardShortcutSettings.shortcut(for: .globalSearch) == globalSearchShortcut)
     }

From d9dafb85e45c6b047f2ab78b831fce110d9ae5c7 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 16:13:11 -0700
Subject: [PATCH 107/124] test: cover shortcut policy closeout regressions

---
 .../ShortcutBindingPolicyResultTests.swift    | 27 ++++++++++
 .../ShortcutListManagedBindingTests.swift     | 51 +++++++++++++++++++
 .../SystemWideHotkeyShortcutPolicyTests.swift | 29 +++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 Packages/macOS/CmuxSettings/Tests/CmuxSettingsTests/ShortcutBindingPolicyResultTests.swift

diff --git a/Packages/macOS/CmuxSettings/Tests/CmuxSettingsTests/ShortcutBindingPolicyResultTests.swift b/Packages/macOS/CmuxSettings/Tests/CmuxSettingsTests/ShortcutBindingPolicyResultTests.swift
new file mode 100644
index 000000000000..807ea74c43f1
--- /dev/null
+++ b/Packages/macOS/CmuxSettings/Tests/CmuxSettingsTests/ShortcutBindingPolicyResultTests.swift
@@ -0,0 +1,27 @@
+import Testing
+@testable import CmuxSettings
+
+@Suite struct ShortcutBindingPolicyResultTests {
+    @Test func showHideRequiresCommandOptionOrControl() {
+        let shiftOnly = StoredShortcut(
+            first: ShortcutStroke(
+                key: "j",
+                command: false,
+                shift: true,
+                option: false,
+                control: false
+            )
+        )
+
+        #expect(
+            ShortcutAction.showHideAllWindows.shortcutBindingPolicyResult(
+                for: shiftOnly
+            ) != .accepted
+        )
+        #expect(
+            ShortcutAction.showHideAllWindows.effectivePersistedShortcut(
+                shiftOnly
+            ) == nil
+        )
+    }
+}
diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListManagedBindingTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListManagedBindingTests.swift
index dadb8abf754e..d49f93e999ae 100644
--- a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListManagedBindingTests.swift
+++ b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/ShortcutListManagedBindingTests.swift
@@ -43,6 +43,57 @@ import Testing
         #expect(model.effective(for: .showHideAllWindows) == nil)
     }
 
+    @Test func unrelatedWritePreservesMalformedManagedSibling() async throws {
+        let directory = FileManager.default.temporaryDirectory
+            .appendingPathComponent(
+                "shortcut-list-preserves-malformed-\(UUID().uuidString)",
+                isDirectory: true
+            )
+        try FileManager.default.createDirectory(
+            at: directory,
+            withIntermediateDirectories: true
+        )
+        defer { try? FileManager.default.removeItem(at: directory) }
+
+        let fileURL = directory.appendingPathComponent("cmux.json")
+        try """
+        {
+          "shortcuts": {
+            "bindings": {
+              "showHideAllWindows": 42
+            }
+          }
+        }
+        """.write(to: fileURL, atomically: true, encoding: .utf8)
+
+        let model = ShortcutListModel(
+            jsonStore: JSONConfigStore(fileURL: fileURL),
+            catalog: SettingCatalog(),
+            errorLog: SettingsErrorLog()
+        )
+        model.startObserving()
+        await spin {
+            model.managedBindingActionIDs.contains(
+                ShortcutAction.showHideAllWindows.rawValue
+            )
+        }
+
+        await model.clearBinding(for: .globalSearch)
+
+        let root = try #require(
+            try JSONSerialization.jsonObject(with: Data(contentsOf: fileURL))
+                as? [String: Any]
+        )
+        let shortcuts = try #require(root["shortcuts"] as? [String: Any])
+        let bindings = try #require(shortcuts["bindings"] as? [String: Any])
+        #expect(bindings["showHideAllWindows"] as? Int == 42)
+        #expect(
+            StoredShortcut.decodeFromJSON(
+                bindings["globalSearch"]
+            )?.isUnbound == true
+        )
+    }
+
     private func spin(until condition: () -> Bool) async {
         var spins = 0
         while !condition(), spins < 100_000 {
diff --git a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
index 4076ba569758..21aca975e582 100644
--- a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
+++ b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
@@ -63,6 +63,35 @@ extension GlobalSearchShortcutBehaviorTests {
         #expect(KeyboardShortcutSettings.Action.globalSearch.normalizedRecordedShortcutResult(shortcut) == .accepted(shortcut))
     }
 
+    @Test func nonRegistrableShowHideDoesNotReserveGlobalSearch() throws {
+        let commandPeriod = StoredShortcut(
+            key: ".",
+            command: true,
+            shift: false,
+            option: false,
+            control: false
+        )
+        let encoded = try JSONEncoder().encode(commandPeriod)
+        UserDefaults.standard.set(
+            encoded,
+            forKey: KeyboardShortcutSettings.Action.showHideAllWindows.defaultsKey
+        )
+        UserDefaults.standard.set(
+            encoded,
+            forKey: KeyboardShortcutSettings.Action.globalSearch.defaultsKey
+        )
+
+        #expect(
+            SystemWideHotkeySettings.registrationCandidate(
+                for: commandPeriod
+            ) == nil
+        )
+        #expect(
+            KeyboardShortcutSettings.shortcut(for: .globalSearch)
+                == commandPeriod
+        )
+    }
+
     @Test func controllerRegistersOnlyOptInShowHideShortcut() throws {
         SystemWideHotkeyController.shared.start()
         SystemWideHotkeySettings.setEnabled(false)

From aef6b0d89ee2ae8b37e0f0ba97a68f03aaaa0c10 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 16:18:05 -0700
Subject: [PATCH 108/124] fix: unify shortcut persistence and registration
 policy

---
 .../Values/ShortcutBindingPolicyResult.swift  |  9 +++
 .../ShortcutListModel+Persistence.swift       | 66 +++++++++++++++++
 .../Bindings/ShortcutListModel.swift          | 74 +++++--------------
 ...tcutSettings+PersistedShortcutPolicy.swift | 14 +++-
 ...utSettings+SystemWideHotkeyConflicts.swift | 32 +++++++-
 Sources/KeyboardShortcutSettings.swift        | 23 +-----
 6 files changed, 139 insertions(+), 79 deletions(-)
 create mode 100644 Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Persistence.swift

diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
index 73a65a849069..ab5b9ef107ae 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
@@ -10,6 +10,9 @@ public enum ShortcutBindingPolicyResult: Sendable, Equatable {
     /// The action requires a modifier on this first stroke.
     case bareFirstStrokeNotAllowed
 
+    /// The system-wide action requires Command, Option, or Control.
+    case primaryModifierRequired
+
     /// The action does not support two-stroke shortcuts.
     case chordNotAllowed
 
@@ -38,6 +41,12 @@ public extension ShortcutAction {
         }
 
         let first = shortcut.first
+        if self == .showHideAllWindows,
+           !first.command,
+           !first.option,
+           !first.control {
+            return .primaryModifierRequired
+        }
         let supportsLegacyBareSpace = first.key.lowercased() == "space"
             && self != .globalSearch
         guard allowsBareFirstStroke
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Persistence.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Persistence.swift
new file mode 100644
index 000000000000..f6e2d05a2770
--- /dev/null
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Persistence.swift
@@ -0,0 +1,66 @@
+import CmuxSettings
+
+extension ShortcutListModel {
+    /// Persists one binding leaf, or resets the complete map for Reset Defaults.
+    func write(
+        _ updated: [String: StoredShortcut],
+        clearingLegacyFor action: ShortcutAction? = nil,
+        resetAllLegacy: Bool = false
+    ) async {
+        pendingWriteGeneration += 1
+        let generation = pendingWriteGeneration
+        pendingBindings = updated
+        bindings = updated
+        if let action {
+            managedBindingActionIDs.insert(action.rawValue)
+        } else {
+            managedBindingActionIDs.removeAll()
+        }
+
+        do {
+            if let action {
+                let key = JSONKey<StoredShortcut>(
+                    id: "\(catalog.shortcuts.bindings.id).\(action.rawValue)",
+                    defaultValue: .unbound
+                )
+                try await jsonStore.set(
+                    updated[action.rawValue] ?? .unbound,
+                    for: key
+                )
+            } else {
+                try await jsonStore.reset(catalog.shortcuts.bindings)
+            }
+            if resetAllLegacy {
+                await userDefaultsStore?.resetAllLegacyShortcutBindings()
+                legacyBindings.removeAll()
+            } else if let action, legacyBindings[action.rawValue] != nil {
+                await userDefaultsStore?.resetLegacyShortcutBinding(for: action)
+                legacyBindings.removeValue(forKey: action.rawValue)
+            }
+            onShortcutsChanged()
+            if pendingWriteGeneration == generation {
+                pendingBindings = nil
+            }
+        } catch {
+            if pendingWriteGeneration == generation {
+                let committed = await jsonStore.value(
+                    for: catalog.shortcuts.bindingSnapshot
+                )
+                if pendingWriteGeneration == generation {
+                    let changedActionIds = Set(bindings.keys)
+                        .union(committed.bindings.keys)
+                        .filter { bindings[$0] != committed.bindings[$0] }
+                    bindings = committed.bindings
+                    managedBindingActionIDs = committed.managedActionIDs
+                    pendingBindings = nil
+                    pruneRestoreShortcuts()
+                    pruneConflictRejections()
+                    pruneNumberedDigitRejections(
+                        changedActionIds: Set(changedActionIds)
+                    )
+                }
+            }
+            errorLog.record(error, keyID: catalog.shortcuts.bindings.id)
+        }
+    }
+}
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
index f84a72196b1e..7ad7ec034331 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
@@ -10,9 +10,9 @@ final class ShortcutListModel {
 
     // MARK: - Observed state
 
-    private(set) var bindings: [String: StoredShortcut] = [:]
-    private(set) var managedBindingActionIDs: Set<String> = []
-    private(set) var legacyBindings: [String: StoredShortcut]
+    var bindings: [String: StoredShortcut] = [:]
+    var managedBindingActionIDs: Set<String> = []
+    var legacyBindings: [String: StoredShortcut]
     private(set) var whenOverrideClauses: [String: ShortcutWhenClause] = [:]
     private(set) var whenOverrideRawStrings: [String: String] = [:]
     private(set) var chordModeActions: Set<String> = []
@@ -24,16 +24,16 @@ final class ShortcutListModel {
     /// Per-action conflict target for the red validation banner.
     private(set) var conflictRejections: [String: ShortcutAction] = [:]
     @ObservationIgnored private var rejectedConflictShortcuts: [String: StoredShortcut] = [:]
-    private var pendingBindings: [String: StoredShortcut]?
-    @ObservationIgnored private var pendingWriteGeneration = 0
+    var pendingBindings: [String: StoredShortcut]?
+    @ObservationIgnored var pendingWriteGeneration = 0
 
     // MARK: - Observation-ignored internals
 
-    @ObservationIgnored private let jsonStore: JSONConfigStore
-    @ObservationIgnored private let userDefaultsStore: UserDefaultsSettingsStore?
-    @ObservationIgnored private let catalog: SettingCatalog
-    @ObservationIgnored private let errorLog: SettingsErrorLog
-    @ObservationIgnored private let onShortcutsChanged: @MainActor () -> Void
+    @ObservationIgnored let jsonStore: JSONConfigStore
+    @ObservationIgnored let userDefaultsStore: UserDefaultsSettingsStore?
+    @ObservationIgnored let catalog: SettingCatalog
+    @ObservationIgnored let errorLog: SettingsErrorLog
+    @ObservationIgnored let onShortcutsChanged: @MainActor () -> Void
     @ObservationIgnored private let bindingsDriver = SettingReadDriver<ShortcutBindingsSnapshot>()
     @ObservationIgnored private let legacyBindingsDriver = SettingReadDriver<[String: StoredShortcut]>()
     @ObservationIgnored private let whenDriver = SettingReadDriver<[String: String]>()
@@ -114,7 +114,7 @@ final class ShortcutListModel {
     func effective(for action: ShortcutAction) -> StoredShortcut? {
         let actionID = action.rawValue
         let candidate: StoredShortcut?
-        if pendingBindings != nil || !managedBindingActionIDs.contains(actionID) {
+        if !managedBindingActionIDs.contains(actionID) {
             candidate = latestBindings[actionID] ?? legacyBindings[actionID]
         } else {
             candidate = bindings[actionID]
@@ -313,6 +313,11 @@ final class ShortcutListModel {
             )
         }
         let proposed = StoredShortcut(first: stroke)
+        if action.shortcutBindingPolicyResult(for: proposed)
+            == .primaryModifierRequired {
+            markBareKeyRejected(action)
+            return
+        }
         if action.rejectsSystemDefinedMediaKey(proposed) {
             markSystemReservedRejected(action)
             return
@@ -406,52 +411,11 @@ final class ShortcutListModel {
         await write([:], resetAllLegacy: true)
     }
 
-    /// Persists `updated` to the bindings store, recording any failure to the
-    /// error log.
-    private func write(
-        _ updated: [String: StoredShortcut],
-        clearingLegacyFor action: ShortcutAction? = nil,
-        resetAllLegacy: Bool = false
-    ) async {
-        pendingWriteGeneration += 1
-        let generation = pendingWriteGeneration
-        pendingBindings = updated
-        bindings = updated
-        do {
-            try await jsonStore.set(updated, for: catalog.shortcuts.bindings)
-            if resetAllLegacy {
-                await userDefaultsStore?.resetAllLegacyShortcutBindings()
-                legacyBindings.removeAll()
-            } else if let action, legacyBindings[action.rawValue] != nil {
-                await userDefaultsStore?.resetLegacyShortcutBinding(for: action)
-                legacyBindings.removeValue(forKey: action.rawValue)
-            }
-            onShortcutsChanged()
-            if pendingWriteGeneration == generation {
-                pendingBindings = nil
-            }
-        } catch {
-            if pendingWriteGeneration == generation {
-                let committed = await jsonStore.value(for: catalog.shortcuts.bindings)
-                if pendingWriteGeneration == generation {
-                    let changedActionIds = Set(bindings.keys).union(committed.keys)
-                        .filter { bindings[$0] != committed[$0] }
-                    bindings = committed
-                    pendingBindings = nil
-                    pruneRestoreShortcuts()
-                    pruneConflictRejections()
-                    pruneNumberedDigitRejections(changedActionIds: Set(changedActionIds))
-                }
-            }
-            errorLog.record(error, keyID: catalog.shortcuts.bindings.id)
-        }
-    }
-
     // MARK: - Prune helpers (moved verbatim from section)
 
     /// Drops the "Use a digit from 1 through 9" banner for an action only when
     /// *that action's* binding actually changed in the latest stream update.
-    private func pruneNumberedDigitRejections(changedActionIds: Set<String>) {
+    func pruneNumberedDigitRejections(changedActionIds: Set<String>) {
         guard !numberedDigitRejections.isEmpty else { return }
         for key in Array(numberedDigitRejections) where changedActionIds.contains(key) {
             numberedDigitRejections.remove(key)
@@ -460,7 +424,7 @@ final class ShortcutListModel {
 
     /// Drops conflict banners for actions whose binding now resolves cleanly
     /// (e.g. after an external cmux.json edit removes the colliding binding).
-    private func pruneConflictRejections(changedActionIds: Set<String> = []) {
+    func pruneConflictRejections(changedActionIds: Set<String> = []) {
         guard !conflictRejections.isEmpty else { return }
         for key in Array(conflictRejections.keys) {
             guard let action = ShortcutAction(rawValue: key) else {
@@ -487,7 +451,7 @@ final class ShortcutListModel {
     }
 
     /// Drops cached restore strokes for actions that are no longer unbound.
-    private func pruneRestoreShortcuts() {
+    func pruneRestoreShortcuts() {
         guard !restoreShortcuts.isEmpty else { return }
         // Iterate a key snapshot because the loop mutates `restoreShortcuts`.
         for key in Array(restoreShortcuts.keys) {
diff --git a/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift b/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
index e6ec83b1e5d2..fb99eb7dc29b 100644
--- a/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
+++ b/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
@@ -15,6 +15,8 @@ extension KeyboardShortcutSettings.Action {
         ) {
         case .accepted:
             return nil
+        case .primaryModifierRequired:
+            return .systemWideHotkeyRequiresModifier
         case .bareFirstStrokeNotAllowed:
             return self == .showHideAllWindows
                 ? .systemWideHotkeyRequiresModifier
@@ -93,8 +95,9 @@ extension SystemWideHotkeySettings {
     /// Resolves a complete Show/Hide binding into the Carbon registration shape
     /// shared by conflict arbitration and the actual system-wide registrar.
     ///
-    /// App-shortcut conflicts are checked after Global Search has yielded to
-    /// this candidate, avoiding a recursive lookup between the two actions.
+    /// Global Search intentionally yields to this candidate. Every other
+    /// application and AppKit reservation is validated before it can reserve
+    /// the foreground shortcut or reach the registrar.
     static func registrationCandidate(
         for shortcut: StoredShortcut
     ) -> (shortcut: StoredShortcut, registration: CarbonHotKeyRegistration)? {
@@ -103,7 +106,12 @@ extension SystemWideHotkeySettings {
                 shortcut,
                 checkingSystemWideConflicts: false
             ),
-            let registration = normalizedShortcut.carbonHotKeyRegistration else {
+            let registration = normalizedShortcut.carbonHotKeyRegistration,
+            !KeyboardShortcutSettings.systemWideHotkeyConflicts(
+                with: normalizedShortcut,
+                excluding: action,
+                alsoExcluding: [.globalSearch]
+            ) else {
             return nil
         }
         return (normalizedShortcut, registration)
diff --git a/Sources/KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift b/Sources/KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift
index 5e782f4e968a..9fc065b94db1 100644
--- a/Sources/KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift
+++ b/Sources/KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift
@@ -2,10 +2,14 @@ import Foundation
 
 /// System-wide shortcut conflict helpers extracted from `KeyboardShortcutSettings.swift`, which sits at its file-length budget.
 extension KeyboardShortcutSettings {
-    static func reservedSystemWideHotkeyShortcuts(excluding currentAction: Action) -> [StoredShortcut] {
+    static func reservedSystemWideHotkeyShortcuts(
+        excluding currentAction: Action,
+        alsoExcluding ignoredActions: Set<Action> = []
+    ) -> [StoredShortcut] {
         var reserved: [StoredShortcut] = []
 
-        for action in Action.allCases where action != currentAction {
+        for action in Action.allCases
+        where action != currentAction && !ignoredActions.contains(action) {
             let shortcut = systemWideConflictShortcut(for: action)
             guard !shortcut.isUnbound else { continue }
             if shortcut.hasChord {
@@ -34,6 +38,30 @@ extension KeyboardShortcutSettings {
         return reserved
     }
 
+    static func systemWideHotkeyConflicts(
+        with shortcut: StoredShortcut,
+        excluding action: Action,
+        alsoExcluding ignoredActions: Set<Action> = []
+    ) -> Bool {
+        guard let registration = shortcut.carbonHotKeyRegistration else {
+            return false
+        }
+        let keyCode = UInt16(registration.keyCode)
+        let modifierFlags = shortcut.modifierFlags
+        let eventCharacter = KeyboardLayout.character(forKeyCode: keyCode)
+
+        return reservedSystemWideHotkeyShortcuts(
+            excluding: action,
+            alsoExcluding: ignoredActions
+        ).contains { reserved in
+            reserved.matches(
+                keyCode: keyCode,
+                modifierFlags: modifierFlags,
+                eventCharacter: eventCharacter
+            )
+        }
+    }
+
     static func systemWideConflictShortcut(for action: Action) -> StoredShortcut {
         switch action {
         case .showHideAllWindows:
diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index ac13448e190e..c722f87a426d 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -780,23 +780,6 @@ enum KeyboardShortcutSettings {
         return normalized
     }
 
-    private static func systemWideHotkeyConflicts(with shortcut: StoredShortcut, excluding action: Action) -> Bool {
-        guard let registration = shortcut.carbonHotKeyRegistration else { return false }
-        let keyCode = UInt16(registration.keyCode)
-        let modifierFlags = shortcut.modifierFlags
-        // Validate against the keystroke AppKit shortcuts would see for the
-        // registered Carbon hotkey under the current input source.
-        let eventCharacter = KeyboardLayout.character(forKeyCode: keyCode)
-
-        return reservedSystemWideHotkeyShortcuts(excluding: action).contains { reserved in
-            reserved.matches(
-                keyCode: keyCode,
-                modifierFlags: modifierFlags,
-                eventCharacter: eventCharacter
-            )
-        }
-    }
-
     private static func conflictingAction(
         for proposedShortcut: StoredShortcut,
         excluding currentAction: Action
@@ -1243,11 +1226,13 @@ final class SystemWideHotkeyController {
             return
         }
 
-        guard let candidate = SystemWideHotkeySettings.registrationCandidate(for: shortcut),
-              let normalizedShortcut = Self.action.normalizedRecordedShortcut(candidate.shortcut) else {
+        guard let candidate = SystemWideHotkeySettings.registrationCandidate(
+            for: shortcut
+        ) else {
             unregisterHotKey()
             return
         }
+        let normalizedShortcut = candidate.shortcut
         let registration = candidate.registration
 
         if registeredShortcut == normalizedShortcut,

From eb9f82b5ff953a20984df58a115dffbde5c3db5a Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 16:30:59 -0700
Subject: [PATCH 109/124] test: cover shared shortcut catalog parity

---
 .../SystemWideHotkeyShortcutPolicyTests.swift  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
index 21aca975e582..2670afb9dce8 100644
--- a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
+++ b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
@@ -1,4 +1,5 @@
 import Carbon
+import CmuxSettings
 import Foundation
 import Testing
 
@@ -58,6 +59,23 @@ extension GlobalSearchShortcutBehaviorTests {
         #expect(KeyboardShortcutSettings.Action.allCases.filter(\.isSystemWideHotkey) == [.showHideAllWindows])
     }
 
+    @Test func sharedShortcutCatalogCoversEveryAppActionAndPreservesDefaults() {
+        let appActionIDs = Set(KeyboardShortcutSettings.Action.allCases.map(\.rawValue))
+        let sharedActionIDs = Set(CmuxSettings.ShortcutAction.allCases.map(\.rawValue))
+
+        #expect(sharedActionIDs == appActionIDs)
+        #expect(
+            KeyboardShortcutSettings.shortcut(for: .toggleBrowserDesignMode)
+                == StoredShortcut(
+                    key: "d",
+                    command: true,
+                    shift: false,
+                    option: true,
+                    control: true
+                )
+        )
+    }
+
     @Test func foregroundGlobalSearchDoesNotUseSystemWideReservationPolicy() {
         let shortcut = commandGraveShortcut()
         #expect(KeyboardShortcutSettings.Action.globalSearch.normalizedRecordedShortcutResult(shortcut) == .accepted(shortcut))

From 4ce7fec27868690340132287b870776d9fa31c3a Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 16:43:55 -0700
Subject: [PATCH 110/124] test: disambiguate shared shortcut catalog

---
 cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
index 2670afb9dce8..0afffb9c48b8 100644
--- a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
+++ b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
@@ -1,5 +1,5 @@
 import Carbon
-import CmuxSettings
+import enum CmuxSettings.ShortcutAction
 import Foundation
 import Testing
 
@@ -61,7 +61,7 @@ extension GlobalSearchShortcutBehaviorTests {
 
     @Test func sharedShortcutCatalogCoversEveryAppActionAndPreservesDefaults() {
         let appActionIDs = Set(KeyboardShortcutSettings.Action.allCases.map(\.rawValue))
-        let sharedActionIDs = Set(CmuxSettings.ShortcutAction.allCases.map(\.rawValue))
+        let sharedActionIDs = Set(ShortcutAction.allCases.map(\.rawValue))
 
         #expect(sharedActionIDs == appActionIDs)
         #expect(

From 364f1895ec47ba31279572d871c14f2db2553a40 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 17:35:43 -0700
Subject: [PATCH 111/124] fix: keep shared shortcut catalog complete

---
 .../CmuxSettings/Values/ShortcutAction+Defaults.swift     | 1 +
 .../Sources/CmuxSettings/Values/ShortcutAction.swift      | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Defaults.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Defaults.swift
index 6adcb71fb6e8..d3959580e748 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Defaults.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Defaults.swift
@@ -148,6 +148,7 @@ extension ShortcutAction {
         case .toggleBrowserDeveloperTools: return ShortcutStroke(key: "i", command: true, option: true)
         case .showBrowserJavaScriptConsole: return ShortcutStroke(key: "c", command: true, option: true)
         case .toggleBrowserFocusMode: return ShortcutStroke(key: "\r", command: true, option: true)
+        case .toggleBrowserDesignMode: return ShortcutStroke(key: "d", command: true, option: true, control: true)
         case .toggleReactGrab: return ShortcutStroke(key: "g", command: true, shift: true)
         case .diffViewerScrollDown: return ShortcutStroke(key: "j")
         case .diffViewerScrollUp: return ShortcutStroke(key: "k")
diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift
index 7749efc16657..99de0e53f39f 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift
@@ -147,6 +147,7 @@ public enum ShortcutAction: String, CaseIterable, Sendable, Hashable, SettingCod
     case toggleBrowserDeveloperTools
     case showBrowserJavaScriptConsole
     case toggleBrowserFocusMode
+    case toggleBrowserDesignMode
     case toggleReactGrab
     /// Scrolls the focused diff viewer down one step.
     case diffViewerScrollDown
@@ -209,7 +210,7 @@ extension ShortcutAction {
              .browserZoomReset, .markdownZoomIn, .markdownZoomOut, .markdownZoomReset,
              .find, .findInDirectory, .findNext, .findPrevious,
              .hideFind, .useSelectionForFind, .toggleBrowserDeveloperTools,
-             .showBrowserJavaScriptConsole, .toggleBrowserFocusMode, .toggleReactGrab,
+             .showBrowserJavaScriptConsole, .toggleBrowserFocusMode, .toggleBrowserDesignMode, .toggleReactGrab,
              .diffViewerScrollDown, .diffViewerScrollUp,
              .diffViewerScrollHalfPageDown, .diffViewerScrollHalfPageUp,
              .diffViewerScrollDownEmacs, .diffViewerScrollUpEmacs, .diffViewerScrollToBottom,
@@ -294,7 +295,8 @@ extension ShortcutAction {
             return .and(.not(.atom(.browserFocus)), .not(.atom(.sidebarFocus)))
         case .browserBack, .browserForward, .browserReload, .browserHardReload,
              .toggleBrowserDeveloperTools, .showBrowserJavaScriptConsole, .toggleBrowserFocusMode,
-             .diffViewerOpenFileSearch, .diffViewerNextFile, .diffViewerPreviousFile:
+             .toggleBrowserDesignMode, .diffViewerOpenFileSearch, .diffViewerNextFile,
+             .diffViewerPreviousFile:
             return .atom(.browserFocus)
         case .diffViewerScrollDown, .diffViewerScrollUp,
              .diffViewerScrollHalfPageDown, .diffViewerScrollHalfPageUp,
@@ -465,6 +467,8 @@ extension ShortcutAction {
         case .toggleBrowserDeveloperTools: return "Toggle Browser Developer Tools"
         case .showBrowserJavaScriptConsole: return "Show Browser JavaScript Console"
         case .toggleBrowserFocusMode: return "Enter Browser Focus Mode"
+        case .toggleBrowserDesignMode:
+            return String(localized: "shortcut.toggleBrowserDesignMode.label", defaultValue: "Toggle Browser Design Mode")
         case .toggleReactGrab: return "Toggle React Grab"
         case .diffViewerScrollDown:
             return String(localized: "shortcut.diffViewerScrollDown.label", defaultValue: "Viewers: Scroll Down")

From 40e2d26f947c829f13f91a8903bf3d9a4bc24e92 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 18:03:32 -0700
Subject: [PATCH 112/124] chore: keep shared shortcut catalog below file limit

---
 .../Sources/CmuxSettings/Values/ShortcutAction.swift           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift
index e57b49f89985..a1303dcab0c4 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift
@@ -470,8 +470,7 @@ extension ShortcutAction {
         case .toggleBrowserDeveloperTools: return "Toggle Browser Developer Tools"
         case .showBrowserJavaScriptConsole: return "Show Browser JavaScript Console"
         case .toggleBrowserFocusMode: return "Enter Browser Focus Mode"
-        case .toggleBrowserDesignMode:
-            return String(localized: "shortcut.toggleBrowserDesignMode.label", defaultValue: "Toggle Browser Design Mode")
+        case .toggleBrowserDesignMode: return String(localized: "shortcut.toggleBrowserDesignMode.label", defaultValue: "Toggle Browser Design Mode")
         case .toggleReactGrab: return "Toggle React Grab"
         case .diffViewerScrollDown:
             return String(localized: "shortcut.diffViewerScrollDown.label", defaultValue: "Viewers: Scroll Down")

From 256c6245d3de3fe3b83e16df7771ec50ed31ef1e Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sat, 25 Jul 2026 18:23:46 -0700
Subject: [PATCH 113/124] test: cover system-wide hotkey settings policy

---
 ...stemWideHotkeyShortcutListModelTests.swift | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SystemWideHotkeyShortcutListModelTests.swift

diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SystemWideHotkeyShortcutListModelTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SystemWideHotkeyShortcutListModelTests.swift
new file mode 100644
index 000000000000..a940188bf526
--- /dev/null
+++ b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SystemWideHotkeyShortcutListModelTests.swift
@@ -0,0 +1,87 @@
+import CmuxSettings
+import Foundation
+import Testing
+@testable import CmuxSettingsUI
+
+@MainActor
+@Suite struct SystemWideHotkeyShortcutListModelTests {
+    @Test func nonRegistrableShowHideBindingDoesNotReserveGlobalSearch() async throws {
+        let fixture = makeFixture()
+        let commandPeriod = StoredShortcut(
+            first: ShortcutStroke(key: ".", command: true)
+        )
+        try await fixture.store.set(
+            [
+                ShortcutAction.showHideAllWindows.rawValue: commandPeriod,
+                ShortcutAction.globalSearch.rawValue: commandPeriod,
+            ],
+            for: fixture.catalog.shortcuts.bindings
+        )
+        let model = ShortcutListModel(
+            jsonStore: fixture.store,
+            catalog: fixture.catalog,
+            errorLog: fixture.errorLog
+        )
+        model.startObserving()
+        await spin(until: { model.bindings.count == 2 })
+
+        #expect(model.effective(for: .showHideAllWindows) == nil)
+        #expect(model.effective(for: .globalSearch) == commandPeriod)
+    }
+
+    @Test func shiftOnlyShowHideBindingUsesSystemWideModifierRejection() async {
+        let fixture = makeFixture()
+        let model = ShortcutListModel(
+            jsonStore: fixture.store,
+            catalog: fixture.catalog,
+            errorLog: fixture.errorLog
+        )
+
+        await model.assign(
+            stroke: ShortcutStroke(key: "f", shift: true),
+            to: .showHideAllWindows
+        )
+
+        let bindings = await fixture.store.value(
+            for: fixture.catalog.shortcuts.bindings
+        )
+        #expect(bindings[ShortcutAction.showHideAllWindows.rawValue] == nil)
+        #expect(
+            model.validationMessage(for: .showHideAllWindows)
+                == String(
+                    localized: "shortcut.recorder.error.systemWideHotkeyRequiresModifier",
+                    defaultValue: "System-wide hotkeys must include Command, Option, or Control."
+                )
+        )
+    }
+
+    private func makeFixture() -> (
+        store: JSONConfigStore,
+        catalog: SettingCatalog,
+        errorLog: SettingsErrorLog
+    ) {
+        let directory = FileManager.default.temporaryDirectory
+            .appendingPathComponent(
+                "system-wide-hotkey-shortcut-list-model-\(UUID().uuidString)",
+                isDirectory: true
+            )
+        try? FileManager.default.createDirectory(
+            at: directory,
+            withIntermediateDirectories: true
+        )
+        return (
+            JSONConfigStore(fileURL: directory.appendingPathComponent("cmux.json")),
+            SettingCatalog(),
+            SettingsErrorLog()
+        )
+    }
+
+    private func spin(until condition: () -> Bool) async {
+        var attempts = 0
+        while !condition(), attempts < 100_000 {
+            await Task.yield()
+            attempts += 1
+        }
+        #expect(condition(), "spin(until:) timed out after 100 000 yields")
+    }
+}

From c5fc201d3cec7e383ad0e88ecb136f5e23968608 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sun, 26 Jul 2026 00:06:54 -0700
Subject: [PATCH 114/124] fix: align system-wide shortcut registration policy

---
 .../Values/ShortcutAction+Validation.swift    | 22 +++++
 .../Values/ShortcutBindingPolicyResult.swift  |  6 ++
 .../ShortcutListModel+Resolution.swift        | 49 ++++++++++
 .../ShortcutListModel+Validation.swift        | 16 ++++
 .../Bindings/ShortcutListModel.swift          | 67 ++++++-------
 .../Environment/SettingsHostActions.swift     | 16 ++++
 .../Rows/ShortcutListStableLazyView.swift     |  3 +-
 .../Sections/GlobalHotkeySection.swift        |  5 +-
 .../Sections/KeyboardShortcutsSection.swift   |  3 +
 ...stemWideHotkeyShortcutListModelTests.swift | 32 +++++++
 ...e+VisibleGlobalSearchShortcutRouting.swift |  8 +-
 Sources/App/ShortcutBareStartRouting.swift    |  9 +-
 Sources/AppDelegate.swift                     |  4 +-
 Sources/HostSettingsActions.swift             |  8 ++
 ...tcutSettings+PersistedShortcutPolicy.swift |  8 +-
 ...utSettings+SystemWideHotkeyConflicts.swift |  4 -
 .../KeyboardShortcutSettingsObserver.swift    | 41 +-------
 .../GlobalSearchShortcutSettingsTests.swift   |  2 +-
 ...eyboardShortcutSettingsObserverTests.swift | 96 -------------------
 19 files changed, 209 insertions(+), 190 deletions(-)
 create mode 100644 Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Resolution.swift

diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Validation.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Validation.swift
index 54b6d6c3d335..adc7a1e8c558 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Validation.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Validation.swift
@@ -27,4 +27,26 @@ extension ShortcutAction {
         return firstKey.lowercased().hasPrefix("media.")
             || secondKey?.lowercased().hasPrefix("media.") == true
     }
+
+    /// Whether the system reserves this complete shortcut before the action can execute it.
+    ///
+    /// Command-Period is AppKit's standard cancel keystroke for modal alerts
+    /// and open/save panels. The system-wide Show/Hide action must not capture
+    /// that first instinctive cancel press.
+    ///
+    /// - Parameter shortcut: The shortcut being validated.
+    /// - Returns: `true` when the shortcut is reserved for system interaction.
+    public func rejectsSystemReservedShortcut(
+        _ shortcut: StoredShortcut
+    ) -> Bool {
+        guard self == .showHideAllWindows, !shortcut.hasChord else {
+            return false
+        }
+        let first = shortcut.first.canonicalized()
+        return first.key == "."
+            && first.command
+            && !first.shift
+            && !first.option
+            && !first.control
+    }
 }
diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
index ab5b9ef107ae..06e7083dad47 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
@@ -18,6 +18,9 @@ public enum ShortcutBindingPolicyResult: Sendable, Equatable {
 
     /// The foreground action cannot receive a system-defined media key.
     case systemDefinedMediaKeyNotAllowed
+
+    /// The system reserves this shortcut before the action can execute it.
+    case systemReservedShortcutNotAllowed
 }
 
 public extension ShortcutAction {
@@ -39,6 +42,9 @@ public extension ShortcutAction {
         if rejectsSystemDefinedMediaKey(shortcut) {
             return .systemDefinedMediaKeyNotAllowed
         }
+        if rejectsSystemReservedShortcut(shortcut) {
+            return .systemReservedShortcutNotAllowed
+        }
 
         let first = shortcut.first
         if self == .showHideAllWindows,
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Resolution.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Resolution.swift
new file mode 100644
index 000000000000..c08110251d2e
--- /dev/null
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Resolution.swift
@@ -0,0 +1,49 @@
+import CmuxSettings
+
+extension ShortcutListModel {
+    /// The effective shortcut for `action`, using the runtime's JSON, legacy
+    /// UserDefaults, then built-in precedence.
+    func effective(for action: ShortcutAction) -> StoredShortcut? {
+        let actionID = action.rawValue
+        let candidate: StoredShortcut?
+        if !managedBindingActionIDs.contains(actionID) {
+            candidate = latestBindings[actionID] ?? legacyBindings[actionID]
+        } else {
+            candidate = bindings[actionID]
+            if candidate == nil, action == .showHideAllWindows { return nil }
+        }
+        return action.effectivePersistedShortcut(
+            candidate,
+            normalizing: { shortcut in
+                guard action.shortcutBindingPolicyResult(for: shortcut) == .accepted else {
+                    return nil
+                }
+                if action == .showHideAllWindows,
+                   !canRegisterSystemWideHotkey(shortcut) {
+                    return nil
+                }
+                return shortcut.canonicalized()
+            },
+            conflictsWithReservedShortcut: { shortcut in
+                guard action == .globalSearch,
+                      let systemWideShortcut = effective(for: .showHideAllWindows) else {
+                    return false
+                }
+                return ShortcutBindingConflict(
+                    proposed: shortcut,
+                    proposedUsesNumberedDigitMatching: action.usesNumberedDigitMatching,
+                    configured: systemWideShortcut,
+                    configuredUsesNumberedDigitMatching: false
+                ).exists
+            }
+        )
+    }
+
+    /// Whether `action` is currently unbound but has a cached stroke available to
+    /// restore (drives the X → restore button swap).
+    func canRestore(for action: ShortcutAction) -> Bool {
+        let effectiveShortcut = effective(for: action)
+        let isUnbound = effectiveShortcut?.isUnbound ?? true
+        return isUnbound && restoreShortcuts[action.rawValue] != nil
+    }
+}
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Validation.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Validation.swift
index edb83837e11e..52cc8676fedf 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Validation.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel+Validation.swift
@@ -2,8 +2,24 @@ import CmuxSettings
 import Foundation
 
 extension ShortcutListModel {
+    /// Whether the recorder should retain its rejected stroke for `action`.
+    func hasPendingRejection(for action: ShortcutAction) -> Bool {
+        let actionID = action.rawValue
+        return bareKeyRejections.contains(actionID)
+            || primaryModifierRejections.contains(actionID)
+            || systemReservedRejections.contains(actionID)
+            || numberedDigitRejections.contains(actionID)
+            || conflictRejections[actionID] != nil
+    }
+
     /// The red validation-banner text for `action`, or `nil` when no rejection is pending.
     func validationMessage(for action: ShortcutAction) -> String? {
+        if primaryModifierRejections.contains(action.rawValue) {
+            return String(
+                localized: "shortcut.recorder.error.systemWideHotkeyRequiresModifier",
+                defaultValue: "System-wide hotkeys must include Command, Option, or Control."
+            )
+        }
         if systemReservedRejections.contains(action.rawValue) {
             return String(
                 localized: "shortcut.recorder.error.reservedBySystem",
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
index 7ad7ec034331..d98f06441bb6 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Bindings/ShortcutListModel.swift
@@ -18,6 +18,7 @@ final class ShortcutListModel {
     private(set) var chordModeActions: Set<String> = []
     private(set) var restoreShortcuts: [String: StoredShortcut] = [:]
     private(set) var bareKeyRejections: Set<String> = []
+    private(set) var primaryModifierRejections: Set<String> = []
     private(set) var systemReservedRejections: Set<String> = []
     /// Per-action set marking a numbered action rejected for a non-`1…9` key.
     private(set) var numberedDigitRejections: Set<String> = []
@@ -34,6 +35,7 @@ final class ShortcutListModel {
     @ObservationIgnored let catalog: SettingCatalog
     @ObservationIgnored let errorLog: SettingsErrorLog
     @ObservationIgnored let onShortcutsChanged: @MainActor () -> Void
+    @ObservationIgnored let canRegisterSystemWideHotkey: @MainActor (StoredShortcut) -> Bool
     @ObservationIgnored private let bindingsDriver = SettingReadDriver<ShortcutBindingsSnapshot>()
     @ObservationIgnored private let legacyBindingsDriver = SettingReadDriver<[String: StoredShortcut]>()
     @ObservationIgnored private let whenDriver = SettingReadDriver<[String: String]>()
@@ -47,6 +49,9 @@ final class ShortcutListModel {
         userDefaultsStore: UserDefaultsSettingsStore? = nil,
         catalog: SettingCatalog,
         errorLog: SettingsErrorLog,
+        canRegisterSystemWideHotkey: @escaping @MainActor (StoredShortcut) -> Bool = {
+            ShortcutAction.showHideAllWindows.shortcutBindingPolicyResult(for: $0) == .accepted
+        },
         onShortcutsChanged: @escaping @MainActor () -> Void = {}
     ) {
         self.jsonStore = jsonStore
@@ -54,6 +59,7 @@ final class ShortcutListModel {
         self.legacyBindings = userDefaultsStore?.initialLegacyShortcutBindings() ?? [:]
         self.catalog = catalog
         self.errorLog = errorLog
+        self.canRegisterSystemWideHotkey = canRegisterSystemWideHotkey
         self.onShortcutsChanged = onShortcutsChanged
     }
 
@@ -85,7 +91,7 @@ final class ShortcutListModel {
         )
     }
 
-    private var latestBindings: [String: StoredShortcut] { pendingBindings ?? bindings }
+    var latestBindings: [String: StoredShortcut] { pendingBindings ?? bindings }
 
     private func ingestBindings(_ snapshot: ShortcutBindingsSnapshot) {
         let dictionary = snapshot.bindings
@@ -107,41 +113,6 @@ final class ShortcutListModel {
         pruneNumberedDigitRejections(changedActionIds: Set(changedActionIds))
     }
 
-    // MARK: - Display helpers (lifted from actionRow inline computations)
-
-    /// The effective shortcut for `action`, using the runtime's JSON, legacy
-    /// UserDefaults, then built-in precedence.
-    func effective(for action: ShortcutAction) -> StoredShortcut? {
-        let actionID = action.rawValue
-        let candidate: StoredShortcut?
-        if !managedBindingActionIDs.contains(actionID) {
-            candidate = latestBindings[actionID] ?? legacyBindings[actionID]
-        } else {
-            candidate = bindings[actionID]
-            if candidate == nil, action == .showHideAllWindows { return nil }
-        }
-        return action.effectivePersistedShortcut(candidate) { shortcut in
-            guard action == .globalSearch,
-                  let systemWideShortcut = effective(for: .showHideAllWindows) else {
-                return false
-            }
-            return ShortcutBindingConflict(
-                proposed: shortcut,
-                proposedUsesNumberedDigitMatching: action.usesNumberedDigitMatching,
-                configured: systemWideShortcut,
-                configuredUsesNumberedDigitMatching: false
-            ).exists
-        }
-    }
-
-    /// Whether `action` is currently unbound but has a cached stroke available to
-    /// restore (drives the X → restore button swap).
-    func canRestore(for action: ShortcutAction) -> Bool {
-        let eff = effective(for: action)
-        let isUnbound = eff?.isUnbound ?? true
-        return isUnbound && restoreShortcuts[action.rawValue] != nil
-    }
-
     // MARK: - Conflict helpers (moved verbatim from section)
 
     /// The effective focus `when` clause for `action`: its `shortcuts.when`
@@ -246,6 +217,7 @@ final class ShortcutListModel {
     /// Dismisses all rejection banners for the action (the Undo button handler).
     func clearRejections(for action: ShortcutAction) {
         bareKeyRejections.remove(action.rawValue)
+        primaryModifierRejections.remove(action.rawValue)
         systemReservedRejections.remove(action.rawValue)
         numberedDigitRejections.remove(action.rawValue)
         conflictRejections.removeValue(forKey: action.rawValue)
@@ -257,6 +229,11 @@ final class ShortcutListModel {
         bareKeyRejections.insert(action.rawValue)
     }
 
+    private func markPrimaryModifierRejected(_ action: ShortcutAction) {
+        clearRejections(for: action)
+        primaryModifierRejections.insert(action.rawValue)
+    }
+
     private func markSystemReservedRejected(_ action: ShortcutAction) {
         clearRejections(for: action)
         systemReservedRejections.insert(action.rawValue)
@@ -313,12 +290,23 @@ final class ShortcutListModel {
             )
         }
         let proposed = StoredShortcut(first: stroke)
-        if action.shortcutBindingPolicyResult(for: proposed)
-            == .primaryModifierRequired {
+        switch action.shortcutBindingPolicyResult(for: proposed) {
+        case .accepted:
+            break
+        case .primaryModifierRequired:
+            markPrimaryModifierRejected(action)
+            return
+        case .bareFirstStrokeNotAllowed:
             markBareKeyRejected(action)
             return
+        case .chordNotAllowed,
+             .systemDefinedMediaKeyNotAllowed,
+             .systemReservedShortcutNotAllowed:
+            markSystemReservedRejected(action)
+            return
         }
-        if action.rejectsSystemDefinedMediaKey(proposed) {
+        if action == .showHideAllWindows,
+           !canRegisterSystemWideHotkey(proposed) {
             markSystemReservedRejected(action)
             return
         }
@@ -404,6 +392,7 @@ final class ShortcutListModel {
     func resetAll() async {
         restoreShortcuts.removeAll()
         bareKeyRejections.removeAll()
+        primaryModifierRejections.removeAll()
         systemReservedRejections.removeAll()
         numberedDigitRejections.removeAll()
         conflictRejections.removeAll()
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Environment/SettingsHostActions.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Environment/SettingsHostActions.swift
index 226fd332dd99..9d87eb9d35bf 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Environment/SettingsHostActions.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Environment/SettingsHostActions.swift
@@ -179,6 +179,15 @@ public protocol SettingsHostActions: AnyObject {
     /// Invalidates host-owned shortcut caches after Settings persists a shortcut change.
     func notifyShortcutSettingsDidChange()
 
+    /// Whether the host can register `shortcut` as its system-wide hotkey.
+    ///
+    /// The macOS host applies Carbon conversion and app-reservation checks that
+    /// the settings package cannot perform by itself.
+    ///
+    /// - Parameter shortcut: The complete Show/Hide shortcut proposed by Settings.
+    /// - Returns: `true` when the host's runtime registrar can use the shortcut.
+    func canRegisterSystemWideHotkey(_ shortcut: StoredShortcut) -> Bool
+
     /// Applies the host-side OS `AppleLanguages` override for a changed app
     /// language selection.
     func applyLanguageOverride(_ language: AppLanguage)
@@ -197,6 +206,13 @@ public extension SettingsHostActions {
     /// Default no-op for package previews and tests without host layout editing.
     func customizeWorkspaceLayouts() {}
 
+    /// Default package-only validation for previews and non-macOS hosts.
+    func canRegisterSystemWideHotkey(_ shortcut: StoredShortcut) -> Bool {
+        ShortcutAction.showHideAllWindows.shortcutBindingPolicyResult(
+            for: shortcut
+        ) == .accepted
+    }
+
     /// Default no-op for package previews and tests without app-language ownership.
     func applyLanguageOverride(_ language: AppLanguage) {}
 
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Rows/ShortcutListStableLazyView.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Rows/ShortcutListStableLazyView.swift
index 298016067487..8169b0625d2c 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Rows/ShortcutListStableLazyView.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Rows/ShortcutListStableLazyView.swift
@@ -23,8 +23,7 @@ struct ShortcutListStableLazyView: View {
                     subtitle: model.scopeCaption(for: action),
                     placeholder: model.formatPlaceholder(effective: effective, numbered: action.usesNumberedDigitMatching),
                     chordsEnabled: model.chordModeActions.contains(action.rawValue),
-                    hasPendingRejection: model.bareKeyRejections.contains(action.rawValue)
-                        || model.numberedDigitRejections.contains(action.rawValue),
+                    hasPendingRejection: model.hasPendingRejection(for: action),
                     firstStrokeRequiresModifier: !action.allowsBareFirstStroke,
                     isUnbound: effective?.isUnbound ?? true,
                     canRestore: model.canRestore(for: action),
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/GlobalHotkeySection.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/GlobalHotkeySection.swift
index 5376ab7e7f70..c3bd5576fc5e 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/GlobalHotkeySection.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/GlobalHotkeySection.swift
@@ -35,6 +35,9 @@ public struct GlobalHotkeySection: View {
             userDefaultsStore: defaultsStore,
             catalog: catalog,
             errorLog: errorLog,
+            canRegisterSystemWideHotkey: {
+                hostActions.canRegisterSystemWideHotkey($0)
+            },
             onShortcutsChanged: { hostActions.notifyShortcutSettingsDidChange() }
         ))
     }
@@ -88,7 +91,7 @@ public struct GlobalHotkeySection: View {
                 subtitle: nil,
                 placeholder: shortcutModel.formatPlaceholder(effective: effective, numbered: false),
                 chordsEnabled: false,
-                hasPendingRejection: shortcutModel.bareKeyRejections.contains(hotkeyAction.rawValue),
+                hasPendingRejection: shortcutModel.hasPendingRejection(for: hotkeyAction),
                 firstStrokeRequiresModifier: true,
                 isUnbound: effective?.isUnbound ?? true,
                 canRestore: shortcutModel.canRestore(for: hotkeyAction),
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/KeyboardShortcutsSection.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/KeyboardShortcutsSection.swift
index 7c31c793bd8c..033dd79b5c3a 100644
--- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/KeyboardShortcutsSection.swift
+++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/KeyboardShortcutsSection.swift
@@ -33,6 +33,9 @@ public struct KeyboardShortcutsSection: View {
             userDefaultsStore: userDefaultsStore,
             catalog: catalog,
             errorLog: errorLog,
+            canRegisterSystemWideHotkey: {
+                hostActions.canRegisterSystemWideHotkey($0)
+            },
             onShortcutsChanged: { hostActions.notifyShortcutSettingsDidChange() }
         ))
     }
diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SystemWideHotkeyShortcutListModelTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SystemWideHotkeyShortcutListModelTests.swift
index a940188bf526..9e3d79afa5d0 100644
--- a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SystemWideHotkeyShortcutListModelTests.swift
+++ b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SystemWideHotkeyShortcutListModelTests.swift
@@ -55,6 +55,38 @@ import Testing
         )
     }
 
+    @Test func hostRegistrationPolicyControlsGlobalSearchReservation() async throws {
+        let fixture = makeFixture()
+        let rejectedByHost = StoredShortcut(
+            first: ShortcutStroke(
+                key: "f20",
+                command: true,
+                shift: true,
+                option: true,
+                control: true,
+                keyCode: 90
+            )
+        )
+        try await fixture.store.set(
+            [
+                ShortcutAction.showHideAllWindows.rawValue: rejectedByHost,
+                ShortcutAction.globalSearch.rawValue: rejectedByHost,
+            ],
+            for: fixture.catalog.shortcuts.bindings
+        )
+        let model = ShortcutListModel(
+            jsonStore: fixture.store,
+            catalog: fixture.catalog,
+            errorLog: fixture.errorLog,
+            canRegisterSystemWideHotkey: { $0 != rejectedByHost }
+        )
+        model.startObserving()
+        await spin(until: { model.bindings.count == 2 })
+
+        #expect(model.effective(for: .showHideAllWindows) == nil)
+        #expect(model.effective(for: .globalSearch) == rejectedByHost)
+    }
+
     private func makeFixture() -> (
         store: JSONConfigStore,
         catalog: SettingCatalog,
diff --git a/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift b/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
index 17bc3658c4fe..7190b6b793be 100644
--- a/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
+++ b/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
@@ -23,7 +23,7 @@ extension AppDelegate {
             return .notApplicable
         }
 
-        let shortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
+        let shortcut = globalSearchShortcutForRouting()
         guard !shortcut.isUnbound else { return .notApplicable }
 
         let normalizedFlags = ShortcutStroke.normalizedModifierFlags(from: event.modifierFlags)
@@ -68,8 +68,8 @@ extension AppDelegate {
         _ event: NSEvent,
         normalizedFlags: NSEvent.ModifierFlags
     ) -> VisibleGlobalSearchShortcutRoute {
-        let shortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
-        let matchesShortcut = matchCachedGlobalSearchShortcut(
+        let shortcut = globalSearchShortcutForRouting()
+        let matchesShortcut = matchGlobalSearchShortcut(
             event: event,
             normalizedFlags: normalizedFlags
         )
@@ -107,7 +107,7 @@ extension AppDelegate {
         _ event: NSEvent,
         normalizedFlags: NSEvent.ModifierFlags
     ) -> Bool {
-        let shortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
+        let shortcut = globalSearchShortcutForRouting()
         return shortcut.hasChord
             && activeConfiguredShortcutChordPrefixForCurrentEvent == nil
             && shortcut.firstStroke.modifierFlags == normalizedFlags
diff --git a/Sources/App/ShortcutBareStartRouting.swift b/Sources/App/ShortcutBareStartRouting.swift
index 6b2ee283e21e..47faa172cf25 100644
--- a/Sources/App/ShortcutBareStartRouting.swift
+++ b/Sources/App/ShortcutBareStartRouting.swift
@@ -129,11 +129,11 @@ extension AppDelegate {
         }
     }
 
-    func matchCachedGlobalSearchShortcut(
+    func matchGlobalSearchShortcut(
         event: NSEvent,
         normalizedFlags: NSEvent.ModifierFlags? = nil
     ) -> Bool {
-        let shortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
+        let shortcut = globalSearchShortcutForRouting()
         guard let stroke = activeGlobalSearchStroke(for: shortcut),
               stroke.modifierFlags
                   == (normalizedFlags ?? ShortcutStroke.normalizedModifierFlags(from: event.modifierFlags)),
@@ -143,6 +143,11 @@ extension AppDelegate {
         return globalSearchShortcutWhenClauseAllows(event: event)
     }
 
+    /// Resolves the foreground Search binding from the authoritative settings snapshot.
+    func globalSearchShortcutForRouting() -> StoredShortcut {
+        KeyboardShortcutSettings.shortcut(for: .globalSearch)
+    }
+
     private func activeGlobalSearchStroke(for shortcut: StoredShortcut) -> ShortcutStroke? {
         guard !shortcut.isUnbound else { return nil }
         if let activePrefix = activeConfiguredShortcutChordPrefixForCurrentEvent {
diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index 9191425d13a9..dc1e7f7ae26c 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -13287,8 +13287,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
             }
         }
 
-        let globalSearchShortcut = KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
-        let matchesGlobalSearchShortcut = matchCachedGlobalSearchShortcut(
+        let globalSearchShortcut = globalSearchShortcutForRouting()
+        let matchesGlobalSearchShortcut = matchGlobalSearchShortcut(
             event: event,
             normalizedFlags: normalizedFlags
         )
diff --git a/Sources/HostSettingsActions.swift b/Sources/HostSettingsActions.swift
index a74f1d376073..1db4589bc913 100644
--- a/Sources/HostSettingsActions.swift
+++ b/Sources/HostSettingsActions.swift
@@ -102,6 +102,14 @@ final class HostSettingsActions: SettingsHostActions {
         }
     }
 
+    func canRegisterSystemWideHotkey(
+        _ shortcut: CmuxSettings.StoredShortcut
+    ) -> Bool {
+        SystemWideHotkeySettings.registrationCandidate(
+            for: StoredShortcut(cmuxSettingsStoredShortcut: shortcut)
+        ) != nil
+    }
+
     func applyLanguageOverride(_ language: AppLanguage) {
         LanguageSettingsStore(defaults: .standard).applyLanguageOverride(language)
     }
diff --git a/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift b/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
index fb99eb7dc29b..00cd918ac1e5 100644
--- a/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
+++ b/Sources/KeyboardShortcutSettings+PersistedShortcutPolicy.swift
@@ -21,7 +21,9 @@ extension KeyboardShortcutSettings.Action {
             return self == .showHideAllWindows
                 ? .systemWideHotkeyRequiresModifier
                 : .bareKeyNotAllowed
-        case .chordNotAllowed, .systemDefinedMediaKeyNotAllowed:
+        case .chordNotAllowed,
+             .systemDefinedMediaKeyNotAllowed,
+             .systemReservedShortcutNotAllowed:
             return .reservedBySystem
         }
     }
@@ -118,7 +120,7 @@ extension SystemWideHotkeySettings {
     }
 }
 
-private extension StoredShortcut {
+extension StoredShortcut {
     init(cmuxSettingsStoredShortcut shortcut: CmuxSettings.StoredShortcut) {
         self.init(
             first: ShortcutStroke(cmuxSettingsShortcutStroke: shortcut.first),
@@ -134,7 +136,7 @@ private extension StoredShortcut {
     }
 }
 
-private extension ShortcutStroke {
+extension ShortcutStroke {
     init(cmuxSettingsShortcutStroke stroke: CmuxSettings.ShortcutStroke) {
         self.init(
             key: stroke.key,
diff --git a/Sources/KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift b/Sources/KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift
index 9fc065b94db1..444ae982d6c0 100644
--- a/Sources/KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift
+++ b/Sources/KeyboardShortcutSettings+SystemWideHotkeyConflicts.swift
@@ -76,9 +76,5 @@ extension KeyboardShortcutSettings {
         StoredShortcut(key: "\t", command: false, shift: true, option: false, control: true),
         StoredShortcut(key: "`", command: true, shift: false, option: false, control: false),
         StoredShortcut(key: "`", command: true, shift: true, option: false, control: false),
-        // Cmd+. is AppKit's standard cancel keystroke for modal alerts and
-        // open/save panels. Refuse to register it as the global hotkey so the
-        // first instinctive "cancel" press never hides the whole app.
-        StoredShortcut(key: ".", command: true, shift: false, option: false, control: false),
     ]
 }
diff --git a/Sources/KeyboardShortcutSettingsObserver.swift b/Sources/KeyboardShortcutSettingsObserver.swift
index 32c3002eabfb..57fb98eb261c 100644
--- a/Sources/KeyboardShortcutSettingsObserver.swift
+++ b/Sources/KeyboardShortcutSettingsObserver.swift
@@ -1,37 +1,23 @@
-import Carbon
 import Combine
-import CmuxSettings
 import Foundation
 
-/// Publishes keyboard-shortcut revisions and owns hot-path matcher snapshots.
+/// Publishes keyboard-shortcut revisions and owns the right-sidebar matcher snapshot.
 @MainActor
 final class KeyboardShortcutSettingsObserver: ObservableObject {
-    typealias ShortcutProvider = (KeyboardShortcutSettings.Action) -> StoredShortcut
-
     static let shared = KeyboardShortcutSettingsObserver()
 
     @Published private(set) var revision: UInt64 = 0
-    private(set) var globalSearchShortcut: StoredShortcut
-    let rightSidebarModeShortcutMatcher: RightSidebarModeShortcutMatcher
-    private let shortcutProvider: ShortcutProvider
+    let rightSidebarModeShortcutMatcher = RightSidebarModeShortcutMatcher()
     private var settingsCancellable: AnyCancellable?
     private var recorderCancellable: AnyCancellable?
-    private var inputSourceCancellable: AnyCancellable?
 
-    init(
-        notificationCenter: NotificationCenter = .default,
-        shortcutProvider: @escaping ShortcutProvider = KeyboardShortcutSettings.shortcut(for:)
-    ) {
-        self.shortcutProvider = shortcutProvider
-        globalSearchShortcut = shortcutProvider(.globalSearch)
-        rightSidebarModeShortcutMatcher = RightSidebarModeShortcutMatcher(
-            shortcutProvider: shortcutProvider
-        )
+    init(notificationCenter: NotificationCenter = .default) {
         settingsCancellable = notificationCenter.publisher(
             for: KeyboardShortcutSettings.didChangeNotification
         ).sink { [weak self] _ in
             Self.deliverOnMainActor { [weak self] in
-                self?.reloadCachedShortcuts()
+                self?.revision &+= 1
+                self?.rightSidebarModeShortcutMatcher.reload()
             }
         }
         recorderCancellable = notificationCenter.publisher(
@@ -41,23 +27,6 @@ final class KeyboardShortcutSettingsObserver: ObservableObject {
                 self?.revision &+= 1
             }
         }
-        inputSourceCancellable = DistributedNotificationCenter.default()
-            .publisher(
-                for: Notification.Name(
-                    rawValue: kTISNotifySelectedKeyboardInputSourceChanged as String
-                )
-            )
-            .sink { [weak self] _ in
-                Self.deliverOnMainActor { [weak self] in
-                    self?.reloadCachedShortcuts()
-                }
-            }
-    }
-
-    private func reloadCachedShortcuts() {
-        globalSearchShortcut = shortcutProvider(.globalSearch)
-        revision &+= 1
-        rightSidebarModeShortcutMatcher.reload()
     }
 
     /// Preserves synchronous delivery for main-thread settings mutations while
diff --git a/cmuxTests/GlobalSearchShortcutSettingsTests.swift b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
index bc0fefe48e65..f1a76846cb13 100644
--- a/cmuxTests/GlobalSearchShortcutSettingsTests.swift
+++ b/cmuxTests/GlobalSearchShortcutSettingsTests.swift
@@ -80,7 +80,7 @@ extension GlobalSearchShortcutBehaviorTests {
 
         #expect(shortcutRoutingShouldBypassForPrintableOptionText(event: event))
         #expect(shortcut.matches(event: event))
-        #expect(appDelegate.matchCachedGlobalSearchShortcut(event: event))
+        #expect(appDelegate.matchGlobalSearchShortcut(event: event))
     }
 
     @Test func ordinaryTypingDoesNotResolveGlobalSearchBinding() throws {
diff --git a/cmuxTests/KeyboardShortcutSettingsObserverTests.swift b/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
index fb2f6db3fcbc..d4dd72aa01c9 100644
--- a/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
+++ b/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
@@ -1,4 +1,3 @@
-import Carbon
 import Foundation
 import Testing
 
@@ -22,58 +21,6 @@ extension GlobalSearchShortcutBehaviorTests {
         #expect(observer.revision == expectedRevision)
     }
 
-    @Test func globalSearchShortcutUsesSnapshotAndReloadsAfterSettingsChange() {
-        let notificationCenter = NotificationCenter()
-        var configuredShortcut = StoredShortcut(
-            key: "f",
-            command: true,
-            shift: false,
-            option: true,
-            control: false
-        )
-        var globalSearchLookupCount = 0
-        let observer = KeyboardShortcutSettingsObserver(
-            notificationCenter: notificationCenter,
-            shortcutProvider: { action in
-                guard action == .globalSearch else { return .unbound }
-                globalSearchLookupCount += 1
-                return configuredShortcut
-            }
-        )
-
-        #expect(observer.globalSearchShortcut == configuredShortcut)
-        let initialLookupCount = globalSearchLookupCount
-        for _ in 0..<100 {
-            _ = observer.globalSearchShortcut
-        }
-        #expect(globalSearchLookupCount == initialLookupCount)
-
-        configuredShortcut = StoredShortcut(
-            key: "g",
-            command: true,
-            shift: true,
-            option: false,
-            control: false,
-            chordKey: "s"
-        )
-        notificationCenter.post(
-            name: KeyboardShortcutSettings.didChangeNotification,
-            object: nil
-        )
-
-        #expect(observer.globalSearchShortcut == configuredShortcut)
-        #expect(globalSearchLookupCount == initialLookupCount + 1)
-
-        configuredShortcut = .unbound
-        notificationCenter.post(
-            name: KeyboardShortcutSettings.didChangeNotification,
-            object: nil
-        )
-
-        #expect(observer.globalSearchShortcut == .unbound)
-        #expect(globalSearchLookupCount == initialLookupCount + 2)
-    }
-
     @Test func legacyMediaKeyGlobalSearchBindingFallsBackToDefault() throws {
         let action = KeyboardShortcutSettings.Action.globalSearch
         let defaults = UserDefaults.standard
@@ -108,48 +55,5 @@ extension GlobalSearchShortcutBehaviorTests {
         #expect(KeyboardShortcutSettings.shortcut(for: action) == action.defaultShortcut)
     }
 
-    @Test func inputSourceChangeRefreshesGlobalSearchSnapshot() async {
-        let notificationCenter = NotificationCenter()
-        var configuredShortcut = StoredShortcut(
-            key: "f",
-            command: true,
-            shift: false,
-            option: true,
-            control: false
-        )
-        var globalSearchLookupCount = 0
-        let observer = KeyboardShortcutSettingsObserver(
-            notificationCenter: notificationCenter,
-            shortcutProvider: { action in
-                guard action == .globalSearch else { return .unbound }
-                globalSearchLookupCount += 1
-                return configuredShortcut
-            }
-        )
-        let initialLookupCount = globalSearchLookupCount
-        configuredShortcut = StoredShortcut(
-            key: "g",
-            command: true,
-            shift: true,
-            option: false,
-            control: false
-        )
-
-        DistributedNotificationCenter.default().postNotificationName(
-            Notification.Name(rawValue: kTISNotifySelectedKeyboardInputSourceChanged as String),
-            object: nil,
-            userInfo: nil,
-            deliverImmediately: true
-        )
-        var yields = 0
-        while globalSearchLookupCount == initialLookupCount, yields < 1_000 {
-            await Task.yield()
-            yields += 1
-        }
-
-        #expect(observer.globalSearchShortcut == configuredShortcut)
-        #expect(globalSearchLookupCount == initialLookupCount + 1)
-        #expect(observer.revision == 1)
-    }
     }
 }

From 3ec16e145892992ed1777c3f017fb1cdd2818d24 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sun, 26 Jul 2026 00:18:51 -0700
Subject: [PATCH 115/124] test: cover visible search editing chord suffix

---
 .../GlobalSearchShortcutBehaviorTests.swift   | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/cmuxTests/GlobalSearchShortcutBehaviorTests.swift b/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
index b254fff0eee2..07947317ccb9 100644
--- a/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
+++ b/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
@@ -126,6 +126,58 @@ extension GlobalSearchShortcutBehaviorTests {
 #endif
     }
 
+    @Test func visibleSearchChordEditingSuffixCompletesThroughLocalMonitorChain() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let window = try makeMainWindow(appDelegate: appDelegate)
+        defer { closeWindow(window, appDelegate: appDelegate) }
+
+        KeyboardShortcutSettings.setShortcut(
+            StoredShortcut(
+                key: "k",
+                command: true,
+                shift: false,
+                option: false,
+                control: false,
+                chordKey: "c",
+                chordCommand: true
+            ),
+            for: .globalSearch
+        )
+        appDelegate.toggleGlobalSearchPalette()
+        let popoverWindow = try #require(
+            waitForSearchPopoverWindow(excluding: window),
+            "The real Search popover and its local key monitor must be active"
+        )
+
+        NSApp.sendEvent(
+            try makeKeyDownEvent(
+                key: "k",
+                modifiers: [.command],
+                keyCode: 40,
+                windowNumber: popoverWindow.windowNumber
+            )
+        )
+        #expect(GlobalSearchCoordinator.shared.isPaletteVisible())
+
+        NSApp.sendEvent(
+            try makeKeyDownEvent(
+                key: "c",
+                modifiers: [.command],
+                keyCode: 8,
+                windowNumber: popoverWindow.windowNumber
+            )
+        )
+
+        #expect(
+            waitUntilGlobalSearchCloses(),
+            "An editing-key suffix must complete an already-active Global Search chord"
+        )
+#else
+        Issue.record("Global Search local-monitor routing requires a DEBUG app-host build")
+#endif
+    }
+
     @Test func unrelatedChordSuffixPreservesPendingPrefixForDownstreamMonitor() throws {
 #if DEBUG
         let appDelegate = try #require(AppDelegate.shared)

From 2cbd54eeb3cf5b0405faa30b05593e84f3cb252a Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sun, 26 Jul 2026 00:19:52 -0700
Subject: [PATCH 116/124] test: cover promoted search chord suffix state

---
 .../GlobalSearchShortcutBehaviorTests.swift   | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/cmuxTests/GlobalSearchShortcutBehaviorTests.swift b/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
index 07947317ccb9..175764429c4a 100644
--- a/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
+++ b/cmuxTests/GlobalSearchShortcutBehaviorTests.swift
@@ -178,6 +178,51 @@ extension GlobalSearchShortcutBehaviorTests {
 #endif
     }
 
+    @Test func visibleSearchCompletesEditingSuffixFromPromotedChordState() throws {
+#if DEBUG
+        let appDelegate = try #require(AppDelegate.shared)
+        let window = try makeMainWindow(appDelegate: appDelegate)
+        defer { closeWindow(window, appDelegate: appDelegate) }
+
+        let shortcut = StoredShortcut(
+            key: "k",
+            command: true,
+            shift: false,
+            option: false,
+            control: false,
+            chordKey: "c",
+            chordCommand: true
+        )
+        KeyboardShortcutSettings.setShortcut(shortcut, for: .globalSearch)
+        appDelegate.toggleGlobalSearchPalette()
+        let popoverWindow = try #require(
+            waitForSearchPopoverWindow(excluding: window),
+            "The real Search popover and its local key monitor must be active"
+        )
+        appDelegate.activeConfiguredShortcutChordPrefixForCurrentEvent =
+            shortcut.firstStroke
+
+        let route = appDelegate.routeVisibleGlobalSearchShortcutFromLocalMonitor(
+            try makeKeyDownEvent(
+                key: "c",
+                modifiers: [.command],
+                keyCode: 8,
+                windowNumber: popoverWindow.windowNumber
+            )
+        )
+
+        guard case .handled = route else {
+            Issue.record(
+                "An editing-key suffix must complete a promoted Global Search chord"
+            )
+            return
+        }
+        #expect(waitUntilGlobalSearchCloses())
+#else
+        Issue.record("Global Search local-monitor routing requires a DEBUG app-host build")
+#endif
+    }
+
     @Test func unrelatedChordSuffixPreservesPendingPrefixForDownstreamMonitor() throws {
 #if DEBUG
         let appDelegate = try #require(AppDelegate.shared)

From c0a037c778d96ba0b0c52a087b4a01f7adac8e4a Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sun, 26 Jul 2026 00:20:17 -0700
Subject: [PATCH 117/124] fix: preserve promoted search chord state

---
 .../AppDelegate+VisibleGlobalSearchShortcutRouting.swift    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift b/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
index 7190b6b793be..c50e13e4fbc7 100644
--- a/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
+++ b/Sources/App/AppDelegate+VisibleGlobalSearchShortcutRouting.swift
@@ -42,10 +42,12 @@ extension AppDelegate {
         let previousActiveChord = activeConfiguredShortcutChordPrefixForCurrentEvent
         let eventWindowNumber = configuredShortcutChordWindowNumber(for: event)
         if let pendingConfiguredShortcutChord,
-           pendingConfiguredShortcutChord.windowNumber == eventWindowNumber {
+           pendingConfiguredShortcutChord.windowNumber == eventWindowNumber,
+           pendingConfiguredShortcutChord.firstStroke == shortcut.firstStroke {
             activeConfiguredShortcutChordPrefixForCurrentEvent =
                 pendingConfiguredShortcutChord.firstStroke
-        } else {
+        } else if activeConfiguredShortcutChordPrefixForCurrentEvent
+            != shortcut.firstStroke {
             activeConfiguredShortcutChordPrefixForCurrentEvent = nil
         }
         pendingConfiguredShortcutChord = nil

From 383a0969f132d91af83768971bb9dee6644a8716 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sun, 26 Jul 2026 00:33:54 -0700
Subject: [PATCH 118/124] test: cover legacy global hotkey registration
 migration

---
 .../SystemWideHotkeyShortcutPolicyTests.swift | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
index 0afffb9c48b8..1713f2a7d5af 100644
--- a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
+++ b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
@@ -145,6 +145,37 @@ extension GlobalSearchShortcutBehaviorTests {
         #expect(probeRegistrationStatus(showHideRegistration) == noErr)
     }
 
+    @Test func controllerMigratesLegacyShowHideShortcutBeforeRegistration() throws {
+        SystemWideHotkeyController.shared.start()
+        SystemWideHotkeySettings.setEnabled(false)
+        notifyHotkeyControllerOfDefaultsChange()
+
+        let shortcut = try #require(availableSyntheticShortcuts().first)
+        let registration = try #require(shortcut.carbonHotKeyRegistration)
+        let encodedShortcut = try JSONEncoder().encode(shortcut)
+        UserDefaults.standard.set(
+            encodedShortcut,
+            forKey: SystemWideHotkeySettings.legacyShortcutKey
+        )
+        UserDefaults.standard.removeObject(
+            forKey: KeyboardShortcutSettings.Action.showHideAllWindows.defaultsKey
+        )
+        defer {
+            SystemWideHotkeySettings.setEnabled(false)
+            notifyHotkeyControllerOfDefaultsChange()
+        }
+
+        SystemWideHotkeySettings.setEnabled(true)
+        notifyHotkeyControllerOfDefaultsChange()
+
+        #expect(probeRegistrationStatus(registration) == eventHotKeyExistsErr)
+        #expect(
+            UserDefaults.standard.object(
+                forKey: SystemWideHotkeySettings.legacyShortcutKey
+            ) == nil
+        )
+    }
+
     private func availableSyntheticShortcuts() -> [StoredShortcut] {
         [
             ("f13", 105),

From 91a1a299a93b3b4b5f00299ebbd3ccfd0fa8d3ad Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sun, 26 Jul 2026 01:02:53 -0700
Subject: [PATCH 119/124] fix: preserve legacy global hotkey migration

---
 Sources/KeyboardShortcutSettings.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index c3145f0b95bd..bc85b945efc0 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -1217,7 +1217,7 @@ final class SystemWideHotkeyController {
     }
 
     private func refreshRegistration() {
-        let shortcut = KeyboardShortcutSettings.shortcut(for: Self.action)
+        let shortcut = SystemWideHotkeySettings.shortcut()
         // Stand down while either recorder is armed (legacy app-target recorder or the CmuxSettingsUI
         // package recorder) so the opt-in hotkey is captured rather than fired while being rebound.
         let isShortcutRecordingActive = KeyboardShortcutRecorderActivity.isAnyRecorderActive

From f9de8c780e244246b7f1f8aa6495fc03a29063fb Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sun, 26 Jul 2026 01:09:39 -0700
Subject: [PATCH 120/124] refactor: observe shortcut updates with Observation

---
 .../CmuxSettings/Values/ShortcutAction.swift  |  1 +
 .../Values/ShortcutBindingPolicyResult.swift  |  8 ++--
 Sources/AllShortcutsPopover.swift             |  2 +-
 Sources/ContentView.swift                     |  4 +-
 .../KeyboardShortcutSettingsObserver.swift    | 42 +++++++++++++------
 Sources/NotificationsPage.swift               |  2 +-
 Sources/Panels/BrowserPanelView.swift         |  2 +-
 Sources/RightSidebarPanelView.swift           |  2 +-
 Sources/Update/UpdateTitlebarAccessory.swift  |  2 +-
 Sources/WorkspaceContentView.swift            |  2 +-
 Sources/cmuxApp.swift                         |  2 +-
 11 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift
index a1303dcab0c4..b625afcac75d 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift
@@ -148,6 +148,7 @@ public enum ShortcutAction: String, CaseIterable, Sendable, Hashable, SettingCod
     case toggleBrowserDeveloperTools
     case showBrowserJavaScriptConsole
     case toggleBrowserFocusMode
+    /// Toggles design-mode editing for the focused browser.
     case toggleBrowserDesignMode
     case toggleReactGrab
     /// Scrolls the focused diff viewer down one step.
diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
index 06e7083dad47..71a3d2e0acea 100644
--- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
+++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutBindingPolicyResult.swift
@@ -23,7 +23,7 @@ public enum ShortcutBindingPolicyResult: Sendable, Equatable {
     case systemReservedShortcutNotAllowed
 }
 
-public extension ShortcutAction {
+extension ShortcutAction {
     /// Validates the representation-independent shape of a persisted shortcut.
     ///
     /// This policy intentionally excludes conflicts with other actions because
@@ -31,7 +31,7 @@ public extension ShortcutAction {
     ///
     /// - Parameter shortcut: The shortcut loaded or proposed by a persistence adapter.
     /// - Returns: The action-owned validity of the shortcut shape.
-    func shortcutBindingPolicyResult(
+    public func shortcutBindingPolicyResult(
         for shortcut: StoredShortcut
     ) -> ShortcutBindingPolicyResult {
         guard !shortcut.isUnbound else { return .accepted }
@@ -75,7 +75,7 @@ public extension ShortcutAction {
     ///   - conflictsWithReservedShortcut: Whether a normalized shortcut is reserved
     ///     by a higher-priority system-wide binding.
     /// - Returns: The executable shortcut, or `nil` when the action is unbound.
-    func effectivePersistedShortcut(
+    public func effectivePersistedShortcut(
         _ candidate: StoredShortcut?,
         conflictsWithReservedShortcut: (StoredShortcut) -> Bool = { _ in false }
     ) -> StoredShortcut? {
@@ -99,7 +99,7 @@ public extension ShortcutAction {
     ///   - conflictsWithReservedShortcut: Whether a normalized shortcut is reserved
     ///     by a higher-priority system-wide binding.
     /// - Returns: The executable shortcut, or `nil` when the action is unbound.
-    func effectivePersistedShortcut(
+    public func effectivePersistedShortcut(
         _ candidate: StoredShortcut?,
         normalizing: (StoredShortcut) -> StoredShortcut?,
         conflictsWithReservedShortcut: (StoredShortcut) -> Bool
diff --git a/Sources/AllShortcutsPopover.swift b/Sources/AllShortcutsPopover.swift
index 829617bd3ad5..3be50357e3a9 100644
--- a/Sources/AllShortcutsPopover.swift
+++ b/Sources/AllShortcutsPopover.swift
@@ -20,7 +20,7 @@ import SwiftUI
 /// the boundary) and its `revision` is read once at the top of `body`; no row
 /// view holds a store reference.
 struct AllShortcutsPopover: View {
-    @ObservedObject private var shortcutObserver = KeyboardShortcutSettingsObserver.shared
+    @State private var shortcutObserver = KeyboardShortcutSettingsObserver.shared
 
     var body: some View {
         // Reading the observer's revision keeps the popover reactive to live
diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift
index 5e0b31cc80d4..46732315640b 100644
--- a/Sources/ContentView.swift
+++ b/Sources/ContentView.swift
@@ -10562,7 +10562,7 @@ struct VerticalTabsSidebar: View, Equatable {
     @StateObject private var tabItemSettingsStore = SidebarTabItemSettingsStore(
         initialSidebarFontSize: GhosttyConfig.load().sidebarFontSize
     )
-    @ObservedObject private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
+    @State private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
     @State var dragState = SidebarDragState()
     // Bonsplit tab drags arrive through AppKit pasteboard callbacks, not
     // `SidebarDragState`, so they need a separate transient collection flag.
@@ -14616,7 +14616,7 @@ private struct SidebarHelpMenuButton: View {
     private let helpTitle = String(localized: "sidebar.help.button", defaultValue: "Help")
     private let buttonSize: CGFloat = 22
     private let iconSize: CGFloat = 11
-    @ObservedObject private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
+    @State private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
 
     let onSendFeedback: () -> Void
 
diff --git a/Sources/KeyboardShortcutSettingsObserver.swift b/Sources/KeyboardShortcutSettingsObserver.swift
index 57fb98eb261c..c0a693c703c2 100644
--- a/Sources/KeyboardShortcutSettingsObserver.swift
+++ b/Sources/KeyboardShortcutSettingsObserver.swift
@@ -1,34 +1,52 @@
-import Combine
 import Foundation
+import Observation
 
-/// Publishes keyboard-shortcut revisions and owns the right-sidebar matcher snapshot.
+/// Observes keyboard-shortcut revisions and owns the right-sidebar matcher snapshot.
 @MainActor
-final class KeyboardShortcutSettingsObserver: ObservableObject {
+@Observable
+final class KeyboardShortcutSettingsObserver {
     static let shared = KeyboardShortcutSettingsObserver()
 
-    @Published private(set) var revision: UInt64 = 0
+    private(set) var revision: UInt64 = 0
     let rightSidebarModeShortcutMatcher = RightSidebarModeShortcutMatcher()
-    private var settingsCancellable: AnyCancellable?
-    private var recorderCancellable: AnyCancellable?
+    private let notificationCenter: NotificationCenter
+    @ObservationIgnored
+    private var settingsObserver: NSObjectProtocol?
+    @ObservationIgnored
+    private var recorderObserver: NSObjectProtocol?
 
     init(notificationCenter: NotificationCenter = .default) {
-        settingsCancellable = notificationCenter.publisher(
-            for: KeyboardShortcutSettings.didChangeNotification
-        ).sink { [weak self] _ in
+        self.notificationCenter = notificationCenter
+        settingsObserver = notificationCenter.addObserver(
+            forName: KeyboardShortcutSettings.didChangeNotification,
+            object: nil,
+            queue: nil
+        ) { [weak self] _ in
             Self.deliverOnMainActor { [weak self] in
                 self?.revision &+= 1
                 self?.rightSidebarModeShortcutMatcher.reload()
             }
         }
-        recorderCancellable = notificationCenter.publisher(
-            for: KeyboardShortcutRecorderActivity.didChangeNotification
-        ).sink { [weak self] _ in
+        recorderObserver = notificationCenter.addObserver(
+            forName: KeyboardShortcutRecorderActivity.didChangeNotification,
+            object: nil,
+            queue: nil
+        ) { [weak self] _ in
             Self.deliverOnMainActor { [weak self] in
                 self?.revision &+= 1
             }
         }
     }
 
+    deinit {
+        if let settingsObserver {
+            notificationCenter.removeObserver(settingsObserver)
+        }
+        if let recorderObserver {
+            notificationCenter.removeObserver(recorderObserver)
+        }
+    }
+
     /// Preserves synchronous delivery for main-thread settings mutations while
     /// bridging background notifications onto the main actor.
     nonisolated private static func deliverOnMainActor(
diff --git a/Sources/NotificationsPage.swift b/Sources/NotificationsPage.swift
index a2c8a95f144a..d1729f37a347 100644
--- a/Sources/NotificationsPage.swift
+++ b/Sources/NotificationsPage.swift
@@ -7,7 +7,7 @@ struct NotificationsPage: View {
     @EnvironmentObject var tabManager: TabManager
     @Binding var selection: SidebarSelection
     @FocusState private var focusedNotificationId: UUID?
-    @ObservedObject private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
+    @State private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
     @AppStorage(PhonePushSettings.forwardEnabledKey) private var forwardToPhone = false
     @AppStorage(PhonePushSettings.hideContentKey) private var hidePhoneNotificationContent = false
     @AppStorage(PhonePushSettings.forwardModeKey) private var forwardToPhoneMode = PhoneForwardingMode.defaultMode.rawValue
diff --git a/Sources/Panels/BrowserPanelView.swift b/Sources/Panels/BrowserPanelView.swift
index 31d24a717ff7..8881e22202be 100644
--- a/Sources/Panels/BrowserPanelView.swift
+++ b/Sources/Panels/BrowserPanelView.swift
@@ -279,7 +279,7 @@ struct BrowserPanelView: View {
     @AppStorage(BrowserImportHintSettings.variantKey) private var browserImportHintVariantRaw = BrowserImportHintSettings.defaultVariant.rawValue
     @AppStorage(BrowserImportHintSettings.showOnBlankTabsKey) private var showBrowserImportHintOnBlankTabs = BrowserImportHintSettings.defaultShowOnBlankTabs
     @AppStorage(BrowserImportHintSettings.dismissedKey) private var isBrowserImportHintDismissed = BrowserImportHintSettings.defaultDismissed
-    @ObservedObject private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
+    @State private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
     @LiveSetting(\.shortcuts.showModifierHoldHints) private var showModifierHoldHints
     @State private var omnibarSuggestionRefreshScheduler = OmnibarSuggestionRefreshScheduler()
     @State private var omnibarSuggestionRefreshConsumerTask: Task<Void, Never>?
diff --git a/Sources/RightSidebarPanelView.swift b/Sources/RightSidebarPanelView.swift
index 2022ecec4bc0..064c18a8c797 100644
--- a/Sources/RightSidebarPanelView.swift
+++ b/Sources/RightSidebarPanelView.swift
@@ -125,7 +125,7 @@ struct RightSidebarPanelView: View {
     @State private var focusShortcutHintMonitor = WindowScopedShortcutHintModifierMonitor(activation: .commandOnly)
     @State private var closeShortcutHintMonitor = WindowScopedShortcutHintModifierMonitor(activation: .commandOnly)
     @State private var hasMountedRightSidebarContent = false
-    @ObservedObject private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
+    @State private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
     private let alwaysShowShortcutHints = ShortcutHintDebugSettings().alwaysShowHints
     private let closeShortcutHintXOffset = ShortcutHintDebugSettings.defaultRightSidebarCloseHintX
     private let closeShortcutHintYOffset = ShortcutHintDebugSettings.defaultRightSidebarCloseHintY
diff --git a/Sources/Update/UpdateTitlebarAccessory.swift b/Sources/Update/UpdateTitlebarAccessory.swift
index db749d751499..2a13419c3c1d 100644
--- a/Sources/Update/UpdateTitlebarAccessory.swift
+++ b/Sources/Update/UpdateTitlebarAccessory.swift
@@ -2132,7 +2132,7 @@ final class TitlebarControlsAccessoryViewController: NSTitlebarAccessoryViewCont
 
 private struct NotificationsPopoverView: View {
     @ObservedObject var notificationStore: TerminalNotificationStore
-    @ObservedObject private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
+    @State private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
     let onDismiss: () -> Void
 
     @AppStorage("cmux.notifications.popover.width")
diff --git a/Sources/WorkspaceContentView.swift b/Sources/WorkspaceContentView.swift
index cb63a32f1ab1..8ee602b56d35 100644
--- a/Sources/WorkspaceContentView.swift
+++ b/Sources/WorkspaceContentView.swift
@@ -753,7 +753,7 @@ extension WorkspaceContentView {
 struct EmptyPanelView: View {
     @ObservedObject var workspace: Workspace
     let paneId: PaneID
-    @ObservedObject private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
+    @State private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
 
     private struct ShortcutHint: View {
         let text: String
diff --git a/Sources/cmuxApp.swift b/Sources/cmuxApp.swift
index 31a06c793b14..d3deff760cb8 100644
--- a/Sources/cmuxApp.swift
+++ b/Sources/cmuxApp.swift
@@ -63,7 +63,7 @@ struct cmuxApp: App {
     @StateObject private var notificationStore = TerminalNotificationStore.shared
     @StateObject var closedItemHistoryStore = ClosedItemHistoryStore.shared
     @StateObject private var sidebarState = SidebarState()
-    @StateObject private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
+    @State private var keyboardShortcutSettingsObserver = KeyboardShortcutSettingsObserver.shared
     @AppStorage(AppearanceSettings.appearanceModeKey) private var appearanceMode = AppearanceSettings.defaultMode.rawValue
     @AppStorage(TitlebarControlsStyle.storageKey) private var titlebarControlsStyle = TitlebarControlsStyle.defaultRawValue
     @AppStorage(DevBuildBannerDebugSettings.sidebarBannerVisibleKey)

From 332c4b59836eff1d535043a55ce9ddbbc6095a04 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sun, 26 Jul 2026 13:26:50 -0700
Subject: [PATCH 121/124] fix: cache foreground search shortcut routing

---
 Sources/App/ShortcutBareStartRouting.swift    |   4 +-
 .../KeyboardShortcutSettingsObserver.swift    |  48 ++++++++-
 ...eyboardShortcutSettingsObserverTests.swift | 100 ++++++++++++++++++
 3 files changed, 145 insertions(+), 7 deletions(-)

diff --git a/Sources/App/ShortcutBareStartRouting.swift b/Sources/App/ShortcutBareStartRouting.swift
index 47faa172cf25..0b04b55a8c1d 100644
--- a/Sources/App/ShortcutBareStartRouting.swift
+++ b/Sources/App/ShortcutBareStartRouting.swift
@@ -143,9 +143,9 @@ extension AppDelegate {
         return globalSearchShortcutWhenClauseAllows(event: event)
     }
 
-    /// Resolves the foreground Search binding from the authoritative settings snapshot.
+    /// Returns the foreground Search binding from the observer's authoritative snapshot.
     func globalSearchShortcutForRouting() -> StoredShortcut {
-        KeyboardShortcutSettings.shortcut(for: .globalSearch)
+        KeyboardShortcutSettingsObserver.shared.globalSearchShortcut
     }
 
     private func activeGlobalSearchStroke(for shortcut: StoredShortcut) -> ShortcutStroke? {
diff --git a/Sources/KeyboardShortcutSettingsObserver.swift b/Sources/KeyboardShortcutSettingsObserver.swift
index c0a693c703c2..154cb50b1403 100644
--- a/Sources/KeyboardShortcutSettingsObserver.swift
+++ b/Sources/KeyboardShortcutSettingsObserver.swift
@@ -1,30 +1,48 @@
+import Carbon
 import Foundation
 import Observation
 
-/// Observes keyboard-shortcut revisions and owns the right-sidebar matcher snapshot.
+/// Observes keyboard-shortcut revisions and owns hot-path matcher snapshots.
 @MainActor
 @Observable
 final class KeyboardShortcutSettingsObserver {
+    typealias ShortcutProvider = (KeyboardShortcutSettings.Action) -> StoredShortcut
+
     static let shared = KeyboardShortcutSettingsObserver()
 
     private(set) var revision: UInt64 = 0
-    let rightSidebarModeShortcutMatcher = RightSidebarModeShortcutMatcher()
+    private(set) var globalSearchShortcut: StoredShortcut
+    let rightSidebarModeShortcutMatcher: RightSidebarModeShortcutMatcher
     private let notificationCenter: NotificationCenter
+    private let distributedNotificationCenter: DistributedNotificationCenter
+    @ObservationIgnored
+    private let shortcutProvider: ShortcutProvider
     @ObservationIgnored
     private var settingsObserver: NSObjectProtocol?
     @ObservationIgnored
     private var recorderObserver: NSObjectProtocol?
+    @ObservationIgnored
+    private var inputSourceObserver: NSObjectProtocol?
 
-    init(notificationCenter: NotificationCenter = .default) {
+    init(
+        notificationCenter: NotificationCenter = .default,
+        distributedNotificationCenter: DistributedNotificationCenter = .default(),
+        shortcutProvider: @escaping ShortcutProvider = KeyboardShortcutSettings.shortcut(for:)
+    ) {
         self.notificationCenter = notificationCenter
+        self.distributedNotificationCenter = distributedNotificationCenter
+        self.shortcutProvider = shortcutProvider
+        globalSearchShortcut = shortcutProvider(.globalSearch)
+        rightSidebarModeShortcutMatcher = RightSidebarModeShortcutMatcher(
+            shortcutProvider: shortcutProvider
+        )
         settingsObserver = notificationCenter.addObserver(
             forName: KeyboardShortcutSettings.didChangeNotification,
             object: nil,
             queue: nil
         ) { [weak self] _ in
             Self.deliverOnMainActor { [weak self] in
-                self?.revision &+= 1
-                self?.rightSidebarModeShortcutMatcher.reload()
+                self?.reloadCachedShortcuts()
             }
         }
         recorderObserver = notificationCenter.addObserver(
@@ -36,6 +54,17 @@ final class KeyboardShortcutSettingsObserver {
                 self?.revision &+= 1
             }
         }
+        inputSourceObserver = distributedNotificationCenter.addObserver(
+            forName: Notification.Name(
+                rawValue: kTISNotifySelectedKeyboardInputSourceChanged as String
+            ),
+            object: nil,
+            queue: nil
+        ) { [weak self] _ in
+            Self.deliverOnMainActor { [weak self] in
+                self?.reloadCachedShortcuts()
+            }
+        }
     }
 
     deinit {
@@ -45,6 +74,15 @@ final class KeyboardShortcutSettingsObserver {
         if let recorderObserver {
             notificationCenter.removeObserver(recorderObserver)
         }
+        if let inputSourceObserver {
+            distributedNotificationCenter.removeObserver(inputSourceObserver)
+        }
+    }
+
+    private func reloadCachedShortcuts() {
+        globalSearchShortcut = shortcutProvider(.globalSearch)
+        revision &+= 1
+        rightSidebarModeShortcutMatcher.reload()
     }
 
     /// Preserves synchronous delivery for main-thread settings mutations while
diff --git a/cmuxTests/KeyboardShortcutSettingsObserverTests.swift b/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
index d4dd72aa01c9..c5197a200471 100644
--- a/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
+++ b/cmuxTests/KeyboardShortcutSettingsObserverTests.swift
@@ -1,3 +1,4 @@
+import Carbon
 import Foundation
 import Testing
 
@@ -21,6 +22,59 @@ extension GlobalSearchShortcutBehaviorTests {
         #expect(observer.revision == expectedRevision)
     }
 
+    @Test func globalSearchShortcutUsesSnapshotAndReloadsAfterSettingsChange() {
+        let notificationCenter = NotificationCenter()
+        var configuredShortcut = StoredShortcut(
+            key: "f",
+            command: true,
+            shift: false,
+            option: true,
+            control: false
+        )
+        var globalSearchLookupCount = 0
+        let observer = KeyboardShortcutSettingsObserver(
+            notificationCenter: notificationCenter,
+            distributedNotificationCenter: DistributedNotificationCenter(),
+            shortcutProvider: { action in
+                guard action == .globalSearch else { return .unbound }
+                globalSearchLookupCount += 1
+                return configuredShortcut
+            }
+        )
+
+        #expect(observer.globalSearchShortcut == configuredShortcut)
+        let initialLookupCount = globalSearchLookupCount
+        for _ in 0..<100 {
+            _ = observer.globalSearchShortcut
+        }
+        #expect(globalSearchLookupCount == initialLookupCount)
+
+        configuredShortcut = StoredShortcut(
+            key: "g",
+            command: true,
+            shift: true,
+            option: false,
+            control: false,
+            chordKey: "s"
+        )
+        notificationCenter.post(
+            name: KeyboardShortcutSettings.didChangeNotification,
+            object: nil
+        )
+
+        #expect(observer.globalSearchShortcut == configuredShortcut)
+        #expect(globalSearchLookupCount == initialLookupCount + 1)
+
+        configuredShortcut = .unbound
+        notificationCenter.post(
+            name: KeyboardShortcutSettings.didChangeNotification,
+            object: nil
+        )
+
+        #expect(observer.globalSearchShortcut == .unbound)
+        #expect(globalSearchLookupCount == initialLookupCount + 2)
+    }
+
     @Test func legacyMediaKeyGlobalSearchBindingFallsBackToDefault() throws {
         let action = KeyboardShortcutSettings.Action.globalSearch
         let defaults = UserDefaults.standard
@@ -55,5 +109,51 @@ extension GlobalSearchShortcutBehaviorTests {
         #expect(KeyboardShortcutSettings.shortcut(for: action) == action.defaultShortcut)
     }
 
+    @Test func inputSourceChangeRefreshesGlobalSearchSnapshot() async {
+        let notificationCenter = NotificationCenter()
+        let distributedNotificationCenter = DistributedNotificationCenter.default()
+        var configuredShortcut = StoredShortcut(
+            key: "f",
+            command: true,
+            shift: false,
+            option: true,
+            control: false
+        )
+        var globalSearchLookupCount = 0
+        let observer = KeyboardShortcutSettingsObserver(
+            notificationCenter: notificationCenter,
+            distributedNotificationCenter: distributedNotificationCenter,
+            shortcutProvider: { action in
+                guard action == .globalSearch else { return .unbound }
+                globalSearchLookupCount += 1
+                return configuredShortcut
+            }
+        )
+        let initialLookupCount = globalSearchLookupCount
+        configuredShortcut = StoredShortcut(
+            key: "g",
+            command: true,
+            shift: true,
+            option: false,
+            control: false
+        )
+
+        distributedNotificationCenter.postNotificationName(
+            Notification.Name(rawValue: kTISNotifySelectedKeyboardInputSourceChanged as String),
+            object: nil,
+            userInfo: nil,
+            deliverImmediately: true
+        )
+        var yields = 0
+        while globalSearchLookupCount == initialLookupCount, yields < 1_000 {
+            await Task.yield()
+            yields += 1
+        }
+
+        #expect(observer.globalSearchShortcut == configuredShortcut)
+        #expect(globalSearchLookupCount == initialLookupCount + 1)
+        #expect(observer.revision == 1)
+    }
+
     }
 }

From 1f7bf6bf56ead40fe031f6c01209fdf3cf560417 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Sun, 26 Jul 2026 14:53:23 -0700
Subject: [PATCH 122/124] fix: make legacy hotkey migration single-pass

---
 Sources/KeyboardShortcutSettings.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index 1ae8d80059b8..d35e7dd5fb1f 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -1107,10 +1107,10 @@ enum SystemWideHotkeySettings {
 
     private static func migrateLegacyShortcutIfNeeded(defaults: UserDefaults = .standard) {
         guard defaults.object(forKey: legacyShortcutKey) != nil else { return }
-        defer { defaults.removeObject(forKey: legacyShortcutKey) }
-
+        let legacyData = defaults.data(forKey: legacyShortcutKey)
+        defaults.removeObject(forKey: legacyShortcutKey)
         guard defaults.object(forKey: action.defaultsKey) == nil,
-              let data = defaults.data(forKey: legacyShortcutKey),
+              let data = legacyData,
               let shortcut = try? JSONDecoder().decode(StoredShortcut.self, from: data) else {
             return
         }

From 9f9535cc41c3833c86d4d7d99a2cff68d91e78a1 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Mon, 27 Jul 2026 12:19:50 -0700
Subject: [PATCH 123/124] Fix legacy hotkey migration test ordering

---
 cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
index 1713f2a7d5af..7446a990f505 100644
--- a/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
+++ b/cmuxTests/SystemWideHotkeyShortcutPolicyTests.swift
@@ -153,13 +153,13 @@ extension GlobalSearchShortcutBehaviorTests {
         let shortcut = try #require(availableSyntheticShortcuts().first)
         let registration = try #require(shortcut.carbonHotKeyRegistration)
         let encodedShortcut = try JSONEncoder().encode(shortcut)
+        UserDefaults.standard.removeObject(
+            forKey: KeyboardShortcutSettings.Action.showHideAllWindows.defaultsKey
+        )
         UserDefaults.standard.set(
             encodedShortcut,
             forKey: SystemWideHotkeySettings.legacyShortcutKey
         )
-        UserDefaults.standard.removeObject(
-            forKey: KeyboardShortcutSettings.Action.showHideAllWindows.defaultsKey
-        )
         defer {
             SystemWideHotkeySettings.setEnabled(false)
             notifyHotkeyControllerOfDefaultsChange()

From bbcbf81d20407741f6836de403120073c5afc346 Mon Sep 17 00:00:00 2001
From: cmux reload-cloud <cmux-reload-cloud@users.noreply.github.com>
Date: Mon, 27 Jul 2026 13:11:50 -0700
Subject: [PATCH 124/124] Fix merged feature flag isolation warning

---
 Sources/FeatureFlags.swift | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sources/FeatureFlags.swift b/Sources/FeatureFlags.swift
index 857772c87216..7041b203422a 100644
--- a/Sources/FeatureFlags.swift
+++ b/Sources/FeatureFlags.swift
@@ -3,7 +3,7 @@ import Observation
 import PostHog
 import os
 
-struct CmuxFeatureFlagDefinition: Identifiable, Equatable {
+struct CmuxFeatureFlagDefinition: Identifiable, Equatable, Sendable {
     var id: String { key }
 
     let key: String
@@ -51,9 +51,9 @@ final class CmuxFeatureFlags {
     #endif
     private static let agentChatUIDefault = false
     #if DEBUG
-    private static let mobileWorkspaceChangesDefault = true
+    private nonisolated static let mobileWorkspaceChangesDefault = true
     #else
-    private static let mobileWorkspaceChangesDefault = false
+    private nonisolated static let mobileWorkspaceChangesDefault = false
     #endif
     private static let sidebarWorkspaceAgentSpinnerDefault = false
     private static let simulatorDefault = true
@@ -95,7 +95,7 @@ final class CmuxFeatureFlags {
     // Mac-side flag turns the whole feature off end to end. Release builds
     // keep it off until the PostHog flag enables it; DEBUG keeps it on for
     // dogfood.
-    static let mobileWorkspaceChangesFlag = CmuxFeatureFlagDefinition(
+    nonisolated static let mobileWorkspaceChangesFlag = CmuxFeatureFlagDefinition(
         key: "mobile-workspace-changes-enabled-release",
         title: String(
             localized: "featureFlags.mobileWorkspaceChanges.title",