Merge branch 'feature/chat-menu' into develop

Author: intitni

Core/Sources/ChatService/ChatService.swift

@@ -20,8 +20,8 @@ public final class ChatService: ObservableObject {
     let pluginController: ChatPluginController
     let contextController: DynamicContextController
     var cancellable = Set<AnyCancellable>()
-    var systemPrompt = defaultSystemPrompt
-    var extraSystemPrompt = ""
+    @Published public internal(set) var systemPrompt = defaultSystemPrompt
+    @Published public internal(set) var extraSystemPrompt = ""
 
     public init<T: ChatGPTServiceType>(chatGPTService: T) {
         self.chatGPTService = chatGPTService
@@ -61,6 +61,11 @@ public final class ChatService: ObservableObject {
         await pluginController.cancel()
         await chatGPTService.clearHistory()
     }
+    
+    public func resetPrompt() async {
+        systemPrompt = defaultSystemPrompt
+        extraSystemPrompt = ""
+    }
 
     public func deleteMessage(id: String) async {
         await chatGPTService.mutateHistory { messages in

Core/Sources/Service/GUI/ChatProvider+Service.swift

@@ -1,4 +1,5 @@
 import ChatService
+import Combine
 import Foundation
 import OpenAIService
 import SuggestionWidget
@@ -11,6 +12,7 @@ extension ChatProvider {
         onSwitchContext: @escaping () -> Void
     ) {
         self.init()
+
         let cancellable = service.objectWillChange.sink { [weak self] in
             guard let self else { return }
             Task { @MainActor in
@@ -22,6 +24,8 @@ extension ChatProvider {
                     )
                 }
                 self.isReceivingMessage = await service.chatGPTService.isReceivingMessage
+                self.systemPrompt = service.systemPrompt
+                self.extraSystemPrompt = service.extraSystemPrompt
             }
         }
 
@@ -75,5 +79,19 @@ extension ChatProvider {
                 }
             }
         }
+
+        onResetPrompt = {
+            Task {
+                await service.resetPrompt()
+            }
+        }
+        
+        onRunCustomCommand = { command in
+            Task {
+                let commandHandler = PseudoCommandHandler()
+                await commandHandler.handleCustomCommand(command)
+            }
+        }
     }
 }
+

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -74,7 +74,8 @@ struct PseudoCommandHandler {
                 return it
             }
             switch command.feature {
-            case .customChat:
+            // editor content is not required.
+            case .customChat, .chatWithSelection:
                 return .init(
                     content: "",
                     lines: [],
@@ -85,7 +86,8 @@ struct PseudoCommandHandler {
                     indentSize: 0,
                     usesTabsForIndentation: false
                 )
-            case .chatWithSelection, .promptToCode:
+            // editor content is required.
+            case .promptToCode:
                 return nil
             }
         }() else {

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -234,8 +234,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
     func chatWithSelection(editor: EditorContent) async throws -> UpdatedContent? {
         Task {
             do {
-                try await startChatWithSelection(
-                    editor: editor,
+                try await startChat(
                     specifiedSystemPrompt: nil,
                     extraSystemPrompt: nil,
                     sendingMessageImmediately: nil,
@@ -289,8 +288,7 @@ extension WindowBaseCommandHandler {
 
         switch command.feature {
         case let .chatWithSelection(extraSystemPrompt, prompt):
-            try await startChatWithSelection(
-                editor: editor,
+            try await startChat(
                 specifiedSystemPrompt: nil,
                 extraSystemPrompt: extraSystemPrompt,
                 sendingMessageImmediately: prompt,
@@ -385,69 +383,6 @@ extension WindowBaseCommandHandler {
 
         presenter.presentPromptToCode(fileURL: fileURL)
     }
-
-    private func startChatWithSelection(
-        editor: EditorContent,
-        specifiedSystemPrompt: String?,
-        extraSystemPrompt: String?,
-        sendingMessageImmediately: String?,
-        name: String?
-    ) async throws {
-        presenter.markAsProcessing(true)
-        defer { presenter.markAsProcessing(false) }
-
-        let fileURL = try await Environment.fetchCurrentFileURL()
-
-        let code = {
-            guard let selection = editor.selections.last,
-                  selection.start != selection.end else { return "" }
-            return editor.selectedCode(in: selection)
-        }()
-
-        let chat = WidgetDataSource.shared.createChatIfNeeded(for: fileURL)
-        
-        chat.mutateSystemPrompt(specifiedSystemPrompt)
-        chat.mutateExtraSystemPrompt(extraSystemPrompt ?? "")
-
-        Task {
-            let customCommandPrefix = {
-                if let name { return "[\(name)] " }
-                return ""
-            }()
-            
-            if specifiedSystemPrompt != nil {
-                await chat.chatGPTService.mutateHistory { history in
-                    history.append(.init(
-                        role: .assistant,
-                        content: "",
-                        summary: "\(customCommandPrefix)System prompt is updated."
-                    ))
-                }
-            } else if !code.isEmpty, let selection = editor.selections.last {
-                await chat.chatGPTService.mutateHistory { history in
-                    history.append(.init(
-                        role: .assistant,
-                        content: "",
-                        summary: "\(customCommandPrefix)Chatting about selected code in `\(fileURL.lastPathComponent)` from `\(selection.start.line + 1):\(selection.start.character + 1)` to `\(selection.end.line + 1):\(selection.end.character)`.\nThe code will persist in the conversation."
-                    ))
-                }
-            } else if !customCommandPrefix.isEmpty {
-                await chat.chatGPTService.mutateHistory { history in
-                    history.append(.init(
-                        role: .assistant,
-                        content: "",
-                        summary: "\(customCommandPrefix)System prompt is updated."
-                    ))
-                }
-            }
-
-            if let sendingMessageImmediately, !sendingMessageImmediately.isEmpty {
-                try await chat.send(content: sendingMessageImmediately)
-            }
-        }
-
-        presenter.presentChatRoom(fileURL: fileURL)
-    }
 
     private func startChat(
         specifiedSystemPrompt: String?,
@@ -459,7 +394,6 @@ extension WindowBaseCommandHandler {
         defer { presenter.markAsProcessing(false) }
 
         let focusedElementURI = try await Environment.fetchFocusedElementURI()
-        let language = UserDefaults.shared.value(for: \.chatGPTLanguage)
 
         let chat = WidgetDataSource.shared.createChatIfNeeded(for: focusedElementURI)
 
@@ -472,15 +406,7 @@ extension WindowBaseCommandHandler {
                 return ""
             }()
 
-            if specifiedSystemPrompt != nil {
-                await chat.chatGPTService.mutateHistory { history in
-                    history.append(.init(
-                        role: .assistant,
-                        content: "",
-                        summary: "\(customCommandPrefix)System prompt is updated."
-                    ))
-                }
-            } else if !customCommandPrefix.isEmpty {
+            if specifiedSystemPrompt != nil || extraSystemPrompt != nil {
                 await chat.chatGPTService.mutateHistory { history in
                     history.append(.init(
                         role: .assistant,

Core/Sources/SuggestionWidget/ChatProvider.swift

@@ -1,17 +1,22 @@
 import Foundation
+import Preferences
 import SwiftUI
 
 public final class ChatProvider: ObservableObject {
     let id = UUID()
     @Published public var history: [ChatMessage] = []
     @Published public var isReceivingMessage = false
+    public var systemPrompt = ""
+    public var extraSystemPrompt = ""
     public var onMessageSend: (String) -> Void
     public var onStop: () -> Void
     public var onClear: () -> Void
     public var onClose: () -> Void
     public var onSwitchContext: () -> Void
     public var onDeleteMessage: (String) -> Void
     public var onResendMessage: (String) -> Void
+    public var onResetPrompt: () -> Void
+    public var onRunCustomCommand: (CustomCommand) -> Void = { _ in }
 
     public init(
         history: [ChatMessage] = [],
@@ -22,7 +27,9 @@ public final class ChatProvider: ObservableObject {
         onClose: @escaping () -> Void = {},
         onSwitchContext: @escaping () -> Void = {},
         onDeleteMessage: @escaping (String) -> Void = { _ in },
-        onResendMessage: @escaping (String) -> Void = { _ in }
+        onResendMessage: @escaping (String) -> Void = { _ in },
+        onResetPrompt: @escaping () -> Void = {},
+        onRunCustomCommand: @escaping (CustomCommand) -> Void = { _ in }
     ) {
         self.history = history
         self.isReceivingMessage = isReceivingMessage
@@ -33,6 +40,8 @@ public final class ChatProvider: ObservableObject {
         self.onSwitchContext = onSwitchContext
         self.onDeleteMessage = onDeleteMessage
         self.onResendMessage = onResendMessage
+        self.onResetPrompt = onResetPrompt
+        self.onRunCustomCommand = onRunCustomCommand
     }
 
     public func send(_ message: String) { onMessageSend(message) }
@@ -42,6 +51,10 @@ public final class ChatProvider: ObservableObject {
     public func switchContext() { onSwitchContext() }
     public func deleteMessage(id: String) { onDeleteMessage(id) }
     public func resendMessage(id: String) { onResendMessage(id) }
+    public func resetPrompt() { onResetPrompt() }
+    public func triggerCustomCommand(_ command: CustomCommand) {
+        onRunCustomCommand(command)
+    }
 }
 
 public struct ChatMessage: Equatable {
@@ -55,3 +68,4 @@ public struct ChatMessage: Equatable {
         self.text = text
     }
 }
+

Core/Sources/SuggestionWidget/SuggestionPanelContent/ChatPanel.swift

@@ -258,6 +258,9 @@ struct ChatPanelInputArea: View {
         }
         .padding(8)
         .background(.ultraThickMaterial)
+        .contextMenu {
+            ChatContextMenu(chat: chat)
+        }
     }
 
     var clearButton: some View {
@@ -342,6 +345,71 @@ struct ChatPanelInputArea: View {
     }
 }
 
+struct ChatContextMenu: View {
+    let chat: ChatProvider
+    @AppStorage(\.customCommands) var customCommands
+
+    var body: some View {
+        Group {
+            currentSystemPrompt
+            currentExtraSystemPrompt
+            resetPrompt
+
+            Divider()
+
+            customCommandMenu
+        }
+    }
+
+    @ViewBuilder
+    var currentSystemPrompt: some View {
+        Text("System Prompt:")
+        Text({
+            var text = chat.systemPrompt
+            if text.isEmpty { text = "N/A" }
+            if text.count > 30 { text = String(text.prefix(30)) + "..." }
+            return text
+        }() as String)
+    }
+
+    @ViewBuilder
+    var currentExtraSystemPrompt: some View {
+        Text("Extra Prompt:")
+        Text({
+            var text = chat.extraSystemPrompt
+            if text.isEmpty { text = "N/A" }
+            if text.count > 30 { text = String(text.prefix(30)) + "..." }
+            return text
+        }() as String)
+    }
+
+    var resetPrompt: some View {
+        Button("Reset System Prompt") {
+            chat.resetPrompt()
+        }
+    }
+
+    var customCommandMenu: some View {
+        Menu("Custom Commands") {
+            ForEach(
+                customCommands.filter {
+                    switch $0.feature {
+                    case .chatWithSelection, .customChat: return true
+                    case .promptToCode: return false
+                    }
+                },
+                id: \.name
+            ) { command in
+                Button(action: {
+                    chat.triggerCustomCommand(command)
+                }) {
+                    Text(command.name)
+                }
+            }
+        }
+    }
+}
+
 struct RoundedCorners: Shape {
     var tl: CGFloat = 0.0
     var tr: CGFloat = 0.0
@@ -403,7 +471,7 @@ struct GlobalChatSwitchToggleStyle: ToggleStyle {
         HStack(spacing: 4) {
             Text(configuration.isOn ? "Shared Conversation" : "Local Conversation")
                 .foregroundStyle(.tertiary)
-            
+
             RoundedRectangle(cornerRadius: 10, style: .circular)
                 .foregroundColor(configuration.isOn ? Color.indigo : .gray.opacity(0.5))
                 .frame(width: 30, height: 20, alignment: .center)