Merge branch 'feature/realtime-suggestion-blocking-tweak' into develop

Author: intitni

Core/Sources/Service/AutoTrigger.swift

@@ -28,19 +28,29 @@ actor AutoTrigger {
         if task == nil {
             task = Task { [stream = eventObserver.stream] in
                 var triggerTask: Task<Void, Error>?
-                try? await Environment.triggerAction("Realtime Suggestions")
+                try? await Environment.triggerAction("Real-time Suggestions")
                 for await _ in stream {
                     triggerTask?.cancel()
                     if Task.isCancelled { break }
+                    guard await Environment.isXcodeActive() else { continue }
+
+                    await withTaskGroup(of: Void.self) { group in
+                        for (_, workspace) in await workspaces {
+                            group.addTask {
+                                await workspace.cancelInFlightRealtimeSuggestionRequests()
+                            }
+                        }
+                    }
+
                     triggerTask = Task { @ServiceActor in
-                        try? await Task.sleep(nanoseconds: 2_000_000_000)
+                        try? await Task.sleep(nanoseconds: 2_500_000_000)
                         if Task.isCancelled { return }
                         let fileURL = try? await Environment.fetchCurrentFileURL()
                         guard let folderURL = try? await Environment.fetchCurrentProjectRootURL(fileURL),
                               let workspace = workspaces[folderURL],
                               workspace.isRealtimeSuggestionEnabled
                         else { return }
-                        try? await Environment.triggerAction("Realtime Suggestions")
+                        try? await Environment.triggerAction("Real-time Suggestions")
                     }
                 }
             }

Core/Sources/Service/CGEventObserver.swift

@@ -15,7 +15,7 @@ final class CGEventObserver: CGEventObserverType {
 
     private var continuation: AsyncStream<Void>.Continuation
     private var port: CFMachPort?
-    private let eventsOfInterest: Set<CGEventType> = [.keyUp, .leftMouseUp, .mouseMoved]
+    private let eventsOfInterest: Set<CGEventType> = [.keyUp, .leftMouseUp, .rightMouseUp]
     private let tapLocation: CGEventTapLocation = .cghidEventTap
     private let tapPlacement: CGEventTapPlacement = .tailAppendEventTap
     private let tapOptions: CGEventTapOptions = .listenOnly

Core/Sources/Service/Environment.swift

@@ -16,6 +16,23 @@ private struct FailedToFetchFileURLError: Error, LocalizedError {
 
 enum Environment {
     static var now = { Date() }
+    
+    static var isXcodeActive: () async ->  Bool = {
+        var activeXcodes = [NSRunningApplication]()
+        var retryCount = 0
+        // Sometimes runningApplications returns 0 items.
+        while activeXcodes.isEmpty, retryCount < 3 {
+            activeXcodes = NSRunningApplication
+                .runningApplications(withBundleIdentifier: "com.apple.dt.Xcode")
+                .sorted { lhs, _ in
+                    if lhs.isActive { return true }
+                    return false
+                }
+            if retryCount > 0 { try? await Task.sleep(nanoseconds: 1_000_000) }
+            retryCount += 1
+        }
+        return !activeXcodes.isEmpty
+    }
 
     static var fetchCurrentProjectRootURL: (_ fileURL: URL?) async throws -> URL? = { fileURL in
         let appleScript = """
@@ -24,7 +41,8 @@ enum Environment {
         end tell
         """
 
-        if let path = try await runAppleScript(appleScript) {
+        let path = try await runAppleScript(appleScript)
+        if !path.isEmpty {
             let trimmedNewLine = path.trimmingCharacters(in: .newlines)
             var url = URL(fileURLWithPath: trimmedNewLine)
             while !FileManager.default.fileIsDirectory(atPath: url.path) ||
@@ -61,7 +79,7 @@ enum Environment {
                     if lhs.isActive { return true }
                     return false
                 }
-            if retryCount > 0 { try await Task.sleep(nanoseconds: 50_000_000) }
+            if retryCount > 0 { try await Task.sleep(nanoseconds: 10_000_000) }
             retryCount += 1
         }
 
@@ -117,7 +135,7 @@ enum Environment {
         while xcodes.isEmpty, retryCount < 5 {
             xcodes = NSRunningApplication
                 .runningApplications(withBundleIdentifier: "com.apple.dt.Xcode")
-            if retryCount > 0 { try await Task.sleep(nanoseconds: 50_000_000) }
+            if retryCount > 0 { try await Task.sleep(nanoseconds: 10_000_000) }
             retryCount += 1
         }
 

Core/Sources/Service/Helpers.swift

@@ -1,4 +1,5 @@
 import Foundation
+import LanguageServerProtocol
 
 extension FileManager {
     func fileIsDirectory(atPath path: String) -> Bool {
@@ -9,19 +10,86 @@ extension FileManager {
 }
 
 @discardableResult
-func runAppleScript(_ appleScript: String) async throws -> String? {
+func runAppleScript(_ appleScript: String) async throws -> String {
     let task = Process()
     task.launchPath = "/usr/bin/osascript"
     task.arguments = ["-e", appleScript]
     let outpipe = Pipe()
     task.standardOutput = outpipe
-    try task.run()
-    await Task.yield()
-    task.waitUntilExit()
-    if let data = try outpipe.fileHandleForReading.readToEnd(),
-       let content = String(data: data, encoding: .utf8)
-    {
-        return content
+
+    return try await withUnsafeThrowingContinuation { continuation in
+        do {
+            task.terminationHandler = { _ in
+                do {
+                    if let data = try outpipe.fileHandleForReading.readToEnd(),
+                       let content = String(data: data, encoding: .utf8)
+                    {
+                        continuation.resume(returning: content)
+                        return
+                    }
+                    continuation.resume(returning: "")
+                } catch {
+                    continuation.resume(throwing: error)
+                }
+            }
+            try task.run()
+        } catch {
+            continuation.resume(throwing: error)
+        }
+    }
+}
+
+extension XPCService {
+    @ServiceActor
+    func fetchOrCreateWorkspaceIfNeeded(fileURL: URL) async throws -> Workspace {
+        let projectURL = try await Environment.fetchCurrentProjectRootURL(fileURL)
+        let workspaceURL = projectURL ?? fileURL
+        let workspace = workspaces[workspaceURL] ?? Workspace(projectRootURL: workspaceURL)
+        workspaces[workspaceURL] = workspace
+        return workspace
+    }
+}
+
+extension NSError {
+    static func from(_ error: Error) -> NSError {
+        if let error = error as? ServerError {
+            var message = "Unknown"
+            switch error {
+            case let .handlerUnavailable(handler):
+                message = "Handler unavailable: \(handler)."
+            case let .unhandledMethod(method):
+                message = "Methond unhandled: \(method)."
+            case let .notificationDispatchFailed(error):
+                message = "Notification dispatch failed: \(error.localizedDescription)."
+            case let .requestDispatchFailed(error):
+                message = "Request dispatch failed: \(error.localizedDescription)."
+            case let .clientDataUnavailable(error):
+                message = "Client data unavalable: \(error.localizedDescription)."
+            case .serverUnavailable:
+                message = "Server unavailable, please make sure you have installed Node."
+            case .missingExpectedParameter:
+                message = "Missing expected parameter."
+            case .missingExpectedResult:
+                message = "Missing expected result."
+            case let .unableToDecodeRequest(error):
+                message = "Unable to decode request: \(error.localizedDescription)."
+            case let .unableToSendRequest(error):
+                message = "Unable to send request: \(error.localizedDescription)."
+            case let .unableToSendNotification(error):
+                message = "Unable to send notification: \(error.localizedDescription)."
+            case let .serverError(code, m, _):
+                message = "Server error: (\(code)) \(m)."
+            case let .invalidRequest(error):
+                message = "Invalid request: \(error?.localizedDescription ?? "Unknown")."
+            case .timeout:
+                message = "Timeout."
+            }
+            return NSError(domain: "com.intii.CopilotForXcode", code: -1, userInfo: [
+                NSLocalizedDescriptionKey: message,
+            ])
+        }
+        return NSError(domain: "com.intii.CopilotForXcode", code: -1, userInfo: [
+            NSLocalizedDescriptionKey: error.localizedDescription,
+        ])
     }
-    return nil
 }