Make resend work for plugin

Author: intitni

Core/Sources/ChatPlugins/AITerminalChatPlugin.swift

@@ -19,7 +19,7 @@ public actor AITerminalChatPlugin: ChatPlugin {
         self.delegate = delegate
     }
 
-    public func send(content: String) async {
+    public func send(content: String, originalMessage: String) async {
         if !isStarted {
             isStarted = true
             delegate?.pluginDidStart(self)
@@ -69,7 +69,11 @@ public actor AITerminalChatPlugin: ChatPlugin {
                 }
             } else {
                 await chatGPTService.mutateHistory { history in
-                    history.append(.init(role: .user, content: "Run a command to \(content)"))
+                    history.append(.init(
+                        role: .user,
+                        content: originalMessage,
+                        summary: "Run a command to \(content)")
+                    )
                 }
                 delegate?.pluginDidStartResponding(self)
                 let result = try await generateCommand(task: content)

Core/Sources/ChatPlugins/ChatPlugin.swift

@@ -7,7 +7,7 @@ public protocol ChatPlugin: AnyObject {
     var name: String { get }
 
     init(inside chatGPTService: any ChatGPTServiceType, delegate: ChatPluginDelegate)
-    func send(content: String) async
+    func send(content: String, originalMessage: String) async
     func cancel() async
     func stopResponding() async
 }

Core/Sources/ChatPlugins/TerminalChatPlugin.swift

@@ -17,7 +17,7 @@ public actor TerminalChatPlugin: ChatPlugin {
         self.delegate = delegate
     }
 
-    public func send(content: String) async {
+    public func send(content: String, originalMessage: String) async {
         delegate?.pluginDidStart(self)
         delegate?.pluginDidStartResponding(self)
 
@@ -38,7 +38,11 @@ public actor TerminalChatPlugin: ChatPlugin {
             let projectURL = try await Environment.fetchCurrentProjectRootURL(fileURL)
 
             await chatGPTService.mutateHistory { history in
-                history.append(.init(role: .user, content: "Run command: \(content)"))
+                history.append(.init(
+                    role: .user,
+                    content: originalMessage,
+                    summary: "Run command: \(content)")
+                )
             }
 
             if isCancelled { throw CancellationError() }

Core/Sources/ChatService/ChatService.swift

@@ -53,24 +53,28 @@ public final class ChatService: ObservableObject {
                     }
                 }
             } else if let runningPlugin {
-                await runningPlugin.send(content: content)
+                await runningPlugin.send(content: content, originalMessage: content)
             } else if let pluginType = plugins[command] {
                 let plugin = pluginType.init(inside: chatGPTService, delegate: self)
                 if #available(macOS 13.0, *) {
                     await plugin.send(
                         content: String(
                             content.dropFirst(command.count + 1)
                                 .trimmingPrefix(while: { $0 == " " })
-                        )
+                        ),
+                        originalMessage: content
                     )
                 } else {
-                    await plugin.send(content: String(content.dropFirst(command.count + 1)))
+                    await plugin.send(
+                        content: String(content.dropFirst(command.count + 1)),
+                        originalMessage: content
+                    )
                 }
             } else {
                 _ = try await chatGPTService.send(content: content, summary: nil)
             }
         } else if let runningPlugin {
-            await runningPlugin.send(content: content)
+            await runningPlugin.send(content: content, originalMessage: content)
         } else {
             _ = try await chatGPTService.send(content: content, summary: nil)
         }
@@ -89,13 +93,13 @@ 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)
@@ -133,7 +137,7 @@ extension ChatService: ChatPluginDelegate {
     public func shouldStartAnotherPlugin(_ type: ChatPlugin.Type, withContent content: String) {
         let plugin = type.init(inside: chatGPTService, delegate: self)
         Task {
-            await plugin.send(content: content)
+            await plugin.send(content: content, originalMessage: content)
         }
     }
 }