jarvis-ai-assistant 0.1.224__tar.gz → 0.1.225__tar.gz

{jarvis_ai_assistant-0.1.224/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.225}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.224
+Version: 0.1.225
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -57,8 +57,8 @@ Requires-Dist: pyte==0.8.2
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: pyyaml>=5.3.1
 Requires-Dist: ddgs==9.0.2
-Requires-Dist: beautifulsoup4==4.13.4
 Requires-Dist: lxml==6.0.0
+Requires-Dist: markdownify>=1.1.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -158,6 +158,7 @@ jarvis --llm_type thinking -t "初始任务"
 | `-t/--task` | 直接从命令行输入任务内容 |
 | `-f/--config` | 自定义配置文件的路径 |
 | `--restore-session` | 从 .jarvis/saved_session.json 恢复会话 |
+| `-e/--edit` | 编辑配置文件 |
 
 #### 4. 工作流程
 1. 初始化环境

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/README.md

@@ -74,6 +74,7 @@ jarvis --llm_type thinking -t "初始任务"
 | `-t/--task` | 直接从命令行输入任务内容 |
 | `-f/--config` | 自定义配置文件的路径 |
 | `--restore-session` | 从 .jarvis/saved_session.json 恢复会话 |
+| `-e/--edit` | 编辑配置文件 |
 
 #### 4. 工作流程
 1. 初始化环境

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.224"
+version = "0.1.225"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -39,8 +39,8 @@ dependencies = [
     "httpx>=0.28.1",
     "pyyaml>=5.3.1",
     "ddgs==9.0.2",
-    "beautifulsoup4==4.13.4",
     "lxml==6.0.0",
+    "markdownify>=1.1.0",
 ]
 requires-python = ">=3.9"
 
@@ -89,3 +89,7 @@ jarvis-methodology = "jarvis.jarvis_methodology.main:main"
 jm = "jarvis.jarvis_methodology.main:main"
 jarvis-rag = "jarvis.jarvis_rag.cli:main"
 jrg = "jarvis.jarvis_rag.cli:main"
+
+[[tool.uv.index]]
+url = "https://artsz.zte.com.cn/artifactory/api/pypi/public-pypi-virtual/simple"
+default = true

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.224",
+    version="0.1.225",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -34,8 +34,8 @@ setup(
         "httpx>=0.28.1",
         "pyyaml>=5.3.1",
         "ddgs==9.0.2",
-        "beautifulsoup4==4.13.4",
         "lxml==6.0.0",
+        "markdownify>=1.1.0",
     ],
     extras_require={
         "dev": ["pytest", "black", "isort", "mypy", "build", "twine"],

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.224"
+__version__ = "0.1.225"

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/jarvis_agent/__init__.py

@@ -213,6 +213,7 @@ class Agent:
 """
         )
         self.first = True
+        self.run_input_handlers_next_turn = False
 
     def set_user_data(self, key: str, value: Any):
         """Sets user data in the session."""
@@ -236,6 +237,10 @@ class Agent:
         """Sets the addon prompt in the session."""
         self.session.set_addon_prompt(addon_prompt)
 
+    def set_run_input_handlers_next_turn(self, value: bool):
+        """Sets the flag to run input handlers on the next turn."""
+        self.run_input_handlers_next_turn = value
+
     def set_after_tool_call_cb(self, cb: Callable[[Any], None]):  # type: ignore
         """设置工具调用后回调函数。
 
@@ -264,7 +269,9 @@ class Agent:
                 return handler
         return None
 
-    def _call_model(self, message: str, need_complete: bool = False) -> str:
+    def _call_model(
+        self, message: str, need_complete: bool = False, run_input_handlers: bool = True
+    ) -> str:
         """调用AI模型并实现重试逻辑
 
         参数:
@@ -280,10 +287,11 @@ class Agent:
             3. 会自动添加附加提示
             4. 会检查并处理上下文长度限制
         """
-        for handler in self.input_handler:
-            message, need_return = handler(message, self)
-            if need_return:
-                return message
+        if run_input_handlers:
+            for handler in self.input_handler:
+                message, need_return = handler(message, self)
+                if need_return:
+                    return message
 
         if self.session.addon_prompt:
             message += f"\n\n{self.session.addon_prompt}"
@@ -478,12 +486,20 @@ class Agent:
         try:
             set_agent(self.name, self)
 
+            run_input_handlers = True
             while True:
+                if self.run_input_handlers_next_turn:
+                    run_input_handlers = True
+                    self.run_input_handlers_next_turn = False
+
                 if self.first:
                     self._first_run()
                 try:
-                    current_response = self._call_model(self.session.prompt, True)
+                    current_response = self._call_model(
+                        self.session.prompt, True, run_input_handlers
+                    )
                     self.session.prompt = ""
+                    run_input_handlers = False
 
                     if get_interrupt():
                         set_interrupt(False)
@@ -491,6 +507,7 @@ class Agent:
                             f"模型交互期间被中断，请输入用户干预信息："
                         )
                         if user_input:
+                            run_input_handlers = True
                             # 如果有工具调用且用户确认继续，则将干预信息和工具执行结果拼接为prompt
                             if any(
                                 handler.can_handle(current_response)
@@ -502,6 +519,7 @@ class Agent:
                                     self.session.prompt = (
                                         f"{user_input}\n\n{current_response}"
                                     )
+                                    run_input_handlers = False
                                     continue
                             self.session.prompt += f"{user_input}"
                             continue
@@ -529,6 +547,7 @@ class Agent:
 
                     if user_input:
                         self.session.prompt = user_input
+                        run_input_handlers = True
                         continue
 
                     if not user_input:

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/jarvis_agent/jarvis.py

@@ -1,8 +1,11 @@
 # -*- coding: utf-8 -*-
 import argparse
 import os
+import shutil
+import subprocess
 import sys
-from typing import Dict
+from pathlib import Path
+from typing import Dict, Optional
 
 import yaml  # type: ignore
 from prompt_toolkit import prompt  # type: ignore
@@ -106,8 +109,8 @@ def _select_task(tasks: Dict[str, str]) -> str:
             PrettyOutput.print(f"选择任务失败: {str(val_err)}", OutputType.ERROR)
 
 
-def main() -> None:
-
+def _parse_args() -> argparse.Namespace:
+    """Parse command line arguments."""
     parser = argparse.ArgumentParser(description="Jarvis AI assistant")
     parser.add_argument(
         "--llm_type",
@@ -129,44 +132,90 @@ def main() -> None:
         help="Restore session from .jarvis/saved_session.json",
         default=False,
     )
-    args = parser.parse_args()
-    init_env(
-        "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=args.config
+    parser.add_argument(
+        "-e", "--edit", action="store_true", help="Edit the configuration file"
     )
+    return parser.parse_args()
 
-    try:
-        agent = Agent(
-            system_prompt=origin_agent_system_prompt,
-            llm_type=args.llm_type,
-            input_handler=[shell_input_handler, builtin_input_handler],
-            output_handler=[ToolRegistry()],
-            need_summary=False,
-        )
 
-        # 尝试恢复会话
-        if args.restore_session:
-            if agent.restore_session():
-                PrettyOutput.print("会话已成功恢复。", OutputType.SUCCESS)
-            else:
-                PrettyOutput.print("无法恢复会话。", OutputType.WARNING)
+def _handle_edit_mode(args: argparse.Namespace) -> None:
+    """If edit flag is set, open config file in editor and exit."""
+    if not args.edit:
+        return
 
-        # 优先处理命令行直接传入的任务
-        if args.task:
-            agent.run(args.task)
+    config_file_path = (
+        Path(args.config)
+        if args.config
+        else Path(os.path.expanduser("~/.jarvis/config.yaml"))
+    )
+    editors = ["nvim", "vim", "vi"]
+    editor = next((e for e in editors if shutil.which(e)), None)
+
+    if editor:
+        try:
+            subprocess.run([editor, str(config_file_path)], check=True)
             sys.exit(0)
+        except (subprocess.CalledProcessError, FileNotFoundError) as e:
+            PrettyOutput.print(f"Failed to open editor: {e}", OutputType.ERROR)
+            sys.exit(1)
+    else:
+        PrettyOutput.print(
+            "No suitable editor found (nvim, vim, vi).", OutputType.ERROR
+        )
+        sys.exit(1)
+
 
-        if agent.first:
-            tasks = _load_tasks()
-            if tasks and (selected_task := _select_task(tasks)):
-                PrettyOutput.print(f"开始执行任务: \n{selected_task}", OutputType.INFO)
-                agent.run(selected_task)
-                sys.exit(0)
+def _initialize_agent(args: argparse.Namespace) -> Agent:
+    """Initialize the agent and restore session if requested."""
+    agent = Agent(
+        system_prompt=origin_agent_system_prompt,
+        llm_type=args.llm_type,
+        input_handler=[shell_input_handler, builtin_input_handler],
+        output_handler=[ToolRegistry()],  # type: ignore
+        need_summary=False,
+    )
 
-        user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
-        if user_input:
-            agent.run(user_input)
+    # 尝试恢复会话
+    if args.restore_session:
+        if agent.restore_session():
+            PrettyOutput.print("会话已成功恢复。", OutputType.SUCCESS)
+        else:
+            PrettyOutput.print("无法恢复会话。", OutputType.WARNING)
+    return agent
+
+
+def _get_and_run_task(agent: Agent, task_content: Optional[str] = None) -> None:
+    """Get task from various sources and run it."""
+    # 优先处理命令行直接传入的任务
+    if task_content:
+        agent.run(task_content)
         sys.exit(0)
 
+    if agent.first:
+        tasks = _load_tasks()
+        if tasks and (selected_task := _select_task(tasks)):
+            PrettyOutput.print(f"开始执行任务: \n{selected_task}", OutputType.INFO)
+            agent.run(selected_task)
+            sys.exit(0)
+
+    user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
+    if user_input:
+        agent.run(user_input)
+    sys.exit(0)
+
+
+def main() -> None:
+    """Main function for Jarvis AI assistant."""
+    args = _parse_args()
+    _handle_edit_mode(args)
+
+    init_env(
+        "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=args.config
+    )
+
+    try:
+        agent = _initialize_agent(args)
+        _get_and_run_task(agent, args.task)
     except Exception as err:  # pylint: disable=broad-except
         PrettyOutput.print(f"初始化错误: {str(err)}", OutputType.ERROR)
         sys.exit(1)

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/jarvis_agent/main.py

@@ -20,7 +20,9 @@ def load_config(config_path: str) -> dict:
         dict: 配置字典
     """
     if not os.path.exists(config_path):
-        PrettyOutput.print(f"配置文件 {config_path} 不存在，使用默认配置", OutputType.WARNING)
+        PrettyOutput.print(
+            f"配置文件 {config_path} 不存在，使用默认配置", OutputType.WARNING
+        )
         return {}
 
     with open(config_path, "r", encoding="utf-8", errors="ignore") as f:
@@ -53,7 +55,9 @@ def main():
     args = parser.parse_args()
 
     # Initialize environment
-    init_env("欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=args.config)
+    init_env(
+        "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=args.config
+    )
 
     # Load configuration
     config = load_config(args.agent_definition) if args.agent_definition else {}

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -18,7 +18,10 @@ from jarvis.jarvis_code_agent.lint import get_lint_tools
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.registry import ToolRegistry
-from jarvis.jarvis_utils.config import is_confirm_before_apply_patch, is_enable_static_analysis
+from jarvis.jarvis_utils.config import (
+    is_confirm_before_apply_patch,
+    is_enable_static_analysis,
+)
 from jarvis.jarvis_utils.git_utils import (
     confirm_add_new_files,
     find_git_root_and_cd,
@@ -54,7 +57,6 @@ class CodeAgent:
                 "search_web",
                 "ask_user",
                 "read_code",
-                "methodology",
                 "rewrite_file",
             ]
         )
@@ -116,7 +118,7 @@ class CodeAgent:
             system_prompt=code_system_prompt,
             name="CodeAgent",
             auto_complete=False,
-            output_handler=[tool_registry, EditFileHandler()],
+            output_handler=[tool_registry, EditFileHandler()],  # type: ignore
             llm_type=llm_type,
             input_handler=[shell_input_handler, builtin_input_handler],
             need_summary=need_summary,

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/jarvis_code_analysis/checklists/loader.py

@@ -5,12 +5,26 @@ Utility module for loading language-specific code review checklists.
 from typing import Dict, Optional
 
 # Import checklist modules
-from jarvis.jarvis_code_analysis.checklists import (c_cpp, csharp, data_format,
-                                                    devops, docs, go,
-                                                    infrastructure, java,
-                                                    javascript, kotlin, php,
-                                                    python, ruby, rust, shell,
-                                                    sql, swift, web)
+from jarvis.jarvis_code_analysis.checklists import (
+    c_cpp,
+    csharp,
+    data_format,
+    devops,
+    docs,
+    go,
+    infrastructure,
+    java,
+    javascript,
+    kotlin,
+    php,
+    python,
+    ruby,
+    rust,
+    shell,
+    sql,
+    swift,
+    web,
+)
 
 # Map of language identifiers to their checklist content
 CHECKLIST_MAP = {

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/jarvis_platform_manager/main.py

@@ -188,9 +188,13 @@ def chat_with_model(platform_name: str, model_name: str, system_prompt: str) ->
                         for entry in conversation_history:
                             file_obj.write(f"{entry['role']}: {entry['content']}\n\n")
 
-                    PrettyOutput.print(f"所有对话已保存到 {file_path}", OutputType.SUCCESS)
+                    PrettyOutput.print(
+                        f"所有对话已保存到 {file_path}", OutputType.SUCCESS
+                    )
                 except Exception as exc:
-                    PrettyOutput.print(f"保存所有对话失败: {str(exc)}", OutputType.ERROR)
+                    PrettyOutput.print(
+                        f"保存所有对话失败: {str(exc)}", OutputType.ERROR
+                    )
                 continue
 
             # Check if it is a save_session command
@@ -211,7 +215,9 @@ def chat_with_model(platform_name: str, model_name: str, system_prompt: str) ->
                         file_path = file_path[1:-1]
 
                     if platform.save(file_path):
-                        PrettyOutput.print(f"会话已保存到 {file_path}", OutputType.SUCCESS)
+                        PrettyOutput.print(
+                            f"会话已保存到 {file_path}", OutputType.SUCCESS
+                        )
                     else:
                         PrettyOutput.print("保存会话失败", OutputType.ERROR)
                 except Exception as exc:
@@ -237,7 +243,9 @@ def chat_with_model(platform_name: str, model_name: str, system_prompt: str) ->
 
                     if platform.restore(file_path):
                         conversation_history = []  # Clear local history after loading
-                        PrettyOutput.print(f"会话已从 {file_path} 加载", OutputType.SUCCESS)
+                        PrettyOutput.print(
+                            f"会话已从 {file_path} 加载", OutputType.SUCCESS
+                        )
                     else:
                         PrettyOutput.print("加载会话失败", OutputType.ERROR)
                 except Exception as exc:
@@ -433,8 +441,12 @@ def main() -> None:
     service_parser.add_argument(
         "--port", type=int, default=8000, help="服务端口 (默认: 8000)"
     )
-    service_parser.add_argument("--platform", "-p", help="指定默认平台，当客户端未指定平台时使用")
-    service_parser.add_argument("--model", "-m", help="指定默认模型，当客户端未指定平台时使用")
+    service_parser.add_argument(
+        "--platform", "-p", help="指定默认平台，当客户端未指定平台时使用"
+    )
+    service_parser.add_argument(
+        "--model", "-m", help="指定默认模型，当客户端未指定平台时使用"
+    )
     service_parser.set_defaults(func=service_command)
 
     # role subcommand

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/jarvis_rag/llm_interface.py

@@ -101,9 +101,7 @@ class JarvisPlatform_LLM(LLMInterface):
         try:
             self.registry = PlatformRegistry.get_global_platform_registry()
             self.platform: BasePlatform = self.registry.get_normal_platform()
-            self.platform.set_suppress_output(
-                False
-            )  # 确保模型没有控制台输出
+            self.platform.set_suppress_output(False)  # 确保模型没有控制台输出
             print(f"🚀 已初始化 Jarvis 平台 LLM，模型: {self.platform.name()}")
         except Exception as e:
             print(f"❌ 初始化 Jarvis 平台 LLM 失败: {e}")

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/jarvis_smart_shell/main.py

@@ -20,34 +20,37 @@ def execute_command(command: str, should_run: bool) -> None:
 
 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
-    
+
     Returns:
         str: Path to fish config file
     """
     return os.path.expanduser("~/.config/fish/config.fish")
 
+
 def _get_markers() -> Tuple[str, str]:
     """Get start and end markers for JSS completion
-    
+
     Returns:
         Tuple[str, str]: (start_marker, end_marker)
     """
     return (
         "# ===== JARVIS JSS FISH COMPLETION START =====",
-        "# ===== JARVIS JSS FISH COMPLETION END ====="
+        "# ===== JARVIS JSS FISH COMPLETION END =====",
     )
 
+
 def install_jss_completion() -> int:
     """Install JSS fish shell command completion
-    
+
     Returns:
         int: 0 if success, 1 if failed
     """
@@ -70,7 +73,8 @@ def install_jss_completion() -> int:
         return 0
 
     with open(config_file, "a") as f:
-        f.write(f"""
+        f.write(
+            f"""
 {start_marker}
 function fish_command_not_found
     if test (string length "$argv") -lt 10
@@ -83,13 +87,15 @@ function __fish_command_not_found_handler --on-event fish_command_not_found
     fish_command_not_found "$argv"
 end
 {end_marker}
-""")
+"""
+        )
     print("JSS fish completion已安装，请执行: source ~/.config/fish/config.fish")
     return 0
 
+
 def uninstall_jss_completion() -> int:
     """Uninstall JSS fish shell command completion
-    
+
     Returns:
         int: 0 if success, 1 if failed
     """
@@ -112,10 +118,10 @@ def uninstall_jss_completion() -> int:
         return 0
 
     new_content = content.split(start_marker)[0] + content.split(end_marker)[-1]
-    
+
     with open(config_file, "w") as f:
         f.write(new_content)
-    
+
     print("JSS fish completion已卸载，请执行: source ~/.config/fish/config.fish")
     return 0
 
@@ -205,7 +211,7 @@ Example:
     install_parser.add_argument(
         "--shell", choices=["fish"], default="fish", help="指定shell类型(仅支持fish)"
     )
-    
+
     # 添加uninstall子命令
     uninstall_parser = subparsers.add_parser(
         "uninstall", help="卸载JSS fish shell命令补全功能"
@@ -232,7 +238,7 @@ Example:
             print(f"错误: 不支持的shell类型: {args.shell}, 仅支持fish")
             return 1
         return uninstall_jss_completion()
-        
+
     # 处理request命令
     if not args.request:
         # 检查是否在交互式终端中运行

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/jarvis_tools/ask_user.py

@@ -34,6 +34,7 @@ class AskUserTool:
 
             # 获取agent对象并重置工具调用计数
             agent = args["agent"]
+            agent.set_run_input_handlers_next_turn(True)
 
             # 显示问题给用户
             PrettyOutput.print(f"问题: {question}", OutputType.SYSTEM)

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/jarvis_tools/registry.py

@@ -565,7 +565,10 @@ class ToolRegistry(OutputHandlerProtocol):
             ot("TOOL_CALL") + r"(.*?)" + ct("TOOL_CALL"), content, re.DOTALL
         )
         if not data:
-            return {}, f"只有{ot('TOOL_CALL')}标签，未找到{ct('TOOL_CALL')}标签，调用格式错误，请检查工具调用格式。\n{tool_call_help}"
+            return (
+                {},
+                f"只有{ot('TOOL_CALL')}标签，未找到{ct('TOOL_CALL')}标签，调用格式错误，请检查工具调用格式。\n{tool_call_help}",
+            )
         ret = []
         for item in data:
             try:

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/jarvis_tools/search_web.py

@@ -3,7 +3,7 @@
 from typing import Any, Dict
 
 import httpx
-from bs4 import BeautifulSoup
+from markdownify import markdownify as md
 from ddgs import DDGS
 
 from jarvis.jarvis_agent import Agent
@@ -27,7 +27,7 @@ class SearchWebTool:
         """Performs a web search, scrapes content, and summarizes the results."""
         try:
             PrettyOutput.print("▶️ 使用 DuckDuckGo 开始网页搜索...", OutputType.INFO)
-            results = list(DDGS().text(query, max_results=5))
+            results = list(DDGS().text(query, max_results=50))
 
             if not results:
                 return {
@@ -36,19 +36,29 @@ class SearchWebTool:
                     "success": False,
                 }
 
-            urls = [r["href"] for r in results]
             full_content = ""
             visited_urls = []
+            visited_count = 0
+
+            for r in results:
+                if visited_count >= 10:
+                    PrettyOutput.print("ℹ️ 已成功获取10个网页，停止抓取。", OutputType.INFO)
+                    break
+
+                url = r["href"]
+                title = r.get("title", url)
 
-            for url in urls:
                 try:
-                    PrettyOutput.print(f"📄 正在抓取内容: {url}", OutputType.INFO)
+                    PrettyOutput.print(
+                        f"📄 ({visited_count + 1}/10) 正在抓取: {title} ({url})",
+                        OutputType.INFO,
+                    )
                     response = http_get(url, timeout=10.0, follow_redirects=True)
-                    soup = BeautifulSoup(response.text, "lxml")
-                    body = soup.find("body")
-                    if body:
-                        full_content += body.get_text(" ", strip=True) + "\n\n"
+                    content = md(response.text, strip=['script', 'style'])
+                    if content:
+                        full_content += content + "\n\n"
                         visited_urls.append(url)
+                        visited_count += 1
                 except httpx.HTTPStatusError as e:
                     PrettyOutput.print(
                         f"⚠️ HTTP错误 {e.response.status_code} 访问 {url}",

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/jarvis_utils/builtin_replace_map.py

@@ -29,7 +29,6 @@ arguments:
 """,
         "description": "网页搜索",
     },
-    
     "FindRelatedFiles": {
         "append": False,
         "template": f"""

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis/jarvis_utils/utils.py

@@ -129,6 +129,7 @@ def load_config():
                     PrettyOutput.print(
                         f"已生成默认配置文件: {config_file_path}", OutputType.INFO
                     )
+                    sys.exit(0)
                 except Exception as e:
                     PrettyOutput.print(f"生成默认配置文件失败: {e}", OutputType.ERROR)
     else:

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.224
+Version: 0.1.225
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -57,8 +57,8 @@ Requires-Dist: pyte==0.8.2
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: pyyaml>=5.3.1
 Requires-Dist: ddgs==9.0.2
-Requires-Dist: beautifulsoup4==4.13.4
 Requires-Dist: lxml==6.0.0
+Requires-Dist: markdownify>=1.1.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -158,6 +158,7 @@ jarvis --llm_type thinking -t "初始任务"
 | `-t/--task` | 直接从命令行输入任务内容 |
 | `-f/--config` | 自定义配置文件的路径 |
 | `--restore-session` | 从 .jarvis/saved_session.json 恢复会话 |
+| `-e/--edit` | 编辑配置文件 |
 
 #### 4. 工作流程
 1. 初始化环境

{jarvis_ai_assistant-0.1.224 → jarvis_ai_assistant-0.1.225}/src/jarvis_ai_assistant.egg-info/requires.txt

@@ -15,8 +15,8 @@ pyte==0.8.2
 httpx>=0.28.1
 pyyaml>=5.3.1
 ddgs==9.0.2
-beautifulsoup4==4.13.4
 lxml==6.0.0
+markdownify>=1.1.0
 
 [dev]
 pytest