Merge branch 'github:main' into main

Author: MVPuknowme

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.47.0 - February 4, 2026
+### Added
+- Auto approval for MCP tools, sensitive files, and terminal commands.
+- MCP registry and allowlist are now available (requires editor preview feature flag).
+
+### Changed
+- Improved UI for MCP tool call details.
+- Improved UI for working set header.
+
+### Fixed
+- Fixed toolcall layout issue.
+- Fixed NES display issue.
+- Fixed error message for SSL certificate errors.
+- Fixed several performance issues.
+
 ## 0.46.0 - December 11, 2025
 ### Added
 - MCP: Support delete MCP server from list.

Copilot for Xcode.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -21,6 +21,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         case chat
         case settings
         case tools
+        case toolsAutoApprove
         case byok
     }
 
@@ -51,6 +52,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             return .settings
         } else if launchArgs.contains("--tools") {
             return .tools
+        } else if launchArgs.contains("--tools-auto-approve") {
+            return .toolsAutoApprove
         } else if launchArgs.contains("--byok") {
             return .byok
         } else {
@@ -64,6 +67,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             openSettings()
         case .tools:
             openToolsSettings()
+        case .toolsAutoApprove:
+            openToolsSettingsAutoApprove()
         case .byok:
             openBYOKSettings()
         case .chat:
@@ -92,6 +97,14 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             hostAppStore.send(.setActiveTab(.tools))
         }
     }
+
+    private func openToolsSettingsAutoApprove() {
+        DispatchQueue.main.async {
+            activateAndOpenSettings()
+            hostAppStore.send(.setActiveTab(.tools))
+            hostAppStore.send(.setActiveToolsSubTab(.AutoApprove))
+        }
+    }
 
     private func openBYOKSettings() {
         DispatchQueue.main.async {
@@ -202,6 +215,18 @@ struct CopilotForXcodeApp: App {
                 hostAppStore.send(.setActiveTab(.tools))
             }
         }
+
+        DistributedNotificationCenter.default().addObserver(
+            forName: .openToolsSettingsAutoApproveWindowRequest,
+            object: nil,
+            queue: .main
+        ) { _ in
+            DispatchQueue.main.async {
+                activateAndOpenSettings()
+                hostAppStore.send(.setActiveTab(.tools))
+                hostAppStore.send(.setActiveToolsSubTab(.AutoApprove))
+            }
+        }
 
         DistributedNotificationCenter.default().addObserver(
             forName: .openBYOKSettingsWindowRequest,

Copilot for Xcode/App.swift

@@ -3349,4 +3349,90 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\
 SOFTWARE.\
 \
 \
+Dependency: https://github.com/tree-sitter/tree-sitter\
+Version: 0.25.10\
+License Content:\
+The MIT License\
+\
+Copyright (c) 2018 Max Brunsfeld
+\
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+\
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+\
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+\
+\
+Dependency: https://github.com/tree-sitter/swift-tree-sitter\
+Version: 0.25.0\
+License Content:\
+BSD 3-Clause License\
+\
+Copyright (c) 2021, Chime
+All rights reserved.
+\
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+\
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+\
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+\
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+\
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+\
+\
+Dependency: https://github.com/tree-sitter/tree-sitter-bash\
+Version: 0.25.1\
+License Content:\
+The MIT License\
+\
+Copyright (c) 2017 Max Brunsfeld
+\
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+\
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+\
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+\
+\
 }

Copilot for Xcode/Credits.rtf

@@ -53,7 +53,9 @@ let package = Package(
             .package(url: "https://github.com/devm33/KeyboardShortcuts", branch: "main"),
         .package(url: "https://github.com/devm33/CGEventOverride", branch: "devm33/fix-stale-AXIsProcessTrusted"),
         .package(url: "https://github.com/devm33/Highlightr", branch: "master"),
-        .package(url: "https://github.com/globulus/swiftui-flow-layout", from: "1.0.5")
+        .package(url: "https://github.com/globulus/swiftui-flow-layout", from: "1.0.5"),
+        .package(url: "https://github.com/tree-sitter/swift-tree-sitter.git", from: "0.25.0"),
+        .package(url: "https://github.com/tree-sitter/tree-sitter-bash", from: "0.25.1")
     ],
     targets: [
         // MARK: - Main
@@ -132,6 +134,7 @@ let package = Package(
                     .product(name: "KeyboardShortcuts", package: "KeyboardShortcuts"),
                     .product(name: "GitHubCopilotService", package: "Tool"),
                     .product(name: "Persist", package: "Tool"),
+                    .product(name: "UserDefaultsObserver", package: "Tool"),
                 ]),
 
         // MARK: - Suggestion Service
@@ -185,7 +188,10 @@ let package = Package(
                     .product(name: "AppKitExtension", package: "Tool"),
                     .product(name: "WebContentExtractor", package: "Tool"),
                     .product(name: "GitHelper", package: "Tool"),
-                    .product(name: "SuggestionBasic", package: "Tool")
+                    .product(name: "SuggestionBasic", package: "Tool"),
+                    .product(name: "SwiftTreeSitter", package: "swift-tree-sitter"),
+                    .product(name: "SwiftTreeSitterLayer", package: "swift-tree-sitter"),
+                    .product(name: "TreeSitterBash", package: "tree-sitter-bash"),
                 ]),
             .testTarget(
                 name: "ChatServiceTests",

Core/Package.swift

@@ -441,8 +441,17 @@ public final class ChatService: ChatServiceType, ObservableObject {
 
         self.lastUserRequest = request
         self.skillSet = validSkillSet
-        if let response = try await sendConversationRequest(request) {
-            await handleConversationCreateResponse(response)
+        
+        do {
+            if let response = try await sendConversationRequest(request) {
+                await handleConversationCreateResponse(response)
+            }
+        } catch {
+            // Check if this is a certificate error and show helpful message
+            if isCertificateError(error) {
+                await showCertificateErrorMessage(turnId: currentTurnId)
+            }
+            throw error
         }
     }
 
@@ -1018,6 +1027,44 @@ public final class ChatService: ChatServiceType, ObservableObject {
             }
         }
     }
+    
+    // MARK: - Certificate Error Detection
+    
+    /// Checks if an error is related to SSL certificate issues
+    private func isCertificateError(_ error: Error) -> Bool {
+        let errorDescription = error.localizedDescription.lowercased()
+        
+        // Check for certificate error messages
+        if errorDescription.contains("unable to get local issuer certificate") ||
+           errorDescription.contains("self-signed certificate in certificate chain") ||
+           errorDescription.contains("unable_to_get_issuer_cert_locally") {
+            return true
+        }
+        
+        // Check GitHubCopilotError with ServerError
+        if let serverError = error as? ServerError,
+            case .serverError(_, let message, _) = serverError {
+                let serverMessage = message.lowercased()
+                if serverMessage.contains("unable to get local issuer certificate") ||
+                   serverMessage.contains("self-signed certificate in certificate chain") {
+                    return true
+            }
+        }
+        
+        return false
+    }
+    
+    private func showCertificateErrorMessage(turnId: String?) async {
+        let messageId = turnId ?? UUID().uuidString
+        let errorMessage = ChatMessage(
+            errorMessageWithId: messageId,
+            chatTabID: chatTabInfo.id,
+            errorMessages: [
+                SSLCertificateErrorMessage
+            ]
+        )
+        await memory.appendMessage(errorMessage)
+    }
 }
 
 

Core/Sources/ChatService/ChatService.swift

@@ -4,7 +4,8 @@ public typealias ConversationID = String
 
 public enum AutoApprovalScope: Hashable {
     case session(ConversationID)
+    /// Applies to all workspaces. Persisted in `UserDefaults.autoApproval`.
+    case global
     // Future scopes:
     // case workspace(String)
-    // case global
 }