Merge branch 'feature/ax-notification-out-of-main-thread' into develop

Author: intitni

Core/Sources/HostApp/DebugView.swift

@@ -25,6 +25,10 @@ final class DebugSettings: ObservableObject {
     var restartXcodeInspectorIfAccessibilityAPIIsMalfunctioningNoTimer
     @AppStorage(\.toastForTheReasonWhyXcodeInspectorNeedsToBeRestarted)
     var toastForTheReasonWhyXcodeInspectorNeedsToBeRestarted
+    @AppStorage(\.observeToAXNotificationOnAnotherThread)
+    var observeToAXNotificationOnAnotherThread
+    @AppStorage(\.observeToAXNotificationWithDefaultMode)
+    var observeToAXNotificationWithDefaultMode
     init() {}
 }
 
@@ -116,6 +120,20 @@ struct DebugSettingsView: View {
                         UserDefaults.shared.set(nil, forKey: "ChatModels")
                         UserDefaults.shared.set(nil, forKey: "EmbeddingModels")
                     }
+                    
+                    Group {
+                        Toggle(
+                            isOn: $settings.observeToAXNotificationOnAnotherThread
+                        ) {
+                            Text("Observe to AXNotification on background thread")
+                        }
+
+                        Toggle(
+                            isOn: $settings.observeToAXNotificationWithDefaultMode
+                        ) {
+                            Text("Observe to AXNotification with default mode")
+                        }
+                    }
                 }
             }
             .padding()

Tool/Package.swift

@@ -160,6 +160,7 @@ let package = Package(
         .target(
             name: "AXNotificationStream",
             dependencies: [
+                "Preferences",
                 "Logger",
             ]
         ),

Tool/Sources/AXNotificationStream/AXNotificationStream.swift

@@ -2,6 +2,7 @@ import AppKit
 import ApplicationServices
 import Foundation
 import Logger
+import Preferences
 
 public final class AXNotificationStream: AsyncSequence {
     public typealias Stream = AsyncStream<Element>
@@ -53,6 +54,15 @@ public final class AXNotificationStream: AsyncSequence {
         self.file = file
         self.line = line
         self.function = function
+
+        let mode: CFRunLoopMode = UserDefaults.shared
+            .value(for: \.observeToAXNotificationWithDefaultMode) ? .defaultMode : .commonModes
+
+        let runLoop: CFRunLoop = UserDefaults.shared
+            .value(for: \.observeToAXNotificationOnAnotherThread)
+            ? DispatchQueue.global(qos: .userInteractive).sync { CFRunLoopGetCurrent() }
+            : CFRunLoopGetMain()
+
         var cont: Continuation!
         stream = Stream { continuation in
             cont = continuation
@@ -88,17 +98,17 @@ public final class AXNotificationStream: AsyncSequence {
                 AXObserverRemoveNotification(observer, observingElement, name as CFString)
             }
             CFRunLoopRemoveSource(
-                CFRunLoopGetMain(),
+                runLoop,
                 AXObserverGetRunLoopSource(observer),
-                .commonModes
+                mode
             )
         }
 
         Task { @MainActor [weak self] in
             CFRunLoopAddSource(
-                CFRunLoopGetMain(),
+                runLoop,
                 AXObserverGetRunLoopSource(observer),
-                .commonModes
+                mode
             )
             var pendingRegistrationNames = Set(notificationNames)
             var retry = 0

Tool/Sources/Preferences/Keys.swift

@@ -604,5 +604,13 @@ public extension UserDefaultPreferenceKeys {
             key: "FeatureFlag-ToastForTheReasonWhyXcodeInspectorNeedsToBeRestarted"
         )
     }
+    
+    var observeToAXNotificationOnAnotherThread: FeatureFlag {
+        .init(defaultValue: false, key: "FeatureFlag-observeToAXNotificationOnAnotherThread")
+    }
+    
+    var observeToAXNotificationWithDefaultMode: FeatureFlag {
+        .init(defaultValue: false, key: "FeatureFlag-observeToAXNotificationWithDefaultMode")
+    }
 }