From 815f616dfd0889abef26b95a9a0389ea46e4d39c Mon Sep 17 00:00:00 2001
From: Bakadax <bakadax@qq.com>
Date: Tue, 29 Apr 2025 19:58:16 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=B0=8620=E5=91=BD=E5=90=8D=E4=B8=BA?=
 =?UTF-8?q?=E5=B8=B8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/emoji_system/emoji_manager.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/emoji_system/emoji_manager.py b/src/plugins/emoji_system/emoji_manager.py
index 211a4a835..315cfb801 100644
--- a/src/plugins/emoji_system/emoji_manager.py
+++ b/src/plugins/emoji_system/emoji_manager.py
@@ -22,7 +22,7 @@ logger = get_logger("emoji")
 BASE_DIR = os.path.join("data")
 EMOJI_DIR = os.path.join(BASE_DIR, "emoji")  # 表情包存储目录
 EMOJI_REGISTED_DIR = os.path.join(BASE_DIR, "emoji_registed")  # 已注册的表情包注册目录
-
+MAX_EMOJI_FOR_PROMPT = 20  # 最大表情包描述于图片替换的 prompt 中
 
 """
 还没经过测试，有些地方数据库和内存数据同步可能不完全
@@ -634,7 +634,7 @@ class EmojiManager:
 
             # 使用概率分布选择最多20个表情包
             selected_emojis = random.choices(
-                emoji_objects, weights=normalized_probabilities, k=min(20, len(emoji_objects))
+                emoji_objects, weights=normalized_probabilities, k=min(MAX_EMOJI_FOR_PROMPT, len(emoji_objects))
             )
 
             # 将表情包信息转换为可读的字符串

From d5ae3173aa40487e3158ef5fa59372e36eb4547d Mon Sep 17 00:00:00 2001
From: Bakadax <bakadax@qq.com>
Date: Wed, 30 Apr 2025 13:56:34 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpfc=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=9F=A5=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/PFC/conversation.py         |  4 ++--
 src/plugins/PFC/pfc_KnowledgeFetcher.py | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/plugins/PFC/conversation.py b/src/plugins/PFC/conversation.py
index c1b314266..9f744c30c 100644
--- a/src/plugins/PFC/conversation.py
+++ b/src/plugins/PFC/conversation.py
@@ -525,9 +525,9 @@ class Conversation:
                     )
                 action_successful = True
             except Exception as fetch_err:
-                logger.error(f"[私聊][{self.private_name}]获取知识时出错: {fetch_err}")
+                logger.error(f"[私聊][{self.private_name}]获取知识时出错: {str(fetch_err)}")
                 conversation_info.done_action[action_index].update(
-                    {"status": "recall", "final_reason": f"获取知识失败: {fetch_err}"}
+                    {"status": "recall", "final_reason": f"获取知识失败: {str(fetch_err)}"}
                 )
                 self.conversation_info.last_successful_reply_action = None  # 重置状态
 
diff --git a/src/plugins/PFC/pfc_KnowledgeFetcher.py b/src/plugins/PFC/pfc_KnowledgeFetcher.py
index 099b4979e..673e418cb 100644
--- a/src/plugins/PFC/pfc_KnowledgeFetcher.py
+++ b/src/plugins/PFC/pfc_KnowledgeFetcher.py
@@ -68,16 +68,19 @@ class KnowledgeFetcher:
             max_depth=3,
             fast_retrieval=False,
         )
-        knowledge = ""
+        knowledge_text = ""
+        sources = []
         if related_memory:
-            sources = []
             for memory in related_memory:
-                knowledge += memory[1] + "\n"
+                knowledge_text += memory[1] + "\n"
                 sources.append(f"记忆片段{memory[0]}")
-            knowledge = knowledge.strip(), "，".join(sources)
+            knowledge_text = knowledge_text.strip()
+            sources_text = "，".join(sources)
+
+        knowledge_text += "现在有以下**知识**可供参考：\n "
+        knowledge_text += self._lpmm_get_knowledge(query)
+        knowledge_text += "请记住这些**知识**，并根据**知识**回答问题。\n"
+
+        return knowledge_text or "未找到相关知识", sources_text or "无记忆匹配"
 
-        knowledge += "现在有以下**知识**可供参考：\n "
-        knowledge += self._lpmm_get_knowledge(query)
-        knowledge += "请记住这些**知识**，并根据**知识**回答问题。\n"
 
-        return "未找到相关知识", "无记忆匹配"

From 4802c1584bc9757f157cf73212702fb3f8e16197 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 30 Apr 2025 05:57:04 +0000
Subject: [PATCH 03/10] =?UTF-8?q?=F0=9F=A4=96=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=20[skip=20ci]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/PFC/pfc_KnowledgeFetcher.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/plugins/PFC/pfc_KnowledgeFetcher.py b/src/plugins/PFC/pfc_KnowledgeFetcher.py
index 673e418cb..7453aa0e6 100644
--- a/src/plugins/PFC/pfc_KnowledgeFetcher.py
+++ b/src/plugins/PFC/pfc_KnowledgeFetcher.py
@@ -82,5 +82,3 @@ class KnowledgeFetcher:
         knowledge_text += "请记住这些**知识**，并根据**知识**回答问题。\n"
 
         return knowledge_text or "未找到相关知识", sources_text or "无记忆匹配"
-
-

From 7789050a45d5931eb53bd94ab2403a22bc44f5f4 Mon Sep 17 00:00:00 2001
From: 114514 <2514624910@qq.com>
Date: Wed, 30 Apr 2025 14:45:28 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=8F=92=E5=85=A5=E7=9F=A5=E8=AF=86?=
 =?UTF-8?q?=E5=BA=93=E5=92=8C=E8=AE=B0=E5=BF=86=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/PFC/action_planner.py  | 39 +++++++++++++++++++++++++-
 src/plugins/PFC/reply_generator.py | 45 ++++++++++++++++++++++++++++--
 2 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/src/plugins/PFC/action_planner.py b/src/plugins/PFC/action_planner.py
index a80e96b15..dd7355fa2 100644
--- a/src/plugins/PFC/action_planner.py
+++ b/src/plugins/PFC/action_planner.py
@@ -21,6 +21,7 @@ PROMPT_INITIAL_REPLY = """{persona_text}。现在你在参与一场QQ私聊，
 
 【当前对话目标】
 {goals_str}
+{knowledge_info_str}
 
 【最近行动历史概要】
 {action_history_summary}
@@ -33,7 +34,7 @@ PROMPT_INITIAL_REPLY = """{persona_text}。现在你在参与一场QQ私聊，
 
 ------
 可选行动类型以及解释：
-fetch_knowledge: 需要调取知识，当需要专业知识或特定信息时选择，对方若提到你不太认识的人名或实体也可以尝试选择
+fetch_knowledge: 需要调取知识或记忆，当需要专业知识或特定信息时选择，对方若提到你不太认识的人名或实体也可以尝试选择
 listening: 倾听对方发言，当你认为对方话才说到一半，发言明显未结束时选择
 direct_reply: 直接回复对方
 rethink_goal: 思考一个对话目标，当你觉得目前对话需要目标，或当前目标不再适用，或话题卡住时选择。注意私聊的环境是灵活的，有可能需要经常选择
@@ -53,6 +54,7 @@ PROMPT_FOLLOW_UP = """{persona_text}。现在你在参与一场QQ私聊，刚刚
 
 【当前对话目标】
 {goals_str}
+{knowledge_info_str}
 
 【最近行动历史概要】
 {action_history_summary}
@@ -224,6 +226,40 @@ class ActionPlanner:
             logger.error(f"[私聊][{self.private_name}]构建对话目标字符串时出错: {e}")
             goals_str = "- 构建对话目标时出错。\n"
 
+        # --- 知识信息字符串构建开始 ---
+        knowledge_info_str = "【已获取的相关知识和记忆】\n"
+        try:
+            # 检查 conversation_info 是否有 knowledge_list 并且不为空
+            if hasattr(conversation_info, "knowledge_list") and conversation_info.knowledge_list:
+                # 最多只显示最近的 3 条知识，防止 Prompt 过长
+                recent_knowledge = conversation_info.knowledge_list[-3:]
+                for i, knowledge_item in enumerate(recent_knowledge):
+                    if isinstance(knowledge_item, dict):
+                        query = knowledge_item.get('query', '未知查询')
+                        knowledge = knowledge_item.get('knowledge', '无知识内容')
+                        source = knowledge_item.get('source', '未知来源')
+                        # 只取知识内容的前 150 个字，避免太长
+                        knowledge_snippet = knowledge[:150] + "..." if len(knowledge) > 150 else knowledge
+                        knowledge_info_str += f"{i+1}. 关于 '{query}' 的知识 (来源: {source}):\n   {knowledge_snippet}\n"
+                    else:
+                        # 处理列表里不是字典的异常情况
+                        knowledge_info_str += f"{i+1}. 发现一条格式不正确的知识记录。\n"
+
+                if not recent_knowledge: # 如果 knowledge_list 存在但为空
+                     knowledge_info_str += "- 暂无相关知识和记忆。\n"
+
+            else:
+                # 如果 conversation_info 没有 knowledge_list 属性，或者列表为空
+                knowledge_info_str += "- 暂无相关知识记忆。\n"
+        except AttributeError:
+            logger.warning(f"[私聊][{self.private_name}]ConversationInfo 对象可能缺少 knowledge_list 属性。")
+            knowledge_info_str += "- 获取知识列表时出错。\n"
+        except Exception as e:
+            logger.error(f"[私聊][{self.private_name}]构建知识信息字符串时出错: {e}")
+            knowledge_info_str += "- 处理知识列表时出错。\n"
+        # --- 知识信息字符串构建结束 ---
+
+
         # 获取聊天历史记录 (chat_history_text)
         chat_history_text = ""
         try:
@@ -349,6 +385,7 @@ class ActionPlanner:
             time_since_last_bot_message_info=time_since_last_bot_message_info,
             timeout_context=timeout_context,
             chat_history_text=chat_history_text if chat_history_text.strip() else "还没有聊天记录。",
+            knowledge_info_str=knowledge_info_str
         )
 
         logger.debug(f"[私聊][{self.private_name}]发送到LLM的最终提示词:\n------\n{prompt}\n------")
diff --git a/src/plugins/PFC/reply_generator.py b/src/plugins/PFC/reply_generator.py
index 9b497ef28..f813e140d 100644
--- a/src/plugins/PFC/reply_generator.py
+++ b/src/plugins/PFC/reply_generator.py
@@ -17,6 +17,9 @@ logger = get_module_logger("reply_generator")
 PROMPT_DIRECT_REPLY = """{persona_text}。现在你在参与一场QQ私聊，请根据以下信息生成一条回复：
 
 当前对话目标：{goals_str}
+
+{knowledge_info_str}
+
 最近的聊天记录：
 {chat_history_text}
 
@@ -25,7 +28,7 @@ PROMPT_DIRECT_REPLY = """{persona_text}。现在你在参与一场QQ私聊，请
 1. 符合对话目标，以"你"的角度发言（不要自己与自己对话！）
 2. 符合你的性格特征和身份细节
 3. 通俗易懂，自然流畅，像正常聊天一样，简短（通常20字以内，除非特殊情况）
-4. 适当利用相关知识，但不要生硬引用
+4. 可以适当利用相关知识，但不要生硬引用
 5. 自然、得体，结合聊天记录逻辑合理，且没有重复表达同质内容
 
 请注意把握聊天内容，不要回复的太有条理，可以有个性。请分清"你"和对方说的话，不要把"你"说的话当做对方说的话，这是你自己说的话。
@@ -39,6 +42,9 @@ PROMPT_DIRECT_REPLY = """{persona_text}。现在你在参与一场QQ私聊，请
 PROMPT_SEND_NEW_MESSAGE = """{persona_text}。现在你在参与一场QQ私聊，**刚刚你已经发送了一条或多条消息**，现在请根据以下信息再发一条新消息： 
 
 当前对话目标：{goals_str}
+
+{knowledge_info_str}
+
 最近的聊天记录：
 {chat_history_text}
 
@@ -47,7 +53,7 @@ PROMPT_SEND_NEW_MESSAGE = """{persona_text}。现在你在参与一场QQ私聊
 1. 符合对话目标，以"你"的角度发言（不要自己与自己对话！）
 2. 符合你的性格特征和身份细节
 3. 通俗易懂，自然流畅，像正常聊天一样，简短（通常20字以内，除非特殊情况）
-4. 适当利用相关知识，但不要生硬引用
+4. 可以适当利用相关知识，但不要生硬引用
 5. 跟之前你发的消息自然的衔接，逻辑合理，且没有重复表达同质内容或部分重叠内容
 
 请注意把握聊天内容，不用太有条理，可以有个性。请分清"你"和对方说的话，不要把"你"说的话当做对方说的话，这是你自己说的话。
@@ -131,6 +137,36 @@ class ReplyGenerator:
         else:
             goals_str = "- 目前没有明确对话目标\n"  # 简化无目标情况
 
+           # --- 新增：构建知识信息字符串 ---
+        knowledge_info_str = "【供参考的相关知识和记忆】\n" # 稍微改下标题，表明是供参考
+        try:
+            # 检查 conversation_info 是否有 knowledge_list 并且不为空
+            if hasattr(conversation_info, "knowledge_list") and conversation_info.knowledge_list:
+                # 最多只显示最近的 3 条知识
+                recent_knowledge = conversation_info.knowledge_list[-3:]
+                for i, knowledge_item in enumerate(recent_knowledge):
+                    if isinstance(knowledge_item, dict):
+                        query = knowledge_item.get('query', '未知查询')
+                        knowledge = knowledge_item.get('knowledge', '无知识内容')
+                        source = knowledge_item.get('source', '未知来源')
+                        # 只取知识内容的前 150 个字
+                        knowledge_snippet = knowledge[:150] + "..." if len(knowledge) > 150 else knowledge
+                        knowledge_info_str += f"{i+1}. 关于 '{query}' (来源: {source}): {knowledge_snippet}\n" # 格式微调，更简洁
+                    else:
+                        knowledge_info_str += f"{i+1}. 发现一条格式不正确的知识记录。\n"
+
+                if not recent_knowledge:
+                     knowledge_info_str += "- 暂无。\n" # 更简洁的提示
+
+            else:
+                knowledge_info_str += "- 暂无。\n"
+        except AttributeError:
+            logger.warning(f"[私聊][{self.private_name}]ConversationInfo 对象可能缺少 knowledge_list 属性。")
+            knowledge_info_str += "- 获取知识列表时出错。\n"
+        except Exception as e:
+            logger.error(f"[私聊][{self.private_name}]构建知识信息字符串时出错: {e}")
+            knowledge_info_str += "- 处理知识列表时出错。\n" 
+
         # 获取聊天历史记录 (chat_history_text)
         chat_history_text = observation_info.chat_history_str
         if observation_info.new_messages_count > 0 and observation_info.unprocessed_messages:
@@ -162,7 +198,10 @@ class ReplyGenerator:
 
         # --- 格式化最终的 Prompt ---
         prompt = prompt_template.format(
-            persona_text=persona_text, goals_str=goals_str, chat_history_text=chat_history_text
+            persona_text=persona_text,
+            goals_str=goals_str, 
+            chat_history_text=chat_history_text,
+            knowledge_info_str=knowledge_info_str
         )
 
         # --- 调用 LLM 生成 ---

From 837b0b36889976e3a55689024fd2ee9c1eefc226 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 30 Apr 2025 06:49:22 +0000
Subject: [PATCH 05/10] =?UTF-8?q?=F0=9F=A4=96=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=20[skip=20ci]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/PFC/action_planner.py  | 19 ++++++++++---------
 src/plugins/PFC/reply_generator.py | 24 +++++++++++++-----------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/plugins/PFC/action_planner.py b/src/plugins/PFC/action_planner.py
index dd7355fa2..036d47807 100644
--- a/src/plugins/PFC/action_planner.py
+++ b/src/plugins/PFC/action_planner.py
@@ -235,18 +235,20 @@ class ActionPlanner:
                 recent_knowledge = conversation_info.knowledge_list[-3:]
                 for i, knowledge_item in enumerate(recent_knowledge):
                     if isinstance(knowledge_item, dict):
-                        query = knowledge_item.get('query', '未知查询')
-                        knowledge = knowledge_item.get('knowledge', '无知识内容')
-                        source = knowledge_item.get('source', '未知来源')
+                        query = knowledge_item.get("query", "未知查询")
+                        knowledge = knowledge_item.get("knowledge", "无知识内容")
+                        source = knowledge_item.get("source", "未知来源")
                         # 只取知识内容的前 150 个字，避免太长
                         knowledge_snippet = knowledge[:150] + "..." if len(knowledge) > 150 else knowledge
-                        knowledge_info_str += f"{i+1}. 关于 '{query}' 的知识 (来源: {source}):\n   {knowledge_snippet}\n"
+                        knowledge_info_str += (
+                            f"{i + 1}. 关于 '{query}' 的知识 (来源: {source}):\n   {knowledge_snippet}\n"
+                        )
                     else:
                         # 处理列表里不是字典的异常情况
-                        knowledge_info_str += f"{i+1}. 发现一条格式不正确的知识记录。\n"
+                        knowledge_info_str += f"{i + 1}. 发现一条格式不正确的知识记录。\n"
 
-                if not recent_knowledge: # 如果 knowledge_list 存在但为空
-                     knowledge_info_str += "- 暂无相关知识和记忆。\n"
+                if not recent_knowledge:  # 如果 knowledge_list 存在但为空
+                    knowledge_info_str += "- 暂无相关知识和记忆。\n"
 
             else:
                 # 如果 conversation_info 没有 knowledge_list 属性，或者列表为空
@@ -259,7 +261,6 @@ class ActionPlanner:
             knowledge_info_str += "- 处理知识列表时出错。\n"
         # --- 知识信息字符串构建结束 ---
 
-
         # 获取聊天历史记录 (chat_history_text)
         chat_history_text = ""
         try:
@@ -385,7 +386,7 @@ class ActionPlanner:
             time_since_last_bot_message_info=time_since_last_bot_message_info,
             timeout_context=timeout_context,
             chat_history_text=chat_history_text if chat_history_text.strip() else "还没有聊天记录。",
-            knowledge_info_str=knowledge_info_str
+            knowledge_info_str=knowledge_info_str,
         )
 
         logger.debug(f"[私聊][{self.private_name}]发送到LLM的最终提示词:\n------\n{prompt}\n------")
diff --git a/src/plugins/PFC/reply_generator.py b/src/plugins/PFC/reply_generator.py
index f813e140d..134b2740d 100644
--- a/src/plugins/PFC/reply_generator.py
+++ b/src/plugins/PFC/reply_generator.py
@@ -137,8 +137,8 @@ class ReplyGenerator:
         else:
             goals_str = "- 目前没有明确对话目标\n"  # 简化无目标情况
 
-           # --- 新增：构建知识信息字符串 ---
-        knowledge_info_str = "【供参考的相关知识和记忆】\n" # 稍微改下标题，表明是供参考
+        # --- 新增：构建知识信息字符串 ---
+        knowledge_info_str = "【供参考的相关知识和记忆】\n"  # 稍微改下标题，表明是供参考
         try:
             # 检查 conversation_info 是否有 knowledge_list 并且不为空
             if hasattr(conversation_info, "knowledge_list") and conversation_info.knowledge_list:
@@ -146,17 +146,19 @@ class ReplyGenerator:
                 recent_knowledge = conversation_info.knowledge_list[-3:]
                 for i, knowledge_item in enumerate(recent_knowledge):
                     if isinstance(knowledge_item, dict):
-                        query = knowledge_item.get('query', '未知查询')
-                        knowledge = knowledge_item.get('knowledge', '无知识内容')
-                        source = knowledge_item.get('source', '未知来源')
+                        query = knowledge_item.get("query", "未知查询")
+                        knowledge = knowledge_item.get("knowledge", "无知识内容")
+                        source = knowledge_item.get("source", "未知来源")
                         # 只取知识内容的前 150 个字
                         knowledge_snippet = knowledge[:150] + "..." if len(knowledge) > 150 else knowledge
-                        knowledge_info_str += f"{i+1}. 关于 '{query}' (来源: {source}): {knowledge_snippet}\n" # 格式微调，更简洁
+                        knowledge_info_str += (
+                            f"{i + 1}. 关于 '{query}' (来源: {source}): {knowledge_snippet}\n"  # 格式微调，更简洁
+                        )
                     else:
-                        knowledge_info_str += f"{i+1}. 发现一条格式不正确的知识记录。\n"
+                        knowledge_info_str += f"{i + 1}. 发现一条格式不正确的知识记录。\n"
 
                 if not recent_knowledge:
-                     knowledge_info_str += "- 暂无。\n" # 更简洁的提示
+                    knowledge_info_str += "- 暂无。\n"  # 更简洁的提示
 
             else:
                 knowledge_info_str += "- 暂无。\n"
@@ -165,7 +167,7 @@ class ReplyGenerator:
             knowledge_info_str += "- 获取知识列表时出错。\n"
         except Exception as e:
             logger.error(f"[私聊][{self.private_name}]构建知识信息字符串时出错: {e}")
-            knowledge_info_str += "- 处理知识列表时出错。\n" 
+            knowledge_info_str += "- 处理知识列表时出错。\n"
 
         # 获取聊天历史记录 (chat_history_text)
         chat_history_text = observation_info.chat_history_str
@@ -199,9 +201,9 @@ class ReplyGenerator:
         # --- 格式化最终的 Prompt ---
         prompt = prompt_template.format(
             persona_text=persona_text,
-            goals_str=goals_str, 
+            goals_str=goals_str,
             chat_history_text=chat_history_text,
-            knowledge_info_str=knowledge_info_str
+            knowledge_info_str=knowledge_info_str,
         )
 
         # --- 调用 LLM 生成 ---

From d09965571f432f50a4c907c33aaee0538649e930 Mon Sep 17 00:00:00 2001
From: 114514 <2514624910@qq.com>
Date: Wed, 30 Apr 2025 15:06:01 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8A=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/PFC/action_planner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/PFC/action_planner.py b/src/plugins/PFC/action_planner.py
index dd7355fa2..ec5eb8a8d 100644
--- a/src/plugins/PFC/action_planner.py
+++ b/src/plugins/PFC/action_planner.py
@@ -238,8 +238,8 @@ class ActionPlanner:
                         query = knowledge_item.get('query', '未知查询')
                         knowledge = knowledge_item.get('knowledge', '无知识内容')
                         source = knowledge_item.get('source', '未知来源')
-                        # 只取知识内容的前 150 个字，避免太长
-                        knowledge_snippet = knowledge[:150] + "..." if len(knowledge) > 150 else knowledge
+                        # 只取知识内容的前 2000 个字，避免太长
+                        knowledge_snippet = knowledge[:2000] + "..." if len(knowledge) > 200 else knowledge
                         knowledge_info_str += f"{i+1}. 关于 '{query}' 的知识 (来源: {source}):\n   {knowledge_snippet}\n"
                     else:
                         # 处理列表里不是字典的异常情况

From 7ef65cadc24e1d7c94ae65ea2672094a0b95e4b0 Mon Sep 17 00:00:00 2001
From: Bakadax <bakadax@qq.com>
Date: Wed, 30 Apr 2025 15:07:34 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A9=BA=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/PFC/pfc_KnowledgeFetcher.py | 3 ++-
 src/plugins/PFC/reply_generator.py      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/PFC/pfc_KnowledgeFetcher.py b/src/plugins/PFC/pfc_KnowledgeFetcher.py
index 7453aa0e6..171ba7050 100644
--- a/src/plugins/PFC/pfc_KnowledgeFetcher.py
+++ b/src/plugins/PFC/pfc_KnowledgeFetcher.py
@@ -69,8 +69,9 @@ class KnowledgeFetcher:
             fast_retrieval=False,
         )
         knowledge_text = ""
-        sources = []
+        sources_text = "无记忆匹配"  # 默认值
         if related_memory:
+            sources = []
             for memory in related_memory:
                 knowledge_text += memory[1] + "\n"
                 sources.append(f"记忆片段{memory[0]}")
diff --git a/src/plugins/PFC/reply_generator.py b/src/plugins/PFC/reply_generator.py
index f813e140d..3de22fcf6 100644
--- a/src/plugins/PFC/reply_generator.py
+++ b/src/plugins/PFC/reply_generator.py
@@ -137,7 +137,7 @@ class ReplyGenerator:
         else:
             goals_str = "- 目前没有明确对话目标\n"  # 简化无目标情况
 
-           # --- 新增：构建知识信息字符串 ---
+        # --- 新增：构建知识信息字符串 ---
         knowledge_info_str = "【供参考的相关知识和记忆】\n" # 稍微改下标题，表明是供参考
         try:
             # 检查 conversation_info 是否有 knowledge_list 并且不为空
@@ -156,7 +156,7 @@ class ReplyGenerator:
                         knowledge_info_str += f"{i+1}. 发现一条格式不正确的知识记录。\n"
 
                 if not recent_knowledge:
-                     knowledge_info_str += "- 暂无。\n" # 更简洁的提示
+                    knowledge_info_str += "- 暂无。\n" # 更简洁的提示
 
             else:
                 knowledge_info_str += "- 暂无。\n"

From 94dd06561e88d7d5ffbf60bb44ac7785cf16cbec Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 30 Apr 2025 07:08:58 +0000
Subject: [PATCH 08/10] =?UTF-8?q?=F0=9F=A4=96=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=20[skip=20ci]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/PFC/action_planner.py  | 10 ++++++----
 src/plugins/PFC/reply_generator.py |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/plugins/PFC/action_planner.py b/src/plugins/PFC/action_planner.py
index 7082e281e..78f419360 100644
--- a/src/plugins/PFC/action_planner.py
+++ b/src/plugins/PFC/action_planner.py
@@ -235,12 +235,14 @@ class ActionPlanner:
                 recent_knowledge = conversation_info.knowledge_list[-3:]
                 for i, knowledge_item in enumerate(recent_knowledge):
                     if isinstance(knowledge_item, dict):
-                        query = knowledge_item.get('query', '未知查询')
-                        knowledge = knowledge_item.get('knowledge', '无知识内容')
-                        source = knowledge_item.get('source', '未知来源')
+                        query = knowledge_item.get("query", "未知查询")
+                        knowledge = knowledge_item.get("knowledge", "无知识内容")
+                        source = knowledge_item.get("source", "未知来源")
                         # 只取知识内容的前 2000 个字，避免太长
                         knowledge_snippet = knowledge[:2000] + "..." if len(knowledge) > 200 else knowledge
-                        knowledge_info_str += f"{i+1}. 关于 '{query}' 的知识 (来源: {source}):\n   {knowledge_snippet}\n"
+                        knowledge_info_str += (
+                            f"{i + 1}. 关于 '{query}' 的知识 (来源: {source}):\n   {knowledge_snippet}\n"
+                        )
                     else:
                         # 处理列表里不是字典的异常情况
                         knowledge_info_str += f"{i + 1}. 发现一条格式不正确的知识记录。\n"
diff --git a/src/plugins/PFC/reply_generator.py b/src/plugins/PFC/reply_generator.py
index f5e7c1e67..134b2740d 100644
--- a/src/plugins/PFC/reply_generator.py
+++ b/src/plugins/PFC/reply_generator.py
@@ -138,7 +138,7 @@ class ReplyGenerator:
             goals_str = "- 目前没有明确对话目标\n"  # 简化无目标情况
 
         # --- 新增：构建知识信息字符串 ---
-        knowledge_info_str = "【供参考的相关知识和记忆】\n" # 稍微改下标题，表明是供参考
+        knowledge_info_str = "【供参考的相关知识和记忆】\n"  # 稍微改下标题，表明是供参考
         try:
             # 检查 conversation_info 是否有 knowledge_list 并且不为空
             if hasattr(conversation_info, "knowledge_list") and conversation_info.knowledge_list:
@@ -158,7 +158,7 @@ class ReplyGenerator:
                         knowledge_info_str += f"{i + 1}. 发现一条格式不正确的知识记录。\n"
 
                 if not recent_knowledge:
-                    knowledge_info_str += "- 暂无。\n" # 更简洁的提示
+                    knowledge_info_str += "- 暂无。\n"  # 更简洁的提示
 
             else:
                 knowledge_info_str += "- 暂无。\n"

From 03a9f50128b458130de0804a13afc3c47062dd04 Mon Sep 17 00:00:00 2001
From: 114514 <2514624910@qq.com>
Date: Wed, 30 Apr 2025 15:10:26 +0800
Subject: [PATCH 09/10] 1

---
 src/plugins/PFC/action_planner.py  | 6 +++---
 src/plugins/PFC/reply_generator.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/PFC/action_planner.py b/src/plugins/PFC/action_planner.py
index ec5eb8a8d..63677b04f 100644
--- a/src/plugins/PFC/action_planner.py
+++ b/src/plugins/PFC/action_planner.py
@@ -231,15 +231,15 @@ class ActionPlanner:
         try:
             # 检查 conversation_info 是否有 knowledge_list 并且不为空
             if hasattr(conversation_info, "knowledge_list") and conversation_info.knowledge_list:
-                # 最多只显示最近的 3 条知识，防止 Prompt 过长
-                recent_knowledge = conversation_info.knowledge_list[-3:]
+                # 最多只显示最近的 5 条知识，防止 Prompt 过长
+                recent_knowledge = conversation_info.knowledge_list[-5:]
                 for i, knowledge_item in enumerate(recent_knowledge):
                     if isinstance(knowledge_item, dict):
                         query = knowledge_item.get('query', '未知查询')
                         knowledge = knowledge_item.get('knowledge', '无知识内容')
                         source = knowledge_item.get('source', '未知来源')
                         # 只取知识内容的前 2000 个字，避免太长
-                        knowledge_snippet = knowledge[:2000] + "..." if len(knowledge) > 200 else knowledge
+                        knowledge_snippet = knowledge[:2000] + "..." if len(knowledge) > 2000 else knowledge
                         knowledge_info_str += f"{i+1}. 关于 '{query}' 的知识 (来源: {source}):\n   {knowledge_snippet}\n"
                     else:
                         # 处理列表里不是字典的异常情况
diff --git a/src/plugins/PFC/reply_generator.py b/src/plugins/PFC/reply_generator.py
index f813e140d..438a21ac4 100644
--- a/src/plugins/PFC/reply_generator.py
+++ b/src/plugins/PFC/reply_generator.py
@@ -142,15 +142,15 @@ class ReplyGenerator:
         try:
             # 检查 conversation_info 是否有 knowledge_list 并且不为空
             if hasattr(conversation_info, "knowledge_list") and conversation_info.knowledge_list:
-                # 最多只显示最近的 3 条知识
-                recent_knowledge = conversation_info.knowledge_list[-3:]
+                # 最多只显示最近的 5 条知识
+                recent_knowledge = conversation_info.knowledge_list[-5:]
                 for i, knowledge_item in enumerate(recent_knowledge):
                     if isinstance(knowledge_item, dict):
                         query = knowledge_item.get('query', '未知查询')
                         knowledge = knowledge_item.get('knowledge', '无知识内容')
                         source = knowledge_item.get('source', '未知来源')
                         # 只取知识内容的前 150 个字
-                        knowledge_snippet = knowledge[:150] + "..." if len(knowledge) > 150 else knowledge
+                        knowledge_snippet = knowledge[:2000] + "..." if len(knowledge) > 2000 else knowledge
                         knowledge_info_str += f"{i+1}. 关于 '{query}' (来源: {source}): {knowledge_snippet}\n" # 格式微调，更简洁
                     else:
                         knowledge_info_str += f"{i+1}. 发现一条格式不正确的知识记录。\n"

From 0caaec69c19b6f98cc8747e18427056427fbcea5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 30 Apr 2025 08:20:16 +0000
Subject: [PATCH 10/10] =?UTF-8?q?=F0=9F=A4=96=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=20[skip=20ci]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/PFC/reply_generator.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/PFC/reply_generator.py b/src/plugins/PFC/reply_generator.py
index b577872f6..890f807c7 100644
--- a/src/plugins/PFC/reply_generator.py
+++ b/src/plugins/PFC/reply_generator.py
@@ -151,7 +151,9 @@ class ReplyGenerator:
                         source = knowledge_item.get("source", "未知来源")
                         # 只取知识内容的前 2000 个字
                         knowledge_snippet = knowledge[:2000] + "..." if len(knowledge) > 2000 else knowledge
-                        knowledge_info_str += f"{i+1}. 关于 '{query}' (来源: {source}): {knowledge_snippet}\n" # 格式微调，更简洁
+                        knowledge_info_str += (
+                            f"{i + 1}. 关于 '{query}' (来源: {source}): {knowledge_snippet}\n"  # 格式微调，更简洁
+                        )
                     else:
                         knowledge_info_str += f"{i + 1}. 发现一条格式不正确的知识记录。\n"