jarvis-ai-assistant 0.3.15__tar.gz → 0.3.16__tar.gz

{jarvis_ai_assistant-0.3.15/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.15
+Version: 0.3.16
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.3.15 → jarvis_ai_assistant-0.3.16}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.15"
+version = "0.3.16"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.3.15 → jarvis_ai_assistant-0.3.16}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.15",
+    version="0.3.16",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.3.15 → jarvis_ai_assistant-0.3.16}/src/jarvis/__init__.py

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

jarvis_ai_assistant-0.3.16/src/jarvis/jarvis_agent/jarvis.py

@@ -0,0 +1,286 @@
+# -*- coding: utf-8 -*-
+"""Jarvis AI 助手主入口模块"""
+from typing import Optional
+
+import typer
+
+from jarvis.jarvis_agent import OutputType, PrettyOutput
+from jarvis.jarvis_agent.agent_manager import AgentManager
+from jarvis.jarvis_agent.config_editor import ConfigEditor
+from jarvis.jarvis_agent.methodology_share_manager import MethodologyShareManager
+from jarvis.jarvis_agent.tool_share_manager import ToolShareManager
+from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.input import user_confirm, get_single_line_input
+import os
+import sys
+import subprocess
+from pathlib import Path
+import yaml  # type: ignore
+from rich.table import Table
+from rich.console import Console
+
+app = typer.Typer(help="Jarvis AI 助手")
+
+
+@app.callback(invoke_without_command=True)
+def run_cli(
+    ctx: typer.Context,
+    llm_type: str = typer.Option(
+        "normal",
+        "-t",
+        "--llm-type",
+        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
+    ),
+    task: Optional[str] = typer.Option(
+        None, "-T", "--task", help="从命令行直接输入任务内容"
+    ),
+    model_group: Optional[str] = typer.Option(
+        None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
+    tool_group: Optional[str] = typer.Option(
+        None, "-G", "--tool-group", help="使用的工具组，覆盖配置文件中的设置"
+    ),
+    config_file: Optional[str] = typer.Option(
+        None, "-f", "--config", help="自定义配置文件路径"
+    ),
+    restore_session: bool = typer.Option(
+        False,
+        "--restore-session",
+        help="从 .jarvis/saved_session.json 恢复会话",
+    ),
+    edit: bool = typer.Option(False, "-e", "--edit", help="编辑配置文件"),
+    share_methodology: bool = typer.Option(
+        False, "--share-methodology", help="分享本地方法论到中心方法论仓库"
+    ),
+    share_tool: bool = typer.Option(
+        False, "--share-tool", help="分享本地工具到中心工具仓库"
+    ),
+) -> None:
+    """Jarvis AI assistant command-line interface."""
+    if ctx.invoked_subcommand is not None:
+        return
+
+    # 处理配置文件编辑
+    if edit:
+        ConfigEditor.edit_config(config_file)
+        return
+
+    # 处理方法论分享
+    if share_methodology:
+        init_env("", config_file=config_file)  # 初始化配置但不显示欢迎信息
+        methodology_manager = MethodologyShareManager()
+        methodology_manager.run()
+        return
+
+    # 处理工具分享
+    if share_tool:
+        init_env("", config_file=config_file)  # 初始化配置但不显示欢迎信息
+        tool_manager = ToolShareManager()
+        tool_manager.run()
+        return
+
+    # 在初始化环境前检测Git仓库，并可选择自动切换到代码开发模式（jca）
+    try:
+        res = subprocess.run(
+            ["git", "rev-parse", "--show-toplevel"],
+            capture_output=True,
+            text=True,
+        )
+        if res.returncode == 0:
+            git_root = res.stdout.strip()
+            if git_root and os.path.isdir(git_root):
+                PrettyOutput.print(
+                    f"检测到当前位于 Git 仓库: {git_root}", OutputType.INFO
+                )
+                if user_confirm(
+                    "检测到Git仓库，是否切换到代码开发模式（jca）？", default=False
+                ):
+                    # 构建并切换到 jarvis-code-agent 命令，传递兼容参数
+                    args = ["jarvis-code-agent"]
+                    if llm_type:
+                        args += ["-t", llm_type]
+                    if model_group:
+                        args += ["-g", model_group]
+                    if tool_group:
+                        args += ["-G", tool_group]
+                    if config_file:
+                        args += ["-f", config_file]
+                    if restore_session:
+                        args += ["--restore-session"]
+                    if task:
+                        args += ["-r", task]
+                    PrettyOutput.print(
+                        "正在切换到 'jca'（jarvis-code-agent）以进入代码开发模式...",
+                        OutputType.INFO,
+                    )
+                    os.execvp(args[0], args)
+    except Exception:
+        # 静默忽略检测异常，不影响主流程
+        pass
+
+    # 在进入默认通用代理前，列出内置配置供选择（agent/multi_agent/roles）
+    try:
+        # 优先使用项目内置目录，若不存在则回退到指定的绝对路径
+        builtin_root = Path(__file__).resolve().parents[3] / "builtin"
+        if not builtin_root.exists():
+            builtin_root = Path("/home/skyfire/code/Jarvis/builtin")
+
+        categories = [
+            ("agent", "jarvis-agent", "*.yaml"),
+            ("multi_agent", "jarvis-multi-agent", "*.yaml"),
+            ("roles", "jarvis-platform-manager", "*.yaml"),
+        ]
+
+        options = []
+        for cat, cmd, pattern in categories:
+            dir_path = builtin_root / cat
+            if not dir_path.exists():
+                continue
+            for fpath in sorted(dir_path.glob(pattern)):
+                # 解析YAML以获取可读名称/描述（失败时静默降级为文件名）
+                name = fpath.stem
+                desc = ""
+                try:
+                    with open(fpath, "r", encoding="utf-8", errors="ignore") as fh:
+                        data = yaml.safe_load(fh) or {}
+                    if isinstance(data, dict):
+                        name = data.get("name") or data.get("title") or name
+                        desc = data.get("description") or data.get("desc") or ""
+                        if cat == "roles" and isinstance(data.get("roles"), list):
+                            if not desc:
+                                desc = f"{len(data['roles'])} 个角色"
+                except Exception:
+                    # 忽略解析错误，使用默认显示
+                    pass
+
+                # 为 roles 构建详细信息（每个角色的名称与描述）
+                details = ""
+                if cat == "roles":
+                    roles = (data or {}).get("roles", [])
+                    if isinstance(roles, list):
+                        lines = []
+                        for role in roles:
+                            if isinstance(role, dict):
+                                rname = str(role.get("name", "") or "")
+                                rdesc = str(role.get("description", "") or "")
+                                lines.append(f"{rname} - {rdesc}" if rdesc else rname)
+                        details = "\n".join([ln for ln in lines if ln])
+                    # 如果没有角色详情，退回到统计信息
+                    if not details and isinstance((data or {}).get("roles"), list):
+                        details = f"{len(data['roles'])} 个角色"
+
+                options.append(
+                    {
+                        "category": cat,
+                        "cmd": cmd,
+                        "file": str(fpath),
+                        "name": str(name),
+                        "desc": str(desc),
+                        "details": str(details),
+                    }
+                )
+
+        if options:
+            PrettyOutput.section("可用的内置配置", OutputType.SUCCESS)
+            # 使用 rich Table 呈现
+            table = Table(show_header=True, header_style="bold magenta")
+            table.add_column("No.", style="cyan", no_wrap=True)
+            table.add_column("类型", style="green", no_wrap=True)
+            table.add_column("名称", style="bold")
+            table.add_column("文件", style="dim")
+            table.add_column("描述/详情", style="white")
+
+            for idx, opt in enumerate(options, 1):
+                category = opt.get("category", "")
+                name = opt.get("name", "")
+                file_path = opt.get("file", "")
+                # multi_agent: 优先显示顶层描述
+                # roles: 显示每个角色名称与描述（多行）
+                # 其他：显示 desc
+                if category == "roles" and opt.get("details"):
+                    detail = opt["details"]
+                else:
+                    detail = opt.get("desc", "")
+
+                table.add_row(str(idx), category, name, file_path, detail)
+
+            Console().print(table)
+
+            choice = get_single_line_input(
+                "选择要启动的配置编号，直接回车使用默认通用代理(jvs): ", default=""
+            )
+
+            if choice.strip():
+                try:
+                    index = int(choice.strip())
+                    if 1 <= index <= len(options):
+                        sel = options[index - 1]
+                        args = []
+
+                        if sel["category"] == "agent":
+                            # jarvis-agent 支持 -f/--config（全局配置）与 -c/--agent-definition
+                            args = [sel["cmd"], "-c", sel["file"]]
+                            if llm_type:
+                                args += ["--llm-type", llm_type]
+                            if model_group:
+                                args += ["-g", model_group]
+                            if config_file:
+                                args += ["-f", config_file]
+                            if task:
+                                args += ["--task", task]
+
+                        elif sel["category"] == "multi_agent":
+                            # jarvis-multi-agent 需要 -c/--config，用户输入通过 -i/--input 传递
+                            args = [sel["cmd"], "-c", sel["file"]]
+                            if task:
+                                args += ["-i", task]
+
+                        elif sel["category"] == "roles":
+                            # jarvis-platform-manager role 子命令，支持 -c/-t/-g
+                            args = [sel["cmd"], "role", "-c", sel["file"]]
+                            if llm_type:
+                                args += ["-t", llm_type]
+                            if model_group:
+                                args += ["-g", model_group]
+
+                        if args:
+                            PrettyOutput.print(
+                                f"正在启动: {' '.join(args)}", OutputType.INFO
+                            )
+                            os.execvp(args[0], args)
+                except Exception:
+                    # 任何异常都不影响默认流程
+                    pass
+    except Exception:
+        # 静默忽略内置配置扫描错误，不影响主流程
+        pass
+
+    # 初始化环境
+    init_env(
+        "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=config_file
+    )
+
+    # 运行主流程
+    try:
+        agent_manager = AgentManager(
+            llm_type=llm_type,
+            model_group=model_group,
+            tool_group=tool_group,
+            restore_session=restore_session,
+        )
+        agent_manager.initialize()
+        agent_manager.run_task(task)
+    except typer.Exit:
+        raise
+    except Exception as err:  # pylint: disable=broad-except
+        PrettyOutput.print(f"初始化错误: {str(err)}", OutputType.ERROR)
+        raise typer.Exit(code=1)
+
+
+def main() -> None:
+    """Application entry point."""
+    app()
+
+
+if __name__ == "__main__":
+    main()

{jarvis_ai_assistant-0.3.15 → jarvis_ai_assistant-0.3.16}/src/jarvis/jarvis_agent/main.py

@@ -3,7 +3,7 @@ import os
 from typing import Optional
 
 import typer
-import yaml
+import yaml  # type: ignore[import-untyped]
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_utils.input import get_multiline_input
@@ -45,20 +45,22 @@ def cli(
     agent_definition: Optional[str] = typer.Option(
         None, "-c", "--agent-definition", help="代理定义文件路径"
     ),
-    task: Optional[str] = typer.Option(
-        None, "-t", "--task", help="初始任务内容"
-    ),
+    task: Optional[str] = typer.Option(None, "-T", "--task", help="初始任务内容"),
     llm_type: str = typer.Option(
         "normal",
-        "-t", "--llm-type",
+        "-t",
+        "--llm-type",
         help="使用的LLM类型，覆盖配置文件中的设置",
     ),
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
-    ),):
+    ),
+):
     """Main entry point for Jarvis agent"""
     # Initialize environment
-    init_env("欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=config_file)
+    init_env(
+        "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=config_file
+    )
 
     # Load configuration
     config = load_config(agent_definition) if agent_definition else {}
@@ -77,21 +79,27 @@ def cli(
         if task:
             PrettyOutput.print(f"执行初始任务: {task}", OutputType.INFO)
             agent.run(task)
-            raise typer.Exit(code=0)
+            return
 
         try:
             user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
             if not user_input:
-                raise typer.Exit(code=0)
+                return
             agent.set_addon_prompt(
                 "如果有必要，请先指定出行动计划，然后根据计划一步步执行，如果任务过于复杂，可以拆分子Agent进行执行，拆的子Agent需要掌握所有必要的任务信息，否则无法执行"
             )
             agent.run(user_input)
+        except KeyboardInterrupt:
+            # 用户主动取消输入，正常退出
+            return
+        except typer.Exit:
+            # 来自输入流程的正常退出
+            return
         except Exception as e:
             PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
 
     except typer.Exit:
-        raise
+        return
     except Exception as e:
         PrettyOutput.print(f"初始化错误: {str(e)}", OutputType.ERROR)
         raise typer.Exit(code=1)

{jarvis_ai_assistant-0.3.15 → jarvis_ai_assistant-0.3.16}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -52,8 +52,10 @@ class CodeAgent:
         model_group: Optional[str] = None,
         need_summary: bool = True,
         append_tools: Optional[str] = None,
+        tool_group: Optional[str] = None,
     ):
         self.root_dir = os.getcwd()
+        self.tool_group = tool_group
 
         # 检测 git username 和 email 是否已设置
         self._check_git_config()
@@ -239,10 +241,7 @@ class CodeAgent:
         if has_uncommitted_changes():
             print("⏳ 发现未提交修改，正在处理...")
             git_commiter = GitCommitTool()
-            git_commiter.execute({
-                "prefix": prefix,
-                "suffix": suffix
-            })
+            git_commiter.execute({"prefix": prefix, "suffix": suffix})
             print("✅ 未提交修改已处理完成")
         else:
             print("✅ 没有未提交的修改")
@@ -496,10 +495,7 @@ class CodeAgent:
                 check=True,
             )
             git_commiter = GitCommitTool()
-            git_commiter.execute({
-                "prefix": prefix,
-                "suffix": suffix
-            })
+            git_commiter.execute({"prefix": prefix, "suffix": suffix})
 
             # 在用户接受commit后，根据配置决定是否保存记忆
             if self.agent.force_save_memory:
@@ -670,6 +666,12 @@ def cli(
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
+    tool_group: Optional[str] = typer.Option(
+        None, "-G", "--tool-group", help="使用的工具组，覆盖配置文件中的设置"
+    ),
+    config_file: Optional[str] = typer.Option(
+        None, "-f", "--config", help="配置文件路径"
+    ),
     requirement: Optional[str] = typer.Option(
         None, "-r", "--requirement", help="要处理的需求描述"
     ),
@@ -693,7 +695,10 @@ def cli(
     ),
 ) -> None:
     """Jarvis主入口点。"""
-    init_env("欢迎使用 Jarvis-CodeAgent，您的代码工程助手已准备就绪！")
+    init_env(
+        "欢迎使用 Jarvis-CodeAgent，您的代码工程助手已准备就绪！",
+        config_file=config_file,
+    )
 
     try:
         subprocess.run(
@@ -737,6 +742,7 @@ def cli(
             model_group=model_group,
             need_summary=False,
             append_tools=append_tools,
+            tool_group=tool_group,
         )
 
         # 尝试恢复会话

{jarvis_ai_assistant-0.3.15 → jarvis_ai_assistant-0.3.16}/src/jarvis/jarvis_multi_agent/main.py

@@ -2,7 +2,7 @@
 from typing import Optional
 
 import typer
-import yaml
+import yaml  # type: ignore[import-untyped]
 
 from jarvis.jarvis_multi_agent import MultiAgent
 from jarvis.jarvis_utils.input import get_multiline_input
@@ -15,7 +15,9 @@ app = typer.Typer(help="多智能体系统启动器")
 @app.command()
 def cli(
     config: str = typer.Option(..., "--config", "-c", help="YAML配置文件路径"),
-    user_input: Optional[str] = typer.Option(None, "--input", "-i", help="用户输入（可选）"),
+    user_input: Optional[str] = typer.Option(
+        None, "--input", "-i", help="用户输入（可选）"
+    ),
 ):
     """从YAML配置文件初始化并运行多智能体系统"""
     init_env("欢迎使用 Jarvis-MultiAgent，您的多智能体系统已准备就绪！")
@@ -39,11 +41,13 @@ def cli(
             else get_multiline_input("请输入内容（输入空行结束）：")
         )
         if not final_input:
-            raise typer.Exit(code=0)
+            return
         multi_agent.run(final_input)
 
+    except KeyboardInterrupt:
+        return
     except typer.Exit:
-        raise
+        return
     except (ValueError, RuntimeError, yaml.YAMLError) as e:
         PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
         raise typer.Exit(code=1)

{jarvis_ai_assistant-0.3.15 → jarvis_ai_assistant-0.3.16}/src/jarvis/jarvis_tools/base.py

@@ -6,7 +6,14 @@ from typing import Any, Callable, Dict
 class Tool:
     """工具类，用于封装工具的基本信息和执行方法"""
 
-    def __init__(self, name: str, description: str, parameters: Dict, func: Callable):
+    def __init__(
+        self,
+        name: str,
+        description: str,
+        parameters: Dict,
+        func: Callable,
+        protocol_version: str = "1.0",
+    ):
         """
         初始化工具对象
 
@@ -15,11 +22,13 @@ class Tool:
             description (str): 工具描述
             parameters (Dict): 工具参数定义
             func (Callable): 工具执行函数
+            protocol_version (str): 工具协议版本，默认"1.0"；支持"1.0"或"2.0"
         """
         self.name = name
         self.description = description
         self.parameters = parameters
         self.func = func
+        self.protocol_version = protocol_version
 
     def to_dict(self) -> Dict:
         """将工具对象转换为字典格式，主要用于序列化"""

{jarvis_ai_assistant-0.3.15 → jarvis_ai_assistant-0.3.16}/src/jarvis/jarvis_tools/registry.py

@@ -7,7 +7,7 @@ import tempfile
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple
 
-import yaml
+import yaml  # type: ignore[import-untyped]
 
 from jarvis.jarvis_mcp import McpClient
 from jarvis.jarvis_mcp.sse_mcp_client import SSEMcpClient
@@ -32,6 +32,7 @@ tool_call_help = f"""
 {ot("TOOL_CALL")}
 want: 想要从执行结果中获取到的信息，如果工具输出内容过长，会根据此字段尝试提取有效信息
 name: 工具名称
+
 arguments:
   param1: 值1
   param2: 值2
@@ -77,6 +78,7 @@ arguments:
 {ot("TOOL_CALL")}
 want: 当前的git状态，期望获取xxx的提交记录
 name: execute_script
+
 arguments:
   interpreter: bash
   script_content: |2
@@ -595,6 +597,9 @@ class ToolRegistry(OutputHandlerProtocol):
                             description=tool_instance.description,
                             parameters=tool_instance.parameters,
                             func=tool_instance.execute,
+                            protocol_version=getattr(
+                                tool_instance, "protocol_version", "1.0"
+                            ),
                         )
                         tool_found = True
                         break
@@ -630,7 +635,7 @@ class ToolRegistry(OutputHandlerProtocol):
             content: 包含工具调用的内容
 
         返回:
-            Tuple[Dict[str, Dict[str, Any]], str]: 
+            Tuple[Dict[str, Dict[str, Any]], str]:
                 - 第一个元素是提取的工具调用字典
                 - 第二个元素是错误消息字符串(成功时为"")
 
@@ -708,6 +713,7 @@ class ToolRegistry(OutputHandlerProtocol):
         description: str,
         parameters: Any,
         func: Callable[..., Dict[str, Any]],
+        protocol_version: str = "1.0",
     ) -> None:
         """注册新工具
 
@@ -721,7 +727,7 @@ class ToolRegistry(OutputHandlerProtocol):
             PrettyOutput.print(
                 f"警告: 工具 '{name}' 已存在，将被覆盖", OutputType.WARNING
             )
-        self.tools[name] = Tool(name, description, parameters, func)
+        self.tools[name] = Tool(name, description, parameters, func, protocol_version)
 
     def get_tool(self, name: str) -> Optional[Tool]:
         """获取工具
@@ -742,12 +748,15 @@ class ToolRegistry(OutputHandlerProtocol):
         """
         return [tool.to_dict() for tool in self.tools.values()]
 
-    def execute_tool(self, name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
+    def execute_tool(
+        self, name: str, arguments: Dict[str, Any], agent: Optional[Any] = None
+    ) -> Dict[str, Any]:
         """执行指定工具
 
         参数:
             name: 工具名称
             arguments: 工具参数
+            agent: 智能体实例（由系统内部传递，用于v2.0分离agent与参数）
 
         返回:
             Dict[str, Any]: 包含执行结果的字典，包含success、stdout和stderr字段
@@ -763,7 +772,23 @@ class ToolRegistry(OutputHandlerProtocol):
         # 更新工具调用统计
         self._update_tool_stats(name)
 
-        return tool.execute(arguments)
+        # 根据工具实现声明的协议版本分发调用方式
+        try:
+            if getattr(tool, "protocol_version", "1.0") == "2.0":
+                # v2.0: agent与参数分离传递
+                return tool.func(arguments, agent)  # type: ignore[misc]
+            else:
+                # v1.0: 兼容旧实现，将agent注入到arguments（如果提供）
+                args_to_call = arguments.copy() if isinstance(arguments, dict) else {}
+                if agent is not None:
+                    args_to_call["agent"] = agent
+                return tool.execute(args_to_call)
+        except TypeError:
+            # 兼容处理：如果函数签名不匹配，回退到旧方式
+            args_to_call = arguments.copy() if isinstance(arguments, dict) else {}
+            if agent is not None:
+                args_to_call["agent"] = agent
+            return tool.execute(args_to_call)
 
     def _format_tool_output(self, stdout: str, stderr: str) -> str:
         """格式化工具输出为可读字符串
@@ -802,14 +827,14 @@ class ToolRegistry(OutputHandlerProtocol):
     def handle_tool_calls(self, tool_call: Dict[str, Any], agent: Any) -> str:
         try:
             name = tool_call["name"]  # 确保name是str类型
-            args = tool_call["arguments"]  # args已经是Dict[str, Any]
+            args = tool_call["arguments"]  # 原始参数（来自外部协议）
             want = tool_call["want"]
-            args["agent"] = agent
 
             from jarvis.jarvis_agent import Agent
 
             agent_instance: Agent = agent
 
+            # 如果args是字符串，尝试解析为JSON
             if isinstance(args, str):
                 try:
                     args = json.loads(args)
@@ -819,8 +844,8 @@ class ToolRegistry(OutputHandlerProtocol):
                     )
                     return ""
 
-            # 执行工具调用
-            result = self.execute_tool(name, args)  # 修正参数传递
+            # 执行工具调用（根据工具实现的协议版本，由系统在内部决定agent的传递方式）
+            result = self.execute_tool(name, args, agent)
 
             # 格式化输出
             output = self._format_tool_output(
@@ -853,8 +878,9 @@ class ToolRegistry(OutputHandlerProtocol):
                             [output_file]
                         )
                         if upload_success:
-                            # 删除args的agent键
-                            args.pop("agent", None)
+                            # 删除args的agent键（保持协议v2.0的“参数与agent分离”在可视化中的一致性）
+                            if isinstance(args, dict):
+                                args.pop("agent", None)
                             prompt = f"""
 以下是之前对话的关键信息总结：
 

{jarvis_ai_assistant-0.3.15 → jarvis_ai_assistant-0.3.16/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.15
+Version: 0.3.16
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire