fast-agent-mcp 0.2.42__py3-none-any.whl → 0.2.44__py3-none-any.whl

mcp_agent/core/interactive_prompt.py

@@ -30,7 +30,7 @@ from mcp_agent.core.enhanced_prompt import (
     handle_special_commands,
 )
 from mcp_agent.core.usage_display import collect_agents_from_provider, display_usage_report
-from mcp_agent.mcp.mcp_aggregator import SEP  # Import SEP once at the top
+from mcp_agent.mcp.mcp_aggregator import SEP
 from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
 from mcp_agent.progress_display import progress_display
 
@@ -56,6 +56,7 @@ class PromptProvider(Protocol):
         prompt_title: Optional[str] = None,
         arguments: Optional[Dict[str, str]] = None,
         agent_name: Optional[str] = None,
+        as_template: bool = False,
         **kwargs,
     ) -> str:
         """Apply a prompt."""
@@ -188,6 +189,10 @@ class InteractivePrompt:
                         # Handle usage display
                         await self._show_usage(prompt_provider, agent)
                         continue
+                    elif "show_markdown" in command_result:
+                        # Handle markdown display
+                        await self._show_markdown(prompt_provider, agent)
+                        continue
 
                 # Skip further processing if:
                 # 1. The command was handled (command_result is truthy)
@@ -713,3 +718,57 @@ class InteractivePrompt:
 
         except Exception as e:
             rich_print(f"[red]Error showing usage: {e}[/red]")
+
+    async def _show_markdown(self, prompt_provider: PromptProvider, agent_name: str) -> None:
+        """
+        Show the last assistant message without markdown formatting.
+
+        Args:
+            prompt_provider: Provider that has access to agents
+            agent_name: Name of the current agent
+        """
+        try:
+            # Get agent to display from
+            if hasattr(prompt_provider, "_agent"):
+                # This is an AgentApp - get the specific agent
+                agent = prompt_provider._agent(agent_name)
+            else:
+                # This is a single agent
+                agent = prompt_provider
+
+            # Check if agent has message history
+            if not hasattr(agent, "_llm") or not agent._llm:
+                rich_print("[yellow]No message history available[/yellow]")
+                return
+
+            message_history = agent._llm.message_history
+            if not message_history:
+                rich_print("[yellow]No messages in history[/yellow]")
+                return
+
+            # Find the last assistant message
+            last_assistant_msg = None
+            for msg in reversed(message_history):
+                if msg.role == "assistant":
+                    last_assistant_msg = msg
+                    break
+
+            if not last_assistant_msg:
+                rich_print("[yellow]No assistant messages found[/yellow]")
+                return
+
+            # Get the text content and display without markdown
+            content = last_assistant_msg.last_text()
+
+            # Display with a simple header
+            rich_print("\n[bold blue]Last Assistant Response (Plain Text):[/bold blue]")
+            rich_print("─" * 60)
+            # Use console.print with markup=False to display raw text
+            from mcp_agent import console
+
+            console.console.print(content, markup=False)
+            rich_print("─" * 60)
+            rich_print()
+
+        except Exception as e:
+            rich_print(f"[red]Error showing markdown: {e}[/red]")

mcp_agent/core/usage_display.py

@@ -91,12 +91,19 @@ def display_usage_report(
     max_agent_width = min(15, max(len(data["name"]) for data in usage_data) if usage_data else 8)
     agent_width = max(max_agent_width, 5)  # Minimum of 5 for "Agent" header
 
-    # Display the table
+    # Display the table with new visual style
     console = Console()
+
+    # Top separator
+    console.print()
+    console.print("─" * console.size.width, style="dim")
+    console.print()
+
+    # Header with block character
+    console.print("[dim]▎[/dim] [bold dim]Usage Summary[/bold dim]")
     console.print()
-    console.print("[dim]Usage Summary (Cumulative)[/dim]")
 
-    # Print header with proper spacing
+    # Table header with proper spacing
     console.print(
         f"[dim]{'Agent':<{agent_width}} {'Input':>9} {'Output':>9} {'Total':>9} {'Turns':>6} {'Tools':>6} {'Context%':>9}  {'Model':<25}[/dim]"
     )

mcp_agent/llm/augmented_llm.py

@@ -46,7 +46,6 @@ from mcp_agent.mcp.interfaces import (
 from mcp_agent.mcp.mcp_aggregator import MCPAggregator
 from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
 from mcp_agent.mcp.prompt_render import render_multipart_message
-from mcp_agent.ui.console_display import ConsoleDisplay
 
 # Define type variables locally
 MessageParamT = TypeVar("MessageParamT")
@@ -157,6 +156,10 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
         self._message_history: List[PromptMessageMultipart] = []
 
         # Initialize the display component
+        if self.context.config and self.context.config.logger.use_legacy_display:
+            from mcp_agent.ui.console_display_legacy import ConsoleDisplay
+        else:
+            from mcp_agent.ui.console_display import ConsoleDisplay
         self.display = ConsoleDisplay(config=self.context.config)
 
         # Tool call counter for current turn
@@ -448,10 +451,6 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
         """Display a tool result in a formatted panel."""
         self.display.show_tool_result(result, name=self.name)
 
-    def show_oai_tool_result(self, result: str) -> None:
-        """Display a tool result in a formatted panel."""
-        self.display.show_oai_tool_result(result, name=self.name)
-
     def show_tool_call(self, available_tools, tool_name, tool_args) -> None:
         """Display a tool call in a formatted panel."""
         self._current_turn_tool_calls += 1

mcp_agent/llm/augmented_llm_passthrough.py

@@ -162,8 +162,17 @@ class PassthroughLLM(AugmentedLLM):
         self,
         multipart_messages: List["PromptMessageMultipart"],
         request_params: RequestParams | None = None,
+        is_template: bool = False,
     ) -> PromptMessageMultipart:
+        print(
+            f"DEBUG: PassthroughLLM _apply_prompt_provider_specific called with {len(multipart_messages)} messages, is_template={is_template}"
+        )
+
+        # Add messages to history with proper is_prompt flag
+        self.history.extend(multipart_messages, is_prompt=is_template)
+
         last_message = multipart_messages[-1]
+        print(f"DEBUG: Last message role: {last_message.role}, text: '{last_message.first_text()}'")
 
         if self.is_tool_call(last_message):
             result = Prompt.assistant(await self.generate_str(last_message.first_text()))
@@ -200,8 +209,14 @@ class PassthroughLLM(AugmentedLLM):
         else:
             # TODO -- improve when we support Audio/Multimodal gen models e.g. gemini . This should really just return the input as "assistant"...
             concatenated: str = "\n".join(message.all_text() for message in multipart_messages)
+            print(
+                f"DEBUG: PassthroughLLM generating response: '{concatenated}' (is_template={is_template})"
+            )
             await self.show_assistant_message(concatenated)
             result = Prompt.assistant(concatenated)
+            print(f"DEBUG: PassthroughLLM created result: {result}")
+            print(f"DEBUG: Result first_text(): {result.first_text()}")
+            print(f"DEBUG: Result content: {result.content}")
 
         # Track usage for this passthrough "turn"
         try:

mcp_agent/llm/providers/augmented_llm_anthropic.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING, List, Tuple, Type
 
-from mcp.types import EmbeddedResource, ImageContent, TextContent
+from mcp.types import TextContent
 
 from mcp_agent.core.prompt import Prompt
 from mcp_agent.event_progress import ProgressAction
@@ -33,6 +33,7 @@ from anthropic.types import (
 from mcp.types import (
     CallToolRequest,
     CallToolRequestParams,
+    ContentBlock,
 )
 from rich.text import Text
 
@@ -149,7 +150,7 @@ class AnthropicAugmentedLLM(AugmentedLLM[MessageParam, Message]):
         self,
         message_param,
         request_params: RequestParams | None = None,
-    ) -> list[TextContent | ImageContent | EmbeddedResource]:
+    ) -> list[ContentBlock]:
         """
         Process a query using an LLM and available tools.
         Override this method to use a different LLM.
@@ -190,7 +191,7 @@ class AnthropicAugmentedLLM(AugmentedLLM[MessageParam, Message]):
             for tool in tool_list.tools
         ]
 
-        responses: List[TextContent | ImageContent | EmbeddedResource] = []
+        responses: List[ContentBlock] = []
 
         model = self.default_request_params.model
 

mcp_agent/llm/providers/augmented_llm_bedrock.py

@@ -4,7 +4,7 @@ import re
 from enum import Enum
 from typing import TYPE_CHECKING, Any, Dict, List, Tuple, Type, Union
 
-from mcp.types import EmbeddedResource, ImageContent, TextContent
+from mcp.types import ContentBlock, TextContent
 from rich.text import Text
 
 from mcp_agent.core.exceptions import ProviderKeyError
@@ -1066,7 +1066,7 @@ class BedrockAugmentedLLM(AugmentedLLM[BedrockMessageParam, BedrockMessage]):
         self,
         message_param: BedrockMessageParam,
         request_params: RequestParams | None = None,
-    ) -> List[TextContent | ImageContent | EmbeddedResource]:
+    ) -> List[ContentBlock | CallToolRequestParams]:
         """
         Process a query using Bedrock and available tools.
         """
@@ -1120,7 +1120,7 @@ class BedrockAugmentedLLM(AugmentedLLM[BedrockMessageParam, BedrockMessage]):
                 f"Model {model_to_check} does not support tool use - skipping tool preparation"
             )
 
-        responses: List[TextContent | ImageContent | EmbeddedResource] = []
+        responses: List[ContentBlock] = []
         model = self.default_request_params.model
 
         for i in range(params.max_iterations):

mcp_agent/llm/providers/augmented_llm_google_native.py

@@ -10,8 +10,7 @@ from mcp.types import (
     CallToolRequest,
     CallToolRequestParams,
     CallToolResult,
-    EmbeddedResource,
-    ImageContent,
+    ContentBlock,
     TextContent,
 )
 from rich.text import Text
@@ -228,12 +227,12 @@ class GoogleNativeAugmentedLLM(AugmentedLLM[types.Content, types.Content]):
     async def _google_completion(
         self,
         request_params: RequestParams | None = None,
-    ) -> List[TextContent | ImageContent | EmbeddedResource]:
+    ) -> List[ContentBlock]:
         """
         Process a query using Google's generate_content API and available tools.
         """
         request_params = self.get_request_params(request_params=request_params)
-        responses: List[TextContent | ImageContent | EmbeddedResource] = []
+        responses: List[ContentBlock] = []
 
         # Load full conversation history if use_history is true
         if request_params.use_history:
@@ -376,9 +375,7 @@ class GoogleNativeAugmentedLLM(AugmentedLLM[types.Content, types.Content]):
 
                     # Execute the tool call. google.genai does not provide a tool_call_id, pass None.
                     result = await self.call_tool(tool_call_request, None)
-                    self.show_oai_tool_result(
-                        str(result.content)
-                    )  # Use show_oai_tool_result for consistency
+                    self.show_tool_result(result)
 
                     tool_results.append((tool_call_params.name, result))  # Store name and result
 

mcp_agent/llm/providers/augmented_llm_openai.py

@@ -4,8 +4,7 @@ from mcp.types import (
     CallToolRequest,
     CallToolRequestParams,
     CallToolResult,
-    EmbeddedResource,
-    ImageContent,
+    ContentBlock,
     TextContent,
 )
 from openai import AsyncOpenAI, AuthenticationError
@@ -298,7 +297,7 @@ class OpenAIAugmentedLLM(AugmentedLLM[ChatCompletionMessageParam, ChatCompletion
         self,
         message: OpenAIMessage,
         request_params: RequestParams | None = None,
-    ) -> List[TextContent | ImageContent | EmbeddedResource]:
+    ) -> List[ContentBlock]:
         """
         Process a query using an LLM and available tools.
         The default implementation uses OpenAI's ChatCompletion as the LLM.
@@ -307,7 +306,7 @@ class OpenAIAugmentedLLM(AugmentedLLM[ChatCompletionMessageParam, ChatCompletion
 
         request_params = self.get_request_params(request_params=request_params)
 
-        responses: List[TextContent | ImageContent | EmbeddedResource] = []
+        responses: List[ContentBlock] = []
 
         # TODO -- move this in to agent context management / agent group handling
         messages: List[ChatCompletionMessageParam] = []
@@ -427,7 +426,7 @@ class OpenAIAugmentedLLM(AugmentedLLM[ChatCompletionMessageParam, ChatCompletion
                         ),
                     )
                     result = await self.call_tool(tool_call_request, tool_call.id)
-                    self.show_oai_tool_result(str(result))
+                    self.show_tool_result(result)
 
                     tool_results.append((tool_call.id, result))
                     responses.extend(result.content)
@@ -511,9 +510,7 @@ class OpenAIAugmentedLLM(AugmentedLLM[ChatCompletionMessageParam, ChatCompletion
 
         # For assistant messages: Return the last message (no completion needed)
         message_param: OpenAIMessage = OpenAIConverter.convert_to_openai(last_message)
-        responses: List[
-            TextContent | ImageContent | EmbeddedResource
-        ] = await self._openai_completion(
+        responses: List[ContentBlock] = await self._openai_completion(
             message_param,
             request_params,
         )

mcp_agent/llm/providers/augmented_llm_tensorzero.py

@@ -5,8 +5,7 @@ from mcp.types import (
     CallToolRequest,
     CallToolRequestParams,
     CallToolResult,
-    EmbeddedResource,
-    ImageContent,
+    ContentBlock,
     TextContent,
 )
 from tensorzero import AsyncTensorZeroGateway
@@ -169,7 +168,7 @@ class TensorZeroAugmentedLLM(AugmentedLLM[Dict[str, Any], Any]):
         available_tools: Optional[List[Dict[str, Any]]] = await self._prepare_t0_tools()
 
         # [3] Initialize storage arrays for the text content of the assistant message reply and, optionally, tool calls and results, and begin inference loop
-        final_assistant_message: List[Union[TextContent, ImageContent, EmbeddedResource]] = []
+        final_assistant_message: List[ContentBlock] = []
         last_executed_results: Optional[List[CallToolResult]] = None
 
         for i in range(merged_params.max_iterations):
@@ -353,11 +352,11 @@ class TensorZeroAugmentedLLM(AugmentedLLM[Dict[str, Any], Any]):
         completion: Union[ChatInferenceResponse, JsonInferenceResponse],
         available_tools_for_display: Optional[List[Dict[str, Any]]] = None,
     ) -> Tuple[
-        List[Union[TextContent, ImageContent, EmbeddedResource]],  # Text/Image content ONLY
+        List[Union[ContentBlock]],  # Text/Image content ONLY
         List[CallToolResult],  # Executed results
         List[Any],  # Raw tool_call blocks
     ]:
-        content_parts_this_turn: List[Union[TextContent, ImageContent, EmbeddedResource]] = []
+        content_parts_this_turn: List[ContentBlock] = []
         executed_tool_results: List[CallToolResult] = []
         raw_tool_call_blocks_from_t0: List[Any] = []
 
@@ -402,7 +401,7 @@ class TensorZeroAugmentedLLM(AugmentedLLM[Dict[str, Any], Any]):
                             setattr(result, "_t0_tool_name_temp", tool_name)
                             setattr(result, "_t0_is_error_temp", False)
                             executed_tool_results.append(result)
-                            self.show_oai_tool_result(str(result))
+                            self.show_tool_result(result)
                         except Exception as e:
                             self.logger.error(
                                 f"Error executing tool {tool_name} (id: {tool_use_id}): {e}"
@@ -415,7 +414,7 @@ class TensorZeroAugmentedLLM(AugmentedLLM[Dict[str, Any], Any]):
                             setattr(error_result, "_t0_tool_name_temp", tool_name)
                             setattr(error_result, "_t0_is_error_temp", True)
                             executed_tool_results.append(error_result)
-                            self.show_oai_tool_result(f"ERROR: {error_text}")
+                            self.show_tool_result(error_result)
 
                 elif block_type == "thought":
                     thought_text = getattr(block, "text", None)

mcp_agent/llm/providers/google_converter.py

@@ -8,6 +8,7 @@ from mcp.types import (
     CallToolRequest,
     CallToolRequestParams,
     CallToolResult,
+    ContentBlock,
     EmbeddedResource,
     ImageContent,
     TextContent,
@@ -158,17 +159,15 @@ class GoogleConverter:
 
     def convert_from_google_content(
         self, content: types.Content
-    ) -> List[TextContent | ImageContent | EmbeddedResource | CallToolRequestParams]:
+    ) -> List[ContentBlock | CallToolRequestParams]:
         """
         Converts google.genai types.Content from a model response to a list of
         fast-agent content types or tool call requests.
         """
-        fast_agent_parts: List[
-            TextContent | ImageContent | EmbeddedResource | CallToolRequestParams
-        ] = []
+        fast_agent_parts: List[ContentBlock | CallToolRequestParams] = []
 
-        if content is None or not hasattr(content, 'parts') or content.parts is None:
-                    return [] # Google API response 'content' object is None. Cannot extract parts.
+        if content is None or not hasattr(content, "parts") or content.parts is None:
+            return []  # Google API response 'content' object is None. Cannot extract parts.
 
         for part in content.parts:
             if part.text:
@@ -340,9 +339,7 @@ class GoogleConverter:
         if content.role == "model" and any(part.function_call for part in content.parts):
             return PromptMessageMultipart(role="assistant", content=[])
 
-        fast_agent_parts: List[
-            TextContent | ImageContent | EmbeddedResource | CallToolRequestParams
-        ] = []
+        fast_agent_parts: List[ContentBlock | CallToolRequestParams] = []
         for part in content.parts:
             if part.text:
                 fast_agent_parts.append(TextContent(type="text", text=part.text))

mcp_agent/llm/providers/multipart_converter_anthropic.py

@@ -16,6 +16,7 @@ from anthropic.types import (
 from mcp.types import (
     BlobResourceContents,
     CallToolResult,
+    ContentBlock,
     EmbeddedResource,
     ImageContent,
     PromptMessage,
@@ -117,7 +118,7 @@ class AnthropicConverter:
 
     @staticmethod
     def _convert_content_items(
-        content_items: Sequence[Union[TextContent, ImageContent, EmbeddedResource]],
+        content_items: Sequence[ContentBlock],
         document_mode: bool = True,
     ) -> List[ContentBlockParam]:
         """
@@ -210,7 +211,7 @@ class AnthropicConverter:
                 return ImageBlockParam(
                     type="image", source=URLImageSourceParam(type="url", url=uri_str)
                 )
-            
+
             # Try to get image data
             image_data = get_image_data(resource)
             if image_data:
@@ -220,7 +221,7 @@ class AnthropicConverter:
                         type="base64", media_type=mime_type, data=image_data
                     ),
                 )
-            
+
             return AnthropicConverter._create_fallback_text("Image missing data", resource)
 
         elif mime_type == "application/pdf":
@@ -450,4 +451,4 @@ class AnthropicConverter:
             # Add separate blocks directly to the message
             content_blocks.extend(separate_blocks)
 
-        return MessageParam(role="user", content=content_blocks)
+        return MessageParam(role="user", content=content_blocks)

mcp_agent/llm/providers/multipart_converter_openai.py

@@ -5,6 +5,7 @@ from mcp.types import (
     EmbeddedResource,
     ImageContent,
     PromptMessage,
+    ResourceLink,
     TextContent,
 )
 from openai.types.chat import ChatCompletionMessageParam
@@ -16,6 +17,7 @@ from mcp_agent.mcp.helpers.content_helpers import (
     get_text,
     is_image_content,
     is_resource_content,
+    is_resource_link,
     is_text_content,
 )
 from mcp_agent.mcp.mime_utils import (
@@ -92,6 +94,11 @@ class OpenAIConverter:
                     if block:
                         content_blocks.append(block)
 
+                elif is_resource_link(item):
+                    block = OpenAIConverter._convert_resource_link(item)
+                    if block:
+                        content_blocks.append(block)
+
                 else:
                     _logger.warning(f"Unsupported content type: {type(item)}")
                     # Create a text block with information about the skipped content
@@ -213,6 +220,32 @@ class OpenAIConverter:
 
         return "text/plain"
 
+    @staticmethod
+    def _convert_resource_link(
+        resource: ResourceLink,
+    ) -> Optional[ContentBlock]:
+        """
+        Convert ResourceLink to OpenAI content block.
+
+        Args:
+            resource: The resource link to convert
+
+        Returns:
+            An OpenAI content block or None if conversion failed
+        """
+        name = resource.name or "unknown"
+        uri_str = str(resource.uri)
+        mime_type = resource.mimeType or "unknown"
+        description = resource.description or "No description"
+
+        # Create a text block with the resource link information
+        return {
+            "type": "text",
+            "text": f"Linked Resource ${name} MIME type {mime_type}>\n"
+            f"Resource Link: {uri_str}\n"
+            f"${description}\n",
+        }
+
     @staticmethod
     def _convert_embedded_resource(
         resource: EmbeddedResource,

mcp_agent/llm/providers/multipart_converter_tensorzero.py

@@ -1,8 +1,9 @@
 import json
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional
 
 from mcp.types import (
     CallToolResult,
+    ContentBlock,
     EmbeddedResource,
     ImageContent,
     TextContent,
@@ -22,7 +23,7 @@ class TensorZeroConverter:
 
     @staticmethod
     def _convert_content_part(
-        part: Union[TextContent, ImageContent, EmbeddedResource],
+        part: ContentBlock,
     ) -> Optional[Dict[str, Any]]:
         """Converts a single MCP content part to a T0 content block dictionary."""
         if isinstance(part, TextContent):

mcp_agent/logging/rich_progress.py

@@ -37,8 +37,12 @@ class RichProgressDisplay:
         self._progress.start()
 
     def stop(self) -> None:
-        """stop"""
+        """Stop and clear the progress display."""
+        # Hide all tasks before stopping (like pause does)
+        for task in self._progress.tasks:
+            task.visible = False
         self._progress.stop()
+        self._paused = True
 
     def pause(self) -> None:
         """Pause the progress display."""
@@ -107,7 +111,7 @@ class RichProgressDisplay:
             description = f"[{self._get_action_style(event.action)}]{formatted_tokens}"
         else:
             description = f"[{self._get_action_style(event.action)}]{event.action.value:<15}"
-            
+
         self._progress.update(
             task_id,
             description=description,