From 5ebf64621ff006a066fd7013db3bc8744f55cfbf Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 27 Jun 2025 06:11:17 +0000 Subject: [PATCH 1/2] Pre-release 0.37.127 --- Core/Sources/HostApp/General.swift | 16 ++- .../HostApp/GeneralSettings/AppInfoView.swift | 73 +++++----- .../CopilotConnectionView.swift | 46 ++++-- Core/Sources/HostApp/GeneralView.swift | 25 ++-- Core/Sources/HostApp/MCPConfigView.swift | 5 - .../CopilotMCPToolManagerObservable.swift | 43 ++++-- .../MCPSettings/MCPServerToolsSection.swift | 77 +++------- .../MCPSettings/MCPToolsListView.swift | 11 +- .../SharedComponents/SettingsButtonRow.swift | 25 ++-- .../RealtimeSuggestionController.swift | 2 +- Core/Sources/Service/XPCService.swift | 66 +++++++++ ExtensionService/AppDelegate.swift | 2 +- Server/package-lock.json | 8 +- Server/package.json | 2 +- Tool/Package.swift | 2 +- Tool/Sources/AXExtension/AXUIElement.swift | 2 +- .../CopilotLocalProcessServer.swift | 7 +- .../CopilotMCPToolManager.swift | 26 +++- .../LanguageServer/GitHubCopilotRequest.swift | 8 +- .../LanguageServer/GitHubCopilotService.swift | 133 ++++++++++-------- Tool/Sources/Status/Status.swift | 4 +- Tool/Sources/Status/StatusObserver.swift | 2 +- Tool/Sources/Status/Types/AuthStatus.swift | 15 +- .../XPCShared/XPCExtensionService.swift | 71 ++++++++++ .../XPCShared/XPCServiceProtocol.swift | 64 +++------ 25 files changed, 442 insertions(+), 293 deletions(-) diff --git a/Core/Sources/HostApp/General.swift b/Core/Sources/HostApp/General.swift index f2b2abe8..92d78a25 100644 --- a/Core/Sources/HostApp/General.swift +++ b/Core/Sources/HostApp/General.swift @@ -12,8 +12,10 @@ public struct General { @ObservableState public struct State: Equatable { var xpcServiceVersion: String? + var xpcCLSVersion: String? var isAccessibilityPermissionGranted: ObservedAXStatus = .unknown var isExtensionPermissionGranted: ExtensionPermissionStatus = .unknown + var xpcServiceAuthStatus: AuthStatus = .init(status: .unknown) var isReloading = false } @@ -24,8 +26,10 @@ public struct General { case reloadStatus case finishReloading( xpcServiceVersion: String, + xpcCLSVersion: String?, axStatus: ObservedAXStatus, - extensionStatus: ExtensionPermissionStatus + extensionStatus: ExtensionPermissionStatus, + authStatus: AuthStatus ) case failedReloading case retryReloading @@ -90,10 +94,14 @@ public struct General { let isAccessibilityPermissionGranted = try await service .getXPCServiceAccessibilityPermission() let isExtensionPermissionGranted = try await service.getXPCServiceExtensionPermission() + let xpcServiceAuthStatus = try await service.getXPCServiceAuthStatus() ?? .init(status: .unknown) + let xpcCLSVersion = try await service.getXPCCLSVersion() await send(.finishReloading( xpcServiceVersion: xpcServiceVersion, + xpcCLSVersion: xpcCLSVersion, axStatus: isAccessibilityPermissionGranted, - extensionStatus: isExtensionPermissionGranted + extensionStatus: isExtensionPermissionGranted, + authStatus: xpcServiceAuthStatus )) } else { toast("Launching service app.", .info) @@ -114,10 +122,12 @@ public struct General { } }.cancellable(id: ReloadStatusCancellableId(), cancelInFlight: true) - case let .finishReloading(version, axStatus, extensionStatus): + case let .finishReloading(version, clsVersion, axStatus, extensionStatus, authStatus): state.xpcServiceVersion = version state.isAccessibilityPermissionGranted = axStatus state.isExtensionPermissionGranted = extensionStatus + state.xpcServiceAuthStatus = authStatus + state.xpcCLSVersion = clsVersion state.isReloading = false return .none diff --git a/Core/Sources/HostApp/GeneralSettings/AppInfoView.swift b/Core/Sources/HostApp/GeneralSettings/AppInfoView.swift index 837f3047..0cf5e8af 100644 --- a/Core/Sources/HostApp/GeneralSettings/AppInfoView.swift +++ b/Core/Sources/HostApp/GeneralSettings/AppInfoView.swift @@ -1,6 +1,5 @@ import ComposableArchitecture import GitHubCopilotService -import GitHubCopilotViewModel import SwiftUI struct AppInfoView: View { @@ -15,7 +14,6 @@ struct AppInfoView: View { @Environment(\.toast) var toast @StateObject var settings = Settings() - @StateObject var viewModel: GitHubCopilotViewModel @State var appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String @State var automaticallyCheckForUpdates: Bool? @@ -23,53 +21,54 @@ struct AppInfoView: View { let store: StoreOf var body: some View { - HStack(alignment: .center, spacing: 16) { - let appImage = if let nsImage = NSImage(named: "AppIcon") { - Image(nsImage: nsImage) - } else { - Image(systemName: "app") - } - appImage - .resizable() - .frame(width: 110, height: 110) - VStack(alignment: .leading, spacing: 8) { - HStack { - Text(Bundle.main.object(forInfoDictionaryKey: "HOST_APP_NAME") as? String ?? "GitHub Copilot for Xcode") - .font(.title) - Text("(\(appVersion ?? ""))") - .font(.title) + WithPerceptionTracking { + HStack(alignment: .center, spacing: 16) { + let appImage = if let nsImage = NSImage(named: "AppIcon") { + Image(nsImage: nsImage) + } else { + Image(systemName: "app") } - Text("Language Server Version: \(viewModel.version ?? "Loading...")") - Button(action: { - updateChecker.checkForUpdates() - }) { - HStack(spacing: 2) { - Text("Check for Updates") + appImage + .resizable() + .frame(width: 110, height: 110) + VStack(alignment: .leading, spacing: 8) { + HStack { + Text(Bundle.main.object(forInfoDictionaryKey: "HOST_APP_NAME") as? String ?? "GitHub Copilot for Xcode") + .font(.title) + Text("(\(appVersion ?? ""))") + .font(.title) } - } - HStack { - Toggle(isOn: .init( - get: { automaticallyCheckForUpdates ?? updateChecker.getAutomaticallyChecksForUpdates() }, - set: { updateChecker.setAutomaticallyChecksForUpdates($0); automaticallyCheckForUpdates = $0 } - )) { - Text("Automatically Check for Updates") + Text("Language Server Version: \(store.xpcCLSVersion ?? "Loading...")") + Button(action: { + updateChecker.checkForUpdates() + }) { + HStack(spacing: 2) { + Text("Check for Updates") + } } - - Toggle(isOn: $settings.installPrereleases) { - Text("Install pre-releases") + HStack { + Toggle(isOn: .init( + get: { automaticallyCheckForUpdates ?? updateChecker.getAutomaticallyChecksForUpdates() }, + set: { updateChecker.setAutomaticallyChecksForUpdates($0); automaticallyCheckForUpdates = $0 } + )) { + Text("Automatically Check for Updates") + } + + Toggle(isOn: $settings.installPrereleases) { + Text("Install pre-releases") + } } } + Spacer() } - Spacer() + .padding(.horizontal, 2) + .padding(.vertical, 15) } - .padding(.horizontal, 2) - .padding(.vertical, 15) } } #Preview { AppInfoView( - viewModel: GitHubCopilotViewModel.shared, store: .init(initialState: .init(), reducer: { General() }) ) } diff --git a/Core/Sources/HostApp/GeneralSettings/CopilotConnectionView.swift b/Core/Sources/HostApp/GeneralSettings/CopilotConnectionView.swift index 347f202d..5a454b7a 100644 --- a/Core/Sources/HostApp/GeneralSettings/CopilotConnectionView.swift +++ b/Core/Sources/HostApp/GeneralSettings/CopilotConnectionView.swift @@ -1,6 +1,7 @@ import ComposableArchitecture import GitHubCopilotViewModel import SwiftUI +import Client struct CopilotConnectionView: View { @AppStorage("username") var username: String = "" @@ -18,23 +19,36 @@ struct CopilotConnectionView: View { } } } + + var accountStatusString: String { + switch store.xpcServiceAuthStatus.status { + case .loggedIn: + return "Active" + case .notLoggedIn: + return "Not Signed In" + case .notAuthorized: + return "No Subscription" + case .unknown: + return "Loading..." + } + } var accountStatus: some View { SettingsButtonRow( title: "GitHub Account Status Permissions", - subtitle: "GitHub Account: \(viewModel.status?.description ?? "Loading...")" + subtitle: "GitHub Account: \(accountStatusString)" ) { if viewModel.isRunningAction || viewModel.waitingForSignIn { ProgressView().controlSize(.small) } Button("Refresh Connection") { - viewModel.checkStatus() + store.send(.reloadStatus) } if viewModel.waitingForSignIn { Button("Cancel") { viewModel.cancelWaiting() } - } else if viewModel.status == .notSignedIn { + } else if store.xpcServiceAuthStatus.status == .notLoggedIn { Button("Log in to GitHub") { viewModel.signIn() } @@ -54,21 +68,31 @@ struct CopilotConnectionView: View { """) } } - if viewModel.status == .ok || viewModel.status == .alreadySignedIn || - viewModel.status == .notAuthorized - { - Button("Log Out from GitHub") { viewModel.signOut() - viewModel.isSignInAlertPresented = false + if store.xpcServiceAuthStatus.status == .loggedIn || store.xpcServiceAuthStatus.status == .notAuthorized { + Button("Log Out from GitHub") { + Task { + viewModel.signOut() + viewModel.isSignInAlertPresented = false + let service = try getService() + do { + try await service.signOutAllGitHubCopilotService() + } catch { + toast(error.localizedDescription, .error) + } + } } } } } var connection: some View { - SettingsSection(title: "Account Settings", showWarning: viewModel.status == .notAuthorized) { + SettingsSection( + title: "Account Settings", + showWarning: store.xpcServiceAuthStatus.status == .notAuthorized + ) { accountStatus Divider() - if viewModel.status == .notAuthorized { + if store.xpcServiceAuthStatus.status == .notAuthorized { SettingsLink( url: "https://github.com/features/copilot/plans", title: "Enable powerful AI features for free with the GitHub Copilot Free plan" @@ -81,7 +105,7 @@ struct CopilotConnectionView: View { ) } .onReceive(DistributedNotificationCenter.default().publisher(for: .authStatusDidChange)) { _ in - viewModel.checkStatus() + store.send(.reloadStatus) } } diff --git a/Core/Sources/HostApp/GeneralView.swift b/Core/Sources/HostApp/GeneralView.swift index 7ba62833..e80c9491 100644 --- a/Core/Sources/HostApp/GeneralView.swift +++ b/Core/Sources/HostApp/GeneralView.swift @@ -7,24 +7,25 @@ struct GeneralView: View { @StateObject private var viewModel = GitHubCopilotViewModel.shared var body: some View { - ScrollView { - VStack(alignment: .leading, spacing: 0) { - generalView.padding(20) - Divider() - rightsView.padding(20) + WithPerceptionTracking { + ScrollView { + VStack(alignment: .leading, spacing: 0) { + generalView.padding(20) + Divider() + rightsView.padding(20) + } + .frame(maxWidth: .infinity) + } + .task { + if isPreview { return } + await store.send(.appear).finish() } - .frame(maxWidth: .infinity) - } - .task { - if isPreview { return } - viewModel.checkStatus() - await store.send(.appear).finish() } } private var generalView: some View { VStack(alignment: .leading, spacing: 30) { - AppInfoView(viewModel: viewModel, store: store) + AppInfoView(store: store) GeneralSettingsView(store: store) CopilotConnectionView(viewModel: viewModel, store: store) } diff --git a/Core/Sources/HostApp/MCPConfigView.swift b/Core/Sources/HostApp/MCPConfigView.swift index 3f72daf7..5008cc44 100644 --- a/Core/Sources/HostApp/MCPConfigView.swift +++ b/Core/Sources/HostApp/MCPConfigView.swift @@ -161,11 +161,6 @@ struct MCPConfigView: View { UserDefaults.shared.set(jsonString, for: \.gitHubCopilotMCPConfig) } - NotificationCenter.default.post( - name: .gitHubCopilotShouldRefreshEditorInformation, - object: nil - ) - Task { let service = try getService() do { diff --git a/Core/Sources/HostApp/MCPSettings/CopilotMCPToolManagerObservable.swift b/Core/Sources/HostApp/MCPSettings/CopilotMCPToolManagerObservable.swift index 5799c58d..d493b8be 100644 --- a/Core/Sources/HostApp/MCPSettings/CopilotMCPToolManagerObservable.swift +++ b/Core/Sources/HostApp/MCPSettings/CopilotMCPToolManagerObservable.swift @@ -2,6 +2,8 @@ import SwiftUI import Combine import Persist import GitHubCopilotService +import Client +import Logger class CopilotMCPToolManagerObservable: ObservableObject { static let shared = CopilotMCPToolManagerObservable() @@ -10,23 +12,42 @@ class CopilotMCPToolManagerObservable: ObservableObject { private var cancellables = Set() private init() { - // Initial load - availableMCPServerTools = CopilotMCPToolManager.getAvailableMCPServerToolsCollections() - - // Setup notification to update when MCP server tools collections change - NotificationCenter.default + DistributedNotificationCenter.default() .publisher(for: .gitHubCopilotMCPToolsDidChange) .receive(on: DispatchQueue.main) .sink { [weak self] _ in guard let self = self else { return } - self.refreshTools() + Task { + await self.refreshMCPServerTools() + } } .store(in: &cancellables) + + Task { + // Initial load of MCP server tools collections from ExtensionService process + await refreshMCPServerTools() + } + } + + @MainActor + private func refreshMCPServerTools() async { + do { + let service = try getService() + let mcpTools = try await service.getAvailableMCPServerToolsCollections() + refreshTools(tools: mcpTools) + } catch { + Logger.client.error("Failed to fetch MCP server tools: \(error)") + } } - - private func refreshTools() { - self.availableMCPServerTools = CopilotMCPToolManager.getAvailableMCPServerToolsCollections() - AppState.shared.cleanupMCPToolsStatus(availableTools: self.availableMCPServerTools) - AppState.shared.createMCPToolsStatus(self.availableMCPServerTools) + + private func refreshTools(tools: [MCPServerToolsCollection]?) { + guard let tools = tools else { + // nil means the tools data is ready, and skip it first. + return + } + + AppState.shared.cleanupMCPToolsStatus(availableTools: tools) + AppState.shared.createMCPToolsStatus(tools) + self.availableMCPServerTools = tools } } diff --git a/Core/Sources/HostApp/MCPSettings/MCPServerToolsSection.swift b/Core/Sources/HostApp/MCPSettings/MCPServerToolsSection.swift index 5464a6f3..9641a45a 100644 --- a/Core/Sources/HostApp/MCPSettings/MCPServerToolsSection.swift +++ b/Core/Sources/HostApp/MCPSettings/MCPServerToolsSection.swift @@ -17,12 +17,8 @@ struct MCPServerToolsSection: View { HStack(spacing: 8) { Text("MCP Server: \(serverTools.name)").fontWeight(.medium) if serverTools.status == .error { - if hasUnsupportedServerType() { - Badge(text: getUnsupportedServerTypeMessage(), level: .danger, icon: "xmark.circle.fill") - } else { - let message = extractErrorMessage(serverTools.error?.description ?? "") - Badge(text: message, level: .danger, icon: "xmark.circle.fill") - } + let message = extractErrorMessage(serverTools.error?.description ?? "") + Badge(text: message, level: .danger, icon: "xmark.circle.fill") } Spacer() } @@ -59,32 +55,11 @@ struct MCPServerToolsSection: View { ) } } - } - - // Function to check if the MCP config contains unsupported server types - private func hasUnsupportedServerType() -> Bool { - let mcpConfig = UserDefaults.shared.value(for: \.gitHubCopilotMCPConfig) - // Check if config contains a URL field for this server - guard !mcpConfig.isEmpty else { return false } - - do { - guard let jsonData = mcpConfig.data(using: .utf8), - let jsonObject = try JSONSerialization.jsonObject(with: jsonData) as? [String: Any], - let serverConfig = jsonObject[serverTools.name] as? [String: Any], - let url = serverConfig["url"] as? String else { - return false - } - - return true - } catch { - return false + .onChange(of: serverTools) { newValue in + initializeToolStates(server: newValue) } } - - // Get the warning message for unsupported server types - private func getUnsupportedServerTypeMessage() -> String { - return "SSE/HTTP transport is not yet supported" - } + var body: some View { VStack(alignment: .leading, spacing: 0) { @@ -103,7 +78,7 @@ struct MCPServerToolsSection: View { serverToggle } .onAppear { - initializeToolStates() + initializeToolStates(server: serverTools) if forceExpand { isExpanded = true } @@ -131,17 +106,16 @@ struct MCPServerToolsSection: View { return description[start..: View { let title: String @@ -6,20 +7,22 @@ struct SettingsButtonRow: View { @ViewBuilder let content: () -> Content var body: some View { - HStack(alignment: .center, spacing: 8) { - VStack(alignment: .leading) { - Text(title) - .font(.body) - if let subtitle = subtitle { - Text(subtitle) - .font(.footnote) + WithPerceptionTracking{ + HStack(alignment: .center, spacing: 8) { + VStack(alignment: .leading) { + Text(title) + .font(.body) + if let subtitle = subtitle { + Text(subtitle) + .font(.footnote) + } } + Spacer() + content() } - Spacer() - content() + .foregroundStyle(.primary) + .padding(10) } - .foregroundStyle(.primary) - .padding(10) } } diff --git a/Core/Sources/Service/RealtimeSuggestionController.swift b/Core/Sources/Service/RealtimeSuggestionController.swift index 517717be..899865f1 100644 --- a/Core/Sources/Service/RealtimeSuggestionController.swift +++ b/Core/Sources/Service/RealtimeSuggestionController.swift @@ -153,7 +153,7 @@ public actor RealtimeSuggestionController { // check if user loggin let authStatus = await Status.shared.getAuthStatus() - guard authStatus == .loggedIn else { return } + guard authStatus.status == .loggedIn else { return } guard UserDefaults.shared.value(for: \.realtimeSuggestionToggle) else { return } diff --git a/Core/Sources/Service/XPCService.swift b/Core/Sources/Service/XPCService.swift index 1f4ce005..84ce30e5 100644 --- a/Core/Sources/Service/XPCService.swift +++ b/Core/Sources/Service/XPCService.swift @@ -8,6 +8,7 @@ import Status import XPCShared import HostAppActivator import XcodeInspector +import GitHubCopilotViewModel public class XPCService: NSObject, XPCServiceProtocol { // MARK: - Service @@ -18,6 +19,19 @@ public class XPCService: NSObject, XPCServiceProtocol { Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "N/A" ) } + + public func getXPCCLSVersion(withReply reply: @escaping (String?) -> Void) { + Task { @MainActor in + do { + let service = try GitHubCopilotViewModel.shared.getGitHubCopilotAuthService() + let version = try await service.version() + reply(version) + } catch { + Logger.service.error("Failed to get CLS version: \(error.localizedDescription)") + reply(nil) + } + } + } public func getXPCServiceAccessibilityPermission(withReply reply: @escaping (ObservedAXStatus) -> Void) { Task { @@ -262,6 +276,58 @@ public class XPCService: NSObject, XPCServiceProtocol { reply(nil, error) } } + + // MARK: - MCP Server Tools + public func getAvailableMCPServerToolsCollections(withReply reply: @escaping (Data?) -> Void) { + let availableMCPServerTools = CopilotMCPToolManager.getAvailableMCPServerToolsCollections() + if let availableMCPServerTools = availableMCPServerTools { + // Encode and send the data + let data = try? JSONEncoder().encode(availableMCPServerTools) + reply(data) + } else { + reply(nil) + } + } + + public func updateMCPServerToolsStatus(tools: Data) { + // Decode the data + let decoder = JSONDecoder() + var collections: [UpdateMCPToolsStatusServerCollection] = [] + do { + collections = try decoder.decode([UpdateMCPToolsStatusServerCollection].self, from: tools) + if collections.isEmpty { + return + } + } catch { + Logger.service.error("Failed to decode MCP server collections: \(error)") + return + } + + Task { @MainActor in + await GitHubCopilotService.updateAllClsMCP(collections: collections) + } + } + + // MARK: - Auth + public func signOutAllGitHubCopilotService() { + Task { @MainActor in + do { + try await GitHubCopilotService.signOutAll() + } catch { + Logger.service.error("Failed to sign out all: \(error)") + } + } + } + + public func getXPCServiceAuthStatus(withReply reply: @escaping (Data?) -> Void) { + Task { @MainActor in + let service = try GitHubCopilotViewModel.shared.getGitHubCopilotAuthService() + _ = try await service.checkStatus() + let authStatus = await Status.shared.getAuthStatus() + let data = try? JSONEncoder().encode(authStatus) + reply(data) + } + } } struct NoAccessToAccessibilityAPIError: Error, LocalizedError { diff --git a/ExtensionService/AppDelegate.swift b/ExtensionService/AppDelegate.swift index 5ad06d7a..7f89e6cf 100644 --- a/ExtensionService/AppDelegate.swift +++ b/ExtensionService/AppDelegate.swift @@ -256,7 +256,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate { func setInitialStatusBarStatus() { Task { let authStatus = await Status.shared.getAuthStatus() - if authStatus == .unknown { + if authStatus.status == .unknown { // temporarily kick off a language server instance to prime the initial auth status await forceAuthStatusCheck() } diff --git a/Server/package-lock.json b/Server/package-lock.json index dfbc7944..d31c6de2 100644 --- a/Server/package-lock.json +++ b/Server/package-lock.json @@ -8,7 +8,7 @@ "name": "@github/copilot-xcode", "version": "0.0.1", "dependencies": { - "@github/copilot-language-server": "^1.337.0", + "@github/copilot-language-server": "^1.338.0", "@xterm/addon-fit": "^0.10.0", "@xterm/xterm": "^5.5.0", "monaco-editor": "0.52.2" @@ -36,9 +36,9 @@ } }, "node_modules/@github/copilot-language-server": { - "version": "1.337.0", - "resolved": "https://registry.npmjs.org/@github/copilot-language-server/-/copilot-language-server-1.337.0.tgz", - "integrity": "sha512-tvCgScCaZrHlrQgDqXACH9DzI9uA+EYIMJVMaEyfCE46fbkfDQEixascbpKiRW2cB4eMFnxXlU+m2x8KH54XuA==", + "version": "1.338.0", + "resolved": "https://registry.npmjs.org/@github/copilot-language-server/-/copilot-language-server-1.338.0.tgz", + "integrity": "sha512-QPg4Gn/IWON6J+fqeEHvFMxaHOi+AmBq3jc8ySat2isQ8gL5cWvd/mThXvqeJ9XeHLAsojWvS6YitFCntZviSg==", "license": "https://docs.github.com/en/site-policy/github-terms/github-terms-for-additional-products-and-features", "dependencies": { "vscode-languageserver-protocol": "^3.17.5" diff --git a/Server/package.json b/Server/package.json index 822a3bc6..73223fa6 100644 --- a/Server/package.json +++ b/Server/package.json @@ -7,7 +7,7 @@ "build": "webpack" }, "dependencies": { - "@github/copilot-language-server": "^1.337.0", + "@github/copilot-language-server": "^1.338.0", "@xterm/addon-fit": "^0.10.0", "@xterm/xterm": "^5.5.0", "monaco-editor": "0.52.2" diff --git a/Tool/Package.swift b/Tool/Package.swift index 3391cd51..1e040128 100644 --- a/Tool/Package.swift +++ b/Tool/Package.swift @@ -85,7 +85,7 @@ let package = Package( targets: [ // MARK: - Helpers - .target(name: "XPCShared", dependencies: ["SuggestionBasic", "Logger", "Status", "HostAppActivator"]), + .target(name: "XPCShared", dependencies: ["SuggestionBasic", "Logger", "Status", "HostAppActivator", "GitHubCopilotService"]), .target(name: "Configs"), diff --git a/Tool/Sources/AXExtension/AXUIElement.swift b/Tool/Sources/AXExtension/AXUIElement.swift index 9199fa49..1a790e20 100644 --- a/Tool/Sources/AXExtension/AXUIElement.swift +++ b/Tool/Sources/AXExtension/AXUIElement.swift @@ -65,7 +65,7 @@ public extension AXUIElement { } var isXcodeWorkspaceWindow: Bool { - description == "Xcode.WorkspaceWindow" + description == "Xcode.WorkspaceWindow" || identifier == "Xcode.WorkspaceWindow" } var selectedTextRange: ClosedRange? { diff --git a/Tool/Sources/GitHubCopilotService/LanguageServer/CopilotLocalProcessServer.swift b/Tool/Sources/GitHubCopilotService/LanguageServer/CopilotLocalProcessServer.swift index 8182833f..65a972d6 100644 --- a/Tool/Sources/GitHubCopilotService/LanguageServer/CopilotLocalProcessServer.swift +++ b/Tool/Sources/GitHubCopilotService/LanguageServer/CopilotLocalProcessServer.swift @@ -310,12 +310,7 @@ extension CustomJSONRPCLanguageServer { block(nil) return true case "copilot/mcpTools": - if let payload = GetAllToolsParams.decode( - fromParams: anyNotification.params - ) { - Logger.gitHubCopilot.info("MCPTools: \(payload)") - CopilotMCPToolManager.updateMCPTools(payload.servers) - } + notificationPublisher.send(anyNotification) block(nil) return true case "conversation/preconditionsNotification", "statusNotification": diff --git a/Tool/Sources/GitHubCopilotService/LanguageServer/CopilotMCPToolManager.swift b/Tool/Sources/GitHubCopilotService/LanguageServer/CopilotMCPToolManager.swift index f64c58e7..a2baecbc 100644 --- a/Tool/Sources/GitHubCopilotService/LanguageServer/CopilotMCPToolManager.swift +++ b/Tool/Sources/GitHubCopilotService/LanguageServer/CopilotMCPToolManager.swift @@ -1,4 +1,5 @@ import Foundation +import Logger public extension Notification.Name { static let gitHubCopilotMCPToolsDidChange = Notification @@ -6,34 +7,45 @@ public extension Notification.Name { } public class CopilotMCPToolManager { - private static var availableMCPServerTools: [MCPServerToolsCollection] = [] + private static var availableMCPServerTools: [MCPServerToolsCollection]? public static func updateMCPTools(_ serverToolsCollections: [MCPServerToolsCollection]) { let sortedMCPServerTools = serverToolsCollections.sorted(by: { $0.name.lowercased() < $1.name.lowercased() }) guard sortedMCPServerTools != availableMCPServerTools else { return } availableMCPServerTools = sortedMCPServerTools DispatchQueue.main.async { - NotificationCenter.default.post(name: .gitHubCopilotMCPToolsDidChange, object: nil) + Logger.client.info("Notify about MCP tools change: \(getToolsSummary())") + DistributedNotificationCenter.default().post(name: .gitHubCopilotMCPToolsDidChange, object: nil) } } - public static func getAvailableMCPTools() -> [MCPTool] { + private static func getToolsSummary() -> String { + var summary = "" + guard let tools = availableMCPServerTools else { return summary } + for server in tools { + summary += "Server: \(server.name) with \(server.tools.count) tools (\(server.tools.filter { $0._status == .enabled }.count) enabled, \(server.tools.filter { $0._status == .disabled }.count) disabled). " + } + + return summary + } + + public static func getAvailableMCPTools() -> [MCPTool]? { // Flatten all tools from all servers into a single array - return availableMCPServerTools.flatMap { $0.tools } + return availableMCPServerTools?.flatMap { $0.tools } } - public static func getAvailableMCPServerToolsCollections() -> [MCPServerToolsCollection] { + public static func getAvailableMCPServerToolsCollections() -> [MCPServerToolsCollection]? { return availableMCPServerTools } public static func hasMCPTools() -> Bool { - return !availableMCPServerTools.isEmpty + return availableMCPServerTools != nil && !availableMCPServerTools!.isEmpty } public static func clearMCPTools() { availableMCPServerTools = [] DispatchQueue.main.async { - NotificationCenter.default.post(name: .gitHubCopilotMCPToolsDidChange, object: nil) + DistributedNotificationCenter.default().post(name: .gitHubCopilotMCPToolsDidChange, object: nil) } } } diff --git a/Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotRequest.swift b/Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotRequest.swift index b5b15e50..c750f4a8 100644 --- a/Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotRequest.swift +++ b/Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotRequest.swift @@ -51,7 +51,7 @@ public struct GitHubCopilotCodeSuggestion: Codable, Equatable { public var displayText: String } -public func editorConfiguration() -> JSONValue { +public func editorConfiguration(includeMCP: Bool) -> JSONValue { var proxyAuthorization: String? { let username = UserDefaults.shared.value(for: \.gitHubCopilotProxyUsername) if username.isEmpty { return nil } @@ -96,10 +96,12 @@ public func editorConfiguration() -> JSONValue { var d: [String: JSONValue] = [:] if let http { d["http"] = http } if let authProvider { d["github-enterprise"] = authProvider } - if mcp != nil || customInstructions != nil { + if (includeMCP && mcp != nil) || customInstructions != nil { var github: [String: JSONValue] = [:] var copilot: [String: JSONValue] = [:] - copilot["mcp"] = mcp + if includeMCP { + copilot["mcp"] = mcp + } copilot["globalCopilotInstructions"] = customInstructions github["copilot"] = .hash(copilot) d["github"] = .hash(github) diff --git a/Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotService.swift b/Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotService.swift index 0d4da90f..74469e2f 100644 --- a/Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotService.swift +++ b/Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotService.swift @@ -143,8 +143,6 @@ public enum GitHubCopilotError: Error, LocalizedError { public extension Notification.Name { static let gitHubCopilotShouldRefreshEditorInformation = Notification .Name("com.github.CopilotForXcode.GitHubCopilotShouldRefreshEditorInformation") - static let gitHubCopilotShouldUpdateMCPToolsStatus = Notification - .Name("com.github.CopilotForXcode.gitHubCopilotShouldUpdateMCPToolsStatus") } public class GitHubCopilotBaseService { @@ -291,8 +289,6 @@ public class GitHubCopilotBaseService { let notifications = NotificationCenter.default .notifications(named: .gitHubCopilotShouldRefreshEditorInformation) - let mcpNotifications = NotificationCenter.default - .notifications(named: .gitHubCopilotShouldUpdateMCPToolsStatus) Task { [weak self] in if projectRootURL.path != "/" { try? await server.sendNotification( @@ -301,27 +297,22 @@ public class GitHubCopilotBaseService { ) ) } + + let includeMCP = projectRootURL.path != "/" // Send workspace/didChangeConfiguration once after initalize _ = try? await server.sendNotification( .workspaceDidChangeConfiguration( - .init(settings: editorConfiguration()) + .init(settings: editorConfiguration(includeMCP: includeMCP)) ) ) - if let copilotService = self as? GitHubCopilotService { - _ = await copilotService.initializeMCP() - } for await _ in notifications { guard self != nil else { return } _ = try? await server.sendNotification( .workspaceDidChangeConfiguration( - .init(settings: editorConfiguration()) + .init(settings: editorConfiguration(includeMCP: includeMCP)) ) ) } - for await _ in mcpNotifications { - guard self != nil else { return } - _ = await GitHubCopilotService.updateAllMCP() - } } } @@ -428,6 +419,8 @@ public final class GitHubCopilotService: private var cancellables = Set() private var statusWatcher: CopilotAuthStatusWatcher? private static var services: [GitHubCopilotService] = [] // cache all alive copilot service instances + private var isMCPInitialized = false + private var unrestoredMcpServers: [String] = [] override init(designatedServer: any GitHubCopilotLSP) { super.init(designatedServer: designatedServer) @@ -436,7 +429,17 @@ public final class GitHubCopilotService: override public init(projectRootURL: URL = URL(fileURLWithPath: "/"), workspaceURL: URL = URL(fileURLWithPath: "/")) throws { do { try super.init(projectRootURL: projectRootURL, workspaceURL: workspaceURL) + localProcessServer?.notificationPublisher.sink(receiveValue: { [weak self] notification in + if notification.method == "copilot/mcpTools" && projectRootURL.path != "/" { + DispatchQueue.main.async { [weak self] in + guard let self else { return } + Task { @MainActor in + await self.handleMCPToolsNotification(notification) + } + } + } + self?.serverNotificationHandler.handleNotification(notification) }).store(in: &cancellables) localProcessServer?.serverRequestPublisher.sink(receiveValue: { [weak self] (request, callback) in @@ -445,8 +448,6 @@ public final class GitHubCopilotService: updateStatusInBackground() GitHubCopilotService.services.append(self) - - setupMCPInformationObserver() Task { await registerClientTools(server: self) @@ -461,20 +462,7 @@ public final class GitHubCopilotService: deinit { GitHubCopilotService.services.removeAll { $0 === self } } - - // Setup notification observer for refreshing MCP information - private func setupMCPInformationObserver() { - NotificationCenter.default.addObserver( - forName: .gitHubCopilotShouldUpdateMCPToolsStatus, - object: nil, - queue: .main - ) { _ in - Task { - await GitHubCopilotService.updateAllMCP() - } - } - } - + @GitHubCopilotSuggestionActor public func getCompletions( fileURL: URL, @@ -1112,32 +1100,15 @@ public final class GitHubCopilotService: } } - public static func updateAllMCP() async { + public static func updateAllClsMCP(collections: [UpdateMCPToolsStatusServerCollection]) async { var updateError: Error? = nil var servers: [MCPServerToolsCollection] = [] - - // Get and validate data from UserDefaults only once, outside the loop - let jsonString: String = UserDefaults.shared.value(for: \.gitHubCopilotMCPUpdatedStatus) - guard !jsonString.isEmpty, let data = jsonString.data(using: .utf8) else { - Logger.gitHubCopilot.info("No MCP data found in UserDefaults") - return - } - - // Decode the data - let decoder = JSONDecoder() - var collections: [UpdateMCPToolsStatusServerCollection] = [] - do { - collections = try decoder.decode([UpdateMCPToolsStatusServerCollection].self, from: data) - if collections.isEmpty { - Logger.gitHubCopilot.info("No MCP server collections found in UserDefaults") - return - } - } catch { - Logger.gitHubCopilot.error("Failed to decode MCP server collections: \(error)") - return - } for service in services { + if service.projectRootURL.path == "/" { + continue // Skip services with root project URL + } + do { servers = try await service.updateMCPToolsStatus( params: .init(servers: collections) @@ -1150,29 +1121,77 @@ public final class GitHubCopilotService: } CopilotMCPToolManager.updateMCPTools(servers) - + Logger.gitHubCopilot.info("Updated All MCPTools: \(servers.count) servers") + if let updateError { Logger.gitHubCopilot.error("Failed to update MCP Tools status: \(updateError)") } } - public func initializeMCP() async { + private func loadUnrestoredMCPServers() -> [String] { + if let savedJSON = AppState.shared.get(key: "mcpToolsStatus"), + let data = try? JSONEncoder().encode(savedJSON), + let savedStatus = try? JSONDecoder().decode([UpdateMCPToolsStatusServerCollection].self, from: data) { + return savedStatus + .filter { !$0.tools.isEmpty } + .map { $0.name } + } + + return [] + } + + private func restoreMCPToolsStatus(_ mcpServers: [String]) async -> [MCPServerToolsCollection]? { guard let savedJSON = AppState.shared.get(key: "mcpToolsStatus"), let data = try? JSONEncoder().encode(savedJSON), let savedStatus = try? JSONDecoder().decode([UpdateMCPToolsStatusServerCollection].self, from: data) else { Logger.gitHubCopilot.info("Failed to get MCP Tools status") - return + return nil } do { - _ = try await updateMCPToolsStatus( - params: .init(servers: savedStatus) - ) + let savedServers = savedStatus.filter { mcpServers.contains($0.name) } + if savedServers.isEmpty { + return nil + } else { + return try await updateMCPToolsStatus( + params: .init(servers: savedServers) + ) + } } catch let error as ServerError { Logger.gitHubCopilot.error("Failed to update MCP Tools status: \(GitHubCopilotError.languageServerError(error))") } catch { Logger.gitHubCopilot.error("Failed to update MCP Tools status: \(error)") } + + return nil + } + + public func handleMCPToolsNotification(_ notification: AnyJSONRPCNotification) async { + defer { + self.isMCPInitialized = true + } + + if !self.isMCPInitialized { + self.unrestoredMcpServers = self.loadUnrestoredMCPServers() + } + + if let payload = GetAllToolsParams.decode(fromParams: notification.params) { + if !self.unrestoredMcpServers.isEmpty { + // Find servers that need to be restored + let toRestore = payload.servers.filter { !$0.tools.isEmpty } + .filter { self.unrestoredMcpServers.contains($0.name) } + .map { $0.name } + self.unrestoredMcpServers.removeAll { toRestore.contains($0) } + + if let tools = await self.restoreMCPToolsStatus(toRestore) { + Logger.gitHubCopilot.info("Restore MCP tools status for servers: \(toRestore)") + CopilotMCPToolManager.updateMCPTools(tools) + return + } + } + + CopilotMCPToolManager.updateMCPTools(payload.servers) + } } } diff --git a/Tool/Sources/Status/Status.swift b/Tool/Sources/Status/Status.swift index 08910e03..be005f5f 100644 --- a/Tool/Sources/Status/Status.swift +++ b/Tool/Sources/Status/Status.swift @@ -113,8 +113,8 @@ public final actor Status { ).isEmpty } - public func getAuthStatus() -> AuthStatus.Status { - authStatus.status + public func getAuthStatus() -> AuthStatus { + authStatus } public func getCLSStatus() -> CLSStatus { diff --git a/Tool/Sources/Status/StatusObserver.swift b/Tool/Sources/Status/StatusObserver.swift index 2fce99ac..2bda2b2b 100644 --- a/Tool/Sources/Status/StatusObserver.swift +++ b/Tool/Sources/Status/StatusObserver.swift @@ -37,7 +37,7 @@ public class StatusObserver: ObservableObject { let statusInfo = await Status.shared.getStatus() self.authStatus = AuthStatus( - status: authStatus, + status: authStatus.status, username: statusInfo.userName, message: nil ) diff --git a/Tool/Sources/Status/Types/AuthStatus.swift b/Tool/Sources/Status/Types/AuthStatus.swift index 8253a6a5..668b4a11 100644 --- a/Tool/Sources/Status/Types/AuthStatus.swift +++ b/Tool/Sources/Status/Types/AuthStatus.swift @@ -1,6 +1,17 @@ -public struct AuthStatus: Equatable { - public enum Status { case unknown, loggedIn, notLoggedIn, notAuthorized } +public struct AuthStatus: Codable, Equatable, Hashable { + public enum Status: Codable, Equatable, Hashable { + case unknown + case loggedIn + case notLoggedIn + case notAuthorized + } public let status: Status public let username: String? public let message: String? + + public init(status: Status, username: String? = nil, message: String? = nil) { + self.status = status + self.username = username + self.message = message + } } diff --git a/Tool/Sources/XPCShared/XPCExtensionService.swift b/Tool/Sources/XPCShared/XPCExtensionService.swift index 9319045a..bcf82c19 100644 --- a/Tool/Sources/XPCShared/XPCExtensionService.swift +++ b/Tool/Sources/XPCShared/XPCExtensionService.swift @@ -1,4 +1,5 @@ import Foundation +import GitHubCopilotService import Logger import Status @@ -48,6 +49,15 @@ public class XPCExtensionService { } } } + + public func getXPCCLSVersion() async throws -> String? { + try await withXPCServiceConnected { + service, continuation in + service.getXPCCLSVersion { version in + continuation.resume(version) + } + } + } public func getXPCServiceAccessibilityPermission() async throws -> ObservedAXStatus { try await withXPCServiceConnected { @@ -347,4 +357,65 @@ extension XPCExtensionService { } } } + + @XPCServiceActor + public func getAvailableMCPServerToolsCollections() async throws -> [MCPServerToolsCollection]? { + return try await withXPCServiceConnected { + service, continuation in + service.getAvailableMCPServerToolsCollections { data in + guard let data else { + continuation.resume(nil) + return + } + + do { + let tools = try JSONDecoder().decode([MCPServerToolsCollection].self, from: data) + continuation.resume(tools) + } catch { + continuation.reject(error) + } + } + } + } + + @XPCServiceActor + public func updateMCPServerToolsStatus(_ update: [UpdateMCPToolsStatusServerCollection]) async throws { + return try await withXPCServiceConnected { + service, continuation in + do { + let data = try JSONEncoder().encode(update) + service.updateMCPServerToolsStatus(tools: data) + continuation.resume(()) + } catch { + continuation.reject(error) + } + } + } + + @XPCServiceActor + public func signOutAllGitHubCopilotService() async throws { + return try await withXPCServiceConnected { + service, _ in service.signOutAllGitHubCopilotService() + } + } + + @XPCServiceActor + public func getXPCServiceAuthStatus() async throws -> AuthStatus? { + return try await withXPCServiceConnected { + service, continuation in + service.getXPCServiceAuthStatus { data in + guard let data else { + continuation.resume(nil) + return + } + + do { + let authStatus = try JSONDecoder().decode(AuthStatus.self, from: data) + continuation.resume(authStatus) + } catch { + continuation.reject(error) + } + } + } + } } diff --git a/Tool/Sources/XPCShared/XPCServiceProtocol.swift b/Tool/Sources/XPCShared/XPCServiceProtocol.swift index 803e2502..dbc64f4d 100644 --- a/Tool/Sources/XPCShared/XPCServiceProtocol.swift +++ b/Tool/Sources/XPCShared/XPCServiceProtocol.swift @@ -4,58 +4,30 @@ import SuggestionBasic @objc(XPCServiceProtocol) public protocol XPCServiceProtocol { - func getSuggestedCode( - editorContent: Data, - withReply reply: @escaping (_ updatedContent: Data?, Error?) -> Void - ) - func getNextSuggestedCode( - editorContent: Data, - withReply reply: @escaping (_ updatedContent: Data?, Error?) -> Void - ) - func getPreviousSuggestedCode( - editorContent: Data, - withReply reply: @escaping (_ updatedContent: Data?, Error?) -> Void - ) - func getSuggestionAcceptedCode( - editorContent: Data, - withReply reply: @escaping (_ updatedContent: Data?, Error?) -> Void - ) - func getSuggestionRejectedCode( - editorContent: Data, - withReply reply: @escaping (_ updatedContent: Data?, Error?) -> Void - ) - func getRealtimeSuggestedCode( - editorContent: Data, - withReply reply: @escaping (Data?, Error?) -> Void - ) - func getPromptToCodeAcceptedCode( - editorContent: Data, - withReply reply: @escaping (_ updatedContent: Data?, Error?) -> Void - ) - func openChat( - withReply reply: @escaping (Error?) -> Void - ) - func promptToCode( - editorContent: Data, - withReply reply: @escaping (Data?, Error?) -> Void - ) - func customCommand( - id: String, - editorContent: Data, - withReply reply: @escaping (Data?, Error?) -> Void - ) - + func getSuggestedCode(editorContent: Data, withReply reply: @escaping (_ updatedContent: Data?, Error?) -> Void) + func getNextSuggestedCode(editorContent: Data, withReply reply: @escaping (_ updatedContent: Data?, Error?) -> Void) + func getPreviousSuggestedCode(editorContent: Data, withReply reply: @escaping (_ updatedContent: Data?, Error?) -> Void) + func getSuggestionAcceptedCode(editorContent: Data, withReply reply: @escaping (_ updatedContent: Data?, Error?) -> Void) + func getSuggestionRejectedCode(editorContent: Data, withReply reply: @escaping (_ updatedContent: Data?, Error?) -> Void) + func getRealtimeSuggestedCode(editorContent: Data, withReply reply: @escaping (Data?, Error?) -> Void) + func getPromptToCodeAcceptedCode(editorContent: Data, withReply reply: @escaping (_ updatedContent: Data?, Error?) -> Void) + func openChat(withReply reply: @escaping (Error?) -> Void) + func promptToCode(editorContent: Data, withReply reply: @escaping (Data?, Error?) -> Void) + func customCommand(id: String, editorContent: Data, withReply reply: @escaping (Data?, Error?) -> Void) func toggleRealtimeSuggestion(withReply reply: @escaping (Error?) -> Void) - - func prefetchRealtimeSuggestions( - editorContent: Data, - withReply reply: @escaping () -> Void - ) + func prefetchRealtimeSuggestions(editorContent: Data, withReply reply: @escaping () -> Void) func getXPCServiceVersion(withReply reply: @escaping (String, String) -> Void) + func getXPCCLSVersion(withReply reply: @escaping (String?) -> Void) func getXPCServiceAccessibilityPermission(withReply reply: @escaping (ObservedAXStatus) -> Void) func getXPCServiceExtensionPermission(withReply reply: @escaping (ExtensionPermissionStatus) -> Void) func getXcodeInspectorData(withReply reply: @escaping (Data?, Error?) -> Void) + func getAvailableMCPServerToolsCollections(withReply reply: @escaping (Data?) -> Void) + func updateMCPServerToolsStatus(tools: Data) + + func signOutAllGitHubCopilotService() + func getXPCServiceAuthStatus(withReply reply: @escaping (Data?) -> Void) + func postNotification(name: String, withReply reply: @escaping () -> Void) func send(endpoint: String, requestBody: Data, reply: @escaping (Data?, Error?) -> Void) func quit(reply: @escaping () -> Void) From 5d7b9d79c8eef1d1071bcfb5c9df6df8018f8e9e Mon Sep 17 00:00:00 2001 From: Jan Duda Date: Mon, 7 Jul 2025 01:58:19 +0200 Subject: [PATCH 2/2] Add files via upload --- role-assignments-2025-07-07.csv | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 role-assignments-2025-07-07.csv diff --git a/role-assignments-2025-07-07.csv b/role-assignments-2025-07-07.csv new file mode 100644 index 00000000..de0b0e5e --- /dev/null +++ b/role-assignments-2025-07-07.csv @@ -0,0 +1,3 @@ +RoleAssignmentId,Scope,DisplayName,SignInName,RoleDefinitionName,RoleDefinitionId,ObjectId,ObjectType,RoleAssignmentDescription,ConditionVersion,Condition +4ff67848-9234-4b7e-a2f7-83219aecbe6c,/,Jan Duda,janduda1771_gmail.com#EXT#@janduda1771gmail.onmicrosoft.com,Administrator dostępu użytkowników,/providers/Microsoft.Authorization/roleDefinitions/18d7d88d-d35e-4fb5-a5c3-7773c20a72d9,86568aa4-919f-47b0-a2c9-a57b1b3f1246,User,,, +b9a815e9-07ad-4af3-b4cc-de93fc4212f0,/providers/Microsoft.PortalServices,Jan Duda,janduda1771_gmail.com#EXT#@janduda1771gmail.onmicrosoft.com,Właściciel,/providers/Microsoft.Authorization/roleDefinitions/8e3af657-a8ff-443c-a75c-2fe8c4bcb635,86568aa4-919f-47b0-a2c9-a57b1b3f1246,User,,,