address comments

Author: icecrasher321

apps/sim/app/api/copilot/chat/stream/route.ts

@@ -322,22 +322,22 @@ async function handleResumeRequestBody({
     const flushEvents = async () => {
       const events = await readEvents(streamId, cursor)
       if (events.length > 0) {
-        totalEventsFlushed += events.length
         logger.debug('[Resume] Flushing events', {
           streamId,
           afterCursor: cursor,
           eventCount: events.length,
         })
       }
       for (const envelope of events) {
+        if (!enqueueEvent(envelope)) {
+          break
+        }
+        totalEventsFlushed += 1
         cursor = envelope.stream.cursor ?? String(envelope.seq)
         currentRequestId = extractEnvelopeRequestId(envelope) || currentRequestId
         if (envelope.type === MothershipStreamV1EventType.complete) {
           sawTerminalEvent = true
         }
-        if (!enqueueEvent(envelope)) {
-          break
-        }
       }
     }
 
@@ -357,13 +357,13 @@ async function handleResumeRequestBody({
         reason: options?.reason,
         requestId: currentRequestId,
       })) {
+        if (!enqueueEvent(envelope)) {
+          break
+        }
         cursor = envelope.stream.cursor ?? String(envelope.seq)
         if (envelope.type === MothershipStreamV1EventType.complete) {
           sawTerminalEvent = true
         }
-        if (!enqueueEvent(envelope)) {
-          break
-        }
       }
     }
 
@@ -373,14 +373,14 @@ async function handleResumeRequestBody({
       const gap = await checkForReplayGap(streamId, afterCursor, currentRequestId)
       if (gap) {
         for (const envelope of gap.envelopes) {
+          if (!enqueueEvent(envelope)) {
+            break
+          }
           cursor = envelope.stream.cursor ?? String(envelope.seq)
           currentRequestId = extractEnvelopeRequestId(envelope) || currentRequestId
           if (envelope.type === MothershipStreamV1EventType.complete) {
             sawTerminalEvent = true
           }
-          if (!enqueueEvent(envelope)) {
-            break
-          }
         }
         return
       }

apps/sim/hooks/use-progressive-list.ts

@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useState } from 'react'
+import { useEffect, useLayoutEffect, useRef, useState } from 'react'
 
 interface ProgressiveListOptions {
   /** Number of items to render in the initial batch (most recent items) */
@@ -54,6 +54,11 @@ export function useProgressiveList<T>(
   const initialBatch = Math.max(0, options?.initialBatch ?? DEFAULTS.initialBatch)
   const batchSize = Math.max(1, options?.batchSize ?? DEFAULTS.batchSize)
   const [state, setState] = useState(() => createInitialState(key, items.length, initialBatch))
+  const latestItemCountRef = useRef(items.length)
+
+  useLayoutEffect(() => {
+    latestItemCountRef.current = items.length
+  }, [items.length])
 
   const renderState =
     state.key === key && (state.count > 0 || items.length === 0 || state.caughtUp)
@@ -105,11 +110,12 @@ export function useProgressiveList<T>(
           return prev
         }
 
-        const count = Math.min(items.length, prev.count + batchSize)
+        const itemCount = latestItemCountRef.current
+        const count = Math.min(itemCount, prev.count + batchSize)
         return {
           key,
           count,
-          caughtUp: count >= items.length,
+          caughtUp: count >= itemCount,
         }
       })
     })