Merge branch 'feature/read-xcode-version-from-inspector' into hotfix/0.18.3

Author: intitni

Core/Package.swift

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

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/Service/Workspace.swift

@@ -135,7 +135,7 @@ final class Workspace {
         }
 
         if _suggestionService == nil {
-            _suggestionService = Environment.createSuggestionService(projectRootURL) {
+            _suggestionService = SuggestionService(projectRootURL: projectRootURL) {
                 [weak self] _ in
                 guard let self else { return }
                 for (_, filespace) in filespaces {

Core/Sources/XcodeInspector/XcodeInspector.swift

@@ -167,6 +167,26 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
     @Published public var documentURL: URL = .init(fileURLWithPath: "/")
     @Published public var projectURL: URL = .init(fileURLWithPath: "/")
     @Published public var workspaces = [WorkspaceIdentifier: WorkspaceInfo]()
+    var _version: String?
+    public var version: String? {
+        if let _version { return _version }
+        guard let plistPath = runningApplication.bundleURL?
+            .appendingPathComponent("Contents")
+            .appendingPathComponent("version.plist")
+            .path
+        else { return nil }
+        guard let plistData = FileManager.default.contents(atPath: plistPath) else { return nil }
+        var format = PropertyListSerialization.PropertyListFormat.xml
+        guard let plistDict = try? PropertyListSerialization.propertyList(
+            from: plistData,
+            options: .mutableContainersAndLeaves,
+            format: &format
+        ) as? [String: AnyObject] else { return nil }
+        let result = plistDict["CFBundleShortVersionString"] as? String
+        _version = result
+        return result
+    }
+
     private var longRunningTasks = Set<Task<Void, Error>>()
     private var focusedWindowObservations = Set<AnyCancellable>()
 

Core/Tests/ServiceTests/Environment.swift

@@ -22,10 +22,6 @@ import XPCShared
         URL(fileURLWithPath: "/path/to/project/file.swift")
     }
 
-    Environment.createSuggestionService = {
-        _, _ in fatalError("")
-    }
-
     Environment.triggerAction = { _ in }
 }
 

Tool/Package.swift

@@ -15,6 +15,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/pvieito/PythonKit.git", branch: "master"),
+        // TODO: Switch to Tiktoken. https://github.com/aespinilla/Tiktoken
         .package(url: "https://github.com/alfianlosari/GPTEncoder", from: "1.0.4"),
         .package(url: "https://github.com/apple/swift-async-algorithms", from: "0.1.0"),
         .package(url: "https://github.com/pointfreeco/swift-parsing", from: "0.12.1")
@@ -56,9 +57,9 @@ let package = Package(
         .target(
             name: "OpenAIService",
             dependencies: [
-                "GPTEncoder",
                 "Logger",
                 "Preferences",
+                .product(name: "GPTEncoder", package: "GPTEncoder"),
                 .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
             ]
         ),