fast-agent-mcp 0.2.43__py3-none-any.whl → 0.2.45__py3-none-any.whl

mcp_agent/core/agent_app.py

@@ -5,7 +5,7 @@ Direct AgentApp implementation for interacting with agents without proxies.
 from typing import Dict, List, Optional, Union
 
 from deprecated import deprecated
-from mcp.types import PromptMessage
+from mcp.types import GetPromptResult, PromptMessage
 from rich import print as rich_print
 
 from mcp_agent.agents.agent import Agent
@@ -108,22 +108,26 @@ class AgentApp:
 
     async def apply_prompt(
         self,
-        prompt_name: str,
+        prompt: Union[str, GetPromptResult],
         arguments: Dict[str, str] | None = None,
         agent_name: str | None = None,
+        as_template: bool = False,
     ) -> str:
         """
         Apply a prompt template to an agent (default agent if not specified).
 
         Args:
-            prompt_name: Name of the prompt template to apply
+            prompt: Name of the prompt template to apply OR a GetPromptResult object
             arguments: Optional arguments for the prompt template
             agent_name: Name of the agent to send to
+            as_template: If True, store as persistent template (always included in context)
 
         Returns:
             The agent's response as a string
         """
-        return await self._agent(agent_name).apply_prompt(prompt_name, arguments)
+        return await self._agent(agent_name).apply_prompt(
+            prompt, arguments, as_template=as_template
+        )
 
     async def list_prompts(self, server_name: str | None = None, agent_name: str | None = None):
         """
@@ -235,7 +239,12 @@ class AgentApp:
         """
         return await self.interactive(agent_name=agent_name, default_prompt=default_prompt)
 
-    async def interactive(self, agent_name: str | None = None, default_prompt: str = "", pretty_print_parallel: bool = False) -> str:
+    async def interactive(
+        self,
+        agent_name: str | None = None,
+        default_prompt: str = "",
+        pretty_print_parallel: bool = False,
+    ) -> str:
         """
         Interactive prompt for sending messages with advanced features.
 
@@ -283,6 +292,7 @@ class AgentApp:
                 agent = self._agents.get(agent_name)
                 if agent and agent.agent_type == AgentType.PARALLEL:
                     from mcp_agent.ui.console_display import ConsoleDisplay
+
                     display = ConsoleDisplay(config=None)
                     display.show_parallel_results(agent)
 

mcp_agent/core/direct_decorators.py

@@ -23,6 +23,9 @@ from typing import (
 from mcp.client.session import ElicitationFnT
 
 from mcp_agent.agents.agent import AgentConfig
+from mcp_agent.agents.workflow.router_agent import (
+    ROUTING_SYSTEM_INSTRUCTION,
+)
 from mcp_agent.core.agent_types import AgentType
 from mcp_agent.core.request_params import RequestParams
 
@@ -397,10 +400,6 @@ def router(
     Returns:
         A decorator that registers the router with proper type annotations
     """
-    default_instruction = """
-    You are a router that determines which specialized agent should handle a given query.
-    Analyze the query and select the most appropriate agent to handle it.
-    """
 
     return cast(
         "Callable[[AgentCallable[P, R]], DecoratedRouterProtocol[P, R]]",
@@ -408,7 +407,7 @@ def router(
             self,
             AgentType.ROUTER,
             name=name,
-            instruction=instruction or default_instruction,
+            instruction=instruction or ROUTING_SYSTEM_INSTRUCTION,
             servers=servers,
             model=model,
             use_history=use_history,

mcp_agent/core/enhanced_prompt.py

@@ -106,15 +106,35 @@ async def _display_agent_info_helper(agent_name: str, agent_provider: object) ->
         else:
             # For regular agents, only display if they have MCP servers attached
             if server_count > 0:
-                # Pluralization helpers
+                # Build display parts in order: tools, prompts, resources (omit if count is 0)
+                display_parts = []
+
+                if tool_count > 0:
+                    tool_word = "tool" if tool_count == 1 else "tools"
+                    display_parts.append(f"{tool_count:,}[dim] {tool_word}[/dim]")
+
+                if prompt_count > 0:
+                    prompt_word = "prompt" if prompt_count == 1 else "prompts"
+                    display_parts.append(f"{prompt_count:,}[dim] {prompt_word}[/dim]")
+
+                if resource_count > 0:
+                    resource_word = "resource" if resource_count == 1 else "resources"
+                    display_parts.append(f"{resource_count:,}[dim] {resource_word}[/dim]")
+
+                # Always show server count
                 server_word = "Server" if server_count == 1 else "Servers"
-                tool_word = "tool" if tool_count == 1 else "tools"
-                resource_word = "resource" if resource_count == 1 else "resources"
-                prompt_word = "prompt" if prompt_count == 1 else "prompts"
+                server_text = f"{server_count:,}[dim] MCP {server_word}[/dim]"
 
-                rich_print(
-                    f"[dim]Agent [/dim][blue]{agent_name}[/blue][dim]:[/dim] {server_count:,}[dim] MCP {server_word}, [/dim]{tool_count:,}[dim] {tool_word}, [/dim]{resource_count:,}[dim] {resource_word}, [/dim]{prompt_count:,}[dim] {prompt_word} available[/dim]"
-                )
+                if display_parts:
+                    content = (
+                        f"{server_text}[dim], [/dim]"
+                        + "[dim], [/dim]".join(display_parts)
+                        + "[dim] available[/dim]"
+                    )
+                else:
+                    content = f"{server_text}[dim] available[/dim]"
+
+                rich_print(f"[dim]Agent [/dim][blue]{agent_name}[/blue][dim]:[/dim] {content}")
 
         # Mark as shown
         _agent_info_shown.add(agent_name)
@@ -274,6 +294,7 @@ class AgentCompleter(Completer):
             "prompt": "List and select MCP prompts, or apply specific prompt (/prompt <name>)",
             "agents": "List available agents",
             "usage": "Show current usage statistics",
+            "markdown": "Show last assistant message without markdown formatting",
             "help": "Show available commands",
             "clear": "Clear the screen",
             "STOP": "Stop this prompting session and move to next workflow step",
@@ -398,7 +419,7 @@ def get_text_from_editor(initial_text: str = "") -> str:
     return edited_text.strip()  # Added strip() to remove trailing newlines often added by editors
 
 
-def create_keybindings(on_toggle_multiline=None, app=None):
+def create_keybindings(on_toggle_multiline=None, app=None, agent_provider=None, agent_name=None):
     """Create custom key bindings."""
     kb = KeyBindings()
 
@@ -463,6 +484,40 @@ def create_keybindings(on_toggle_multiline=None, app=None):
             if event.app:
                 event.app.invalidate()
 
+    # Store reference to agent provider and agent name for clipboard functionality
+    kb.agent_provider = agent_provider
+    kb.current_agent_name = agent_name
+
+    @kb.add("c-y")
+    async def _(event) -> None:
+        """Ctrl+Y: Copy last assistant response to clipboard."""
+        if kb.agent_provider and kb.current_agent_name:
+            try:
+                # Get the agent
+                if hasattr(kb.agent_provider, "_agent"):
+                    agent = kb.agent_provider._agent(kb.current_agent_name)
+                else:
+                    agent = kb.agent_provider
+
+                # Get message history
+                if hasattr(agent, "_llm") and agent._llm and agent._llm.message_history:
+                    # Find last assistant message
+                    for msg in reversed(agent._llm.message_history):
+                        if msg.role == "assistant":
+                            content = msg.last_text()
+                            import pyperclip
+
+                            pyperclip.copy(content)
+                            rich_print("\n[green]✓ Copied to clipboard[/green]")
+                            return
+
+                else:
+                    pass
+            except Exception:
+                pass
+        else:
+            pass
+
     return kb
 
 
@@ -527,6 +582,7 @@ async def get_enhanced_input(
         shortcuts = [
             ("Ctrl+T", toggle_text),
             ("Ctrl+E", "External"),
+            ("Ctrl+Y", "Copy"),
             ("Ctrl+L", "Clear"),
             ("↑/↓", "History"),
         ]
@@ -569,7 +625,12 @@ async def get_enhanced_input(
     )
 
     # Create key bindings with a reference to the app
-    bindings = create_keybindings(on_toggle_multiline=on_multiline_toggle, app=session.app)
+    bindings = create_keybindings(
+        on_toggle_multiline=on_multiline_toggle,
+        app=session.app,
+        agent_provider=agent_provider,
+        agent_name=agent_name,
+    )
     session.app.key_bindings = bindings
 
     # Create formatted prompt text
@@ -619,6 +680,8 @@ async def get_enhanced_input(
                 return "LIST_AGENTS"
             elif cmd == "usage":
                 return "SHOW_USAGE"
+            elif cmd == "markdown":
+                return "MARKDOWN"
             elif cmd == "prompt":
                 # Handle /prompt with no arguments as interactive mode
                 if len(cmd_parts) > 1:
@@ -792,16 +855,18 @@ async def handle_special_commands(command, agent_app=None):
         rich_print("  /help          - Show this help")
         rich_print("  /clear         - Clear screen")
         rich_print("  /agents        - List available agents")
-        rich_print("  /prompts       - List and select MCP prompts")
         rich_print("  /prompt <name> - Apply a specific prompt by name")
         rich_print("  /usage         - Show current usage statistics")
+        rich_print("  /markdown      - Show last assistant message without markdown formatting")
         rich_print("  @agent_name    - Switch to agent")
         rich_print("  STOP           - Return control back to the workflow")
         rich_print("  EXIT           - Exit fast-agent, terminating any running workflows")
         rich_print("\n[bold]Keyboard Shortcuts:[/bold]")
         rich_print("  Enter          - Submit (normal mode) / New line (multiline mode)")
-        rich_print("  Ctrl+Enter      - Always submit (in any mode)")
+        rich_print("  Ctrl+Enter     - Always submit (in any mode)")
         rich_print("  Ctrl+T         - Toggle multiline mode")
+        rich_print("  Ctrl+E         - Edit in external editor")
+        rich_print("  Ctrl+Y         - Copy last assistant response to clipboard")
         rich_print("  Ctrl+L         - Clear input")
         rich_print("  Up/Down        - Navigate history")
         return True
@@ -827,6 +892,10 @@ async def handle_special_commands(command, agent_app=None):
         # Return a dictionary to signal that usage should be shown
         return {"show_usage": True}
 
+    elif command == "MARKDOWN":
+        # Return a dictionary to signal that markdown display should be shown
+        return {"show_markdown": True}
+
     elif command == "SELECT_PROMPT" or (
         isinstance(command, str) and command.startswith("SELECT_PROMPT:")
     ):

mcp_agent/core/fastagent.py

@@ -314,7 +314,7 @@ class FastAgent:
                         self.agents,
                         model_factory_func,
                     )
-                    
+
                     # Validate API keys after agent creation
                     validate_provider_keys_post_creation(active_agents)
 
@@ -435,6 +435,14 @@ class FastAgent:
                 raise SystemExit(1)
 
             finally:
+                # Ensure progress display is stopped before showing usage summary
+                try:
+                    from mcp_agent.progress_display import progress_display
+
+                    progress_display.stop()
+                except:  # noqa: E722
+                    pass
+
                 # Print usage report before cleanup (show for user exits too)
                 if active_agents and not had_error:
                     self._print_usage_report(active_agents)

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/human_input/elicitation_form.py

@@ -5,6 +5,7 @@ from typing import Any, Dict, Optional
 
 from mcp.types import ElicitRequestedSchema
 from prompt_toolkit import Application
+from prompt_toolkit.application.current import get_app
 from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.filters import Condition
 from prompt_toolkit.formatted_text import FormattedText
@@ -272,29 +273,32 @@ class ElicitationForm:
             keep_focused_window_visible=True,
         )
 
-        # Create title bar manually
-        title_bar = Window(
-            FormattedTextControl(FormattedText([("class:title", "Elicitation Request")])),
-            height=1,
-            style="class:dialog.title",
-        )
-
-        # Combine title, sticky headers, and scrollable content
+        # Combine sticky headers and scrollable content (no separate title bar needed)
         full_content = HSplit(
             [
-                title_bar,
-                Window(height=1),  # Spacing after title
+                Window(height=1),  # Top spacing
                 sticky_headers,  # Headers stay fixed at top
                 scrollable_content,  # Form fields can scroll
             ]
         )
 
-        # Create dialog frame manually to avoid Dialog's internal scrolling
+        # Create dialog frame with title
         dialog = Frame(
             body=full_content,
+            title="Elicitation Request",
             style="class:dialog",
         )
 
+        # Apply width constraints by putting Frame in VSplit with flexible spacers
+        # This prevents console display interference and constrains the Frame border
+        constrained_dialog = VSplit(
+            [
+                Window(width=10),  # Smaller left spacer
+                dialog,
+                Window(width=10),  # Smaller right spacer
+            ]
+        )
+
         # Key bindings
         kb = KeyBindings()
 
@@ -370,7 +374,7 @@ class ElicitationForm:
         # Add toolbar to the layout
         root_layout = HSplit(
             [
-                dialog,  # The main dialog
+                constrained_dialog,  # The width-constrained dialog
                 self._toolbar_window,
             ]
         )
@@ -588,7 +592,6 @@ class ElicitationForm:
 
     def _is_in_multiline_field(self) -> bool:
         """Check if currently focused field is a multiline field."""
-        from prompt_toolkit.application.current import get_app
 
         focused = get_app().layout.current_control
 

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
@@ -209,8 +212,6 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
         # note - check changes here are mirrored in structured(). i've thought hard about
         # a strategy to reduce duplication etc, but aiming for simple but imperfect for the moment
 
-        # We never expect this for structured() calls - this is for interactive use - developers
-        # can do this programatically
         # TODO -- create a "fast-agent" control role rather than magic strings
 
         if multipart_messages[-1].first_text().startswith("***SAVE_HISTORY"):
@@ -232,6 +233,7 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
 
         # add generic error and termination reason handling/rollback
         self._message_history.append(assistant_response)
+
         return assistant_response
 
     @abstractmethod
@@ -448,10 +450,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,7 +162,11 @@ class PassthroughLLM(AugmentedLLM):
         self,
         multipart_messages: List["PromptMessageMultipart"],
         request_params: RequestParams | None = None,
+        is_template: bool = False,
     ) -> PromptMessageMultipart:
+        # Add messages to history with proper is_prompt flag
+        self.history.extend(multipart_messages, is_prompt=is_template)
+
         last_message = multipart_messages[-1]
 
         if self.is_tool_call(last_message):