Merge branch 'release/0.14.0'

Author: intitni

Copilot for Xcode/DebugView.swift

@@ -8,6 +8,7 @@ final class DebugSettings: ObservableObject {
     @AppStorage(\.preCacheOnFileOpen)
     var preCacheOnFileOpen: Bool
     @AppStorage(\.useCustomScrollViewWorkaround) var useCustomScrollViewWorkaround
+    @AppStorage(\.triggerActionWithAccessibilityAPI) var triggerActionWithAccessibilityAPI
     init() {}
 }
 
@@ -29,6 +30,10 @@ struct DebugSettingsView: View {
                     Text("Use custom scroll view workaround for smooth scrolling")
                 }
                 .toggleStyle(.switch)
+                Toggle(isOn: $settings.triggerActionWithAccessibilityAPI) {
+                    Text("Trigger action with AccessibilityAPI")
+                }
+                .toggleStyle(.switch)
             }
         }
         .buttonStyle(.copilot)

Copilot for Xcode/SettingsView.swift

@@ -28,6 +28,9 @@ struct SettingsView: View {
         var preferWidgetToStayInsideEditorWhenWidthGreaterThan: Double
         @AppStorage(\.hideCommonPrecedingSpacesInSuggestion)
         var hideCommonPrecedingSpacesInSuggestion: Bool
+        @AppStorage(\.suggestionCodeFontSize) var suggestionCodeFontSize
+        @AppStorage(\.chatFontSize) var chatFontSize
+        @AppStorage(\.chatCodeFontSize) var chatCodeFontSize
         init() {}
     }
 
@@ -49,7 +52,7 @@ struct SettingsView: View {
                     isOpen: $isCustomCommandEditorOpen
                 )
             }
-            
+
             Form {
                 Toggle(isOn: $settings.quitXPCServiceOnXcodeAndAppQuit) {
                     Text("Quit service when Xcode and host app are terminated")
@@ -165,7 +168,10 @@ struct SettingsView: View {
                         case .openAI:
                             Text("OpenAI").tag($0)
                         case .githubCopilot:
-                            Text("GitHub Copilot (Implement for experiment, barely works, don't use.)").tag($0)
+                            Text(
+                                "GitHub Copilot (Implement for experiment, barely works, don't use.)"
+                            )
+                            .tag($0)
                         }
                     }
                 } label: {
@@ -184,7 +190,48 @@ struct SettingsView: View {
                     }
                     .textFieldStyle(.roundedBorder)
 
-                    Text("px")
+                    Text("pt")
+                }
+
+                Group { // UI
+                    HStack {
+                        TextField(text: .init(get: {
+                            "\(Int(settings.chatFontSize))"
+                        }, set: {
+                            settings.chatFontSize = Double(Int($0) ?? 0)
+                        })) {
+                            Text("Font size of chat message")
+                        }
+                        .textFieldStyle(.roundedBorder)
+
+                        Text("pt")
+                    }
+                    
+                    HStack {
+                        TextField(text: .init(get: {
+                            "\(Int(settings.chatCodeFontSize))"
+                        }, set: {
+                            settings.chatCodeFontSize = Double(Int($0) ?? 0)
+                        })) {
+                            Text("Font size of code block in chat")
+                        }
+                        .textFieldStyle(.roundedBorder)
+
+                        Text("pt")
+                    }
+                    
+                    HStack {
+                        TextField(text: .init(get: {
+                            "\(Int(settings.suggestionCodeFontSize))"
+                        }, set: {
+                            settings.suggestionCodeFontSize = Double(Int($0) ?? 0)
+                        })) {
+                            Text("Font size of suggestion code")
+                        }
+                        .textFieldStyle(.roundedBorder)
+
+                        Text("pt")
+                    }
                 }
             }
         }.buttonStyle(.copilot)

Core/Sources/AXExtension/AXUIElement.swift

@@ -12,6 +12,14 @@ public extension AXUIElement {
         (try? copyValue(key: kAXValueAttribute)) ?? ""
     }
 
+    var title: String {
+        (try? copyValue(key: kAXTitleAttribute)) ?? ""
+    }
+    
+    var role: String {
+        (try? copyValue(key: kAXRoleAttribute)) ?? ""
+    }
+
     var doubleValue: Double {
         (try? copyValue(key: kAXValueAttribute)) ?? 0.0
     }
@@ -23,6 +31,10 @@ public extension AXUIElement {
     var description: String {
         (try? copyValue(key: kAXDescriptionAttribute)) ?? ""
     }
+    
+    var label: String {
+        (try? copyValue(key: kAXLabelValueAttribute)) ?? ""
+    }
 
     var isSourceEditor: Bool {
         description == "Source Editor"
@@ -115,14 +127,34 @@ public extension AXUIElement {
         (try? copyValue(key: kAXChildrenAttribute)) ?? []
     }
 
+    var menuBar: AXUIElement? {
+        try? copyValue(key: kAXMenuBarAttribute)
+    }
+
     var visibleChildren: [AXUIElement] {
         (try? copyValue(key: kAXVisibleChildrenAttribute)) ?? []
     }
 
-    func child(identifier: String) -> AXUIElement? {
+    func child(
+        identifier: String? = nil,
+        title: String? = nil,
+        role: String? = nil
+    ) -> AXUIElement? {
         for child in children {
-            if child.identifier == identifier { return child }
-            if let target = child.child(identifier: identifier) { return target }
+            let match = {
+                if let identifier, child.identifier != identifier { return false }
+                if let title, child.title != title { return false }
+                if let role, child.role != role { return false }
+                return true
+            }()
+            if match { return child }
+        }
+        for child in children {
+            if let target = child.child(
+                identifier: identifier,
+                title: title,
+                role: role
+            ) { return target }
         }
         return nil
     }

Core/Sources/CopilotService/CopilotService.swift

@@ -2,6 +2,7 @@ import CopilotModel
 import Foundation
 import LanguageClient
 import LanguageServerProtocol
+import Logger
 import Preferences
 import XPCShared
 
@@ -25,10 +26,15 @@ public protocol CopilotSuggestionServiceType {
     ) async throws -> [CopilotCompletion]
     func notifyAccepted(_ completion: CopilotCompletion) async
     func notifyRejected(_ completions: [CopilotCompletion]) async
+    func notifyOpenTextDocument(fileURL: URL, content: String) async throws
+    func notifyChangeTextDocument(fileURL: URL, content: String) async throws
+    func notifyCloseTextDocument(fileURL: URL) async throws
+    func notifySaveTextDocument(fileURL: URL) async throws
 }
 
 protocol CopilotLSP {
     func sendRequest<E: CopilotRequestType>(_ endpoint: E) async throws -> E.Response
+    func sendNotification(_ notif: ClientNotification) async throws
 }
 
 public class CopilotBaseService {
@@ -57,7 +63,7 @@ public class CopilotBaseService {
             }
             let executionParams: Process.ExecutionParameters
             let runner = UserDefaults.shared.value(for: \.runNodeWith)
-            
+
             switch runner {
             case .bash:
                 let nodePath = UserDefaults.shared.value(for: \.nodePath)
@@ -248,6 +254,57 @@ public final class CopilotSuggestionService: CopilotBaseService, CopilotSuggesti
             CopilotRequest.NotifyRejected(completionUUIDs: completions.map(\.uuid))
         )
     }
+
+    public func notifyOpenTextDocument(
+        fileURL: URL,
+        content: String
+    ) async throws {
+        let languageId = languageIdentifierFromFileURL(fileURL)
+        let uri = "file://\(fileURL.path)"
+//        Logger.service.debug("Open \(uri)")
+        try await server.sendNotification(
+            .didOpenTextDocument(
+                DidOpenTextDocumentParams(
+                    textDocument: .init(
+                        uri: uri,
+                        languageId: languageId.rawValue,
+                        version: 0,
+                        text: content
+                    )
+                )
+            )
+        )
+    }
+
+    public func notifyChangeTextDocument(fileURL: URL, content: String) async throws {
+        let uri = "file://\(fileURL.path)"
+//        Logger.service.debug("Change \(uri)")
+        try await server.sendNotification(
+            .didChangeTextDocument(
+                DidChangeTextDocumentParams(
+                    uri: uri,
+                    version: 0,
+                    contentChange: .init(
+                        range: nil,
+                        rangeLength: nil,
+                        text: content
+                    )
+                )
+            )
+        )
+    }
+
+    public func notifySaveTextDocument(fileURL: URL) async throws {
+        let uri = "file://\(fileURL.path)"
+//        Logger.service.debug("Save \(uri)")
+        try await server.sendNotification(.didSaveTextDocument(.init(uri: uri)))
+    }
+
+    public func notifyCloseTextDocument(fileURL: URL) async throws {
+        let uri = "file://\(fileURL.path)"
+//        Logger.service.debug("Close \(uri)")
+        try await server.sendNotification(.didCloseTextDocument(.init(uri: uri)))
+    }
 }
 
 extension InitializingServer: CopilotLSP {

Core/Sources/Environment/Environment.swift

@@ -3,6 +3,7 @@ import AppKit
 import AXExtension
 import CopilotService
 import Foundation
+import Logger
 
 public struct NoAccessToAccessibilityAPIError: Error, LocalizedError {
     public var errorDescription: String? {
@@ -104,6 +105,24 @@ public enum Environment {
         }
         throw FailedToFetchFileURLError()
     }
+    
+    public static var fetchFocusedElementURI: () async throws -> URL = {
+        guard let xcode = ActiveApplicationMonitor.activeXcode
+            ?? ActiveApplicationMonitor.latestXcode
+        else {
+            throw FailedToFetchFileURLError()
+        }
+        
+        let application = AXUIElementCreateApplication(xcode.processIdentifier)
+        let focusedElement = application.focusedElement
+        if focusedElement?.description != "Source Editor" {
+            let window = application.focusedWindow
+            let id = window?.identifier.hashValue
+            return URL(fileURLWithPath: "/xcode-focused-element/\(id ?? 0)")
+        }
+        
+        return try await fetchCurrentFileURL()
+    }
 
     public static var createAuthService: () -> CopilotAuthServiceType = {
         CopilotAuthService()
@@ -120,27 +139,71 @@ public enum Environment {
         else { return }
         let bundleName = Bundle.main
             .object(forInfoDictionaryKey: "EXTENSION_BUNDLE_NAME") as! String
+        
+        await Task.yield()
 
-        /// check if menu is open, if not, click the menu item.
-        let appleScript = """
-        tell application "System Events"
-            set theprocs to every process whose unix id is \(activeXcode.processIdentifier)
-            repeat with proc in theprocs
-            set the frontmost of proc to true
-                tell proc
-                    repeat with theMenu in menus of menu bar 1
-                        set theValue to value of attribute "AXVisibleChildren" of theMenu
-                        if theValue is not {} then
-                            return
-                        end if
-                    end repeat
-                    click menu item "\(name)" of menu 1 of menu item "\(bundleName)" of menu 1 of menu bar item "Editor" of menu bar 1
-                end tell
-            end repeat
-        end tell
-        """
+        if UserDefaults.shared.value(for: \.triggerActionWithAccessibilityAPI) {
+            if !activeXcode.isActive { activeXcode.activate() }
+            let app = AXUIElementCreateApplication(activeXcode.processIdentifier)
 
-        try await runAppleScript(appleScript)
+            if let editorMenu = app.menuBar?.child(title: "Editor"),
+               let commandMenu = editorMenu.child(title: bundleName)
+            {
+                if let button = commandMenu.child(title: name, role: "AXMenuItem") {
+                    let error = AXUIElementPerformAction(button, kAXPressAction as CFString)
+                    if error != AXError.success {
+                        Logger.service
+                            .error("Trigger action \(name) failed: \(error.localizedDescription)")
+                        throw error
+                    }
+                }
+            } else if let commandMenu = app.menuBar?.child(title: bundleName),
+                      let button = commandMenu.child(title: name, role: "AXMenuItem")
+            {
+                let error = AXUIElementPerformAction(button, kAXPressAction as CFString)
+                if error != AXError.success {
+                    Logger.service
+                        .error("Trigger action \(name) failed: \(error.localizedDescription)")
+                    throw error
+                }
+            } else {
+                struct CantRunCommand: Error, LocalizedError {
+                    let name: String
+                    var errorDescription: String? {
+                        "Can't run command \(name)."
+                    }
+                }
+                
+                throw CantRunCommand(name: name)
+            }
+        } else {
+            /// check if menu is open, if not, click the menu item.
+            let appleScript = """
+            tell application "System Events"
+                set theprocs to every process whose unix id is \(activeXcode.processIdentifier)
+                repeat with proc in theprocs
+                set the frontmost of proc to true
+                    tell proc
+                        repeat with theMenu in menus of menu bar 1
+                            set theValue to value of attribute "AXVisibleChildren" of theMenu
+                            if theValue is not {} then
+                                return
+                            end if
+                        end repeat
+                        click menu item "\(name)" of menu 1 of menu item "\(bundleName)" of menu 1 of menu bar item "Editor" of menu bar 1
+                    end tell
+                end repeat
+            end tell
+            """
+
+            do {
+                try await runAppleScript(appleScript)
+            } catch {
+                Logger.service
+                    .error("Trigger action \(name) failed: \(error.localizedDescription)")
+                throw error
+            }
+        }
     }
 
     public static var makeXcodeActive: () async throws -> Void = {