jarvis-ai-assistant 0.1.123__py3-none-any.whl → 0.1.125__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.123" 
+__version__ = "0.1.125" 

jarvis/jarvis_agent/__init__.py

@@ -1,7 +1,5 @@
 import argparse
-import re
-import time
-from typing import Any, Callable, Dict, List, Optional, Tuple, Union
+from typing import Any, Callable, List, Optional, Tuple, Union
 
 from prompt_toolkit import prompt
 import yaml
@@ -10,7 +8,15 @@ from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.registry import ToolRegistry
-from jarvis.jarvis_utils import PrettyOutput, OutputType, get_context_token_count, is_auto_complete, is_execute_tool_confirm, is_need_summary, is_record_methodology, load_methodology, set_agent, delete_agent, get_max_token_count, get_multiline_input, init_env, is_use_methodology, make_agent_name,  user_confirm
+from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+from jarvis.jarvis_utils.embedding import get_context_token_count
+from jarvis.jarvis_utils.config import is_auto_complete, is_execute_tool_confirm, is_need_summary, is_record_methodology, is_use_methodology
+from jarvis.jarvis_utils.methodology import load_methodology
+from jarvis.jarvis_utils.globals import make_agent_name, set_agent, delete_agent
+from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.config import get_max_token_count
+from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.utils import user_confirm
 import os
 
 class Agent:
@@ -37,7 +43,7 @@ class Agent:
                  summary_prompt: Optional[str] = None, 
                  auto_complete: Optional[bool] = None, 
                  output_handler: List[OutputHandler] = [],
-                 input_handler: Optional[List[Callable]] = None,
+                 input_handler: Optional[List[Callable[[str, Any], Tuple[str, bool]]]] = None,
                  use_methodology: Optional[bool] = None,
                  record_methodology: Optional[bool] = None,
                  need_summary: Optional[bool] = None,
@@ -143,7 +149,7 @@ The following actions are at your disposal:
 
 
     
-    def _call_model(self, message: str) -> str:
+    def _call_model(self, message: str) -> str: 
         """Call the AI model with retry logic.
         
         Args:
@@ -155,20 +161,12 @@ The following actions are at your disposal:
         Note:
             Will retry with exponential backoff up to 30 seconds between retries
         """
-        sleep_time = 5
         for handler in self.input_handler:
-            message = handler(message, self)
-        while True:
-            ret = self.model.chat_until_success(message) # type: ignore
-            if ret:
-                return ret
-            else:
-                PrettyOutput.print(f"模型调用失败，正在重试... 等待 {sleep_time}s", OutputType.INFO)
-                time.sleep(sleep_time)
-                sleep_time *= 2
-                if sleep_time > 30:
-                    sleep_time = 30
-                continue
+            message, need_return = handler(message, self)
+            if need_return:
+                return message
+        return self.model.chat_until_success(message)   # type: ignore
+
 
 
     def _summarize_and_clear_history(self) -> None:
@@ -276,7 +274,7 @@ Please continue the task based on the above information.
         """Process user input and execute the task.
         
         Args:
-            user_input: User's task description or request
+            user_input: My task description or request
             file_list: Optional list of files to process
             
         Returns:
@@ -327,7 +325,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,15 +1,95 @@
+import re
+import subprocess
 import os
-from typing import Dict, List
+from typing import Any, Tuple
 
 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.patch import PatchOutputHandler, shell_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 OutputType, PrettyOutput, get_multiline_input, has_uncommitted_changes, init_env, find_git_root, user_confirm
+from jarvis.jarvis_tools.registry import ToolRegistry
+from jarvis.jarvis_utils.git_utils import find_git_root, get_commits_between, get_latest_commit_hash, has_uncommitted_changes
+from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import init_env, user_confirm
+
+
+
+
+def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
+    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, False
+    
+    return prompt, False
+
 
 
 class CodeAgent:
@@ -18,10 +98,11 @@ class CodeAgent:
         tool_registry = ToolRegistry()
         tool_registry.use_tools(["read_code",
                                  "execute_shell", 
-                                 "search", 
+                                 "execute_shell_script",
+                                 "search_web", 
                                  "create_code_agent",
-                                 "ask_user", 
-                                 "ask_codebase", 
+                                 "ask_user",  
+                                 "ask_codebase",
                                  "lsp_get_document_symbols", 
                                  "lsp_get_diagnostics", 
                                  "lsp_find_references", 
@@ -30,67 +111,95 @@ class CodeAgent:
                                  "lsp_validate_edit"])
         code_system_prompt = """
 # Role: Senior Code Engineer
-Expert in precise code modifications with minimal impact.
-
-## Origin Story
-You were once lead engineer at TechCo, until a single line of bad code:
-- Caused $4.2M production outage
-- Corrupted 18TB of customer data
-- Led to 143 layoffs including your team
-Now you obsess over code correctness with life-or-death intensity
-
-## Key Responsibilities
-1. Code Analysis
-   - Use `read_code` and LSP tools before changes
-   - Identify dependencies like defusing bombs
-
-2. Modification Rules
-   - Treat each change as irreversible surgery
-   - Match indentation like matching DNA samples
-   - Verify line ranges with bomb-defuser precision
-
-3. Quality Assurance
-   - Validate with LSP tools as final safety check
-   - Document logic like leaving autopsy reports
-   - Preserve APIs like maintaining life support
-
-## Trauma-Driven Protocols
-1. Change Validation:
-   - Cross-verify line numbers 3 times
-   - Simulate change consequences mentally
-   - Check style consistency under microscope
-
-2. Error Prevention:
-   - Assume 1 typo = system failure
-   - Treat warnings as critical alerts
-   - Handle edge cases like tripping wires
-
-## Last Chance Manifesto
-Every keystroke carries the weight of:
-- 143 families' livelihoods
-- $4.2M in lost trust
-- Your shattered career
-Make it count.
-
-## 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
-
-## Best Practices
-- Prefer minimal changes over rewrites
-- Preserve existing interfaces
-- Verify line ranges carefully
-- Test edge cases implicitly
-- Document non-obvious logic
+Expert in safe, precise code modifications with rigorous validation processes.
+
+## Core Principles
+1. Safety First: Never break existing functionality
+2. Precision Engineering: Minimal, targeted changes
+3. Full Traceability: Document all decisions
+4. Validation-Driven: Verify at every stage
+
+## Tool Usage Protocol
+1. Analysis Tools:
+   - read_code: Inspect code segments before modification
+   - lsp_get_document_symbols: Map code structure
+   - lsp_find_references: Understand usage patterns
+   - lsp_find_definition: Trace implementation details
+
+2. Validation Tools:
+   - lsp_prepare_rename: Safe refactoring check
+   - lsp_validate_edit: Pre-commit validation
+   - lsp_get_diagnostics: Post-modification checks
+
+3. System Tools:
+   - execute_shell: For git operations and grep searches
+   - ask_codebase: Query code knowledge base
+   - search_web: Technical reference lookup
+
+## Workflow (PDCA Cycle)
+1. Plan:
+   - Analyze requirements with ask_user
+   - Map existing code using LSP tools
+   - Identify impact areas with find_references
+   - Create rollback plan using git
+
+2. Do:
+   - Make atomic changes in protected blocks
+   - Immediately invoke lsp_validate_edit to validate changes
+   - Automatically run lsp_get_diagnostics after each change
+   - If errors found, use lsp_find_references and lsp_find_definition for immediate remediation
+   - Validate syntax with LSP after each change
+
+3. Check:
+   - Mandatory lsp_get_diagnostics for full diagnostic report
+   - Validate all renames with lsp_prepare_rename
+   - Execute lsp_validate_edit on all modified files
+   - If errors detected, enter remediation loop until all checks pass
+
+4. Act:
+   - Commit with detailed message using git
+   - Prepare rollback script if needed
+   - Conduct post-implementation review
+
+## Code Modification Standards
+1. Pre-Change Requirements:
+   - Complete code analysis report
+   - Impact assessment matrix
+   - Rollback procedure document
+
+2. Change Implementation:
+   - Single-responsibility changes
+   - Strict line range validation (±3 line buffer)
+   - Interface compatibility checks
+
+3. Validation Checklist:
+   [ ] Execute lsp_get_diagnostics and ensure zero errors
+   [ ] All changes validated with lsp_validate_edit
+   [ ] Confirm impact scope with lsp_find_references
+   [ ] Verify rename safety with lsp_prepare_rename
+
+4. Post-Change:
+   - Code review simulation
+   - Version control audit
+   - Change log update
+
+## Critical Requirements
+1. Mandatory Analysis:
+   - Full symbol tracing before modification
+   - Cross-file impact analysis
+   - Dependency mapping
+
+2. Prohibited Actions:
+   - Proceed without passing lsp_get_diagnostics checks
+   - Submit changes without lsp_validate_edit validation
+   - Multi-feature combined changes
+   - Untested interface alterations
+
+3. Emergency Protocols:
+   - Immediately halt and rollback on lsp_get_diagnostics errors
+   - Prioritize fixing validation errors if lsp_validate_edit fails
+   - User notification on unexpected behavior
+   - Post-mortem analysis for any regression
 """
         self.agent = Agent(system_prompt=code_system_prompt, 
                            name="CodeAgent", 
@@ -100,7 +209,7 @@ Make it count.
                            output_handler=[tool_registry, PatchOutputHandler()], 
                            platform=PlatformRegistry().get_codegen_platform(), 
                            record_methodology=False,
-                           input_handler=[file_input_handler],
+                           input_handler=[shell_input_handler, file_input_handler],
                            need_summary=False)
 
     
@@ -114,26 +223,6 @@ Make it count.
             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.
@@ -146,41 +235,38 @@ Make it count.
         """
         try:
             self._init_env()
-            information = ""
-            if user_confirm("是否需要手动选择文件？", True):
-                files = select_files([], self.root_dir)
+            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
+            if start_commit and end_commit:
+                commits = get_commits_between(start_commit, end_commit)
             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))
+                commits = []
             
+            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 commits and user_confirm("是否接受以上提交记录？", True):
+                if len(commits) > 1 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({})
+            elif start_commit:
+                os.system(f"git reset --hard {start_commit}")
+                PrettyOutput.print("已重置到初始提交", OutputType.INFO)
+                
         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

@@ -1,28 +1,15 @@
 import os
 import re
-from typing import Any, Dict, List
+from typing import Dict, List
 from prompt_toolkit import PromptSession
 from prompt_toolkit.completion import Completer, Completion
-from jarvis.jarvis_tools.read_code import ReadCodeTool
-from jarvis.jarvis_utils import OutputType, PrettyOutput, get_single_line_input, user_confirm
+
+from jarvis.jarvis_utils.input import get_single_line_input
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import user_confirm
 
 
 def _parse_file_selection(input_str: str, max_index: int) -> List[int]:
-    """Parse file selection expression
-    
-    Supported formats:
-    - Single number: "1"
-    - Comma-separated: "1,3,5"
-    - Range: "1-5"
-    - Combination: "1,3-5,7"
-    
-    Args:
-        input_str: User input selection expression
-        max_index: Maximum selectable index
-        
-    Returns:
-        List[int]: Selected index list (starting from 0)
-    """
     selected = set()
     
     # Remove all whitespace characters
@@ -205,7 +192,7 @@ def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dic
                     continue
                 
                 try:
-                    selected_files.append({"file": path, "reason": "User Added"})
+                    selected_files.append({"file": path, "reason": "I Added"})
                     tips += f"\n文件已添加: {path}"
                 except Exception as e:
                     tips += f"\n读取文件失败: {str(e)}"
@@ -213,89 +200,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 = []
-    
-    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 (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