Add new suggestionFeatureProvider key

Author: intitni

Core/Package.swift

@@ -186,7 +186,9 @@ let package = Package(
             dependencies: [
                 .product(name: "SuggestionModel", package: "Tool"),
                 .product(name: "SuggestionProvider", package: "Tool")
-            ]
+            ].pro([
+                "ProExtension",
+            ])
         ),
         .target(
             name: "SuggestionInjector",

Core/Sources/HostApp/FeatureSettings/SuggestionSettingsView.swift

@@ -56,9 +56,9 @@ struct SuggestionSettingsView: View {
                 ForEach(BuiltInSuggestionFeatureProvider.allCases, id: \.rawValue) {
                     switch $0 {
                     case .gitHubCopilot:
-                        Text("GitHub Copilot").tag($0)
+                        Text("GitHub Copilot").tag(SuggestionFeatureProvider.builtIn($0))
                     case .codeium:
-                        Text("Codeium").tag($0)
+                        Text("Codeium").tag(SuggestionFeatureProvider.builtIn($0))
                     }
                 }
             } label: {

Core/Sources/SuggestionService/SuggestionService.swift

@@ -4,6 +4,10 @@ import SuggestionModel
 import SuggestionProvider
 import UserDefaultsObserver
 
+#if canImport(ProExtension)
+import ProExtension
+#endif
+
 public protocol SuggestionServiceType: SuggestionServiceProvider {}
 
 public actor SuggestionService: SuggestionServiceType {
@@ -15,13 +19,13 @@ public actor SuggestionService: SuggestionServiceType {
     let onServiceLaunched: (SuggestionServiceProvider) -> Void
     let providerChangeObserver = UserDefaultsObserver(
         object: UserDefaults.shared,
-        forKeyPaths: [UserDefaultPreferenceKeys().suggestionFeatureProvider.key],
+        forKeyPaths: [UserDefaultPreferenceKeys().oldSuggestionFeatureProvider.key],
         context: nil
     )
 
     lazy var suggestionProvider: SuggestionServiceProvider = buildService()
 
-    var serviceType: BuiltInSuggestionFeatureProvider {
+    var serviceType: SuggestionFeatureProvider {
         UserDefaults.shared.value(for: \.suggestionFeatureProvider)
     }
 
@@ -41,13 +45,19 @@ public actor SuggestionService: SuggestionServiceType {
     }
 
     func buildService() -> SuggestionServiceProvider {
+        #if canImport(ProExtension)
+        if let provider = ProExtension.suggestionProviderFactory(serviceType) {
+            return provider
+        }
+        #endif
+        
         switch serviceType {
-        case .codeium:
+        case .builtIn(.codeium):
             return CodeiumSuggestionProvider(
                 projectRootURL: projectRootURL,
                 onServiceLaunched: onServiceLaunched
             )
-        case .gitHubCopilot:
+        case .builtIn(.gitHubCopilot), .extension:
             return GitHubCopilotSuggestionProvider(
                 projectRootURL: projectRootURL,
                 onServiceLaunched: onServiceLaunched

Tool/Sources/Preferences/Keys.swift

@@ -286,9 +286,13 @@ public extension UserDefaultPreferenceKeys {
 // MARK: - Suggestion
 
 public extension UserDefaultPreferenceKeys {
-    var suggestionFeatureProvider: PreferenceKey<BuiltInSuggestionFeatureProvider> {
+    var oldSuggestionFeatureProvider: DeprecatedPreferenceKey<BuiltInSuggestionFeatureProvider> {
         .init(defaultValue: .gitHubCopilot, key: "SuggestionFeatureProvider")
     }
+    
+    var suggestionFeatureProvider: PreferenceKey<SuggestionFeatureProvider> {
+        .init(defaultValue: .builtIn(.gitHubCopilot), key: "NewSuggestionFeatureProvider")
+    }
 
     var realtimeSuggestionToggle: PreferenceKey<Bool> {
         .init(defaultValue: true, key: "RealtimeSuggestionToggle")

Tool/Sources/Preferences/Types/SuggestionFeatureProvider.swift

@@ -5,8 +5,23 @@ public enum BuiltInSuggestionFeatureProvider: Int, CaseIterable, Codable {
     case codeium
 }
 
-public enum SuggestionFeatureProvider: Codable {
+public enum SuggestionFeatureProvider: Codable, RawRepresentable, Hashable {
     case builtIn(BuiltInSuggestionFeatureProvider)
-    case extended(name: String, bundleIdentifier: String)
+    case `extension`(name: String, bundleIdentifier: String)
+
+    public init?(rawValue: String) {
+        guard let data = rawValue.data(using: .utf8),
+              let value = try? JSONDecoder().decode(Self.self, from: data)
+        else { return nil }
+
+        self = value
+    }
+
+    public var rawValue: String {
+        if let data = try? JSONEncoder().encode(self) {
+            return String(data: data, encoding: .utf8) ?? ""
+        }
+        return ""
+    }
 }
 

Tool/Sources/Preferences/UserDefaults.swift

@@ -21,6 +21,10 @@ public extension UserDefaults {
         shared.setupDefaultValue(for: \.runNodeWith, defaultValue: .env)
         shared.setupDefaultValue(for: \.chatModels)
         shared.setupDefaultValue(for: \.embeddingModels)
+        shared.setupDefaultValue(
+            for: \.suggestionFeatureProvider,
+            defaultValue: .builtIn(shared.value(for: \.oldSuggestionFeatureProvider))
+        )
     }
 }