Release 0.40.0

actions-user · actions-user · commit 9d1d42f00bcf · 2025-07-24T08:08:31.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ 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.40.0 - July 24, 2025
+### Added
+- Support disabling Agent mode when it's disabled by policy.
+
 ## 0.39.0 - July 23, 2025
 ### Fixed
 - Performance: Fixed a freezing issue in 'Add Context' view when opening large projects.
diff --git a/Core/Sources/ConversationTab/ModelPicker/ChatModePicker.swift b/Core/Sources/ConversationTab/ModelPicker/ChatModePicker.swift
@@ -1,63 +1,95 @@
 import SwiftUI
 import Persist
 import ConversationServiceProvider
+import GitHubCopilotService
+import Combine
 
 public extension Notification.Name {
     static let gitHubCopilotChatModeDidChange = Notification
         .Name("com.github.CopilotForXcode.ChatModeDidChange")
 }
 
+public enum ChatMode: String {
+    case Ask = "Ask"
+    case Agent = "Agent"
+}
+
 public struct ChatModePicker: View {
     @Binding var chatMode: String
     @Environment(\.colorScheme) var colorScheme
+    @State var isAgentModeFFEnabled: Bool
+    @State private var cancellables = Set<AnyCancellable>()
     var onScopeChange: (PromptTemplateScope) -> Void
     
     public init(chatMode: Binding<String>, onScopeChange: @escaping (PromptTemplateScope) -> Void = { _ in }) {
         self._chatMode = chatMode
         self.onScopeChange = onScopeChange
+        self.isAgentModeFFEnabled = FeatureFlagNotifierImpl.shared.featureFlags.agent_mode != false
+    }
+    
+    private func setChatMode(mode: ChatMode) {
+        chatMode = mode.rawValue
+        AppState.shared.setSelectedChatMode(mode.rawValue)
+        onScopeChange(mode == .Ask ? .chatPanel : .agentPanel)
+        NotificationCenter.default.post(
+            name: .gitHubCopilotChatModeDidChange,
+            object: nil
+        )
+    }
+    
+    private func subscribeToFeatureFlagsDidChangeEvent() {
+        FeatureFlagNotifierImpl.shared.featureFlagsDidChange.sink(receiveValue: { (featureFlags) in
+            isAgentModeFFEnabled = featureFlags.agent_mode ?? true
+        })
+        .store(in: &cancellables)
     }
 
     public var body: some View {
-        HStack(spacing: -1) {
-            ModeButton(
-                title: "Ask",
-                isSelected: chatMode == "Ask",
-                activeBackground: colorScheme == .dark ? Color.white.opacity(0.25) : Color.white,
-                activeTextColor: Color.primary,
-                inactiveTextColor: Color.primary.opacity(0.5),
-                action: {
-                    chatMode = "Ask"
-                    AppState.shared.setSelectedChatMode("Ask")
-                    onScopeChange(.chatPanel)
-                    NotificationCenter.default.post(
-                        name: .gitHubCopilotChatModeDidChange,
-                        object: nil
+        VStack {
+            if isAgentModeFFEnabled {
+                HStack(spacing: -1) {
+                    ModeButton(
+                        title: "Ask",
+                        isSelected: chatMode == "Ask",
+                        activeBackground: colorScheme == .dark ? Color.white.opacity(0.25) : Color.white,
+                        activeTextColor: Color.primary,
+                        inactiveTextColor: Color.primary.opacity(0.5),
+                        action: {
+                            setChatMode(mode: .Ask)
+                        }
                     )
-                }
-            )
-            
-            ModeButton(
-                title: "Agent",
-                isSelected: chatMode == "Agent",
-                activeBackground: Color.blue,
-                activeTextColor: Color.white,
-                inactiveTextColor: Color.primary.opacity(0.5),
-                action: {
-                    chatMode = "Agent"
-                    AppState.shared.setSelectedChatMode("Agent")
-                    onScopeChange(.agentPanel)
-                    NotificationCenter.default.post(
-                        name: .gitHubCopilotChatModeDidChange,
-                        object: nil
+                    
+                    ModeButton(
+                        title: "Agent",
+                        isSelected: chatMode == "Agent",
+                        activeBackground: Color.blue,
+                        activeTextColor: Color.white,
+                        inactiveTextColor: Color.primary.opacity(0.5),
+                        action: {
+                            setChatMode(mode: .Agent)
+                        }
                     )
                 }
-            )
+                .padding(1)
+                .frame(height: 20, alignment: .topLeading)
+                .background(.primary.opacity(0.1))
+                .cornerRadius(5)
+                .padding(4)
+                .help("Set Mode")
+            } else {
+                EmptyView()
+            }
+        }
+        .task {
+            subscribeToFeatureFlagsDidChangeEvent()
+            if !isAgentModeFFEnabled {
+                setChatMode(mode: .Ask)
+            }
+        }
+        .onChange(of: isAgentModeFFEnabled) { newAgentModeFFEnabled in
+            if !newAgentModeFFEnabled {
+                setChatMode(mode: .Ask)
+            }
         }
-        .padding(1)
-        .frame(height: 20, alignment: .topLeading)
-        .background(.primary.opacity(0.1))
-        .cornerRadius(5)
-        .padding(4)
-        .help("Set Mode")
     }
 }
diff --git a/Core/Sources/HostApp/TabContainer.swift b/Core/Sources/HostApp/TabContainer.swift
@@ -5,6 +5,9 @@ import LaunchAgentManager
 import SwiftUI
 import Toast
 import UpdateChecker
+import Client
+import Logger
+import Combine
 
 @MainActor
 public let hostAppStore: StoreOf<HostApp> = .init(initialState: .init(), reducer: { HostApp() })
@@ -13,6 +16,7 @@ public struct TabContainer: View {
     let store: StoreOf<HostApp>
     @ObservedObject var toastController: ToastController
     @State private var tabBarItems = [TabBarItem]()
+    @State private var isAgentModeFFEnabled = true
     @Binding var tag: Int
 
     public init() {
@@ -32,6 +36,19 @@ public struct TabContainer: View {
             set: { store.send(.setActiveTab($0)) }
         )
     }
+    
+    private func updateAgentModeFeatureFlag() async {
+        do {
+            let service = try getService()
+            let featureFlags = try await service.getCopilotFeatureFlags()
+            isAgentModeFFEnabled = featureFlags?.agent_mode ?? true
+            if hostAppStore.activeTabIndex == 2 && !isAgentModeFFEnabled {
+                hostAppStore.send(.setActiveTab(0))
+            }
+        } catch {
+            Logger.client.error("Failed to get copilot feature flags: \(error)")
+        }
+    }
 
     public var body: some View {
         WithPerceptionTracking {
@@ -51,11 +68,13 @@ public struct TabContainer: View {
                         title: "Advanced",
                         image: "gearshape.2.fill"
                     )
-                    MCPConfigView().tabBarItem(
-                        tag: 2,
-                        title: "MCP",
-                        image: "wrench.and.screwdriver.fill"
-                    )
+                    if isAgentModeFFEnabled {
+                        MCPConfigView().tabBarItem(
+                            tag: 2,
+                            title: "MCP",
+                            image: "wrench.and.screwdriver.fill"
+                        )
+                    }
                 }
                 .environment(\.tabBarTabTag, tag)
                 .frame(minHeight: 400)
@@ -70,7 +89,16 @@ public struct TabContainer: View {
             }
             .onAppear {
                 store.send(.appear)
+                Task {
+                    await updateAgentModeFeatureFlag()
+                }
             }
+            .onReceive(DistributedNotificationCenter.default()
+                .publisher(for: .gitHubCopilotFeatureFlagsDidChange)) { _ in
+                    Task {
+                        await updateAgentModeFeatureFlag()
+                    }
+                }
         }
     }
 }
diff --git a/Core/Sources/Service/XPCService.swift b/Core/Sources/Service/XPCService.swift
@@ -308,6 +308,15 @@ public class XPCService: NSObject, XPCServiceProtocol {
         }
     }
     
+    // MARK: - FeatureFlags
+    public func getCopilotFeatureFlags(
+        withReply reply: @escaping (Data?) -> Void
+    ) {
+        let featureFlags = FeatureFlagNotifierImpl.shared.featureFlags
+        let data = try? JSONEncoder().encode(featureFlags)
+        reply(data)
+    }
+    
     // MARK: - Auth
     public func signOutAllGitHubCopilotService() {
         Task { @MainActor in
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,8 +1,9 @@
-### GitHub Copilot for Xcode 0.39.0
+### GitHub Copilot for Xcode 0.40.0
 
 **🚀 Highlights**
 
 * Performance: Fixed a freezing issue in 'Add Context' view when opening large projects.
+* Support disabling Agent mode when it's disabled by policy.
 
 **🛠️ Bug Fixes**
 
diff --git a/Server/package-lock.json b/Server/package-lock.json
diff --git a/Server/package.json b/Server/package.json
@@ -7,7 +7,7 @@
     "build": "webpack"
   },
   "dependencies": {
-    "@github/copilot-language-server": "^1.347.0",
+    "@github/copilot-language-server": "^1.348.0",
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/xterm": "^5.5.0",
     "monaco-editor": "0.52.2"
diff --git a/Tool/Sources/GitHubCopilotService/Services/FeatureFlagNotifier.swift b/Tool/Sources/GitHubCopilotService/Services/FeatureFlagNotifier.swift
@@ -1,11 +1,29 @@
 import Combine
 import SwiftUI
 
+public extension Notification.Name {
+    static let gitHubCopilotFeatureFlagsDidChange = Notification
+        .Name("com.github.CopilotForXcode.CopilotFeatureFlagsDidChange")
+}
+
+public enum ExperimentValue: Hashable, Codable {
+    case string(String)
+    case number(Double)
+    case boolean(Bool)
+    case stringArray([String])
+}
+
+public typealias ActiveExperimentForFeatureFlags = [String: ExperimentValue]
+
 public struct FeatureFlags: Hashable, Codable {
     public var rt: Bool
     public var sn: Bool
     public var chat: Bool
+    public var ic: Bool
+    public var pc: Bool
     public var xc: Bool?
+    public var ae: ActiveExperimentForFeatureFlags
+    public var agent_mode: Bool?
 }
 
 public protocol FeatureFlagNotifier {
@@ -19,7 +37,7 @@ public class FeatureFlagNotifierImpl: FeatureFlagNotifier {
     public static let shared = FeatureFlagNotifierImpl()
     public var featureFlagsDidChange: PassthroughSubject<FeatureFlags, Never>
     
-    init(featureFlags: FeatureFlags = FeatureFlags(rt: false, sn: false, chat: true),
+    init(featureFlags: FeatureFlags = FeatureFlags(rt: false, sn: false, chat: true, ic: true, pc: true, ae: [:]),
          featureFlagsDidChange: PassthroughSubject<FeatureFlags, Never> = PassthroughSubject<FeatureFlags, Never>()) {
         self.featureFlags = featureFlags
         self.featureFlagsDidChange = featureFlagsDidChange
@@ -31,6 +49,7 @@ public class FeatureFlagNotifierImpl: FeatureFlagNotifier {
         DispatchQueue.main.async { [weak self] in
             guard let self else { return }
             self.featureFlagsDidChange.send(self.featureFlags)
+            DistributedNotificationCenter.default().post(name: .gitHubCopilotFeatureFlagsDidChange, object: nil)
         }
     }
 }
diff --git a/Tool/Sources/XPCShared/XPCExtensionService.swift b/Tool/Sources/XPCShared/XPCExtensionService.swift
@@ -392,6 +392,26 @@ extension XPCExtensionService {
         }
     }
     
+    @XPCServiceActor
+    public func getCopilotFeatureFlags() async throws -> FeatureFlags? {
+        return try await withXPCServiceConnected {
+            service, continuation in
+            service.getCopilotFeatureFlags { data in
+                guard let data else {
+                    continuation.resume(nil)
+                    return
+                }
+
+                do {
+                    let tools = try JSONDecoder().decode(FeatureFlags.self, from: data)
+                    continuation.resume(tools)
+                } catch {
+                    continuation.reject(error)
+                }
+            }
+        }
+    }
+    
     @XPCServiceActor
     public func signOutAllGitHubCopilotService() async throws {
         return try await withXPCServiceConnected {
diff --git a/Tool/Sources/XPCShared/XPCServiceProtocol.swift b/Tool/Sources/XPCShared/XPCServiceProtocol.swift
@@ -24,6 +24,8 @@ public protocol XPCServiceProtocol {
     func getXcodeInspectorData(withReply reply: @escaping (Data?, Error?) -> Void)
     func getAvailableMCPServerToolsCollections(withReply reply: @escaping (Data?) -> Void)
     func updateMCPServerToolsStatus(tools: Data)
+    
+    func getCopilotFeatureFlags(withReply reply: @escaping (Data?) -> Void)
 
     func signOutAllGitHubCopilotService()
     func getXPCServiceAuthStatus(withReply reply: @escaping (Data?) -> Void)
