Update flare-ui/src/app/services/conversation-manager.service.ts

flare-ui/src/app/services/conversation-manager.service.ts

@@ -505,19 +505,23 @@ export class ConversationManagerService implements OnDestroy {
             
             // Update last message with audio URL
             const messages = this.messagesSubject.value;
-            if (messages.length > 0 && messages[messages.length - 1].role === 'assistant') {
-              messages[messages.length - 1].audioUrl = audioUrl;
-              this.messagesSubject.next([...messages]);
-              console.log('✅ Audio URL attached to assistant message');
-              
-              // Auto-play welcome message
-              if (messages.length === 1) {
-                setTimeout(() => {
-                  this.playAudio(audioUrl);
-                }, 500);
+            if (messages.length > 0) {
+              const lastAssistantMessageIndex = this.findLastAssistantMessageIndex(messages);
+              if (lastAssistantMessageIndex >= 0) {
+                messages[lastAssistantMessageIndex].audioUrl = audioUrl;
+                this.messagesSubject.next([...messages]);
+                console.log('✅ Audio URL attached to assistant message at index:', lastAssistantMessageIndex);
+                
+                // Auto-play if it's welcome message or if in playing_audio state
+                if (messages.length === 1 || this.currentStateSubject.value === 'playing_audio') {
+                  setTimeout(() => {
+                    console.log('🎵 Auto-playing audio...');
+                    this.playAudio(audioUrl);
+                  }, 500);
+                }
+              } else {
+                console.warn('⚠️ No assistant message found to attach audio');
               }
-            } else {
-              console.warn('⚠️ No assistant message found to attach audio');
             }
             
             // Clear queue
@@ -535,6 +539,15 @@ export class ConversationManagerService implements OnDestroy {
         console.error('❌ Error handling TTS audio:', error);
         this.audioQueue = []; // Clear queue on error
       }
+    }
+  
+  private findLastAssistantMessageIndex(messages: ConversationMessage[]): number {
+    for (let i = messages.length - 1; i >= 0; i--) {
+      if (messages[i].role === 'assistant') {
+        return i;
+      }
+    }
+    return -1;
   }
   
   private isValidBase64(str: string): boolean {