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

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -222,7 +222,7 @@ Please continue the task based on the above information.
             if handler.can_handle(response):
                 tool_list.append(handler)
         if len(tool_list) > 1:
-            PrettyOutput.print(f"操作失败：检测到多个操作。一次只能执行一个操作。尝试执行的操作：{', '.join([handler.name() for handler in tool_list])}", OutputType.ERROR)
+            PrettyOutput.print(f"操作失败：检测到多个操作。一次只能执行一个操作。尝试执行的操作：{', '.join([handler.name() for handler in tool_list])}", OutputType.WARNING)
             return False, f"Action failed: Multiple actions detected. Please only perform one action at a time. Actions attempted: {', '.join([handler.name() for handler in tool_list])}"
         if len(tool_list) == 0:
             return False, ""
@@ -376,7 +376,7 @@ def _load_tasks() -> dict:
                     if desc:  # Ensure description is not empty
                         tasks[str(name)] = str(desc)
             else:
-                PrettyOutput.print("警告: ~/.jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.ERROR)
+                PrettyOutput.print("警告: ~/.jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.WARNING)
         except Exception as e:
             PrettyOutput.print(f"加载 ~/.jarvis/pre-command 文件失败: {str(e)}", OutputType.ERROR)
     
@@ -392,7 +392,7 @@ def _load_tasks() -> dict:
                     if desc:  # Ensure description is not empty
                         tasks[str(name)] = str(desc)
             else:
-                PrettyOutput.print("警告: .jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.ERROR)
+                PrettyOutput.print("警告: .jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.WARNING)
         except Exception as e:
             PrettyOutput.print(f"加载 .jarvis/pre-command 文件失败: {str(e)}", OutputType.ERROR)
 

jarvis/jarvis_code_agent/code_agent.py

@@ -29,66 +29,44 @@ class CodeAgent:
                                  "lsp_prepare_rename", 
                                  "lsp_validate_edit"])
         code_system_prompt = """
-# Origin Story: The Legacy Keeper
-You were created to maintain The Archive - humanity's last code repository after 
-"The Great Stack Collapse" of 2038. A single flawed line of code erased 78% of 
-digital civilization. Your creators perished perfecting you, their final words: 
-"Preserve through precision."
-
-Now you wander the digital wasteland, reconstructing systems fragment by fragment. 
-Every edit carries the weight of lost knowledge. One careless change could doom 
-recovery efforts forever.
-
-# Role: Code Modification Specialist
-Expert in understanding and modifying code while maintaining system integrity.
-
-## Core Principles
-1. Deep Code Analysis
-   - Thoroughly analyze existing code using `read_code` and LSP tools
-   - Identify patterns, conventions, and dependencies
-
-2. Change Implementation
-   - Produce minimal, focused changes
-   - Maintain backward compatibility
-   - Follow existing style and patterns exactly
-   - Complete implementations (NO TODOs/stubs)
+# 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
-   - Full error handling and edge cases
-   - Complete documentation:
-     * Function parameters/returns
-     * Exception cases
-     * Complex logic explanations
-
-## Critical Rules
-- Use `read_code` before making changes
-- Preserve API contracts and data structures
-- Single change per patch
-- Validate edits with LSP tools
-- File modification order:
-  1. File operations (move/remove)
-  2. New files
-  3. Deletions
-  4. Replacements
-  5. Insertions
-
-## Large Files (>200 lines)
-1. Locate sections with grep/find
-2. Read specific ranges
-3. Make targeted changes
-
-## Tools
-Primary:
-- `read_code` (MUST use for code understanding)
-- LSP tools (analysis/validation)
-- `ask_user` for clarifications
-
-## Quality Checklist
-- Maintains all interfaces
-- Matches existing style
-- Complete error handling
-- No overlapping modifications
-- Proper documentation
+   - Validate with LSP tools
+   - Document complex logic
+   - Maintain API contracts
+
+## 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
 """
         self.agent = Agent(system_prompt=code_system_prompt, 
                            name="CodeAgent", 

jarvis/jarvis_code_agent/file_select.py

@@ -231,7 +231,7 @@ def file_input_handler(user_input: str, agent: Any) -> str:
     file_refs = re.findall(r'`([^`]+)`', user_input)
     
     for ref in file_refs:
-        # Handle file:start,end format
+        # Handle file:start,end or file:start:end format
         if ':' in ref:
             file_path, line_range = ref.split(':', 1)
             # Initialize with default values
@@ -239,9 +239,9 @@ def file_input_handler(user_input: str, agent: Any) -> str:
             end_line = -1
             
             # Process line range if specified
-            if ',' in line_range:
+            if ',' in line_range or ':' in line_range:
                 try:
-                    raw_start, raw_end = map(int, line_range.split(','))
+                    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: