From 2bbb03b5b0e247e11413f75f622150cdda6f9bb6 Mon Sep 17 00:00:00 2001 From: Windpicker-owo <3431391539@qq.com> Date: Thu, 13 Nov 2025 20:10:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(planner):=20=E6=9B=B4=E6=96=B0=E5=8A=A8?= =?UTF-8?q?=E4=BD=9C=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91=E4=BB=A5=E7=A1=AE?= =?UTF-8?q?=E4=BF=9D=E5=9B=9E=E5=A4=8D=E5=8A=A8=E4=BD=9C=E5=9C=A8=E6=9C=AA?= =?UTF-8?q?=E8=BE=BE=E5=88=B0=E9=98=88=E5=80=BC=E6=97=B6=E8=A2=AB=E6=8E=92?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../planner/plan_generator.py | 6 +-- .../affinity_flow_chatter/planner/planner.py | 49 +++---------------- 2 files changed, 10 insertions(+), 45 deletions(-) diff --git a/src/plugins/built_in/affinity_flow_chatter/planner/plan_generator.py b/src/plugins/built_in/affinity_flow_chatter/planner/plan_generator.py index 3cf36d046..f8142d696 100644 --- a/src/plugins/built_in/affinity_flow_chatter/planner/plan_generator.py +++ b/src/plugins/built_in/affinity_flow_chatter/planner/plan_generator.py @@ -107,15 +107,15 @@ class ChatterPlanGenerator: """ try: # 从组件注册表获取可用动作 - available_actions = component_registry.get_enabled_actions() + available_actions = self.action_manager.get_using_actions() # 根据聊天类型和模式筛选动作 filtered_actions = {} for action_name, action_info in available_actions.items(): # 检查动作是否支持当前聊天类型 - if chat_type in action_info.chat_types: + if chat_type == action_info.chat_type_allow: # 检查动作是否支持当前模式 - if mode in action_info.chat_modes: + if mode == action_info.mode_enable: filtered_actions[action_name] = action_info return filtered_actions diff --git a/src/plugins/built_in/affinity_flow_chatter/planner/planner.py b/src/plugins/built_in/affinity_flow_chatter/planner/planner.py index 0ac27bb93..2d42cc426 100644 --- a/src/plugins/built_in/affinity_flow_chatter/planner/planner.py +++ b/src/plugins/built_in/affinity_flow_chatter/planner/planner.py @@ -190,9 +190,13 @@ class ChatterActionPlanner: # 4. 生成初始计划 initial_plan = await self.generator.generate(ChatMode.FOCUS) - # 5. 确保Plan中包含所有当前可用的动作 - initial_plan.available_actions = self.action_manager.get_using_actions() - + # 5. 过滤回复动作（如果未达到回复阈值） + if reply_not_available: + initial_plan.available_actions = { + action_name: action_info + for action_name, action_info in initial_plan.available_actions.items() + if action_name not in ["reply", "respond"] + } # 6. 筛选 Plan available_actions = list(initial_plan.available_actions.keys()) plan_filter = ChatterPlanFilter(self.chat_id, available_actions) @@ -527,45 +531,6 @@ 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: