myagent-ai 1.11.1 → 1.11.2

package/agents/main_agent.py

@@ -293,7 +293,9 @@ class MainAgent(BaseAgent):
         auto_kb_dir.mkdir(parents=True, exist_ok=True)
 
         # 使用 session_id 作为文件名（取前8位避免过长）
-        safe_session = session_id.replace("-", "")[:8] if session_id else "default"
+        # 注意: session_id 可能包含 '/' (来自 agent_path 如 "coder/python-expert")，
+        # 必须替换为安全字符，避免创建意外的子目录
+        safe_session = session_id.replace("-", "").replace("/", "_")[:12] if session_id else "default"
         kb_file = auto_kb_dir / f"{safe_session}.md"
 
         now_str = datetime.now().strftime("%Y-%m-%d %H:%M")

package/core/context_builder.py

@@ -69,6 +69,8 @@ class ContextBuilder:
         self.skill_registry = skill_registry
         self.knowledge_base_dir = knowledge_base_dir
         self.max_dialog_chars = max_dialog_chars
+        # Agent 专属知识库目录（由调用方动态设置，优先于组织知识库）
+        self.agent_knowledge_dir: Optional[str] = None
 
     # =========================================================================
     # 公共接口
@@ -248,8 +250,9 @@ class ContextBuilder:
         """
         构建 <knowledge> 段落 —— 知识库 RAG 检索结果。
 
-        使用 KnowledgeRAG (TF-IDF + 余弦相似度) 检索与查询最相关的
-        知识片段。当 knowledge_base_dir 未设置或目录不存在时，输出占位提示。
+        搜索优先级:
+        1. Agent 专属知识库 (agent_knowledge_dir) —— 如果有且非空
+        2. 组织知识库 (knowledge_base_dir) —— 兜底
 
         Args:
             query: 搜索查询文本（通常为 <get_knowledge> 内容或用户消息）
@@ -257,31 +260,46 @@ class ContextBuilder:
         Returns:
             <knowledge> XML 段落字符串
         """
-        if not self.knowledge_base_dir:
+        # 优先搜索 Agent 专属知识库
+        if self.agent_knowledge_dir:
+            agent_result = self._search_knowledge_dir(self.agent_knowledge_dir, query, top_k=5)
+            if agent_result:
+                return agent_result
+
+        # 回退到组织知识库
+        if self.knowledge_base_dir:
+            org_result = self._search_knowledge_dir(self.knowledge_base_dir, query, top_k=5)
+            if org_result:
+                return org_result
+
+        # 都没有配置或都为空
+        if not self.knowledge_base_dir and not self.agent_knowledge_dir:
             return "<knowledge>\n(知识库未配置)\n</knowledge>"
+        return "<knowledge>\n(未找到相关知识)\n</knowledge>"
+
+    def _search_knowledge_dir(self, kb_dir: str, query: str, top_k: int = 5) -> str:
+        """在指定知识库目录中执行 RAG 搜索并格式化结果"""
+        import os as _os
 
         if not query.strip():
-            return "<knowledge>\n(无检索关键词)\n</knowledge>"
+            return ""
+
+        if not kb_dir or not _os.path.isdir(kb_dir):
+            return ""
 
         try:
             from knowledge.rag import KnowledgeRAG
-            import os as _os
-
-            kb_path = self.knowledge_base_dir
-            if not _os.path.isdir(kb_path):
-                logger.debug(f"知识库目录不存在: {kb_path}")
-                return "<knowledge>\n(知识库目录不存在)\n</knowledge>"
 
-            rag = KnowledgeRAG(kb_dir=kb_path)
+            rag = KnowledgeRAG(kb_dir=kb_dir)
             rag.build_index()
 
             if rag.total_chunks == 0:
-                return "<knowledge>\n(知识库为空，无索引内容)\n</knowledge>"
+                return ""
 
-            results = rag.search(query, top_k=5)
+            results = rag.search(query, top_k=top_k)
 
             if not results:
-                return "<knowledge>\n(未找到相关知识)\n</knowledge>"
+                return ""
 
             lines: List[str] = ["<knowledge>"]
             for i, chunk in enumerate(results, 1):
@@ -297,8 +315,8 @@ class ContextBuilder:
             return "\n".join(lines)
 
         except Exception as e:
-            logger.warning(f"知识库 RAG 检索失败: {e}")
-            return "<knowledge>\n(知识库检索不可用)\n</knowledge>"
+            logger.warning(f"知识库 RAG 检索失败 ({kb_dir}): {e}")
+            return ""
 
     def _build_recent_dialog(
         self,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/web/api_server.py

@@ -3153,6 +3153,11 @@ class ApiServer:
                 # 标记执行模式（传递给 MainAgent 用于增强 system prompt）
                 if self.core.main_agent:
                     self.core.main_agent._chat_mode = chat_mode
+                # 设置 Agent 专属知识库目录
+                if agent_path and self.core.main_agent and self.core.main_agent.context_builder:
+                    agent_kb_dir = self._get_agent_knowledge_dir(agent_path)
+                    if agent_kb_dir.exists() and any(agent_kb_dir.iterdir()):
+                        self.core.main_agent.context_builder.agent_knowledge_dir = str(agent_kb_dir)
 
                 try:
                     response = await self.core.process_message(message, session_id)
@@ -3161,6 +3166,8 @@ class ApiServer:
                         self.core.main_agent._agent_override_prompt = None
                         self.core.main_agent._agent_override_path = None
                         self.core.main_agent._chat_mode = ""
+                        if self.core.main_agent.context_builder:
+                            self.core.main_agent.context_builder.agent_knowledge_dir = None
 
                 # 检查是否成功（如果回复包含错误标记）
                 if response and not response.startswith("⚠️ LLM 调用失败") and not response.startswith("❌"):
@@ -3289,6 +3296,15 @@ class ApiServer:
                 _original_exec_mode = agent.executor.execution_mode
                 agent.executor.set_execution_mode(_exec_mode)
 
+        # ── 设置 Agent 专属知识库目录（优先于组织知识库）──
+        if agent_path and agent.context_builder:
+            agent_kb_dir = self._get_agent_knowledge_dir(agent_path)
+            if agent_kb_dir.exists() and any(agent_kb_dir.iterdir()):
+                agent.context_builder.agent_knowledge_dir = str(agent_kb_dir)
+                logger.debug(f"[{session_id}] 使用 Agent 专属知识库: {agent_kb_dir}")
+            else:
+                agent.context_builder.agent_knowledge_dir = None
+
         # Clear execution events from previous runs
         agent.clear_execution_events()
 
@@ -3370,6 +3386,9 @@ class ApiServer:
                 # 恢复执行引擎原始模式（防止影响后续 Agent 请求）
                 if _original_exec_mode is not None and agent.executor:
                     agent.executor.set_execution_mode(_original_exec_mode)
+                # 清理 Agent 专属知识库目录设置（防止影响其他 Agent 请求）
+                if agent.context_builder:
+                    agent.context_builder.agent_knowledge_dir = None
 
             # V2 结束后：如果 task_list_store 中有任务，确保最终推送一次
             if chat_mode == "exec" and session_id in self._task_list_store: