Merge branch 'feature/detached-chat-panel' into develop

Author: intitni

Core/Sources/AXExtension/AXUIElement.swift

@@ -31,6 +31,10 @@ public extension AXUIElement {
     var description: String {
         (try? copyValue(key: kAXDescriptionAttribute)) ?? ""
     }
+    
+    var label: String {
+        (try? copyValue(key: kAXLabelValueAttribute)) ?? ""
+    }
 
     var isSourceEditor: Bool {
         description == "Source Editor"

Core/Sources/Environment/Environment.swift

@@ -105,6 +105,24 @@ public enum Environment {
         }
         throw FailedToFetchFileURLError()
     }
+    
+    public static var fetchFocusedElementURI: () async throws -> URL = {
+        guard let xcode = ActiveApplicationMonitor.activeXcode
+            ?? ActiveApplicationMonitor.latestXcode
+        else {
+            throw FailedToFetchFileURLError()
+        }
+        
+        let application = AXUIElementCreateApplication(xcode.processIdentifier)
+        let focusedElement = application.focusedElement
+        if focusedElement?.description != "Source Editor" {
+            let window = application.focusedWindow
+            let id = window?.identifier.hashValue
+            return URL(fileURLWithPath: "/xcode-focused-element/\(id ?? 0)")
+        }
+        
+        return try await fetchCurrentFileURL()
+    }
 
     public static var createAuthService: () -> CopilotAuthServiceType = {
         CopilotAuthService()
@@ -148,6 +166,15 @@ public enum Environment {
                         .error("Trigger action \(name) failed: \(error.localizedDescription)")
                     throw error
                 }
+            } else {
+                struct CantRunCommand: Error, LocalizedError {
+                    let name: String
+                    var errorDescription: String? {
+                        "Can't run command \(name)."
+                    }
+                }
+                
+                throw CantRunCommand(name: name)
             }
         } else {
             /// check if menu is open, if not, click the menu item.

Core/Sources/Preferences/Keys.swift

@@ -175,6 +175,17 @@ public struct UserDefaultPreferenceKeys {
     public var preferWidgetToStayInsideEditorWhenWidthGreaterThan: PreferWidgetToStayInsideEditorWhenWidthGreaterThan {
         .init()
     }
+    
+    // MARK: - Chat Panel in a Separate Window
+
+    public struct ChatPanelInASeparateWindow: UserDefaultPreferenceKey {
+        public let defaultValue = true
+        public let key = "ChatPanelInASeparateWindow"
+    }
+
+    public var chatPanelInASeparateWindow: ChatPanelInASeparateWindow {
+        .init()
+    }
 }
 
 // MARK: - OpenAI Account Settings

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -69,8 +69,26 @@ struct PseudoCommandHandler {
     }
 
     func handleCustomCommand(_ command: CustomCommand) async {
-        guard let editor = await getEditorContent(sourceEditor: nil)
-        else {
+        guard let editor = await {
+            if let it = await getEditorContent(sourceEditor: nil) {
+                return it
+            }
+            switch command.feature {
+            case .customChat:
+                return .init(
+                    content: "",
+                    lines: [],
+                    uti: "",
+                    cursorPosition: .outOfScope,
+                    selections: [],
+                    tabSize: 0,
+                    indentSize: 0,
+                    usesTabsForIndentation: false
+                )
+            case .chatWithSelection, .promptToCode:
+                return nil
+            }
+        }() else {
             do {
                 try await Environment.triggerAction(command.name)
             } catch {

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -53,6 +53,8 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
             forFileAt: fileURL,
             editor: editor
         )
+        
+        try Task.checkCancellation()
 
         if filespace.presentingSuggestion != nil {
             presenter.presentSuggestion(fileURL: fileURL)
@@ -295,8 +297,7 @@ extension WindowBaseCommandHandler {
                 name: command.name
             )
         case let .customChat(systemPrompt, prompt):
-            try await startChatWithSelection(
-                editor: editor,
+            try await startChat(
                 specifiedSystemPrompt: systemPrompt,
                 extraSystemPrompt: nil,
                 sendingMessageImmediately: prompt,
@@ -433,7 +434,7 @@ extension WindowBaseCommandHandler {
 
         Task {
             let customCommandPrefix = {
-                if let name { return "[\(name)]" }
+                if let name { return "[\(name)] " }
                 return ""
             }()
 
@@ -442,23 +443,23 @@ extension WindowBaseCommandHandler {
                     history.append(.init(
                         role: .assistant,
                         content: "",
-                        summary: "\(customCommandPrefix) System prompt is updated."
+                        summary: "\(customCommandPrefix)System prompt is updated."
                     ))
                 }
             } else if !code.isEmpty, let selection = editor.selections.last {
                 await chat.chatGPTService.mutateHistory { history in
                     history.append(.init(
                         role: .assistant,
                         content: "",
-                        summary: "\(customCommandPrefix) Chatting about selected code in `\(fileURL.lastPathComponent)` from `\(selection.start.line + 1):\(selection.start.character + 1)` to `\(selection.end.line + 1):\(selection.end.character)`.\nThe code will persist in the conversation."
+                        summary: "\(customCommandPrefix)Chatting about selected code in `\(fileURL.lastPathComponent)` from `\(selection.start.line + 1):\(selection.start.character + 1)` to `\(selection.end.line + 1):\(selection.end.character)`.\nThe code will persist in the conversation."
                     ))
                 }
             } else if !customCommandPrefix.isEmpty {
                 await chat.chatGPTService.mutateHistory { history in
                     history.append(.init(
                         role: .assistant,
                         content: "",
-                        summary: "\(customCommandPrefix) System prompt is updated."
+                        summary: "\(customCommandPrefix)System prompt is updated."
                     ))
                 }
             }
@@ -470,4 +471,63 @@ extension WindowBaseCommandHandler {
 
         presenter.presentChatRoom(fileURL: fileURL)
     }
+    
+    private func startChat(
+        specifiedSystemPrompt: String?,
+        extraSystemPrompt: String?,
+        sendingMessageImmediately: String?,
+        name: String?
+    ) async throws {
+        presenter.markAsProcessing(true)
+        defer { presenter.markAsProcessing(false) }
+
+        let focusedElementURI = try await Environment.fetchFocusedElementURI()
+        let language = UserDefaults.shared.value(for: \.chatGPTLanguage)
+
+        var systemPrompt = specifiedSystemPrompt ?? """
+        \(language.isEmpty ? "" : "You must always reply in \(language)")
+        You are a senior programmer, you will answer my questions concisely. If you are replying with code, embed the code in a code block in markdown.
+        
+        You don't have any code in advance, ask me to provide it when needed.
+        """
+
+        if let extraSystemPrompt {
+            systemPrompt += "\n\(extraSystemPrompt)"
+        }
+
+        let chat = WidgetDataSource.shared.createChatIfNeeded(for: focusedElementURI)
+
+        await chat.mutateSystemPrompt(systemPrompt)
+
+        Task {
+            let customCommandPrefix = {
+                if let name { return "[\(name)] " }
+                return ""
+            }()
+            
+            if specifiedSystemPrompt != nil {
+                await chat.chatGPTService.mutateHistory { history in
+                    history.append(.init(
+                        role: .assistant,
+                        content: "",
+                        summary: "\(customCommandPrefix)System prompt is updated."
+                    ))
+                }
+            } else if !customCommandPrefix.isEmpty {
+                await chat.chatGPTService.mutateHistory { history in
+                    history.append(.init(
+                        role: .assistant,
+                        content: "",
+                        summary: "\(customCommandPrefix)System prompt is updated."
+                    ))
+                }
+            }
+
+            if let sendingMessageImmediately, !sendingMessageImmediately.isEmpty {
+                try await chat.send(content: sendingMessageImmediately)
+            }
+        }
+
+        presenter.presentChatRoom(fileURL: focusedElementURI)
+    }
 }

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -0,0 +1,32 @@
+import AppKit
+import SwiftUI
+
+private let r: Double = 8
+
+@MainActor
+final class ChatWindowViewModel: ObservableObject {
+    @Published var chat: ChatProvider?
+    @Published var colorScheme: ColorScheme
+    @Published var isPanelDisplayed = false
+    @AppStorage(\.chatPanelInASeparateWindow) var chatPanelInASeparateWindow
+    
+    public init(chat: ChatProvider? = nil, colorScheme: ColorScheme = .dark) {
+        self.chat = chat
+        self.colorScheme = colorScheme
+    }
+}
+
+struct ChatWindowView: View {
+    @ObservedObject var viewModel: ChatWindowViewModel
+
+    var body: some View {
+        Group {
+            if let chat = viewModel.chat {
+                ChatPanel(chat: chat)
+            }
+        }
+        .opacity(viewModel.isPanelDisplayed ? 1 : 0)
+        .frame(minWidth: Style.panelWidth, minHeight: Style.panelHeight)
+        .preferredColorScheme(viewModel.colorScheme)
+    }
+}

Core/Sources/SuggestionWidget/SuggestionPanelContent/ChatPanel.swift

@@ -60,39 +60,16 @@ struct ChatPanelToolbar: View {
 
 struct ChatPanelMessages: View {
     @ObservedObject var chat: ChatProvider
-    @AppStorage(\.disableLazyVStack) var disableLazyVStack
-    @State var height: Double = 0
-
-    struct HeightPreferenceKey: PreferenceKey {
-        static var defaultValue: Double = 0
-        static func reduce(value: inout Double, nextValue: () -> Double) {
-            value = nextValue() + value
-        }
-    }
-
-    struct UpdateHeightModifier: ViewModifier {
-        func body(content: Content) -> some View {
-            content
-                .background {
-                    GeometryReader { proxy in
-                        Color.clear
-                            .preference(key: HeightPreferenceKey.self, value: proxy.size.height)
-                    }
-                }
-        }
-    }
-
+    
     var body: some View {
         List {
             Group {
                 Spacer()
-                    .modifier(UpdateHeightModifier())
 
                 if chat.isReceivingMessage {
                     StopRespondingButton(chat: chat)
                         .padding(.vertical, 4)
                         .listRowInsets(EdgeInsets(top: 0, leading: -8, bottom: 0, trailing: -8))
-                        .modifier(UpdateHeightModifier())
                 }
 
                 if chat.history.isEmpty {
@@ -102,7 +79,6 @@ struct ChatPanelMessages: View {
                         .scaleEffect(x: -1, y: -1, anchor: .center)
                         .foregroundStyle(.secondary)
                         .listRowInsets(EdgeInsets(top: 0, leading: -8, bottom: 0, trailing: -8))
-                        .modifier(UpdateHeightModifier())
                 }
 
                 ForEach(chat.history.reversed(), id: \.id) { message in
@@ -120,20 +96,14 @@ struct ChatPanelMessages: View {
                     }
                 }
                 .listItemTint(.clear)
-                .modifier(UpdateHeightModifier())
 
                 Spacer()
-                    .modifier(UpdateHeightModifier())
             }
             .scaleEffect(x: -1, y: 1, anchor: .center)
         }
         .id("\(chat.history.count), \(chat.isReceivingMessage)")
         .listStyle(.plain)
-        .frame(idealHeight: max(50, height + 16))
         .scaleEffect(x: 1, y: -1, anchor: .center)
-        .onPreferenceChange(HeightPreferenceKey.self) { newHeight in
-            height = newHeight
-        }
     }
 }
 

Core/Sources/SuggestionWidget/SuggestionPanelView.swift

@@ -24,6 +24,8 @@ final class SuggestionPanelViewModel: ObservableObject {
         case suggestion
         case chat
     }
+    
+    @AppStorage(\.chatPanelInASeparateWindow) var chatPanelInASeparateWindow
 
     @Published var content: Content? {
         didSet {
@@ -67,6 +69,11 @@ final class SuggestionPanelViewModel: ObservableObject {
     }
 
     func adjustActiveTabAndShowHideIfNeeded(tab: ActiveTab) {
+        if chatPanelInASeparateWindow {
+            activeTab = .suggestion
+            return
+        }
+        
         switch tab {
         case .suggestion:
             if content != nil {
@@ -124,14 +131,14 @@ struct SuggestionPanelView: View {
                     }
                 }
 
-                if let chat = viewModel.chat {
-                    if case .chat = viewModel.activeTab {
-                        ChatPanel(chat: chat)
-                            .frame(maxWidth: .infinity, maxHeight: Style.panelHeight)
-                            .fixedSize(horizontal: false, vertical: true)
-                            .allowsHitTesting(viewModel.isPanelDisplayed)
-                    }
-                }
+//                if let chat = viewModel.chat {
+//                    if case .chat = viewModel.activeTab {
+//                        ChatPanel(chat: chat)
+//                            .frame(maxWidth: .infinity, maxHeight: Style.panelHeight)
+//                            .fixedSize(horizontal: false, vertical: true)
+//                            .allowsHitTesting(viewModel.isPanelDisplayed)
+//                    }
+//                }
             }
             .frame(maxWidth: .infinity)