合并消息的正确存储

src/plugin_system/apis/send_api.py

@@ -310,6 +310,7 @@ async def command_to_stream(
         display_message=display_message,
         typing=False,
         storage_message=storage_message,
+        set_reply=False,
     )
 
 

src/plugin_system/base/base_action.py

@@ -397,6 +397,8 @@ class BaseAction(ABC):
             reply_set=reply_set,
             stream_id=self.chat_id,
             storage_message=storage_message,
+            set_reply=False,
+            reply_message=None,
         )
 
     async def send_voice(self, audio_base64: str) -> bool:

src/plugin_system/base/base_command.py

@@ -320,6 +320,8 @@ class BaseCommand(ABC):
             reply_set=reply_set,
             stream_id=chat_stream.stream_id,
             storage_message=storage_message,
+            set_reply=False,
+            reply_message=None,
         )
 
     async def send_custom(

src/plugin_system/base/base_events_handler.py

@@ -377,4 +377,6 @@ class BaseEventHandler(ABC):
             reply_set=reply_set,
             stream_id=stream_id,
             storage_message=storage_message,
+            set_reply=False,
+            reply_message=None,
         )

src/plugin_system/core/events_manager.py

@@ -2,7 +2,7 @@ import asyncio
 import contextlib
 from typing import List, Dict, Optional, Type, Tuple, TYPE_CHECKING
 
-from src.chat.message_receive.message import MessageRecv
+from src.chat.message_receive.message import MessageRecv, MessageSending
 from src.chat.message_receive.chat_stream import get_chat_manager
 from src.common.logger import get_logger
 from src.plugin_system.base.component_types import EventType, EventHandlerInfo, MaiMessages, CustomEventHandlerResult
@@ -66,7 +66,7 @@ class EventsManager:
     async def handle_mai_events(
         self,
         event_type: EventType,
-        message: Optional[MessageRecv] = None,
+        message: Optional[MessageRecv | MessageSending] = None,
         llm_prompt: Optional[str] = None,
         llm_response: Optional["LLMGenerationDataModel"] = None,
         stream_id: Optional[str] = None,
@@ -206,7 +206,7 @@ class EventsManager:
 
     def _transform_event_message(
         self,
-        message: MessageRecv,
+        message: MessageRecv | MessageSending,
         llm_prompt: Optional[str] = None,
         llm_response: Optional["LLMGenerationDataModel"] = None,
     ) -> MaiMessages:
@@ -295,7 +295,7 @@ class EventsManager:
     def _prepare_message(
         self,
         event_type: EventType,
-        message: Optional[MessageRecv] = None,
+        message: Optional[MessageRecv | MessageSending] = None,
         llm_prompt: Optional[str] = None,
         llm_response: Optional["LLMGenerationDataModel"] = None,
         stream_id: Optional[str] = None,