Support swapping suggestion feature provider

Author: intitni

Core/Package.swift

@@ -16,6 +16,7 @@ let package = Package(
                 "LaunchAgentManager",
                 "UpdateChecker",
                 "Logger",
+                "UserDefaultsObserver",
             ]
         ),
         .library(
@@ -69,6 +70,7 @@ let package = Package(
                 "ChatService",
                 "PromptToCodeService",
                 "ServiceUpdateMigration",
+                "UserDefaultsObserver",
                 .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
             ]
         ),
@@ -118,6 +120,7 @@ let package = Package(
         .target(name: "SuggestionService", dependencies: [
             "GitHubCopilotService",
             "CodeiumService",
+            "UserDefaultsObserver",
         ]),
 
         // MARK: - Prompt To Code
@@ -150,6 +153,7 @@ let package = Package(
                 "Environment",
                 "Highlightr",
                 "Splash",
+                "UserDefaultsObserver",
                 .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
                 .product(name: "MarkdownUI", package: "swift-markdown-ui"),
             ]
@@ -179,6 +183,7 @@ let package = Package(
             name: "ServiceUpdateMigration",
             dependencies: ["Preferences", "GitHubCopilotService"]
         ),
+        .target(name: "UserDefaultsObserver"),
 
         // MARK: - GitHub Copilot
 

Core/Sources/Service/GUI/RealtimeSuggestionIndicatorController.swift

@@ -7,6 +7,7 @@ import Environment
 import Preferences
 import QuartzCore
 import SwiftUI
+import UserDefaultsObserver
 
 /// Present a tiny dot next to mouse cursor if real-time suggestion is enabled.
 @MainActor

Core/Sources/Service/Workspace.swift

@@ -7,6 +7,7 @@ import Preferences
 import SuggestionInjector
 import SuggestionModel
 import SuggestionService
+import UserDefaultsObserver
 import XPCShared
 
 @ServiceActor
@@ -119,7 +120,7 @@ final class Workspace {
 
         if _suggestionService == nil {
             _suggestionService = Environment.createSuggestionService(projectRootURL) {
-                [weak self] service in
+                [weak self] _ in
                 guard let self else { return }
                 for (_, filespace) in filespaces {
                     notifyOpenFile(filespace: filespace)
@@ -178,7 +179,7 @@ final class Workspace {
 
         let projectURL = try await Environment.fetchCurrentProjectRootURL(fileURL)
         let workspaceURL = projectURL ?? fileURL
-        
+
         let workspace = {
             if let existed = workspaces[workspaceURL] {
                 return existed
@@ -191,7 +192,7 @@ final class Workspace {
             }
             return Workspace(projectRootURL: workspaceURL)
         }()
-        
+
         let filespace = workspace.createFilespaceIfNeeded(fileURL: fileURL)
         workspaces[workspaceURL] = workspace
         workspace.refreshUpdateTime()

Core/Sources/SuggestionService/SuggestionService.swift

@@ -1,6 +1,5 @@
-import CodeiumService
 import Foundation
-import GitHubCopilotService
+import UserDefaultsObserver
 import Preferences
 import SuggestionModel
 
@@ -28,9 +27,13 @@ protocol SuggestionServiceProvider: SuggestionServiceType {}
 public final class SuggestionService: SuggestionServiceType {
     let projectRootURL: URL
     let onServiceLaunched: (SuggestionServiceType) -> Void
-    lazy var suggestionProvider: SuggestionServiceProvider = buildService()
+    let providerChangeObserver = UserDefaultsObserver(
+        object: UserDefaults.shared,
+        forKeyPaths: [UserDefaultPreferenceKeys().suggestionFeatureProvider.key],
+        context: nil
+    )
 
-    var codeiumService: CodeiumSuggestionServiceType?
+    lazy var suggestionProvider: SuggestionServiceProvider = buildService()
 
     var serviceType: SuggestionFeatureProvider {
         UserDefaults.shared.value(for: \.suggestionFeatureProvider)
@@ -39,6 +42,11 @@ public final class SuggestionService: SuggestionServiceType {
     public init(projectRootURL: URL, onServiceLaunched: @escaping (SuggestionServiceType) -> Void) {
         self.projectRootURL = projectRootURL
         self.onServiceLaunched = onServiceLaunched
+        
+        providerChangeObserver.onChange = { [weak self] in
+            guard let self else { return }
+            suggestionProvider = buildService()
+        }
     }
 
     func buildService() -> SuggestionServiceProvider {

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -6,6 +6,7 @@ import Combine
 import Environment
 import Preferences
 import SwiftUI
+import UserDefaultsObserver
 
 @MainActor
 public final class SuggestionWidgetController: NSObject {

Core/Sources/SuggestionWidget/UserDefaultsObserver.swift

@@ -1,11 +1,15 @@
 import Foundation
 
-final class UserDefaultsObserver: NSObject {
-    var onChange: (() -> Void)?
+public final class UserDefaultsObserver: NSObject {
+    public var onChange: (() -> Void)?
     private weak var object: NSObject?
     private let keyPaths: [String]
-    
-    init(object: NSObject, forKeyPaths keyPaths: [String], context: UnsafeMutableRawPointer?) {
+
+    public init(
+        object: NSObject,
+        forKeyPaths keyPaths: [String],
+        context: UnsafeMutableRawPointer?
+    ) {
         self.object = object
         self.keyPaths = keyPaths
         super.init()
@@ -19,8 +23,8 @@ final class UserDefaultsObserver: NSObject {
             object?.removeObserver(self, forKeyPath: keyPath)
         }
     }
-    
-    override func observeValue(
+
+    public override func observeValue(
         forKeyPath keyPath: String?,
         of object: Any?,
         change: [NSKeyValueChangeKey: Any]?,
@@ -29,3 +33,4 @@ final class UserDefaultsObserver: NSObject {
         onChange?()
     }
 }
+

…urces/Service/UserDefaultsObserver.swift …aultsObserver/UserDefaultsObserver.swiftCore/Sources/Service/UserDefaultsObserver.swift renamed to Core/Sources/UserDefaultsObserver/UserDefaultsObserver.swift Core/Sources/Service/UserDefaultsObserver.swift renamed to Core/Sources/UserDefaultsObserver/UserDefaultsObserver.swift

@@ -9,6 +9,7 @@ import ServiceManagement
 import ServiceUpdateMigration
 import SwiftUI
 import UpdateChecker
+import UserDefaultsObserver
 import UserNotifications
 
 let bundleIdentifierBase = Bundle.main
@@ -18,7 +19,11 @@ let serviceIdentifier = bundleIdentifierBase + ".ExtensionService"
 @main
 class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
     let scheduledCleaner = ScheduledCleaner()
-    private let userDefaultsObserver = UserDefaultsObserver()
+    private let userDefaultsObserver = UserDefaultsObserver(
+        object: UserDefaults.shared,
+        forKeyPaths: [UserDefaultPreferenceKeys().realtimeSuggestionToggle.key],
+        context: nil
+    )
     private var statusBarItem: NSStatusItem!
     private var xpcListener: (NSXPCListener, ServiceDelegate)?
     private let updateChecker =
@@ -78,7 +83,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
             action: #selector(checkForUpdate),
             keyEquivalent: ""
         )
-        
+
         let openCopilotForXcode = NSMenuItem(
             title: "Open Copilot for Xcode",
             action: #selector(openCopilotForXcode),
@@ -110,21 +115,16 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         statusBarMenu.addItem(.separator())
         statusBarMenu.addItem(quitItem)
 
-        userDefaultsObserver.onChange = { key in
-            switch key {
-            case UserDefaultPreferenceKeys().realtimeSuggestionToggle.key:
-                toggleRealtimeSuggestions.state = UserDefaults.shared
-                    .value(for: \.realtimeSuggestionToggle) ? .on : .off
-            default:
-                break
-            }
+        userDefaultsObserver.onChange = {
+            toggleRealtimeSuggestions.state = UserDefaults.shared
+                .value(for: \.realtimeSuggestionToggle) ? .on : .off
         }
     }
 
     @objc func quit() {
         exit(0)
     }
-    
+
     @objc func openCopilotForXcode() {
         let task = Process()
         if let appPath = locateHostBundleURL(url: Bundle.main.bundleURL)?.absoluteString {
@@ -234,32 +234,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
     }
 }
 
-private class UserDefaultsObserver: NSObject {
-    var onChange: ((String?) -> Void)?
-
-    override func observeValue(
-        forKeyPath keyPath: String?,
-        of object: Any?,
-        change: [NSKeyValueChangeKey: Any]?,
-        context: UnsafeMutableRawPointer?
-    ) {
-        onChange?(keyPath)
-    }
-
-    deinit {
-        removeObserver(self, forKeyPath: UserDefaultPreferenceKeys().realtimeSuggestionToggle.key)
-    }
-
-    override init() {
-        super.init()
-        observe(keyPath: UserDefaultPreferenceKeys().realtimeSuggestionToggle.key)
-    }
-
-    private func observe(keyPath: String) {
-        UserDefaults.shared.addObserver(self, forKeyPath: keyPath, options: .new, context: nil)
-    }
-}
-
 extension NSRunningApplication {
     var isUserOfService: Bool {
         [