Pre-release 0.34.118

Author: actions-user

Copilot for Xcode/App.swift

@@ -6,6 +6,7 @@ import SharedUIComponents
 import UpdateChecker
 import XPCShared
 import HostAppActivator
+import ComposableArchitecture
 
 struct VisualEffect: NSViewRepresentable {
   func makeNSView(context: Self.Context) -> NSView { return NSVisualEffectView() }
@@ -192,14 +193,16 @@ struct CopilotForXcodeApp: App {
     }
 
     var body: some Scene {
-        Settings {
-            TabContainer()
-                .frame(minWidth: 800, minHeight: 600)
-                .background(VisualEffect().ignoresSafeArea())
-                .environment(\.updateChecker, UpdateChecker(
-                    hostBundle: Bundle.main,
-                    checkerDelegate: AppUpdateCheckerDelegate()
-                ))
+        WithPerceptionTracking {
+            Settings {
+                TabContainer()
+                    .frame(minWidth: 800, minHeight: 600)
+                    .background(VisualEffect().ignoresSafeArea())
+                    .environment(\.updateChecker, UpdateChecker(
+                        hostBundle: Bundle.main,
+                        checkerDelegate: AppUpdateCheckerDelegate()
+                    ))
+            }
         }
     }
 }

Core/Sources/ChatService/ChatService.swift

@@ -379,7 +379,7 @@ public final class ChatService: ChatServiceType, ObservableObject {
     public func stopReceivingMessage() async {
         if let activeRequestId = activeRequestId {
             do {
-                try await conversationProvider?.stopReceivingMessage(activeRequestId)
+                try await conversationProvider?.stopReceivingMessage(activeRequestId, workspaceURL: getWorkspaceURL())
             } catch {
                 print("Failed to cancel ongoing request with WDT: \(activeRequestId)")
             }
@@ -393,7 +393,7 @@ public final class ChatService: ChatServiceType, ObservableObject {
         await memory.clearHistory()
         if let activeRequestId = activeRequestId {
             do {
-                try await conversationProvider?.stopReceivingMessage(activeRequestId)
+                try await conversationProvider?.stopReceivingMessage(activeRequestId, workspaceURL: getWorkspaceURL())
             } catch {
                 print("Failed to cancel ongoing request with WDT: \(activeRequestId)")
             }
@@ -491,13 +491,20 @@ public final class ChatService: ChatServiceType, ObservableObject {
             try await send(UUID().uuidString, content: templateProcessor.process(sendingMessageImmediately), skillSet: [], references: [])
         }
     }
-    
+
+    public func getWorkspaceURL() -> URL? {
+        guard !chatTabInfo.workspacePath.isEmpty else {
+            return nil
+        }
+        return URL(fileURLWithPath: chatTabInfo.workspacePath)
+    }
+
     public func upvote(_ id: String, _ rating: ConversationRating) async {
-        try? await conversationProvider?.rateConversation(turnId: id, rating: rating)
+        try? await conversationProvider?.rateConversation(turnId: id, rating: rating, workspaceURL: getWorkspaceURL())
     }
 
     public func downvote(_ id: String, _ rating: ConversationRating) async {
-        try? await conversationProvider?.rateConversation(turnId: id, rating: rating)
+        try? await conversationProvider?.rateConversation(turnId: id, rating: rating, workspaceURL: getWorkspaceURL())
     }
 
     public func copyCode(_ id: String) async {
@@ -725,7 +732,7 @@ public final class ChatService: ChatServiceType, ObservableObject {
 
         do {
             if let conversationId = conversationId {
-                try await conversationProvider?.createTurn(with: conversationId, request: request)
+                try await conversationProvider?.createTurn(with: conversationId, request: request, workspaceURL: getWorkspaceURL())
             } else {
                 var requestWithTurns = request
 
@@ -738,7 +745,7 @@ public final class ChatService: ChatServiceType, ObservableObject {
                     requestWithTurns.turns = turns
                 }
 
-                try await conversationProvider?.createConversation(requestWithTurns)
+                try await conversationProvider?.createConversation(requestWithTurns, workspaceURL: getWorkspaceURL())
             }
         } catch {
             resetOngoingRequest()

Core/Sources/ConversationTab/Chat.swift

@@ -66,6 +66,7 @@ struct Chat {
         var fileEditMap: OrderedDictionary<URL, FileEdit> = [:]
         var diffViewerController: DiffViewWindowController? = nil
         var isAgentMode: Bool = AppState.shared.isAgentModeEnabled()
+        var workspaceURL: URL? = nil
         enum Field: String, Hashable {
             case textField
             case fileSearchBar
@@ -564,4 +565,3 @@ private actor TimedDebounceFunction {
         await block()
     }
 }
-

Core/Sources/ConversationTab/ChatPanel.swift

@@ -488,7 +488,7 @@ struct ChatPanelInputArea: View {
                             }
                         )
                         .onAppear() {
-                            allFiles = ContextUtils.getFilesInActiveWorkspace()
+                            allFiles = ContextUtils.getFilesInActiveWorkspace(workspaceURL: chat.workspaceURL)
                         }
                     }
 

Core/Sources/ConversationTab/ContextUtils.swift

@@ -6,7 +6,11 @@ import Workspace
 
 public struct ContextUtils {
 
-    public static func getFilesInActiveWorkspace() -> [FileReference] {
+    public static func getFilesInActiveWorkspace(workspaceURL: URL?) -> [FileReference] {
+        if let workspaceURL = workspaceURL, let info = WorkspaceFile.getWorkspaceInfo(workspaceURL: workspaceURL) {
+            return WorkspaceFile.getFilesInActiveWorkspace(workspaceURL: info.workspaceURL, workspaceRootURL: info.projectURL)
+        }
+
         guard let workspaceURL = XcodeInspector.shared.realtimeActiveWorkspaceURL,
               let workspaceRootURL = XcodeInspector.shared.realtimeActiveProjectURL else {
             return []

Core/Sources/ConversationTab/ConversationTab.swift

@@ -114,7 +114,7 @@ public class ConversationTab: ChatTab {
 
         let service = ChatService.service(for: info)
         self.service = service
-        chat = .init(initialState: .init(), reducer: { Chat(service: service) })
+        chat = .init(initialState: .init(workspaceURL: service.getWorkspaceURL()), reducer: { Chat(service: service) })
         super.init(store: store)
 
         // Start to observe changes of Chat Message
@@ -128,7 +128,7 @@ public class ConversationTab: ChatTab {
     @MainActor
     public init(service: ChatService, store: StoreOf<ChatTabItem>, with chatTabInfo: ChatTabInfo) {
         self.service = service
-        chat = .init(initialState: .init(), reducer: { Chat(service: service) })
+        chat = .init(initialState: .init(workspaceURL: service.getWorkspaceURL()), reducer: { Chat(service: service) })
         super.init(store: store)
     }
 

Core/Sources/HostApp/MCPConfigView.swift

@@ -6,6 +6,7 @@ import SwiftUI
 import Toast
 import ConversationServiceProvider
 import GitHubCopilotService
+import ComposableArchitecture
 
 struct MCPConfigView: View {
     @State private var mcpConfig: String = ""
@@ -16,20 +17,24 @@ struct MCPConfigView: View {
     @State private var fileMonitorTask: Task<Void, Error>? = nil
     @Environment(\.colorScheme) var colorScheme
 
+    private static var lastSyncTimestamp: Date? = nil
+
     var body: some View {
-        ScrollView {
-            VStack(alignment: .leading, spacing: 8) {
-                MCPIntroView()
-                MCPToolsListView()
-            }
-            .padding(20)
-            .onAppear {
-                setupConfigFilePath()
-                startMonitoringConfigFile()
-                refreshConfiguration(())
-            }
-            .onDisappear {
-                stopMonitoringConfigFile()
+        WithPerceptionTracking {
+            ScrollView {
+                VStack(alignment: .leading, spacing: 8) {
+                    MCPIntroView()
+                    MCPToolsListView()
+                }
+                .padding(20)
+                .onAppear {
+                    setupConfigFilePath()
+                    startMonitoringConfigFile()
+                    refreshConfiguration(())
+                }
+                .onDisappear {
+                    stopMonitoringConfigFile()
+                }
             }
         }
     }
@@ -145,6 +150,12 @@ struct MCPConfigView: View {
     }
 
     func refreshConfiguration(_: Any) {
+        if MCPConfigView.lastSyncTimestamp == lastModificationDate {
+            return
+        }
+
+        MCPConfigView.lastSyncTimestamp = lastModificationDate
+
         let fileURL = URL(fileURLWithPath: configFilePath)
         if let jsonString = readAndValidateJSON(from: fileURL) {
             UserDefaults.shared.set(jsonString, for: \.gitHubCopilotMCPConfig)

Core/Sources/HostApp/MCPSettings/MCPIntroView.swift

@@ -13,7 +13,10 @@ struct MCPIntroView: View {
                 "my-mcp-server": {
                     "type": "stdio",
                     "command": "my-command",
-                    "args": []
+                    "args": [],
+                    "env": {
+                        "TOKEN": "my_token"
+                    }
                 }
             }
         }
@@ -75,7 +78,7 @@ struct MCPIntroView: View {
             .overlay(
                 RoundedRectangle(cornerRadius: 4)
                 .inset(by: 0.5)
-                .stroke(Color(red: 0.9, green: 0.9, blue: 0.9), lineWidth: 1)
+                .stroke(Color("GroupBoxStrokeColor"), lineWidth: 1)
             )
     }