jarvis-ai-assistant 0.3.14__py3-none-any.whl → 0.3.16__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/jarvis.py

@@ -10,6 +10,14 @@ 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 助手")
 
@@ -23,14 +31,18 @@ def run_cli(
         "--llm-type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
-    task: Optional[str] = typer.Option(None, "-T", "--task", help="从命令行直接输入任务内容"),
+    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="自定义配置文件路径"),
+    config_file: Optional[str] = typer.Option(
+        None, "-f", "--config", help="自定义配置文件路径"
+    ),
     restore_session: bool = typer.Option(
         False,
         "--restore-session",
@@ -40,7 +52,9 @@ def run_cli(
     share_methodology: bool = typer.Option(
         False, "--share-methodology", help="分享本地方法论到中心方法论仓库"
     ),
-    share_tool: bool = typer.Option(False, "--share-tool", help="分享本地工具到中心工具仓库"),
+    share_tool: bool = typer.Option(
+        False, "--share-tool", help="分享本地工具到中心工具仓库"
+    ),
 ) -> None:
     """Jarvis AI assistant command-line interface."""
     if ctx.invoked_subcommand is not None:
@@ -65,8 +79,186 @@ def run_cli(
         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)
+    init_env(
+        "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=config_file
+    )
 
     # 运行主流程
     try:

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/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()
@@ -233,18 +235,18 @@ class CodeAgent:
                 else:
                     print("ℹ️ .jarvis已在.gitignore中")
 
-    def _handle_git_changes(self) -> None:
+    def _handle_git_changes(self, prefix: str, suffix: str) -> None:
         """处理git仓库中的未提交修改"""
         print("🔄 正在检查未提交的修改...")
         if has_uncommitted_changes():
             print("⏳ 发现未提交修改，正在处理...")
             git_commiter = GitCommitTool()
-            git_commiter.execute({})
+            git_commiter.execute({"prefix": prefix, "suffix": suffix})
             print("✅ 未提交修改已处理完成")
         else:
             print("✅ 没有未提交的修改")
 
-    def _init_env(self) -> None:
+    def _init_env(self, prefix: str, suffix: str) -> None:
         """初始化环境，组合以下功能：
         1. 查找git根目录
         2. 检查并更新.gitignore文件
@@ -254,7 +256,7 @@ class CodeAgent:
         print("🚀 正在初始化环境...")
         git_dir = self._find_git_root()
         self._update_gitignore(git_dir)
-        self._handle_git_changes()
+        self._handle_git_changes(prefix, suffix)
         # 配置git对换行符变化不敏感
         self._configure_line_ending_settings()
         print("✅ 环境初始化完成")
@@ -473,7 +475,11 @@ class CodeAgent:
         return commits
 
     def _handle_commit_confirmation(
-        self, commits: List[Tuple[str, str]], start_commit: Optional[str]
+        self,
+        commits: List[Tuple[str, str]],
+        start_commit: Optional[str],
+        prefix: str,
+        suffix: str,
     ) -> None:
         """处理提交确认和可能的重置"""
         if commits and user_confirm("是否接受以上提交记录？", True):
@@ -489,7 +495,7 @@ class CodeAgent:
                 check=True,
             )
             git_commiter = GitCommitTool()
-            git_commiter.execute({})
+            git_commiter.execute({"prefix": prefix, "suffix": suffix})
 
             # 在用户接受commit后，根据配置决定是否保存记忆
             if self.agent.force_save_memory:
@@ -498,7 +504,7 @@ class CodeAgent:
             os.system(f"git reset --hard {str(start_commit)}")  # 确保转换为字符串
             PrettyOutput.print("已重置到初始提交", OutputType.INFO)
 
-    def run(self, user_input: str) -> Optional[str]:
+    def run(self, user_input: str, prefix: str = "", suffix: str = "") -> Optional[str]:
         """使用给定的用户输入运行代码代理。
 
         参数:
@@ -508,7 +514,7 @@ class CodeAgent:
             str: 描述执行结果的输出，成功时返回None
         """
         try:
-            self._init_env()
+            self._init_env(prefix, suffix)
             start_commit = get_latest_commit_hash()
 
             # 获取项目统计信息并附加到用户输入
@@ -557,7 +563,7 @@ class CodeAgent:
             self._handle_uncommitted_changes()
             end_commit = get_latest_commit_hash()
             commits = self._show_commit_history(start_commit, end_commit)
-            self._handle_commit_confirmation(commits, start_commit)
+            self._handle_commit_confirmation(commits, start_commit, prefix, suffix)
             return None
 
         except RuntimeError as e:
@@ -660,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="要处理的需求描述"
     ),
@@ -671,9 +683,22 @@ def cli(
         "--restore-session",
         help="从 .jarvis/saved_session.json 恢复会话状态",
     ),
+    prefix: str = typer.Option(
+        "",
+        "--prefix",
+        help="提交信息前缀（用空格分隔）",
+    ),
+    suffix: str = typer.Option(
+        "",
+        "--suffix",
+        help="提交信息后缀（用换行分隔）",
+    ),
 ) -> None:
     """Jarvis主入口点。"""
-    init_env("欢迎使用 Jarvis-CodeAgent，您的代码工程助手已准备就绪！")
+    init_env(
+        "欢迎使用 Jarvis-CodeAgent，您的代码工程助手已准备就绪！",
+        config_file=config_file,
+    )
 
     try:
         subprocess.run(
@@ -717,6 +742,7 @@ def cli(
             model_group=model_group,
             need_summary=False,
             append_tools=append_tools,
+            tool_group=tool_group,
         )
 
         # 尝试恢复会话
@@ -731,13 +757,13 @@ def cli(
                 )
 
         if requirement:
-            agent.run(requirement)
+            agent.run(requirement, prefix=prefix, suffix=suffix)
         else:
             while True:
                 user_input = get_multiline_input("请输入你的需求（输入空行退出）:")
                 if not user_input:
                     raise typer.Exit(code=0)
-                agent.run(user_input)
+                agent.run(user_input, prefix=prefix, suffix=suffix)
 
     except typer.Exit:
         raise

jarvis/jarvis_mcp/streamable_mcp_client.py

@@ -4,7 +4,7 @@ import threading
 from typing import Any, Callable, Dict, List
 from urllib.parse import urljoin
 
-import requests
+import requests  # type: ignore[import-untyped]
 
 from jarvis.jarvis_mcp import McpClient
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -25,6 +25,8 @@ class StreamableMcpClient(McpClient):
         self.base_url = config.get("base_url", "")
         if not self.base_url:
             raise ValueError("No base_url specified in config")
+        # Normalize base_url to ensure trailing slash for urljoin correctness
+        self.base_url = self.base_url.rstrip("/") + "/"
 
         # 设置HTTP客户端
         self.session = requests.Session()
@@ -43,6 +45,8 @@ class StreamableMcpClient(McpClient):
         # 添加额外的HTTP头
         extra_headers = config.get("headers", {})
         self.session.headers.update(extra_headers)
+        # Request timeouts (connect, read) in seconds; can be overridden via config["timeout"]
+        self.timeout = config.get("timeout", (10, 300))
 
         # 请求相关属性
         self.pending_requests: Dict[str, threading.Event] = {}  # 存储等待响应的请求 {id: Event}
@@ -141,7 +145,9 @@ class StreamableMcpClient(McpClient):
 
             # 发送请求到Streamable HTTP端点
             mcp_url = urljoin(self.base_url, "mcp")
-            response = self.session.post(mcp_url, json=request, stream=True)  # 启用流式传输
+            response = self.session.post(
+                mcp_url, json=request, stream=True, timeout=self.timeout
+            )  # 启用流式传输
             response.raise_for_status()
 
             # 处理流式响应
@@ -149,17 +155,21 @@ class StreamableMcpClient(McpClient):
             for line in response.iter_lines(decode_unicode=True):
                 if line:
                     try:
-                        data = json.loads(line)
+                        line_data = line
+                        if isinstance(line_data, str) and line_data.startswith("data:"):
+                            # Handle SSE-formatted lines like "data: {...}"
+                            line_data = line_data.split(":", 1)[1].strip()
+                        data = json.loads(line_data)
                         if "id" in data and data["id"] == req_id:
                             # 这是我们的请求响应
                             result = data
                             break
                         elif "method" in data:
                             # 这是一个通知
-                            method = data.get("method", "")
+                            notify_method = data.get("method", "")
                             params = data.get("params", {})
-                            if method in self.notification_handlers:
-                                for handler in self.notification_handlers[method]:
+                            if notify_method in self.notification_handlers:
+                                for handler in self.notification_handlers[notify_method]:
                                     try:
                                         handler(params)
                                     except Exception as e:
@@ -171,6 +181,8 @@ class StreamableMcpClient(McpClient):
                         PrettyOutput.print(f"无法解析响应: {line}", OutputType.WARNING)
                         continue
 
+            # Ensure response is closed after streaming
+            response.close()
             if result is None:
                 raise RuntimeError(f"未收到响应: {method}")
 
@@ -198,8 +210,9 @@ class StreamableMcpClient(McpClient):
 
             # 发送通知到Streamable HTTP端点
             mcp_url = urljoin(self.base_url, "mcp")
-            response = self.session.post(mcp_url, json=notification)
+            response = self.session.post(mcp_url, json=notification, timeout=self.timeout)
             response.raise_for_status()
+            response.close()
 
         except Exception as e:
             PrettyOutput.print(f"发送通知失败: {str(e)}", OutputType.ERROR)

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/jarvis_platform_manager/service.py

@@ -7,6 +7,7 @@ import asyncio
 import json
 import os
 import time
+import threading
 import uuid
 from datetime import datetime
 from typing import Any, Dict, List, Optional, Union
@@ -72,8 +73,16 @@ def start_service(
 ) -> None:
     """Start OpenAI-compatible API server."""
     # Create logs directory if it doesn't exist
-    logs_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "logs")
-    os.makedirs(logs_dir, exist_ok=True)
+    # Prefer environment variable, then user directory, fall back to CWD
+    logs_dir = os.environ.get("JARVIS_LOG_DIR")
+    if not logs_dir:
+        logs_dir = os.path.join(os.path.expanduser("~"), ".jarvis", "logs")
+    try:
+        os.makedirs(logs_dir, exist_ok=True)
+    except Exception:
+        # As a last resort, use current working directory
+        logs_dir = os.path.join(os.getcwd(), "logs")
+        os.makedirs(logs_dir, exist_ok=True)
 
     app = FastAPI(title="Jarvis API Server")
 
@@ -81,7 +90,7 @@ def start_service(
     app.add_middleware(
         CORSMiddleware,
         allow_origins=["*"],
-        allow_credentials=True,
+        allow_credentials=False,
         allow_methods=["*"],
         allow_headers=["*"],
     )
@@ -228,23 +237,23 @@ def start_service(
             "messages": [{"role": m.role, "content": m.content} for m in messages],
         }
 
-        # Log the conversation
-        log_conversation(
-            conversation_id,
-            [{"role": m.role, "content": m.content} for m in messages],
-            model,
-        )
+        # Logging moved to post-response to avoid duplicates
 
         if stream:
             # Return streaming response
             return StreamingResponse(
                 stream_chat_response(platform, message_text, model),  # type: ignore
                 media_type="text/event-stream",
+                headers={"Cache-Control": "no-cache", "Connection": "keep-alive"},
             )
 
         # Get chat response
         try:
-            response_text = platform.chat_until_success(message_text)
+            # Run potentially blocking call in a thread to avoid blocking the event loop
+            loop = asyncio.get_running_loop()
+            response_text = await loop.run_in_executor(
+                None, lambda: platform.chat_until_success(message_text)
+            )
 
             # Create response in OpenAI format
             completion_id = f"chatcmpl-{str(uuid.uuid4())}"
@@ -287,11 +296,31 @@ def start_service(
             raise HTTPException(status_code=500, detail=str(exc))
 
     async def stream_chat_response(platform: Any, message: str, model_name: str) -> Any:
-        """Stream chat response in OpenAI-compatible format."""
+        """Stream chat response in OpenAI-compatible format without blocking the event loop."""
         completion_id = f"chatcmpl-{str(uuid.uuid4())}"
         created_time = int(time.time())
         conversation_id = str(uuid.uuid4())
 
+        loop = asyncio.get_running_loop()
+        queue: asyncio.Queue = asyncio.Queue()
+        SENTINEL = object()
+
+        def producer() -> None:
+            try:
+                for chunk in platform.chat(message):
+                    if chunk:
+                        asyncio.run_coroutine_threadsafe(queue.put(chunk), loop)
+            except Exception as exc:
+                # Use a special dict to pass error across thread boundary
+                asyncio.run_coroutine_threadsafe(
+                    queue.put({"__error__": str(exc)}), loop
+                )
+            finally:
+                asyncio.run_coroutine_threadsafe(queue.put(SENTINEL), loop)
+
+        # Start producer thread
+        threading.Thread(target=producer, daemon=True).start()
+
         # Send the initial chunk with the role
         initial_data = {
             "id": completion_id,
@@ -304,36 +333,20 @@ def start_service(
         }
         yield f"data: {json.dumps(initial_data)}\n\n"
 
-        try:
-            # Use the streaming-capable chat method
-            response_generator = platform.chat(message)
-
-            full_response = ""
-            has_content = False
-
-            # Iterate over the generator and stream chunks
-            for chunk in response_generator:
-                if chunk:
-                    has_content = True
-                    full_response += chunk
-                    chunk_data = {
-                        "id": completion_id,
-                        "object": "chat.completion.chunk",
-                        "created": created_time,
-                        "model": model_name,
-                        "choices": [
-                            {
-                                "index": 0,
-                                "delta": {"content": chunk},
-                                "finish_reason": None,
-                            }
-                        ],
-                    }
-                    yield f"data: {json.dumps(chunk_data)}\n\n"
+        full_response = ""
+        has_content = False
+
+        while True:
+            item = await queue.get()
+            if item is SENTINEL:
+                break
+
+            if isinstance(item, dict) and "__error__" in item:
+                error_msg = f"Error during streaming: {item['__error__']}"
+                PrettyOutput.print(error_msg, OutputType.ERROR)
 
-            if not has_content:
-                no_response_message = "No response from model."
-                chunk_data = {
+                # Send error information in the stream
+                error_chunk = {
                     "id": completion_id,
                     "object": "chat.completion.chunk",
                     "created": created_time,
@@ -341,41 +354,45 @@ def start_service(
                     "choices": [
                         {
                             "index": 0,
-                            "delta": {"content": no_response_message},
-                            "finish_reason": None,
+                            "delta": {"content": error_msg},
+                            "finish_reason": "stop",
                         }
                     ],
                 }
-                yield f"data: {json.dumps(chunk_data)}\n\n"
-                full_response = no_response_message
+                yield f"data: {json.dumps(error_chunk)}\n\n"
+                yield "data: [DONE]\n\n"
+
+                # Log the error
+                log_conversation(
+                    conversation_id,
+                    [{"role": "user", "content": message}],
+                    model_name,
+                    response=f"ERROR: {error_msg}",
+                )
+                return
 
-            # Send the final chunk with finish_reason
-            final_data = {
+            # Normal chunk
+            chunk = item
+            has_content = True
+            full_response += chunk
+            chunk_data = {
                 "id": completion_id,
                 "object": "chat.completion.chunk",
                 "created": created_time,
                 "model": model_name,
-                "choices": [{"index": 0, "delta": {}, "finish_reason": "stop"}],
+                "choices": [
+                    {
+                        "index": 0,
+                        "delta": {"content": chunk},
+                        "finish_reason": None,
+                    }
+                ],
             }
-            yield f"data: {json.dumps(final_data)}\n\n"
+            yield f"data: {json.dumps(chunk_data)}\n\n"
 
-            # Send the [DONE] marker
-            yield "data: [DONE]\n\n"
-
-            # Log the full conversation
-            log_conversation(
-                conversation_id,
-                [{"role": "user", "content": message}],
-                model_name,
-                full_response,
-            )
-
-        except Exception as exc:
-            error_msg = f"Error during streaming: {str(exc)}"
-            PrettyOutput.print(error_msg, OutputType.ERROR)
-
-            # Send error information in the stream
-            error_chunk = {
+        if not has_content:
+            no_response_message = "No response from model."
+            chunk_data = {
                 "id": completion_id,
                 "object": "chat.completion.chunk",
                 "created": created_time,
@@ -383,21 +400,34 @@ def start_service(
                 "choices": [
                     {
                         "index": 0,
-                        "delta": {"content": error_msg},
-                        "finish_reason": "stop",
+                        "delta": {"content": no_response_message},
+                        "finish_reason": None,
                     }
                 ],
             }
-            yield f"data: {json.dumps(error_chunk)}\n\n"
-            yield "data: [DONE]\n\n"
+            yield f"data: {json.dumps(chunk_data)}\n\n"
+            full_response = no_response_message
 
-            # Log the error
-            log_conversation(
-                conversation_id,
-                [{"role": "user", "content": message}],
-                model_name,
-                response=f"ERROR: {error_msg}",
-            )
+        # Send the final chunk with finish_reason
+        final_data = {
+            "id": completion_id,
+            "object": "chat.completion.chunk",
+            "created": created_time,
+            "model": model_name,
+            "choices": [{"index": 0, "delta": {}, "finish_reason": "stop"}],
+        }
+        yield f"data: {json.dumps(final_data)}\n\n"
+
+        # Send the [DONE] marker
+        yield "data: [DONE]\n\n"
+
+        # Log the full conversation
+        log_conversation(
+            conversation_id,
+            [{"role": "user", "content": message}],
+            model_name,
+            full_response,
+        )
 
     # Run the server
     uvicorn.run(app, host=host, port=port)

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/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,9 +78,10 @@ arguments:
 {ot("TOOL_CALL")}
 want: 当前的git状态，期望获取xxx的提交记录
 name: execute_script
+
 arguments:
   interpreter: bash
-  script_cotent: |2
+  script_content: |2
     git status --porcelain
 {ct("TOOL_CALL")}
 </string_format>
@@ -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,9 @@ class ToolRegistry(OutputHandlerProtocol):
             content: 包含工具调用的内容
 
         返回:
-            List[Dict]: 包含名称和参数的提取工具调用列表
+            Tuple[Dict[str, Dict[str, Any]], str]:
+                - 第一个元素是提取的工具调用字典
+                - 第二个元素是错误消息字符串(成功时为"")
 
         异常:
             Exception: 如果工具调用缺少必要字段
@@ -706,6 +713,7 @@ class ToolRegistry(OutputHandlerProtocol):
         description: str,
         parameters: Any,
         func: Callable[..., Dict[str, Any]],
+        protocol_version: str = "1.0",
     ) -> None:
         """注册新工具
 
@@ -719,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]:
         """获取工具
@@ -740,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字段
@@ -761,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:
         """格式化工具输出为可读字符串
@@ -800,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)
@@ -817,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(
@@ -851,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.14.dist-info → jarvis_ai_assistant-0.3.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.14
+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.14.dist-info → jarvis_ai_assistant-0.3.16.dist-info}/RECORD

@@ -1,12 +1,12 @@
-jarvis/__init__.py,sha256=VWGr6Ejq9BZqFLJznrElHDghpbCaBnkgpyMgrmU4ysk,74
+jarvis/__init__.py,sha256=5JlEGGjW7DTnB2ahsKZhnkQHtdqbBlTqmnALZllbEWw,74
 jarvis/jarvis_agent/__init__.py,sha256=CkFa66l5lM0-_zlzApwBxTYbrnbC4_NqdD4QuK3H1VQ,32614
 jarvis/jarvis_agent/agent_manager.py,sha256=YzpMiF0H2-eyk2kn2o24Bkj3bXsQx7Pv2vfD4gWepo0,2893
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=wS-FqpT3pIXwHn1dfL3SpXonUKWgVThbQueUIeyRc2U,2917
 jarvis/jarvis_agent/config_editor.py,sha256=Ctk82sO6w2cNW0-_5L7Bomj-hgM4U7WwMc52fwhAJyg,1809
 jarvis/jarvis_agent/edit_file_handler.py,sha256=w-byNJ4TN_SlV3djjfFC7OksySOFGrM8ku49w662dzc,11854
 jarvis/jarvis_agent/file_methodology_manager.py,sha256=PwDUQwq7HVIyPInsN8fgWyMXLwi8heIXPrqfBZJhVHs,4260
-jarvis/jarvis_agent/jarvis.py,sha256=mE7sPQzuHtL9j8e_yDO91KfpbEqxrBrBG3px_WyWz50,3238
-jarvis/jarvis_agent/main.py,sha256=0xq-rjadcTedcB2HJSk2v0ihcm2-r2NXLj_Nq9xS9LY,3345
+jarvis/jarvis_agent/jarvis.py,sha256=wi5V-pIMoXuWMcd1JgZ9G912SHnbabrF6osAK-ClcDk,11524
+jarvis/jarvis_agent/main.py,sha256=Hu5u0mq0owuzt965IqaGP6TtVGFXHE4E4Tg1TzCtGYE,3552
 jarvis/jarvis_agent/memory_manager.py,sha256=F7HTNzdN1_-cSygnz7zKSJRJvPLUOosqcXQeiW8zG4U,5266
 jarvis/jarvis_agent/methodology_share_manager.py,sha256=vwWNexluTXSI3qeNP3zJAemOjWW37o_1AlqDR1C8wCI,6910
 jarvis/jarvis_agent/output_handler.py,sha256=P7oWpXBGFfOsWq7cIhS_z9crkQ19ES7qU5pM92KKjAs,1172
@@ -21,7 +21,7 @@ jarvis/jarvis_agent/task_manager.py,sha256=HJm4_SMpsFbQMUUsAZeHm7cZuhNbz28YW-DRL
 jarvis/jarvis_agent/tool_executor.py,sha256=k73cKhZEZpljvui4ZxALlFEIE-iLzJ32Softsmiwzqk,1896
 jarvis/jarvis_agent/tool_share_manager.py,sha256=R5ONIQlDXX9pFq3clwHFhEW8BAJ3ECaR2DqWCEC9tzM,5205
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=GPmCMlAERHC3yPy0LEv3ATdPsZm99MUz1XxcNB9_p2o,29972
+jarvis/jarvis_code_agent/code_agent.py,sha256=GhY79JRzyLeeNKxNJtgieO9UvqQl36S7W521ZyOwjMY,30967
 jarvis/jarvis_code_agent/lint.py,sha256=LZPsfyZPMo7Wm7LN4osZocuNJwZx1ojacO3MlF870x8,4009
 jarvis/jarvis_code_analysis/code_review.py,sha256=OLoMtXz7Kov6cVTdBoxq_OsX_j0rb7Rk3or5tKgiLpo,36023
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=LIXAYa1sW3l7foP6kohLWnE98I_EQ0T7z5bYKHq6rJA,78
@@ -52,12 +52,12 @@ jarvis/jarvis_git_utils/git_commiter.py,sha256=GpSnVa72b9yWoJBbK1Qp_Kb4iimwVW6K7
 jarvis/jarvis_mcp/__init__.py,sha256=OPMtjD-uq9xAaKCRIDyKIosaFfBe1GBPu1az-mQ0rVM,2048
 jarvis/jarvis_mcp/sse_mcp_client.py,sha256=neKrgFxwLDPWjVrl9uDt1ricNwbLZbv1ZEFh0IkmqZk,22656
 jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=APYUksYKlMx7AVNODKOLrTkKZPnp4kqTQIYIuNDDKko,11286
-jarvis/jarvis_mcp/streamable_mcp_client.py,sha256=sP0KEsxVcXGht0eA7a_m-ECtZAk39s4PL9OUdm35x2Y,14467
+jarvis/jarvis_mcp/streamable_mcp_client.py,sha256=P5keAhI7SsVjAq3nU9J7pp2Tk4pJDxjdPAb6ZcVPLEc,15279
 jarvis/jarvis_memory_organizer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_memory_organizer/memory_organizer.py,sha256=4tf6Bs8u6Drj4repvuY3-XeH2Sb6ajVMFcW-rQEiGEY,26502
 jarvis/jarvis_methodology/main.py,sha256=6QF8hH3vB6rfxim0fPR34uVPf41zVpb4ZLqrFN2qONg,10983
 jarvis/jarvis_multi_agent/__init__.py,sha256=kCgtAX7VvliyEOQxIj2DvNjRAuh6bpNaOtDn60nzph4,6089
-jarvis/jarvis_multi_agent/main.py,sha256=Wbarez48QxXexlKEOcRsoMbcQEOP5rv_DzGkNk0SfpY,1779
+jarvis/jarvis_multi_agent/main.py,sha256=b9IThFMeUZCYSlgT-VT8r7xeBdrEE_zNT11awEc8IdY,1853
 jarvis/jarvis_platform/__init__.py,sha256=WLQHSiE87PPket2M50_hHzjdMIgPIBx2VF8JfB_NNRk,105
 jarvis/jarvis_platform/ai8.py,sha256=W3947AGMpk3RRBfsfZmf222sEP0VIGoSU0vPkgiVnl0,11683
 jarvis/jarvis_platform/base.py,sha256=VyZhXgtGbUTrhXaDwA3kYUo03mfM-nNCYaTGgpY_TZQ,9365
@@ -69,7 +69,7 @@ jarvis/jarvis_platform/tongyi.py,sha256=KXEMfylTU91kHisXSaiz8dxzNXK_d7XD9vjuw4yX
 jarvis/jarvis_platform/yuanbao.py,sha256=32hjk1Ju1tqrMpF47JsSuaxej5K-gUPxjsDu9g0briY,23575
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_platform_manager/main.py,sha256=5k7D-tBsNjXPH07eO4f-0gwyUY7STGSNBSl1PbLq15A,20966
-jarvis/jarvis_platform_manager/service.py,sha256=myJYGSUclCEiRTf3JKs4JndwhXJeQj7MQQy4i13jMt0,13767
+jarvis/jarvis_platform_manager/service.py,sha256=DnuRJjD7RvunGt3LpMfUDr-Bps-Nb--frkeaC0nwxj0,14874
 jarvis/jarvis_rag/__init__.py,sha256=HRTXgnQxDuaE9x-e3r6SYqhJ5d4DSI_rrIxy2IGY6qk,320
 jarvis/jarvis_rag/cache.py,sha256=Tqx_Oe-AhuWlMXHGHUaIuG6OEHoHBVZq7mL3kldtFFU,2723
 jarvis/jarvis_rag/cli.py,sha256=bIQKibp8swJDyfFBXaiX5C20LHN_2W2knO2I-MQp58c,15620
@@ -88,7 +88,7 @@ jarvis/jarvis_stats/storage.py,sha256=MBQRxExIWdePXzY1EE8JAs1IEpMqamImpgjruqt_u9
 jarvis/jarvis_stats/visualizer.py,sha256=ZIBmGELzs6c7qM01tQql1HF6eFKn6HDGVQfKXRUUIY0,8529
 jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_tools/ask_user.py,sha256=M6DdLNryCE8y1JcdZHEifUgZkPUEPNKc-zDW5p0Mb1k,2029
-jarvis/jarvis_tools/base.py,sha256=kgDjh64HYr_ox_1FR7j52LsJ4B4W2wSqOejdtSBb2Fc,1413
+jarvis/jarvis_tools/base.py,sha256=tFZkRlbV_a-pbjM-ci9AYmXVJm__FXuzVWKbQEyz4Ao,1639
 jarvis/jarvis_tools/clear_memory.py,sha256=HQMK70UJhhDgPPHozGaTpYizzQblUzYRwPbvD1z3z6o,8730
 jarvis/jarvis_tools/edit_file.py,sha256=hM345E9rxS-EkqCZpwwizL6fmPdTadtB798tEO5Ce3g,10417
 jarvis/jarvis_tools/execute_script.py,sha256=gMarE5yCCSPU6Dp6HlcL2KT-2xCzR-1p-oQNlYOJK58,6157
@@ -97,7 +97,7 @@ jarvis/jarvis_tools/generate_new_tool.py,sha256=uaWKlDMGjetvvwKTj0_AVTdmd14IktRb
 jarvis/jarvis_tools/methodology.py,sha256=_K4GIDUodGEma3SvNRo7Qs5rliijgNespVLyAPN35JU,5233
 jarvis/jarvis_tools/read_code.py,sha256=EnI-R-5HyIQYhMD391nZWXHIuHHBF-OJIRE0QpLcPX4,6417
 jarvis/jarvis_tools/read_webpage.py,sha256=NmDUboVZd4CGHBPRFK6dp3uqVhuGopW1bOi3TcaLDF4,2092
-jarvis/jarvis_tools/registry.py,sha256=TtZ415LUMfWqfcgn3G5V4e3QLLU2ILNRatkP10U0Ypw,31047
+jarvis/jarvis_tools/registry.py,sha256=IJ2ExlNqje2hA9MgiGnd0SCyy0zqAhxuZ76s_98FGwU,32668
 jarvis/jarvis_tools/retrieve_memory.py,sha256=0UBZm4wQTXLTj5WHXR9fjsiIDQh-Z2UINVu8cJ12YYg,9488
 jarvis/jarvis_tools/rewrite_file.py,sha256=eG_WKg6cVAXmuGwUqlWkcuyay5S8DOzEi8vZCmX3O8w,7255
 jarvis/jarvis_tools/save_memory.py,sha256=DjeFb38OtK9Y_RpWYHz8vL72JdauXZTlc_Y0FUQBtiM,7486
@@ -119,9 +119,9 @@ jarvis/jarvis_utils/methodology.py,sha256=IIMU17WVSunsWXsnXROd4G77LxgYs4xEC_xm_0
 jarvis/jarvis_utils/output.py,sha256=QRLlKObQKT0KuRSeZRqYb7NlTQvsd1oZXZ41WxeWEuU,10894
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=LiVui9RMsbfUdzbvBBwbGNC4uniGnLp3LFsk7LXGrQE,47370
-jarvis_ai_assistant-0.3.14.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.3.14.dist-info/METADATA,sha256=jPFjzOOpjbCDOcVVwpNJCWax51_2VcfMRg3AnuGnbHo,18216
-jarvis_ai_assistant-0.3.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.3.14.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
-jarvis_ai_assistant-0.3.14.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.3.14.dist-info/RECORD,,
+jarvis_ai_assistant-0.3.16.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.3.16.dist-info/METADATA,sha256=wawbsyujbiRROXrHycIuMhIZsvp2hbt3UT5Mco3xPw4,18216
+jarvis_ai_assistant-0.3.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.3.16.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
+jarvis_ai_assistant-0.3.16.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.3.16.dist-info/RECORD,,