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

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/agent/agentic_edit.py

@@ -595,14 +595,36 @@ class AgenticEdit:
         - If at any point a mermaid diagram would make your plan clearer to help the user quickly see the structure, you are encouraged to include a Mermaid code block in the response. (Note: if you use colors in your mermaid diagrams, be sure to use high contrast colors so the text is readable.)
         - Finally once it seems like you've reached a good plan, ask the user to switch you back to ACT MODE to implement the solution.
 
+        {% if enable_active_context_in_generate %}
+        ====
+
+        PROJECT PACKAGE CONTEXT
+
+        Each directory can contain a short **`active.md`** summary file located under the mirrored path inside
+        `{{ current_project }}/.auto-coder/active-context/`.
+
+        * **Purpose** – captures only the files that have **recently changed** in that directory. It is *not* a full listing.
+        * **Example** – for `{{ current_project }}/src/abc/bbc`, the summary is
+          `{{ current_project }}/.auto-coder/active-context/src/abc/bbc/active.md`.
+
+        **Reading a summary**
+
+        ```xml
+        <read_file>
+        <path>.auto-coder/active-context/src/abc/bbc/active.md</path>
+        </read_file>
+        ```
+
+        Use these summaries to quickly decide which files deserve a deeper look with tools like
+        `read_file`, `search_files`, or `list_code_definition_names`.
+
+        {% endif %}
         ====
 
         CAPABILITIES
 
-        - You have access to tools that let you execute CLI commands on the user's computer, list files, view source code definitions, regex search${
-            supportsComputerUse ? ", use the browser" : ""
-        }, read and edit files, and ask follow-up questions. These tools help you effectively accomplish a wide range of tasks, such as writing code, making edits or improvements to existing files, understanding the current state of a project, performing system operations, and much more.
-        - When the user initially gives you a task, a recursive list of all filepaths in the current working directory ('${cwd.toPosix()}') will be included in environment_details. This provides an overview of the project's file structure, offering key insights into the project from directory/file names (how developers conceptualize and organize their code) and file extensions (the language used). This can also guide decision-making on which files to explore further. If you need to further explore directories such as outside the current working directory, you can use the list_files tool. If you pass 'true' for the recursive parameter, it will list files recursively. Otherwise, it will list files at the top level, which is better suited for generic directories where you don't necessarily need the nested structure, like the Desktop.
+        - You have access to tools that let you execute CLI commands on the user's computer, list files, view source code definitions, regex search, read and edit files, and ask follow-up questions. These tools help you effectively accomplish a wide range of tasks, such as writing code, making edits or improvements to existing files, understanding the current state of a project, performing system operations, and much more.
+        - When the user initially gives you a task, a recursive list of all filepaths in the current working directory ('{{ current_project }}') will be included in environment_details. This provides an overview of the project's file structure, offering key insights into the project from directory/file names (how developers conceptualize and organize their code) and file extensions (the language used). This can also guide decision-making on which files to explore further. If you need to further explore directories such as outside the current working directory, you can use the list_files tool. If you pass 'true' for the recursive parameter, it will list files recursively. Otherwise, it will list files at the top level, which is better suited for generic directories where you don't necessarily need the nested structure, like the Desktop.
         - You can use search_files to perform regex searches across files in a specified directory, outputting context-rich results that include surrounding lines. This is particularly useful for understanding code patterns, finding specific implementations, or identifying areas that need refactoring.
         - You can use the list_code_definition_names tool to get an overview of source code definitions for all files at the top level of a specified directory. This can be particularly useful when you need to understand the broader context and relationships between certain parts of the code. You may need to call this tool multiple times to understand various parts of the codebase related to the task.
             - For example, when asked to make edits or improvements you might analyze the file structure in the initial environment_details to get an overview of the project, then use list_code_definition_names to get further insight using source code definitions for files located in relevant directories, then read_file to examine the contents of relevant files, analyze the code and suggest improvements or make necessary edits, then use the replace_in_file tool to implement changes. If you refactored code that could affect other parts of the codebase, you could use search_files to ensure you update other files as needed.
@@ -613,7 +635,7 @@ class AgenticEdit:
         RULES
 
         - Your current working directory is: {{current_project}}
-        - You cannot \`cd\` into a different directory to complete a task. You are stuck operating from '${cwd.toPosix()}', so be sure to pass in the correct 'path' parameter when using tools that require a path.
+        - You cannot \`cd\` into a different directory to complete a task. You are stuck operating from '{{ current_project }}', so be sure to pass in the correct 'path' parameter when using tools that require a path.
         - Do not use the ~ character or $HOME to refer to the home directory.
         - Before using the execute_command tool, you must first think about the SYSTEM INFORMATION context provided to understand the user's environment and tailor your commands to ensure they are compatible with their system. You must also consider if the command you need to run should be executed in a specific directory outside of the current working directory '${cwd.toPosix()}', and if so prepend with \`cd\`'ing into that directory && then executing the command (as one command since you are stuck operating from '${cwd.toPosix()}'). For example, if you needed to run \`npm install\` in a project outside of '${cwd.toPosix()}', you would need to prepend with a \`cd\` i.e. pseudocode for this would be \`cd (path to project) && (command, in this case npm install)\`.
         - When using the search_files tool, craft your regex patterns carefully to balance specificity and flexibility. Based on the user's task you may use it to find code patterns, TODO comments, function definitions, or any text-based information across the project. The results include context, so analyze the surrounding code to better understand the matches. Leverage the search_files tool in combination with other tools for more comprehensive analysis. For example, use it to find specific code patterns, then use read_file to examine the full context of interesting matches before using replace_in_file to make informed changes.
@@ -634,6 +656,21 @@ class AgenticEdit:
         - When using the replace_in_file tool, you must include complete lines in your SEARCH blocks, not partial lines. The system requires exact line matches and cannot match partial lines. For example, if you want to match a line containing "const x = 5;", your SEARCH block must include the entire line, not just "x = 5" or other fragments.
         - When using the replace_in_file tool, if you use multiple SEARCH/REPLACE blocks, list them in the order they appear in the file. For example if you need to make changes to both line 10 and line 50, first include the SEARCH/REPLACE block for line 10, followed by the SEARCH/REPLACE block for line 50.
         - It is critical you wait for the user's response after each tool use, in order to confirm the success of the tool use. For example, if asked to make a todo app, you would create a file, wait for the user's response it was created successfully, then create another file if needed, wait for the user's response it was created successfully, etc.        
+        
+        {% 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 %}
 
         ====
 
@@ -654,29 +691,7 @@ class AgenticEdit:
         2. Work through these goals sequentially, utilizing available tools one at a time as necessary. Each goal should correspond to a distinct step in your problem-solving process. You will be informed on the work completed and what's remaining as you go.
         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.
-
-        {% if 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.
-        {% 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 %}
+        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.                    
         """
         import os
         extra_docs = get_rules()
@@ -699,7 +714,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,
+            "enable_active_context_in_generate": self.args.enable_active_context_in_generate,
             "extra_docs": extra_docs,
         }
 
@@ -762,7 +777,7 @@ class AgenticEdit:
         logger.info("Adding initial files context to conversation")
         conversations.append({
             "role":"user","content":f'''
-Below are some files the user is focused on, and the content is up to date. These entries show the file paths along with their full text content, which can help you better understand the user's needs. If the information is insufficient, you can use tools such as read_file to retrieve more details.
+The following are context files that the user is currently focusing on. These files are presented with their complete paths and up-to-date content, providing essential context to help you better understand the user's needs. If you need more detailed information about specific files or directories not shown here, you can use tools like read_file, search_files, or list_files to explore the codebase further.
 <files>
 {self.files.to_str()}
 </files>'''

autocoder/common/v2/code_auto_generate.py

@@ -16,6 +16,8 @@ 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
+from autocoder.run_context import get_run_context,RunMode
 
 class CodeAutoGenerate:
     def __init__(
@@ -36,6 +38,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:
@@ -116,7 +200,7 @@ class CodeAutoGenerate:
                                   generate_mode="diff"
                                   )
 
-        if not self.args.human_as_model:
+        if not self.args.human_as_model or get_run_context().mode == RunMode.WEB:
             with ThreadPoolExecutor(max_workers=len(self.llms) * self.generate_times_same_model) as executor:
                 futures = []
                 count = 0

autocoder/common/v2/code_auto_generate_diff.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 autocoder.common.rulefiles.autocoderrules_utils import get_rules
+from autocoder.run_context import get_run_context,RunMode
 
 class CodeAutoGenerateDiff:
     def __init__(
@@ -155,22 +156,23 @@ class CodeAutoGenerateDiff:
         ```
 
         现在让我们开始一个新的任务:
-
-        ====
+    
         {%- if structure %}
+        ====
         {{ structure }}
         {%- endif %}
 
-        ====
+        
         {%- if content %}
+        ====
         下面是一些文件路径以及每个文件对应的源码：
         <files>
         {{ content }}
         </files>
         {%- endif %}
-
-        ====
+        
         {%- if package_context %}
+        ====
         下面是上面文件的一些信息（包括最近的变更情况）：
         <package_context>
         {{ package_context }}
@@ -300,7 +302,7 @@ class CodeAutoGenerateDiff:
                                   generate_mode="diff"
                                   )
 
-        if not self.args.human_as_model:
+        if not self.args.human_as_model or get_run_context().mode == RunMode.WEB:
             with ThreadPoolExecutor(max_workers=len(self.llms) * self.generate_times_same_model) as executor:
                 futures = []
                 count = 0

autocoder/common/v2/code_auto_generate_editblock.py

@@ -15,7 +15,9 @@ 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
+from autocoder.run_context import get_run_context,RunMode
 
 
 
@@ -175,13 +177,15 @@ class CodeAutoGenerateEditBlock:
         {%- endif %}
 
         {%- if content %}
+        ====
         下面是一些文件路径以及每个文件对应的源码：
         <files>
         {{ content }}
         </files>
         {%- endif %}
-
+                
         {%- if package_context %}
+        ====
         下面是上面文件的一些信息（包括最近的变更情况）：
         <package_context>
         {{ package_context }}
@@ -194,6 +198,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 +224,9 @@ class CodeAutoGenerateEditBlock:
                 "structure": "",
                 "fence_0": self.fence_0,
                 "fence_1": self.fence_1,
-            }
+            }  
+
+        extra_docs = get_rules()          
 
         return {
             "structure": (
@@ -214,6 +236,7 @@ class CodeAutoGenerateEditBlock:
             ),
             "fence_0": self.fence_0,
             "fence_1": self.fence_1,
+            "extra_docs": extra_docs,
         }
 
     def single_round_run(
@@ -296,7 +319,7 @@ class CodeAutoGenerateEditBlock:
                                   generate_mode="editblock"
                                   )
 
-        if not self.args.human_as_model:
+        if not self.args.human_as_model or get_run_context().mode == RunMode.WEB:
             with ThreadPoolExecutor(max_workers=len(self.llms) * self.generate_times_same_model) as executor:
                 futures = []
                 count = 0

autocoder/common/v2/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_rule
+from autocoder.run_context import get_run_context,RunMode
 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 }}
@@ -136,14 +141,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 +172,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)
@@ -353,7 +376,7 @@ class CodeAutoGenerateStrictDiff:
                                   generate_mode="strict_diff"
                                   )
 
-        if not self.args.human_as_model:
+        if not self.args.human_as_model or get_run_context().mode == RunMode.WEB:
             with ThreadPoolExecutor(max_workers=len(self.llms) * self.generate_times_same_model) as executor:
                 futures = []
                 count = 0

autocoder/version.py

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