Add command handler

Author: intitni

Core/Package.swift

@@ -90,6 +90,7 @@ let package = Package(
                 .product(name: "Logger", package: "Tool"),
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
+                .product(name: "CommandHandler", package: "Tool"),
                 .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
                 .product(name: "Dependencies", package: "swift-dependencies"),
@@ -388,6 +389,7 @@ var isProIncluded: Bool {
         let rootURL = fileURL
             .deletingLastPathComponent()
             .deletingLastPathComponent()
+            .deletingLastPathComponent()
         let confURL = rootURL.appendingPathComponent("PLUS")
         return FileManager.default.fileExists(atPath: confURL.path)
     }

Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift

@@ -186,7 +186,7 @@ struct GUI {
                             )
                         }
                     }
-
+                    
                 case let .sendCustomCommandToActiveChat(command):
                     @Sendable func stopAndHandleCommand(_ tab: ChatGPTChatTab) async {
                         if tab.service.isReceivingMessage {
@@ -218,9 +218,7 @@ struct GUI {
 
                     return .run { send in
                         guard let (chatTab, chatTabInfo) = await chatTabPool.createTab(for: nil)
-                        else {
-                            return
-                        }
+                        else { return }
                         await send(.suggestionWidget(.chatPanel(.appendAndSelectTab(chatTabInfo))))
                         await send(.openChatPanel(forceDetach: false))
                         if let chatTab = chatTab as? ChatGPTChatTab {

Core/Sources/Service/Service.swift

@@ -1,6 +1,7 @@
 import BuiltinExtension
 import CodeiumService
 import Combine
+import CommandHandler
 import Dependencies
 import Foundation
 import GitHubCopilotService
@@ -45,6 +46,7 @@ public final class Service {
 
     private init() {
         @Dependency(\.workspacePool) var workspacePool
+        CommandHandlerDependencyKey.liveValue = PseudoCommandHandler()
 
         BuiltinExtensionManager.shared.setupExtensions([
             GitHubCopilotExtension(workspacePool: workspacePool),

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -1,13 +1,14 @@
 import ActiveApplicationMonitor
 import AppKit
 import CodeiumService
+import CommandHandler
 import enum CopilotForXcodeKit.SuggestionServiceError
 import Dependencies
 import Logger
 import PlusFeatureFlag
 import Preferences
-import SuggestionInjector
 import SuggestionBasic
+import SuggestionInjector
 import Toast
 import Workspace
 import WorkspaceSuggestionService
@@ -21,7 +22,7 @@ import BrowserChatTab
 /// It's used to run some commands without really triggering the menu bar item.
 ///
 /// For example, we can use it to generate real-time suggestions without Apple Scripts.
-struct PseudoCommandHandler {
+struct PseudoCommandHandler: CommandHandler {
     static var lastTimeCommandFailedToTriggerWithAccessibilityAPI = Date(timeIntervalSince1970: 0)
     private var toast: ToastController { ToastControllerDependencyKey.liveValue }
 
@@ -397,6 +398,33 @@ struct PseudoCommandHandler {
             }
         }
     }
+
+    func sendChatMessage(_ message: String) async {
+        let store = Service.shared.guiController.store
+        await store.send(.sendCustomCommandToActiveChat(CustomCommand(
+            commandId: "",
+            name: "",
+            feature: .chatWithSelection(
+                extraSystemPrompt: nil,
+                prompt: message,
+                useExtraSystemPrompt: nil
+            )
+        ))).finish()
+    }
+
+    @WorkspaceActor
+    func presentSuggestions(_ suggestions: [SuggestionBasic.CodeSuggestion]) async {
+        guard let filespace = await getFilespace() else { return }
+        filespace.setSuggestions(suggestions)
+        PresentInWindowSuggestionPresenter().presentSuggestion(fileURL: filespace.fileURL)
+    }
+
+    func toast(_ message: String, as type: ToastType) {
+        Task { @MainActor in
+            let store = Service.shared.guiController.store
+            store.send(.suggestionWidget(.toastPanel(.toast(.toast(message, type, nil)))))
+        }
+    }
 }
 
 extension PseudoCommandHandler {

Tool/Package.swift

@@ -46,6 +46,7 @@ let package = Package(
         .library(name: "DebounceFunction", targets: ["DebounceFunction"]),
         .library(name: "AsyncPassthroughSubject", targets: ["AsyncPassthroughSubject"]),
         .library(name: "CustomAsyncAlgorithms", targets: ["CustomAsyncAlgorithms"]),
+        .library(name: "CommandHandler", targets: ["CommandHandler"]),
     ],
     dependencies: [
         // A fork of https://github.com/aespinilla/Tiktoken to allow loading from local files.
@@ -292,6 +293,15 @@ let package = Package(
                 ),
             ]
         ),
+        
+        .target(
+            name: "CommandHandler",
+            dependencies: [
+                "XcodeInspector",
+                "Preferences",
+                .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
+            ]
+        ),
 
         // MARK: - Services
 

Tool/Sources/CommandHandler/CommandHandler.swift

@@ -0,0 +1,65 @@
+import Dependencies
+import Foundation
+import Preferences
+import SuggestionBasic
+import Toast
+import XcodeInspector
+
+/// Provides an interface to handle commands.
+public protocol CommandHandler {
+    // MARK: Suggestion
+
+    func presentSuggestions(_ suggestions: [CodeSuggestion]) async
+    func presentPreviousSuggestion() async
+    func presentNextSuggestion() async
+    func rejectSuggestions() async
+    func acceptSuggestion() async
+    func dismissSuggestion() async
+    func generateRealtimeSuggestions(sourceEditor: SourceEditor?) async
+
+    // MARK: Chat
+
+    func openChat(forceDetach: Bool)
+    func sendChatMessage(_ message: String) async
+
+    // MARK: Prompt to Code
+
+    func acceptPromptToCode() async
+
+    // MARK: Custom Command
+
+    func handleCustomCommand(_ command: CustomCommand) async
+
+    // MARK: Toast
+
+    func toast(_ string: String, as type: ToastType)
+}
+
+public struct CommandHandlerDependencyKey: DependencyKey {
+    public static var liveValue: CommandHandler = NoopCommandHandler()
+}
+
+public extension DependencyValues {
+    var commandHandler: CommandHandler {
+        get { self[CommandHandlerDependencyKey.self] }
+        set { self[CommandHandlerDependencyKey.self] = newValue }
+    }
+}
+
+struct NoopCommandHandler: CommandHandler {
+    static let shared: CommandHandler = NoopCommandHandler()
+
+    func presentSuggestions(_: [CodeSuggestion]) async {}
+    func presentPreviousSuggestion() async {}
+    func presentNextSuggestion() async {}
+    func rejectSuggestions() async {}
+    func acceptSuggestion() async {}
+    func dismissSuggestion() async {}
+    func generateRealtimeSuggestions(sourceEditor: SourceEditor?) async {}
+    func openChat(forceDetach: Bool) {}
+    func sendChatMessage(_: String) async {}
+    func acceptPromptToCode() async {}
+    func handleCustomCommand(_: CustomCommand) async {}
+    func toast(_: String, as: ToastType) {}
+}
+