Merge branch 'feature/0.15.0-prerelease-bugfix' into develop

Author: intitni

Core/Sources/AXExtension/AXUIElement.swift

@@ -15,7 +15,7 @@ public extension AXUIElement {
     var title: String {
         (try? copyValue(key: kAXTitleAttribute)) ?? ""
     }
-    
+
     var role: String {
         (try? copyValue(key: kAXRoleAttribute)) ?? ""
     }
@@ -32,12 +32,12 @@ public extension AXUIElement {
     var description: String {
         (try? copyValue(key: kAXDescriptionAttribute)) ?? ""
     }
-    
+
     /// Type in Accessibility Inspector.
     var roleDescription: String {
         (try? copyValue(key: kAXRoleDescriptionAttribute)) ?? ""
     }
-    
+
     var label: String {
         (try? copyValue(key: kAXLabelValueAttribute)) ?? ""
     }
@@ -113,6 +113,10 @@ public extension AXUIElement {
         (try? copyValue(key: kAXWindowsAttribute)) ?? []
     }
 
+    var isFullScreen: Bool {
+        (try? copyValue(key: "AXFullScreen")) ?? false
+    }
+
     var focusedWindow: AXUIElement? {
         try? copyValue(key: kAXFocusedWindowAttribute)
     }
@@ -164,7 +168,7 @@ public extension AXUIElement {
         }
         return nil
     }
-    
+
     func children(where match: (AXUIElement) -> Bool) -> [AXUIElement] {
         var all = [AXUIElement]()
         for child in children {
@@ -175,7 +179,7 @@ public extension AXUIElement {
         }
         return all
     }
-    
+
     func firstChild(where match: (AXUIElement) -> Bool) -> AXUIElement? {
         for child in children {
             if match(child) { return child }
@@ -233,3 +237,4 @@ public extension AXUIElement {
 }
 
 extension AXError: Error {}
+

Core/Sources/HostApp/AccountSettings/CopilotView.swift

@@ -7,7 +7,7 @@ import SwiftUI
 
 struct CopilotView: View {
     static var copilotAuthService: GitHubCopilotAuthServiceType?
-    
+
     class Settings: ObservableObject {
         @AppStorage(\.nodePath) var nodePath: String
         @AppStorage(\.runNodeWith) var runNodeWith
@@ -26,7 +26,7 @@ struct CopilotView: View {
     @State var version: String?
     @State var isRunningAction: Bool = false
     @State var isUserCodeCopiedAlertPresented = false
-    
+
     func getGitHubCopilotAuthService() throws -> GitHubCopilotAuthServiceType {
         if let service = Self.copilotAuthService { return service }
         let service = try GitHubCopilotAuthService()
@@ -56,17 +56,15 @@ struct CopilotView: View {
                     } label: {
                         Text("Run Node with")
                     }
-
-                    VStack { // workaround a layout issue of SwiftUI
-                        Text(
-                            "You may have to restart the helper app to apply the changes. To do so, simply close the helper app by clicking on the menu bar icon that looks like a steer wheel, it will automatically restart as needed."
-                        )
-                        .lineLimit(nil)
-                        .fixedSize(horizontal: false, vertical: true)
-                        .foregroundColor(.secondary)
-                    }
                 }
 
+                Text(
+                    "You may have to restart the helper app to apply the changes. To do so, simply close the helper app by clicking on the menu bar icon that looks like a steer wheel, it will automatically restart as needed."
+                )
+                .lineLimit(6)
+                .fixedSize(horizontal: false, vertical: true)
+                .foregroundColor(.secondary)
+
                 VStack(alignment: .leading) {
                     Text("Language Server Version: \(version ?? "Loading..")")
                     Text("Status: \(status?.description ?? "Loading..")")
@@ -104,9 +102,9 @@ struct CopilotView: View {
                     RoundedRectangle(cornerRadius: 8)
                         .stroke(Color(nsColor: .separatorColor), style: .init(lineWidth: 1))
                 }
-                
+
                 Divider()
-                
+
                 Form {
                     Toggle("Verbose Log", isOn: $settings.gitHubCopilotVerboseLog)
                 }
@@ -128,7 +126,7 @@ struct CopilotView: View {
                 version = try await service.version()
                 isRunningAction = false
 
-                if status != .ok && status != .notSignedIn {
+                if status != .ok, status != .notSignedIn {
                     toast(
                         Text(
                             "GitHub Copilot status is not \"ok\". Please check if you have a valid GitHub Copilot subscription."

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

@@ -1,3 +1,4 @@
+import ActiveApplicationMonitor
 import Combine
 import PromptToCodeService
 import SuggestionWidget
@@ -58,6 +59,9 @@ extension PromptToCodeProvider {
             Task { @ServiceActor in
                 let handler = PseudoCommandHandler()
                 await handler.acceptSuggestion()
+                if let app = ActiveApplicationMonitor.previousActiveApplication, app.isXcode {
+                    app.activate()
+                }
             }
         }
 
@@ -74,3 +78,4 @@ extension PromptToCodeProvider {
         }
     }
 }
+

Core/Sources/Service/GUI/WidgetDataSource.swift

@@ -173,12 +173,22 @@ extension WidgetDataSource: SuggestionWidgetDataSource {
                         Task { @ServiceActor in
                             let handler = PseudoCommandHandler()
                             await handler.rejectSuggestions()
+                            if let app = ActiveApplicationMonitor.previousActiveApplication,
+                               app.isXcode
+                            {
+                                app.activate()
+                            }
                         }
                     },
                     onAcceptSuggestionTapped: {
                         Task { @ServiceActor in
                             let handler = PseudoCommandHandler()
                             await handler.acceptSuggestion()
+                            if let app = ActiveApplicationMonitor.previousActiveApplication,
+                               app.isXcode
+                            {
+                                app.activate()
+                            }
                         }
                     }
                 )

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -1,3 +1,4 @@
+import ActiveApplicationMonitor
 import AppKit
 import SwiftUI
 
@@ -9,7 +10,7 @@ final class ChatWindowViewModel: ObservableObject {
     @Published var colorScheme: ColorScheme
     @Published var isPanelDisplayed = false
     @Published var chatPanelInASeparateWindow = false
-    
+
     public init(chat: ChatProvider? = nil, colorScheme: ColorScheme = .dark) {
         self.chat = chat
         self.colorScheme = colorScheme
@@ -26,6 +27,11 @@ struct ChatWindowView: View {
                     .background {
                         Button(action: {
                             viewModel.isPanelDisplayed = false
+                            if let app = ActiveApplicationMonitor.previousActiveApplication,
+                               app.isXcode
+                            {
+                                app.activate()
+                            }
                         }) {
                             EmptyView()
                         }
@@ -38,3 +44,4 @@ struct ChatWindowView: View {
         .preferredColorScheme(viewModel.colorScheme)
     }
 }
+

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -10,6 +10,23 @@ import UserDefaultsObserver
 
 @MainActor
 public final class SuggestionWidgetController: NSObject {
+    private lazy var fullscreenDetector = {
+        let it = CanBecomeKeyWindow(
+            contentRect: .zero,
+            styleMask: .borderless,
+            backing: .buffered,
+            defer: false
+        )
+        it.isReleasedWhenClosed = false
+        it.isOpaque = false
+        it.backgroundColor = .clear
+        it.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary]
+        it.hasShadow = false
+        it.setIsVisible(true)
+        it.canBecomeKeyChecker = { false }
+        return it
+    }()
+    
     private lazy var widgetWindow = {
         let it = CanBecomeKeyWindow(
             contentRect: .zero,
@@ -21,7 +38,7 @@ public final class SuggestionWidgetController: NSObject {
         it.isOpaque = false
         it.backgroundColor = .clear
         it.level = .init(19)
-        it.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary]
+        it.collectionBehavior = [.fullScreenAuxiliary]
         it.hasShadow = true
         it.contentView = NSHostingView(
             rootView: WidgetView(
@@ -52,7 +69,7 @@ public final class SuggestionWidgetController: NSObject {
         it.isOpaque = false
         it.backgroundColor = .clear
         it.level = .init(19)
-        it.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary]
+        it.collectionBehavior = [.fullScreenAuxiliary]
         it.hasShadow = true
         it.contentView = NSHostingView(
             rootView: TabView(chatWindowViewModel: chatWindowViewModel)
@@ -64,7 +81,7 @@ public final class SuggestionWidgetController: NSObject {
 
     private lazy var panelWindow = {
         let it = CanBecomeKeyWindow(
-            contentRect: .zero,
+            contentRect: .init(x: 0, y: 0, width: Style.panelWidth, height: Style.panelHeight),
             styleMask: .borderless,
             backing: .buffered,
             defer: false
@@ -73,16 +90,13 @@ public final class SuggestionWidgetController: NSObject {
         it.isOpaque = false
         it.backgroundColor = .clear
         it.level = .init(NSWindow.Level.floating.rawValue + 1)
-        it.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary]
+        it.collectionBehavior = [.fullScreenAuxiliary]
         it.hasShadow = true
         it.contentView = NSHostingView(
             rootView: SuggestionPanelView(viewModel: suggestionPanelViewModel)
         )
         it.setIsVisible(true)
-        it.canBecomeKeyChecker = { [suggestionPanelViewModel] in
-            if case .promptToCode = suggestionPanelViewModel.content { return true }
-            return false
-        }
+        it.canBecomeKeyChecker = { true }
         return it
     }()
 
@@ -97,7 +111,7 @@ public final class SuggestionWidgetController: NSObject {
         it.isOpaque = false
         it.backgroundColor = .clear
         it.level = .floating
-        it.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary]
+        it.collectionBehavior = [.fullScreenAuxiliary]
         it.hasShadow = true
         it.contentView = NSHostingView(
             rootView: ChatWindowView(viewModel: chatWindowViewModel)
@@ -128,6 +142,7 @@ public final class SuggestionWidgetController: NSObject {
     private var windowChangeObservationTask: Task<Void, Error>?
     private var activeApplicationMonitorTask: Task<Void, Error>?
     private var sourceEditorMonitorTask: Task<Void, Error>?
+    private var fullscreenDetectingTask: Task<Void, Error>?
     private var currentFileURL: URL?
     private var colorScheme: ColorScheme = .light
     private var cancellable = Set<AnyCancellable>()
@@ -174,6 +189,27 @@ public final class SuggestionWidgetController: NSObject {
             }
         }
 
+        Task { @MainActor in
+            fullscreenDetectingTask = Task { [weak self] in
+                let sequence = NSWorkspace.shared.notificationCenter
+                    .notifications(named: NSWorkspace.activeSpaceDidChangeNotification)
+                _ = self?.fullscreenDetector
+                for await _ in sequence {
+                    try Task.checkCancellation()
+                    guard let self else { return }
+                    guard let activeXcode = ActiveApplicationMonitor.activeXcode else { continue }
+                    guard fullscreenDetector.isOnActiveSpace else { continue }
+                    let app = AXUIElementCreateApplication(activeXcode.processIdentifier)
+                    if let window = app.focusedWindow, window.isFullScreen {
+                        widgetWindow.orderFrontRegardless()
+                        tabWindow.orderFrontRegardless()
+                        panelWindow.orderFrontRegardless()
+                        chatWindow.orderFrontRegardless()
+                    }
+                }
+            }
+        }
+
         Task { @MainActor in
             presentationModeChangeObserver.onChange = { [weak self] in
                 guard let self else { return }
@@ -224,7 +260,7 @@ public final class SuggestionWidgetController: NSObject {
             }
         }
     }
-    
+
     public func detachChat() {
         chatWindowViewModel.chatPanelInASeparateWindow = true
     }
@@ -499,16 +535,14 @@ extension SuggestionWidgetController {
         }
 
         if let app = ActiveApplicationMonitor.activeApplication, app.isXcode {
-            let application = AXUIElementCreateApplication(app.processIdentifier)
-            let noFocus = application.focusedWindow == nil
-            panelWindow.alphaValue = noFocus ? 0 : 1
-            widgetWindow.alphaValue = noFocus ? 0 : 1
-            tabWindow.alphaValue = noFocus ? 0 : 1
+            panelWindow.alphaValue = 1
+            widgetWindow.alphaValue = 1
+            tabWindow.alphaValue = 1
 
             if detachChat {
                 chatWindow.alphaValue = chatWindowViewModel.chat != nil ? 1 : 0
             } else {
-                chatWindow.alphaValue = noFocus ? 0 : 1
+                chatWindow.alphaValue = 1
             }
         } else if let app = ActiveApplicationMonitor.activeApplication,
                   app.bundleIdentifier == Bundle.main.bundleIdentifier
@@ -584,6 +618,7 @@ extension SuggestionWidgetController: NSWindowDelegate {
         var mouseLocation = NSEvent.mouseLocation
         let windowFrame = chatWindow.frame
         if mouseLocation.y > windowFrame.maxY - 40,
+           mouseLocation.y < windowFrame.maxY,
            mouseLocation.x > windowFrame.minX,
            mouseLocation.x < windowFrame.maxX
         {
@@ -616,6 +651,7 @@ class ChatWindow: NSWindow {
         let windowFrame = frame
         let currentLocation = event.locationInWindow
         if currentLocation.y > windowFrame.size.height - 40,
+           currentLocation.y < windowFrame.size.height,
            currentLocation.x > 0,
            currentLocation.x < windowFrame.width
         {

Core/Sources/SuggestionWidget/WidgetView.swift

@@ -1,3 +1,4 @@
+import ActiveApplicationMonitor
 import Environment
 import Preferences
 import SuggestionModel
@@ -26,15 +27,24 @@ struct WidgetView: View {
         Circle().fill(isHovering ? .white.opacity(0.8) : .white.opacity(0.3))
             .onTapGesture {
                 withAnimation(.easeInOut(duration: 0.2)) {
-                    let isDisplayed = {
+                    let wasDisplayed = {
                         if panelViewModel.isPanelDisplayed,
                            panelViewModel.content != nil { return true }
                         if chatWindowViewModel.isPanelDisplayed,
                            chatWindowViewModel.chat != nil { return true }
                         return false
                     }()
-                    panelViewModel.isPanelDisplayed = !isDisplayed
-                    chatWindowViewModel.isPanelDisplayed = !isDisplayed
+                    panelViewModel.isPanelDisplayed = !wasDisplayed
+                    chatWindowViewModel.isPanelDisplayed = !wasDisplayed
+                    let isDisplayed = !wasDisplayed
+
+                    if !isDisplayed {
+                        if let app = ActiveApplicationMonitor.previousActiveApplication,
+                           app.isXcode
+                        {
+                            app.activate()
+                        }
+                    }
                 }
             }
             .overlay {