[pull] main from intitni:main

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)
     }

Core/Sources/ChatService/ChatService.swift

@@ -7,7 +7,7 @@ import Preferences
 
 public final class ChatService: ObservableObject {
     public let memory: ContextAwareAutoManagedChatGPTMemory
-    public let configuration: ChatGPTConfiguration
+    public let configuration: OverridingChatGPTConfiguration
     public let chatGPTService: any ChatGPTServiceType
     public var allPluginCommands: [String] { allPlugins.map { $0.command } }
     @Published public internal(set) var isReceivingMessage = false
@@ -20,7 +20,7 @@ public final class ChatService: ObservableObject {
 
     init<T: ChatGPTServiceType>(
         memory: ContextAwareAutoManagedChatGPTMemory,
-        configuration: ChatGPTConfiguration,
+        configuration: OverridingChatGPTConfiguration,
         chatGPTService: T
     ) {
         self.memory = memory

Core/Sources/Service/GUI/ChatTabFactory.swift

@@ -11,9 +11,7 @@ import XcodeInspector
 import ProChatTabs
 
 enum ChatTabFactory {
-    static func chatTabBuilderCollection(
-        openTab: @escaping (any ChatTab) -> Void
-    ) -> [ChatTabBuilderCollection] {
+    static func chatTabBuilderCollection() -> [ChatTabBuilderCollection] {
         func folderIfNeeded(
             _ builders: [any ChatTabBuilder],
             title: String
@@ -27,82 +25,88 @@ enum ChatTabFactory {
 
         let collection = [
             folderIfNeeded(ChatGPTChatTab.chatBuilders(), title: ChatGPTChatTab.name),
-            folderIfNeeded(BrowserChatTab.chatBuilders(externalDependency: .init(
-                getEditorContent: {
-                    guard let editor = XcodeInspector.shared.focusedEditor else {
-                        return .init(selectedText: "", language: "", fileContent: "")
-                    }
-                    let content = editor.content
-                    return .init(
-                        selectedText: content.selectedContent,
-                        language: languageIdentifierFromFileURL(
-                            XcodeInspector.shared
-                                .activeDocumentURL
-                        )
-                        .rawValue,
-                        fileContent: content.content
-                    )
-                },
-                handleCustomCommand: { command, prompt in
-                    switch command.feature {
-                    case let .chatWithSelection(extraSystemPrompt, _, useExtraSystemPrompt):
-                        let service = ChatService()
-                        return try await service.processMessage(
-                            systemPrompt: nil,
-                            extraSystemPrompt: (useExtraSystemPrompt ?? false) ? extraSystemPrompt :
-                                nil,
-                            prompt: prompt
-                        )
-                    case let .customChat(systemPrompt, _):
-                        let service = ChatService()
-                        return try await service.processMessage(
-                            systemPrompt: systemPrompt,
-                            extraSystemPrompt: nil,
-                            prompt: prompt
-                        )
-                    case let .singleRoundDialog(
-                        systemPrompt,
-                        overwriteSystemPrompt,
-                        _,
-                        _
-                    ):
-                        let service = ChatService()
-                        return try await service.handleSingleRoundDialogCommand(
-                            systemPrompt: systemPrompt,
-                            overwriteSystemPrompt: overwriteSystemPrompt ?? false,
-                            prompt: prompt
-                        )
-                    case let .promptToCode(extraSystemPrompt, instruction, _, _):
-                        let service = PromptToCodeService(
-                            code: prompt,
-                            selectionRange: .outOfScope,
-                            language: .plaintext,
-                            identSize: 4,
-                            usesTabsForIndentation: true,
-                            projectRootURL: .init(fileURLWithPath: "/"),
-                            fileURL: .init(fileURLWithPath: "/"),
-                            allCode: prompt,
-                            extraSystemPrompt: extraSystemPrompt,
-                            generateDescriptionRequirement: false
-                        )
-                        try await service.modifyCode(prompt: instruction ?? "Modify content.")
-                        return service.code
-                    }
-                },
-                handleNewTab: openTab
-            )), title: BrowserChatTab.name),
+            folderIfNeeded(
+                BrowserChatTab.chatBuilders(
+                    externalDependency: externalDependenciesForBrowserChatTab()
+                ),
+                title: BrowserChatTab.name
+            ),
         ].compactMap { $0 }
 
         return collection
     }
+
+    static func externalDependenciesForBrowserChatTab() -> BrowserChatTab.ExternalDependency {
+        .init(
+            getEditorContent: {
+                guard let editor = XcodeInspector.shared.focusedEditor else {
+                    return .init(selectedText: "", language: "", fileContent: "")
+                }
+                let content = editor.content
+                return .init(
+                    selectedText: content.selectedContent,
+                    language: languageIdentifierFromFileURL(
+                        XcodeInspector.shared
+                            .activeDocumentURL
+                    )
+                    .rawValue,
+                    fileContent: content.content
+                )
+            },
+            handleCustomCommand: { command, prompt in
+                switch command.feature {
+                case let .chatWithSelection(extraSystemPrompt, _, useExtraSystemPrompt):
+                    let service = ChatService()
+                    return try await service.processMessage(
+                        systemPrompt: nil,
+                        extraSystemPrompt: (useExtraSystemPrompt ?? false) ? extraSystemPrompt :
+                            nil,
+                        prompt: prompt
+                    )
+                case let .customChat(systemPrompt, _):
+                    let service = ChatService()
+                    return try await service.processMessage(
+                        systemPrompt: systemPrompt,
+                        extraSystemPrompt: nil,
+                        prompt: prompt
+                    )
+                case let .singleRoundDialog(
+                    systemPrompt,
+                    overwriteSystemPrompt,
+                    _,
+                    _
+                ):
+                    let service = ChatService()
+                    return try await service.handleSingleRoundDialogCommand(
+                        systemPrompt: systemPrompt,
+                        overwriteSystemPrompt: overwriteSystemPrompt ?? false,
+                        prompt: prompt
+                    )
+                case let .promptToCode(extraSystemPrompt, instruction, _, _):
+                    let service = PromptToCodeService(
+                        code: prompt,
+                        selectionRange: .outOfScope,
+                        language: .plaintext,
+                        identSize: 4,
+                        usesTabsForIndentation: true,
+                        projectRootURL: .init(fileURLWithPath: "/"),
+                        fileURL: .init(fileURLWithPath: "/"),
+                        allCode: prompt,
+                        extraSystemPrompt: extraSystemPrompt,
+                        generateDescriptionRequirement: false
+                    )
+                    try await service.modifyCode(prompt: instruction ?? "Modify content.")
+                    return service.code
+                }
+            }
+        )
+    }
 }
 
 #else
 
 enum ChatTabFactory {
-    static func chatTabBuilderCollection(
-        openTab: @escaping (any ChatTab) -> Void
-    ) -> [ChatTabBuilderCollection] {
+    static func chatTabBuilderCollection() -> [ChatTabBuilderCollection] {
         func folderIfNeeded(
             _ builders: [any ChatTabBuilder],
             title: String