auto-coder 3.0.34__tar.gz → 3.0.35__tar.gz

{auto_coder-3.0.34/src/auto_coder.egg-info → auto_coder-3.0.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-coder
-Version: 3.0.34
+Version: 3.0.35
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Author-email: allwefantasy <allwefantasy@gmail.com>

{auto_coder-3.0.34 → auto_coder-3.0.35}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "auto-coder"
-version = "3.0.34"
+version = "3.0.35"
 description = "AutoCoder: AutoCoder"
 authors = [
     {name = "allwefantasy", email = "allwefantasy@gmail.com"}

{auto_coder-3.0.34 → auto_coder-3.0.35/src/auto_coder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-coder
-Version: 3.0.34
+Version: 3.0.35
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Author-email: allwefantasy <allwefantasy@gmail.com>

{auto_coder-3.0.34 → auto_coder-3.0.35}/src/autocoder/common/rulefiles/api.py

@@ -118,6 +118,7 @@ def get_required_and_index_rules(
     *,
     is_sub_agent: bool = False,
     subagent_name: str | None = None,
+    args: AutoCoderArgs | None = None,
 ) -> dict[str, str]:
     """
     获取所有必须应用的规则文件(always_apply=True)和Index.md文件。
@@ -135,14 +136,19 @@ def get_required_and_index_rules(
     )
 
     for rule in filtered:
+        content = rule.content
+        # 如果提供了args，尝试渲染模板
+        if args is not None:
+            content = _rules_manager.render_rule_content(rule, args)
+            
         if rule.always_apply:
-            result[rule.file_path] = rule.content
+            result[rule.file_path] = content
             logger.debug(
                 f"[RULES] 添加必须应用的规则 | stage=load file_path={os.path.basename(rule.file_path)}"
             )
 
         if os.path.basename(rule.file_path).lower() == "index.md":
-            result[rule.file_path] = rule.content
+            result[rule.file_path] = content
             logger.debug(
                 f"[RULES] 添加Index.md文件 | stage=load file_path={rule.file_path}"
             )
@@ -246,6 +252,7 @@ def get_rules_for_conversation(
     *,
     is_sub_agent: bool = False,
     subagent_name: str | None = None,
+    args: AutoCoderArgs | None = None,
 ) -> str | None:
     """
     获取格式化的规则文本，用于添加到对话中。
@@ -294,7 +301,13 @@ def get_rules_for_conversation(
                         f"**Applicable Files**: {', '.join(rule.globs)}"
                     )
                 message_parts.append("")
-                message_parts.append(rule.content)
+                
+                # 如果提供了args，尝试渲染模板
+                content = rule.content
+                if args is not None and _rules_manager is not None:
+                    content = _rules_manager.render_rule_content(rule, args)
+                    
+                message_parts.append(content)
                 message_parts.append("")
 
         # 添加条件规则的描述和路径

{auto_coder-3.0.34 → auto_coder-3.0.35}/src/autocoder/common/rulefiles/core/manager.py

@@ -9,9 +9,10 @@ import os
 import re
 import time
 from threading import Lock
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 import yaml
+from jinja2 import Template, TemplateError
 from loguru import logger
 
 # 导入数据模型
@@ -286,6 +287,7 @@ class AutocoderRulesManager:
                 globs=metadata.get("globs", []),
                 always_apply=metadata.get("alwaysApply", False),
                 subagents=_normalize_subagents(metadata.get("subagents")),
+                variables=metadata.get("variables", {}),
                 content=markdown_content.strip(),
                 file_path=file_path,
             )
@@ -346,6 +348,44 @@ class AutocoderRulesManager:
             parsed_rule = self.parse_rule_file(file_path)
             parsed_rules.append(parsed_rule)
         return parsed_rules
+        
+    def render_rule_content(self, rule: RuleFile, args: Any) -> str:
+        """
+        使用Jinja2渲染规则正文内容
+        
+        Args:
+            rule: 规则文件对象
+            args: AutoCoderArgs配置对象
+            
+        Returns:
+            str: 渲染后的规则内容
+            
+        Raises:
+            TemplateError: 当模板渲染出错时抛出，便于上层处理
+        """
+        # 如果没有变量也没有模板标记，直接返回原始内容
+        content = rule.content
+        if not rule.variables and "{{" not in content and "{%" not in content:
+            return content
+            
+        try:
+            # 构建安全的上下文，仅暴露必要信息
+            context = {
+                "args": args,
+                "variables": rule.variables
+            }
+            
+            # 创建模板并渲染
+            template = Template(content)
+            rendered_content = template.render(context)
+            return rendered_content
+            
+        except TemplateError as e:
+            logger.error(
+                f"[RULES] 规则模板渲染失败 | stage=render file_path={rule.file_path} error={str(e)}"
+            )
+            # 渲染错误时抛出异常，保持错误可见
+            raise RuntimeError(f"规则文件 {rule.file_path} 模板渲染失败: {str(e)}") from e
 
     @classmethod
     def reset_instance(cls):

{auto_coder-3.0.34 → auto_coder-3.0.35}/src/autocoder/common/rulefiles/models/rule_file.py

@@ -22,5 +22,6 @@ class RuleFile(BaseModel):
             '["*"]=任何子 agent 都加载'
         ),
     )
+    variables: dict = Field(default_factory=dict, description="规则文件中定义的模板变量")
     content: str = Field(default="", description="规则文件的正文内容")
     file_path: str = Field(default="", description="规则文件的路径")

{auto_coder-3.0.34 → auto_coder-3.0.35}/src/autocoder/common/rulefiles/test_rulefiles.py

@@ -26,6 +26,7 @@ from autocoder.common.rulefiles import (
     get_required_and_index_rules,
     get_rules,
     get_rules_cache_stats,
+    get_rules_for_conversation,
     invalidate_rules_cache,
     parse_rule_file,
     reset_rules_manager,
@@ -832,3 +833,187 @@ class TestIntegrationScenarios:
             # 清理所有缓存管理器
             for cache_manager in cache_managers:
                 cache_manager.cleanup()
+
+
+
+
+class TestRuleTemplateRendering:
+    """测试规则文件Jinja2模板渲染功能"""
+    
+    def test_variables_front_matter_parsing(self, temp_project_dir, rules_dir):
+        """测试variables front-matter字段解析功能
+        验证：
+        1. variables字段能正确从YAML头中解析为字典
+        2. 没有variables字段时默认是空字典
+        """
+        # 创建带variables的规则文件
+        rule_content = """---
+description: 测试变量
+variables:
+  project_name: AutoCoder
+  version: 0.1.0
+  features:
+    - 多语言支持
+    - 模板渲染
+alwaysApply: true
+---
+这是规则内容
+"""
+        rule_file = os.path.join(rules_dir, "test_variables.md")
+        with open(rule_file, "w", encoding="utf-8") as f:
+            f.write(rule_content)
+            
+        # 解析规则
+        rules = get_parsed_rules()
+        assert len(rules) == 1
+        rule = rules[0]
+        
+        # 验证变量正确解析
+        assert rule.variables == {
+            "project_name": "AutoCoder",
+            "version": "0.1.0",
+            "features": ["多语言支持", "模板渲染"]
+        }
+        assert rule.always_apply is True
+        
+        # 创建没有variables字段的规则文件
+        rule_content2 = """---
+description: 无变量测试
+alwaysApply: true
+---
+这是无变量规则内容
+"""
+        rule_file2 = os.path.join(rules_dir, "test_no_variables.md")
+        with open(rule_file2, "w", encoding="utf-8") as f:
+            f.write(rule_content2)
+            
+        reset_rules_manager()
+        rules = get_parsed_rules()
+        assert len(rules) == 2
+        rule_without_vars = [r for r in rules if "no_variables" in r.file_path][0]
+        assert rule_without_vars.variables == {}  # 没有variables字段时默认是空字典
+        
+    def test_template_rendering_with_args_and_variables(self, temp_project_dir, rules_dir):
+        """测试模板渲染功能，同时使用args和variables
+        验证：
+        1. 能正确引用args中的属性
+        2. 能正确引用variables中的属性
+        3. 渲染结果正确
+        """
+        # 创建带模板的规则文件
+        rule_content = """---
+description: 模板测试
+variables:
+  project_name: AutoCoder
+  default_model: gpt-4o
+alwaysApply: true
+---
+项目名称：{{ variables.project_name }}
+默认模型：{{ variables.default_model }}
+当前模型：{{ args.model }}
+查询：{{ args.query }}
+"""
+        rule_file = os.path.join(rules_dir, "test_template.md")
+        with open(rule_file, "w", encoding="utf-8") as f:
+            f.write(rule_content)
+            
+        # 模拟AutoCoderArgs对象
+        mock_args = Mock()
+        mock_args.model = "doubao-seed-2.0-pro"
+        mock_args.query = "实现新功能"
+        
+        # 获取必须应用的规则并渲染
+        rules_content = get_required_and_index_rules(args=mock_args)
+        assert len(rules_content) == 1
+        content = list(rules_content.values())[0]
+        
+        # 验证渲染结果
+        assert "项目名称：AutoCoder" in content
+        assert "默认模型：gpt-4o" in content
+        assert "当前模型：doubao-seed-2.0-pro" in content
+        assert "查询：实现新功能" in content
+        
+    def test_backward_compatibility_no_template(self, temp_project_dir, rules_dir):
+        """测试向后兼容性：没有模板标记的规则内容保持不变
+        验证：
+        1. 没有{{和{%标记的内容直接返回原始值
+        2. 即使提供了args，没有模板标记也不会改变内容
+        """
+        rule_content = """---
+description: 无模板测试
+alwaysApply: true
+---
+这是普通规则内容，没有模板标记
+包含一些特殊字符但不是模板语法
+纯文本内容应该原样保留
+"""
+        rule_file = os.path.join(rules_dir, "test_no_template.md")
+        with open(rule_file, "w", encoding="utf-8") as f:
+            f.write(rule_content)
+            
+        mock_args = Mock()
+        mock_args.model = "test-model"
+        
+        # 没有模板标记的内容应该保持不变
+        rules_content = get_required_and_index_rules(args=mock_args)
+        assert len(rules_content) == 1
+        content = list(rules_content.values())[0]
+        
+        assert "这是普通规则内容，没有模板标记" in content
+        assert "包含一些特殊字符但不是模板语法" in content
+        assert "纯文本内容应该原样保留" in content
+        
+    def test_template_rendering_error_handling(self, temp_project_dir, rules_dir):
+        """测试模板渲染错误处理
+        验证：
+        1. 模板语法错误时会抛出异常
+        2. 错误信息包含文件路径和具体错误原因
+        """
+        # 创建有语法错误的模板
+        rule_content = """---
+description: 错误模板测试
+alwaysApply: true
+---
+这是错误的模板：{{ args.non_existent_attribute + }}
+"""
+        rule_file = os.path.join(rules_dir, "test_error_template.md")
+        with open(rule_file, "w", encoding="utf-8") as f:
+            f.write(rule_content)
+            
+        mock_args = Mock()
+        mock_args.model = "test-model"
+        
+        # 验证渲染失败会抛出异常
+        with pytest.raises(RuntimeError) as exc_info:
+            get_required_and_index_rules(args=mock_args)
+            
+        assert "test_error_template.md" in str(exc_info.value)
+        assert "模板渲染失败" in str(exc_info.value)
+        
+    def test_get_rules_for_conversation_rendering(self, temp_project_dir, rules_dir):
+        """测试get_rules_for_conversation接口也支持模板渲染
+        验证：
+        1. 对话用的规则内容也会被正确渲染
+        """
+        rule_content = """---
+description: 对话规则测试
+variables:
+  rule_type: 对话规则
+alwaysApply: true
+---
+这是对话中的规则，当前模型是：{{ args.model }}
+规则类型：{{ variables.rule_type }}
+"""
+        rule_file = os.path.join(rules_dir, "test_conversation_rule.md")
+        with open(rule_file, "w", encoding="utf-8") as f:
+            f.write(rule_content)
+            
+        mock_args = Mock()
+        mock_args.model = "conversation-model"
+        
+        # 获取对话规则
+        rules_text = get_rules_for_conversation(args=mock_args)
+        assert rules_text is not None
+        assert "当前模型是：conversation-model" in rules_text
+        assert "规则类型：对话规则" in rules_text
+

{auto_coder-3.0.34 → auto_coder-3.0.35}/src/autocoder/common/rulefiles/utils/parser.py

@@ -77,6 +77,7 @@ def parse_rule_file(file_path: str) -> RuleFile:
             globs=metadata.get("globs", []),
             always_apply=metadata.get("alwaysApply", False),
             subagents=_normalize_subagents(metadata.get("subagents")),
+            variables=metadata.get("variables", {}),
             content=markdown_content.strip(),
             file_path=file_path,
         )

{auto_coder-3.0.34 → auto_coder-3.0.35}/src/autocoder/common/terminal_paste/paste_handler.py

@@ -216,11 +216,6 @@ def resolve_paste_placeholders(text: str) -> str:
     # Replace all placeholders in the text
     resolved_text = PLACEHOLDER_PATTERN.sub(replace_placeholder, text)
 
-    # Show user if any replacements were made
-    if resolved_text != text:
-        placeholder_count = len(PLACEHOLDER_PATTERN.findall(text))
-        print(f"\033[92m✓ Resolved {placeholder_count} paste placeholder(s)\033[0m")
-
     return resolved_text
 
 

{auto_coder-3.0.34 → auto_coder-3.0.35}/src/autocoder/common/v2/agent/agentic_edit.py

@@ -2163,7 +2163,7 @@ class AgenticEdit:
 
          ===
 
-         SUB AGENTS
+         SUBAGENTS
 
          ## Overview
 
@@ -2313,28 +2313,15 @@ class AgenticEdit:
 
          ## Limitations and Considerations
 
-         1. No Inter-Task Communication: Sub-agents cannot communicate with each other
-         2. No Shared Context: Each sub-agent starts with a fresh context, make sure you provide the enough context for each sub-agent
-
-         ## Get specific sub-agent output
-
-         If you want to control the final output of the subagent, you can add the following content in your prompt/task description
-         when invoking the subagent:
-
-         you should output what you find in attempt_completion tool in this format:
-
-         ```json
-         {
-            "files": [
-               {
-                  "path": "path/to/file.py",
-                  "operation": "modify"
-               }
-            ]
-         }
-         ```
-
-         you can always get the output of the subagent by using the attempt_completion tool.
+         1. **No Inter-Task Communication**: Sub-agents cannot communicate with each other during execution. There is no message passing, shared memory, or signaling mechanism between concurrent sub-agents.
+         2. **No Shared Context — This is critical**: Each sub-agent starts with a completely fresh, empty context. Sub-agents do NOT inherit your conversation history, previously read file contents, analysis results, or any other state from the parent agent. Consecutive sub-agents also do NOT share context with each other — the output of sub-agent A is NOT automatically available to sub-agent B.
+            Therefore, you MUST explicitly include ALL necessary context in each sub-agent's `task` field. This includes:
+            - **File paths**: Exact file paths that the sub-agent needs to read or modify (do not assume the sub-agent knows which files are relevant)
+            - **Code snippets / signatures**: If the sub-agent needs to know about specific classes, functions, or data structures, paste the relevant code or signatures directly into the task description
+            - **Findings from previous sub-agents**: If this sub-agent depends on results from an earlier sub-agent, you must copy those results into the task description verbatim
+            - **Project conventions**: Any coding style, naming conventions, or architectural patterns the sub-agent should follow
+            - **Modification instructions**: Precise descriptions of what to change, including the old code and new code when possible
+            Treat each sub-agent's `task` field as a **self-contained, standalone brief** — it should contain everything the sub-agent needs to complete its work without asking any follow-up questions.                
 
          ## Advanced Pattern: Staged Parallel Execution
 

{auto_coder-3.0.34 → auto_coder-3.0.35}/src/autocoder/version.py

@@ -1,4 +1,4 @@
 # This file is auto-generated by Hatchling. As such, do not:
 #   - modify
 #   - track in version control e.g. be sure to add to .gitignore
-__version__ = "3.0.34"
+__version__ = "3.0.35"