myagent-ai 1.11.1 → 1.12.0

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/config.py

@@ -100,6 +100,7 @@ class ModelEntry:
     input_modes: List[str] = field(default_factory=lambda: ["text"])  # 支持的输入模式: text, image, video, audio
     reasoning: bool = True       # 是否支持推理（如 o1 系列）
     enabled: bool = True
+    is_global_fallback: bool = True  # 是否作为全局兜底模型（保障系统运行的最终兜底模型）
 
 
 @dataclass

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.12.0",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/web/api_server.py

@@ -2594,73 +2594,52 @@ class ApiServer:
         return web.json_response({"ok": True, "hot_reload": True})
 
     async def handle_test_llm(self, request):
-        """POST /api/llm/test - 测试 LLM 连接，支持使用请求体中的临时配置"""
-        print(f"handle_test_llm 被调用!", flush=True)
+        """POST /api/llm/test - 独立测试指定模型连接，不使用任何兜底/fallback逻辑"""
         try:
-            # 尝试从请求体读取临时配置
-            temp_client = None
-            try:
-                data = await request.json()
-                print(f"请求数据: {data}", flush=True)
-                api_key = data.get("api_key", "")
-                base_url = data.get("base_url", "")
-                model = data.get("model", "")
-                api_type = data.get("api_type", "")
-                temperature = data.get("temperature", 0.1)
-                # 如果请求中有 provider，直接使用；否则根据 api_type 或 base_url 推断
-                provider = data.get("provider", "")
-                if not provider:
-                    if api_type in ("openai-chat", "openai-completions"):
-                        provider = "openai"
-                    elif api_type == "anthropic":
-                        provider = "anthropic"
-                    elif api_type == "ollama":
-                        provider = "ollama"
-                    elif "zhipu" in base_url or "bigmodel" in base_url:
-                        provider = "zhipu"
-                    elif "anthropic" in base_url:
-                        provider = "anthropic"
-                    elif "ollama" in base_url or "localhost" in base_url or "127.0.0.1" in base_url:
-                        provider = "ollama"
-                    elif "dashscope" in base_url or "qwen" in base_url.lower() or "modelscope" in base_url:
-                        provider = "custom"  # DashScope/ModelScope 使用自定义 provider
-                    else:
-                        provider = "openai"
-                print(f"准备创建 temp_client: provider={provider}, api_key={api_key[:10] if api_key else 'empty'}...", flush=True)
-                if api_key or base_url or model:
-                    # 使用请求体中的配置创建临时客户端测试
-                    from core.llm import LLMClient
-                    temp_client = LLMClient(
-                        provider=provider,
-                        api_key=api_key or self.core.llm.api_key if self.core.llm else "",
-                        base_url=base_url or self.core.llm.base_url if self.core.llm else "",
-                        model=model or self.core.llm.model if self.core.llm else "gpt-4",
-                        temperature=temperature,
-                        timeout=30,
-                        max_retries=1,
-                    )
-                    print(f"temp_client 创建成功: {temp_client}, base_url={temp_client.base_url}", flush=True)
+            data = await request.json()
+            api_key = data.get("api_key", "")
+            base_url = data.get("base_url", "")
+            model = data.get("model", "")
+            api_type = data.get("api_type", "")
+            temperature = data.get("temperature", 0.1)
+            provider = data.get("provider", "")
+
+            if not model:
+                return web.json_response({"ok": False, "error": "缺少 model 参数"})
+
+            # 根据 api_type 或 base_url 推断 provider
+            if not provider:
+                if api_type == "anthropic":
+                    provider = "anthropic"
+                elif api_type == "ollama":
+                    provider = "ollama"
+                elif "zhipu" in base_url or "bigmodel" in base_url:
+                    provider = "zhipu"
+                elif "anthropic" in base_url:
+                    provider = "anthropic"
+                elif "ollama" in base_url or "localhost" in base_url or "127.0.0.1" in base_url:
+                    provider = "ollama"
+                elif "dashscope" in base_url or "qwen" in base_url.lower() or "modelscope" in base_url:
+                    provider = "custom"
                 else:
-                    print("条件不满足，temp_client 未创建", flush=True)
-            except Exception as e:
-                print(f"创建 temp_client 异常: {e}", flush=True)
-                logger.warning(f"读取请求体失败: {e}")
-                pass  # 如果没有请求体或解析失败，使用当前配置
-
-            client = temp_client or self.core.llm
-            print(f"DEBUG: temp_client={temp_client is not None}, client={client}, client_type={type(client).__name__}, client_base_url={getattr(client, 'base_url', 'N/A')}", flush=True)
-            if not client:
-                print("没有 LLM 客户端", flush=True)
-                return web.json_response({"ok": False, "error": "没有配置 LLM 客户端"})
-            msg = await client.chat([Message(role="user", content="Hi, reply OK")])
-            print(f"TEST: msg.success={msg.success}, msg.content={repr(msg.content[:50] if msg.content else '')}, msg.error={msg.error}", flush=True)
-            # 必须检查 msg.success，否则即使请求失败也会返回成功
+                    provider = "openai"
+
+            # 纯粹使用请求体中的参数创建临时客户端，绝不 fallback 到全局配置
+            from core.llm import LLMClient
+            temp_client = LLMClient(
+                provider=provider,
+                api_key=api_key,
+                base_url=base_url,
+                model=model,
+                temperature=temperature,
+                timeout=30,
+                max_retries=1,
+            )
+            msg = await temp_client.chat([Message(role="user", content="Hi, reply OK")])
             if not msg.success:
-                print(f"返回失败: {msg.error}", flush=True)
                 return web.json_response({"ok": False, "error": msg.error or "LLM 调用失败"})
             return web.json_response({"ok": True, "response": msg.content[:100] if msg.content else ""})
         except Exception as e:
-            print(f"handle_test_llm 异常: {e}", flush=True)
             return web.json_response({"ok": False, "error": str(e)})
 
     async def handle_llm_usage(self, request):
@@ -2680,6 +2659,7 @@ class ApiServer:
                 "input_modes": m.input_modes,
                 "reasoning": m.reasoning,
                 "enabled": m.enabled,
+                "is_global_fallback": getattr(m, 'is_global_fallback', True),
                 "has_api_key": bool(m.api_key),
             })
         return web.json_response(models)
@@ -2708,6 +2688,7 @@ class ApiServer:
             input_modes=data.get("input_modes", ["text"]),
             reasoning=data.get("reasoning", False),
             enabled=data.get("enabled", True),
+            is_global_fallback=data.get("is_global_fallback", True),
         )
         self.core.config.models_library.append(entry)
         self.core.config_mgr.save()
@@ -2721,7 +2702,7 @@ class ApiServer:
         found = False
         for m in self.core.config.models_library:
             if m.id == model_id:
-                for k in ("name", "provider", "api_type", "model", "base_url", "max_tokens", "temperature", "context_window", "input_modes", "reasoning", "enabled"):
+                for k in ("name", "provider", "api_type", "model", "base_url", "max_tokens", "temperature", "context_window", "input_modes", "reasoning", "enabled", "is_global_fallback"): 
                     if k in data:
                         setattr(m, k, data[k])
                 if data.get("api_key"):
@@ -3062,20 +3043,40 @@ class ApiServer:
                 "is_backup": False,
             })
 
-        # 如果没有找到任何主模型配置，使用全局默认 LLM 作为 fallback
+        # 如果没有找到任何主模型配置，使用模型库中标记为全局兜底的模型
         if not chain:
-            chain.append({
-                "id": "default",
-                "name": llm_defaults.model,
-                "provider": llm_defaults.provider,
-                "api_type": llm_defaults.api_type,
-                "model": llm_defaults.model,
-                "base_url": llm_defaults.base_url,
-                "api_key": llm_defaults.api_key,
-                "temperature": llm_defaults.temperature,
-                "max_tokens": llm_defaults.max_tokens,
-                "is_backup": False,
-            })
+            fallback_model = None
+            for me in self.core.config.models_library:
+                if getattr(me, 'is_global_fallback', True) and me.enabled:
+                    fallback_model = me
+                    break
+            if fallback_model:
+                chain.append({
+                    "id": fallback_model.id,
+                    "name": fallback_model.name,
+                    "provider": fallback_model.provider or llm_defaults.provider,
+                    "api_type": getattr(fallback_model, 'api_type', '') or llm_defaults.api_type,
+                    "model": fallback_model.model or fallback_model.id,
+                    "base_url": fallback_model.base_url or llm_defaults.base_url,
+                    "api_key": fallback_model.api_key or llm_defaults.api_key,
+                    "temperature": fallback_model.temperature if fallback_model.temperature is not None else llm_defaults.temperature,
+                    "max_tokens": fallback_model.max_tokens if fallback_model.max_tokens else llm_defaults.max_tokens,
+                    "is_backup": False,
+                })
+            else:
+                # 兜底到全局默认 LLM 配置
+                chain.append({
+                    "id": "default",
+                    "name": llm_defaults.model,
+                    "provider": llm_defaults.provider,
+                    "api_type": llm_defaults.api_type,
+                    "model": llm_defaults.model,
+                    "base_url": llm_defaults.base_url,
+                    "api_key": llm_defaults.api_key,
+                    "temperature": llm_defaults.temperature,
+                    "max_tokens": llm_defaults.max_tokens,
+                    "is_backup": False,
+                })
 
         # 备用模型列表
         backup_ids = agent_cfg.get("backup_model_ids", [])
@@ -3153,6 +3154,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 +3167,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 +3297,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 +3387,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:

package/web/ui/chat/chat_main.js

@@ -304,6 +304,7 @@ function initChat() {
   // Enable/disable send button
   document.getElementById('userInput').addEventListener('input', function() {
     document.getElementById('sendBtn').disabled = !this.value.trim();
+    saveDraft();
   });
   // Load task plan if in exec mode (collapsed by default)
   if (state.chatMode === 'exec') {
@@ -1182,6 +1183,7 @@ async function selectAgent(agentPath) {
   // 如果 loadSessions 已经 auto-selected 了 session，UI 已由 selectSession 设置好，不再覆盖
 
   document.getElementById('userInput').focus();
+  loadDraft();
   // Reload task plan if in exec mode
   if (state.chatMode === 'exec') loadTaskPlan();
   // Reset escalation and update exec mode UI
@@ -1668,6 +1670,7 @@ function newChat() {
   updateSidebarAgentIndicator();
   const userInput = document.getElementById('userInput');
   if (userInput) userInput.focus();
+  loadDraft();
   // 移动端：新建会话后自动收起侧边栏
   if (isMobile()) closeMobileSidebar();
 }
@@ -1804,6 +1807,7 @@ async function selectSession(id) {
     }
   } catch (_) {}
   document.getElementById('userInput').focus();
+  loadDraft();
   if (isMobile()) closeMobileSidebar();
 }
 

package/web/ui/chat/flow_engine.js

@@ -3,7 +3,36 @@
 // ── 负责消息发送、SSE 流式处理、大文本检测与分段、
 //    消息注入、执行进度轮询、输入处理等核心流程 ──
 // ══════════════════════════════════════════════════════
-//
+
+// ── 输入框草稿持久化（按 agent + session 维度保存，刷新页面不丢失） ──
+var _draftTimer = null;
+function _draftKey() {
+  return 'myagent_draft_' + (state.activeAgent || 'default') + '_' + (state.activeSessionId || '__new__');
+}
+function saveDraft() {
+  if (_draftTimer) clearTimeout(_draftTimer);
+  _draftTimer = setTimeout(function() {
+    var input = document.getElementById('userInput');
+    if (!input) return;
+    var val = input.value;
+    if (val) { localStorage.setItem(_draftKey(), val); }
+    else { localStorage.removeItem(_draftKey()); }
+  }, 300);
+}
+function loadDraft() {
+  var input = document.getElementById('userInput');
+  if (!input) return;
+  var val = localStorage.getItem(_draftKey());
+  input.value = val || '';
+  input.style.height = 'auto';
+  if (input.value) autoResize(input);
+  document.getElementById('sendBtn').disabled = !input.value.trim();
+}
+function clearDraft() {
+  localStorage.removeItem(_draftKey());
+}
+
+
 // 依赖的全局对象（由 chat_main.js 提供）：
 //   state, api(), toast(), escapeHtml(), renderMarkdown(),
 //   renderMessages(), scrollToBottom(), formatSessionName(),
@@ -1145,6 +1174,7 @@ async function sendMessage() {
   input.value = '';
   input.style.height = 'auto';
   document.getElementById('sendBtn').disabled = true;
+  clearDraft();
 
   // Show typing
   state.isGenerating = true;
@@ -1695,6 +1725,7 @@ async function handleInjectChoice(choice) {
   const input = document.getElementById('userInput');
   input.value = '';
   input.style.height = 'auto';
+  clearDraft();
 
   try {
     const rawSid = state.activeSessionId ? state.activeSessionId.replace(`${state.activeAgent}_`, '') : 'web_default';

package/web/ui/chat/groupchat.js

@@ -610,9 +610,7 @@ async function sendGroupChat() {
   input.value = '';
   input.style.height = 'auto';
   document.getElementById('sendBtn').disabled = true;
-
-  // Show typing
-  state.isGenerating = true;
+  clearDraft();
   showTypingIndicator();
   document.getElementById('sendBtn').style.display = 'none';
   document.getElementById('stopBtn').style.display = '';