jarvis-ai-assistant 0.3.22__py3-none-any.whl → 0.3.24__py3-none-any.whl

jarvis/jarvis_platform_manager/main.py

@@ -11,8 +11,6 @@ import typer
 from jarvis.jarvis_utils.config import (
     get_normal_platform_name,
     get_normal_model_name,
-    get_thinking_platform_name,
-    get_thinking_model_name,
 )
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
@@ -66,7 +64,7 @@ def list_platforms(
 
 
 def chat_with_model(
-    platform_name: str, model_name: str, system_prompt: str, llm_type: str = "normal"
+    platform_name: str, model_name: str, system_prompt: str
 ) -> None:
     """与指定平台和模型进行对话。
 
@@ -74,7 +72,7 @@ def chat_with_model(
         platform_name: 平台名称
         model_name: 模型名称
         system_prompt: 系统提示语
-        llm_type: LLM类型，可选值：'normal'(普通)或 'thinking'(思考模式)
+
     """
     registry = PlatformRegistry.get_global_platform_registry()
     conversation_history: List[Dict[str, str]] = []  # 存储对话记录
@@ -360,32 +358,19 @@ def chat_command(
         None, "--platform", "-p", help="指定要使用的平台"
     ),
     model: Optional[str] = typer.Option(None, "--model", "-m", help="指定要使用的模型"),
-    llm_type: str = typer.Option(
-        "normal",
-        "-t",
-        "--llm-type",
-        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
-    ),
+
     llm_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
 ) -> None:
     """与指定平台和模型聊天。"""
     # 如果未提供平台或模型参数，则从config获取默认值
-    platform = platform or (
-        get_thinking_platform_name(llm_group)
-        if llm_type == "thinking"
-        else get_normal_platform_name(llm_group)
-    )
-    model = model or (
-        get_thinking_model_name(llm_group)
-        if llm_type == "thinking"
-        else get_normal_model_name(llm_group)
-    )
+    platform = platform or get_normal_platform_name(llm_group)
+    model = model or get_normal_model_name(llm_group)
 
     if not validate_platform_model(platform, model):
         return
-    chat_with_model(platform, model, "", llm_type)
+    chat_with_model(platform, model, "")
 
 
 @app.command("service")
@@ -444,12 +429,7 @@ def role_command(
     model: Optional[str] = typer.Option(
         None, "--model", "-m", help="指定要使用的模型，覆盖角色配置"
     ),
-    llm_type: Optional[str] = typer.Option(
-        None,
-        "-t",
-        "--llm-type",
-        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式），覆盖角色配置",
-    ),
+
     llm_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
@@ -483,54 +463,37 @@ def role_command(
         PrettyOutput.print("无效的选择", OutputType.ERROR)
         return
 
-    # 获取llm_type，优先使用命令行参数，否则使用角色配置，默认为normal
-    role_llm_type = llm_type or selected_role.get("llm_type", "normal")
+
 
     # 初始化平台和模型
     # 如果提供了platform或model参数，优先使用命令行参数
-    # 否则，如果提供了llm_group，根据llm_type从配置中获取
+    # 否则，如果提供了 llm_group，则从配置中获取
     # 最后才使用角色配置中的platform和model
     if platform:
         platform_name = platform
     elif llm_group:
-        platform_name = (
-            get_thinking_platform_name(llm_group)
-            if role_llm_type == "thinking"
-            else get_normal_platform_name(llm_group)
-        )
+        platform_name = get_normal_platform_name(llm_group)
     else:
         platform_name = selected_role.get("platform")
         if not platform_name:
             # 如果角色配置中没有platform，使用默认配置
-            platform_name = (
-                get_thinking_platform_name()
-                if role_llm_type == "thinking"
-                else get_normal_platform_name()
-            )
+            platform_name = get_normal_platform_name()
 
     if model:
         model_name = model
     elif llm_group:
-        model_name = (
-            get_thinking_model_name(llm_group)
-            if role_llm_type == "thinking"
-            else get_normal_model_name(llm_group)
-        )
+        model_name = get_normal_model_name(llm_group)
     else:
         model_name = selected_role.get("model")
         if not model_name:
             # 如果角色配置中没有model，使用默认配置
-            model_name = (
-                get_thinking_model_name()
-                if role_llm_type == "thinking"
-                else get_normal_model_name()
-            )
+            model_name = get_normal_model_name()
 
     system_prompt = selected_role.get("system_prompt", "")
 
     # 开始对话
     PrettyOutput.print(f"已选择角色: {selected_role['name']}", OutputType.SUCCESS)
-    chat_with_model(platform_name, model_name, system_prompt, role_llm_type)
+    chat_with_model(platform_name, model_name, system_prompt)
 
 
 def main() -> None:

jarvis/jarvis_rag/cli.py

@@ -240,6 +240,7 @@ def add_documents(
 
         sorted_files = sorted(list(files_to_process))
         total_files = len(sorted_files)
+        loaded_msgs: List[str] = []
 
         for i, file_path in enumerate(sorted_files):
             try:
@@ -249,14 +250,15 @@ def add_documents(
                     loader = TextLoader(str(file_path), encoding="utf-8")
 
                 docs_batch.extend(loader.load())
-                PrettyOutput.print(
-                    f"已加载: {file_path} (文件 {i + 1}/{total_files})", OutputType.INFO
-                )
+                loaded_msgs.append(f"已加载: {file_path} (文件 {i + 1}/{total_files})")
             except Exception as e:
                 PrettyOutput.print(f"加载失败 {file_path}: {e}", OutputType.WARNING)
 
             # 当批处理已满或是最后一个文件时处理批处理
             if docs_batch and (len(docs_batch) >= batch_size or (i + 1) == total_files):
+                if loaded_msgs:
+                    PrettyOutput.print("\n".join(loaded_msgs), OutputType.INFO)
+                    loaded_msgs = []
                 PrettyOutput.print(
                     f"正在处理批次，包含 {len(docs_batch)} 个文档...", OutputType.INFO
                 )
@@ -267,6 +269,10 @@ def add_documents(
                 )
                 docs_batch = []  # 清空批处理
 
+        # 最后统一打印可能残留的“已加载”信息
+        if loaded_msgs:
+            PrettyOutput.print("\n".join(loaded_msgs), OutputType.INFO)
+            loaded_msgs = []
         if total_docs_added == 0:
             PrettyOutput.print("未能成功加载任何文档。", OutputType.ERROR)
             raise typer.Exit(code=1)
@@ -321,12 +327,11 @@ def list_documents(
             )
             return
 
-        PrettyOutput.print(
-            f"知识库 '{collection_name}' 中共有 {len(sources)} 个独立文档:",
-            OutputType.INFO,
-        )
+        # 避免在循环中逐条打印，先拼接后统一打印
+        lines = [f"知识库 '{collection_name}' 中共有 {len(sources)} 个独立文档:"]
         for i, source in enumerate(sorted(list(sources)), 1):
-            PrettyOutput.print(f"  {i}. {source}", OutputType.INFO)
+            lines.append(f"  {i}. {source}")
+        PrettyOutput.print("\n".join(lines), OutputType.INFO)
 
     except Exception as e:
         PrettyOutput.print(f"发生错误: {e}", OutputType.ERROR)
@@ -450,11 +455,7 @@ def query(
         PrettyOutput.print(f"正在查询: '{question}'", OutputType.INFO)
         answer = pipeline.query(question)
 
-        PrettyOutput.print("答案:", OutputType.INFO)
-        # 我们仍然可以使用 rich.markdown.Markdown，因为 PrettyOutput 底层使用了 rich
-        from jarvis.jarvis_utils.globals import console
-
-        console.print(Markdown(answer))
+        PrettyOutput.print(answer, OutputType.SUCCESS)
 
     except Exception as e:
         PrettyOutput.print(f"发生错误: {e}", OutputType.ERROR)

jarvis/jarvis_rag/embedding_manager.py

@@ -38,12 +38,24 @@ class EmbeddingManager:
         encode_kwargs = {"normalize_embeddings": True}
 
         try:
-            return HuggingFaceEmbeddings(
-                model_name=self.model_name,
-                model_kwargs=model_kwargs,
-                encode_kwargs=encode_kwargs,
-                show_progress=True,
-            )
+            # First try to load model locally
+            try:
+                from sentence_transformers import SentenceTransformer
+                local_model = SentenceTransformer(self.model_name, device=model_kwargs["device"])
+                return HuggingFaceEmbeddings(
+                    client=local_model,
+                    model_name=self.model_name,
+                    model_kwargs=model_kwargs,
+                    encode_kwargs=encode_kwargs,
+                )
+            except Exception:
+                # Fall back to remote download if local loading fails
+                return HuggingFaceEmbeddings(
+                    model_name=self.model_name,
+                    model_kwargs=model_kwargs,
+                    encode_kwargs=encode_kwargs,
+                    show_progress=True,
+                )
         except Exception as e:
             PrettyOutput.print(
                 f"加载嵌入模型 '{self.model_name}' 时出错: {e}", OutputType.ERROR

jarvis/jarvis_rag/llm_interface.py

@@ -47,13 +47,11 @@ class ToolAgent_LLM(LLMInterface):
         # 为代理提供一个通用的系统提示
         self.system_prompt = "You are a helpful assistant. Please answer the user's question based on the provided context. You can use tools to find more information if needed."
         self.summary_prompt = """
-<report>
 请为本次问答任务生成一个总结报告，包含以下内容：
 
 1. **原始问题**: 重述用户最开始提出的问题。
 2. **关键信息来源**: 总结你是基于哪些关键信息或文件得出的结论。
 3. **最终答案**: 给出最终的、精炼的回答。
-</report>
 """
 
     def generate(self, prompt: str, **kwargs) -> str:

jarvis/jarvis_rag/rag_pipeline.py

@@ -161,19 +161,24 @@ class JarvisRAGPipeline:
             if not changed and not deleted:
                 return
             # 打印摘要
-            PrettyOutput.print(
-                f"检测到索引可能不一致：变更 {len(changed)} 个，删除 {len(deleted)} 个。",
-                OutputType.WARNING,
-            )
-            for p in (changed[:3] if changed else []):
-                PrettyOutput.print(f"  变更: {p}", OutputType.WARNING)
-            for p in (deleted[:3] if deleted else []):
-                PrettyOutput.print(f"  删除: {p}", OutputType.WARNING)
+            # 先拼接列表信息再统一打印，避免循环中逐条打印
+            lines = [
+                f"检测到索引可能不一致：变更 {len(changed)} 个，删除 {len(deleted)} 个。"
+            ]
+            if changed:
+                lines.extend([f"  变更: {p}" for p in changed[:3]])
+            if deleted:
+                lines.extend([f"  删除: {p}" for p in deleted[:3]])
+            PrettyOutput.print("\n".join(lines), OutputType.WARNING)
             # 询问用户
-            if get_yes_no("检测到索引变更，是否现在更新索引后再开始检索？", default=True):
+            if get_yes_no(
+                "检测到索引变更，是否现在更新索引后再开始检索？", default=True
+            ):
                 retriever.update_index_for_changes(changed, deleted)
             else:
-                PrettyOutput.print("已跳过索引更新，将直接使用当前索引进行检索。", OutputType.INFO)
+                PrettyOutput.print(
+                    "已跳过索引更新，将直接使用当前索引进行检索。", OutputType.INFO
+                )
         except Exception as e:
             PrettyOutput.print(f"检索前索引检查失败：{e}", OutputType.WARNING)
 
@@ -228,9 +233,12 @@ class JarvisRAGPipeline:
         rewritten_queries = self._get_query_rewriter().rewrite(query_text)
 
         # 2. 为每个重写的查询检索初始候选文档
+        PrettyOutput.print(
+            "将为以下查询变体进行混合检索:\n" + "\n".join([f"  - {q}" for q in rewritten_queries]),
+            OutputType.INFO,
+        )
         all_candidate_docs = []
         for q in rewritten_queries:
-            PrettyOutput.print(f"正在为查询变体 '{q}' 进行混合检索...", OutputType.INFO)
             candidates = self._get_retriever().retrieve(
                 q, n_results=n_results * 2, use_bm25=self.use_bm25
             )
@@ -269,9 +277,9 @@ class JarvisRAGPipeline:
             )
         )
         if sources:
-            PrettyOutput.print("根据以下文档回答:", OutputType.INFO)
-            for source in sources:
-                PrettyOutput.print(f"  - {source}", OutputType.INFO)
+            # 合并来源列表后一次性打印，避免多次加框
+            lines = ["根据以下文档回答:"] + [f"  - {source}" for source in sources]
+            PrettyOutput.print("\n".join(lines), OutputType.INFO)
 
         # 4. 创建最终提示并生成答案
         # 我们使用原始的query_text作为给LLM的最终提示
@@ -299,9 +307,12 @@ class JarvisRAGPipeline:
         rewritten_queries = self._get_query_rewriter().rewrite(query_text)
 
         # 2. 检索候选文档
+        PrettyOutput.print(
+            "将为以下查询变体进行混合检索:\n" + "\n".join([f"  - {q}" for q in rewritten_queries]),
+            OutputType.INFO,
+        )
         all_candidate_docs = []
         for q in rewritten_queries:
-            PrettyOutput.print(f"正在为查询变体 '{q}' 进行混合检索...", OutputType.INFO)
             candidates = self._get_retriever().retrieve(
                 q, n_results=n_results * 2, use_bm25=self.use_bm25
             )

jarvis/jarvis_rag/retriever.py

@@ -184,32 +184,26 @@ class ChromaRetriever:
         deleted = result["deleted"]
         if not changed and not deleted:
             return
+        # 为避免在循环中逐条打印，先拼接后统一打印
+        lines: list[str] = []
         if changed:
-            PrettyOutput.print(
-                f"检测到 {len(changed)} 个已索引文件发生变化，建议重新索引以保证检索准确性。",
-                OutputType.WARNING,
+            lines.append(
+                f"检测到 {len(changed)} 个已索引文件发生变化，建议重新索引以保证检索准确性。"
             )
-            for p in changed[:5]:
-                PrettyOutput.print(f"  变更: {p}", OutputType.WARNING)
+            lines.extend([f"  变更: {p}" for p in changed[:5]])
             if len(changed) > 5:
-                PrettyOutput.print(
-                    f"  ... 以及另外 {len(changed) - 5} 个文件", OutputType.WARNING
-                )
+                lines.append(f"  ... 以及另外 {len(changed) - 5} 个文件")
         if deleted:
-            PrettyOutput.print(
-                f"检测到 {len(deleted)} 个已索引文件已被删除，建议清理并重新索引。",
-                OutputType.WARNING,
+            lines.append(
+                f"检测到 {len(deleted)} 个已索引文件已被删除，建议清理并重新索引。"
             )
-            for p in deleted[:5]:
-                PrettyOutput.print(f"  删除: {p}", OutputType.WARNING)
+            lines.extend([f"  删除: {p}" for p in deleted[:5]])
             if len(deleted) > 5:
-                PrettyOutput.print(
-                    f"  ... 以及另外 {len(deleted) - 5} 个文件", OutputType.WARNING
-                )
-        PrettyOutput.print(
-            "提示：请使用 'jarvis-rag add <路径>' 重新索引相关文件，以更新向量库与BM25索引。",
-            OutputType.INFO,
+                lines.append(f"  ... 以及另外 {len(deleted) - 5} 个文件")
+        lines.append(
+            "提示：请使用 'jarvis-rag add <路径>' 重新索引相关文件，以更新向量库与BM25索引。"
         )
+        PrettyOutput.print("\n".join(lines), OutputType.WARNING)
 
     def detect_index_changes(self) -> Dict[str, List[str]]:
         """
@@ -231,7 +225,9 @@ class ChromaRetriever:
                 removed += 1
         if removed > 0:
             self._save_manifest(manifest)
-            PrettyOutput.print(f"已从索引清单中移除 {removed} 个已删除的源文件记录。", OutputType.INFO)
+            PrettyOutput.print(
+                f"已从索引清单中移除 {removed} 个已删除的源文件记录。", OutputType.INFO
+            )
 
     def update_index_for_changes(self, changed: List[str], deleted: List[str]) -> None:
         """
@@ -240,21 +236,29 @@ class ChromaRetriever:
         - 对 changed: 先删除旧条目，再从源文件重建并添加
         - 最后：从集合重建BM25索引，更新manifest
         """
-        changed = list(dict.fromkeys([p for p in (changed or []) if isinstance(p, str)]))
-        deleted = list(dict.fromkeys([p for p in (deleted or []) if isinstance(p, str)]))
+        changed = list(
+            dict.fromkeys([p for p in (changed or []) if isinstance(p, str)])
+        )
+        deleted = list(
+            dict.fromkeys([p for p in (deleted or []) if isinstance(p, str)])
+        )
 
         if not changed and not deleted:
             return
 
         # 先处理删除
+        delete_errors: list[str] = []
         for src in deleted:
             try:
                 self.collection.delete(where={"source": src})  # type: ignore[arg-type]
             except Exception as e:
-                PrettyOutput.print(f"删除源 '{src}' 时出错: {e}", OutputType.WARNING)
+                delete_errors.append(f"删除源 '{src}' 时出错: {e}")
+        if delete_errors:
+            PrettyOutput.print("\n".join(delete_errors), OutputType.WARNING)
 
         # 再处理变更（重建）
         docs_to_add: List[Document] = []
+        rebuild_errors: list[str] = []
         for src in changed:
             try:
                 # 删除旧条目
@@ -265,9 +269,13 @@ class ChromaRetriever:
                 # 读取源文件内容（作为单文档载入，由 add_documents 进行拆分与嵌入）
                 with open(src, "r", encoding="utf-8", errors="ignore") as f:
                     content = f.read()
-                docs_to_add.append(Document(page_content=content, metadata={"source": src}))
+                docs_to_add.append(
+                    Document(page_content=content, metadata={"source": src})
+                )
             except Exception as e:
-                PrettyOutput.print(f"重建源 '{src}' 内容时出错: {e}", OutputType.WARNING)
+                rebuild_errors.append(f"重建源 '{src}' 内容时出错: {e}")
+        if rebuild_errors:
+            PrettyOutput.print("\n".join(rebuild_errors), OutputType.WARNING)
 
         if docs_to_add:
             try:

jarvis/jarvis_tools/cli/main.py

@@ -39,18 +39,22 @@ def list_tools(
             )
     else:
         PrettyOutput.section("可用工具列表", OutputType.SYSTEM)
+        # 为避免 PrettyOutput 对每行加框造成信息稀疏，先拼接字符串再统一打印
+        lines = []
+        import json as _json  # local import to ensure available
         for tool in tools:
-            PrettyOutput.print(f"\n{tool['name']}", OutputType.SUCCESS)
-            PrettyOutput.print(f"   描述: {tool['description']}", OutputType.INFO)
+            lines.append(f"\n{tool['name']}")
+            lines.append(f"   描述: {tool['description']}")
             if detailed:
-                PrettyOutput.print("   参数:", OutputType.INFO)
-                import json as _json  # local import to ensure available
-
-                PrettyOutput.print(
-                    _json.dumps(tool["parameters"], ensure_ascii=False, indent=2),
-                    OutputType.CODE,
-                    lang="json",
-                )
+                lines.append("   参数:")
+                # 使用 Markdown 代码块统一展示参数
+                lines.append("```json")
+                try:
+                    lines.append(_json.dumps(tool["parameters"], ensure_ascii=False, indent=2))
+                except Exception:
+                    lines.append(str(tool.get("parameters")))
+                lines.append("```")
+        PrettyOutput.print("\n".join(lines), OutputType.INFO, lang="markdown")
 
 
 @app.command("stat")
@@ -202,15 +206,18 @@ def call_tool(
     missing_params = [p for p in required_params if p not in tool_args]
 
     if missing_params:
-        PrettyOutput.print(
-            f"错误: 缺少必需参数: {', '.join(missing_params)}", OutputType.ERROR
-        )
-        PrettyOutput.print("\n参数说明:", OutputType.INFO)
+        # 先拼接提示与参数说明，再统一打印，避免循环中逐条打印
         params = tool_obj.parameters.get("properties", {})
+        lines = [
+            f"错误: 缺少必需参数: {', '.join(missing_params)}",
+            "",
+            "参数说明:",
+        ]
         for param_name in required_params:
             param_info = params.get(param_name, {})
             desc = param_info.get("description", "无描述")
-            PrettyOutput.print(f"  - {param_name}: {desc}", OutputType.INFO)
+            lines.append(f"  - {param_name}: {desc}")
+        PrettyOutput.print("\n".join(lines), OutputType.ERROR)
         raise typer.Exit(code=1)
 
     result = registry.execute_tool(tool_name, tool_args)

jarvis/jarvis_tools/edit_file.py

@@ -146,9 +146,7 @@ class FileSearchReplaceTool:
                         }
                     )
                 else:
-                    PrettyOutput.print(
-                        f"文件 {file_path} 处理失败", OutputType.ERROR
-                    )
+                    PrettyOutput.print(f"文件 {file_path} 处理失败", OutputType.ERROR)
                     file_results.append(
                         {
                             "file": file_path,

jarvis/jarvis_tools/file_analyzer.py

@@ -30,7 +30,7 @@ class FileAnalyzerTool:
 
     @staticmethod
     def check() -> bool:
-        return PlatformRegistry().get_thinking_platform().support_upload_files()
+        return PlatformRegistry().get_normal_platform().support_upload_files()
 
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         """执行文件分析操作
@@ -45,25 +45,31 @@ class FileAnalyzerTool:
             file_paths = args["file_paths"]
             prompt = args["prompt"]
 
-            # 验证文件路径
+            # 验证文件路径（先收集不存在的文件，统一打印一次）
             valid_files = []
+            missing_files = []
             for file_path in file_paths:
                 if os.path.exists(file_path):
                     valid_files.append(file_path)
                 else:
-                    PrettyOutput.print(f"文件不存在: {file_path}", OutputType.WARNING)
+                    missing_files.append(file_path)
+            if missing_files:
+                PrettyOutput.print(
+                    "以下文件不存在:\n" + "\n".join(f"  - {p}" for p in missing_files),
+                    OutputType.WARNING,
+                )
 
             if not valid_files:
                 return {"success": False, "stdout": "", "stderr": "没有找到有效的文件"}
 
-            # 创建thinking平台实例
-            platform = PlatformRegistry().get_thinking_platform()
+            # 创建平台实例
+            platform = PlatformRegistry().get_normal_platform()
 
             if not platform:
                 return {
                     "success": False,
                     "stdout": "",
-                    "stderr": "无法创建thinking平台实例",
+                    "stderr": "无法创建平台实例",
                 }
 
             # 设置系统消息

jarvis/jarvis_tools/registry.py

@@ -73,7 +73,7 @@ arguments:
 
 <string_format>
 # 📝 字符串参数格式
-始终使用 |2 语法表示字符串参数，防止多行字符串行首空格引起歧义：
+使用 |2 语法表示字符串参数，防止多行字符串行首空格引起歧义。
 
 {ot("TOOL_CALL")}
 want: 当前的git状态，期望获取xxx的提交记录
@@ -81,7 +81,7 @@ name: execute_script
 
 arguments:
   interpreter: bash
-  script_content: |2
+  script_content: |
     git status --porcelain
 {ct("TOOL_CALL")}
 </string_format>
@@ -98,7 +98,6 @@ arguments:
 <common_errors>
 # ⚠️ 常见错误
 - 同时调用多个工具
-- 字符串参数缺少 |2
 - 假设工具结果
 - 创建虚构对话
 - 在没有所需信息的情况下继续
@@ -276,14 +275,17 @@ class ToolRegistry(OutputHandlerProtocol):
         # 如果配置了 use 列表，只保留列表中的工具
         if use_list:
             filtered_tools = {}
+            missing = []
             for tool_name in use_list:
                 if tool_name in self.tools:
                     filtered_tools[tool_name] = self.tools[tool_name]
                 else:
-                    PrettyOutput.print(
-                        f"警告: 配置的工具 '{tool_name}' 不存在",
-                        OutputType.WARNING,
-                    )
+                    missing.append(tool_name)
+            if missing:
+                PrettyOutput.print(
+                    "警告: 配置的工具不存在: " + ", ".join(f"'{name}'" for name in missing),
+                    OutputType.WARNING,
+                )
             self.tools = filtered_tools
 
         # 如果配置了 dont_use 列表，排除列表中的工具
@@ -315,14 +317,15 @@ class ToolRegistry(OutputHandlerProtocol):
         )
 
         # 遍历目录中的所有.yaml文件
+        error_lines = []
         for file_path in mcp_tools_dir.glob("*.yaml"):
             try:
                 config = yaml.safe_load(open(file_path, "r", encoding="utf-8"))
                 self.register_mcp_tool_by_config(config)
             except Exception as e:
-                PrettyOutput.print(
-                    f"文件 {file_path} 加载失败: {str(e)}", OutputType.WARNING
-                )
+                error_lines.append(f"文件 {file_path} 加载失败: {str(e)}")
+        if error_lines:
+            PrettyOutput.print("\n".join(error_lines), OutputType.WARNING)
 
     def _load_builtin_tools(self) -> None:
         """从内置工具目录加载工具"""
@@ -613,7 +616,9 @@ class ToolRegistry(OutputHandlerProtocol):
         )
 
     @staticmethod
-    def _extract_tool_calls(content: str) -> Tuple[Dict[str, Dict[str, Any]], str, bool]:
+    def _extract_tool_calls(
+        content: str,
+    ) -> Tuple[Dict[str, Dict[str, Any]], str, bool]:
         """从内容中提取工具调用。
 
         参数:

jarvis/jarvis_tools/sub_agent.py

@@ -133,7 +133,7 @@ class SubAgentTool:
                 system_prompt=system_prompt,
                 name="SubAgent",
                 description="Temporary sub agent for executing a subtask",
-                llm_type="normal",  # 使用默认模型类型
+
                 model_group=model_group,  # 继承父Agent模型组（如可用）
                 summary_prompt=summary_prompt,  # 继承父Agent总结提示词（如可用）
                 auto_complete=auto_complete,

jarvis/jarvis_tools/sub_code_agent.py

@@ -103,12 +103,10 @@ class SubCodeAgentTool:
                 pass
 
             # 创建 CodeAgent：参数优先使用父Agent的配置（若可获取），否则使用默认
-            # 推断/继承 llm_type、need_summary、tool_group
-            llm_type = "normal"
+            # 推断/继承 tool_group
             tool_group = None
             try:
                 if parent_agent is not None:
-                    llm_type = getattr(parent_agent, "llm_type", llm_type)
                     tool_group = getattr(parent_agent, "tool_group", tool_group)
             except Exception:
                 pass
@@ -135,7 +133,6 @@ class SubCodeAgentTool:
 
             try:
                 code_agent = CodeAgent(
-                    llm_type=llm_type,
                     model_group=model_group,
                     need_summary=True,
                     append_tools=append_tools,