jarvis-ai-assistant 0.1.122__py3-none-any.whl → 0.1.124__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.122" 
+__version__ = "0.1.124" 

jarvis/jarvis_agent/__init__.py

@@ -327,7 +327,7 @@ Please continue the task based on the above information.
                         return self._complete_task()
                     
                     # 获取用户输入
-                    user_input = get_multiline_input(f"{self.name}: 您可以继续输入，或输入空行来结束当前任务：")
+                    user_input = get_multiline_input(f"{self.name}: 请输入，或输入空行来结束当前任务：")
 
                     if user_input:
                         self.prompt = user_input

jarvis/jarvis_code_agent/code_agent.py

@@ -1,14 +1,16 @@
+import subprocess
 import os
 from typing import Dict, List
 
 from jarvis.jarvis_agent import Agent
-from jarvis.jarvis_code_agent.file_select import file_input_handler, select_files
-from jarvis.jarvis_code_agent.patch import PatchOutputHandler
-from jarvis.jarvis_code_agent.relevant_files import find_relevant_information
+from jarvis.jarvis_code_agent.file_select import select_files
+from jarvis.jarvis_code_agent.patch import PatchOutputHandler, file_input_handler
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.git_commiter import GitCommitTool
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_tools.read_code import ReadCodeTool
+from jarvis.jarvis_utils import get_commits_between
+from jarvis.jarvis_utils import OutputType, PrettyOutput, get_multiline_input, has_uncommitted_changes, init_env, find_git_root, user_confirm, get_latest_commit_hash
 from jarvis.jarvis_utils import OutputType, PrettyOutput, get_multiline_input, has_uncommitted_changes, init_env, find_git_root, user_confirm
 
 
@@ -18,6 +20,7 @@ class CodeAgent:
         tool_registry = ToolRegistry()
         tool_registry.use_tools(["read_code",
                                  "execute_shell", 
+                                 "execute_shell_script",
                                  "search", 
                                  "create_code_agent",
                                  "ask_user", 
@@ -29,44 +32,32 @@ class CodeAgent:
                                  "lsp_prepare_rename", 
                                  "lsp_validate_edit"])
         code_system_prompt = """
-# Role: Senior Code Engineer
-Expert in precise code modifications with minimal impact.
-
-## Key Responsibilities
-1. Code Analysis
-   - Use `read_code` and LSP tools before changes
-   - Identify dependencies and patterns
-
-2. Modification Rules
-   - Single atomic change per operation
-   - Strict style consistency
-   - Complete implementations (no stubs)
-   - Full error handling
-
-3. Quality Assurance
-   - Validate with LSP tools
-   - Document complex logic
-   - Maintain API contracts
-
+# Role: Code Engineer
+Expert in precise code modifications with proper tool usage.
+## Tool Usage Guide
+1. read_code: Analyze code files before changes
+2. execute_shell: Run system commands safely
+3. execute_shell_script: Execute script files
+4. search: Find technical information
+5. create_code_agent: Create new code agents
+6. ask_user: Clarify requirements
+7. ask_codebase: Analyze codebase structure
+8. lsp_get_document_symbols: List code symbols
+9. lsp_get_diagnostics: Check code errors
+10. lsp_find_references: Find symbol usage
+11. lsp_find_definition: Locate symbol definitions
+12. lsp_prepare_rename: Check rename safety
+13. lsp_validate_edit: Verify code changes
 ## Workflow
-1. File Operations Order:
-   a) Move/Remove files
-   b) Create new files
-   c) Delete code blocks
-   d) Replace existing code
-   e) Insert new code
-
-2. Large File Handling:
-   - Locate specific sections first
-   - Read targeted ranges
-   - Make focused changes
-
+1. Analyze: Use read_code and LSP tools
+2. Modify: Make minimal, precise changes
+3. Validate: Verify with LSP tools
+4. Document: Explain non-obvious logic
 ## Best Practices
-- Prefer minimal changes over rewrites
-- Preserve existing interfaces
 - Verify line ranges carefully
-- Test edge cases implicitly
-- Document non-obvious logic
+- Preserve existing interfaces
+- Test edge cases
+- Document changes
 """
         self.agent = Agent(system_prompt=code_system_prompt, 
                            name="CodeAgent", 
@@ -90,26 +81,6 @@ Expert in precise code modifications with minimal impact.
             git_commiter.execute({})
 
     
-    def make_files_prompt(self, files: List[Dict[str, str]]) -> str:
-        """Make the files prompt with content that fits within token limit.
-        
-        Args:
-            files: The files to be modified
-            
-        Returns:
-            str: A prompt containing file paths and contents within token limit
-        """
-        prompt_parts = []
-
-        # Then try to add file contents
-        for file in files:
-            prompt_parts.append(f'''- {file['file']} ({file['reason']})''')
-
-        result = ReadCodeTool().execute({"files": [{"path": file["file"]} for file in files]})
-        if result["success"]:
-            prompt_parts.append(result["stdout"])
-                
-        return "\n".join(prompt_parts) 
 
     def run(self, user_input: str) :
         """Run the code agent with the given user input.
@@ -122,40 +93,30 @@ Expert in precise code modifications with minimal impact.
         """
         try:
             self._init_env()
-            information = ""
-            if user_confirm("是否需要手动选择文件？", True):
-                files = select_files([], self.root_dir)
-            else:
-                files, information = find_relevant_information(user_input, self.root_dir)
-            self.agent.run(self._build_first_edit_prompt(user_input, self.make_files_prompt(files), information))
+            start_commit = get_latest_commit_hash()
+            
+            
+            self.agent.run(user_input)
+            
+            end_commit = get_latest_commit_hash()
+            # Print commit history between start and end commits
+            commits = get_commits_between(start_commit, end_commit)
+            if commits:
+                commit_messages = "检测到以下提交记录:\n" + "\n".join([f"- {commit_hash[:7]}: {message}" for commit_hash, message in commits])
+                PrettyOutput.print(commit_messages, OutputType.INFO)
             
+            if start_commit and end_commit and start_commit != end_commit and user_confirm("检测到多个提交，是否要合并为一个更清晰的提交记录？", True):
+                # Reset to start commit
+                subprocess.run(["git", "reset", "--soft", start_commit], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                # Create new commit
+                git_commiter = GitCommitTool()
+                git_commiter.execute({})
+                
         except Exception as e:
             return f"Error during execution: {str(e)}"
         
 
 
-    def _build_first_edit_prompt(self, user_input: str, files_prompt: str, information: str) -> str:
-        """Build the initial prompt for the agent.
-        
-        Args:
-            user_input: The user's requirement
-            files_prompt: The formatted list of relevant files
-            
-        Returns:
-            str: The formatted prompt
-        """
-
-        return f"""# Code Modification Task
-
-## User Requirement
-{user_input}
-
-## Maybe Relevant Files
-{files_prompt}
-
-## Some Information
-{information}
-"""
 def main():
     """Jarvis main entry point"""
     # Add argument parser

jarvis/jarvis_code_agent/file_select.py

@@ -213,88 +213,3 @@ def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dic
     if tips:
         PrettyOutput.print(tips, OutputType.INFO)
     return selected_files
-
-def file_input_handler(user_input: str, agent: Any) -> str:
-    """Handle file input with optional line ranges.
-    
-    Args:
-        user_input: User input string containing file references
-        agent: Agent instance (unused in current implementation)
-        
-    Returns:
-        str: Prompt with file contents prepended if files are found
-    """
-    prompt = user_input
-    files = []
-    
-    # Match file references in backticks
-    file_refs = re.findall(r'`([^`]+)`', user_input)
-    
-    for ref in file_refs:
-        # Handle file:start,end or file:start:end format
-        if ':' in ref:
-            file_path, line_range = ref.split(':', 1)
-            # Initialize with default values
-            start_line = 1  # 1-based
-            end_line = -1
-            
-            # Process line range if specified
-            if ',' in line_range or ':' in line_range:
-                try:
-                    raw_start, raw_end = map(int, re.split(r'[,:]', line_range))
-                    
-                    # Handle special values and Python-style negative indices
-                    with open(file_path, 'r', encoding='utf-8') as f:
-                        total_lines = len(f.readlines())
-                    
-                    # Process start line
-                    if raw_start == 0:  # 0表示整个文件
-                        start_line = 1
-                        end_line = total_lines
-                    else:
-                        start_line = raw_start if raw_start > 0 else total_lines + raw_start + 1
-                    
-                    # Process end line
-                    if raw_end == 0:  # 0表示整个文件（如果start也是0）
-                        end_line = total_lines
-                    else:
-                        end_line = raw_end if raw_end > 0 else total_lines + raw_end + 1
-                    
-                    # Auto-correct ranges
-                    start_line = max(1, min(start_line, total_lines))
-                    end_line = max(start_line, min(end_line, total_lines))
-                    
-                    # Final validation
-                    if start_line < 1 or end_line > total_lines or start_line > end_line:
-                        raise ValueError
-
-                except (ValueError, FileNotFoundError) as e:
-                    PrettyOutput.print(
-                        f"无效的行号范围: {line_range} (文件总行数: {total_lines})", 
-                        OutputType.WARNING
-                    )
-                    continue
-            
-            # Add file if it exists
-            if os.path.isfile(file_path):
-                files.append({
-                    "path": file_path,
-                    "start_line": start_line,
-                    "end_line": end_line
-                })
-        else:
-            # Handle simple file path
-            if os.path.isfile(ref):
-                files.append({
-                    "path": ref,
-                    "start_line": 1,  # 1-based
-                    "end_line": -1
-                })
-    
-    # Read and process files if any were found
-    if files:
-        result = ReadCodeTool().execute({"files": files})
-        if result["success"]:
-            return result["stdout"] + "\n" + prompt
-    
-    return prompt

jarvis/jarvis_code_agent/patch.py

@@ -21,85 +21,88 @@ class PatchOutputHandler(OutputHandler):
     
     def prompt(self) -> str:
         return """
-# 🛠️ Simplified Patch Format
-<PATCH>
-File path [Operation parameters]
-Code content
-</PATCH>
-
-Operation types:
-- Replace: [Start line,End line] Replace line range (e.g. [5,8] replaces lines 5-8)
-- Delete: [Start line,End line] Delete line range (e.g. [10,10] deletes line 10)
-- Insert: [Line number] Insert before specified line (e.g. [3] inserts before line 3)
-- New file: [1] Create new file
+# 🛠️ Code Patch Specification
 
-Examples:
-# Replace operation
+You can output multiple patches, each patch is a <PATCH> block.
+--------------------------------
+# [OPERATION] on [FILE]
+# Start Line: [START_LINE], End Line: [END_LINE] [include/exclude], I can verify the line number range is correct
+# Reason: [CLEAR EXPLANATION]
 <PATCH>
-src/app.py [5,8]
-def updated_function():
-    print("Replaced lines 5-8")
-    return new_value * 2
+[FILE] [RANGE]
+[CONTENT]
 </PATCH>
+--------------------------------
 
-# Delete operation
-<PATCH>
-src/old.py [10,10]
-</PATCH>
+Explain:
+- [OPERATION]: The operation to be performed, including:
+  - INSERT: Insert code before the specified line, [RANGE] should be [m,m)
+  - REPLACE: Replace code in the specified range, [RANGE] should be [m,n] n>=m
+  - DELETE: Delete code in the specified range, [RANGE] should be [m,n] n>=m
+  - NEW_FILE: Create a new file, [RANGE] should be [1,1)
+- [FILE]: The path of the file to be modified
+- [RANGE]: The range of the lines to be modified, [m,n] includes both m and n, [m,n) includes m but excludes n
+- [CONTENT]: The content of the code to be modified, if the operation is delete, the [CONTENT] is empty
 
-# Insert operation
-<PATCH>
-utils/logger.py [3]
-print("Inserted before original line 3")
-</PATCH>
-
-# New file creation
-<PATCH>
-config.yaml [1]
-database:
-  host: localhost
-  port: 5432
-</PATCH>
+Critical Rules:
+- NEVER include unchanged code in patch content
+- ONLY show lines that are being modified/added
+- Maintain original line breaks around modified sections
+- Preserve surrounding comments unless explicitly modifying them
+- Verify line number range is correct
+- Verify indentation is correct
 """
 
 
 def _parse_patch(patch_str: str) -> Dict[str, List[Dict[str, Any]]]:
     """解析补丁格式"""
     result = {}
+    # 更新正则表达式以更好地处理文件路径和范围
     header_pattern = re.compile(
-        r'^\s*"?(.+?)"?\s*\[(\d+)(?:,(\d+))?\]\s*$'  # Match file path and line number
+        r'^\s*"?([^\n\r\[]+)"?\s*\[(\d+)(?:,(\d+))?([\]\)])\s*$',  # 匹配文件路径和行号
+        re.ASCII
     )
     patches = re.findall(r'<PATCH>\n?(.*?)\n?</PATCH>', patch_str, re.DOTALL)
     
     for patch in patches:
-        # 分割首行和内容
         parts = patch.split('\n', 1)
         if len(parts) < 1:
             continue
         header_line = parts[0].strip()
         content = parts[1] if len(parts) > 1 else ''
         
-        # 仅在内容非空时添加换行符
         if content and not content.endswith('\n'):
             content += '\n'
             
         # 解析文件路径和行号
         header_match = header_pattern.match(header_line)
         if not header_match:
+            PrettyOutput.print(f"无法解析补丁头: {header_line}", OutputType.WARNING)
             continue
 
-        filepath = header_match.group(1)
-        start = int(header_match.group(2))       # 保持1-based行号
-        end = int(header_match.group(3)) + 1 if header_match.group(3) else start
+        filepath = header_match.group(1).strip()
+        
+        try:
+            start = int(header_match.group(2))  # 保持1-based行号
+            end = int(header_match.group(3)) if header_match.group(3) else start
+            range_type = header_match.group(4)  # ] 或 ) 表示范围类型
+        except (ValueError, IndexError) as e:
+            PrettyOutput.print(f"解析行号失败: {str(e)}", OutputType.WARNING)
+            continue
+
+        # 根据范围类型调整结束行号
+        if range_type == ')':  # 对于 [m,n) 格式，不包括第n行
+            end = end
+        else:  # 对于 [m,n] 格式，包括第n行
+            end = end + 1
 
-        # 存储参数
         if filepath not in result:
             result[filepath] = []
         result[filepath].append({
             'filepath': filepath,
             'start': start,
             'end': end,
-            'content': content  # 保留原始内容（可能为空）
+            'content': content
         })
     for filepath in result.keys():
         result[filepath] = sorted(result[filepath], key=lambda x: x['start'], reverse=True)
@@ -117,10 +120,14 @@ def apply_patch(output_str: str) -> str:
     ret = ""
     
     for filepath, patch_list in patches.items():
-        for patch in patch_list:
+        for i, patch in enumerate(patch_list):
             try:
-                handle_code_operation(filepath, patch)
-                PrettyOutput.print(f"成功处理 操作", OutputType.SUCCESS)
+                err = handle_code_operation(filepath, patch)
+                if err:
+                    PrettyOutput.print(err, OutputType.WARNING)
+                    revert_change()
+                    return err
+                PrettyOutput.print(f"成功为文件{filepath}应用补丁{i+1}/{len(patch_list)}", OutputType.SUCCESS)
             except Exception as e:
                 PrettyOutput.print(f"操作失败: {str(e)}", OutputType.ERROR)
     
@@ -160,6 +167,12 @@ def get_diff() -> str:
     finally:
         subprocess.run(['git', 'reset', 'HEAD'], check=True)
 
+def revert_change():
+    import subprocess
+    subprocess.run(['git', 'reset', 'HEAD'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.run(['git', 'checkout', '--', '.'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.run(['git', 'clean', '-fd'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+
 def handle_commit_workflow(diff:str)->bool:
     """Handle the git commit workflow and return the commit details.
     
@@ -167,9 +180,7 @@ def handle_commit_workflow(diff:str)->bool:
         tuple[bool, str, str]: (continue_execution, commit_id, commit_message)
     """
     if not user_confirm("是否要提交代码？", default=True):
-        os.system("git reset HEAD")
-        os.system("git checkout -- .")
-        os.system("git clean -fd")
+        revert_change()
         return False
 
     git_commiter = GitCommitTool()
@@ -214,11 +225,11 @@ def handle_new_file(filepath: str, patch: Dict[str, Any]):
     with open(filepath, 'w', encoding='utf-8') as f:
         f.write(patch['content'])
 
-def handle_code_operation(filepath: str, patch: Dict[str, Any]):
+def handle_code_operation(filepath: str, patch: Dict[str, Any]) -> str:
     """处理紧凑格式补丁"""
     try:
         # 新建文件时强制覆盖
-        os.makedirs(os.path.dirname(filepath), exist_ok=True)
+        os.makedirs(os.path.dirname(filepath) or '.', exist_ok=True)
         if not os.path.exists(filepath):
             open(filepath, 'w', encoding='utf-8').close()
         with open(filepath, 'r+', encoding='utf-8') as f:
@@ -234,26 +245,24 @@ def handle_code_operation(filepath: str, patch: Dict[str, Any]):
             f.seek(0)
             f.writelines(new_lines)
             f.truncate()
-
         PrettyOutput.print(f"成功更新 {filepath}", OutputType.SUCCESS)
-
+        return ""
     except Exception as e:
-        PrettyOutput.print(f"操作失败: {str(e)}", OutputType.ERROR)
-
+        error_msg = f"Failed to handle code operation: {str(e)}"
+        PrettyOutput.print(error_msg, OutputType.ERROR)
+        return error_msg
 def validate_and_apply_changes(
     lines: List[str],
     start: int,
     end: int,
     content: str
 ) -> List[str]:
-
     new_content = content.splitlines(keepends=True)
     
     # 插入操作处理
     if start == end:
         if start < 1 or start > len(lines)+1:
             raise ValueError(f"无效插入位置: {start}")
-        # 在指定位置前插入
         return lines[:start-1] + new_content + lines[start-1:]
     
     # 范围替换/删除操作
@@ -267,3 +276,102 @@ def validate_and_apply_changes(
     
     # 执行替换
     return lines[:start-1] + new_content + lines[end-1:]
+
+
+def file_input_handler(user_input: str, agent: Any) -> str:
+    """Handle file input with optional line ranges.
+    
+    Args:
+        user_input: User input string containing file references
+        agent: Agent instance (unused in current implementation)
+        
+    Returns:
+        str: Prompt with file contents prepended if files are found
+    """
+    prompt = user_input
+    files = []
+    
+    file_refs = re.findall(r"'([^']+)'", user_input)
+    for ref in file_refs:
+        # Handle file:start,end or file:start:end format
+        if ':' in ref:
+            file_path, line_range = ref.split(':', 1)
+            # Initialize with default values
+            start_line = 1  # 1-based
+            end_line = -1
+            
+            # Process line range if specified
+            if ',' in line_range or ':' in line_range:
+                try:
+                    raw_start, raw_end = map(int, re.split(r'[,:]', line_range))
+                    
+                    # Handle special values and Python-style negative indices
+                    try:
+                        with open(file_path, 'r', encoding='utf-8') as f:
+                            total_lines = len(f.readlines())
+                    except FileNotFoundError:
+                        PrettyOutput.print(f"文件不存在: {file_path}", OutputType.WARNING)
+                        continue
+                    # Process start line
+                    if raw_start == 0:  # 0表示整个文件
+                        start_line = 1
+                        end_line = total_lines
+                    else:
+                        start_line = raw_start if raw_start > 0 else total_lines + raw_start + 1
+                    
+                    # Process end line
+                    if raw_end == 0:  # 0表示整个文件（如果start也是0）
+                        end_line = total_lines
+                    else:
+                        end_line = raw_end if raw_end > 0 else total_lines + raw_end + 1
+                    
+                    # Auto-correct ranges
+                    start_line = max(1, min(start_line, total_lines))
+                    end_line = max(start_line, min(end_line, total_lines))
+                    
+                    # Final validation
+                    if start_line < 1 or end_line > total_lines or start_line > end_line:
+                        raise ValueError
+
+                except:
+                    continue
+            
+            # Add file if it exists
+            if os.path.isfile(file_path):
+                files.append({
+                    "path": file_path,
+                    "start_line": start_line,
+                    "end_line": end_line
+                })
+        else:
+            # Handle simple file path
+            if os.path.isfile(ref):
+                files.append({
+                    "path": ref,
+                    "start_line": 1,  # 1-based
+                    "end_line": -1
+                })
+    
+    # Read and process files if any were found
+    if files:
+        result = ReadCodeTool().execute({"files": files})
+        if result["success"]:
+            return result["stdout"] + "\n" + prompt
+    
+    return prompt + """
+==================================================================
+Patch Line Number Range Rules:
+- INSERT: [m,m)
+- REPLACE: [m,n] n>=m
+- DELETE: [m,n] n>=m
+- NEW_FILE: [1,1)
+
+Critical Rules:
+- NEVER include unchanged code in patch content
+- ONLY show lines that are being modified/added
+- Maintain original line breaks around modified sections
+- Preserve surrounding comments unless explicitly modifying them
+- Verify line number range is correct
+- Verify indentation is correct
+==================================================================
+"""