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

autocoder/common/v2/agent/agentic_edit.py

@@ -79,10 +79,12 @@ from autocoder.common.v2.agent.agentic_edit_types import (AgenticEditRequest, To
                                                           LLMOutputEvent, LLMThinkingEvent, ToolCallEvent,
                                                           ToolResultEvent, CompletionEvent, PlanModeRespondEvent, ErrorEvent, TokenUsageEvent,
                                                           WindowLengthChangeEvent,
+                                                          ConversationIdEvent,
                                                           # Import specific tool types for display mapping
                                                           ReadFileTool, WriteToFileTool, ReplaceInFileTool, ExecuteCommandTool,
                                                           ListFilesTool, SearchFilesTool, ListCodeDefinitionNamesTool,
-                                                          AskFollowupQuestionTool, UseMcpTool, AttemptCompletionTool
+                                                          AskFollowupQuestionTool, UseMcpTool, AttemptCompletionTool,
+                                                          AgenticEditConversationConfig
                                                           )
 from autocoder.common.rag_manager import RAGManager
 from autocoder.rag.token_counter import count_tokens
@@ -103,6 +105,14 @@ TOOL_RESOLVER_MAP: Dict[Type[BaseTool], Type[BaseToolResolver]] = {
     UseMcpTool: UseMcpToolResolver,
     UseRAGTool: UseRAGToolResolver
 }
+from autocoder.common.conversations.get_conversation_manager import (
+    get_conversation_manager,
+    get_conversation_manager_config,
+    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 ---
@@ -117,7 +127,8 @@ class AgenticEdit:
         args: AutoCoderArgs,
         memory_config: MemoryConfig,
         command_config: Optional[CommandConfig] = None,
-        conversation_name:Optional[str] = "current"        
+        conversation_name:Optional[str] = "current",
+        conversation_config:Optional[AgenticEditConversationConfig] = None
     ):
         self.llm = llm
         self.context_prune_llm = get_single_llm(args.context_prune_model or args.model,product_mode=args.product_mode) 
@@ -127,7 +138,7 @@ class AgenticEdit:
         self.files = files
         # Removed self.max_iterations
         # Note: This might need updating based on the new flow
-        self.conversation_history = conversation_history
+        self.conversation_history = conversation_history                    
 
         self.current_conversations = []
         self.memory_config = memory_config
@@ -183,6 +194,19 @@ class AgenticEdit:
         # 格式: { file_path: FileChangeEntry(...) }
         self.file_changes: Dict[str, FileChangeEntry] = {}
 
+        # 对话管理器
+        self.conversation_config =conversation_config
+        self.conversation_manager = get_conversation_manager()
+
+        if self.conversation_config.action == "new":
+            conversation_id = self.conversation_manager.create_conversation(name=self.conversation_config.query or "New Conversation",
+                                                                            description=self.conversation_config.query or "New Conversation")
+            self.conversation_manager.set_current_conversation(conversation_id)
+
+        if self.conversation_config.action == "resume" and self.conversation_config.conversation_id:
+            self.conversation_manager.set_current_conversation(self.conversation_config.conversation_id)
+            
+
     @byzerllm.prompt()
     def generate_library_docs_prompt(self, libraries_with_paths: List[Dict[str, str]], docs_content: str) -> Dict[str, Any]:
         """
@@ -419,7 +443,7 @@ class AgenticEdit:
         <list_code_definition_names>
         <path>Directory path here</path>
         </list_code_definition_names>
-
+                
         ## ask_followup_question
         Description: Ask the user a question to gather additional information needed to complete the task. This tool should be used when you encounter ambiguities, need clarification, or require more details to proceed effectively. It allows for interactive problem-solving by enabling direct communication with the user. Use this tool judiciously to maintain a balance between gathering necessary information and avoiding excessive back-and-forth.
         Parameters:
@@ -431,7 +455,7 @@ class AgenticEdit:
         <options>
         Array of options here (optional), e.g. ["Option 1", "Option 2", "Option 3"]
         </options>
-        </ask_followup_question>
+        </ask_followup_question>        
 
         ## attempt_completion
         Description: After each tool use, the user will respond with the result of that tool use, i.e. if it succeeded or failed, along with any reasons for failure. Once you've received the results of tool uses and can confirm that the task is complete, use this tool to present the result of your work to the user. Optionally you may provide a CLI command to showcase the result of your work. The user may respond with feedback if they are not satisfied with the result, which you can use to make improvements and try again.
@@ -1028,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 %}
 
 
@@ -1096,6 +1120,7 @@ class AgenticEdit:
             "enable_active_context_in_generate": self.args.enable_active_context_in_generate,
             "extra_docs": extra_docs,
             "file_paths_str": file_paths_str,
+            "agentic_auto_approve": self.args.enable_agentic_auto_approve,
         }
 
     # Removed _execute_command_result and execute_auto_command methods
@@ -1144,7 +1169,7 @@ class AgenticEdit:
         """
         Analyzes the user request, interacts with the LLM, parses responses,
         executes tools, and yields structured events for visualization until completion or error.
-        """
+        """       
         logger.info(f"Starting analyze method with user input: {request.user_input[:50]}...")
         system_prompt = self._analyze.prompt(request)
         logger.info(f"Generated system prompt with length: {len(system_prompt)}")
@@ -1154,7 +1179,7 @@ class AgenticEdit:
         conversations = [
             {"role": "system", "content": system_prompt},
         ] 
-        
+                                
         # Add third-party library documentation information
         try:
             package_manager = LLMFriendlyPackageManager(
@@ -1199,12 +1224,36 @@ class AgenticEdit:
                     })
                     
         except Exception as e:
-            logger.warning(f"Failed to load library documentation: {str(e)}")
-                                
+            logger.warning(f"Failed to load library documentation: {str(e)}")                                        
+
+        if self.conversation_config.action == "resume":
+            current_conversation = self.conversation_manager.get_current_conversation()
+            # 如果继续的是当前的对话，将其消息加入到 conversations 中
+            if current_conversation and current_conversation.get('messages'):
+                for message in current_conversation['messages']:
+                    # 确保消息格式正确（包含 role 和 content 字段）
+                    if isinstance(message, dict) and 'role' in message and 'content' in message:
+                        conversations.append({
+                            "role": message['role'],
+                            "content": message['content']
+                        })
+                logger.info(f"Resumed conversation with {len(current_conversation['messages'])} existing messages")     
+        
+        if self.conversation_manager.get_current_conversation_id() is None:
+            conv_id = self.conversation_manager.create_conversation(name=self.conversation_config.query,description=self.conversation_config.query)
+            self.conversation_manager.set_current_conversation(conv_id)            
+        
+        self.conversation_manager.set_current_conversation(self.conversation_manager.get_current_conversation_id())
+        yield ConversationIdEvent(conversation_id=self.conversation_manager.get_current_conversation_id())
+        
         conversations.append({
             "role": "user", "content": request.user_input
-        })        
+        })  
         
+        self.conversation_manager.append_message_to_current(
+                    role="user", 
+                    content=request.user_input,
+                    metadata={})
         
         self.current_conversations = conversations
         
@@ -1292,7 +1341,12 @@ class AgenticEdit:
                     conversations.append({
                         "role": "assistant",
                         "content": assistant_buffer + tool_xml
-                    })                    
+                    }) 
+                    self.conversation_manager.append_message_to_current(
+                        role="assistant", 
+                        content=assistant_buffer + tool_xml,
+                        metadata={})
+                    
                     assistant_buffer = ""  # Reset buffer after tool call
                     
                     # 计算当前对话的总 token 数量并触发事件
@@ -1311,7 +1365,7 @@ class AgenticEdit:
                         completion_event = CompletionEvent(completion=tool_obj, completion_xml=tool_xml)
                         logger.info(
                             "AgenticEdit analyze loop finished due to AttemptCompletion.")
-                        save_formatted_log(self.args.source_dir, json.dumps(conversations, ensure_ascii=False), "agentic_conversation")        
+                        save_formatted_log(self.args.source_dir, json.dumps(conversations, ensure_ascii=False), "agentic_conversation")                                
                         mark_event_should_finish = True
                         should_yield_completion_event = True
                         continue
@@ -1387,6 +1441,10 @@ class AgenticEdit:
                         "role": "user",  # Simulating the user providing the tool result
                         "content": error_xml
                     })
+                    self.conversation_manager.append_message_to_current(
+                        role="user", 
+                        content=error_xml,
+                        metadata={})
                     
                     # 计算当前对话的总 token 数量并触发事件
                     current_conversation_str = json.dumps(conversations, ensure_ascii=False)
@@ -1425,6 +1483,9 @@ class AgenticEdit:
                         logger.info("Adding new assistant message")
                         conversations.append(
                             {"role": "assistant", "content": assistant_buffer})
+                        self.conversation_manager.append_message_to_current(
+                            role="assistant", content=assistant_buffer,metadata={})
+                        
                     elif last_message["role"] == "assistant":
                         logger.info("Appending to existing assistant message")
                         last_message["content"] += assistant_buffer
@@ -1441,6 +1502,11 @@ class AgenticEdit:
                     "role": "user",
                     "content": "NOTE: You must use an appropriate tool (such as read_file, write_to_file, execute_command, etc.) or explicitly complete the task (using attempt_completion). Do not provide text responses without taking concrete actions. Please select a suitable tool to continue based on the user's task."
                 })
+
+                self.conversation_manager.append_message_to_current(
+                    role="user", 
+                    content="NOTE: You must use an appropriate tool (such as read_file, write_to_file, execute_command, etc.) or explicitly complete the task (using attempt_completion). Do not provide text responses without taking concrete actions. Please select a suitable tool to continue based on the user's task.",
+                    metadata={})
                 
                 # 计算当前对话的总 token 数量并触发事件
                 current_conversation_str = json.dumps(conversations, ensure_ascii=False)
@@ -1580,9 +1646,9 @@ class AgenticEdit:
                             else:
                                 yield ToolCallEvent(tool=tool_obj, tool_xml=reconstructed_xml)
                         else:
-                            yield ErrorEvent(message=f"Failed to parse tool: <{current_tool_tag}>")
+                            # yield ErrorEvent(message=f"Failed to parse tool: <{current_tool_tag}>")
                             # Optionally yield the raw XML as plain text?
-                            # yield LLMOutputEvent(text=tool_xml)
+                            yield LLMOutputEvent(text=f"Failed to parse tool: <{current_tool_tag}> {tool_xml}")
 
                         buffer = buffer[tool_block_end_index:]
                         in_tool_block = False
@@ -1856,85 +1922,219 @@ 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):
         """
-        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)
+        创建 Pull Request（如果配置启用）
+        
+        Args:
+            commit_result: Git commit 结果对象
+        """
+        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"
-                    )
-        else:
-            self.printer.print_in_terminal("no_changes_made")
+            # 准备 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):
         """
         Runs the agentic edit process based on the request and displays
         the interaction streamingly in the terminal using Rich.
         """
+        import json
         console = Console()
         project_name = os.path.basename(os.path.abspath(self.args.source_dir))
+
+        if self.conversation_config.action == "list":
+            conversations = self.conversation_manager.list_conversations()
+            # 只保留 conversation_id 和 name 字段
+            filtered_conversations = []
+            for conv in conversations:
+                filtered_conv = {
+                    "conversation_id": conv.get("conversation_id"),
+                    "name": conv.get("name")
+                }
+                filtered_conversations.append(filtered_conv)
+            
+            # 格式化 JSON 输出，使用 JSON 格式渲染而不是 Markdown
+            json_str = json.dumps(filtered_conversations, ensure_ascii=False, indent=4)
+            console.print(Panel(json_str,
+                                  title="🏁 Task Completion", border_style="green", title_align="left"))
+            return
+        
+
+        if self.conversation_config.action == "new" and not request.user_input.strip():
+            console.print(Panel(Markdown(f"New conversation created: {self.conversation_manager.get_current_conversation_id()}"),
+                                  title="🏁 Task Completion", border_style="green", title_align="left"))
+            return
+
         console.rule(f"[bold cyan]Starting Agentic Edit: {project_name}[/]")
         console.print(Panel(
             f"[bold]{get_message('/agent/edit/user_query')}:[/bold]\n{request.user_input}", title=get_message("/agent/edit/objective"), border_style="blue"))
@@ -1952,6 +2152,9 @@ class AgenticEdit:
             self.apply_pre_changes()
             event_stream = self.analyze(request)
             for event in event_stream:
+                if isinstance(event, ConversationIdEvent):
+                    console.print(f"[dim]Conversation ID: {event.conversation_id}[/dim]")
+                    continue
                 if isinstance(event, TokenUsageEvent):
                     last_meta: SingleOutputMeta = event.usage
                     # Get model info for pricing
@@ -2144,6 +2347,20 @@ class AgenticEdit:
         finally:
             console.rule("[bold cyan]Agentic Edit Finished[/]")
 
+    def run(self, request: AgenticEditRequest):        
+        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:
+            logger.exception(
+                "An unexpected error occurred during agent execution: {e}")           
+            raise e
+
+
     def run_with_events(self, request: AgenticEditRequest):
         """
         Runs the agentic edit process, converting internal events to the
@@ -2275,6 +2492,16 @@ class AgenticEdit:
                     
                     # 记录日志
                     logger.info(f"当前会话总 tokens: {agent_event.tokens_used}")
+
+                elif isinstance(agent_event, ConversationIdEvent):
+                    metadata.path = "/agent/edit/conversation_id"
+                    content = EventContentCreator.create_result(
+                        content={
+                            "conversation_id": agent_event.conversation_id
+                        },
+                        metadata={}
+                    )
+                    event_manager.write_result(content=content.to_dict(), metadata=metadata.to_dict())    
                     
                 elif isinstance(agent_event, ErrorEvent):                                        
                     metadata.path = "/agent/edit/error"
@@ -2284,7 +2511,7 @@ class AgenticEdit:
                         details={"agent_event_type": "ErrorEvent"}
                     )
                     event_manager.write_error(
-                        content=content.to_dict(), metadata=metadata.to_dict())
+                        content=content.to_dict(), metadata=metadata.to_dict())                
                 else:
                     metadata.path = "/agent/edit/error"
                     logger.warning(

autocoder/common/v2/agent/agentic_edit_types.py

@@ -86,6 +86,11 @@ class TokenUsageEvent(BaseModel):
     """Represents the result of executing a tool."""
     usage: Any
 
+
+class ConversationIdEvent(BaseModel):
+    """Represents the conversation id."""
+    conversation_id: str
+
 class PlanModeRespondEvent(BaseModel):
     """Represents the LLM attempting to complete the task."""
     completion: SkipValidation[PlanModeRespondTool] # Skip validation
@@ -177,3 +182,9 @@ class CommandConfig(BaseModel):
     index_import: SkipValidation[Callable]
     exclude_files: SkipValidation[Callable]
 
+class AgenticEditConversationConfig(BaseModel):     
+    conversation_name: Optional[str] = "current"
+    conversation_id: Optional[str] = None 
+    action: Optional[str] = None
+    query: Optional[str] = None
+    pull_request: bool = False

autocoder/common/v2/code_auto_generate_editblock.py

@@ -52,7 +52,7 @@ class CodeAutoGenerateEditBlock:
                                  package_context: str = ""
                                  ) -> str:
         """
-        如果你需要生成代码，对于每个需要更改的文件,你需要按 *SEARCH/REPLACE block* 的格式进行生成。
+        如果你需要生成代码，对于每个需要更改的文件,你需要按 *SEARCH/REPLACE block* 的格式进行生成。        
 
         # *SEARCH/REPLACE block* Rules:
 
@@ -196,7 +196,15 @@ class CodeAutoGenerateEditBlock:
         <extra_context>
         {{ context }}
         </extra_context>
-        {%- endif %}     
+        {%- endif %}   
+
+        ====
+
+        RULES PROVIDED BY SYSTEM
+
+        Before outputting the *SEARCH/REPLACE block* format, you must carefully think through the user's question and make a complete design. These thoughts and designs should be placed within the <thinking></thinking> tags.
+
+        ====  
 
         {%- if extra_docs %}
         ====

autocoder/dispacher/__init__.py

@@ -8,6 +8,11 @@ from autocoder.dispacher.actions.action import (
 from autocoder.dispacher.actions.plugins.action_regex_project import ActionRegexProject
 from typing import Optional
 import byzerllm
+# from autocoder.common.conversations.get_conversation_manager import (
+#     get_conversation_manager,
+#     get_conversation_manager_config,
+#     reset_conversation_manager
+# )
 
 
 class Dispacher:
@@ -16,6 +21,11 @@ class Dispacher:
         self.llm = llm
 
     def dispach(self):
+        # manager = get_conversation_manager()
+        # if not manager.get_current_conversation():
+        #     manager.create_conversation(name="New Conversation", description="New Conversation")
+        #     manager.set_current_conversation(manager.get_current_conversation_id())
+
         args = self.args
         actions = [            
             ActionTSProject(args=args, llm=self.llm),