Merge branch 'feature/realtime-suggestion-indicator' into develop

Author: intitni

Copilot for Xcode.xcodeproj/project.pbxproj

@@ -45,6 +45,7 @@
 		C882175A294187E100A22FD3 /* Client in Frameworks */ = {isa = PBXBuildFile; productRef = C8821759294187E100A22FD3 /* Client */; };
 		C882175C294187EF00A22FD3 /* Client in Frameworks */ = {isa = PBXBuildFile; productRef = C882175B294187EF00A22FD3 /* Client */; };
 		C882175E294187F900A22FD3 /* Service in Frameworks */ = {isa = PBXBuildFile; productRef = C882175D294187F900A22FD3 /* Service */; };
+		C8FFC1D329939F7F002F4CA4 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8FFC1D229939F7F002F4CA4 /* AppDelegate.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -193,6 +194,7 @@
 		C87F3E5F293DC600008523E8 /* Section.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Section.swift; sourceTree = "<group>"; };
 		C87F3E61293DD004008523E8 /* Styles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Styles.swift; sourceTree = "<group>"; };
 		C887BC832965D96000931567 /* DEVELOPMENT.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = DEVELOPMENT.md; sourceTree = "<group>"; };
+		C8FFC1D229939F7F002F4CA4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -268,6 +270,7 @@
 				C848181C293A017300966BB2 /* XPCService.entitlements */,
 				C81458BC293A016100135263 /* Info.plist */,
 				C81458B7293A015C00135263 /* main.swift */,
+				C8FFC1D229939F7F002F4CA4 /* AppDelegate.swift */,
 				C87B03B3293B393100C77EAE /* ServiceDelegate.swift */,
 			);
 			path = XPCService;
@@ -521,6 +524,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C8FFC1D329939F7F002F4CA4 /* AppDelegate.swift in Sources */,
 				C81458B8293A015C00135263 /* main.swift in Sources */,
 				C87B03B4293B393100C77EAE /* ServiceDelegate.swift in Sources */,
 			);

Core/Package.swift

@@ -20,6 +20,7 @@ let package = Package(
         .package(url: "https://github.com/ChimeHQ/LanguageClient", from: "0.3.1"),
     ],
     targets: [
+        .target(name: "CGEventObserver"),
         .target(
             name: "CopilotService",
             dependencies: ["LanguageClient", "CopilotModel", "XPCShared"]
@@ -50,7 +51,7 @@ let package = Package(
         ),
         .target(
             name: "Service",
-            dependencies: ["CopilotModel", "CopilotService", "XPCShared"]
+            dependencies: ["CopilotModel", "CopilotService", "XPCShared", "CGEventObserver"]
         ),
         .target(
             name: "XPCShared",

…re/Sources/Service/CGEventObserver.swift …es/CGEventObserver/CGEventObserver.swiftCore/Sources/Service/CGEventObserver.swift renamed to Core/Sources/CGEventObserver/CGEventObserver.swift Core/Sources/Service/CGEventObserver.swift renamed to Core/Sources/CGEventObserver/CGEventObserver.swift

@@ -10,18 +10,13 @@ public protocol CGEventObserverType {
     var isEnabled: Bool { get }
 }
 
-final class CGEventObserver: CGEventObserverType {
-    let stream: AsyncStream<CGEvent>
-    var isEnabled: Bool { port != nil }
+public final class CGEventObserver: CGEventObserverType {
+    public let stream: AsyncStream<CGEvent>
+    public var isEnabled: Bool { port != nil }
 
     private var continuation: AsyncStream<CGEvent>.Continuation
     private var port: CFMachPort?
-    private let eventsOfInterest: Set<CGEventType> = [
-        .keyUp,
-        .keyDown,
-        .rightMouseDown,
-        .leftMouseDown,
-    ]
+    private let eventsOfInterest: Set<CGEventType>
     private let tapLocation: CGEventTapLocation = .cghidEventTap
     private let tapPlacement: CGEventTapPlacement = .tailAppendEventTap
     private let tapOptions: CGEventTapOptions = .listenOnly
@@ -32,7 +27,8 @@ final class CGEventObserver: CGEventObserverType {
         CFMachPortInvalidate(port)
     }
 
-    init() {
+    public init(eventsOfInterest: Set<CGEventType>) {
+        self.eventsOfInterest = eventsOfInterest
         var continuation: AsyncStream<CGEvent>.Continuation!
         stream = AsyncStream { c in
             continuation = c

Core/Sources/Service/AutoTrigger.swift

@@ -16,10 +16,7 @@ func runAppleScript(_ appleScript: String) async throws -> String {
     task.arguments = ["-e", appleScript]
     let outpipe = Pipe()
     task.standardOutput = outpipe
-    #if DEBUG
-    #else
     task.standardError = Pipe()
-    #endif
 
     return try await withUnsafeThrowingContinuation { continuation in
         do {