Fix

Author: Sg312

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts

@@ -1074,6 +1074,7 @@ export function useChat(
       while (!chatIdRef.current && sendingRef.current && Date.now() - start < 3000) {
         await new Promise((r) => setTimeout(r, 50))
       }
+      if (!chatIdRef.current) return
     }
 
     if (sendingRef.current) {

apps/sim/lib/copilot/chat-streaming.ts

@@ -29,16 +29,19 @@ const pendingChatStreams = new Map<
 >()
 
 function registerPendingChatStream(chatId: string, streamId: string): void {
-  let resolve: () => void
+  if (pendingChatStreams.has(chatId)) {
+    logger.warn(`registerPendingChatStream: overwriting existing entry for chatId ${chatId}`)
+  }
+  let resolve!: () => void
   const promise = new Promise<void>((r) => {
     resolve = r
   })
-  pendingChatStreams.set(chatId, { promise, resolve: resolve!, streamId })
+  pendingChatStreams.set(chatId, { promise, resolve, streamId })
 }
 
-function resolvePendingChatStream(chatId: string): void {
+function resolvePendingChatStream(chatId: string, streamId: string): void {
   const entry = pendingChatStreams.get(chatId)
-  if (entry) {
+  if (entry && entry.streamId === streamId) {
     entry.resolve()
     pendingChatStreams.delete(chatId)
   }
@@ -255,7 +258,7 @@ export function createSSEStream(params: StreamingOrchestrationParams): ReadableS
       } finally {
         activeStreams.delete(streamId)
         if (chatId) {
-          resolvePendingChatStream(chatId)
+          resolvePendingChatStream(chatId, streamId)
         }
         try {
           controller.close()