Fix overlay window destruction

Author: intitni

Core/Sources/Service/ScheduledCleaner.swift

@@ -61,7 +61,6 @@ public final class ScheduledCleaner {
                 }.result
                 await workspace.cleanUp(availableTabs: [])
                 await service.workspacePool.removeWorkspace(url: url)
-                await service.overlayWindowController.removeController(for: url)
             } else {
                 let tabs = (workspaceInfos[.url(url)]?.tabs ?? [])
                     .union(workspaceInfos[.unknown]?.tabs ?? [])

OverlayWindow/Sources/OverlayWindow/IDEWorkspaceWindowOverlayWindowController.swift

@@ -29,7 +29,6 @@ final class IDEWorkspaceWindowOverlayWindowController {
     let inspector: WorkspaceXcodeWindowInspector
     let contentProviders: [any IDEWorkspaceWindowOverlayWindowControllerContentProvider]
     let maskPanel: OverlayPanel
-    private var isDestroyed: Bool = false
     private var axNotificationTask: Task<Void, Never>?
 
     init(
@@ -89,14 +88,10 @@ final class IDEWorkspaceWindowOverlayWindowController {
 
     deinit {
         axNotificationTask?.cancel()
-        _ = withExtendedLifetime(self) {
-            Task { @MainActor in
-                precondition(
-                    !self.isDestroyed,
-                    "IDEWorkspaceWindowOverlayWindowController should be destroyed before deinit"
-                )
-            }
-        }
+    }
+
+    var isWindowClosed: Bool {
+        inspector.isInvalid
     }
 
     func access() {
@@ -116,12 +111,10 @@ final class IDEWorkspaceWindowOverlayWindowController {
     }
 
     func destroy() {
-        axNotificationTask?.cancel()
         maskPanel.close()
         for contentProvider in contentProviders {
             contentProvider.destroy()
         }
-        isDestroyed = true
     }
 }
 

OverlayWindow/Sources/OverlayWindow/OverlayWindowController.swift

@@ -17,7 +17,6 @@ public final class OverlayWindowController {
     var ideWindowOverlayWindowControllers: [URL: IDEWorkspaceWindowOverlayWindowController] = [:]
     var updateWindowStateTask: Task<Void, Error>?
 
-    @MainActor
     lazy var fullscreenDetector = {
         let it = NSWindow(
             contentRect: .zero,
@@ -40,17 +39,6 @@ public final class OverlayWindowController {
         observeEvents()
         _ = fullscreenDetector
     }
-    
-    public func removeController(for url: URL) {
-        if let controller = ideWindowOverlayWindowControllers[url] {
-            controller.destroy()
-            ideWindowOverlayWindowControllers.removeValue(forKey: url)
-        }
-    }
-    
-    public func removeAllControllers() {
-        ideWindowOverlayWindowControllers.removeAll()
-    }
 
     public nonisolated static func registerIDEWorkspaceWindowOverlayWindowControllerContentProviderFactory(
         _ factory: @escaping IDEWorkspaceWindowOverlayWindowControllerContentProviderFactory
@@ -110,8 +98,17 @@ private extension OverlayWindowController {
                 defer { self.observeWindowChange() }
 
                 guard XcodeInspector.shared.activeApplication?.isXcode ?? false else {
-                    for (_, controller) in self.ideWindowOverlayWindowControllers {
-                        controller.dim()
+                    var closedControllers: [URL] = []
+                    for (url, controller) in self.ideWindowOverlayWindowControllers {
+                        if controller.isWindowClosed {
+                            controller.dim()
+                            closedControllers.append(url)
+                        } else {
+                            controller.dim()
+                        }
+                    }
+                    for url in closedControllers {
+                        self.removeIDEOverlayWindowController(for: url)
                     }
                     return
                 }
@@ -169,6 +166,13 @@ private extension OverlayWindowController {
         newController.access()
         ideWindowOverlayWindowControllers[workspaceURL] = newController
     }
+    
+    func removeIDEOverlayWindowController(for workspaceURL: URL) {
+        if let controller = ideWindowOverlayWindowControllers[workspaceURL] {
+            controller.destroy()
+        }
+        ideWindowOverlayWindowControllers[workspaceURL] = nil
+    }
 
     func handleSpaceChange() async {
         let windowInspector = XcodeInspector.shared.focusedWindow

Tool/Sources/XcodeInspector/XcodeWindowInspector.swift

@@ -13,6 +13,10 @@ public class XcodeWindowInspector {
         self.uiElement = uiElement
         uiElement.setMessagingTimeout(2)
     }
+    
+    public var isInvalid: Bool {
+        uiElement.parent == nil
+    }
 }
 
 @XcodeInspectorActor