deal with bug in KeyboardShortcuts

Author: gsabran

app/modules/App/Sources/Windows/WindowsViewModel.swift

@@ -18,10 +18,8 @@ final class WindowsViewModel {
   init() {
     state = .init(isSidePanelVisible: false, isSetupVisible: false)
 
-    Task {
-      await appEventHandlerRegistry.registerHandler { [weak self] event in
-        await self?.handle(appEvent: event) ?? false
-      }
+    appEventHandlerRegistry.registerHandler { [weak self] event in
+      await self?.handle(appEvent: event) ?? false
     }
     permissionsService.status(for: .accessibility).sink { [weak self] isGranted in
       self?.handle(.accessibilityPermissionChanged(isGranted: isGranted))

app/modules/App/Sources/XcodeKeyboardShortcuts.swift

@@ -23,30 +23,47 @@ final class XcodeKeyboardShortcutsManager: @unchecked Sendable {
 
   private var cancellables: Set<AnyCancellable> = []
 
+  private var enabledShortcutNames = Set<String>()
+
   @Dependency(\.appEventHandlerRegistry) private var appEventHandlerRegistry
 
   /// This can be moved to the initializer once https://github.com/swiftlang/swift/issues/80050 is fixed.
   private func observeXcodeState(appsActivationState: AnyPublisher<AppsActivationState, Never>) {
     let cancellable = appsActivationState
       .sink { @Sendable [weak self] appsActivationState in
-        guard self != nil else { return }
+        guard let self else { return }
         // Handle de-activations first, then activations.
         if !appsActivationState.isHostAppActive {
-          KeyboardShortcuts.disable(KeyboardShortcuts.Name.hostAppShortcuts)
+          disable(KeyboardShortcuts.Name.hostAppShortcuts)
         }
         if !appsActivationState.isXcodeActive {
-          KeyboardShortcuts.disable(KeyboardShortcuts.Name.xcodeShortcuts)
+          disable(KeyboardShortcuts.Name.xcodeShortcuts)
         }
         if appsActivationState.isHostAppActive {
-          KeyboardShortcuts.enable(KeyboardShortcuts.Name.hostAppShortcuts)
+          enable(KeyboardShortcuts.Name.hostAppShortcuts)
         }
         if appsActivationState.isXcodeActive {
-          KeyboardShortcuts.enable(KeyboardShortcuts.Name.xcodeShortcuts)
+          enable(KeyboardShortcuts.Name.xcodeShortcuts)
         }
       }
     safelyMutate { $0.cancellables.insert(cancellable) }
   }
 
+  /// Manually tracks enabled shortcuts due to https://github.com/sindresorhus/KeyboardShortcuts/issues/217
+  private func enable(_ shortcuts: [KeyboardShortcuts.Name]) {
+    KeyboardShortcuts.enable(shortcuts)
+    safelyMutate { state in
+      for shortcut in shortcuts { state.enabledShortcutNames.insert(shortcut.rawValue) }
+    }
+  }
+
+  private func disable(_ shortcuts: [KeyboardShortcuts.Name]) {
+    KeyboardShortcuts.disable(shortcuts)
+    safelyMutate { state in
+      for shortcut in shortcuts { state.enabledShortcutNames.remove(shortcut.rawValue) }
+    }
+  }
+
   private func registerActions() {
     on(.ask, trigger: AddCodeToChatEvent(newThread: false, chatMode: .ask))
     on(.askInNewThread, trigger: AddCodeToChatEvent(newThread: true, chatMode: .ask))
@@ -56,14 +73,17 @@ final class XcodeKeyboardShortcutsManager: @unchecked Sendable {
     on(.generate, trigger: GenerateEvent())
     on(.hideChat, trigger: HideChatEvent())
     on(.new, trigger: NewChatEvent())
-    on(.switchToAskMode, trigger: AddCodeToChatEvent(newThread: false, chatMode: .ask))
-    on(.switchToAgentMode, trigger: AddCodeToChatEvent(newThread: false, chatMode: .agent))
+    on(.switchToAskMode, trigger: ChangeChatModeEvent(chatMode: .ask))
+    on(.switchToAgentMode, trigger: ChangeChatModeEvent(chatMode: .agent))
   }
 
   private func on(_ keyEvent: KeyboardShortcuts.Name, trigger event: AppEvent) {
     KeyboardShortcuts.onKeyUp(for: keyEvent) {
       Task { [weak self] in
-        await self?.appEventHandlerRegistry.handle(event: event)
+        guard let self else { return }
+        if enabledShortcutNames.contains(keyEvent.rawValue) {
+          _ = await appEventHandlerRegistry.handle(event: event)
+        }
       }
     }
   }

app/modules/features/Chat/Sources/ChatViewModel.swift

@@ -53,19 +53,7 @@ public class ChatViewModel {
     self.currentModel = currentModel
     self.selectedTab = selectedTab
     self.defaultMode = defaultMode
-
-    appEventHandlerRegistry.registerHandler { [weak self] event in
-      guard let self else { return false }
-      if let event = event as? AddCodeToChatEvent {
-        await handle(addCodeToChatEvent: event)
-        return true
-      } else if event is NewChatEvent {
-        await addTab(copyingCurrentInput: true)
-        return true
-      } else {
-        return false
-      }
-    }
+    registerAsAppEventHandler()
   }
 
   var tabs: [ChatTabViewModel]
@@ -106,6 +94,26 @@ public class ChatViewModel {
   @ObservationIgnored @Dependency(\.xcodeObserver) private var xcodeObserver
   @ObservationIgnored @Dependency(\.fileManager) private var fileManager
 
+  private func registerAsAppEventHandler() {
+    appEventHandlerRegistry.registerHandler { [weak self] event in
+      guard let self else { return false }
+      if let event = event as? AddCodeToChatEvent {
+        await handle(addCodeToChatEvent: event)
+        return true //
+      } else if let event = event as? ChangeChatModeEvent {
+        Task { @MainActor in
+          self.selectedTab?.input.mode = event.chatMode
+        }
+        return true
+      } else if event is NewChatEvent {
+        await addTab(copyingCurrentInput: true)
+        return true
+      } else {
+        return false
+      }
+    }
+  }
+
   private func handle(addCodeToChatEvent event: AddCodeToChatEvent) {
     Task { @MainActor in
       if ProcessInfo.processInfo.processName != "xctest" {

app/modules/foundations/ChatAppEvents/Sources/ChatAppEvents.swift

@@ -16,6 +16,16 @@ public struct AddCodeToChatEvent: AppEvent {
   public let chatMode: ChatMode?
 }
 
+// MARK: - ChangeChatModeEvent
+
+public struct ChangeChatModeEvent: AppEvent {
+  public init(chatMode: ChatMode) {
+    self.chatMode = chatMode
+  }
+
+  public let chatMode: ChatMode
+}
+
 // MARK: - NewChatEvent
 
 public struct NewChatEvent: AppEvent {