Tweak the behavior of activating the app on chat

intitni · intitni · commit 2a36d2e331b9 · 2024-07-18T23:38:04.000+08:00
diff --git a/Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift b/Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift
@@ -55,7 +55,7 @@ struct GUI {
 
     enum Action {
         case start
-        case openChatPanel(forceDetach: Bool)
+        case openChatPanel(forceDetach: Bool, activateThisApp: Bool)
         case createAndSwitchToChatGPTChatTabIfNeeded
         case createAndSwitchToChatTabIfNeededMatching(
             check: (any ChatTab) -> Bool,
@@ -138,7 +138,7 @@ struct GUI {
                     return .none
                     #endif
 
-                case let .openChatPanel(forceDetach):
+                case let .openChatPanel(forceDetach, activate):
                     return .run { send in
                         await send(
                             .suggestionWidget(
@@ -147,7 +147,9 @@ struct GUI {
                         )
                         await send(.suggestionWidget(.updateKeyWindow(.chatPanel)))
 
-                        activateThisApp()
+                        if activate {
+                            activateThisApp()
+                        }
                     }
 
                 case .createAndSwitchToChatGPTChatTabIfNeeded:
@@ -199,7 +201,7 @@ struct GUI {
                        let activeTab = chatTabPool.getTab(of: info.id) as? ChatGPTChatTab
                     {
                         return .run { send in
-                            await send(.openChatPanel(forceDetach: false))
+                            await send(.openChatPanel(forceDetach: false, activateThisApp: false))
                             await stopAndHandleCommand(activeTab)
                         }
                     }
@@ -211,7 +213,7 @@ struct GUI {
                     {
                         state.chatTabGroup.selectedTabId = chatTab.id
                         return .run { send in
-                            await send(.openChatPanel(forceDetach: false))
+                            await send(.openChatPanel(forceDetach: false, activateThisApp: false))
                             await stopAndHandleCommand(chatTab)
                         }
                     }
@@ -220,7 +222,7 @@ struct GUI {
                         guard let (chatTab, chatTabInfo) = await chatTabPool.createTab(for: nil)
                         else { return }
                         await send(.suggestionWidget(.chatPanel(.appendAndSelectTab(chatTabInfo))))
-                        await send(.openChatPanel(forceDetach: false))
+                        await send(.openChatPanel(forceDetach: false, activateThisApp: false))
                         if let chatTab = chatTab as? ChatGPTChatTab {
                             await stopAndHandleCommand(chatTab)
                         }
@@ -347,7 +349,7 @@ public final class GraphicalUserInterfaceController {
         suggestionDependency.onOpenChatClicked = { [weak self] in
             Task { [weak self] in
                 await self?.store.send(.createAndSwitchToChatGPTChatTabIfNeeded).finish()
-                self?.store.send(.openChatPanel(forceDetach: false))
+                self?.store.send(.openChatPanel(forceDetach: false, activateThisApp: true))
             }
         }
         suggestionDependency.onCustomCommandClicked = { command in
diff --git a/Core/Sources/Service/GlobalShortcutManager.swift b/Core/Sources/Service/GlobalShortcutManager.swift
@@ -28,7 +28,7 @@ final class GlobalShortcutManager {
                !guiController.store.state.suggestionWidgetState.chatPanelState.isPanelDisplayed,
                UserDefaults.shared.value(for: \.showHideWidgetShortcutGlobally)
             {
-                guiController.store.send(.openChatPanel(forceDetach: true))
+                guiController.store.send(.openChatPanel(forceDetach: true, activateThisApp: true))
             } else {
                 guiController.store.send(.toggleWidgetsHotkeyPressed)
             }
diff --git a/Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift
@@ -332,13 +332,16 @@ struct PseudoCommandHandler: CommandHandler {
         await filespace.reset()
     }
 
-    func openChat(forceDetach: Bool) {
+    func openChat(forceDetach: Bool, activateThisApp: Bool = true) {
         switch UserDefaults.shared.value(for: \.openChatMode) {
         case .chatPanel:
             Task { @MainActor in
                 let store = Service.shared.guiController.store
                 await store.send(.createAndSwitchToChatGPTChatTabIfNeeded).finish()
-                store.send(.openChatPanel(forceDetach: forceDetach))
+                store.send(.openChatPanel(
+                    forceDetach: forceDetach,
+                    activateThisApp: activateThisApp
+                ))
             }
         case .browser:
             let urlString = UserDefaults.shared.value(for: \.openChatInBrowserURL)
@@ -375,7 +378,10 @@ struct PseudoCommandHandler: CommandHandler {
                         },
                         kind: .init(BrowserChatTab.urlChatBuilder(url: url))
                     )).finish()
-                    store.send(.openChatPanel(forceDetach: forceDetach))
+                    store.send(.openChatPanel(
+                        forceDetach: forceDetach,
+                        activateThisApp: activateThisApp
+                    ))
                 }
                 #endif
             } else {
@@ -393,13 +399,17 @@ struct PseudoCommandHandler: CommandHandler {
                         kind: .init(CodeiumChatTab.defaultChatBuilder())
                     )
                 ).finish()
-                store.send(.openChatPanel(forceDetach: forceDetach))
+                store.send(.openChatPanel(
+                    forceDetach: forceDetach,
+                    activateThisApp: activateThisApp
+                ))
             }
         }
     }
 
+    @MainActor
     func sendChatMessage(_ message: String) async {
-        let store = await Service.shared.guiController.store
+        let store = Service.shared.guiController.store
         await store.send(.sendCustomCommandToActiveChat(CustomCommand(
             commandId: "",
             name: "",
diff --git a/Core/Sources/Service/SuggestionPresenter/PresentInWindowSuggestionPresenter.swift b/Core/Sources/Service/SuggestionPresenter/PresentInWindowSuggestionPresenter.swift
@@ -42,17 +42,10 @@ struct PresentInWindowSuggestionPresenter {
         }
     }
 
-    func closeChatRoom(fileURL: URL) {
-        Task { @MainActor in
-            let controller = Service.shared.guiController.widgetController
-            controller.closeChatRoom()
-        }
-    }
-
     func presentChatRoom(fileURL: URL) {
         Task { @MainActor in
-            let controller = Service.shared.guiController.widgetController
-            controller.presentChatRoom()
+            let controller = Service.shared.guiController
+            controller.store.send(.openChatPanel(forceDetach: false, activateThisApp: true))
         }
     }
 }
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/ChatPanelFeature.swift b/Core/Sources/SuggestionWidget/FeatureReducers/ChatPanelFeature.swift
@@ -166,7 +166,6 @@ public struct ChatPanelFeature {
                             .chatPanelWindow
                             .centerInActiveSpaceIfNeeded()
                     }
-                    activateExtensionService()
                     await send(.focusActiveChatTab)
                 }
 
diff --git a/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift b/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift
@@ -70,17 +70,5 @@ public extension SuggestionWidgetController {
     func presentError(_ errorDescription: String) {
         store.send(.toastPanel(.toast(.toast(errorDescription, .error, nil))))
     }
-
-    func presentChatRoom() {
-        store.send(.chatPanel(.presentChatPanel(forceDetach: false)))
-    }
-
-    func presentDetachedGlobalChat() {
-        store.send(.chatPanel(.presentChatPanel(forceDetach: true)))
-    }
-
-    func closeChatRoom() {
-//        store.send(.chatPanel(.closeChatPanel))
-    }
 }
 
diff --git a/Tool/Sources/CommandHandler/CommandHandler.swift b/Tool/Sources/CommandHandler/CommandHandler.swift
@@ -19,7 +19,7 @@ public protocol CommandHandler {
 
     // MARK: Chat
 
-    func openChat(forceDetach: Bool)
+    func openChat(forceDetach: Bool, activateThisApp: Bool)
     func sendChatMessage(_ message: String) async
 
     // MARK: Prompt to Code
@@ -86,8 +86,8 @@ public final class UniversalCommandHandler: CommandHandler {
         await commandHandler.generateRealtimeSuggestions(sourceEditor: sourceEditor)
     }
 
-    public func openChat(forceDetach: Bool) {
-        commandHandler.openChat(forceDetach: forceDetach)
+    public func openChat(forceDetach: Bool, activateThisApp: Bool) {
+        commandHandler.openChat(forceDetach: forceDetach, activateThisApp: activateThisApp)
     }
 
     public func sendChatMessage(_ message: String) async {
@@ -115,7 +115,7 @@ struct NoopCommandHandler: CommandHandler {
     func acceptSuggestion() async {}
     func dismissSuggestion() async {}
     func generateRealtimeSuggestions(sourceEditor: SourceEditor?) async {}
-    func openChat(forceDetach: Bool) {}
+    func openChat(forceDetach: Bool, activateThisApp: Bool) {}
     func sendChatMessage(_: String) async {}
     func acceptPromptToCode() async {}
     func handleCustomCommand(_: CustomCommand) async {}

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ struct GUI {`
`55`	`55`
`56`	`56`	`enum Action {`
`57`	`57`	`case start`
`58`		`- case openChatPanel(forceDetach: Bool)`
	`58`	`+ case openChatPanel(forceDetach: Bool, activateThisApp: Bool)`
`59`	`59`	`case createAndSwitchToChatGPTChatTabIfNeeded`
`60`	`60`	`case createAndSwitchToChatTabIfNeededMatching(`
`61`	`61`	`check: (any ChatTab) -> Bool,`
`@@ -138,7 +138,7 @@ struct GUI {`
`138`	`138`	`return .none`
`139`	`139`	`#endif`
`140`	`140`
`141`		`- case let .openChatPanel(forceDetach):`
	`141`	`+ case let .openChatPanel(forceDetach, activate):`
`142`	`142`	`return .run { send in`
`143`	`143`	`await send(`
`144`	`144`	`.suggestionWidget(`
`@@ -147,7 +147,9 @@ struct GUI {`
`147`	`147`	`)`
`148`	`148`	`await send(.suggestionWidget(.updateKeyWindow(.chatPanel)))`
`149`	`149`
`150`		`- activateThisApp()`
	`150`	`+ if activate {`
	`151`	`+ activateThisApp()`
	`152`	`+ }`
`151`	`153`	`}`
`152`	`154`
`153`	`155`	`case .createAndSwitchToChatGPTChatTabIfNeeded:`
`@@ -199,7 +201,7 @@ struct GUI {`
`199`	`201`	`let activeTab = chatTabPool.getTab(of: info.id) as? ChatGPTChatTab`
`200`	`202`	`{`
`201`	`203`	`return .run { send in`
`202`		`- await send(.openChatPanel(forceDetach: false))`
	`204`	`+ await send(.openChatPanel(forceDetach: false, activateThisApp: false))`
`203`	`205`	`await stopAndHandleCommand(activeTab)`
`204`	`206`	`}`
`205`	`207`	`}`
`@@ -211,7 +213,7 @@ struct GUI {`
`211`	`213`	`{`
`212`	`214`	`state.chatTabGroup.selectedTabId = chatTab.id`
`213`	`215`	`return .run { send in`
`214`		`- await send(.openChatPanel(forceDetach: false))`
	`216`	`+ await send(.openChatPanel(forceDetach: false, activateThisApp: false))`
`215`	`217`	`await stopAndHandleCommand(chatTab)`
`216`	`218`	`}`
`217`	`219`	`}`
`@@ -220,7 +222,7 @@ struct GUI {`
`220`	`222`	`guard let (chatTab, chatTabInfo) = await chatTabPool.createTab(for: nil)`
`221`	`223`	`else { return }`
`222`	`224`	`await send(.suggestionWidget(.chatPanel(.appendAndSelectTab(chatTabInfo))))`
`223`		`- await send(.openChatPanel(forceDetach: false))`
	`225`	`+ await send(.openChatPanel(forceDetach: false, activateThisApp: false))`
`224`	`226`	`if let chatTab = chatTab as? ChatGPTChatTab {`
`225`	`227`	`await stopAndHandleCommand(chatTab)`
`226`	`228`	`}`
`@@ -347,7 +349,7 @@ public final class GraphicalUserInterfaceController {`
`347`	`349`	`suggestionDependency.onOpenChatClicked = { [weak self] in`
`348`	`350`	`Task { [weak self] in`
`349`	`351`	`await self?.store.send(.createAndSwitchToChatGPTChatTabIfNeeded).finish()`
`350`		`- self?.store.send(.openChatPanel(forceDetach: false))`
	`352`	`+ self?.store.send(.openChatPanel(forceDetach: false, activateThisApp: true))`
`351`	`353`	`}`
`352`	`354`	`}`
`353`	`355`	`suggestionDependency.onCustomCommandClicked = { command in`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ final class GlobalShortcutManager {`
`28`	`28`	`!guiController.store.state.suggestionWidgetState.chatPanelState.isPanelDisplayed,`
`29`	`29`	`UserDefaults.shared.value(for: \.showHideWidgetShortcutGlobally)`
`30`	`30`	`{`
`31`		`- guiController.store.send(.openChatPanel(forceDetach: true))`
	`31`	`+ guiController.store.send(.openChatPanel(forceDetach: true, activateThisApp: true))`
`32`	`32`	`} else {`
`33`	`33`	`guiController.store.send(.toggleWidgetsHotkeyPressed)`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,17 +42,10 @@ struct PresentInWindowSuggestionPresenter {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`- func closeChatRoom(fileURL: URL) {`
`46`		`- Task { @MainActor in`
`47`		`- let controller = Service.shared.guiController.widgetController`
`48`		`- controller.closeChatRoom()`
`49`		`- }`
`50`		`- }`
`51`		`-`
`52`	`45`	`func presentChatRoom(fileURL: URL) {`
`53`	`46`	`Task { @MainActor in`
`54`		`- let controller = Service.shared.guiController.widgetController`
`55`		`- controller.presentChatRoom()`
	`47`	`+ let controller = Service.shared.guiController`
	`48`	`+ controller.store.send(.openChatPanel(forceDetach: false, activateThisApp: true))`
`56`	`49`	`}`
`57`	`50`	`}`
`58`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,6 @@ public struct ChatPanelFeature {`
`166`	`166`	`.chatPanelWindow`
`167`	`167`	`.centerInActiveSpaceIfNeeded()`
`168`	`168`	`}`
`169`		`- activateExtensionService()`
`170`	`169`	`await send(.focusActiveChatTab)`
`171`	`170`	`}`
`172`	`171`