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

jarvis/__init__.py

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

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:
@@ -39,10 +39,12 @@ class Agent:
                  auto_complete: Optional[bool] = None, 
                  output_handler_before_tool: Optional[List[Callable]] = None,
                  output_handler_after_tool: Optional[List[Callable]] = None,
+                 input_handler: Optional[List[Callable]] = None,
                  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:
@@ -60,7 +62,7 @@ class Agent:
             need_summary: Whether to generate summaries
             max_context_length: Maximum context length
         """
-        PrettyOutput.print(f"Welcome to Jarvis, your AI assistant, Initiating...", OutputType.SYSTEM)
+        PrettyOutput.print(f"欢迎使用Jarvis，你的AI助手，正在初始化...", OutputType.SYSTEM)
         if platform is not None:
             self.model = platform
         else:
@@ -74,10 +76,13 @@ class Agent:
         self.conversation_length = 0  # Use length counter instead
         self.system_prompt = system_prompt
         self.need_summary = need_summary if need_summary is not None else is_need_summary()
+        self.input_handler = input_handler if input_handler is not None else []
         # Load configuration from environment variables
         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
@@ -93,11 +98,11 @@ Please describe in concise bullet points, highlighting important information.
 
         self.auto_complete = auto_complete if auto_complete is not None else is_auto_complete()
 
-        PrettyOutput.section(f"Jarvis initialized - With {self.model.name()}", OutputType.SYSTEM)
+        PrettyOutput.section(f"Jarvis 初始化完成 - 使用 {self.model.name()} 模型", OutputType.SYSTEM)
 
         tools = self.tool_registry.get_all_tools()
         if tools:
-            PrettyOutput.section(f"Available tools: {', '.join([tool['name'] for tool in tools])}", OutputType.SYSTEM)
+            PrettyOutput.section(f"可用工具: {', '.join([tool['name'] for tool in tools])}", OutputType.SYSTEM)
 
         
         tools_prompt = self.tool_registry.load_tools()
@@ -178,12 +183,16 @@ Please describe in concise bullet points, highlighting important information.
             Will retry with exponential backoff up to 30 seconds between retries
         """
         sleep_time = 5
+
+        for handler in self.input_handler:
+            message = handler(message)
+
         while True:
             ret = self.model.chat_until_success(message)
             if ret:
                 return ret
             else:
-                PrettyOutput.print(f"Model call failed, retrying... waiting {sleep_time}s", OutputType.INFO)
+                PrettyOutput.print(f"模型调用失败，正在重试... 等待 {sleep_time}s", OutputType.INFO)
                 time.sleep(sleep_time)
                 sleep_time *= 2
                 if sleep_time > 30:
@@ -206,7 +215,7 @@ Please describe in concise bullet points, highlighting important information.
         """
         # Create a new model instance to summarize, avoid affecting the main conversation
 
-        PrettyOutput.print("Summarizing conversation history, preparing to generate summary, starting new conversation...", OutputType.PROGRESS)
+        PrettyOutput.print("总结对话历史，准备生成摘要，开始新对话...", OutputType.PROGRESS)
         
         prompt = """Please summarize the key information from the previous conversation, including:
 1. Current task objective
@@ -219,7 +228,7 @@ Please describe in concise bullet points, highlighting important information. Do
 """
         
         try:
-            summary = self.model.chat_until_success(self.prompt + "\n" + prompt)
+            summary = self._call_model(self.prompt + "\n" + prompt)
             
             # 清空当前对话历史，但保留系统消息
             self.conversation_length = 0  # Reset conversation length
@@ -234,7 +243,7 @@ Please continue the task based on the above information.
             self.conversation_length = len(self.prompt)  # 设置新的起始长度
             
         except Exception as e:
-            PrettyOutput.print(f"Failed to summarize conversation history: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"总结对话历史失败: {str(e)}", OutputType.ERROR)
 
     def _complete_task(self) -> str:
         """Complete the current task and generate summary if needed.
@@ -246,7 +255,7 @@ Please continue the task based on the above information.
             - For main agent: May generate methodology if enabled
             - For sub-agent: May generate summary if enabled
         """
-        PrettyOutput.section("Task completed", OutputType.SUCCESS)
+        PrettyOutput.section("任务完成", OutputType.SUCCESS)
         
         if not self.is_sub_agent:
             if self.record_methodology:
@@ -269,18 +278,18 @@ Please continue the task based on the above information.
                         if tool_calls:
                             self.tool_registry.handle_tool_calls(tool_calls)
                     except Exception as e:
-                        PrettyOutput.print(f"Failed to handle methodology generation: {str(e)}", OutputType.ERROR)
+                        PrettyOutput.print(f"处理方法论生成失败: {str(e)}", OutputType.ERROR)
                     
                 except Exception as e:
-                    PrettyOutput.print(f"Error generating methodology: {str(e)}", OutputType.ERROR)
+                    PrettyOutput.print(f"生成方法论失败: {str(e)}", OutputType.ERROR)
             
-            return "Task completed"
+            return "任务完成"
         
         if self.need_summary:
             self.prompt = self.summary_prompt
             return self._call_model(self.prompt)
         
-        return "Task completed"
+        return "任务完成"
 
 
     def run(self, user_input: str, file_list: Optional[List[str]] = None) -> str:
@@ -303,12 +312,12 @@ Please continue the task based on the above information.
         add_agent(self.name)
 
         try:
-            PrettyOutput.section("Preparing environment", OutputType.PLANNING)
+            PrettyOutput.section("准备环境", OutputType.PLANNING)
             if file_list:
                 self.model.upload_files(file_list)
 
             # 显示任务开始
-            PrettyOutput.section(f"Starting new task: {self.name}", OutputType.PLANNING)
+            PrettyOutput.section(f"开始新任务: {self.name}", OutputType.PLANNING)
 
             if self.first and self.use_methodology:
                 self.prompt = f"{user_input}\n\n{load_methodology(user_input)}"
@@ -319,7 +328,7 @@ Please continue the task based on the above information.
             while True:
                 try:
                     # 显示思考状态
-                    PrettyOutput.print("Analyzing task...", OutputType.PROGRESS)
+                    PrettyOutput.print("正在分析任务...", OutputType.PROGRESS)
                     
                     # 累加对话长度
                     self.conversation_length += get_context_token_count(self.prompt)
@@ -339,15 +348,16 @@ Please continue the task based on the above information.
                     try:
                         result = Agent._extract_tool_calls(current_response)
                     except Exception as e:
-                        PrettyOutput.print(f"Tool call error: {str(e)}", OutputType.ERROR)
+                        PrettyOutput.print(f"工具调用错误: {str(e)}", OutputType.ERROR)
                         self.prompt += f"Tool call error: {str(e)}"
                         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"执行工具调用: {result[0]['name']}?"):
+                            PrettyOutput.print("正在执行工具调用...", 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)
                     
@@ -358,7 +368,7 @@ Please continue the task based on the above information.
                         return self._complete_task()
                     
                     # 获取用户输入
-                    user_input = get_multiline_input(f"{self.name}: You can continue to input, or enter an empty line to end the current task")
+                    user_input = get_multiline_input(f"{self.name}: 您可以继续输入，或输入空行来结束当前任务：")
 
                     if user_input:
                         self.prompt = user_input
@@ -368,11 +378,11 @@ Please continue the task based on the above information.
                         return self._complete_task()
 
                 except Exception as e:
-                    PrettyOutput.print(str(e), OutputType.ERROR)
+                    PrettyOutput.print(f"任务失败: {str(e)}", OutputType.ERROR)
                     return f"Task failed: {str(e)}"
 
         except Exception as e:
-            PrettyOutput.print(str(e), OutputType.ERROR)
+            PrettyOutput.print(f"任务失败: {str(e)}", OutputType.ERROR)
             return f"Task failed: {str(e)}"
         
         finally:
@@ -410,9 +420,9 @@ def _load_tasks() -> dict:
                     if desc:  # Ensure description is not empty
                         tasks[str(name)] = str(desc)
             else:
-                PrettyOutput.print("Warning: ~/.jarvis/pre-command file should contain a dictionary of task_name: task_description", OutputType.ERROR)
+                PrettyOutput.print("警告: ~/.jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.ERROR)
         except Exception as e:
-            PrettyOutput.print(f"Error loading ~/.jarvis/pre-command file: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"加载 ~/.jarvis/pre-command 文件失败: {str(e)}", OutputType.ERROR)
     
     # Check .jarvis/pre-command in current directory
     if os.path.exists(".jarvis/pre-command"):
@@ -426,9 +436,9 @@ def _load_tasks() -> dict:
                     if desc:  # Ensure description is not empty
                         tasks[str(name)] = str(desc)
             else:
-                PrettyOutput.print("Warning: .jarvis/pre-command file should contain a dictionary of task_name: task_description", OutputType.ERROR)
+                PrettyOutput.print("警告: .jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.ERROR)
         except Exception as e:
-            PrettyOutput.print(f"Error loading .jarvis/pre-command file: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"加载 .jarvis/pre-command 文件失败: {str(e)}", OutputType.ERROR)
 
     
     if is_use_methodology():
@@ -451,17 +461,17 @@ def _select_task(tasks: dict) -> str:
     # Convert tasks to list for ordered display
     task_names = list(tasks.keys())
     
-    task_list = ["Available tasks:"]
+    task_list = ["可用任务:"]
     for i, name in enumerate(task_names, 1):
         task_list.append(f"[{i}] {name}")
-    task_list.append("[0] Skip predefined tasks")
+    task_list.append("[0] 跳过预定义任务")
     PrettyOutput.print("\n".join(task_list), OutputType.INFO)
     
     
     while True:
         try:
             choice = prompt(
-                "\nPlease select a task number (0 to skip): ",
+                "\n请选择一个任务编号（0 跳过预定义任务）：",
             ).strip()
             
             if not choice:
@@ -474,14 +484,14 @@ def _select_task(tasks: dict) -> str:
                 selected_name = task_names[choice - 1]
                 return tasks[selected_name]  # Return the task description
             else:
-                PrettyOutput.print("Invalid choice. Please select a number from the list.", OutputType.ERROR)
+                PrettyOutput.print("无效的选择。请选择列表中的一个号码。", OutputType.ERROR)
                 
         except KeyboardInterrupt:
             return ""  # Return empty on Ctrl+C
         except EOFError:
             return ""  # Return empty on Ctrl+D
         except Exception as e:
-            PrettyOutput.print(f"Failed to select task: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"选择任务失败: {str(e)}", OutputType.ERROR)
             continue
 
 origin_agent_system_prompt = """You are Jarvis, an AI assistant with powerful problem-solving capabilities.
@@ -499,6 +509,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,29 +528,29 @@ 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()
         if tasks:
             selected_task = _select_task(tasks)
             if selected_task:
-                PrettyOutput.print(f"\nExecute task: {selected_task}", OutputType.INFO)
+                PrettyOutput.print(f"执行任务: {selected_task}", OutputType.INFO)
                 agent.run(selected_task, args.files)
                 return 0
         
         # 如果没有选择预定义任务，进入交互模式
         while True:
             try:
-                user_input = get_multiline_input("Please enter your task (input empty line to exit):")
+                user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
                 if not user_input:
                     break
                 agent.run(user_input, args.files)
             except Exception as e:
-                PrettyOutput.print(f"Error: {str(e)}", OutputType.ERROR)
+                PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
 
     except Exception as e:
-        PrettyOutput.print(f"Initialization error: {str(e)}", OutputType.ERROR)
+        PrettyOutput.print(f"初始化错误: {str(e)}", OutputType.ERROR)
         return 1
 
     return 0

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,11 +26,32 @@ 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
+
+# Code Completeness Requirements
+1. Implementation Must Be Complete
+   • NO TODOs or placeholder comments
+   • NO unfinished functions
+   • NO stub implementations
+   • All error cases must be handled
+   • All edge cases must be covered
+
+2. Documentation Must Be Complete
+   • All functions must have docstrings
+   • All parameters must be documented
+   • Return values must be specified
+   • Exceptions must be documented
+   • Complex logic must be explained
 
 # Patch Format
 <PATCH>
-> /path/file start,end
+> path/file start,end
 new_content
 </PATCH>
 
@@ -41,40 +62,44 @@ 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
+   • Implement completely - no TODOs
 
 # File Handling
 Large Files (>200 lines):
@@ -84,26 +109,28 @@ 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"""
+✓ Follow project patterns
+✓ Be completely implemented
+✓ Have no TODOs or stubs"""
         self.agent = Agent(system_prompt=code_system_prompt, 
                            name="CodeAgent", 
                            auto_complete=False,
                            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 +146,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 +174,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 +192,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"""
@@ -178,17 +214,17 @@ def main():
         # Interactive mode
         while True:
             try:
-                user_input = get_multiline_input("Please enter your requirement (input empty line to exit):")
+                user_input = get_multiline_input("请输入你的需求（输入空行退出）:")
                 if not user_input:
                     break
                 agent = CodeAgent()
                 agent.run(user_input)
                 
             except Exception as e:
-                PrettyOutput.print(f"Error: {str(e)}", OutputType.ERROR)
+                PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
 
     except Exception as e:
-        PrettyOutput.print(f"Initialization error: {str(e)}", OutputType.ERROR)
+        PrettyOutput.print(f"初始化错误: {str(e)}", OutputType.ERROR)
         return 1
 
     return 0