Fix real-time suggestion cancellation

Author: intitni

Core/Sources/Service/AutoTrigger.swift

@@ -64,7 +64,7 @@ public actor AutoTrigger {
         if task == nil {
             task = Task { [stream = eventObserver.stream] in
                 var triggerTask: Task<Void, Error>?
-                for await _ in stream {
+                for await eventType in stream {
                     triggerTask?.cancel()
                     if Task.isCancelled { break }
                     guard await Environment.isXcodeActive() else { continue }
@@ -77,16 +77,17 @@ public actor AutoTrigger {
                         }
                     }
 
+                    guard eventType == .keyUp else { continue }
+
                     triggerTask = Task { @ServiceActor in
-                        try? await Task.sleep(nanoseconds: 2_000_000_000)
+                        try? await Task.sleep(nanoseconds: 1_500_000_000)
                         if Task.isCancelled { return }
                         let fileURL = try? await Environment.fetchCurrentFileURL()
-                        guard let folderURL = try? await Environment
-                            .fetchCurrentProjectRootURL(fileURL)
-                        else { return }
-                        let workspace = workspaces[folderURL] ??
-                            Workspace(projectRootURL: folderURL)
-                        workspaces[folderURL] = workspace
+                        let folderURL = try? await Environment.fetchCurrentProjectRootURL(fileURL)
+                        guard let workspaceURL = folderURL ?? fileURL else { return }
+                        let workspace = workspaces[workspaceURL]
+                            ?? Workspace(projectRootURL: workspaceURL)
+                        workspaces[workspaceURL] = workspace
                         guard workspace.isRealtimeSuggestionEnabled else { return }
                         if Task.isCancelled { return }
                         try? await Environment.triggerAction("Prefetch Suggestions")

Core/Sources/Service/CGEventObserver.swift

@@ -6,17 +6,22 @@ public protocol CGEventObserverType {
     @discardableResult
     func activateIfPossible() -> Bool
     func deactivate()
-    var stream: AsyncStream<Void> { get }
+    var stream: AsyncStream<CGEventType> { get }
     var isEnabled: Bool { get }
 }
 
 final class CGEventObserver: CGEventObserverType {
-    let stream: AsyncStream<Void>
+    let stream: AsyncStream<CGEventType>
     var isEnabled: Bool { port != nil }
 
-    private var continuation: AsyncStream<Void>.Continuation
+    private var continuation: AsyncStream<CGEventType>.Continuation
     private var port: CFMachPort?
-    private let eventsOfInterest: Set<CGEventType> = [.keyUp]
+    private let eventsOfInterest: Set<CGEventType> = [
+        .keyUp,
+        .keyDown,
+        .rightMouseDown,
+        .leftMouseDown,
+    ]
     private let tapLocation: CGEventTapLocation = .cghidEventTap
     private let tapPlacement: CGEventTapPlacement = .tailAppendEventTap
     private let tapOptions: CGEventTapOptions = .listenOnly
@@ -28,7 +33,7 @@ final class CGEventObserver: CGEventObserverType {
     }
 
     init() {
-        var continuation: AsyncStream<Void>.Continuation!
+        var continuation: AsyncStream<CGEventType>.Continuation!
         stream = AsyncStream { c in
             continuation = c
         }
@@ -66,9 +71,9 @@ final class CGEventObserver: CGEventObserverType {
             }
 
             if let continuation = continuationPointer?
-                .assumingMemoryBound(to: AsyncStream<Void>.Continuation.self)
+                .assumingMemoryBound(to: AsyncStream<CGEventType>.Continuation.self)
             {
-                continuation.pointee.yield(())
+                continuation.pointee.yield(eventType)
             }
 
             return .passRetained(event)