auto-coder 0.1.362__tar.gz → 0.1.364__tar.gz

{auto_coder-0.1.362 → auto_coder-0.1.364}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.362
+Version: 0.1.364
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10
@@ -28,7 +28,7 @@ Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
 Requires-Dist: aiofiles
 Requires-Dist: readerwriterlock
-Requires-Dist: byzerllm[saas]>=0.1.181
+Requires-Dist: byzerllm[saas]>=0.1.182
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.362 → auto_coder-0.1.364}/README.md

@@ -42,3 +42,4 @@ auto-coder.chat
 0. [Auto-Coder.Chat: 通向智能编程之路](https://uelng8wukz.feishu.cn/wiki/QIpkwpQo2iSdkwk9nP6cNSPlnPc)
 
 
+

{auto_coder-0.1.362 → auto_coder-0.1.364}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.362
+Version: 0.1.364
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10
@@ -28,7 +28,7 @@ Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
 Requires-Dist: aiofiles
 Requires-Dist: readerwriterlock
-Requires-Dist: byzerllm[saas]>=0.1.181
+Requires-Dist: byzerllm[saas]>=0.1.182
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.362 → auto_coder-0.1.364}/src/auto_coder.egg-info/SOURCES.txt

@@ -34,6 +34,31 @@ src/autocoder/agent/coder.py
 src/autocoder/agent/designer.py
 src/autocoder/agent/planner.py
 src/autocoder/agent/project_reader.py
+src/autocoder/agent/base_agentic/__init__.py
+src/autocoder/agent/base_agentic/agent_hub.py
+src/autocoder/agent/base_agentic/agentic_lang.py
+src/autocoder/agent/base_agentic/agentic_tool_display.py
+src/autocoder/agent/base_agentic/base_agent.py
+src/autocoder/agent/base_agentic/default_tools.py
+src/autocoder/agent/base_agentic/test_base_agent.py
+src/autocoder/agent/base_agentic/tool_registry.py
+src/autocoder/agent/base_agentic/types.py
+src/autocoder/agent/base_agentic/utils.py
+src/autocoder/agent/base_agentic/tools/__init__.py
+src/autocoder/agent/base_agentic/tools/ask_followup_question_tool_resolver.py
+src/autocoder/agent/base_agentic/tools/attempt_completion_tool_resolver.py
+src/autocoder/agent/base_agentic/tools/base_tool_resolver.py
+src/autocoder/agent/base_agentic/tools/example_tool_resolver.py
+src/autocoder/agent/base_agentic/tools/execute_command_tool_resolver.py
+src/autocoder/agent/base_agentic/tools/list_files_tool_resolver.py
+src/autocoder/agent/base_agentic/tools/plan_mode_respond_tool_resolver.py
+src/autocoder/agent/base_agentic/tools/read_file_tool_resolver.py
+src/autocoder/agent/base_agentic/tools/replace_in_file_tool_resolver.py
+src/autocoder/agent/base_agentic/tools/search_files_tool_resolver.py
+src/autocoder/agent/base_agentic/tools/talk_to_group_tool_resolver.py
+src/autocoder/agent/base_agentic/tools/talk_to_tool_resolver.py
+src/autocoder/agent/base_agentic/tools/use_mcp_tool_resolver.py
+src/autocoder/agent/base_agentic/tools/write_to_file_tool_resolver.py
 src/autocoder/chat/__init__.py
 src/autocoder/chat/conf_command.py
 src/autocoder/chat/models_command.py
@@ -114,6 +139,18 @@ src/autocoder/common/conversations/example.py
 src/autocoder/common/directory_cache/__init__.py
 src/autocoder/common/directory_cache/cache.py
 src/autocoder/common/directory_cache/test_cache.py
+src/autocoder/common/file_checkpoint/__init__.py
+src/autocoder/common/file_checkpoint/backup.py
+src/autocoder/common/file_checkpoint/examples.py
+src/autocoder/common/file_checkpoint/manager.py
+src/autocoder/common/file_checkpoint/models.py
+src/autocoder/common/file_checkpoint/store.py
+src/autocoder/common/file_checkpoint/test_backup.py
+src/autocoder/common/file_checkpoint/test_manager.py
+src/autocoder/common/file_checkpoint/test_models.py
+src/autocoder/common/file_checkpoint/test_store.py
+src/autocoder/common/file_checkpoint/test_utils.py
+src/autocoder/common/file_checkpoint/utils.py
 src/autocoder/common/file_monitor/__init__.py
 src/autocoder/common/file_monitor/monitor.py
 src/autocoder/common/ignorefiles/__init__.py
@@ -155,6 +192,7 @@ src/autocoder/common/v2/agent/agentic_edit_tools/read_file_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/replace_in_file_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/search_files_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/test_search_files_tool_resolver.py
+src/autocoder/common/v2/agent/agentic_edit_tools/test_write_to_file_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/use_mcp_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/write_to_file_tool_resolver.py
 src/autocoder/compilers/__init__.py
@@ -164,6 +202,7 @@ src/autocoder/compilers/compiler_config_manager.py
 src/autocoder/compilers/compiler_factory.py
 src/autocoder/compilers/java_compiler.py
 src/autocoder/compilers/models.py
+src/autocoder/compilers/normal_compiler.py
 src/autocoder/compilers/provided_compiler.py
 src/autocoder/compilers/python_compiler.py
 src/autocoder/compilers/reactjs_compiler.py
@@ -201,6 +240,7 @@ src/autocoder/linters/__init__.py
 src/autocoder/linters/base_linter.py
 src/autocoder/linters/linter_factory.py
 src/autocoder/linters/models.py
+src/autocoder/linters/normal_linter.py
 src/autocoder/linters/python_linter.py
 src/autocoder/linters/reactjs_linter.py
 src/autocoder/linters/shadow_linter.py
@@ -235,6 +275,9 @@ src/autocoder/rag/relevant_utils.py
 src/autocoder/rag/searchable.py
 src/autocoder/rag/simple_directory_reader.py
 src/autocoder/rag/simple_rag.py
+src/autocoder/rag/test_doc_filter.py
+src/autocoder/rag/test_long_context_rag.py
+src/autocoder/rag/test_token_limiter.py
 src/autocoder/rag/token_checker.py
 src/autocoder/rag/token_counter.py
 src/autocoder/rag/token_limiter.py
@@ -259,7 +302,6 @@ src/autocoder/rag/loaders/filter_utils.py
 src/autocoder/rag/loaders/image_loader.py
 src/autocoder/rag/loaders/pdf_loader.py
 src/autocoder/rag/loaders/ppt_loader.py
-src/autocoder/rag/loaders/test_image_loader.py
 src/autocoder/rag/stream_event/__init__.py
 src/autocoder/rag/stream_event/event_writer.py
 src/autocoder/rag/stream_event/types.py

{auto_coder-0.1.362 → auto_coder-0.1.364}/src/auto_coder.egg-info/requires.txt

@@ -18,7 +18,7 @@ prompt-toolkit
 tokenizers
 aiofiles
 readerwriterlock
-byzerllm[saas]>=0.1.181
+byzerllm[saas]>=0.1.182
 patch
 diff_match_patch
 GitPython

auto_coder-0.1.364/src/autocoder/agent/base_agentic/agent_hub.py

@@ -0,0 +1,169 @@
+import typing
+import byzerllm
+from typing import List, Dict, Optional, Literal, Any, Union
+from pydantic import BaseModel
+from loguru import logger
+import threading
+from concurrent.futures import ThreadPoolExecutor
+import os
+from datetime import datetime
+from .types import Message, ReplyDecision
+from .utils import GroupUtils,GroupMemberResponse
+
+if typing.TYPE_CHECKING:
+    from .base_agent import BaseAgent
+
+class AgentHub:
+    """管理所有Agent实例的全局中心"""
+    _instance = None
+    agents: Dict[str, 'BaseAgent'] = {}
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+        return cls._instance
+
+    @classmethod
+    def register_agent(cls, agent: 'BaseAgent'):
+        """注册一个新的Agent"""
+        if agent.name in cls.agents:
+            raise ValueError(f"Agent with name {agent.name} already exists")
+        cls.agents[agent.name] = agent
+
+    @classmethod
+    def get_agent(cls, name: str) -> Optional['BaseAgent']:
+        """根据名称获取Agent"""
+        return cls.agents.get(name)
+
+    @classmethod
+    def list_agents(cls) -> List[str]:
+        """获取所有Agent名称"""
+        return list(cls.agents.keys())
+
+    @classmethod
+    def get_all_groups(cls) -> List['Group']:
+        """获取所有群组实例"""
+        return list(GroupHub.groups.values())
+
+class GroupHub:
+    """管理所有Group实例的全局中心"""
+    _instance = None
+    groups: Dict[str, 'Group'] = {}
+    _groups_lock = threading.RLock()
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+        return cls._instance
+
+    @classmethod
+    def register_group(cls, group: 'Group'):
+        """注册一个新的Group"""
+        with cls._groups_lock:
+            if group.name in cls.groups:
+                raise ValueError(f"Group with name {group.name} already exists")
+            cls.groups[group.name] = group
+
+    @classmethod
+    def get_group(cls, name: str) -> Optional['Group']:
+        """根据名称获取Group"""
+        with cls._groups_lock:
+            return cls.groups.get(name)
+
+    @classmethod
+    def list_groups(cls) -> List[str]:
+        """获取所有Group名称"""
+        with cls._groups_lock:
+            return list(cls.groups.keys())
+
+
+
+class Group:
+    # 类级线程池（所有 Group 实例共享）
+    _executor = ThreadPoolExecutor(max_workers=min(32, (os.cpu_count() or 1) * 4 + 4))
+    
+    def __init__(self, name: str):
+        self.name = name
+        self.members: List[Agent] = []
+        self.history: List[Message] = []
+        # 成员列表和消息历史的读写锁
+        self._members_lock = threading.RLock()
+        self._history_lock = threading.RLock()
+        # 自动注册到GroupHub
+        GroupHub.register_group(self)
+        
+    def add_member(self, agent: 'Agent'):
+        with self._members_lock:
+            if agent not in self.members:
+                self.members.append(agent)
+                with agent._group_lock:  # 访问 Agent 的锁
+                    agent.joined_groups[self.name] = self
+    
+    def _safe_send_message(self, member: 'Agent', message: Message, print_conversation: bool):
+        try:                        
+            # 调用 Agent 的线程安全接收方法
+            member.threadsafe_receive(message,print_conversation=print_conversation)
+        except Exception as e:
+            import traceback
+            traceback.print_exc()
+            logger.error(f"Message delivery failed to {member.name}: {str(e)}")
+
+    def _handle_send_result(self, future):
+        try:
+            future.result()
+        except Exception as e:            
+            logger.error(f"Message delivery error: {str(e)}")
+            
+    def broadcast(self, message: Message, print_conversation: bool = False):
+        # 消息历史写入需要同步
+        with self._history_lock:
+            self.history.append(message)
+        
+        # 使用线程池并行发送
+        futures = []
+        with self._members_lock:  # 保护成员列表遍历
+            current_members = self.members.copy()
+        
+        for member in current_members:
+            if member.name == message.sender:
+                continue
+                
+            futures.append(
+                self._executor.submit(
+                    self._safe_send_message,
+                    member, message, print_conversation
+                )
+            )
+
+        # 异步等待所有任务完成（可选）
+        for future in futures:
+            future.add_done_callback(self._handle_send_result)
+
+        if print_conversation:
+            with self._history_lock:  # 同步打印
+                print(f"[Group Broadcast End] {message.sender} finished broadcasting to {self.name} group")                
+
+
+class GroupMembership:
+    def __init__(self, agent: 'BaseAgent', group: 'Group'):
+        self.agent = agent
+        self.group = group
+        
+    def talk_to_all(self, content: str):
+        message = Message(
+            sender=self.agent.name,
+            content=content,
+            is_group=True,
+            group_name=self.group.name
+        )
+        self.group.broadcast(message)
+        
+    def talk_to(self, content: str, mentions: List['BaseAgent']):
+        message = Message(
+            sender=self.agent.name,
+            content=f"@{' @'.join([a.name for a in mentions])} {content}",
+            is_group=True,
+            group_name=self.group.name,
+            mentions=[a.name for a in mentions]
+        )
+        self.group.broadcast(message)

auto_coder-0.1.364/src/autocoder/agent/base_agentic/agentic_lang.py

@@ -0,0 +1,112 @@
+import locale
+from byzerllm.utils import format_str_jinja2
+
+MESSAGES = {
+    "auto_command_analyzing": {
+        "en": "Analyzing Command Request",
+        "zh": "正在分析命令请求"
+    },
+    # run_in_terminal方法的国际化文本
+    "agent_start": {
+        "en": "[bold cyan]Starting Agent: {{ project_name }}[/]",
+        "zh": "[bold cyan]启动代理: {{ project_name }}[/]"
+    },
+    "user_input": {
+        "en": "[bold]User Input:[/bold]\n{{ input }}",
+        "zh": "[bold]用户输入:[/bold]\n{{ input }}"
+    },
+    "user_input_title": {
+        "en": "Objective",
+        "zh": "目标"
+    },
+    "token_usage_log": {
+        "en": "Token Usage: Model={{ model }}, Input Tokens={{ input_tokens }}, Output Tokens={{ output_tokens }}, Input Cost=${{ input_cost }}, Output Cost=${{ output_cost }}",
+        "zh": "Token使用情况: 模型={{ model }}, 输入Token={{ input_tokens }}, 输出Token={{ output_tokens }}, 输入成本=${{ input_cost }}, 输出成本=${{ output_cost }}"
+    },
+    "tool_operation_title": {
+        "en": "🛠️ Operation: {{ tool_name }}",
+        "zh": "🛠️ 操作: {{ tool_name }}"
+    },
+    "tool_result_success_title": {
+        "en": "✅ Tool Result: {{ tool_name }}",
+        "zh": "✅ 工具结果: {{ tool_name }}"
+    },
+    "tool_result_failure_title": {
+        "en": "❌ Tool Result: {{ tool_name }}",
+        "zh": "❌ 工具结果: {{ tool_name }}"
+    },
+    "status": {
+        "en": "[bold]Status:[/bold] {{ status }}",
+        "zh": "[bold]状态:[/bold] {{ status }}"
+    },
+    "message": {
+        "en": "[bold]Message:[/bold] {{ message }}",
+        "zh": "[bold]消息:[/bold] {{ message }}"
+    },
+    "success_status": {
+        "en": "Success",
+        "zh": "成功"
+    },
+    "failure_status": {
+        "en": "Failure",
+        "zh": "失败"
+    },
+    "format_tool_error": {
+        "en": "Error formatting tool result content: {{ error }}",
+        "zh": "格式化工具结果内容时出错: {{ error }}"
+    },
+    "completion_title": {
+        "en": "🏁 Task Completed",
+        "zh": "🏁 任务完成"
+    },
+    "suggested_command": {
+        "en": "[dim]Suggested Command:[/dim] [bold cyan]{{ command }}[/]",
+        "zh": "[dim]建议命令:[/dim] [bold cyan]{{ command }}[/]"
+    },
+    "error_title": {
+        "en": "🔥 Error",
+        "zh": "🔥 错误"
+    },
+    "error_content": {
+        "en": "[bold red]Error:[/bold red] {{ message }}",
+        "zh": "[bold red]错误:[/bold red] {{ message }}"
+    },
+    "fatal_error_title": {
+        "en": "🔥 System Error",
+        "zh": "🔥 系统错误"
+    },
+    "fatal_error_content": {
+        "en": "[bold red]Fatal Error:[/bold red]\n{{ error }}",
+        "zh": "[bold red]致命错误:[/bold red]\n{{ error }}"
+    },
+    "shadow_merge_error": {
+        "en": "Error merging shadow changes to project: {{ error }}",
+        "zh": "合并影子更改到项目时出错: {{ error }}"
+    },
+    "agent_execution_complete": {
+        "en": "[bold cyan]Agent Execution Completed[/]",
+        "zh": "[bold cyan]代理执行完成[/]"
+    },
+    "unexpected_error": {
+        "en": "Unexpected error during agent execution:",
+        "zh": "代理执行过程中发生意外错误:"
+    }
+}
+
+
+def get_system_language():
+    try:
+        return locale.getdefaultlocale()[0][:2]
+    except:
+        return "en"
+
+
+def get_message(key):
+    lang = get_system_language()
+    if key in MESSAGES:
+        return MESSAGES[key].get(lang, MESSAGES[key].get("en", ""))
+    return ""
+
+
+def get_message_with_format(msg_key: str, **kwargs):
+    return format_str_jinja2(get_message(msg_key), **kwargs)

auto_coder-0.1.364/src/autocoder/agent/base_agentic/agentic_tool_display.py

@@ -0,0 +1,180 @@
+import json
+from typing import Dict, Callable, Type
+from autocoder.common.auto_coder_lang import get_system_language, format_str_jinja2
+from autocoder.agent.base_agentic.types import (
+    BaseTool,
+    ReadFileTool, WriteToFileTool, ReplaceInFileTool, ExecuteCommandTool,
+    ListFilesTool, SearchFilesTool,
+    AskFollowupQuestionTool, UseMcpTool, AttemptCompletionTool
+)
+
+# Define message templates for each tool in English and Chinese
+TOOL_DISPLAY_MESSAGES: Dict[Type[BaseTool], Dict[str, str]] = {
+    ReadFileTool: {
+        "en": "AutoCoder wants to read this file:\n[bold cyan]{{ path }}[/]",
+        "zh": "AutoCoder 想要读取此文件：\n[bold cyan]{{ path }}[/]"
+    },
+    WriteToFileTool: {
+        "en": (
+            "AutoCoder wants to write to this file:\n[bold cyan]{{ path }}[/]\n\n"
+            "[dim]Content Snippet:[/dim]\n{{ content_snippet }}{{ ellipsis }}"
+        ),
+        "zh": (
+            "AutoCoder 想要写入此文件：\n[bold cyan]{{ path }}[/]\n\n"
+            "[dim]内容片段：[/dim]\n{{ content_snippet }}{{ ellipsis }}"
+        )
+    },
+    ReplaceInFileTool: {
+        "en": (
+            "AutoCoder wants to replace content in this file:\n[bold cyan]{{ path }}[/]\n\n"
+            "[dim]Diff Snippet:[/dim]\n{{ diff_snippet }}{{ ellipsis }}"
+        ),
+        "zh": (
+            "AutoCoder 想要替换此文件中的内容：\n[bold cyan]{{ path }}[/]\n\n"
+            "[dim]差异片段：[/dim]\n{{ diff_snippet }}{{ ellipsis }}"
+        )
+    },
+    ExecuteCommandTool: {
+        "en": (
+            "AutoCoder wants to execute this command:\n[bold yellow]{{ command }}[/]\n"
+            "[dim](Requires Approval: {{ requires_approval }})[/]"
+        ),
+        "zh": (
+            "AutoCoder 想要执行此命令：\n[bold yellow]{{ command }}[/]\n"
+            "[dim](需要批准：{{ requires_approval }})[/]"
+        )
+    },
+    ListFilesTool: {
+        "en": (
+            "AutoCoder wants to list files in:\n[bold green]{{ path }}[/] "
+            "{{ recursive_text }}"
+        ),
+        "zh": (
+            "AutoCoder 想要列出此目录中的文件：\n[bold green]{{ path }}[/] "
+            "{{ recursive_text }}"
+        )
+    },
+    SearchFilesTool: {
+        "en": (
+            "AutoCoder wants to search files in:\n[bold green]{{ path }}[/]\n"
+            "[dim]File Pattern:[/dim] [yellow]{{ file_pattern }}[/]\n"
+            "[dim]Regex:[/dim] [yellow]{{ regex }}[/]"
+        ),
+        "zh": (
+            "AutoCoder 想要在此目录中搜索文件：\n[bold green]{{ path }}[/]\n"
+            "[dim]文件模式：[/dim] [yellow]{{ file_pattern }}[/]\n"
+            "[dim]正则表达式：[/dim] [yellow]{{ regex }}[/]"
+        )
+    },
+    
+    AskFollowupQuestionTool: {
+        "en": (
+            "AutoCoder is asking a question:\n[bold magenta]{{ question }}[/]\n"
+            "{{ options_text }}"
+        ),
+        "zh": (
+            "AutoCoder 正在提问：\n[bold magenta]{{ question }}[/]\n"
+            "{{ options_text }}"
+        )
+    },
+    UseMcpTool: {
+        "en": (
+            "AutoCoder wants to use an MCP tool:\n"
+            "[dim]Server:[/dim] [blue]{{ server_name }}[/]\n"
+            "[dim]Tool:[/dim] [blue]{{ tool_name }}[/]\n"
+            "[dim]Args:[/dim] {{ arguments_snippet }}{{ ellipsis }}"
+        ),
+        "zh": (
+            "AutoCoder 想要使用 MCP 工具：\n"
+            "[dim]服务器：[/dim] [blue]{{ server_name }}[/]\n"
+            "[dim]工具：[/dim] [blue]{{ tool_name }}[/]\n"
+            "[dim]参数：[/dim] {{ arguments_snippet }}{{ ellipsis }}"
+        )
+    }
+}
+
+def get_tool_display_message(tool: BaseTool) -> str:
+    """
+    Generates a user-friendly, internationalized string representation for a tool call.
+
+    Args:
+        tool: The tool instance (Pydantic model).
+
+    Returns:
+        A formatted string for display in the terminal.
+    """
+    lang = get_system_language()
+    tool_type = type(tool)
+
+    if tool_type not in TOOL_DISPLAY_MESSAGES:
+        # Fallback for unknown tools
+        return f"Unknown tool type: {tool_type.__name__}\nData: {tool.model_dump_json(indent=2)}"
+
+    templates = TOOL_DISPLAY_MESSAGES[tool_type]
+    template = templates.get(lang, templates.get("en", "Tool display template not found")) # Fallback to English
+
+    # Prepare context specific to each tool type
+    context = {}
+    if isinstance(tool, ReadFileTool):
+        context = {"path": tool.path}
+    elif isinstance(tool, WriteToFileTool):
+        snippet = tool.content[:150]
+        context = {
+            "path": tool.path,
+            "content_snippet": snippet,
+            "ellipsis": '...' if len(tool.content) > 150 else ''
+        }
+    elif isinstance(tool, ReplaceInFileTool):
+        snippet = tool.diff
+        context = {
+            "path": tool.path,
+            "diff_snippet": snippet,
+            "ellipsis": ''
+        }
+    elif isinstance(tool, ExecuteCommandTool):
+        context = {"command": tool.command, "requires_approval": tool.requires_approval}
+    elif isinstance(tool, ListFilesTool):
+        rec_text_en = '(Recursively)' if tool.recursive else '(Top Level)'
+        rec_text_zh = '（递归）' if tool.recursive else '（顶层）'
+        context = {
+            "path": tool.path,
+            "recursive_text": rec_text_zh if lang == 'zh' else rec_text_en
+        }
+    elif isinstance(tool, SearchFilesTool):
+        context = {
+            "path": tool.path,
+            "file_pattern": tool.file_pattern or '*',
+            "regex": tool.regex
+        }
+    elif isinstance(tool, ListCodeDefinitionNamesTool):
+        context = {"path": tool.path}
+    elif isinstance(tool, AskFollowupQuestionTool):
+        options_text_en = ""
+        options_text_zh = ""
+        if tool.options:
+            options_list_en = "\n".join([f"- {opt}" for opt in tool.options])
+            options_list_zh = "\n".join([f"- {opt}" for opt in tool.options]) # Assuming options are simple enough not to need translation
+            options_text_en = f"[dim]Options:[/dim]\n{options_list_en}"
+            options_text_zh = f"[dim]选项：[/dim]\n{options_list_zh}"
+        context = {
+            "question": tool.question,
+            "options_text": options_text_zh if lang == 'zh' else options_text_en
+        }
+    elif isinstance(tool, UseMcpTool):
+        args_str = tool.query
+        snippet = args_str[:100]
+        context = {
+            "server_name": tool.server_name,
+            "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()
+
+    try:
+        return format_str_jinja2(template, **context)
+    except Exception as e:
+        # Fallback in case of formatting errors
+        return f"Error formatting display for {tool_type.__name__}: {e}\nTemplate: {template}\nContext: {context}"