New setting - attach Copilot window only to Xcode workspace and project windows, ignoring standalone files

Author: Alkenso

Core/Sources/HostApp/AdvancedSettings/ChatSection.swift

@@ -2,6 +2,7 @@ import AppKitExtension
 import Client
 import ComposableArchitecture
 import ConversationServiceProvider
+import Preferences
 import SwiftUI
 import Toast
 import XcodeInspector
@@ -10,7 +11,6 @@ import Logger
 import SystemUtils
 
 struct ChatSection: View {
-    @AppStorage(\.autoAttachChatToXcode) var autoAttachChatToXcode
     @AppStorage(\.enableFixError) var enableFixError
     @AppStorage(\.enableSubagent) var enableSubagent
     @ObservedObject private var featureFlags = FeatureFlagManager.shared
@@ -62,15 +62,12 @@ struct ChatSection: View {
 
                 Divider()
             }
-            
-            // Auto Attach toggle
-            SettingsToggle(
-                title: "Auto-attach Chat Window to Xcode",
-                isOn: $autoAttachChatToXcode
-            )
+
+            AutoAttachChatToXcodeSetting()
+                .padding(SettingsToggle.defaultPadding)
 
             Divider()
-            
+
             // Fix error toggle
             SettingsToggle(
                 title: "Quick fix for error", 
@@ -105,6 +102,32 @@ struct ChatSection: View {
     }
 }
 
+struct AutoAttachChatToXcodeSetting: View {
+    @AppStorage(\.autoAttachChatToXcodeMode) private var autoAttachChatToXcodeMode
+
+    var body: some View {
+        WithPerceptionTracking {
+            HStack {
+                VStack(alignment: .leading) {
+                    Text("Auto-attach Chat Window to Xcode")
+                        .font(.body)
+                    Text("Choose Projects to attach only to Xcode project and workspace windows.")
+                        .font(.footnote)
+                }
+
+                Spacer()
+
+                Picker("", selection: $autoAttachChatToXcodeMode) {
+                    Text("Never").tag(AutoAttachChatToXcodeMode.never)
+                    Text("Always").tag(AutoAttachChatToXcodeMode.always)
+                    Text("Projects").tag(AutoAttachChatToXcodeMode.projects)
+                }
+                .frame(maxWidth: 200, alignment: .trailing)
+            }
+        }
+    }
+}
+
 struct ResponseLanguageSetting: View {
     @AppStorage(\.chatResponseLocale) var chatResponseLocale
 

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -142,7 +142,7 @@ struct ChatLoadingView: View {
 struct ChatTitleBar: View {
     let store: StoreOf<ChatPanelFeature>
     @State var isHovering = false
-    @AppStorage(\.autoAttachChatToXcode) var autoAttachChatToXcode
+    @AppStorage(\.autoAttachChatToXcodeMode) var autoAttachChatToXcodeMode
 
     var body: some View {
         WithPerceptionTracking {
@@ -169,7 +169,7 @@ struct ChatTitleBar: View {
 
                 Spacer()
 
-                if !autoAttachChatToXcode {
+                if autoAttachChatToXcodeMode == .never {
                     TrafficLightButton(
                         isHovering: isHovering,
                         isActive: store.isDetached,

Core/Sources/SuggestionWidget/WidgetWindowsController.swift

@@ -572,10 +572,13 @@ extension WidgetWindowsController {
             }
         }
 
-        let isAttachedToXcodeEnabled = UserDefaults.shared.value(for: \.autoAttachChatToXcode)
-        guard isAttachedToXcodeEnabled else { return }
+        let autoAttachMode = UserDefaults.shared.value(for: \.autoAttachChatToXcodeMode)
+        guard autoAttachMode != .never else { return }
 
         guard notif.element.isXcodeWorkspaceWindow else { return }
+        guard autoAttachMode != .projects
+            || WorkspaceXcodeWindowInspector.isProjectOrWorkspaceWindow(windowElement: notif.element)
+        else { return }
 
         let state = store.withState { $0 }
         if state.chatPanelState.isPanelDisplayed && !windows.chatPanelWindow.isWindowHidden {
@@ -667,8 +670,8 @@ extension WidgetWindowsController {
                 )
             }
 
-            let isAttachedToXcodeEnabled = UserDefaults.shared.value(for: \.autoAttachChatToXcode)
-            if isAttachedToXcodeEnabled {
+            let autoAttachMode = UserDefaults.shared.value(for: \.autoAttachChatToXcodeMode)
+            if autoAttachMode != .never {
                 // update in `updateAttachedChatWindowLocation`
             } else if isChatPanelDetached {
                 // don't update it!

Tool/Sources/Preferences/Keys.swift

@@ -321,9 +321,13 @@ public extension UserDefaultPreferenceKeys {
         .init(defaultValue: "", key: "GlobalCopilotInstructions")
     }
 
-    var autoAttachChatToXcode: PreferenceKey<Bool> {
+    var oldAutoAttachChatToXcode: DeprecatedPreferenceKey<Bool> {
         .init(defaultValue: true, key: "AutoAttachChatToXcode")
     }
+
+    var autoAttachChatToXcodeMode: PreferenceKey<AutoAttachChatToXcodeMode> {
+        .init(defaultValue: .always, key: "AutoAttachChatToXcodeMode")
+    }
 
     var enableFixError: PreferenceKey<Bool> {
         .init(defaultValue: true, key: "EnableFixError")

Tool/Sources/Preferences/Types/AutoAttachChatToXcodeMode.swift

@@ -0,0 +1,5 @@
+public enum AutoAttachChatToXcodeMode: Int, CaseIterable {
+    case never = 0
+    case always = 1
+    case projects = 2
+}

Tool/Sources/Preferences/UserDefaults.swift

@@ -22,7 +22,10 @@ public extension UserDefaults {
         shared.setupDefaultValue(for: \.realtimeNESToggle)
         shared.setupDefaultValue(for: \.realtimeSuggestionDebounce)
         shared.setupDefaultValue(for: \.suggestionPresentationMode)
-        shared.setupDefaultValue(for: \.autoAttachChatToXcode)
+        shared.setupDefaultValue(
+            for: \.autoAttachChatToXcodeMode,
+            defaultValue: shared.deprecatedValue(for: \.oldAutoAttachChatToXcode) ? .always : .never
+        )
         shared.setupDefaultValue(for: \.enableFixError)
         shared.setupDefaultValue(for: \.enableSubagent)
         shared.setupDefaultValue(for: \.enableAutoApproval)

Tool/Sources/XcodeInspector/XcodeWindowInspector.swift

@@ -85,6 +85,32 @@ public final class WorkspaceXcodeWindowInspector: XcodeWindowInspector {
         }
     }
 
+    public static func isProjectOrWorkspaceWindow(windowElement: AXUIElement) -> Bool {
+        guard windowElement.isXcodeWorkspaceWindow else { return false }
+        return isProjectOrWorkspaceWindow(
+            title: windowElement.title,
+            workspaceURL: extractWorkspaceURL(windowElement: windowElement)
+        )
+    }
+
+    static func isProjectOrWorkspaceWindow(title: String, workspaceURL: URL?) -> Bool {
+        guard let workspaceURL else { return false }
+
+        let projectName: String
+        if ["xcodeproj", "xcworkspace", "playground"].contains(workspaceURL.pathExtension) {
+            projectName = workspaceURL.deletingPathExtension().lastPathComponent
+        } else {
+            projectName = workspaceURL.lastPathComponent
+        }
+        guard !projectName.isEmpty else { return false }
+
+        return [" — ", " - "].contains { separator in
+            let prefix = projectName + separator
+            guard title.hasPrefix(prefix) else { return false }
+            return !title.dropFirst(prefix.count).trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+        }
+    }
+
     static func extractDocumentURL(
         windowElement: AXUIElement
     ) -> URL? {