Tweak widget transition

Author: intitni

Core/Sources/Service/GUI/PromptToCodeProvider+Service.swift

@@ -55,11 +55,14 @@ extension PromptToCodeProvider {
             service.stopResponding()
         }
 
-        onAcceptSuggestionTapped = {
-            Task { 
+        onAcceptSuggestionTapped = { [weak self] in
+            Task { [weak self] in
                 let handler = PseudoCommandHandler()
                 await handler.acceptSuggestion()
-                if let app = ActiveApplicationMonitor.shared.previousApp, app.isXcode {
+                if let app = ActiveApplicationMonitor.shared.previousApp,
+                    app.isXcode,
+                   !(self?.isContinuous ?? false)
+                {
                     try await Task.sleep(nanoseconds: 200_000_000)
                     app.activate()
                 }

Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift

@@ -23,6 +23,7 @@ public struct WidgetFeature: ReducerProtocol {
     }
 
     public struct State: Equatable {
+        var focusingDocumentURL: URL?
         public var colorScheme: ColorScheme = .light
 
         // MARK: Panels
@@ -107,6 +108,7 @@ public struct WidgetFeature: ReducerProtocol {
 
         case updateWindowLocation(animated: Bool)
         case updateWindowOpacity
+        case updateFocusingDocumentURL
 
         case panel(PanelFeature.Action)
         case chatPanel(ChatPanelFeature.Action)
@@ -121,6 +123,11 @@ public struct WidgetFeature: ReducerProtocol {
     @Dependency(\.suggestionWidgetControllerDependency) var suggestionWidgetControllerDependency
     @Dependency(\.activeApplicationMonitor) var activeApplicationMonitor
     @Dependency(\.xcodeInspector) var xcodeInspector
+    @Dependency(\.mainQueue) var mainQueue
+
+    public enum DebounceKey: Hashable {
+        case updateWindowOpacity
+    }
 
     public init() {}
 
@@ -301,6 +308,8 @@ public struct WidgetFeature: ReducerProtocol {
             case .observeWindowChange:
                 guard let app = activeApplicationMonitor.activeApplication else { return .none }
                 guard app.isXcode else { return .none }
+                
+                let documentURL = state.focusingDocumentURL
 
                 return .run { send in
                     await send(.observeEditorChange)
@@ -319,17 +328,31 @@ public struct WidgetFeature: ReducerProtocol {
                         kAXWindowMiniaturizedNotification,
                         kAXWindowDeminiaturizedNotification
                     )
+
                     for await notification in notifications {
                         try Task.checkCancellation()
 
+                        // Hide the widgets before switching to another window/editor
+                        // so the transition looks better.
+                        if [
+                            kAXFocusedUIElementChangedNotification,
+                            kAXFocusedWindowChangedNotification,
+                        ].contains(notification.name) {
+                            let newDocumentURL = xcodeInspector.realtimeActiveDocumentURL
+                            if documentURL != newDocumentURL {
+                                await send(.panel(.removeDisplayedContent))
+                                await hidePanelWindows()
+                            }
+                            await send(.updateFocusingDocumentURL)
+                        }
+
+                        // update widgets.
                         if [
                             kAXFocusedUIElementChangedNotification,
                             kAXApplicationActivatedNotification,
                             kAXMainWindowChangedNotification,
                             kAXFocusedWindowChangedNotification,
                         ].contains(notification.name) {
-                            await hidePanelWindows()
-                            await send(.panel(.removeDisplayedContent))
                             await send(.updateWindowLocation(animated: false))
                             await send(.updateWindowOpacity)
                             await send(.observeEditorChange)
@@ -421,6 +444,10 @@ public struct WidgetFeature: ReducerProtocol {
                 state.panelState.suggestionPanelState.colorScheme = scheme
                 state.chatPanelState.colorScheme = scheme
                 return .none
+                
+            case .updateFocusingDocumentURL:
+                state.focusingDocumentURL = xcodeInspector.realtimeActiveDocumentURL
+                return .none
 
             case let .updateWindowLocation(animated):
                 guard let widgetLocation = generateWidgetLocation() else { return .none }
@@ -486,8 +513,8 @@ public struct WidgetFeature: ReducerProtocol {
             case .updateWindowOpacity:
                 let isChatPanelDetached = state.chatPanelState.chatPanelInASeparateWindow
                 let hasChat = !state.chatPanelState.chatTabGroup.tabInfo.isEmpty
-
                 return .run { _ in
+                    try await mainQueue.sleep(for: .seconds(0.2))
                     Task { @MainActor in
                         if let app = activeApplicationMonitor.activeApplication, app.isXcode {
                             let application = AXUIElementCreateApplication(app.processIdentifier)
@@ -538,6 +565,7 @@ public struct WidgetFeature: ReducerProtocol {
                         }
                     }
                 }
+                .cancellable(id: DebounceKey.updateWindowOpacity, cancelInFlight: true)
 
             case .circularWidget:
                 return .none

Tool/Sources/XcodeInspector/XcodeInspector.swift

@@ -23,6 +23,10 @@ public final class XcodeInspector: ObservableObject {
     @Published public internal(set) var focusedElement: AXUIElement?
     @Published public internal(set) var completionPanel: AXUIElement?
 
+    public var realtimeActiveDocumentURL: URL {
+        latestActiveXcode?.realtimeDocumentURL ?? URL(fileURLWithPath: "/")
+    }
+
     init() {
         let runningApplications = NSWorkspace.shared.runningApplications
         xcodes = runningApplications
@@ -176,6 +180,17 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
 
     @Published public private(set) var completionPanel: AXUIElement?
 
+    public var realtimeDocumentURL: URL {
+        guard let window = appElement.focusedWindow,
+              window.identifier == "Xcode.WorkspaceWindow"
+        else {
+            return URL(fileURLWithPath: "/")
+        }
+
+        return WorkspaceXcodeWindowInspector.extractDocumentURL(windowElement: window)
+            ?? URL(fileURLWithPath: "/")
+    }
+
     var _version: String?
     public var version: String? {
         if let _version { return _version }