auto-coder 0.1.337__py3-none-any.whl → 0.1.338__py3-none-any.whl

{auto_coder-0.1.337.dist-info → auto_coder-0.1.338.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.337
+Version: 0.1.338
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.337.dist-info → auto_coder-0.1.338.dist-info}/RECORD

@@ -4,7 +4,7 @@ autocoder/auto_coder_lang.py,sha256=Rtupq6N3_HT7JRhDKdgCBcwRaiAnyCOR_Gsp4jUomrI,
 autocoder/auto_coder_rag.py,sha256=NesRm7sIJrRQL1xxm_lbMtM7gi-KrYv9f26RfBuloZE,35386
 autocoder/auto_coder_rag_client_mcp.py,sha256=QRxUbjc6A8UmDMQ8lXgZkjgqtq3lgKYeatJbDY6rSo0,6270
 autocoder/auto_coder_rag_mcp.py,sha256=-RrjNwFaS2e5v8XDIrKR-zlUNUE8UBaeOtojffBrvJo,8521
-autocoder/auto_coder_runner.py,sha256=MMppqdwfT1a-NoIxqbQGNS2z2Wi0CWY6X3AK8morCsE,111424
+autocoder/auto_coder_runner.py,sha256=Xrzeo9u7UIvIjKgaV12O-XItl10dhjogp-7TNIvqAP8,111518
 autocoder/auto_coder_server.py,sha256=bLORGEclcVdbBVfM140JCI8WtdrU0jbgqdJIVVupiEU,20578
 autocoder/benchmark.py,sha256=Ypomkdzd1T3GE6dRICY3Hj547dZ6_inqJbBJIp5QMco,4423
 autocoder/chat_auto_coder.py,sha256=CthuvdjVjTQOVv-zREsl8OCsZHPSP9OQcIgHULrW2Ro,25842
@@ -14,7 +14,7 @@ autocoder/command_parser.py,sha256=fx1g9E6GaM273lGTcJqaFQ-hoksS_Ik2glBMnVltPCE,1
 autocoder/lang.py,sha256=PFtATuOhHRnfpqHQkXr6p4C893JvpsgwTMif3l-GEi0,14321
 autocoder/models.py,sha256=_SCar82QIeBFTZZBdM2jPS6atKVhHnvE0gX3V0CsxD4,11590
 autocoder/run_context.py,sha256=IUfSO6_gp2Wt1blFWAmOpN0b0nDrTTk4LmtCYUBIoro,1643
-autocoder/version.py,sha256=_LNwUtBnPaBerh9KZiByo60wMmCJ6961eqCjdcRR4Zk,23
+autocoder/version.py,sha256=oUXeUGWr7ewx0MgKWn_rfyWO62ZnbdWizzFCRsj8frY,23
 autocoder/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/agent/agentic_edit.py,sha256=XsfePZ-t6M-uBSdG1VLZXk1goqXk2HPeJ_A8IYyBuWQ,58896
 autocoder/agent/agentic_edit_types.py,sha256=oFcDd_cxJ2yH9Ed1uTpD3BipudgoIEWDMPb5pAkq4gI,3288
@@ -54,7 +54,7 @@ autocoder/common/action_yml_file_manager.py,sha256=DdF5P1R_B_chCnnqoA2IgogakWLZk
 autocoder/common/anything2images.py,sha256=0ILBbWzY02M-CiWB-vzuomb_J1hVdxRcenAfIrAXq9M,25283
 autocoder/common/anything2img.py,sha256=iZQmg8srXlD7N5uGl5b_ONKJMBjYoW8kPmokkG6ISF0,10118
 autocoder/common/audio.py,sha256=Kn9nWKQddWnUrAz0a_ZUgjcu4VUU_IcZBigT7n3N3qc,7439
-autocoder/common/auto_coder_lang.py,sha256=cNwzXknWDDFUoG68D0xhp1KgTC25bS8pbObeL-1pRpA,40656
+autocoder/common/auto_coder_lang.py,sha256=ozoGTy4ZFn3YsO5zWhvAGCu54mK4LtnRfC2yCvrMc_8,42462
 autocoder/common/auto_configure.py,sha256=D4N-fl9v8bKM5-Ds-uhkC2uGDmHH_ZjLJ759F8KXMKs,13129
 autocoder/common/buildin_tokenizer.py,sha256=L7d5t39ZFvUd6EoMPXUhYK1toD0FHlRH1jtjKRGokWU,1236
 autocoder/common/chunk_validation.py,sha256=BrR_ZWavW8IANuueEE7hS8NFAwEvm8TX34WnPx_1hs8,3030
@@ -126,10 +126,10 @@ autocoder/common/v2/code_editblock_manager.py,sha256=G0CIuV9Ki0FqMLnpA8nBT4pnkCN
 autocoder/common/v2/code_manager.py,sha256=C403bS-f6urixwitlKHcml-J03hci-UyNwHJOqBiY6Q,9182
 autocoder/common/v2/code_strict_diff_manager.py,sha256=v-J1kDyLg7tLGg_6_lbO9S4fNkx7M_L8Xr2G7fPptiU,9347
 autocoder/common/v2/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/common/v2/agent/agentic_edit.py,sha256=iFr2Umr1qXYGH0enzn2KJS8H2nqfuKkyBidbUKq38Bc,87031
-autocoder/common/v2/agent/agentic_edit_conversation.py,sha256=XtN0D1stP80gKnGiVxFMZL1DbIU56AISyDkS52RMaac,4434
-autocoder/common/v2/agent/agentic_edit_types.py,sha256=ZCgIu0Dj4xPP9s-lWtzh1-wBvoXrSkgu3pan_Oo_Ng0,4433
-autocoder/common/v2/agent/agentic_tool_display.py,sha256=5KshKQX0YFcGobfbJIwylwkalAEuZVUO68hSrIlPM64,7341
+autocoder/common/v2/agent/agentic_edit.py,sha256=mw85tMint-m6MA7OrPmrwOOZw_uW_N7fboTGfXNQYcE,88790
+autocoder/common/v2/agent/agentic_edit_conversation.py,sha256=2GZrw5f8Sh9GgUDnuFc2v7Q4syrm77kKEfXI6k6uEFY,7310
+autocoder/common/v2/agent/agentic_edit_types.py,sha256=6qBLLmvdlcsbzrpMHsYQVIHqbOWubMXOnmkqTs1pBWQ,4629
+autocoder/common/v2/agent/agentic_tool_display.py,sha256=M-fFfmCzAyYrT916tXbc8HZxbv4ePksR9WqvSrhcZIs,7345
 autocoder/common/v2/agent/agentic_edit_tools/__init__.py,sha256=wGICCc1dYh07osB21j62zOQ9Ws0PyyOQ12UYRHmHrtI,1229
 autocoder/common/v2/agent/agentic_edit_tools/ask_followup_question_tool_resolver.py,sha256=pjrukXjWXMIfUAUzoHzr7j2Onf1L7bxmjsUR1gGaFoA,2809
 autocoder/common/v2/agent/agentic_edit_tools/attempt_completion_tool_resolver.py,sha256=82ZGKeRBSDKeead_XVBW4FxpiE-5dS7tBOk_3RZ6B5s,1511
@@ -139,7 +139,7 @@ autocoder/common/v2/agent/agentic_edit_tools/list_code_definition_names_tool_res
 autocoder/common/v2/agent/agentic_edit_tools/list_files_tool_resolver.py,sha256=ERM5E7s2azQ8vcvogan4A_LZci8Pmhmxw1uQaNQhon4,5469
 autocoder/common/v2/agent/agentic_edit_tools/plan_mode_respond_tool_resolver.py,sha256=SZwFUxK6d2BaKWqQXi_c3IVe2iffviF6VUXJA9T9sx0,1492
 autocoder/common/v2/agent/agentic_edit_tools/read_file_tool_resolver.py,sha256=9Bh0KVbL0qiIqwChlb77biiBiETQ3zekxGe5Fj7hXAg,2800
-autocoder/common/v2/agent/agentic_edit_tools/replace_in_file_tool_resolver.py,sha256=tTQpCIGIzh1XO_MZm6wefMvUm_h6cKoa--oPIm-VwXM,7342
+autocoder/common/v2/agent/agentic_edit_tools/replace_in_file_tool_resolver.py,sha256=lpD4fCbVR8GTrynqXON69IjM94nPy3nuUL62Ashm5O4,7988
 autocoder/common/v2/agent/agentic_edit_tools/search_files_tool_resolver.py,sha256=K-TcqY0z7nDupMkTRDAJdqW3z2Y_RUM_wUb-pOEVQRI,6044
 autocoder/common/v2/agent/agentic_edit_tools/use_mcp_tool_resolver.py,sha256=wM2Xy4bcnD0TSLEmcM8rvvyyWenN5_KQnJMO6hJ8lTE,1716
 autocoder/common/v2/agent/agentic_edit_tools/write_to_file_tool_resolver.py,sha256=UO4SrkDek3WDlRdlHH022W1roSNMdMcipJqDxRBlheM,3044
@@ -276,9 +276,9 @@ autocoder/utils/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=KW0mlmcHlStXi8-_6fXZ2-ifeJ5mgP0OV7DQFzCtIsw,14008
 autocoder/utils/chat_auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_coder-0.1.337.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.337.dist-info/METADATA,sha256=GH7LgmlLQFdtYtvXWvRcDzUoY5toRt_Bmf0XX8Mcghg,2747
-auto_coder-0.1.337.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.337.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.337.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.337.dist-info/RECORD,,
+auto_coder-0.1.338.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.338.dist-info/METADATA,sha256=szlrczWaHSc5hCrxKrOcI6lPK2aeYHLQX-J42_mlg9o,2747
+auto_coder-0.1.338.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.338.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.338.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.338.dist-info/RECORD,,

autocoder/auto_coder_runner.py

@@ -2835,7 +2835,9 @@ def auto_command(query: str,extra_args: Dict[str,Any]={}):
             agent = AgenticEdit(llm=llm,args=args,files=SourceCodeList(sources=sources), 
                                 conversation_history=[],
                                 memory_config=MemoryConfig(memory=memory, 
-                                save_memory_func=save_memory), command_config=CommandConfig)
+                                save_memory_func=save_memory), command_config=CommandConfig,
+                                conversation_name="current"
+                                )
             agent.run_in_terminal(AgenticEditRequest(user_input=query))
             return
     

autocoder/common/auto_coder_lang.py

@@ -837,6 +837,42 @@ MESSAGES = {
 }
 
 
+# 新增 ReplaceInFileToolResolver 国际化消息
+MESSAGES.update({
+    "replace_in_file.access_denied": {
+        "en": "Error: Access denied. Attempted to modify file outside the project directory: {{file_path}}",
+        "zh": "错误：拒绝访问。尝试修改项目目录之外的文件：{{file_path}}"
+    },
+    "replace_in_file.file_not_found": {
+        "en": "Error: File not found at path: {{file_path}}",
+        "zh": "错误：未找到文件路径：{{file_path}}"
+    },
+    "replace_in_file.read_error": {
+        "en": "An error occurred while reading the file for replacement: {{error}}",
+        "zh": "读取待替换文件时发生错误：{{error}}"
+    },
+    "replace_in_file.no_valid_blocks": {
+        "en": "Error: No valid SEARCH/REPLACE blocks found in the provided diff.",
+        "zh": "错误：在提供的diff中未找到有效的SEARCH/REPLACE代码块。"
+    },
+    "replace_in_file.apply_failed": {
+        "en": "Failed to apply any changes. Errors:\n{{errors}}",
+        "zh": "未能应用任何更改。错误信息：\n{{errors}}"
+    },
+    "replace_in_file.apply_success": {
+        "en": "Successfully applied {{applied}}/{{total}} changes to file: {{file_path}}.",
+        "zh": "成功应用了 {{applied}}/{{total}} 个更改到文件：{{file_path}}。"
+    },
+    "replace_in_file.apply_success_with_warnings": {
+        "en": "Successfully applied {{applied}}/{{total}} changes to file: {{file_path}}.\nWarnings:\n{{errors}}",
+        "zh": "成功应用了 {{applied}}/{{total}} 个更改到文件：{{file_path}}。\n警告信息：\n{{errors}}"
+    },
+    "replace_in_file.write_error": {
+        "en": "An error occurred while writing the modified file: {{error}}",
+        "zh": "写入修改后的文件时发生错误：{{error}}"
+    }
+})
+
 def get_system_language():
     try:
         return locale.getdefaultlocale()[0][:2]

autocoder/common/v2/agent/agentic_edit.py

@@ -1,3 +1,4 @@
+from autocoder.common.v2.agent.agentic_edit_conversation import AgenticConversation
 from enum import Enum
 from enum import Enum
 import json
@@ -64,7 +65,7 @@ from autocoder.common.v2.agent.agentic_edit_types import (AgenticEditRequest, To
                                                           TOOL_MODEL_MAP,
                                                           # Event Types
                                                           LLMOutputEvent, LLMThinkingEvent, ToolCallEvent,
-                                                          ToolResultEvent, CompletionEvent, ErrorEvent,TokenUsageEvent,
+                                                          ToolResultEvent, CompletionEvent, PlanModeRespondEvent, ErrorEvent, TokenUsageEvent,
                                                           # Import specific tool types for display mapping
                                                           ReadFileTool, WriteToFileTool, ReplaceInFileTool, ExecuteCommandTool,
                                                           ListFilesTool, SearchFilesTool, ListCodeDefinitionNamesTool,
@@ -87,6 +88,7 @@ TOOL_RESOLVER_MAP: Dict[Type[BaseTool], Type[BaseToolResolver]] = {
     UseMcpTool: UseMcpToolResolver,
 }
 
+
 # --- Tool Display Customization is now handled by agentic_tool_display.py ---
 
 
@@ -99,6 +101,7 @@ class AgenticEdit:
         args: AutoCoderArgs,
         memory_config: MemoryConfig,
         command_config: Optional[CommandConfig] = None,
+        conversation_name: str = "current"
     ):
         self.llm = llm
         self.args = args
@@ -113,12 +116,15 @@ class AgenticEdit:
         self.project_type_analyzer = ProjectTypeAnalyzer(
             args=args, llm=self.llm)
 
+        self.conversation_manager = AgenticConversation(
+            args, self.conversation_history, conversation_name=conversation_name)
+
         self.shadow_manager = ShadowManager(
             args.source_dir, args.event_file, args.ignore_clean_shadows)
         self.shadow_linter = ShadowLinter(self.shadow_manager, verbose=False)
         self.shadow_compiler = ShadowCompiler(
-            self.shadow_manager, verbose=False)    
-            
+            self.shadow_manager, verbose=False)
+
         self.mcp_server_info = ""
         # try:
         #     self.mcp_server = get_mcp_server()
@@ -133,7 +139,7 @@ class AgenticEdit:
         #     logger.error(f"Error getting MCP server info: {str(e)}")
 
         # 变更跟踪信息
-        # 格式: { file_path: FileChangeEntry(...) }        
+        # 格式: { file_path: FileChangeEntry(...) }
         self.file_changes: Dict[str, FileChangeEntry] = {}
 
     def record_file_change(self, file_path: str, change_type: str, diff: Optional[str] = None, content: Optional[str] = None):
@@ -148,7 +154,8 @@ class AgenticEdit:
         """
         entry = self.file_changes.get(file_path)
         if entry is None:
-            entry = FileChangeEntry(type=change_type, diffs=[], content=content)
+            entry = FileChangeEntry(
+                type=change_type, diffs=[], content=content)
             self.file_changes[file_path] = entry
         else:
             # 文件已经存在，可能之前是 added，现在又被 modified，或者多次 modified
@@ -185,8 +192,10 @@ class AgenticEdit:
             for fname in files:
                 shadow_file_path = os.path.join(root, fname)
                 try:
-                    project_file_path = self.shadow_manager.from_shadow_path(shadow_file_path)
-                    rel_path = os.path.relpath(project_file_path, self.args.source_dir)
+                    project_file_path = self.shadow_manager.from_shadow_path(
+                        shadow_file_path)
+                    rel_path = os.path.relpath(
+                        project_file_path, self.args.source_dir)
                     changed_files.append(rel_path)
                 except Exception:
                     # 非映射关系，忽略
@@ -391,7 +400,7 @@ class AgenticEdit:
         Your query here
         </query>
         </use_mcp_tool> 
-        
+
         {%if mcp_server_info %}
         ### MCP_SERVER_LIST
         {{mcp_server_info}}
@@ -736,10 +745,14 @@ class AgenticEdit:
         executes tools, and yields structured events for visualization until completion or error.
         """
         system_prompt = self._analyze.prompt(request)
+
         conversations = [
             {"role": "system", "content": system_prompt},
-            {"role": "user", "content": request.user_input}
-        ]
+        ] + self.conversation_manager.get_history()
+        conversations.append({
+            "role": "user", "content": request.user_input
+        })
+        self.conversation_manager.add_user_message(request.user_input)
         logger.debug(
             f"Initial conversation history size: {len(conversations)}")
 
@@ -749,17 +762,17 @@ class AgenticEdit:
                 f"Starting LLM interaction cycle. History size: {len(conversations)}")
             tool_executed = False
             assistant_buffer = ""
-            
+
             llm_response_gen = stream_chat_with_continue(
                 llm=self.llm,
                 conversations=conversations,
                 llm_config={},  # Placeholder for future LLM configs
                 args=self.args
             )
-            
+
             meta_holder = byzerllm.MetaHolder()
             parsed_events = self.stream_and_parse_llm_response(
-                llm_response_gen,meta_holder)
+                llm_response_gen, meta_holder)
 
             for event in parsed_events:
                 global_cancel.check_and_raise()
@@ -777,6 +790,8 @@ class AgenticEdit:
                         "role": "assistant",
                         "content": assistant_buffer + tool_xml
                     })
+                    self.conversation_manager.add_assistant_message(
+                        assistant_buffer + tool_xml)
                     assistant_buffer = ""  # Reset buffer after tool call
 
                     yield event  # Yield the ToolCallEvent for display
@@ -790,6 +805,14 @@ class AgenticEdit:
                             "AgenticEdit analyze loop finished due to AttemptCompletion.")
                         return
 
+                    if isinstance(tool_obj, PlanModeRespondTool):
+                        logger.info(
+                            "PlanModeRespondTool received. Finalizing session.")
+                        yield PlanModeRespondEvent(completion=tool_obj, completion_xml=tool_xml)
+                        logger.info(
+                            "AgenticEdit analyze loop finished due to PlanModeRespond.")
+                        return
+
                     # Resolve the tool
                     resolver_cls = TOOL_RESOLVER_MAP.get(type(tool_obj))
                     if not resolver_cls:
@@ -844,6 +867,7 @@ class AgenticEdit:
                         "role": "user",  # Simulating the user providing the tool result
                         "content": error_xml
                     })
+                    self.conversation_manager.add_user_message(error_xml)
                     logger.debug(
                         f"Added tool result to conversations for tool {type(tool_obj).__name__}")
                     break  # After tool execution and result, break to start a new LLM cycle
@@ -862,6 +886,8 @@ class AgenticEdit:
                 if assistant_buffer:
                     conversations.append(
                         {"role": "assistant", "content": assistant_buffer})
+                    self.conversation_manager.add_assistant_message(
+                        assistant_buffer)
                 # If the loop ends without AttemptCompletion, it means the LLM finished talking
                 # without signaling completion. We might just stop or yield a final message.
                 # Let's assume it stops here.
@@ -870,7 +896,7 @@ class AgenticEdit:
         logger.info("AgenticEdit analyze loop finished.")
 
     def stream_and_parse_llm_response(
-        self, generator: Generator[Tuple[str, Any], None, None],meta_holder: byzerllm.MetaHolder
+        self, generator: Generator[Tuple[str, Any], None, None], meta_holder: byzerllm.MetaHolder
     ) -> Generator[Union[LLMOutputEvent, LLMThinkingEvent, ToolCallEvent, ErrorEvent], None, None]:
         """
         Streamingly parses the LLM response generator, distinguishing between
@@ -1081,17 +1107,17 @@ class AgenticEdit:
         Runs the agentic edit process, converting internal events to the
         standard event system format and writing them using the event manager.
         """
-        event_manager = get_event_manager(self.args.event_file)        
+        event_manager = get_event_manager(self.args.event_file)
 
         try:
             event_stream = self.analyze(request)
             for agent_event in event_stream:
                 content = None
                 metadata = EventMetadata(
-                    action_file=self.args.event_file, 
-                    is_streaming=False, 
+                    action_file=self.args.event_file,
+                    is_streaming=False,
                     stream_out_type="/agent/edit")
-                
+
                 if isinstance(agent_event, LLMThinkingEvent):
                     content = EventContentCreator.create_stream_thinking(
                         content=agent_event.text)
@@ -1134,7 +1160,8 @@ class AgenticEdit:
                     try:
                         self.apply_changes()
                     except Exception as e:
-                        logger.exception(f"Error merging shadow changes to project: {e}")
+                        logger.exception(
+                            f"Error merging shadow changes to project: {e}")
 
                     metadata.path = "/agent/edit/completion"
                     content = EventContentCreator.create_completion(
@@ -1144,7 +1171,8 @@ class AgenticEdit:
                             **agent_event.completion.model_dump()
                         }
                     )
-                    event_manager.write_completion(content=content.to_dict(), metadata=metadata.to_dict())
+                    event_manager.write_completion(
+                        content=content.to_dict(), metadata=metadata.to_dict())
                 elif isinstance(agent_event, ErrorEvent):
                     metadata.path = "/agent/edit/error"
                     content = EventContentCreator.create_error(
@@ -1152,7 +1180,8 @@ class AgenticEdit:
                         error_message=agent_event.message,
                         details={"agent_event_type": "ErrorEvent"}
                     )
-                    event_manager.write_error(content=content.to_dict(), metadata=metadata.to_dict())
+                    event_manager.write_error(
+                        content=content.to_dict(), metadata=metadata.to_dict())
                 else:
                     metadata.path = "/agent/edit/error"
                     logger.warning(
@@ -1163,7 +1192,8 @@ class AgenticEdit:
                         details={"agent_event_type": type(
                             agent_event).__name__}
                     )
-                    event_manager.write_error(content=content.to_dict(), metadata=metadata.to_dict())
+                    event_manager.write_error(
+                        content=content.to_dict(), metadata=metadata.to_dict())
 
         except Exception as e:
             logger.exception(
@@ -1174,15 +1204,16 @@ class AgenticEdit:
                 error_message=f"An unexpected error occurred: {str(e)}",
                 details={"exception_type": type(e).__name__}
             )
-            event_manager.write_error(content=error_content.to_dict(), metadata=metadata.to_dict())
+            event_manager.write_error(
+                content=error_content.to_dict(), metadata=metadata.to_dict())
             # Re-raise the exception if needed, or handle appropriately
             raise e
 
     def apply_changes(self):
         """
         Apply all tracked file changes to the original project directory.
-        """            
-        for (file_path,change) in self.get_all_file_changes().items():            
+        """
+        for (file_path, change) in self.get_all_file_changes().items():
             with open(file_path, 'w', encoding='utf-8') as f:
                 f.write(change.content)
 
@@ -1194,33 +1225,40 @@ class AgenticEdit:
                         self.args.source_dir,
                         f"{self.args.query}\nauto_coder_{file_name}",
                     )
-                    
-                    action_yml_file_manager = ActionYmlFileManager(self.args.source_dir)
+
+                    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))
+                        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)  
+                    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)
+                        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)),
+                        self.git_require_msg(
+                            source_dir=self.args.source_dir, error=str(e)),
                         style="red"
-                    )                                                
+                    )
         else:
-            self.printer.print_in_terminal("no_changes_made")        
+            self.printer.print_in_terminal("no_changes_made")
 
     def run_in_terminal(self, request: AgenticEditRequest):
         """
@@ -1258,6 +1296,9 @@ class AgenticEdit:
                     if event.tool_name == "AttemptCompletionTool":
                         continue  # Do not display AttemptCompletionTool result
 
+                    if event.tool_name == "PlanModeRespondTool":
+                        continue
+
                     result = event.result
                     title = f"✅ Tool Result: {event.tool_name}" if result.success else f"❌ Tool Result: {event.tool_name}"
                     border_style = "green" if result.success else "red"
@@ -1274,7 +1315,7 @@ class AgenticEdit:
                     panel_content = [base_content]
                     syntax_content = None
 
-                    if result.content is not None:                        
+                    if result.content is not None:
                         content_str = ""
                         try:
                             if isinstance(result.content, (dict, list)):
@@ -1316,7 +1357,8 @@ class AgenticEdit:
                             else:
                                 content_str = str(result.content)
                                 # Append simple string content directly
-                                panel_content.append(_format_content(content_str))
+                                panel_content.append(
+                                    _format_content(content_str))
                         except Exception as e:
                             logger.warning(
                                 f"Error formatting tool result content: {e}")
@@ -1329,13 +1371,17 @@ class AgenticEdit:
                     # Print syntax highlighted content separately if it exists
                     if syntax_content:
                         console.print(syntax_content)
+                elif isinstance(event, PlanModeRespondEvent):
+                    console.print(Panel(Markdown(event.completion.response),
+                                  title="🏁 Task Completion", border_style="green", title_align="left"))
 
                 elif isinstance(event, CompletionEvent):
                     # 在这里完成实际合并
                     try:
                         self.apply_changes()
                     except Exception as e:
-                        logger.exception(f"Error merging shadow changes to project: {e}")
+                        logger.exception(
+                            f"Error merging shadow changes to project: {e}")
 
                     console.print(Panel(Markdown(event.completion.result),
                                   title="🏁 Task Completion", border_style="green", title_align="left"))

autocoder/common/v2/agent/agentic_edit_conversation.py

@@ -1,6 +1,7 @@
 # src/autocoder/common/v2/agent/agentic_edit_conversation.py
 import os
 import json
+import uuid
 from typing import List, Dict, Any, Optional
 from autocoder.common import AutoCoderArgs
 
@@ -15,16 +16,32 @@ class AgenticConversation:
     and retrieving the history.
     """
 
-    def __init__(self, args: AutoCoderArgs, initial_history: Optional[List[MessageType]] = None):
+    def __init__(self, args: AutoCoderArgs, initial_history: Optional[List[MessageType]] = None, conversation_name: Optional[str] = None):
         """
         Initializes the conversation history.
 
         Args:
             initial_history: An optional list of messages to start with.
+            conversation_name: Optional conversation identifier. If provided, history is saved/loaded from a file named after it.
         """
         self.project_path = args.source_dir
         self._history: List[MessageType] = initial_history if initial_history is not None else []
-        self.memory_file_path = os.path.join(self.project_path, ".auto-coder", "memory", "agentic_edit_memory.json")
+
+        # Determine the memory directory
+        memory_dir = os.path.join(self.project_path, ".auto-coder", "memory", "agentic_edit_memory")
+        os.makedirs(memory_dir, exist_ok=True)
+
+        # Determine conversation file path
+        if conversation_name:
+            filename = f"{conversation_name}.json"
+        else:
+            conversation_name = str(uuid.uuid4())
+            filename = f"{conversation_name}.json"
+
+        self.conversation_name = conversation_name
+        self.memory_file_path = os.path.join(memory_dir, filename)
+
+        # Load existing history if file exists
         self._load_memory()
 
     def add_message(self, role: str, content: Any, **kwargs):
@@ -67,14 +84,62 @@ class AgenticConversation:
 
     def get_history(self) -> List[MessageType]:
         """
-        Returns the current conversation history.
-
+        Returns the latest 20 pairs of (user, assistant) conversation history.
+        Merges adjacent same-role messages into one, concatenated by newline.
+        Ensures that each user message is paired with the subsequent assistant response,
+        skips other roles, and that the last message is always assistant (drops trailing user if unpaired).
+        
         Returns:
-            A list of message dictionaries.
+            A list of message dictionaries, ordered chronologically.
         """
-        # Return a deep copy might be safer if messages contain mutable objects,
-        # but a shallow copy is usually sufficient for typical message structures.
-        return self._history.copy()
+        paired_history = []
+        pair_count = 0
+        pending_assistant = None
+        pending_user = None
+
+        # Traverse history in reverse to collect latest pairs with merging
+        for msg in reversed(self._history):
+            role = msg.get("role")
+            if role == "assistant":
+                if pending_assistant is None:
+                    pending_assistant = dict(msg)
+                else:
+                    # Merge with previous assistant
+                    prev_content = pending_assistant.get("content", "")
+                    curr_content = msg.get("content", "")
+                    merged_content = (curr_content.strip() + "\n" + prev_content.strip()).strip()
+                    pending_assistant["content"] = merged_content
+            elif role == "user":
+                if pending_user is None:
+                    pending_user = dict(msg)
+                else:
+                    # Merge with previous user
+                    prev_content = pending_user.get("content", "")
+                    curr_content = msg.get("content", "")
+                    merged_content = (curr_content.strip() + "\n" + prev_content.strip()).strip()
+                    pending_user["content"] = merged_content
+
+                if pending_assistant is not None:
+                    # Have a full pair, insert in order
+                    paired_history.insert(0, pending_user)
+                    paired_history.insert(1, pending_assistant)
+                    pair_count += 1
+                    pending_assistant = None
+                    pending_user = None
+                    if pair_count >= 20:
+                        break
+                else:
+                    # User without assistant yet, continue accumulating
+                    continue
+            else:
+                # Ignore other roles
+                continue
+
+        # Ensure last message is assistant, drop trailing user if unpaired
+        if paired_history and paired_history[-1].get("role") == "user":
+            paired_history.pop()
+
+        return paired_history
 
     def clear_history(self):
         """Clears the conversation history."""

autocoder/common/v2/agent/agentic_edit_tools/replace_in_file_tool_resolver.py

@@ -6,6 +6,7 @@ from autocoder.common import AutoCoderArgs
 from autocoder.common.v2.agent.agentic_edit_tools.base_tool_resolver import BaseToolResolver
 from autocoder.common.v2.agent.agentic_edit_types import ReplaceInFileTool, ToolResult  # Import ToolResult from types
 from loguru import logger
+from autocoder.common.auto_coder_lang import get_message_with_format
 if typing.TYPE_CHECKING:
     from autocoder.common.v2.agent.agentic_edit import AgenticEdit
 
@@ -66,7 +67,7 @@ class ReplaceInFileToolResolver(BaseToolResolver):
 
         # Security check
         if not abs_file_path.startswith(abs_project_dir):
-            return ToolResult(success=False, message=f"Error: Access denied. Attempted to modify file outside the project directory: {file_path}")
+            return ToolResult(success=False, message=get_message_with_format("replace_in_file.access_denied", file_path=file_path))
 
         # Determine target path: shadow file if shadow_manager exists
         target_path = abs_file_path
@@ -90,14 +91,14 @@ class ReplaceInFileToolResolver(BaseToolResolver):
                     f.write(original_content)
                 logger.info(f"[Shadow] Initialized shadow file from original: {target_path}")
             else:
-                return ToolResult(success=False, message=f"Error: File not found at path: {file_path}")
+                return ToolResult(success=False, message=get_message_with_format("replace_in_file.file_not_found", file_path=file_path))
         except Exception as e:
             logger.error(f"Error reading file for replace '{file_path}': {str(e)}")
-            return ToolResult(success=False, message=f"An error occurred while reading the file for replacement: {str(e)}")
+            return ToolResult(success=False, message=get_message_with_format("replace_in_file.read_error", error=str(e)))
 
         parsed_blocks = self.parse_diff(diff_content)
         if not parsed_blocks:
-            return ToolResult(success=False, message="Error: No valid SEARCH/REPLACE blocks found in the provided diff.")
+            return ToolResult(success=False, message=get_message_with_format("replace_in_file.no_valid_blocks"))
 
         current_content = original_content
         applied_count = 0
@@ -121,7 +122,7 @@ class ReplaceInFileToolResolver(BaseToolResolver):
                 # continue applying remaining blocks
 
         if applied_count == 0 and errors:
-            return ToolResult(success=False, message=f"Failed to apply any changes. Errors:\n" + "\n".join(errors))
+            return ToolResult(success=False, message=get_message_with_format("replace_in_file.apply_failed", errors="\n".join(errors)))
 
         try:
             os.makedirs(os.path.dirname(target_path), exist_ok=True)
@@ -129,9 +130,17 @@ class ReplaceInFileToolResolver(BaseToolResolver):
                 f.write(current_content)
             logger.info(f"Successfully applied {applied_count}/{len(parsed_blocks)} changes to file: {file_path}")
 
-            message = f"Successfully applied {applied_count}/{len(parsed_blocks)} changes to file: {file_path}."
             if errors:
-                message += "\nWarnings:\n" + "\n".join(errors)
+                message = get_message_with_format("replace_in_file.apply_success_with_warnings", 
+                                                  applied=applied_count, 
+                                                  total=len(parsed_blocks), 
+                                                  file_path=file_path,
+                                                  errors="\n".join(errors))
+            else:
+                message = get_message_with_format("replace_in_file.apply_success", 
+                                                  applied=applied_count, 
+                                                  total=len(parsed_blocks), 
+                                                  file_path=file_path)
 
             # 变更跟踪，回调AgenticEdit
             if self.agent:
@@ -141,4 +150,4 @@ class ReplaceInFileToolResolver(BaseToolResolver):
             return ToolResult(success=True, message=message, content=current_content)
         except Exception as e:
             logger.error(f"Error writing replaced content to file '{file_path}': {str(e)}")
-            return ToolResult(success=False, message=f"An error occurred while writing the modified file: {str(e)}")
+            return ToolResult(success=False, message=get_message_with_format("replace_in_file.write_error", error=str(e)))

autocoder/common/v2/agent/agentic_edit_types.py

@@ -80,6 +80,11 @@ class TokenUsageEvent(BaseModel):
     """Represents the result of executing a tool."""
     usage: Any
 
+class PlanModeRespondEvent(BaseModel):
+    """Represents the LLM attempting to complete the task."""
+    completion: SkipValidation[PlanModeRespondTool] # Skip validation
+    completion_xml: str
+
 class CompletionEvent(BaseModel):
     """Represents the LLM attempting to complete the task."""
     completion: SkipValidation[AttemptCompletionTool] # Skip validation

autocoder/common/v2/agent/agentic_tool_display.py

@@ -93,7 +93,7 @@ TOOL_DISPLAY_MESSAGES: Dict[Type[BaseTool], Dict[str, str]] = {
             "[dim]工具：[/dim] [blue]{{ tool_name }}[/]\n"
             "[dim]参数：[/dim] {{ arguments_snippet }}{{ ellipsis }}"
         )
-    }
+    }    
     # AttemptCompletionTool is handled separately in the display loop
 }
 

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.337"
+__version__ = "0.1.338"