u

src/components/chat/ChatDrawer.jsx

@@ -48,6 +48,7 @@ export default class ChatDrawer extends PureComponent {
       loadingConversations: s.loadingConversations,
       sseStatus: s.sseStatus,
       sendError: s.sendError,
+      activeTurns: s.activeTurns || [],
       inputText: '',
       drawerWidth: settings?.chatDrawerWidth || DEFAULT_DRAWER_WIDTH,
       isResizing: false,
@@ -88,6 +89,7 @@ export default class ChatDrawer extends PureComponent {
         loadingConversations: state.loadingConversations,
         sseStatus: state.sseStatus,
         sendError: state.sendError,
+        activeTurns: state.activeTurns || [],
       };
     });
 
@@ -409,7 +411,7 @@ export default class ChatDrawer extends PureComponent {
         ) : (
           <ChatFlowList
             messages={
-              streamingText
+              streamingText && (!this.state.activeTurns || this.state.activeTurns.length === 0)
                 ? [
                     ...messages,
                     {
@@ -422,6 +424,7 @@ export default class ChatDrawer extends PureComponent {
                   ]
                 : messages
             }
+            activeTurns={this.state.activeTurns}
             conversationState={conversationState}
             model={model}
           />