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

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.123" 
+__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,68 +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.
-
-## 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.
-
+# 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", 
@@ -114,26 +81,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 +93,30 @@ Make it count.
         """
         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,89 +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 = []
-    
-    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

jarvis/jarvis_code_agent/patch.py

@@ -22,137 +22,87 @@ class PatchOutputHandler(OutputHandler):
     def prompt(self) -> str:
         return """
 # 🛠️ 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
 
+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>
-File path [Range]
-Code content
+[FILE] [RANGE]
+[CONTENT]
 </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
 
 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 ========
-# GOOD: Only modified lines
-# REPLACE in src/app.py: Lines 5-8
-# Reason: Update calculation formula
-<PATCH>
-src/app.py [5,8]
-    result = (base_value * 1.15) + tax
-    logger.debug("New calculation applied")
-</PATCH>
-
-# BAD: Includes unchanged lines
-<PATCH>
-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 ========
-# GOOD: Insert single line
-# INSERT in utils/logger.py: Before line 3 
-# Reason: Add initialization check
-<PATCH>
-utils/logger.py [3]
-if not _initialized: initialize()
-</PATCH>
-
-# BAD: Extra empty lines
-<PATCH>
-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>
+- 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)
@@ -170,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)
     
@@ -213,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.
     
@@ -220,10 +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):
-        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)
+        revert_change()
         return False
 
     git_commiter = GitCommitTool()
@@ -268,7 +225,7 @@ 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:
         # 新建文件时强制覆盖
@@ -288,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:]
     
     # 范围替换/删除操作
@@ -321,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
+==================================================================
+"""

jarvis/jarvis_platform/base.py

@@ -57,7 +57,7 @@ class BasePlatform(ABC):
                     )
 
             # Keep original think tag handling
-            response = re.sub(r'<<think>>.*?</</think>>', '', response, flags=re.DOTALL)
+            response = re.sub(r'<think>.*?</think>', '', response, flags=re.DOTALL)
             return response
                 
         return while_true(lambda: while_success(lambda: _chat(), 5), 5)

jarvis/jarvis_tools/chdir.py

@@ -17,10 +17,31 @@ class ChdirTool:
     }
     
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
+        """Execute directory change operation with comprehensive error handling.
+        
+        Args:
+            args: Dictionary containing 'path' key with target directory path
+            
+        Returns:
+            Dictionary containing:
+                - success: Boolean indicating operation status
+                - stdout: Success message or empty string
+                - stderr: Error message or empty string
+                
+        Raises:
+            Handles and returns appropriate error messages for:
+                - Non-existent paths
+                - Non-directory paths
+                - Permission errors
+                - Generic exceptions
+        """
+        # Main execution block with comprehensive error handling
         try:
+            # Normalize and expand the input path (handles ~ and relative paths)
             path = os.path.expanduser(args["path"].strip())
             path = os.path.abspath(path)
             
+            # Validate that the target path exists
             if not os.path.exists(path):
                 return {
                     "success": False,
@@ -28,6 +49,7 @@ class ChdirTool:
                     "stderr": f"Directory does not exist: {path}"
                 }
                 
+            # Ensure the path points to a directory, not a file
             if not os.path.isdir(path):
                 return {
                     "success": False,
@@ -35,6 +57,7 @@ class ChdirTool:
                     "stderr": f"The path is not a directory: {path}"
                 }
                 
+            # Capture current directory and attempt to change to new path
             old_path = os.getcwd()
             os.chdir(path)
             
@@ -44,12 +67,14 @@ class ChdirTool:
                 "stderr": ""
             }
             
+        # Handle cases where user lacks directory access permissions
         except PermissionError:
             return {
                 "success": False,
                 "stdout": "",
                 "stderr": f"No permission to access directory: {path}"
             }
+        # Catch-all for any other unexpected errors during directory change
         except Exception as e:
             return {
                 "success": False,

jarvis/jarvis_tools/create_code_agent.py

@@ -3,7 +3,7 @@ from typing import Dict, Any
 from jarvis.jarvis_code_agent.code_agent import CodeAgent
 from jarvis.jarvis_tools.git_commiter import GitCommitTool
 from jarvis.jarvis_tools.code_review import CodeReviewTool, extract_code_report
-from jarvis.jarvis_utils import OutputType, PrettyOutput, has_uncommitted_changes
+from jarvis.jarvis_utils import OutputType, PrettyOutput, has_uncommitted_changes, get_latest_commit_hash
 
 class CreateCodeAgentTool:
     """Tool for managing the code development workflow."""
@@ -14,9 +14,6 @@ class CreateCodeAgentTool:
         "requirement": "Technical specifications for code implementation"
     }
     
-    def _get_current_commit(self) -> str:
-        """Get current commit hash."""
-        return os.popen("git rev-parse HEAD").read().strip()
     
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         try:
@@ -42,7 +39,7 @@ class CreateCodeAgentTool:
                     }
             
             # Get current commit hash
-            start_commit = self._get_current_commit()
+            start_commit = get_latest_commit_hash()
             
             # Step 2: Development
             PrettyOutput.print("开始开发...", OutputType.INFO)
@@ -50,7 +47,7 @@ class CreateCodeAgentTool:
             agent.run(requirement)
             
             # Get new commit hash after development
-            end_commit = self._get_current_commit()
+            end_commit = get_latest_commit_hash()
             
             # Step 3: Code Review
             PrettyOutput.print("开始代码审查...", OutputType.INFO)

jarvis/jarvis_tools/execute_shell_script.py

@@ -0,0 +1,58 @@
+from typing import Dict, Any
+import os
+import tempfile
+from pathlib import Path
+from jarvis.jarvis_utils import OutputType, PrettyOutput
+
+class ShellScriptTool:
+    name = "execute_shell_script"
+    description = """Execute shell script file and return result"""
+    parameters = {
+        "type": "object",
+        "properties": {
+            "script_content": {
+                "type": "string",
+                "description": "Content of the shell script to execute"
+            }
+        },
+        "required": ["script_content"]
+    }
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """Execute shell script content"""
+        try:
+            script_content = args.get("script_content", "").strip()
+            if not script_content:
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": "Missing or empty script_content parameter"
+                }
+            
+            # Create temporary script file
+            script_path = os.path.join(tempfile.gettempdir(), f"jarvis_script_{os.getpid()}.sh")
+            try:
+                with open(script_path, 'w', encoding='utf-8') as f:
+                    f.write(script_content)
+                os.chmod(script_path, 0o755)  # Make script executable
+                
+                # Use execute_shell to run the script
+                from jarvis.jarvis_tools.execute_shell import ShellTool
+                shell_tool = ShellTool()
+                result = shell_tool.execute({"command": script_path})
+                
+                return {
+                    "success": result["success"],
+                    "stdout": result["stdout"],
+                    "stderr": result["stderr"]
+                }
+            finally:
+                # Clean up temporary script file
+                Path(script_path).unlink(missing_ok=True)
+                
+        except Exception as e:
+            PrettyOutput.print(str(e), OutputType.ERROR)
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": str(e)
+            }

jarvis/jarvis_tools/git_commiter.py

@@ -1,4 +1,3 @@
-import os
 import re
 import shlex
 import subprocess
@@ -8,13 +7,23 @@ import yaml
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils import OutputType, PrettyOutput, has_uncommitted_changes, init_env
 import sys
+import argparse
 
 
 class GitCommitTool:
     name = "git_commit_agent"
     description = "Automatically generate and execute git commits based on code changes"
-    parameters = {"properties": {}, "required": []}
-
+    parameters = {
+        "type": "object",
+        "properties": {
+            "lang": {
+                "type": "string",
+                "description": "Language for commit message",
+                "default": "Chinese"
+            }
+        },
+        "required": []
+    }
     def _extract_commit_message(self, message):
         """Raw extraction preserving all characters"""
         r = re.search(
@@ -59,26 +68,20 @@ class GitCommitTool:
             PrettyOutput.print(diff, OutputType.CODE, lang="diff")
             
             prompt = f'''Generate commit message with the paranoia of someone who's lost production data:
-
-# Format Enforcement Protocol
-FAILURE TO WRAP MESSAGE IN <COMMIT_MESSAGE> TAGS WILL CAUSE SYSTEM REJECTION
-
+            You should write commit message in {args.get('lang', 'Chinese')}
 # Required Structure
 YOU MUST USE EXACTLY THIS FORMAT:
-
 <COMMIT_MESSAGE>
 <type>(<scope>): <subject>
-
-[Body description in imperative mood]
+Body description in imperative mood
 </COMMIT_MESSAGE>
-
 # Format Rules
 1. Types: fix, feat, docs, style, refactor, test, chore
 2. Scope indicates module (e.g. auth, database)
 3. Subject line <= 72 chars, no period
-4. Body explains WHAT and WHY, using present tense
-
-# Analysis Material (DO NOT INCLUDE IN OUTPUT)
+4. Body explains WHAT and WHY for every change, using present tense
+5. Do not omit any changes
+# Analysis Material
 {diff}
 '''
             
@@ -121,8 +124,11 @@ YOU MUST USE EXACTLY THIS FORMAT:
 
 def main():
     init_env()
+    parser = argparse.ArgumentParser(description='Git commit tool')
+    parser.add_argument('--lang', type=str, default='Chinese', help='Language for commit messages')
+    args = parser.parse_args()
     tool = GitCommitTool()
-    tool.execute({})
+    tool.execute({"lang": args.lang if hasattr(args, 'lang') else 'Chinese'})
 
 if __name__ == "__main__":
     sys.exit(main())

jarvis/jarvis_tools/search.py

@@ -212,7 +212,6 @@ Please synthesize a final answer that:
                     "stderr": "No search results found"
                 }
             
-            # Collect webpage content
             contents = []
             for i, result in enumerate(results, 1):
                 try:

jarvis/jarvis_utils/__init__.py

@@ -4,7 +4,7 @@ import time
 import os
 from enum import Enum
 from datetime import datetime
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Tuple
 import colorama
 from colorama import Fore, Style as ColoramaStyle
 import numpy as np
@@ -196,29 +196,26 @@ class PrettyOutput:
         """
         
         
+        # Define styles for different output types
         # Define styles for different output types
         styles = {
             OutputType.SYSTEM: RichStyle(
                 color="bright_cyan", 
-                italic=True,
                 bold=True, 
             ),
             OutputType.CODE: RichStyle(
                 color="green", 
-                italic=True,
                 bgcolor="#1a1a1a",
                 frame=True
             ),
             OutputType.RESULT: RichStyle(
                 color="bright_blue",
                 bold=True,
-                italic=True,
                 bgcolor="navy_blue"
             ),
             OutputType.ERROR: RichStyle(
                 color="red", 
                 bold=True,
-                italic=True,
                 blink=True,
                 bgcolor="dark_red",
             ),
@@ -226,47 +223,39 @@ class PrettyOutput:
                 color="gold1",
                 dim=True,
                 bgcolor="grey11",
-                italic=True
             ),
             OutputType.PLANNING: RichStyle(
                 color="purple", 
-                italic=True,
                 bold=True,
             ),
             OutputType.PROGRESS: RichStyle(
                 color="white", 
                 encircle=True,
-                italic=True,
             ),
             OutputType.SUCCESS: RichStyle(
                 color="bright_green", 
                 bold=True,
                 strike=False,
                 meta={"icon": "✓"},
-                italic=True
             ),
             OutputType.WARNING: RichStyle(
                 color="yellow", 
                 bold=True,
                 blink2=True,
                 bgcolor="dark_orange",
-                italic=True
             ),
             OutputType.DEBUG: RichStyle(
                 color="grey58",
                 dim=True,
-                italic=True,
                 conceal=True
             ),
             OutputType.USER: RichStyle(
                 color="spring_green2",
                 reverse=True,
                 frame=True,
-                italic=True
             ),
             OutputType.TOOL: RichStyle(
                 color="dark_sea_green4",
-                italic=True,
                 bgcolor="grey19",
             )
         }
@@ -517,12 +506,12 @@ def while_true(func, sleep_time: float = 0.1):
         time.sleep(sleep_time)
     return ret
 
-def find_git_root(dir="."):
-    curr_dir = os.getcwd()
-    os.chdir(dir)
-    ret = os.popen("git rev-parse --show-toplevel").read().strip()
-    os.chdir(curr_dir)
-    return ret
+def find_git_root(start_dir="."):
+    """Change to git root directory of the given path"""
+    os.chdir(start_dir)
+    git_root = os.popen("git rev-parse --show-toplevel").read().strip()
+    os.chdir(git_root)
+    return git_root
 
 def has_uncommitted_changes():
     import subprocess
@@ -539,6 +528,58 @@ def has_uncommitted_changes():
     subprocess.run(["git", "reset"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
     
     return working_changes or staged_changes
+def get_commits_between(start_hash: str, end_hash: str) -> List[Tuple[str, str]]:
+    """Get list of commits between two commit hashes
+    
+    Args:
+        start_hash: Starting commit hash (exclusive)
+        end_hash: Ending commit hash (inclusive)
+        
+    Returns:
+        List[Tuple[str, str]]: List of (commit_hash, commit_message) tuples
+    """
+    try:
+        import subprocess
+        # Use git log with pretty format to get hash and message
+        result = subprocess.run(
+            ['git', 'log', f'{start_hash}..{end_hash}', '--pretty=format:%H|%s'],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+        if result.returncode != 0:
+            PrettyOutput.print(f"获取commit历史失败: {result.stderr}", OutputType.ERROR)
+            return []
+            
+        commits = []
+        for line in result.stdout.splitlines():
+            if '|' in line:
+                commit_hash, message = line.split('|', 1)
+                commits.append((commit_hash, message))
+        return commits
+        
+    except Exception as e:
+        PrettyOutput.print(f"获取commit历史异常: {str(e)}", OutputType.ERROR)
+        return []
+def get_latest_commit_hash() -> str:
+    """Get the latest commit hash of the current git repository
+    
+    Returns:
+        str: The commit hash, or empty string if not in a git repo or error occurs
+    """
+    try:
+        import subprocess
+        result = subprocess.run(
+            ['git', 'rev-parse', 'HEAD'],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+        if result.returncode == 0:
+            return result.stdout.strip()
+        return ""
+    except Exception:
+        return ""
 
 def load_embedding_model():
     model_name = "BAAI/bge-m3"

{jarvis_ai_assistant-0.1.123.dist-info → jarvis_ai_assistant-0.1.124.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: jarvis-ai-assistant
-Version: 0.1.123
+Version: 0.1.124
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -43,10 +43,10 @@ License-File: LICENSE
 Requires-Dist: requests>=2.25.1
 Requires-Dist: pyyaml>=5.1
 Requires-Dist: colorama>=0.4.6
-Requires-Dist: prompt_toolkit>=3.0.0
+Requires-Dist: prompt-toolkit>=3.0.0
 Requires-Dist: openai>=1.20.0
 Requires-Dist: playwright>=1.41.1
-Requires-Dist: numpy==1.17.4
+Requires-Dist: numpy>=1.19.5
 Requires-Dist: faiss-cpu>=1.8.0
 Requires-Dist: sentence-transformers>=2.2.2
 Requires-Dist: bs4>=0.0.1
@@ -62,14 +62,13 @@ Requires-Dist: fuzzywuzzy>=0.18.0
 Requires-Dist: python-Levenshtein>=0.25.0
 Requires-Dist: jedi>=0.17.2
 Requires-Dist: psutil>=7.0.0
+Requires-Dist: fastapi>=0.115.4
+Requires-Dist: uvicorn>=0.33.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: isort; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
-Dynamic: author
-Dynamic: home-page
-Dynamic: requires-python
 
 <div align="center">
 

{jarvis_ai_assistant-0.1.123.dist-info → jarvis_ai_assistant-0.1.124.dist-info}/RECORD

@@ -1,11 +1,10 @@
-jarvis/__init__.py,sha256=Fd_y2qXT9cBkdEeg_-h8CvQ5Za_ELGG_KVryk5O1WC0,51
-jarvis/jarvis_agent/__init__.py,sha256=4nmQOpFbY68OpyM3sCUsQSHOQGBoTP8Xff8RyX08W4Y,22447
+jarvis/__init__.py,sha256=IEWrPxaE2RuPsf_eQCJWAuNjrMdwTLc1r-X__zq4Tow,51
+jarvis/jarvis_agent/__init__.py,sha256=zOjtzMX98v7qSFQ71jUmRFyOfYUo9z0gpz7sRSlnw4Q,22435
 jarvis/jarvis_agent/output_handler.py,sha256=kJeFTjjSu0K_2p0wyhq2veSZuhRXoaFC_8wVaoBKX0w,401
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=_D4oPX9isUvCJk4l-afquLimqjxLA6XBd_IxnQxfTGs,6954
-jarvis/jarvis_code_agent/file_select.py,sha256=Q3ibitHZHMhqlNw9rmjaMgK3U5hb8RgW1MK-CPHqtJ8,11942
-jarvis/jarvis_code_agent/patch.py,sha256=IospCezRB2R8IM6h3Nx0zyfFVbx-S0RryuwSgotSg84,10285
-jarvis/jarvis_code_agent/relevant_files.py,sha256=Z9bHJ6qkRu8EhD06kS_e0raqrsUgRUwkYf5mgBfdKP8,3392
+jarvis/jarvis_code_agent/code_agent.py,sha256=8Jwpo9iEDb8W_zGr82iwkGw2eFRidExFLMw2MJPTjAI,5774
+jarvis/jarvis_code_agent/file_select.py,sha256=nBPNUSOXiCun56quOMMBUtS93k3AAb_I1m20h5kS2bM,8509
+jarvis/jarvis_code_agent/patch.py,sha256=NzQbSnVGvzTe2wT67M2zbENB3f2jy2aGcaE8SRtzEDU,14018
 jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_codebase/main.py,sha256=qwB74U9YDgqvBSdvglQ62HmPkBT_Y5x5YF4J8LnzbQU,39778
 jarvis/jarvis_dev/main.py,sha256=zNV7P0d9-jjZ5XAAq_o2FAYqcBfn_lai89mJgomL6fM,24270
@@ -18,7 +17,7 @@ jarvis/jarvis_lsp/rust.py,sha256=ZvUoOZm9GWLl3kobfByBuTGrQ8aM2dLuNxS_NHr1aQQ,554
 jarvis/jarvis_multi_agent/__init__.py,sha256=Z6QaRZrqUUa6r6Pe_KZi34Ymle5amQe1N-AINxiOi1c,6011
 jarvis/jarvis_platform/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
 jarvis/jarvis_platform/ai8.py,sha256=rVPcbf0EbXV3lUPEmd_aO6UzYT0AHo4w13iGhHGvbjo,11964
-jarvis/jarvis_platform/base.py,sha256=qrgdJm-aZI3Tb4el6Is8u41cC5hfnJz-U2Vfj8zzlzE,3461
+jarvis/jarvis_platform/base.py,sha256=Z-GTDyySuc9TrQD0LmI3uqnWLHGiy0ge_Uu-pQhJn9o,3456
 jarvis/jarvis_platform/kimi.py,sha256=dQM4RLSfDiJwNV25qNWPKqseEpPTo7fel3SI2Pot3l4,15701
 jarvis/jarvis_platform/ollama.py,sha256=TsBEg8crPmBiLvMRDtXYVa2AIdeog36MmW2tn5j9x8U,5613
 jarvis/jarvis_platform/openai.py,sha256=Ofu-J4HmteyoPsxCHvCEDlY5J7-8t3qWr8QsCprw9-8,4463
@@ -35,13 +34,14 @@ jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 jarvis/jarvis_tools/ask_codebase.py,sha256=-4oIe7maa-60w5-QZxOGVt47W0kVd6TB-eIU77fIIMw,3005
 jarvis/jarvis_tools/ask_user.py,sha256=tIyiKk9F8xchjQ3Yh5fMQjhpflQTuh75HTuXMftGxZY,1827
 jarvis/jarvis_tools/base.py,sha256=c0DMoDDPxmsqUYJR989zgUs7nIYRY6GWBrAdusIZKjc,656
-jarvis/jarvis_tools/chdir.py,sha256=06GAtMqoi5fT1FXD2HUUlHKosVtz-Z8KI13lpEFQw3g,1820
+jarvis/jarvis_tools/chdir.py,sha256=8v7bhYNQOW2BCwS2H4g4a0ozrzKDl-3VXxHE5S7SENY,2981
 jarvis/jarvis_tools/code_review.py,sha256=ZMWCrkVECCVaT7UyZV0_v49Gecws-x_dQ0NamFUunEs,9775
-jarvis/jarvis_tools/create_code_agent.py,sha256=i1crlCWrQrpUuTYueLKgenAy_LhwXhEoFNk8xXo56xc,3899
+jarvis/jarvis_tools/create_code_agent.py,sha256=SAwIGBEz2i-XL-F7J7yXWYqoZzFo1i1sx4yfABh7cAo,3777
 jarvis/jarvis_tools/create_sub_agent.py,sha256=ldpNn5LczybExvt9Sz4t1ybetLX-dTJIAF5f_oH-Z3M,2869
 jarvis/jarvis_tools/execute_shell.py,sha256=MwgVyI1O1wshU9yR-DvSWIgoSQpVjtH9JpjVQvSrKF0,2566
+jarvis/jarvis_tools/execute_shell_script.py,sha256=1F4nYnlYyB3JVFylhS-6wABDBD8eyzQ7hm0FP9DlirA,2118
 jarvis/jarvis_tools/file_operation.py,sha256=9mUGXYrH7dN4XijN1R82SsMXeljOIjIMVzh8hm1aZ1s,5501
-jarvis/jarvis_tools/git_commiter.py,sha256=iskOXIhfwvy7XfAQQpjDzy90Tl_dnlZ54hIepiuLBbE,4544
+jarvis/jarvis_tools/git_commiter.py,sha256=LZ4rtyugvkt77HbW4_gSlAxMbMNJ3F-IJsx25k49uJo,5010
 jarvis/jarvis_tools/lsp_find_definition.py,sha256=xV8YeN1RJfwd2F3gE6OnDeTwl-AnCmrxueHocbXkQOc,4800
 jarvis/jarvis_tools/lsp_find_references.py,sha256=FohlJeLfTxcMUASfbjOT93hQGtI2WeyTpMGwRwShW_I,4043
 jarvis/jarvis_tools/lsp_get_diagnostics.py,sha256=bEvbDk8TnKg9TTFFxMrYOJm5TBDgz5gO04WJFQUwQQE,4490
@@ -53,13 +53,13 @@ jarvis/jarvis_tools/rag.py,sha256=eY3GrzagaJIPQ8DmrqNUFFJnIF_GfUxqRjeSengEDss,49
 jarvis/jarvis_tools/read_code.py,sha256=e0iX9rpwUlSfrhnzgQPNvfqJ-ebxuJybrNaTgb3Hnyw,7290
 jarvis/jarvis_tools/read_webpage.py,sha256=7QamwBi5s7lD-jTcjD0wsBvkmWPRC9-K-0JkGgeTpvs,3063
 jarvis/jarvis_tools/registry.py,sha256=XefDvujSfqKX2uLA6tnoJFg5kyBNW0iNAAJZocfIz9w,14836
-jarvis/jarvis_tools/search.py,sha256=NHrFpAqg6dtws_9wLJvIZimjeJ-kekETi0Bg0AWMG08,11437
+jarvis/jarvis_tools/search.py,sha256=UqXIUlpqy-0h3CrK23EfdqoXK0SjcthmA90OUGlIYYo,11399
 jarvis/jarvis_tools/select_code_files.py,sha256=vbEdneWWtAN90OFASohtllTgZW400ZxQbrkgroPK1qc,1902
 jarvis/jarvis_tools/tool_generator.py,sha256=jdniHyKcEyF9KyouudrCoZBH3czZmQXc3ns0_trZ3yU,6332
-jarvis/jarvis_utils/__init__.py,sha256=LYZktMl-iCtGLUa8RXpmDzQVMT_0Pm00aXyFGMBu95o,32207
-jarvis_ai_assistant-0.1.123.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.123.dist-info/METADATA,sha256=f9JvSSga3TWB7iIVfNpCitzs9R-h0CpHHuXrjKH88ZY,13746
-jarvis_ai_assistant-0.1.123.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-jarvis_ai_assistant-0.1.123.dist-info/entry_points.txt,sha256=H9Y_q7BZGDsgJijaXHD9GbscllATyKYfg22otrpKEoE,619
-jarvis_ai_assistant-0.1.123.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.123.dist-info/RECORD,,
+jarvis/jarvis_utils/__init__.py,sha256=K74tsMDZPieWX6HxOu1WHX9mJuQah4nOeuzq_j91ecg,33744
+jarvis_ai_assistant-0.1.124.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.124.dist-info/METADATA,sha256=iDizLFV77rJQTHB56lhDR9Q5RePLuaeWs7zDGcI1pzA,13749
+jarvis_ai_assistant-0.1.124.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+jarvis_ai_assistant-0.1.124.dist-info/entry_points.txt,sha256=H9Y_q7BZGDsgJijaXHD9GbscllATyKYfg22otrpKEoE,619
+jarvis_ai_assistant-0.1.124.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.124.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.123.dist-info → jarvis_ai_assistant-0.1.124.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

jarvis/jarvis_code_agent/relevant_files.py

@@ -1,117 +0,0 @@
-import os
-import re
-from typing import Dict, List, Optional, Tuple
-
-from jarvis.jarvis_code_agent.file_select import select_files
-from jarvis.jarvis_codebase.main import CodeBase
-from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils import OutputType, PrettyOutput
-
-def make_question(requirement: str) -> Optional[str]:
-    """Generate structured questions to gather necessary information for the requirement."""
-    prompt = f"""
-# 🔍 Role Definition
-You are a code analysis expert who helps developers understand existing system implementations by asking targeted questions.
-
-# 🎯 Core Objectives
-- Understand current system implementations
-- Identify integration points and interfaces
-- Discover extension mechanisms
-- Map component interactions
-
-# 📋 Question Categories
-## 1. System Architecture
-Focus on system structure and design:
-- Existing interfaces and classes
-- Component integration patterns
-- Extension points and hooks
-- System boundaries
-
-## 2. Implementation Details
-Explore current codebase:
-- Workflow implementations
-- Hook and callback systems
-- Interface hierarchies
-- Extension mechanisms
-
-## 3. Integration Patterns
-Understand connection points:
-- Component interactions
-- Integration interfaces
-- Extension methods
-- Plugin systems
-
-## 4. Extension Mechanisms
-Identify customization options:
-- Extension patterns
-- Plugin architectures
-- Configuration systems
-- Customization points
-
-# 📝 Question Guidelines
-## Good Questions
-- "What interfaces currently handle user authentication?"
-- "How does the system expose extension points for plugins?"
-- "Where are the existing hooks for custom providers?"
-
-## Bad Questions
-- "How should we implement the new feature?"
-- "What's the best way to add this?"
-- "Should we create a new class?"
-
-# 🎨 Question Template
-3-5 specific questions about existing implementations:
-<QUESTION>
-1. System architecture question
-2. Implementation details question
-3. Integration or extension question
-</QUESTION>
-
-# 🔎 Investigation Focus
-1. Current System
-   - Existing implementations
-   - Active interfaces
-   - Current patterns
-
-2. Integration Points
-   - Connection methods
-   - Extension hooks
-   - Plugin systems
-
-3. Extension Options
-   - Customization points
-   - Configuration options
-   - Extension patterns
-
-# ❗ Important Rules
-1. Focus on EXISTING code
-2. Ask about current patterns
-3. Explore extension points
-4. Investigate interfaces
-5. Map dependencies
-
-User Requirement:
-{requirement}
-"""
-    model = PlatformRegistry().get_thinking_platform()
-    response = model.chat_until_success(prompt)
-    response = re.search(r'<QUESTION>(.*?)</QUESTION>', response, re.DOTALL)
-    if response is None:
-        return None
-    return response.group(1)
-
-
-def find_relevant_information(user_input: str, root_dir: str) -> Tuple[List[Dict[str, str]], str]:
-    try:
-        PrettyOutput.print("从代码库中查找文件...", OutputType.INFO)
-        codebase = CodeBase(root_dir)
-        question = make_question(user_input)
-        if question is None:
-            return [], ""
-        files_from_codebase, infomation = codebase.ask_codebase(question)
-
-        selected_files = select_files(files_from_codebase, os.getcwd())
-        return selected_files, infomation
-    except Exception:
-        PrettyOutput.print("查找相关文件失败", OutputType.ERROR)
-        return [], ""