hud-python 0.4.1__py3-none-any.whl → 0.4.3__py3-none-any.whl

hud/agents/base.py

@@ -1,599 +1,599 @@
-"""Base MCP Agent implementation."""
-
-from __future__ import annotations
-
-import asyncio
-import json
-import logging
-from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Any, Literal
-
-import mcp.types as types
-
-from hud.types import AgentResponse, MCPToolCall, MCPToolResult, Trace
-from hud.utils.mcp import MCPConfigPatch, patch_mcp_config, setup_hud_telemetry
-
-if TYPE_CHECKING:
-    from hud.clients.base import AgentMCPClient
-    from hud.datasets import Task
-
-    from .misc import ResponseAgent
-
-
-logger = logging.getLogger(__name__)
-
-GLOBAL_SYSTEM_PROMPT = "You are an assistant that can use tools to help the user. You will be given a task and you will need to use the tools to complete the task."  # noqa: E501
-
-
-class MCPAgent(ABC):
-    """
-    Base class for MCP-enabled agents.
-
-    This class provides the foundation for agents that interact with MCP servers,
-    handling tool discovery and filtering while leaving provider-specific
-    implementation details to subclasses.
-    """
-
-    metadata: dict[str, Any]
-
-    def __init__(
-        self,
-        mcp_client: AgentMCPClient | None = None,
-        # Filtering
-        allowed_tools: list[str] | None = None,
-        disallowed_tools: list[str] | None = None,
-        lifecycle_tools: list[str] | None = None,
-        # Messages
-        system_prompt: str = GLOBAL_SYSTEM_PROMPT,
-        append_setup_output: bool = True,
-        initial_screenshot: bool = True,
-        # Misc
-        model_name: str = "mcp-agent",
-        response_agent: ResponseAgent | None = None,
-        auto_trace: bool = True,
-    ) -> None:
-        """
-        Initialize the base MCP agent.
-
-        Args:
-            mcp_client: AgentMCPClient instance for server connections
-            allowed_tools: List of tool names to allow (None = all tools)
-            disallowed_tools: List of tool names to disallow
-            lifecycle_tools: List of tool names to use for lifecycle tools
-            initial_screenshot: Whether to capture screenshot before first prompt
-            system_prompt: System prompt to use
-            append_setup_output: Whether to append setup tool output to initial messages
-        """
-
-        self.mcp_client = mcp_client
-        self._auto_created_client = False  # Track if we created the client
-
-        self.model_name = model_name
-
-        # Filtering
-        self.allowed_tools = allowed_tools
-        self.disallowed_tools = disallowed_tools or []
-        self.lifecycle_tools = lifecycle_tools or []
-
-        # Messages
-        self.system_prompt = system_prompt
-        self.append_setup_output = append_setup_output
-        self.initial_screenshot = initial_screenshot
-
-        # Initialize these here so methods can be called before initialize()
-        self._available_tools: list[types.Tool] = []
-        self._tool_map: dict[str, types.Tool] = {}  # Simplified: just name to tool
-        self.screenshot_history: list[str] = []
-        self._auto_trace = auto_trace
-        self.initialization_complete = False
-
-        # Response agent to automatically interact with the model
-        self.response_agent = response_agent
-
-    async def initialize(self, task: str | Task | None = None) -> None:
-        """Initialize the agent with task-specific configuration."""
-        from hud.datasets import Task
-
-        # Create client if needed
-        if self.mcp_client is None and isinstance(task, Task) and task.mcp_config:
-            from hud.clients import MCPClient
-
-            self.mcp_client = MCPClient(mcp_config=task.mcp_config)
-            self._auto_created_client = True
-            logger.info("Auto-created MCPClient from task.mcp_config")
-
-        # Ensure we have a client
-        if self.mcp_client is None:
-            raise ValueError(
-                "No MCPClient. Please provide one when initializing the agent or pass a Task with mcp_config."  # noqa: E501
-            )
-
-        await self._setup_config(self.mcp_client.mcp_config)
-
-        # Initialize client if needed
-        await self.mcp_client.initialize()
-
-        # If task is provided, add lifecycle tools
-        if isinstance(task, Task):
-            if task.setup_tool:
-                if isinstance(task.setup_tool, list):
-                    for tool in task.setup_tool:
-                        self.lifecycle_tools.append(tool.name)
-                else:
-                    self.lifecycle_tools.append(task.setup_tool.name)
-            if task.evaluate_tool:
-                if isinstance(task.evaluate_tool, list):
-                    for tool in task.evaluate_tool:
-                        self.lifecycle_tools.append(tool.name)
-                else:
-                    self.lifecycle_tools.append(task.evaluate_tool.name)
-            if task.system_prompt:
-                self.system_prompt += "\n\n" + task.system_prompt
-
-        # Re-apply filtering with updated lifecycle tools
-        await self._filter_tools()
-
-        logger.info(
-            "Agent initialized with %d available tools (after filtering)",
-            len(self._available_tools),
-        )
-
-    async def run(self, prompt_or_task: str | Task | dict[str, Any], max_steps: int = 10) -> Trace:
-        """
-        Run the agent with the given prompt or task.
-
-        Args:
-            prompt_or_task: Either a string prompt for simple execution or a Task object
-            max_steps: Maximum number of steps (-1 for infinite)
-
-        Returns:
-            Trace with reward, done, content, isError fields and trace steps
-        """
-        # Import here to avoid circular imports
-        from hud.datasets import Task
-
-        if isinstance(prompt_or_task, dict):
-            prompt_or_task = Task(**prompt_or_task)
-
-        try:
-            # Establish the connection with the MCP server/Environment
-            if not self.initialization_complete:
-                await self.initialize(prompt_or_task)
-                self.initialization_complete = True
-
-            # Handle Task objects with full lifecycle
-            if isinstance(prompt_or_task, Task):
-                return await self.run_task(prompt_or_task, max_steps)
-
-            # Handle simple string prompts
-            elif isinstance(prompt_or_task, str):
-                context = text_to_blocks(prompt_or_task)
-                return await self._run_context(context, max_steps=max_steps)
-
-            else:
-                raise TypeError(f"prompt_or_task must be str or Task, got {type(prompt_or_task)}")
-        finally:
-            # Cleanup auto-created resources
-            await self._cleanup()
-
-    async def run_task(self, task: Task, max_steps: int = 10) -> Trace:
-        """
-        Execute a task with setup and evaluate phases.
-
-        Args:
-            task: Task object with prompt, setup, and evaluate configs
-            max_steps: Maximum steps for task execution (-1 for infinite)
-
-        Returns:
-            Trace with reward from evaluation
-        """
-        prompt_result = None
-
-        try:
-            # Setup phase
-            start_context: list[types.ContentBlock] = []
-
-            # Extract the initial task information
-            if task.prompt:
-                start_context.extend(text_to_blocks(task.prompt))
-
-            # Execute the setup tool and append the initial observation to the context
-            if task.setup_tool is not None:
-                logger.info("Setting up tool phase: %s", task.setup_tool)
-                results = await self.call_tools(task.setup_tool)
-                if any(result.isError for result in results):
-                    raise RuntimeError(f"{results}")
-
-                if self.append_setup_output and isinstance(results[0].content, list):
-                    start_context.extend(results[0].content)
-            if not self.initial_screenshot:
-                start_context = await self._filter_messages(start_context, include_types=["text"])
-
-            # Execute the task (agent loop) - this returns a empty trace object with the final response  # noqa: E501
-            prompt_result = await self._run_context(start_context, max_steps=max_steps)
-
-        except Exception as e:
-            logger.error("Task execution failed: %s", e)
-            # Create an error result but don't return yet - we still want to evaluate
-            prompt_result = Trace(reward=0.0, done=True, content=str(e), isError=True)
-            prompt_result.populate_from_context()
-
-        # Always evaluate if we have a prompt result and evaluate tool
-        if prompt_result is not None and task.evaluate_tool is not None:
-            try:
-                logger.info("Evaluating tool phase: %s", task.evaluate_tool)
-                results = await self.call_tools(task.evaluate_tool)
-
-                if any(result.isError for result in results):
-                    raise RuntimeError(f"{results}")
-
-                # Extract reward and content from evaluation
-                if results:
-                    reward = find_reward(results[0])
-                    eval_content = find_content(results[0])
-
-                    # Update the prompt result with evaluation reward
-                    prompt_result.reward = reward
-
-                    # Update the prompt result with evaluation content (if available)
-                    if eval_content:
-                        # Prompt result may already have final response content, so we append to it
-                        if prompt_result.content:
-                            prompt_result.content += "\n\n" + eval_content
-                        else:
-                            prompt_result.content = eval_content
-
-            except Exception as e:
-                logger.error("Evaluation phase failed: %s", e)
-                # Continue with the prompt result even if evaluation failed
-
-        return (
-            prompt_result
-            if prompt_result
-            else Trace(reward=0.0, done=True, content="No result available", isError=True)
-        )
-
-    async def _run_context(
-        self, context: list[types.ContentBlock], *, max_steps: int = 10
-    ) -> Trace:
-        """
-        Run the agent with the given context messages. This is the core agent loop.
-
-        Args:
-            context: The context to complete
-            max_steps: Maximum number of steps (-1 for infinite)
-
-        Returns:
-            Trace with reward, done, content fields and trace steps
-        """
-        final_response = None
-        error = None
-
-        try:
-            # Start with system messages
-            messages = await self.get_system_messages()
-
-            # Add initial context
-            messages.extend(await self.format_message(context))
-            logger.debug("Messages: %s", messages)
-
-            step_count = 0
-            while max_steps == -1 or step_count < max_steps:
-                step_count += 1
-                if max_steps == -1:
-                    logger.info("Step %s (unlimited)", step_count)
-                else:
-                    logger.info("Step %s/%s", step_count, max_steps)
-
-                try:
-                    # 1. Get model response
-                    response = await self.get_response(messages)
-
-                    logger.info("Agent:\n%s", response)
-
-                    # Check if we should stop
-                    if response.done or not response.tool_calls:
-                        # Optional external ResponseAgent to decide whether to stop
-                        decision = "STOP"
-                        if self.response_agent is not None and response.content:
-                            try:
-                                decision = await self.response_agent.determine_response(
-                                    response.content
-                                )
-                            except Exception as e:
-                                logger.warning("ResponseAgent failed: %s", e)
-                        if decision == "STOP":
-                            logger.info("Stopping execution")
-                            final_response = response
-                            break
-                        else:
-                            logger.info("Continuing execution")
-                            messages.extend(await self.format_message(decision))
-                            continue
-
-                    # 2. Execute tools
-                    tool_calls = response.tool_calls
-                    tool_results = await self.call_tools(tool_calls)
-
-                    # 3. Format tool results and add to messages
-                    tool_messages = await self.format_tool_results(tool_calls, tool_results)
-                    messages.extend(tool_messages)
-
-                except Exception as e:
-                    logger.error("Step failed: %s", e)
-                    error = str(e)
-                    break
-
-        except KeyboardInterrupt:
-            logger.info("Agent execution interrupted by user")
-            error = "Interrupted by user"
-        except asyncio.CancelledError:
-            logger.info("Agent execution cancelled")
-            error = "Cancelled"
-        except Exception as e:
-            logger.error("Unexpected error: %s", e)
-            error = str(e)
-
-        # Build result
-        trace_result = Trace(
-            reward=0.0,  # Default - will be set by task evaluation if applicable
-            done=True,
-            content=final_response.content if final_response else None,
-            isError=error is not None,
-            info={"error": error} if error else {},
-        )
-
-        # Populate trace steps from current context
-        trace_result.populate_from_context()
-
-        return trace_result
-
-    async def call_tools(
-        self, tool_call: MCPToolCall | list[MCPToolCall] | None = None
-    ) -> list[MCPToolResult]:
-        """
-        Call a tool through the MCP client.
-
-        Args:
-            tool_call: MCPToolCall or list of MCPToolCall
-
-        Returns:
-            List of MCPToolResult
-        """
-        if tool_call is None:
-            return []
-
-        if isinstance(tool_call, MCPToolCall):
-            tool_call = [tool_call]
-
-        if self.mcp_client is None:
-            raise ValueError("Client is not initialized")
-
-        results: list[MCPToolResult] = []
-        for tc in tool_call:
-            try:
-                logger.info("Calling tool: %s", tc)
-                results.append(await self.mcp_client.call_tool(tc))
-            except TimeoutError as e:
-                logger.error("Tool execution timed out: %s", e)
-                try:
-                    await self.mcp_client.shutdown()
-                except Exception as close_err:
-                    logger.debug("Failed to close MCP client cleanly: %s", close_err)
-                raise
-            except Exception as e:
-                logger.error("Tool execution failed: %s", e)
-                results.append(_format_error_result(str(e)))
-        return results
-
-    @abstractmethod
-    async def get_system_messages(self) -> list[Any]:
-        """
-        Get the system prompt.
-        """
-        raise NotImplementedError
-
-    @abstractmethod
-    async def get_response(
-        self, messages: list[Any]
-    ) -> AgentResponse:  # maybe type messages as list[types.ContentBlock]
-        """
-        Get response from the model including any tool calls.
-
-        NOTE: Subclasses should decorate this method with:
-            @hud.instrument(span_type="agent", record_args=False, record_result=True)
-
-        Args:
-            messages: Current conversation messages
-
-        Returns:
-            AgentResponse with content, tool_calls, and done fields
-        """
-        raise NotImplementedError
-
-    @abstractmethod
-    async def format_blocks(self, blocks: list[types.ContentBlock]) -> list[Any]:
-        """
-        Format a list of content blocks into a list of messages.
-        """
-        raise NotImplementedError
-
-    @abstractmethod
-    async def format_tool_results(
-        self, tool_calls: list[MCPToolCall], tool_results: list[MCPToolResult]
-    ) -> list[Any]:
-        """
-        Format tool results into messages for the model.
-
-        Args:
-            tool_calls: List of MCPToolCall objects that were executed
-            tool_results: List of MCPToolResult objects from tool execution
-
-        Returns:
-            List of formatted messages to append to conversation
-        """
-        raise NotImplementedError
-
-    async def format_message(
-        self,
-        message: str
-        | list[str]
-        | types.ContentBlock
-        | list[types.ContentBlock]
-        | list[str | types.ContentBlock],
-    ) -> list[Any]:  # maybe type messages as list[types.ContentBlock]
-        """
-        Convencience function.
-
-        Format a single content message into a list of messages for the model.
-        """
-        blocks: list[types.ContentBlock] = []
-        if not isinstance(message, list):
-            message = [message]
-
-        for m in message:
-            if isinstance(m, str):
-                blocks.append(types.TextContent(text=m, type="text"))
-            elif isinstance(m, types.ContentBlock):
-                blocks.append(m)
-            else:
-                raise ValueError(f"Invalid message type: {type(m)}")
-
-        return await self.format_blocks(blocks)
-
-    async def _filter_tools(self) -> None:
-        """Apply tool filtering based on allowed/disallowed lists."""
-        # Get all tools from client
-        if self.mcp_client is None:
-            raise ValueError("MCP client is not initialized")
-
-        all_tools = await self.mcp_client.list_tools()
-
-        # Filter tools
-        self._available_tools = []
-        self._tool_map = {}
-
-        for tool in all_tools:
-            # Check if tool should be included
-            if self.allowed_tools and tool.name not in self.allowed_tools:
-                continue
-            if tool.name in self.disallowed_tools:
-                continue
-
-            self._available_tools.append(tool)
-            # Simplified mapping - just tool name to tool
-            self._tool_map[tool.name] = tool
-
-    async def _setup_config(self, mcp_config: dict[str, dict[str, Any]]) -> None:
-        """Inject metadata into the metadata of the initialize request."""
-        if self.metadata:
-            patch_mcp_config(
-                mcp_config,
-                MCPConfigPatch(meta=self.metadata),
-            )
-        setup_hud_telemetry(mcp_config, auto_trace=self._auto_trace)
-
-    def get_available_tools(self) -> list[types.Tool]:
-        """Get list of available MCP tools for LLM use (excludes lifecycle tools)."""
-        lifecycle_tool_names = self.lifecycle_tools
-        return [tool for tool in self._available_tools if tool.name not in lifecycle_tool_names]
-
-    def get_tool_schemas(self) -> list[dict]:
-        """Get tool schemas in a format suitable for the model."""
-        schemas = []
-        for tool in self.get_available_tools():
-            schema = {
-                "name": tool.name,
-                "description": tool.description,
-            }
-            if tool.inputSchema:
-                schema["parameters"] = tool.inputSchema
-            schemas.append(schema)
-        return schemas
-
-    async def _filter_messages(
-        self,
-        message_list: list[types.ContentBlock],
-        include_types: list[
-            Literal["text", "image", "audio", "resource_link", "embedded_resource"]
-        ],
-    ) -> list[types.ContentBlock]:
-        """
-        Filter a list of messages and return only the messages of the given types.
-
-        Args:
-            message_list: The list of messages to filter
-            include_types: List of types to include (None = all types)
-
-        Returns:
-            List of messages in provider-specific format
-        """
-        return [message for message in message_list if message.type in include_types]
-
-    async def _cleanup(self) -> None:
-        """Cleanup resources."""
-        if self._auto_created_client and self.mcp_client:
-            try:
-                await self.mcp_client.shutdown()
-                logger.info("Closed auto-created MCPClient")
-            except Exception as e:
-                logger.warning("Failed to close auto-created client: %s", e)
-            finally:
-                self.mcp_client = None
-                self._auto_created_client = False
-
-
-def _format_error_result(error_message: str) -> MCPToolResult:
-    return MCPToolResult(content=text_to_blocks(error_message), isError=True)
-
-
-def text_to_blocks(text: str) -> list[types.ContentBlock]:
-    return [types.TextContent(text=text, type="text")]
-
-
-def find_reward(result: MCPToolResult) -> float:
-    """Find the reward in the result.
-
-    Agent accepts "reward", "grade", "score"
-
-    If not found, return 0.0
-    """
-    accept_keys = ["reward", "grade", "score"]
-    for key in accept_keys:
-        if isinstance(result.structuredContent, dict) and key in result.structuredContent:
-            return result.structuredContent[key]
-    if isinstance(result.content, list):
-        for content in result.content:
-            if isinstance(content, types.TextContent):
-                try:
-                    json_content = json.loads(content.text)
-                    for key, value in json_content.items():
-                        if key in accept_keys:
-                            return value
-                except json.JSONDecodeError:
-                    pass
-    return 0.0
-
-
-def find_content(result: MCPToolResult) -> str | None:
-    """Find the content in the result.
-
-    Agent accepts "content", "text", "message", or "logs"
-
-    If not found, return 0.0
-    """
-    accept_keys = ["content", "text", "message", "logs"]
-    for key in accept_keys:
-        if isinstance(result.structuredContent, dict) and key in result.structuredContent:
-            return result.structuredContent[key]
-    if isinstance(result.content, list):
-        for content in result.content:
-            if isinstance(content, types.TextContent):
-                try:
-                    json_content = json.loads(content.text)
-                    for key, value in json_content.items():
-                        if key in accept_keys:
-                            return value
-                except json.JSONDecodeError:
-                    pass
-    return ""
+"""Base MCP Agent implementation."""
+
+from __future__ import annotations
+
+import asyncio
+import json
+import logging
+from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING, Any, Literal
+
+import mcp.types as types
+
+from hud.types import AgentResponse, MCPToolCall, MCPToolResult, Trace
+from hud.utils.mcp import MCPConfigPatch, patch_mcp_config, setup_hud_telemetry
+
+if TYPE_CHECKING:
+    from hud.clients.base import AgentMCPClient
+    from hud.datasets import Task
+
+    from .misc import ResponseAgent
+
+
+logger = logging.getLogger(__name__)
+
+GLOBAL_SYSTEM_PROMPT = "You are an assistant that can use tools to help the user. You will be given a task and you will need to use the tools to complete the task."  # noqa: E501
+
+
+class MCPAgent(ABC):
+    """
+    Base class for MCP-enabled agents.
+
+    This class provides the foundation for agents that interact with MCP servers,
+    handling tool discovery and filtering while leaving provider-specific
+    implementation details to subclasses.
+    """
+
+    metadata: dict[str, Any]
+
+    def __init__(
+        self,
+        mcp_client: AgentMCPClient | None = None,
+        # Filtering
+        allowed_tools: list[str] | None = None,
+        disallowed_tools: list[str] | None = None,
+        lifecycle_tools: list[str] | None = None,
+        # Messages
+        system_prompt: str = GLOBAL_SYSTEM_PROMPT,
+        append_setup_output: bool = True,
+        initial_screenshot: bool = True,
+        # Misc
+        model_name: str = "mcp-agent",
+        response_agent: ResponseAgent | None = None,
+        auto_trace: bool = True,
+    ) -> None:
+        """
+        Initialize the base MCP agent.
+
+        Args:
+            mcp_client: AgentMCPClient instance for server connections
+            allowed_tools: List of tool names to allow (None = all tools)
+            disallowed_tools: List of tool names to disallow
+            lifecycle_tools: List of tool names to use for lifecycle tools
+            initial_screenshot: Whether to capture screenshot before first prompt
+            system_prompt: System prompt to use
+            append_setup_output: Whether to append setup tool output to initial messages
+        """
+
+        self.mcp_client = mcp_client
+        self._auto_created_client = False  # Track if we created the client
+
+        self.model_name = model_name
+
+        # Filtering
+        self.allowed_tools = allowed_tools
+        self.disallowed_tools = disallowed_tools or []
+        self.lifecycle_tools = lifecycle_tools or []
+
+        # Messages
+        self.system_prompt = system_prompt
+        self.append_setup_output = append_setup_output
+        self.initial_screenshot = initial_screenshot
+
+        # Initialize these here so methods can be called before initialize()
+        self._available_tools: list[types.Tool] = []
+        self._tool_map: dict[str, types.Tool] = {}  # Simplified: just name to tool
+        self.screenshot_history: list[str] = []
+        self._auto_trace = auto_trace
+        self.initialization_complete = False
+
+        # Response agent to automatically interact with the model
+        self.response_agent = response_agent
+
+    async def initialize(self, task: str | Task | None = None) -> None:
+        """Initialize the agent with task-specific configuration."""
+        from hud.datasets import Task
+
+        # Create client if needed
+        if self.mcp_client is None and isinstance(task, Task) and task.mcp_config:
+            from hud.clients import MCPClient
+
+            self.mcp_client = MCPClient(mcp_config=task.mcp_config)
+            self._auto_created_client = True
+            logger.info("Auto-created MCPClient from task.mcp_config")
+
+        # Ensure we have a client
+        if self.mcp_client is None:
+            raise ValueError(
+                "No MCPClient. Please provide one when initializing the agent or pass a Task with mcp_config."  # noqa: E501
+            )
+
+        await self._setup_config(self.mcp_client.mcp_config)
+
+        # Initialize client if needed
+        await self.mcp_client.initialize()
+
+        # If task is provided, add lifecycle tools
+        if isinstance(task, Task):
+            if task.setup_tool:
+                if isinstance(task.setup_tool, list):
+                    for tool in task.setup_tool:
+                        self.lifecycle_tools.append(tool.name)
+                else:
+                    self.lifecycle_tools.append(task.setup_tool.name)
+            if task.evaluate_tool:
+                if isinstance(task.evaluate_tool, list):
+                    for tool in task.evaluate_tool:
+                        self.lifecycle_tools.append(tool.name)
+                else:
+                    self.lifecycle_tools.append(task.evaluate_tool.name)
+            if task.system_prompt:
+                self.system_prompt += "\n\n" + task.system_prompt
+
+        # Re-apply filtering with updated lifecycle tools
+        await self._filter_tools()
+
+        logger.info(
+            "Agent initialized with %d available tools (after filtering)",
+            len(self._available_tools),
+        )
+
+    async def run(self, prompt_or_task: str | Task | dict[str, Any], max_steps: int = 10) -> Trace:
+        """
+        Run the agent with the given prompt or task.
+
+        Args:
+            prompt_or_task: Either a string prompt for simple execution or a Task object
+            max_steps: Maximum number of steps (-1 for infinite)
+
+        Returns:
+            Trace with reward, done, content, isError fields and trace steps
+        """
+        # Import here to avoid circular imports
+        from hud.datasets import Task
+
+        if isinstance(prompt_or_task, dict):
+            prompt_or_task = Task(**prompt_or_task)
+
+        try:
+            # Establish the connection with the MCP server/Environment
+            if not self.initialization_complete:
+                await self.initialize(prompt_or_task)
+                self.initialization_complete = True
+
+            # Handle Task objects with full lifecycle
+            if isinstance(prompt_or_task, Task):
+                return await self.run_task(prompt_or_task, max_steps)
+
+            # Handle simple string prompts
+            elif isinstance(prompt_or_task, str):
+                context = text_to_blocks(prompt_or_task)
+                return await self._run_context(context, max_steps=max_steps)
+
+            else:
+                raise TypeError(f"prompt_or_task must be str or Task, got {type(prompt_or_task)}")
+        finally:
+            # Cleanup auto-created resources
+            await self._cleanup()
+
+    async def run_task(self, task: Task, max_steps: int = 10) -> Trace:
+        """
+        Execute a task with setup and evaluate phases.
+
+        Args:
+            task: Task object with prompt, setup, and evaluate configs
+            max_steps: Maximum steps for task execution (-1 for infinite)
+
+        Returns:
+            Trace with reward from evaluation
+        """
+        prompt_result = None
+
+        try:
+            # Setup phase
+            start_context: list[types.ContentBlock] = []
+
+            # Extract the initial task information
+            if task.prompt:
+                start_context.extend(text_to_blocks(task.prompt))
+
+            # Execute the setup tool and append the initial observation to the context
+            if task.setup_tool is not None:
+                logger.info("Setting up tool phase: %s", task.setup_tool)
+                results = await self.call_tools(task.setup_tool)
+                if any(result.isError for result in results):
+                    raise RuntimeError(f"{results}")
+
+                if self.append_setup_output and isinstance(results[0].content, list):
+                    start_context.extend(results[0].content)
+            if not self.initial_screenshot:
+                start_context = await self._filter_messages(start_context, include_types=["text"])
+
+            # Execute the task (agent loop) - this returns a empty trace object with the final response  # noqa: E501
+            prompt_result = await self._run_context(start_context, max_steps=max_steps)
+
+        except Exception as e:
+            logger.error("Task execution failed: %s", e)
+            # Create an error result but don't return yet - we still want to evaluate
+            prompt_result = Trace(reward=0.0, done=True, content=str(e), isError=True)
+            prompt_result.populate_from_context()
+
+        # Always evaluate if we have a prompt result and evaluate tool
+        if prompt_result is not None and task.evaluate_tool is not None:
+            try:
+                logger.info("Evaluating tool phase: %s", task.evaluate_tool)
+                results = await self.call_tools(task.evaluate_tool)
+
+                if any(result.isError for result in results):
+                    raise RuntimeError(f"{results}")
+
+                # Extract reward and content from evaluation
+                if results:
+                    reward = find_reward(results[0])
+                    eval_content = find_content(results[0])
+
+                    # Update the prompt result with evaluation reward
+                    prompt_result.reward = reward
+
+                    # Update the prompt result with evaluation content (if available)
+                    if eval_content:
+                        # Prompt result may already have final response content, so we append to it
+                        if prompt_result.content:
+                            prompt_result.content += "\n\n" + eval_content
+                        else:
+                            prompt_result.content = eval_content
+
+            except Exception as e:
+                logger.error("Evaluation phase failed: %s", e)
+                # Continue with the prompt result even if evaluation failed
+
+        return (
+            prompt_result
+            if prompt_result
+            else Trace(reward=0.0, done=True, content="No result available", isError=True)
+        )
+
+    async def _run_context(
+        self, context: list[types.ContentBlock], *, max_steps: int = 10
+    ) -> Trace:
+        """
+        Run the agent with the given context messages. This is the core agent loop.
+
+        Args:
+            context: The context to complete
+            max_steps: Maximum number of steps (-1 for infinite)
+
+        Returns:
+            Trace with reward, done, content fields and trace steps
+        """
+        final_response = None
+        error = None
+
+        try:
+            # Start with system messages
+            messages = await self.get_system_messages()
+
+            # Add initial context
+            messages.extend(await self.format_message(context))
+            logger.debug("Messages: %s", messages)
+
+            step_count = 0
+            while max_steps == -1 or step_count < max_steps:
+                step_count += 1
+                if max_steps == -1:
+                    logger.info("Step %s (unlimited)", step_count)
+                else:
+                    logger.info("Step %s/%s", step_count, max_steps)
+
+                try:
+                    # 1. Get model response
+                    response = await self.get_response(messages)
+
+                    logger.info("Agent:\n%s", response)
+
+                    # Check if we should stop
+                    if response.done or not response.tool_calls:
+                        # Optional external ResponseAgent to decide whether to stop
+                        decision = "STOP"
+                        if self.response_agent is not None and response.content:
+                            try:
+                                decision = await self.response_agent.determine_response(
+                                    response.content
+                                )
+                            except Exception as e:
+                                logger.warning("ResponseAgent failed: %s", e)
+                        if decision == "STOP":
+                            logger.info("Stopping execution")
+                            final_response = response
+                            break
+                        else:
+                            logger.info("Continuing execution")
+                            messages.extend(await self.format_message(decision))
+                            continue
+
+                    # 2. Execute tools
+                    tool_calls = response.tool_calls
+                    tool_results = await self.call_tools(tool_calls)
+
+                    # 3. Format tool results and add to messages
+                    tool_messages = await self.format_tool_results(tool_calls, tool_results)
+                    messages.extend(tool_messages)
+
+                except Exception as e:
+                    logger.error("Step failed: %s", e)
+                    error = str(e)
+                    break
+
+        except KeyboardInterrupt:
+            logger.info("Agent execution interrupted by user")
+            error = "Interrupted by user"
+        except asyncio.CancelledError:
+            logger.info("Agent execution cancelled")
+            error = "Cancelled"
+        except Exception as e:
+            logger.error("Unexpected error: %s", e)
+            error = str(e)
+
+        # Build result
+        trace_result = Trace(
+            reward=0.0,  # Default - will be set by task evaluation if applicable
+            done=True,
+            content=final_response.content if final_response else None,
+            isError=error is not None,
+            info={"error": error} if error else {},
+        )
+
+        # Populate trace steps from current context
+        trace_result.populate_from_context()
+
+        return trace_result
+
+    async def call_tools(
+        self, tool_call: MCPToolCall | list[MCPToolCall] | None = None
+    ) -> list[MCPToolResult]:
+        """
+        Call a tool through the MCP client.
+
+        Args:
+            tool_call: MCPToolCall or list of MCPToolCall
+
+        Returns:
+            List of MCPToolResult
+        """
+        if tool_call is None:
+            return []
+
+        if isinstance(tool_call, MCPToolCall):
+            tool_call = [tool_call]
+
+        if self.mcp_client is None:
+            raise ValueError("Client is not initialized")
+
+        results: list[MCPToolResult] = []
+        for tc in tool_call:
+            try:
+                logger.info("Calling tool: %s", tc)
+                results.append(await self.mcp_client.call_tool(tc))
+            except TimeoutError as e:
+                logger.error("Tool execution timed out: %s", e)
+                try:
+                    await self.mcp_client.shutdown()
+                except Exception as close_err:
+                    logger.debug("Failed to close MCP client cleanly: %s", close_err)
+                raise
+            except Exception as e:
+                logger.error("Tool execution failed: %s", e)
+                results.append(_format_error_result(str(e)))
+        return results
+
+    @abstractmethod
+    async def get_system_messages(self) -> list[Any]:
+        """
+        Get the system prompt.
+        """
+        raise NotImplementedError
+
+    @abstractmethod
+    async def get_response(
+        self, messages: list[Any]
+    ) -> AgentResponse:  # maybe type messages as list[types.ContentBlock]
+        """
+        Get response from the model including any tool calls.
+
+        NOTE: Subclasses should decorate this method with:
+            @hud.instrument(span_type="agent", record_args=False, record_result=True)
+
+        Args:
+            messages: Current conversation messages
+
+        Returns:
+            AgentResponse with content, tool_calls, and done fields
+        """
+        raise NotImplementedError
+
+    @abstractmethod
+    async def format_blocks(self, blocks: list[types.ContentBlock]) -> list[Any]:
+        """
+        Format a list of content blocks into a list of messages.
+        """
+        raise NotImplementedError
+
+    @abstractmethod
+    async def format_tool_results(
+        self, tool_calls: list[MCPToolCall], tool_results: list[MCPToolResult]
+    ) -> list[Any]:
+        """
+        Format tool results into messages for the model.
+
+        Args:
+            tool_calls: List of MCPToolCall objects that were executed
+            tool_results: List of MCPToolResult objects from tool execution
+
+        Returns:
+            List of formatted messages to append to conversation
+        """
+        raise NotImplementedError
+
+    async def format_message(
+        self,
+        message: str
+        | list[str]
+        | types.ContentBlock
+        | list[types.ContentBlock]
+        | list[str | types.ContentBlock],
+    ) -> list[Any]:  # maybe type messages as list[types.ContentBlock]
+        """
+        Convencience function.
+
+        Format a single content message into a list of messages for the model.
+        """
+        blocks: list[types.ContentBlock] = []
+        if not isinstance(message, list):
+            message = [message]
+
+        for m in message:
+            if isinstance(m, str):
+                blocks.append(types.TextContent(text=m, type="text"))
+            elif isinstance(m, types.ContentBlock):
+                blocks.append(m)
+            else:
+                raise ValueError(f"Invalid message type: {type(m)}")
+
+        return await self.format_blocks(blocks)
+
+    async def _filter_tools(self) -> None:
+        """Apply tool filtering based on allowed/disallowed lists."""
+        # Get all tools from client
+        if self.mcp_client is None:
+            raise ValueError("MCP client is not initialized")
+
+        all_tools = await self.mcp_client.list_tools()
+
+        # Filter tools
+        self._available_tools = []
+        self._tool_map = {}
+
+        for tool in all_tools:
+            # Check if tool should be included
+            if self.allowed_tools and tool.name not in self.allowed_tools:
+                continue
+            if tool.name in self.disallowed_tools:
+                continue
+
+            self._available_tools.append(tool)
+            # Simplified mapping - just tool name to tool
+            self._tool_map[tool.name] = tool
+
+    async def _setup_config(self, mcp_config: dict[str, dict[str, Any]]) -> None:
+        """Inject metadata into the metadata of the initialize request."""
+        if self.metadata:
+            patch_mcp_config(
+                mcp_config,
+                MCPConfigPatch(meta=self.metadata),
+            )
+        setup_hud_telemetry(mcp_config, auto_trace=self._auto_trace)
+
+    def get_available_tools(self) -> list[types.Tool]:
+        """Get list of available MCP tools for LLM use (excludes lifecycle tools)."""
+        lifecycle_tool_names = self.lifecycle_tools
+        return [tool for tool in self._available_tools if tool.name not in lifecycle_tool_names]
+
+    def get_tool_schemas(self) -> list[dict]:
+        """Get tool schemas in a format suitable for the model."""
+        schemas = []
+        for tool in self.get_available_tools():
+            schema = {
+                "name": tool.name,
+                "description": tool.description,
+            }
+            if tool.inputSchema:
+                schema["parameters"] = tool.inputSchema
+            schemas.append(schema)
+        return schemas
+
+    async def _filter_messages(
+        self,
+        message_list: list[types.ContentBlock],
+        include_types: list[
+            Literal["text", "image", "audio", "resource_link", "embedded_resource"]
+        ],
+    ) -> list[types.ContentBlock]:
+        """
+        Filter a list of messages and return only the messages of the given types.
+
+        Args:
+            message_list: The list of messages to filter
+            include_types: List of types to include (None = all types)
+
+        Returns:
+            List of messages in provider-specific format
+        """
+        return [message for message in message_list if message.type in include_types]
+
+    async def _cleanup(self) -> None:
+        """Cleanup resources."""
+        if self._auto_created_client and self.mcp_client:
+            try:
+                await self.mcp_client.shutdown()
+                logger.info("Closed auto-created MCPClient")
+            except Exception as e:
+                logger.warning("Failed to close auto-created client: %s", e)
+            finally:
+                self.mcp_client = None
+                self._auto_created_client = False
+
+
+def _format_error_result(error_message: str) -> MCPToolResult:
+    return MCPToolResult(content=text_to_blocks(error_message), isError=True)
+
+
+def text_to_blocks(text: str) -> list[types.ContentBlock]:
+    return [types.TextContent(text=text, type="text")]
+
+
+def find_reward(result: MCPToolResult) -> float:
+    """Find the reward in the result.
+
+    Agent accepts "reward", "grade", "score"
+
+    If not found, return 0.0
+    """
+    accept_keys = ["reward", "grade", "score"]
+    for key in accept_keys:
+        if isinstance(result.structuredContent, dict) and key in result.structuredContent:
+            return result.structuredContent[key]
+    if isinstance(result.content, list):
+        for content in result.content:
+            if isinstance(content, types.TextContent):
+                try:
+                    json_content = json.loads(content.text)
+                    for key, value in json_content.items():
+                        if key in accept_keys:
+                            return value
+                except json.JSONDecodeError:
+                    pass
+    return 0.0
+
+
+def find_content(result: MCPToolResult) -> str | None:
+    """Find the content in the result.
+
+    Agent accepts "content", "text", "message", or "logs"
+
+    If not found, return 0.0
+    """
+    accept_keys = ["content", "text", "message", "logs"]
+    for key in accept_keys:
+        if isinstance(result.structuredContent, dict) and key in result.structuredContent:
+            return result.structuredContent[key]
+    if isinstance(result.content, list):
+        for content in result.content:
+            if isinstance(content, types.TextContent):
+                try:
+                    json_content = json.loads(content.text)
+                    for key, value in json_content.items():
+                        if key in accept_keys:
+                            return value
+                except json.JSONDecodeError:
+                    pass
+    return ""