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

autocoder/auto_coder_runner.py

@@ -22,6 +22,8 @@ from autocoder.common.result_manager import ResultManager
 from autocoder.version import __version__
 from autocoder.auto_coder import main as auto_coder_main
 from autocoder.utils import get_last_yaml_file
+from autocoder.commands.auto_command import CommandAutoTuner, AutoCommandRequest, CommandConfig, MemoryConfig
+from autocoder.common.v2.agent.agentic_edit import AgenticEdit,AgenticEditRequest
 from autocoder.index.symbols_utils import (
     extract_symbols,
     SymbolType,
@@ -40,7 +42,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 
@@ -54,11 +60,12 @@ from autocoder.memory.active_context_manager import ActiveContextManager
 from autocoder.common.command_completer import CommandCompleter,FileSystemModel as CCFileSystemModel,MemoryConfig as CCMemoryModel
 from autocoder.common.conf_validator import ConfigValidator
 from autocoder import command_parser as CommandParser
-from loguru import logger
+from loguru import logger as global_logger
 from autocoder.utils.project_structure import EnhancedFileAnalyzer
+from autocoder.common import SourceCodeList,SourceCode
 
-## 对外API，用于第三方集成 auto-coder 使用。
 
+## 对外API，用于第三方集成 auto-coder 使用。
 class SymbolItem(BaseModel):
     symbol_name: str
     symbol_type: SymbolType
@@ -218,6 +225,36 @@ def get_all_extensions(directory: str = ".") -> str:
     # 转换为逗号分隔的字符串
     return ",".join(sorted(all_extensions))
 
+def configure_logger():
+    # 设置日志目录和文件
+    log_dir = os.path.join(project_root, ".auto-coder", "logs")
+    os.makedirs(log_dir, exist_ok=True)
+    log_file = os.path.join(log_dir, "auto-coder.log")
+
+    # 配置全局日志
+    # 默认情况下，所有日志都写入文件
+    # 控制台上默认不输出任何日志，除非显式配置
+    global_logger.configure(
+        handlers=[
+            {
+                "sink": log_file,
+                "level": "INFO",
+                "rotation": "10 MB",
+                "retention": "1 week",
+                "format": "{time:YYYY-MM-DD HH:mm:ss} | {level} | {name} | {message}",
+            },
+            {
+                "sink": sys.stdout,
+                "level": "INFO",
+                "format": "{time:YYYY-MM-DD HH:mm:ss} | {name} | {message}",
+                # 默认不打印任何日志到控制台
+                "filter": lambda record: False
+            }
+        ]
+    )
+
+configure_logger()
+
 def initialize_system(args:InitializeSystemRequest):
     from autocoder.utils.model_provider_selector import ModelProviderSelector
     from autocoder import models as models_module
@@ -2742,12 +2779,74 @@ def conf_import(path: str):
     from autocoder.common.conf_import_export import import_conf
     import_conf(os.getcwd(), path)
 
-@run_in_raw_thread()
-def auto_command(query: str,extra_args: Dict[str,Any]={}):
-    """处理/auto指令"""
-    from autocoder.commands.auto_command import CommandAutoTuner, AutoCommandRequest, CommandConfig, MemoryConfig
-    args = get_final_config()       
+def generate_new_yaml(query: str):
+    memory = get_memory()
+    conf = memory.get("conf",{})
+    current_files = memory.get("current_files",{}).get("files",[])
+    auto_coder_main(["next", "chat_action"])        
+    latest_yaml_file = get_last_yaml_file("actions")
+    if latest_yaml_file:
+        yaml_config = {
+            "include_file": ["./base/base.yml"],
+            "auto_merge": conf.get("auto_merge", "editblock"),
+            "human_as_model": conf.get("human_as_model", "false") == "true",
+            "skip_build_index": conf.get("skip_build_index", "true") == "true",
+            "skip_confirm": conf.get("skip_confirm", "true") == "true",
+            "silence": conf.get("silence", "true") == "true",
+            "include_project_structure": conf.get("include_project_structure", "true")
+            == "true",
+            "exclude_files": memory.get("exclude_files", []),
+        }
+        yaml_config["context"] = ""                    
+        for key, value in conf.items():
+            converted_value = convert_config_value(key, value)
+            if converted_value is not None:
+                yaml_config[key] = converted_value
+
+        yaml_config["urls"] = current_files + get_llm_friendly_package_docs(
+            return_paths=True
+        )
+        # handle image
+        v = Image.convert_image_paths_from(query)
+        yaml_config["query"] = v                    
+
+        yaml_content = convert_yaml_config_to_str(yaml_config=yaml_config)        
 
+        execute_file = os.path.join("actions", latest_yaml_file)
+        with open(os.path.join(execute_file), "w",encoding="utf-8") as f:
+            f.write(yaml_content)
+        return execute_file,convert_yaml_to_config(execute_file)
+
+@run_in_raw_thread()
+def auto_command(query: str,extra_args: Dict[str,Any]={}):    
+    """处理/auto指令"""        
+    args = get_final_config() 
+    memory = get_memory()         
+    if args.enable_agentic_edit:        
+        from autocoder.run_context import get_run_context,RunMode
+        execute_file,args = generate_new_yaml(query)
+        args.file = execute_file                      
+        current_files = memory.get("current_files",{}).get("files",[])
+        sources = []
+        for file in current_files:
+            with open(file,"r",encoding="utf-8") as f:
+                sources.append(SourceCode(module_name=file,source_code=f.read()))  
+                    
+        llm = get_single_llm(args.code_model or args.model,product_mode=args.product_mode) 
+        conversation_history = extra_args.get("conversations",[])   
+        agent = AgenticEdit(llm=llm,args=args,files=SourceCodeList(sources=sources), 
+                            conversation_history=conversation_history,
+                            memory_config=MemoryConfig(memory=memory, 
+                            save_memory_func=save_memory), command_config=CommandConfig,
+                            conversation_name="current"
+                            )
+        if get_run_context() == RunMode.TERMINAL:
+            agent.run_in_terminal(AgenticEditRequest(user_input=query))
+        else:
+            agent.run_with_events(AgenticEditRequest(user_input=query))
+        return
+        
+    args = get_final_config()  
     # 准备请求参数
     request = AutoCommandRequest(
         user_input=query        

autocoder/chat_auto_coder.py

@@ -668,8 +668,7 @@ def main():
             try:
                 # Shutdown all plugins before exiting
                 plugin_manager.shutdown_all()
-
-                save_memory()
+                # save_memory()
                 try:
                     if get_mcp_server():
                         get_mcp_server().stop()

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

@@ -272,6 +272,7 @@ class AutoCoderArgs(pydantic.BaseModel):
     index_model_anti_quota_limit: Optional[int] = 0
 
     enable_agentic_filter: Optional[bool] = False
+    enable_agentic_edit: Optional[bool] = False
     
 
     index_filter_level: Optional[int] = 0
@@ -416,6 +417,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,16 +787,92 @@ 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": "结束编译错误检查过程."
+    },
+    "/agent/edit/objective":{
+        "en":"Objective",
+        "zh":"目标"
+    },
+    "/agent/edit/user_query":{
+        "en":"User Query",
+        "zh":"用户查询"
+    }
 }
 
 
+# 新增 ReplaceInFileToolResolver 国际化消息
+MESSAGES.update({
+    "replace_in_file.access_denied": {
+        "en": "Error: Access denied. Attempted to modify file outside the project directory: {{file_path}}",
+        "zh": "错误：拒绝访问。尝试修改项目目录之外的文件：{{file_path}}"
+    },
+    "replace_in_file.file_not_found": {
+        "en": "Error: File not found at path: {{file_path}}",
+        "zh": "错误：未找到文件路径：{{file_path}}"
+    },
+    "replace_in_file.read_error": {
+        "en": "An error occurred while reading the file for replacement: {{error}}",
+        "zh": "读取待替换文件时发生错误：{{error}}"
+    },
+    "replace_in_file.no_valid_blocks": {
+        "en": "Error: No valid SEARCH/REPLACE blocks found in the provided diff.",
+        "zh": "错误：在提供的diff中未找到有效的SEARCH/REPLACE代码块。"
+    },
+    "replace_in_file.apply_failed": {
+        "en": "Failed to apply any changes. Errors:\n{{errors}}",
+        "zh": "未能应用任何更改。错误信息：\n{{errors}}"
+    },
+    "replace_in_file.apply_success": {
+        "en": "Successfully applied {{applied}}/{{total}} changes to file: {{file_path}}.",
+        "zh": "成功应用了 {{applied}}/{{total}} 个更改到文件：{{file_path}}。"
+    },
+    "replace_in_file.apply_success_with_warnings": {
+        "en": "Successfully applied {{applied}}/{{total}} changes to file: {{file_path}}.\nWarnings:\n{{errors}}",
+        "zh": "成功应用了 {{applied}}/{{total}} 个更改到文件：{{file_path}}。\n警告信息：\n{{errors}}"
+    },
+    "replace_in_file.write_error": {
+        "en": "An error occurred while writing the modified file: {{error}}",
+        "zh": "写入修改后的文件时发生错误：{{error}}"
+    }
+})
+
 def get_system_language():
     try:
         return locale.getdefaultlocale()[0][:2]

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:
         """