迁移：3804124，9e9e796

（feat：将no_reply内置、fix：优化reply，填补缺失值）

src/chat/utils/chat_message_builder.py

@@ -1250,6 +1250,10 @@ async def get_person_id_list(messages: List[Dict[str, Any]]) -> List[str]:
         # 检查必要信息是否存在 且 不是机器人自己
         if not all([platform, user_id]) or user_id == global_config.bot.qq_account:
             continue
+        
+        # 添加空值检查，防止 platform 为 None 时出错
+        if platform is None:
+            platform = "unknown"
 
         if person_id := PersonInfoManager.get_person_id(platform, user_id):
             person_ids_set.add(person_id)

src/chat/utils/smart_prompt.py

@@ -194,6 +194,7 @@ class SmartPromptBuilder:
         core_dialogue, background_dialogue = await self._build_s4u_chat_history_prompts(
             params.message_list_before_now_long,
             params.target_user_info.get("user_id") if params.target_user_info else "",
+            params.sender
         )
 
         context_data["core_dialogue_prompt"] = core_dialogue
@@ -208,11 +209,10 @@ class SmartPromptBuilder:
 {params.chat_talking_prompt_short}"""
 
     async def _build_s4u_chat_history_prompts(
-        self, message_list_before_now: List[Dict[str, Any]], target_user_id: str
+        self, message_list_before_now: List[Dict[str, Any]], target_user_id: str, sender: str
     ) -> Tuple[str, str]:
         """构建S4U风格的分离对话prompt - 完整实现"""
         core_dialogue_list = []
-        background_dialogue_list = []
         bot_id = str(global_config.bot.qq_account)
 
         # 过滤消息：分离bot和目标用户的对话 vs 其他用户的对话
@@ -224,41 +224,53 @@ class SmartPromptBuilder:
                 if (msg_user_id == bot_id and reply_to_user_id == target_user_id) or msg_user_id == target_user_id:
                     # bot 和目标用户的对话
                     core_dialogue_list.append(msg_dict)
-                else:
-                    # 其他用户的对话
-                    background_dialogue_list.append(msg_dict)
             except Exception as e:
                 logger.error(f"处理消息记录时出错: {msg_dict}, 错误: {e}")
 
         # 构建背景对话 prompt
-        background_dialogue_prompt = ""
-        if background_dialogue_list:
-            latest_25_msgs = background_dialogue_list[-int(global_config.chat.max_context_size * 0.5) :]
-            background_dialogue_prompt_str = build_readable_messages(
+        all_dialogue_prompt = ""
+        if message_list_before_now:
+            latest_25_msgs = message_list_before_now[-int(global_config.chat.max_context_size) :]
+            all_dialogue_prompt_str = build_readable_messages(
                 latest_25_msgs,
                 replace_bot_name=True,
                 timestamp_mode="normal",
                 truncate=True,
             )
-            background_dialogue_prompt = f"这是其他用户的发言：\n{background_dialogue_prompt_str}"
+            all_dialogue_prompt = f"所有用户的发言：\n{all_dialogue_prompt_str}"
 
         # 构建核心对话 prompt
         core_dialogue_prompt = ""
         if core_dialogue_list:
-            core_dialogue_list = core_dialogue_list[-int(global_config.chat.max_context_size * 2) :]  # 限制消息数量
+            # 检查最新五条消息中是否包含bot自己说的消息
+            latest_5_messages = core_dialogue_list[-5:] if len(core_dialogue_list) >= 5 else core_dialogue_list
+            has_bot_message = any(str(msg.get("user_id")) == bot_id for msg in latest_5_messages)
+            
+            # logger.info(f"最新五条消息：{latest_5_messages}")
+            # logger.info(f"最新五条消息中是否包含bot自己说的消息：{has_bot_message}")
+            
+            # 如果最新五条消息中不包含bot的消息，则返回空字符串
+            if not has_bot_message:
+                core_dialogue_prompt = ""
+            else:
+                core_dialogue_list = core_dialogue_list[-int(global_config.chat.max_context_size * 2) :]  # 限制消息数量
+                
+                core_dialogue_prompt_str = build_readable_messages(
+                    core_dialogue_list,
+                    replace_bot_name=True,
+                    merge_messages=False,
+                    timestamp_mode="normal_no_YMD",
+                    read_mark=0.0,
+                    truncate=True,
+                    show_actions=True,
+                )
+                core_dialogue_prompt = f"""--------------------------------
+这是你和{sender}的对话，你们正在交流中：
+{core_dialogue_prompt_str}
+--------------------------------
+"""
 
-            core_dialogue_prompt_str = build_readable_messages(
-                core_dialogue_list,
-                replace_bot_name=True,
-                merge_messages=False,
-                timestamp_mode="normal",
-                read_mark=0.0,
-                truncate=True,
-                show_actions=True,
-            )
-            core_dialogue_prompt = core_dialogue_prompt_str
-
-        return core_dialogue_prompt, background_dialogue_prompt
+        return core_dialogue_prompt, all_dialogue_prompt
 
     async def _build_mai_think_context(self, params: SmartPromptParameters) -> Any:
         """构建mai_think上下文 - 完全继承DefaultReplyer功能"""