Pre-release 0.36.124

Author: actions-user

Core/Sources/HostApp/AdvancedSettings/ChatSection.swift

@@ -5,20 +5,27 @@ import Toast
 import XcodeInspector
 
 struct ChatSection: View {
+    @AppStorage(\.autoAttachChatToXcode) var autoAttachChatToXcode
+    
     var body: some View {
         SettingsSection(title: "Chat Settings") {
-            VStack(spacing: 10) {
-                // Response language picker
-                ResponseLanguageSetting()
-                    .padding(.horizontal, 10)
-
-                Divider()
-
-                // Custom instructions
-                CustomInstructionSetting()
-                    .padding(.horizontal, 10)
-            }
-            .padding(.vertical, 10)
+            // Auto Attach toggle
+            SettingsToggle(
+                title: "Auto-attach Chat Window to Xcode", 
+                isOn: $autoAttachChatToXcode
+            )
+            
+            Divider()
+            
+            // Response language picker
+            ResponseLanguageSetting()
+                .padding(SettingsToggle.defaultPadding)
+            
+            Divider()
+            
+            // Custom instructions
+            CustomInstructionSetting()
+                .padding(SettingsToggle.defaultPadding)
         }
     }
 }

Core/Sources/HostApp/SharedComponents/SettingsToggle.swift

@@ -1,6 +1,8 @@
 import SwiftUI
 
 struct SettingsToggle: View {
+    static let defaultPadding: CGFloat = 10
+    
     let title: String
     let isOn: Binding<Bool>
 
@@ -11,7 +13,7 @@ struct SettingsToggle: View {
             Toggle(isOn: isOn) {}
                 .toggleStyle(.switch)
         }
-        .padding(10)
+        .padding(SettingsToggle.defaultPadding)
     }
 }
 

Core/Sources/SuggestionWidget/ChatPanelWindow.swift

@@ -76,6 +76,13 @@ final class ChatPanelWindow: NSWindow {
                 }
             }
         }
+        
+        setInitialFrame()
+    }
+    
+    private func setInitialFrame() {
+        let frame = UpdateLocationStrategy.getChatPanelFrame(isAttachedToXcodeEnabled: false)
+        setFrame(frame, display: false, animate: true)
     }
 
     func setFloatOnTop(_ isFloatOnTop: Bool) {

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -141,6 +141,7 @@ struct ChatLoadingView: View {
 struct ChatTitleBar: View {
     let store: StoreOf<ChatPanelFeature>
     @State var isHovering = false
+    @AppStorage(\.autoAttachChatToXcode) var autoAttachChatToXcode
 
     var body: some View {
         WithPerceptionTracking {
@@ -167,18 +168,20 @@ struct ChatTitleBar: View {
 
                 Spacer()
 
-                TrafficLightButton(
-                    isHovering: isHovering,
-                    isActive: store.isDetached,
-                    color: Color(nsColor: .systemCyan),
-                    action: {
-                        store.send(.toggleChatPanelDetachedButtonClicked)
+                if !autoAttachChatToXcode {
+                    TrafficLightButton(
+                        isHovering: isHovering,
+                        isActive: store.isDetached,
+                        color: Color(nsColor: .systemCyan),
+                        action: {
+                            store.send(.toggleChatPanelDetachedButtonClicked)
+                        }
+                    ) {
+                        Image(systemName: "pin.fill")
+                            .foregroundStyle(.black.opacity(0.5))
+                            .font(Font.system(size: 6).weight(.black))
+                            .transformEffect(.init(translationX: 0, y: 0.5))
                     }
-                ) {
-                    Image(systemName: "pin.fill")
-                        .foregroundStyle(.black.opacity(0.5))
-                        .font(Font.system(size: 6).weight(.black))
-                        .transformEffect(.init(translationX: 0, y: 0.5))
                 }
             }
             .buttonStyle(.plain)

Core/Sources/SuggestionWidget/Styles.swift

@@ -6,6 +6,7 @@ import SwiftUI
 enum Style {
     static let panelHeight: Double = 560
     static let panelWidth: Double = 504
+    static let minChatPanelWidth: Double = 242 // Following the minimal width of Navigator in Xcode
     static let inlineSuggestionMaxHeight: Double = 400
     static let inlineSuggestionPadding: Double = 25
     static let widgetHeight: Double = 20

Core/Sources/SuggestionWidget/WidgetPositionStrategy.swift

@@ -1,5 +1,6 @@
 import AppKit
 import Foundation
+import XcodeInspector
 
 public struct WidgetLocation: Equatable {
     struct PanelLocation: Equatable {
@@ -319,14 +320,41 @@ enum UpdateLocationStrategy {
         return selectionFrame
     }
 
-    static func getChatPanelFrame(_ screen: NSScreen) -> CGRect {
+    static func getChatPanelFrame(isAttachedToXcodeEnabled: Bool = false) -> CGRect {
+        let screen = NSScreen.main ?? NSScreen.screens.first!
+        return getChatPanelFrame(screen, isAttachedToXcodeEnabled: isAttachedToXcodeEnabled)
+    }
+    
+    static func getChatPanelFrame(_ screen: NSScreen, isAttachedToXcodeEnabled: Bool = false) -> CGRect {
         let visibleScreenFrame = screen.visibleFrame
-        // avoid too wide
-        let width = min(Style.panelWidth, visibleScreenFrame.width * 0.3)
-        let height = visibleScreenFrame.height
-        let x = visibleScreenFrame.width - width
-                
-        return CGRect(x: x, y: visibleScreenFrame.height, width: width, height: height)
+        
+        // Default Frame
+        var width = min(Style.panelWidth, visibleScreenFrame.width * 0.3)
+        var height = visibleScreenFrame.height
+        var x = visibleScreenFrame.maxX - width
+        var y = visibleScreenFrame.minY
+        
+        if isAttachedToXcodeEnabled,
+           let latestActiveXcode = XcodeInspector.shared.latestActiveXcode,
+           let xcodeWindow = latestActiveXcode.appElement.focusedWindow,
+           let xcodeScreen = latestActiveXcode.appScreen,
+           let xcodeRect = xcodeWindow.rect,
+           let mainDisplayScreen = NSScreen.screens.first(where: { $0.frame.origin == .zero }) // The main display should exist
+        {
+            let minWidth = Style.minChatPanelWidth
+            let visibleXcodeScreenFrame = xcodeScreen.visibleFrame
+            
+            width = max(visibleXcodeScreenFrame.maxX - xcodeRect.maxX, minWidth)
+            height = xcodeRect.height
+            x = visibleXcodeScreenFrame.maxX - width
+            
+            // AXUIElement coordinates: Y=0 at top-left
+            // NSWindow coordinates: Y=0 at bottom-left
+            y = mainDisplayScreen.frame.maxY - xcodeRect.maxY + mainDisplayScreen.frame.minY
+        }
+        
+        
+        return CGRect(x: x, y: y, width: width, height: height)
     }
 }
 

Core/Sources/SuggestionWidget/WidgetWindowsController.swift

@@ -142,13 +142,14 @@ private extension WidgetWindowsController {
                     await updateWidgetsAndNotifyChangeOfEditor(immediately: false)
                 case .mainWindowChanged:
                     await updateWidgetsAndNotifyChangeOfEditor(immediately: false)
-                case .moved,
-                     .resized,
-                     .windowMoved,
-                     .windowResized,
-                     .windowMiniaturized,
-                     .windowDeminiaturized:
+                case .windowMiniaturized, .windowDeminiaturized:
                     await updateWidgets(immediately: false)
+                case .resized,
+                    .moved,
+                    .windowMoved,
+                    .windowResized:
+                    await updateWidgets(immediately: false)
+                    await updateChatWindowLocation()
                 case .created, .uiElementDestroyed, .xcodeCompletionPanelChanged,
                      .applicationDeactivated:
                     continue
@@ -339,8 +340,7 @@ extension WidgetWindowsController {
 
     // Generate a default location when no workspace is opened
     private func generateDefaultLocation() -> WidgetLocation {
-        let mainScreen = NSScreen.main ?? NSScreen.screens.first!
-        let chatPanelFrame = UpdateLocationStrategy.getChatPanelFrame(mainScreen)
+        let chatPanelFrame = UpdateLocationStrategy.getChatPanelFrame(isAttachedToXcodeEnabled: false)
 
         return WidgetLocation(
             widgetFrame: .zero,
@@ -444,6 +444,18 @@ extension WidgetWindowsController {
 
         updateWindowOpacityTask = task
     }
+    
+    @MainActor
+    func updateChatWindowLocation() {
+        let state = store.withState { $0 }
+        let isAttachedToXcodeEnabled = UserDefaults.shared.value(for: \.autoAttachChatToXcode)
+        if isAttachedToXcodeEnabled {
+            if state.chatPanelState.isPanelDisplayed && !windows.chatPanelWindow.isWindowHidden {
+                let frame = UpdateLocationStrategy.getChatPanelFrame(isAttachedToXcodeEnabled: isAttachedToXcodeEnabled)
+                windows.chatPanelWindow.setFrame(frame, display: true, animate: true)
+            }
+        }
+    }
 
     func updateWindowLocation(
         animated: Bool,
@@ -481,8 +493,11 @@ extension WidgetWindowsController {
                     animate: animated
                 )
             }
-
-            if isChatPanelDetached {
+            
+            let isAttachedToXcodeEnabled = UserDefaults.shared.value(for: \.autoAttachChatToXcode)
+            if isAttachedToXcodeEnabled {
+                // update in `updateChatWindowLocation`
+            } else if isChatPanelDetached {
                 // don't update it!
             } else {
                 windows.chatPanelWindow.setFrame(
@@ -523,10 +538,10 @@ extension WidgetWindowsController {
 
     @MainActor
     func adjustChatPanelWindowLevel() async {
+        let window = windows.chatPanelWindow
+        
         let disableFloatOnTopWhenTheChatPanelIsDetached = UserDefaults.shared
             .value(for: \.disableFloatOnTopWhenTheChatPanelIsDetached)
-
-        let window = windows.chatPanelWindow
         guard disableFloatOnTopWhenTheChatPanelIsDetached else {
             window.setFloatOnTop(true)
             return
@@ -549,7 +564,7 @@ extension WidgetWindowsController {
         } else {
             false
         }
-
+        
         if !floatOnTopWhenOverlapsXcode || !latestAppIsXcodeOrExtension {
             window.setFloatOnTop(false)
         } else {

Server/package-lock.json

@@ -7,7 +7,7 @@
     "build": "webpack"
   },
   "dependencies": {
-    "@github/copilot-language-server": "^1.334.0",
+    "@github/copilot-language-server": "^1.335.0",
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/xterm": "^5.5.0",
     "monaco-editor": "0.52.2"

Server/package.json

@@ -303,6 +303,10 @@ public extension UserDefaultPreferenceKeys {
     var globalCopilotInstructions: PreferenceKey<String> {
         .init(defaultValue: "", key: "GlobalCopilotInstructions")
     }
+    
+    var autoAttachChatToXcode: PreferenceKey<Bool> {
+        .init(defaultValue: true, key: "AutoAttachChatToXcode")
+    }
 }
 
 // MARK: - Theme