Simplify KeyBindingManager initialization

Author: intitni

Core/Package.swift

@@ -329,12 +329,14 @@ let package = Package(
         .target(
             name: "KeyBindingManager",
             dependencies: [
+                .product(name: "CommandHandler", package: "Tool"),
                 .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"),
+                .product(name: "CGEventOverride", package: "CGEventOverride"),
+                .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
             ]
         ),
         .testTarget(

Core/Sources/KeyBindingManager/KeyBindingManager.swift

@@ -1,19 +1,12 @@
 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 init() {
+        tabToAcceptSuggestion = .init()
     }
 
     public func start() {

Core/Sources/KeyBindingManager/TabToAcceptSuggestion.swift

@@ -1,6 +1,8 @@
 import ActiveApplicationMonitor
 import AppKit
 import CGEventOverride
+import CommandHandler
+import Dependencies
 import Foundation
 import Logger
 import Preferences
@@ -14,9 +16,9 @@ final class TabToAcceptSuggestion {
         Logger.service.debug("TabToAcceptSuggestion: \(message)")
     }
 
-    let workspacePool: WorkspacePool
-    let acceptSuggestion: () -> Void
-    let dismissSuggestion: () -> Void
+    @Dependency(\.workspacePool) var workspacePool
+    @Dependency(\.commandHandler) var commandHandler
+
     private var CGEventObservationTask: Task<Void, Error>?
     private var isObserving: Bool { CGEventObservationTask != nil }
     private let userDefaultsObserver = UserDefaultsObserver(
@@ -43,16 +45,9 @@ final class TabToAcceptSuggestion {
         stopObservation()
     }
 
-    init(
-        workspacePool: WorkspacePool,
-        acceptSuggestion: @escaping () -> Void,
-        dismissSuggestion: @escaping () -> Void
-    ) {
+    init() {
         _ = ThreadSafeAccessToXcodeInspector.shared
-        self.workspacePool = workspacePool
-        self.acceptSuggestion = acceptSuggestion
-        self.dismissSuggestion = dismissSuggestion
-
+     
         hook.add(
             .init(
                 eventsOfInterest: [.keyDown],
@@ -193,7 +188,7 @@ final class TabToAcceptSuggestion {
             )
 
             if shouldAcceptSuggestion {
-                acceptSuggestion()
+                Task { await commandHandler.acceptSuggestion() }
                 return .discarded
             } else {
                 return .unchanged
@@ -215,7 +210,7 @@ final class TabToAcceptSuggestion {
                 filespace.presentingSuggestion != nil
             else { return .unchanged }
 
-            dismissSuggestion()
+            Task { await commandHandler.dismissSuggestion() }
             return .discarded
         default:
             return .unchanged

Core/Sources/Service/Service.swift

@@ -57,16 +57,7 @@ public final class Service {
         let guiController = GraphicalUserInterfaceController()
         self.guiController = guiController
         globalShortcutManager = .init(guiController: guiController)
-
-        keyBindingManager = .init(
-            workspacePool: workspacePool,
-            acceptSuggestion: {
-                Task { await PseudoCommandHandler().acceptSuggestion() }
-            },
-            dismissSuggestion: {
-                Task { await PseudoCommandHandler().dismissSuggestion() }
-            }
-        )
+        keyBindingManager = .init()
 
         #if canImport(ProService)
         proService = ProService()