auto-coder 0.1.359__py3-none-any.whl → 0.1.360__py3-none-any.whl

{auto_coder-0.1.359.dist-info → auto_coder-0.1.360.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.359
+Version: 0.1.360
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10

{auto_coder-0.1.359.dist-info → auto_coder-0.1.360.dist-info}/RECORD

@@ -14,7 +14,7 @@ autocoder/command_parser.py,sha256=fx1g9E6GaM273lGTcJqaFQ-hoksS_Ik2glBMnVltPCE,1
 autocoder/lang.py,sha256=PFtATuOhHRnfpqHQkXr6p4C893JvpsgwTMif3l-GEi0,14321
 autocoder/models.py,sha256=Gu50IATQtZtgEir1PpCfwgH6o4ygw6XqqbQRj3lx5dU,13798
 autocoder/run_context.py,sha256=IUfSO6_gp2Wt1blFWAmOpN0b0nDrTTk4LmtCYUBIoro,1643
-autocoder/version.py,sha256=kubSVhGu19jZ8JzGmXTOr05JRqWtxaCOHwlbz49NIwg,23
+autocoder/version.py,sha256=AJWkVCVcNxcQiTT91kp7mLT7D-FHFLU1zfRiNjiCFIE,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
@@ -24,7 +24,7 @@ autocoder/agent/auto_filegroup.py,sha256=pBsAkBcpFTff-9L5OwI8xhf2xPKpl-aZwz-skF2
 autocoder/agent/auto_guess_query.py,sha256=rDSdhpPHcOGE5MuDXvIrhCXAPR4ARS1LqpyoLsx2Jhw,11374
 autocoder/agent/auto_learn.py,sha256=uNpfvE_EYGi79KUJEe7g-j5VanbmYOYYnxWf32DaWGE,22359
 autocoder/agent/auto_learn_from_commit.py,sha256=edD4GQJyO2qvVnTKyldeswWoNeKe1Aaua6ieJzlGlFI,10662
-autocoder/agent/auto_review_commit.py,sha256=gumITezGCztu70T7sSt5KBCFQREAchirApShnIvhC98,10913
+autocoder/agent/auto_review_commit.py,sha256=1z9FOUDPZTWnrPmJ-TwUlXLOTDPmRcAlYqXbUj1pi08,11015
 autocoder/agent/auto_tool.py,sha256=DBzip-P_T6ZtT2eHexPcusmKYD0h7ufzp7TLwXAY10E,11554
 autocoder/agent/coder.py,sha256=x6bdJwDuETGg9ebQnYlUWCxCtQcDGg73LtI6McpWslQ,72034
 autocoder/agent/designer.py,sha256=EpRbzO58Xym3GrnppIT1Z8ZFAlnNfgzHbIzZ3PX-Yv8,27037
@@ -64,10 +64,10 @@ autocoder/common/buildin_tokenizer.py,sha256=L7d5t39ZFvUd6EoMPXUhYK1toD0FHlRH1jt
 autocoder/common/chunk_validation.py,sha256=BrR_ZWavW8IANuueEE7hS8NFAwEvm8TX34WnPx_1hs8,3030
 autocoder/common/cleaner.py,sha256=NU72i8C6o9m0vXExab7nao5bstBUsfJFcj11cXa9l4U,1089
 autocoder/common/code_auto_execute.py,sha256=4KXGmiGObr_B1d6tzV9dwS6MifCSc3Gm4j2d6ildBXQ,6867
-autocoder/common/code_auto_generate.py,sha256=0TuyfWdWeddBlgCzPC3JtJnYGBWa8idgSC6Oe3AXRz4,11634
-autocoder/common/code_auto_generate_diff.py,sha256=Pq7Q4ccjIMRkJ33krKejfRBw7DD6YMs5ap7q6x50awM,18528
-autocoder/common/code_auto_generate_editblock.py,sha256=wvKWBn_46u6j-ZoNAW6S2TZp3EvDPTnhhfEH95Z3TsM,21240
-autocoder/common/code_auto_generate_strict_diff.py,sha256=5q5VUwI-kngIHO76B125yGDfuPLmwxBA0gHKfTymjSk,17411
+autocoder/common/code_auto_generate.py,sha256=gZ2TUcmXQkNZS_bpQb7Qi9uoYcSFXUjtLvZtrhp0CzI,12053
+autocoder/common/code_auto_generate_diff.py,sha256=WJEXW44USo1NA-EyH2lEbQBbt6FiXdJ_GQ8xXWjy_sc,19097
+autocoder/common/code_auto_generate_editblock.py,sha256=MQwkDUZlC8FBPEfmIn0wYZyOgD3b2OXQfysUsltnNXk,21809
+autocoder/common/code_auto_generate_strict_diff.py,sha256=oYRl43-mzXdPkM4SSsiari8xqfhJTm0Z3PLfa24e9as,17969
 autocoder/common/code_auto_merge.py,sha256=WaU-T-ZVn3QDaA_SrdkHciUPKDcTfVa-IbhHKBYEv5w,9961
 autocoder/common/code_auto_merge_diff.py,sha256=DcljWrtlejq2cb9Gj-jBjvUQzRbCE2uMNGg8SBOhEnk,19271
 autocoder/common/code_auto_merge_editblock.py,sha256=5PLH8Ey4GYsPNMGn36pSy_IgwgZ8-j1QF5FEv-THC-0,18397
@@ -121,8 +121,11 @@ autocoder/common/conversations/__init__.py,sha256=xGZeOFrDsgg2fkPK1zmvYBDhAyX66F
 autocoder/common/conversations/compatibility.py,sha256=WuBXB4-dw5X9LUMsB16VWbihvRZQ1tT99m6zuBwDfqE,9606
 autocoder/common/conversations/conversation_manager.py,sha256=ZhuhfSdOTncqgy3nHPoEU7Cg0dCsSl-VPcvLbUlL2Tk,18295
 autocoder/common/conversations/example.py,sha256=Pz_EhO6qneUFMfHZiDmGAClZ6b0V4T1sbC8tIMxX2RM,5437
+autocoder/common/directory_cache/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+autocoder/common/directory_cache/cache.py,sha256=Jknygb_U6DkF04_SX04IwsOcQdd-2QQ4d6k9Ucc9OZ0,9358
+autocoder/common/directory_cache/test_cache.py,sha256=0iQkHaZQPhZBwSS6dwK_je93QMLbYGY0BYrTSt45Cao,6610
 autocoder/common/file_monitor/__init__.py,sha256=9reL3IEnyLWU77WjPzeprM8-4lCetlSMZ94Nuxk5KNg,85
-autocoder/common/file_monitor/monitor.py,sha256=lnav8TkNHEK_XqQGWpHIrw6l0U5s99ZoB94NH1AEHa4,16623
+autocoder/common/file_monitor/monitor.py,sha256=biS9TJyNKga2dE-CeYAi9xfXvA9aMeMl0tBf68G-SBE,16609
 autocoder/common/ignorefiles/__init__.py,sha256=P0hq7Avu1IeXBYEkPBZLsJhFzhzyktUWTqaRIXiAFLY,75
 autocoder/common/ignorefiles/ignore_file_utils.py,sha256=H1gUjjYLHZ_4GZel9bN5lEgpTlOyfPdIhyNRqd7no4c,3484
 autocoder/common/ignorefiles/test_ignore_file_utils.py,sha256=EydHG6E2iPsnbt-Jt8Go-WvRgFtBW6QkHUQ9nI4cF-w,3111
@@ -133,10 +136,10 @@ autocoder/common/rulefiles/__init__.py,sha256=babSbPdFaXk1NvdHtH2zrJLb_tWd7d2ELI
 autocoder/common/rulefiles/autocoderrules_utils.py,sha256=JsB0BkdyygbTOEBfaAB2WA4RFU6Q3VamaFncmbbiLRE,10011
 autocoder/common/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/common/v2/code_agentic_editblock_manager.py,sha256=pAh918YMgmLenXmNKXlmDPgKyVJjOuk69901VEEQHm4,34980
-autocoder/common/v2/code_auto_generate.py,sha256=hdhTTb0r1A8_OSuUIkxSXrwf47pXnazphufMu1vpkhI,9327
-autocoder/common/v2/code_auto_generate_diff.py,sha256=NwoPSpUQxD8zXl-RIqoE7tJIJ2_qQdJvowvyCqjGeH0,15093
-autocoder/common/v2/code_auto_generate_editblock.py,sha256=VaBvhMg_ryEataxM_n0L08FN_LI1Wfjoq4ecXs9jZwQ,15059
-autocoder/common/v2/code_auto_generate_strict_diff.py,sha256=HYAeUQjxh_AKAArCuk3-j--7QUa0J8ewDOemuIHfenk,17434
+autocoder/common/v2/code_auto_generate.py,sha256=g6hbBCFfqZnBUvswv_eO9r8b7HwnpIVh9f1M9ICivYQ,11547
+autocoder/common/v2/code_auto_generate_diff.py,sha256=QJQk_D3l5yk3kczRF9-HwQgOLQYDlDhkGH72UtI-4Ks,15114
+autocoder/common/v2/code_auto_generate_editblock.py,sha256=JKeAul5S5xKWtB9Ma4XlJw9ImxnxXetfUSESME3StUk,15621
+autocoder/common/v2/code_auto_generate_strict_diff.py,sha256=k0aW21Gb40b8Z4-i5aHFgMtfoqK0ilFwQtv9C823X34,17968
 autocoder/common/v2/code_auto_merge.py,sha256=FZHrIZyFUkFmv4EbproXfIIUfGx_L3EPfvjldsYlplI,9345
 autocoder/common/v2/code_auto_merge_diff.py,sha256=DcljWrtlejq2cb9Gj-jBjvUQzRbCE2uMNGg8SBOhEnk,19271
 autocoder/common/v2/code_auto_merge_editblock.py,sha256=rVohrpjTzgvWEX09GNRAQ0fbjjNjcxeP1bqczhFT8F8,20741
@@ -307,9 +310,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=t902pKxQ5xM7zgIHiAOsTPLwxhE6VuvXAqPy751S7fg,14096
 autocoder/utils/chat_auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_coder-0.1.359.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.359.dist-info/METADATA,sha256=WP-yHh87MG8JU0Akq0ILfiyBqqG-hrbB_0wpXZkL2gA,2751
-auto_coder-0.1.359.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.359.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.359.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.359.dist-info/RECORD,,
+auto_coder-0.1.360.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.360.dist-info/METADATA,sha256=X4RcgNPLlNFVBEANGjlIbrqSgeJcWK0v8ACJWkPMGAY,2751
+auto_coder-0.1.360.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.360.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.360.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.360.dist-info/RECORD,,

autocoder/agent/auto_review_commit.py

@@ -47,7 +47,7 @@ class AutoReviewCommit:
     @byzerllm.prompt()
     def review(self, querie_with_urls_and_changes: List[Tuple[str, List[str], Dict[str, Tuple[str, str]]]], query: str) -> Generator[str,None,None]:
         """
-        如果前面我们对话提供了文档，请参考上面的文档对提交的代码变更进行审查，提供改进建议。
+        如果前面我们对话提供了文档，请参考上面的文档对提交的代码变更进行审查，提供改进建议，你所有的输出都要以markdown语法输出。
 
         下面包含最新一次提交的信息：        
         <commit>
@@ -96,7 +96,7 @@ class AutoReviewCommit:
            - 依赖关系：组件耦合是否合理
            - 复用性：是否有重复代码
 
-        评审结果包含以下内容（以美观易于阅读的Markdown格式输出）：
+        评审结果包含以下内容
         1. issues: 发现的具体问题列表        
         3. severity: 问题的严重程度(low/medium/high)，从高到底进行描述。
         4. suggestions: 对应的改进建议列表
@@ -115,7 +115,9 @@ class AutoReviewCommit:
         1. 评审意见应该具体且可操作，而不是泛泛而谈
         2. 对于每个问题都应该提供明确的改进建议
         3. 严重程度的判断要考虑问题对系统的潜在影响
-        4. 建议应该符合项目的技术栈和开发规范        
+        4. 建议应该符合项目的技术栈和开发规范     
+
+        注意，请以「纯 Markdown」输出，不要出现 <markdown>、</markdown> 之类标签。   
         """
         return {}
 

autocoder/common/code_auto_generate.py

@@ -59,16 +59,19 @@ class CodeAutoGenerate:
     ) -> str:
         """
         {%- if structure %}
+        ====
         {{ structure }}
         {%- endif %}
 
         {%- if content %}
+        ====
         下面是一些文件路径以及每个文件对应的源码：
 
         {{ content }}
         {%- endif %}
 
         {%- if package_context %}
+        ====
         下面是上面文件的一些信息（包括最近的变更情况）：
         <package_context>
         {{ package_context }}
@@ -76,9 +79,27 @@ class CodeAutoGenerate:
         {%- endif %}
 
         {%- if context %}
+        ====
         {{ context }}
         {%- endif %}
 
+        {%- if extra_docs %}
+        ====
+
+        RULES PROVIDED BY USER
+
+        The following rules are provided by the user, and you must follow them strictly.
+
+        {% for key, value in extra_docs.items() %}
+        <user_rule>
+        ##File: {{ key }}
+        {{ value }}
+        </user_rule>
+        {% endfor %}        
+        {% endif %}
+
+        ====
+
         下面是用户的需求：
 
         {{ instruction }}

autocoder/common/code_auto_generate_diff.py

@@ -16,6 +16,7 @@ from autocoder.rag.token_counter import count_tokens
 from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.memory.active_context_manager import ActiveContextManager
+from autocoder.common.rulefiles.autocoderrules_utils import get_rules
 
 class CodeAutoGenerateDiff:
     def __init__(
@@ -135,10 +136,12 @@ class CodeAutoGenerateDiff:
         现在让我们开始一个新的任务:
 
         {%- if structure %}
+        ====
         {{ structure }}
         {%- endif %}
 
         {%- if content %}
+        ====
         下面是一些文件路径以及每个文件对应的源码：
         <files>
         {{ content }}
@@ -146,6 +149,7 @@ class CodeAutoGenerateDiff:
         {%- endif %}
 
         {%- if package_context %}
+        ====
         下面是上面文件的一些信息（包括最近的变更情况）：
         <package_context>
         {{ package_context }}
@@ -153,11 +157,29 @@ class CodeAutoGenerateDiff:
         {%- endif %}
 
         {%- if context %}
+        ====
         <extra_context>
         {{ context }}
         </extra_context>
         {%- endif %}
 
+        {%- if extra_docs %}
+        ====
+
+        RULES PROVIDED BY USER
+
+        The following rules are provided by the user, and you must follow them strictly.
+
+        {% for key, value in extra_docs.items() %}
+        <user_rule>
+        ##File: {{ key }}
+        {{ value }}
+        </user_rule>
+        {% endfor %}        
+        {% endif %}
+
+        ====
+
         下面是用户的需求：
 
         {{ instruction }}
@@ -169,13 +191,15 @@ class CodeAutoGenerateDiff:
             return {
                 "structure": ""
             }
-
+        
+        extra_docs = get_rules()
         return {
             "structure": (
                 self.action.pp.get_tree_like_directory_structure()
                 if self.action
                 else ""
-            )
+            ),
+            "extra_docs": extra_docs,
         }
 
     @byzerllm.prompt(llm=lambda self: self.llm)

autocoder/common/code_auto_generate_editblock.py

@@ -20,6 +20,7 @@ from autocoder.rag.token_counter import count_tokens
 from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.memory.active_context_manager import ActiveContextManager
+from autocoder.common.rulefiles.autocoderrules_utils import get_rules
 
 
 
@@ -188,10 +189,12 @@ class CodeAutoGenerateEditBlock:
         现在让我们开始一个新的任务:
 
         {%- if structure %}
+        ====
         {{ structure }}
         {%- endif %}
 
         {%- if content %}
+        ====
         下面是一些文件路径以及每个文件对应的源码：
         <files>
         {{ content }}
@@ -199,6 +202,7 @@ class CodeAutoGenerateEditBlock:
         {%- endif %}
 
         {%- if package_context %}
+        ====
         下面是上面文件的一些信息（包括最近的变更情况）：
         <package_context>
         {{ package_context }}
@@ -206,11 +210,29 @@ class CodeAutoGenerateEditBlock:
         {%- endif %}     
 
         {%- if context %}
+        ====
         <extra_context>
         {{ context }}
         </extra_context>
         {%- endif %}     
 
+        {%- if extra_docs %}
+        ====
+
+        RULES PROVIDED BY USER
+
+        The following rules are provided by the user, and you must follow them strictly.
+
+        {% for key, value in extra_docs.items() %}
+        <user_rule>
+        ##File: {{ key }}
+        {{ value }}
+        </user_rule>
+        {% endfor %}        
+        {% endif %}
+
+        ====
+
         下面是用户的需求：
 
         {{ instruction }}
@@ -224,6 +246,8 @@ class CodeAutoGenerateEditBlock:
                 "fence_0": self.fence_0,
                 "fence_1": self.fence_1,
             }
+        
+        extra_docs = get_rules()
 
         return {
             "structure": (
@@ -233,6 +257,7 @@ class CodeAutoGenerateEditBlock:
             ),
             "fence_0": self.fence_0,
             "fence_1": self.fence_1,
+            "extra_docs": extra_docs,
         }
 
     @byzerllm.prompt()

autocoder/common/code_auto_generate_strict_diff.py

@@ -16,6 +16,8 @@ from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.privacy.model_filter import ModelPathFilter
 from autocoder.memory.active_context_manager import ActiveContextManager
+from autocoder.common.rulefiles.autocoderrules_utils import get_rules
+
 class CodeAutoGenerateStrictDiff:
     def __init__(
         self, llm: byzerllm.ByzerLLM, args: AutoCoderArgs, action=None
@@ -118,10 +120,12 @@ class CodeAutoGenerateStrictDiff:
         现在让我们开始一个新的任务:
 
         {%- if structure %}
+        ====
         {{ structure }}
         {%- endif %}
 
         {%- if content %}
+        ====
         下面是一些文件路径以及每个文件对应的源码：
         <files>
         {{ content }}
@@ -129,6 +133,7 @@ class CodeAutoGenerateStrictDiff:
         {%- endif %}
 
         {%- if package_context %}
+        ====
         下面是上面文件的一些信息（包括最近的变更情况）：
         <package_context>
         {{ package_context }}
@@ -141,6 +146,23 @@ class CodeAutoGenerateStrictDiff:
         </extra_context>
         {%- endif %}
 
+        {%- if extra_docs %}
+        ====
+
+        RULES PROVIDED BY USER
+
+        The following rules are provided by the user, and you must follow them strictly.
+
+        {% for key, value in extra_docs.items() %}
+        <user_rule>
+        ##File: {{ key }}
+        {{ value }}
+        </user_rule>
+        {% endfor %}        
+        {% endif %}
+
+        ====
+
         下面是用户的需求：
 
         {{ instruction }}
@@ -152,13 +174,16 @@ class CodeAutoGenerateStrictDiff:
             return {
                 "structure": "",                
             }
+        
+        extra_docs = get_rules()
 
         return {
             "structure": (
                 self.action.pp.get_tree_like_directory_structure()
                 if self.action
                 else ""
-            )
+            ),
+            "extra_docs": extra_docs,
         }
 
     @byzerllm.prompt(llm=lambda self: self.llm)

autocoder/common/directory_cache/__init__.py

@@ -0,0 +1 @@
+

autocoder/common/directory_cache/cache.py

@@ -0,0 +1,192 @@
+from __future__ import annotations
+import os, fnmatch, asyncio
+from watchfiles import Change
+from autocoder.common.ignorefiles.ignore_file_utils import should_ignore
+from autocoder.common.file_monitor.monitor import get_file_monitor
+import logging
+import functools
+
+logger = logging.getLogger(__name__)
+
+class DirectoryCache:
+    _instance: "DirectoryCache|None" = None
+
+    def __init__(self, root: str):
+        self.root = os.path.abspath(root)
+        self.files_set: set[str] = set()
+        self.lock = asyncio.Lock()
+        self._main_loop = asyncio.get_event_loop()  # 保存主事件循环引用
+        logger.info(f"Initializing DirectoryCache for root: {self.root}")
+
+    # ---------- 单例获取 ----------
+    @classmethod
+    def get_instance(cls, root: str | None = None) -> "DirectoryCache":
+        if cls._instance is None:
+            if root is None:
+                raise ValueError("root is required when initializing DirectoryCache for the first time")
+            logger.info("Creating new DirectoryCache instance.")
+            cls._instance = cls(root)
+            cls._instance._build()      # 同步首扫
+            cls._instance._register_monitor()
+        elif root is not None and os.path.abspath(root) != cls._instance.root:
+             # 如果请求的 root 与已存在的实例 root 不同，可以选择抛出错误或重新初始化
+             logger.warning(f"Requested root {os.path.abspath(root)} differs from existing instance root {cls._instance.root}. Re-initializing cache.")
+             cls._instance = cls(root)
+             cls._instance._build()
+             cls._instance._register_monitor()
+
+        return cls._instance
+
+    # ---------- 构建 ----------
+    def _build(self) -> None:
+        logger.info(f"Building initial file cache for {self.root}...")
+        count = 0
+        for r, ds, fs in os.walk(self.root, followlinks=True):
+            # 过滤掉需要忽略的目录
+            ds[:] = [d for d in ds if not should_ignore(os.path.join(r, d))]
+            for f in fs:
+                fp = os.path.join(r, f)
+                abs_fp = os.path.abspath(fp)
+                if not should_ignore(abs_fp):
+                    self.files_set.add(abs_fp)
+                    count += 1
+        logger.info(f"Initial cache build complete. Found {count} files.")
+
+
+    # ---------- 监控回调 ----------
+    def _register_monitor(self) -> None:
+        try:
+            logger.info(f"Registering file monitor for {self.root}")
+            mon = get_file_monitor(self.root)
+            # 使用 functools.partial 包装异步回调
+            async_callback_wrapper = functools.partial(self._on_change_wrapper)
+            mon.register("**/*", async_callback_wrapper) # 监听所有文件变化
+            if not mon.is_running():
+                logger.info("Starting file monitor...")
+                mon.start()
+            logger.info("File monitor registered and running.")
+        except Exception as e:
+            logger.error(f"Failed to register or start file monitor: {e}", exc_info=True)
+
+    # Wrapper to run the async callback in the event loop
+    def _on_change_wrapper(self, change: Change, path: str):
+        try:
+            # 使用run_coroutine_threadsafe在主事件循环中运行协程
+            # 注意：主事件循环必须在其他地方运行，如主线程中
+            asyncio.run_coroutine_threadsafe(self._on_change(change, path), self._main_loop)
+        except Exception as e:
+            logger.error(f"Error executing _on_change_wrapper: {e}", exc_info=True)
+            # 如果run_coroutine_threadsafe失败，可以考虑一个同步的备用处理方法
+            try:
+                # 同步备份处理
+                ap = os.path.abspath(path)
+                if should_ignore(ap):
+                    return
+                
+                if change is Change.added:
+                    self.files_set.add(ap)
+                elif change is Change.deleted:
+                    self.files_set.discard(ap)
+                # Change.modified不需要更新集合
+            except Exception as backup_error:
+                logger.error(f"Backup handler also failed: {backup_error}", exc_info=True)
+
+
+    async def _on_change(self, change: Change, path: str) -> None:
+        ap = os.path.abspath(path)
+        # Check ignore status again, as gitignore might change
+        if should_ignore(ap):
+            # If a previously tracked file becomes ignored, remove it
+            async with self.lock:
+                if ap in self.files_set:
+                    logger.debug(f"File became ignored, removing from cache: {ap}")
+                    self.files_set.discard(ap)
+            return
+
+        async with self.lock:
+            if change is Change.added:
+                logger.debug(f"File added, adding to cache: {ap}")
+                self.files_set.add(ap)
+            elif change is Change.deleted:
+                logger.debug(f"File deleted, removing from cache: {ap}")
+                self.files_set.discard(ap)
+            elif change is Change.modified:
+                 # Modification doesn't change existence, but we might want to log or handle metadata updates if needed
+                 logger.debug(f"File modified: {ap} (ignored in cache set)")
+                 pass # No change needed for the set itself
+
+    # ---------- 查询 ----------
+    async def query(self, patterns: list[str]) -> list[str]:
+        logger.debug(f"Querying cache with patterns: {patterns}")
+        async with self.lock:
+            # Make a copy to avoid issues if the set is modified during iteration (though lock prevents this here)
+            current_files = list(self.files_set)
+
+        if not patterns or patterns == [""] or patterns == ["*"]:
+             logger.debug(f"Returning all {len(current_files)} cached files.")
+             return current_files
+
+        out: set[str] = set()
+
+        for p in patterns:
+            pattern_abs = os.path.abspath(os.path.join(self.root, p)) if not os.path.isabs(p) else p
+            is_glob = "*" in p or "?" in p or "[" in p # More robust glob check
+
+            try:
+                if is_glob:
+                    # fnmatch expects relative paths for matching within a root usually,
+                    # but here we match against absolute paths in files_set.
+                    # We need a pattern that works with absolute paths.
+                    # If pattern 'p' is like '*.py', we need to match '/path/to/root/**/*.py'
+                    # Let's adjust the pattern logic or filtering logic.
+
+                    # Option 1: Match relative paths within the root
+                    # Convert absolute paths in files_set to relative for matching
+                    # relative_files = [os.path.relpath(f, self.root) for f in current_files]
+                    # matched_relative = fnmatch.filter(relative_files, p)
+                    # out.update(os.path.join(self.root, rel_f) for rel_f in matched_relative)
+
+                    # Option 2: Match absolute paths directly (might need careful pattern construction)
+                    # If p is relative, make it absolute based on root for matching
+                    # Example: p = "src/*.py" -> effective_pattern = "/path/to/root/src/*.py"
+                    # This requires fnmatch to handle absolute paths correctly or custom logic.
+
+                    # Option 3: Simplified wildcard matching on absolute paths
+                    # Treat '*' as a general wildcard anywhere in the path.
+                    # fnmatch.filter might work if the pattern is constructed like `*pattern*`
+                    # Let's stick to the user's original logic first, assuming it worked for their case
+                    # The original `*{p}*` suggests substring matching with wildcards? Let's refine.
+
+                    # Refined Glob Matching:
+                    # If p contains wildcards, assume it's a glob pattern relative to root.
+                    # Convert files_set paths to relative for matching.
+                    for f_abs in current_files:
+                        f_rel = os.path.relpath(f_abs, self.root)
+                        if fnmatch.fnmatch(f_rel, p) or fnmatch.fnmatch(os.path.basename(f_abs), p):
+                             out.add(f_abs)
+
+                else:
+                    # Exact or substring matching for non-glob patterns
+                    # Match against filename or full path segment
+                    p_lower = p.lower()
+                    for f_abs in current_files:
+                        if p_lower in os.path.basename(f_abs).lower() or p_lower in f_abs.lower():
+                             out.add(f_abs)
+
+            except Exception as e:
+                logger.error(f"Error during pattern matching for '{p}': {e}", exc_info=True)
+
+
+        result = sorted(list(out)) # Sort for consistent output
+        logger.debug(f"Query returned {len(result)} files.")
+        return result
+
+# Helper function (optional, could be integrated into get_instance)
+def initialize_cache(root_path: str):
+    """Initializes the DirectoryCache singleton."""
+    try:
+        DirectoryCache.get_instance(root_path)
+        logger.info("DirectoryCache initialized successfully.")
+    except Exception as e:
+        logger.error(f"Failed to initialize DirectoryCache: {e}", exc_info=True)
+

autocoder/common/directory_cache/test_cache.py

@@ -0,0 +1,190 @@
+import pytest
+import os
+import tempfile
+import shutil
+import asyncio
+from unittest.mock import patch, MagicMock
+
+# 导入被测模块
+from autocoder.common.directory_cache.cache import DirectoryCache
+
+# 测试环境辅助函数
+def create_test_environment(base_dir, structure):
+    """创建测试所需的文件/目录结构"""
+    for path, content in structure.items():
+        full_path = os.path.join(base_dir, path)
+        os.makedirs(os.path.dirname(full_path), exist_ok=True)
+        with open(full_path, 'w', encoding='utf-8') as f:
+            f.write(content)
+
+# Pytest Fixture: 临时目录
+@pytest.fixture(scope="function")
+def temp_test_dir():
+    """提供一个临时的、测试后自动清理的目录"""
+    temp_dir = tempfile.mkdtemp()
+    print(f"创建测试临时目录: {temp_dir}")
+    yield temp_dir
+    print(f"清理测试临时目录: {temp_dir}")
+    shutil.rmtree(temp_dir)
+
+# Pytest Fixture: 重置单例
+@pytest.fixture(autouse=True)
+def reset_singleton():
+    """每次测试前重置DirectoryCache单例"""
+    DirectoryCache._instance = None
+    yield
+    DirectoryCache._instance = None
+
+# Pytest Fixture: 文件监视器模拟
+@pytest.fixture
+def mock_file_monitor():
+    """模拟文件监视器"""
+    mock_monitor = MagicMock()
+    mock_monitor.register = MagicMock()
+    mock_monitor.is_running = MagicMock(return_value=False)
+    mock_monitor.start = MagicMock()
+    
+    with patch('autocoder.common.directory_cache.cache.get_file_monitor', return_value=mock_monitor):
+        yield mock_monitor
+
+# --- 测试用例 ---
+
+@pytest.mark.asyncio
+async def test_initialization(temp_test_dir, mock_file_monitor):
+    """测试DirectoryCache的初始化和单例模式"""
+    # 创建测试文件结构
+    create_test_environment(temp_test_dir, {
+        "file1.txt": "测试内容1",
+        "subdir/file2.txt": "测试内容2",
+        ".gitignore": "*.ignored"
+    })
+    create_test_environment(temp_test_dir, {
+        "file3.ignored": "这个文件应该被忽略"
+    })
+    
+    # 获取实例
+    cache = DirectoryCache.get_instance(temp_test_dir)
+    
+    # 验证单例模式
+    assert DirectoryCache.get_instance() is cache
+    assert cache.root == os.path.abspath(temp_test_dir)
+    
+    # 验证文件缓存构建
+    assert len(cache.files_set) == 3  # file1.txt, subdir/file2.txt, .gitignore
+    assert os.path.join(temp_test_dir, "file1.txt") in [os.path.normpath(f) for f in cache.files_set]
+    assert os.path.join(temp_test_dir, "subdir/file2.txt") in [os.path.normpath(f) for f in cache.files_set]
+    
+    # 验证监视器注册
+    mock_file_monitor.register.assert_called_once()
+    mock_file_monitor.start.assert_called_once()
+
+@pytest.mark.asyncio
+async def test_query_all_files(temp_test_dir, mock_file_monitor):
+    """测试查询所有文件"""
+    # 创建测试文件结构
+    create_test_environment(temp_test_dir, {
+        "file1.py": "def test(): pass",
+        "file2.txt": "text content",
+        "subdir/file3.py": "class Test: pass"
+    })
+    
+    # 获取实例并查询所有文件
+    cache = DirectoryCache.get_instance(temp_test_dir)
+    result = await cache.query(["*"])
+    
+    # 验证结果
+    assert len(result) == 3
+    assert sorted([os.path.basename(f) for f in result]) == ["file1.py", "file2.txt", "file3.py"]
+
+@pytest.mark.asyncio
+async def test_query_with_pattern(temp_test_dir, mock_file_monitor):
+    """测试使用模式查询文件"""
+    # 创建测试文件结构
+    create_test_environment(temp_test_dir, {
+        "file1.py": "def test(): pass",
+        "file2.txt": "text content",
+        "subdir/file3.py": "class Test: pass",
+        "another.doc": "document"
+    })
+    
+    # 获取实例
+    cache = DirectoryCache.get_instance(temp_test_dir)
+    
+    # 测试不同的查询模式
+    py_files = await cache.query(["*.py"])
+    assert len(py_files) == 2
+    assert all(f.endswith('.py') for f in py_files)
+    
+    txt_files = await cache.query(["*.txt"])
+    assert len(txt_files) == 1
+    assert txt_files[0].endswith('file2.txt')
+    
+    # 测试多模式查询
+    mixed_files = await cache.query(["*.py", "*.txt"])
+    assert len(mixed_files) == 3
+    assert len([f for f in mixed_files if f.endswith('.py')]) == 2
+    assert len([f for f in mixed_files if f.endswith('.txt')]) == 1
+
+@pytest.mark.asyncio
+async def test_file_change_events(temp_test_dir, mock_file_monitor):
+    """测试文件变更事件处理"""
+    from watchfiles import Change
+    
+    # 创建测试文件结构
+    create_test_environment(temp_test_dir, {
+        "file1.txt": "初始内容"
+    })
+    
+    # 获取实例
+    cache = DirectoryCache.get_instance(temp_test_dir)
+    
+    # 初始状态
+    file_path = os.path.join(temp_test_dir, "file1.txt")
+    abs_file_path = os.path.abspath(file_path)
+    assert abs_file_path in cache.files_set
+    
+    # 测试删除事件
+    await cache._on_change(Change.deleted, abs_file_path)
+    assert abs_file_path not in cache.files_set
+    
+    # 测试添加事件
+    await cache._on_change(Change.added, abs_file_path)
+    assert abs_file_path in cache.files_set
+    
+    # 测试修改事件 (不应改变集合)
+    initial_set_size = len(cache.files_set)
+    await cache._on_change(Change.modified, abs_file_path)
+    assert len(cache.files_set) == initial_set_size
+    assert abs_file_path in cache.files_set
+    
+    # 测试新文件
+    new_file_path = os.path.join(temp_test_dir, "newfile.txt")
+    abs_new_file_path = os.path.abspath(new_file_path)
+    await cache._on_change(Change.added, abs_new_file_path)
+    assert abs_new_file_path in cache.files_set
+
+@pytest.mark.asyncio
+async def test_reinitialization_with_different_root(temp_test_dir, mock_file_monitor):
+    """测试使用不同根目录重新初始化缓存"""
+    # 创建第一个测试目录
+    first_dir = os.path.join(temp_test_dir, "first")
+    os.makedirs(first_dir)
+    create_test_environment(first_dir, {"test.txt": "first directory"})
+    
+    # 初始化缓存
+    cache1 = DirectoryCache.get_instance(first_dir)
+    assert cache1.root == os.path.abspath(first_dir)
+    
+    # 创建第二个测试目录
+    second_dir = os.path.join(temp_test_dir, "second")
+    os.makedirs(second_dir)
+    create_test_environment(second_dir, {"other.txt": "second directory"})
+    
+    # 使用新目录重新初始化
+    cache2 = DirectoryCache.get_instance(second_dir)
+    assert cache2.root == os.path.abspath(second_dir)
+    
+    # 验证文件集合已更新
+    all_files = await cache2.query(["*"])
+    assert len(all_files) == 1
+    assert all_files[0].endswith('other.txt') 

autocoder/common/file_monitor/monitor.py

@@ -153,7 +153,7 @@ class FileMonitor:
         """
         # 将单个模式转换为pathspec格式
         # 使用GitWildMatchPattern，它支持.gitignore样式的通配符，功能最全面
-        return pathspec.PathSpec.from_patterns([pattern], pathspec.patterns.GitWildMatchPattern)
+        return pathspec.PathSpec([pathspec.patterns.GitWildMatchPattern(pattern)])
 
     def register(self, path: Union[str, Path], callback: Callable[[Change, str], None]):
         """

autocoder/common/v2/code_auto_generate.py

@@ -16,6 +16,7 @@ from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.memory.active_context_manager import ActiveContextManager
 from loguru import logger
+from autocoder.common.rulefiles.autocoderrules_utils import get_rules
 
 class CodeAutoGenerate:
     def __init__(
@@ -36,6 +37,88 @@ class CodeAutoGenerate:
         if not isinstance(self.llms, list):
             self.llms = [self.llms]
 
+    @byzerllm.prompt(llm=lambda self: self.llm)
+    def single_round_instruction(
+        self, instruction: str, content: str, context: str = "", package_context: str = ""
+    ) -> str:
+        """
+        {%- if structure %}
+        ====
+        {{ structure }}
+        {%- endif %}
+
+        {%- if content %}
+        ====
+        下面是一些文件路径以及每个文件对应的源码：
+
+        {{ content }}
+        {%- endif %}
+
+        {%- if package_context %}
+        ====
+        下面是上面文件的一些信息（包括最近的变更情况）：
+        <package_context>
+        {{ package_context }}
+        </package_context>
+        {%- endif %}
+
+        {%- if context %}
+        ====        
+        {{ context }}
+        {%- endif %}
+
+        {%- if extra_docs %}
+        ====
+
+        RULES PROVIDED BY USER
+
+        The following rules are provided by the user, and you must follow them strictly.
+
+        {% for key, value in extra_docs.items() %}
+        <user_rule>
+        ##File: {{ key }}
+        {{ value }}
+        </user_rule>
+        {% endfor %}        
+        {% endif %}
+
+        下面是用户的需求：
+
+        {{ instruction }}
+
+        如果你需要生成代码，你生成的代码要符合这个格式：
+
+        ```{lang}
+        ##File: {FILE_PATH}
+        {CODE}
+        ```
+
+        ```{lang}
+        ##File: {FILE_PATH}
+        {CODE}
+        ```
+
+        其中，{lang}是代码的语言，{CODE}是代码的内容, {FILE_PATH} 是文件的路径(请尽量使用绝对路径)，他们都在代码块中，请严格按上面的格式进行内容生成。
+
+        请确保每份代码的完整性，而不要只生成修改部分。
+        """
+        
+        if not self.args.include_project_structure:
+            return {
+                "structure": "",                
+            }
+        
+        extra_docs = get_rules()    
+        
+        return {
+            "structure": (
+                self.action.pp.get_tree_like_directory_structure()
+                if self.action
+                else ""
+            ),
+            "extra_docs": extra_docs,
+        }        
+
     def single_round_run(
         self, query: str, source_code_list: SourceCodeList        
     ) -> CodeGenerateResult:

autocoder/common/v2/code_auto_generate_diff.py

@@ -155,22 +155,23 @@ class CodeAutoGenerateDiff:
         ```
 
         现在让我们开始一个新的任务:
-
-        ====
+    
         {%- if structure %}
+        ====
         {{ structure }}
         {%- endif %}
 
-        ====
+        
         {%- if content %}
+        ====
         下面是一些文件路径以及每个文件对应的源码：
         <files>
         {{ content }}
         </files>
         {%- endif %}
-
-        ====
+        
         {%- if package_context %}
+        ====
         下面是上面文件的一些信息（包括最近的变更情况）：
         <package_context>
         {{ package_context }}

autocoder/common/v2/code_auto_generate_editblock.py

@@ -15,6 +15,7 @@ from autocoder.rag.token_counter import count_tokens
 from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.memory.active_context_manager import ActiveContextManager
+from autocoder.common.rulefiles.autocoderrules_utils import get_rules
 from loguru import logger
 
 
@@ -175,13 +176,15 @@ class CodeAutoGenerateEditBlock:
         {%- endif %}
 
         {%- if content %}
+        ====
         下面是一些文件路径以及每个文件对应的源码：
         <files>
         {{ content }}
         </files>
         {%- endif %}
-
+                
         {%- if package_context %}
+        ====
         下面是上面文件的一些信息（包括最近的变更情况）：
         <package_context>
         {{ package_context }}
@@ -194,6 +197,22 @@ class CodeAutoGenerateEditBlock:
         </extra_context>
         {%- endif %}     
 
+        {%- if extra_docs %}
+        ====
+
+        RULES PROVIDED BY USER
+
+        The following rules are provided by the user, and you must follow them strictly.
+
+        {% for key, value in extra_docs.items() %}
+        <user_rule>
+        ##File: {{ key }}
+        {{ value }}
+        </user_rule>
+        {% endfor %}        
+        {% endif %}
+
+        ====
         下面是用户的需求：
 
         {{ instruction }}
@@ -204,7 +223,9 @@ class CodeAutoGenerateEditBlock:
                 "structure": "",
                 "fence_0": self.fence_0,
                 "fence_1": self.fence_1,
-            }
+            }  
+
+        extra_docs = get_rules()          
 
         return {
             "structure": (
@@ -214,6 +235,7 @@ class CodeAutoGenerateEditBlock:
             ),
             "fence_0": self.fence_0,
             "fence_1": self.fence_1,
+            "extra_docs": extra_docs,
         }
 
     def single_round_run(

autocoder/common/v2/code_auto_generate_strict_diff.py

@@ -16,6 +16,7 @@ from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.privacy.model_filter import ModelPathFilter
 from autocoder.memory.active_context_manager import ActiveContextManager
+from autocoder.common.rulefiles.autocoderrules_utils import get_rules
 class CodeAutoGenerateStrictDiff:
     def __init__(
         self, llm: byzerllm.ByzerLLM, args: AutoCoderArgs, action=None
@@ -118,10 +119,12 @@ class CodeAutoGenerateStrictDiff:
         现在让我们开始一个新的任务:
 
         {%- if structure %}
+        ====
         {{ structure }}
         {%- endif %}
 
         {%- if content %}
+        ====
         下面是一些文件路径以及每个文件对应的源码：
         <files>
         {{ content }}
@@ -129,6 +132,7 @@ class CodeAutoGenerateStrictDiff:
         {%- endif %}
 
         {%- if package_context %}
+        ====
         下面是上面文件的一些信息（包括最近的变更情况）：
         <package_context>
         {{ package_context }}
@@ -136,14 +140,29 @@ class CodeAutoGenerateStrictDiff:
         {%- endif %}
 
         {%- if context %}
+        ====
         <extra_context>
         {{ context }}
         </extra_context>
         {%- endif %}
 
-        下面是用户的需求：
+        {%- if extra_docs %}
+        ====
 
-        {{ instruction }}
+        RULES PROVIDED BY USER
+
+        The following rules are provided by the user, and you must follow them strictly.
+
+        {% for key, value in extra_docs.items() %}
+        <user_rule>
+        ##File: {{ key }}
+        {{ value }}
+        </user_rule>
+        {% endfor %}
+        {% endif %}
+
+        ====
+        下面是用户的需求：
 
         每次生成一个文件的diff，然后询问我是否继续，当我回复继续，继续生成下一个文件的diff。当没有后续任务时，请回复 "__完成__" 或者 "__EOF__"。
         """
@@ -152,13 +171,16 @@ class CodeAutoGenerateStrictDiff:
             return {
                 "structure": "",                
             }
+        
+        extra_docs = get_rules()
 
         return {
             "structure": (
                 self.action.pp.get_tree_like_directory_structure()
                 if self.action
                 else ""
-            )
+            ),
+            "extra_docs": extra_docs,
         }
 
     @byzerllm.prompt(llm=lambda self: self.llm)

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.359"
+__version__ = "0.1.360"