Split start/end plugin and start/end responding

Author: intitni

Core/Sources/ChatPlugins/ChatPlugin.swift

@@ -9,9 +9,12 @@ public protocol ChatPlugin {
     init(inside chatGPTService: ChatGPTServiceType, delegate: ChatPluginDelegate)
     func send(content: String) async
     func cancel() async
+    func stopResponding() async
 }
 
 public protocol ChatPluginDelegate: AnyObject {
     func pluginDidStart(_ plugin: ChatPlugin)
     func pluginDidEnd(_ plugin: ChatPlugin)
+    func pluginDidStartResponding(_ plugin: ChatPlugin)
+    func pluginDidEndResponding(_ plugin: ChatPlugin)
 }

Core/Sources/ChatPlugins/TerminalChatPlugin.swift

@@ -19,6 +19,7 @@ public actor TerminalChatPlugin: ChatPlugin {
 
     public func send(content: String) async {
         delegate?.pluginDidStart(self)
+        delegate?.pluginDidStartResponding(self)
 
         let id = "\(Self.command)-\(UUID().uuidString)"
         var message = ChatMessage(id: id, role: .assistant, content: "")
@@ -87,11 +88,17 @@ public actor TerminalChatPlugin: ChatPlugin {
             }
         }
 
+        delegate?.pluginDidEndResponding(self)
         delegate?.pluginDidEnd(self)
     }
 
     public func cancel() async {
         isCancelled = true
         await terminal.terminate()
     }
+    
+    public func stopResponding() async {
+        isCancelled = true
+        await terminal.terminate()
+    }
 }

Core/Sources/ChatService/ChatService.swift

@@ -13,10 +13,6 @@ public final class ChatService: ObservableObject {
         self.chatGPTService = chatGPTService
     }
 
-    deinit {
-        print("deinit")
-    }
-
     public func send(content: String) async throws {
         // look for the prefix of content, see if there is something like /command.
         // If there is, then we need to find the plugin that can handle this command.
@@ -50,17 +46,23 @@ public final class ChatService: ObservableObject {
 }
 
 extension ChatService: ChatPluginDelegate {
-    public func pluginDidStart(_ plugin: ChatPlugin) {
+    public func pluginDidStartResponding(_ plugin: ChatPlugins.ChatPlugin) {
         Task {
             await chatGPTService.markReceivingMessage(true)
         }
-        runningPlugin = plugin
     }
 
-    public func pluginDidEnd(_ plugin: ChatPlugin) {
+    public func pluginDidEndResponding(_ plugin: ChatPlugins.ChatPlugin) {
         Task {
             await chatGPTService.markReceivingMessage(false)
         }
+    }
+    
+    public func pluginDidStart(_ plugin: ChatPlugin) {
+        runningPlugin = plugin
+    }
+    
+    public func pluginDidEnd(_ plugin: ChatPlugin) {
         runningPlugin = nil
     }
 }

Core/Sources/Terminal/Terminal.swift

@@ -15,14 +15,18 @@ public protocol TerminalType {
         currentDirectoryPath: String,
         environment: [String: String]
     ) async throws -> String
-    
+
     func terminate() async
+    func writeInput(_ input: String) async
+    var isRunning: Bool { get }
 }
 
 public final class Terminal: TerminalType, @unchecked Sendable {
     var process: Process?
     var outputPipe: Pipe?
     var inputPipe: Pipe?
+    
+    public var isRunning: Bool { process?.isRunning ?? false }
 
     public struct TerminationError: Error {
         public let reason: Process.TerminationReason
@@ -84,13 +88,14 @@ public final class Terminal: TerminalType, @unchecked Sendable {
                 if !(self.process?.isRunning ?? false) {
                     let reason = self.process?.terminationReason ?? .exit
                     let status = self.process?.terminationStatus ?? 1
-                    if let output = (self.process?.standardOutput as? Pipe)?.fileHandleForReading.readDataToEndOfFile(),
-                       let content = String(data: output, encoding: .utf8),
-                       !content.isEmpty
+                    if let output = (self.process?.standardOutput as? Pipe)?.fileHandleForReading
+                        .readDataToEndOfFile(),
+                        let content = String(data: output, encoding: .utf8),
+                        !content.isEmpty
                     {
                         continuation?.yield(content)
                     }
-                    
+
                     if status == 0 {
                         continuation?.finish()
                     } else {
@@ -139,15 +144,15 @@ public final class Terminal: TerminalType, @unchecked Sendable {
         return result
     }
 
-    func writeInput(_ input: String) {
+    public func writeInput(_ input: String) {
         guard let data = input.data(using: .utf8) else {
             return
         }
 
         inputPipe?.fileHandleForWriting.write(data)
         inputPipe?.fileHandleForWriting.closeFile()
     }
-    
+
     public func terminate() async {
         process?.terminate()
         process = nil