Merge branch 'release/0.22.0'

Author: intitni

Copilot for Xcode.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,14 @@
 {
   "pins" : [
+    {
+      "identity" : "cgeventoverride",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/intitni/CGEventOverride",
+      "state" : {
+        "revision" : "40b29e804204c461253a52b77adea9c055184aad",
+        "version" : "1.2.0"
+      }
+    },
     {
       "identity" : "combine-schedulers",
       "kind" : "remoteSourceControl",
@@ -30,10 +39,10 @@
     {
       "identity" : "highlightr",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/raspu/Highlightr",
+      "location" : "https://github.com/intitni/Highlightr",
       "state" : {
-        "revision" : "93199b9e434f04bda956a613af8f571933f9f037",
-        "version" : "2.1.2"
+        "branch" : "bump-highlight-js-version",
+        "revision" : "4ffbb1b0b721378263297cafea6f2838044eb1eb"
       }
     },
     {
@@ -90,15 +99,6 @@
         "version" : "2.4.2"
       }
     },
-    {
-      "identity" : "splash",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/JohnSundell/Splash",
-      "state" : {
-        "branch" : "master",
-        "revision" : "2e3f17c2d09689c8bf175c4a84ff7f2ad3353301"
-      }
-    },
     {
       "identity" : "swift-argument-parser",
       "kind" : "remoteSourceControl",

Core/Package.swift

@@ -15,7 +15,6 @@ let package = Package(
                 "FileChangeChecker",
                 "LaunchAgentManager",
                 "UpdateChecker",
-                "UserDefaultsObserver",
             ]
         ),
         .library(
@@ -72,14 +71,15 @@ let package = Package(
                 "SuggestionService",
                 "GitHubCopilotService",
                 "XPCShared",
-                "CGEventObserver",
                 "DisplayLink",
                 "SuggestionWidget",
                 "ChatService",
                 "PromptToCodeService",
                 "ServiceUpdateMigration",
-                "UserDefaultsObserver",
                 "ChatGPTChatTab",
+                .product(name: "CGEventObserver", package: "Tool"),
+                .product(name: "Workspace", package: "Tool"),
+                .product(name: "UserDefaultsObserver", package: "Tool"),
                 .product(name: "AppMonitoring", package: "Tool"),
                 .product(name: "Environment", package: "Tool"),
                 .product(name: "SuggestionModel", package: "Tool"),
@@ -91,7 +91,7 @@ let package = Package(
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
                 .product(name: "Dependencies", package: "swift-dependencies"),
             ].pro([
-                "ProChatTabs",
+                "ProService",
             ])
         ),
         .testTarget(
@@ -149,7 +149,7 @@ let package = Package(
         .target(name: "SuggestionService", dependencies: [
             "GitHubCopilotService",
             "CodeiumService",
-            "UserDefaultsObserver",
+            .product(name: "UserDefaultsObserver", package: "Tool"),
         ]),
 
         // MARK: - Prompt To Code
@@ -180,6 +180,7 @@ let package = Package(
                 // context collectors
                 "WebChatContextCollector",
                 "ActiveDocumentChatContextCollector",
+                "SystemInfoChatContextCollector",
 
                 .product(name: "AppMonitoring", package: "Tool"),
                 .product(name: "Environment", package: "Tool"),
@@ -226,7 +227,7 @@ let package = Package(
             name: "SuggestionWidget",
             dependencies: [
                 "ChatGPTChatTab",
-                "UserDefaultsObserver",
+                .product(name: "UserDefaultsObserver", package: "Tool"),
                 .product(name: "SharedUIComponents", package: "Tool"),
                 .product(name: "AppMonitoring", package: "Tool"),
                 .product(name: "Environment", package: "Tool"),
@@ -241,12 +242,6 @@ let package = Package(
 
         // MARK: - Helpers
 
-        .target(
-            name: "CGEventObserver",
-            dependencies: [
-                .product(name: "Logger", package: "Tool"),
-            ]
-        ),
         .target(name: "FileChangeChecker"),
         .target(name: "LaunchAgentManager"),
         .target(name: "DisplayLink"),
@@ -264,7 +259,6 @@ let package = Package(
                 .product(name: "Preferences", package: "Tool"),
             ]
         ),
-        .target(name: "UserDefaultsObserver"),
         .target(
             name: "PlusFeatureFlag",
             dependencies: [
@@ -353,6 +347,15 @@ let package = Package(
             path: "Sources/ChatContextCollectors/WebChatContextCollector"
         ),
 
+        .target(
+            name: "SystemInfoChatContextCollector",
+            dependencies: [
+                "ChatContextCollector",
+                .product(name: "OpenAIService", package: "Tool"),
+            ],
+            path: "Sources/ChatContextCollectors/SystemInfoChatContextCollector"
+        ),
+
         .target(
             name: "ActiveDocumentChatContextCollector",
             dependencies: [

Core/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/ActiveDocumentChatContextCollector.swift

@@ -89,9 +89,15 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
         let start = """
         ## File and Code Scope
 
-        You can use the following context to answer user's questions about the editing document or code. The context shows only a part of the code in the editing document, and will change during the conversation, so it may not match our conversation.
+        You can use the following context to answer my questions about the editing document or code. The context shows only a part of the code in the editing document, and will change during the conversation, so it may not match our conversation.
 
-        User Editing Document Context: ###
+        \(
+            context.focusedContext == nil
+                ? ""
+                : "When you don't known what I am asking, I am probably referring to the code."
+        )
+
+        Editing Document Context: ###
         """
         let end = "###"
         let relativePath = "Document Relative Path: \(context.relativePath)"
@@ -110,10 +116,7 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
             let codeRange = "Focused Range [line, character]: \(focusedContext.codeRange)"
 
             let code = """
-            Focused Code (start from line \(
-                focusedContext.codeRange.start
-                    .line
-            )):
+            Focused Code (start from line \(focusedContext.codeRange.start.line + 1)):
             ```\(context.language.rawValue)
             \(focusedContext.code)
             ```
@@ -282,7 +285,7 @@ struct ActiveDocumentContext {
         selectionRange = info.editorContent?.selections.first ?? .zero
         lineAnnotations = info.editorContent?.lineAnnotations ?? []
         imports = []
-        
+
         if changed {
             moveToFocusedCode()
         }

Core/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/Functions/ExpandFocusRangeFunction.swift

@@ -10,7 +10,7 @@ struct ExpandFocusRangeFunction: ChatGPTFunction {
         var range: CursorRange
 
         var botReadableContent: String {
-            "User Editing Document Context is updated to display code at \(range)."
+            "Editing Document Context is updated to display code at \(range)."
         }
     }
 
@@ -25,7 +25,7 @@ struct ExpandFocusRangeFunction: ChatGPTFunction {
     }
 
     var description: String {
-        "Call when User Editing Document Context provides too little context to answer a question."
+        "Call when Editing Document Context provides too little context to answer a question."
     }
 
     var argumentSchema: JSONSchemaValue { [

Core/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/Functions/MoveToCodeAroundLineFunction.swift

@@ -12,7 +12,7 @@ struct MoveToCodeAroundLineFunction: ChatGPTFunction {
         var range: CursorRange
 
         var botReadableContent: String {
-            "User Editing Document Context is updated to display code at \(range)."
+            "Editing Document Context is updated to display code at \(range)."
         }
     }
 

Core/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/Functions/MoveToFocusedCodeFunction.swift

@@ -10,7 +10,7 @@ struct MoveToFocusedCodeFunction: ChatGPTFunction {
         var range: CursorRange
 
         var botReadableContent: String {
-            "User Editing Document Context is updated to display code at \(range)."
+            "Editing Document Context is updated to display code at \(range)."
         }
     }
 
@@ -25,7 +25,7 @@ struct MoveToFocusedCodeFunction: ChatGPTFunction {
     }
 
     var description: String {
-        "Move user editing document context to the selected or focused code"
+        "Move editing document context to the selected or focused code"
     }
 
     var argumentSchema: JSONSchemaValue { [

Core/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/LegacyActiveDocumentChatContextCollector.swift

@@ -68,9 +68,9 @@ public struct LegacyActiveDocumentChatContextCollector: ChatContextCollector {
 
             return """
             Selected Code Not Available: '''
-            User has disabled default scope. \
-            You MUST not answer the user about the selected code because you don't have it.\
-            Ask user to prepend message with `@selection` to enable selected code to be \
+            I have disabled default scope. \
+            You MUST not answer about the selected code because you don't have it.\
+            Ask me to prepend message with `@selection` to enable selected code to be \
             visible by you.
             '''
             """

Core/Sources/ChatContextCollectors/SystemInfoChatContextCollector/SystemInfoChatContextCollector.swift

@@ -0,0 +1,27 @@
+import ChatContextCollector
+import Foundation
+import OpenAIService
+
+public final class SystemInfoChatContextCollector: ChatContextCollector {
+    static let dateFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "EEEE, yyyy-MM-dd HH:mm:ssZ"
+        return formatter
+    }()
+
+    public init() {}
+
+    public func generateContext(
+        history: [ChatMessage],
+        scopes: Set<String>,
+        content: String
+    ) -> ChatContext? {
+        return .init(
+            systemPrompt: """
+            Current Time: \(Self.dateFormatter.string(from: Date())) (You can use it to calculate time in another time zone)
+            """,
+            functions: []
+        )
+    }
+}
+

Core/Sources/ChatContextCollectors/WebChatContextCollector/SearchFunction.swift

@@ -51,7 +51,7 @@ struct SearchFunction: ChatGPTFunction {
                 "freshness": [
                     .type: "string",
                     .description: .string(
-                        "limit the search result to a specific range, use only when user ask the question about current events. Today is \(today). Format: yyyy-MM-dd..yyyy-MM-dd"
+                        "limit the search result to a specific range, use only when I ask the question about current events. Today is \(today). Format: yyyy-MM-dd..yyyy-MM-dd"
                     ),
                     .examples: ["1919-10-20..1988-10-20"],
                 ],

Core/Sources/ChatGPTChatTab/ChatContextMenu.swift

@@ -3,7 +3,7 @@ import SharedUIComponents
 import SwiftUI
 
 struct ChatContextMenu: View {
-    let chat: ChatProvider
+    @ObservedObject var chat: ChatProvider
     @AppStorage(\.customCommands) var customCommands
 
     var body: some View {

Core/Sources/ChatGPTChatTab/ChatGPTChatTab.swift

@@ -1,7 +1,9 @@
 import ChatService
 import ChatTab
 import Combine
+import ComposableArchitecture
 import Foundation
+import OpenAIService
 import Preferences
 import SwiftUI
 
@@ -13,18 +15,24 @@ public class ChatGPTChatTab: ChatTab {
     public let provider: ChatProvider
     private var cancellable = Set<AnyCancellable>()
 
+    struct RestorableState: Codable {
+        var history: [OpenAIService.ChatMessage]
+        var configuration: OverridingChatGPTConfiguration.Overriding
+        var systemPrompt: String
+        var extraSystemPrompt: String
+    }
+
     struct Builder: ChatTabBuilder {
         var title: String
-        var buildable: Bool { true }
         var customCommand: CustomCommand?
+        var afterBuild: (ChatGPTChatTab) async -> Void = { _ in }
 
-        func build() -> any ChatTab {
-            let tab = ChatGPTChatTab()
-            Task {
-                if let customCommand {
-                    try await tab.service.handleCustomCommand(customCommand)
-                }
+        func build(store: StoreOf<ChatTabItem>) async -> (any ChatTab)? {
+            let tab = ChatGPTChatTab(store: store)
+            if let customCommand {
+                try? await tab.service.handleCustomCommand(customCommand)
             }
+            await afterBuild(tab)
             return tab
         }
     }
@@ -37,6 +45,32 @@ public class ChatGPTChatTab: ChatTab {
         ChatContextMenu(chat: provider)
     }
 
+    public func restorableState() async -> Data {
+        let state = RestorableState(
+            history: await service.memory.history,
+            configuration: service.configuration.overriding,
+            systemPrompt: service.systemPrompt,
+            extraSystemPrompt: service.extraSystemPrompt
+        )
+        return (try? JSONEncoder().encode(state)) ?? Data()
+    }
+
+    public static func restore(
+        from data: Data,
+        externalDependency: Void
+    ) async throws -> any ChatTabBuilder {
+        let state = try JSONDecoder().decode(RestorableState.self, from: data)
+        let builder = Builder(title: "Chat") { @MainActor tab in
+            tab.service.configuration.overriding = state.configuration
+            tab.service.mutateSystemPrompt(state.systemPrompt)
+            tab.service.mutateExtraSystemPrompt(state.extraSystemPrompt)
+            await tab.service.memory.mutateHistory { history in
+                history = state.history
+            }
+        }
+        return builder
+    }
+
     public static func chatBuilders(externalDependency: Void) -> [ChatTabBuilder] {
         let customCommands = UserDefaults.shared.value(for: \.customCommands).compactMap {
             command in
@@ -49,14 +83,33 @@ public class ChatGPTChatTab: ChatTab {
         return [Builder(title: "New Chat", customCommand: nil)] + customCommands
     }
 
-    public init(service: ChatService = .init()) {
+    public init(service: ChatService = .init(), store: StoreOf<ChatTabItem>) {
         self.service = service
         provider = .init(service: service)
-        super.init(id: "Chat-" + provider.id.uuidString, title: "Chat")
+        super.init(store: store)
+    }
 
+    public func start() {
+        chatTabViewStore.send(.updateTitle("Chat"))
+        
+        service.$systemPrompt.removeDuplicates().sink { _ in
+            Task { @MainActor [weak self] in
+                self?.chatTabViewStore.send(.tabContentUpdated)
+            }
+        }.store(in: &cancellable)
+        
+        service.$extraSystemPrompt.removeDuplicates().sink { _ in
+            Task { @MainActor [weak self] in
+                self?.chatTabViewStore.send(.tabContentUpdated)
+            }
+        }.store(in: &cancellable)
+        
         provider.$history.sink { [weak self] _ in
-            if let title = self?.provider.title {
-                self?.title = title
+            Task { @MainActor [weak self] in
+                if let title = self?.provider.title {
+                    self?.chatTabViewStore.send(.updateTitle(title))
+                }
+                self?.chatTabViewStore.send(.tabContentUpdated)
             }
         }.store(in: &cancellable)
     }