Pre-release 0.44.147

Author: actions-user

Core/Sources/HostApp/SharedComponents/Badge.swift

@@ -22,19 +22,30 @@ struct BadgeItem {
 
 struct Badge: View {
     let text: String
+    let attributedText: AttributedString?
     let level: BadgeItem.Level
     let icon: String?
     let isSelected: Bool
 
     init(badgeItem: BadgeItem) {
         text = badgeItem.text
+        attributedText = nil
         level = badgeItem.level
         icon = badgeItem.icon
         isSelected = badgeItem.isSelected
     }
 
     init(text: String, level: BadgeItem.Level, icon: String? = nil, isSelected: Bool = false) {
         self.text = text
+        self.attributedText = nil
+        self.level = level
+        self.icon = icon
+        self.isSelected = isSelected
+    }
+    
+    init(attributedText: AttributedString, level: BadgeItem.Level, icon: String? = nil, isSelected: Bool = false) {
+        self.text = String(attributedText.characters)
+        self.attributedText = attributedText
         self.level = level
         self.icon = icon
         self.isSelected = isSelected
@@ -47,10 +58,18 @@ struct Badge: View {
                     .font(.caption2)
                     .padding(.vertical, 1)
             }
-            Text(text)
-                .fontWeight(.semibold)
-                .font(.caption2)
-                .lineLimit(1)
+            if let attributedText = attributedText {
+                Text(attributedText)
+                    .fontWeight(.semibold)
+                    .font(.caption2)
+                    .lineLimit(1)
+                    .truncationMode(.middle)
+            } else {
+                Text(text)
+                    .fontWeight(.semibold)
+                    .font(.caption2)
+                    .lineLimit(1)
+            }
         }
         .padding(.vertical, 1)
         .padding(.horizontal, 3)
@@ -77,5 +96,6 @@ struct Badge: View {
                 lineWidth: 1
             )
         )
+        .help(text)
     }
 }

Core/Sources/HostApp/ToolsConfigView.swift

@@ -22,6 +22,8 @@ struct MCPConfigView: View {
     @Environment(\.colorScheme) var colorScheme
 
     private static var lastSyncTimestamp: Date? = nil
+    @State private var debounceTimer: Timer?
+    private static let refreshDebounceInterval: TimeInterval = 1.0 // 1.0 second debounce
 
     enum ToolType: String, CaseIterable, Identifiable {
         case MCP, BuiltIn
@@ -241,16 +243,24 @@ struct MCPConfigView: View {
             UserDefaults.shared.set(jsonString, for: \.gitHubCopilotMCPConfig)
         }
 
-        Task {
-            do {
-                let service = try getService()
-                try await service.postNotification(
-                    name: Notification.Name
-                        .gitHubCopilotShouldRefreshEditorInformation.rawValue
-                )
-                toast("MCP configuration updated", .info)
-            } catch {
-                toast(error.localizedDescription, .error)
+        // Debounce the refresh notification to avoid sending too frequently
+        debounceTimer?.invalidate()
+        debounceTimer = Timer.scheduledTimer(withTimeInterval: MCPConfigView.refreshDebounceInterval, repeats: false) { _ in
+            Task {
+                do {
+                    let service = try getService()
+                    try await service.postNotification(
+                        name: Notification.Name
+                            .gitHubCopilotShouldRefreshEditorInformation.rawValue
+                    )
+                    await MainActor.run {
+                        toast("Fetching MCP tools...", .info)
+                    }
+                } catch {
+                    await MainActor.run {
+                        toast(error.localizedDescription, .error)
+                    }
+                }
             }
         }
     }

Core/Sources/HostApp/ToolsSettings/MCPRegistry/MCPRegistryInstallation.swift

@@ -263,25 +263,8 @@ public class MCPRegistryService: ObservableObject {
         let jsonData = try JSONSerialization.data(withJSONObject: config, options: [.prettyPrinted])
         try jsonData.write(to: configFileURL)
 
-        // Update UserDefaults and trigger refresh
-        // Extract only the "servers" object to save to UserDefaults (consistent with ToolsConfigView)
-        if let serversDict = config["servers"] as? [String: Any] {
-            let serversData = try JSONSerialization.data(withJSONObject: serversDict, options: [.prettyPrinted])
-            if let jsonString = String(data: serversData, encoding: .utf8) {
-                UserDefaults.shared.set(jsonString, for: \.gitHubCopilotMCPConfig)
-            }
-        }
-
-        Task {
-            do {
-                let service = try getService()
-                try await service.postNotification(
-                    name: Notification.Name.gitHubCopilotShouldRefreshEditorInformation.rawValue
-                )
-            } catch {
-                Logger.client.error("Failed to post refresh notification: \(error)")
-            }
-        }
+        // Note: UserDefaults update and notification will be handled by ToolsConfigView's file monitor
+        // with debouncing to prevent duplicate notifications
     }
 
     // MARK: - Server Installation Status

Core/Sources/HostApp/ToolsSettings/MCPRegistry/MCPRegistryURLInputField.swift

@@ -13,6 +13,7 @@ struct MCPRegistryURLInputField: View {
     let isSheet: Bool
     let mcpRegistryEntry: MCPRegistryEntry?
     let onValidationChange: ((Bool) -> Void)?
+    let onCommit: (() -> Void)?
 
     private var isRegistryOnly: Bool {
         mcpRegistryEntry?.registryAccess == .registryOnly
@@ -23,13 +24,15 @@ struct MCPRegistryURLInputField: View {
         maxURLLength: Int = 2048,
         isSheet: Bool = false,
         mcpRegistryEntry: MCPRegistryEntry? = nil,
-        onValidationChange: ((Bool) -> Void)? = nil
+        onValidationChange: ((Bool) -> Void)? = nil,
+        onCommit: (() -> Void)? = nil
     ) {
         self._urlText = urlText
         self.maxURLLength = maxURLLength
         self.isSheet = isSheet
         self.mcpRegistryEntry = mcpRegistryEntry
         self.onValidationChange = onValidationChange
+        self.onCommit = onCommit
     }
 
     var body: some View {
@@ -43,6 +46,9 @@ struct MCPRegistryURLInputField: View {
                             .onChange(of: urlText) { newValue in
                                 handleURLChange(newValue)
                             }
+                            .onSubmit {
+                                onCommit?()
+                            }
                     }
                 } else {
                     TextField("MCP Registry URL:", text: $urlText)
@@ -52,20 +58,25 @@ struct MCPRegistryURLInputField: View {
                         .onChange(of: urlText) { newValue in
                             handleURLChange(newValue)
                         }
+                        .onSubmit {
+                            onCommit?()
+                        }
                 }
 
                 Menu {
                     ForEach(urlHistory, id: \.self) { url in
                         Button(url) {
                             urlText = url
                             isFocused = false
+                            onCommit?()
                         }
                     }
 
                     Divider()
 
                     Button("Reset to Default") {
                         urlText = defaultMCPRegistryURL
+                        onCommit?()
                     }
 
                     if !urlHistory.isEmpty {

Core/Sources/HostApp/ToolsSettings/MCPRegistry/MCPRegistryURLSheet.swift

@@ -66,6 +66,6 @@ struct MCPRegistryURLSheet: View {
     }
 
     private func openHelpLink() {
-        NSWorkspace.shared.open(URL(string: "https://registry.mcpservers.org")!)
+        NSWorkspace.shared.open(URL(string: "https://docs.github.com/en/copilot/how-tos/provide-context/use-mcp/select-an-mcp-registry")!)
     }
 }

Core/Sources/HostApp/ToolsSettings/MCPRegistry/MCPRegistryURLView.swift

@@ -75,8 +75,12 @@ struct MCPRegistryURLView: View {
                             maxURLLength: maxURLLength,
                             isSheet: false,
                             mcpRegistryEntry: mcpRegistry?.first,
-                            onValidationChange: { isValid in
-                                if isValid && (!tempURLText.isEmpty || tempURLText.isEmpty) {
+                            onValidationChange: { _ in
+                                // Only validate, don't update mcpRegistryURL here
+                            },
+                            onCommit: {
+                                // Update mcpRegistryURL when user presses Enter
+                                if tempURLText != mcpRegistryURL {
                                     mcpRegistryURL = tempURLText
                                 }
                             }
@@ -105,6 +109,7 @@ struct MCPRegistryURLView: View {
             )
             .animation(.easeInOut(duration: 0.3), value: isExpanded)
             .onAppear {
+                tempURLText = mcpRegistryURL
                 Task { await getMCPRegistryAllowlist() }
             }
             .onReceive(DistributedNotificationCenter.default().publisher(for: .authStatusDidChange)) { _ in
@@ -122,6 +127,11 @@ struct MCPRegistryURLView: View {
     }
 
     private func loadMCPServers() async {
+        // Update mcpRegistryURL with current tempURLText before loading
+        if tempURLText != mcpRegistryURL {
+            mcpRegistryURL = tempURLText
+        }
+        
         isLoading = true
         defer { isLoading = false }
         do {
@@ -208,7 +218,17 @@ struct MCPRegistryURLView: View {
         defer { isLoading = false }
 
         // Let the view model handle the entire update flow including clearing and fetching
-        await MCPServerGalleryWindow.refreshFromURL(mcpRegistryEntry: mcpRegistry?.first)
+        if let error = await MCPServerGalleryWindow.refreshFromURL(mcpRegistryEntry: mcpRegistry?.first) {
+            // Display error in the URL view
+            if let serviceError = error as? XPCExtensionServiceError {
+                errorMessage = serviceError.underlyingError?.localizedDescription ?? serviceError.localizedDescription
+            } else {
+                errorMessage = error.localizedDescription
+            }
+            isExpanded = true
+        } else {
+            errorMessage = ""
+        }
     }
 }
 

Core/Sources/HostApp/ToolsSettings/MCPRegistry/MCPServerGalleryView.swift

@@ -5,6 +5,7 @@ import GitHubCopilotService
 import Logger
 import SharedUIComponents
 import SwiftUI
+import XPCShared
 
 enum MCPServerGalleryWindow {
     static let identifier = "MCPServerGalleryWindow"
@@ -53,8 +54,8 @@ enum MCPServerGalleryWindow {
         currentViewModel?.updateData(serverList: serverList, mcpRegistryEntry: mcpRegistryEntry)
     }
 
-    @MainActor static func refreshFromURL(mcpRegistryEntry: MCPRegistryEntry? = nil) async {
-        await currentViewModel?.refreshFromURL(mcpRegistryEntry: mcpRegistryEntry)
+    @MainActor static func refreshFromURL(mcpRegistryEntry: MCPRegistryEntry? = nil) async -> Error? {
+        return await currentViewModel?.refreshFromURL(mcpRegistryEntry: mcpRegistryEntry)
     }
 
     static func isOpen() -> Bool {
@@ -87,6 +88,14 @@ struct MCPServerGalleryView: View {
 
     var body: some View {
         VStack(spacing: 0) {
+            if let error = viewModel.lastError {
+                if let serviceError = error as? XPCExtensionServiceError {
+                    Badge(text: serviceError.underlyingError?.localizedDescription ?? serviceError.localizedDescription, level: .danger, icon: "xmark.circle.fill")
+                } else {
+                    Badge(text: error.localizedDescription, level: .danger, icon: "xmark.circle.fill")
+                }
+            }
+            
             tableHeaderView
             serverListView
         }

Core/Sources/HostApp/ToolsSettings/MCPRegistry/MCPServerGalleryViewModel.swift

@@ -28,6 +28,7 @@ final class MCPServerGalleryViewModel: ObservableObject {
     @Published var pendingServer: MCPRegistryServerDetail?
     @Published var infoSheetServer: MCPRegistryServerDetail?
     @Published var mcpRegistryEntry: MCPRegistryEntry?
+    @Published private(set) var lastError: Error?
 
     @AppStorage(\.mcpRegistryURL) var mcpRegistryURL
 
@@ -154,11 +155,12 @@ final class MCPServerGalleryViewModel: ObservableObject {
             searchText = ""
 
             // Load servers from the base URL
-            await loadServerList(resetToFirstPage: true)
+            _ = await loadServerList(resetToFirstPage: true)
         }
     }
 
-    func refreshFromURL(mcpRegistryEntry: MCPRegistryEntry? = nil) async {
+    // Called from Settings view to refresh with optional new registry entry
+    func refreshFromURL(mcpRegistryEntry: MCPRegistryEntry? = nil) async -> Error? {
         isRefreshing = true
         defer { isRefreshing = false }
 
@@ -170,10 +172,12 @@ final class MCPServerGalleryViewModel: ObservableObject {
         Logger.client.info("Cleared gallery view model data for refresh")
 
         // Load servers from the base URL
-        await loadServerList(resetToFirstPage: true)
+        let error = await loadServerList(resetToFirstPage: true)
 
         // Reload installed servers after fetching new data
         loadInstalledServers()
+        
+        return error
     }
 
     func updateData(serverList: MCPRegistryServerList, mcpRegistryEntry: MCPRegistryEntry? = nil) {
@@ -214,7 +218,7 @@ final class MCPServerGalleryViewModel: ObservableObject {
         }
     }
 
-    private func loadServerList(resetToFirstPage: Bool) async {
+    private func loadServerList(resetToFirstPage: Bool) async -> Error? {
         if resetToFirstPage {
             isInitialLoading = true
         } else {
@@ -225,6 +229,8 @@ final class MCPServerGalleryViewModel: ObservableObject {
             isInitialLoading = false
             isLoadingMore = false
         }
+        
+        lastError = nil
 
         do {
             let service = try getService()
@@ -247,8 +253,12 @@ final class MCPServerGalleryViewModel: ObservableObject {
                 servers.append(contentsOf: serverList?.servers ?? [])
                 registryMetadata = serverList?.metadata
             }
+            
+            return nil
         } catch {
             Logger.client.error("Failed to load MCP servers: \(error)")
+            lastError = error
+            return error
         }
     }