Remove default scopes in custom chats, and reset them on prompt reset

Author: intitni

Core/Sources/ChatService/ChatService.swift

@@ -49,11 +49,22 @@ public final class ChatService: ObservableObject {
                 functionProvider: memory.functionProvider
             )
         )
+        
+        resetDefaultScopes()
 
+        memory.chatService = self
         memory.observeHistoryChange { [weak self] in
             self?.objectWillChange.send()
         }
     }
+    
+    public func resetDefaultScopes() {
+        if UserDefaults.shared.value(for: \.useCodeScopeByDefaultInChatContext) {
+            memory.contextController.defaultScopes = ["code"]
+        } else {
+            memory.contextController.defaultScopes = ["file"]
+        }
+    }
 
     public func send(content: String) async throws {
         guard !isReceivingMessage else { throw CancellationError() }
@@ -101,6 +112,7 @@ public final class ChatService: ObservableObject {
     public func resetPrompt() async {
         systemPrompt = UserDefaults.shared.value(for: \.defaultChatSystemPrompt)
         extraSystemPrompt = ""
+        resetDefaultScopes()
     }
 
     public func deleteMessage(id: String) async {
@@ -161,6 +173,7 @@ public final class ChatService: ObservableObject {
                     name: command.name
                 )
             case let .customChat(systemPrompt, prompt):
+                memory.contextController.defaultScopes = []
                 return .init(
                     specifiedSystemPrompt: systemPrompt,
                     extraSystemPrompt: "",

Core/Sources/ChatService/DynamicContextController.swift

@@ -9,6 +9,7 @@ final class DynamicContextController {
     let contextCollectors: [ChatContextCollector]
     let memory: AutoManagedChatGPTMemory
     let functionProvider: ChatFunctionProvider
+    var defaultScopes = [] as Set<String>
 
     convenience init(
         memory: AutoManagedChatGPTMemory,
@@ -35,11 +36,7 @@ final class DynamicContextController {
     func updatePromptToMatchContent(systemPrompt: String, content: String) async throws {
         var content = content
         var scopes = Self.parseScopes(&content)
-        if UserDefaults.shared.value(for: \.useCodeScopeByDefaultInChatContext) {
-            scopes.insert("code")
-        } else {
-            scopes.insert("file")
-        }
+        scopes.formUnion(defaultScopes)
 
         functionProvider.removeAll()
         let language = UserDefaults.shared.value(for: \.chatGPTLanguage)