jarvis-ai-assistant 0.3.23__py3-none-any.whl → 0.3.25__py3-none-any.whl

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]]:
         """
@@ -253,14 +247,18 @@ class ChromaRetriever:
             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:
                 # 删除旧条目
@@ -275,9 +273,9 @@ class ChromaRetriever:
                     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_smart_shell/main.py

@@ -24,20 +24,11 @@ Example:
 
 def execute_command(command: str, should_run: bool) -> None:
     """Print command without execution"""
-    PrettyOutput.print(command, OutputType.CODE, lang="bash")
+    print(command)
     if should_run:
         os.system(command)
 
 
-def _check_fish_shell() -> bool:
-    """Check if current shell is fish
-
-    Returns:
-        bool: True if fish shell, False otherwise
-    """
-    return get_shell_name() == "fish"
-
-
 def _get_config_file() -> str:
     """Get fish config file path
 

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

@@ -122,8 +122,8 @@ class FileSearchReplaceTool:
 
         from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
-        stdout_messages = []
-        stderr_messages = []
+        stdout_messages: list[str] = []
+        stderr_messages: list[str] = []
         overall_success = False
         file_results = []
 
@@ -168,10 +168,10 @@ class FileSearchReplaceTool:
                 )
 
         # 整合所有错误信息到stderr
-        all_stderr = []
-        for result in file_results:
-            if not result["success"]:
-                all_stderr.append(f"文件 {result['file']} 处理失败: {result['stderr']}")
+        all_stderr: list[str] = []
+        for file_result in file_results:
+            if not file_result["success"]:
+                all_stderr.append(f"文件 {file_result['file']} 处理失败: {file_result['stderr']}")
 
         return {
             "success": overall_success,

jarvis/jarvis_tools/execute_script.py

@@ -74,8 +74,7 @@ class ScriptTool:
         stream.feed(data)
 
         # 清理每行右侧空格，并过滤空行
-        cleaned = []
-        cleaned = []
+        cleaned: list[str] = []
         for y in range(screen.lines):
             line = screen.buffer[y]
             stripped = "".join(char.data for char in line.values()).rstrip()

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:
         """从内置工具目录加载工具"""

jarvis/jarvis_tools/sub_agent.py

@@ -64,12 +64,6 @@ class SubAgentTool:
                 f"背景信息:\n{background}\n\n任务:\n{task}" if background else task
             )
 
-            # 读取背景信息并组合任务
-            background: str = str(args.get("background", "")).strip()
-            enhanced_task = (
-                f"背景信息:\n{background}\n\n任务:\n{task}" if background else task
-            )
-
             # 继承父Agent的运行参数（用于覆盖默认值）；若无父Agent则使用默认/全局配置
             parent_agent = args.get("agent")
             # 如未注入父Agent，尝试从全局获取当前或任一已注册Agent
@@ -133,7 +127,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,
@@ -160,7 +154,10 @@ class SubAgentTool:
                     try:
                         model_name = parent_agent.model.name()  # type: ignore[attr-defined]
                         if model_name:
-                            agent.model.set_model_name(model_name)  # type: ignore[attr-defined]
+                            from typing import Any
+                            model_obj: Any = getattr(agent, "model", None)
+                            if model_obj is not None:
+                                model_obj.set_model_name(model_name)
                     except Exception:
                         pass
                 if use_tools:

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,
@@ -164,7 +161,10 @@ class SubCodeAgentTool:
                     try:
                         parent_model_name = parent_agent.model.name()  # type: ignore[attr-defined]
                         if parent_model_name:
-                            code_agent.agent.model.set_model_name(parent_model_name)  # type: ignore[attr-defined]
+                            from typing import Any
+                            model_obj: Any = getattr(code_agent.agent, "model", None)
+                            if model_obj is not None:
+                                model_obj.set_model_name(parent_model_name)
                     except Exception:
                         pass
             except Exception:

jarvis/jarvis_utils/config.py

@@ -115,6 +115,14 @@ def get_shell_name() -> str:
     return os.path.basename(shell_path).lower()
 
 
+def _apply_llm_group_env_override(group_config: Dict[str, Any]) -> None:
+    """如果模型组配置中包含ENV，则应用环境变量覆盖"""
+    if "ENV" in group_config and isinstance(group_config["ENV"], dict):
+        os.environ.update(
+            {str(k): str(v) for k, v in group_config["ENV"].items() if v is not None}
+        )
+
+
 def _get_resolved_model_config(
     model_group_override: Optional[str] = None,
 ) -> Dict[str, Any]:
@@ -141,6 +149,8 @@ def _get_resolved_model_config(
             if isinstance(group_item, dict) and model_group_name in group_item:
                 group_config = group_item[model_group_name]
                 break
+    
+    _apply_llm_group_env_override(group_config)
 
     # Start with group config
     resolved_config = group_config.copy()
@@ -149,8 +159,6 @@ def _get_resolved_model_config(
     for key in [
         "JARVIS_PLATFORM",
         "JARVIS_MODEL",
-        "JARVIS_THINKING_PLATFORM",
-        "JARVIS_THINKING_MODEL",
         "JARVIS_MAX_INPUT_TOKEN_COUNT",
     ]:
         if key in GLOBAL_CONFIG_DATA:
@@ -181,7 +189,7 @@ def get_normal_model_name(model_group_override: Optional[str] = None) -> str:
     return config.get("JARVIS_MODEL", "deep_seek_v3")
 
 
-def get_thinking_platform_name(model_group_override: Optional[str] = None) -> str:
+def _deprecated_platform_name_v1(model_group_override: Optional[str] = None) -> str:
     """
     获取思考操作的平台名称。
 
@@ -190,12 +198,10 @@ def get_thinking_platform_name(model_group_override: Optional[str] = None) -> st
     """
     config = _get_resolved_model_config(model_group_override)
     # Fallback to normal platform if thinking platform is not specified
-    return config.get(
-        "JARVIS_THINKING_PLATFORM", get_normal_platform_name(model_group_override)
-    )
+    return get_normal_platform_name(model_group_override)
 
 
-def get_thinking_model_name(model_group_override: Optional[str] = None) -> str:
+def _deprecated_model_name_v1(model_group_override: Optional[str] = None) -> str:
     """
     获取思考操作的模型名称。
 
@@ -204,9 +210,7 @@ def get_thinking_model_name(model_group_override: Optional[str] = None) -> str:
     """
     config = _get_resolved_model_config(model_group_override)
     # Fallback to normal model if thinking model is not specified
-    return config.get(
-        "JARVIS_THINKING_MODEL", get_normal_model_name(model_group_override)
-    )
+    return get_normal_model_name(model_group_override)
 
 
 def is_execute_tool_confirm() -> bool:
@@ -638,6 +642,16 @@ def get_tool_dont_use_list() -> List[str]:
     return config.get("dont_use", [])
 
 
+def get_tool_filter_threshold() -> int:
+    """
+    获取AI工具筛选的阈值。
+
+    返回:
+        int: 当工具数量超过此阈值时，触发AI筛选。默认为30
+    """
+    return int(GLOBAL_CONFIG_DATA.get("JARVIS_TOOL_FILTER_THRESHOLD", 30))
+
+
 def is_enable_git_repo_jca_switch() -> bool:
     """
     是否启用：在初始化环境前检测Git仓库并提示可切换到代码开发模式（jca）

jarvis/jarvis_utils/input.py

@@ -384,14 +384,17 @@ def _show_history_and_copy():
         PrettyOutput.print("没有可复制的消息", OutputType.INFO)
         return
 
-    PrettyOutput.print("\n" + "=" * 20 + " 消息历史记录 " + "=" * 20, OutputType.INFO)
+    # 为避免 PrettyOutput 在循环中为每行加框，先拼接后统一打印
+    lines = []
+    lines.append("\n" + "=" * 20 + " 消息历史记录 " + "=" * 20)
     for i, msg in enumerate(history):
         cleaned_msg = msg.replace("\n", r"\n")
         display_msg = (
             (cleaned_msg[:70] + "...") if len(cleaned_msg) > 70 else cleaned_msg
         )
-        PrettyOutput.print(f"  {i + 1}: {display_msg.strip()}", OutputType.INFO)
-    PrettyOutput.print("=" * 58 + "\n", OutputType.INFO)
+        lines.append(f"  {i + 1}: {display_msg.strip()}")
+    lines.append("=" * 58 + "\n")
+    PrettyOutput.print("\n".join(lines), OutputType.INFO)
 
     while True:
         try:
@@ -699,7 +702,7 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
                         "未检测到 fzf，无法打开文件选择器。", OutputType.WARNING
                     )
                 else:
-                    files: list[str] = []
+                    files = []
                     try:
                         r = subprocess.run(
                             ["git", "ls-files"],
@@ -832,7 +835,7 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
                         "未检测到 fzf，无法打开文件选择器。", OutputType.WARNING
                     )
                 else:
-                    files: list[str] = []
+                    files = []
                     try:
                         import os as _os
 

jarvis/jarvis_utils/methodology.py

@@ -81,11 +81,13 @@ def _load_all_methodologies() -> Dict[str, str]:
 
     import glob
 
+    # 收集循环中的提示，统一打印，避免逐条加框
+    warn_dirs: List[str] = []
+    error_lines: List[str] = []
+
     for directory in set(methodology_dirs):  # Use set to avoid duplicates
         if not os.path.isdir(directory):
-            PrettyOutput.print(
-                f"警告: 方法论目录不存在或不是一个目录: {directory}", OutputType.WARNING
-            )
+            warn_dirs.append(f"警告: 方法论目录不存在或不是一个目录: {directory}")
             continue
 
         for filepath in glob.glob(os.path.join(directory, "*.json")):
@@ -100,10 +102,13 @@ def _load_all_methodologies() -> Dict[str, str]:
                         all_methodologies[problem_type] = content
             except Exception as e:
                 filename = os.path.basename(filepath)
-                PrettyOutput.print(
-                    f"加载方法论文件 {filename} 失败: {str(e)}", OutputType.WARNING
-                )
+                error_lines.append(f"加载方法论文件 {filename} 失败: {str(e)}")
 
+    # 统一打印目录警告与文件加载失败信息
+    if warn_dirs:
+        PrettyOutput.print("\n".join(warn_dirs), OutputType.WARNING)
+    if error_lines:
+        PrettyOutput.print("\n".join(error_lines), OutputType.WARNING)
     return all_methodologies
 
 

jarvis/jarvis_utils/utils.py

@@ -673,13 +673,20 @@ def _interactive_config_setup(config_file_path: Path):
 
         # 如果有配置指导，先显示总体说明
         if config_guide:
-            PrettyOutput.print(f"\n配置获取方法:", OutputType.INFO)
+            # 为避免 PrettyOutput 在循环中为每行加框，先拼接后统一打印
+            guide_lines = ["", "配置获取方法:"]
+            for key in required_keys:
+                if key in config_guide and config_guide[key]:
+                    guide_lines.append(f"")
+                    guide_lines.append(f"{key} 获取方法:")
+                    guide_lines.append(str(config_guide[key]))
+            PrettyOutput.print("\n".join(guide_lines), OutputType.INFO)
+        else:
+            # 若无指导，仍需遍历以保持后续逻辑一致
+            pass
 
         for key in required_keys:
-            # 显示该环境变量的配置指导
-            if key in config_guide and config_guide[key]:
-                PrettyOutput.print(f"\n{key} 获取方法:", OutputType.INFO)
-                PrettyOutput.print(config_guide[key], OutputType.INFO)
+            # 显示该环境变量的配置指导（上文已统一打印，此处不再逐条打印）
 
             default_value = defaults.get(key, "")
             prompt_text = f"  - {key}"
@@ -737,9 +744,7 @@ def _interactive_config_setup(config_file_path: Path):
     config_data = {
         "ENV": env_vars,
         "JARVIS_PLATFORM": platform_name,
-        "JARVIS_THINKING_PLATFORM": platform_name,
         "JARVIS_MODEL": model_name,
-        "JARVIS_THINKING_MODEL": model_name,
     }
 
     if not test_passed:
@@ -1080,6 +1085,14 @@ def _collect_optional_config_interactively(
         )
         or changed
     )
+    changed = (
+        _ask_and_set_int(
+            "JARVIS_TOOL_FILTER_THRESHOLD",
+            "设置AI工具筛选阈值 (当可用工具数超过此值时触发AI筛选, 默认30)",
+            30,
+        )
+        or changed
+    )
 
     # 目录类配置（逗号分隔）
     changed = (
@@ -1159,7 +1172,7 @@ def _collect_optional_config_interactively(
     try:
         if "JARVIS_RAG" not in config_data:
             if get_yes_no("是否配置 RAG 检索增强参数？", default=False):
-                rag_conf = {}
+                rag_conf: Dict[str, Any] = {}
                 emb = get_single_line_input(
                     f"RAG 嵌入模型（留空使用默认: {rag_default_embed}）：",
                     default="",
@@ -1454,7 +1467,7 @@ def _read_old_config_file(config_file):
 
 
 def while_success(func: Callable[[], Any], sleep_time: float = 0.1) -> Any:
-    """循环执行函数直到成功
+    """循环执行函数直到成功（累计日志后统一打印，避免逐次加框）
 
     参数：
     func -- 要执行的函数
@@ -1463,17 +1476,20 @@ def while_success(func: Callable[[], Any], sleep_time: float = 0.1) -> Any:
     返回：
     函数执行结果
     """
+    result: Any = None
     while True:
         try:
-            return func()
-        except Exception as e:
+            result = func()
+            break
+        except Exception:
             PrettyOutput.print(f"重试中，等待 {sleep_time}s...", OutputType.WARNING)
             time.sleep(sleep_time)
             continue
+    return result
 
 
 def while_true(func: Callable[[], bool], sleep_time: float = 0.1) -> Any:
-    """循环执行函数直到返回True
+    """循环执行函数直到返回True（累计日志后统一打印，避免逐次加框）
 
     参数:
         func: 要执行的函数，必须返回布尔值
@@ -1486,6 +1502,7 @@ def while_true(func: Callable[[], bool], sleep_time: float = 0.1) -> Any:
         与while_success不同，此函数只检查返回是否为True，
         不捕获异常，异常会直接抛出
     """
+    ret: bool = False
     while True:
         ret = func()
         if ret: