jarvis-ai-assistant 0.1.129__py3-none-any.whl → 0.1.131__py3-none-any.whl

jarvis/jarvis_tools/execute_shell.py

@@ -74,11 +74,11 @@ class ShellTool:
             tee_command = f"script -q -c '{escaped_command}' {output_file}"
             
             # Execute command and capture return code
-            return_code = os.system(tee_command)
+            os.system(tee_command)
             
             # Read and process output file
             try:
-                with open(output_file, 'r', encoding='utf-8', errors='replace') as f:
+                with open(output_file, 'r', encoding='utf-8', errors='ignore') as f:
                     output = f.read()
                     # Remove header and footer added by script command
                     if output:

jarvis/jarvis_tools/execute_shell_script.py

@@ -33,7 +33,7 @@ class ShellScriptTool:
             # Create temporary script file
             script_path = os.path.join(tempfile.gettempdir(), f"jarvis_script_{os.getpid()}.sh")
             try:
-                with open(script_path, 'w', encoding='utf-8') as f:
+                with open(script_path, 'w', encoding='utf-8', errors="ignore") as f:
                     f.write(script_content)
                 # Use execute_shell to run the script
                 from jarvis.jarvis_tools.execute_shell import ShellTool

jarvis/jarvis_tools/file_operation.py

@@ -55,7 +55,7 @@ class FileOperationTool:
                             "stderr": "File too large (>10MB)"
                         }
                         
-                    with open(abs_path, 'r', encoding='utf-8') as f:
+                    with open(abs_path, 'r', encoding='utf-8', errors="ignore") as f:
                         lines = f.readlines()
                     
                     
@@ -90,7 +90,7 @@ class FileOperationTool:
             elif operation == "write":
                 with yaspin(text=f"正在写入文件: {abs_path}...", color="cyan") as spinner:
                     os.makedirs(os.path.dirname(os.path.abspath(abs_path)), exist_ok=True)
-                    with open(abs_path, 'w', encoding='utf-8') as f:
+                    with open(abs_path, 'w', encoding='utf-8', errors="ignore") as f:
                         f.write(content)
                     spinner.text = f"文件写入完成: {abs_path}"
                     spinner.ok("✅")

jarvis/jarvis_tools/git_commiter.py

@@ -8,8 +8,9 @@ from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
 import sys
 import argparse
+import os
 
-from jarvis.jarvis_utils.git_utils import has_uncommitted_changes
+from jarvis.jarvis_utils.git_utils import find_git_root, has_uncommitted_changes
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 
@@ -24,6 +25,11 @@ class GitCommitTool:
                 "type": "string",
                 "description": "提交信息的语言",
                 "default": "Chinese"
+            },
+            "root_dir": {
+                "type": "string",
+                "description": "Git仓库的根目录路径（可选）",
+                "default": "."
             }
         },
         "required": []
@@ -51,82 +57,95 @@ class GitCommitTool:
     def execute(self, args: Dict) -> Dict[str, Any]:
         """Execute automatic commit process with support for multi-line messages and special characters"""
         try:
-            if not has_uncommitted_changes():
-                PrettyOutput.print("没有未提交的更改", OutputType.SUCCESS)
-                return {"success": True, "stdout": "No changes to commit", "stderr": ""}
+            root_dir = args.get("root_dir", ".")
             
-            with yaspin(text="正在初始化提交流程...", color="cyan") as spinner:
-                # 添加文件
-                spinner.text = "正在添加文件到提交..."
-                subprocess.Popen(
-                    ["git", "add", "."],
-                    stdout=subprocess.DEVNULL,
-                    stderr=subprocess.DEVNULL
-                ).wait()
-                spinner.write("✅ 添加文件到提交")
-                
-                # 获取差异
-                spinner.text = "正在获取代码差异..."
-                process = subprocess.Popen(
-                    ["git", "diff", "--cached", "--exit-code"],
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.PIPE
-                )
-                diff = process.communicate()[0].decode()
-                spinner.write("✅ 获取差异")
+            # Store current directory
+            original_dir = os.getcwd()
+            
+            try:
+                # Change to root_dir
+                os.chdir(root_dir)
                 
-                # 生成提交信息
-                spinner.text = "正在生成提交消息..."
-                prompt = f'''根据以下规则生成提交信息：
-                提交信息应使用{args.get('lang', '中文')}书写
-    # 必需结构
-    必须使用以下格式：
-    <COMMIT_MESSAGE>
-    <类型>(<范围>): <主题>
-    使用祈使语气描述变更内容
-    </COMMIT_MESSAGE>
-    # 格式规则
-    1. 类型: fix, feat, docs, style, refactor, test, chore
-    2. 范围表示模块 (例如: auth, database)
-    3. 主题行 <= 72个字符，不以句号结尾
-    4. 正文使用现在时态解释每个变更的内容和原因
-    5. 不要遗漏任何变更
-    # 分析材料
-    {diff}
-    '''
-                platform = PlatformRegistry().get_codegen_platform()
-                commit_message = platform.chat_until_success(prompt)
-                commit_message = self._extract_commit_message(commit_message)
-                spinner.write("✅ 生成提交消息")
+                find_git_root()
+                if not has_uncommitted_changes():
+                    PrettyOutput.print("没有未提交的更改", OutputType.SUCCESS)
+                    return {"success": True, "stdout": "No changes to commit", "stderr": ""}
                 
-                # 执行提交
-                spinner.text = "正在准备提交..."
-                with tempfile.NamedTemporaryFile(mode='w', delete=True) as tmp_file:
-                    tmp_file.write(commit_message)
-                    tmp_file.flush()
-                    spinner.text = "正在执行提交..."
-                    commit_cmd = ["git", "commit", "-F", tmp_file.name]
+                with yaspin(text="正在初始化提交流程...", color="cyan") as spinner:
+                    # 添加文件
+                    spinner.text = "正在添加文件到提交..."
                     subprocess.Popen(
-                        commit_cmd,
+                        ["git", "add", "."],
                         stdout=subprocess.DEVNULL,
                         stderr=subprocess.DEVNULL
                     ).wait()
-                    spinner.write("✅ 提交")
+                    spinner.write("✅ 添加文件到提交")
+                    
+                    # 获取差异
+                    spinner.text = "正在获取代码差异..."
+                    process = subprocess.Popen(
+                        ["git", "diff", "--cached", "--exit-code"],
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE
+                    )
+                    diff = process.communicate()[0].decode()
+                    spinner.write("✅ 获取差异")
+                    
+                    # 生成提交信息
+                    spinner.text = "正在生成提交消息..."
+                    prompt = f'''根据以下规则生成提交信息：
+                    提交信息应使用{args.get('lang', '中文')}书写
+        # 必需结构
+        必须使用以下格式：
+        <COMMIT_MESSAGE>
+        <类型>(<范围>): <主题>
+        使用祈使语气描述变更内容
+        </COMMIT_MESSAGE>
+        # 格式规则
+        1. 类型: fix, feat, docs, style, refactor, test, chore
+        2. 范围表示模块 (例如: auth, database)
+        3. 主题行 <= 72个字符，不以句号结尾
+        4. 正文使用现在时态解释每个变更的内容和原因
+        5. 不要遗漏任何变更
+        # 分析材料
+        {diff}
+        '''
+                    platform = PlatformRegistry().get_codegen_platform()
+                    commit_message = platform.chat_until_success(prompt)
+                    commit_message = self._extract_commit_message(commit_message)
+                    spinner.write("✅ 生成提交消息")
+                    
+                    # 执行提交
+                    spinner.text = "正在准备提交..."
+                    with tempfile.NamedTemporaryFile(mode='w', delete=True) as tmp_file:
+                        tmp_file.write(commit_message)
+                        tmp_file.flush()
+                        spinner.text = "正在执行提交..."
+                        commit_cmd = ["git", "commit", "-F", tmp_file.name]
+                        subprocess.Popen(
+                            commit_cmd,
+                            stdout=subprocess.DEVNULL,
+                            stderr=subprocess.DEVNULL
+                        ).wait()
+                        spinner.write("✅ 提交")
 
-                commit_hash = self._get_last_commit_hash()
-                spinner.text = "完成提交"
-                spinner.ok("✅")
+                    commit_hash = self._get_last_commit_hash()
+                    spinner.text = "完成提交"
+                    spinner.ok("✅")
 
-            PrettyOutput.print(f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS)
+                PrettyOutput.print(f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS)
 
-            return {
-                "success": True,
-                "stdout": yaml.safe_dump({
-                    "commit_hash": commit_hash,
-                    "commit_message": commit_message
-                }),
-                "stderr": ""
-                }
+                return {
+                    "success": True,
+                    "stdout": yaml.safe_dump({
+                        "commit_hash": commit_hash,
+                        "commit_message": commit_message
+                    }),
+                    "stderr": ""
+                    }
+            finally:
+                # Always restore original directory
+                os.chdir(original_dir)
 
         except Exception as e:
             return {
@@ -139,9 +158,10 @@ def main():
     init_env()
     parser = argparse.ArgumentParser(description='Git commit tool')
     parser.add_argument('--lang', type=str, default='Chinese', help='Language for commit messages')
+    parser.add_argument('--root-dir', type=str, default='.', help='Root directory of the Git repository')
     args = parser.parse_args()
     tool = GitCommitTool()
-    tool.execute({"lang": args.lang if hasattr(args, 'lang') else 'Chinese'})
+    tool.execute({"lang": args.lang if hasattr(args, 'lang') else 'Chinese', "root_dir": args.root_dir})
 
 if __name__ == "__main__":
     sys.exit(main())

jarvis/jarvis_tools/lsp_find_definition.py

@@ -11,7 +11,12 @@ class LSPFindDefinitionTool:
         "file_path": "包含符号的文件路径",
         "line": "符号所在的行号（从0开始）",
         "character": "符号在行中的字符位置",
-        "language": f"文件的编程语言（{', '.join(LSPRegistry.get_global_lsp_registry().get_supported_languages())}）"
+        "language": f"文件的编程语言（{', '.join(LSPRegistry.get_global_lsp_registry().get_supported_languages())}）",
+        "root_dir": {
+            "type": "string",
+            "description": "LSP操作的根目录路径（可选）",
+            "default": "."
+        }
     }
     
     @staticmethod
@@ -26,6 +31,7 @@ class LSPFindDefinitionTool:
         line = args.get("line", None)
         character = args.get("character", None)
         language = args.get("language", "")
+        root_dir = args.get("root_dir", ".")
         
         # Validate inputs
         if not all([file_path, line is not None, character is not None, language]):
@@ -52,83 +58,93 @@ class LSPFindDefinitionTool:
                 "stdout": ""
             }
             
-        # Get LSP instance
-        registry = LSPRegistry.get_global_lsp_registry()
-        lsp = registry.create_lsp(language)
+        # Store current directory
+        original_dir = os.getcwd()
         
-        if not lsp:
-            return {
-                "success": False,
-                "stderr": f"No LSP support for language: {language}",
-                "stdout": ""
-            }
-            
         try:
-            # Initialize LSP
-            if not lsp.initialize(os.path.abspath(os.getcwd())):
+            # Change to root_dir
+            os.chdir(root_dir)
+            
+            # Get LSP instance
+            registry = LSPRegistry.get_global_lsp_registry()
+            lsp = registry.create_lsp(language)
+            
+            if not lsp:
                 return {
                     "success": False,
-                    "stderr": "LSP initialization failed",
+                    "stderr": f"No LSP support for language: {language}",
                     "stdout": ""
                 }
                 
-            # Get symbol at position
-            symbol = LSPRegistry.get_text_at_position(file_path, line, character)
-            if not symbol:
-                return {
-                    "success": False,
-                    "stderr": f"No symbol found at position {line}:{character}",
-                    "stdout": ""
-                }
+            try:
+                # Initialize LSP
+                if not lsp.initialize(os.path.abspath(os.getcwd())):
+                    return {
+                        "success": False,
+                        "stderr": "LSP initialization failed",
+                        "stdout": ""
+                    }
+                    
+                # Get symbol at position
+                symbol = LSPRegistry.get_text_at_position(file_path, line, character)
+                if not symbol:
+                    return {
+                        "success": False,
+                        "stderr": f"No symbol found at position {line}:{character}",
+                        "stdout": ""
+                    }
+                    
+                # Find definition
+                defn = lsp.find_definition(file_path, (line, character))
+                
+                if not defn:
+                    return {
+                        "success": True,
+                        "stdout": f"No definition found for '{symbol}'",
+                        "stderr": ""
+                    }
+                    
+                # Format output
+                def_line = defn["range"]["start"]["line"]
+                def_char = defn["range"]["start"]["character"]
+                context = LSPRegistry.get_line_at_position(defn["uri"], def_line).strip()
+                
+                output = [
+                    f"Definition of '{symbol}':",
+                    f"File: {defn['uri']}",
+                    f"Line {def_line + 1}, Col {def_char + 1}: {context}"
+                ]
+                
+                # Get a few lines of context around the definition
+                try:
+                    with open(defn["uri"], 'r', errors="ignore") as f:
+                        lines = f.readlines()
+                        start = max(0, def_line - 2)
+                        end = min(len(lines), def_line + 3)
+                        
+                        if start < def_line:
+                            output.append("\nContext:")
+                            for i in range(start, end):
+                                prefix = ">" if i == def_line else " "
+                                output.append(f"{prefix} {i+1:4d} | {lines[i].rstrip()}")
+                except Exception:
+                    pass
                 
-            # Find definition
-            defn = lsp.find_definition(file_path, (line, character))
-            
-            if not defn:
                 return {
                     "success": True,
-                    "stdout": f"No definition found for '{symbol}'",
+                    "stdout": "\n".join(output),
                     "stderr": ""
                 }
                 
-            # Format output
-            def_line = defn["range"]["start"]["line"]
-            def_char = defn["range"]["start"]["character"]
-            context = LSPRegistry.get_line_at_position(defn["uri"], def_line).strip()
-            
-            output = [
-                f"Definition of '{symbol}':",
-                f"File: {defn['uri']}",
-                f"Line {def_line + 1}, Col {def_char + 1}: {context}"
-            ]
-            
-            # Get a few lines of context around the definition
-            try:
-                with open(defn["uri"], 'r') as f:
-                    lines = f.readlines()
-                    start = max(0, def_line - 2)
-                    end = min(len(lines), def_line + 3)
-                    
-                    if start < def_line:
-                        output.append("\nContext:")
-                        for i in range(start, end):
-                            prefix = ">" if i == def_line else " "
-                            output.append(f"{prefix} {i+1:4d} | {lines[i].rstrip()}")
-            except Exception:
-                pass
-            
-            return {
-                "success": True,
-                "stdout": "\n".join(output),
-                "stderr": ""
-            }
-            
-        except Exception as e:
-            return {
-                "success": False,
-                "stderr": f"Error finding definition: {str(e)}",
-                "stdout": ""
-            }
+            except Exception as e:
+                return {
+                    "success": False,
+                    "stderr": f"Error finding definition: {str(e)}",
+                    "stdout": ""
+                }
+            finally:
+                if lsp:
+                    lsp.shutdown()
         finally:
-            if lsp:
-                lsp.shutdown()
+            # Always restore original directory
+            os.chdir(original_dir)

jarvis/jarvis_tools/lsp_find_references.py

@@ -11,7 +11,12 @@ class LSPFindReferencesTool:
         "file_path": "Path to the file containing the symbol",
         "line": "Line number (0-based) of the symbol",
         "character": "Character position in the line",
-        "language": f"Programming language of the file ({', '.join(LSPRegistry.get_global_lsp_registry().get_supported_languages())})"
+        "language": f"Programming language of the file ({', '.join(LSPRegistry.get_global_lsp_registry().get_supported_languages())})",
+        "root_dir": {
+            "type": "string",
+            "description": "Root directory for LSP operations (optional)",
+            "default": "."
+        }
     }
     
     @staticmethod
@@ -26,6 +31,7 @@ class LSPFindReferencesTool:
         line = args.get("line", None)
         character = args.get("character", None)
         language = args.get("language", "")
+        root_dir = args.get("root_dir", ".")
         
         # Validate inputs
         if not all([file_path, line is not None, character is not None, language]):
@@ -52,60 +58,70 @@ class LSPFindReferencesTool:
                 "stdout": ""
             }
             
-        # Get LSP instance
-        registry = LSPRegistry.get_global_lsp_registry()
-        lsp = registry.create_lsp(language)
+        # Store current directory
+        original_dir = os.getcwd()
         
-        if not lsp:
-            return {
-                "success": False,
-                "stderr": f"No LSP support for language: {language}",
-                "stdout": ""
-            }
-            
         try:
-            # Initialize LSP
-            if not lsp.initialize(os.path.abspath(os.getcwd())):
+            # Change to root_dir
+            os.chdir(root_dir)
+            
+            # Get LSP instance
+            registry = LSPRegistry.get_global_lsp_registry()
+            lsp = registry.create_lsp(language)
+            
+            if not lsp:
                 return {
                     "success": False,
-                    "stderr": "LSP initialization failed",
+                    "stderr": f"No LSP support for language: {language}",
                     "stdout": ""
                 }
                 
-            # Get symbol at position
-            symbol = LSPRegistry.get_text_at_position(file_path, line, character)
-            if not symbol:
+            try:
+                # Initialize LSP
+                if not lsp.initialize(os.path.abspath(os.getcwd())):
+                    return {
+                        "success": False,
+                        "stderr": "LSP initialization failed",
+                        "stdout": ""
+                    }
+                    
+                # Get symbol at position
+                symbol = LSPRegistry.get_text_at_position(file_path, line, character)
+                if not symbol:
+                    return {
+                        "success": False,
+                        "stderr": f"No symbol found at position {line}:{character}",
+                        "stdout": ""
+                    }
+                    
+                # Find references
+                refs = lsp.find_references(file_path, (line, character))
+                
+                # Format output
+                output = [f"References to '{symbol}':\n"]
+                for ref in refs:
+                    ref_line = ref["range"]["start"]["line"]
+                    ref_char = ref["range"]["start"]["character"]
+                    context = LSPRegistry.get_line_at_position(ref["uri"], ref_line).strip()
+                    output.append(f"File: {ref['uri']}")
+                    output.append(f"Line {ref_line + 1}, Col {ref_char + 1}: {context}")
+                    output.append("-" * 40)
+                
+                return {
+                    "success": True,
+                    "stdout": "\n".join(output) if len(refs) > 0 else f"No references found for '{symbol}'",
+                    "stderr": ""
+                }
+                
+            except Exception as e:
                 return {
                     "success": False,
-                    "stderr": f"No symbol found at position {line}:{character}",
+                    "stderr": f"Error finding references: {str(e)}",
                     "stdout": ""
                 }
-                
-            # Find references
-            refs = lsp.find_references(file_path, (line, character))
-            
-            # Format output
-            output = [f"References to '{symbol}':\n"]
-            for ref in refs:
-                ref_line = ref["range"]["start"]["line"]
-                ref_char = ref["range"]["start"]["character"]
-                context = LSPRegistry.get_line_at_position(ref["uri"], ref_line).strip()
-                output.append(f"File: {ref['uri']}")
-                output.append(f"Line {ref_line + 1}, Col {ref_char + 1}: {context}")
-                output.append("-" * 40)
-            
-            return {
-                "success": True,
-                "stdout": "\n".join(output) if len(refs) > 0 else f"No references found for '{symbol}'",
-                "stderr": ""
-            }
-            
-        except Exception as e:
-            return {
-                "success": False,
-                "stderr": f"Error finding references: {str(e)}",
-                "stdout": ""
-            }
+            finally:
+                if lsp:
+                    lsp.shutdown()
         finally:
-            if lsp:
-                lsp.shutdown()
+            # Always restore original directory
+            os.chdir(original_dir)