Move KeybindingManager to Core

Author: intitni

Core/Package.swift

@@ -101,6 +101,7 @@ let package = Package(
         // quick hack to support custom UserDefaults
         // https://github.com/sindresorhus/KeyboardShortcuts
         .package(url: "https://github.com/intitni/KeyboardShortcuts", branch: "main"),
+        .package(url: "https://github.com/intitni/CGEventOverride", from: "1.2.1"),
     ].pro,
     targets: [
         // MARK: - Main
@@ -127,6 +128,7 @@ let package = Package(
                 "ServiceUpdateMigration",
                 "ChatGPTChatTab",
                 "PlusFeatureFlag",
+                "KeyBindingManager",
                 .product(name: "XPCShared", package: "Tool"),
                 .product(name: "SuggestionProvider", package: "Tool"),
                 .product(name: "Workspace", package: "Tool"),
@@ -377,6 +379,24 @@ let package = Package(
             ],
             path: "Sources/ChatContextCollectors/SystemInfoChatContextCollector"
         ),
+        
+        // MARK: Key Binding
+
+        .target(
+            name: "KeyBindingManager",
+            dependencies: [
+                .product(name: "Workspace", package: "Tool"),
+                .product(name: "Preferences", package: "Tool"),
+                .product(name: "Logger", package: "Tool"),
+                .product(name: "CGEventOverride", package: "CGEventOverride"),
+                .product(name: "AppMonitoring", package: "Tool"),
+                .product(name: "UserDefaultsObserver", package: "Tool"),
+            ]
+        ),
+        .testTarget(
+            name: "KeyBindingManagerTests",
+            dependencies: ["KeyBindingManager"]
+        ),
     ]
 )
 

Core/Sources/HostApp/FeatureSettings/Suggestion/SuggestionSettingsGeneralSectionView.swift

@@ -172,28 +172,24 @@ struct SuggestionSettingsGeneralSectionView: View {
                 Text("Real-time suggestion")
             }
 
-            #if canImport(ProHostApp)
-            WithFeatureEnabled(\.tabToAcceptSuggestion) {
-                Toggle(isOn: $settings.acceptSuggestionWithTab) {
-                    HStack {
-                        Text("Accept suggestion with Tab")
+            Toggle(isOn: $settings.acceptSuggestionWithTab) {
+                HStack {
+                    Text("Accept suggestion with Tab")
 
-                        Button(action: {
-                            isTabToAcceptSuggestionModifierViewOpen = true
-                        }) {
-                            Image(systemName: "gearshape.fill")
-                        }
-                        .buttonStyle(.plain)
+                    Button(action: {
+                        isTabToAcceptSuggestionModifierViewOpen = true
+                    }) {
+                        Image(systemName: "gearshape.fill")
                     }
-                }.sheet(isPresented: $isTabToAcceptSuggestionModifierViewOpen) {
-                    TabToAcceptSuggestionModifierView()
+                    .buttonStyle(.plain)
                 }
+            }.sheet(isPresented: $isTabToAcceptSuggestionModifierViewOpen) {
+                TabToAcceptSuggestionModifierView()
             }
 
             Toggle(isOn: $settings.dismissSuggestionWithEsc) {
                 Text("Dismiss suggestion with ESC")
             }
-            #endif
 
             HStack {
                 Toggle(isOn: $settings.disableSuggestionFeatureGlobally) {

Core/Sources/KeyBindingManager/KeyBindingManager.swift

@@ -0,0 +1,29 @@
+import Foundation
+import Workspace
+
+public final class KeyBindingManager {
+    let tabToAcceptSuggestion: TabToAcceptSuggestion
+
+    public init(
+        workspacePool: WorkspacePool,
+        acceptSuggestion: @escaping () -> Void,
+        dismissSuggestion: @escaping () -> Void
+    ) {
+        tabToAcceptSuggestion = .init(
+            workspacePool: workspacePool,
+            acceptSuggestion: acceptSuggestion, 
+            dismissSuggestion: dismissSuggestion
+        )
+    }
+    
+    public func start() {
+        tabToAcceptSuggestion.start()
+    }
+    
+    @MainActor
+    public func stopForExit() {
+        tabToAcceptSuggestion.stopForExit()
+    }
+}
+
+