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

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

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

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

@@ -4,21 +4,21 @@ 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=W08NHr_I-9ldhXUhatnKrUCBL33_mQpF7KFqzp0zMEI,109203
+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=SzH6fdoH8kJgARYXBu0CTB8J9PY8Q2T9CrIB844PXtM,25841
+autocoder/chat_auto_coder.py,sha256=CthuvdjVjTQOVv-zREsl8OCsZHPSP9OQcIgHULrW2Ro,25842
 autocoder/chat_auto_coder_lang.py,sha256=RxkYAMWUB5ayX0x03yBOcEkjTcWG_EBsLXBC_bh--cc,22265
 autocoder/command_args.py,sha256=HxflngkYtTrV17Vfgk6lyUyiG68jP2ftSc7FYr9AXwY,30585
 autocoder/command_parser.py,sha256=fx1g9E6GaM273lGTcJqaFQ-hoksS_Ik2glBMnVltPCE,10013
 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=znLFQLSAKbCRErJEcoRffYh44RYOI_DI4IWhNI0JIy0,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
-autocoder/agent/agentic_filter.py,sha256=yL7ufHJWIJpwmsd5Z5IAdnLopYN89JgB8DlC7NhTYFU,38780
+autocoder/agent/agentic_filter.py,sha256=9Miqj9lVOkKrKRXK9MZDouhkp2n1s_RakpRwdmLfFtY,39516
 autocoder/agent/auto_demand_organizer.py,sha256=URAq0gSEiHeV_W4zwhOI_83kHz0Ryfj1gcfh5jwCv_w,6501
 autocoder/agent/auto_filegroup.py,sha256=pBsAkBcpFTff-9L5OwI8xhf2xPKpl-aZwz-skF2B6dc,6296
 autocoder/agent/auto_guess_query.py,sha256=rDSdhpPHcOGE5MuDXvIrhCXAPR4ARS1LqpyoLsx2Jhw,11374
@@ -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=34SU-Q_JDjioH_i7jc3JsZkX6SjgueBMC54_P8Xwf5U,40478
+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,9 +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=Vv5e_lgzfd9PZS10bJR0yvFzP4MLAVCZB45s02RWXkU,83440
-autocoder/common/v2/agent/agentic_edit_types.py,sha256=ZCgIu0Dj4xPP9s-lWtzh1-wBvoXrSkgu3pan_Oo_Ng0,4433
-autocoder/common/v2/agent/agentic_tool_display.py,sha256=O-H7vV5G-Jlkrul_GWmfUEsJZdeUbwtbBlfONlYD7bY,7382
+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
@@ -138,8 +139,8 @@ 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/search_files_tool_resolver.py,sha256=Q5U5CMS-06vwXlI0DZImtGZRpi-WXTb5GNDeIpjIdxQ,5571
+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
 autocoder/compilers/__init__.py,sha256=C0HOms70QA747XD0uZEMmGtRFcIPenohyqECNStv0Bw,1647
@@ -275,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.336.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.336.dist-info/METADATA,sha256=jFmhNbFpLI9K9ggO4_IYJ7FdnWg2P8j2VSZYQQZJwao,2747
-auto_coder-0.1.336.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.336.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.336.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.336.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/agent/agentic_filter.py

@@ -259,8 +259,8 @@ class AgenticFilter:
         3.  **深入分析**:
             *   使用 `read_files` 读取关键文件的内容进行确认。如果文件过大，使用 `line_ranges` 参数分段读取。
             *   如有必要，使用 `run_python` 或 `execute_shell_command` 执行代码或命令进行更复杂的分析。
-        4.  **迭代决策**: 根据工具的返回结果，你可能需要多次调用不同的工具来逐步缩小范围或获取更多信息。
-        5.  **最终响应**: 当你确定了所有需要参考和修改的文件后，**必须**调用 `output_result` 工具，并提供符合其要求格式的JSON字符串作为其 `response` 参数。
+        4.  **迭代决策**: 根据工具的返回结果，你可能需要多次调用不同的工具来逐步缩小范围或获取更多信息。        
+        6.  **最终响应**: 当你确定了所有需要参考和修改的文件后，**必须**调用 `output_result` 工具，并提供符合其要求格式的JSON字符串作为其 `response` 参数。
             该json格式要求为：
             ```json
             {
@@ -273,9 +273,17 @@ class AgenticFilter:
                 "reasoning": "详细说明你是如何通过分析和使用工具得出这个文件列表的。"
             }
             ```
-
-
-        """
+        
+        {% if enable_active_context %}
+        ** 非常非常重要的提示 **
+        每一个目录都有一个描述信息，比如 {{ project_path }}/src/abc/bbc 的目录描述信息会放在 {{ project_path }}/.auto-coder/active-context/src/abc/bbc/active.md 文件中。
+        你可以使用 read_files 函数读取，从而帮助你更好的挑选要详细阅读哪个文件。值得注意的是，active.md 并不会包含该目录下所有的文件信息，只保存最近发生变更的文件的信息。
+        {% endif %}
+        """        
+        return {
+            "project_path": os.path.abspath(self.args.source_dir),
+            "enable_active_context": self.args.enable_active_context,
+        }
 
     @byzerllm.prompt()
     def _execute_command_result(self, result: str) -> str:
@@ -590,8 +598,7 @@ class AgenticFilter:
          - 如果未找到匹配项，会返回提示信息
 
         </usage>
-        </command>
-
+        </command>        
         <command>
         <n>execute_mcp_server</n>
         <description>执行MCP服务器</description>

autocoder/auto_coder_runner.py

@@ -22,6 +22,8 @@ from autocoder.common.result_manager import ResultManager
 from autocoder.version import __version__
 from autocoder.auto_coder import main as auto_coder_main
 from autocoder.utils import get_last_yaml_file
+from autocoder.commands.auto_command import CommandAutoTuner, AutoCommandRequest, CommandConfig, MemoryConfig
+from autocoder.common.v2.agent.agentic_edit import AgenticEdit,AgenticEditRequest
 from autocoder.index.symbols_utils import (
     extract_symbols,
     SymbolType,
@@ -60,7 +62,7 @@ from autocoder.common.conf_validator import ConfigValidator
 from autocoder import command_parser as CommandParser
 from loguru import logger as global_logger
 from autocoder.utils.project_structure import EnhancedFileAnalyzer
-from autocoder.common import SourceCodeList
+from autocoder.common import SourceCodeList,SourceCode
 
 
 ## 对外API，用于第三方集成 auto-coder 使用。
@@ -2777,22 +2779,69 @@ def conf_import(path: str):
     from autocoder.common.conf_import_export import import_conf
     import_conf(os.getcwd(), path)
 
+def generate_new_yaml(query: str):
+    memory = get_memory()
+    conf = memory.get("conf",{})
+    current_files = memory.get("current_files",{}).get("files",[])
+    auto_coder_main(["next", "chat_action"])        
+    latest_yaml_file = get_last_yaml_file("actions")
+    if latest_yaml_file:
+        yaml_config = {
+            "include_file": ["./base/base.yml"],
+            "auto_merge": conf.get("auto_merge", "editblock"),
+            "human_as_model": conf.get("human_as_model", "false") == "true",
+            "skip_build_index": conf.get("skip_build_index", "true") == "true",
+            "skip_confirm": conf.get("skip_confirm", "true") == "true",
+            "silence": conf.get("silence", "true") == "true",
+            "include_project_structure": conf.get("include_project_structure", "true")
+            == "true",
+            "exclude_files": memory.get("exclude_files", []),
+        }
+        yaml_config["context"] = ""                    
+        for key, value in conf.items():
+            converted_value = convert_config_value(key, value)
+            if converted_value is not None:
+                yaml_config[key] = converted_value
+
+        yaml_config["urls"] = current_files + get_llm_friendly_package_docs(
+            return_paths=True
+        )
+        # handle image
+        v = Image.convert_image_paths_from(query)
+        yaml_config["query"] = v                    
+
+        yaml_content = convert_yaml_config_to_str(yaml_config=yaml_config)        
+
+        execute_file = os.path.join("actions", latest_yaml_file)
+        with open(os.path.join(execute_file), "w",encoding="utf-8") as f:
+            f.write(yaml_content)
+        return execute_file,convert_yaml_to_config(execute_file)
+
 @run_in_raw_thread()
 def auto_command(query: str,extra_args: Dict[str,Any]={}):    
-    """处理/auto指令"""    
-    from autocoder.commands.auto_command import CommandAutoTuner, AutoCommandRequest, CommandConfig, MemoryConfig
-    args = get_final_config()       
-
+    """处理/auto指令"""        
+    args = get_final_config() 
+    memory = get_memory()            
     if args.enable_agentic_edit:
-        from autocoder.common.v2.agent.agentic_edit import AgenticEdit,AgenticEditRequest
-        llm = get_single_llm(args.code_model or args.model,product_mode=args.product_mode)    
-        agent = AgenticEdit(llm=llm,args=args,files=SourceCodeList(sources=[]), 
-                            conversation_history=[],
-                            memory_config=MemoryConfig(memory=memory, 
-                            save_memory_func=save_memory), command_config=CommandConfig)
-        agent.run_in_terminal(AgenticEditRequest(user_input=query))
-        return
-
+        execute_file,args = generate_new_yaml(query)
+        args.file = execute_file                      
+        current_files = memory.get("current_files",{}).get("files",[])
+        sources = []
+        for file in current_files:
+            with open(file,"r",encoding="utf-8") as f:
+                sources.append(SourceCode(module_name=file,source_code=f.read()))  
+                    
+            llm = get_single_llm(args.code_model or args.model,product_mode=args.product_mode)    
+            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,
+                                conversation_name="current"
+                                )
+            agent.run_in_terminal(AgenticEditRequest(user_input=query))
+            return
+    
+    args = get_final_config()  
     # 准备请求参数
     request = AutoCommandRequest(
         user_input=query        

autocoder/chat_auto_coder.py

@@ -668,8 +668,7 @@ def main():
             try:
                 # Shutdown all plugins before exiting
                 plugin_manager.shutdown_all()
-
-                save_memory()
+                # save_memory()
                 try:
                     if get_mcp_server():
                         get_mcp_server().stop()

autocoder/common/auto_coder_lang.py

@@ -825,10 +825,54 @@ MESSAGES = {
     "/compile/check/end": {
         "en": "Finished compile error checking process.",
         "zh": "结束编译错误检查过程."
+    },
+    "/agent/edit/objective":{
+        "en":"Objective",
+        "zh":"目标"
+    },
+    "/agent/edit/user_query":{
+        "en":"User Query",
+        "zh":"用户查询"
     }
 }
 
 
+# 新增 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
@@ -12,7 +13,8 @@ from rich.panel import Panel
 from pydantic import SkipValidation
 
 # Removed ResultManager, stream_out, git_utils, AutoCommandTools, count_tokens, global_cancel, ActionYmlFileManager, get_event_manager, EventContentCreator, get_run_context, AgenticFilterStreamOutType
-from autocoder.auto_coder import AutoCoderArgs
+from autocoder.common import AutoCoderArgs, git_utils, SourceCodeList, SourceCode
+from autocoder.common.global_cancel import global_cancel
 from autocoder.common import detect_env
 from autocoder.common import shells
 from loguru import logger
@@ -34,10 +36,13 @@ from rich.syntax import Syntax  # Added
 from rich.markdown import Markdown  # Added
 from autocoder.events.event_manager_singleton import get_event_manager
 from autocoder.events.event_types import Event, EventType, EventMetadata
+from autocoder.memory.active_context_manager import ActiveContextManager
 from autocoder.events import event_content as EventContentCreator
 from autocoder.shadows.shadow_manager import ShadowManager
 from autocoder.linters.shadow_linter import ShadowLinter
 from autocoder.compilers.shadow_compiler import ShadowCompiler
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
+from autocoder.common.auto_coder_lang import get_message
 # Import the new display function
 from autocoder.common.v2.agent.agentic_tool_display import get_tool_display_message
 from autocoder.common.v2.agent.agentic_edit_types import FileChangeEntry
@@ -60,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,
@@ -83,6 +88,7 @@ TOOL_RESOLVER_MAP: Dict[Type[BaseTool], Type[BaseToolResolver]] = {
     UseMcpTool: UseMcpToolResolver,
 }
 
+
 # --- Tool Display Customization is now handled by agentic_tool_display.py ---
 
 
@@ -95,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
@@ -109,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()
@@ -129,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):
@@ -144,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
@@ -181,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:
                     # 非映射关系，忽略
@@ -387,7 +400,7 @@ class AgenticEdit:
         Your query here
         </query>
         </use_mcp_tool> 
-        
+
         {%if mcp_server_info %}
         ### MCP_SERVER_LIST
         {{mcp_server_info}}
@@ -655,6 +668,13 @@ class AgenticEdit:
         3. Remember, you have extensive capabilities with access to a wide range of tools that can be used in powerful and clever ways as necessary to accomplish each goal. Before calling a tool, do some analysis within <thinking></thinking> tags. First, analyze the file structure provided in environment_details to gain context and insights for proceeding effectively. Then, think about which of the provided tools is the most relevant tool to accomplish the user's task. Next, go through each of the required parameters of the relevant tool and determine if the user has directly provided or given enough information to infer a value. When deciding if the parameter can be inferred, carefully consider all the context to see if it supports a specific value. If all of the required parameters are present or can be reasonably inferred, close the thinking tag and proceed with the tool use. BUT, if one of the values for a required parameter is missing, DO NOT invoke the tool (not even with fillers for the missing params) and instead, ask the user to provide the missing parameters using the ask_followup_question tool. DO NOT ask for more information on optional parameters if it is not provided.
         4. Once you've completed the user's task, you must use the attempt_completion tool to present the result of the task to the user. You may also provide a CLI command to showcase the result of your task; this can be particularly useful for web development tasks, where you can run e.g. \`open index.html\` to show the website you've built.
         5. The user may provide feedback, which you can use to make improvements and try again. But DO NOT continue in pointless back and forth conversations, i.e. don't end your responses with questions or offers for further assistance.
+
+        {{ enable_active_context }}
+        **Very Important Notice**
+        Each directory has a description file stored separately. For example, the description for the directory `{{ current_project }}/src/abc/bbc` can be found in the file `{{ current_project }}/.auto-coder/active-context/src/abc/bbc/active.md`.
+        You can use the tool  `read_file` to read these description files, which helps you decide exactly which files need detailed attention. Note that the `active.md` file does not contain information about all files within the directory—it only includes information 
+        about the files that were recently changed.
+        {{ enable_active_context }}
         """
         env_info = detect_env()
         shell_type = "bash"
@@ -674,6 +694,7 @@ class AgenticEdit:
             "home_dir": os.path.expanduser("~"),
             "files": self.files.to_str(),
             "mcp_server_info": self.mcp_server_info,
+            "enable_active_context": self.args.enable_active_context,
         }
 
     # Removed _execute_command_result and execute_auto_command methods
@@ -724,14 +745,19 @@ 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)}")
 
         while True:
+            global_cancel.check_and_raise()
             logger.info(
                 f"Starting LLM interaction cycle. History size: {len(conversations)}")
             tool_executed = False
@@ -743,12 +769,13 @@ class AgenticEdit:
                 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()
                 if isinstance(event, (LLMOutputEvent, LLMThinkingEvent)):
                     assistant_buffer += event.text
                     yield event  # Yield text/thinking immediately for display
@@ -763,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
@@ -776,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:
@@ -830,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
@@ -848,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.
@@ -856,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
@@ -929,6 +969,8 @@ class AgenticEdit:
                 return None
 
         for content_chunk, metadata in generator:
+            global_cancel.check_and_raise()
+
             meta_holder.meta = metadata
             if not content_chunk:
                 continue
@@ -1065,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)
@@ -1118,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(
@@ -1128,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(
@@ -1136,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(
@@ -1147,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(
@@ -1158,19 +1204,61 @@ 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
+            raise e
 
     def apply_changes(self):
         """
         Apply all tracked file changes to the original project directory.
         """
-        for change in self.get_all_file_changes():
-            file_path = change['file_path']
-            content = change['content']
+        for (file_path, change) in self.get_all_file_changes().items():
             with open(file_path, 'w', encoding='utf-8') as f:
-                f.write(content)
+                f.write(change.content)
+
+        if len(self.get_all_file_changes()) > 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}",
+                    )
+
+                    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")
 
     def run_in_terminal(self, request: AgenticEditRequest):
         """
@@ -1181,7 +1269,7 @@ class AgenticEdit:
         project_name = os.path.basename(os.path.abspath(self.args.source_dir))
         console.rule(f"[bold cyan]Starting Agentic Edit: {project_name}[/]")
         console.print(Panel(
-            f"[bold]User Query:[/bold]\n{request.user_input}", title="Objective", border_style="blue"))
+            f"[bold]{get_message('/agent/edit/user_query')}:[/bold]\n{request.user_input}", title=get_message("/agent/edit/objective"), border_style="blue"))
 
         try:
             event_stream = self.analyze(request)
@@ -1208,18 +1296,26 @@ 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"
                     base_content = f"[bold]Status:[/bold] {'Success' if result.success else 'Failure'}\n"
                     base_content += f"[bold]Message:[/bold] {result.message}\n"
 
+                    def _format_content(content):
+                        if len(content) > 200:
+                            return f"{content[:100]}\n...\n{content[-100:]}"
+                        else:
+                            return content
+
                     # Prepare panel for base info first
                     panel_content = [base_content]
                     syntax_content = None
 
                     if result.content is not None:
-                        panel_content.append("[bold]Content:[/bold]\n")
                         content_str = ""
                         try:
                             if isinstance(result.content, (dict, list)):
@@ -1257,16 +1353,17 @@ class AgenticEdit:
                                     lexer = "text"
 
                                 syntax_content = Syntax(
-                                    result.content[0:100], lexer, theme="default", line_numbers=True)
+                                    _format_content(result.content), lexer, theme="default", line_numbers=True)
                             else:
                                 content_str = str(result.content)
                                 # Append simple string content directly
-                                panel_content.append(content_str[0:100])
+                                panel_content.append(
+                                    _format_content(content_str))
                         except Exception as e:
                             logger.warning(
                                 f"Error formatting tool result content: {e}")
                             panel_content.append(
-                                str(result.content))  # Fallback
+                                _format_content(str(result.content)))  # Fallback
 
                     # Print the base info panel
                     console.print(Panel("\n".join(
@@ -1274,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"))
@@ -1298,5 +1399,6 @@ class AgenticEdit:
                 "An unexpected error occurred during agent execution:")
             console.print(Panel(
                 f"[bold red]FATAL ERROR:[/bold red]\n{str(e)}", title="🔥 System Error", border_style="red"))
+            raise e
         finally:
             console.rule("[bold cyan]Agentic Edit Finished[/]")

autocoder/common/v2/agent/agentic_edit_conversation.py

@@ -0,0 +1,178 @@
+# 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
+
+# Define a type alias for a message dictionary
+MessageType = Dict[str, Any]
+
+class AgenticConversation:
+    """
+    Manages the conversation history for an agentic editing process.
+
+    Handles adding messages (user, assistant, tool calls, tool results)
+    and retrieving the history.
+    """
+
+    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 []
+
+        # 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):
+        """
+        Adds a message to the conversation history.
+
+        Args:
+            role: The role of the message sender (e.g., "user", "assistant", "tool").
+            content: The content of the message. Can be None for messages like tool calls.
+            **kwargs: Additional key-value pairs to include in the message dictionary (e.g., tool_calls, tool_call_id).
+        """
+        message: MessageType = {"role": role}
+        if content is not None:
+            message["content"] = content
+        message.update(kwargs)
+        self._history.append(message)
+        self._save_memory()
+
+    def add_user_message(self, content: str):
+        """Adds a user message."""
+        self.add_message(role="user", content=content)
+
+    def add_assistant_message(self, content: str):
+        """Adds an assistant message (potentially containing text response)."""
+        self.add_message(role="assistant", content=content)
+
+    def add_assistant_tool_call_message(self, tool_calls: List[Dict[str, Any]], content: Optional[str] = None):
+         """
+         Adds a message representing one or more tool calls from the assistant.
+         Optionally includes assistant's textual reasoning/content alongside the calls.
+         """
+         self.add_message(role="assistant", content=content, tool_calls=tool_calls)
+
+
+    def add_tool_result_message(self, tool_call_id: str, content: Any):
+         """Adds a message representing the result of a specific tool call."""
+         # The content here is typically the output/result from the tool execution.
+         self.add_message(role="tool", content=content, tool_call_id=tool_call_id)
+
+
+    def get_history(self) -> List[MessageType]:
+        """
+        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, ordered chronologically.
+        """
+        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."""
+        self._history = []
+
+    def __len__(self) -> int:
+        """Returns the number of messages in the history."""
+        return len(self._history)
+
+    def __str__(self) -> str:
+        """Returns a string representation of the conversation history."""
+        # Consider a more readable format if needed for debugging
+        return str(self._history)
+
+    # Potential future enhancements:
+    # - Method to limit history size (by tokens or message count)
+    # - Method to format history specifically for different LLM APIs
+    # - Serialization/deserialization methods
+
+    def _save_memory(self):
+        try:
+            os.makedirs(os.path.dirname(self.memory_file_path), exist_ok=True)
+            with open(self.memory_file_path, "w", encoding="utf-8") as f:
+                json.dump(self._history, f, ensure_ascii=False, indent=2)
+        except Exception as e:
+            # Optionally log or ignore
+            pass
+
+    def _load_memory(self):
+        try:
+            if os.path.exists(self.memory_file_path):
+                with open(self.memory_file_path, "r", encoding="utf-8") as f:
+                    self._history = json.load(f)
+        except Exception as e:
+            # Ignore loading errors, start fresh
+            pass

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_tools/search_files_tool_resolver.py

@@ -54,9 +54,14 @@ class SearchFilesToolResolver(BaseToolResolver):
             compiled_regex = re.compile(regex_pattern)
             search_glob_pattern = os.path.join(search_base_path, "**", file_pattern)
 
-            logger.info(f"Searching for regex '{regex_pattern}' in files matching '{file_pattern}' under '{search_base_path}' (shadow: {shadow_exists})")
+            ignored_dirs = ['.git', 'node_modules', '.mvn', '.idea', '__pycache__', '.venv', 'venv', 'dist', 'build', '.gradle']
+            logger.info(f"Searching for regex '{regex_pattern}' in files matching '{file_pattern}' under '{search_base_path}' (shadow: {shadow_exists}), ignoring directories: {ignored_dirs}")
 
             for filepath in glob.glob(search_glob_pattern, recursive=True):
+                normalized_path = filepath.replace("\\", "/")  # Normalize for Windows paths
+                if any(f"/{ignored_dir}/" in normalized_path or normalized_path.endswith(f"/{ignored_dir}") or f"/{ignored_dir}/" in normalized_path for ignored_dir in ignored_dirs):
+                    continue
+
                 if os.path.isfile(filepath):
                     try:
                         with open(filepath, 'r', encoding='utf-8', errors='replace') as f:

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
 }
 
@@ -129,11 +129,11 @@ def get_tool_display_message(tool: BaseTool) -> str:
             "ellipsis": '...' if len(tool.content) > 150 else ''
         }
     elif isinstance(tool, ReplaceInFileTool):
-        snippet = tool.diff[:200]
+        snippet = tool.diff
         context = {
             "path": tool.path,
             "diff_snippet": snippet,
-            "ellipsis": '...' if len(tool.diff) > 200 else ''
+            "ellipsis": ''
         }
     elif isinstance(tool, ExecuteCommandTool):
         context = {"command": tool.command, "requires_approval": tool.requires_approval}

autocoder/version.py

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