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

autocoder/common/v2/agent/agentic_edit.py

@@ -72,7 +72,6 @@ from autocoder.common.v2.agent.agentic_edit_types import (AgenticEditRequest, To
                                                           AskFollowupQuestionTool, UseMcpTool, AttemptCompletionTool
                                                           )
 
-
 # Map Pydantic Tool Models to their Resolver Classes
 TOOL_RESOLVER_MAP: Dict[Type[BaseTool], Type[BaseToolResolver]] = {
     ExecuteCommandTool: ExecuteCommandToolResolver,
@@ -86,7 +85,7 @@ TOOL_RESOLVER_MAP: Dict[Type[BaseTool], Type[BaseToolResolver]] = {
     AskFollowupQuestionTool: AskFollowupQuestionToolResolver,
     AttemptCompletionTool: AttemptCompletionToolResolver,  # Will stop the loop anyway
     PlanModeRespondTool: PlanModeRespondToolResolver,
-    UseMcpTool: UseMcpToolResolver,
+    UseMcpTool: UseMcpToolResolver
 }
 
 
@@ -233,7 +232,7 @@ class AgenticEdit:
         # Tools
 
         ## execute_command
-        Description: Request to execute a CLI command on the system. Use this when you need to perform system operations or run specific commands to accomplish any step in the user's task. You must tailor your command to the user's system and provide a clear explanation of what the command does. For command chaining, use the appropriate chaining syntax for the user's shell. Prefer to execute complex CLI commands over creating executable scripts, as they are more flexible and easier to run. Commands will be executed in the current working directory: ${cwd.toPosix()}
+        Description: Request to execute a CLI command on the system. Use this when you need to perform system operations or run specific commands to accomplish any step in the user's task. You must tailor your command to the user's system and provide a clear explanation of what the command does. For command chaining, use the appropriate chaining syntax for the user's shell. Prefer to execute complex CLI commands over creating executable scripts, as they are more flexible and easier to run. Commands will be executed in the current working directory: {{current_project}}
         Parameters:
         - command: (required) The CLI command to execute. This should be valid for the current operating system. Ensure the command is properly formatted and does not contain any harmful instructions.
         - requires_approval: (required) A boolean indicating whether this command requires explicit user approval before execution in case the user has auto-approve mode enabled. Set to 'true' for potentially impactful operations like installing/uninstalling packages, deleting/overwriting files, system configuration changes, network operations, or any commands that could have unintended side effects. Set to 'false' for safe operations like reading files/directories, running development servers, building projects, and other non-destructive operations.
@@ -255,7 +254,7 @@ class AgenticEdit:
         ## read_file
         Description: Request to read the contents of a file at the specified path. Use this when you need to examine the contents of an existing file you do not know the contents of, for example to analyze code, review text files, or extract information from configuration files. Automatically extracts raw text from PDF and DOCX files. May not be suitable for other types of binary files, as it returns the raw content as a string.
         Parameters:
-        - path: (required) The path of the file to read (relative to the current working directory ${cwd.toPosix()})
+        - path: (required) The path of the file to read (relative to the current working directory {{ current_project }})
         Usage:
         <read_file>
         <path>File path here</path>
@@ -264,7 +263,7 @@ class AgenticEdit:
         ## write_to_file
         Description: Request to write content to a file at the specified path. If the file exists, it will be overwritten with the provided content. If the file doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
         Parameters:
-        - path: (required) The path of the file to write to (relative to the current working directory ${cwd.toPosix()})
+        - path: (required) The path of the file to write to (relative to the current working directory {{ current_project }})
         - content: (required) The content to write to the file. ALWAYS provide the COMPLETE intended content of the file, without any truncation or omissions. You MUST include ALL parts of the file, even if they haven't been modified.
         Usage:
         <write_to_file>
@@ -277,15 +276,15 @@ class AgenticEdit:
         ## replace_in_file
         Description: Request to replace sections of content in an existing file using SEARCH/REPLACE blocks that define exact changes to specific parts of the file. This tool should be used when you need to make targeted changes to specific parts of a file.
         Parameters:
-        - path: (required) The path of the file to modify (relative to the current working directory ${cwd.toPosix()})
+        - path: (required) The path of the file to modify (relative to the current working directory {{ current_project }})
         - diff: (required) One or more SEARCH/REPLACE blocks following this exact format:
-        \`\`\`
+        ```
         <<<<<<< SEARCH
         [exact content to find]
         =======
         [new content to replace with]
         >>>>>>> REPLACE
-        \`\`\`
+        ```
         Critical rules:
         1. SEARCH content must match the associated file section to find EXACTLY:
             * Match character-for-character including whitespace, indentation, line endings
@@ -313,7 +312,7 @@ class AgenticEdit:
         ## search_files
         Description: Request to perform a regex search across files in a specified directory, providing context-rich results. This tool searches for patterns or specific content across multiple files, displaying each match with encapsulating context.
         Parameters:
-        - path: (required) The path of the directory to search in (relative to the current working directory ${cwd.toPosix()}). This directory will be recursively searched.
+        - path: (required) The path of the directory to search in (relative to the current working directory {{ current_project }}). This directory will be recursively searched.
         - regex: (required) The regular expression pattern to search for. Uses Rust regex syntax.
         - file_pattern: (optional) Glob pattern to filter files (e.g., '*.ts' for TypeScript files). If not provided, it will search all files (*).
         Usage:
@@ -326,7 +325,7 @@ class AgenticEdit:
         ## list_files
         Description: Request to list files and directories within the specified directory. If recursive is true, it will list all files and directories recursively. If recursive is false or not provided, it will only list the top-level contents. Do not use this tool to confirm the existence of files you may have created, as the user will let you know if the files were created successfully or not.
         Parameters:
-        - path: (required) The path of the directory to list contents for (relative to the current working directory ${cwd.toPosix()})
+        - path: (required) The path of the directory to list contents for (relative to the current working directory {{ current_project }})
         - recursive: (optional) Whether to list files recursively. Use true for recursive listing, false or omit for top-level only.
         Usage:
         <list_files>
@@ -337,7 +336,7 @@ class AgenticEdit:
         ## list_code_definition_names
         Description: Request to list definition names (classes, functions, methods, etc.) used in source code files at the top level of the specified directory. This tool provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
         Parameters:
-        - path: (required) The path of the directory (relative to the current working directory ${cwd.toPosix()}) to list top level source code definitions for.
+        - path: (required) The path of the directory (relative to the current working directory {{ current_project }}) to list top level source code definitions for.
         Usage:
         <list_code_definition_names>
         <path>Directory path here</path>
@@ -636,7 +635,7 @@ class AgenticEdit:
         - Your current working directory is: {{current_project}}
         - 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)\`.
+        - 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 '{{ current_project }}', and if so prepend with \`cd\`'ing into that directory && then executing the command (as one command since you are stuck operating from '{{ current_project }}'). For example, if you needed to run \`npm install\` in a project outside of '{{ current_project }}', 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.
         - When creating a new project (such as an app, website, or any software project), organize all new files within a dedicated project directory unless the user specifies otherwise. Use appropriate file paths when creating files, as the write_to_file tool will automatically create any necessary directories. Structure the project logically, adhering to best practices for the specific type of project being created. Unless otherwise specified, new projects should be easily run without additional setup, for example most projects can be built in HTML, CSS, and JavaScript - which you can open in a browser.
         - Be sure to consider the type of project (e.g. Python, JavaScript, web application) when determining the appropriate structure and files to include. Also consider what files may be most relevant to accomplishing the task, for example looking at a project's manifest file would help you understand the project's dependencies, which you could incorporate into any code you write.
@@ -813,17 +812,18 @@ class AgenticEdit:
 
             assistant_buffer = ""
             logger.info("Initializing stream chat with LLM")
+
+            ## 实际请求大模型
             llm_response_gen = stream_chat_with_continue(
                 llm=self.llm,
                 conversations=conversations,
                 llm_config={},  # Placeholder for future LLM configs
                 args=self.args
             )
-
-            meta_holder = byzerllm.MetaHolder()
+            
             logger.info("Starting to parse LLM response stream")
             parsed_events = self.stream_and_parse_llm_response(
-                llm_response_gen, meta_holder)
+                llm_response_gen)
 
             event_count = 0
             for event in parsed_events:
@@ -942,8 +942,9 @@ class AgenticEdit:
                     # logger.error("Stopping analyze loop due to parsing error.")
                     # return
 
-            logger.info("Yielding token usage event")
-            yield TokenUsageEvent(usage=meta_holder.meta)
+                elif isinstance(event, TokenUsageEvent):
+                    logger.info("Yielding token usage event")
+                    yield event
             
             if not tool_executed:
                 # No tool executed in this LLM response cycle
@@ -973,7 +974,7 @@ class AgenticEdit:
         logger.info(f"AgenticEdit analyze loop finished after {iteration_count} iterations.")
 
     def stream_and_parse_llm_response(
-        self, generator: Generator[Tuple[str, Any], None, None], meta_holder: byzerllm.MetaHolder
+        self, generator: Generator[Tuple[str, Any], None, None]
     ) -> Generator[Union[LLMOutputEvent, LLMThinkingEvent, ToolCallEvent, ErrorEvent], None, None]:
         """
         Streamingly parses the LLM response generator, distinguishing between
@@ -1050,7 +1051,8 @@ class AgenticEdit:
                 logger.exception(
                     f"Failed to parse tool XML for <{tool_tag}>: {e}\nXML:\n{tool_xml}")
                 return None
-
+        
+        meta_holder = byzerllm.MetaHolder()
         for content_chunk, metadata in generator:
             global_cancel.check_and_raise(token=self.args.event_file)
             meta_holder.meta = metadata            

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

@@ -14,7 +14,9 @@ class ReplaceInFileToolResolver(BaseToolResolver):
     def __init__(self, agent: Optional['AgenticEdit'], tool: ReplaceInFileTool, args: AutoCoderArgs):
         super().__init__(agent, tool, args)
         self.tool: ReplaceInFileTool = tool  # For type hinting
+        self.args = args
         self.shadow_manager = self.agent.shadow_manager if self.agent else None
+        self.shadow_linter = self.agent.shadow_linter if self.agent else None
 
     def parse_diff(self, diff_content: str) -> List[Tuple[str, str]]:
         """
@@ -58,6 +60,30 @@ class ReplaceInFileToolResolver(BaseToolResolver):
             logger.warning(f"Could not parse any SEARCH/REPLACE blocks from diff: {diff_content}")
         return blocks
 
+    def _format_lint_issues(self, lint_result):
+        """
+        将 lint 结果格式化为可读的文本格式
+        
+        参数:
+            lint_result: 单个文件的 lint 结果对象
+            
+        返回:
+            str: 格式化的问题描述
+        """
+        formatted_issues = []
+        
+        for issue in lint_result.issues:
+            severity = "错误" if issue.severity.value == 3 else "警告" if issue.severity.value == 2 else "信息"
+            line_info = f"第{issue.position.line}行"
+            if issue.position.column:
+                line_info += f", 第{issue.position.column}列"
+            
+            formatted_issues.append(
+                f"  - [{severity}] {line_info}: {issue.message} (规则: {issue.code})"
+            )
+        
+        return "\n".join(formatted_issues)
+
     def resolve(self) -> ToolResult:
         file_path = self.tool.path
         diff_content = self.tool.diff
@@ -130,6 +156,36 @@ class ReplaceInFileToolResolver(BaseToolResolver):
                 f.write(current_content)
             logger.info(f"Successfully applied {applied_count}/{len(parsed_blocks)} changes to file: {file_path}")
 
+            # 新增：执行代码质量检查
+            lint_results = None
+            lint_message = ""
+            formatted_issues = ""
+            has_lint_issues = False
+            
+            # 检查是否启用了Lint功能
+            enable_lint = self.args.enable_auto_fix_lint
+            
+            if enable_lint:
+                try:
+                    if self.shadow_linter and self.shadow_manager:
+                        # 对修改后的文件进行 lint 检查
+                        shadow_path = target_path  # 已经是影子路径
+                        lint_results = self.shadow_linter.lint_shadow_file(shadow_path)
+                        
+                        if lint_results and lint_results.issues:
+                            has_lint_issues = True
+                            # 格式化 lint 问题
+                            formatted_issues = self._format_lint_issues(lint_results)
+                            lint_message = f"\n\n代码质量检查发现 {len(lint_results.issues)} 个问题:\n{formatted_issues}"
+                        else:
+                            lint_message = "\n\n代码质量检查通过，未发现问题。"
+                except Exception as e:
+                    logger.error(f"Lint 检查失败: {str(e)}")
+                    lint_message = "\n\n尝试进行代码质量检查时出错。"
+            else:
+                logger.info("代码质量检查已禁用")
+
+            # 构建包含 lint 结果的返回消息
             if errors:
                 message = get_message_with_format("replace_in_file.apply_success_with_warnings", 
                                                   applied=applied_count, 
@@ -141,13 +197,29 @@ class ReplaceInFileToolResolver(BaseToolResolver):
                                                   applied=applied_count, 
                                                   total=len(parsed_blocks), 
                                                   file_path=file_path)
+            
+            # 将 lint 消息添加到结果中，如果启用了Lint
+            if enable_lint:
+                message += lint_message
 
             # 变更跟踪，回调AgenticEdit
             if self.agent:
                 rel_path = os.path.relpath(abs_file_path, abs_project_dir)
                 self.agent.record_file_change(rel_path, "modified", diff=diff_content, content=current_content)
 
-            return ToolResult(success=True, message=message, content=current_content)
+            # 附加 lint 结果到返回内容
+            result_content = {
+                "content": current_content,
+            }
+            
+            # 只有在启用Lint时才添加Lint结果
+            if enable_lint:
+                result_content["lint_results"] = {
+                    "has_issues": has_lint_issues,
+                    "issues": formatted_issues if has_lint_issues else None
+                }
+
+            return ToolResult(success=True, message=message, content=result_content)
         except Exception as e:
             logger.error(f"Error writing replaced content to file '{file_path}': {str(e)}")
             return ToolResult(success=False, message=get_message_with_format("replace_in_file.write_error", error=str(e)))

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

@@ -4,6 +4,7 @@ from autocoder.common.v2.agent.agentic_edit_types import WriteToFileTool, ToolRe
 from autocoder.common.v2.agent.agentic_edit_tools.base_tool_resolver import BaseToolResolver
 from loguru import logger
 from autocoder.common import AutoCoderArgs
+from autocoder.common.auto_coder_lang import get_message_with_format
 import typing
 
 if typing.TYPE_CHECKING:
@@ -13,7 +14,33 @@ class WriteToFileToolResolver(BaseToolResolver):
     def __init__(self, agent: Optional['AgenticEdit'], tool: WriteToFileTool, args: AutoCoderArgs):
         super().__init__(agent, tool, args)
         self.tool: WriteToFileTool = tool  # For type hinting
+        self.args = args
         self.shadow_manager = self.agent.shadow_manager if self.agent else None
+        self.shadow_linter = self.agent.shadow_linter if self.agent else None
+        
+    def _format_lint_issues(self, lint_result):
+        """
+        将 lint 结果格式化为可读的文本格式
+        
+        参数:
+            lint_result: 单个文件的 lint 结果对象
+            
+        返回:
+            str: 格式化的问题描述
+        """
+        formatted_issues = []
+        
+        for issue in lint_result.issues:
+            severity = "错误" if issue.severity.value == 3 else "警告" if issue.severity.value == 2 else "信息"
+            line_info = f"第{issue.position.line}行"
+            if issue.position.column:
+                line_info += f", 第{issue.position.column}列"
+            
+            formatted_issues.append(
+                f"  - [{severity}] {line_info}: {issue.message} (规则: {issue.code})"
+            )
+        
+        return "\n".join(formatted_issues)
 
     def resolve(self) -> ToolResult:
         file_path = self.tool.path
@@ -39,8 +66,56 @@ class WriteToFileToolResolver(BaseToolResolver):
                 if self.agent:
                     rel_path = os.path.relpath(abs_file_path, abs_project_dir)
                     self.agent.record_file_change(rel_path, "added", diff=None, content=content)
-
-                return ToolResult(success=True, message=f"Successfully wrote to file (shadow): {file_path}", content=content)
+                
+                # 新增：执行代码质量检查
+                lint_results = None
+                lint_message = ""
+                formatted_issues = ""
+                has_lint_issues = False
+                
+                # 检查是否启用了Lint功能
+                enable_lint = self.args.enable_auto_fix_lint
+                
+                if enable_lint:
+                    try:
+                        if self.shadow_linter and self.shadow_manager:
+                            # 对新创建的文件进行 lint 检查
+                            shadow_path = self.shadow_manager.to_shadow_path(abs_file_path)
+                            lint_results = self.shadow_linter.lint_shadow_file(shadow_path)
+                            
+                            if lint_results and lint_results.issues:
+                                has_lint_issues = True
+                                # 格式化 lint 问题
+                                formatted_issues = self._format_lint_issues(lint_results)
+                                lint_message = f"\n\n代码质量检查发现 {len(lint_results.issues)} 个问题:\n{formatted_issues}"
+                            else:
+                                lint_message = "\n\n代码质量检查通过，未发现问题。"
+                    except Exception as e:
+                        logger.error(f"Lint 检查失败: {str(e)}")
+                        lint_message = "\n\n尝试进行代码质量检查时出错。"
+                else:
+                    logger.info("代码质量检查已禁用")
+                
+                # 构建包含 lint 结果的返回消息
+                message = f"Successfully wrote to file (shadow): {file_path}"
+                
+                # 将 lint 消息添加到结果中，如果启用了Lint
+                if enable_lint:
+                    message += lint_message
+                
+                # 附加 lint 结果到返回内容
+                result_content = {
+                    "content": content,
+                }
+                
+                # 只有在启用Lint时才添加Lint结果
+                if enable_lint:
+                    result_content["lint_results"] = {
+                        "has_issues": has_lint_issues,
+                        "issues": formatted_issues if has_lint_issues else None
+                    }
+                
+                return ToolResult(success=True, message=message, content=result_content)
             else:
                 # No shadow manager fallback to original file
                 os.makedirs(os.path.dirname(abs_file_path), exist_ok=True)
@@ -51,8 +126,61 @@ class WriteToFileToolResolver(BaseToolResolver):
                 if self.agent:
                     rel_path = os.path.relpath(abs_file_path, abs_project_dir)
                     self.agent.record_file_change(rel_path, "added", diff=None, content=content)
-
-                return ToolResult(success=True, message=f"Successfully wrote to file: {file_path}", content=content)
+                
+                # 新增：执行代码质量检查
+                lint_results = None
+                lint_message = ""
+                formatted_issues = ""
+                has_lint_issues = False
+                
+                # 检查是否启用了Lint功能
+                enable_lint = self.args.enable_auto_fix_lint
+                
+                if enable_lint:
+                    try:
+                        if self.shadow_linter and self.shadow_manager:
+                            # 对新创建的文件进行 lint 检查
+                            # 由于没有shadow系统，需要先创建shadow文件
+                            shadow_path = self.shadow_manager.to_shadow_path(abs_file_path)
+                            os.makedirs(os.path.dirname(shadow_path), exist_ok=True)
+                            with open(shadow_path, 'w', encoding='utf-8') as f:
+                                f.write(content)
+                            
+                            lint_results = self.shadow_linter.lint_shadow_file(shadow_path)
+                            
+                            if lint_results and lint_results.issues:
+                                has_lint_issues = True
+                                # 格式化 lint 问题
+                                formatted_issues = self._format_lint_issues(lint_results)
+                                lint_message = f"\n\n代码质量检查发现 {len(lint_results.issues)} 个问题:\n{formatted_issues}"
+                            else:
+                                lint_message = "\n\n代码质量检查通过，未发现问题。"
+                    except Exception as e:
+                        logger.error(f"Lint 检查失败: {str(e)}")
+                        lint_message = "\n\n尝试进行代码质量检查时出错。"
+                else:
+                    logger.info("代码质量检查已禁用")
+                
+                # 构建包含 lint 结果的返回消息
+                message = f"Successfully wrote to file: {file_path}"
+                
+                # 将 lint 消息添加到结果中，如果启用了Lint
+                if enable_lint:
+                    message += lint_message
+                
+                # 附加 lint 结果到返回内容
+                result_content = {
+                    "content": content,
+                }
+                
+                # 只有在启用Lint时才添加Lint结果
+                if enable_lint:
+                    result_content["lint_results"] = {
+                        "has_issues": has_lint_issues,
+                        "issues": formatted_issues if has_lint_issues else None
+                    }
+                
+                return ToolResult(success=True, message=message, content=result_content)
         except Exception as e:
             logger.error(f"Error writing to file '{file_path}': {str(e)}")
             return ToolResult(success=False, message=f"An error occurred while writing to the file: {str(e)}")

autocoder/common/v2/agent/agentic_edit_types.py

@@ -2,7 +2,6 @@ from pydantic import BaseModel
 from typing import List, Dict, Any, Callable, Optional, Type
 from pydantic import SkipValidation
 
-
 # Result class used by Tool Resolvers
 class ToolResult(BaseModel):
     success: bool
@@ -115,7 +114,7 @@ TOOL_MODEL_MAP: Dict[str, Type[BaseTool]] = {
     "attempt_completion": AttemptCompletionTool,
     "plan_mode_respond": PlanModeRespondTool,
     "use_mcp_tool": UseMcpTool,
-    "list_package_info": ListPackageInfoTool,
+    "list_package_info": ListPackageInfoTool,    
 }
 
 class FileChangeEntry(BaseModel):

autocoder/common/v2/agent/agentic_tool_display.py

@@ -93,8 +93,7 @@ TOOL_DISPLAY_MESSAGES: Dict[Type[BaseTool], Dict[str, str]] = {
             "[dim]工具：[/dim] [blue]{{ tool_name }}[/]\n"
             "[dim]参数：[/dim] {{ arguments_snippet }}{{ ellipsis }}"
         )
-    }    
-    # AttemptCompletionTool is handled separately in the display loop
+    }
 }
 
 def get_tool_display_message(tool: BaseTool) -> str:
@@ -172,7 +171,7 @@ def get_tool_display_message(tool: BaseTool) -> str:
             "tool_name": tool.tool_name,
             "arguments_snippet": snippet,
             "ellipsis": '...' if len(args_str) > 100 else ''
-        }
+        }    
     else:
         # Generic context for tools not specifically handled above
         context = tool.model_dump()