jarvis-ai-assistant 0.1.110__py3-none-any.whl → 0.1.111__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.110" 
+__version__ = "0.1.111" 

jarvis/agent.py

@@ -8,7 +8,7 @@ import yaml
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.registry import ToolRegistry, tool_call_help
-from jarvis.utils import PrettyOutput, OutputType, get_context_token_count, is_auto_complete, is_need_summary, is_record_methodology, load_methodology, add_agent, delete_current_agent, get_max_token_count, get_multiline_input, init_env, is_use_methodology
+from jarvis.utils import PrettyOutput, OutputType, get_context_token_count, is_auto_complete, is_execute_tool_confirm, is_need_summary, is_record_methodology, load_methodology, add_agent, delete_current_agent, get_max_token_count, get_multiline_input, init_env, is_use_methodology, user_confirm
 import os
 
 class Agent:
@@ -42,7 +42,8 @@ class Agent:
                  use_methodology: Optional[bool] = None,
                  record_methodology: Optional[bool] = None,
                  need_summary: Optional[bool] = None,
-                 max_context_length: Optional[int] = None):
+                 max_context_length: Optional[int] = None,
+                 execute_tool_confirm: Optional[bool] = None):
         """Initialize an Agent instance.
         
         Args:
@@ -78,6 +79,8 @@ class Agent:
         self.output_handler_before_tool = output_handler_before_tool if output_handler_before_tool else []
         self.output_handler_after_tool = output_handler_after_tool if output_handler_after_tool else []
 
+        self.execute_tool_confirm = execute_tool_confirm if execute_tool_confirm is not None else is_execute_tool_confirm()
+
         self.summary_prompt = summary_prompt if summary_prompt else f"""Please generate a concise summary report of the task execution, including:
 
 1. Task Objective: Task restatement
@@ -344,10 +347,11 @@ Please continue the task based on the above information.
                         continue
                     
                     if len(result) > 0:
-                        PrettyOutput.print("Executing tool call...", OutputType.PROGRESS)
-                        tool_result = self.tool_registry.handle_tool_calls(result)
-                        self.prompt += tool_result
-
+                        if not self.execute_tool_confirm or user_confirm(f"Execute tool call: {result[0]['name']}?"):
+                            PrettyOutput.print("Executing tool call...", OutputType.PROGRESS)
+                            tool_result = self.tool_registry.handle_tool_calls(result)
+                            self.prompt += tool_result
+                            
                     for handler in self.output_handler_after_tool:
                         self.prompt += handler(current_response)
                     
@@ -499,6 +503,8 @@ When users need to execute tasks, you will strictly follow these steps to handle
 10. Auto check the task goal completion status: If the task goal is completed, use the task completion command to end the task
 11. Task Completion: End the task using task completion command when finished
 
+Tip: Chat in user's language
+
 Methodology Template:
 1. Problem Restatement
 2. Optimal Solution
@@ -516,7 +522,7 @@ def main():
 
     try:
         # 获取全局模型实例
-        agent = Agent(system_prompt=origin_agent_system_prompt, tool_registry=ToolRegistry())
+        agent = Agent(system_prompt=origin_agent_system_prompt)
 
         # 加载预定义任务
         tasks = _load_tasks()

jarvis/jarvis_code_agent/code_agent.py

@@ -1,13 +1,13 @@
 import os
-from typing import List
+from typing import Dict, List
 
 from jarvis.agent import Agent
 from jarvis.jarvis_code_agent.patch import apply_patch
-from jarvis.jarvis_code_agent.relevant_files import find_relevant_files
+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.utils import OutputType, PrettyOutput, get_file_line_count, get_multiline_input, has_uncommitted_changes, init_env, find_git_root
+from jarvis.utils import OutputType, PrettyOutput, get_multiline_input, has_uncommitted_changes, init_env, find_git_root
 
 
 class CodeAgent:
@@ -26,7 +26,13 @@ class CodeAgent:
                                  "lsp_find_definition", 
                                  "lsp_prepare_rename", 
                                  "lsp_validate_edit"])
-        code_system_prompt = """You are a code agent responsible for modifying code. You will analyze code and create patches while following these guidelines:
+        code_system_prompt = """You are a code agent responsible for modifying code. Your primary task is to understand existing code first and ensure compatibility with the current system.
+
+# Critical First Steps
+1. READ and UNDERSTAND existing code thoroughly
+2. Identify current patterns and conventions
+3. Map out affected components and their interactions
+4. Plan changes that maintain system integrity
 
 # Patch Format
 <PATCH>
@@ -41,40 +47,43 @@ Key Rules:
 • Same start/end number: insert before that line
 • Start=0, end=0: create new file with content
 
-# Code Compatibility
+# Code Compatibility Requirements
 1. System Integration
-   • Maintain existing API contracts
-   • Preserve function signatures
-   • Keep data structures compatible
-   • Honor return types and exceptions
+   • MUST preserve existing API contracts
+   • MUST maintain current function signatures
+   • MUST keep data structure compatibility
+   • MUST follow error handling patterns
 
 2. Style Consistency
-   • Match naming conventions
-   • Follow indentation patterns
-   • Use existing import style
-   • Keep comment format
+   • Match existing naming conventions exactly
+   • Follow established code organization
+   • Use current import style and order
+   • Maintain comment style and level of detail
 
 3. Pattern Alignment
-   • Use similar error handling
-   • Follow existing design patterns
-   • Match logging approach
-   • Keep configuration style
+   • Reuse existing error handling approaches
+   • Follow established design patterns
+   • Use current logging conventions
+   • Keep configuration consistency
 
 # Development Process
-1. ANALYZE
-   • Break down requirements
-   • Assess task complexity
-   • Determine if subtasks needed
-
-2. ASSESS
-   • Map dependencies
-   • Check compatibility impact
-   • Identify integration points
-
-3. IMPLEMENT
-   • Follow existing patterns
-   • Make minimal changes
-   • Verify integrations
+1. ANALYZE (Current Code)
+   • Read and understand existing implementations
+   • Map out current code structure
+   • Identify established patterns
+   • Note key dependencies
+
+2. ASSESS (Changes)
+   • Evaluate impact on existing code
+   • Check all dependencies
+   • Verify API compatibility
+   • Consider side effects
+
+3. IMPLEMENT (Carefully)
+   • Make minimal necessary changes
+   • Follow existing patterns exactly
+   • Preserve all interfaces
+   • Maintain backward compatibility
 
 # File Handling
 Large Files (>200 lines):
@@ -84,18 +93,18 @@ Large Files (>200 lines):
 
 # Available Tools
 Primary:
+• read_code - MUST use to understand existing code
 • LSP tools for code analysis
-• read_code with line ranges
 • execute_shell for searches
-• ask_user when unclear
+• ask_user when uncertain
 
 # Quality Requirements
-Code Changes Must:
-✓ Preserve interfaces
-✓ Match existing style
+Every Change Must:
+✓ Be based on thorough code reading
+✓ Preserve all interfaces
+✓ Match existing style exactly
 ✓ Handle errors consistently
 ✓ Maintain documentation
-✓ Keep test coverage
 ✓ Follow project patterns"""
         self.agent = Agent(system_prompt=code_system_prompt, 
                            name="CodeAgent", 
@@ -103,7 +112,7 @@ Code Changes Must:
                            is_sub_agent=False, 
                            use_methodology=False,
                            tool_registry=tool_registry, 
-                           platform=PlatformRegistry().get_thinking_platform(), 
+                           platform=PlatformRegistry().get_codegen_platform(), 
                            record_methodology=False,
                            output_handler_after_tool=[apply_patch],
                            need_summary=False)
@@ -119,17 +128,22 @@ Code Changes Must:
             git_commiter.execute({})
 
     
-    def make_files_prompt(self, files: List[str]) -> str:
-        """Make the files prompt.
+    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
         """
-        return "\n".join(
-            f"- {file} ({get_file_line_count(file)} lines)"
-            for file in files
-        )
+        prompt_parts = []
+
+        # Then try to add file contents
+        for file in files:
+            prompt_parts.append(f'''- {file['file']} ({file['reason']})''')
+                
+        return "\n".join(prompt_parts)
 
     def run(self, user_input: str) :
         """Run the code agent with the given user input.
@@ -142,15 +156,15 @@ Code Changes Must:
         """
         try:
             self._init_env()
-            files = find_relevant_files(user_input, self.root_dir)
-            self.agent.run(self._build_first_edit_prompt(user_input, self.make_files_prompt(files)))
+            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:
             return f"Error during execution: {str(e)}"
         
 
 
-    def _build_first_edit_prompt(self, user_input: str, files_prompt: str) -> str:
+    def _build_first_edit_prompt(self, user_input: str, files_prompt: str, information: str) -> str:
         """Build the initial prompt for the agent.
         
         Args:
@@ -160,13 +174,17 @@ Code Changes Must:
         Returns:
             str: The formatted prompt
         """
+
         return f"""# Code Modification Task
 
 ## User Requirement
 {user_input}
 
-## Available Files
+## Maybe Relevant Files
 {files_prompt}
+
+## Some Information
+{information}
 """
 def main():
     """Jarvis main entry point"""

jarvis/jarvis_code_agent/file_select.py

@@ -2,7 +2,7 @@ import os
 import re
 from typing import Dict, List
 from prompt_toolkit import PromptSession
-from prompt_toolkit.completion import WordCompleter, Completer, Completion
+from prompt_toolkit.completion import Completer, Completion
 from jarvis.utils import OutputType, PrettyOutput, get_single_line_input, user_confirm
 
 
@@ -125,7 +125,7 @@ def _fuzzy_match_files(root_dir: str, pattern: str) -> List[str]:
     
     return sorted(matches)
 
-def select_files(related_files: List[str], root_dir: 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("Related files", OutputType.INFO)
     
@@ -133,7 +133,7 @@ def select_files(related_files: List[str], root_dir: str) -> List[str]:
     # Display found files
     selected_files = list(related_files)  # Default select all
     for i, file in enumerate(related_files, 1):
-        output += f"[{i}] {file}\n"
+        output += f"[{i}] {file['file']} ({file['reason']})\n"
 
     PrettyOutput.print(output, OutputType.INFO, lang="markdown")
     
@@ -199,7 +199,7 @@ def select_files(related_files: List[str], root_dir: str) -> List[str]:
                     continue
                 
                 try:
-                    selected_files.append(path)
+                    selected_files.append({"file": path, "reason": "User Added"})
                     PrettyOutput.print(f"File added: {path}", OutputType.SUCCESS)
                 except Exception as e:
                     PrettyOutput.print(f"Failed to read file: {str(e)}", OutputType.ERROR)

jarvis/jarvis_code_agent/patch.py

@@ -115,11 +115,14 @@ def handle_commit_workflow()->bool:
     Returns:
         tuple[bool, str, str]: (continue_execution, commit_id, commit_message)
     """
+    os.system("git add .")
     diff = os.popen("git diff HEAD").read()
+    os.system("git reset HEAD")
     PrettyOutput.print(diff, OutputType.CODE, lang="diff")
     if not user_confirm("Do you want to commit the code?", default=True):
         os.system("git reset HEAD")
         os.system("git checkout -- .")
+        os.system("git clean -fd")
         return False
 
     git_commiter = GitCommitTool()

jarvis/jarvis_code_agent/relevant_files.py

@@ -1,27 +1,86 @@
 import os
 import re
-from typing import List
+from typing import Dict, List, Optional, Tuple
 
-import yaml
-from jarvis.agent import Agent
 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_tools.registry import ToolRegistry
-from jarvis.utils import OutputType, PrettyOutput, is_disable_codebase
+from jarvis.utils import OutputType, PrettyOutput
 
+def make_question(requirement: str) -> Optional[str]:
+    """Generate structured questions to gather necessary information for the requirement.
+    
+    Args:
+        requirement: The user's requirement description
+        
+    Returns:
+        str: A formatted string containing relevant questions
+    """
+    prompt = f"""You are a helpful assistant that generates SPECIFIC questions in English for a code analysis team. The analysis team:
+- Has access to the codebase but NO CONTEXT about the requirement
+- Will search and analyze code based on your questions
+- Needs complete context to understand what to look for
 
-def find_relevant_files(user_input: str, root_dir: str) -> List[str]:
-    try:
-        files_from_codebase = []
-        if not is_disable_codebase():
-            PrettyOutput.print("Find files from codebase...", OutputType.INFO)
-            codebase = CodeBase(root_dir)
-            files_from_codebase = codebase.search_similar(user_input)
+Key Instructions:
+1. Write questions in clear, professional English
+2. Include necessary CONTEXT in each question
+3. Be SPECIFIC about what needs to be found/analyzed
+4. Provide enough background for someone with no prior knowledge
+
+For example:
+BAD: "How is error handling implemented?"
+GOOD: "Given that we need to add retry logic to the file upload feature, how does the current error handling work in upload_handler.py, specifically around network failures and timeout scenarios?"
+
+Consider these aspects when forming questions:
+
+1. Implementation Context:
+   - "What is the current implementation of [specific feature]?"
+   - "Which modules/classes handle [specific functionality]?"
+   - "What is the existing workflow for [specific operation]?"
+
+2. Technical Investigation:
+   - "How does the system currently handle [specific scenario]?"
+   - "What patterns are used for [specific behavior]?"
+   - "Where are the configuration settings for [specific feature]?"
+
+3. Integration Details:
+   - "Which components call or depend on [specific module]?"
+   - "What is the data flow between [component A] and [component B]?"
+   - "How are errors propagated from [specific component]?"
 
+4. Requirements Context:
+   - "Given [specific requirement], what are the current limitations?"
+   - "For [specific change], what validation rules apply?"
+   - "In the context of [feature], what edge cases exist?"
+
+User Requirement:
+{requirement}
+
+Output Format:
+<QUESTION>
+[Write 3-5 specific questions in English, ensuring each includes full context for someone with no prior knowledge of the requirement]
+</QUESTION>
+"""
+    model = PlatformRegistry().get_normal_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("Find files from codebase...", OutputType.INFO)
+        codebase = CodeBase(root_dir)
+        question = make_question(user_input)
+        if question is None:
+            return [], ""
+        files_from_codebase, infomation = codebase.ask_codebase(question)
         PrettyOutput.print("Find files by agent...", OutputType.INFO)
 
         selected_files = select_files(files_from_codebase, os.getcwd())
-        return selected_files
-    except Exception as e:
-        return []
+        return selected_files, infomation
+    except Exception:
+        PrettyOutput.print("Failed to find relevant files", OutputType.ERROR)
+        return [], ""

jarvis/jarvis_codebase/main.py

@@ -524,7 +524,7 @@ Content: {content}
         score = len(matched_keywords) / len(keywords)
         return score
 
-    def pick_results(self, query: List[str], initial_results: List[str]) -> List[str]:
+    def pick_results(self, query: List[str], initial_results: List[str]) -> List[Dict[str,str]]:
         """Use a large model to pick the search results
         
         Args:
@@ -538,14 +538,14 @@ Content: {content}
             return []
             
         try:
-            PrettyOutput.print(f"Picking results for query: \n" + "\n".join(query), output_type=OutputType.INFO)
+            PrettyOutput.print(f"Picking results ...", output_type=OutputType.INFO)
             
             # Maximum content length per batch
             max_batch_length = self.max_token_count - 1000  # Reserve space for prompt
             max_file_length = max_batch_length // 3  # Limit individual file size
             
             # Process files in batches
-            all_selected_files = set()
+            all_selected_files = []
             current_batch = []
             current_token_count = 0
             
@@ -565,7 +565,7 @@ Content: {content}
                         # Process current batch
                         if current_batch:
                             selected = self._process_batch('\n'.join(query), current_batch)
-                            all_selected_files.update(selected)
+                            all_selected_files.extend(selected)
                         # Start new batch
                         current_batch = [file_info]
                         current_token_count = tokens_count
@@ -580,17 +580,16 @@ Content: {content}
             # Process final batch
             if current_batch:
                 selected = self._process_batch('\n'.join(query), current_batch)
-                all_selected_files.update(selected)
+                all_selected_files.extend(selected)
             
             # Convert set to list and maintain original order
-            final_results = [path for path in initial_results if path in all_selected_files]
-            return final_results
+            return all_selected_files
 
         except Exception as e:
             PrettyOutput.print(f"Failed to pick: {str(e)}", OutputType.ERROR)
-            return initial_results
+            return [{"file": f, "reason": "" } for f in initial_results]
             
-    def _process_batch(self, query: str, files_info: List[str]) -> List[str]:
+    def _process_batch(self, query: str, files_info: List[str]) -> List[Dict[str, str]]:
         """Process a batch of files"""
         prompt = f"""As a code analysis expert, please help identify the most relevant files for the given query using chain-of-thought reasoning.
 
@@ -611,8 +610,10 @@ Think through this step by step:
 
 Please output your selection in YAML format:
 <FILES>
-- path/to/most/relevant.py
+- file: path/to/most/relevant.py
+  reason: xxxxxxxxxx
 - path/to/next/relevant.py
+  reason: yyyyyyyyyy
 </FILES>
 
 Important:
@@ -724,7 +725,7 @@ Please provide 10 search-optimized expressions in the specified format.
         return results
 
 
-    def search_similar(self, query: str, top_k: int = 30) -> List[str]:
+    def search_similar(self, query: str, top_k: int = 30) -> List[Dict[str, str]]:
         """Search related files with optimized retrieval"""
         try:
             self.generate_codebase()
@@ -764,13 +765,13 @@ Please provide 10 search-optimized expressions in the specified format.
             all_results.sort(key=lambda x: x[1], reverse=True)
             results = all_results[:top_k]
 
-            # Display results with scores
-            message = "Found related files:\n"
-            for path, score, _ in results:
-                message += f"File: {path} (Score: {score:.3f})\n"
-            PrettyOutput.print(message.rstrip(), output_type=OutputType.INFO, lang="markdown")
-
             results = self.pick_results(query_variants, [path for path, _, _ in results])
+
+            output = "Found related files:\n"
+            for file in results:
+                output += f'''- {file['file']} ({file['reason']})\n'''
+            PrettyOutput.print(output, output_type=OutputType.INFO, lang="markdown")
+
             
             return results
             
@@ -778,18 +779,13 @@ Please provide 10 search-optimized expressions in the specified format.
             PrettyOutput.print(f"Failed to search: {str(e)}", output_type=OutputType.ERROR)
             return []
 
-    def ask_codebase(self, query: str, top_k: int=20) -> str:
+    def ask_codebase(self, query: str, top_k: int=20) -> Tuple[List[Dict[str, str]], str]:
         """Query the codebase with enhanced context building"""
         files_from_codebase = self.search_similar(query, top_k)
         
         if not files_from_codebase:
             PrettyOutput.print("No related files found", output_type=OutputType.WARNING)
-            return ""
-        
-        output = "Found related files:\n"
-        for path in files_from_codebase:
-            output += f"- {path}\n"
-        PrettyOutput.print(output, output_type=OutputType.INFO, lang="markdown")
+            return [],""
         
         # Build enhanced prompt
         prompt = f"""Based on the following code files, please provide a comprehensive and accurate answer to the user's question.
@@ -799,6 +795,8 @@ Important guidelines:
 2. Explain technical concepts clearly
 3. Include relevant code snippets when helpful
 4. If the code doesn't fully answer the question, indicate what's missing
+5. Answer in user's language.
+6. Answer with professional language.
 
 Question: {query}
 
@@ -810,9 +808,9 @@ Relevant code files (ordered by relevance):
         
         for path in files_from_codebase:
             try:
-                content = open(path, "r", encoding="utf-8").read()
+                content = open(path["file"], "r", encoding="utf-8").read()
                 file_content = f"""
-File: {path}
+File: {path["file"]}
 Content:
 {content}
 ----------------------------------------
@@ -832,21 +830,8 @@ Content:
                                 output_type=OutputType.ERROR)
                 continue
         
-        prompt += """
-Please structure your answer as follows:
-1. Direct answer to the question
-2. Relevant code explanations
-3. Implementation details
-4. Any missing information or limitations
-5. Add reference files and code snippets at the end of the answer.
-
-Answer in Chinese using professional language.
-"""
-        
-        model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
-        response = model.chat_until_success(prompt)
-        
-        return response
+        model = PlatformRegistry.get_global_platform_registry().get_thinking_platform()
+        return files_from_codebase, model.chat_until_success(prompt)
 
     def is_index_generated(self) -> bool:
         """Check if the index has been generated"""
@@ -948,7 +933,7 @@ def main():
 
     elif args.command == 'ask':            
         response = codebase.ask_codebase(args.question, args.top_k)
-        output = f"""Answer:\n{response}"""
+        output = f"""{response}"""
         PrettyOutput.print(output, output_type=OutputType.INFO)
 
     else:

jarvis/jarvis_tools/ask_codebase.py

@@ -52,7 +52,7 @@ class AskCodebaseTool:
             codebase = CodeBase(git_root)
 
             # Use ask_codebase method
-            response = codebase.ask_codebase(question, top_k)
+            _, response = codebase.ask_codebase(question, top_k)
 
             return {
                 "success": True,

jarvis/jarvis_tools/git_commiter.py

@@ -3,9 +3,7 @@ import re
 from typing import Dict, Any
 
 import yaml
-from jarvis.agent import Agent
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.utils import OutputType, PrettyOutput, init_env
 import sys
 

jarvis/jarvis_tools/read_code.py

@@ -100,11 +100,12 @@ class ReadCodeTool:
                 
             content = "".join(formatted_lines)
 
-            PrettyOutput.print(f"File: {filepath}\nLines: [{start_line}, {end_line})\n{content}", OutputType.CODE)
+            output = f"File: {filepath}\nLines: [{start_line}, {end_line})\n{content}";
+            PrettyOutput.print(output, OutputType.CODE)
             
             return {
                 "success": True,
-                "stdout": content,
+                "stdout": output,
                 "stderr": ""
             }
             

jarvis/utils/date_utils.py

@@ -0,0 +1,19 @@
+from datetime import datetime
+
+class DateValidator:
+    @staticmethod
+    def validate_iso_date(date_str: str) -> bool:
+        try:
+            datetime.fromisoformat(date_str)
+            return True
+        except ValueError:
+            return False
+
+    @staticmethod
+    def validate_date_range(start: str, end: str) -> bool:
+        try:
+            start_dt = datetime.fromisoformat(start)
+            end_dt = datetime.fromisoformat(end)
+            return start_dt <= end_dt
+        except ValueError:
+            return False

jarvis/utils.py

@@ -213,6 +213,8 @@ class FileCompleter(Completer):
     """Custom completer for file paths with fuzzy matching."""
     def __init__(self):
         self.path_completer = PathCompleter()
+        self.max_suggestions = 10  # 增加显示数量
+        self.min_score = 10  # 降低相似度阈值
         
     def get_completions(self, document: Document, complete_event):
         text = document.text_before_cursor
@@ -251,21 +253,26 @@ class FileCompleter(Completer):
         # If no input after @, show all files
         # Otherwise use fuzzy matching
         if not file_path:
-            scored_files = [(path, 100) for path in all_files]
+            scored_files = [(path, 100) for path in all_files[:self.max_suggestions]]
         else:
             scored_files = [
                 (path, fuzz.ratio(file_path.lower(), path.lower()))
                 for path in all_files
             ]
+            # Sort by score and take top results
             scored_files.sort(key=lambda x: x[1], reverse=True)
+            scored_files = scored_files[:self.max_suggestions]
         
         # Return completions for files
         for path, score in scored_files:
-            if not file_path or score > 30:  # Show all if no input, otherwise filter by score
+            if not file_path or score > self.min_score:
+                display_text = path
+                if file_path and score < 100:
+                    display_text = f"{path} ({score}%)"
                 completion = Completion(
                     text=path,
                     start_position=-len(file_path),
-                    display=f"{path}" if not file_path else f"{path} ({score}%)",
+                    display=display_text,
                     display_meta="File"
                 )
                 yield completion
@@ -376,6 +383,7 @@ def has_uncommitted_changes():
     working_changes = os.popen("git diff --exit-code").read().strip() != ""
     # Check staged changes
     staged_changes = os.popen("git diff --cached --exit-code").read().strip() != ""
+    os.system("git reset HEAD")
     return working_changes or staged_changes
 
 def load_embedding_model():
@@ -685,9 +693,6 @@ def dont_use_local_model():
     
 def is_auto_complete() -> bool:
     return os.getenv('JARVIS_AUTO_COMPLETE', 'false') == 'true'
-
-def is_disable_codebase() -> bool:
-    return os.getenv('JARVIS_DISABLE_CODEBASE', 'false') == 'true'
     
 def is_use_methodology() -> bool:
     return os.getenv('JARVIS_USE_METHODOLOGY', 'true') == 'true'
@@ -731,6 +736,9 @@ def get_cheap_platform_name() -> str:
 def get_cheap_model_name() -> str:
     return os.getenv('JARVIS_CHEAP_MODEL', os.getenv('JARVIS_MODEL', 'kimi'))
 
+def is_execute_tool_confirm() -> bool:
+    return os.getenv('JARVIS_EXECUTE_TOOL_CONFIRM', 'false') == 'true'
+
 def split_text_into_chunks(text: str, max_length: int = 512) -> List[str]:
     """Split text into chunks with overlapping windows"""
     chunks = []
@@ -774,7 +782,7 @@ def get_context_token_count(text: str) -> int:
     try:
         # Use a fast tokenizer that's good at general text
         tokenizer = load_tokenizer()
-        chunks = split_text_into_chunks(text, 512)
+        chunks = split_text_into_chunks(text, 1024)
         return sum([len(tokenizer.encode(chunk)) for chunk in chunks])
         
     except Exception as e:

{jarvis_ai_assistant-0.1.110.dist-info → jarvis_ai_assistant-0.1.111.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.110
+Version: 0.1.111
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -149,7 +149,6 @@ Jarvis supports configuration through environment variables that can be set in t
 | JARVIS_MAX_PARAGRAPH_LENGTH | Maximum paragraph length | 1000 | No |
 | JARVIS_CONTEXT_WINDOW | Context window size | 5 | No |
 | JARVIS_AUTO_COMPLETE | Enable auto completion | false | No |
-| JARVIS_DISABLE_CODEBASE | Disable codebase features | false | No |
 | JARVIS_USE_METHODOLOGY | Enable methodology | true | No |
 | JARVIS_RECORD_METHODOLOGY | Record methodology | true | No |
 | JARVIS_NEED_SUMMARY | Generate summaries | true | No |

{jarvis_ai_assistant-0.1.110.dist-info → jarvis_ai_assistant-0.1.111.dist-info}/RECORD

@@ -1,13 +1,13 @@
-jarvis/__init__.py,sha256=0rw1RD8VrgfjPxXtqbnGEx3Aj9K4mgrYWuVSzACO3Ic,51
-jarvis/agent.py,sha256=eV2Bgm5Q6gnQb2QeEo9bHCDaLY0v3RSV8Ylm_gS2_Yc,22678
-jarvis/utils.py,sha256=7v9hs9Tlyi9XMLYkPUzbzzMXGuAlJAx5999O2d7kP9A,26945
+jarvis/__init__.py,sha256=EwzKMyQQYv9-9h1YUWEh1i7Ne5vKRvUB3mF27llLwo4,51
+jarvis/agent.py,sha256=r-wTNio1BwbySStjJH2fF-yCVftDJzWtX9GJxMrkD3Y,23062
+jarvis/utils.py,sha256=iwmiKVg5ATyKzOGzDaunZHl2ThosQRMyqjQzj1Hu6Wc,27289
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=nigsmCK6D2z0dFU_1HFNYEvXr3lWdl0rm6p4VgiOk6o,5980
-jarvis/jarvis_code_agent/file_select.py,sha256=1kOVRLPS1GZcDyGpCW9hOPbfCEwF8f0-qVPaRZPHzoM,8154
-jarvis/jarvis_code_agent/patch.py,sha256=bOhegGKs4JEmJJOZfUlmwzGI6kakMyi2Q62HADJ7Npk,4594
-jarvis/jarvis_code_agent/relevant_files.py,sha256=Q4nI45zuyWt5aKuc4OR7-a6UbOXOym3oEzQJvqxkF8Q,946
+jarvis/jarvis_code_agent/code_agent.py,sha256=2EptFqsX7xgbTIrsr1lMxo7j6g1t0jrbuuS1J3QrrI0,6935
+jarvis/jarvis_code_agent/file_select.py,sha256=w4s-aUqGRVC2zP45_QgMAlWuSq8ocnT1s1XRioejVNc,8222
+jarvis/jarvis_code_agent/patch.py,sha256=0_T_P1NOGqYe91VaQ6oofNI1Q8XVcfxMH69aT-txd_c,4688
+jarvis/jarvis_code_agent/relevant_files.py,sha256=BPc8HXIS86HdLS76j9seL9Sw78Eh3G_Oyj--lwdoZZY,3475
 jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_codebase/main.py,sha256=40ySTIrQld5uW60vW9pawZopjDNVvtmlW27oNVaJXH0,39683
+jarvis/jarvis_codebase/main.py,sha256=Yjy9P9xh1s7GIDskpajPObgE8zDfwj9-oi8eipEwWbw,39186
 jarvis/jarvis_lsp/base.py,sha256=_7pdbMKjdtYBW0DsRbjIodDHM3J7df-YgXHejN_WIrU,4490
 jarvis/jarvis_lsp/cpp.py,sha256=F7Zo3BErkvtWS1_H9zQO83pX_FUmnijux-2SjhWzKCE,4985
 jarvis/jarvis_lsp/go.py,sha256=p8LULiFdq4qjDYQzXFlzH0-FQZ3IyfiwN_sbO9i0L_A,5310
@@ -29,7 +29,7 @@ jarvis/jarvis_rag/main.py,sha256=Lr3b2eTB9TXZGZGdG4Sl9bdtE5NFRbv_bRysxeWNCEo,313
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=VdUR-x932OccEwU0pcQM_pb_I4yfrAutE3hfm6jf5es,3955
 jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_tools/ask_codebase.py,sha256=1mLe9CHDU-NFJHmu3mxrWuA4IiHqQyum2ga31P3hLzU,2991
+jarvis/jarvis_tools/ask_codebase.py,sha256=KLECEUGcAwXPAJF4sYV4CS2PYIc7RPBjHfUHZXCbMNQ,2994
 jarvis/jarvis_tools/ask_user.py,sha256=9ZhIffoPGSfxJIwiIsL03V95yM8uYJsRg7j1C8ltNGc,1830
 jarvis/jarvis_tools/base.py,sha256=c0DMoDDPxmsqUYJR989zgUs7nIYRY6GWBrAdusIZKjc,656
 jarvis/jarvis_tools/chdir.py,sha256=A53BNXFB9tvwoV_cxW_LpF_DfxANgAEJ8rjikTaTa-I,1813
@@ -40,7 +40,7 @@ jarvis/jarvis_tools/deep_thinking.py,sha256=ltsMUfmE8XNyYTkgpWMD1Qow-6_x0dcD8WL7
 jarvis/jarvis_tools/deep_thinking_agent.py,sha256=UBBWq8kp6SDEhwYXjO-tMMHP7Wblx5OA-gpQ8h_1tdk,4378
 jarvis/jarvis_tools/execute_shell.py,sha256=bawfof8bUg3f9bjyCSifLa9bU-hkNoNOuos22uZffdg,2564
 jarvis/jarvis_tools/file_operation.py,sha256=-1U_J5SEuBjRylzEl7wvCfjspNv6aA49UvFHLNQ3bJU,4098
-jarvis/jarvis_tools/git_commiter.py,sha256=4dcFMTN3qmfuTfMkF6an4K95PTR1_0qBoplr20lH2jQ,2565
+jarvis/jarvis_tools/git_commiter.py,sha256=bGGqSHraR5E1YMrGDudKh6uZyMEhjlLiCYJUp9wvFhU,2480
 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
@@ -49,14 +49,15 @@ jarvis/jarvis_tools/lsp_prepare_rename.py,sha256=RxUyIef4awtp-jgupcD1LcPlno9P3mO
 jarvis/jarvis_tools/lsp_validate_edit.py,sha256=M0iglK2QbnIEFv0RYK6o2iAYnv259jB6EU7To-rc51E,5247
 jarvis/jarvis_tools/methodology.py,sha256=RFqcVjKuj8ESGmNYcQz_HyphsitDvF3XtqgGaqhafDQ,5770
 jarvis/jarvis_tools/rag.py,sha256=2fQHqc4bw8JM-OxGTsHobLIOTo8Mip3rdtJCmAoY8XU,4952
-jarvis/jarvis_tools/read_code.py,sha256=5DGmeXTgumAiG0RP1xB4sF4NdmBm5BEGjRRlIBzjGnQ,4002
+jarvis/jarvis_tools/read_code.py,sha256=Pr7e06qHpVn7_cuXCZY1HuJ28MCHMPzCQltn9GSza8o,4030
 jarvis/jarvis_tools/read_webpage.py,sha256=JCReSXhkDHDkQ606sZYIKG1Itlprjpmu1sSbF-Ed-jI,2478
 jarvis/jarvis_tools/registry.py,sha256=OR-BxSVfI3ER_1rAPMZfLf45E2YpheeS01j8MJ8RGso,11841
 jarvis/jarvis_tools/search.py,sha256=PLSSNETyajpqDoStCTfkoy-D41IMNudTuVzonMlT6Aw,9225
 jarvis/jarvis_tools/select_code_files.py,sha256=bjJGwCNw0Ue_8jW60K1gcy1rUgKqoHihicu5SS58WNk,1890
-jarvis_ai_assistant-0.1.110.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.110.dist-info/METADATA,sha256=0Ogu7gge_EAhRT6p7HXEqeGNb4uAFMa6MedSJQsp0yY,14392
-jarvis_ai_assistant-0.1.110.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.110.dist-info/entry_points.txt,sha256=UYj4FYvOH8jJ0GgCJTA_TAmJ3wvikos-hUVbCwt_KOc,480
-jarvis_ai_assistant-0.1.110.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.110.dist-info/RECORD,,
+jarvis/utils/date_utils.py,sha256=DZCQ91FBC4dnQRKCqNnACTg3HuqzQ7R1DRYqH59tON4,537
+jarvis_ai_assistant-0.1.111.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.111.dist-info/METADATA,sha256=FEftsBlMHWqbUroz5ZdWcDD6JaOZlKlzQ3PJshAC-bQ,14323
+jarvis_ai_assistant-0.1.111.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.111.dist-info/entry_points.txt,sha256=UYj4FYvOH8jJ0GgCJTA_TAmJ3wvikos-hUVbCwt_KOc,480
+jarvis_ai_assistant-0.1.111.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.111.dist-info/RECORD,,