Fix that command handler is not correctly setup

Author: intitni

Core/Sources/Service/Service.swift

@@ -49,36 +49,27 @@ public final class Service {
     private init() {
         @Dependency(\.workspacePool) var workspacePool
         let commandHandler = PseudoCommandHandler()
+        UniversalCommandHandler.shared.commandHandler = commandHandler
         self.commandHandler = commandHandler
 
-        func setup<R>(_ operation: () -> R) -> R {
-            withDependencies { values in
-                values.commandHandler = commandHandler
-            } operation: {
-                operation() //
-            }
-        }
-
-        realtimeSuggestionController = setup { .init() }
-        scheduledCleaner = setup { .init() }
-        let guiController = setup { GraphicalUserInterfaceController() }
+        realtimeSuggestionController = .init()
+        scheduledCleaner = .init()
+        let guiController = GraphicalUserInterfaceController()
         self.guiController = guiController
-        globalShortcutManager = setup { .init(guiController: guiController) }
-
-        keyBindingManager = setup {
-            .init(
-                workspacePool: workspacePool,
-                acceptSuggestion: {
-                    Task { await PseudoCommandHandler().acceptSuggestion() }
-                },
-                dismissSuggestion: {
-                    Task { await PseudoCommandHandler().dismissSuggestion() }
-                }
-            )
-        }
+        globalShortcutManager = .init(guiController: guiController)
+
+        keyBindingManager = .init(
+            workspacePool: workspacePool,
+            acceptSuggestion: {
+                Task { await PseudoCommandHandler().acceptSuggestion() }
+            },
+            dismissSuggestion: {
+                Task { await PseudoCommandHandler().dismissSuggestion() }
+            }
+        )
 
         #if canImport(ProService)
-        proService = setup { ProService() }
+        proService = ProService()
         #endif
 
         BuiltinExtensionManager.shared.setupExtensions([
@@ -149,7 +140,7 @@ public extension Service {
     ) {
         do {
             #if canImport(ProService)
-            try Service.shared.proService.handleXPCServiceRequests(
+            try proService.handleXPCServiceRequests(
                 endpoint: endpoint,
                 requestBody: requestBody,
                 reply: reply

Tool/Sources/CommandHandler/CommandHandler.swift

@@ -36,19 +36,78 @@ public protocol CommandHandler {
 }
 
 public struct CommandHandlerDependencyKey: DependencyKey {
-    public static var liveValue: CommandHandler = NoopCommandHandler()
+    public static var liveValue: CommandHandler = UniversalCommandHandler.shared
+    public static var testValue: CommandHandler = NoopCommandHandler()
 }
 
 public extension DependencyValues {
+    /// In production, you need to override the command handler globally by setting
+    /// ``UniversalCommandHandler.shared.commandHandler``.
+    ///
+    /// In tests, you can use ``withDependency`` to mock it.
     var commandHandler: CommandHandler {
         get { self[CommandHandlerDependencyKey.self] }
         set { self[CommandHandlerDependencyKey.self] = newValue }
     }
 }
 
-struct NoopCommandHandler: CommandHandler {
-    static let shared: CommandHandler = NoopCommandHandler()
+public final class UniversalCommandHandler: CommandHandler {
+    public static let shared: UniversalCommandHandler = UniversalCommandHandler()
+    
+    public var commandHandler: CommandHandler = NoopCommandHandler()
+    
+    private init() {}
+
+    public func presentSuggestions(_ suggestions: [SuggestionBasic.CodeSuggestion]) async {
+        await commandHandler.presentSuggestions(suggestions)
+    }
+
+    public func presentPreviousSuggestion() async {
+        await commandHandler.presentPreviousSuggestion()
+    }
+
+    public func presentNextSuggestion() async {
+        await commandHandler.presentNextSuggestion()
+    }
 
+    public func rejectSuggestions() async {
+        await commandHandler.rejectSuggestions()
+    }
+
+    public func acceptSuggestion() async {
+        await commandHandler.acceptSuggestion()
+    }
+
+    public func dismissSuggestion() async {
+        await commandHandler.dismissSuggestion()
+    }
+
+    public func generateRealtimeSuggestions(sourceEditor: SourceEditor?) async {
+        await commandHandler.generateRealtimeSuggestions(sourceEditor: sourceEditor)
+    }
+
+    public func openChat(forceDetach: Bool) {
+        commandHandler.openChat(forceDetach: forceDetach)
+    }
+
+    public func sendChatMessage(_ message: String) async {
+        await commandHandler.sendChatMessage(message)
+    }
+
+    public func acceptPromptToCode() async {
+        await commandHandler.acceptPromptToCode()
+    }
+
+    public func handleCustomCommand(_ command: CustomCommand) async {
+        await commandHandler.handleCustomCommand(command)
+    }
+
+    public func toast(_ string: String, as type: ToastType) {
+        commandHandler.toast(string, as: type)
+    }
+}
+
+struct NoopCommandHandler: CommandHandler {
     func presentSuggestions(_: [CodeSuggestion]) async {}
     func presentPreviousSuggestion() async {}
     func presentNextSuggestion() async {}

Tool/Sources/SharedUIComponents/AsyncCodeBlock.swift

@@ -4,7 +4,7 @@ import Foundation
 import Perception
 import SwiftUI
 
-public struct AsyncCodeBlock: View {
+public struct AsyncCodeBlock: View { // chat: hid
     @State var storage = Storage()
     @Environment(\.colorScheme) var colorScheme