fast-agent-mcp 0.3.11__py3-none-any.whl → 0.3.13__py3-none-any.whl

fast_agent/llm/fastagent_llm.py

@@ -129,6 +129,7 @@ class FastAgentLLM(ContextDependent, FastAgentLLMProtocol, Generic[MessageParamT
         self.history: Memory[MessageParamT] = SimpleMemory[MessageParamT]()
 
         self._message_history: List[PromptMessageExtended] = []
+        self._template_messages: List[PromptMessageExtended] = []
 
         # Initialize the display component
         from fast_agent.ui.console_display import ConsoleDisplay
@@ -575,11 +576,15 @@ class FastAgentLLM(ContextDependent, FastAgentLLMProtocol, Generic[MessageParamT
 
         # Convert to PromptMessageExtended objects
         multipart_messages = PromptMessageExtended.parse_get_prompt_result(prompt_result)
+        # Store a local copy of template messages so we can retain them across clears
+        self._template_messages = [msg.model_copy(deep=True) for msg in multipart_messages]
 
         # Delegate to the provider-specific implementation
         result = await self._apply_prompt_provider_specific(
             multipart_messages, None, is_template=True
         )
+        # Ensure message history always includes the stored template when applied
+        self._message_history = [msg.model_copy(deep=True) for msg in self._template_messages]
         return result.first_text()
 
     async def _save_history(self, filename: str) -> None:
@@ -607,6 +612,18 @@ class FastAgentLLM(ContextDependent, FastAgentLLMProtocol, Generic[MessageParamT
         """
         return self._message_history
 
+    def clear(self, *, clear_prompts: bool = False) -> None:
+        """Reset stored message history while optionally retaining prompt templates."""
+
+        self.history.clear(clear_prompts=clear_prompts)
+        if clear_prompts:
+            self._template_messages = []
+            self._message_history = []
+            return
+
+        # Restore message history to template messages only; new turns will append as normal
+        self._message_history = [msg.model_copy(deep=True) for msg in self._template_messages]
+
     def _api_key(self):
         if self._init_api_key:
             return self._init_api_key

fast_agent/llm/model_database.py

@@ -232,6 +232,8 @@ class ModelDatabase:
         "claude-3-7-sonnet-latest": ANTHROPIC_37_SERIES,
         "claude-sonnet-4-0": ANTHROPIC_SONNET_4_VERSIONED,
         "claude-sonnet-4-20250514": ANTHROPIC_SONNET_4_VERSIONED,
+        "claude-sonnet-4-5": ANTHROPIC_SONNET_4_VERSIONED,
+        "claude-sonnet-4-5-20250929": ANTHROPIC_SONNET_4_VERSIONED,
         "claude-opus-4-0": ANTHROPIC_OPUS_4_VERSIONED,
         "claude-opus-4-1": ANTHROPIC_OPUS_4_VERSIONED,
         "claude-opus-4-20250514": ANTHROPIC_OPUS_4_VERSIONED,

fast_agent/llm/model_factory.py

@@ -84,6 +84,8 @@ class ModelFactory:
         "claude-opus-4-20250514": Provider.ANTHROPIC,
         "claude-sonnet-4-20250514": Provider.ANTHROPIC,
         "claude-sonnet-4-0": Provider.ANTHROPIC,
+        "claude-sonnet-4-5-20250929": Provider.ANTHROPIC,
+        "claude-sonnet-4-5": Provider.ANTHROPIC,
         "deepseek-chat": Provider.DEEPSEEK,
         "gemini-2.0-flash": Provider.GOOGLE,
         "gemini-2.5-flash-preview-05-20": Provider.GOOGLE,
@@ -101,8 +103,9 @@ class ModelFactory:
     }
 
     MODEL_ALIASES = {
-        "sonnet": "claude-sonnet-4-0",
+        "sonnet": "claude-sonnet-4-5",
         "sonnet4": "claude-sonnet-4-0",
+        "sonnet45": "claude-sonnet-4-5",
         "sonnet35": "claude-3-5-sonnet-latest",
         "sonnet37": "claude-3-7-sonnet-latest",
         "claude": "claude-sonnet-4-0",

fast_agent/llm/provider/google/google_converter.py

@@ -53,6 +53,14 @@ class GoogleConverter:
             if key in unsupported_keys:
                 continue  # Skip this key
 
+            # Rewrite unsupported 'const' to a safe form for Gemini tools
+            # - For string const, convert to enum [value]
+            # - For non-string const (booleans/numbers), drop the constraint
+            if key == "const":
+                if isinstance(value, str):
+                    cleaned_schema["enum"] = [value]
+                continue
+
             if (
                 key == "format"
                 and schema.get("type") == "string"
@@ -140,9 +148,8 @@ class GoogleConverter:
                     )
                 elif is_resource_content(part_content):
                     assert isinstance(part_content, EmbeddedResource)
-                    if (
-                        "application/pdf" == part_content.resource.mimeType
-                        and isinstance(part_content.resource, BlobResourceContents)
+                    if "application/pdf" == part_content.resource.mimeType and isinstance(
+                        part_content.resource, BlobResourceContents
                     ):
                         pdf_bytes = base64.b64decode(part_content.resource.blob)
                         parts.append(

fast_agent/mcp/mcp_agent_client_session.py

@@ -4,6 +4,7 @@ It adds logging and supports sampling requests.
 """
 
 from datetime import timedelta
+from time import perf_counter
 from typing import TYPE_CHECKING
 
 from mcp import ClientSession, ServerNotification
@@ -207,6 +208,7 @@ class MCPAgentClientSession(ClientSession, ContextDependent):
     ) -> ReceiveResultT:
         logger.debug("send_request: request=", data=request.model_dump())
         request_id = getattr(self, "_request_id", None)
+        start_time = perf_counter()
         try:
             result = await super().send_request(
                 request=request,
@@ -220,6 +222,7 @@ class MCPAgentClientSession(ClientSession, ContextDependent):
                 data=result.model_dump() if result is not None else "no response returned",
             )
             self._attach_transport_channel(request_id, result)
+            self._attach_transport_elapsed(result, perf_counter() - start_time)
             return result
         except Exception as e:
             # Handle connection errors cleanly
@@ -250,6 +253,16 @@ class MCPAgentClientSession(ClientSession, ContextDependent):
             # If result cannot be mutated, ignore silently
             pass
 
+    @staticmethod
+    def _attach_transport_elapsed(result, elapsed: float | None) -> None:
+        if result is None or elapsed is None:
+            return
+        try:
+            setattr(result, "transport_elapsed", max(elapsed, 0.0))
+        except Exception:
+            # Ignore if result is immutable
+            pass
+
     async def _received_notification(self, notification: ServerNotification) -> None:
         """
         Can be overridden by subclasses to handle a notification without needing

fast_agent/mcp/mcp_connection_manager.py

@@ -38,6 +38,8 @@ from fast_agent.mcp.streamable_http_tracking import tracking_streamablehttp_clie
 from fast_agent.mcp.transport_tracking import TransportChannelMetrics
 
 if TYPE_CHECKING:
+    from mcp.client.auth import OAuthClientProvider
+
     from fast_agent.context import Context
     from fast_agent.mcp_server_registry import ServerRegistry
 
@@ -65,6 +67,38 @@ def _add_none_to_context(context_manager):
     return StreamingContextAdapter(context_manager)
 
 
+def _prepare_headers_and_auth(
+    server_config: MCPServerSettings,
+) -> tuple[dict[str, str], Optional["OAuthClientProvider"], set[str]]:
+    """
+    Prepare request headers and determine if OAuth authentication should be used.
+
+    Returns a copy of the headers, an OAuth auth provider when applicable, and the set
+    of user-supplied authorization header keys.
+    """
+    headers: dict[str, str] = dict(server_config.headers or {})
+    auth_header_keys = {"authorization", "x-hf-authorization"}
+    user_provided_auth_keys = {key for key in headers if key.lower() in auth_header_keys}
+
+    # OAuth is only relevant for SSE/HTTP transports and should be skipped when the
+    # user has already supplied explicit Authorization headers.
+    if server_config.transport not in ("sse", "http") or user_provided_auth_keys:
+        return headers, None, user_provided_auth_keys
+
+    oauth_auth = build_oauth_provider(server_config)
+    if oauth_auth is not None:
+        # Scrub Authorization headers so OAuth-managed credentials are the only ones sent.
+        for header_name in (
+            "Authorization",
+            "authorization",
+            "X-HF-Authorization",
+            "x-hf-authorization",
+        ):
+            headers.pop(header_name, None)
+
+    return headers, oauth_auth, user_provided_auth_keys
+
+
 class ServerConnection:
     """
     Represents a long-lived MCP server connection, including:
@@ -113,7 +147,9 @@ class ServerConnection:
         self.server_implementation: Implementation | None = None
         self.client_capabilities: dict | None = None
         self.server_instructions_available: bool = False
-        self.server_instructions_enabled: bool = server_config.include_instructions if server_config else True
+        self.server_instructions_enabled: bool = (
+            server_config.include_instructions if server_config else True
+        )
         self.session_id: str | None = None
         self._get_session_id_cb: GetSessionIdCallback | None = None
         self.transport_metrics: TransportChannelMetrics | None = None
@@ -404,7 +440,9 @@ class MCPConnectionManager(ContextDependent):
 
         logger.debug(f"{server_name}: Found server configuration=", data=config.model_dump())
 
-        transport_metrics = TransportChannelMetrics() if config.transport in ("http", "stdio") else None
+        transport_metrics = (
+            TransportChannelMetrics() if config.transport in ("http", "stdio") else None
+        )
 
         def transport_context_factory():
             if config.transport == "stdio":
@@ -425,7 +463,9 @@ class MCPConnectionManager(ContextDependent):
 
                 channel_hook = transport_metrics.record_event if transport_metrics else None
                 return _add_none_to_context(
-                    tracking_stdio_client(server_params, channel_hook=channel_hook, errlog=error_handler)
+                    tracking_stdio_client(
+                        server_params, channel_hook=channel_hook, errlog=error_handler
+                    )
                 )
             elif config.transport == "sse":
                 if not config.url:
@@ -434,12 +474,12 @@ class MCPConnectionManager(ContextDependent):
                     )
                 # Suppress MCP library error spam
                 self._suppress_mcp_sse_errors()
-                oauth_auth = build_oauth_provider(config)
-                # If using OAuth, strip any pre-existing Authorization headers to avoid conflicts
-                headers = dict(config.headers or {})
-                if oauth_auth is not None:
-                    headers.pop("Authorization", None)
-                    headers.pop("X-HF-Authorization", None)
+                headers, oauth_auth, user_auth_keys = _prepare_headers_and_auth(config)
+                if user_auth_keys:
+                    logger.debug(
+                        f"{server_name}: Using user-specified auth header(s); skipping OAuth provider.",
+                        user_auth_headers=sorted(user_auth_keys),
+                    )
                 return _add_none_to_context(
                     sse_client(
                         config.url,
@@ -453,19 +493,22 @@ class MCPConnectionManager(ContextDependent):
                     raise ValueError(
                         f"Server '{server_name}' uses http transport but no url is specified"
                     )
-                oauth_auth = build_oauth_provider(config)
-                headers = dict(config.headers or {})
-                if oauth_auth is not None:
-                    headers.pop("Authorization", None)
-                    headers.pop("X-HF-Authorization", None)
+                headers, oauth_auth, user_auth_keys = _prepare_headers_and_auth(config)
+                if user_auth_keys:
+                    logger.debug(
+                        f"{server_name}: Using user-specified auth header(s); skipping OAuth provider.",
+                        user_auth_headers=sorted(user_auth_keys),
+                    )
                 channel_hook = None
                 if transport_metrics is not None:
+
                     def channel_hook(event):
                         try:
                             transport_metrics.record_event(event)
                         except Exception:  # pragma: no cover - defensive guard
                             logger.debug(
-                                "%s: transport metrics hook failed", server_name,
+                                "%s: transport metrics hook failed",
+                                server_name,
                                 exc_info=True,
                             )
 

fast_agent/mcp/prompts/prompt_load.py

@@ -117,6 +117,7 @@ def load_prompt(file: Path) -> List[PromptMessageExtended]:
     if path_str.endswith(".json"):
         # JSON files use the serialization module directly
         from fast_agent.mcp.prompt_serialization import load_messages
+
         return load_messages(str(file))
     else:
         # Non-JSON files need template processing for resource loading
@@ -128,15 +129,13 @@ def load_prompt(file: Path) -> List[PromptMessageExtended]:
         # Render the template without arguments to get the messages
         messages = create_messages_with_resources(
             template.content_sections,
-            [file]  # Pass the file path for resource resolution
+            [file],  # Pass the file path for resource resolution
         )
 
         # Convert to PromptMessageExtended
         return PromptMessageExtended.to_extended(messages)
 
 
-
-
 def load_prompt_as_get_prompt_result(file: Path):
     """
     Load a prompt from a file and convert to GetPromptResult format for MCP compatibility.

fast_agent/ui/console_display.py

@@ -6,6 +6,7 @@ from mcp.types import CallToolResult
 from rich.panel import Panel
 from rich.text import Text
 
+from fast_agent.constants import REASONING
 from fast_agent.ui import console
 from fast_agent.ui.mcp_ui_utils import UILink
 from fast_agent.ui.mermaid_utils import (
@@ -144,6 +145,25 @@ class ConsoleDisplay:
         self._markup = config.logger.enable_markup if config else True
         self._escape_xml = True
 
+    @staticmethod
+    def _format_elapsed(elapsed: float) -> str:
+        """Format elapsed seconds for display."""
+        if elapsed < 0:
+            elapsed = 0.0
+        if elapsed < 0.001:
+            return "<1ms"
+        if elapsed < 1:
+            return f"{elapsed * 1000:.0f}ms"
+        if elapsed < 10:
+            return f"{elapsed:.2f}s"
+        if elapsed < 60:
+            return f"{elapsed:.1f}s"
+        minutes, seconds = divmod(elapsed, 60)
+        if minutes < 60:
+            return f"{int(minutes)}m {seconds:02.0f}s"
+        hours, minutes = divmod(int(minutes), 60)
+        return f"{hours}h {minutes:02d}m"
+
     def display_message(
         self,
         content: Any,
@@ -156,6 +176,7 @@ class ConsoleDisplay:
         is_error: bool = False,
         truncate_content: bool = True,
         additional_message: Text | None = None,
+        pre_content: Text | None = None,
     ) -> None:
         """
         Unified method to display formatted messages to the console.
@@ -170,6 +191,8 @@ class ConsoleDisplay:
             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
+            additional_message: Optional Rich Text appended after the main content
+            pre_content: Optional Rich Text shown before the main content
         """
         # Get configuration for this message type
         config = MESSAGE_CONFIGS[message_type]
@@ -191,6 +214,8 @@ class ConsoleDisplay:
         self._create_combined_separator_status(left, right_info)
 
         # Display the content
+        if pre_content and pre_content.plain:
+            console.console.print(pre_content, markup=self._markup)
         self._display_content(
             content, truncate_content, is_error, message_type, check_markdown_markers=False
         )
@@ -544,7 +569,7 @@ class ConsoleDisplay:
 
         # Build transport channel info for bottom bar
         channel = getattr(result, "transport_channel", None)
-        bottom_metadata = None
+        bottom_metadata_items: List[str] = []
         if channel:
             # Format channel info for bottom bar
             if channel == "post-json":
@@ -560,7 +585,13 @@ class ConsoleDisplay:
             else:
                 transport_info = channel.upper()
 
-            bottom_metadata = [transport_info]
+            bottom_metadata_items.append(transport_info)
+
+        elapsed = getattr(result, "transport_elapsed", None)
+        if isinstance(elapsed, (int, float)):
+            bottom_metadata_items.append(self._format_elapsed(float(elapsed)))
+
+        bottom_metadata = bottom_metadata_items or None
 
         # Build right info (without channel info)
         right_info = f"[dim]tool result - {status}[/dim]"
@@ -724,8 +755,26 @@ class ConsoleDisplay:
         # Extract text from PromptMessageExtended if needed
         from fast_agent.types import PromptMessageExtended
 
+        pre_content: Text | None = None
+
         if isinstance(message_text, PromptMessageExtended):
             display_text = message_text.last_text() or ""
+
+            channels = message_text.channels or {}
+            reasoning_blocks = channels.get(REASONING) or []
+            if reasoning_blocks:
+                from fast_agent.mcp.helpers.content_helpers import get_text
+
+                reasoning_segments = []
+                for block in reasoning_blocks:
+                    text = get_text(block)
+                    if text:
+                        reasoning_segments.append(text)
+
+                if reasoning_segments:
+                    joined = "\n".join(reasoning_segments)
+                    if joined.strip():
+                        pre_content = Text(joined, style="dim default")
         else:
             display_text = message_text
 
@@ -743,6 +792,7 @@ class ConsoleDisplay:
             max_item_length=max_item_length,
             truncate_content=False,  # Assistant messages shouldn't be truncated
             additional_message=additional_message,
+            pre_content=pre_content,
         )
 
         # Handle mermaid diagrams separately (after the main message)

fast_agent/ui/enhanced_prompt.py

@@ -339,15 +339,16 @@ class AgentCompleter(Completer):
         # Map commands to their descriptions for better completion hints
         self.commands = {
             "mcp": "Show MCP server status",
+            "history": "Show conversation history overview (optionally another agent)",
             "tools": "List available MCP tools",
             "prompt": "List and choose MCP prompts, or apply specific prompt (/prompt <name>)",
+            "clear": "Clear history",
             "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",
             "help": "Show commands and shortcuts",
-            "clear": "Clear the screen",
             "EXIT": "Exit fast-agent, terminating any running workflows",
             "STOP": "Stop this prompting session and move to next workflow step",
             **(commands or {}),  # Allow custom commands to be passed in
@@ -518,7 +519,15 @@ def create_keybindings(
 
     @kb.add("c-l")
     def _(event) -> None:
-        """Ctrl+L: Clear the input buffer."""
+        """Ctrl+L: Clear and redraw the terminal screen."""
+        app_ref = event.app or app
+        if app_ref and getattr(app_ref, "renderer", None):
+            app_ref.renderer.clear()
+            app_ref.invalidate()
+
+    @kb.add("c-u")
+    def _(event) -> None:
+        """Ctrl+U: Clear the input buffer."""
         event.current_buffer.text = ""
 
     @kb.add("c-e")
@@ -725,13 +734,24 @@ async def get_enhanced_input(
         # Check for active events first (highest priority)
         active_status = notification_tracker.get_active_status()
         if active_status:
-            event_type = active_status['type'].upper()
-            server = active_status['server']
-            notification_segment = f" | <style fg='ansired' bg='ansiblack'>◀ {event_type} ({server})</style>"
+            event_type = active_status["type"].upper()
+            server = active_status["server"]
+            notification_segment = (
+                f" | <style fg='ansired' bg='ansiblack'>◀ {event_type} ({server})</style>"
+            )
         elif notification_tracker.get_count() > 0:
             # Show completed events summary when no active events
-            summary = notification_tracker.get_summary()
-            notification_segment = f" | ◀ {notification_tracker.get_count()} updates ({summary})"
+            counts_by_type = notification_tracker.get_counts_by_type()
+            total_events = sum(counts_by_type.values()) if counts_by_type else 0
+
+            if len(counts_by_type) == 1:
+                event_type, count = next(iter(counts_by_type.items()))
+                label_text = notification_tracker.format_event_label(event_type, count)
+                notification_segment = f" | ◀ {label_text}"
+            else:
+                summary = notification_tracker.get_summary(compact=True)
+                heading = "event" if total_events == 1 else "events"
+                notification_segment = f" | ◀ {total_events} {heading} ({summary})"
 
         if middle:
             return HTML(
@@ -824,14 +844,26 @@ async def get_enhanced_input(
 
             if cmd == "help":
                 return "HELP"
-            elif cmd == "clear":
-                return "CLEAR"
             elif cmd == "agents":
                 return "LIST_AGENTS"
             elif cmd == "system":
                 return "SHOW_SYSTEM"
             elif cmd == "usage":
                 return "SHOW_USAGE"
+            elif cmd == "history":
+                target_agent = None
+                if len(cmd_parts) > 1:
+                    candidate = cmd_parts[1].strip()
+                    if candidate:
+                        target_agent = candidate
+                return {"show_history": {"agent": target_agent}}
+            elif cmd == "clear":
+                target_agent = None
+                if len(cmd_parts) > 1:
+                    candidate = cmd_parts[1].strip()
+                    if candidate:
+                        target_agent = candidate
+                return {"clear_history": {"agent": target_agent}}
             elif cmd == "markdown":
                 return "MARKDOWN"
             elif cmd in ("save_history", "save"):
@@ -1010,15 +1042,18 @@ async def handle_special_commands(command, agent_app=None):
     if isinstance(command, dict):
         return command
 
+    global agent_histories
+
     # Check for special string commands
     if command == "HELP":
         rich_print("\n[bold]Available Commands:[/bold]")
         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("  /history [agent_name] - Show chat history overview")
+        rich_print("  /clear [agent_name]   - Clear conversation history (keeps templates)")
         rich_print("  /markdown      - Show last assistant message without markdown formatting")
         rich_print("  /mcpstatus     - Show MCP server status summary for the active agent")
         rich_print("  /save_history <filename> - Save current chat history to a file")
@@ -1034,15 +1069,11 @@ async def handle_special_commands(command, agent_app=None):
         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("  Ctrl+L         - Redraw the screen")
+        rich_print("  Ctrl+U         - Clear input")
         rich_print("  Up/Down        - Navigate history")
         return True
 
-    elif command == "CLEAR":
-        # Clear screen (ANSI escape sequence)
-        print("\033c", end="")
-        return True
-
     elif isinstance(command, str) and command.upper() == "EXIT":
         raise PromptExitError("User requested to exit fast-agent session")