Change the way custom command is handled

Author: intitni

Core/Sources/ChatGPTChatTab/ChatGPTChatTab.swift

@@ -104,7 +104,7 @@ public class ChatGPTChatTab: ChatTab {
 
         return [Builder(title: "Legacy Chat", customCommand: nil)] + customCommands
     }
-    
+
     public static func defaultBuilder() -> ChatTabBuilder {
         Builder(title: "Legacy Chat", customCommand: nil)
     }
@@ -174,5 +174,15 @@ public class ChatGPTChatTab: ChatTab {
             }
         }
     }
+
+    public func handleCustomCommand(_ customCommand: CustomCommand) -> Bool {
+        Task {
+            if service.isReceivingMessage {
+                await service.stopReceivingMessage()
+            }
+            try? await service.handleCustomCommand(customCommand)
+        }
+        return true
+    }
 }
 

Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift

@@ -187,31 +187,26 @@ struct GUI {
                     }
 
                 case let .sendCustomCommandToActiveChat(command):
-                    @Sendable func stopAndHandleCommand(_ tab: ChatGPTChatTab) async {
-                        if tab.service.isReceivingMessage {
-                            await tab.service.stopReceivingMessage()
-                        }
-                        try? await tab.service.handleCustomCommand(command)
-                    }
-
                     if let info = state.chatTabGroup.selectedTabInfo,
-                       let activeTab = chatTabPool.getTab(of: info.id) as? ChatGPTChatTab
+                       let tab = chatTabPool.getTab(of: info.id),
+                       tab.handleCustomCommand(command)
                     {
                         return .run { send in
                             await send(.openChatPanel(forceDetach: false, activateThisApp: false))
-                            await stopAndHandleCommand(activeTab)
                         }
                     }
 
-                    if let info = state.chatTabGroup.tabInfo.first(where: {
-                        chatTabPool.getTab(of: $0.id) is ChatGPTChatTab
-                    }),
-                        let chatTab = chatTabPool.getTab(of: info.id) as? ChatGPTChatTab
-                    {
-                        state.chatTabGroup.selectedTabId = chatTab.id
-                        return .run { send in
-                            await send(.openChatPanel(forceDetach: false, activateThisApp: false))
-                            await stopAndHandleCommand(chatTab)
+                    for info in state.chatTabGroup.tabInfo {
+                        if let chatTab = chatTabPool.getTab(of: info.id),
+                           chatTab.handleCustomCommand(command)
+                        {
+                            state.chatTabGroup.selectedTabId = chatTab.id
+                            return .run { send in
+                                await send(.openChatPanel(
+                                    forceDetach: false,
+                                    activateThisApp: false
+                                ))
+                            }
                         }
                     }
 
@@ -220,9 +215,7 @@ struct GUI {
                         else { return }
                         await send(.suggestionWidget(.chatPanel(.appendAndSelectTab(chatTabInfo))))
                         await send(.openChatPanel(forceDetach: false, activateThisApp: false))
-                        if let chatTab = chatTab as? ChatGPTChatTab {
-                            await stopAndHandleCommand(chatTab)
-                        }
+                        _ = chatTab.handleCustomCommand(command)
                     }
 
                 case .toggleWidgetsHotkeyPressed:

Tool/Sources/ChatTab/ChatTab.swift

@@ -1,4 +1,5 @@
 import ComposableArchitecture
+import Preferences
 import Foundation
 import SwiftUI
 
@@ -49,6 +50,8 @@ public protocol ChatTabType {
     func start()
     /// Whenever the user close the tab, this method will be called.
     func close()
+    /// Handle custom command.
+    func handleCustomCommand(_ customCommand: CustomCommand) -> Bool
 
     /// Whether this chat tab should be the default chat tab replacement.
     static var isDefaultChatTabReplacement: Bool { get }
@@ -180,6 +183,9 @@ public extension ChatTabType {
     /// Default implementation that does nothing.
     func close() {}
 
+    /// By default it can't handle custom command.
+    func handleCustomCommand(_ customCommand: CustomCommand) -> Bool { false }
+    
     static var canHandleOpenChatCommand: Bool { false }
     static var isDefaultChatTabReplacement: Bool { false }
     static func defaultChatBuilder() -> ChatTabBuilder {