Merge tag '0.18.3' into develop

# Conflicts:
#	Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift
#	Tool/Package.swift

Author: intitni

Core/Package.swift

@@ -107,7 +107,7 @@ let package = Package(
             dependencies: [
                 "ActiveApplicationMonitor",
                 "AXExtension",
-                "SuggestionService",
+                .product(name: "Preferences", package: "Tool"),
             ]
         ),
 
@@ -261,6 +261,7 @@ let package = Package(
             name: "XcodeInspector",
             dependencies: [
                 "AXExtension",
+                "SuggestionModel",
                 "Environment",
                 "AXNotificationStream",
                 .product(name: "Logger", package: "Tool"),
@@ -294,6 +295,7 @@ let package = Package(
                 "LanguageClient",
                 "SuggestionModel",
                 "KeychainAccess",
+                "XcodeInspector",
                 .product(name: "Preferences", package: "Tool"),
                 .product(name: "Terminal", package: "Tool"),
             ]

Core/Sources/AXExtension/AXUIElement.swift

@@ -63,6 +63,10 @@ public extension AXUIElement {
     var isEnabled: Bool {
         (try? copyValue(key: kAXEnabledAttribute)) ?? false
     }
+    
+    var isHidden: Bool {
+        (try? copyValue(key: kAXHiddenAttribute)) ?? false
+    }
 }
 
 // MARK: - Rect

Core/Sources/AXNotificationStream/AXNotificationStream.swift

@@ -6,7 +6,7 @@ public final class AXNotificationStream: AsyncSequence {
     public typealias Stream = AsyncStream<Element>
     public typealias Continuation = Stream.Continuation
     public typealias AsyncIterator = Stream.AsyncIterator
-    public typealias Element = (name: String, info: CFDictionary)
+    public typealias Element = (name: String, element: AXUIElement, info: CFDictionary)
 
     private var continuation: Continuation
     private let stream: Stream
@@ -48,7 +48,7 @@ public final class AXNotificationStream: AsyncSequence {
         ) {
             guard let pointer = pointer?.assumingMemoryBound(to: Continuation.self)
             else { return }
-            pointer.pointee.yield((notificationName as String, userInfo))
+            pointer.pointee.yield((notificationName as String, element, userInfo))
         }
 
         _ = AXObserverCreateWithInfoCallback(
@@ -72,13 +72,24 @@ public final class AXNotificationStream: AsyncSequence {
                 .commonModes
             )
         }
-        for name in notificationNames {
-            AXObserverAddNotification(observer, observingElement, name as CFString, &continuation)
+        
+        Task {
+            for name in notificationNames {
+                var error = AXError.cannotComplete
+                var retryCount = 0
+                while error == AXError.cannotComplete, retryCount < 5 {
+                    error = AXObserverAddNotification(observer, observingElement, name as CFString, &continuation)
+                    if error == .cannotComplete {
+                        try await Task.sleep(nanoseconds: 1_000_000_000)
+                    }
+                    retryCount += 1
+                }
+            }
+            CFRunLoopAddSource(
+                CFRunLoopGetMain(),
+                AXObserverGetRunLoopSource(observer),
+                .commonModes
+            )
         }
-        CFRunLoopAddSource(
-            CFRunLoopGetMain(),
-            AXObserverGetRunLoopSource(observer),
-            .commonModes
-        )
     }
 }

Core/Sources/CodeiumService/CodeiumInstallationManager.swift

@@ -3,7 +3,7 @@ import Terminal
 
 public struct CodeiumInstallationManager {
     private static var isInstalling = false
-    static let latestSupportedVersion = "1.2.25"
+    static let latestSupportedVersion = "1.2.40"
 
     public init() {}
 

Core/Sources/CodeiumService/CodeiumService.swift

@@ -3,6 +3,7 @@ import LanguageClient
 import LanguageServerProtocol
 import Logger
 import SuggestionModel
+import XcodeInspector
 
 public protocol CodeiumSuggestionServiceType {
     func getCompletions(
@@ -54,9 +55,9 @@ public class CodeiumSuggestionService {
 
     let authService = CodeiumAuthService()
 
-    var xcodeVersion = "14.0.0"
+    var fallbackXcodeVersion = "14.0.0"
     var languageServerVersion = CodeiumInstallationManager.latestSupportedVersion
-    
+
     private var ongoingTasks = Set<Task<[CodeSuggestion], Error>>()
 
     init(designatedServer: CodeiumLSP) {
@@ -95,13 +96,6 @@ public class CodeiumSuggestionService {
         }
 
         let metadata = try getMetadata()
-        xcodeVersion = (try? await getXcodeVersion()) ?? xcodeVersion
-        let versionNumberSegmentCount = xcodeVersion.split(separator: ".").count
-        if versionNumberSegmentCount == 2 {
-            xcodeVersion += ".0"
-        } else if versionNumberSegmentCount == 1 {
-            xcodeVersion += ".0.0"
-        }
         let tempFolderURL = FileManager.default.temporaryDirectory
         let managerDirectoryURL = tempFolderURL
             .appendingPathComponent("com.intii.CopilotForXcode")
@@ -192,9 +186,16 @@ extension CodeiumSuggestionService {
             }
             throw E()
         }
+        var ideVersion = XcodeInspector.shared.latestActiveXcode?.version ?? fallbackXcodeVersion
+        let versionNumberSegmentCount = ideVersion.split(separator: ".").count
+        if versionNumberSegmentCount == 2 {
+            ideVersion += ".0"
+        } else if versionNumberSegmentCount == 1 {
+            ideVersion += ".0.0"
+        }
         return Metadata(
             ide_name: "xcode",
-            ide_version: xcodeVersion,
+            ide_version: ideVersion,
             extension_version: languageServerVersion,
             api_key: key,
             session_id: CodeiumSuggestionService.sessionId,
@@ -231,11 +232,11 @@ extension CodeiumSuggestionService: CodeiumSuggestionServiceType {
         ongoingTasks.forEach { $0.cancel() }
         ongoingTasks.removeAll()
         await cancelRequest()
-        
+
         requestCounter += 1
         let languageId = languageIdentifierFromFileURL(fileURL)
         let relativePath = getRelativePath(of: fileURL)
-        
+
         let task = Task {
             let request = await CodeiumRequest.GetCompletion(requestBody: .init(
                 metadata: try getMetadata(),
@@ -263,11 +264,11 @@ extension CodeiumSuggestionService: CodeiumSuggestionServiceType {
                         )
                     }
             ))
-            
+
             try Task.checkCancellation()
 
             let result = try await (try await setupServerIfNeeded()).sendRequest(request)
-            
+
             try Task.checkCancellation()
 
             return result.completionItems?.filter { item in
@@ -294,7 +295,7 @@ extension CodeiumSuggestionService: CodeiumSuggestionServiceType {
                 )
             } ?? []
         }
-        
+
         ongoingTasks.insert(task)
 
         return try await task.value

Core/Sources/Environment/Environment.swift

@@ -2,9 +2,8 @@ import ActiveApplicationMonitor
 import AppKit
 import AXExtension
 import Foundation
-import GitHubCopilotService
 import Logger
-import SuggestionService
+import Preferences
 
 public struct NoAccessToAccessibilityAPIError: Error, LocalizedError {
     public var errorDescription: String? {
@@ -134,13 +133,6 @@ public enum Environment {
         }
     }
 
-    public static var createSuggestionService: (
-        _ projectRootURL: URL,
-        _ onServiceLaunched: @escaping (SuggestionServiceType) -> Void
-    ) -> SuggestionServiceType = { projectRootURL, onServiceLaunched in
-        SuggestionService(projectRootURL: projectRootURL, onServiceLaunched: onServiceLaunched)
-    }
-
     public static var triggerAction: (_ name: String) async throws -> Void = { name in
         guard let activeXcode = ActiveApplicationMonitor.activeXcode
             ?? ActiveApplicationMonitor.latestXcode

Core/Sources/HostApp/DebugView.swift

@@ -8,6 +8,8 @@ final class DebugSettings: ObservableObject {
     @AppStorage(\.preCacheOnFileOpen) var preCacheOnFileOpen
     @AppStorage(\.useCustomScrollViewWorkaround) var useCustomScrollViewWorkaround
     @AppStorage(\.triggerActionWithAccessibilityAPI) var triggerActionWithAccessibilityAPI
+    @AppStorage(\.alwaysAcceptSuggestionWithAccessibilityAPI)
+    var alwaysAcceptSuggestionWithAccessibilityAPI
     init() {}
 }
 
@@ -35,6 +37,9 @@ struct DebugSettingsView: View {
                 Toggle(isOn: $settings.triggerActionWithAccessibilityAPI) {
                     Text("Trigger command with AccessibilityAPI")
                 }
+                Toggle(isOn: $settings.alwaysAcceptSuggestionWithAccessibilityAPI) {
+                    Text("Always accept suggestion with AccessibilityAPI")
+                }
             }
             .padding()
         }

Core/Sources/HostApp/FeatureSettings/SuggestionSettingsView.swift

@@ -32,8 +32,8 @@ struct SuggestionSettingsView: View {
                 Picker(selection: $settings.suggestionPresentationMode) {
                     ForEach(PresentationMode.allCases, id: \.rawValue) {
                         switch $0 {
-                        case .comment:
-                            Text("Comment (Deprecating Soon)").tag($0)
+                        case .nearbyTextCursor:
+                            Text("Nearby Text Cursor").tag($0)
                         case .floatingWidget:
                             Text("Floating Widget").tag($0)
                         }

Core/Sources/HostApp/LaunchAgentManager.swift

@@ -13,7 +13,9 @@ extension LaunchAgentManager {
                 .appendingPathComponent(
                     "CopilotForXcodeExtensionService.app/Contents/MacOS/CopilotForXcodeExtensionService"
                 )
-                .path
+                .path,
+            bundleIdentifier: Bundle.main
+                .object(forInfoDictionaryKey: "BUNDLE_IDENTIFIER_BASE") as! String
         )
     }
 }

Core/Sources/LaunchAgentManager/LaunchAgentManager.swift

@@ -1,9 +1,11 @@
 import Foundation
 
+#warning("TODO: Migrate to SMAppService")
 public struct LaunchAgentManager {
     let lastLaunchAgentVersionKey = "LastLaunchAgentVersion"
     let serviceIdentifier: String
     let executablePath: String
+    let bundleIdentifier: String
 
     var launchAgentDirURL: URL {
         FileManager.default.homeDirectoryForCurrentUser
@@ -14,9 +16,10 @@ public struct LaunchAgentManager {
         launchAgentDirURL.appendingPathComponent("\(serviceIdentifier).plist").path
     }
 
-    public init(serviceIdentifier: String, executablePath: String) {
+    public init(serviceIdentifier: String, executablePath: String, bundleIdentifier: String) {
         self.serviceIdentifier = serviceIdentifier
         self.executablePath = executablePath
+        self.bundleIdentifier = bundleIdentifier
     }
 
     public func setupLaunchAgentForTheFirstTimeIfNeeded() async throws {
@@ -44,6 +47,11 @@ public struct LaunchAgentManager {
                 <key>\(serviceIdentifier)</key>
                 <true/>
             </dict>
+            <key>AssociatedBundleIdentifiers</key>
+            <array>
+                <string>\(bundleIdentifier)</string>
+                <string>\(serviceIdentifier)</string>
+            </array>
         </dict>
         </plist>
         """