Pre-release 0.44.151

actions-user · actions-user · commit 8770b9e39bde · 2025-11-11T09:34:23.000Z
diff --git a/Core/Package.swift b/Core/Package.swift
@@ -254,6 +254,7 @@ let package = Package(
         .target(
             name: "GitHubCopilotViewModel",
             dependencies: [
+                "Client",
                 .product(name: "GitHubCopilotService", package: "Tool"),
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
                 .product(name: "Status", package: "Tool"),
diff --git a/Core/Sources/ConversationTab/ModeAndModelPicker/ModelManagerUtils.swift b/Core/Sources/ConversationTab/ModeAndModelPicker/ModelManagerUtils.swift
@@ -179,7 +179,7 @@ public extension CopilotModelManager {
     static func getDefaultChatModel(scope: PromptTemplateScope = .chatPanel) -> LLMModel? {
         let LLMs = CopilotModelManager.getAvailableLLMs()
         let LLMsInScope = LLMs.filter({ $0.scopes.contains(scope) })
-        let defaultModel = LLMsInScope.first(where: { $0.isChatDefault })
+        let defaultModel = LLMsInScope.first(where: { $0.isChatDefault && !$0.isAutoModel })
         // If a default model is found, return it
         if let defaultModel = defaultModel {
             return LLMModel(
@@ -202,7 +202,7 @@ public extension CopilotModelManager {
         }
 
         // If no default model is found, fallback to the first available model
-        if let firstModel = LLMsInScope.first {
+        if let firstModel = LLMsInScope.first(where: { !$0.isAutoModel }) {
             return LLMModel(
                 modelName: firstModel.modelName,
                 modelFamily: firstModel.modelFamily,
@@ -270,3 +270,7 @@ public extension LLMModel {
     /// Apply to `Copilot Models`
     var isAutoModel: Bool { isStandardModel && modelName == "Auto" }
 }
+
+extension CopilotModel {
+    var isAutoModel: Bool { modelName == "Auto" }
+}
diff --git a/Core/Sources/GitHubCopilotViewModel/GitHubCopilotViewModel.swift b/Core/Sources/GitHubCopilotViewModel/GitHubCopilotViewModel.swift
@@ -4,6 +4,7 @@ import ComposableArchitecture
 import Status
 import SwiftUI
 import Cache
+import Client
 
 public struct SignInResponse {
     public let status: SignInInitiateStatus
@@ -126,7 +127,7 @@ public class GitHubCopilotViewModel: ObservableObject {
         waitingForSignIn = false
     }
     
-    public func copyAndOpen() {
+    public func copyAndOpen(fromHostApp: Bool = false) {
         waitingForSignIn = true
         guard let signInResponse else {
             toast("Missing sign in details.", .error)
@@ -137,10 +138,10 @@ public class GitHubCopilotViewModel: ObservableObject {
         pasteboard.setString(signInResponse.userCode, forType: NSPasteboard.PasteboardType.string)
         toast("Sign-in code \(signInResponse.userCode) copied", .info)
         NSWorkspace.shared.open(signInResponse.verificationURL)
-        waitForSignIn()
+        waitForSignIn(fromHostApp: fromHostApp)
     }
     
-    public func waitForSignIn() {
+    public func waitForSignIn(fromHostApp: Bool = false) {
         Task {
             do {
                 guard waitingForSignIn else { return }
@@ -155,14 +156,19 @@ public class GitHubCopilotViewModel: ObservableObject {
                 self.status = status
                 await Status.shared.updateAuthStatus(.loggedIn, username: username)
                 broadcastStatusChange()
-                let models = try? await service.models()
-                if let models = models, !models.isEmpty {
-                    CopilotModelManager.updateLLMs(models)
+                if !fromHostApp {
+                    let models = try? await service.models()
+                    if let models = models, !models.isEmpty {
+                        CopilotModelManager.updateLLMs(models)
+                    }
+                } else {
+                    let xpcService = try getService()
+                    _ = try? await xpcService.updateCopilotModels()
                 }
             } catch let error as GitHubCopilotError {
                 switch error {
                 case .languageServerError(.timeout):
-                    waitForSignIn()
+                    waitForSignIn(fromHostApp: fromHostApp)
                     return
                 case .languageServerError(
                     .serverError(
diff --git a/Core/Sources/HostApp/AdvancedSettings/SuggestionSection.swift b/Core/Sources/HostApp/AdvancedSettings/SuggestionSection.swift
@@ -7,6 +7,7 @@ struct SuggestionSection: View {
     @AppStorage(\.realtimeNESToggle) var realtimeNESToggle
     @State var isSuggestionFeatureDisabledLanguageListViewOpen = false
     @State private var shouldPresentTurnoffSheet = false
+    @ObservedObject private var featureFlags = FeatureFlagManager.shared
 
     var realtimeSuggestionBinding : Binding<Bool> {
         Binding(
@@ -27,11 +28,15 @@ struct SuggestionSection: View {
                 title: "Enable completions while typing",
                 isOn: realtimeSuggestionBinding
             )
-            Divider()
-            SettingsToggle(
-                title: "Enable Next Edit Suggestions (NES)",
-                isOn: $realtimeNESToggle
-            )
+            
+            if featureFlags.isEditorPreviewEnabled {
+                Divider()
+                SettingsToggle(
+                    title: "Enable Next Edit Suggestions (NES)",
+                    isOn: $realtimeNESToggle
+                )
+            }
+            
             Divider()
             SettingsToggle(
                 title: "Accept suggestions with Tab",
diff --git a/Core/Sources/HostApp/GeneralSettings/CopilotConnectionView.swift b/Core/Sources/HostApp/GeneralSettings/CopilotConnectionView.swift
@@ -57,7 +57,10 @@ struct CopilotConnectionView: View {
                     isPresented: $viewModel.isSignInAlertPresented,
                     presenting: viewModel.signInResponse) { _ in
                         Button("Cancel", role: .cancel, action: {})
-                        Button("Copy Code and Open", action: viewModel.copyAndOpen)
+                        Button(
+                            "Copy Code and Open",
+                            action: { viewModel.copyAndOpen(fromHostApp: true) }
+                        )
                     } message: { response in
                         Text("""
                                Please enter the above code in the \
diff --git a/Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift
@@ -10,6 +10,7 @@ import WorkspaceSuggestionService
 import XcodeInspector
 import XPCShared
 import AXHelper
+import GitHubCopilotService
 
 /// It's used to run some commands without really triggering the menu bar item.
 ///
@@ -59,7 +60,8 @@ struct PseudoCommandHandler {
         if Task.isCancelled { return }
         
         let codeCompletionEnabled = UserDefaults.shared.value(for: \.realtimeSuggestionToggle)
-        let nesEnabled = UserDefaults.shared.value(for: \.realtimeNESToggle)
+        // Enabled both by Feature Flag and User.
+        let nesEnabled = FeatureFlagNotifierImpl.shared.featureFlags.editorPreviewFeatures && UserDefaults.shared.value(for: \.realtimeNESToggle)
         guard codeCompletionEnabled || nesEnabled else {
             cleanupAllSuggestions(filespace: filespace, presenter: nil)
             return
diff --git a/Core/Sources/Service/XPCService.swift b/Core/Sources/Service/XPCService.swift
@@ -594,6 +594,21 @@ public class XPCService: NSObject, XPCServiceProtocol {
         }
     }
     
+    public func updateCopilotModels(withReply reply: @escaping (Data?, Error?) -> Void) {
+        Task { @MainActor in
+            do {
+                let service = try GitHubCopilotViewModel.shared.getGitHubCopilotAuthService()
+                let models = try await service.models()
+                CopilotModelManager.updateLLMs(models)
+                let data = try JSONEncoder().encode(models)
+                reply(data, nil)
+            } catch {
+                Logger.service.error("Failed to get models: \(error.localizedDescription)")
+                reply(nil, NSError.from(error))
+            }
+        }
+    }
+    
     // MARK: - BYOK
     public func saveBYOKApiKey(_ params: Data, withReply reply: @escaping (Data?) -> Void) {
         let decoder = JSONDecoder()
diff --git a/Core/Sources/SuggestionWidget/ChatWindow/ChatLoginView.swift b/Core/Sources/SuggestionWidget/ChatWindow/ChatLoginView.swift
@@ -77,7 +77,7 @@ struct ChatLoginView: View {
                 Button("Cancel", role: .cancel, action: {})
                     .scaledFont(.body)
                 
-                Button("Copy Code and Open", action: viewModel.copyAndOpen)
+                Button("Copy Code and Open", action: { viewModel.copyAndOpen(fromHostApp: false) })
                     .scaledFont(.body)
             } message: { response in
                 Text("""
diff --git a/Core/Sources/SuggestionWidget/Extensions/WidgetWindowsController+FeatureFlags.swift b/Core/Sources/SuggestionWidget/Extensions/WidgetWindowsController+FeatureFlags.swift
@@ -0,0 +1,27 @@
+import GitHubCopilotService
+
+extension WidgetWindowsController {
+    
+    @MainActor
+    var isNESFeatureFlagEnabled: Bool {
+        FeatureFlagNotifierImpl.shared.featureFlags.editorPreviewFeatures
+    }
+    
+    func setupFeatureFlagObservers() {
+        Task { @MainActor in
+            let sinker = FeatureFlagNotifierImpl.shared.featureFlagsDidChange
+                .sink(receiveValue: { [weak self] _ in
+                    self?.onFeatureFlagChanged()
+                })
+            
+            await self.storeCancellables([sinker])
+        }
+    }
+    
+    @MainActor
+    func onFeatureFlagChanged() {
+        if !isNESFeatureFlagEnabled {
+            hideAllNESWindows()
+        }
+    }
+}
diff --git a/Core/Sources/SuggestionWidget/Extensions/WidgetWindowsController+NES.swift b/Core/Sources/SuggestionWidget/Extensions/WidgetWindowsController+NES.swift
@@ -1,4 +1,5 @@
 import AppKit
+import GitHubCopilotService
 
 extension WidgetWindowsController {
     func setupNESSuggestionPanelObservers() {
@@ -16,6 +17,40 @@ extension WidgetWindowsController {
         }
     }
     
+    @MainActor
+    func applyOpacityForNESWindows(by noFocus: Bool) {
+        guard !noFocus, isNESFeatureFlagEnabled
+        else {
+            hideAllNESWindows()
+            return
+        }
+        
+        displayAllNESWindows()
+    }
+    
+    @MainActor
+    func hideAllNESWindows() {
+        windows.nesMenuWindow.alphaValue = 0
+        windows.nesDiffWindow.setIsVisible(false)
+        
+        hideNESDiffWindow()
+        
+        windows.nesNotificationWindow.alphaValue = 0
+        windows.nesNotificationWindow.setIsVisible(false)
+    }
+    
+    @MainActor
+    func displayAllNESWindows() {
+        windows.nesMenuWindow.alphaValue = 1
+        windows.nesDiffWindow.setIsVisible(true)
+        
+        windows.nesDiffWindow.alphaValue = 1
+        windows.nesDiffWindow.setIsVisible(true)
+        
+        windows.nesNotificationWindow.alphaValue = 1
+        windows.nesNotificationWindow.setIsVisible(true)
+    }
+    
     @MainActor
     func hideNESDiffWindow() {
         NSAnimationContext.runAnimationGroup { context in
diff --git a/Core/Sources/SuggestionWidget/WidgetWindowsController.swift b/Core/Sources/SuggestionWidget/WidgetWindowsController.swift
@@ -100,6 +100,9 @@ actor WidgetWindowsController: NSObject {
         
         // Observer state change for NES
         setupNESSuggestionPanelObservers()
+
+        // Observe feature flags
+        setupFeatureFlagObservers()
     }
     
     private func setupCodeReviewPanelObservers() {
@@ -501,8 +504,7 @@ extension WidgetWindowsController {
                     send(.panel(noFocus ? .hidePanel(.suggestion) : .showPanel(.suggestion)))
                     windows.suggestionPanelWindow.alphaValue = noFocus ? 0 : 1
                     send(.panel(noFocus ? .hidePanel(.nes) : .showPanel(.nes)))
-                    windows.nesMenuWindow.alphaValue = noFocus ? 0 : 1
-                    windows.nesDiffWindow.alphaValue = noFocus ? 0 : 1
+                    applyOpacityForNESWindows(by: noFocus)
                     send(.panel(noFocus ? .hidePanel(.agentConfiguration) : .showPanel(.agentConfiguration)))
                     applyOpacityForAgentConfigurationWidget(by: noFocus)
                     windows.nesNotificationWindow.alphaValue = noFocus ? 0 : 1
@@ -530,8 +532,7 @@ extension WidgetWindowsController {
                     send(.panel(noFocus ? .hidePanel(.suggestion) : .showPanel(.suggestion)))
                     windows.sharedPanelWindow.alphaValue = noFocus ? 0 : 1
                     send(.panel(noFocus ? .hidePanel(.nes) : .showPanel(.nes)))
-                    windows.nesMenuWindow.alphaValue = noFocus ? 0 : 1
-                    windows.nesDiffWindow.alphaValue = noFocus ? 0 : 1
+                    applyOpacityForNESWindows(by: noFocus)
                     send(.panel(noFocus ? .hidePanel(.agentConfiguration) : .showPanel(.agentConfiguration)))
                     applyOpacityForAgentConfigurationWidget(by: noFocus)
                     windows.nesNotificationWindow.alphaValue = noFocus ? 0 : 1
diff --git a/ExtensionService/AppDelegate.swift b/ExtensionService/AppDelegate.swift
@@ -68,6 +68,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         Logger.service.info("XPC Service started.")
         NSApp.setActivationPolicy(.accessory)
         buildStatusBarMenu()
+        _ = FeatureFlagNotifierImpl.shared
+        observeFeatureFlags()
         watchServiceStatus()
         watchAXStatus()
         watchAuthStatus()
@@ -235,6 +237,16 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
             }
         }
     }
+    
+    
+    func observeFeatureFlags() {
+        Task { @MainActor in
+            FeatureFlagNotifierImpl.shared.featureFlagsDidChange
+                .sink(receiveValue: { [weak self] featureFlags in
+                    self?.toggleNES.isHidden = !featureFlags.editorPreviewFeatures
+                })
+        }
+    }
 
     func watchAuthStatus() {
         let notifications = DistributedNotificationCenter.default().notifications(named: .authStatusDidChange)
diff --git a/Tool/Sources/XPCShared/XPCExtensionService.swift b/Tool/Sources/XPCShared/XPCExtensionService.swift
@@ -685,6 +685,31 @@ extension XPCExtensionService {
         }
     }
     
+    @XPCServiceActor
+    public func updateCopilotModels() async throws -> [CopilotModel]? {
+        return try await withXPCServiceConnected {
+            service, continuation in
+            service.updateCopilotModels { data, error in
+                if let error {
+                    continuation.reject(error)
+                    return
+                }
+                
+                guard let data else {
+                    continuation.resume(nil)
+                    return
+                }
+
+                do {
+                    let models = try JSONDecoder().decode([CopilotModel].self, from: data)
+                    continuation.resume(models)
+                } catch {
+                    continuation.reject(error)
+                }
+            }
+        }
+    }
+    
     // MARK: BYOK
     @XPCServiceActor
     public func saveBYOKApiKey(_ params: BYOKSaveApiKeyParams) async throws -> BYOKSaveApiKeyResponse? {
diff --git a/Tool/Sources/XPCShared/XPCServiceProtocol.swift b/Tool/Sources/XPCShared/XPCServiceProtocol.swift
@@ -48,6 +48,7 @@ public protocol XPCServiceProtocol {
 
     func getCopilotFeatureFlags(withReply reply: @escaping (Data?) -> Void)
     func getCopilotPolicy(withReply reply: @escaping (Data?) -> Void)
+    func updateCopilotModels(withReply reply: @escaping (Data?, Error?) -> Void)
     func getModes(workspaceFolders: Data?, withReply reply: @escaping (Data?, Error?) -> Void)
 
     func signOutAllGitHubCopilotService()
diff --git a/Tool/Sources/XcodeInspector/XcodeWindowInspector.swift b/Tool/Sources/XcodeInspector/XcodeWindowInspector.swift
