auto-coder 0.1.334__py3-none-any.whl → 0.1.335__py3-none-any.whl

autocoder/agent/agentic_edit_tools/write_to_file_tool_resolver.py

@@ -0,0 +1,98 @@
+import os
+import re
+from typing import Dict, Any, Optional, List, Tuple
+from .base_tool_resolver import BaseToolResolver
+from autocoder.agent.agentic_edit_types import WriteToFileTool, ToolResult  # Import ToolResult from types
+from loguru import logger
+
+
+class WriteToFileToolResolver(BaseToolResolver):
+    def __init__(self, agent: Optional[Any], tool: WriteToFileTool, args: Dict[str, Any]):
+        super().__init__(agent, tool, args)
+        self.tool: WriteToFileTool = tool  # For type hinting
+
+    def parse_diff(self, diff_content: str) -> List[Tuple[str, str]]:
+        """
+        Parses the diff content into a list of (search_block, replace_block) tuples.
+        """
+        blocks = []
+        # Regex to find SEARCH/REPLACE blocks, handling potential variations in line endings
+        pattern = re.compile(r"<<<<<<< SEARCH\r?\n(.*?)\r?\n=======\r?\n(.*?)\r?\n>>>>>>> REPLACE", re.DOTALL)
+        matches = pattern.findall(diff_content)
+        for search_block, replace_block in matches:
+            blocks.append((search_block, replace_block))
+        if not matches and diff_content.strip():
+            logger.warning(f"Could not parse any SEARCH/REPLACE blocks from diff: {diff_content}")
+        return blocks
+
+    def resolve(self) -> ToolResult:
+        file_path = self.tool.path
+        content = self.tool.content
+        source_dir = self.args.source_dir or "."
+        absolute_path = os.path.abspath(os.path.join(source_dir, file_path))
+
+        # Security check: ensure the path is within the source directory
+        if not absolute_path.startswith(os.path.abspath(source_dir)):
+            return ToolResult(success=False, message=f"Error: Access denied. Attempted to write file outside the project directory: {file_path}")
+
+        try:
+            # Create directories if they don't exist
+            os.makedirs(os.path.dirname(absolute_path), exist_ok=True)
+
+            # Check if the content contains SEARCH/REPLACE blocks
+            parsed_blocks = self.parse_diff(content)
+            if parsed_blocks:
+                # If file exists, read its current content
+                if os.path.exists(absolute_path):
+                    try:
+                        with open(absolute_path, 'r', encoding='utf-8', errors='replace') as f:
+                            original_content = f.read()
+                    except Exception as e:
+                        logger.error(f"Error reading existing file '{file_path}' for diff apply: {str(e)}")
+                        return ToolResult(success=False, message=f"An error occurred while reading the existing file: {str(e)}")
+                else:
+                    # If file does not exist, start with empty content
+                    original_content = ""
+
+                current_content = original_content
+                applied_count = 0
+                errors = []
+
+                for i, (search_block, replace_block) in enumerate(parsed_blocks):
+                    start_index = current_content.find(search_block)
+                    if start_index != -1:
+                        current_content = (
+                            current_content[:start_index]
+                            + replace_block
+                            + current_content[start_index + len(search_block):]
+                        )
+                        applied_count += 1
+                        logger.info(f"Applied SEARCH/REPLACE block {i+1} in file {file_path}")
+                    else:
+                        error_message = f"SEARCH block {i+1} not found in current content. Search block:\n---\n{search_block}\n---"
+                        logger.warning(error_message)
+                        errors.append(error_message)
+                        # Continue with next block
+
+                try:
+                    with open(absolute_path, 'w', encoding='utf-8') as f:
+                        f.write(current_content)
+                    message = f"Successfully applied {applied_count}/{len(parsed_blocks)} changes to file: {file_path}."
+                    if errors:
+                        message += "\nWarnings:\n" + "\n".join(errors)
+                    logger.info(message)
+                    return ToolResult(success=True, message=message, content=current_content)
+                except Exception as e:
+                    logger.error(f"Error writing replaced content to file '{file_path}': {str(e)}")
+                    return ToolResult(success=False, message=f"An error occurred while writing the modified file: {str(e)}")
+            else:
+                # No diff blocks detected, treat as full content overwrite
+                with open(absolute_path, 'w', encoding='utf-8') as f:
+                    f.write(content)
+
+                logger.info(f"Successfully wrote to file: {file_path}")
+                return ToolResult(success=True, message=f"Successfully wrote to file: {file_path}", content=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/agent/agentic_edit_types.py

@@ -0,0 +1,124 @@
+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
+    message: str
+    content: Any = None # Can store file content, command output, etc.
+
+# Pydantic Models for Tools
+class BaseTool(BaseModel):
+    pass
+
+class ExecuteCommandTool(BaseTool):
+    command: str
+    requires_approval: bool
+
+class ReadFileTool(BaseTool):
+    path: str
+
+class WriteToFileTool(BaseTool):
+    path: str
+    content: str
+
+class ReplaceInFileTool(BaseTool):
+    path: str
+    diff: str
+
+class SearchFilesTool(BaseTool):
+    path: str
+    regex: str
+    file_pattern: Optional[str] = None
+
+class ListFilesTool(BaseTool):
+    path: str
+    recursive: Optional[bool] = False
+
+class ListCodeDefinitionNamesTool(BaseTool):
+    path: str
+
+class AskFollowupQuestionTool(BaseTool):
+    question: str
+    options: Optional[List[str]] = None
+
+class AttemptCompletionTool(BaseTool):
+    result: str
+    command: Optional[str] = None
+
+class PlanModeRespondTool(BaseTool):
+    response: str
+    options: Optional[List[str]] = None
+
+class UseMcpTool(BaseTool):
+    server_name: str
+    tool_name: str
+    arguments: Dict[str, Any]
+
+class PlainTextOutput(BaseModel):
+    text: str
+
+
+# Mapping from tool tag names to Pydantic models
+TOOL_MODEL_MAP: Dict[str, Type[BaseTool]] = {
+    "execute_command": ExecuteCommandTool,
+    "read_file": ReadFileTool,
+    "write_to_file": WriteToFileTool,
+    "replace_in_file": ReplaceInFileTool,
+    "search_files": SearchFilesTool,
+    "list_files": ListFilesTool,
+    "list_code_definition_names": ListCodeDefinitionNamesTool,
+    "ask_followup_question": AskFollowupQuestionTool,
+    "attempt_completion": AttemptCompletionTool,
+    "plan_mode_respond": PlanModeRespondTool,
+    "use_mcp_tool": UseMcpTool,
+}
+
+
+class AgenticEditRequest(BaseModel):
+    user_input: str
+
+
+class FileOperation(BaseModel):
+    path: str
+    operation: str  # e.g., "MODIFY", "REFERENCE", "ADD", "REMOVE"
+class MemoryConfig(BaseModel):
+    """
+    A model to encapsulate memory configuration and operations.
+    """
+
+    memory: Dict[str, Any]
+    save_memory_func: SkipValidation[Callable]
+
+    class Config:
+        arbitrary_types_allowed = True
+
+
+class CommandConfig(BaseModel):
+    coding: SkipValidation[Callable]
+    chat: SkipValidation[Callable]
+    add_files: SkipValidation[Callable]
+    remove_files: SkipValidation[Callable]
+    index_build: SkipValidation[Callable]
+    index_query: SkipValidation[Callable]
+    list_files: SkipValidation[Callable]
+    ask: SkipValidation[Callable]
+    revert: SkipValidation[Callable]
+    commit: SkipValidation[Callable]
+    help: SkipValidation[Callable]
+    exclude_dirs: SkipValidation[Callable]
+    summon: SkipValidation[Callable]
+    design: SkipValidation[Callable]
+    mcp: SkipValidation[Callable]
+    models: SkipValidation[Callable]
+    lib: SkipValidation[Callable]
+    execute_shell_command: SkipValidation[Callable]
+    generate_shell_command: SkipValidation[Callable]
+    conf_export: SkipValidation[Callable]
+    conf_import: SkipValidation[Callable]
+    index_export: SkipValidation[Callable]
+    index_import: SkipValidation[Callable]
+    exclude_files: SkipValidation[Callable]
+

autocoder/auto_coder.py

@@ -52,6 +52,11 @@ from autocoder.privacy.model_filter import ModelPathFilter
 from autocoder.common.result_manager import ResultManager
 from autocoder.events.event_manager_singleton import get_event_manager
 from autocoder.events import event_content as EventContentCreator
+from autocoder.common.mcp_server import get_mcp_server
+from autocoder.common.mcp_server_types import (
+    McpRequest, McpInstallRequest, McpRemoveRequest, McpListRequest, 
+    McpListRunningRequest, McpRefreshRequest
+)
 
 console = Console()
 
@@ -1254,7 +1259,6 @@ def main(input_args: Optional[List[str]] = None):
                 v = (item for item in response)
                 
             elif "mcp" in commands_info: 
-                from autocoder.common.mcp_server import get_mcp_server, McpRequest, McpInstallRequest, McpRemoveRequest, McpListRequest, McpListRunningRequest, McpRefreshRequest                               
                 mcp_server = get_mcp_server()
                 
                 pos_args = commands_info["mcp"].get("args", [])

autocoder/auto_coder_runner.py

@@ -40,7 +40,11 @@ import git
 from autocoder.common import git_utils
 from autocoder.chat_auto_coder_lang import get_message
 from autocoder.agent.auto_guess_query import AutoGuessQuery
-from autocoder.common.mcp_server import get_mcp_server, McpRequest, McpInstallRequest, McpRemoveRequest, McpListRequest, McpListRunningRequest, McpRefreshRequest,McpServerInfoRequest
+from autocoder.common.mcp_server import get_mcp_server
+from autocoder.common.mcp_server_types import (
+    McpRequest, McpInstallRequest, McpRemoveRequest, McpListRequest, 
+    McpListRunningRequest, McpRefreshRequest, McpServerInfoRequest
+)
 import byzerllm
 from byzerllm.utils import format_str_jinja2
 from autocoder.common.memory_manager import get_global_memory_file_paths 

autocoder/chat_auto_coder_lang.py

@@ -30,6 +30,14 @@ MESSAGES = {
         "en": "Available builtin MCP servers:",
         "zh": "可用的内置 MCP 服务器："
     },
+    "mcp_list_external_title": {
+        "en": "Available external MCP servers:",
+        "zh": "可用的外部 MCP 服务器："
+    },
+    "mcp_list_marketplace_title": {
+        "en": "Available marketplace MCP servers:",
+        "zh": "可用的市场 MCP 服务器："
+    },
     "mcp_refresh_error": {
         "en": "Error refreshing MCP servers: {{error}}",
         "zh": "刷新 MCP 服务器时出错：{{error}}"
@@ -543,8 +551,8 @@ MESSAGES = {
         "zh": "用法: /plugins <命令>\n可用的子命令:\n  /plugins /list - 列出所有可用插件\n  /plugins /load <名称> - 加载一个插件\n  /plugins /unload <名称> - 卸载一个插件\n  /plugins/dirs - 列出插件目录\n  /plugins/dirs /add <路径> - 添加一个插件目录\n  /plugins/dirs /remove <路径> - 移除一个插件目录\n  /plugins/dirs /clear - 清除所有插件目录"
     },
     "mcp_server_info_error": {
-        "en": "Error getting MCP server info: {{ error }}",
-        "zh": "获取MCP服务器信息时出错: {{ error }}"
+        "en": "Error getting MCP server info: {{error}}",
+        "zh": "获取 MCP 服务器信息时出错：{{error}}"
     },
     "mcp_server_info_title": {
         "en": "Connected MCP Server Info",
@@ -553,6 +561,14 @@ MESSAGES = {
     "active_context_desc": {
         "en": "Manage active context tasks, list all tasks and their status",
         "zh": "管理活动上下文任务，列出所有任务及其状态"
+    },
+    "marketplace_add_success": {
+        "en": "Successfully added marketplace item: {{name}}",
+        "zh": "成功添加市场项目：{{name}}"
+    },
+    "marketplace_add_error": {
+        "en": "Error adding marketplace item: {{name}} - {{error}}",
+        "zh": "添加市场项目时出错：{{name}} - {{error}}"
     }
 }
 

autocoder/commands/tools.py

@@ -42,6 +42,11 @@ from autocoder.events.event_manager_singleton import get_event_manager
 from autocoder.events import event_content as EventContentCreator
 from autocoder.linters.linter_factory import LinterFactory, lint_file, lint_project, format_lint_result
 import traceback
+from autocoder.common.mcp_server import get_mcp_server
+from autocoder.common.mcp_server_types import (
+    McpRequest, McpInstallRequest, McpRemoveRequest, McpListRequest, 
+    McpListRunningRequest, McpRefreshRequest
+)
 
 
 @byzerllm.prompt()
@@ -76,7 +81,6 @@ class AutoCommandTools:
         self.printer = Printer()
 
     def execute_mcp_server(self, query: str) -> str:
-        from autocoder.common.mcp_server import get_mcp_server, McpRequest, McpInstallRequest, McpRemoveRequest, McpListRequest, McpListRunningRequest, McpRefreshRequest
         mcp_server = get_mcp_server()
         response = mcp_server.send_request(
             McpRequest(

autocoder/common/__init__.py

@@ -416,6 +416,7 @@ class AutoCoderArgs(pydantic.BaseModel):
     event_file: Optional[str] = None
 
     enable_active_context: Optional[bool] = False
+    enable_active_context_in_generate: Optional[bool] = False
 
     generate_max_rounds: Optional[int] = 5
 

autocoder/common/auto_coder_lang.py

@@ -453,7 +453,7 @@ MESSAGES = {
     "quick_filter_too_long": {
         "en": "⚠️ index file is too large ({{ tokens_len }}/{{ max_tokens }}). The query will be split into {{ split_size }} chunks.",
         "zh": "⚠️ 索引文件过大 ({{ tokens_len }}/{{ max_tokens }})。查询将被分成 {{ split_size }} 个部分执行。"
-    },        
+    },
     "quick_filter_tokens_len": {
         "en": "📊 Current index size: {{ tokens_len }} tokens",
         "zh": "📊 当前索引大小: {{ tokens_len }} tokens"
@@ -787,13 +787,45 @@ MESSAGES = {
         "zh": "已达到最大未合并代码块修复尝试次数"
     },
     "agenticFilterContext": {
-    "en": "Start to find context...",
-    "zh": "开始智能查找上下文...."
-  },
-  "agenticFilterContextFinished": {
-    "en": "End to find context...",
-    "zh": "结束智能查找上下文...."
-  }
+        "en": "Start to find context...",
+        "zh": "开始智能查找上下文...."
+    },
+    "agenticFilterContextFinished": {
+        "en": "End to find context...",
+        "zh": "结束智能查找上下文...."
+    },
+    "/context/check/start":{
+        "en": "Starting missing context checking process.",
+        "zh": "开始缺失上下文检查过程."
+    },
+    "/context/check/end": {
+        "en": "Finished missing context checking process.",
+        "zh": "结束缺失上下文检查过程."
+    },
+    "/unmerged_blocks/check/start": {
+        "en": "Starting unmerged blocks checking process.",
+        "zh": "开始未合并代码检查过程."
+    },
+    "/unmerged_blocks/check/end": {
+        "en": "Finished unmerged blocks checking process.",
+        "zh": "结束未合并代码检查过程."
+    },
+    "/lint/check/start": {
+        "en": "Starting lint error checking process.",
+        "zh": "开始代码质量检查过程."
+    },
+    "/lint/check/end": {
+        "en": "Finished lint error checking process.",
+        "zh": "结束代码质量检查过程."
+    },
+    "/compile/check/start": {
+        "en": "Starting compile error checking process.",
+        "zh": "开始编译错误检查过程."
+    },
+    "/compile/check/end": {
+        "en": "Finished compile error checking process.",
+        "zh": "结束编译错误检查过程."
+    }
 }
 
 

autocoder/common/code_auto_generate_diff.py

@@ -329,7 +329,7 @@ class CodeAutoGenerateDiff:
         # 获取包上下文信息
         package_context = ""
         
-        if self.args.enable_active_context:
+        if self.args.enable_active_context and self.args.enable_active_context_in_generate:
             # 初始化活动上下文管理器
             active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
             # 获取活动上下文信息

autocoder/common/code_auto_generate_editblock.py

@@ -438,7 +438,7 @@ class CodeAutoGenerateEditBlock:
             # 获取包上下文信息
             package_context = ""
             
-            if self.args.enable_active_context:
+            if self.args.enable_active_context and self.args.enable_active_context_in_generate:
                 # 获取活动上下文信息
                 result = active_context_manager.load_active_contexts_for_files(
                     [source.module_name for source in source_code_list.sources]

autocoder/common/code_auto_generate_strict_diff.py

@@ -299,7 +299,7 @@ class CodeAutoGenerateStrictDiff:
         # 获取包上下文信息
         package_context = ""
         
-        if self.args.enable_active_context:
+        if self.args.enable_active_context and self.args.enable_active_context_in_generate:
             # 初始化活动上下文管理器
             active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
             # 获取活动上下文信息

autocoder/common/mcp_hub.py

@@ -13,6 +13,7 @@ from pydantic import BaseModel, Field
 from loguru import logger
 from contextlib import AsyncExitStack
 from datetime import timedelta
+from autocoder.common.mcp_server_types import MarketplaceMCPServerItem
 
 try:
     from mcp import ClientSession
@@ -42,7 +43,6 @@ class McpResource(BaseModel):
     description: Optional[str] = None
     mime_type: Optional[str] = None
 
-
 class McpResourceTemplate(BaseModel):
     """Represents an MCP resource template"""
 
@@ -133,7 +133,7 @@ class McpHub:
             cls._instance._initialized = False
         return cls._instance
 
-    def __init__(self, settings_path: Optional[str] = None):
+    def __init__(self, settings_path: Optional[str] = None, marketplace_path: Optional[str] = None):
         if self._initialized:
             return
         """Initialize the MCP Hub with a path to settings file"""
@@ -141,6 +141,12 @@ class McpHub:
             self.settings_path = Path.home() / ".auto-coder" / "mcp" / "settings.json"
         else:
             self.settings_path = Path(settings_path)
+
+        if marketplace_path is None:
+            self.marketplace_path = Path.home() / ".auto-coder" / "mcp" / "marketplace.json"
+        else:
+            self.marketplace_path = Path(marketplace_path)
+
         self.connections: Dict[str, McpConnection] = {}
         self.is_connecting = False
         self.exit_stacks: Dict[str, AsyncExitStack] = {}
@@ -149,6 +155,11 @@ class McpHub:
         self.settings_path.parent.mkdir(parents=True, exist_ok=True)
         if not self.settings_path.exists():
             self._write_default_settings()
+            
+        # Ensure marketplace file exists
+        self.marketplace_path.parent.mkdir(parents=True, exist_ok=True)
+        if not self.marketplace_path.exists():
+            self._write_default_marketplace()
 
         self._initialized = True
 
@@ -157,6 +168,178 @@ class McpHub:
         default_settings = {"mcpServers": {}}
         with open(self.settings_path, "w", encoding="utf-8") as f:
             json.dump(default_settings, f, indent=2)
+            
+    def _write_default_marketplace(self):
+        """Write default marketplace file"""
+        default_marketplace = {"mcpServers": []}
+        with open(self.marketplace_path, "w", encoding="utf-8") as f:
+            json.dump(default_marketplace, f, indent=2)
+            
+    def _read_marketplace(self) -> Dict[str, List[Dict[str, Any]]]:
+        """Read marketplace file"""
+        try:
+            with open(self.marketplace_path,"r", encoding="utf-8") as f:
+                return json.load(f)
+        except Exception as e:
+            logger.error(f"Failed to read marketplace: {e}")
+            return {"mcpServers": []}
+            
+    def get_marketplace_items(self) -> List[MarketplaceMCPServerItem]:
+        """Get all marketplace items"""
+        data = self._read_marketplace()
+        return [MarketplaceMCPServerItem(**item) for item in data.get("mcpServers", [])]
+        
+    def get_marketplace_item(self, name: str) -> Optional[MarketplaceMCPServerItem]:
+        """Get a marketplace item by name"""
+        items = self.get_marketplace_items()
+        for item in items:
+            if item.name == name:
+                return item
+        return None
+    
+    async def add_marketplace_item(self, item: MarketplaceMCPServerItem) -> bool:
+        """
+        Add a new marketplace item
+        
+        Args:
+            item: MarketplaceMCPServerItem to add
+            
+        Returns:
+            bool: True if successful, False otherwise
+        """
+        try:
+            # Check if item with this name already exists
+            existing = self.get_marketplace_item(item.name)
+            if existing:
+                logger.warning(f"Marketplace item with name {item.name} already exists")
+                return False
+                
+            # Add the new item
+            data = self._read_marketplace()
+            data["mcpServers"].append(item.dict())
+            
+            # Write back to file
+            with open(self.marketplace_path, "w", encoding="utf-8") as f:
+                json.dump(data, f, indent=2, ensure_ascii=False)
+                
+            logger.info(f"Added marketplace item: {item.name}")
+            return True
+        except Exception as e:
+            logger.error(f"Failed to add marketplace item: {e}")
+            return False
+    
+    async def update_marketplace_item(self, name: str, updated_item: MarketplaceMCPServerItem) -> bool:
+        """
+        Update an existing marketplace item
+        
+        Args:
+            name: Name of the item to update
+            updated_item: Updated MarketplaceMCPServerItem
+            
+        Returns:
+            bool: True if successful, False otherwise
+        """
+        try:
+            data = self._read_marketplace()
+            items = data.get("mcpServers", [])
+            
+            # Find the item to update
+            for i, item in enumerate(items):
+                if item.get("name") == name:
+                    # Update the item
+                    items[i] = updated_item.model_dump()
+                    
+                    # Write back to file
+                    with open(self.marketplace_path, "w", encoding="utf-8") as f:
+                        json.dump(data, f, indent=2, ensure_ascii=False)
+                    
+                    logger.info(f"Updated marketplace item: {name}")
+                    return True
+            
+            logger.warning(f"Marketplace item with name {name} not found")
+            return False
+        except Exception as e:
+            logger.error(f"Failed to update marketplace item: {e}")
+            return False
+    
+    async def remove_marketplace_item(self, name: str) -> bool:
+        """
+        Remove a marketplace item
+        
+        Args:
+            name: Name of the item to remove
+            
+        Returns:
+            bool: True if successful, False otherwise
+        """
+        try:
+            data = self._read_marketplace()
+            items = data.get("mcpServers", [])
+            
+            # Find and remove the item
+            for i, item in enumerate(items):
+                if item.get("name") == name:
+                    del items[i]
+                    
+                    # Write back to file
+                    with open(self.marketplace_path, "w", encoding="utf-8") as f:
+                        json.dump(data, f, indent=2, ensure_ascii=False)
+                    
+                    logger.info(f"Removed marketplace item: {name}")
+                    return True
+            
+            logger.warning(f"Marketplace item with name {name} not found")
+            return False
+        except Exception as e:
+            logger.error(f"Failed to remove marketplace item: {e}")
+            return False
+            
+    async def apply_marketplace_item(self, name: str) -> bool:
+        """
+        Apply a marketplace item to server config
+        
+        Args:
+            name: Name of the item to apply
+            
+        Returns:
+            bool: True if successful, False otherwise
+        """
+        try:
+            item = self.get_marketplace_item(name)
+            if not item:
+                logger.warning(f"Marketplace item with name {name} not found")
+                return False
+                
+            # Convert marketplace item to server config
+            config = {}
+            
+            if item.mcp_type == "command":
+                config = {
+                    "command": item.command,
+                    "args": item.args,
+                    "env": item.env,
+                    "transport": {
+                        "type": "stdio",
+                        "endpoint": ""
+                    }
+                }
+            elif item.mcp_type == "sse":
+                config = {
+                    "transport": {
+                        "type": "sse",
+                        "endpoint": item.url
+                    }
+                }
+            else:
+                logger.error(f"Unknown MCP type: {item.mcp_type}")
+                return False
+                
+            # Add server config
+            result = await self.add_server_config(name, config)
+            return result
+        except Exception as e:
+            logger.error(f"Failed to apply marketplace item: {e}")
+            return False
 
     async def add_server_config(self, name: str, config: Dict[str, Any]) -> None:
         """