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

jarvis/__init__.py

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

jarvis/jarvis_agent/jarvis.py

@@ -4,6 +4,7 @@ import sys
 
 from typing import Dict  # 仅保留实际使用的类型导入
 
+from jarvis.jarvis_utils.config import get_data_dir
 from prompt_toolkit import prompt
 import yaml
 from yaspin import yaspin
@@ -25,13 +26,14 @@ def _load_tasks() -> Dict[str, str]:
     """Load tasks from .jarvis files in user home and current directory."""
     tasks: Dict[str, str] = {}
 
-    # Check .jarvis/pre-command in user directory
-    user_jarvis = os.path.expanduser("~/.jarvis/pre-command")
-    if os.path.exists(user_jarvis):
-        spinner_text = f"从{user_jarvis}加载预定义任务..."
+    # Check pre-command in data directory
+    data_dir = get_data_dir()
+    pre_command_path = os.path.join(data_dir, "pre-command")
+    if os.path.exists(pre_command_path):
+        spinner_text = f"从{pre_command_path}加载预定义任务..."
         with yaspin(text=spinner_text, color="cyan") as spinner:
             try:
-                with open(user_jarvis, "r", encoding="utf-8", errors="ignore") as f:
+                with open(pre_command_path, "r", encoding="utf-8", errors="ignore") as f:
                     user_tasks = yaml.safe_load(f)
                 if isinstance(user_tasks, dict):
                     for name, desc in user_tasks.items():

jarvis/jarvis_agent/main.py

@@ -1,7 +1,6 @@
 import argparse
 import yaml
 import os
-from typing import Optional, List
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType

jarvis/jarvis_agent/patch.py

@@ -238,7 +238,8 @@ def revert_file(filepath: str):
         # 检查文件是否在版本控制中
         result = subprocess.run(
             ['git', 'ls-files', '--error-unmatch', filepath],
-            stderr=subprocess.PIPE
+            stderr=subprocess.PIPE,
+            text=False  # 禁用自动文本解码
         )
         if result.returncode == 0:
             subprocess.run(['git', 'checkout', 'HEAD',
@@ -248,33 +249,67 @@ def revert_file(filepath: str):
                 os.remove(filepath)
         subprocess.run(['git', 'clean', '-f', '--', filepath], check=True)
     except subprocess.CalledProcessError as e:
-        PrettyOutput.print(f"恢复文件失败: {str(e)}", OutputType.ERROR)
+        error_msg = e.stderr.decode('utf-8', errors='replace') if e.stderr else str(e)
+        PrettyOutput.print(f"恢复文件失败: {error_msg}", OutputType.ERROR)
 # 修改后的恢复函数
 
 
 def revert_change():
+    """恢复所有未提交的修改到HEAD状态"""
     import subprocess
-    subprocess.run(['git', 'reset', '--hard', 'HEAD'], check=True)
-    subprocess.run(['git', 'clean', '-fd'], check=True)
+    try:
+        # 检查是否为空仓库
+        head_check = subprocess.run(
+            ['git', 'rev-parse', '--verify', 'HEAD'],
+            stderr=subprocess.PIPE,
+            stdout=subprocess.PIPE
+        )
+        if head_check.returncode == 0:
+            subprocess.run(['git', 'reset', '--hard', 'HEAD'], check=True)
+        subprocess.run(['git', 'clean', '-fd'], check=True)
+    except subprocess.CalledProcessError as e:
+        return f"恢复更改失败: {str(e)}"
 # 修改后的获取差异函数
 
 
 def get_diff() -> str:
     """使用git获取暂存区差异"""
     import subprocess
+    
+    # 初始化状态
+    need_reset = False
+    
     try:
+        # 暂存所有修改
         subprocess.run(['git', 'add', '.'], check=True)
+        need_reset = True
+        
+        # 获取差异
         result = subprocess.run(
             ['git', 'diff', '--cached'],
             capture_output=True,
-            text=True,
+            text=False,
             check=True
         )
-        ret = result.stdout
-        subprocess.run(['git', "reset", "--mixed", "HEAD"], check=True)
+        
+        # 解码输出
+        try:
+            ret = result.stdout.decode('utf-8')
+        except UnicodeDecodeError:
+            ret = result.stdout.decode('utf-8', errors='replace')
+        
+        # 重置暂存区
+        subprocess.run(['git', "reset", "--mixed"], check=False)
         return ret
+        
     except subprocess.CalledProcessError as e:
+        if need_reset:
+            subprocess.run(['git', "reset", "--mixed"], check=False)
         return f"获取差异失败: {str(e)}"
+    except Exception as e:
+        if need_reset:
+            subprocess.run(['git', "reset", "--mixed"], check=False)
+        return f"发生意外错误: {str(e)}"
 
 
 def handle_commit_workflow() -> bool:

jarvis/jarvis_code_analysis/code_review.py

@@ -4,7 +4,6 @@ import os
 import re
 import tempfile
 
-from httpx import get
 from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.read_code import ReadCodeTool

jarvis/jarvis_git_utils/git_commiter.py

@@ -3,7 +3,6 @@ import shlex
 import subprocess
 from typing import Dict, Any, Optional
 import tempfile
-from click import Option
 import yaml
 from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry

jarvis/jarvis_lsp/base.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import List, Dict, Optional, Tuple, Any, Union
+from typing import List, Dict, Any, Union
 
 class BaseLSP(ABC):
     """Base class for Language Server Protocol integration.

jarvis/jarvis_lsp/cpp.py

@@ -1,7 +1,7 @@
 import os
 import shutil
 import subprocess
-from typing import List, Dict, Optional, Tuple, Any
+from typing import List, Dict, Optional, Any
 import json
 from jarvis.jarvis_lsp.base import BaseLSP
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput

jarvis/jarvis_lsp/go.py

@@ -1,7 +1,7 @@
 import os
 import shutil
 import subprocess
-from typing import List, Dict, Optional, Tuple, Any
+from typing import List, Dict, Optional, Any
 import json
 from jarvis.jarvis_lsp.base import BaseLSP
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput

jarvis/jarvis_lsp/python.py

@@ -1,4 +1,4 @@
-from typing import List, Dict, Optional, Tuple, Any
+from typing import List, Dict, Any
 import jedi
 from jarvis.jarvis_lsp.base import BaseLSP
 

jarvis/jarvis_lsp/registry.py

@@ -6,6 +6,7 @@ import sys
 from typing import Dict, Type, Optional, List
 from jarvis.jarvis_lsp.base import BaseLSP
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.config import get_data_dir
 
 REQUIRED_METHODS = [
     ('initialize', ['workspace_path']),
@@ -21,7 +22,7 @@ class LSPRegistry:
     @staticmethod
     def get_lsp_dir() -> str:
         """Get LSP implementation directory."""
-        user_lsp_dir = os.path.expanduser("~/.jarvis/lsp")
+        user_lsp_dir = os.path.join(get_data_dir(), "lsp")
         if not os.path.exists(user_lsp_dir):
             try:
                 os.makedirs(user_lsp_dir)

jarvis/jarvis_lsp/rust.py

@@ -1,7 +1,7 @@
 import os
 import shutil
 import subprocess
-from typing import List, Dict, Optional, Tuple, Any
+from typing import List, Dict, Optional, Any
 import json
 from jarvis.jarvis_lsp.base import BaseLSP
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput

jarvis/jarvis_mcp/__init__.py

@@ -0,0 +1,36 @@
+from abc import ABC, abstractmethod
+from typing import Any, Dict, List
+
+
+class McpClient(ABC):
+    """MCP客户端抽象基类"""
+    
+    @abstractmethod
+    def get_tool_list(self) -> List[Dict[str, Any]]:
+        """获取工具列表
+        
+        返回:
+            List[Dict[str, Any]]: 工具列表，每个工具包含以下字段：
+                - name: str - 工具名称
+                - description: str - 工具描述
+                - parameters: Dict - 工具参数
+        """
+        pass
+    
+    @abstractmethod
+    def execute(self, tool_name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
+        """执行工具
+        
+        参数:
+            tool_name: 工具名称
+            arguments: 参数字典，包含工具执行所需的参数
+            
+        返回:
+            Dict[str, Any]: 执行结果，包含以下字段：
+                - success: bool - 是否执行成功
+                - stdout: str - 标准输出
+                - stderr: str - 标准错误
+        """
+        pass
+
+

jarvis/jarvis_mcp/local_mcp_client.py

@@ -0,0 +1,241 @@
+from typing import Any, Dict, List
+import subprocess
+import os
+import json
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from . import McpClient
+
+
+class LocalMcpClient(McpClient):
+    """本地MCP客户端实现
+    
+    参数:
+        config: 配置字典（command、args、env）
+    """
+    def __init__(self, config: Dict[str, Any]):
+        self.config = config
+        self.process = None
+        self.protocol_version = "2025-03-26"  # MCP协议版本
+        self._start_process()
+        self._initialize()
+
+    def _start_process(self) -> None:
+        """启动MCP进程"""
+        try:
+            # 构建命令和参数
+            command = self.config.get('command', '')
+            if not command:
+                raise ValueError('No command specified in config')
+
+            # 获取参数列表
+            args = self.config.get('args', [])
+            if not isinstance(args, list):
+                args = [str(args)]
+
+            # 获取环境变量
+            env = os.environ.copy()
+            env.update(self.config.get('env', {}))
+
+            # 启动进程
+            self.process = subprocess.Popen(
+                [command] + args,
+                stdin=subprocess.PIPE,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                env=env,
+                text=True
+            )
+
+        except Exception as e:
+            PrettyOutput.print(f"启动MCP进程失败: {str(e)}", OutputType.ERROR)
+            raise
+
+    def _initialize(self) -> None:
+        """初始化MCP连接"""
+        try:
+            # 发送初始化请求
+            response = self._send_request('initialize', {
+                'processId': os.getpid(),
+                'clientInfo': {
+                    'name': 'jarvis',
+                    'version': '1.0.0'
+                },
+                'capabilities': {},
+                'protocolVersion': self.protocol_version
+            })
+
+            # 验证服务器响应
+            if 'result' not in response:
+                raise RuntimeError(f"初始化失败: {response.get('error', 'Unknown error')}")
+
+            result = response['result']
+            
+            # 发送initialized通知 - 使用正确的方法名格式
+            self._send_notification('notifications/initialized', {})
+
+        except Exception as e:
+            PrettyOutput.print(f"MCP初始化失败: {str(e)}", OutputType.ERROR)
+            raise
+
+    def _send_request(self, method: str, params: Dict[str, Any]) -> Dict[str, Any]:
+        """发送请求到MCP进程
+        
+        参数:
+            method: 请求方法
+            params: 请求参数
+            
+        返回:
+            Dict[str, Any]: 响应结果
+        """
+        if not self.process:
+            raise RuntimeError('MCP process not started')
+
+        try:
+            # 构建请求
+            request = {
+                'jsonrpc': '2.0',
+                'method': method,
+                'params': params,
+                'id': 1
+            }
+
+            # 发送请求
+            self.process.stdin.write(json.dumps(request) + '\n')  # type: ignore
+            self.process.stdin.flush()  # type: ignore
+
+            # 读取响应
+            response = self.process.stdout.readline()  # type: ignore
+            return json.loads(response)
+
+        except Exception as e:
+            PrettyOutput.print(f"发送请求失败: {str(e)}", OutputType.ERROR)
+            raise
+
+    def _send_notification(self, method: str, params: Dict[str, Any]) -> None:
+        """发送通知到MCP进程（不需要响应）
+        
+        参数:
+            method: 通知方法
+            params: 通知参数
+        """
+        if not self.process:
+            raise RuntimeError('MCP process not started')
+
+        try:
+            # 构建通知
+            notification = {
+                'jsonrpc': '2.0',
+                'method': method,
+                'params': params
+            }
+            # 发送通知
+            self.process.stdin.write(json.dumps(notification) + '\n')  # type: ignore
+            self.process.stdin.flush()  # type: ignore
+
+        except Exception as e:
+            PrettyOutput.print(f"发送通知失败: {str(e)}", OutputType.ERROR)
+            raise
+
+    def get_tool_list(self) -> List[Dict[str, Any]]:
+        """获取工具列表
+        
+        返回:
+            List[Dict[str, Any]]: 工具列表，每个工具包含以下字段：
+                - name: str - 工具名称
+                - description: str - 工具描述
+                - parameters: Dict - 工具参数
+        """
+        try:
+            response = self._send_request('tools/list', {})
+            if 'result' in response and 'tools' in response['result']:
+                # 注意这里: 响应结构是 response['result']['tools']
+                tools = response['result']['tools']
+                # 将MCP协议字段转换为内部格式
+                formatted_tools = []
+                for tool in tools:
+                    # 从inputSchema中提取参数定义
+                    input_schema = tool.get('inputSchema', {})
+                    parameters = {}
+                    if 'properties' in input_schema:
+                        parameters = input_schema['properties']
+                    
+                    formatted_tools.append({
+                        'name': tool.get('name', ''),
+                        'description': tool.get('description', ''),
+                        'parameters': parameters
+                    })
+                return formatted_tools
+            else:
+                error_msg = "获取工具列表失败"
+                if 'error' in response:
+                    error_msg += f": {response['error']}"
+                elif 'result' in response:
+                    error_msg += f": 响应格式不正确 - {response['result']}"
+                else:
+                    error_msg += ": 未知错误"
+                    
+                PrettyOutput.print(error_msg, OutputType.ERROR)
+                return []
+        except Exception as e:
+            PrettyOutput.print(f"获取工具列表失败: {str(e)}", OutputType.ERROR)
+            return []
+
+    def execute(self, tool_name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
+        """执行工具
+        
+        参数:
+            tool_name: 工具名称
+            arguments: 参数字典，包含工具执行所需的参数
+            
+        返回:
+            Dict[str, Any]: 执行结果，包含以下字段：
+                - success: bool - 是否执行成功
+                - stdout: str - 标准输出
+                - stderr: str - 标准错误
+        """
+        try:
+            response = self._send_request('tools/call', {
+                'name': tool_name,
+                'arguments': arguments
+            })
+            if 'result' in response:
+                result = response['result']
+                # 从content中提取输出信息
+                stdout = ''
+                stderr = ''
+                for content in result.get('content', []):
+                    if content.get('type') == 'text':
+                        stdout += content.get('text', '')
+                    elif content.get('type') == 'error':
+                        stderr += content.get('text', '')
+                
+                return {
+                    'success': True,
+                    'stdout': stdout,
+                    'stderr': stderr
+                }
+            else:
+                return {
+                    'success': False,
+                    'stdout': '',
+                    'stderr': response.get('error', 'Unknown error')
+                }
+        except Exception as e:
+            PrettyOutput.print(f"执行工具失败: {str(e)}", OutputType.ERROR)
+            return {
+                'success': False,
+                'stdout': '',
+                'stderr': str(e)
+            }
+
+    def __del__(self):
+        """清理资源"""
+        if self.process:
+            try:
+                # 发送退出通知 - 使用通知而非请求
+                self._send_notification('notifications/exit', {})
+                # 等待进程结束
+                self.process.wait(timeout=1)
+            except:
+                # 如果进程没有正常退出，强制终止
+                self.process.kill()