Add detach chat panel

Author: intitni

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/WindowBaseCommandHandler.swift

@@ -53,6 +53,8 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
             forFileAt: fileURL,
             editor: editor
         )
+        
+        try Task.checkCancellation()
 
         if filespace.presentingSuggestion != nil {
             presenter.presentSuggestion(fileURL: fileURL)

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -0,0 +1,29 @@
+import AppKit
+import SwiftUI
+
+private let r: Double = 8
+
+@MainActor
+final class ChatWindowViewModel: ObservableObject {
+    @Published var chat: ChatProvider?
+    @Published var colorScheme: ColorScheme
+    
+    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)
+            }
+        }
+        .frame(minWidth: Style.panelWidth, minHeight: Style.panelHeight)
+        .preferredColorScheme(viewModel.colorScheme)
+    }
+}

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 {

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -92,8 +92,29 @@ public final class SuggestionWidgetController {
         return it
     }()
 
+    private lazy var chatWindow = {
+        let it = CanBecomeKeyWindow(
+            contentRect: .zero,
+            styleMask: [.borderless, .resizable],
+            backing: .buffered,
+            defer: false
+        )
+        it.isReleasedWhenClosed = false
+        it.isOpaque = false
+        it.backgroundColor = .clear
+        it.level = .floating
+        it.hasShadow = true
+        it.contentView = NSHostingView(
+            rootView: ChatWindowView(viewModel: chatWindowViewModel)
+        )
+        it.setIsVisible(true)
+        it.canBecomeKeyChecker = { true }
+        return it
+    }()
+
     let widgetViewModel = WidgetViewModel()
     let suggestionPanelViewModel = SuggestionPanelViewModel()
+    let chatWindowViewModel = ChatWindowViewModel()
 
     private var presentationModeChangeObserver = UserDefaultsObserver()
     private var colorSchemeChangeObserver = UserDefaultsObserver()
@@ -102,7 +123,7 @@ public final class SuggestionWidgetController {
     private var sourceEditorMonitorTask: Task<Void, Error>?
     private var currentFileURL: URL?
     private var colorScheme: ColorScheme = .light
-    
+
     public var onOpenChatClicked: () -> Void = {}
     public var onCustomCommandClicked: (CustomCommand) -> Void = { _ in }
     public var dataSource: SuggestionWidgetDataSource?
@@ -198,30 +219,32 @@ public final class SuggestionWidgetController {
             )
         }
 
-        Task { @MainActor in
-            var switchTask: Task<Void, Error>?
-            suggestionPanelViewModel.requestApplicationPolicyUpdate = { viewModel in
-                #warning("""
-                TODO: There should be a better way for that
-                Currently, we have to make the app an accessory so that we can type things in the chat mode.
-                But in other modes, we want to keep it prohibited so the helper app won't take over the focus.
-                """)
-                switch (viewModel.activeTab, viewModel.content) {
-                case (.chat, _), (.suggestion, .promptToCode):
-                    guard NSApp.activationPolicy() != .accessory else { return }
-                    switchTask?.cancel()
-                    NSApp.setActivationPolicy(.accessory)
-                case (.suggestion, _):
-                    guard NSApp.activationPolicy() != .prohibited else { return }
-                    switchTask?.cancel()
-                    switchTask = Task {
-                        try await Environment.makeXcodeActive()
-                        try Task.checkCancellation()
-                        NSApp.setActivationPolicy(.prohibited)
-                    }
-                }
-            }
-        }
+//        Task { @MainActor in
+//            var switchTask: Task<Void, Error>?
+//            suggestionPanelViewModel.requestApplicationPolicyUpdate = { viewModel in
+//                #warning("""
+//                TODO: There should be a better way for that
+//                Currently, we have to make the app an accessory so that we can type things in the
+//                chat mode.
+//                But in other modes, we want to keep it prohibited so the helper app won't take
+//                over the focus.
+//                """)
+//                switch (viewModel.activeTab, viewModel.content) {
+//                case (.chat, _), (.suggestion, .promptToCode):
+//                    guard NSApp.activationPolicy() != .accessory else { return }
+//                    switchTask?.cancel()
+//                    NSApp.setActivationPolicy(.accessory)
+//                case (.suggestion, _):
+//                    guard NSApp.activationPolicy() != .prohibited else { return }
+//                    switchTask?.cancel()
+//                    switchTask = Task {
+//                        try await Environment.makeXcodeActive()
+//                        try Task.checkCancellation()
+//                        NSApp.setActivationPolicy(.prohibited)
+//                    }
+//                }
+//            }
+//        }
     }
 }
 
@@ -259,9 +282,14 @@ public extension SuggestionWidgetController {
         widgetViewModel.isProcessing = false
         Task {
             if let chat = await dataSource?.chatForFile(at: fileURL) {
+                chatWindowViewModel.chat = chat
                 suggestionPanelViewModel.chat = chat
                 suggestionPanelViewModel.isPanelDisplayed = true
 
+                if UserDefaults.shared.value(for: \.chatPanelInASeparateWindow) {
+                    self.updateWindowLocation()
+                }
+
                 Task { @MainActor in
                     // looks like we need a delay.
                     try await Task.sleep(nanoseconds: 150_000_000)
@@ -277,14 +305,14 @@ public extension SuggestionWidgetController {
             await updateContentForActiveEditor(fileURL: fileURL)
         }
     }
-    
+
     func presentPromptToCode(fileURL: URL) {
         widgetViewModel.isProcessing = false
         Task {
             if let provider = await dataSource?.promptToCodeForFile(at: fileURL) {
                 suggestionPanelViewModel.content = .promptToCode(provider)
                 suggestionPanelViewModel.isPanelDisplayed = true
-                
+
                 Task { @MainActor in
                     // looks like we need a delay.
                     try await Task.sleep(nanoseconds: 150_000_000)
@@ -293,7 +321,7 @@ public extension SuggestionWidgetController {
             }
         }
     }
-    
+
     func discardPromptToCode(fileURL: URL) {
         widgetViewModel.isProcessing = false
         Task {
@@ -427,6 +455,14 @@ extension SuggestionWidgetController {
             hide()
             return
         }
+        
+        let detachChat = UserDefaults.shared.value(for: \.chatPanelInASeparateWindow)
+
+        if detachChat {
+            chatWindow.alphaValue = chatWindowViewModel.chat != nil ? 1 : 0
+        } else {
+            chatWindow.alphaValue = 0
+        }
 
         if let xcode = ActiveApplicationMonitor.activeXcode {
             let application = AXUIElementCreateApplication(xcode.processIdentifier)
@@ -461,6 +497,10 @@ extension SuggestionWidgetController {
                     tabWindow.setFrame(result.tabFrame, display: false, animate: animated)
                     suggestionPanelViewModel.alignTopToAnchor = result.alignPanelTopToAnchor
                 }
+                
+                if chatWindow.alphaValue == 0 {
+                    chatWindow.setFrame(panelWindow.frame, display: false, animate: false)
+                }
 
                 if panelWindow.alphaValue != 1 {
                     panelWindow.alphaValue = 1
@@ -484,6 +524,7 @@ extension SuggestionWidgetController {
             return try? await Environment.fetchCurrentFileURL()
         }() else {
             suggestionPanelViewModel.content = nil
+            chatWindowViewModel.chat = nil
             suggestionPanelViewModel.chat = nil
             return
         }
@@ -492,10 +533,14 @@ extension SuggestionWidgetController {
             if suggestionPanelViewModel.chat?.id != chat.id {
                 suggestionPanelViewModel.chat = chat
             }
+            if chatWindowViewModel.chat?.id != chat.id {
+                chatWindowViewModel.chat = chat
+            }
         } else {
             suggestionPanelViewModel.chat = nil
+            chatWindowViewModel.chat = nil
         }
-        
+
         if let provider = await dataSource?.promptToCodeForFile(at: fileURL) {
             suggestionPanelViewModel.content = .promptToCode(provider)
         } else if let suggestion = await dataSource?.suggestionForFile(at: fileURL) {

Core/Sources/SuggestionWidget/TabView.swift

@@ -9,7 +9,8 @@ struct TabView: View {
             case .chat:
                 if panelViewModel.content != nil {
                     Button(action: {
-                        panelViewModel.activeTab = .suggestion
+                        
+                            panelViewModel.activeTab = .suggestion
                     }, label: {
                         Image(systemName: "lightbulb.fill")
                             .frame(width: Style.widgetWidth, height: Style.widgetHeight)
@@ -23,7 +24,12 @@ struct TabView: View {
             case .suggestion:
                 if panelViewModel.chat != nil {
                     Button(action: {
-                        panelViewModel.activeTab = .chat
+                        if panelViewModel.chatPanelInASeparateWindow {
+                            panelViewModel.chatPanelInASeparateWindow = false
+                            panelViewModel.activeTab = .chat
+                        } else {
+                            panelViewModel.activeTab = .chat
+                        }
                     }, label: {
                         Image(systemName: "ellipsis.bubble.fill")
                             .frame(width: Style.widgetWidth, height: Style.widgetHeight)

Core/Sources/SuggestionWidget/WidgetView.swift

@@ -107,6 +107,7 @@ struct WidgetContextMenu: View {
     @AppStorage(\.disableSuggestionFeatureGlobally) var disableSuggestionFeatureGlobally
     @AppStorage(\.suggestionFeatureEnabledProjectList) var suggestionFeatureEnabledProjectList
     @AppStorage(\.customCommands) var customCommands
+    @AppStorage(\.chatPanelInASeparateWindow) var chatPanelInASeparateWindow
     @ObservedObject var widgetViewModel: WidgetViewModel
     @State var projectPath: String?
     var isChatOpen: Bool
@@ -130,6 +131,15 @@ struct WidgetContextMenu: View {
             Divider()
 
             Group { // Settings
+                Button(action: {
+                    chatPanelInASeparateWindow.toggle()
+                }) {
+                    Text("Detach Chat Panel")
+                    if chatPanelInASeparateWindow {
+                        Image(systemName: "checkmark")
+                    }
+                }
+                
                 Button(action: {
                     useGlobalChat.toggle()
                 }) {

ExtensionService/AppDelegate.swift

@@ -34,7 +34,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         setupQuitOnUserTerminated()
         xpcListener = setupXPCListener()
         Logger.service.info("XPC Service started.")
-        NSApp.setActivationPolicy(.prohibited)
+        NSApp.setActivationPolicy(.accessory)
         buildStatusBarMenu()
     }