Merge branch 'main' into develop

Author: intitni

Core/Package.swift

@@ -382,6 +382,7 @@ let package = Package(
 extension [Target.Dependency] {
     func pro(_ targetNames: [String]) -> [Target.Dependency] {
         if isProIncluded() {
+            // include the pro package
             return self + targetNames.map { Target.Dependency.product(name: $0, package: "Pro") }
         }
         return self
@@ -391,6 +392,7 @@ extension [Target.Dependency] {
 extension [Package.Dependency] {
     var pro: [Package.Dependency] {
         if isProIncluded() {
+            // include the pro package
             return self + [.package(path: "../Pro")]
         }
         return self

Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift

@@ -108,11 +108,13 @@ struct GUI: ReducerProtocol {
         Reduce { state, action in
             switch action {
             case .start:
+                #if canImport(ChatTabPersistent)
                 return .run { send in
-                    #if canImport(ChatTabPersistent)
                     await send(.persistent(.restoreChatTabs))
-                    #endif
                 }
+                #else
+                return .none
+                #endif
 
             case let .openChatPanel(forceDetach):
                 return .run { send in

Core/Sources/Service/Service.swift

@@ -1,5 +1,7 @@
 import Foundation
+#if canImport(KeyBindingManager)
 import KeyBindingManager
+#endif
 import Workspace
 
 @globalActor public enum ServiceActor {
@@ -24,10 +26,13 @@ public final class Service {
     public let guiController = GraphicalUserInterfaceController()
     public let realtimeSuggestionController = RealtimeSuggestionController()
     public let scheduledCleaner: ScheduledCleaner
+    #if canImport(KeyBindingManager)
     let keyBindingManager: KeyBindingManager
+    #endif
 
     private init() {
         scheduledCleaner = .init(workspacePool: workspacePool, guiController: guiController)
+        #if canImport(KeyBindingManager)
         keyBindingManager = .init(
             workspacePool: workspacePool,
             acceptSuggestion: {
@@ -36,14 +41,17 @@ public final class Service {
                 }
             }
         )
+        #endif
     }
-    
+
     @MainActor
     public func start() {
         scheduledCleaner.start()
         realtimeSuggestionController.start()
         guiController.start()
+        #if canImport(KeyBindingManager)
         keyBindingManager.start()
+        #endif
         DependencyUpdater().update()
     }
 }