jarvis-ai-assistant 0.3.30__py3-none-any.whl → 0.7.6__py3-none-any.whl

jarvis/jarvis_data/config_schema.json

@@ -7,6 +7,7 @@
     "JARVIS_MCP": {
       "type": "array",
       "description": "MCP工具配置列表",
+      "default": [],
       "items": {
         "type": "object",
         "oneOf": [
@@ -119,12 +120,32 @@
     "JARVIS_PLATFORM": {
       "type": "string",
       "description": "常规操作平台名称",
-      "default": "yuanbao"
+      "default": "openai"
     },
     "JARVIS_MODEL": {
       "type": "string",
       "description": "常规操作模型名称",
-      "default": "deep_seek_v3"
+      "default": "gpt-5"
+    },
+    "JARVIS_CHEAP_PLATFORM": {
+      "type": "string",
+      "description": "廉价操作的平台名称。如未配置，则使用 JARVIS_PLATFORM 的值",
+      "default": ""
+    },
+    "JARVIS_CHEAP_MODEL": {
+      "type": "string",
+      "description": "廉价操作的模型名称。如未配置，则使用 JARVIS_MODEL 的值",
+      "default": ""
+    },
+    "JARVIS_SMART_PLATFORM": {
+      "type": "string",
+      "description": "智能操作的平台名称。如未配置，则使用 JARVIS_PLATFORM 的值",
+      "default": ""
+    },
+    "JARVIS_SMART_MODEL": {
+      "type": "string",
+      "description": "智能操作的模型名称。如未配置，则使用 JARVIS_MODEL 的值",
+      "default": ""
     },
     "JARVIS_WEB_SEARCH_PLATFORM": {
       "type": "string",
@@ -152,16 +173,32 @@
           "properties": {
             "JARVIS_PLATFORM": {
               "type": "string",
-              "default": "yuanbao"
+              "default": "openai"
             },
             "JARVIS_MODEL": {
               "type": "string",
-              "default": "deep_seek_v3"
+              "default": "gpt-5"
             },
             "JARVIS_MAX_INPUT_TOKEN_COUNT": {
               "type": "number",
               "default": 32000
             },
+            "JARVIS_CHEAP_PLATFORM": {
+              "type": "string",
+              "description": "廉价操作的平台名称。如未配置，则使用 JARVIS_PLATFORM 的值"
+            },
+            "JARVIS_CHEAP_MODEL": {
+              "type": "string",
+              "description": "廉价操作的模型名称。如未配置，则使用 JARVIS_MODEL 的值"
+            },
+            "JARVIS_SMART_PLATFORM": {
+              "type": "string",
+              "description": "智能操作的平台名称。如未配置，则使用 JARVIS_PLATFORM 的值"
+            },
+            "JARVIS_SMART_MODEL": {
+              "type": "string",
+              "description": "智能操作的模型名称。如未配置，则使用 JARVIS_MODEL 的值"
+            },
             "ENV": {
               "type": "object",
               "description": "该模型组特定的环境变量，会覆盖全局 ENV 配置",
@@ -182,6 +219,16 @@
       "description": "执行工具前是否需要确认",
       "default": false
     },
+    "JARVIS_TOOL_FILTER_THRESHOLD": {
+      "type": "number",
+      "description": "AI工具筛选阈值：当可用工具数量超过此值时触发AI筛选",
+      "default": 30
+    },
+    "JARVIS_SCRIPT_EXECUTION_TIMEOUT": {
+      "type": "number",
+      "description": "脚本执行的超时时间（秒），仅在非交互模式下生效。",
+      "default": 300
+    },
     "JARVIS_CONFIRM_BEFORE_APPLY_PATCH": {
       "type": "boolean",
       "description": "应用补丁前是否需要确认",
@@ -195,7 +242,7 @@
     "JARVIS_PRETTY_OUTPUT": {
       "type": "boolean",
       "description": "是否启用美化输出",
-      "default": false
+      "default": true
     },
     "JARVIS_USE_METHODOLOGY": {
       "type": "boolean",
@@ -257,12 +304,12 @@
     },
     "JARVIS_CENTRAL_METHODOLOGY_REPO": {
       "type": "string",
-      "description": "中心方法论Git仓库地址，该仓库会自动添加到方法论加载路径中",
+      "description": "中心方法论仓库路径或Git仓库地址。支持本地目录（含git子路径）：若为本地目录将直接加入方法论加载路径；若为Git URL则会克隆到数据目录后加载。",
       "default": ""
     },
     "JARVIS_CENTRAL_TOOL_REPO": {
       "type": "string",
-      "description": "中心工具库Git仓库地址，该仓库会自动克隆到数据目录并加载其中的工具",
+      "description": "中心工具仓库路径或Git仓库地址。支持本地目录（含git子路径）：若为本地目录将直接加载其中的工具；若为Git URL则会克隆到数据目录并加载。",
       "default": ""
     },
     "JARVIS_PRINT_PROMPT": {
@@ -270,31 +317,76 @@
       "description": "是否打印提示",
       "default": false
     },
+    "JARVIS_PRINT_ERROR_TRACEBACK": {
+      "type": "boolean",
+      "description": "是否在错误输出时打印回溯调用链",
+      "default": false
+    },
     "JARVIS_ENABLE_STATIC_ANALYSIS": {
       "type": "boolean",
       "description": "是否启用静态代码分析",
       "default": true
     },
+    "JARVIS_ENABLE_BUILD_VALIDATION": {
+      "type": "boolean",
+      "description": "是否启用构建验证。在代码编辑后自动验证代码能否成功编译/构建，确保编辑不会破坏项目构建。",
+      "default": true
+    },
+    "JARVIS_BUILD_VALIDATION_TIMEOUT": {
+      "type": "number",
+      "description": "构建验证的超时时间（秒）。当构建验证执行时间超过此值时，将终止验证并报告超时。",
+      "default": 600
+    },
+    "JARVIS_ENABLE_IMPACT_ANALYSIS": {
+      "type": "boolean",
+      "description": "是否启用编辑影响范围分析。分析代码编辑的影响范围，识别可能受影响的文件、函数、测试等，帮助评估编辑风险。",
+      "default": true
+    },
     "JARVIS_FORCE_SAVE_MEMORY": {
       "type": "boolean",
       "description": "是否强制保存记忆",
-      "default": true
+      "default": false
     },
     "JARVIS_ENABLE_GIT_JCA_SWITCH": {
       "type": "boolean",
       "description": "在初始化环境前检测Git仓库并提示可切换到代码开发模式（jca）",
-      "default": false
+      "default": true
     },
     "JARVIS_ENABLE_STARTUP_CONFIG_SELECTOR": {
       "type": "boolean",
       "description": "在进入默认通用代理前，列出可用配置（agent/multi_agent/roles）供选择",
-      "default": false
+      "default": true
     },
     "JARVIS_IMMEDIATE_ABORT": {
       "type": "boolean",
       "description": "是否启用立即中断：在对话迭代中检测到中断信号时立即返回",
       "default": false
     },
+    "JARVIS_SAVE_SESSION_HISTORY": {
+      "type": "boolean",
+      "description": "是否保存会话记录",
+      "default": false
+    },
+    "JARVIS_SKIP_PREDEFINED_TASKS": {
+      "type": "boolean",
+      "description": "是否跳过预定义任务加载（不读取 pre-command 列表）",
+      "default": false
+    },
+    "JARVIS_ADDON_PROMPT_THRESHOLD": {
+      "type": "number",
+      "description": "附加提示的触发阈值（字符数）。当消息长度超过此值时，会自动添加默认的附加提示",
+      "default": 1024
+    },
+    "JARVIS_ENABLE_INTENT_RECOGNITION": {
+      "type": "boolean",
+      "description": "是否启用意图识别功能。用于智能上下文推荐中的LLM意图提取和语义分析",
+      "default": true
+    },
+    "JARVIS_ENABLE_MEMORY_ORGANIZER": {
+      "type": "boolean",
+      "description": "是否启用自动记忆整理功能。在任务完成后自动检测记忆库状态，当记忆数量超过200条且存在重叠时提示用户整理",
+      "default": false
+    },
     "JARVIS_GIT_CHECK_MODE": {
       "type": "string",
       "enum": ["strict", "warn"],
@@ -341,7 +433,23 @@
     "JARVIS_RAG_GROUPS": {
       "type": "array",
       "description": "预定义的RAG配置组",
-      "default": [],
+      "default": [
+        {
+          "text": {
+            "embedding_model": "BAAI/bge-m3",
+            "rerank_model": "BAAI/bge-reranker-v2-m3",
+            "use_bm25": true,
+            "use_rerank": true
+          }
+        },
+        {
+          "code": {
+            "embedding_model": "Qodo/Qodo-Embed-1-1.5B",
+            "use_bm25": false,
+            "use_rerank": false
+          }
+        }
+      ],
       "items": {
         "type": "object",
         "additionalProperties": {
@@ -421,7 +529,8 @@
         "required": [
           "template"
         ]
-      }
+      },
+      "default": {}
     },
     "OPENAI_API_KEY": {
       "type": "string",
@@ -451,6 +560,13 @@
       "type": "string",
       "description": "系统Shell路径，用于获取当前使用的shell类型",
       "default": "/bin/bash"
+    },
+    "JARVIS_CONVERSATION_TURN_THRESHOLD": {
+      "type": "number",
+      "description": "对话轮次阈值，用于触发总结。当对话轮次超过此值时，系统会自动触发对话总结",
+      "default": 50,
+      "minimum": 1,
+      "maximum": 1000
     }
   },
   "additionalProperties": true

jarvis/jarvis_git_squash/main.py

@@ -5,7 +5,6 @@ from typing import Dict
 import typer
 
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_utils.input import user_confirm
 from jarvis.jarvis_utils.globals import get_agent, current_agent_name
@@ -38,11 +37,11 @@ class GitSquashTool:
         """Execute the squash operation"""
         try:
             if not self._confirm_squash():
-                PrettyOutput.print("操作已取消", OutputType.WARNING)
+                print("⚠️ 操作已取消")
                 return
 
             if not self._reset_to_commit(args["commit_hash"]):
-                PrettyOutput.print("重置到指定提交失败", OutputType.WARNING)
+                print("⚠️ 重置到指定提交失败")
                 return
 
             # Use existing GitCommitTool for new commit
@@ -53,7 +52,7 @@ class GitSquashTool:
                 exec_args["agent"] = agent
             commit_tool.execute(exec_args)
         except Exception as e:
-            PrettyOutput.print(f"压缩提交失败: {str(e)}", OutputType.WARNING)
+            print(f"⚠️ 压缩提交失败: {str(e)}")
 
 
 @app.command()
@@ -61,7 +60,7 @@ def cli(
     commit_hash: str = typer.Argument(..., help="要压缩的基础提交哈希"),
     lang: str = typer.Option("Chinese", "--lang", help="提交信息的语言"),
 ):
-    init_env("欢迎使用 Jarvis-GitSquash，您的Git压缩助手已准备就绪！")
+    init_env()
     tool = GitSquashTool()
     tool.execute({"commit_hash": commit_hash, "lang": lang})
 

jarvis/jarvis_git_utils/git_commiter.py

@@ -75,7 +75,7 @@ class GitCommitTool:
         os.chdir(root_dir)
         find_git_root_and_cd()
         if not has_uncommitted_changes():
-            PrettyOutput.print("没有未提交的更改", OutputType.SUCCESS)
+            print("✅ 没有未提交的更改")
             return None
         return original_dir
 
@@ -129,42 +129,7 @@ class GitCommitTool:
 
             try:
                 temp_diff_file_path = None
-                # 生成提交信息
-                PrettyOutput.print("正在生成提交消息...", OutputType.INFO)
-
-                # 准备提示信息
-                custom_prompt = get_git_commit_prompt()
-                base_prompt = (
-                    custom_prompt
-                    if custom_prompt
-                    else """根据代码差异生成提交信息：
-                提交信息应使用中文书写
-# 格式模板
-必须使用以下格式：
-
-<类型>(<范围>): <主题>
-
-[可选] 详细描述变更内容和原因
-
-# 格式规则
-1. 类型: fix(修复bug), feat(新功能), docs(文档), style(格式), refactor(重构), test(测试), chore(其他)
-2. 范围表示变更的模块或组件 (例如: auth, database, ui)
-3. 主题行不超过72个字符，不以句号结尾，使用祈使语气
-4. 如有详细描述，使用空行分隔主题和详细描述
-5. 详细描述部分应解释"是什么"和"为什么"，而非"如何"
-6. 仅输出提交信息，不要输出其他内容
-"""
-                )
-                base_prompt += f"""
-# 输出格式
-{ot("COMMIT_MESSAGE")}
-commit信息
-{ct("COMMIT_MESSAGE")}
-                """
-
-                # 优先从调用方传入的 agent 获取平台与模型
-                agent_from_args = args.get("agent")
-
+                
                 # Get model_group from args
                 model_group = args.get("model_group")
 
@@ -177,30 +142,36 @@ commit信息
                 platform_name = None
                 model_name = None
 
-                if (
-                    agent_from_args
-                    and hasattr(agent_from_args, "model")
-                    and getattr(agent_from_args, "model", None)
-                ):
-                    try:
-                        platform_name = agent_from_args.model.platform_name()
-                        model_name = agent_from_args.model.name()
-                        if not model_group and hasattr(
-                            agent_from_args.model, "model_group"
-                        ):
-                            model_group = agent_from_args.model.model_group
-                    except Exception:
-                        # 安全回退到后续逻辑
-                        platform_name = None
-                        model_name = None
-
-                # 如果未能从agent获取到，再根据 model_group 获取
-                if not platform_name:
+                # 优先根据 model_group 获取（确保配置一致性）
+                # 如果 model_group 存在，强制使用它来解析，避免使用 agent.model 中可能不一致的值
+                if model_group:
                     platform_name = get_normal_platform_name(model_group)
-                if not model_name:
                     model_name = get_normal_model_name(model_group)
-
-                # If no explicit parameters, try to get from existing global agent
+                else:
+                    # 如果没有提供 model_group，尝试从传入的 agent 获取
+                    agent_from_args = args.get("agent")
+                    if (
+                        agent_from_args
+                        and hasattr(agent_from_args, "model")
+                        and getattr(agent_from_args, "model", None)
+                    ):
+                        try:
+                            platform_name = agent_from_args.model.platform_name()
+                            model_name = agent_from_args.model.name()
+                            if hasattr(agent_from_args.model, "model_group"):
+                                model_group = agent_from_args.model.model_group
+                        except Exception:
+                            # 安全回退到后续逻辑
+                            platform_name = None
+                            model_name = None
+                    
+                    # 如果仍未获取到，使用配置文件中的默认值（传入 None 会读取默认配置）
+                    if not platform_name:
+                        platform_name = get_normal_platform_name(None)
+                    if not model_name:
+                        model_name = get_normal_model_name(None)
+
+                # 最后的回退：尝试从全局 agent 获取（仅当仍未获取到时）
                 if not platform_name:
                     agent = get_agent(current_agent_name)
                     if (
@@ -208,10 +179,17 @@ commit信息
                         and hasattr(agent, "model")
                         and getattr(agent, "model", None)
                     ):
-                        platform_name = agent.model.platform_name()
-                        model_name = agent.model.name()
-                        if not model_group and hasattr(agent.model, "model_group"):
-                            model_group = agent.model.model_group
+                        try:
+                            platform_name = agent.model.platform_name()
+                            model_name = agent.model.name()
+                            if not model_group and hasattr(agent.model, "model_group"):
+                                model_group = agent.model.model_group
+                        except Exception:
+                            # 如果全局 agent 也无法获取，使用配置文件默认值
+                            if not platform_name:
+                                platform_name = get_normal_platform_name(None)
+                            if not model_name:
+                                model_name = get_normal_model_name(None)
 
                 # Create a new platform instance
                 if platform_name:
@@ -227,6 +205,40 @@ commit信息
                 else:
                     platform = PlatformRegistry().get_normal_platform()
 
+                # 生成提交信息
+                model_display_name = model_name or (platform.name() if platform else "AI")
+                print(f"ℹ️ 正在使用{model_display_name}生成提交消息...")
+
+                # 准备提示信息
+                custom_prompt = get_git_commit_prompt()
+                base_prompt = (
+                    custom_prompt
+                    if custom_prompt
+                    else """根据代码差异生成提交信息：
+                提交信息应使用中文书写
+# 格式模板
+必须使用以下格式：
+
+<类型>(<范围>): <主题>
+
+[可选] 详细描述变更内容和原因
+
+# 格式规则
+1. 类型: fix(修复bug), feat(新功能), docs(文档), style(格式), refactor(重构), test(测试), chore(其他)
+2. 范围表示变更的模块或组件 (例如: auth, database, ui)
+3. 主题行不超过72个字符，不以句号结尾，使用祈使语气
+4. 如有详细描述，使用空行分隔主题和详细描述
+5. 详细描述部分应解释"是什么"和"为什么"，而非"如何"
+6. 仅输出提交信息，不要输出其他内容
+"""
+                )
+                base_prompt += f"""
+# 输出格式
+{ot("COMMIT_MESSAGE")}
+commit信息
+{ct("COMMIT_MESSAGE")}
+                """
+
                 # 跳过模型可用性校验：
                 # 为避免某些平台/代理不支持 get_model_list 接口导致的噪音日志（如 404），
                 # 这里默认不调用 platform.get_model_list() 进行模型可用性校验。
@@ -244,11 +256,11 @@ commit信息
                 upload_success = False
 
                 # Check if content is too large
-                is_large_content = is_context_overflow(diff, model_group)
+                is_large_content = is_context_overflow(diff, model_group, platform)
 
                 if is_large_content:
                     if not platform.support_upload_files():
-                        PrettyOutput.print("差异文件太大，无法处理", OutputType.ERROR)
+                        print("❌ 差异文件太大，无法处理")
                         return {
                             "success": False,
                             "stdout": "",
@@ -267,7 +279,7 @@ commit信息
                     if upload_success:
                         pass
                     else:
-                        PrettyOutput.print("上传代码差异文件失败", OutputType.ERROR)
+                        print("❌ 上传代码差异文件失败")
                         return {
                             "success": False,
                             "stdout": "",
@@ -366,14 +378,9 @@ commit信息
                     try:
                         os.unlink(temp_diff_file_path)
                     except Exception as e:
-                        PrettyOutput.print(
-                            f"无法删除临时文件: {str(e)}", OutputType.WARNING
-                        )
+                        print(f"⚠️ 无法删除临时文件: {str(e)}")
 
-            PrettyOutput.print(
-                f"提交哈希: {commit_hash}\n提交消息: {commit_message}",
-                OutputType.SUCCESS,
-            )
+            PrettyOutput.print(f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS)
 
             return {
                 "success": True,
@@ -384,7 +391,7 @@ commit信息
                 "stderr": "",
             }
         except Exception as e:
-            PrettyOutput.print(f"提交失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 提交失败: {str(e)}")
             return {
                 "success": False,
                 "stdout": "",
@@ -413,7 +420,7 @@ def cli(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
 ):
-    init_env("欢迎使用 Jarvis-GitCommitTool，您的Git提交助手已准备就绪！")
+    init_env()
     tool = GitCommitTool()
     tool.execute(
         {

jarvis/jarvis_mcp/sse_mcp_client.py

@@ -5,10 +5,9 @@ import time
 from typing import Any, Callable, Dict, List, Optional
 from urllib.parse import parse_qs, urlencode, urljoin
 
-import requests
+import requests  # type: ignore[import-untyped]
 
 from jarvis.jarvis_mcp import McpClient
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class SSEMcpClient(McpClient):
@@ -78,13 +77,10 @@ class SSEMcpClient(McpClient):
 
             if not self.messages_endpoint:
                 self.messages_endpoint = "/messages"  # 默认端点
-                PrettyOutput.print(
-                    f"未获取到消息端点，使用默认值: {self.messages_endpoint}",
-                    OutputType.WARNING,
-                )
+                print(f"⚠️ 未获取到消息端点，使用默认值: {self.messages_endpoint}")
 
             if not self.session_id:
-                PrettyOutput.print("未获取到会话ID", OutputType.WARNING)
+                print("⚠️ 未获取到会话ID")
 
             # 发送初始化请求
             response = self._send_request(
@@ -107,7 +103,7 @@ class SSEMcpClient(McpClient):
             self._send_notification("notifications/initialized", {})
 
         except Exception as e:
-            PrettyOutput.print(f"MCP初始化失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ MCP初始化失败: {str(e)}")
             raise
 
     def _start_sse_connection(self) -> None:
@@ -138,7 +134,7 @@ class SSEMcpClient(McpClient):
                 self.sse_thread.start()
 
         except Exception as e:
-            PrettyOutput.print(f"SSE连接失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ SSE连接失败: {str(e)}")
             raise
 
     def _process_sse_events(self) -> None:
@@ -166,9 +162,7 @@ class SSEMcpClient(McpClient):
                                 if "session_id" in query_params:
                                     self.session_id = query_params["session_id"][0]
                         except Exception as e:
-                            PrettyOutput.print(
-                                f"解析消息端点或会话ID失败: {e}", OutputType.WARNING
-                            )
+                            print(f"⚠️ 解析消息端点或会话ID失败: {e}")
                     else:
                         buffer += data
                 elif line.startswith(":"):  # 忽略注释行
@@ -184,10 +178,10 @@ class SSEMcpClient(McpClient):
                     try:
                         self._handle_sse_event(buffer)
                     except Exception as e:
-                        PrettyOutput.print(f"处理SSE事件出错: {e}", OutputType.ERROR)
+                        print(f"❌ 处理SSE事件出错: {e}")
                     buffer = ""
 
-        PrettyOutput.print("SSE连接已关闭", OutputType.WARNING)
+        print("⚠️ SSE连接已关闭")
 
     def _handle_sse_event(self, data: str) -> None:
         """处理单个SSE事件数据"""
@@ -217,11 +211,10 @@ class SSEMcpClient(McpClient):
                         except Exception as e:
                             error_lines.append(f"处理通知时出错 ({method}): {e}")
                     if error_lines:
-                        PrettyOutput.print("\n".join(error_lines), OutputType.ERROR)
-        except json.JSONDecodeError:
-            PrettyOutput.print(f"无法解析SSE事件: {data}", OutputType.WARNING)
-        except Exception as e:
-            PrettyOutput.print(f"处理SSE事件时出错: {e}", OutputType.ERROR)
+                        joined_errors = '\n'.join(error_lines)
+                        print(f"❌ {joined_errors}")
+        except Exception:
+            print(f"⚠️ 无法解析SSE事件: {data}")
 
     def register_notification_handler(self, method: str, handler: Callable) -> None:
         """注册通知处理器
@@ -341,7 +334,7 @@ class SSEMcpClient(McpClient):
                 self.pending_requests.pop(req_id, None)
                 self.request_results.pop(req_id, None)
 
-            PrettyOutput.print(f"发送请求失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 发送请求失败: {str(e)}")
             raise
 
     def _send_notification(self, method: str, params: Dict[str, Any]) -> None:
@@ -396,7 +389,7 @@ class SSEMcpClient(McpClient):
                     post_response.raise_for_status()
 
         except Exception as e:
-            PrettyOutput.print(f"发送通知失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 发送通知失败: {str(e)}")
             raise
 
     def get_tool_list(self) -> List[Dict[str, Any]]:
@@ -439,10 +432,10 @@ class SSEMcpClient(McpClient):
                 else:
                     error_msg += ": 未知错误"
 
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                print(f"❌ {error_msg}")
                 return []
         except Exception as e:
-            PrettyOutput.print(f"获取工具列表失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 获取工具列表失败: {str(e)}")
             return []
 
     def execute(self, tool_name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
@@ -481,7 +474,7 @@ class SSEMcpClient(McpClient):
                     "stderr": response.get("error", "Unknown error"),
                 }
         except Exception as e:
-            PrettyOutput.print(f"执行工具失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 执行工具失败: {str(e)}")
             return {"success": False, "stdout": "", "stderr": str(e)}
 
     def get_resource_list(self) -> List[Dict[str, Any]]:
@@ -504,10 +497,10 @@ class SSEMcpClient(McpClient):
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                print(f"❌ {error_msg}")
                 return []
         except Exception as e:
-            PrettyOutput.print(f"获取资源列表失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 获取资源列表失败: {str(e)}")
             return []
 
     def get_resource(self, uri: str) -> Dict[str, Any]:
@@ -548,11 +541,11 @@ class SSEMcpClient(McpClient):
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                print(f"❌ {error_msg}")
                 return {"success": False, "stdout": "", "stderr": error_msg}
         except Exception as e:
             error_msg = f"获取资源内容失败: {str(e)}"
-            PrettyOutput.print(error_msg, OutputType.ERROR)
+            print(f"❌ {error_msg}")
             return {"success": False, "stdout": "", "stderr": error_msg}
 
     def __del__(self):
@@ -568,7 +561,7 @@ class SSEMcpClient(McpClient):
         if self.sse_response:
             try:
                 self.sse_response.close()
-            except:
+            except Exception:
                 pass
 
         # 关闭HTTP会话