jarvis-ai-assistant 0.1.225__py3-none-any.whl → 0.2.0__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -102,6 +102,7 @@ class Agent:
         name: str = "Jarvis",
         description: str = "",
         llm_type: str = "normal",
+        model_group: Optional[str] = None,
         summary_prompt: Optional[str] = None,
         auto_complete: bool = False,
         output_handler: List[OutputHandlerProtocol] = [],
@@ -137,11 +138,11 @@ class Agent:
         self.description = description
         # 初始化平台和模型
         if llm_type == "thinking":
-            platform_name = get_thinking_platform_name()
-            model_name = get_thinking_model_name()
+            platform_name = get_thinking_platform_name(model_group)
+            model_name = get_thinking_model_name(model_group)
         else:  # 默认为 normal
-            platform_name = get_normal_platform_name()
-            model_name = get_normal_model_name()
+            platform_name = get_normal_platform_name(model_group)
+            model_name = get_normal_model_name(model_group)
 
         self.model = PlatformRegistry().create_platform(platform_name)
         if self.model is None:
@@ -153,6 +154,8 @@ class Agent:
         if model_name:
             self.model.set_model_name(model_name)
 
+        self.model.set_model_group(model_group)
+
         self.user_data: Dict[str, Any] = {}
 
         self.model.set_suppress_output(False)
@@ -197,7 +200,7 @@ class Agent:
             summary_prompt if summary_prompt else DEFAULT_SUMMARY_PROMPT
         )
 
-        self.max_token_count = get_max_token_count()
+        self.max_token_count = get_max_token_count(model_group)
         self.auto_complete = auto_complete
         welcome_message = f"{name} 初始化完成 - 使用 {self.model.name()} 模型"
 

jarvis/jarvis_agent/jarvis.py

@@ -125,6 +125,11 @@ def _parse_args() -> argparse.Namespace:
         type=str,
         help="Directly input task content from command line",
     )
+    parser.add_argument(
+        "--model_group",
+        type=str,
+        help="Model group to use, overriding config",
+    )
     parser.add_argument("-f", "--config", type=str, help="Path to custom config file")
     parser.add_argument(
         "--restore-session",
@@ -170,6 +175,7 @@ def _initialize_agent(args: argparse.Namespace) -> Agent:
     agent = Agent(
         system_prompt=origin_agent_system_prompt,
         llm_type=args.llm_type,
+        model_group=args.model_group,
         input_handler=[shell_input_handler, builtin_input_handler],
         output_handler=[ToolRegistry()],  # type: ignore
         need_summary=False,

jarvis/jarvis_agent/main.py

@@ -52,6 +52,11 @@ def main():
         choices=["normal", "thinking"],
         help="LLM type to use, overriding config",
     )
+    parser.add_argument(
+        "--model_group",
+        type=str,
+        help="Model group to use, overriding config",
+    )
     args = parser.parse_args()
 
     # Initialize environment
@@ -65,6 +70,8 @@ def main():
     # Override config with command-line arguments if provided
     if args.llm_type:
         config["llm_type"] = args.llm_type
+    if args.model_group:
+        config["model_group"] = args.model_group
 
     # Create and run agent
     try:

jarvis/jarvis_code_agent/code_agent.py

@@ -47,6 +47,7 @@ class CodeAgent:
     def __init__(
         self,
         llm_type: str = "normal",
+        model_group: Optional[str] = None,
         need_summary: bool = True,
     ):
         self.root_dir = os.getcwd()
@@ -120,6 +121,7 @@ class CodeAgent:
             auto_complete=False,
             output_handler=[tool_registry, EditFileHandler()],  # type: ignore
             llm_type=llm_type,
+            model_group=model_group,
             input_handler=[shell_input_handler, builtin_input_handler],
             need_summary=need_summary,
             use_methodology=False,  # 禁用方法论
@@ -411,6 +413,11 @@ def main() -> None:
         choices=["normal", "thinking"],
         help="LLM type to use",
     )
+    parser.add_argument(
+        "--model_group",
+        type=str,
+        help="Model group to use, overriding config",
+    )
     parser.add_argument(
         "-r", "--requirement", type=str, help="Requirement to process", default=None
     )
@@ -427,7 +434,11 @@ def main() -> None:
     PrettyOutput.print(f"当前目录: {git_dir}", OutputType.INFO)
 
     try:
-        agent = CodeAgent(llm_type=args.llm_type, need_summary=False)
+        agent = CodeAgent(
+            llm_type=args.llm_type,
+            model_group=args.model_group,
+            need_summary=False,
+        )
 
         # 尝试恢复会话
         if args.restore_session:

jarvis/jarvis_code_analysis/code_review.py

@@ -3,12 +3,13 @@ import os
 import re
 import subprocess
 import tempfile
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_code_analysis.checklists.loader import get_language_checklist
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.read_code import ReadCodeTool
+from jarvis.jarvis_utils.globals import get_agent, current_agent_name
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import init_env, is_context_overflow
@@ -261,7 +262,9 @@ class CodeReviewTool:
         checklist = get_language_checklist(language)
         return checklist if checklist else ""
 
-    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
+    def execute(
+        self, args: Dict[str, Any], agent: Optional["Agent"] = None
+    ) -> Dict[str, Any]:
         try:
             review_type = args.get("review_type", "current").strip()
             root_dir = args.get("root_dir", ".")
@@ -570,9 +573,17 @@ class CodeReviewTool:
 
                 tool_registry = ToolRegistry()
                 tool_registry.dont_use_tools(["code_review"])
+                
+                # Use the provided agent's model_group or get it from globals
+                calling_agent = agent or get_agent(current_agent_name)
+                model_group = None
+                if calling_agent and hasattr(calling_agent, "model") and calling_agent.model:
+                    model_group = calling_agent.model.model_group
+
                 agent = Agent(
                     system_prompt=system_prompt,
                     name="Code Review Agent",
+                    model_group=model_group,
                     summary_prompt=f"""<code_review_report>
 <overview>
 # 整体评估
@@ -675,7 +686,7 @@ class CodeReviewTool:
 
                 try:
                     # Check if content is too large
-                    is_large_content = is_context_overflow(diff_output)
+                    is_large_content = is_context_overflow(diff_output, model_group)
 
                     # Upload the file to the agent's model
                     if is_large_content:

jarvis/jarvis_data/config_schema.json

@@ -141,6 +141,47 @@
       "description": "思考操作模型名称",
       "default": "deep_seek"
     },
+    "JARVIS_MODEL_GROUP": {
+      "type": "string",
+      "description": "选择一个预定义的模型组"
+    },
+    "JARVIS_MODEL_GROUPS": {
+      "type": "array",
+      "description": "预定义的模型配置组",
+      "items": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object",
+          "properties": {
+            "JARVIS_PLATFORM": {
+              "type": "string"
+            },
+            "JARVIS_MODEL": {
+              "type": "string"
+            },
+            "JARVIS_THINKING_PLATFORM": {
+              "type": "string"
+            },
+            "JARVIS_THINKING_MODEL": {
+              "type": "string"
+            },
+            "JARVIS_MAX_TOKEN_COUNT": {
+              "type": "number"
+            },
+            "JARVIS_MAX_INPUT_TOKEN_COUNT": {
+              "type": "number"
+            },
+            "JARVIS_MAX_BIG_CONTENT_SIZE": {
+              "type": "number"
+            }
+          },
+          "required": [
+            "JARVIS_PLATFORM",
+            "JARVIS_MODEL"
+          ]
+        }
+      }
+    },
     "JARVIS_EXECUTE_TOOL_CONFIRM": {
       "type": "boolean",
       "description": "执行工具前是否需要确认",

jarvis/jarvis_git_utils/git_commiter.py

@@ -16,6 +16,7 @@ from jarvis.jarvis_utils.git_utils import (
     find_git_root_and_cd,
     has_uncommitted_changes,
 )
+from jarvis.jarvis_utils.globals import get_agent, current_agent_name
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import init_env, is_context_overflow
@@ -162,11 +163,17 @@ commit信息
                 """
 
                 # 获取模型并尝试上传文件
-                platform = PlatformRegistry().get_normal_platform()
+                agent = get_agent(current_agent_name)
+                if agent:
+                    platform = agent.model
+                    model_group = agent.model.model_group
+                else:
+                    platform = PlatformRegistry().get_normal_platform()
+                    model_group = None
                 upload_success = False
 
                 # Check if content is too large
-                is_large_content = is_context_overflow(diff)
+                is_large_content = is_context_overflow(diff, model_group)
 
                 if is_large_content:
                     if not platform.support_upload_files():

jarvis/jarvis_mcp/sse_mcp_client.py

@@ -2,7 +2,7 @@
 import json
 import threading
 import time
-from typing import Any, Callable, Dict, List
+from typing import Any, Callable, Dict, List, Optional
 from urllib.parse import parse_qs, urlencode, urljoin
 
 import requests
@@ -46,10 +46,10 @@ class SSEMcpClient(McpClient):
         self.session.headers.update(extra_headers)
 
         # SSE相关属性
-        self.sse_response = None
-        self.sse_thread = None
-        self.messages_endpoint = None
-        self.session_id = None  # 从SSE连接获取的会话ID
+        self.sse_response: Optional[requests.Response] = None
+        self.sse_thread: Optional[threading.Thread] = None
+        self.messages_endpoint: Optional[str] = None
+        self.session_id: Optional[str] = None
         self.pending_requests = {}  # 存储等待响应的请求 {id: Event}
         self.request_results = {}  # 存储请求结果 {id: result}
         self.notification_handlers = {}
@@ -123,13 +123,15 @@ class SSEMcpClient(McpClient):
             self.sse_response = self.session.get(
                 sse_url, stream=True, headers=sse_headers, timeout=30
             )
-            self.sse_response.raise_for_status()
+            if self.sse_response:
+                self.sse_response.raise_for_status()
 
             # 启动事件处理线程
             self.sse_thread = threading.Thread(
                 target=self._process_sse_events, daemon=True
             )
-            self.sse_thread.start()
+            if self.sse_thread:
+                self.sse_thread.start()
 
         except Exception as e:
             PrettyOutput.print(f"SSE连接失败: {str(e)}", OutputType.ERROR)

jarvis/jarvis_mcp/stdio_mcp_client.py

@@ -2,7 +2,7 @@
 import json
 import os
 import subprocess
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 from jarvis.jarvis_mcp import McpClient
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -17,7 +17,7 @@ class StdioMcpClient(McpClient):
 
     def __init__(self, config: Dict[str, Any]):
         self.config = config
-        self.process = None
+        self.process: Optional[subprocess.Popen] = None
         self.protocol_version = "2025-03-26"  # MCP协议版本
         self._start_process()
         self._initialize()

jarvis/jarvis_platform/base.py

@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 import re
 from abc import ABC, abstractmethod
-from typing import Generator, List, Tuple
+from types import TracebackType
+from typing import Generator, List, Optional, Tuple, Type
+
+from typing_extensions import Self
 
 from rich import box  # type: ignore
 from rich.live import Live  # type: ignore
@@ -28,9 +31,19 @@ class BasePlatform(ABC):
         self.suppress_output = True  # 添加输出控制标志
         self.web = False  # 添加web属性，默认false
         self._saved = False
-
-    def __del__(self):
-        """Destroy model"""
+        self.model_group: Optional[str] = None
+
+    def __enter__(self) -> Self:
+        """Enter context manager"""
+        return self
+
+    def __exit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_val: Optional[BaseException],
+        exc_tb: Optional[TracebackType],
+    ) -> None:
+        """Exit context manager"""
         if not self._saved:
             self.delete_chat()
 
@@ -64,9 +77,11 @@ class BasePlatform(ABC):
 
         input_token_count = get_context_token_count(message)
 
-        if input_token_count > get_max_input_token_count():
-            max_chunk_size = get_max_input_token_count() - 1024  # 留出一些余量
-            min_chunk_size = get_max_input_token_count() - 2048
+        if input_token_count > get_max_input_token_count(self.model_group):
+            max_chunk_size = (
+                get_max_input_token_count(self.model_group) - 1024
+            )  # 留出一些余量
+            min_chunk_size = get_max_input_token_count(self.model_group) - 2048
             inputs = split_text_into_chunks(message, max_chunk_size, min_chunk_size)
             print("📤 正在提交长上下文...")
             prefix_prompt = f"""
@@ -95,14 +110,10 @@ class BasePlatform(ABC):
                 ):
                     response += trunk
 
-                print(
-                    f"📤 提交第{submit_count}部分完成，当前进度：{length}/{len(message)}"
-                )
+                print(f"📤 提交第{submit_count}部分完成，当前进度：{length}/{len(message)}")
             print("✅ 提交完成")
             response += "\n" + while_true(
-                lambda: while_success(
-                    lambda: self._chat("内容已经全部提供完毕，请根据内容继续"), 5
-                ),
+                lambda: while_success(lambda: self._chat("内容已经全部提供完毕，请根据内容继续"), 5),
                 5,
             )
         else:
@@ -233,6 +244,10 @@ class BasePlatform(ABC):
         """Set whether to suppress output"""
         self.suppress_output = suppress
 
+    def set_model_group(self, model_group: Optional[str]):
+        """Set model group"""
+        self.model_group = model_group
+
     def set_web(self, web: bool):
         """Set web flag"""
         self.web = web

jarvis/jarvis_tools/generate_new_tool.py

@@ -12,6 +12,7 @@ class generate_new_tool:
     生成并注册新的Jarvis工具。该工具会在用户数据目录下创建新的工具文件，
     并自动注册到当前的工具注册表中。适用场景：1. 需要创建新的自定义工具；
     2. 扩展Jarvis功能；3. 自动化重复性操作；4. 封装特定领域的功能。
+    重要提示：在编写工具代码时，应尽量将工具执行的过程和结果打印出来，方便追踪工具的执行状态。
     """
 
     parameters = {

jarvis/jarvis_tools/registry.py

@@ -17,7 +17,7 @@ from jarvis.jarvis_tools.base import Tool
 from jarvis.jarvis_utils.config import get_data_dir, get_tool_load_dirs
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
-from jarvis.jarvis_utils.utils import is_context_overflow
+from jarvis.jarvis_utils.utils import is_context_overflow, daily_check_git_updates
 
 tool_call_help = f"""
 <tool_system_guide>
@@ -124,7 +124,7 @@ class ToolRegistry(OutputHandlerProtocol):
         """加载工具"""
         tools = self.get_all_tools()
         if tools:
-            tools_prompt = "<tools_section>\n"
+            tools_prompt = f"{tool_call_help}\n<tools_section>\n"
             tools_prompt += "  <header>## 可用工具:</header>\n"
             tools_prompt += "  <tools_list>\n"
             for tool in tools:
@@ -287,16 +287,18 @@ class ToolRegistry(OutputHandlerProtocol):
 
     def _load_external_tools(self) -> None:
         """从jarvis_data/tools和配置的目录加载外部工具"""
-        tool_dirs = [Path(get_data_dir()) / "tools"] + [
-            Path(p) for p in get_tool_load_dirs()
-        ]
+        tool_dirs = [str(Path(get_data_dir()) / "tools")] + get_tool_load_dirs()
+
+        # --- 全局每日更新检查 ---
+        daily_check_git_updates(tool_dirs, "tools")
 
         for tool_dir in tool_dirs:
-            if not tool_dir.exists():
+            p_tool_dir = Path(tool_dir)
+            if not p_tool_dir.exists() or not p_tool_dir.is_dir():
                 continue
 
             # 遍历目录中的所有.py文件
-            for file_path in tool_dir.glob("*.py"):
+            for file_path in p_tool_dir.glob("*.py"):
                 # 跳过__init__.py
                 if file_path.name == "__init__.py":
                     continue
@@ -717,7 +719,10 @@ class ToolRegistry(OutputHandlerProtocol):
             )
 
             # 检查内容是否过大
-            is_large_content = is_context_overflow(output)
+            model_group = None
+            if agent_instance.model:
+                model_group = agent_instance.model.model_group
+            is_large_content = is_context_overflow(output, model_group)
 
             if is_large_content:
                 # 创建临时文件

jarvis/jarvis_utils/config.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
 from functools import lru_cache
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 import yaml  # type: ignore
 
@@ -76,24 +76,26 @@ def get_replace_map() -> dict:
         return {**BUILTIN_REPLACE_MAP, **file_map}
 
 
-def get_max_token_count() -> int:
+def get_max_token_count(model_group_override: Optional[str] = None) -> int:
     """
     获取模型允许的最大token数量。
 
     返回:
         int: 模型能处理的最大token数量。
     """
-    return int(GLOBAL_CONFIG_DATA.get("JARVIS_MAX_TOKEN_COUNT", "960000"))
+    config = _get_resolved_model_config(model_group_override)
+    return int(config.get("JARVIS_MAX_TOKEN_COUNT", "960000"))
 
 
-def get_max_input_token_count() -> int:
+def get_max_input_token_count(model_group_override: Optional[str] = None) -> int:
     """
     获取模型允许的最大输入token数量。
 
     返回:
         int: 模型能处理的最大输入token数量。
     """
-    return int(GLOBAL_CONFIG_DATA.get("JARVIS_MAX_INPUT_TOKEN_COUNT", "32000"))
+    config = _get_resolved_model_config(model_group_override)
+    return int(config.get("JARVIS_MAX_INPUT_TOKEN_COUNT", "32000"))
 
 
 def get_shell_name() -> str:
@@ -113,48 +115,94 @@ def get_shell_name() -> str:
     return os.path.basename(shell_path).lower()
 
 
-def get_normal_platform_name() -> str:
+def _get_resolved_model_config(model_group_override: Optional[str] = None) -> Dict[str, Any]:
+    """
+    解析并合并模型配置，处理模型组。
+
+    优先级顺序:
+    1. 单独的环境变量 (JARVIS_PLATFORM, JARVIS_MODEL, etc.)
+    2. JARVIS_MODEL_GROUP 中定义的组配置
+    3. 代码中的默认值
+
+    返回:
+        Dict[str, Any]: 解析后的模型配置字典
+    """
+    group_config = {}
+    model_group_name = model_group_override or GLOBAL_CONFIG_DATA.get("JARVIS_MODEL_GROUP")
+    # The format is a list of single-key dicts: [{'group_name': {...}}, ...]
+    model_groups = GLOBAL_CONFIG_DATA.get("JARVIS_MODEL_GROUPS", [])
+
+    if model_group_name and isinstance(model_groups, list):
+        for group_item in model_groups:
+            if isinstance(group_item, dict) and model_group_name in group_item:
+                group_config = group_item[model_group_name]
+                break
+
+    # Start with group config
+    resolved_config = group_config.copy()
+
+    # Override with specific settings from GLOBAL_CONFIG_DATA
+    for key in [
+        "JARVIS_PLATFORM",
+        "JARVIS_MODEL",
+        "JARVIS_THINKING_PLATFORM",
+        "JARVIS_THINKING_MODEL",
+        "JARVIS_MAX_TOKEN_COUNT",
+        "JARVIS_MAX_INPUT_TOKEN_COUNT",
+        "JARVIS_MAX_BIG_CONTENT_SIZE",
+    ]:
+        if key in GLOBAL_CONFIG_DATA:
+            resolved_config[key] = GLOBAL_CONFIG_DATA[key]
+
+    return resolved_config
+
+
+def get_normal_platform_name(model_group_override: Optional[str] = None) -> str:
     """
     获取正常操作的平台名称。
 
     返回：
         str: 平台名称，默认为'yuanbao'
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_PLATFORM", "yuanbao")
+    config = _get_resolved_model_config(model_group_override)
+    return config.get("JARVIS_PLATFORM", "yuanbao")
 
 
-def get_normal_model_name() -> str:
+def get_normal_model_name(model_group_override: Optional[str] = None) -> str:
     """
     获取正常操作的模型名称。
 
     返回：
-        str: 模型名称，默认为'deep_seek'
+        str: 模型名称，默认为'deep_seek_v3'
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_MODEL", "deep_seek_v3")
+    config = _get_resolved_model_config(model_group_override)
+    return config.get("JARVIS_MODEL", "deep_seek_v3")
 
 
-def get_thinking_platform_name() -> str:
+def get_thinking_platform_name(model_group_override: Optional[str] = None) -> str:
     """
     获取思考操作的平台名称。
 
     返回：
-        str: 平台名称，默认为'yuanbao'
+        str: 平台名称，默认为正常操作平台
     """
-    return GLOBAL_CONFIG_DATA.get(
-        "JARVIS_THINKING_PLATFORM", GLOBAL_CONFIG_DATA.get("JARVIS_PLATFORM", "yuanbao")
+    config = _get_resolved_model_config(model_group_override)
+    # Fallback to normal platform if thinking platform is not specified
+    return config.get(
+        "JARVIS_THINKING_PLATFORM", get_normal_platform_name(model_group_override)
     )
 
 
-def get_thinking_model_name() -> str:
+def get_thinking_model_name(model_group_override: Optional[str] = None) -> str:
     """
     获取思考操作的模型名称。
 
     返回：
-        str: 模型名称，默认为'deep_seek'
+        str: 模型名称，默认为正常操作模型
     """
-    return GLOBAL_CONFIG_DATA.get(
-        "JARVIS_THINKING_MODEL", GLOBAL_CONFIG_DATA.get("JARVIS_MODEL", "deep_seek")
-    )
+    config = _get_resolved_model_config(model_group_override)
+    # Fallback to normal model if thinking model is not specified
+    return config.get("JARVIS_THINKING_MODEL", get_normal_model_name(model_group_override))
 
 
 def is_execute_tool_confirm() -> bool:
@@ -190,14 +238,15 @@ def get_data_dir() -> str:
     )
 
 
-def get_max_big_content_size() -> int:
+def get_max_big_content_size(model_group_override: Optional[str] = None) -> int:
     """
     获取最大大内容大小。
 
     返回：
         int: 最大大内容大小
     """
-    return int(GLOBAL_CONFIG_DATA.get("JARVIS_MAX_BIG_CONTENT_SIZE", "160000"))
+    config = _get_resolved_model_config(model_group_override)
+    return int(config.get("JARVIS_MAX_BIG_CONTENT_SIZE", "160000"))
 
 
 def get_pretty_output() -> bool:
@@ -240,6 +289,16 @@ def get_tool_load_dirs() -> List[str]:
     return GLOBAL_CONFIG_DATA.get("JARVIS_TOOL_LOAD_DIRS", [])
 
 
+def get_methodology_dirs() -> List[str]:
+    """
+    获取方法论加载目录。
+
+    返回:
+        List[str]: 方法论加载目录列表
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_METHODOLOGY_DIRS", [])
+
+
 def is_print_prompt() -> bool:
     """
     获取是否打印提示。

jarvis/jarvis_utils/git_utils.py

@@ -538,12 +538,12 @@ def get_recent_commits_with_files() -> List[Dict[str, Any]]:
             return []
 
         # 解析提交信息
-        commits = []
+        commits: List[Dict[str, Any]] = []
         lines = result.stdout.splitlines()
         for i in range(0, len(lines), 4):
             if i + 3 >= len(lines):
                 break
-            commit = {
+            commit: Dict[str, Any] = {
                 "hash": lines[i],
                 "message": lines[i + 1],
                 "author": lines[i + 2],

jarvis/jarvis_utils/globals.py

@@ -11,7 +11,7 @@ import os
 
 # 全局变量：保存最后一条消息
 last_message: str = ""
-from typing import Any, Set
+from typing import Any, Dict, Set
 
 import colorama
 from rich.console import Console
@@ -22,7 +22,7 @@ colorama.init()
 # 禁用tokenizers并行以避免多进程问题
 os.environ["TOKENIZERS_PARALLELISM"] = "false"
 # 全局代理管理
-global_agents: Set[str] = set()
+global_agents: Dict[str, Any] = {}
 current_agent_name: str = ""
 # 表示与大模型交互的深度(>0表示正在交互)
 g_in_chat: int = 0
@@ -66,6 +66,19 @@ def make_agent_name(agent_name: str) -> str:
     return agent_name
 
 
+def get_agent(agent_name: str) -> Any:
+    """
+    获取指定名称的代理实例。
+
+    参数：
+        agent_name: 代理名称
+
+    返回：
+        Any: 代理实例，如果不存在则返回None
+    """
+    return global_agents.get(agent_name)
+
+
 def set_agent(agent_name: str, agent: Any) -> None:
     """
     设置当前代理并将其添加到全局代理集合中。
@@ -74,7 +87,7 @@ def set_agent(agent_name: str, agent: Any) -> None:
         agent_name: 代理名称
         agent: 代理对象
     """
-    global_agents.add(agent_name)
+    global_agents[agent_name] = agent
     global current_agent_name
     current_agent_name = agent_name
 
@@ -101,7 +114,7 @@ def delete_agent(agent_name: str) -> None:
         agent_name: 要删除的代理名称
     """
     if agent_name in global_agents:
-        global_agents.remove(agent_name)
+        del global_agents[agent_name]
         global current_agent_name
         current_agent_name = ""
 
@@ -173,10 +186,3 @@ def get_last_message() -> str:
         str: 最后一条消息
     """
     return last_message
-    """
-    获取当前中断信号状态。
-
-    返回:
-        int: 当前中断计数
-    """
-    return g_interrupt

jarvis/jarvis_utils/methodology.py

@@ -10,14 +10,15 @@
 import json
 import os
 import tempfile
+from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.config import get_data_dir
+from jarvis.jarvis_utils.config import get_data_dir, get_methodology_dirs
+from jarvis.jarvis_utils.globals import get_agent, current_agent_name
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import is_context_overflow
-
+from jarvis.jarvis_utils.utils import is_context_overflow, daily_check_git_updates
 
 def _get_methodology_directory() -> str:
     """
@@ -37,32 +38,39 @@ def _get_methodology_directory() -> str:
 
 def _load_all_methodologies() -> Dict[str, str]:
     """
-    加载所有方法论文件
+    从默认目录和配置的外部目录加载所有方法论文件。
 
     返回：
-        Dict[str, str]: 方法论字典，键为问题类型，值为方法论内容
+        Dict[str, str]: 方法论字典，键为问题类型，值为方法论内容。
     """
-    methodology_dir = _get_methodology_directory()
     all_methodologies = {}
+    methodology_dirs = [_get_methodology_directory()] + get_methodology_dirs()
 
-    if not os.path.exists(methodology_dir):
-        return all_methodologies
+    # --- 全局每日更新检查 ---
+    daily_check_git_updates(methodology_dirs, "methodologies")
 
     import glob
 
-    for filepath in glob.glob(os.path.join(methodology_dir, "*.json")):
-        try:
-            with open(filepath, "r", encoding="utf-8", errors="ignore") as f:
-                methodology = json.load(f)
-                problem_type = methodology.get("problem_type", "")
-                content = methodology.get("content", "")
-                if problem_type and content:
-                    all_methodologies[problem_type] = content
-        except Exception as e:
-            filename = os.path.basename(filepath)
-            PrettyOutput.print(
-                f"加载方法论文件 {filename} 失败: {str(e)}", OutputType.WARNING
-            )
+    for directory in set(methodology_dirs):  # Use set to avoid duplicates
+        if not os.path.isdir(directory):
+            PrettyOutput.print(f"警告: 方法论目录不存在或不是一个目录: {directory}", OutputType.WARNING)
+            continue
+
+        for filepath in glob.glob(os.path.join(directory, "*.json")):
+            try:
+                with open(filepath, "r", encoding="utf-8", errors="ignore") as f:
+                    methodology = json.load(f)
+                    problem_type = methodology.get("problem_type", "")
+                    content = methodology.get("content", "")
+                    if problem_type and content:
+                        if problem_type in all_methodologies:
+                            PrettyOutput.print(f"警告: 方法论 '{problem_type}' 被 '{filepath}' 覆盖。", OutputType.WARNING)
+                        all_methodologies[problem_type] = content
+            except Exception as e:
+                filename = os.path.basename(filepath)
+                PrettyOutput.print(
+                    f"加载方法论文件 {filename} 失败: {str(e)}", OutputType.WARNING
+                )
 
     return all_methodologies
 
@@ -163,7 +171,13 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
         print(f"✅ 加载方法论文件完成 (共 {len(methodologies)} 个)")
 
         # 获取当前平台
-        platform = PlatformRegistry().get_normal_platform()
+        agent = get_agent(current_agent_name)
+        if agent:
+            platform = agent.model
+            model_group = agent.model.model_group
+        else:
+            platform = PlatformRegistry().get_normal_platform()
+            model_group = None
         platform.set_suppress_output(False)
         if not platform:
             return ""
@@ -198,7 +212,7 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
 """
 
         # 检查内容是否过大
-        is_large_content = is_context_overflow(full_content)
+        is_large_content = is_context_overflow(full_content, model_group)
         temp_file_path = None
 
         try:

jarvis/jarvis_utils/output.py

@@ -10,7 +10,7 @@
 """
 from datetime import datetime
 from enum import Enum
-from typing import Optional, Tuple
+from typing import Dict, Optional, Tuple, Any
 
 from pygments.lexers import guess_lexer
 from pygments.util import ClassNotFound
@@ -175,7 +175,7 @@ class PrettyOutput:
             lang: 语法高亮的语言
             traceback: 是否显示错误的回溯信息
         """
-        styles = {
+        styles: Dict[OutputType, Dict[str, Any]] = {
             OutputType.SYSTEM: dict(bgcolor="#1e2b3c"),
             OutputType.CODE: dict(bgcolor="#1c2b1c"),
             OutputType.RESULT: dict(bgcolor="#1c1c2b"),

jarvis/jarvis_utils/utils.py

@@ -7,7 +7,8 @@ import subprocess
 import sys
 import time
 from pathlib import Path
-from typing import Any, Callable, Dict, Optional
+from typing import Any, Callable, Dict, List, Optional
+from datetime import datetime
 
 import yaml  # type: ignore
 
@@ -416,9 +417,13 @@ def count_cmd_usage() -> None:
     _update_cmd_stats(sys.argv[0])
 
 
-def is_context_overflow(content: str) -> bool:
+def is_context_overflow(
+    content: str, model_group_override: Optional[str] = None
+) -> bool:
     """判断文件内容是否超出上下文限制"""
-    return get_context_token_count(content) > get_max_big_content_size()
+    return get_context_token_count(content) > get_max_big_content_size(
+        model_group_override
+    )
 
 
 def get_loc_stats() -> str:
@@ -475,3 +480,132 @@ def copy_to_clipboard(text: str) -> None:
         )
     except Exception as e:
         PrettyOutput.print(f"使用xclip时出错: {e}", OutputType.WARNING)
+
+
+def _pull_git_repo(repo_path: Path, repo_type: str):
+    """对指定的git仓库执行git pull操作，并根据commit hash判断是否有更新。"""
+    git_dir = repo_path / ".git"
+    if not git_dir.is_dir():
+        return
+
+    PrettyOutput.print(f"正在更新{repo_type}库 '{repo_path.name}'...", OutputType.INFO)
+    try:
+        # 检查是否有远程仓库
+        remote_result = subprocess.run(
+            ["git", "remote"],
+            cwd=repo_path,
+            capture_output=True,
+            text=True,
+            check=True,
+            timeout=10,
+        )
+        if not remote_result.stdout.strip():
+            PrettyOutput.print(
+                f"'{repo_path.name}' 未配置远程仓库，跳过更新。",
+                OutputType.INFO,
+            )
+            return
+
+        # 检查git仓库状态
+        status_result = subprocess.run(
+            ["git", "status", "--porcelain"],
+            cwd=repo_path,
+            capture_output=True,
+            text=True,
+            check=True,
+            timeout=10,
+        )
+        if status_result.stdout:
+            PrettyOutput.print(
+                f"检测到 '{repo_path.name}' 存在未提交的更改，跳过自动更新。",
+                OutputType.WARNING,
+            )
+            return
+
+        # 获取更新前的commit hash
+        before_hash_result = subprocess.run(
+            ["git", "rev-parse", "HEAD"],
+            cwd=repo_path,
+            capture_output=True,
+            text=True,
+            check=True,
+            timeout=10,
+        )
+        before_hash = before_hash_result.stdout.strip()
+
+        # 执行 git pull
+        pull_result = subprocess.run(
+            ["git", "pull"],
+            cwd=repo_path,
+            capture_output=True,
+            text=True,
+            check=True,
+            timeout=60,
+        )
+
+        # 获取更新后的commit hash
+        after_hash_result = subprocess.run(
+            ["git", "rev-parse", "HEAD"],
+            cwd=repo_path,
+            capture_output=True,
+            text=True,
+            check=True,
+            timeout=10,
+        )
+        after_hash = after_hash_result.stdout.strip()
+
+        if before_hash != after_hash:
+            PrettyOutput.print(f"{repo_type}库 '{repo_path.name}' 已更新。", OutputType.SUCCESS)
+            if pull_result.stdout.strip():
+                PrettyOutput.print(pull_result.stdout.strip(), OutputType.INFO)
+        else:
+            PrettyOutput.print(f"{repo_type}库 '{repo_path.name}' 已是最新版本。", OutputType.INFO)
+
+    except FileNotFoundError:
+        PrettyOutput.print(
+            f"git 命令未找到，跳过更新 '{repo_path.name}'。", OutputType.WARNING
+        )
+    except subprocess.TimeoutExpired:
+        PrettyOutput.print(f"更新 '{repo_path.name}' 超时。", OutputType.ERROR)
+    except subprocess.CalledProcessError as e:
+        error_message = e.stderr.strip() if e.stderr else str(e)
+        PrettyOutput.print(
+            f"更新 '{repo_path.name}' 失败: {error_message}", OutputType.ERROR
+        )
+    except Exception as e:
+        PrettyOutput.print(
+            f"更新 '{repo_path.name}' 时发生未知错误: {str(e)}", OutputType.ERROR
+        )
+
+
+def daily_check_git_updates(repo_dirs: List[str], repo_type: str):
+    """
+    对指定的目录列表执行每日一次的git更新检查。
+
+    Args:
+        repo_dirs (List[str]): 需要检查的git仓库目录列表。
+        repo_type (str): 仓库的类型名称，例如 "工具" 或 "方法论"，用于日志输出。
+    """
+    data_dir = Path(get_data_dir())
+    last_check_file = data_dir / f"{repo_type}_updates_last_check.txt"
+    should_check_for_updates = True
+
+    if last_check_file.exists():
+        try:
+            last_check_timestamp = float(last_check_file.read_text())
+            last_check_date = datetime.fromtimestamp(last_check_timestamp).date()
+            if last_check_date == datetime.now().date():
+                should_check_for_updates = False
+        except (ValueError, IOError):
+            pass
+
+    if should_check_for_updates:
+        PrettyOutput.print(f"执行每日{repo_type}库更新检查...", OutputType.INFO)
+        for repo_dir in repo_dirs:
+            p_repo_dir = Path(repo_dir)
+            if p_repo_dir.exists() and p_repo_dir.is_dir():
+                _pull_git_repo(p_repo_dir, repo_type)
+        try:
+            last_check_file.write_text(str(time.time()))
+        except IOError as e:
+            PrettyOutput.print(f"无法写入git更新检查时间戳: {e}", OutputType.WARNING)

{jarvis_ai_assistant-0.1.225.dist-info → jarvis_ai_assistant-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.225
+Version: 0.2.0
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -508,9 +508,9 @@ ENV:
 #### Kimi
 ```yaml
 JARVIS_PLATFORM: kimi
-JARVIS_MODEL: kimi
+JARVIS_MODEL: k1.5
 JARVIS_THINKING_PLATFORM: kimi
-JARVIS_THINKING_MODEL: k1
+JARVIS_THINKING_MODEL: k1.5-thinking
 ENV:
   KIMI_API_KEY: <Kimi API KEY>
 ```
@@ -535,19 +535,55 @@ OPENAI_API_KEY: <OpenAI API Key>
 OPENAI_API_BASE: https://api.openai.com/v1
 ```
 
-### 2. 配置项说明
+### 2. 模型组配置 (高级)
+
+除了单独配置每个模型参数，您还可以定义和使用**模型组**来快速切换不同的模型组合。这对于需要在不同任务或平台间频繁切换的场景非常有用。
+
+**配置示例** (`~/.jarvis/config.yaml`):
+
+```yaml
+# 定义模型组
+JARVIS_MODEL_GROUPS:
+  - kimi:
+      JARVIS_PLATFORM: kimi
+      JARVIS_MODEL: k1.5
+      JARVIS_THINKING_PLATFORM: kimi
+      JARVIS_THINKING_MODEL: k1.5-thinking
+      JARVIS_MAX_TOKEN_COUNT: 8192
+  - ai8:
+      JARVIS_PLATFORM: ai8
+      JARVIS_MODEL: gemini-2.5-pro
+      # 如果不指定思考模型，将自动使用常规模型
+      # JARVIS_THINKING_PLATFORM: ai8
+      # JARVIS_THINKING_MODEL: gemini-2.5-pro
+
+# 选择要使用的模型组
+JARVIS_MODEL_GROUP: kimi
+```
+
+**配置优先级规则:**
+
+Jarvis 会按照以下顺序解析模型配置，序号越小优先级越高：
+
+1.  **独立配置**: 直接设置的 `JARVIS_PLATFORM`, `JARVIS_MODEL`, `JARVIS_THINKING_PLATFORM`, `JARVIS_THINKING_MODEL` 环境变量。这些配置会**覆盖**任何模型组中的设置。
+2.  **模型组配置**: 通过 `JARVIS_MODEL_GROUP` 选中的模型组配置。
+3.  **默认值**: 如果以上均未配置，则使用代码中定义的默认模型（如 `yuanbao` 和 `deep_seek_v3`）。
+
+### 3. 全部配置项说明
 | 变量名称 | 默认值 | 说明 |
 |----------|--------|------|
 | `ENV` | {} | 环境变量配置 |
-| `JARVIS_MAX_TOKEN_COUNT` | 960000 | 上下文窗口的最大token数量 |
-| `JARVIS_MAX_INPUT_TOKEN_COUNT` | 32000 | 输入的最大token数量 |
-| `JARVIS_PLATFORM` | yuanbao | 默认AI平台 |
-| `JARVIS_MODEL` | deep_seek_v3 | 默认模型 |
-| `JARVIS_THINKING_PLATFORM` | JARVIS_PLATFORM | 推理任务使用的平台 |
-| `JARVIS_THINKING_MODEL` | JARVIS_MODEL | 推理任务使用的模型 |
+| `JARVIS_MODEL_GROUPS` | `[]` | 预定义的模型配置组列表 |
+| `JARVIS_MODEL_GROUP` | `null` | 选择要激活的模型组名称 |
+| `JARVIS_MAX_TOKEN_COUNT` | 960000 | 上下文窗口的最大token数量 (可被模型组覆盖) |
+| `JARVIS_MAX_INPUT_TOKEN_COUNT` | 32000 | 输入的最大token数量 (可被模型组覆盖) |
+| `JARVIS_PLATFORM` | yuanbao | 默认AI平台 (可被模型组覆盖) |
+| `JARVIS_MODEL` | deep_seek_v3 | 默认模型 (可被模型组覆盖) |
+| `JARVIS_THINKING_PLATFORM` | JARVIS_PLATFORM | 推理任务使用的平台 (可被模型组覆盖) |
+| `JARVIS_THINKING_MODEL` | JARVIS_MODEL | 推理任务使用的模型 (可被模型组覆盖) |
 | `JARVIS_EXECUTE_TOOL_CONFIRM` | false | 执行工具前是否需要确认 |
 | `JARVIS_CONFIRM_BEFORE_APPLY_PATCH` | false | 应用补丁前是否需要确认 |
-| `JARVIS_MAX_BIG_CONTENT_SIZE` | 160000 | 最大大内容大小 |
+| `JARVIS_MAX_BIG_CONTENT_SIZE` | 160000 | 最大大内容大小 (可被模型组覆盖) |
 | `JARVIS_PRETTY_OUTPUT` | false | 是否启用PrettyOutput |
 | `JARVIS_GIT_COMMIT_PROMPT` | "" | 自定义git提交信息生成提示模板 |
 | `JARVIS_PRINT_PROMPT` | false | 是否打印提示 |

{jarvis_ai_assistant-0.1.225.dist-info → jarvis_ai_assistant-0.2.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-jarvis/__init__.py,sha256=46Ob6ZTm4a9stXblcxcvfaE4NlTYqHOyTFezByeVN_Y,75
-jarvis/jarvis_agent/__init__.py,sha256=mpNT4SPLYyUP3vb4zR8GM04pOej8MpnMqfkoz5ZARSQ,22412
+jarvis/__init__.py,sha256=EmFCOffXrFq1m3oGpL5fp5ciwQF4OV_6X1esvw2Ukdg,73
+jarvis/jarvis_agent/__init__.py,sha256=BmBbMUsCwe_0znrwxSipaKj-MuOgJTZvLbyKzBFfpic,22559
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=Qs4LAr4xdKLBJpQE81YP4CkucAop86ms0iVoKa1nnso,2468
 jarvis/jarvis_agent/edit_file_handler.py,sha256=ml1o-BE2Ca1-ybPlKuhstLQYwdJag39o0_-PXTUvFaE,11646
-jarvis/jarvis_agent/jarvis.py,sha256=5Lkh2RbVqL_se8ZWcXxlh7XiJDhac8fxRtWmMHHO-q8,7803
-jarvis/jarvis_agent/main.py,sha256=W23ORF8mIxZv4GTLPuR1SlrioJLT0dLeFXrYAAMSc1A,3091
+jarvis/jarvis_agent/jarvis.py,sha256=dRJWrMbZnxo5g7_5-x9IPypPYynUhMIYBVlqtlOlOb0,7969
+jarvis/jarvis_agent/main.py,sha256=ufMQsv1-9wU2E3UAyu48oITwFSIBVFsUfnlhDZ7dWbU,3293
 jarvis/jarvis_agent/output_handler.py,sha256=P7oWpXBGFfOsWq7cIhS_z9crkQ19ES7qU5pM92KKjAs,1172
 jarvis/jarvis_agent/prompt_builder.py,sha256=PH1fPDVa8z_RXkoXHJFNDf8PQjUoLNLYwkh2lC__p40,1705
 jarvis/jarvis_agent/prompts.py,sha256=e8i-3kaGr96mlzL3UUhQUHFDfbJSoE4xiF9TDksNDm4,7720
@@ -12,9 +12,9 @@ jarvis/jarvis_agent/session_manager.py,sha256=DnvI9rWkVmkyO1XfKZyo9lTn4ajg4ccwzE
 jarvis/jarvis_agent/shell_input_handler.py,sha256=1IboqdxcJuoIqRpmDU10GugR9fWXUHyCEbVF4nIWbyo,1328
 jarvis/jarvis_agent/tool_executor.py,sha256=nIq-sPNgrtimtM-IHpN09cWmId8jDzWRdCFoRzXnnoo,1721
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=ZTvZ6tCVMv6nJBteLy39q0qtsg4OsvcIeg3ip7szVnc,18374
+jarvis/jarvis_code_agent/code_agent.py,sha256=YQYeaFx-dlf5p6_vw7T4mmtwyqQkytlxMUWDhF2V3_Y,18659
 jarvis/jarvis_code_agent/lint.py,sha256=LZPsfyZPMo7Wm7LN4osZocuNJwZx1ojacO3MlF870x8,4009
-jarvis/jarvis_code_analysis/code_review.py,sha256=Huia4w1SkhxfzAk2GNC75uo3a_BcVTCDbj0rx8_t0r4,30424
+jarvis/jarvis_code_analysis/code_review.py,sha256=eyezZ64ffiNC8vIHF-BZ1cF9cTnk1NdpuUXfoa-jWpc,30971
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=LIXAYa1sW3l7foP6kohLWnE98I_EQ0T7z5bYKHq6rJA,78
 jarvis/jarvis_code_analysis/checklists/c_cpp.py,sha256=9t62bMqs6qTkFSio4SKkj88qyb5ZubWrw3MxJBQ4X1A,1317
 jarvis/jarvis_code_analysis/checklists/csharp.py,sha256=ShPXrl2_UPAnGaCHAG2wLl90COG3HK2XCSr1UK2dxN4,2420
@@ -35,23 +35,23 @@ jarvis/jarvis_code_analysis/checklists/shell.py,sha256=aRFYhQQvTgbYd-uY5pc8UHIUA
 jarvis/jarvis_code_analysis/checklists/sql.py,sha256=vR0T6qC7b4dURjJVAd7kSVxyvZEQXPG1Jqc2sNTGp5c,2355
 jarvis/jarvis_code_analysis/checklists/swift.py,sha256=TPx4I6Gupvs6tSerRKmTSKEPQpOLEbH2Y7LXg1uBgxc,2566
 jarvis/jarvis_code_analysis/checklists/web.py,sha256=25gGD7pDadZQybNFvALYxWvK0VRjGQb1NVJQElwjyk0,3943
-jarvis/jarvis_data/config_schema.json,sha256=uuDN-25NJRnKfb6KuuqxOnfRGMphkKQbjxfu0Me6pAI,7494
+jarvis/jarvis_data/config_schema.json,sha256=XpQ7aaHMW-YCuFrnaAEjMWrnv6a8B7MqGjm2XgrvtgQ,8573
 jarvis/jarvis_data/tiktoken/9b5ad71b2ce5302211f9c61530b329a4922fc6a4,sha256=Ijkht27pm96ZW3_3OFE-7xAPtR0YyTWXoRO8_-hlsqc,1681126
 jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_details/main.py,sha256=DE1DcX-1lvUsb_K-FExpHs3NBRmo5KZb53PGa8QFBOc,8875
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=2nwX-Ghphn97Ua0SXPJIxix-rgm_Z9KRkrovjpSklUk,2311
-jarvis/jarvis_git_utils/git_commiter.py,sha256=erZ3wNJuaEgHlKTaYv0UKargG_Yl9OnssTIcErEAdtw,12472
+jarvis/jarvis_git_utils/git_commiter.py,sha256=Yir26RyvoToTmkeh1-cFnG3LE3fH7z2njPOK3FIpQDc,12801
 jarvis/jarvis_mcp/__init__.py,sha256=OPMtjD-uq9xAaKCRIDyKIosaFfBe1GBPu1az-mQ0rVM,2048
-jarvis/jarvis_mcp/sse_mcp_client.py,sha256=-3Qy1LyqgHswoc6YbadVRG3ias2op7lUp7Ne2-QUKBM,22474
-jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=armvgyHAv-AxF5lqiK-TbVLzg3XgSCwmTdWmxBSTLRk,11248
+jarvis/jarvis_mcp/sse_mcp_client.py,sha256=AhYLPQb0mE9-6ZQw1JesRNyEy0esJumNEFb5LyzyIn0,22612
+jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=APYUksYKlMx7AVNODKOLrTkKZPnp4kqTQIYIuNDDKko,11286
 jarvis/jarvis_mcp/streamable_mcp_client.py,sha256=1OZpsG82U2MLbGuojllJAblFUAMmp1N0i5fsKM4n5Ts,14453
 jarvis/jarvis_methodology/main.py,sha256=-PqsWvtpUJkkhiGgV-1JegEnEZBmv8SHnNMNNm_-QQc,11720
 jarvis/jarvis_multi_agent/__init__.py,sha256=efB04nWPRl4EOD64RThqQ6w78GZc2t0GGisX2wwTP8I,5949
 jarvis/jarvis_multi_agent/main.py,sha256=h7VUSwoPrES0XTK8z5kt3XLX1mmcm8UEuFEHQOUWPH4,1696
 jarvis/jarvis_platform/__init__.py,sha256=WLQHSiE87PPket2M50_hHzjdMIgPIBx2VF8JfB_NNRk,105
 jarvis/jarvis_platform/ai8.py,sha256=yi7xG8ld4Yrf7drz-uu_JT_XCGYRB0obhygt-jKik8o,10871
-jarvis/jarvis_platform/base.py,sha256=-XegiAS8G_nzwsWPOVEAQ2iTxE33fxu5-TWV4c3Pz-g,8981
+jarvis/jarvis_platform/base.py,sha256=cfeYB6ldfQH1tz1rroQpmJTLAw8KByKS74qun0pqE1c,9498
 jarvis/jarvis_platform/human.py,sha256=cSN8Lqf0ts2_pPfS2_v7PaWxQKqcW_3bSmhRTHey7Qo,4674
 jarvis/jarvis_platform/kimi.py,sha256=dn_P4EEZvWWCPS67MDbWStsP7n3MN4-Rrc6R7GhJyEg,15436
 jarvis/jarvis_platform/openai.py,sha256=ccGqsU2cFfd5324P7SH1tSmFABpvto8fytmxQGkr3BA,6412
@@ -79,11 +79,11 @@ jarvis/jarvis_tools/base.py,sha256=tFVmK6ppsImW2BzHZmrNmMRiOJdW-4aZP6Me3VxdYcA,1
 jarvis/jarvis_tools/edit_file.py,sha256=hM345E9rxS-EkqCZpwwizL6fmPdTadtB798tEO5Ce3g,10417
 jarvis/jarvis_tools/execute_script.py,sha256=gMarE5yCCSPU6Dp6HlcL2KT-2xCzR-1p-oQNlYOJK58,6157
 jarvis/jarvis_tools/file_analyzer.py,sha256=aVe1jBSp0YmlypihxrGADJpYrU_7CxDETxGUNySuSlI,4044
-jarvis/jarvis_tools/generate_new_tool.py,sha256=2YAs8DC7fJnxOkjSmhmSAwqSpBlicVhYc06WZ8YVBls,7679
+jarvis/jarvis_tools/generate_new_tool.py,sha256=ppMRuTYUZ0c02rHo7xi8DCGiDVPZTANVp9nS7bvkqqo,7819
 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=Lfp6UcEw-Gbva-7OUTHOBrT9xYwrGrolvjaSpYhWFwU,26435
+jarvis/jarvis_tools/registry.py,sha256=3SMzVM9rhI9Gl8EdI13_NOHBxwygueqw-nUcCi6AgRM,26754
 jarvis/jarvis_tools/rewrite_file.py,sha256=eG_WKg6cVAXmuGwUqlWkcuyay5S8DOzEi8vZCmX3O8w,7255
 jarvis/jarvis_tools/search_web.py,sha256=DDAPjYWTFaF85zsnhJ6VNDSc1BcY8EHus5ymKP9nnPs,5703
 jarvis/jarvis_tools/virtual_tty.py,sha256=KKr3jpvQWWMPr2o40hlmN6fuXJCN8H4_ma5QU40Citc,16089
@@ -91,20 +91,20 @@ jarvis/jarvis_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 jarvis/jarvis_tools/cli/main.py,sha256=Mg6TQDxMdzB1Ua1UrZ2EE-uQWsbaeojWaEGHJp2HimA,6375
 jarvis/jarvis_utils/__init__.py,sha256=67h0ldisGlh3oK4DAeNEL2Bl_VsI3tSmfclasyVlueM,850
 jarvis/jarvis_utils/builtin_replace_map.py,sha256=4BurljGuiG_I93EBs7mlFlPm9wYC_4CmdTG5tQWpF6g,1712
-jarvis/jarvis_utils/config.py,sha256=eTarDAeBdFZx2jX4KQrzanEu4W6hpS5Cw1DHmiB5nN0,8247
+jarvis/jarvis_utils/config.py,sha256=YcPGjCSJ2_2CKtlY8ecyqaovKVb65XcQ5WNizjwmdVs,10689
 jarvis/jarvis_utils/embedding.py,sha256=oEOEM2qf16DMYwPsQe6srET9BknyjOdY2ef0jsp3Or8,2714
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
-jarvis/jarvis_utils/git_utils.py,sha256=EpyS8AvvK9M9WnkObtQsU2gXq45PnY-WJo2c4kMtyFM,21702
-jarvis/jarvis_utils/globals.py,sha256=WzZh_acNfHJj1LDulhyLQ7cojksBy0gdrITe0vH1XA0,3901
+jarvis/jarvis_utils/git_utils.py,sha256=_b4-5uWOTVFjAB48QbRJNBR7PTD_jzi7-5V5M_wjXFo,21740
+jarvis/jarvis_utils/globals.py,sha256=QKeiiWhUlu9HE7SzAn0lKaeaXQF1uhmLXPZTeLKyGPQ,4048
 jarvis/jarvis_utils/http.py,sha256=Uqt1kcz0HWnAfXHHi1fNGwLb2lcVUqpbrG2Uk_-kcIU,4882
 jarvis/jarvis_utils/input.py,sha256=V2w3xV0MO73c4Y4XY_yy9jVNg7MmN76FmAnpKRiJUog,9160
-jarvis/jarvis_utils/methodology.py,sha256=-cvM6pwgJK7BXCYg2uVjIId_j3v5RUh2z2PBcK_2vj4,8155
-jarvis/jarvis_utils/output.py,sha256=PRCgudPOB8gMEP3u-g0FGD2c6tBgJhLXUMqNPglfjV8,10813
+jarvis/jarvis_utils/methodology.py,sha256=V2Y0mbamrWBhhCK-3foAM1hKewOEcIDcXO-Sv_AU-kQ,9106
+jarvis/jarvis_utils/output.py,sha256=2QMpzb8ZOysQ6HHsRjRzjgUnNXaFGkIiZ_qElPKLbsA,10858
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
-jarvis/jarvis_utils/utils.py,sha256=OXZ57qTB3dY5e_V6lWZRivYu1cMT1e2VftW7AQBd2X0,15295
-jarvis_ai_assistant-0.1.225.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.225.dist-info/METADATA,sha256=s60vmDTdhXx9eGKHz22DIMFUqjqZF_G-r9PwzApQJr4,24094
-jarvis_ai_assistant-0.1.225.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.225.dist-info/entry_points.txt,sha256=JXK_n-d9HZ_RLz959CvpK5-UPOCwssn5oAH8dAHuebA,1277
-jarvis_ai_assistant-0.1.225.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.225.dist-info/RECORD,,
+jarvis/jarvis_utils/utils.py,sha256=G6UuiBrPlWLpau1LbSGStrlAHCHG8JufINLD_bwtjTE,20006
+jarvis_ai_assistant-0.2.0.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.2.0.dist-info/METADATA,sha256=ddh41XdsU955MHnmlVF1YhXW5D2oYZK-M7ZsTUqVMAs,25713
+jarvis_ai_assistant-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.2.0.dist-info/entry_points.txt,sha256=JXK_n-d9HZ_RLz959CvpK5-UPOCwssn5oAH8dAHuebA,1277
+jarvis_ai_assistant-0.2.0.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.2.0.dist-info/RECORD,,