fast-agent-mcp 0.3.5__py3-none-any.whl → 0.3.7__py3-none-any.whl

fast_agent/ui/console_display.py

@@ -26,6 +26,7 @@ class MessageType(Enum):
 
     USER = "user"
     ASSISTANT = "assistant"
+    SYSTEM = "system"
     TOOL_CALL = "tool_call"
     TOOL_RESULT = "tool_result"
 
@@ -44,6 +45,12 @@ MESSAGE_CONFIGS = {
         "arrow_style": "dim green",
         "highlight_color": "bright_green",
     },
+    MessageType.SYSTEM: {
+        "block_color": "yellow",
+        "arrow": "●",
+        "arrow_style": "dim yellow",
+        "highlight_color": "bright_yellow",
+    },
     MessageType.TOOL_CALL: {
         "block_color": "magenta",
         "arrow": "◀",
@@ -144,7 +151,7 @@ class ConsoleDisplay:
         name: str | None = None,
         right_info: str = "",
         bottom_metadata: List[str] | None = None,
-        highlight_items: str | List[str] | None = None,
+        highlight_index: int | None = None,
         max_item_length: int | None = None,
         is_error: bool = False,
         truncate_content: bool = True,
@@ -159,7 +166,7 @@ class ConsoleDisplay:
             name: Optional name to display (agent name, user name, etc.)
             right_info: Information to display on the right side of the header
             bottom_metadata: Optional list of items for bottom separator
-            highlight_items: Item(s) to highlight in bottom metadata
+            highlight_index: Index of item to highlight in bottom metadata (0-based), or None
             max_item_length: Optional max length for bottom metadata items (with ellipsis)
             is_error: For tool results, whether this is an error (uses red color)
             truncate_content: Whether to truncate long content
@@ -199,16 +206,6 @@ class ConsoleDisplay:
             if max_item_length:
                 display_items = self._shorten_items(bottom_metadata, max_item_length)
 
-            # Normalize highlight_items
-            if highlight_items is None:
-                highlight_items = []
-            elif isinstance(highlight_items, str):
-                highlight_items = [highlight_items]
-
-            # Shorten highlight items to match if we shortened display items
-            if max_item_length:
-                highlight_items = self._shorten_items(highlight_items, max_item_length)
-
             # Format the metadata with highlighting, clipped to available width
             # Compute available width for the metadata segment (excluding the fixed prefix/suffix)
             total_width = console.console.size.width
@@ -220,7 +217,7 @@ class ConsoleDisplay:
 
             metadata_text = self._format_bottom_metadata(
                 display_items,
-                highlight_items,
+                highlight_index,
                 config["highlight_color"],
                 max_width=available,
             )
@@ -268,11 +265,11 @@ class ConsoleDisplay:
         from fast_agent.mcp.helpers.content_helpers import get_text, is_text_content
 
         # Determine the style based on message type
-        # USER and ASSISTANT messages should display in normal style
+        # USER, ASSISTANT, and SYSTEM messages should display in normal style
         # TOOL_CALL and TOOL_RESULT should be dimmed
         if is_error:
             style = "dim red"
-        elif message_type in [MessageType.USER, MessageType.ASSISTANT]:
+        elif message_type in [MessageType.USER, MessageType.ASSISTANT, MessageType.SYSTEM]:
             style = None  # No style means default/normal white
         else:
             style = "dim"
@@ -464,7 +461,7 @@ class ConsoleDisplay:
     def _format_bottom_metadata(
         self,
         items: List[str],
-        highlight_items: List[str],
+        highlight_index: int | None,
         highlight_color: str,
         max_width: int | None = None,
     ) -> Text:
@@ -473,8 +470,9 @@ class ConsoleDisplay:
 
         Args:
             items: List of items to display
-            highlight_items: List of items to highlight
+            highlight_index: Index of item to highlight (0-based), or None for no highlighting
             highlight_color: Color to use for highlighting
+            max_width: Maximum width for the formatted text
 
         Returns:
             Formatted Text object with proper separators and highlighting
@@ -491,14 +489,7 @@ class ConsoleDisplay:
             sep = Text(" | ", style="dim") if i > 0 else Text("")
 
             # Prepare item text with potential highlighting
-            should_highlight = False
-            if item in highlight_items:
-                should_highlight = True
-            else:
-                for highlight in highlight_items:
-                    if item.startswith(highlight) or highlight.endswith(item):
-                        should_highlight = True
-                        break
+            should_highlight = highlight_index is not None and i == highlight_index
 
             item_text = Text(item, style=(highlight_color if should_highlight else "dim"))
 
@@ -569,7 +560,7 @@ class ConsoleDisplay:
         tool_name: str,
         tool_args: Dict[str, Any] | None,
         bottom_items: List[str] | None = None,
-        highlight_items: str | List[str] | None = None,
+        highlight_index: int | None = None,
         max_item_length: int | None = None,
         name: str | None = None,
     ) -> None:
@@ -579,7 +570,7 @@ class ConsoleDisplay:
             tool_name: Name of the tool being called
             tool_args: Arguments being passed to the tool
             bottom_items: Optional list of items for bottom separator (e.g., available tools)
-            highlight_items: Item(s) to highlight in the bottom separator
+            highlight_index: Index of item to highlight in the bottom separator (0-based), or None
             max_item_length: Optional max length for bottom items (with ellipsis)
             name: Optional agent name
         """
@@ -596,7 +587,7 @@ class ConsoleDisplay:
             name=name,
             right_info=right_info,
             bottom_metadata=bottom_items,
-            highlight_items=tool_name,
+            highlight_index=highlight_index,
             max_item_length=max_item_length,
             truncate_content=True,
         )
@@ -683,7 +674,7 @@ class ConsoleDisplay:
         self,
         message_text: Union[str, Text, "PromptMessageExtended"],
         bottom_items: List[str] | None = None,
-        highlight_items: str | List[str] | None = None,
+        highlight_index: int | None = None,
         max_item_length: int | None = None,
         name: str | None = None,
         model: str | None = None,
@@ -694,7 +685,7 @@ class ConsoleDisplay:
         Args:
             message_text: The message content to display (str, Text, or PromptMessageExtended)
             bottom_items: Optional list of items for bottom separator (e.g., servers, destinations)
-            highlight_items: Item(s) to highlight in the bottom separator
+            highlight_index: Index of item to highlight in the bottom separator (0-based), or None
             max_item_length: Optional max length for bottom items (with ellipsis)
             title: Title for the message (default "ASSISTANT")
             name: Optional agent name
@@ -722,7 +713,7 @@ class ConsoleDisplay:
             name=name,
             right_info=right_info,
             bottom_metadata=bottom_items,
-            highlight_items=highlight_items,
+            highlight_index=highlight_index,
             max_item_length=max_item_length,
             truncate_content=False,  # Assistant messages shouldn't be truncated
             additional_message=additional_message,
@@ -816,6 +807,32 @@ class ConsoleDisplay:
             truncate_content=False,  # User messages typically shouldn't be truncated
         )
 
+    def show_system_message(
+        self,
+        system_prompt: str,
+        agent_name: str | None = None,
+        server_count: int = 0,
+    ) -> None:
+        """Display the system prompt in a formatted panel."""
+        if not self.config or not self.config.logger.show_chat:
+            return
+
+        # Build right side info
+        right_parts = []
+        if server_count > 0:
+            server_word = "server" if server_count == 1 else "servers"
+            right_parts.append(f"{server_count} MCP {server_word}")
+
+        right_info = f"[dim]{' '.join(right_parts)}[/dim]" if right_parts else ""
+
+        self.display_message(
+            content=system_prompt,
+            message_type=MessageType.SYSTEM,
+            name=agent_name,
+            right_info=right_info,
+            truncate_content=False,  # Don't truncate system prompts
+        )
+
     async def show_prompt_loaded(
         self,
         prompt_name: str,

fast_agent/ui/enhanced_prompt.py

@@ -3,12 +3,13 @@ Enhanced prompt functionality with advanced prompt_toolkit features.
 """
 
 import asyncio
+import json
 import os
 import shlex
 import subprocess
 import tempfile
 from importlib.metadata import version
-from typing import List, Optional
+from typing import TYPE_CHECKING, List, Optional
 
 from prompt_toolkit import PromptSession
 from prompt_toolkit.completion import Completer, Completion, WordCompleter
@@ -20,9 +21,13 @@ from prompt_toolkit.styles import Style
 from rich import print as rich_print
 
 from fast_agent.agents.agent_types import AgentType
+from fast_agent.constants import FAST_AGENT_ERROR_CHANNEL, FAST_AGENT_REMOVED_METADATA_CHANNEL
 from fast_agent.core.exceptions import PromptExitError
 from fast_agent.llm.model_info import get_model_info
 
+if TYPE_CHECKING:
+    from fast_agent.core.agent_app import AgentApp
+
 # Get the application version
 try:
     app_version = version("fast-agent-mcp")
@@ -38,6 +43,30 @@ available_agents = set()
 # Keep track of multi-line mode state
 in_multiline_mode = False
 
+
+def _extract_alert_flags_from_meta(blocks) -> set[str]:
+    flags: set[str] = set()
+    for block in blocks or []:
+        text = getattr(block, "text", None)
+        if not text:
+            continue
+        try:
+            payload = json.loads(text)
+        except (TypeError, ValueError):
+            continue
+        if payload.get("type") != "fast-agent-removed":
+            continue
+        category = payload.get("category")
+        match category:
+            case "text":
+                flags.add("T")
+            case "document":
+                flags.add("D")
+            case "vision":
+                flags.add("V")
+    return flags
+
+
 # Track whether help text has been shown globally
 help_message_shown = False
 
@@ -45,20 +74,17 @@ help_message_shown = False
 _agent_info_shown = set()
 
 
-async def _display_agent_info_helper(agent_name: str, agent_provider: object) -> None:
+async def _display_agent_info_helper(agent_name: str, agent_provider: "AgentApp | None") -> None:
     """Helper function to display agent information."""
     # Only show once per agent
     if agent_name in _agent_info_shown:
         return
 
     try:
-        # Get agent info
-        if hasattr(agent_provider, "_agent"):
-            # This is an AgentApp - get the specific agent
-            agent = agent_provider._agent(agent_name)
-        else:
-            # This is a single agent
-            agent = agent_provider
+        # Get agent info from AgentApp
+        if agent_provider is None:
+            return
+        agent = agent_provider._agent(agent_name)
 
         # Get counts TODO -- add this to the type library or adjust the way aggregator/reporting works
         server_count = 0
@@ -148,7 +174,9 @@ async def _display_agent_info_helper(agent_name: str, agent_provider: object) ->
         pass
 
 
-async def _display_all_agents_with_hierarchy(available_agents: List[str], agent_provider) -> None:
+async def _display_all_agents_with_hierarchy(
+    available_agents: List[str], agent_provider: "AgentApp | None"
+) -> None:
     """Display all agents with tree structure for workflow agents."""
     # Track which agents are children to avoid displaying them twice
     child_agents = set()
@@ -156,10 +184,9 @@ async def _display_all_agents_with_hierarchy(available_agents: List[str], agent_
     # First pass: identify all child agents
     for agent_name in available_agents:
         try:
-            if hasattr(agent_provider, "_agent"):
-                agent = agent_provider._agent(agent_name)
-            else:
-                agent = agent_provider
+            if agent_provider is None:
+                continue
+            agent = agent_provider._agent(agent_name)
 
             if agent.agent_type == AgentType.PARALLEL:
                 if hasattr(agent, "fan_out_agents") and agent.fan_out_agents:
@@ -184,10 +211,9 @@ async def _display_all_agents_with_hierarchy(available_agents: List[str], agent_
             continue
 
         try:
-            if hasattr(agent_provider, "_agent"):
-                agent = agent_provider._agent(agent_name)
-            else:
-                agent = agent_provider
+            if agent_provider is None:
+                continue
+            agent = agent_provider._agent(agent_name)
 
             # Display parent agent
             await _display_agent_info_helper(agent_name, agent_provider)
@@ -202,7 +228,7 @@ async def _display_all_agents_with_hierarchy(available_agents: List[str], agent_
             continue
 
 
-async def _display_parallel_children(parallel_agent, agent_provider) -> None:
+async def _display_parallel_children(parallel_agent, agent_provider: "AgentApp | None") -> None:
     """Display child agents of a parallel agent in tree format."""
     children = []
 
@@ -222,7 +248,7 @@ async def _display_parallel_children(parallel_agent, agent_provider) -> None:
         await _display_child_agent_info(child_agent, prefix, agent_provider)
 
 
-async def _display_router_children(router_agent, agent_provider) -> None:
+async def _display_router_children(router_agent, agent_provider: "AgentApp | None") -> None:
     """Display child agents of a router agent in tree format."""
     children = []
 
@@ -239,7 +265,9 @@ async def _display_router_children(router_agent, agent_provider) -> None:
         await _display_child_agent_info(child_agent, prefix, agent_provider)
 
 
-async def _display_child_agent_info(child_agent, prefix: str, agent_provider) -> None:
+async def _display_child_agent_info(
+    child_agent, prefix: str, agent_provider: "AgentApp | None"
+) -> None:
     """Display info for a child agent with tree prefix."""
     try:
         # Get counts for child agent
@@ -297,6 +325,7 @@ class AgentCompleter(Completer):
             "tools": "List available MCP tools",
             "prompt": "List and choose MCP prompts, or apply specific prompt (/prompt <name>)",
             "agents": "List available agents",
+            "system": "Show the current system prompt",
             "usage": "Show current usage statistics",
             "markdown": "Show last assistant message without markdown formatting",
             "save_history": "Save history; .json = MCP JSON, others = Markdown",
@@ -424,7 +453,9 @@ 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, agent_provider=None, agent_name=None):
+def create_keybindings(
+    on_toggle_multiline=None, app=None, agent_provider: "AgentApp | None" = None, agent_name=None
+):
     """Create custom key bindings."""
     kb = KeyBindings()
 
@@ -503,30 +534,20 @@ def create_keybindings(on_toggle_multiline=None, app=None, agent_provider=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
+                # Get the agent from AgentApp
+                agent = kb.agent_provider._agent(kb.current_agent_name)
+
+                # Find last assistant message
+                for msg in reversed(agent.message_history):
+                    if msg.role == "assistant":
+                        content = msg.last_text()
+                        import pyperclip
+
+                        pyperclip.copy(content)
+                        rich_print("\n[green]✓ Copied to clipboard[/green]")
+                        return
             except Exception:
                 pass
-        else:
-            pass
 
     return kb
 
@@ -541,7 +562,7 @@ async def get_enhanced_input(
     agent_types: dict[str, AgentType] = None,
     is_human_input: bool = False,
     toolbar_color: str = "ansiblue",
-    agent_provider: object = None,
+    agent_provider: "AgentApp | None" = None,
 ) -> str:
     """
     Enhanced input with advanced prompt_toolkit features.
@@ -556,7 +577,7 @@ async def get_enhanced_input(
         agent_types: Dictionary mapping agent names to their types for display
         is_human_input: Whether this is a human input request (disables agent selection features)
         toolbar_color: Color to use for the agent name in the toolbar (default: "ansiblue")
-        agent_provider: Optional agent provider for displaying agent info
+        agent_provider: Optional AgentApp for displaying agent info
 
     Returns:
         User input string
@@ -597,18 +618,22 @@ async def get_enhanced_input(
 
         shortcut_text = " | ".join(f"{key}:{action}" for key, action in shortcuts)
 
-        # Resolve model name and TDV from the current agent if available
+        # Resolve model name, turn counter, and TDV from the current agent if available
         model_display = None
         tdv_segment = None
+        turn_count = 0
         try:
-            agent_obj = (
-                agent_provider._agent(agent_name)
-                if agent_provider and hasattr(agent_provider, "_agent")
-                else agent_provider
-            )
-            if agent_obj and hasattr(agent_obj, "llm") and agent_obj.llm:
-                model_name = getattr(agent_obj.llm, "model_name", None)
-                if model_name:
+            if agent_provider:
+                agent = agent_provider._agent(agent_name)
+
+                # Get turn count from message history
+                for message in agent.message_history:
+                    if message.role == "user":
+                        turn_count += 1
+
+                # Get model name from LLM
+                if agent.llm and agent.llm.model_name:
+                    model_name = agent.llm.model_name
                     # Truncate model name to max 25 characters with ellipsis
                     max_len = 25
                     if len(model_name) > max_len:
@@ -618,20 +643,35 @@ async def get_enhanced_input(
                         model_display = model_name
 
                 # Build TDV capability segment based on model database
-                info = get_model_info(agent_obj)
+                info = get_model_info(agent)
                 # Default to text-only if info resolution fails for any reason
                 t, d, v = (True, False, False)
                 if info:
                     t, d, v = info.tdv_flags
 
+                # Check for alert flags in user messages
+                alert_flags: set[str] = set()
+                error_seen = False
+                for message in agent.message_history:
+                    if message.channels:
+                        if message.channels.get(FAST_AGENT_ERROR_CHANNEL):
+                            error_seen = True
+                    if message.role == "user" and message.channels:
+                        meta_blocks = message.channels.get(FAST_AGENT_REMOVED_METADATA_CHANNEL, [])
+                        alert_flags.update(_extract_alert_flags_from_meta(meta_blocks))
+
+                if error_seen and not alert_flags:
+                    alert_flags.add("T")
+
                 def _style_flag(letter: str, supported: bool) -> str:
                     # Enabled uses the same color as NORMAL mode (ansigreen), disabled is dim
+                    if letter in alert_flags:
+                        return f"<style fg='ansired' bg='ansiblack'>{letter}</style>"
+
                     enabled_color = "ansigreen"
-                    return (
-                        f"<style fg='{enabled_color}' bg='ansiblack'>{letter}</style>"
-                        if supported
-                        else f"<style fg='ansiblack' bg='ansiwhite'>{letter}</style>"
-                    )
+                    if supported:
+                        return f"<style fg='{enabled_color}' bg='ansiblack'>{letter}</style>"
+                    return f"<style fg='ansiblack' bg='ansiwhite'>{letter}</style>"
 
                 tdv_segment = f"{_style_flag('T', t)}{_style_flag('D', d)}{_style_flag('V', v)}"
         except Exception:
@@ -639,7 +679,7 @@ async def get_enhanced_input(
             model_display = None
             tdv_segment = None
 
-        # Build dynamic middle segments: model (in green) and optional shortcuts
+        # Build dynamic middle segments: model (in green), turn counter, and optional shortcuts
         middle_segments = []
         if model_display:
             # Model chip + inline TDV flags
@@ -649,6 +689,10 @@ async def get_enhanced_input(
                 )
             else:
                 middle_segments.append(f"<style bg='ansigreen'>{model_display}</style>")
+
+        # Add turn counter (formatted as 3 digits)
+        middle_segments.append(f"{turn_count:03d}")
+
         if shortcut_text:
             middle_segments.append(shortcut_text)
         middle = " | ".join(middle_segments)
@@ -751,6 +795,8 @@ async def get_enhanced_input(
                 return "CLEAR"
             elif cmd == "agents":
                 return "LIST_AGENTS"
+            elif cmd == "system":
+                return "SHOW_SYSTEM"
             elif cmd == "usage":
                 return "SHOW_USAGE"
             elif cmd == "markdown":
@@ -758,7 +804,9 @@ async def get_enhanced_input(
             elif cmd in ("save_history", "save"):
                 # Return a structured action for the interactive loop to handle
                 # Prefer programmatic saving via HistoryExporter; fall back to magic-string there if needed
-                filename = cmd_parts[1].strip() if len(cmd_parts) > 1 and cmd_parts[1].strip() else None
+                filename = (
+                    cmd_parts[1].strip() if len(cmd_parts) > 1 and cmd_parts[1].strip() else None
+                )
                 return {"save_history": True, "filename": filename}
             elif cmd == "prompt":
                 # Handle /prompt with no arguments as interactive mode
@@ -933,11 +981,14 @@ 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("  /system        - Show the current system prompt")
         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("  /save_history <filename> - Save current chat history to a file")
-        rich_print("      [dim]Tip: Use a .json extension for MCP-compatible JSON; any other extension saves Markdown.[/dim]")
+        rich_print(
+            "      [dim]Tip: Use a .json extension for MCP-compatible JSON; any other extension saves Markdown.[/dim]"
+        )
         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")
@@ -972,6 +1023,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 == "SHOW_SYSTEM":
+        # Return a dictionary to signal that system prompt should be shown
+        return {"show_system": True}
+
     elif command == "MARKDOWN":
         # Return a dictionary to signal that markdown display should be shown
         return {"show_markdown": True}