refac

backend/open_webui/main.py

@@ -1228,8 +1228,10 @@ async def chat_completion(
                                 status_code=status.HTTP_403_FORBIDDEN,
                                 detail=ERROR_MESSAGES.DEFAULT(),
                             )
-                target_message_id = message_ids[0]['message_id'] if message_ids else None
+                for entry in message_ids:
-                if target_message_id:
+                    target_message_id = entry.get('message_id')
+                    if not target_message_id:
+                        continue
                     target_message = await Messages.get_message_by_id(target_message_id)
                     if target_message and target_message.channel_id != channel.id:
                         raise HTTPException(

backend/open_webui/socket/main.py

@@ -848,11 +848,14 @@ async def _make_channel_emitter(request_info):
     async def _emit_channel_update(content: str, done: bool = False):
         from open_webui.models.messages import MessageForm, Messages
 
+        msg = await Messages.get_message_by_id(message_id)
+        if not msg or msg.channel_id != channel_id:
+            return
+
         update_form = MessageForm(content=content)
         if done:
             # Merge done flag into existing meta (preserve model_id etc.)
-            msg = await Messages.get_message_by_id(message_id)
+            existing_meta = msg.meta or {}
-            existing_meta = (msg.meta or {}) if msg else {}
             update_form = MessageForm(
                 content=content,
                 meta={**existing_meta, 'done': True},