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

jarvis/__init__.py

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

jarvis/jarvis_code_agent/code_agent.py

@@ -32,21 +32,45 @@ class CodeAgent:
 # 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 and patterns
+   - Identify dependencies like defusing bombs
 
 2. Modification Rules
-   - Single atomic change per operation
-   - Strict style consistency
-   - Complete implementations (no stubs)
-   - Full error handling
+   - 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
-   - Document complex logic
-   - Maintain API contracts
+   - 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:
@@ -145,7 +169,8 @@ Expert in precise code modifications with minimal impact.
             str: The formatted prompt
         """
 
-        return f"""# Code Modification Task
+        return f"""
+# Code Modification Task
 
 ## User Requirement
 {user_input}

jarvis/jarvis_code_agent/file_select.py

@@ -227,9 +227,7 @@ def file_input_handler(user_input: str, agent: Any) -> str:
     prompt = user_input
     files = []
     
-    # Match file references in backticks
-    file_refs = re.findall(r'`([^`]+)`', user_input)
-    
+    file_refs = re.findall(r"'([^']+)'", user_input)
     for ref in file_refs:
         # Handle file:start,end or file:start:end format
         if ':' in ref:
@@ -244,9 +242,12 @@ def file_input_handler(user_input: str, agent: Any) -> str:
                     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())
-                    
+                    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

jarvis/jarvis_code_agent/patch.py

@@ -21,45 +21,98 @@ class PatchOutputHandler(OutputHandler):
     
     def prompt(self) -> str:
         return """
-# 🛠️ Simplified Patch Format
+# 🛠️ Code Patch Specification
+When making changes, you MUST:
+1. Explain each modification BEFORE the <PATCH> block using:
+   # [OPERATION] on [FILE]: Lines X-Y
+   # Reason: [CLEAR EXPLANATION]
+2. Maintain original code style and compatibility:
+   - Preserve existing indentation levels
+   - Keep surrounding empty lines
+   - Match variable naming conventions
+   - Maintain API compatibility
+3. Follow the exact patch format below
+4. Use separate <PATCH> blocks for different files
+5. Include ONLY modified lines in content
+
 <PATCH>
-File path [Operation parameters]
+File path [Range]
 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
+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
 
 Examples:
-# Replace operation
+# ======== REPLACE ========
+# GOOD: Only modified lines
+# REPLACE in src/app.py: Lines 5-8
+# Reason: Update calculation formula
 <PATCH>
 src/app.py [5,8]
-def updated_function():
-    print("Replaced lines 5-8")
-    return new_value * 2
+    result = (base_value * 1.15) + tax
+    logger.debug("New calculation applied")
 </PATCH>
 
-# Delete operation
+# BAD: Includes unchanged lines
 <PATCH>
-src/old.py [10,10]
+src/app.py [5,8]
+def calculate():
+    # Original comment (should not be included)
+    result = (base_value * 1.15) + tax
+    return result  # Original line
 </PATCH>
 
-# Insert operation
+# ======== INSERT ========
+# GOOD: Insert single line
+# INSERT in utils/logger.py: Before line 3 
+# Reason: Add initialization check
 <PATCH>
 utils/logger.py [3]
-print("Inserted before original line 3")
+if not _initialized: initialize()
 </PATCH>
 
-# New file creation
+# BAD: Extra empty lines
 <PATCH>
-config.yaml [1]
+utils/logger.py [3]
+
+if not _initialized: 
+    initialize()
+
+</PATCH>
+
+# ======== NEW FILE ========
+# GOOD: Complete minimal content
+# NEW FILE in config/settings.yaml: Create new config
+<PATCH>
+config/settings.yaml [1]
 database:
   host: localhost
   port: 5432
 </PATCH>
+
+# BAD: Placeholder content
+<PATCH>
+config/settings.yaml [1]
+TODO: Add configuration
+</PATCH>
+
+# ======== DELETE ========
+# GOOD: Empty content for deletion
+# DELETE in src/old.py: Lines 10-12 
+# Reason: Remove deprecated function
+<PATCH>
+src/old.py [10,12]
+</PATCH>
+
+# BAD: Comment in delete operation
+<PATCH>
+src/old.py [10,12]
+# Remove these lines
+</PATCH>
 """
 
 
@@ -167,9 +220,10 @@ 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")
+        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)
         return False
 
     git_commiter = GitCommitTool()
@@ -218,7 +272,7 @@ def handle_code_operation(filepath: str, patch: Dict[str, Any]):
     """处理紧凑格式补丁"""
     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: