Support opening chat web page in chat tab

Author: intitni

Core/Package.swift

@@ -126,6 +126,7 @@ let package = Package(
                 "PromptToCodeService",
                 "ServiceUpdateMigration",
                 "ChatGPTChatTab",
+                "PlusFeatureFlag",
                 .product(name: "XPCShared", package: "Tool"),
                 .product(name: "SuggestionProvider", package: "Tool"),
                 .product(name: "Workspace", package: "Tool"),

Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift

@@ -55,7 +55,8 @@ struct GUI {
     enum Action {
         case start
         case openChatPanel(forceDetach: Bool)
-        case createChatGPTChatTabIfNeeded
+        case createAndSwitchToChatGPTChatTabIfNeeded
+        case createAndSwitchToBrowserTabIfNeeded(url: URL)
         case sendCustomCommandToActiveChat(CustomCommand)
         case toggleWidgetsHotkeyPressed
 
@@ -145,11 +146,22 @@ struct GUI {
                         activateThisApp()
                     }
 
-                case .createChatGPTChatTabIfNeeded:
-                    if state.chatTabGroup.tabInfo.contains(where: {
+                case .createAndSwitchToChatGPTChatTabIfNeeded:
+                    if let selectedTabInfo = state.chatTabGroup.selectedTabInfo,
+                       chatTabPool.getTab(of: selectedTabInfo.id) is ChatGPTChatTab
+                    {
+                        // Already in ChatGPT tab
+                        return .none
+                    }
+
+                    if let firstChatGPTTabInfo = state.chatTabGroup.tabInfo.first(where: {
                         chatTabPool.getTab(of: $0.id) is ChatGPTChatTab
                     }) {
-                        return .none
+                        return .run { send in
+                            await send(.suggestionWidget(.chatPanel(.tabClicked(
+                                id: firstChatGPTTabInfo.id
+                            ))))
+                        }
                     }
                     return .run { send in
                         if let (_, chatTabInfo) = await chatTabPool.createTab(for: nil) {
@@ -159,6 +171,53 @@ struct GUI {
                         }
                     }
 
+                case let .createAndSwitchToBrowserTabIfNeeded(url):
+                    #if canImport(BrowserChatTab)
+                    func match(_ tabURL: URL?) -> Bool {
+                        guard let tabURL else { return false }
+                        return tabURL == url
+                            || tabURL.absoluteString.hasPrefix(url.absoluteString)
+                    }
+
+                    if let selectedTabInfo = state.chatTabGroup.selectedTabInfo,
+                       let tab = chatTabPool.getTab(of: selectedTabInfo.id) as? BrowserChatTab,
+                       match(tab.url)
+                    {
+                        // Already in the target Browser tab
+                        return .none
+                    }
+
+                    if let firstChatGPTTabInfo = state.chatTabGroup.tabInfo.first(where: {
+                        guard let tab = chatTabPool.getTab(of: $0.id) as? BrowserChatTab,
+                              match(tab.url)
+                        else { return false }
+                        return true
+                    }) {
+                        return .run { send in
+                            await send(.suggestionWidget(.chatPanel(.tabClicked(
+                                id: firstChatGPTTabInfo.id
+                            ))))
+                        }
+                    }
+
+                    return .run { send in
+                        if let (_, chatTabInfo) = await chatTabPool.createTab(
+                            for: .init(BrowserChatTab.urlChatBuilder(
+                                url: url,
+                                externalDependency: ChatTabFactory
+                                    .externalDependenciesForBrowserChatTab()
+                            ))
+                        ) {
+                            await send(
+                                .suggestionWidget(.chatPanel(.appendAndSelectTab(chatTabInfo)))
+                            )
+                        }
+                    }
+
+                    #else
+                    return .none
+                    #endif
+
                 case let .sendCustomCommandToActiveChat(command):
                     @Sendable func stopAndHandleCommand(_ tab: ChatGPTChatTab) async {
                         if tab.service.isReceivingMessage {
@@ -320,7 +379,7 @@ public final class GraphicalUserInterfaceController {
         suggestionDependency.suggestionWidgetDataSource = widgetDataSource
         suggestionDependency.onOpenChatClicked = { [weak self] in
             Task { [weak self] in
-                await self?.store.send(.createChatGPTChatTabIfNeeded).finish()
+                await self?.store.send(.createAndSwitchToChatGPTChatTabIfNeeded).finish()
                 self?.store.send(.openChatPanel(forceDetach: false))
             }
         }

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -1,6 +1,7 @@
 import ActiveApplicationMonitor
 import AppKit
 import Dependencies
+import PlusFeatureFlag
 import Preferences
 import SuggestionInjector
 import SuggestionModel
@@ -318,14 +319,19 @@ struct PseudoCommandHandler {
     func openChat(forceDetach: Bool) {
         switch UserDefaults.shared.value(for: \.openChatMode) {
         case .chatPanel:
+            let store = Service.shared.guiController.store
             Task { @MainActor in
-                let store = Service.shared.guiController.store
-                await store.send(.createChatGPTChatTabIfNeeded).finish()
+                await store.send(.createAndSwitchToChatGPTChatTabIfNeeded).finish()
                 store.send(.openChatPanel(forceDetach: false))
             }
         case .browser:
             let urlString = UserDefaults.shared.value(for: \.openChatInBrowserURL)
-            let openInApp = UserDefaults.shared.value(for: \.openChatInBrowserInInAppBrowser)
+            let openInApp = {
+                if !UserDefaults.shared.value(for: \.openChatInBrowserInInAppBrowser) {
+                    return false
+                }
+                return isFeatureAvailable(\.browserTab)
+            }()
             guard let url = URL(string: urlString) else {
                 let alert = NSAlert()
                 alert.messageText = "Invalid URL"
@@ -336,7 +342,11 @@ struct PseudoCommandHandler {
             }
 
             if openInApp {
-                return
+                let store = Service.shared.guiController.store
+                Task { @MainActor in
+                    await store.send(.createAndSwitchToBrowserTabIfNeeded(url: url)).finish()
+                    store.send(.openChatPanel(forceDetach: false))
+                }
             } else {
                 Task {
                     @Dependency(\.openURL) var openURL