Pre-release 0.35.120

Core/Sources/ChatService/ChatService.swift

@@ -17,7 +17,7 @@ import OrderedCollections
 
 public protocol ChatServiceType {
     var memory: ContextAwareAutoManagedChatMemory { get set }
-    func send(_ id: String, content: String, skillSet: [ConversationSkill], references: [FileReference], model: String?, agentMode: Bool) async throws
+    func send(_ id: String, content: String, skillSet: [ConversationSkill], references: [FileReference], model: String?, agentMode: Bool, userLanguage: String?, turnId: String?) async throws
     func stopReceivingMessage() async
     func upvote(_ id: String, _ rating: ConversationRating) async
     func downvote(_ id: String, _ rating: ConversationRating) async
@@ -79,6 +79,7 @@ public final class ChatService: ChatServiceType, ObservableObject {
     private var activeRequestId: String?
     private(set) public var conversationId: String?
     private var skillSet: [ConversationSkill] = []
+    private var lastUserRequest: ConversationRequest?
     private var isRestored: Bool = false
     private var pendingToolCallRequests: [String: ToolCallRequest] = [:]
     init(provider: any ConversationServiceProvider,
@@ -98,6 +99,18 @@ public final class ChatService: ChatServiceType, ObservableObject {
         subscribeToClientToolConfirmationEvent()
     }
 
+    deinit {
+        Task { [weak self] in
+            await self?.stopReceivingMessage()
+        }
+
+        // Clear all subscriptions
+        cancellables.forEach { $0.cancel() }
+        cancellables.removeAll()
+
+        // Memory will be deallocated automatically
+    }
+
     private func subscribeToNotifications() {
         memory.observeHistoryChange { [weak self] in
             Task { [weak self] in
@@ -303,7 +316,16 @@ public final class ChatService: ChatServiceType, ObservableObject {
         }
     }
 
-    public func send(_ id: String, content: String, skillSet: Array<ConversationSkill>, references: Array<FileReference>, model: String? = nil, agentMode: Bool = false) async throws {
+    public func send(
+        _ id: String,
+        content: String,
+        skillSet: Array<ConversationSkill>,
+        references: Array<FileReference>,
+        model: String? = nil,
+        agentMode: Bool = false,
+        userLanguage: String? = nil,
+        turnId: String? = nil
+    ) async throws {
         guard activeRequestId == nil else { return }
         let workDoneToken = UUID().uuidString
         activeRequestId = workDoneToken
@@ -315,11 +337,15 @@ public final class ChatService: ChatServiceType, ObservableObject {
             content: content,
             references: references.toConversationReferences()
         )
-        await memory.appendMessage(chatMessage)
+
+        // If turnId is provided, it is used to update the existing message, no need to append the user message
+        if turnId == nil {
+            await memory.appendMessage(chatMessage)
+        }
 
         // reset file edits
         self.resetFileEdits()
-
+            
         // persist
         saveChatMessageToStorage(chatMessage)
 
@@ -363,7 +389,11 @@ public final class ChatService: ChatServiceType, ObservableObject {
                                           ignoredSkills: ignoredSkills,
                                           references: references,
                                           model: model,
-                                          agentMode: agentMode)
+                                          agentMode: agentMode,
+                                          userLanguage: userLanguage,
+                                          turnId: turnId
+        )
+        self.lastUserRequest = request
         self.skillSet = skillSet
         try await send(request)
     }
@@ -408,12 +438,23 @@ public final class ChatService: ChatServiceType, ObservableObject {
         deleteChatMessageFromStorage(id)
     }
 
-    // Not used for now
-    public func resendMessage(id: String) async throws {
-        if let message = (await memory.history).first(where: { $0.id == id })
+    public func resendMessage(id: String, model: String? = nil) async throws {
+        if let _ = (await memory.history).first(where: { $0.id == id }),
+           let lastUserRequest
         {
+            // TODO: clean up contents for resend message
+            activeRequestId = nil
             do {
-                try await send(id, content: message.content, skillSet: [], references: [])
+                try await send(
+                    id,
+                    content: lastUserRequest.content,
+                    skillSet: skillSet,
+                    references: lastUserRequest.references ?? [],
+                    model: model != nil ? model : lastUserRequest.model,
+                    agentMode: lastUserRequest.agentMode,
+                    userLanguage: lastUserRequest.userLanguage,
+                    turnId: id
+                )
             } catch {
                 print("Failed to resend message")
             }
@@ -611,17 +652,34 @@ public final class ChatService: ChatServiceType, ObservableObject {
             if CLSError.code == 402 {
                 Task {
                     await Status.shared
-                        .updateCLSStatus(.error, busy: false, message: CLSError.message)
+                        .updateCLSStatus(.warning, busy: false, message: CLSError.message)
                     let errorMessage = ChatMessage(
                         id: progress.turnId,
                         chatTabID: self.chatTabInfo.id,
                         clsTurnID: progress.turnId,
-                        role: .system,
-                        content: CLSError.message
+                        role: .assistant,
+                        content: "",
+                        panelMessages: [.init(type: .error, title: String(CLSError.code ?? 0), message: CLSError.message, location: .Panel)]
                     )
                     // will persist in resetongoingRequest()
-                    await memory.removeMessage(progress.turnId)
                     await memory.appendMessage(errorMessage)
+
+                    if let lastUserRequest {
+                        guard let fallbackModel = CopilotModelManager.getFallbackLLM(
+                            scope: lastUserRequest.agentMode ? .agentPanel : .chatPanel
+                        ) else {
+                            resetOngoingRequest()
+                            return
+                        }
+                        do {
+                            CopilotModelManager.switchToFallbackModel()
+                            try await resendMessage(id: progress.turnId, model: fallbackModel.id)
+                        } catch {
+                            Logger.gitHubCopilot.error(error)
+                            resetOngoingRequest()
+                        }
+                        return
+                    }
                 }
             } else if CLSError.code == 400 && CLSError.message.contains("model is not supported") {
                 Task {
@@ -633,6 +691,8 @@ public final class ChatService: ChatServiceType, ObservableObject {
                         errorMessage: "Oops, the model is not supported. Please enable it first in [GitHub Copilot settings](https://github.com/settings/copilot)."
                     )
                     await memory.appendMessage(errorMessage)
+                    resetOngoingRequest()
+                    return
                 }
             } else {
                 Task {
@@ -646,10 +706,10 @@ public final class ChatService: ChatServiceType, ObservableObject {
                     )
                     // will persist in resetOngoingRequest()
                     await memory.appendMessage(errorMessage)
+                    resetOngoingRequest()
+                    return
                 }
             }
-            resetOngoingRequest()
-            return
         }
 
         Task {
@@ -664,9 +724,8 @@ public final class ChatService: ChatServiceType, ObservableObject {
             )
             // will persist in resetOngoingRequest()
             await memory.appendMessage(message)
+            resetOngoingRequest()
         }
-
-        resetOngoingRequest()
     }
 
     private func resetOngoingRequest() {
@@ -732,7 +791,12 @@ public final class ChatService: ChatServiceType, ObservableObject {
 
         do {
             if let conversationId = conversationId {
-                try await conversationProvider?.createTurn(with: conversationId, request: request, workspaceURL: getWorkspaceURL())
+                try await conversationProvider?
+                    .createTurn(
+                        with: conversationId,
+                        request: request,
+                        workspaceURL: getWorkspaceURL()
+                    )
             } else {
                 var requestWithTurns = request
 

Core/Sources/ChatService/ContextAwareAutoManagedChatMemory.swift

@@ -18,6 +18,8 @@ public final class ContextAwareAutoManagedChatMemory: ChatMemory {
             systemPrompt: ""
         )
     }
+
+    deinit { }
 
     public func mutateHistory(_ update: (inout [ChatMessage]) -> Void) async {
         await memory.mutateHistory(update)

Core/Sources/ConversationTab/Chat.swift

@@ -15,7 +15,6 @@ public struct DisplayedChatMessage: Equatable {
     public enum Role: Equatable {
         case user
         case assistant
-        case system
         case ignored
     }
 
@@ -28,8 +27,20 @@ public struct DisplayedChatMessage: Equatable {
     public var errorMessage: String? = nil
     public var steps: [ConversationProgressStep] = []
     public var editAgentRounds: [AgentRound] = []
-
-    public init(id: String, role: Role, text: String, references: [ConversationReference] = [], followUp: ConversationFollowUp? = nil, suggestedTitle: String? = nil, errorMessage: String? = nil, steps: [ConversationProgressStep] = [], editAgentRounds: [AgentRound] = []) {
+    public var panelMessages: [CopilotShowMessageParams] = []
+
+    public init(
+        id: String,
+        role: Role,
+        text: String,
+        references: [ConversationReference] = [],
+        followUp: ConversationFollowUp? = nil,
+        suggestedTitle: String? = nil,
+        errorMessage: String? = nil,
+        steps: [ConversationProgressStep] = [],
+        editAgentRounds: [AgentRound] = [],
+        panelMessages: [CopilotShowMessageParams] = []
+    ) {
         self.id = id
         self.role = role
         self.text = text
@@ -39,6 +50,7 @@ public struct DisplayedChatMessage: Equatable {
         self.errorMessage = errorMessage
         self.steps = steps
         self.editAgentRounds = editAgentRounds
+        self.panelMessages = panelMessages
     }
 }
 
@@ -137,6 +149,7 @@ struct Chat {
 
     @Dependency(\.openURL) var openURL
     @AppStorage(\.enableCurrentEditorContext) var enableCurrentEditorContext: Bool
+    @AppStorage(\.chatResponseLocale) var chatResponseLocale
 
     var body: some ReducerOf<Self> {
         BindingReducer()
@@ -180,7 +193,7 @@ struct Chat {
                 let selectedModelFamily = AppState.shared.getSelectedModelFamily() ?? CopilotModelManager.getDefaultChatModel(scope: AppState.shared.modelScope())?.modelFamily
                 let agentMode = AppState.shared.isAgentModeEnabled()
                 return .run { _ in
-                    try await service.send(id, content: message, skillSet: skillSet, references: selectedFiles, model: selectedModelFamily, agentMode: agentMode)
+                    try await service.send(id, content: message, skillSet: skillSet, references: selectedFiles, model: selectedModelFamily, agentMode: agentMode, userLanguage: chatResponseLocale)
                 }.cancellable(id: CancelID.sendMessage(self.id))
 
             case let .toolCallAccepted(toolCallId):
@@ -209,7 +222,7 @@ struct Chat {
                 let selectedModelFamily = AppState.shared.getSelectedModelFamily() ?? CopilotModelManager.getDefaultChatModel(scope: AppState.shared.modelScope())?.modelFamily
 
                 return .run { _ in
-                    try await service.send(id, content: message, skillSet: skillSet, references: selectedFiles, model: selectedModelFamily)
+                    try await service.send(id, content: message, skillSet: skillSet, references: selectedFiles, model: selectedModelFamily, userLanguage: chatResponseLocale)
                 }.cancellable(id: CancelID.sendMessage(self.id))
 
             case .returnButtonTapped:
@@ -343,9 +356,9 @@ struct Chat {
                         id: message.id,
                         role: {
                             switch message.role {
-                            case .system: return .system
                             case .user: return .user
                             case .assistant: return .assistant
+                            case .system: return .ignored
                             }
                         }(),
                         text: message.content,
@@ -360,7 +373,8 @@ struct Chat {
                         suggestedTitle: message.suggestedTitle,
                         errorMessage: message.errorMessage,
                         steps: message.steps,
-                        editAgentRounds: message.editAgentRounds
+                        editAgentRounds: message.editAgentRounds,
+                        panelMessages: message.panelMessages
                     ))
 
                     return all

Core/Sources/ConversationTab/ChatPanel.swift

@@ -37,9 +37,7 @@ public struct ChatPanel: View {
                         .accessibilityElement(children: .combine)
                         .accessibilityLabel("Chat Messages Group")
 
-                    if chat.history.last?.role == .system {
-                        ChatCLSError(chat: chat).padding(.trailing, 16)
-                    } else if (chat.history.last?.followUp) != nil {
+                    if let _ = chat.history.last?.followUp {
                         ChatFollowUp(chat: chat)
                             .padding(.trailing, 16)
                             .padding(.vertical, 8)
@@ -344,10 +342,9 @@ struct ChatHistoryItem: View {
                     errorMessage: message.errorMessage,
                     chat: chat,
                     steps: message.steps,
-                    editAgentRounds: message.editAgentRounds
+                    editAgentRounds: message.editAgentRounds,
+                    panelMessages: message.panelMessages
                 )
-            case .system:
-                FunctionMessage(chat: chat, id: message.id, text: text)
             case .ignored:
                 EmptyView()
             }
@@ -516,8 +513,7 @@ struct ChatPanelInputArea: View {
                                         submitChatMessage()
                                     }
                                     dropDownShowingType = nil
-                                },
-                                completions: chatAutoCompletion
+                                }
                             )
                             .focused(focusedField, equals: .textField)
                             .bind($chat.focusedField, to: focusedField)
@@ -800,11 +796,7 @@ struct ChatPanelInputArea: View {
             if !chat.isAgentMode {
                 promptTemplates = await SharedChatService.shared.loadChatTemplates() ?? []
             }
-
-            guard !promptTemplates.isEmpty else {
-                return [releaseNotesTemplate]
-            }
-
+
             let templates = promptTemplates + [releaseNotesTemplate]
             let skippedTemplates = [ "feedback", "help" ]
 
@@ -831,29 +823,6 @@ struct ChatPanelInputArea: View {
             return chatAgents.filter { $0.slug.hasPrefix(prefix) && includedAgents.contains($0.slug) }
         }
 
-        func chatAutoCompletion(text: String, proposed: [String], range: NSRange) -> [String] {
-            guard text.count == 1 else { return [] }
-            let plugins = [String]() // chat.pluginIdentifiers.map { "/\($0)" }
-            let availableFeatures = plugins + [
-//                "/exit",
-                "@code",
-                "@sense",
-                "@project",
-                "@web",
-            ]
-
-            let result: [String] = availableFeatures
-                .filter { $0.hasPrefix(text) && $0 != text }
-                .compactMap {
-                    guard let index = $0.index(
-                        $0.startIndex,
-                        offsetBy: range.location,
-                        limitedBy: $0.endIndex
-                    ) else { return nil }
-                    return String($0[index...])
-                }
-            return result
-        }
         func subscribeToActiveDocumentChangeEvent() {
             Publishers.CombineLatest(
                 XcodeInspector.shared.$latestActiveXcode,