Add proper delay for assistant switching (#2070)

* add proper delay for assistant switching

* persist input if possible

web/src/app/chat/ChatPage.tsx

@@ -412,6 +412,8 @@ export function ChatPage({
     completeMessageDetail.messageMap
   );
   const [isStreaming, setIsStreaming] = useState(false);
+  const [abortController, setAbortController] =
+    useState<AbortController | null>(null);
 
   // uploaded files
   const [currentMessageFiles, setCurrentMessageFiles] = useState<
@@ -614,18 +616,30 @@ export function ChatPage({
       return this.stack.length === 0;
     }
   }
+
   async function updateCurrentMessageFIFO(
     stack: CurrentMessageFIFO,
     params: any
   ) {
     try {
       for await (const packetBunch of sendMessage(params)) {
+        if (params.signal?.aborted) {
+          throw new Error("AbortError");
+        }
         for (const packet of packetBunch) {
           stack.push(packet);
         }
       }
-    } catch (error) {
+    } catch (error: unknown) {
-      stack.error = String(error);
+      if (error instanceof Error) {
+        if (error.name === "AbortError") {
+          console.debug("Stream aborted");
+        } else {
+          stack.error = error.message;
+        }
+      } else {
+        stack.error = String(error);
+      }
     } finally {
       stack.isComplete = true;
     }
@@ -663,6 +677,9 @@ export function ChatPage({
       return;
     }
 
+    const controller = new AbortController();
+    setAbortController(controller);
+
     setAlternativeGeneratingAssistant(alternativeAssistantOverride);
     clientScrollToBottom();
     let currChatSessionId: number;
@@ -775,6 +792,8 @@ export function ChatPage({
 
       const stack = new CurrentMessageFIFO();
       updateCurrentMessageFIFO(stack, {
+        signal: controller.signal, // Add this line
+
         message: currMessage,
         alternateAssistantId: currentAssistantId,
         fileDescriptors: currentMessageFiles,
@@ -987,9 +1006,12 @@ export function ChatPage({
 
   const onAssistantChange = (assistant: Persona | null) => {
     if (assistant && assistant.id !== liveAssistant.id) {
-      // remove uploaded files
+      // Abort the ongoing stream if it exists
-      setCurrentMessageFiles([]);
+      if (abortController && isStreaming) {
-      setSelectedAssistant(assistant);
+        abortController.abort();
+        resetInputBar();
+      }
+
       textAreaRef.current?.focus();
       router.push(buildChatUrl(searchParams, null, assistant.id));
     }