jarvis-ai-assistant 0.1.96__py3-none-any.whl → 0.1.98__py3-none-any.whl

jarvis/jarvis_coder/main.py

@@ -20,14 +20,14 @@ index_lock = threading.Lock()
 
 class JarvisCoder:
     def __init__(self, root_dir: str, language: Optional[str] = "python"):
-        """初始化代码修改工具"""
+        """Initialize code modification tool"""
         self.root_dir = root_dir
         self.language = language
         self._init_directories()
         self._init_codebase()
         
     def _init_directories(self):
-        """初始化目录"""
+        """Initialize directories"""
         self.max_context_length = get_max_context_length()
 
         root_dir = find_git_root(self.root_dir)
@@ -36,9 +36,9 @@ class JarvisCoder:
 
         self.root_dir = root_dir
 
-        PrettyOutput.print(f"Git根目录: {self.root_dir}", OutputType.INFO)
+        PrettyOutput.print(f"Git root directory: {self.root_dir}", OutputType.INFO)
 
-        # 1. 判断代码库路径是否存在，如果不存在，创建
+        # 1. Check if the code repository path exists, if it does not exist, create it
         if not os.path.exists(self.root_dir):
             PrettyOutput.print(
                 "Root directory does not exist, creating...", OutputType.INFO)
@@ -46,7 +46,7 @@ class JarvisCoder:
 
         os.chdir(self.root_dir)
 
-        # 2. 创建 .jarvis-coder 目录
+        # 2. Create .jarvis-coder directory
         self.jarvis_dir = os.path.join(self.root_dir, ".jarvis-coder")
         if not os.path.exists(self.jarvis_dir):
             os.makedirs(self.jarvis_dir)
@@ -55,158 +55,157 @@ class JarvisCoder:
         if not os.path.exists(self.record_dir):
             os.makedirs(self.record_dir)
 
-        # 3. 处理 .gitignore 文件
+        # 3. Process .gitignore file
         gitignore_path = os.path.join(self.root_dir, ".gitignore")
         gitignore_modified = False
         jarvis_ignore_pattern = ".jarvis-*"
 
-        # 3.1 如果 .gitignore 不存在，创建它
+        # 3.1 If .gitignore does not exist, create it
         if not os.path.exists(gitignore_path):
-            PrettyOutput.print("创建 .gitignore 文件", OutputType.INFO)
+            PrettyOutput.print("Create .gitignore file", OutputType.INFO)
             with open(gitignore_path, "w", encoding="utf-8") as f:
                 f.write(f"{jarvis_ignore_pattern}\n")
             gitignore_modified = True
         else:
-            # 3.2 检查是否已经包含 .jarvis-* 模式
+            # 3.2 Check if it already contains the .jarvis-* pattern
             with open(gitignore_path, "r", encoding="utf-8") as f:
                 content = f.read()
             
-            # 检查是否需要添加 .jarvis-* 模式
+            # 3.2 Check if it already contains the .jarvis-* pattern
             if jarvis_ignore_pattern not in content.split("\n"):
-                PrettyOutput.print("将 .jarvis-* 添加到 .gitignore", OutputType.INFO)
+                PrettyOutput.print("Add .jarvis-* to .gitignore", OutputType.INFO)
                 with open(gitignore_path, "a", encoding="utf-8") as f:
-                    # 确保文件以换行符结尾
+                    # Ensure the file ends with a newline
                     if not content.endswith("\n"):
                         f.write("\n")
                     f.write(f"{jarvis_ignore_pattern}\n")
                 gitignore_modified = True
 
-        # 4. 判断代码库是否是git仓库，如果不是，初始化git仓库
+        # 4. Check if the code repository is a git repository, if not, initialize the git repository
         if not os.path.exists(os.path.join(self.root_dir, ".git")):
-            PrettyOutput.print("初始化 Git 仓库", OutputType.INFO)
+            PrettyOutput.print("Initialize Git repository", OutputType.INFO)
             os.system("git init")
             os.system("git add .")
             os.system("git commit -m 'Initial commit'")
-        # 5. 如果修改了 .gitignore，提交更改
+        # 5. If .gitignore is modified, commit the changes
         elif gitignore_modified:
-            PrettyOutput.print("提交 .gitignore 更改", OutputType.INFO)
+            PrettyOutput.print("Commit .gitignore changes", OutputType.INFO)
             os.system("git add .gitignore")
             os.system("git commit -m 'chore: update .gitignore to exclude .jarvis-* files'")
-        # 6. 查看代码库是否有未提交的文件，如果有，提交一次
+        # 6. Check if there are uncommitted files in the code repository, if there are, commit once
         elif self._has_uncommitted_files():
-            PrettyOutput.print("提交未保存的更改", OutputType.INFO)
+            PrettyOutput.print("Commit uncommitted changes", OutputType.INFO)
             os.system("git add .")
             git_diff = os.popen("git diff --cached").read()
-            commit_message = generate_commit_message(git_diff, "Pre-edit commit")
+            commit_message = generate_commit_message(git_diff)
             os.system(f"git commit -m '{commit_message}'")
 
     def _init_codebase(self):
-        """初始化代码库"""
+        """Initialize codebase"""
         self._codebase = CodeBase(self.root_dir)
 
     def _has_uncommitted_files(self) -> bool:
-        """判断代码库是否有未提交的文件"""
-        # 获取未暂存的修改
+        """Check if there are uncommitted files in the code repository"""
+        # Get unstaged modifications
         unstaged = os.popen("git diff --name-only").read()
-        # 获取已暂存但未提交的修改
+        # Get staged but uncommitted modifications
         staged = os.popen("git diff --cached --name-only").read()
-        # 获取未跟踪的文件
+        # Get untracked files
         untracked = os.popen("git ls-files --others --exclude-standard").read()
         
         return bool(unstaged or staged or untracked)
 
     def _prepare_execution(self) -> None:
-        """准备执行环境"""
+        """Prepare execution environment"""
         self._codebase.generate_codebase()
 
 
     def _load_related_files(self, feature: str) -> List[Dict]:
-        """加载相关文件内容"""
+        """Load related file content"""
         ret = []
-        # 确保索引数据库已生成
+        # Ensure the index database is generated
         if not self._codebase.is_index_generated():
-            PrettyOutput.print("检测到索引数据库未生成，正在生成...", OutputType.WARNING)
+            PrettyOutput.print("Index database not generated, generating...", OutputType.WARNING)
             self._codebase.generate_codebase()
             
         related_files = self._codebase.search_similar(feature)
-        for file, score, _ in related_files:
-            PrettyOutput.print(f"相关文件: {file} 相关度: {score:.3f}", OutputType.SUCCESS)
-            with open(file, "r", encoding="utf-8") as f:
-                content = f.read()
+        for file, score in related_files:
+            PrettyOutput.print(f"Related file: {file} (score: {score:.3f})", OutputType.SUCCESS)
+            content = open(file, "r", encoding="utf-8").read()
             ret.append({"file_path": file, "file_content": content})
         return ret
 
     def _parse_file_selection(self, input_str: str, max_index: int) -> List[int]:
-        """解析文件选择表达式
+        """Parse file selection expression
         
-        支持的格式:
-        - 单个数字: "1"
-        - 逗号分隔: "1,3,5"
-        - 范围: "1-5"
-        - 组合: "1,3-5,7"
+        Supported formats:
+        - Single number: "1"
+        - Comma-separated: "1,3,5"
+        - Range: "1-5"
+        - Combination: "1,3-5,7"
         
         Args:
-            input_str: 用户输入的选择表达式
-            max_index: 最大可选择的索引
+            input_str: User input selection expression
+            max_index: Maximum selectable index
             
         Returns:
-            List[int]: 选中的索引列表（从0开始）
+            List[int]: Selected index list (starting from 0)
         """
         selected = set()
         
-        # 移除所有空白字符
+        # Remove all whitespace characters
         input_str = "".join(input_str.split())
         
-        # 处理逗号分隔的部分
+        # Process comma-separated parts
         for part in input_str.split(","):
             if not part:
                 continue
             
-            # 处理范围（例如：3-6）
+            # Process range (e.g.: 3-6)
             if "-" in part:
                 try:
                     start, end = map(int, part.split("-"))
-                    # 转换为从0开始的索引
+                    # Convert to index starting from 0
                     start = max(0, start - 1)
                     end = min(max_index, end - 1)
                     if start <= end:
                         selected.update(range(start, end + 1))
                 except ValueError:
-                    PrettyOutput.print(f"忽略无效的范围表达式: {part}", OutputType.WARNING)
-            # 处理单个数字
+                    PrettyOutput.print(f"Ignore invalid range expression: {part}", OutputType.WARNING)
+            # Process single number
             else:
                 try:
-                    index = int(part) - 1  # 转换为从0开始的索引
+                    index = int(part) - 1  # Convert to index starting from 0
                     if 0 <= index < max_index:
                         selected.add(index)
                     else:
-                        PrettyOutput.print(f"忽略超出范围的索引: {part}", OutputType.WARNING)
+                        PrettyOutput.print(f"Ignore index out of range: {part}", OutputType.WARNING)
                 except ValueError:
-                    PrettyOutput.print(f"忽略无效的数字: {part}", OutputType.WARNING)
+                    PrettyOutput.print(f"Ignore invalid number: {part}", OutputType.WARNING)
         
         return sorted(list(selected))
 
     def _get_file_completer(self) -> Completer:
-        """创建文件路径补全器"""
+        """Create file path completer"""
         class FileCompleter(Completer):
             def __init__(self, root_dir: str):
                 self.root_dir = root_dir
                 
             def get_completions(self, document, complete_event):
-                # 获取当前输入的文本
+                # Get the text of the current input
                 text = document.text_before_cursor
                 
-                # 如果输入为空，返回根目录下的所有文件
+                # If the input is empty, return all files in the root directory
                 if not text:
                     for path in self._list_files(""):
                         yield Completion(path, start_position=0)
                     return
                     
-                # 获取当前目录和部分文件名
+                # Get the current directory and partial file name
                 current_dir = os.path.dirname(text)
                 file_prefix = os.path.basename(text)
                 
-                # 列出匹配的文件
+                # List matching files
                 search_dir = os.path.join(self.root_dir, current_dir) if current_dir else self.root_dir
                 if os.path.isdir(search_dir):
                     for path in self._list_files(current_dir):
@@ -214,7 +213,7 @@ class JarvisCoder:
                             yield Completion(path, start_position=-len(text))
             
             def _list_files(self, current_dir: str) -> List[str]:
-                """列出指定目录下的所有文件（递归）"""
+                """List all files in the specified directory (recursively)"""
                 files = []
                 search_dir = os.path.join(self.root_dir, current_dir)
                 
@@ -222,7 +221,7 @@ class JarvisCoder:
                     for filename in filenames:
                         full_path = os.path.join(root, filename)
                         rel_path = os.path.relpath(full_path, self.root_dir)
-                        # 忽略 .git 目录和其他隐藏文件
+                        # Ignore .git directory and other hidden files
                         if not any(part.startswith('.') for part in rel_path.split(os.sep)):
                             files.append(rel_path)
                 
@@ -231,13 +230,13 @@ class JarvisCoder:
         return FileCompleter(self.root_dir)
 
     def _fuzzy_match_files(self, pattern: str) -> List[str]:
-        """模糊匹配文件路径
+        """Fuzzy match file path
         
         Args:
-            pattern: 匹配模式
+            pattern: Matching pattern
             
         Returns:
-            List[str]: 匹配的文件路径列表
+            List[str]: List of matching file paths
         """
         matches = []
         
@@ -259,38 +258,38 @@ class JarvisCoder:
         return sorted(matches)
 
     def _select_files(self, related_files: List[Dict]) -> List[Dict]:
-        """让用户选择和补充相关文件"""
-        PrettyOutput.section("相关文件", OutputType.INFO)
+        """Let the user select and supplement related files"""
+        PrettyOutput.section("Related files", OutputType.INFO)
         
-        # 显示找到的文件
-        selected_files = list(related_files)  # 默认全选
+        # Display found files
+        selected_files = list(related_files)  # Default select all
         for i, file in enumerate(related_files, 1):
             PrettyOutput.print(f"[{i}] {file['file_path']}", OutputType.INFO)
         
-        # 询问用户是否需要调整
-        user_input = input("\n是否需要调整文件列表？(y/n) [n]: ").strip().lower() or 'n'
+        # Ask the user if they need to adjust the file list
+        user_input = input("\nDo you need to adjust the file list? (y/n) [n]: ").strip().lower() or 'n'
         if user_input == 'y':
-            # 让用户选择文件
-            PrettyOutput.print("\n请输入要包含的文件编号（支持: 1,3-6 格式，直接回车保持当前选择）:", OutputType.INFO)
+            # Let the user select files
+            PrettyOutput.print("\nPlease enter the file numbers to include (support: 1,3-6 format, press Enter to keep the current selection):", OutputType.INFO)
             numbers = input(">>> ").strip()
             if numbers:
                 selected_indices = self._parse_file_selection(numbers, len(related_files))
                 if selected_indices:
                     selected_files = [related_files[i] for i in selected_indices]
                 else:
-                    PrettyOutput.print("未选择任何有效文件，保持原有选择", OutputType.WARNING)
+                    PrettyOutput.print("No valid files selected, keep the current selection", OutputType.WARNING)
         
-        # 询问是否需要补充文件
-        user_input = input("\n是否需要补充其他文件？(y/n) [n]: ").strip().lower() or 'n'
+        # Ask if they need to supplement files
+        user_input = input("\nDo you need to supplement other files? (y/n) [n]: ").strip().lower() or 'n'
         if user_input == 'y':
-            # 创建文件补全会话
+            # Create file completion session
             session = PromptSession(
                 completer=self._get_file_completer(),
                 complete_while_typing=True
             )
             
             while True:
-                PrettyOutput.print("\n请输入要补充的文件路径（支持Tab补全和*?通配符，输入空行结束）:", OutputType.INFO)
+                PrettyOutput.print("\nPlease enter the file path to supplement (support Tab completion and *? wildcard, input empty line to end):", OutputType.INFO)
                 try:
                     file_path = session.prompt(">>> ").strip()
                 except KeyboardInterrupt:
@@ -299,20 +298,20 @@ class JarvisCoder:
                 if not file_path:
                     break
                     
-                # 处理通配符匹配
+                # Process wildcard matching
                 if '*' in file_path or '?' in file_path:
                     matches = self._fuzzy_match_files(file_path)
                     if not matches:
-                        PrettyOutput.print("未找到匹配的文件", OutputType.WARNING)
+                        PrettyOutput.print("No matching files found", OutputType.WARNING)
                         continue
                         
-                    # 显示匹配的文件
-                    PrettyOutput.print("\n找到以下匹配的文件:", OutputType.INFO)
+                    # Display matching files
+                    PrettyOutput.print("\nFound the following matching files:", OutputType.INFO)
                     for i, path in enumerate(matches, 1):
                         PrettyOutput.print(f"[{i}] {path}", OutputType.INFO)
                         
-                    # 让用户选择
-                    numbers = input("\n请选择要添加的文件编号（支持: 1,3-6 格式，直接回车全选）: ").strip()
+                    # Let the user select
+                    numbers = input("\nPlease select the file numbers to add (support: 1,3-6 format, press Enter to select all): ").strip()
                     if numbers:
                         indices = self._parse_file_selection(numbers, len(matches))
                         if not indices:
@@ -323,11 +322,11 @@ class JarvisCoder:
                 else:
                     paths_to_add = [file_path]
                 
-                # 添加选中的文件
+                # Add selected files
                 for path in paths_to_add:
                     full_path = os.path.join(self.root_dir, path)
                     if not os.path.isfile(full_path):
-                        PrettyOutput.print(f"文件不存在: {path}", OutputType.ERROR)
+                        PrettyOutput.print(f"File does not exist: {path}", OutputType.ERROR)
                         continue
                     
                     try:
@@ -337,109 +336,105 @@ class JarvisCoder:
                             "file_path": path,
                             "file_content": content
                         })
-                        PrettyOutput.print(f"已添加文件: {path}", OutputType.SUCCESS)
+                        PrettyOutput.print(f"File added: {path}", OutputType.SUCCESS)
                     except Exception as e:
-                        PrettyOutput.print(f"读取文件失败: {str(e)}", OutputType.ERROR)
+                        PrettyOutput.print(f"Failed to read file: {str(e)}", OutputType.ERROR)
         
         return selected_files
 
     def _finalize_changes(self, feature: str) -> None:
-        """完成修改并提交"""
-        PrettyOutput.print("修改确认成功，提交修改", OutputType.INFO)
+        """Complete changes and commit"""
+        PrettyOutput.print("Modification confirmed, committing...", OutputType.INFO)
 
-        # 只添加已经在 git 控制下的修改文件
+        # Add only modified files under git control
         os.system("git add -u")
         
-        # 然后获取 git diff
+        # Then get git diff
         git_diff = os.popen("git diff --cached").read()
         
-        # 自动生成commit信息，传入feature
-        commit_message = generate_commit_message(git_diff, feature)
+        # Automatically generate commit information, pass in feature
+        commit_message = generate_commit_message(git_diff)
         
-        # 显示并确认commit信息
-        PrettyOutput.print(f"自动生成的commit信息: {commit_message}", OutputType.INFO)
-        user_confirm = input("是否使用该commit信息？(y/n) [y]: ") or "y"
+        # Display and confirm commit information
+        PrettyOutput.print(f"Automatically generated commit information: {commit_message}", OutputType.INFO)
+        user_confirm = input("Use this commit information? (y/n) [y]: ") or "y"
         
         if user_confirm.lower() != "y":
-            commit_message = input("请输入新的commit信息: ")
+            commit_message = input("Please enter a new commit information: ")
         
-        # 不需要再次 git add，因为已经添加过了
+        # No need to git add again, it has already been added
         os.system(f"git commit -m '{commit_message}'")
         save_edit_record(self.record_dir, commit_message, git_diff)
 
     def _revert_changes(self) -> None:
-        """回退所有修改"""
-        PrettyOutput.print("修改已取消，回退更改", OutputType.INFO)
+        """Revert all changes"""
+        PrettyOutput.print("Modification cancelled, reverting changes", OutputType.INFO)
         os.system(f"git reset --hard")
         os.system(f"git clean -df")
 
     def get_key_code(self, files: List[Dict], feature: str):
-        """提取文件中与需求相关的关键代码片段"""
+        """Extract relevant key code snippets from files"""
         for file_info in files:
-            PrettyOutput.print(f"分析文件: {file_info['file_path']}", OutputType.INFO)
+            PrettyOutput.print(f"Analyzing file: {file_info['file_path']}", OutputType.INFO)
             model = PlatformRegistry.get_global_platform_registry().get_codegen_platform()
             model.set_suppress_output(True)
             file_path = file_info["file_path"]
             content = file_info["file_content"]
-            
-            # 生成分析提示
-            system_message = f"""你是一个代码分析专家，可以从代码中提取出与需求相关的片段。
-请按以下格式返回：
+
+            try:
+                prompt = f"""You are a code analysis expert who can extract relevant snippets from code.
+Please return in the following format:
 <PART>
 content
 </PART>
 
-可返回多个片段。如果文件内容与需求无关，则返回空。
-"""
-            model.set_system_message(system_message)
-            
-            try:
+Multiple snippets can be returned. If the file content is not relevant to the requirement, return empty.
 
-                prompt = f"""需求：{feature}
-文件路径：{file_path}
-代码内容：
+Requirement: {feature}
+File path: {file_path}
+Code content:
 {content}
 """
 
                 # 调用大模型进行分析
-                response = while_success(lambda: model.chat(prompt))
+                response = model.chat_until_success(prompt)
 
                 parts = re.findall(r'<PART>\n(.*?)\n</PART>', response, re.DOTALL)
                 file_info["parts"] = parts
             except Exception as e:
-                PrettyOutput.print(f"分析文件失败: {str(e)}", OutputType.ERROR)
+                PrettyOutput.print(f"Failed to analyze file: {str(e)}", OutputType.ERROR)
 
     def execute(self, feature: str) -> Dict[str, Any]:
-        """执行代码修改"""
+        """Execute code modification"""
         try:
             self._prepare_execution()
             
-            # 获取并选择相关文件
+            # Get and select related files
             initial_files = self._load_related_files(feature)
             selected_files = self._select_files(initial_files)
 
-            # 是否是长上下文
+            # Whether it is a long context
             if is_long_context([file['file_path'] for file in selected_files]):
                 self.get_key_code(selected_files, feature)
             else:
                 for file in selected_files:
                     file["parts"] = [file["file_content"]]
             
-            # 获取修改方案
-            modification_plan = PlanGenerator().generate_plan(feature, selected_files)
-            if not modification_plan:
+            # Get modification plan
+            raw_plan, structed_plan = PlanGenerator().generate_plan(feature, selected_files)
+            if not raw_plan or not structed_plan:
                 return {
                     "success": False,
                     "stdout": "",
-                    "stderr": "用户取消修改",
+                    "stderr": "Failed to generate modification plan, please modify the requirement and try again",
                 }
             
-            # 执行修改
-            if PatchHandler().handle_patch_application(selected_files, feature, modification_plan):
+            # Execute modification
+            if PatchHandler().handle_patch_application(feature ,raw_plan, structed_plan):
                 self._finalize_changes(feature)
                 return {
                     "success": True,
-                    "stdout": "代码修改成功",
+                    "stdout": "Code modification successful",
                     "stderr": "",
                 }
             else:
@@ -447,7 +442,7 @@ content
                 return {
                     "success": False,
                     "stdout": "",
-                    "stderr": "代码修改失败，请修改需求后重试",
+                    "stderr": "Code modification failed, please modify the requirement and try again",
                 }
                 
         except Exception as e:
@@ -455,54 +450,54 @@ content
             return {
                 "success": False,
                 "stdout": "",
-                "stderr": f"执行失败: {str(e)}，请修改需求后重试",
+                "stderr": f"Execution failed: {str(e)}, please modify the requirement and try again",
                 "error": e
             }
 
 def main():
-    """命令行入口"""
+    """Command line entry"""
     import argparse
 
     load_env_from_file()
     
-    parser = argparse.ArgumentParser(description='代码修改工具')
-    parser.add_argument('-d', '--dir', help='项目根目录', default=os.getcwd())
-    parser.add_argument('-l', '--language', help='编程语言', default="python")
+    parser = argparse.ArgumentParser(description='Code modification tool')
+    parser.add_argument('-d', '--dir', help='Project root directory', default=os.getcwd())
+    parser.add_argument('-l', '--language', help='Programming language', default="python")
     args = parser.parse_args()
     
     tool = JarvisCoder(args.dir, args.language)
     
-    # 循环处理需求
+    # Loop through requirements
     while True:
         try:
-            # 获取需求，传入项目根目录
-            feature = get_multiline_input("请输入开发需求 (输入空行退出):", tool.root_dir)
+            # Get requirements, pass in project root directory
+            feature = get_multiline_input("Please enter the development requirements (input empty line to exit):", tool.root_dir)
             
             if not feature or feature == "__interrupt__":
                 break
                 
-            # 执行修改
+            # Execute modification
             result = tool.execute(feature)
             
-            # 显示结果
+            # Display results
             if result["success"]:
                 PrettyOutput.print(result["stdout"], OutputType.SUCCESS)
             else:
                 if result.get("stderr"):
                     PrettyOutput.print(result["stderr"], OutputType.WARNING)
-                if result.get("error"):  # 使用 get() 方法避免 KeyError
+                if result.get("error"):  # Use get() method to avoid KeyError
                     error = result["error"]
-                    PrettyOutput.print(f"错误类型: {type(error).__name__}", OutputType.WARNING)
-                    PrettyOutput.print(f"错误信息: {str(error)}", OutputType.WARNING)
-                # 提示用户可以继续输入
-                PrettyOutput.print("\n您可以修改需求后重试", OutputType.INFO)
+                    PrettyOutput.print(f"Error type: {type(error).__name__}", OutputType.WARNING)
+                    PrettyOutput.print(f"Error information: {str(error)}", OutputType.WARNING)
+                # Prompt user to continue input
+                PrettyOutput.print("\nYou can modify the requirements and try again", OutputType.INFO)
                 
         except KeyboardInterrupt:
-            print("\n用户中断执行")
+            print("\nUser interrupted execution")
             break
         except Exception as e:
-            PrettyOutput.print(f"执行出错: {str(e)}", OutputType.ERROR)
-            PrettyOutput.print("\n您可以修改需求后重试", OutputType.INFO)
+            PrettyOutput.print(f"Execution failed: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print("\nYou can modify the requirements and try again", OutputType.INFO)
             continue
             
     return 0
@@ -511,93 +506,93 @@ if __name__ == "__main__":
     exit(main())
 
 class FilePathCompleter(Completer):
-    """文件路径自动完成器"""
+    """File path auto-completer"""
     
     def __init__(self, root_dir: str):
         self.root_dir = root_dir
         self._file_list = None
         
     def _get_files(self) -> List[str]:
-        """获取git管理的文件列表"""
+        """Get the list of files managed by git"""
         if self._file_list is None:
             try:
-                # 切换到项目根目录
+                # Switch to project root directory
                 old_cwd = os.getcwd()
                 os.chdir(self.root_dir)
                 
-                # 获取git管理的文件列表
+                # Get the list of files managed by git
                 self._file_list = os.popen("git ls-files").read().splitlines()
                 
-                # 恢复工作目录
+                # Restore working directory
                 os.chdir(old_cwd)
             except Exception as e:
-                PrettyOutput.print(f"获取文件列表失败: {str(e)}", OutputType.WARNING)
+                PrettyOutput.print(f"Failed to get file list: {str(e)}", OutputType.WARNING)
                 self._file_list = []
         return self._file_list
     
     def get_completions(self, document, complete_event):
-        """获取补全建议"""
+        """Get completion suggestions"""
         text_before_cursor = document.text_before_cursor
         
-        # 检查是否刚输入了@
+        # Check if @ was just entered
         if text_before_cursor.endswith('@'):
-            # 显示所有文件
+            # Display all files
             for path in self._get_files():
                 yield Completion(path, start_position=0)
             return
             
-        # 检查之前是否有@，并获取@后的搜索词
+        # Check if there was an @ before, and get the search word after @
         at_pos = text_before_cursor.rfind('@')
         if at_pos == -1:
             return
             
         search = text_before_cursor[at_pos + 1:].lower().strip()
         
-        # 提供匹配的文件建议
+        # Provide matching file suggestions
         for path in self._get_files():
             path_lower = path.lower()
-            if (search in path_lower or  # 直接包含
-                search in os.path.basename(path_lower) or  # 文件名包含
-                any(fnmatch.fnmatch(path_lower, f'*{s}*') for s in search.split())): # 通配符匹配
-                # 计算正确的start_position
+            if (search in path_lower or  # Directly included
+                search in os.path.basename(path_lower) or  # File name included
+                any(fnmatch.fnmatch(path_lower, f'*{s}*') for s in search.split())): # Wildcard matching
+                # Calculate the correct start_position
                 yield Completion(path, start_position=-(len(search)))
 
 class SmartCompleter(Completer):
-    """智能自动完成器，组合词语和文件路径补全"""
+    """Smart auto-completer, combine word and file path completion"""
     
     def __init__(self, word_completer: WordCompleter, file_completer: FilePathCompleter):
         self.word_completer = word_completer
         self.file_completer = file_completer
         
     def get_completions(self, document, complete_event):
-        """获取补全建议"""
-        # 如果当前行以@结尾，使用文件补全
+        """Get completion suggestions"""
+        # If the current line ends with @, use file completion
         if document.text_before_cursor.strip().endswith('@'):
             yield from self.file_completer.get_completions(document, complete_event)
         else:
-            # 否则使用词语补全
+            # Otherwise, use word completion
             yield from self.word_completer.get_completions(document, complete_event)
 
 def get_multiline_input(prompt_text: str, root_dir: Optional[str] = ".") -> str:
-    """获取多行输入，支持文件路径自动完成功能
+    """Get multi-line input, support file path auto-completion function
     
     Args:
-        prompt_text: 提示文本
-        root_dir: 项目根目录，用于文件补全
+        prompt_text: Prompt text
+        root_dir: Project root directory, for file completion
         
     Returns:
-        str: 用户输入的文本
+        str: User input text
     """
-    # 创建文件补全器
+    # Create file completion
     file_completer = FilePathCompleter(root_dir or os.getcwd())
     
-    # 创建提示样式
+    # Create prompt style
     style = Style.from_dict({
         'prompt': 'ansicyan bold',
         'input': 'ansiwhite',
     })
     
-    # 创建会话
+    # Create session
     session = PromptSession(
         completer=file_completer,
         style=style,
@@ -606,20 +601,20 @@ def get_multiline_input(prompt_text: str, root_dir: Optional[str] = ".") -> str:
         complete_while_typing=True
     )
     
-    # 显示初始提示文本
+    # Display initial prompt text
     print(f"\n{prompt_text}")
     
-    # 创建提示符
+    # Create prompt
     prompt = FormattedText([
         ('class:prompt', ">>> ")
     ])
     
-    # 获取输入
+    # Get input
     lines = []
     try:
         while True:
             line = session.prompt(prompt).strip()
-            if not line:  # 空行表示输入结束
+            if not line:  # Empty line means input end
                 break
             lines.append(line)
     except KeyboardInterrupt: