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

autocoder/common/code_auto_generate_diff.py

@@ -17,6 +17,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__(
@@ -404,7 +405,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/code_auto_generate_editblock.py

@@ -21,8 +21,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 CodeAutoGenerateEditBlock:
     def __init__(
@@ -518,7 +517,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/code_auto_generate_strict_diff.py

@@ -17,6 +17,7 @@ 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
+from autocoder.run_context import get_run_context,RunMode
 
 class CodeAutoGenerateStrictDiff:
     def __init__(
@@ -379,7 +380,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/common/ignorefiles/ignore_file_utils.py

@@ -1,9 +1,9 @@
-
 import os
 from pathlib import Path
 from threading import Lock
 import pathspec
 import threading
+from typing import Optional  # 添加Optional导入
 
 # 尝试导入 FileMonitor
 try:
@@ -24,7 +24,7 @@ class IgnoreFileManager:
     _instance = None
     _lock = Lock()
 
-    def __new__(cls):
+    def __new__(cls, project_root: Optional[str] = None):
         if not cls._instance:
             with cls._lock:
                 if not cls._instance:
@@ -32,20 +32,21 @@ class IgnoreFileManager:
                     cls._instance._initialized = False
         return cls._instance
 
-    def __init__(self):
+    def __init__(self, project_root: Optional[str] = None):
         if self._initialized:
             return
         self._initialized = True
         self._spec = None
         self._ignore_file_path = None
         self._file_monitor = None
+        self._project_root = project_root if project_root is not None else os.getcwd()
         self._load_ignore_spec()
         self._setup_file_monitor()
 
     def _load_ignore_spec(self):
         """加载忽略规则文件并解析规则"""
         ignore_patterns = []
-        project_root = Path(os.getcwd())
+        project_root = Path(self._project_root)
 
         ignore_file_paths = [
             project_root / '.autocoderignore',
@@ -89,15 +90,18 @@ class IgnoreFileManager:
 
     def should_ignore(self, path: str) -> bool:
         """判断指定路径是否应该被忽略"""
-        rel_path = os.path.relpath(path, os.getcwd())
+        rel_path = os.path.relpath(path, self._project_root)
         # 标准化分隔符
         rel_path = rel_path.replace(os.sep, '/')
         return self._spec.match_file(rel_path)
 
 
-# 对外提供单例
-_ignore_manager = IgnoreFileManager()
+# 对外提供的单例管理器
+_ignore_manager = None
 
-def should_ignore(path: str) -> bool:
+def should_ignore(path: str, project_root: Optional[str] = None) -> bool:
     """判断指定路径是否应该被忽略"""
+    global _ignore_manager
+    if _ignore_manager is None:
+        _ignore_manager = IgnoreFileManager(project_root=project_root)
     return _ignore_manager.should_ignore(path)

autocoder/common/result_manager.py

@@ -16,16 +16,24 @@ class ResultItem(BaseModel):
 class ResultManager:
     """结果管理器，用于维护一个追加写入的jsonl文件"""
     
-    def __init__(self, source_dir: Optional[str] = None):
+    def __init__(self, source_dir: Optional[str] = None, event_file: Optional[str] = None):
         """
         初始化结果管理器
         
         Args:
             source_dir: 可选的源目录，如果不提供则使用当前目录
+            event_file: 可选的事件文件路径，用于生成结果文件名
         """
         self.source_dir = source_dir or os.getcwd()
         self.result_dir = os.path.join(self.source_dir, ".auto-coder", "results")
-        self.result_file = os.path.join(self.result_dir, "results.jsonl")
+        
+        if event_file:
+            # 获取文件名并去掉后缀
+            event_file_name = os.path.splitext(os.path.basename(event_file))[0]
+            self.result_file = os.path.join(self.result_dir, f"{event_file_name}.jsonl")
+        else:
+            self.result_file = os.path.join(self.result_dir, "results.jsonl")
+            
         os.makedirs(self.result_dir, exist_ok=True)
 
     def append(self, content: str, meta: Optional[Dict[str, Any]] = None) -> ResultItem:

autocoder/common/rulefiles/autocoderrules_utils.py

@@ -6,7 +6,10 @@ from typing import Dict, List, Optional
 from loguru import logger
 import re
 import yaml
+import byzerllm # Added import
 from pydantic import BaseModel, Field
+from typing import List, Dict, Optional, Any # Added Any
+from autocoder.common import AutoCoderArgs
 
 # 尝试导入 FileMonitor
 try:
@@ -254,3 +257,145 @@ def parse_rule_file(file_path: str, project_root: Optional[str] = None) -> RuleF
     if _rules_manager is None:
         _rules_manager = AutocoderRulesManager(project_root=project_root)
     return _rules_manager.parse_rule_file(file_path)
+
+
+# 添加用于返回类型的Pydantic模型
+class RuleRelevance(BaseModel):
+    """用于规则相关性判断的返回模型"""
+    is_relevant: bool = Field(description="规则是否与当前任务相关")
+    reason: str = Field(default="", description="判断理由")
+
+
+class RuleSelector:
+    """
+    根据LLM的判断和规则元数据选择适用的规则。
+    """
+    def __init__(self, llm: Optional[byzerllm.ByzerLLM], args: Optional[AutoCoderArgs] = None):
+        """
+        初始化RuleSelector。
+
+        Args:
+            llm: ByzerLLM 实例，用于判断规则是否适用。如果为 None，则只选择 always_apply=True 的规则。
+            args: 传递给 Agent 的参数，可能包含用于规则选择的上下文信息。            
+        """
+        self.llm = llm
+        self.args = args        
+
+    @byzerllm.prompt()
+    def _build_selection_prompt(self, rule: RuleFile, context: str = "") -> str:
+        """
+        判断规则是否适用于当前任务。
+
+        规则描述:
+        {{ rule.description }}
+
+        规则内容摘要 (前200字符):
+        {{ rule.content[:200] }}
+
+        {% if context %}
+        任务上下文:
+        {{ context }}
+        {% endif %}
+
+        基于以上信息，判断这条规则 (路径: {{ rule.file_path }}) 是否与当前任务相关并应该被应用？
+        
+        请以JSON格式返回结果:
+        ```json
+        {
+            "is_relevant": true或false,
+            "reason": "判断理由"
+        }
+        ```
+        """
+        # 注意：确保 rule 对象和 context 字典能够被 Jinja2 正确访问。
+        # Pydantic模型可以直接在Jinja2中使用其属性。
+        return {
+            "rule": rule,
+            "context": context
+        }
+
+    def select_rules(self, context: str, rules: List[RuleFile]) -> List[RuleFile]:
+        """
+        选择适用于当前上下文的规则。
+
+        Args:
+            context: 可选的字典，包含用于规则选择的上下文信息 (例如，用户指令、目标文件等)。
+
+        Returns:
+            List[RuleFile]: 选定的规则列表。
+        """
+        selected_rules: List[RuleFile] = []
+        logger.info(f"开始选择规则，总规则数: {len(rules)}")
+
+        for rule in rules:
+            if rule.always_apply:
+                selected_rules.append(rule)
+                logger.debug(f"规则 '{os.path.basename(rule.file_path)}' (AlwaysApply=True) 已自动选择。")
+                continue
+
+            if self.llm is None:
+                 logger.debug(f"规则 '{os.path.basename(rule.file_path)}' (AlwaysApply=False) 已跳过，因为未提供 LLM。")
+                 continue
+
+            # 对于 alwaysApply=False 的规则，使用 LLM 判断
+            try:
+                prompt = self._build_selection_prompt.prompt(rule=rule, context=context)
+                logger.debug(f"为规则 '{os.path.basename(rule.file_path)}' 生成的判断 Prompt (片段): {prompt[:200]}...")
+
+                # **** 实际LLM调用 ****
+                # 确保 self.llm 实例已正确初始化并可用
+                if self.llm: # Check if llm is not None                    
+                    result = None
+                    try:
+                        # 使用with_return_type方法获取结构化结果
+                        result = self._build_selection_prompt.with_llm(self.llm).with_return_type(RuleRelevance).run(rule=rule, context=context)
+                        if result and result.is_relevant:
+                            selected_rules.append(rule)
+                            logger.info(f"规则 '{os.path.basename(rule.file_path)}' (AlwaysApply=False) 已被 LLM 选择，原因: {result.reason}")
+                        else:
+                            logger.debug(f"规则 '{os.path.basename(rule.file_path)}' (AlwaysApply=False) 未被 LLM 选择，原因: {result.reason if result else '未提供'}")
+                    except Exception as e:                    
+                        logger.warning(f"LLM 未能为规则 '{os.path.basename(rule.file_path)}' 提供有效响应。")
+                        # 根据需要决定是否跳过或默认不选
+                        continue # 跳过此规则
+                else: # Handle case where self.llm is None after the initial check
+                    logger.warning(f"LLM instance became None unexpectedly for rule '{os.path.basename(rule.file_path)}'.")
+                    continue
+
+                # **** 模拟LLM调用 (用于测试/开发) ****
+                # 注释掉模拟部分，使用上面的实际调用
+                # simulated_response = "yes" if "always" in rule.description.lower() or "index" in rule.description.lower() else "no"
+                # logger.warning(f"模拟LLM判断规则 '{os.path.basename(rule.file_path)}': {simulated_response}")
+                # response_text = simulated_response
+                # **** 结束模拟 ****
+
+            except Exception as e:
+                logger.error(f"使用 LLM 判断规则 '{os.path.basename(rule.file_path)}' 时出错: {e}", exc_info=True)
+                # 根据策略决定是否包含出错的规则，这里选择跳过
+                continue
+
+        logger.info(f"规则选择完成，选中规则数: {len(selected_rules)}")
+        return selected_rules
+
+    def get_selected_rules_content(self, context: Optional[Dict] = None) -> Dict[str, str]:
+        """
+        获取选定规则的文件路径和内容字典。
+
+        Args:
+            context: 传递给 select_rules 的上下文。
+
+        Returns:
+            Dict[str, str]: 选定规则的 {file_path: content} 字典。
+        """
+        selected_rules = self.select_rules(context=context)
+        # 使用 os.path.basename 获取文件名作为 key，如果需要的话
+        # return {os.path.basename(rule.file_path): rule.content for rule in selected_rules}
+        # 保持 file_path 作为 key
+        return {rule.file_path: rule.content for rule in selected_rules}
+
+def auto_select_rules(context: str, rules: List[RuleFile], llm: Optional[byzerllm.ByzerLLM] = None,args:Optional[AutoCoderArgs] = None) -> List[RuleFile]:
+    """
+    根据LLM的判断和规则元数据选择适用的规则。
+    """
+    selector = RuleSelector(llm=llm, args=args)
+    return selector.select_rules(context=context, rules=rules)

autocoder/common/v2/agent/agentic_edit.py

@@ -10,7 +10,6 @@ from rich.panel import Panel
 from pydantic import SkipValidation
 from byzerllm.utils.types import SingleOutputMeta
 
-# Removed ResultManager, stream_out, git_utils, AutoCommandTools, count_tokens, global_cancel, ActionYmlFileManager, get_event_manager, EventContentCreator, get_run_context, AgenticFilterStreamOutType
 from autocoder.common import AutoCoderArgs, git_utils, SourceCodeList, SourceCode
 from autocoder.common.global_cancel import global_cancel
 from autocoder.common import detect_env
@@ -595,14 +594,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 +634,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 +655,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,28 +690,15 @@ 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 %}
+        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 file_paths_str %}
         ====
-
-        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 %}        
+        The following are files that the user is currently focusing on. 
+        Make sure you always start your analysis by using the read_file tool to get the content of the files.
+        <files>
+        {{file_paths_str}}
+        </files>
         {% endif %}
         """
         import os
@@ -687,6 +710,8 @@ class AgenticEdit:
             shell_type = "cmd"
         elif shells.is_running_in_powershell():
             shell_type = "powershell"
+
+        file_paths_str = "\n".join([file_source.module_name for file_source in self.files.sources])
         return {
             "conversation_history": self.conversation_history,
             "env_info": env_info,
@@ -699,8 +724,9 @@ 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,
+            "file_paths_str": file_paths_str,
         }
 
     # Removed _execute_command_result and execute_auto_command methods
@@ -758,27 +784,15 @@ class AgenticEdit:
         conversations = [
             {"role": "system", "content": system_prompt},
         ] 
-        
-        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.
-<files>
-{self.files.to_str()}
-</files>'''
-        })
-
-        conversations.append({
-            "role":"assistant","content":"Ok"
-        })
-        
-        logger.info("Adding conversation history")        
+                                
         conversations.append({
             "role": "user", "content": request.user_input
         })        
         
         logger.info(
             f"Initial conversation history size: {len(conversations)}")
+        
+        logger.info(f"Conversation history: {json.dumps(conversations, indent=2,ensure_ascii=False)}")
 
         iteration_count = 0
         tool_executed = False
@@ -945,12 +959,17 @@ Below are some files the user is focused on, and the content is up to date. Thes
                     elif last_message["role"] == "assistant":
                         logger.info("Appending to existing assistant message")
                         last_message["content"] += 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.
-                logger.info("No tool executed and LLM finished. Breaking out of main loop.")
-                break
-
+                
+                # 添加系统提示，要求LLM必须使用工具或明确结束，而不是直接退出
+                logger.info("Adding system reminder to use tools or attempt completion")
+                conversations.append({
+                    "role": "user",
+                    "content": "NOTE: You must use an appropriate tool (such as read_file, write_to_file, execute_command, etc.) or explicitly complete the task (using attempt_completion). Do not provide text responses without taking concrete actions. Please select a suitable tool to continue based on the user's task."
+                })
+                # 继续循环，让 LLM 再思考，而不是 break
+                logger.info("Continuing the LLM interaction loop without breaking")
+                continue
+            
         logger.info(f"AgenticEdit analyze loop finished after {iteration_count} iterations.")
 
     def stream_and_parse_llm_response(
@@ -1249,6 +1268,9 @@ Below are some files the user is focused on, and the content is up to date. Thes
                     output_cost = (
                         last_meta.generated_tokens_count * output_price) / 1000000
 
+                    # 添加日志记录
+                    logger.info(f"Token Usage Details: Model={model_name}, Input Tokens={last_meta.input_tokens_count}, Output Tokens={last_meta.generated_tokens_count}, Input Cost=${input_cost:.6f}, Output Cost=${output_cost:.6f}")
+
                     get_event_manager(self.args.event_file).write_result(
                         EventContentCreator.create_result(content=EventContentCreator.ResultTokenStatContent(
                             model_name=model_name,
@@ -1432,6 +1454,9 @@ Below are some files the user is focused on, and the content is up to date. Thes
                     output_cost = (
                         last_meta.generated_tokens_count * output_price) / 1000000
 
+                    # 添加日志记录
+                    logger.info(f"Token Usage: Model={model_name}, Input Tokens={last_meta.input_tokens_count}, Output Tokens={last_meta.generated_tokens_count}, Input Cost=${input_cost:.6f}, Output Cost=${output_cost:.6f}")
+
                     self.printer.print_in_terminal(
                             "code_generation_complete",
                             duration=0.0,

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

@@ -22,20 +22,23 @@ class ReadFileToolResolver(BaseToolResolver):
         abs_project_dir = os.path.abspath(source_dir)
         abs_file_path = os.path.abspath(os.path.join(source_dir, file_path))
 
-        # Security check: ensure the path is within the source directory
-        if not abs_file_path.startswith(abs_project_dir):
-            return ToolResult(success=False, message=f"Error: Access denied. Attempted to read file outside the project directory: {file_path}")
+        # # Security check: ensure the path is within the source directory
+        # if not abs_file_path.startswith(abs_project_dir):
+        #     return ToolResult(success=False, message=f"Error: Access denied. Attempted to read file outside the project directory: {file_path}")
 
         try:
-            if self.shadow_manager:
-                shadow_path = self.shadow_manager.to_shadow_path(abs_file_path)
-                # If shadow file exists, read from it
-                if os.path.exists(shadow_path) and os.path.isfile(shadow_path):
-                    with open(shadow_path, 'r', encoding='utf-8', errors='replace') as f:
-                        content = f.read()
-                    logger.info(f"[Shadow] Successfully read shadow file: {shadow_path}")
-                    return ToolResult(success=True, message=f"Successfully read file (shadow): {file_path}", content=content)
-                # else fallback to original file
+            try:
+                if self.shadow_manager:
+                    shadow_path = self.shadow_manager.to_shadow_path(abs_file_path)
+                    # If shadow file exists, read from it
+                    if os.path.exists(shadow_path) and os.path.isfile(shadow_path):
+                        with open(shadow_path, 'r', encoding='utf-8', errors='replace') as f:
+                            content = f.read()
+                        logger.info(f"[Shadow] Successfully read shadow file: {shadow_path}")
+                        return ToolResult(success=True, message=f"Successfully read file (shadow): {file_path}", content=content)
+            except Exception as e:
+                pass
+            # else fallback to original file
             # Fallback to original file
             if not os.path.exists(abs_file_path):
                 return ToolResult(success=False, message=f"Error: File not found at path: {file_path}")

autocoder/common/v2/code_auto_generate.py

@@ -17,6 +17,7 @@ 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__(
@@ -199,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__(
@@ -301,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

@@ -17,6 +17,7 @@ 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
 
 
 
@@ -214,8 +215,10 @@ class CodeAutoGenerateEditBlock:
 
         ====
         下面是用户的需求：
-
+        
+        <user_instruction>
         {{ instruction }}
+        </user_instruction>
 
         """
         if not self.args.include_project_structure:
@@ -318,7 +321,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,7 +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
+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
@@ -375,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