Fix dependency

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/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/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"),
             ]
         ),