Pre-release 0.33.114

actions-user · actions-user · commit b2189de63341 · 2025-04-28T03:17:23.000Z
diff --git a/Core/Sources/ConversationTab/Chat.swift b/Core/Sources/ConversationTab/Chat.swift
@@ -6,6 +6,7 @@ import Preferences
 import Terminal
 import ConversationServiceProvider
 import Persist
+import GitHubCopilotService
 
 public struct DisplayedChatMessage: Equatable {
     public enum Role: Equatable {
@@ -142,7 +143,7 @@ struct Chat {
                 state.typedMessage = ""
                 
                 let selectedFiles = state.selectedFiles
-                let selectedModelFamily = AppState.shared.getSelectedModelFamily()
+                let selectedModelFamily = AppState.shared.getSelectedModelFamily() ?? CopilotModelManager.getDefaultChatLLM()?.modelFamily
                 return .run { _ in
                     try await service.send(id, content: message, skillSet: skillSet, references: selectedFiles, model: selectedModelFamily)
                 }.cancellable(id: CancelID.sendMessage(self.id))
@@ -152,7 +153,7 @@ struct Chat {
                 let skillSet = state.buildSkillSet()
                 
                 let selectedFiles = state.selectedFiles
-                let selectedModelFamily = AppState.shared.getSelectedModelFamily()
+                let selectedModelFamily = AppState.shared.getSelectedModelFamily() ?? CopilotModelManager.getDefaultChatLLM()?.modelFamily
                 
                 return .run { _ in
                     try await service.send(id, content: message, skillSet: skillSet, references: selectedFiles, model: selectedModelFamily)
diff --git a/Core/Sources/ConversationTab/ModelPicker.swift b/Core/Sources/ConversationTab/ModelPicker.swift
@@ -3,6 +3,7 @@ import ChatService
 import Persist
 import ComposableArchitecture
 import GitHubCopilotService
+import Combine
 
 public let SELECTED_LLM_KEY = "selectedLLM"
 
@@ -28,6 +29,28 @@ extension AppState {
     }
 }
 
+class CopilotModelManagerObservable: ObservableObject {
+    static let shared = CopilotModelManagerObservable()
+    
+    @Published var availableChatModels: [LLMModel] = []
+    @Published var defaultModel: LLMModel = .init(modelName: "", modelFamily: "")
+    private var cancellables = Set<AnyCancellable>()
+    
+    private init() {
+        // Initial load
+        availableChatModels = CopilotModelManager.getAvailableChatLLMs()
+        
+        // Setup notification to update when models change
+        NotificationCenter.default.publisher(for: .gitHubCopilotModelsDidChange)
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                self?.availableChatModels = CopilotModelManager.getAvailableChatLLMs()
+                self?.defaultModel = CopilotModelManager.getDefaultChatModel()
+            }
+            .store(in: &cancellables)
+    }
+}
+
 extension CopilotModelManager {
     static func getAvailableChatLLMs() -> [LLMModel] {
         let LLMs = CopilotModelManager.getAvailableLLMs()
@@ -37,26 +60,40 @@ extension CopilotModelManager {
             LLMModel(modelName: $0.modelName, modelFamily: $0.modelFamily)
         }
     }
+
+    static func getDefaultChatModel() -> LLMModel {
+        let defaultModel = CopilotModelManager.getDefaultChatLLM()
+        if let defaultModel = defaultModel {
+            return LLMModel(modelName: defaultModel.modelName, modelFamily: defaultModel.modelFamily)
+        }
+        // Fallback to a hardcoded default if no model has isChatDefault = true
+        return LLMModel(modelName: "GPT-4.1 (Preview)", modelFamily: "gpt-4.1")
+    }
 }
 
 struct LLMModel: Codable, Hashable {
     let modelName: String
     let modelFamily: String
 }
 
-let defaultModel = LLMModel(modelName: "GPT-4o", modelFamily: "gpt-4o")
 struct ModelPicker: View {
-    @State private var selectedModel = defaultModel.modelName
+    @State private var selectedModel = ""
     @State private var isHovered = false
     @State private var isPressed = false
+    @ObservedObject private var modelManager = CopilotModelManagerObservable.shared
     static var lastRefreshModelsTime: Date = .init(timeIntervalSince1970: 0)
 
     init() {
-        self.updateCurrentModel()
+        let initialModel = AppState.shared.getSelectedModelName() ?? CopilotModelManager.getDefaultChatModel().modelName
+        self._selectedModel = State(initialValue: initialModel)
     }
 
     var models: [LLMModel] {
-        CopilotModelManager.getAvailableChatLLMs()
+        modelManager.availableChatModels
+    }
+    
+    var defaultModel: LLMModel {
+        modelManager.defaultModel
     }
 
     func updateCurrentModel() {
@@ -65,44 +102,48 @@ struct ModelPicker: View {
 
     var body: some View {
         WithPerceptionTracking {
-            Menu(selectedModel) {
-                if models.isEmpty {
-                    Button {
-                        // No action needed
-                    } label: {
-                        Text("Loading...")
-                    }
-                } else {
-                    ForEach(models, id: \.self) { option in
-                        Button {
-                            selectedModel = option.modelName
-                            AppState.shared.setSelectedModel(option)
-                        } label: {
-                            if selectedModel == option.modelName {
-                                Text("✓ \(option.modelName)")
-                            } else {
-                                Text("    \(option.modelName)")
+            Group {
+                if !models.isEmpty && !selectedModel.isEmpty {
+                    Menu(selectedModel) {
+                        ForEach(models, id: \.self) { option in
+                            Button {
+                                selectedModel = option.modelName
+                                AppState.shared.setSelectedModel(option)
+                            } label: {
+                                if selectedModel == option.modelName {
+                                    Text("✓ \(option.modelName)")
+                                } else {
+                                    Text("    \(option.modelName)")
+                                }
                             }
                         }
                     }
+                    .menuStyle(BorderlessButtonMenuStyle())
+                    .frame(maxWidth: labelWidth())
+                    .padding(4)
+                    .background(
+                        RoundedRectangle(cornerRadius: 5)
+                            .fill(isHovered ? Color.gray.opacity(0.1) : Color.clear)
+                    )
+                    .onHover { hovering in
+                        isHovered = hovering
+                    }
+                } else {
+                    EmptyView()
                 }
             }
-            .menuStyle(BorderlessButtonMenuStyle())
-            .frame(maxWidth: labelWidth())
-            .padding(4)
-            .background(
-                RoundedRectangle(cornerRadius: 5)
-                        .fill(isHovered ? Color.gray.opacity(0.1) : Color.clear)
-            )
-            .onHover { hovering in
-                isHovered = hovering
-            }
             .onAppear() {
-                updateCurrentModel()
                 Task {
                     await refreshModels()
+                    updateCurrentModel()
                 }
             }
+            .onChange(of: defaultModel) { _ in
+                updateCurrentModel()
+            }
+            .onChange(of: models) { _ in
+                updateCurrentModel()
+            }
             .help("Pick Model")
         }
     }
diff --git a/ExtensionService/AppDelegate.swift b/ExtensionService/AppDelegate.swift
@@ -258,10 +258,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
 
     func forceAuthStatusCheck() async {
         do {
-            let service = try GitHubCopilotService()
+            let service = try await GitHubCopilotViewModel.shared.getGitHubCopilotAuthService()
             _ = try await service.checkStatus()
-            try await service.shutdown()
-            try await service.exit()
         } catch {
             Logger.service.error("Failed to read auth status: \(error)")
         }
diff --git a/Server/package-lock.json b/Server/package-lock.json
diff --git a/Server/package.json b/Server/package.json
@@ -4,6 +4,6 @@
   "description": "Package for downloading @github/copilot-language-server",
   "private": true,
   "dependencies": {
-    "@github/copilot-language-server": "^1.298.0"
+    "@github/copilot-language-server": "^1.310.0"
   }
 }
diff --git a/Tool/Sources/ConversationServiceProvider/LSPTypes.swift b/Tool/Sources/ConversationServiceProvider/LSPTypes.swift
@@ -17,6 +17,7 @@ public struct ChatTemplate: Codable, Equatable {
 public enum PromptTemplateScope: String, Codable, Equatable {
     case chatPanel = "chat-panel"
     case editPanel = "edit-panel"
+    case agentPanel = "agent-panel"
     case editor = "editor"
     case inline = "inline"
     case completion = "completion"
@@ -37,13 +38,30 @@ public struct CopilotModel: Codable, Equatable {
     public let modelPolicy: CopilotModelPolicy?
     public let scopes: [PromptTemplateScope]
     public let preview: Bool
+    public let isChatDefault: Bool
+    public let isChatFallback: Bool
+    public let capabilities: CopilotModelCapabilities
+    public let billing: CopilotModelBilling?
 }
 
 public struct CopilotModelPolicy: Codable, Equatable {
     public let state: String
     public let terms: String
 }
 
+public struct CopilotModelCapabilities: Codable, Equatable {
+    public let supports: CopilotModelCapabilitiesSupports
+}
+
+public struct CopilotModelCapabilitiesSupports: Codable, Equatable {
+    public let vision: Bool
+}
+
+public struct CopilotModelBilling: Codable, Equatable {
+    public let isPremium: Bool
+    public let multiplier: Float
+}
+
 // MARK: Conversation Agents
 public struct ChatAgent: Codable, Equatable {
     public let slug: String
diff --git a/Tool/Sources/GitHubCopilotService/GitHubCopilotExtension.swift b/Tool/Sources/GitHubCopilotService/GitHubCopilotExtension.swift
@@ -64,7 +64,7 @@ public final class GitHubCopilotExtension: BuiltinExtension {
                 guard let service = await serviceLocator.getService(from: workspace) else { return }
                 try await service.notifyOpenTextDocument(fileURL: documentURL, content: content)
             } catch {
-                Logger.gitHubCopilot.error(error.localizedDescription)
+                Logger.gitHubCopilot.info(error.localizedDescription)
             }
         }
     }
@@ -76,7 +76,7 @@ public final class GitHubCopilotExtension: BuiltinExtension {
                 guard let service = await serviceLocator.getService(from: workspace) else { return }
                 try await service.notifySaveTextDocument(fileURL: documentURL)
             } catch {
-                Logger.gitHubCopilot.error(error.localizedDescription)
+                Logger.gitHubCopilot.info(error.localizedDescription)
             }
         }
     }
@@ -88,7 +88,7 @@ public final class GitHubCopilotExtension: BuiltinExtension {
                 guard let service = await serviceLocator.getService(from: workspace) else { return }
                 try await service.notifyCloseTextDocument(fileURL: documentURL)
             } catch {
-                Logger.gitHubCopilot.error(error.localizedDescription)
+                Logger.gitHubCopilot.info(error.localizedDescription)
             }
         }
     }
@@ -122,10 +122,10 @@ public final class GitHubCopilotExtension: BuiltinExtension {
                     // Reopen document if it's not found in the language server
                     self.workspace(workspace, didOpenDocumentAt: documentURL)
                 default:
-                    Logger.gitHubCopilot.error(error.localizedDescription)
+                    Logger.gitHubCopilot.info(error.localizedDescription)
                 }
             } catch {
-                Logger.gitHubCopilot.error(error.localizedDescription)
+                Logger.gitHubCopilot.info(error.localizedDescription)
             }
         }
     }
diff --git a/Tool/Sources/GitHubCopilotService/LanguageServer/CopilotModelManager.swift b/Tool/Sources/GitHubCopilotService/LanguageServer/CopilotModelManager.swift
@@ -1,21 +1,33 @@
 import ConversationServiceProvider
+import Foundation
+
+public extension Notification.Name {
+    static let gitHubCopilotModelsDidChange = Notification
+        .Name("com.github.CopilotForXcode.CopilotModelsDidChange")
+}
 
 public class CopilotModelManager {
     private static var availableLLMs: [CopilotModel] = []
     
     public static func updateLLMs(_ models: [CopilotModel]) {
-        availableLLMs = models
+        availableLLMs = models.sorted(by: { $0.modelName.lowercased() < $1.modelName.lowercased()})
+        NotificationCenter.default.post(name: .gitHubCopilotModelsDidChange, object: nil)
     }
 
     public static func getAvailableLLMs() -> [CopilotModel] {
         return availableLLMs
     }
     
+    public static func getDefaultChatLLM() -> CopilotModel? {
+        return availableLLMs.first(where: { $0.isChatDefault })
+    }
+    
     public static func hasLLMs() -> Bool {
         return !availableLLMs.isEmpty
     }
 
     public static func clearLLMs() {
         availableLLMs = []
+        NotificationCenter.default.post(name: .gitHubCopilotModelsDidChange, object: nil)
     }
 }
diff --git a/Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotService.swift b/Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotService.swift
@@ -739,6 +739,7 @@ public final class GitHubCopilotService:
         if status.status == .ok || status.status == .maybeOk {
             await Status.shared.updateAuthStatus(.loggedIn, username: status.user)
             if !CopilotModelManager.hasLLMs() {
+                Logger.gitHubCopilot.info("No models found, fetching models...")
                 let models = try? await models()
                 if let models = models, !models.isEmpty {
                     CopilotModelManager.updateLLMs(models)

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`"description": "Package for downloading @github/copilot-language-server",`
`5`	`5`	`"private": true,`
`6`	`6`	`"dependencies": {`
`7`		`- "@github/copilot-language-server": "^1.298.0"`
	`7`	`+ "@github/copilot-language-server": "^1.310.0"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public final class GitHubCopilotExtension: BuiltinExtension {`
`64`	`64`	`guard let service = await serviceLocator.getService(from: workspace) else { return }`
`65`	`65`	`try await service.notifyOpenTextDocument(fileURL: documentURL, content: content)`
`66`	`66`	`} catch {`
`67`		`- Logger.gitHubCopilot.error(error.localizedDescription)`
	`67`	`+ Logger.gitHubCopilot.info(error.localizedDescription)`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`}`
`@@ -76,7 +76,7 @@ public final class GitHubCopilotExtension: BuiltinExtension {`
`76`	`76`	`guard let service = await serviceLocator.getService(from: workspace) else { return }`
`77`	`77`	`try await service.notifySaveTextDocument(fileURL: documentURL)`
`78`	`78`	`} catch {`
`79`		`- Logger.gitHubCopilot.error(error.localizedDescription)`
	`79`	`+ Logger.gitHubCopilot.info(error.localizedDescription)`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`}`
`@@ -88,7 +88,7 @@ public final class GitHubCopilotExtension: BuiltinExtension {`
`88`	`88`	`guard let service = await serviceLocator.getService(from: workspace) else { return }`
`89`	`89`	`try await service.notifyCloseTextDocument(fileURL: documentURL)`
`90`	`90`	`} catch {`
`91`		`- Logger.gitHubCopilot.error(error.localizedDescription)`
	`91`	`+ Logger.gitHubCopilot.info(error.localizedDescription)`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`}`
`@@ -122,10 +122,10 @@ public final class GitHubCopilotExtension: BuiltinExtension {`
`122`	`122`	`// Reopen document if it's not found in the language server`
`123`	`123`	`self.workspace(workspace, didOpenDocumentAt: documentURL)`
`124`	`124`	`default:`
`125`		`- Logger.gitHubCopilot.error(error.localizedDescription)`
	`125`	`+ Logger.gitHubCopilot.info(error.localizedDescription)`
`126`	`126`	`}`
`127`	`127`	`} catch {`
`128`		`- Logger.gitHubCopilot.error(error.localizedDescription)`
	`128`	`+ Logger.gitHubCopilot.info(error.localizedDescription)`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`	`}`