Merge branch 'github:main' into main

Logan23-max · web-flow · commit 6ceac263beef · 2026-04-27T01:27:05.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.48.0 - April 23, 2026
+### Added
+- Context window usage details in chat, including a token breakdown for system instructions, messages, attached files, and tool results.
+- Auto Compress setting to compact conversation history and save context tokens.
+- Install flow for Xcode's built-in MCP server from settings.
+
+### Changed
+- Custom agents and the Auto model are now generally available.
+- Removed support for macOS 12.
+- Improved UI for model picker tooltips.
+
+### Fixed
+- Fixed an issue where GPT-5.4 requests could return a 400 error.
+- Fixed an issue where the MCP allowlist did not work correctly.
+
 ## 0.47.0 - February 4, 2026
 ### Added
 - Auto approval for MCP tools, sensitive files, and terminal commands.
diff --git a/Core/Sources/HostApp/ToolsSettings/MCPRegistry/MCPRegistryInstallation.swift b/Core/Sources/HostApp/ToolsSettings/MCPRegistry/MCPRegistryInstallation.swift
@@ -90,9 +90,55 @@ public class MCPRegistryService: ObservableObject {
     public static let shared = MCPRegistryService()
     public static let apiVersion = "v0.1"
     @AppStorage(\.mcpRegistryBaseURL) var mcpRegistryBaseURL
-    
+    @Published public private(set) var mcpRegistryEntries: [MCPRegistryEntry]?
+
     private init() {}
 
+    /// Fetches the MCP registry allowlist from the language server and updates
+    /// ``mcpRegistryEntries``. Safe to call from any view's `onAppear` –
+    /// duplicate in-flight calls are coalesced via the `isRefreshing` flag.
+    private var isRefreshing = false
+
+    public func refreshAllowlist() async {
+        guard !isRefreshing else { return }
+        isRefreshing = true
+        defer { isRefreshing = false }
+
+        do {
+            let service = try getService()
+
+            let authStatus = try await service.getXPCServiceAuthStatus()
+            guard authStatus?.status == .loggedIn else {
+                Logger.client.info("User not logged in, skipping MCP registry allowlist fetch")
+                mcpRegistryEntries = nil
+                return
+            }
+
+            let result = try await service.getMCPRegistryAllowlist()
+
+            guard let result = result, !result.mcpRegistries.isEmpty else {
+                if result == nil {
+                    Logger.client.error("Failed to get allowlist result")
+                } else {
+                    mcpRegistryEntries = []
+                }
+                return
+            }
+
+            if let firstRegistry = result.mcpRegistries.first {
+                let entry = MCPRegistryEntry(
+                    url: firstRegistry.url,
+                    registryAccess: firstRegistry.registryAccess,
+                    owner: firstRegistry.owner
+                )
+                mcpRegistryEntries = [entry]
+                Logger.client.info("Current MCP Registry Entry: \(entry)")
+            }
+        } catch {
+            Logger.client.error("Failed to get MCP allowlist from registry: \(error)")
+        }
+    }
+
     public static func getServerName(from serverDetail: MCPRegistryServerDetail) -> String {
         return serverDetail.name
     }
diff --git a/Core/Sources/HostApp/ToolsSettings/MCPRegistry/MCPRegistryURLView.swift b/Core/Sources/HostApp/ToolsSettings/MCPRegistry/MCPRegistryURLView.swift
@@ -14,7 +14,7 @@ struct MCPRegistryURLView: View {
     @State private var isLoading: Bool = false
     @State private var tempURLText: String = ""
     @State private var errorMessage: String = ""
-    @State private var mcpRegistry: [MCPRegistryEntry]? = nil
+    @ObservedObject private var registryService = MCPRegistryService.shared
 
     private let maxURLLength = 2048
     private let mcpRegistryUrlVersion = "/v0.1/servers"
@@ -48,7 +48,7 @@ struct MCPRegistryURLView: View {
                             }
                             .buttonStyle(.bordered)
                             .help("Configure your MCP Registry Base URL")
-                            .disabled(mcpRegistry?.first?.registryAccess == .registryOnly)
+                            .disabled(registryService.mcpRegistryEntries?.first?.registryAccess == .registryOnly)
                             
                             Button { Task{ await loadMCPServers() } } label: {
                                 HStack(spacing: 0) {
@@ -74,7 +74,7 @@ struct MCPRegistryURLView: View {
                             urlText: $tempURLText,
                             maxURLLength: maxURLLength,
                             isSheet: false,
-                            mcpRegistryEntry: mcpRegistry?.first,
+                            mcpRegistryEntry: registryService.mcpRegistryEntries?.first,
                             onValidationChange: { _ in
                                 // Only validate, don't update mcpRegistryURL here
                             },
@@ -115,7 +115,7 @@ struct MCPRegistryURLView: View {
                 tempURLText = newValue
                 Task { await updateGalleryWindowIfOpen() }
             }
-            .onChange(of: mcpRegistry) { _ in
+            .onChange(of: registryService.mcpRegistryEntries) { _ in
                 Task { await updateGalleryWindowIfOpen() }
             }
         }
@@ -145,7 +145,7 @@ struct MCPRegistryURLView: View {
             mcpRegistryBaseURLHistory.addToHistory(mcpRegistryBaseURL)
             errorMessage = ""
             
-            MCPServerGalleryWindow.open(serverList: serverList, mcpRegistryEntry: mcpRegistry?.first)
+            MCPServerGalleryWindow.open(serverList: serverList, mcpRegistryEntry: registryService.mcpRegistryEntries?.first)
         } catch {
             Logger.client.error("Failed to load MCP servers from registry: \(error.localizedDescription)")
             if let serviceError = error as? XPCExtensionServiceError {
@@ -160,44 +160,14 @@ struct MCPRegistryURLView: View {
     private func getMCPRegistryAllowlist() async {
         isLoading = true
         defer { isLoading = false }
-        do {
-            let service = try getService()
-            
-            // Only fetch allowlist if user is logged in
-            let authStatus = try await service.getXPCServiceAuthStatus()
-            guard authStatus?.status == .loggedIn else {
-                Logger.client.info("User not logged in, skipping MCP registry allowlist fetch")
-                return
-            }
-            
-            let result = try await service.getMCPRegistryAllowlist()
-            
-            guard let result = result, !result.mcpRegistries.isEmpty else {
-                if result == nil {
-                    Logger.client.error("Failed to get allowlist result")
-                } else {
-                    mcpRegistry = []
-                }
-                return
-            }
-            
-            if let firstRegistry = result.mcpRegistries.first {
-                let entry = MCPRegistryEntry(
-                    url: firstRegistry.url,
-                    registryAccess: firstRegistry.registryAccess,
-                    owner: firstRegistry.owner
-                )
-                mcpRegistry = [entry]
-                Logger.client.info("Current MCP Registry Entry: \(entry)")
-                
-                // If registryOnly, force the URL to be the registry URL
-                if entry.registryAccess == .registryOnly {
-                    mcpRegistryBaseURL = entry.url
-                    tempURLText = entry.url
-                }
-            }
-        } catch {
-            Logger.client.error("Failed to get MCP allowlist from registry: \(error)")
+
+        await registryService.refreshAllowlist()
+
+        // If registryOnly, force the URL to be the registry URL
+        if let entry = registryService.mcpRegistryEntries?.first,
+           entry.registryAccess == .registryOnly {
+            mcpRegistryBaseURL = entry.url
+            tempURLText = entry.url
         }
     }
     
@@ -211,7 +181,7 @@ struct MCPRegistryURLView: View {
         defer { isLoading = false }
         
         // Let the view model handle the entire update flow including clearing and fetching
-        if let error = await MCPServerGalleryWindow.refreshFromURL(mcpRegistryEntry: mcpRegistry?.first) {
+        if let error = await MCPServerGalleryWindow.refreshFromURL(mcpRegistryEntry: registryService.mcpRegistryEntries?.first) {
             // Display error in the URL view
             if let serviceError = error as? XPCExtensionServiceError {
                 errorMessage = serviceError.underlyingError?.localizedDescription ?? serviceError.localizedDescription
diff --git a/Core/Sources/HostApp/ToolsSettings/MCPXcodeServerInstallView.swift b/Core/Sources/HostApp/ToolsSettings/MCPXcodeServerInstallView.swift
@@ -13,6 +13,7 @@ struct MCPXcodeServerInstallView: View {
     /// Cached to avoid repeated file I/O during SwiftUI rendering.
     @State private var configuredXcodeServerNames: Set<String> = []
     @ObservedObject private var mcpToolManager = CopilotMCPToolManagerObservable.shared
+    @ObservedObject private var registryService = MCPRegistryService.shared
 
     private let requiredXcodeVersion = "26.4"
     private let serverName = "xcode"
@@ -39,6 +40,10 @@ struct MCPXcodeServerInstallView: View {
         isConfigured || isConnected
     }
 
+    private var isRegistryOnly: Bool {
+        registryService.mcpRegistryEntries?.first?.registryAccess == .registryOnly
+    }
+
     var body: some View {
         HStack(alignment: .center, spacing: 16) {
             VStack(alignment: .leading, spacing: 0) {
@@ -61,6 +66,7 @@ struct MCPXcodeServerInstallView: View {
         .settingsContainerStyle(isExpanded: false)
         .onAppear {
             checkInstallationStatus()
+            Task { await registryService.refreshAllowlist() }
         }
         .onChange(of: mcpToolManager.availableMCPServerTools) { _ in
             checkInstallationStatus()
@@ -76,11 +82,13 @@ struct MCPXcodeServerInstallView: View {
             Text("Requires Xcode \(requiredXcodeVersion) or later. Current version: \(versionText).")
         } else if isConnected {
             Text("Xcode's built-in MCP server is connected, enabling richer editor integration.")
+        } else if isRegistryOnly {
+            Text("Manual installation of Xcode's built-in MCP server is blocked by your organization's registry policy. Please check the MCP Registry for an approved installation option, or contact your enterprise IT administrator.")
         } else if isConfiguredButNotConnected {
             Text("Please confirm in Xcode to allow the built-in MCP server.")
         } else {
             VStack(alignment: .leading, spacing: 4) {
-                Text("Connect Copilot to Xcode’s built‑in MCP server to enable richer editor integration.")
+                Text("Connect Copilot to Xcode's built-in MCP server to enable richer editor integration.")
                 if let installError {
                     Text(installError)
                         .font(.caption)
@@ -96,6 +104,8 @@ struct MCPXcodeServerInstallView: View {
             EmptyView()
         } else if isConnected {
             Text("Connected").foregroundColor(.secondary)
+        } else if isRegistryOnly {
+            EmptyView()
         } else if isConfiguredButNotConnected {
             HStack(spacing: 6) {
                 ProgressView()
diff --git a/README.md b/README.md
@@ -26,8 +26,8 @@ You can receive auto-complete type suggestions from GitHub Copilot either by sta
 
 ## Requirements
 
-- macOS 12+
-- Xcode 8+
+- macOS 13+
+- Xcode 14+
 - A GitHub account
 
 ## Getting Started
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,18 +1,17 @@
-### GitHub Copilot for Xcode 0.47.0
+### GitHub Copilot for Xcode 0.48.0
 
 **🚀 Highlights**
 
-- **Toolcall Auto Approval**: Streamlined workflow with auto-approval support for MCP tools, sensitive files, and terminal commands.
-- **MCP Registry**: The MCP registry and allowlist features are now available (requires editor preview feature flag).
+- **Context Window and Auto Compress**: Track context token usage directly from the chat input and automatically compact conversation history to save tokens.
+- **Xcode MCP Server Setup**: Install and connect Xcode's built-in MCP server directly from settings.
+- **General Availability**: Custom agents and the Auto model are now generally available.
 
-**💪 Improvements**
+**💪 Changes**
 
-- Refined the working set header.
-- Improved the details view for MCP tool calls.
+- Removed support for macOS 12.
+- Improved UI for model picker tooltips.
 
 **🛠️ Bug Fixes**
 
-- Fixed layout issues with tool calls.
-- Resolved display issues for Next Edit Suggestions (NES).
-- Improved error messaging for SSL certificate failures.
-- Addressed various performance issues.
+- Fixed an issue where GPT-5.4 requests could return a 400 error.
+- Fixed an issue where the MCP allowlist did not work correctly.
diff --git a/Server/package-lock.json b/Server/package-lock.json
diff --git a/Server/package.json b/Server/package.json
