Update open mode to better handle builtin extensions

Author: intitni

Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift

@@ -373,7 +373,14 @@ extension ChatTabPool {
     ) async -> (any ChatTab, ChatTabInfo)? {
         let id = UUID().uuidString
         let info = ChatTabInfo(id: id, title: "")
-        let builder = kind?.builder ?? ChatGPTChatTab.defaultBuilder()
+        let builder = kind?.builder ?? {
+            for ext in BuiltinExtensionManager.shared.extensions {
+                guard let tab = ext.chatTabTypes.first(where: { $0.isDefaultChatTabReplacement } )
+                else { continue }
+                return tab.defaultChatBuilder()
+            }
+            return ChatGPTChatTab.defaultBuilder()
+        }()
         guard let chatTap = await builder.build(store: createStore(id)) else { return nil }
         setTab(chatTap)
         return (chatTap, info)

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -1,5 +1,6 @@
 import ActiveApplicationMonitor
 import AppKit
+import BuiltinExtension
 import CodeiumService
 import CommandHandler
 import enum CopilotForXcodeKit.SuggestionServiceError
@@ -218,12 +219,12 @@ struct PseudoCommandHandler: CommandHandler {
                     if now.timeIntervalSince(last) > 60 * 60 {
                         Self.lastTimeCommandFailedToTriggerWithAccessibilityAPI = now
                         toast.toast(content: """
-                    The app is using a fallback solution to accept suggestions. \
-                    For better experience, please restart Xcode to re-activate the Copilot \
-                    menu item.
-                    """, type: .warning)
+                        The app is using a fallback solution to accept suggestions. \
+                        For better experience, please restart Xcode to re-activate the Copilot \
+                        menu item.
+                        """, type: .warning)
                     }
-                    
+
                     throw error
                 }
             }
@@ -340,6 +341,24 @@ struct PseudoCommandHandler: CommandHandler {
     func openChat(forceDetach: Bool, activateThisApp: Bool = true) {
         switch UserDefaults.shared.value(for: \.openChatMode) {
         case .chatPanel:
+            for ext in BuiltinExtensionManager.shared.extensions {
+                guard let tab = ext.chatTabTypes.first(where: { $0.isDefaultChatTabReplacement } )
+                else { continue }
+                Task { @MainActor in
+                    let store = Service.shared.guiController.store
+                    await store.send(
+                        .createAndSwitchToChatTabIfNeededMatching(
+                            check: { $0.name == tab.name },
+                            kind: .init(tab.defaultChatBuilder())
+                        )
+                    ).finish()
+                    store.send(.openChatPanel(
+                        forceDetach: forceDetach,
+                        activateThisApp: activateThisApp
+                    ))
+                }
+                return
+            }
             Task { @MainActor in
                 let store = Service.shared.guiController.store
                 await store.send(.createAndSwitchToChatGPTChatTabIfNeeded).finish()
@@ -395,20 +414,26 @@ struct PseudoCommandHandler: CommandHandler {
                     await openURL(url)
                 }
             }
-        case .codeiumChat:
+        case let .builtinExtension(extensionIdentifier, tabName):
+            guard let ext = BuiltinExtensionManager.shared.extensions
+                .first(where: { $0.extensionIdentifier == extensionIdentifier }),
+                let tab = ext.chatTabTypes.first(where: { $0.name == tabName })
+            else { return }
             Task { @MainActor in
                 let store = Service.shared.guiController.store
                 await store.send(
                     .createAndSwitchToChatTabIfNeededMatching(
-                        check: { $0 is CodeiumChatTab },
-                        kind: .init(CodeiumChatTab.defaultChatBuilder())
+                        check: { $0.name == tabName },
+                        kind: .init(tab.defaultChatBuilder())
                     )
                 ).finish()
                 store.send(.openChatPanel(
                     forceDetach: forceDetach,
                     activateThisApp: activateThisApp
                 ))
             }
+        case let .externalExtension(extensionIdentifier, tabName):
+            return
         }
     }
 

Tool/Sources/ChatTab/ChatTab.swift

@@ -37,6 +37,8 @@ public protocol ChatTabType {
     /// Available builders for this chat tab.
     /// It's used to generate a list of tab types for user to create.
     static func chatBuilders() -> [ChatTabBuilder]
+    /// The default chat tab builder to be used in open chat
+    static func defaultChatBuilder() -> ChatTabBuilder
     /// Restorable state
     func restorableState() async -> Data
     /// Restore state
@@ -179,6 +181,9 @@ public extension ChatTabType {
 
     static var canHandleOpenChatCommand: Bool { false }
     static var isDefaultChatTabReplacement: Bool { false }
+    static func defaultChatBuilder() -> ChatTabBuilder {
+        DisabledChatTabBuilder(title: name)
+    }
 }
 
 /// A chat tab that does nothing.

Tool/Sources/Preferences/Keys.swift

@@ -518,7 +518,11 @@ public extension UserDefaultPreferenceKeys {
         .init(defaultValue: true, key: "KeepFloatOnTopIfChatPanelAndXcodeOverlaps")
     }
 
-    var openChatMode: PreferenceKey<OpenChatMode> {
+    var openChatMode: PreferenceKey<UserDefaultsStorageBox<OpenChatMode>> {
+        .init(defaultValue: .init(.chatPanel), key: "DefaultOpenChatMode")
+    }
+    
+    var legacyOpenChatMode: DeprecatedPreferenceKey<OpenChatMode.LegacyOpenChatMode> {
         .init(defaultValue: .chatPanel, key: "OpenChatMode")
     }
 

Tool/Sources/Preferences/Types/OpenChatMode.swift

@@ -1,7 +1,14 @@
 import Foundation
 
-public enum OpenChatMode: String, CaseIterable {
+public enum OpenChatMode: Codable, Equatable {
+    public enum LegacyOpenChatMode: String {
+        case chatPanel
+        case browser
+        case codeiumChat
+    }
+    
     case chatPanel
     case browser
-    case codeiumChat
+    case builtinExtension(extensionIdentifier: String, tabName: String)
+    case externalExtension(extensionIdentifier: String, tabName: String)
 }

Tool/Sources/Preferences/UserDefaults.swift

@@ -51,6 +51,20 @@ public extension UserDefaults {
                 weight: .regular
             )))
         )
+        shared.setupDefaultValue(
+            for: \.openChatMode,
+            defaultValue: {
+                switch shared.deprecatedValue(for: \.legacyOpenChatMode) {
+                case .chatPanel: return .init(.chatPanel)
+                case .browser: return .init(.browser)
+                case .codeiumChat:
+                    return .init(.builtinExtension(
+                        extensionIdentifier: "com.codeium",
+                        tabName: "Codeium Chat"
+                    ))
+                }
+            }()
+        )
     }
 }
 
@@ -65,7 +79,7 @@ extension String: UserDefaultsStorable {}
 extension Data: UserDefaultsStorable {}
 extension URL: UserDefaultsStorable {}
 
-extension Array: RawRepresentable where Element: Codable {
+extension Array: @retroactive RawRepresentable where Element: Codable {
     public init?(rawValue: String) {
         guard let data = rawValue.data(using: .utf8),
               let result = try? JSONDecoder().decode([Element].self, from: data)