Merge branch 'feature/custom-open-chat' into develop

Author: intitni

Copilot for Xcode.xcodeproj/project.pbxproj

@@ -53,7 +53,7 @@
 		C882175C294187EF00A22FD3 /* Client in Frameworks */ = {isa = PBXBuildFile; productRef = C882175B294187EF00A22FD3 /* Client */; };
 		C89E75C32A46FB32000DD64F /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89E75C22A46FB32000DD64F /* AppDelegate+Menu.swift */; };
 		C8C8B60929AFA35F00034BEE /* CopilotForXcodeExtensionService.app in Embed XPCService */ = {isa = PBXBuildFile; fileRef = C861E60E2994F6070056CB02 /* CopilotForXcodeExtensionService.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		C8DCF00029CE11D500FDDDD7 /* ChatWithSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DCEFFF29CE11D500FDDDD7 /* ChatWithSelection.swift */; };
+		C8DCF00029CE11D500FDDDD7 /* OpenChat.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DCEFFF29CE11D500FDDDD7 /* OpenChat.swift */; };
 		C8DD9CB12BC673F80036641C /* CloseIdleTabsCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DD9CB02BC673F80036641C /* CloseIdleTabsCommand.swift */; };
 /* End PBXBuildFile section */
 
@@ -236,7 +236,7 @@
 		C887BC832965D96000931567 /* DEVELOPMENT.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = DEVELOPMENT.md; sourceTree = "<group>"; };
 		C89E75C22A46FB32000DD64F /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = "<group>"; };
 		C8CD828229B88006008D044D /* TestPlan.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = TestPlan.xctestplan; sourceTree = "<group>"; };
-		C8DCEFFF29CE11D500FDDDD7 /* ChatWithSelection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatWithSelection.swift; sourceTree = "<group>"; };
+		C8DCEFFF29CE11D500FDDDD7 /* OpenChat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenChat.swift; sourceTree = "<group>"; };
 		C8DD9CB02BC673F80036641C /* CloseIdleTabsCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloseIdleTabsCommand.swift; sourceTree = "<group>"; };
 		C8F103292A7A365000D28F4F /* launchAgent.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = launchAgent.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -320,7 +320,7 @@
 				C8009C022941C576007AA7E8 /* RealtimeSuggestionCommand.swift */,
 				C800DBB0294C624D00B04CAC /* PrefetchSuggestionsCommand.swift */,
 				C8758E6F29F04BFF00D29C1C /* CustomCommand.swift */,
-				C8DCEFFF29CE11D500FDDDD7 /* ChatWithSelection.swift */,
+				C8DCEFFF29CE11D500FDDDD7 /* OpenChat.swift */,
 				C8DD9CB02BC673F80036641C /* CloseIdleTabsCommand.swift */,
 				C861A6A229E5503F005C41A3 /* PromptToCodeCommand.swift */,
 				C81458972939EFDC00135263 /* Info.plist */,
@@ -675,7 +675,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C8DCF00029CE11D500FDDDD7 /* ChatWithSelection.swift in Sources */,
+				C8DCF00029CE11D500FDDDD7 /* OpenChat.swift in Sources */,
 				C81458942939EFDC00135263 /* SourceEditorExtension.swift in Sources */,
 				C8DD9CB12BC673F80036641C /* CloseIdleTabsCommand.swift in Sources */,
 				C8758E7029F04BFF00D29C1C /* CustomCommand.swift in Sources */,

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/HostApp/FeatureSettings/Chat/ChatSettingsGeneralSectionView.swift

@@ -28,6 +28,9 @@ struct ChatSettingsGeneralSectionView: View {
         @AppStorage(
             \.disableFloatOnTopWhenTheChatPanelIsDetached
         ) var disableFloatOnTopWhenTheChatPanelIsDetached
+        @AppStorage(\.openChatMode) var openChatMode
+        @AppStorage(\.openChatInBrowserURL) var openChatInBrowserURL
+        @AppStorage(\.openChatInBrowserInInAppBrowser) var openChatInBrowserInInAppBrowser
 
         init() {}
     }
@@ -39,6 +42,8 @@ struct ChatSettingsGeneralSectionView: View {
 
     var body: some View {
         VStack {
+            openChatSettingsForm
+            SettingsDivider("Conversation")
             chatSettingsForm
             SettingsDivider("UI")
             uiForm
@@ -47,6 +52,45 @@ struct ChatSettingsGeneralSectionView: View {
         }
     }
 
+    @ViewBuilder
+    var openChatSettingsForm: some View {
+        Form {
+            Picker(
+                "Open Chat Mode",
+                selection: $settings.openChatMode
+            ) {
+                ForEach(OpenChatMode.allCases, id: \.rawValue) { mode in
+                    switch mode {
+                    case .chatPanel:
+                        Text("Open chat panel").tag(mode)
+                    case .browser:
+                        Text("Open web page in browser").tag(mode)
+                    }
+                }
+            }
+
+            if settings.openChatMode == .browser {
+                TextField(
+                    "Chat web page URL",
+                    text: $settings.openChatInBrowserURL, 
+                    prompt: Text("https://")
+                )
+                .textFieldStyle(.roundedBorder)
+                .disableAutocorrection(true)
+                .autocorrectionDisabled(true)
+
+                #if canImport(ProHostApp)
+                WithFeatureEnabled(\.browserTab) {
+                    Toggle(
+                        "Open web page in chat panel",
+                        isOn: $settings.openChatInBrowserInInAppBrowser
+                    )
+                }
+                #endif
+            }
+        }
+    }
+
     @ViewBuilder
     var chatSettingsForm: some View {
         Form {

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))
             }
         }
@@ -337,10 +396,7 @@ public final class GraphicalUserInterfaceController {
     }
 
     public func openGlobalChat() {
-        Task {
-            await self.store.send(.createChatGPTChatTabIfNeeded).finish()
-            store.send(.openChatPanel(forceDetach: true))
-        }
+        PseudoCommandHandler().openChat(forceDetach: true)
     }
 }
 

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -1,5 +1,7 @@
 import ActiveApplicationMonitor
 import AppKit
+import Dependencies
+import PlusFeatureFlag
 import Preferences
 import SuggestionInjector
 import SuggestionModel
@@ -210,7 +212,13 @@ struct PseudoCommandHandler {
             guard let focusElement = application.focusedElement,
                   focusElement.description == "Source Editor"
             else { return }
-            guard let (content, lines, _, cursorPosition, cursorOffset) = await getFileContent(sourceEditor: nil)
+            guard let (
+                content,
+                lines,
+                _,
+                cursorPosition,
+                cursorOffset
+            ) = await getFileContent(sourceEditor: nil)
             else {
                 PresentInWindowSuggestionPresenter()
                     .presentErrorMessage("Unable to get file content.")
@@ -266,7 +274,13 @@ struct PseudoCommandHandler {
             guard let focusElement = application.focusedElement,
                   focusElement.description == "Source Editor"
             else { return }
-            guard let (content, lines, _, cursorPosition, cursorOffset) = await getFileContent(sourceEditor: nil)
+            guard let (
+                content,
+                lines,
+                _,
+                cursorPosition,
+                cursorOffset
+            ) = await getFileContent(sourceEditor: nil)
             else {
                 PresentInWindowSuggestionPresenter()
                     .presentErrorMessage("Unable to get file content.")
@@ -301,6 +315,46 @@ struct PseudoCommandHandler {
         await filespace.reset()
         PresentInWindowSuggestionPresenter().discardSuggestion(fileURL: documentURL)
     }
+
+    func openChat(forceDetach: Bool) {
+        switch UserDefaults.shared.value(for: \.openChatMode) {
+        case .chatPanel:
+            let store = Service.shared.guiController.store
+            Task { @MainActor in
+                await store.send(.createAndSwitchToChatGPTChatTabIfNeeded).finish()
+                store.send(.openChatPanel(forceDetach: false))
+            }
+        case .browser:
+            let urlString = UserDefaults.shared.value(for: \.openChatInBrowserURL)
+            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"
+                alert.informativeText = "The URL provided is not valid."
+                alert.alertStyle = .warning
+                alert.runModal()
+                return
+            }
+
+            if openInApp {
+                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
+                    await openURL(url)
+                }
+            }
+        }
+    }
 }
 
 extension PseudoCommandHandler {

Core/Sources/Service/SuggestionCommandHandler/SuggestionCommandHandler.swift

@@ -19,8 +19,6 @@ protocol SuggestionCommandHandler {
     @ServiceActor
     func generateRealtimeSuggestions(editor: EditorContent) async throws -> UpdatedContent?
     @ServiceActor
-    func chatWithSelection(editor: EditorContent) async throws -> UpdatedContent?
-    @ServiceActor
     func promptToCode(editor: EditorContent) async throws -> UpdatedContent?
     @ServiceActor
     func customCommand(id: String, editor: EditorContent) async throws -> UpdatedContent?

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -262,15 +262,6 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
         return try await presentSuggestions(editor: editor)
     }
 
-    func chatWithSelection(editor: EditorContent) async throws -> UpdatedContent? {
-        Task { @MainActor in
-            let store = Service.shared.guiController.store
-            store.send(.createChatGPTChatTabIfNeeded)
-            store.send(.openChatPanel(forceDetach: false))
-        }
-        return nil
-    }
-
     func promptToCode(editor: EditorContent) async throws -> UpdatedContent? {
         Task {
             do {

Core/Sources/Service/XPCService.swift

@@ -140,13 +140,13 @@ public class XPCService: NSObject, XPCServiceProtocol {
         }
     }
 
-    public func chatWithSelection(
+    public func openChat(
         editorContent: Data,
         withReply reply: @escaping (Data?, Error?) -> Void
     ) {
-        replyWithUpdatedContent(editorContent: editorContent, withReply: reply) { handler, editor in
-            try await handler.chatWithSelection(editor: editor)
-        }
+        let handler = PseudoCommandHandler()
+        handler.openChat(forceDetach: false)
+        reply(nil, nil)
     }
 
     public func promptToCode(

EditorExtension/ChatWithSelection.swift EditorExtension/OpenChat.swiftEditorExtension/ChatWithSelection.swift renamed to EditorExtension/OpenChat.swift

@@ -3,7 +3,7 @@ import SuggestionModel
 import Foundation
 import XcodeKit
 
-class ChatWithSelectionCommand: NSObject, XCSourceEditorCommand, CommandType {
+class OpenChatCommand: NSObject, XCSourceEditorCommand, CommandType {
     var name: String { "Open Chat" }
 
     func perform(
@@ -13,7 +13,7 @@ class ChatWithSelectionCommand: NSObject, XCSourceEditorCommand, CommandType {
         completionHandler(nil)
         Task {
             let service = try getService()
-            _ = try await service.chatWithSelection(editorContent: .init(invocation))
+            _ = try await service.openChat(editorContent: .init(invocation))
         }
     }
 }

EditorExtension/SourceEditorExtension.swift

@@ -17,7 +17,7 @@ class SourceEditorExtension: NSObject, XCSourceEditorExtension {
             PreviousSuggestionCommand(),
             PromptToCodeCommand(),
             AcceptPromptToCodeCommand(),
-            ChatWithSelectionCommand(),
+            OpenChatCommand(),
         ].map(makeCommandDefinition)
     }