From 63d5e948d26d972c50a9bcba3d36adb957fd8127 Mon Sep 17 00:00:00 2001 From: Windpicker-owo <3431391539@qq.com> Date: Sat, 1 Nov 2025 22:37:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor(planner):=20=E5=B0=86=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E6=B6=88=E6=81=AF=E5=88=B7=E6=96=B0=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E7=A7=BB=E8=87=B3=E8=A7=84=E5=88=92=E5=99=A8=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=97=B6=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message_manager/distribution_manager.py | 5 +-- .../built_in/affinity_flow_chatter/planner.py | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/chat/message_manager/distribution_manager.py b/src/chat/message_manager/distribution_manager.py index 3dda41061..e74062fce 100644 --- a/src/chat/message_manager/distribution_manager.py +++ b/src/chat/message_manager/distribution_manager.py @@ -330,10 +330,7 @@ class StreamLoopManager: try: start_time = time.time() - # 在处理开始前，先刷新缓存到未读消息 - cached_messages = await self._flush_cached_messages_to_unread(stream_id) - if cached_messages: - logger.debug(f"处理开始前刷新缓存消息: stream={stream_id}, 数量={len(cached_messages)}") + # 注意：缓存消息刷新已移至planner开始时执行（动作修改器之后），此处不再刷新 # 设置触发用户ID，以实现回复保护 last_message = context.get_last_message() diff --git a/src/plugins/built_in/affinity_flow_chatter/planner.py b/src/plugins/built_in/affinity_flow_chatter/planner.py index 991a9946c..d6a77576c 100644 --- a/src/plugins/built_in/affinity_flow_chatter/planner.py +++ b/src/plugins/built_in/affinity_flow_chatter/planner.py @@ -168,6 +168,9 @@ class ChatterActionPlanner: action_modifier = ActionModifier(self.action_manager, self.chat_id) await action_modifier.modify_actions() + # 在生成初始计划前，刷新缓存消息到未读列表 + await self._flush_cached_messages_to_unread(context) + initial_plan = await self.generator.generate(chat_mode) # 确保Plan中包含所有当前可用的动作 @@ -258,6 +261,9 @@ class ChatterActionPlanner: # 重新运行主规划流程，这次将正确使用Focus模式 return await self._enhanced_plan_flow(context) try: + # Normal模式开始时，刷新缓存消息到未读列表 + await self._flush_cached_messages_to_unread(context) + unread_messages = context.get_unread_messages() if context else [] if not unread_messages: @@ -459,6 +465,45 @@ class ChatterActionPlanner: except Exception as e: logger.warning(f"同步chat_mode到ChatStream失败: {e}") + async def _flush_cached_messages_to_unread(self, context: "StreamContext | None") -> list: + """在planner开始时将缓存消息刷新到未读消息列表 + + 此方法在动作修改器执行后、生成初始计划前调用，确保计划阶段能看到所有积累的消息。 + + Args: + context: 流上下文 + + Returns: + list: 刷新的消息列表 + """ + if not context: + return [] + + try: + from src.chat.message_manager.message_manager import message_manager + + stream_id = context.stream_id + + if message_manager.is_running and message_manager.has_cached_messages(stream_id): + # 获取缓存消息 + cached_messages = message_manager.flush_cached_messages(stream_id) + + if cached_messages: + # 直接添加到上下文的未读消息列表 + for message in cached_messages: + context.unread_messages.append(message) + logger.info(f"Planner开始前刷新缓存消息到未读列表: stream={stream_id}, 数量={len(cached_messages)}") + return cached_messages + + return [] + + except ImportError: + logger.debug("MessageManager不可用，跳过缓存刷新") + return [] + except Exception as e: + logger.warning(f"Planner刷新缓存消息失败: error={e}") + return [] + def _update_stats_from_execution_result(self, execution_result: dict[str, Any]): """根据执行结果更新规划器统计""" if not execution_result: