Bring back some main actors

Author: intitni

Pro

@@ -160,14 +160,16 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
                     uiElement: window,
                     axNotifications: axNotifications
                 )
-                focusedWindow = window
 
                 focusedWindowObservations.forEach { $0.cancel() }
                 focusedWindowObservations.removeAll()
 
-                documentURL = window.documentURL
-                workspaceURL = window.workspaceURL
-                projectRootURL = window.projectRootURL
+                Task { @MainActor in
+                    focusedWindow = window
+                    documentURL = window.documentURL
+                    workspaceURL = window.workspaceURL
+                    projectRootURL = window.projectRootURL
+                }
 
                 window.$documentURL
                     .filter { $0 != .init(fileURLWithPath: "/") }
@@ -190,10 +192,14 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
 
             } else {
                 let window = XcodeWindowInspector(uiElement: window)
-                focusedWindow = window
+                Task { @MainActor in
+                    focusedWindow = window
+                }
             }
         } else {
-            focusedWindow = nil
+            Task { @MainActor in
+                focusedWindow = nil
+            }
         }
     }
 
@@ -226,7 +232,8 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
             for await notification in axNotificationStream {
                 guard let self else { return }
                 try Task.checkCancellation()
-
+                await Task.yield()
+            
                 guard let event = AXNotificationKind(rawValue: notification.name) else {
                     continue
                 }
@@ -258,19 +265,23 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
                     switch event {
                     case .created:
                         if isCompletionPanel() {
-                            completionPanel = notification.element
-                            self.axNotifications.send(.init(
-                                kind: .xcodeCompletionPanelChanged,
-                                element: notification.element
-                            ))
+                            await MainActor.run {
+                                self.completionPanel = notification.element
+                                self.axNotifications.send(.init(
+                                    kind: .xcodeCompletionPanelChanged,
+                                    element: notification.element
+                                ))
+                            }
                         }
                     case .uiElementDestroyed:
                         if isCompletionPanel() {
-                            completionPanel = nil
-                            self.axNotifications.send(.init(
-                                kind: .xcodeCompletionPanelChanged,
-                                element: notification.element
-                            ))
+                            await MainActor.run {
+                                self.completionPanel = nil
+                                self.axNotifications.send(.init(
+                                    kind: .xcodeCompletionPanelChanged,
+                                    element: notification.element
+                                ))
+                            }
                         }
                     default: continue
                     }
@@ -319,7 +330,10 @@ extension XcodeAppInstanceInspector {
 
     func updateWorkspaceInfo() {
         let workspaceInfoInVisibleSpace = Self.fetchVisibleWorkspaces(runningApplication)
-        workspaces = Self.updateWorkspace(workspaces, with: workspaceInfoInVisibleSpace)
+        let workspaces = Self.updateWorkspace(workspaces, with: workspaceInfoInVisibleSpace)
+        Task { @MainActor in
+            self.workspaces = workspaces
+        }
     }
 
     /// Use the project path as the workspace identifier.

Tool/Sources/XcodeInspector/Apps/XcodeAppInstanceInspector.swift

@@ -76,6 +76,7 @@ public class SourceEditor {
                 group.addTask { [weak self] in
                     for await notification in editorNotifications {
                         try Task.checkCancellation()
+                        await Task.yield()
                         guard let self else { return }
                         if let kind: AXNotificationKind = {
                             switch notification.name {
@@ -102,6 +103,7 @@ public class SourceEditor {
                     group.addTask { [weak self] in
                         for await notification in scrollViewNotifications {
                             try Task.checkCancellation()
+                            await Task.yield()
                             guard let self else { return }
                             self.axNotifications.send(.init(
                                 kind: .scrollPositionChanged,

Tool/Sources/XcodeInspector/SourceEditor.swift

@@ -55,6 +55,7 @@ public final class WorkspaceXcodeWindowInspector: XcodeWindowInspector {
                         guard notification.kind == .focusedUIElementChanged else { continue }
                         guard let self else { return }
                         try Task.checkCancellation()
+                        await Task.yield()
                         await self.updateURLs()
                     }
                 }
@@ -66,18 +67,24 @@ public final class WorkspaceXcodeWindowInspector: XcodeWindowInspector {
     func updateURLs() {
         let documentURL = Self.extractDocumentURL(windowElement: uiElement)
         if let documentURL {
-            self.documentURL = documentURL
+            Task { @MainActor in
+                self.documentURL = documentURL
+            }
         }
         let workspaceURL = Self.extractWorkspaceURL(windowElement: uiElement)
         if let workspaceURL {
-            self.workspaceURL = workspaceURL
+            Task { @MainActor in
+                self.workspaceURL = workspaceURL
+            }
         }
         let projectURL = Self.extractProjectURL(
             workspaceURL: workspaceURL,
             documentURL: documentURL
         )
         if let projectURL {
-            projectRootURL = projectURL
+            Task { @MainActor in
+                self.projectRootURL = projectURL
+            }
         }
     }