diff --git a/src/memory_system/memory_management_task.py b/src/memory_system/memory_management_task.py index b801e9cf..4d89658d 100644 --- a/src/memory_system/memory_management_task.py +++ b/src/memory_system/memory_management_task.py @@ -112,7 +112,7 @@ class MemoryManagementTask(AsyncTask): logger.info(f"为 [{selected_title}] 找到 {len(related_contents)} 条相关记忆:{related_titles}") # 执行merge_memory合并记忆 - merged_title, merged_content = await global_memory_chest.merge_memory(related_contents) + merged_title, merged_content = await global_memory_chest.merge_memory(related_contents,selected_chat_id) if not merged_title or not merged_content: logger.warning("[记忆管理] 记忆合并失败,跳过删除") return diff --git a/src/plugins/built_in/MaiCurious/plugin.py b/src/plugins/built_in/MaiCurious/plugin.py index 32cc60b5..95865ef2 100644 --- a/src/plugins/built_in/MaiCurious/plugin.py +++ b/src/plugins/built_in/MaiCurious/plugin.py @@ -53,7 +53,7 @@ class CuriousAction(BaseAction): """执行频率调节动作""" try: if len(global_conflict_tracker.question_tracker_list) > 1: - return False, "当前有太多问题,请先解答完再提问,不要再使用make_question动作" + return False, "当前已有问题,请先解答完再提问,不要再使用make_question动作" question = self.action_data.get("question", "")