auto-coder 0.1.399__py3-none-any.whl → 0.1.400__py3-none-any.whl

autocoder/common/v2/agent/agentic_edit.py

@@ -111,6 +111,8 @@ from autocoder.common.conversations.get_conversation_manager import (
     reset_conversation_manager
 )
 from autocoder.common.conversations import ConversationManagerConfig
+from autocoder.common.pull_requests import create_pull_request, detect_platform_from_repo
+from autocoder.common.auto_coder_lang import get_message, get_message_with_format
 
 
 # --- Tool Display Customization is now handled by agentic_tool_display.py ---
@@ -1050,7 +1052,7 @@ class AgenticEdit:
         {% endfor %}  
         </user_rule_or_document_files>              
         
-        Make sure you always start your task by using the read_file tool to get the relevant RULE files listed in index.md based on the user's specific requirements.        
+        You should decide based on the user's requirements whether to use the read_file tool to get the relevant files listed in index.md.        
         {% endif %}
 
 
@@ -1920,76 +1922,186 @@ class AgenticEdit:
     def apply_changes(self):
         """
         Apply all tracked file changes to the original project directory.
+        """                            
+        if not self.args.skip_commit:
+            try:
+                file_name = os.path.basename(self.args.file)
+                commit_result = git_utils.commit_changes(
+                    self.args.source_dir,
+                    f"{self.args.query}\nauto_coder_{file_name}",
+                )
+                
+                get_event_manager(self.args.event_file).write_result(
+                    EventContentCreator.create_result(
+                        content={
+                            "have_commit":commit_result.success,
+                            "commit_hash":commit_result.commit_hash,
+                            "diff_file_num":len(commit_result.changed_files),
+                            "event_file":self.args.event_file                                
+                        }), metadata=EventMetadata(
+                        action_file=self.args.file,
+                        is_streaming=False,
+                        path="/agent/edit/apply_changes",
+                        stream_out_type="/agent/edit").to_dict())
+                
+                action_yml_file_manager = ActionYmlFileManager(
+                    self.args.source_dir)
+                action_file_name = os.path.basename(self.args.file)
+                add_updated_urls = []
+                commit_result.changed_files
+                for file in commit_result.changed_files:
+                    add_updated_urls.append(
+                        os.path.join(self.args.source_dir, file))
+
+                self.args.add_updated_urls = add_updated_urls
+                update_yaml_success = action_yml_file_manager.update_yaml_field(
+                    action_file_name, "add_updated_urls", add_updated_urls)
+                if not update_yaml_success:
+                    self.printer.print_in_terminal(
+                        "yaml_save_error", style="red", yaml_file=action_file_name)
+
+                if self.args.enable_active_context:
+                    active_context_manager = ActiveContextManager(
+                        self.llm, self.args.source_dir)
+                    task_id = active_context_manager.process_changes(
+                        self.args)
+                    self.printer.print_in_terminal("active_context_background_task",
+                                                    style="blue",
+                                                    task_id=task_id)
+                git_utils.print_commit_info(commit_result=commit_result)
+                
+                # 检查是否需要创建 Pull Request
+                if self.conversation_config and self.conversation_config.pull_request:
+                    self._create_pull_request(commit_result)
+                    
+            except Exception as e:                
+                self.printer.print_str_in_terminal(
+                    str(e),
+                    style="red"
+                )        
+            
+    def _create_pull_request(self, commit_result):
+        """
+        创建 Pull Request（如果配置启用）
+        
+        Args:
+            commit_result: Git commit 结果对象
         """
-        diff_file_num = 0
-        if self.shadow_manager:
-            for (file_path, change) in self.get_all_file_changes().items():
-                # Ensure the directory exists before writing the file
-                dir_path = os.path.dirname(file_path)
-                if dir_path: # Ensure dir_path is not empty (for files in root)
-                    os.makedirs(dir_path, exist_ok=True)
-
-                with open(file_path, 'w', encoding='utf-8') as f:
-                    f.write(change.content)
-            diff_file_num = len(self.get_all_file_changes())  
-        else:          
-            changes = self.checkpoint_manager.get_changes_by_group(self.args.event_file)
-            diff_file_num = len(changes)
+        try:
+            # 获取当前分支名
+            current_branch = git_utils.get_current_branch(self.args.source_dir)
+            if not current_branch:
+                logger.warning(get_message("/agent/edit/pull_request/branch_name_failed"))
+                return                        
             
-        if diff_file_num > 0:
-            if not self.args.skip_commit:
-                try:
-                    file_name = os.path.basename(self.args.file)
-                    commit_result = git_utils.commit_changes(
-                        self.args.source_dir,
-                        f"{self.args.query}\nauto_coder_{file_name}",
-                    )
-                    
-                    get_event_manager(self.args.event_file).write_result(
-                        EventContentCreator.create_result(
-                            content={
-                                "have_commit":commit_result.success,
-                                "commit_hash":commit_result.commit_hash,
-                                "diff_file_num":diff_file_num,
-                                "event_file":self.args.event_file                                
-                            }), metadata=EventMetadata(
-                            action_file=self.args.file,
-                            is_streaming=False,
-                            path="/agent/edit/apply_changes",
-                            stream_out_type="/agent/edit").to_dict())
-                    
-                    action_yml_file_manager = ActionYmlFileManager(
-                        self.args.source_dir)
-                    action_file_name = os.path.basename(self.args.file)
-                    add_updated_urls = []
-                    commit_result.changed_files
-                    for file in commit_result.changed_files:
-                        add_updated_urls.append(
-                            os.path.join(self.args.source_dir, file))
-
-                    self.args.add_updated_urls = add_updated_urls
-                    update_yaml_success = action_yml_file_manager.update_yaml_field(
-                        action_file_name, "add_updated_urls", add_updated_urls)
-                    if not update_yaml_success:
-                        self.printer.print_in_terminal(
-                            "yaml_save_error", style="red", yaml_file=action_file_name)
-
-                    if self.args.enable_active_context:
-                        active_context_manager = ActiveContextManager(
-                            self.llm, self.args.source_dir)
-                        task_id = active_context_manager.process_changes(
-                            self.args)
-                        self.printer.print_in_terminal("active_context_background_task",
-                                                       style="blue",
-                                                       task_id=task_id)
-                    git_utils.print_commit_info(commit_result=commit_result)
-                except Exception as e:
-                    self.printer.print_str_in_terminal(
-                        self.git_require_msg(
-                            source_dir=self.args.source_dir, error=str(e)),
-                        style="red"
-                    )        
+            # 准备 PR 标题和描述
+            query = self.args.query or get_message("/agent/edit/pull_request/default_query")
+            pr_title = get_message_with_format("/agent/edit/pull_request/title", query=query[0:40])
+            
+            # 构建 PR 描述
+            file_list = ""
+            if commit_result.changed_files:
+                for file_path in commit_result.changed_files:
+                    file_list += f"- `{file_path}`\n"
             
+            pr_description = get_message_with_format(
+                "/agent/edit/pull_request/description",
+                query=query,
+                file_count=len(commit_result.changed_files or []),
+                commit_hash=commit_result.commit_hash,
+                file_list=file_list.strip(),
+                source_branch=current_branch,
+                target_branch="main",
+                timestamp=time.strftime('%Y-%m-%d %H:%M:%S')
+            )
+
+            # 创建 Pull Request
+            logger.info(get_message_with_format("/agent/edit/pull_request/creating", title=pr_title))
+            
+            result = create_pull_request(
+                repo_path=self.args.source_dir,
+                title=pr_title,                
+                description=pr_description,                
+            )
+            
+            if result.success:
+                logger.info(get_message("/agent/edit/pull_request/success"))
+                logger.info(f"PR URL: {result.pr_url}")
+                logger.info(f"PR 编号: {result.pr_number}")
+                
+                # 打印成功信息到终端
+                self.printer.print_str_in_terminal(
+                    get_message("/agent/edit/pull_request/success"),
+                    style="green"
+                )
+                self.printer.print_str_in_terminal(f"PR URL: {result.pr_url}")
+                self.printer.print_str_in_terminal(f"PR 编号: {result.pr_number}")
+                
+                # 写入事件日志
+                get_event_manager(self.args.event_file).write_result(
+                    EventContentCreator.create_result(
+                        content={
+                            "success": True,
+                            "pr_url": result.pr_url,
+                            "pr_number": result.pr_number,
+                            "source_branch": current_branch,
+                            "target_branch": "main",
+                            "platform": result.platform.value if result.platform else "unknown"
+                        }), 
+                    metadata=EventMetadata(
+                        action_file=self.args.file,
+                        is_streaming=False,
+                        path="/agent/edit/pull_request_created",
+                        stream_out_type="/agent/edit"
+                    ).to_dict()
+                )
+                
+            else:
+                error_msg = get_message_with_format("/agent/edit/pull_request/failed", error=result.error_message)
+                logger.error(error_msg)
+                
+                # 打印错误信息到终端
+                self.printer.print_str_in_terminal(error_msg, style="red")
+                
+                # 写入错误事件日志
+                get_event_manager(self.args.event_file).write_error(
+                    EventContentCreator.create_error(
+                        error_code="PR_CREATION_FAILED",
+                        error_message=result.error_message,
+                        details={
+                            "source_branch": current_branch,
+                            "target_branch": "main"
+                        }
+                    ).to_dict(),
+                    metadata=EventMetadata(
+                        action_file=self.args.file,
+                        is_streaming=False,
+                        path="/agent/edit/pull_request_error",
+                        stream_out_type="/agent/edit"
+                    ).to_dict()
+                )
+                
+        except Exception as e:
+            error_msg = get_message_with_format("/agent/edit/pull_request/exception", error=str(e))
+            logger.exception(error_msg)
+            
+            # 打印异常信息到终端
+            self.printer.print_str_in_terminal(error_msg, style="red")
+            
+            # 写入异常事件日志
+            get_event_manager(self.args.event_file).write_error(
+                EventContentCreator.create_error(
+                    error_code="PR_CREATION_EXCEPTION",
+                    error_message=get_message_with_format("/agent/edit/pull_request/exception", error=str(e)),
+                    details={"exception_type": type(e).__name__}
+                ).to_dict(),
+                metadata=EventMetadata(
+                    action_file=self.args.file,
+                    is_streaming=False,
+                    path="/agent/edit/pull_request_exception",
+                    stream_out_type="/agent/edit"
+                ).to_dict()
+            )
 
     def run_in_terminal(self, request: AgenticEditRequest):
         """
@@ -2239,6 +2351,8 @@ class AgenticEdit:
         try:
             event_stream = self.analyze(request)
             for agent_event in event_stream:
+                if isinstance(agent_event, CompletionEvent):
+                    self.apply_changes()
                 yield agent_event
                 
         except Exception as e:

autocoder/common/v2/agent/agentic_edit_types.py

@@ -187,3 +187,4 @@ class AgenticEditConversationConfig(BaseModel):
     conversation_id: Optional[str] = None 
     action: Optional[str] = None
     query: Optional[str] = None
+    pull_request: bool = False

autocoder/sdk/cli/handlers.py

@@ -49,7 +49,8 @@ class CommandHandler:
             stream=self.options.output_format.startswith("stream"),
             session_id=self.options.resume_session,
             continue_session=self.options.continue_session,
-            model=self.options.model
+            model=self.options.model,
+            pr=self.options.pr
         )
         
     def _get_prompt(self) -> str:

autocoder/sdk/cli/main.py

@@ -115,12 +115,13 @@ class AutoCoderCLI:
         
         # 高级选项
         advanced = parser.add_argument_group("高级选项")
-        advanced.add_argument("--max-turns", type=int, default=3, help="最大对话轮数 (默认: 3)")
+        advanced.add_argument("--max-turns", type=int, default= -1, help="最大对话轮数 (默认: -1 不限制)")
         advanced.add_argument("--system-prompt", help="系统提示")
         advanced.add_argument("--allowed-tools", nargs="+", help="允许使用的工具列表")
         advanced.add_argument("--permission-mode", choices=["manual", "acceptEdits"],
                            default="manual", help="权限模式 (默认: manual)")
         advanced.add_argument("--model", required=True, help="指定使用的模型名称 (如: gpt-4, gpt-3.5-turbo, claude-3-sonnet 等)")
+        advanced.add_argument("--pr", action="store_true", help="创建 Pull Request")
         
         # 启用自动补全
         if ARGCOMPLETE_AVAILABLE:
@@ -143,7 +144,8 @@ class AutoCoderCLI:
             system_prompt=parsed_args.system_prompt,
             allowed_tools=parsed_args.allowed_tools or [],
             permission_mode=parsed_args.permission_mode,
-            model=parsed_args.model
+            model=parsed_args.model,
+            pr=parsed_args.pr
         )
         
         return options

autocoder/sdk/cli/options.py

@@ -32,6 +32,7 @@ class CLIOptions:
     allowed_tools: list = field(default_factory=list)  # 允许使用的工具列表
     permission_mode: str = "manual"  # 权限模式，可选值: manual, acceptEdits
     model: Optional[str] = None  # 模型名称，如 gpt-4, gpt-3.5-turbo 等
+    pr: bool = False  # 是否创建 PR
     
     def validate(self) -> None:
         """验证选项的有效性。"""
@@ -49,9 +50,9 @@ class CLIOptions:
         if self.permission_mode not in valid_permission_modes:
             raise ValueError(f"无效的权限模式: {self.permission_mode}，有效值为: {', '.join(valid_permission_modes)}")
         
-        # 验证最大对话轮数
-        if self.max_turns <= 0:
-            raise ValueError("max_turns必须为正数")
+        # 验证最大对话轮数（-1表示不限制）
+        if self.max_turns <= 0 and self.max_turns != -1:
+            raise ValueError("max_turns必须为正数或-1（表示不限制）")
         
         # 验证会话选项的互斥性
         if self.continue_session and self.resume_session:

autocoder/sdk/core/auto_coder_core.py

@@ -656,6 +656,7 @@ class AutoCoderCore:
         self, 
         prompt: str, 
         pre_commit: bool = False,
+        pr: Optional[bool] = None,
         extra_args: Optional[Dict[str, Any]] = None,
         show_terminal: bool = True
     ) -> CodeModificationResult:
@@ -665,6 +666,7 @@ class AutoCoderCore:
         Args:
             prompt: 修改提示
             pre_commit: 是否预提交
+            pr: 是否创建 PR，如果为None则使用配置中的值
             extra_args: 额外参数
             show_terminal: 是否显示到终端
             
@@ -677,7 +679,8 @@ class AutoCoderCore:
             
             event_stream = self._sync_run_auto_command(
                 prompt, 
-                pre_commit=pre_commit, 
+                pre_commit=pre_commit,
+                pr=pr,
                 extra_args=extra_args
             )
             
@@ -746,6 +749,7 @@ class AutoCoderCore:
         self, 
         prompt: str, 
         pre_commit: bool = False,
+        pr: Optional[bool] = None,
         extra_args: Optional[Dict[str, Any]] = None,
         show_terminal: bool = True
     ) -> AsyncIterator[StreamEvent]:
@@ -755,6 +759,7 @@ class AutoCoderCore:
         Args:
             prompt: 修改提示
             pre_commit: 是否预提交
+            pr: 是否创建 PR，如果为None则使用配置中的值
             extra_args: 额外参数
             show_terminal: 是否显示到终端
             
@@ -773,6 +778,7 @@ class AutoCoderCore:
                 self._sync_run_auto_command,
                 prompt,
                 pre_commit,
+                pr,
                 extra_args
             )
             
@@ -808,6 +814,7 @@ class AutoCoderCore:
         self, 
         prompt: str, 
         pre_commit: bool = False,
+        pr: Optional[bool] = None,
         extra_args: Optional[Dict[str, Any]] = None
     ) -> Iterator[StreamEvent]:
         """
@@ -816,14 +823,20 @@ class AutoCoderCore:
         Args:
             prompt: 查询提示
             pre_commit: 是否预提交
+            pr: 是否创建 PR，如果为None则使用配置中的值
             extra_args: 额外参数
             
         Returns:
             Iterator[StreamEvent]: 事件流
         """
+        # 如果没有明确指定pr参数，使用配置中的值
+        if pr is None:
+            pr = self.options.pr
+        
         return self.bridge.call_run_auto_command(
             query=prompt,
             pre_commit=pre_commit,
+            pr=pr,
             extra_args=extra_args or {},
             stream=True
         )

autocoder/sdk/core/bridge.py

@@ -65,6 +65,7 @@ class AutoCoderBridge:
         self,
         query: str,
         pre_commit: bool = False,
+        pr: bool = False,
         extra_args: Optional[Dict[str, Any]] = None,
         stream: bool = True
     ) -> Iterator[StreamEvent]:
@@ -74,6 +75,7 @@ class AutoCoderBridge:
         Args:
             query: 查询内容
             pre_commit: 是否预提交
+            pr: 是否预提交
             extra_args: 额外参数
             stream: 是否流式返回
 
@@ -103,6 +105,7 @@ class AutoCoderBridge:
                 events = run_auto_command(
                     query=query,
                     pre_commit=pre_commit,
+                    pr=pr,
                     extra_args=extra_args
                 )
 

autocoder/sdk/models/options.py

@@ -52,6 +52,7 @@ class AutoCodeOptions:
     timeout: int = 30
     verbose: bool = False
     include_project_structure: bool = True
+    pr: bool = False  # 是否创建 PR
     
     def __post_init__(self):
         """初始化后验证"""
@@ -61,12 +62,12 @@ class AutoCodeOptions:
     def validate(self) -> None:
         """验证配置选项"""
         
-        # 验证max_turns
-        if self.max_turns <= 0:
-            raise ValidationError("max_turns", "must be positive integer")
+        # 验证max_turns（-1表示不限制）
+        if self.max_turns <= 0 and self.max_turns != -1:
+            raise ValidationError("max_turns", "must be positive integer or -1 (unlimited)")
         
-        if self.max_turns > 100:
-            raise ValidationError("max_turns", "cannot exceed 100")
+        if self.max_turns > 100 and self.max_turns != -1:
+            raise ValidationError("max_turns", "cannot exceed 100 (unless -1 for unlimited)")
         
         # 验证output_format
         if self.output_format not in OUTPUT_FORMATS:
@@ -140,7 +141,8 @@ class AutoCodeOptions:
             "temperature": self.temperature,
             "timeout": self.timeout,
             "verbose": self.verbose,
-            "include_project_structure": self.include_project_structure
+            "include_project_structure": self.include_project_structure,
+            "pr": self.pr
         }
     
     @classmethod

autocoder/version.py

@@ -1,2 +1,2 @@
-__version__ = "0.1.399"
+__version__ = "0.1.400"