jarvis-ai-assistant 0.1.150__py3-none-any.whl → 0.1.151__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.150"
+__version__ = "0.1.151"

jarvis/jarvis_git_utils/git_commiter.py

@@ -177,6 +177,13 @@ class GitCommitTool:
                             # 如果成功提取，就跳出循环
                             if commit_message:
                                 break
+                            prompt = f"""格式错误，请按照以下格式重新生成提交信息：
+                            {ot("COMMIT_MESSAGE")}
+        <类型>(<范围>): <主题>
+        
+        [可选] 详细描述变更内容和原因
+        {ct("COMMIT_MESSAGE")}
+                            """
                         spinner.write("✅ 生成提交消息")
 
                         # 执行提交

jarvis/jarvis_mcp/__init__.py

@@ -33,4 +33,33 @@ class McpClient(ABC):
         """
         pass
 
+    @abstractmethod
+    def get_resource_list(self) -> List[Dict[str, Any]]:
+        """获取资源列表
+        
+        返回:
+            List[Dict[str, Any]]: 资源列表，每个资源包含以下字段：
+                - uri: str - 资源的唯一标识符
+                - name: str - 资源的名称
+                - description: str - 资源的描述（可选）
+                - mimeType: str - 资源的MIME类型（可选）
+        """
+        pass
+
+    @abstractmethod
+    def get_resource(self, uri: str) -> Dict[str, Any]:
+        """获取指定资源的内容
+        
+        参数:
+            uri: str - 资源的URI标识符
+            
+        返回:
+            Dict[str, Any]: 资源内容，包含以下字段：
+                - uri: str - 资源的URI
+                - mimeType: str - 资源的MIME类型（可选）
+                - text: str - 文本内容（如果是文本资源）
+                - blob: str - 二进制内容（如果是二进制资源，base64编码）
+        """
+        pass
+
 

jarvis/jarvis_mcp/local_mcp_client.py

@@ -228,6 +228,91 @@ class LocalMcpClient(McpClient):
                 'stderr': str(e)
             }
 
+    def get_resource_list(self) -> List[Dict[str, Any]]:
+        """获取资源列表
+        
+        返回:
+            List[Dict[str, Any]]: 资源列表，每个资源包含以下字段：
+                - uri: str - 资源的唯一标识符
+                - name: str - 资源的名称
+                - description: str - 资源的描述（可选）
+                - mimeType: str - 资源的MIME类型（可选）
+        """
+        try:
+            response = self._send_request('resources/list', {})
+            if 'result' in response and 'resources' in response['result']:
+                return response['result']['resources']
+            else:
+                error_msg = "获取资源列表失败"
+                if 'error' in response:
+                    error_msg += f": {response['error']}"
+                else:
+                    error_msg += ": 未知错误"
+                PrettyOutput.print(error_msg, OutputType.ERROR)
+                return []
+        except Exception as e:
+            PrettyOutput.print(f"获取资源列表失败: {str(e)}", OutputType.ERROR)
+            return []
+
+    def get_resource(self, uri: str) -> Dict[str, Any]:
+        """获取指定资源的内容
+        
+        参数:
+            uri: str - 资源的URI标识符
+            
+        返回:
+            Dict[str, Any]: 执行结果，包含以下字段：
+                - success: bool - 是否执行成功
+                - stdout: str - 资源内容（文本或base64编码的二进制内容）
+                - stderr: str - 错误信息
+        """
+        try:
+            response = self._send_request('resources/read', {
+                'uri': uri
+            })
+            if 'result' in response and 'contents' in response['result']:
+                contents = response['result']['contents']
+                if contents:
+                    content = contents[0]  # 获取第一个资源内容
+                    # 根据资源类型返回内容
+                    if 'text' in content:
+                        return {
+                            'success': True,
+                            'stdout': content['text'],
+                            'stderr': ''
+                        }
+                    elif 'blob' in content:
+                        return {
+                            'success': True,
+                            'stdout': content['blob'],
+                            'stderr': ''
+                        }
+                return {
+                    'success': False,
+                    'stdout': '',
+                    'stderr': '资源内容为空'
+                }
+            else:
+                error_msg = "获取资源内容失败"
+                if 'error' in response:
+                    error_msg += f": {response['error']}"
+                else:
+                    error_msg += ": 未知错误"
+                PrettyOutput.print(error_msg, OutputType.ERROR)
+                return {
+                    'success': False,
+                    'stdout': '',
+                    'stderr': error_msg
+                }
+        except Exception as e:
+            error_msg = f"获取资源内容失败: {str(e)}"
+            PrettyOutput.print(error_msg, OutputType.ERROR)
+            return {
+                'success': False,
+                'stdout': '',
+                'stderr': error_msg
+            }
+
     def __del__(self):
         """清理资源"""
         if self.process:

jarvis/jarvis_mcp/remote_mcp_client.py

@@ -1,7 +1,10 @@
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional, Iterator, Callable
 import requests
-import sseclient
-from urllib.parse import urljoin
+import json
+import threading
+import time
+import uuid
+from urllib.parse import urljoin, urlencode, parse_qs
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from . import McpClient
 
@@ -37,13 +40,38 @@ class RemoteMcpClient(McpClient):
         extra_headers = config.get('headers', {})
         self.session.headers.update(extra_headers)
         
-        # 初始化SSE连接
-        self.sse_client = None
+        # SSE相关属性
+        self.sse_response = None
+        self.sse_thread = None
+        self.messages_endpoint = None
+        self.session_id = None      # 从SSE连接获取的会话ID
+        self.pending_requests = {}  # 存储等待响应的请求 {id: Event}
+        self.request_results = {}   # 存储请求结果 {id: result}
+        self.notification_handlers = {}
+        self.event_lock = threading.Lock()
+        self.request_id_counter = 0
+        
+        # 初始化连接
         self._initialize()
 
     def _initialize(self) -> None:
         """初始化MCP连接"""
         try:
+            # 启动SSE连接
+            self._start_sse_connection()
+            
+            # 等待获取消息端点和会话ID
+            start_time = time.time()
+            while (not self.messages_endpoint or not self.session_id) and time.time() - start_time < 5:
+                time.sleep(0.1)
+                
+            if not self.messages_endpoint:
+                self.messages_endpoint = "/messages"  # 默认端点
+                PrettyOutput.print(f"未获取到消息端点，使用默认值: {self.messages_endpoint}", OutputType.WARNING)
+                
+            if not self.session_id:
+                PrettyOutput.print("未获取到会话ID", OutputType.WARNING)
+            
             # 发送初始化请求
             response = self._send_request('initialize', {
                 'processId': None,  # 远程客户端不需要进程ID
@@ -59,20 +87,153 @@ class RemoteMcpClient(McpClient):
             if 'result' not in response:
                 raise RuntimeError(f"初始化失败: {response.get('error', 'Unknown error')}")
 
-            result = response['result']
-            
-            # 发送initialized通知 - 使用正确的方法名格式
+            # 发送initialized通知
             self._send_notification('notifications/initialized', {})
 
-            # 建立SSE连接
-            sse_url = urljoin(self.base_url, 'events')
-            response = self.session.get(sse_url, stream=True)
-            self.sse_client = sseclient.SSEClient(response)
-
         except Exception as e:
             PrettyOutput.print(f"MCP初始化失败: {str(e)}", OutputType.ERROR)
             raise
 
+    def _start_sse_connection(self) -> None:
+        """建立SSE连接并启动处理线程"""
+        try:
+            # 设置SSE请求头
+            sse_headers = dict(self.session.headers)
+            sse_headers.update({
+                'Accept': 'text/event-stream',
+                'Cache-Control': 'no-cache',
+            })
+            
+            # 建立SSE连接
+            sse_url = urljoin(self.base_url, 'sse')
+            self.sse_response = self.session.get(
+                sse_url, 
+                stream=True, 
+                headers=sse_headers,
+                timeout=30
+            )
+            self.sse_response.raise_for_status()
+            
+            # 启动事件处理线程
+            self.sse_thread = threading.Thread(target=self._process_sse_events, daemon=True)
+            self.sse_thread.start()
+            
+        except Exception as e:
+            PrettyOutput.print(f"SSE连接失败: {str(e)}", OutputType.ERROR)
+            raise
+    
+    def _process_sse_events(self) -> None:
+        """处理SSE事件流"""
+        if not self.sse_response:
+            return
+            
+        buffer = ""
+        for line in self.sse_response.iter_lines(decode_unicode=True):
+            if line:
+                if line.startswith("data:"):
+                    data = line[5:].strip()
+                    # 检查是否包含消息端点信息
+                    if data.startswith('/'):
+                        # 这是消息端点信息，例如 "/messages/?session_id=xyz"
+                        try:
+                            # 提取消息端点路径和会话ID
+                            url_parts = data.split('?')
+                            self.messages_endpoint = url_parts[0]
+                            
+                            # 如果有查询参数，尝试提取session_id
+                            if len(url_parts) > 1:
+                                query_string = url_parts[1]
+                                query_params = parse_qs(query_string)
+                                if 'session_id' in query_params:
+                                    self.session_id = query_params['session_id'][0]
+                        except Exception as e:
+                            PrettyOutput.print(f"解析消息端点或会话ID失败: {e}", OutputType.WARNING)
+                    else:
+                        buffer += data
+                elif line.startswith(":"):  # 忽略注释行
+                    continue
+                elif line.startswith("event:"):  # 事件类型
+                    continue  # 我们不使用事件类型
+                elif line.startswith("id:"):  # 事件ID
+                    continue  # 我们不使用事件ID
+                elif line.startswith("retry:"):  # 重连时间
+                    continue  # 我们自己管理重连
+            else:  # 空行表示事件结束
+                if buffer:
+                    try:
+                        self._handle_sse_event(buffer)
+                    except Exception as e:
+                        PrettyOutput.print(f"处理SSE事件出错: {e}", OutputType.ERROR)
+                    buffer = ""
+        
+        PrettyOutput.print("SSE连接已关闭", OutputType.WARNING)
+
+    def _handle_sse_event(self, data: str) -> None:
+        """处理单个SSE事件数据"""
+        try:
+            event_data = json.loads(data)
+            
+            # 检查是请求响应还是通知
+            if 'id' in event_data:
+                # 这是一个请求的响应
+                req_id = event_data['id']
+                with self.event_lock:
+                    self.request_results[req_id] = event_data
+                    if req_id in self.pending_requests:
+                        # 通知等待线程响应已到达
+                        self.pending_requests[req_id].set()
+            elif 'method' in event_data:
+                # 这是一个通知
+                method = event_data.get('method', '')
+                params = event_data.get('params', {})
+                
+                # 调用已注册的处理器
+                if method in self.notification_handlers:
+                    for handler in self.notification_handlers[method]:
+                        try:
+                            handler(params)
+                        except Exception as e:
+                            PrettyOutput.print(
+                                f"处理通知时出错 ({method}): {e}", 
+                                OutputType.ERROR
+                            )
+        except json.JSONDecodeError:
+            PrettyOutput.print(f"无法解析SSE事件: {data}", OutputType.WARNING)
+        except Exception as e:
+            PrettyOutput.print(f"处理SSE事件时出错: {e}", OutputType.ERROR)
+
+    def register_notification_handler(self, method: str, handler: Callable) -> None:
+        """注册通知处理器
+        
+        参数:
+            method: 通知方法名
+            handler: 处理通知的回调函数，接收params参数
+        """
+        with self.event_lock:
+            if method not in self.notification_handlers:
+                self.notification_handlers[method] = []
+            self.notification_handlers[method].append(handler)
+
+    def unregister_notification_handler(self, method: str, handler: Callable) -> None:
+        """注销通知处理器
+        
+        参数:
+            method: 通知方法名
+            handler: 要注销的处理器函数
+        """
+        with self.event_lock:
+            if method in self.notification_handlers:
+                if handler in self.notification_handlers[method]:
+                    self.notification_handlers[method].remove(handler)
+                if not self.notification_handlers[method]:
+                    del self.notification_handlers[method]
+
+    def _get_next_request_id(self) -> str:
+        """获取下一个请求ID"""
+        with self.event_lock:
+            self.request_id_counter += 1
+            return str(self.request_id_counter)
+
     def _send_request(self, method: str, params: Dict[str, Any]) -> Dict[str, Any]:
         """发送请求到MCP服务器
         
@@ -83,24 +244,88 @@ class RemoteMcpClient(McpClient):
         返回:
             Dict[str, Any]: 响应结果
         """
+        # 生成唯一请求ID
+        req_id = self._get_next_request_id()
+        
+        # 创建事件标志，用于等待响应
+        event = threading.Event()
+        
+        with self.event_lock:
+            self.pending_requests[req_id] = event
+        
         try:
             # 构建请求
             request = {
                 'jsonrpc': '2.0',
                 'method': method,
                 'params': params,
-                'id': 1
+                'id': req_id
             }
 
-            # 发送请求
-            response = self.session.post(
-                urljoin(self.base_url, 'rpc'),
-                json=request
-            )
-            response.raise_for_status()
-            return response.json()
+            # 尝试不同的请求发送方式
+            if self.session_id:
+                # 方法1: 使用查询参数中的session_id
+                query_params = {'session_id': self.session_id}
+                messages_url = urljoin(self.base_url, self.messages_endpoint)
+                
+                # 尝试直接使用原始URL（不追加查询参数）
+                try:
+                    post_response = self.session.post(
+                        messages_url,
+                        json=request
+                    )
+                    post_response.raise_for_status()
+                except requests.HTTPError:
+                    # 如果失败，尝试添加会话ID到查询参数
+                    messages_url_with_session = f"{messages_url}?{urlencode(query_params)}"
+                    post_response = self.session.post(
+                        messages_url_with_session,
+                        json=request
+                    )
+                    post_response.raise_for_status()
+            else:
+                # 方法2: 不使用session_id
+                if not self.messages_endpoint:
+                    self.messages_endpoint = "/messages"
+                
+                messages_url = urljoin(self.base_url, self.messages_endpoint)
+                
+                # 尝试直接使用messages端点而不带任何查询参数
+                try:
+                    # 尝试1: 标准JSON-RPC格式
+                    post_response = self.session.post(
+                        messages_url,
+                        json=request
+                    )
+                    post_response.raise_for_status()
+                except requests.HTTPError:
+                    # 尝试2: JSON字符串作为请求参数
+                    post_response = self.session.post(
+                        messages_url,
+                        params={'request': json.dumps(request)}
+                    )
+                    post_response.raise_for_status()
+            
+            # 等待SSE通道返回响应（最多30秒）
+            if not event.wait(timeout=30):
+                raise TimeoutError(f"等待响应超时: {method}")
+            
+            # 获取响应结果
+            with self.event_lock:
+                result = self.request_results.pop(req_id, None)
+                self.pending_requests.pop(req_id, None)
+            
+            if result is None:
+                raise RuntimeError(f"未收到响应: {method}")
+                
+            return result
 
         except Exception as e:
+            # 清理请求状态
+            with self.event_lock:
+                self.pending_requests.pop(req_id, None)
+                self.request_results.pop(req_id, None)
+                
             PrettyOutput.print(f"发送请求失败: {str(e)}", OutputType.ERROR)
             raise
 
@@ -119,12 +344,49 @@ class RemoteMcpClient(McpClient):
                 'params': params
             }
 
-            # 发送通知
-            response = self.session.post(
-                urljoin(self.base_url, 'rpc'),
-                json=notification
-            )
-            response.raise_for_status()
+            # 尝试不同的请求发送方式，与_send_request保持一致
+            if self.session_id:
+                # 方法1: 使用查询参数中的session_id
+                query_params = {'session_id': self.session_id}
+                messages_url = urljoin(self.base_url, self.messages_endpoint or '/messages')
+                
+                # 尝试直接使用原始URL（不追加查询参数）
+                try:
+                    post_response = self.session.post(
+                        messages_url,
+                        json=notification
+                    )
+                    post_response.raise_for_status()
+                except requests.HTTPError:
+                    # 如果失败，尝试添加会话ID到查询参数
+                    messages_url_with_session = f"{messages_url}?{urlencode(query_params)}"
+                    post_response = self.session.post(
+                        messages_url_with_session,
+                        json=notification
+                    )
+                    post_response.raise_for_status()
+            else:
+                # 方法2: 不使用session_id
+                if not self.messages_endpoint:
+                    self.messages_endpoint = "/messages"
+                
+                messages_url = urljoin(self.base_url, self.messages_endpoint)
+                
+                # 尝试直接使用messages端点而不带任何查询参数
+                try:
+                    # 尝试1: 标准JSON-RPC格式
+                    post_response = self.session.post(
+                        messages_url,
+                        json=notification
+                    )
+                    post_response.raise_for_status()
+                except requests.HTTPError:
+                    # 尝试2: JSON字符串作为请求参数
+                    post_response = self.session.post(
+                        messages_url,
+                        params={'request': json.dumps(notification)}
+                    )
+                    post_response.raise_for_status()
 
         except Exception as e:
             PrettyOutput.print(f"发送通知失败: {str(e)}", OutputType.ERROR)
@@ -222,9 +484,107 @@ class RemoteMcpClient(McpClient):
                 'stderr': str(e)
             }
 
+    def get_resource_list(self) -> List[Dict[str, Any]]:
+        """获取资源列表
+        
+        返回:
+            List[Dict[str, Any]]: 资源列表，每个资源包含以下字段：
+                - uri: str - 资源的唯一标识符
+                - name: str - 资源的名称
+                - description: str - 资源的描述（可选）
+                - mimeType: str - 资源的MIME类型（可选）
+        """
+        try:
+            response = self._send_request('resources/list', {})
+            if 'result' in response and 'resources' in response['result']:
+                return response['result']['resources']
+            else:
+                error_msg = "获取资源列表失败"
+                if 'error' in response:
+                    error_msg += f": {response['error']}"
+                else:
+                    error_msg += ": 未知错误"
+                PrettyOutput.print(error_msg, OutputType.ERROR)
+                return []
+        except Exception as e:
+            PrettyOutput.print(f"获取资源列表失败: {str(e)}", OutputType.ERROR)
+            return []
+
+    def get_resource(self, uri: str) -> Dict[str, Any]:
+        """获取指定资源的内容
+        
+        参数:
+            uri: str - 资源的URI标识符
+            
+        返回:
+            Dict[str, Any]: 执行结果，包含以下字段：
+                - success: bool - 是否执行成功
+                - stdout: str - 资源内容（文本或base64编码的二进制内容）
+                - stderr: str - 错误信息
+        """
+        try:
+            response = self._send_request('resources/read', {
+                'uri': uri
+            })
+            if 'result' in response and 'contents' in response['result']:
+                contents = response['result']['contents']
+                if contents:
+                    content = contents[0]  # 获取第一个资源内容
+                    # 根据资源类型返回内容
+                    if 'text' in content:
+                        return {
+                            'success': True,
+                            'stdout': content['text'],
+                            'stderr': ''
+                        }
+                    elif 'blob' in content:
+                        return {
+                            'success': True,
+                            'stdout': content['blob'],
+                            'stderr': ''
+                        }
+                return {
+                    'success': False,
+                    'stdout': '',
+                    'stderr': '资源内容为空'
+                }
+            else:
+                error_msg = "获取资源内容失败"
+                if 'error' in response:
+                    error_msg += f": {response['error']}"
+                else:
+                    error_msg += ": 未知错误"
+                PrettyOutput.print(error_msg, OutputType.ERROR)
+                return {
+                    'success': False,
+                    'stdout': '',
+                    'stderr': error_msg
+                }
+        except Exception as e:
+            error_msg = f"获取资源内容失败: {str(e)}"
+            PrettyOutput.print(error_msg, OutputType.ERROR)
+            return {
+                'success': False,
+                'stdout': '',
+                'stderr': error_msg
+            }
+
     def __del__(self):
         """清理资源"""
-        if self.sse_client and hasattr(self.sse_client, 'resp'):
-            self.sse_client.resp.close()
+        # 清理请求状态
+        with self.event_lock:
+            for event in self.pending_requests.values():
+                event.set()  # 释放所有等待的请求
+            self.pending_requests.clear()
+            self.request_results.clear()
+            
+        # 关闭SSE响应
+        if self.sse_response:
+            try:
+                self.sse_response.close()
+            except:
+                pass
+                
+        # 关闭HTTP会话
         if self.session:
             self.session.close()

jarvis/jarvis_tools/ask_codebase.py

@@ -156,10 +156,9 @@ class AskCodebaseTool:
 2. 使用fd命令查找可能相关的文件
 3. 使用rg命令搜索关键词和代码模式
 4. 使用read_code工具直接读取和分析相关文件内容
-5. 只有在fd、rg和read_code都无法解决问题时才考虑使用RAG工具
-6. 根据文件内容提供具体、准确的回答
-7. 确保分析的完整性，收集充分的信息后再得出结论，不要在只掌握部分信息就得出结论
-8. 优先查阅README文件、文档目录和项目文档
+5. 根据文件内容提供具体、准确的回答
+6. 确保分析的完整性，收集充分的信息后再得出结论，不要在只掌握部分信息就得出结论
+7. 优先查阅README文件、文档目录和项目文档
 
 ## 分析步骤
 1. **确定项目的编程语言**:
@@ -186,12 +185,6 @@ class AskCodebaseTool:
    - 提供基于直接分析代码的具体回答
    - 引用具体文件和代码片段作为依据
 
-## 关于RAG工具使用
-- RAG工具应作为最后选择，仅在fd、rg和read_code都无法解决问题时使用
-- 必须通过查看实际代码文件验证RAG返回的每条重要信息
-- 对于关键发现，始终使用`read_code`工具查看原始文件内容进行求证
-- 如发现RAG结果与实际代码不符，以实际代码为准
-
 ## 输出要求
 - 提供准确、具体的回答，避免模糊不清的描述
 - 引用具体文件路径和代码片段作为依据

jarvis/jarvis_tools/registry.py

@@ -16,6 +16,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import ct, ot, init_env
 from jarvis.jarvis_mcp.local_mcp_client import LocalMcpClient
 from jarvis.jarvis_mcp.remote_mcp_client import RemoteMcpClient
+from jarvis.jarvis_mcp import McpClient
 
 
 
@@ -138,7 +139,7 @@ class ToolRegistry(OutputHandler):
 
     def use_tools(self, name: List[str]) -> None:
         """使用指定工具
-        
+
         参数:
             name: 要使用的工具名称列表
         """
@@ -149,7 +150,7 @@ class ToolRegistry(OutputHandler):
 
     def dont_use_tools(self, names: List[str]) -> None:
         """从注册表中移除指定工具
-        
+
         参数:
             names: 要移除的工具名称列表
         """
@@ -193,7 +194,7 @@ class ToolRegistry(OutputHandler):
 
     def register_mcp_tool_by_file(self, file_path: str) -> bool:
         """从指定文件加载并注册工具
-        
+
         参数:
             file_path: 工具文件的路径
 
@@ -205,84 +206,125 @@ class ToolRegistry(OutputHandler):
             if 'type' not in config:
                 PrettyOutput.print(f"文件 {file_path} 缺少type字段", OutputType.WARNING)
                 return False
+
+            # 检查enable标志
+            if not config.get('enable', True):
+                PrettyOutput.print(f"文件 {file_path} 已禁用(enable=false)，跳过注册", OutputType.INFO)
+                return False
+
+            name = config.get('name', Path(file_path).stem)
+
+
+            # 注册资源工具
+            def create_resource_list_func(client: McpClient):
+                def execute(arguments: Dict[str, Any]) -> Dict[str, Any]:
+                    args = arguments.copy()
+                    args.pop('agent', None)
+                    args.pop('want', None)
+                    ret = client.get_resource_list()
+                    PrettyOutput.print(f"MCP {name} 资源列表:\n{yaml.safe_dump(ret)}", OutputType.TOOL)
+                    return {
+                        'success': True,
+                        'stdout': yaml.safe_dump(ret),
+                        'stderr': ''
+                    }
+                return execute
+
+            def create_resource_get_func(client: McpClient):
+                def execute(arguments: Dict[str, Any]) -> Dict[str, Any]:
+                    args = arguments.copy()
+                    args.pop('agent', None)
+                    args.pop('want', None)
+                    if 'uri' not in args:
+                        return {
+                            'success': False,
+                            'stdout': '',
+                            'stderr': '缺少必需的uri参数'
+                        }
+                    ret = client.get_resource(args['uri'])
+                    PrettyOutput.print(f"MCP {name} 获取资源:\n{yaml.safe_dump(ret)}", OutputType.TOOL)
+                    return ret
+                return execute
+
+            def create_mcp_execute_func(tool_name: str, client: McpClient):
+                def execute(arguments: Dict[str, Any]) -> Dict[str, Any]:
+                    args = arguments.copy()
+                    args.pop('agent', None)
+                    args.pop('want', None)
+                    ret = client.execute(tool_name, args)
+                    PrettyOutput.print(f"MCP {name} {tool_name} 执行结果:\n{yaml.safe_dump(ret)}", OutputType.TOOL)
+                    return ret
+                return execute
+
             if config['type'] == 'local':
                 if 'command' not in config:
                     PrettyOutput.print(f"文件 {file_path} 缺少command字段", OutputType.WARNING)
                     return False
-                
-                # 创建本地MCP客户端
-                mcp_client = LocalMcpClient(config)
-                
-                # 获取工具信息
-                tools = mcp_client.get_tool_list()
-                if not tools:
-                    PrettyOutput.print(f"从 {file_path} 获取工具列表失败", OutputType.WARNING)
-                    return False
-                
-                # 注册每个工具
-                for tool in tools:
-                    def create_local_execute_func(tool_name: str, client: LocalMcpClient):
-                        def execute(arguments: Dict[str, Any]) -> Dict[str, Any]:
-                            args = arguments.copy()
-                            args.pop('agent', None)
-                            args.pop('want', None)
-                            ret = client.execute(tool_name, args)
-                            PrettyOutput.print(f"MCP {tool_name} 执行结果:\n{yaml.safe_dump(ret)}", OutputType.TOOL)
-                            return ret
-                        return execute
-                    
-                    # 注册工具
-                    self.register_tool(
-                        name=tool['name'],
-                        description=tool['description'],
-                        parameters=tool['parameters'],
-                        func=create_local_execute_func(tool['name'], mcp_client)
-                    )
-                
-                return True
-                
             elif config['type'] == 'remote':
                 if 'base_url' not in config:
                     PrettyOutput.print(f"文件 {file_path} 缺少base_url字段", OutputType.WARNING)
                     return False
-                
-                # 创建远程MCP客户端
-                mcp_client = RemoteMcpClient(config)
-                
-                # 获取工具信息
-                tools = mcp_client.get_tool_list()
-                if not tools:
-                    PrettyOutput.print(f"从 {file_path} 获取工具列表失败", OutputType.WARNING)
-                    return False
-                
-                # 注册每个工具
-                for tool in tools:
-                    def create_remote_execute_func(tool_name: str, client: RemoteMcpClient):
-                        def execute(arguments: Dict[str, Any]) -> Dict[str, Any]:
-                            args = arguments.copy()
-                            args.pop('agent', None)
-                            args.pop('want', None)
-                            ret = client.execute(tool_name, args)
-                            PrettyOutput.print(f"MCP {tool_name} 执行结果:\n{yaml.safe_dump(ret)}", OutputType.TOOL)
-                            return ret
-                        return execute
-                    
-                    # 注册工具
-                    self.register_tool(
-                        name=tool['name'],
-                        description=tool['description'],
-                        parameters=tool['parameters'],
-                        func=create_remote_execute_func(tool['name'], mcp_client)
-                    )
-                
-                return True
             else:
                 PrettyOutput.print(f"文件 {file_path} 类型错误: {config['type']}", OutputType.WARNING)
                 return False
+
+            # 创建MCP客户端
+            mcp_client: McpClient = LocalMcpClient(config) if config['type'] == 'local' else RemoteMcpClient(config)
+
+            # 获取工具信息
+            tools = mcp_client.get_tool_list()
+            if not tools:
+                PrettyOutput.print(f"从 {file_path} 获取工具列表失败", OutputType.WARNING)
+                return False
+
+            # 注册每个工具
+            for tool in tools:
+
+                # 注册工具
+                self.register_tool(
+                    name=f"{name}.tool_call.{tool['name']}",
+                    description=tool['description'],
+                    parameters=tool['parameters'],
+                    func=create_mcp_execute_func(tool['name'], mcp_client)
+                )
+
+
+            # 注册资源列表工具
+            self.register_tool(
+                name=f"{name}.resource.get_resource_list",
+                description=f"获取{name}MCP服务器上的资源列表",
+                parameters={
+                    'type': 'object',
+                    'properties': {},
+                    'required': []
+                },
+                func=create_resource_list_func(mcp_client)
+            )
+
+            # 注册获取资源工具
+            self.register_tool(
+                name=f"{name}.resource.get_resource",
+                description=f"获取{name}MCP服务器上的指定资源",
+                parameters={
+                    'type': 'object',
+                    'properties': {
+                        'uri': {
+                            'type': 'string',
+                            'description': '资源的URI标识符'
+                        }
+                    },
+                    'required': ['uri']
+                },
+                func=create_resource_get_func(mcp_client)
+            )
+
+            return True
+
+
         except Exception as e:
             PrettyOutput.print(f"文件 {file_path} 加载失败: {str(e)}", OutputType.WARNING)
             return False
-        
+
     def register_tool_by_file(self, file_path: str) -> bool:
         """从指定文件加载并注册工具
 
@@ -348,12 +390,12 @@ class ToolRegistry(OutputHandler):
         except Exception as e:
             PrettyOutput.print(f"从 {Path(file_path).name} 加载工具失败: {str(e)}", OutputType.ERROR)
             return False
-        
+
     @staticmethod
     def _has_tool_calls_block(content: str) -> bool:
         """从内容中提取工具调用块"""
         return re.search(ot("TOOL_CALL")+r'(.*?)'+ct("TOOL_CALL"), content, re.DOTALL) is not None
-        
+
     @staticmethod
     def _extract_tool_calls(content: str) -> Tuple[Dict[str, Dict[str, Any]], str]:
         """从内容中提取工具调用。
@@ -376,20 +418,20 @@ class ToolRegistry(OutputHandler):
                 if 'name' in msg and 'arguments' in msg and 'want' in msg:
                     ret.append(msg)
                 else:
-                    return {}, f"""工具调用格式错误，请检查工具调用格式。 
-                    
-                    {tool_call_help}""" 
+                    return {}, f"""工具调用格式错误，请检查工具调用格式。
+
+                    {tool_call_help}"""
             except Exception as e:
-                return {}, f"""工具调用格式错误，请检查工具调用格式。 
-                
-                {tool_call_help}""" 
+                return {}, f"""工具调用格式错误，请检查工具调用格式。
+
+                {tool_call_help}"""
         if len(ret) > 1:
             return {}, "检测到多个工具调用，请一次只处理一个工具调用。"
         return ret[0] if ret else {}, ""
 
-    def register_tool(self, name: str, description: str, parameters: Dict[str, Dict[str, Any]], func: Callable[..., Dict[str, Any]]) -> None:
+    def register_tool(self, name: str, description: str, parameters: Any, func: Callable[..., Dict[str, Any]]) -> None:
         """注册新工具
-        
+
         参数:
             name: 工具名称
             description: 工具描述
@@ -400,10 +442,10 @@ class ToolRegistry(OutputHandler):
 
     def get_tool(self, name: str) -> Optional[Tool]:
         """获取工具
-        
+
         参数:
             name: 工具名称
-            
+
         返回:
             Optional[Tool]: 找到的工具实例，如果不存在则返回None
         """
@@ -411,7 +453,7 @@ class ToolRegistry(OutputHandler):
 
     def get_all_tools(self) -> List[Dict[str, Any]]:
         """获取所有工具（Ollama格式定义）
-        
+
         返回:
             List[Dict[str, Any]]: 包含所有工具信息的列表
         """
@@ -419,11 +461,11 @@ class ToolRegistry(OutputHandler):
 
     def execute_tool(self, name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
         """执行指定工具
-        
+
         参数:
             name: 工具名称
             arguments: 工具参数
-            
+
         返回:
             Dict[str, Any]: 包含执行结果的字典，包含success、stdout和stderr字段
         """
@@ -485,7 +527,7 @@ class ToolRegistry(OutputHandler):
                 return f"""工具调用原始输出过长，以下是根据输出提出的信息：
 
 {platform.chat_until_success(prompt)}"""
-                
+
             return output
 
         except Exception as e:

jarvis/jarvis_utils/config.py

@@ -29,7 +29,7 @@ def get_max_input_token_count() -> int:
     返回:
         int: 模型能处理的最大输入token数量。
     """
-    return int(os.getenv('JARVIS_MAX_INPUT_TOKEN_COUNT', '32000'))
+    return int(os.getenv('JARVIS_MAX_INPUT_TOKEN_COUNT', '64000'))
 
 
 def is_auto_complete() -> bool:

jarvis/jarvis_utils/methodology.py

@@ -144,10 +144,10 @@ def load_methodology(user_input: str) -> str:
         prompt = f"""根据用户需求: {user_input}
 
 请按以下格式回复：
-### 相关的方法论
+### 与该任务/需求相关的方法论
 1. [方法论名字]
 2. [方法论名字]
-### 总结的方法论内容
+### 根据以上方法论，总结出方法论内容
 [总结的方法论内容]
 
 如果没有匹配的方法论，请输出：没有历史方法论可参考

{jarvis_ai_assistant-0.1.150.dist-info → jarvis_ai_assistant-0.1.151.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.150
+Version: 0.1.151
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -42,7 +42,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests==2.32.3
 Requires-Dist: colorama==0.4.6
-Requires-Dist: prompt-toolkit==3.0.50
+Requires-Dist: prompt_toolkit==3.0.50
 Requires-Dist: yaspin==2.4.0
 Requires-Dist: pygments==2.19.1
 Requires-Dist: fuzzywuzzy==0.18.0
@@ -54,11 +54,16 @@ Requires-Dist: transformers==4.46.3
 Requires-Dist: torch==2.4.1
 Requires-Dist: python-Levenshtein==0.25.1
 Requires-Dist: sseclient==0.0.27
+Requires-Dist: pillow==10.2.1
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: isort; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
+Dynamic: author
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-python
 
 # 🤖 Jarvis AI 助手
 <p align="center">
@@ -276,6 +281,30 @@ class CustomTool:
 ```
 
 
+### 添加MCP
+MCP(模型上下文协议)。在`~/.jarvis/tools/mcp/`中创建YAML配置文件：
+
+#### 本地MCP配置（`stdio`模式）
+```yaml
+type: local
+name: MCP名称
+command: 可执行命令
+args: [参数列表]  # 可选
+env:  # 可选环境变量
+  KEY: VALUE
+```
+
+#### 远程MCP配置（`sse`模式）
+```yaml
+type: remote
+name: MCP名称
+base_url: http://example.com/api
+auth_token: 认证令牌  # 可选
+headers:  # 可选HTTP头
+  X-Custom-Header: value
+```
+
+
 ### 添加新大模型平台
 在 `~/.jarvis/platforms/` 中创建新的 Python 文件：
 ```python

{jarvis_ai_assistant-0.1.150.dist-info → jarvis_ai_assistant-0.1.151.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jarvis/__init__.py,sha256=LAXd2PqzX1hdAOiMxEwjP0kqPkpnlGGCzmHQH7bDoXI,50
+jarvis/__init__.py,sha256=RgZgU-h6b2rFUONprNXY6qN0TgybOI3uDfFqF21sQzA,50
 jarvis/jarvis_agent/__init__.py,sha256=QtWu2kh6o5IB_XtGLoxHi5K9lA1t8XoqNUXtX-OqujY,23796
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=0SjlBYnBWKNi3eVdZ7c2NuP82tQej7DEWLAqG6bY1Rc,4357
 jarvis/jarvis_agent/file_input_handler.py,sha256=6R68cSjLBnSJjTKJrSO2IqziRDFnxazU_Jq2t1W1ndo,3695
@@ -35,16 +35,16 @@ jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 jarvis/jarvis_git_details/main.py,sha256=YowncVxYyJ3y2EvGrZhAJeR4yizXp6aB3dqvoYTepFY,6117
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=xBNkAl7_8_pQC-C6RcUImA1mEU4KTqhjtA57rG_mMJ8,2179
-jarvis/jarvis_git_utils/git_commiter.py,sha256=dozU5vmodhb-uiLJBHGRPzUMU1er4xqvjClG3sqNwTA,10780
+jarvis/jarvis_git_utils/git_commiter.py,sha256=pnUiX-KkAMLDBRMXot93T9zTdoYsIJpqVMozMwQo6R0,11096
 jarvis/jarvis_lsp/base.py,sha256=f-76xgNijfQ4G3Q0t8IfOGtCu-q2TSQ7a_in6XwDb_8,2030
 jarvis/jarvis_lsp/cpp.py,sha256=ekci2M9_UtkCSEe9__72h26Gat93r9_knL2VmFr8X5M,3141
 jarvis/jarvis_lsp/go.py,sha256=sSypuQSP5X2YtrVMC8XCc5nXkgfG93SO7sC89lHzoR8,3458
 jarvis/jarvis_lsp/python.py,sha256=OJuYHLHI1aYNNWcAFayy_5GxogwyMC3A7KOYGjxN1yg,1843
 jarvis/jarvis_lsp/registry.py,sha256=-b7lAfZ6SNp3O0ifRiFSLxH0xJlPQhkq4DATDDjJb1U,6491
 jarvis/jarvis_lsp/rust.py,sha256=ICmQs5UVdMZwn5KjaF1YRXBCLUMtGF8Z9IwE5rqWkrU,3686
-jarvis/jarvis_mcp/__init__.py,sha256=gVPImIkjVSYdc9hJykceEiHnO19oX-rHAUuVR3Ztczg,1044
-jarvis/jarvis_mcp/local_mcp_client.py,sha256=cTOVtrMSZCyPsDNvC5egUus11YWSrZYyR7XKBkIIfgo,8404
-jarvis/jarvis_mcp/remote_mcp_client.py,sha256=ji7wO0VxM3I9lDV7eQ1TBTCX9VL6EAVwAVOXnxGxVo4,8112
+jarvis/jarvis_mcp/__init__.py,sha256=gi74_Yz5nsEFhrAyCg1Ovxsj-hLweLjMGoOaceL2yx4,2090
+jarvis/jarvis_mcp/local_mcp_client.py,sha256=JKmGJG0sOJxs4Sk-k4SfZq01RiZCGY6oYslvcK7lxJg,11790
+jarvis/jarvis_mcp/remote_mcp_client.py,sha256=J9Y2-9VBQb0uJKglev-U3AQg1AfLDmghRbCvNDPSzdI,23478
 jarvis/jarvis_methodology/main.py,sha256=IBv87UOmdCailgooMtWEcqZcQHmNLhZD-kkGw5jOcVg,3375
 jarvis/jarvis_multi_agent/__init__.py,sha256=SX8lBErhltKyYRM-rymrMz3sJ0Zl3hBXrpsPdFgzkQc,4399
 jarvis/jarvis_multi_agent/main.py,sha256=aGuUC3YQmahabqwDwZXJjfQLYsZ3KIZdf8DZDlVNMe4,1543
@@ -58,7 +58,7 @@ jarvis/jarvis_platform_manager/main.py,sha256=o7UDrcCkLf9dTh2LOO-_bQVHjWf2X6RuSY
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=slP_8CwpfMjWFZis0At1ANRlPb3gx1KteAg1B7R7dl4,4546
 jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_tools/ask_codebase.py,sha256=xQTcuDl7cbH6uVkWlkA1HXJAo4_3r09-3SboUkBEBDU,10062
+jarvis/jarvis_tools/ask_codebase.py,sha256=S6NArvKZyK8WEbsEgeGCljjg4D9mteWrq9m352V58jU,9635
 jarvis/jarvis_tools/ask_user.py,sha256=NjxTCHGKo4nthbEQD-isvPCW4PQhTcekEferjnukX70,2143
 jarvis/jarvis_tools/base.py,sha256=vskI4czVdlhbo38ODuF9rFrnWBYQIhJSPAqAkLVcyTs,1165
 jarvis/jarvis_tools/chdir.py,sha256=do_OdtabiH3lZcT_ynjSAX66XgH2gPl9mYiS7dMMDa8,2682
@@ -73,22 +73,22 @@ jarvis/jarvis_tools/lsp_get_diagnostics.py,sha256=IYqv8jQwSK71sZpDBRolSDnYii8t0M
 jarvis/jarvis_tools/methodology.py,sha256=gnlJojY4Dg5v9AAB5xcpKqpPIHs0tOYVtzTHkwOrWk0,5214
 jarvis/jarvis_tools/read_code.py,sha256=_X6D3AIgRD9YplSDnFhXOm8wQAZMA3pkkXy31SG33l0,6041
 jarvis/jarvis_tools/read_webpage.py,sha256=syduSZK4kXRRTPzeZ2W9Q6YH5umKiMJZyjA0cCpSF4g,2198
-jarvis/jarvis_tools/registry.py,sha256=-wzv1Xfzvzu8-A22xTvPnGhgYamuFU_PVmpr_sgoxA8,23083
+jarvis/jarvis_tools/registry.py,sha256=ELlX1ZqCSDQc5D9RwI5xVXgBgN0IeIjWG_lD6P9T5o0,24100
 jarvis/jarvis_tools/search_web.py,sha256=kWW9K2QUR2AxPq6gcyx4Bgy-0Y4gzcdErq1DNT1EYM4,1333
 jarvis/jarvis_tools/virtual_tty.py,sha256=Rpn9VXUG17LQsY87F_O6UCjN_opXB05mpwozxYf-xVI,16372
 jarvis/jarvis_utils/__init__.py,sha256=KMg-KY5rZIhGTeOD5e2Xo5CU7DX1DUz4ULWAaTQ-ZNw,825
-jarvis/jarvis_utils/config.py,sha256=1OKG64hK740C1RzGk4Kov-6MgpODupMLhuma_OO5vxs,3317
+jarvis/jarvis_utils/config.py,sha256=UXIwt1TknkYIuNW15TNiyZ1HJFdjjAzmt_D7_cd6xxQ,3317
 jarvis/jarvis_utils/embedding.py,sha256=_Q-VurYHQZSsyISClTFjadDaNqNPBMqJe58lMM6bsVs,6991
 jarvis/jarvis_utils/file_processors.py,sha256=oNtVlz2JHcQ60NS6sgI-VsvYXOnsQgFUEVenznCXHC4,2952
 jarvis/jarvis_utils/git_utils.py,sha256=j_Jw6h7JD91XhMf0WD3MAH4URkLUBrrYCLnuLm1GeN4,5630
 jarvis/jarvis_utils/globals.py,sha256=Ed2d6diWXCgI74HVV_tI4qW7yXxLpNvQKN2yG0IH9hc,3388
 jarvis/jarvis_utils/input.py,sha256=QhqZEF4BpOGDgNEBrTBabA5n8DnlU0GaHqbKUEZ13Ls,6953
-jarvis/jarvis_utils/methodology.py,sha256=dVk_1GmVFlZnj1EPR_3wilP2-vyOygAIH56w_8PC8Sw,6281
+jarvis/jarvis_utils/methodology.py,sha256=E_FQOSLA9o8bKfmgORNMlkDtqPiqlCkQoIkPuxPQol4,6324
 jarvis/jarvis_utils/output.py,sha256=BmWdB1bmizv0xfU4Z___9p_xQodorriIcEgADVq9fk0,8416
 jarvis/jarvis_utils/utils.py,sha256=j-YZap58avAzSb9ZuB2I71trVqVxIpFxxZDoh8_7a_o,4653
-jarvis_ai_assistant-0.1.150.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.150.dist-info/METADATA,sha256=7qCut4ZuAw6wrI-H61ZzAYaeeljHvPen4W2fDTr0Zrk,10975
-jarvis_ai_assistant-0.1.150.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-jarvis_ai_assistant-0.1.150.dist-info/entry_points.txt,sha256=4ZS8kq6jahnmfDyXFSx39HRi-Tkbp0uFc6cTXt3QIHA,929
-jarvis_ai_assistant-0.1.150.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.150.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.151.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.151.dist-info/METADATA,sha256=_QXsf2ezynGKHG9ZD-_qbOYk6mD0hQPwrW5bMrrPjHI,11562
+jarvis_ai_assistant-0.1.151.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+jarvis_ai_assistant-0.1.151.dist-info/entry_points.txt,sha256=4ZS8kq6jahnmfDyXFSx39HRi-Tkbp0uFc6cTXt3QIHA,929
+jarvis_ai_assistant-0.1.151.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.151.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.150.dist-info → jarvis_ai_assistant-0.1.151.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any