fast-agent-mcp 0.3.10__py3-none-any.whl → 0.3.12__py3-none-any.whl

fast_agent/human_input/elicitation_handler.py

@@ -29,64 +29,81 @@ async def elicitation_input_callback(
     )
     effective_server_name = server_name or "Unknown Server"
 
-    # Check if elicitation is disabled for this server
-    if elicitation_state.is_disabled(effective_server_name):
+    # Start tracking elicitation operation
+    try:
+        from fast_agent.ui import notification_tracker
+        notification_tracker.start_elicitation(effective_server_name)
+    except Exception:
+        # Don't let notification tracking break elicitation
+        pass
+
+    try:
+        # Check if elicitation is disabled for this server
+        if elicitation_state.is_disabled(effective_server_name):
+            return HumanInputResponse(
+                request_id=request.request_id,
+                response="__CANCELLED__",
+                metadata={"auto_cancelled": True, "reason": "Server elicitation disabled by user"},
+            )
+
+        # Get the elicitation schema from metadata
+        schema: Optional[Dict[str, Any]] = None
+        if request.metadata and "requested_schema" in request.metadata:
+            schema = request.metadata["requested_schema"]
+
+        # Use the context manager to pause the progress display while getting input
+        with progress_display.paused():
+            try:
+                if schema:
+                    form_action, form_data = await show_simple_elicitation_form(
+                        schema=schema,
+                        message=request.prompt,
+                        agent_name=effective_agent_name,
+                        server_name=effective_server_name,
+                    )
+
+                    if form_action == "accept" and form_data is not None:
+                        # Convert form data to JSON string
+                        import json
+
+                        response = json.dumps(form_data)
+                    elif form_action == "decline":
+                        response = "__DECLINED__"
+                    elif form_action == "disable":
+                        response = "__DISABLE_SERVER__"
+                    else:  # cancel
+                        response = "__CANCELLED__"
+                else:
+                    # No schema, fall back to text input using prompt_toolkit only
+                    from prompt_toolkit.shortcuts import input_dialog
+
+                    response = await input_dialog(
+                        title="Input Requested",
+                        text=f"Agent: {effective_agent_name}\nServer: {effective_server_name}\n\n{request.prompt}",
+                        style=ELICITATION_STYLE,
+                    ).run_async()
+
+                    if response is None:
+                        response = "__CANCELLED__"
+
+            except KeyboardInterrupt:
+                response = "__CANCELLED__"
+            except EOFError:
+                response = "__CANCELLED__"
+
         return HumanInputResponse(
             request_id=request.request_id,
-            response="__CANCELLED__",
-            metadata={"auto_cancelled": True, "reason": "Server elicitation disabled by user"},
+            response=response.strip() if isinstance(response, str) else response,
+            metadata={"has_schema": schema is not None},
         )
-
-    # Get the elicitation schema from metadata
-    schema: Optional[Dict[str, Any]] = None
-    if request.metadata and "requested_schema" in request.metadata:
-        schema = request.metadata["requested_schema"]
-
-    # Use the context manager to pause the progress display while getting input
-    with progress_display.paused():
+    finally:
+        # End tracking elicitation operation
         try:
-            if schema:
-                form_action, form_data = await show_simple_elicitation_form(
-                    schema=schema,
-                    message=request.prompt,
-                    agent_name=effective_agent_name,
-                    server_name=effective_server_name,
-                )
-
-                if form_action == "accept" and form_data is not None:
-                    # Convert form data to JSON string
-                    import json
-
-                    response = json.dumps(form_data)
-                elif form_action == "decline":
-                    response = "__DECLINED__"
-                elif form_action == "disable":
-                    response = "__DISABLE_SERVER__"
-                else:  # cancel
-                    response = "__CANCELLED__"
-            else:
-                # No schema, fall back to text input using prompt_toolkit only
-                from prompt_toolkit.shortcuts import input_dialog
-
-                response = await input_dialog(
-                    title="Input Requested",
-                    text=f"Agent: {effective_agent_name}\nServer: {effective_server_name}\n\n{request.prompt}",
-                    style=ELICITATION_STYLE,
-                ).run_async()
-
-                if response is None:
-                    response = "__CANCELLED__"
-
-        except KeyboardInterrupt:
-            response = "__CANCELLED__"
-        except EOFError:
-            response = "__CANCELLED__"
-
-    return HumanInputResponse(
-        request_id=request.request_id,
-        response=response.strip() if isinstance(response, str) else response,
-        metadata={"has_schema": schema is not None},
-    )
+            from fast_agent.ui import notification_tracker
+            notification_tracker.end_elicitation(effective_server_name)
+        except Exception:
+            # Don't let notification tracking break elicitation
+            pass
 
 
 # Register adapter with fast_agent tools so they can invoke this UI handler without importing types

fast_agent/interfaces.py

@@ -94,6 +94,8 @@ class FastAgentLLMProtocol(Protocol):
     @property
     def model_info(self) -> "ModelInfo | None": ...
 
+    def clear(self, *, clear_prompts: bool = False) -> None: ...
+
 
 class LlmAgentProtocol(Protocol):
     """Protocol defining the minimal interface for LLM agents."""
@@ -111,6 +113,8 @@ class LlmAgentProtocol(Protocol):
 
     async def shutdown(self) -> None: ...
 
+    def clear(self, *, clear_prompts: bool = False) -> None: ...
+
 
 class AgentProtocol(LlmAgentProtocol):
     """Standard agent interface with flexible input types."""

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/mcp/elicitation_factory.py

@@ -53,7 +53,7 @@ def resolve_elicitation_handler(
             if mode == "none":
                 logger.debug(f"Elicitation disabled by server config for agent {agent_config.name}")
                 return None  # Don't advertise elicitation capability
-            elif mode == "auto_cancel":
+            elif mode == "auto-cancel":
                 logger.debug(
                     f"Using auto-cancel elicitation handler (server config) for agent {agent_config.name}"
                 )
@@ -74,7 +74,7 @@ def resolve_elicitation_handler(
     if mode == "none":
         logger.debug(f"Elicitation disabled by global config for agent {agent_config.name}")
         return None  # Don't advertise elicitation capability
-    elif mode == "auto_cancel":
+    elif mode == "auto-cancel":
         logger.debug(
             f"Using auto-cancel elicitation handler (global config) for agent {agent_config.name}"
         )

fast_agent/mcp/mcp_aggregator.py

@@ -1362,22 +1362,15 @@ class MCPAggregator(ContextDependent):
 
         async with self._refresh_lock:
             try:
-                # Fetch new tools from the server
-                if self.connection_persistence:
-                    server_connection = await self._persistent_connection_manager.get_server(
-                        server_name,
-                        client_session_factory=self._create_session_factory(server_name),
-                    )
-                    tools_result = await server_connection.session.list_tools()
-                    new_tools = tools_result.tools or []
-                else:
-                    async with gen_client(
-                        server_name,
-                        server_registry=self.context.server_registry,
-                        client_session_factory=self._create_session_factory(server_name),
-                    ) as client:
-                        tools_result = await client.list_tools()
-                        new_tools = tools_result.tools or []
+                # Fetch new tools from the server using _execute_on_server to properly record stats
+                tools_result = await self._execute_on_server(
+                    server_name=server_name,
+                    operation_type="tools/list",
+                    operation_name="",
+                    method_name="list_tools",
+                    method_args={},
+                )
+                new_tools = tools_result.tools or []
 
                 # Update tool maps
                 async with self._tool_map_lock:

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/mcp/sampling.py

@@ -77,6 +77,19 @@ async def sample(mcp_ctx: ClientSession, params: CreateMessageRequestParams) ->
     Returns:
         A CreateMessageResult containing the LLM's response
     """
+    # Get server name for notification tracking
+    server_name = "unknown"
+    if hasattr(mcp_ctx, "session") and hasattr(mcp_ctx.session, "session_server_name"):
+        server_name = mcp_ctx.session.session_server_name or "unknown"
+
+    # Start tracking sampling operation
+    try:
+        from fast_agent.ui import notification_tracker
+        notification_tracker.start_sampling(server_name)
+    except Exception:
+        # Don't let notification tracking break sampling
+        pass
+
     model: str | None = None
     api_key: str | None = None
     try:
@@ -157,6 +170,14 @@ async def sample(mcp_ctx: ClientSession, params: CreateMessageRequestParams) ->
         return SamplingConverter.error_result(
             error_message=f"Error in sampling: {str(e)}", model=model
         )
+    finally:
+        # End tracking sampling operation
+        try:
+            from fast_agent.ui import notification_tracker
+            notification_tracker.end_sampling(server_name)
+        except Exception:
+            # Don't let notification tracking break sampling
+            pass
 
 
 def sampling_agent_config(

fast_agent/ui/console_display.py

@@ -623,33 +623,38 @@ class ConsoleDisplay:
         if not self.config or not self.config.logger.show_tools:
             return
 
-        # Combined separator and status line
-        if agent_name:
-            left = (
-                f"[magenta]▎[/magenta][dim magenta]▶[/dim magenta] [magenta]{agent_name}[/magenta]"
-            )
-        else:
-            left = "[magenta]▎[/magenta][dim magenta]▶[/dim magenta]"
+        # Check if prompt_toolkit is active
+        try:
+            from prompt_toolkit.application.current import get_app
 
-        right = f"[dim]{updated_server}[/dim]"
-        self._create_combined_separator_status(left, right)
+            app = get_app()
+            # We're in interactive mode - add to notification tracker
+            from fast_agent.ui import notification_tracker
 
-        # Display update message
-        message = f"Updating tools for server {updated_server}"
-        console.console.print(message, style="dim", markup=self._markup)
+            notification_tracker.add_tool_update(updated_server)
+            app.invalidate()  # Force toolbar redraw
 
-        # Bottom separator
-        console.console.print()
-        console.console.print("─" * console.console.size.width, style="dim")
-        console.console.print()
+        except:  # noqa: E722
+            # No active prompt_toolkit session - display with rich as before
+            # Combined separator and status line
+            if agent_name:
+                left = (
+                    f"[magenta]▎[/magenta][dim magenta]▶[/dim magenta] [magenta]{agent_name}[/magenta]"
+                )
+            else:
+                left = "[magenta]▎[/magenta][dim magenta]▶[/dim magenta]"
 
-        # Force prompt_toolkit redraw if active
-        try:
-            from prompt_toolkit.application.current import get_app
+            right = f"[dim]{updated_server}[/dim]"
+            self._create_combined_separator_status(left, right)
 
-            get_app().invalidate()  # Forces prompt_toolkit to redraw
-        except:  # noqa: E722
-            pass  # No active prompt_toolkit session
+            # Display update message
+            message = f"Updating tools for server {updated_server}"
+            console.console.print(message, style="dim", markup=self._markup)
+
+            # Bottom separator
+            console.console.print()
+            console.console.print("─" * console.console.size.width, style="dim")
+            console.console.print()
 
     def _create_combined_separator_status(self, left_content: str, right_info: str = "") -> None:
         """

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")
@@ -717,17 +726,44 @@ async def get_enhanced_input(
         # Version/app label in green (dynamic version)
         version_segment = f"fast-agent {app_version}"
 
+        # Add notifications - prioritize active events over completed ones
+        from fast_agent.ui import notification_tracker
+
+        notification_segment = ""
+
+        # 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>"
+            )
+        elif notification_tracker.get_count() > 0:
+            # Show completed events summary when no active events
+            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(
                 f" <style fg='{toolbar_color}' bg='ansiblack'> {agent_name} </style> "
                 f" {middle} | <style fg='{mode_style}' bg='ansiblack'> {mode_text} </style> | "
-                f"{version_segment}"
+                f"{version_segment}{notification_segment}"
             )
         else:
             return HTML(
                 f" <style fg='{toolbar_color}' bg='ansiblack'> {agent_name} </style> "
                 f"Mode: <style fg='{mode_style}' bg='ansiblack'> {mode_text} </style> | "
-                f"{version_segment}"
+                f"{version_segment}{notification_segment}"
             )
 
     # A more terminal-agnostic style that should work across themes
@@ -766,7 +802,7 @@ async def get_enhanced_input(
     session.app.key_bindings = bindings
 
     # Create formatted prompt text
-    prompt_text = f"<ansibrightblue>{agent_name}</ansibrightblue> > "
+    prompt_text = f"<ansibrightblue>{agent_name}</ansibrightblue> ❯ "
 
     # Add default value display if requested
     if show_default and default and default != "STOP":
@@ -808,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"):
@@ -994,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")
@@ -1018,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")