Merge branch 'feature/message-manipulation' into develop

Author: intitni

Core/Sources/ChatService/ChatService.swift

@@ -89,6 +89,18 @@ public final class ChatService: ObservableObject {
         }
         await chatGPTService.clearHistory()
     }
+    
+    public func deleteMessage(id: String) async {
+        await chatGPTService.mutateHistory { messages in
+            messages.removeAll(where: { $0.id == id })
+        }
+    }
+    
+    public func resendMessage(id: String) async throws {
+        if let message = (await chatGPTService.history).first(where: { $0.id == id }) {
+            try await send(content: message.content)
+        }
+    }
 
     public func mutateSystemPrompt(_ newPrompt: String) async {
         await chatGPTService.mutateSystemPrompt(newPrompt)

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

@@ -55,9 +55,25 @@ extension ChatProvider {
                 onCloseChat()
             }
         }
-        
+
         self.onSwitchContext = {
             onSwitchContext()
         }
+
+        onDeleteMessage = { id in
+            Task {
+                await service.deleteMessage(id: id)
+            }
+        }
+
+        onResendMessage = { id in
+            Task {
+                do {
+                    try await service.resendMessage(id: id)
+                } catch {
+                    PresentInWindowSuggestionPresenter().presentError(error)
+                }
+            }
+        }
     }
 }

Core/Sources/SuggestionWidget/ChatProvider.swift

@@ -10,6 +10,8 @@ public final class ChatProvider: ObservableObject {
     public var onClear: () -> Void
     public var onClose: () -> Void
     public var onSwitchContext: () -> Void
+    public var onDeleteMessage: (String) -> Void
+    public var onResendMessage: (String) -> Void
 
     public init(
         history: [ChatMessage] = [],
@@ -18,7 +20,9 @@ public final class ChatProvider: ObservableObject {
         onStop: @escaping () -> Void = {},
         onClear: @escaping () -> Void = {},
         onClose: @escaping () -> Void = {},
-        onSwitchContext: @escaping () -> Void = {}
+        onSwitchContext: @escaping () -> Void = {},
+        onDeleteMessage: @escaping (String) -> Void = { _ in },
+        onResendMessage: @escaping (String) -> Void = { _ in }
     ) {
         self.history = history
         self.isReceivingMessage = isReceivingMessage
@@ -27,13 +31,17 @@ public final class ChatProvider: ObservableObject {
         self.onClear = onClear
         self.onClose = onClose
         self.onSwitchContext = onSwitchContext
+        self.onDeleteMessage = onDeleteMessage
+        self.onResendMessage = onResendMessage
     }
 
     public func send(_ message: String) { onMessageSend(message) }
     public func stop() { onStop() }
     public func clear() { onClear() }
     public func close() { onClose() }
     public func switchContext() { onSwitchContext() }
+    public func deleteMessage(id: String) { onDeleteMessage(id) }
+    public func resendMessage(id: String) { onResendMessage(id) }
 }
 
 public struct ChatMessage: Equatable {

Core/Sources/SuggestionWidget/SuggestionPanelContent/ChatPanel.swift

@@ -110,11 +110,11 @@ struct ChatPanelMessages: View {
                         .text
 
                     if message.isUser {
-                        UserMessage(text: text)
+                        UserMessage(id: message.id, text: text, chat: chat)
                             .listRowInsets(EdgeInsets(top: 0, leading: -8, bottom: 0, trailing: -8))
                             .padding(.vertical, 4)
                     } else {
-                        BotMessage(text: text)
+                        BotMessage(id: message.id, text: text, chat: chat)
                             .listRowInsets(EdgeInsets(top: 0, leading: -8, bottom: 0, trailing: -8))
                             .padding(.vertical, 4)
                     }
@@ -165,7 +165,9 @@ private struct StopRespondingButton: View {
 }
 
 private struct UserMessage: View {
+    let id: String
     let text: String
+    let chat: ChatProvider
     @Environment(\.colorScheme) var colorScheme
 
     var body: some View {
@@ -195,13 +197,24 @@ private struct UserMessage: View {
                     NSPasteboard.general.clearContents()
                     NSPasteboard.general.setString(text, forType: .string)
                 }
-                .buttonStyle(.borderless)
+                
+                Button("Send Again") {
+                    chat.resendMessage(id: id)
+                }
+                
+                Divider()
+                
+                Button("Delete") {
+                    chat.deleteMessage(id: id)
+                }
             }
     }
 }
 
 private struct BotMessage: View {
+    let id: String
     let text: String
+    let chat: ChatProvider
     @Environment(\.colorScheme) var colorScheme
 
     var body: some View {
@@ -236,7 +249,12 @@ private struct BotMessage: View {
                         NSPasteboard.general.clearContents()
                         NSPasteboard.general.setString(text, forType: .string)
                     }
-                    .buttonStyle(.borderless)
+                    
+                    Divider()
+                    
+                    Button("Delete") {
+                        chat.deleteMessage(id: id)
+                    }
                 }
         }
         .frame(maxWidth: .infinity, alignment: .trailing)