Pre-release 0.44.146

Author: actions-user

Core/Sources/HostApp/SharedComponents/CardGroupBoxStyle.swift

@@ -15,7 +15,8 @@ public struct CardGroupBoxStyle: GroupBoxStyle {
             configuration.label.foregroundColor(.primary)
             configuration.content.foregroundColor(.primary)
         }
-        .padding(8)
+        .padding(.vertical, 12)
+        .padding(.horizontal, 20)
         .frame(maxWidth: .infinity, alignment: .topLeading)
         .background(backgroundColor)
         .cornerRadius(12)

Core/Sources/HostApp/ToolsConfigView.swift

@@ -71,6 +71,10 @@ struct MCPConfigView: View {
                             setupConfigFilePath()
                             Task {
                                 await updateFeatureFlag()
+                                // Start monitoring if feature is already enabled on initial load
+                                if isMCPFFEnabled {
+                                    startMonitoringConfigFile()
+                                }
                             }
                         }
                         .onDisappear {
@@ -179,18 +183,22 @@ struct MCPConfigView: View {
         stopMonitoringConfigFile()  // Stop existing monitoring if any
 
         isMonitoring = true
+        Logger.client.info("Starting MCP config file monitoring")
 
         fileMonitorTask = Task {
             let configFileURL = URL(fileURLWithPath: configFilePath)
 
             // Check for file changes periodically
             while isMonitoring {
-                try? await Task.sleep(nanoseconds: 3_000_000_000)  // Check every 3 seconds
+                try? await Task.sleep(nanoseconds: 3_000_000_000)  // Check every 1 second for better responsiveness
+
+                guard isMonitoring else { break }  // Extra check after sleep
 
                 let currentDate = getFileModificationDate(url: configFileURL)
 
                 if let currentDate = currentDate, currentDate != lastModificationDate {
                     // File modification date has changed, update our record
+                    Logger.client.info("MCP config file change detected")
                     lastModificationDate = currentDate
 
                     // Read and validate the updated content
@@ -204,14 +212,18 @@ struct MCPConfigView: View {
                         // If JSON is invalid, show error
                         await MainActor.run {
                             toast("Invalid JSON in MCP configuration file", .error)
+                            Logger.client.info("Invalid JSON detected during monitoring")
                         }
                     }
                 }
             }
+            Logger.client.info("Stopped MCP config file monitoring")
         }
     }
 
     private func stopMonitoringConfigFile() {
+        guard isMonitoring else { return }
+        Logger.client.info("Stopping MCP config file monitoring")
         isMonitoring = false
         fileMonitorTask?.cancel()
         fileMonitorTask = nil

Core/Sources/HostApp/ToolsSettings/CopilotMCPToolManagerObservable.swift

@@ -17,6 +17,7 @@ class CopilotMCPToolManagerObservable: ObservableObject {
             .receive(on: DispatchQueue.main)
             .sink { [weak self] _ in
                 guard let self = self else { return }
+                Logger.client.info("MCP tools change notification received")
                 Task {
                     await self.refreshMCPServerTools()
                 }
@@ -31,6 +32,7 @@ class CopilotMCPToolManagerObservable: ObservableObject {
 
     @MainActor
     private func refreshMCPServerTools() async {
+        Logger.client.info("Refreshing MCP server tools...")
         do {
             let service = try getService()
             let mcpTools = try await service.getAvailableMCPServerToolsCollections()
@@ -43,9 +45,14 @@ class CopilotMCPToolManagerObservable: ObservableObject {
     private func refreshTools(tools: [MCPServerToolsCollection]?) {
         guard let tools = tools else {
             // nil means the tools data is ready, and skip it first.
+            Logger.client.info("MCP tools data not ready yet, skipping refresh")
             return
         }
 
+        let totalToolsCount = tools.reduce(0) { $0 + $1.tools.count }
+        let serverNames = tools.map { $0.name }.joined(separator: ", ")
+        Logger.client.info("Refreshed MCP tools - Servers: \(tools.count), Total tools: \(totalToolsCount), Server names: [\(serverNames)]")
+        
         AppState.shared.cleanupMCPToolsStatus(availableTools: tools)
         AppState.shared.createMCPToolsStatus(tools)
         self.availableMCPServerTools = tools

Core/Sources/HostApp/ToolsSettings/MCPAppState.swift

@@ -95,10 +95,10 @@ extension AppState {
 
         // Get all available server names and their respective tool names
         let availableServerMap = Dictionary(
-            uniqueKeysWithValues: availableTools.map { collection in
+            availableTools.map { collection in
                 (collection.name, Set(collection.tools.map { $0.name }))
             }
-        )
+        ) { first, _ in first }
 
         // Remove servers that don't exist in available tools
         existingServers.removeAll { !availableServerMap.keys.contains($0.name) }

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

@@ -173,7 +173,7 @@ public class MCPRegistryService: ObservableObject {
 
         // Add headers if present
         if let headers = remote.headers, !headers.isEmpty {
-            let headersDict = Dictionary(uniqueKeysWithValues: headers.map { ($0.name, $0.value ?? "") })
+            let headersDict = Dictionary(headers.map { ($0.name, $0.value ?? "") }) { first, _ in first }
             config["requestInit"] = ["headers": headersDict]
         }
 
@@ -208,7 +208,7 @@ public class MCPRegistryService: ObservableObject {
 
         // Environment variables
         if let envVars = package.environmentVariables, !envVars.isEmpty {
-            config["env"] = Dictionary(uniqueKeysWithValues: envVars.map { ($0.name, $0.value ?? "") })
+            config["env"] = Dictionary(envVars.map { ($0.name, $0.value ?? "") }) { first, _ in first }
         }
 
         addMetadata(to: &config, serverDetail: serverDetail)
@@ -344,10 +344,22 @@ public class MCPRegistryService: ObservableObject {
     }
 
     public func createRegistryServerKey(registryURL: String, serverId: String) -> String {
-        return "\(registryURL)|\(serverId)"
+        let baseURL = normalizeRegistryURL(registryURL)
+        return "\(baseURL)|\(serverId)"
     }
 
     // MARK: - Registry Key Helpers
+    
+    private func normalizeRegistryURL(_ url: String) -> String {
+        // Remove trailing /v0/servers, /v0.1/servers or similar version paths
+        var normalized = url.trimmingCharacters(in: .whitespacesAndNewlines)
+        if let range = normalized.range(of: "/v\\d+(\\.\\d+)?/servers$", options: .regularExpression) {
+            normalized = String(normalized[..<range.lowerBound])
+        }
+        // Remove trailing slash
+        return normalized.trimmingCharacters(in: CharacterSet(charactersIn: "/"))
+    }
+    
     private func expectedRegistryKey(for serverDetail: MCPRegistryServerDetail) -> String? {
         guard let serverId = Self.getServerId(from: serverDetail),
               let registryURL = try? getRegistryURL() else { return nil }

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

@@ -11,78 +11,115 @@ struct MCPRegistryURLInputField: View {
     let defaultMCPRegistryURL = "https://api.mcp.github.com/2025-09-15/v0/servers"
     let maxURLLength: Int
     let isSheet: Bool
+    let mcpRegistryEntry: MCPRegistryEntry?
     let onValidationChange: ((Bool) -> Void)?
 
+    private var isRegistryOnly: Bool {
+        mcpRegistryEntry?.registryAccess == .registryOnly
+    }
+    
     init(
         urlText: Binding<String>,
         maxURLLength: Int = 2048,
         isSheet: Bool = false,
+        mcpRegistryEntry: MCPRegistryEntry? = nil,
         onValidationChange: ((Bool) -> Void)? = nil
     ) {
         self._urlText = urlText
         self.maxURLLength = maxURLLength
         self.isSheet = isSheet
+        self.mcpRegistryEntry = mcpRegistryEntry
         self.onValidationChange = onValidationChange
     }
 
     var body: some View {
-        HStack(spacing: 8) {
-            if isSheet {
-                TextFieldsContainer {
-                    TextField("MCP Registry URL", text: $urlText)
+        VStack(alignment: .leading, spacing: 8) {
+            HStack(spacing: 8) {
+                if isSheet {
+                    TextFieldsContainer {
+                        TextField("MCP Registry URL", text: $urlText)
+                            .focused($isFocused)
+                            .disabled(isRegistryOnly)
+                            .onChange(of: urlText) { newValue in
+                                handleURLChange(newValue)
+                            }
+                    }
+                } else {
+                    TextField("MCP Registry URL:", text: $urlText)
+                        .textFieldStyle(.roundedBorder)
                         .focused($isFocused)
+                        .disabled(isRegistryOnly)
                         .onChange(of: urlText) { newValue in
                             handleURLChange(newValue)
                         }
                 }
-            } else {
-                TextField("MCP Registry URL:", text: $urlText)
-                    .textFieldStyle(.roundedBorder)
-                    .focused($isFocused)
-                    .onChange(of: urlText) { newValue in
-                        handleURLChange(newValue)
+                
+                Menu {
+                    ForEach(urlHistory, id: \.self) { url in
+                        Button(url) {
+                            urlText = url
+                            isFocused = false
+                        }
                     }
-            }
-            
-            Menu {
-                ForEach(urlHistory, id: \.self) { url in
-                    Button(url) {
-                        urlText = url
-                        isFocused = false
+                    
+                    Divider()
+                    
+                    Button("Reset to Default") {
+                        urlText = defaultMCPRegistryURL
                     }
-                }
-                
-                Divider()
-                
-                Button("Reset to Default") {
-                    urlText = defaultMCPRegistryURL
-                }
-                
-                if !urlHistory.isEmpty {
-                    Button("Clear History") {
-                        urlHistory = []
+                    
+                    if !urlHistory.isEmpty {
+                        Button("Clear History") {
+                            urlHistory = []
+                        }
                     }
-                }
-            } label: {
-                Image(systemName: "chevron.down")
+                } label: {
+                    Image(systemName: "chevron.down")
                     .resizable()
                     .scaledToFit()
                     .frame(width: 11, height: 11)
                     .padding(isSheet ? 9 : 3)
+                }
+                .labelStyle(.iconOnly)
+                .menuIndicator(.hidden)
+                .buttonStyle(
+                    HoverButtonStyle(
+                        hoverColor: SecondarySystemFillColor,
+                        backgroundColor: SecondarySystemFillColor,
+                        cornerRadius: isSheet ? 12 : 6
+                    )
+                )
+                .opacity(isRegistryOnly ? 0.5 : 1)
+                .disabled(isRegistryOnly)
             }
-            .labelStyle(.iconOnly)
-            .menuIndicator(.hidden)
-            .buttonStyle(
-                HoverButtonStyle(
-                    hoverColor: SecondarySystemFillColor,
-                    backgroundColor: SecondarySystemFillColor,
-                    cornerRadius: isSheet ? 12 : 6
+            
+            if isRegistryOnly {
+                Badge(
+                    text: "This URL is managed by \(mcpRegistryEntry!.owner.login) and cannot be modified",
+                    level: .info,
+                    icon: "info.circle.fill"
                 )
-            )
+            }
+        }
+        .onAppear {
+            if isRegistryOnly, let entryURL = mcpRegistryEntry?.url {
+                urlText = entryURL
+            }
+        }
+        .onChange(of: mcpRegistryEntry) { newEntry in
+            if newEntry?.registryAccess == .registryOnly, let entryURL = newEntry?.url {
+                urlText = entryURL
+            }
         }
     }
 
     private func handleURLChange(_ newValue: String) {
+        // If registryOnly, force the URL back to the registry entry URL
+        if isRegistryOnly, let entryURL = mcpRegistryEntry?.url {
+            urlText = entryURL
+            return
+        }
+        
         let limitedText = String(newValue.prefix(maxURLLength))
         if limitedText != newValue {
             urlText = limitedText

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

@@ -7,10 +7,12 @@ struct MCPRegistryURLSheet: View {
     @Environment(\.dismiss) private var dismiss
     @State private var originalMcpRegistryURL: String = ""
     @State private var isFormValid: Bool = true
-
+    
+    let mcpRegistryEntry: MCPRegistryEntry?
     let onURLUpdated: (() -> Void)?
 
-    init(onURLUpdated: (() -> Void)? = nil) {
+    init(mcpRegistryEntry: MCPRegistryEntry? = nil, onURLUpdated: (() -> Void)? = nil) {
+        self.mcpRegistryEntry = mcpRegistryEntry
         self.onURLUpdated = onURLUpdated
     }
 
@@ -28,6 +30,7 @@ struct MCPRegistryURLSheet: View {
                     MCPRegistryURLInputField(
                         urlText: $originalMcpRegistryURL,
                         isSheet: true,
+                        mcpRegistryEntry: mcpRegistryEntry,
                         onValidationChange: { isValid in
                             isFormValid = isValid
                         }
@@ -46,7 +49,7 @@ struct MCPRegistryURLSheet: View {
                         dismiss()
                     }
                     .buttonStyle(.borderedProminent)
-                    .disabled(!isFormValid)
+                    .disabled(!isFormValid || mcpRegistryEntry?.registryAccess == .registryOnly)
                 }
             }
             .textFieldStyle(.plain)