Adjust ChatContext

Core/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/ActiveDocumentChatContextCollector.swift

@@ -27,7 +27,8 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
                 var removedCode = context
                 removedCode.focusedContext = nil
                 return .init(
-                    systemPrompt: [
+                    systemPrompt: "",
+                    retrievedContent: [
                         .init(
                             content: extractSystemPrompt(removedCode),
                             priority: .high
@@ -70,7 +71,8 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
         }
 
         return .init(
-            systemPrompt: [
+            systemPrompt: "",
+            retrievedContent: [
                 .init(content: extractSystemPrompt(context), priority: .high)
             ],
             functions: functions

Core/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/LegacyActiveDocumentChatContextCollector.swift

@@ -78,7 +78,8 @@ public struct LegacyActiveDocumentChatContextCollector: ChatContextCollector {
         }()
 
         return .init(
-            systemPrompt: [
+            systemPrompt: "",
+            retrievedContent: [
                 .init(content: """
                 Active Document Context:###
                 Document Relative Path: \(relativePath)

Core/Sources/ChatContextCollectors/SystemInfoChatContextCollector/SystemInfoChatContextCollector.swift

@@ -18,16 +18,12 @@ public final class SystemInfoChatContextCollector: ChatContextCollector {
         configuration: ChatGPTConfiguration
     ) -> ChatContext {
         return .init(
-            systemPrompt: [
-                .init(
-                    content: """
+            systemPrompt: """
                     Current Time: \(
                         Self.dateFormatter.string(from: Date())
                     ) (You can use it to calculate time in another time zone)
                     """,
-                    priority: .custom(999999)
-                ),
-            ],
+            retrievedContent: [],
             functions: []
         )
     }

Core/Sources/ChatContextCollectors/WebChatContextCollector/WebChatContextCollector.swift

@@ -21,12 +21,8 @@ public final class WebChatContextCollector: ChatContextCollector {
             links.isEmpty ? nil : QueryWebsiteFunction(),
         ]
         return .init(
-            systemPrompt: [
-                .init(
-                    content: "You prefer to answer questions with latest content on the internet.",
-                    priority: .low
-                ),
-            ],
+            systemPrompt: "You prefer to answer questions with latest content on the internet.",
+            retrievedContent: [],
             functions: functions.compactMap { $0 }
         )
     }

Core/Sources/ChatService/DynamicContextController.swift

@@ -66,14 +66,19 @@ final class DynamicContextController {
             return contexts
         }
 
+        let extraSystemPrompt = contexts
+            .map(\.systemPrompt)
+            .filter { !$0.isEmpty }
+            .joined(separator: "\n")
+
         let contextPrompts = contexts
-            .flatMap(\.systemPrompt)
+            .flatMap(\.retrievedContent)
             .filter { !$0.content.isEmpty }
             .sorted { $0.priority > $1.priority }
 
         let contextualSystemPrompt = """
         \(language.isEmpty ? "" : "You must always reply in \(language)")
-        \(systemPrompt)
+        \(systemPrompt)\(extraSystemPrompt.isEmpty ? "" : "\n\(extraSystemPrompt)")
         """
         await memory.mutateSystemPrompt(contextualSystemPrompt)
         await memory.mutateRetrievedContent(contextPrompts.map(\.content))

Tool/Sources/ChatContextCollector/ChatContextCollector.swift

@@ -2,7 +2,7 @@ import Foundation
 import OpenAIService
 
 public struct ChatContext {
-    public struct RetrievedPrompt {
+    public struct RetrievedContent {
         public enum Priority: Equatable, Comparable {
             case low
             case medium
@@ -40,29 +40,35 @@ public struct ChatContext {
         }
     }
 
-    public var systemPrompt: [RetrievedPrompt]
+    public var systemPrompt: String
+    public var retrievedContent: [RetrievedContent]
     public var functions: [any ChatGPTFunction]
-    public init(systemPrompt: [RetrievedPrompt], functions: [any ChatGPTFunction]) {
+    public init(
+        systemPrompt: String,
+        retrievedContent: [RetrievedContent],
+        functions: [any ChatGPTFunction]
+    ) {
         self.systemPrompt = systemPrompt
+        self.retrievedContent = retrievedContent
         self.functions = functions
     }
-    
+
     public static var empty: Self {
-        .init(systemPrompt: [], functions: [])
+        .init(systemPrompt: "", retrievedContent: [], functions: [])
     }
 }
 
 public func + (
-    lhs: ChatContext.RetrievedPrompt.Priority,
+    lhs: ChatContext.RetrievedContent.Priority,
     rhs: Int
-) -> ChatContext.RetrievedPrompt.Priority {
+) -> ChatContext.RetrievedContent.Priority {
     .custom(lhs.rawValue + rhs)
 }
 
 public func - (
-    lhs: ChatContext.RetrievedPrompt.Priority,
+    lhs: ChatContext.RetrievedContent.Priority,
     rhs: Int
-) -> ChatContext.RetrievedPrompt.Priority {
+) -> ChatContext.RetrievedContent.Priority {
     .custom(lhs.rawValue - rhs)
 }