@copilotz/chat-adapter 0.9.29 → 0.9.31

package/dist/index.js

@@ -1732,6 +1732,9 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
   const userContextSeedRef = useRef2(userContextSeed);
   const messagePageInfoRef = useRef2(messagePageInfo);
   const isLoadingOlderMessagesRef = useRef2(isLoadingOlderMessages);
+  const isStreamingRef = useRef2(isStreaming);
+  const threadActivityStatusRef = useRef2(threadActivityStatus);
+  const isRecoveringStreamRef = useRef2(isRecoveringStream);
   const senderOptionsRef = useRef2({
     agents: agentOptions,
     user: userId ? { id: userId, name: userName, avatarUrl: userAvatar } : null,
@@ -1749,6 +1752,9 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
   userContextSeedRef.current = userContextSeed;
   messagePageInfoRef.current = messagePageInfo;
   isLoadingOlderMessagesRef.current = isLoadingOlderMessages;
+  isStreamingRef.current = isStreaming;
+  threadActivityStatusRef.current = threadActivityStatus;
+  isRecoveringStreamRef.current = isRecoveringStream;
   senderOptionsRef.current = {
     agents: agentOptions,
     user: userId ? { id: userId, name: userName, avatarUrl: userAvatar } : null,
@@ -2293,11 +2299,16 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
     async (params) => {
       let currentAssistantId = params.assistantMessageId ?? generateId();
       let currentAssistantSender = params.assistantSender;
+      const streamOwnerThreadId = currentThreadIdRef.current;
+      const streamOwnerThreadExternalId = params.threadExternalId ?? currentThreadExternalIdRef.current;
+      const streamStillOwnsVisibleThread = () => streamOwnerThreadId ? currentThreadIdRef.current === streamOwnerThreadId : !streamOwnerThreadExternalId || currentThreadExternalIdRef.current === streamOwnerThreadExternalId || currentThreadIdRef.current === streamOwnerThreadExternalId;
       params.onBeforeStart?.(currentAssistantId);
       let hasStreamProgress = false;
       const updateStreamingMessage = (partial, opts) => {
+        if (!streamStillOwnsVisibleThread()) return;
         if (partial && partial.length > 0) {
           hasStreamProgress = true;
+          setIsRecoveringStream(false);
         }
         const isReasoning = opts?.isReasoning ?? false;
         const nextSender = opts?.agent ? resolveAgentSender(opts.agent, senderOptionsRef.current) : currentAssistantSender;
@@ -2356,6 +2367,7 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
         });
       };
       const finalizeCurrentAssistantBubble = () => {
+        if (!streamStillOwnsVisibleThread()) return;
         setMessages((prev) => {
           const idx = prev.findIndex((m) => m.id === currentAssistantId);
           if (idx < 0) return prev;
@@ -2368,6 +2380,7 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
       };
       const curThreadId = currentThreadIdRef.current;
       const applyLiveToolResultUpdate = (update) => {
+        if (!streamStillOwnsVisibleThread()) return;
         let matched = false;
         setMessages((prev) => {
           const next = applyToolResultUpdateToMessages(prev, update, {
@@ -2382,6 +2395,7 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
         }
       };
       const finalizeActiveAssistantTurn = (finalAnswer) => {
+        if (!streamStillOwnsVisibleThread()) return;
         setMessages((prev) => {
           const currentIdx = prev.findIndex((message2) => message2.id === currentAssistantId && message2.role === "assistant");
           const fallbackIdx = currentIdx >= 0 ? currentIdx : (() => {
@@ -2429,12 +2443,14 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
         return null;
       };
       const abortController = new AbortController();
-      abortControllerRef.current?.abort();
+      if (!params.preserveActiveRun) {
+        abortControllerRef.current?.abort();
+        recoveryPollGenerationRef.current += 1;
+        setIsRecoveringStream(false);
+      }
       abortControllerRef.current = abortController;
       stopRequestedRef.current = false;
-      recoveryPollGenerationRef.current += 1;
       setThreadActivityStatus("running");
-      setIsRecoveringStream(false);
       setIsStreaming(true);
       liveToolUpdatesRef.current = [];
       let streamError = null;
@@ -2488,6 +2504,7 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
             agent: raw?.payload?.agent ?? raw?.agent ?? null
           }),
           onMessageEvent: async (event) => {
+            if (!streamStillOwnsVisibleThread()) return;
             const intercepted = applyEventInterceptor(event);
             if (intercepted?.handled) {
               return;
@@ -2596,6 +2613,7 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
             handleStreamMessageEvent(event);
           },
           onAssetEvent: async (payload) => {
+            if (!streamStillOwnsVisibleThread()) return;
             const intercepted = applyEventInterceptor({
               type: "ASSET_CREATED",
               payload
@@ -2615,7 +2633,7 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
       }
       const wasStopped = stopRequestedRef.current || abortController.signal.aborted || isAbortError(streamError);
       let recoveryStarted = false;
-      if (!wasStopped) {
+      if (!wasStopped && streamStillOwnsVisibleThread()) {
         try {
           const activityThreadId = await resolveActivityThreadId();
           if (activityThreadId) {
@@ -2635,7 +2653,12 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
           }
         }
       }
-      abortControllerRef.current = null;
+      if (abortControllerRef.current === abortController) {
+        abortControllerRef.current = null;
+      }
+      if (!streamStillOwnsVisibleThread()) {
+        return currentAssistantId;
+      }
       if (recoveryStarted) {
         return currentAssistantId;
       }
@@ -2654,6 +2677,8 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
       const timestamp = nowTs();
       const curThreadId = currentThreadIdRef.current;
       const curThreadExtId = currentThreadExternalIdRef.current;
+      const sendOwnerThreadId = curThreadId;
+      const preserveActiveRun = threadActivityStatusRef.current === "running" || isRecoveringStreamRef.current || isStreamingRef.current;
       const existingThreadId = curThreadId ?? void 0;
       const extMap = threadExternalIdMapRef.current;
       const isPlaceholderThread = existingThreadId ? extMap[existingThreadId] === existingThreadId : false;
@@ -2668,6 +2693,8 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
         setCurrentThreadExternalId(effectiveThreadExternalId ?? null);
       }
       const conversationKey = threadIdForSend ?? effectiveThreadExternalId;
+      const sendOwnerThreadExternalId = effectiveThreadExternalId ?? curThreadExtId;
+      const stillShowingSendOwnerThread = () => sendOwnerThreadId ? currentThreadIdRef.current === sendOwnerThreadId : !sendOwnerThreadExternalId || currentThreadExternalIdRef.current === sendOwnerThreadExternalId || currentThreadIdRef.current === sendOwnerThreadExternalId;
       const currentMetadata = threadMetadataMapRef.current[conversationKey];
       const pendingTitle = currentMetadata?.pendingTitle;
       const userMessage = {
@@ -2727,11 +2754,14 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
           agentName: preferredAgentRef.current,
           assistantMessageId: assistantPlaceholder.id,
           assistantSender,
+          preserveActiveRun,
           // Include pending title for new threads
           threadMetadata: pendingTitle ? { name: pendingTitle } : void 0
         });
         await new Promise((r) => setTimeout(r, 1e3));
-        await fetchAndSetThreadsState(userId, effectiveThreadExternalId ?? existingThreadId ?? null);
+        if (stillShowingSendOwnerThread()) {
+          await fetchAndSetThreadsState(userId, effectiveThreadExternalId ?? existingThreadId ?? null);
+        }
       } catch (error) {
         if (isAbortError(error)) return;
         console.error("Error sending Copilotz message", error);