Update

Author: intitni

Core/Sources/ChatGPTChatTab/Chat.swift

@@ -99,6 +99,7 @@ struct Chat: ReducerProtocol {
         case observeSystemPromptChange(UUID)
         case observeExtraSystemPromptChange(UUID)
         case observeDefaultScopesChange(UUID)
+        case sendMessage(UUID)
     }
 
     @Dependency(\.openURL) var openURL
@@ -129,16 +130,19 @@ struct Chat: ReducerProtocol {
                 state.typedMessage = ""
                 return .run { _ in
                     try await service.send(content: message)
-                }
+                }.cancellable(id: CancelID.sendMessage(id))
 
             case .returnButtonTapped:
                 state.typedMessage += "\n"
                 return .none
 
             case .stopRespondingButtonTapped:
-                return .run { _ in
-                    await service.stopReceivingMessage()
-                }
+                return .merge(
+                    .run { _ in
+                        await service.stopReceivingMessage()
+                    },
+                    .cancel(id: CancelID.sendMessage(id))
+                )
 
             case .clearButtonTap:
                 return .run { _ in

Core/Sources/ChatService/ChatService.swift

@@ -105,7 +105,9 @@ public final class ChatService: ObservableObject {
 
         let stream = try await chatGPTService.send(content: content, summary: nil)
         do {
-            for try await _ in stream {}
+            for try await _ in stream {
+                try Task.checkCancellation()
+            }
         } catch {}
     }
 

Tool/Sources/OpenAIService/ChatGPTService.swift

@@ -203,6 +203,7 @@ public class ChatGPTService: ChatGPTServiceType {
         }
     }
 
+    #warning("TODO: remove this and let the concurrency system handle it")
     public func stopReceivingMessage() {
         runningTask?.cancel()
         runningTask = nil