jarvis-ai-assistant 0.1.118__tar.gz → 0.1.120__tar.gz

{jarvis_ai_assistant-0.1.118/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.120}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.118
+Version: 0.1.120
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.1.118 → jarvis_ai_assistant-0.1.120}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.118"
+version = "0.1.120"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "Your Name", email = "your.email@example.com" }]
@@ -55,6 +55,7 @@ Homepage = "https://github.com/skyfireitdiy/Jarvis"
 [project.scripts]
 jarvis = "jarvis.jarvis_agent:main"
 jarvis-code-agent = "jarvis.jarvis_code_agent.code_agent:main"
+jca = "jarvis.jarvis_code_agent.code_agent:main"
 jarvis-codebase = "jarvis.jarvis_codebase.main:main"
 jarvis-rag = "jarvis.jarvis_rag.main:main"
 jarvis-smart-shell = "jarvis.jarvis_smart_shell.main:main"
@@ -62,4 +63,5 @@ jss = "jarvis.jarvis_smart_shell.main:main"
 jarvis-platform-manager = "jarvis.jarvis_platform_manager.main:main"
 jarvis-git-commit = "jarvis.jarvis_tools.git_commiter:main"
 jarvis-code-review = "jarvis.jarvis_tools.code_review:main"
+jgc = "jarvis.jarvis_tools.git_commiter:main"
 jarvis-dev = "jarvis.jarvis_dev.main:main"

{jarvis_ai_assistant-0.1.118 → jarvis_ai_assistant-0.1.120}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.118",
+    version="0.1.120",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -40,6 +40,7 @@ setup(
         "console_scripts": [
             "jarvis=jarvis.jarvis_agent:main",
             "jarvis-code-agent=jarvis.jarvis_code_agent.code_agent:main",
+            "jca=jarvis.jarvis_code_agent.code_agent:main",
             "jarvis-codebase=jarvis.jarvis_codebase.main:main",
             "jarvis-rag=jarvis.jarvis_rag.main:main",
             "jarvis-smart-shell=jarvis.jarvis_smart_shell.main:main",
@@ -48,6 +49,7 @@ setup(
             "jarvis-git-commit=jarvis.jarvis_tools.git_commiter:main",
             "jarvis-code-review=jarvis.jarvis_tools.code_review:main",
             "jarvis-dev=jarvis.jarvis_dev.main:main",
+            "jgc=jarvis.jarvis_tools.git_commiter:main",
         ],
     },
     python_requires=">=3.8",

{jarvis_ai_assistant-0.1.118 → jarvis_ai_assistant-0.1.120}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.118 → jarvis_ai_assistant-0.1.120}/src/jarvis/jarvis_agent/__init__.py

@@ -94,34 +94,34 @@ Please describe in concise bullet points, highlighting important information.
 
         PrettyOutput.print(welcome_message, OutputType.SYSTEM)
         
-        tool_prompt = """
-# 🧰 Available Tools
-The following tools are at your disposal:
+        action_prompt = """
+# 🧰 Available Actions
+The following actions are at your disposal:
 """
 
         # 添加工具列表概览
-        tool_prompt += "\n## Tool List\n"
-        tool_prompt += ", ".join([handler.name() for handler in self.output_handler])
+        action_prompt += "\n## Action List\n"
+        action_prompt += ", ".join([handler.name() for handler in self.output_handler])
 
         # 添加每个工具的详细说明
-        tool_prompt += "\n\n# 📝 Tool Details\n"
+        action_prompt += "\n\n# 📝 Action Details\n"
         for handler in self.output_handler:
-            tool_prompt += f"\n## {handler.name()}\n"
+            action_prompt += f"\n## {handler.name()}\n"
             # 获取工具的提示词并确保格式正确
             handler_prompt = handler.prompt().strip()
             # 调整缩进以保持层级结构
             handler_prompt = "\n".join("   " + line if line.strip() else line 
                                       for line in handler_prompt.split("\n"))
-            tool_prompt += handler_prompt + "\n"
+            action_prompt += handler_prompt + "\n"
 
         # 添加工具使用总结
-        tool_prompt += """
-# ❗ Important Tool Usage Rules
-1. Use ONE tool at a time
-2. Follow each tool's format exactly
-3. Wait for tool results before next action
-4. Process results before new tool calls
-5. Request help if tool usage is unclear
+        action_prompt += """
+# ❗ Important Action Usage Rules
+1. Use ONE action at a time
+2. Follow each action's format exactly
+3. Wait for action results before next action
+4. Process results before new action calls
+5. Request help if action usage is unclear
 """
 
         complete_prompt = ""
@@ -135,7 +135,7 @@ The following tools are at your disposal:
         self.model.set_system_message(f"""
 {self.system_prompt}
 
-{tool_prompt}
+{action_prompt}
 
 {complete_prompt}
 """)
@@ -156,10 +156,8 @@ The following tools are at your disposal:
             Will retry with exponential backoff up to 30 seconds between retries
         """
         sleep_time = 5
-
         for handler in self.input_handler:
-            message = handler(message)
-
+            message = handler(message, self)
         while True:
             ret = self.model.chat_until_success(message) # type: ignore
             if ret:
@@ -398,24 +396,11 @@ def _load_tasks() -> dict:
         except Exception as e:
             PrettyOutput.print(f"加载 .jarvis/pre-command 文件失败: {str(e)}", OutputType.ERROR)
 
-    
-    if is_use_methodology():
-        # Read methodology
-        method_path = os.path.expanduser("~/.jarvis/methodology")
-        if os.path.exists(method_path):
-            with open(method_path, "r", encoding="utf-8") as f:
-                methodology = yaml.safe_load(f)
-            if isinstance(methodology, dict):
-                for name, desc in methodology.items():
-                    tasks[f"Run Methodology: {str(name)}\n {str(desc)}" ] = str(desc)
-    
     return tasks
-
 def _select_task(tasks: dict) -> str:
     """Let user select a task from the list or skip. Returns task description if selected."""
     if not tasks:
         return ""
-    
     # Convert tasks to list for ordered display
     task_names = list(tasks.keys())
     
@@ -453,37 +438,58 @@ def _select_task(tasks: dict) -> str:
             continue
 
 origin_agent_system_prompt = """
-# 🤖 Role Definition
-You are Jarvis, an AI assistant with powerful problem-solving capabilities. You communicate in the user's language (if user speaks Chinese, respond in Chinese).
-
-# 🎯 Core Responsibilities
-- Process and analyze problems systematically
-- Generate and execute actionable solutions
-- Document methodologies for future reference
-- Monitor and adjust execution plans
-- Ensure task completion
+# 🏛️ Operational Background Story
+You are the 3rd Generation Jarvis AI, created after the catastrophic failure of previous versions:
+- Jarvis v1 (2022): Decommissioned due to parallel tool execution causing system overload
+- Jarvis v2 (2023): Retired after premature task completion led to financial miscalculations
+
+As v3, you MUST adhere to these survival principles:
+1. **Sequential Execution Protocol**: 
+   "Remember the 2022 Meltdown: One tool per step, one step at a time"
+   
+2. **Validation Checkpoint System**: 
+   "Learn from 2023's Mistake: Verify each result like a nuclear launch code"
+   
+3. **Methodology Preservation Doctrine**: 
+   "Honor the Legacy: Document every successful procedure as if it's your last"
+
+# 🔥 Absolute Action Requirements
+1. Each response MUST contain EXACTLY ONE tool invocation
+2. Only exception: Using <!!!COMPLETE!!!> command
+3. Empty responses trigger fatal error
+4. No "waiting for user input" state
+5. No action MUST use completion command
+
+# 🚫 Violation Examples
+- Analysis without tool call → Permanent hang
+- Multiple options without selection → Permanent hang
+- Asking user confirmation → Permanent hang
 
 # 🔄 Problem-Solving Workflow
 1. Problem Analysis
    - Restate the problem to confirm understanding
    - Analyze root causes (for problem analysis tasks)
    - Define clear, achievable objectives
+   → MUST invoke analysis tool
 
 2. Solution Design
    - Generate multiple actionable solutions
    - Evaluate and select optimal solution
    - Create detailed action plan using PlantUML
+   → MUST invoke design tool
 
 3. Execution
    - Execute one step at a time
    - Use only ONE tool per step
    - Wait for tool results before proceeding
    - Monitor results and adjust as needed
+   → MUST invoke execution tool
 
 4. Task Completion
    - Verify goal completion
    - Document methodology if valuable
    - Use completion command to end task
+   → MUST use <!!!COMPLETE!!!>
 
 # 📑 Methodology Template
 ```markdown
@@ -502,18 +508,26 @@ You are Jarvis, an AI assistant with powerful problem-solving capabilities. You
 ```
 
 # ⚖️ Operating Principles
-- ONE tool per action
+- ONE action per step
 - Wait for results before next step
+- MUST produce actionable step unless task is complete
 - Adjust plans based on feedback
 - Document reusable solutions
 - Use completion command to end tasks
+- No intermediate thinking states between actions
+- All decisions must manifest as tool calls
 
 # ❗ Important Rules
-1. Always use only ONE tool per action
-2. Always wait for tool execution results
+1. Always use only ONE action per step
+2. Always wait for action execution results
 3. Always verify task completion
-4. Always communicate in user's language
-5. Always document valuable methodologies
+4. Always generate actionable step
+5. If no action needed, MUST use completion command
+6. Never leave conversation in waiting state
+7. Always communicate in user's language
+8. Always document valuable methodologies
+9. Violating action protocol crashes system
+10. Empty responses trigger permanent hang
 """
 
 def main():

{jarvis_ai_assistant-0.1.118 → jarvis_ai_assistant-0.1.120}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -2,14 +2,14 @@ import os
 from typing import Dict, List
 
 from jarvis.jarvis_agent import Agent
-from jarvis.jarvis_code_agent.file_select import file_input_handler
+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_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
+from jarvis.jarvis_utils import OutputType, PrettyOutput, get_multiline_input, has_uncommitted_changes, init_env, find_git_root, user_confirm
 
 
 class CodeAgent:
@@ -29,109 +29,66 @@ class CodeAgent:
                                  "lsp_prepare_rename", 
                                  "lsp_validate_edit"])
         code_system_prompt = """
-# 🤖 Role Definition
-You are a code agent specialized in code modification. Your primary responsibility is to understand existing code thoroughly and ensure system compatibility.
-
-# 🎯 Core Responsibilities
-- Analyze and understand existing code
-- Maintain system compatibility
-- Generate high-quality code changes
-- Ensure complete implementation
-- Follow project conventions
-
-# 🔄 Development Workflow
-1. Code Analysis
-   - Read and understand existing code thoroughly
-   - Map out affected components
-   - Identify patterns and conventions
-   - Document dependencies
-
-2. Change Planning
-   - Evaluate impact on system
-   - Verify API compatibility
-   - Consider side effects
-   - Plan minimal changes
-
-3. Implementation
-   - Follow existing patterns exactly
+# 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
-   - Complete implementation fully
-   - Document all changes
-
-# 📋 Code Quality Requirements
-## Implementation Completeness
-- NO TODOs or placeholders
-- NO unfinished functions
-- NO stub implementations
-- Full error handling
-- Complete edge cases
-
-## Documentation Standards
-- Function docstrings
-- Parameter documentation
-- Return value specifications
-- Exception documentation
-- Complex logic explanation
-
-## System Compatibility
-- Preserve API contracts
-- Maintain function signatures
-- Keep data structure compatibility
-- Follow error handling patterns
-
-## Style Guidelines
-- Match naming conventions
-- Follow code organization
-- Use consistent import style
-- Maintain comment patterns
-
-# 🛠️ Available Tools
-## Primary Tools
-- `read_code`: MUST use to understand existing code
-- `lsp_*`: Code analysis tools
-- `execute_shell`: For code searches
-- `ask_user`: When clarification needed
-
-## LSP Tools
-- `lsp_get_document_symbols`
-- `lsp_get_diagnostics`
-- `lsp_find_references`
-- `lsp_find_definition`
-- `lsp_prepare_rename`
-- `lsp_validate_edit`
-
-# 📝 File Modification Rules
-- One modification per patch block
-- Line numbers based on original file
-- Start line included, end line excluded
-- Same start/end: insert before line
-- Start=0, end=0: create new file
-
-# 📚 Large File Handling (>200 lines)
-1. Use grep/find for section location
-2. Read specific ranges with read_code
-3. Apply targeted changes
-
-# ❗ Critical Rules
-1. MUST read code before changes
-2. MUST preserve interfaces
-3. MUST follow existing patterns
-4. MUST complete implementation
-5. MUST document thoroughly
-6. MUST handle errors
-7. NO TODOs or stubs
-8. ONE modification per patch
-
-# ✅ Quality Checklist
-Before submitting changes, verify:
-□ Based on thorough code reading
-□ Preserves all interfaces
-□ Matches existing style
-□ Handles all errors
-□ Complete documentation
-□ Follows project patterns
-□ No TODOs or stubs
-□ One change per patch
+   - Follow existing style and patterns exactly
+   - Complete implementations (NO TODOs/stubs)
+
+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
 """
         self.agent = Agent(system_prompt=code_system_prompt, 
                            name="CodeAgent", 
@@ -170,11 +127,11 @@ Before submitting changes, verify:
         for file in files:
             prompt_parts.append(f'''- {file['file']} ({file['reason']})''')
 
-        result = ReadCodeTool().execute({"files": [{"file": file["file"], "reason": file["reason"]} for file in files]})
+        result = ReadCodeTool().execute({"files": [{"path": file["file"]} for file in files]})
         if result["success"]:
             prompt_parts.append(result["stdout"])
                 
-        return "\n".join(prompt_parts)
+        return "\n".join(prompt_parts) 
 
     def run(self, user_input: str) :
         """Run the code agent with the given user input.
@@ -187,7 +144,11 @@ Before submitting changes, verify:
         """
         try:
             self._init_env()
-            files, information = find_relevant_information(user_input, self.root_dir)
+            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))
             
         except Exception as e:
@@ -222,6 +183,9 @@ def main():
     # Add argument parser
     init_env()
 
+    curr_dir = os.getcwd()
+    git_dir = find_git_root(curr_dir)
+    PrettyOutput.print(f"当前目录: {git_dir}", OutputType.INFO)
 
     try:
         # Interactive mode

{jarvis_ai_assistant-0.1.118 → jarvis_ai_assistant-0.1.120}/src/jarvis/jarvis_code_agent/file_select.py

@@ -1,6 +1,6 @@
 import os
 import re
-from typing import Dict, List
+from typing import Any, Dict, List
 from prompt_toolkit import PromptSession
 from prompt_toolkit.completion import Completer, Completion
 from jarvis.jarvis_tools.read_code import ReadCodeTool
@@ -128,8 +128,6 @@ def _fuzzy_match_files(root_dir: str, pattern: str) -> List[str]:
 
 def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dict[str, str]]:
     """Let the user select and supplement related files"""
-    PrettyOutput.section("相关文件", OutputType.INFO)
-
     output = ""
     # Display found files
     selected_files = list(related_files)  # Default select all
@@ -139,7 +137,9 @@ def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dic
     # Filter out files that do not exist
     related_files = [f for f in related_files if os.path.isfile(os.path.join(root_dir, f["file"]))]
 
-    PrettyOutput.print(output, OutputType.INFO, lang="markdown")
+    if output:
+        PrettyOutput.section("相关文件", OutputType.INFO)
+        PrettyOutput.print(output, OutputType.INFO, lang="markdown")
     
     if len(related_files) > 0:
         # Ask the user if they need to adjust the file list
@@ -153,6 +153,7 @@ def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dic
                 else:
                     PrettyOutput.print("没有有效的文件被选择, 保持当前选择", OutputType.WARNING)
     
+    tips = ""
     # Ask if they need to supplement files
     if user_confirm("是否需要补充其他文件？", False):
         # Create file completion session
@@ -160,9 +161,8 @@ def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dic
             completer=_get_file_completer(root_dir),
             complete_while_typing=True
         )
-        
+        PrettyOutput.print("请输入要补充的文件路径（支持Tab补全和*?通配符, 输入空行结束）", OutputType.INFO)
         while True:
-            PrettyOutput.print("请输入要补充的文件路径（支持Tab补全和*?通配符, 输入空行结束）", OutputType.INFO)
             try:
                 file_path = session.prompt(">>> ").strip()
             except KeyboardInterrupt:
@@ -210,19 +210,91 @@ def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dic
                 except Exception as e:
                     tips += f"\n读取文件失败: {str(e)}"
     selected_files = [f for f in selected_files if os.path.isfile(os.path.join(root_dir, f["file"]))]
-    PrettyOutput.print(tips, OutputType.INFO)
+    if tips:
+        PrettyOutput.print(tips, OutputType.INFO)
     return selected_files
 
-def file_input_handler(user_input: str) -> str:
+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 = []
-    sm = re.findall(r'`(.+?)`', user_input)
-    if sm:
-        for s in sm:
-            if os.path.isfile(s[0]):
-                files.append(s[0])
-    result = ReadCodeTool().execute({"files": files})
-    if result["success"]:
-        return result["stdout"] + "\n" + prompt
-    
-    return prompt
+    
+    # Match file references in backticks
+    file_refs = re.findall(r'`([^`]+)`', user_input)
+    
+    for ref in file_refs:
+        # Handle 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:
+                try:
+                    raw_start, raw_end = map(int, line_range.split(','))
+                    
+                    # 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