Adjust plugin cancellation

Author: intitni

Core/Sources/ChatPlugins/AITerminalChatPlugin.swift

@@ -31,6 +31,7 @@ public actor AITerminalChatPlugin: ChatPlugin {
                     history.append(.init(role: .user, content: content))
                 }
                 delegate?.pluginDidStartResponding(self)
+                if isCancelled { return }
                 if try await checkConfirmation(content: content) {
                     delegate?.pluginDidEndResponding(self)
                     delegate?.pluginDidEnd(self)
@@ -52,6 +53,7 @@ public actor AITerminalChatPlugin: ChatPlugin {
                 delegate?.pluginDidStartResponding(self)
                 let result = try await generateCommand(task: content)
                 command = result
+                if isCancelled { return }
                 await chatGPTService.mutateHistory { history in
                     history.append(.init(role: .assistant, content: """
                     Confirm to run?
@@ -73,6 +75,8 @@ public actor AITerminalChatPlugin: ChatPlugin {
 
     public func cancel() async {
         isCancelled = true
+        delegate?.pluginDidEndResponding(self)
+        delegate?.pluginDidEnd(self)
     }
 
     public func stopResponding() async {}

Core/Sources/ChatPlugins/ChatPlugin.swift

@@ -1,7 +1,7 @@
 import Foundation
 import OpenAIService
 
-public protocol ChatPlugin {
+public protocol ChatPlugin: AnyObject {
     /// Should be [a-zA-Z0-9]+
     static var command: String { get }
     var name: String { get }

Core/Sources/ChatService/ChatService.swift

@@ -112,8 +112,10 @@ extension ChatService: ChatPluginDelegate {
         runningPlugin = plugin
     }
 
-    public func pluginDidEnd(_: ChatPlugin) {
-        runningPlugin = nil
+    public func pluginDidEnd(_ plugin: ChatPlugin) {
+        if runningPlugin === plugin {
+            runningPlugin = nil
+        }
     }
 
     public func shouldStartAnotherPlugin(_ type: ChatPlugin.Type, withContent content: String) {