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

jarvis/__init__.py

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

jarvis/agent.py

@@ -1,4 +1,5 @@
 import argparse
+from ast import Tuple
 import time
 from typing import Callable, Dict, List, Optional
 
@@ -33,12 +34,14 @@ class Agent:
                  system_prompt: str, 
                  name: str = "Jarvis", 
                  is_sub_agent: bool = False, 
-                 tool_registry: Optional[ToolRegistry] = None, 
-                 platform: Optional[BasePlatform] = None, 
+                 tool_registry: Optional[ToolRegistry|List[str]] = None, 
+                 platform: Optional[BasePlatform]|Optional[str] = None, 
+                 model_name: Optional[str] = None,
                  summary_prompt: Optional[str] = None, 
                  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,
@@ -61,12 +64,35 @@ 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
+            if isinstance(platform, str):
+                self.model = PlatformRegistry().create_platform(platform)
+                if self.model is None:
+                    PrettyOutput.print(f"平台 {platform} 不存在，将使用普通模型", OutputType.WARNING)
+                    self.model = PlatformRegistry().get_normal_platform()
+            else:
+                self.model = platform
         else:
             self.model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
-        self.tool_registry = tool_registry if tool_registry else ToolRegistry()
+
+        if model_name is not None:
+            self.model.set_model_name(model_name)
+
+
+        # 初始化工具
+        if tool_registry is not None:
+            if isinstance(tool_registry, ToolRegistry):
+                self.tool_registry = tool_registry
+            elif isinstance(tool_registry, List):
+                self.tool_registry = ToolRegistry()
+                self.tool_registry.use_tools(tool_registry)
+        else:
+            self.tool_registry = ToolRegistry()
+
+        
         self.record_methodology = record_methodology if record_methodology is not None else is_record_methodology()
         self.use_methodology = use_methodology if use_methodology is not None else is_use_methodology()
         self.name = name
@@ -75,6 +101,7 @@ 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 []
@@ -96,11 +123,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()
@@ -181,12 +208,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)
+            ret = self.model.chat_until_success(message) # type: ignore
             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:
@@ -209,7 +240,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
@@ -222,7 +253,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
@@ -237,7 +268,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.
@@ -249,7 +280,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:
@@ -272,18 +303,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:
@@ -306,12 +337,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)
+                self.model.upload_files(file_list) # type: ignore
 
             # 显示任务开始
-            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)}"
@@ -322,7 +353,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)
@@ -342,13 +373,13 @@ 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:
-                        if not self.execute_tool_confirm or user_confirm(f"Execute tool call: {result[0]['name']}?"):
-                            PrettyOutput.print("Executing tool call...", OutputType.PROGRESS)
+                        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
                             
@@ -362,7 +393,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
@@ -372,11 +403,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:
@@ -391,7 +422,7 @@ Please continue the task based on the above information.
         3. Reset conversation length counter
         """
         self.prompt = "" 
-        self.model.reset()
+        self.model.reset() # type: ignore
         self.conversation_length = 0  # Reset conversation length
 
 
@@ -414,9 +445,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"):
@@ -430,9 +461,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():
@@ -455,17 +486,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:
@@ -478,14 +509,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.WARNING)
                 
         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.
@@ -529,22 +560,22 @@ def main():
         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

@@ -34,9 +34,24 @@ class CodeAgent:
 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>
 
@@ -84,6 +99,7 @@ Key Rules:
    • Follow existing patterns exactly
    • Preserve all interfaces
    • Maintain backward compatibility
+   • Implement completely - no TODOs
 
 # File Handling
 Large Files (>200 lines):
@@ -105,7 +121,9 @@ Every Change Must:
 ✓ Match existing style exactly
 ✓ Handle errors consistently
 ✓ Maintain documentation
-✓ 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,
@@ -196,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

jarvis/jarvis_code_agent/file_select.py

@@ -42,7 +42,7 @@ def _parse_file_selection(input_str: str, max_index: int) -> List[int]:
                 if start <= end:
                     selected.update(range(start, end + 1))
             except ValueError:
-                PrettyOutput.print(f"Ignore invalid range expression: {part}", OutputType.WARNING)
+                PrettyOutput.print(f"忽略无效的范围表达式: {part}", OutputType.WARNING)
         # Process single number
         else:
             try:
@@ -50,9 +50,9 @@ def _parse_file_selection(input_str: str, max_index: int) -> List[int]:
                 if 0 <= index < max_index:
                     selected.add(index)
                 else:
-                    PrettyOutput.print(f"Ignore index out of range: {part}", OutputType.WARNING)
+                    PrettyOutput.print(f"忽略超出范围的索引: {part}", OutputType.WARNING)
             except ValueError:
-                PrettyOutput.print(f"Ignore invalid number: {part}", OutputType.WARNING)
+                PrettyOutput.print(f"忽略无效的数字: {part}", OutputType.WARNING)
     
     return sorted(list(selected))
 
@@ -127,8 +127,8 @@ def _fuzzy_match_files(root_dir: str, pattern: str) -> List[str]:
 
 def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dict[str, str]]:
     """Let the user select and supplement related files"""
-    PrettyOutput.section("Related files", OutputType.INFO)
-    
+    PrettyOutput.section("相关文件", OutputType.INFO)
+
     output = ""
     # Display found files
     selected_files = list(related_files)  # Default select all
@@ -139,18 +139,18 @@ def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dic
     
     if len(related_files) > 0:
         # Ask the user if they need to adjust the file list
-        if user_confirm("Do you need to adjust the file list?", False):
+        if user_confirm("是否需要调整文件列表？", False):
             # Let the user select files
-            numbers = get_single_line_input("Please enter the file numbers to include (support: 1,3-6 format, press Enter to keep the current selection)").strip()
+            numbers = get_single_line_input("请输入要包含的文件编号（支持: 1,3-6格式, 按回车保持当前选择）").strip()
             if numbers:
                 selected_indices = _parse_file_selection(numbers, len(related_files))
                 if selected_indices:
                     selected_files = [related_files[i] for i in selected_indices]
                 else:
-                    PrettyOutput.print("No valid files selected, keep the current selection", OutputType.WARNING)
+                    PrettyOutput.print("没有有效的文件被选择, 保持当前选择", OutputType.WARNING)
     
     # Ask if they need to supplement files
-    if user_confirm("Do you need to supplement other files?", False):
+    if user_confirm("是否需要补充其他文件？", False):
         # Create file completion session
         session = PromptSession(
             completer=_get_file_completer(root_dir),
@@ -158,7 +158,7 @@ def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dic
         )
         
         while True:
-            PrettyOutput.print("Please enter the file path to supplement (support Tab completion and *? wildcard, input empty line to end):", OutputType.INFO)
+            PrettyOutput.print("请输入要补充的文件路径（支持Tab补全和*?通配符, 输入空行结束）", OutputType.INFO)
             try:
                 file_path = session.prompt(">>> ").strip()
             except KeyboardInterrupt:
@@ -171,16 +171,16 @@ def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dic
             if '*' in file_path or '?' in file_path:
                 matches = _fuzzy_match_files(root_dir, file_path)
                 if not matches:
-                    PrettyOutput.print("No matching files found", OutputType.WARNING)
+                    PrettyOutput.print("没有找到匹配的文件", OutputType.WARNING)
                     continue
                     
                 # Display matching files
-                PrettyOutput.print("Found the following matching files:", OutputType.INFO)
+                PrettyOutput.print("找到以下匹配的文件:", OutputType.INFO)
                 for i, path in enumerate(matches, 1):
                     PrettyOutput.print(f"[{i}] {path}", OutputType.INFO)
                     
                 # Let the user select
-                numbers = get_single_line_input("Please select the file numbers to add (support: 1,3-6 format, press Enter to select all)").strip()
+                numbers = get_single_line_input("请选择要添加的文件编号（支持: 1,3-6格式, 按回车选择所有）").strip()
                 if numbers:
                     indices = _parse_file_selection(numbers, len(matches))
                     if not indices:
@@ -195,13 +195,13 @@ def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dic
             for path in paths_to_add:
                 full_path = os.path.join(root_dir, path)
                 if not os.path.isfile(full_path):
-                    PrettyOutput.print(f"File does not exist: {path}", OutputType.ERROR)
+                    PrettyOutput.print(f"文件不存在: {path}", OutputType.ERROR)
                     continue
                 
                 try:
                     selected_files.append({"file": path, "reason": "User Added"})
-                    PrettyOutput.print(f"File added: {path}", OutputType.SUCCESS)
+                    PrettyOutput.print(f"文件已添加: {path}", OutputType.SUCCESS)
                 except Exception as e:
-                    PrettyOutput.print(f"Failed to read file: {str(e)}", OutputType.ERROR)
+                    PrettyOutput.print(f"读取文件失败: {str(e)}", OutputType.ERROR)
     
     return selected_files

jarvis/jarvis_code_agent/patch.py

@@ -2,13 +2,13 @@ import re
 from typing import Dict, Any, List
 import os
 from jarvis.jarvis_tools.git_commiter import GitCommitTool
-from jarvis.utils import OutputType, PrettyOutput, has_uncommitted_changes, user_confirm
+from jarvis.utils import OutputType, PrettyOutput, get_multiline_input, has_uncommitted_changes, user_confirm
 
 
 def _parse_patch(patch_str: str) -> Dict[str, List[Dict[str, Any]]]:
     """Parse patches from string with format:
     <PATCH>
-    > /path/to/file start_line,end_line
+    > path/to/file start_line,end_line
     content_line1
     content_line2
     ...
@@ -77,12 +77,12 @@ def apply_patch(output_str: str)->str:
                     # Write new file
                     with open(filepath, 'w', encoding='utf-8') as f:
                         f.writelines(new_content)
-                    PrettyOutput.print(f"Created new file {filepath} successfully\n", OutputType.SUCCESS)
+                    PrettyOutput.print(f"成功创建新文件 {filepath}", OutputType.SUCCESS)
                     continue
 
                 # Regular patch logic for existing files
                 if not os.path.exists(filepath):
-                    PrettyOutput.print(f"File not found: {filepath}", OutputType.WARNING)
+                    PrettyOutput.print(f"文件不存在: {filepath}", OutputType.WARNING)
                     continue
                     
                 # Read original file content
@@ -90,7 +90,7 @@ def apply_patch(output_str: str)->str:
                 
                 # Validate line numbers
                 if start_line < 0 or end_line > len(lines) + 1 or start_line > end_line:
-                    PrettyOutput.print(f"Invalid line range [{start_line}, {end_line}) for file: {filepath}", OutputType.WARNING)
+                    PrettyOutput.print(f"无效的行范围 [{start_line}, {end_line}) 对于文件: {filepath}", OutputType.WARNING)
                     continue
                     
                 # Create new content
@@ -99,15 +99,21 @@ def apply_patch(output_str: str)->str:
                 # Write back to file
                 open(filepath, 'w', encoding='utf-8').writelines(lines)
 
-                PrettyOutput.print(f"Applied patch to {filepath} successfully\n", OutputType.SUCCESS)
+                PrettyOutput.print(f"成功应用补丁到 {filepath}", OutputType.SUCCESS)
             
         except Exception as e:
-            PrettyOutput.print(f"Error applying patch to {filepath}: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"应用补丁到 {filepath} 失败: {str(e)}", OutputType.ERROR)
             continue
-    
+    ret = ""
     if has_uncommitted_changes():
-        handle_commit_workflow()
-    return ""
+        if handle_commit_workflow():
+            ret += "Successfully applied the patch"
+        else:
+            ret += "User rejected the patch"
+        user_input = get_multiline_input("你可以继续输入: ")
+        if user_input:
+            ret += user_input
+    return ret
     
 def handle_commit_workflow()->bool:
     """Handle the git commit workflow and return the commit details.
@@ -119,7 +125,7 @@ def handle_commit_workflow()->bool:
     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):
+    if not user_confirm("是否要提交代码？", default=True):
         os.system("git reset HEAD")
         os.system("git checkout -- .")
         os.system("git clean -fd")