fast-agent-mcp 0.2.39__py3-none-any.whl → 0.2.41__py3-none-any.whl

mcp_agent/core/interactive_prompt.py

@@ -53,6 +53,7 @@ class PromptProvider(Protocol):
     async def apply_prompt(
         self,
         prompt_name: str,
+        prompt_title: Optional[str] = None,
         arguments: Optional[Dict[str, str]] = None,
         agent_name: Optional[str] = None,
         **kwargs,
@@ -243,9 +244,10 @@ class InteractivePrompt:
                                     "server": server_name,
                                     "name": prompt.name,
                                     "namespaced_name": f"{server_name}{SEP}{prompt.name}",
-                                    "description": getattr(prompt, "description", "No description"),
-                                    "arg_count": len(getattr(prompt, "arguments", [])),
-                                    "arguments": getattr(prompt, "arguments", []),
+                                    "title": prompt.title or None,
+                                    "description": prompt.description or "No description",
+                                    "arg_count": len(prompt.arguments or []),
+                                    "arguments": prompt.arguments or [],
                                 }
                             )
                     elif isinstance(prompts_info, list) and prompts_info:
@@ -256,6 +258,7 @@ class InteractivePrompt:
                                         "server": server_name,
                                         "name": prompt["name"],
                                         "namespaced_name": f"{server_name}{SEP}{prompt['name']}",
+                                        "title": prompt.get("title", None),
                                         "description": prompt.get("description", "No description"),
                                         "arg_count": len(prompt.get("arguments", [])),
                                         "arguments": prompt.get("arguments", []),
@@ -263,17 +266,15 @@ class InteractivePrompt:
                                 )
                             else:
                                 # Handle Prompt objects from mcp.types
-                                prompt_name = getattr(prompt, "name", str(prompt))
-                                description = getattr(prompt, "description", "No description")
-                                arguments = getattr(prompt, "arguments", [])
                                 all_prompts.append(
                                     {
                                         "server": server_name,
-                                        "name": prompt_name,
-                                        "namespaced_name": f"{server_name}{SEP}{prompt_name}",
-                                        "description": description,
-                                        "arg_count": len(arguments),
-                                        "arguments": arguments,
+                                        "name": prompt.name,
+                                        "namespaced_name": f"{server_name}{SEP}{prompt.name}",
+                                        "title": prompt.title or None,
+                                        "description": prompt.description or "No description",
+                                        "arg_count": len(prompt.arguments or []),
+                                        "arguments": prompt.arguments or [],
                                     }
                                 )
 
@@ -314,6 +315,7 @@ class InteractivePrompt:
                 table.add_column("#", justify="right", style="cyan")
                 table.add_column("Server", style="green")
                 table.add_column("Prompt Name", style="bright_blue")
+                table.add_column("Title")
                 table.add_column("Description")
                 table.add_column("Args", justify="center")
 
@@ -323,6 +325,7 @@ class InteractivePrompt:
                         str(i + 1),
                         prompt["server"],
                         prompt["name"],
+                        prompt["title"],
                         prompt["description"],
                         str(prompt["arg_count"]),
                     )
@@ -378,7 +381,7 @@ class InteractivePrompt:
                     continue
 
                 # Extract prompts
-                prompts = []
+                prompts: List[Prompt] = []
                 if hasattr(prompts_info, "prompts"):
                     prompts = prompts_info.prompts
                 elif isinstance(prompts_info, list):
@@ -387,8 +390,9 @@ class InteractivePrompt:
                 # Process each prompt
                 for prompt in prompts:
                     # Get basic prompt info
-                    prompt_name = getattr(prompt, "name", "Unknown")
-                    prompt_description = getattr(prompt, "description", "No description")
+                    prompt_name = prompt.name
+                    prompt_title = prompt.title or None
+                    prompt_description = prompt.description or "No description"
 
                     # Extract argument information
                     arg_names = []
@@ -397,23 +401,19 @@ class InteractivePrompt:
                     arg_descriptions = {}
 
                     # Get arguments list
-                    arguments = getattr(prompt, "arguments", None)
-                    if arguments:
-                        for arg in arguments:
-                            name = getattr(arg, "name", None)
-                            if name:
-                                arg_names.append(name)
-
-                                # Store description if available
-                                description = getattr(arg, "description", None)
-                                if description:
-                                    arg_descriptions[name] = description
-
-                                # Check if required
-                                if getattr(arg, "required", False):
-                                    required_args.append(name)
-                                else:
-                                    optional_args.append(name)
+                    if prompt.arguments:
+                        for arg in prompt.arguments:
+                            arg_names.append(arg.name)
+
+                            # Store description if available
+                            if arg.description:
+                                arg_descriptions[arg.name] = arg.description
+
+                            # Check if required
+                            if arg.required:
+                                required_args.append(arg.name)
+                            else:
+                                optional_args.append(arg.name)
 
                     # Create namespaced version using the consistent separator
                     namespaced_name = f"{server_name}{SEP}{prompt_name}"
@@ -424,6 +424,7 @@ class InteractivePrompt:
                             "server": server_name,
                             "name": prompt_name,
                             "namespaced_name": namespaced_name,
+                            "title": prompt_title,
                             "description": prompt_description,
                             "arg_count": len(arg_names),
                             "arg_names": arg_names,
@@ -486,6 +487,7 @@ class InteractivePrompt:
                 table.add_column("#", justify="right", style="cyan")
                 table.add_column("Server", style="green")
                 table.add_column("Prompt Name", style="bright_blue")
+                table.add_column("Title")
                 table.add_column("Description")
                 table.add_column("Args", justify="center")
 
@@ -508,6 +510,7 @@ class InteractivePrompt:
                         str(i + 1),
                         prompt["server"],
                         prompt["name"],
+                        prompt["title"] or "No title",
                         prompt["description"] or "No description",
                         args_display,
                     )
@@ -669,6 +672,7 @@ class InteractivePrompt:
             table = Table(title="Available MCP Tools")
             table.add_column("#", justify="right", style="cyan")
             table.add_column("Tool Name", style="bright_blue")
+            table.add_column("Title")
             table.add_column("Description")
 
             # Add tools to table
@@ -676,16 +680,12 @@ class InteractivePrompt:
                 table.add_row(
                     str(i + 1),
                     tool.name,
-                    getattr(tool, "description", "No description") or "No description",
+                    tool.title or "No title",
+                    tool.description or "No description",
                 )
 
             console.print(table)
 
-            # Add usage instructions
-            rich_print("\n[bold]Usage:[/bold]")
-            rich_print("  • Tools are automatically available in your conversation")
-            rich_print("  • Just ask the agent to use a tool by name or description")
-
         except Exception as e:
             import traceback
 

mcp_agent/core/usage_display.py

@@ -36,6 +36,7 @@ def display_usage_report(
     total_input = 0
     total_output = 0
     total_tokens = 0
+    total_tool_calls = 0
 
     for agent_name, agent in agents.items():
         if agent.usage_accumulator:
@@ -45,6 +46,7 @@ def display_usage_report(
                 output_tokens = summary["cumulative_output_tokens"]
                 billing_tokens = summary["cumulative_billing_tokens"]
                 turns = summary["turn_count"]
+                tool_calls = summary["cumulative_tool_calls"]
 
                 # Get context percentage for this agent
                 context_percentage = agent.usage_accumulator.context_usage_percentage
@@ -72,6 +74,7 @@ def display_usage_report(
                         "output": output_tokens,
                         "total": billing_tokens,
                         "turns": turns,
+                        "tool_calls": tool_calls,
                         "context": context_percentage,
                     }
                 )
@@ -79,6 +82,7 @@ def display_usage_report(
                 total_input += input_tokens
                 total_output += output_tokens
                 total_tokens += billing_tokens
+                total_tool_calls += tool_calls
 
     if not usage_data:
         return
@@ -94,7 +98,7 @@ def display_usage_report(
 
     # Print header with proper spacing
     console.print(
-        f"[dim]{'Agent':<{agent_width}} {'Input':>9} {'Output':>9} {'Total':>9} {'Turns':>6} {'Context%':>9}  {'Model':<25}[/dim]"
+        f"[dim]{'Agent':<{agent_width}} {'Input':>9} {'Output':>9} {'Total':>9} {'Turns':>6} {'Tools':>6} {'Context%':>9}  {'Model':<25}[/dim]"
     )
 
     # Print agent rows - use styling based on subdued_colors flag
@@ -103,6 +107,7 @@ def display_usage_report(
         output_str = f"{data['output']:,}"
         total_str = f"{data['total']:,}"
         turns_str = str(data["turns"])
+        tools_str = str(data["tool_calls"])
         context_str = f"{data['context']:.1f}%" if data["context"] is not None else "-"
 
         # Truncate agent name if needed
@@ -118,6 +123,7 @@ def display_usage_report(
                 f"{output_str:>9} "
                 f"[bold]{total_str:>9}[/bold] "
                 f"{turns_str:>6} "
+                f"{tools_str:>6} "
                 f"{context_str:>9}  "
                 f"{data['model']:<25}[/dim]"
             )
@@ -129,6 +135,7 @@ def display_usage_report(
                 f"{output_str:>9} "
                 f"[bold]{total_str:>9}[/bold] "
                 f"{turns_str:>6} "
+                f"{tools_str:>6} "
                 f"{context_str:>9}  "
                 f"[dim]{data['model']:<25}[/dim]"
             )
@@ -139,6 +146,7 @@ def display_usage_report(
         total_input_str = f"{total_input:,}"
         total_output_str = f"{total_output:,}"
         total_tokens_str = f"{total_tokens:,}"
+        total_tools_str = str(total_tool_calls)
 
         if subdued_colors:
             # Original fastagent.py style with dim wrapper on bold
@@ -148,6 +156,7 @@ def display_usage_report(
                 f"{total_output_str:>9} "
                 f"[bold]{total_tokens_str:>9}[/bold] "
                 f"{'':<6} "
+                f"{total_tools_str:>6} "
                 f"{'':<9}  "
                 f"{'':<25}[/bold dim]"
             )
@@ -159,6 +168,7 @@ def display_usage_report(
                 f"[bold]{total_output_str:>9}[/bold] "
                 f"[bold]{total_tokens_str:>9}[/bold] "
                 f"{'':<6} "
+                f"[bold]{total_tools_str:>6}[/bold] "
                 f"{'':<9}  "
                 f"{'':<25}"
             )

mcp_agent/core/validation.py

@@ -52,7 +52,7 @@ def validate_workflow_references(agents: Dict[str, Dict[str, Any]]) -> None:
 
     for name, agent_data in agents.items():
         agent_type = agent_data["type"]  # This is a string from config
-        
+
         # Note: Compare string values from config with the Enum's string value
         if agent_type == AgentType.PARALLEL.value:
             # Check fan_in exists
@@ -226,7 +226,7 @@ def get_dependencies_groups(
     # Build the dependency graph
     for name, agent_data in agents_dict.items():
         agent_type = agent_data["type"]  # This is a string from config
-        
+
         # Note: Compare string values from config with the Enum's string value
         if agent_type == AgentType.PARALLEL.value:
             # Parallel agents depend on their fan-out and fan-in agents
@@ -305,3 +305,22 @@ def get_dependencies_groups(
         remaining -= current_level
 
     return result
+
+
+def validate_provider_keys_post_creation(active_agents: Dict[str, Any]) -> None:
+    """
+    Validate that API keys are available for all created agents with LLMs.
+
+    This runs after agent creation when we have actual agent instances.
+
+    Args:
+        active_agents: Dictionary of created agent instances
+
+    Raises:
+        ProviderKeyError: If any required API key is missing
+    """
+    for agent_name, agent in active_agents.items():
+        llm = getattr(agent, "_llm", None)
+        if llm:
+            # This throws a ProviderKeyError if the key is not present
+            llm._api_key()

mcp_agent/human_input/elicitation_form.py

@@ -16,7 +16,6 @@ from prompt_toolkit.validation import ValidationError, Validator
 from prompt_toolkit.widgets import (
     Button,
     Checkbox,
-    Dialog,
     Frame,
     Label,
     RadioList,
@@ -187,13 +186,31 @@ class ElicitationForm:
             height=len(self.message.split("\n")),
         )
 
-        # Create form fields - removed useless horizontal divider
-        form_fields = [
-            fastagent_header,  # Fast-agent info
-            Window(height=1),  # Spacing
-            mcp_header,  # MCP server message
-            Window(height=1),  # Spacing
-        ]
+        # Create sticky headers (outside scrollable area)
+        sticky_headers = HSplit(
+            [
+                Window(height=1),  # Top padding
+                VSplit(
+                    [
+                        Window(width=2),  # Left padding
+                        fastagent_header,  # Fast-agent info
+                        Window(width=2),  # Right padding
+                    ]
+                ),
+                Window(height=1),  # Spacing
+                VSplit(
+                    [
+                        Window(width=2),  # Left padding
+                        mcp_header,  # MCP server message
+                        Window(width=2),  # Right padding
+                    ]
+                ),
+                Window(height=1),  # Spacing
+            ]
+        )
+
+        # Create scrollable form fields (without headers)
+        form_fields = []
 
         for field_name, field_def in self.properties.items():
             field_widget = self._create_field(field_name, field_def)
@@ -228,18 +245,17 @@ class ElicitationForm:
             ]
         )
 
-        # Main layout
+        # Main scrollable content (form fields and buttons only)
         form_fields.extend([self.status_line, buttons])
-        content = HSplit(form_fields)
+        scrollable_form_content = HSplit(form_fields)
 
-        # Add padding around content using HSplit and VSplit with empty windows
-        padded_content = HSplit(
+        # Add padding around scrollable content
+        padded_scrollable_content = HSplit(
             [
-                Window(height=1),  # Top padding
                 VSplit(
                     [
                         Window(width=2),  # Left padding
-                        content,
+                        scrollable_form_content,
                         Window(width=2),  # Right padding
                     ]
                 ),
@@ -247,20 +263,36 @@ class ElicitationForm:
             ]
         )
 
-        # Wrap content in ScrollablePane to handle oversized forms
+        # Wrap only form fields in ScrollablePane (headers stay fixed)
         scrollable_content = ScrollablePane(
-            content=padded_content,
+            content=padded_scrollable_content,
             show_scrollbar=False,  # Only show when content exceeds available space
             display_arrows=False,  # Only show when content exceeds available space
             keep_cursor_visible=True,
             keep_focused_window_visible=True,
         )
 
-        # Dialog - formatted title with better styling and text
-        dialog = Dialog(
-            title=FormattedText([("class:title", "Elicitation Request")]),
-            body=scrollable_content,
-            with_background=True,  # Re-enable background for proper layout
+        # 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
+        full_content = HSplit(
+            [
+                title_bar,
+                Window(height=1),  # Spacing after title
+                sticky_headers,  # Headers stay fixed at top
+                scrollable_content,  # Form fields can scroll
+            ]
+        )
+
+        # Create dialog frame manually to avoid Dialog's internal scrolling
+        dialog = Frame(
+            body=full_content,
+            style="class:dialog",
         )
 
         # Key bindings
@@ -302,7 +334,8 @@ class ElicitationForm:
         def submit_alt(event):
             self._accept()
 
-        @kb.add("escape", eager=True)
+        # ESC should ALWAYS cancel immediately, no matter what
+        @kb.add("escape", eager=True, is_global=True)
         def cancel(event):
             self._cancel()
 

mcp_agent/llm/augmented_llm.py

@@ -36,7 +36,7 @@ from mcp_agent.llm.sampling_format_converter import (
     BasicFormatConverter,
     ProviderFormatConverter,
 )
-from mcp_agent.llm.usage_tracking import UsageAccumulator
+from mcp_agent.llm.usage_tracking import TurnUsage, UsageAccumulator
 from mcp_agent.logging.logger import get_logger
 from mcp_agent.mcp.helpers.content_helpers import get_text
 from mcp_agent.mcp.interfaces import (
@@ -123,6 +123,7 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
         ] = BasicFormatConverter,
         context: Optional["Context"] = None,
         model: Optional[str] = None,
+        api_key: Optional[str] = None,
         **kwargs: dict[str, Any],
     ) -> None:
         """
@@ -158,6 +159,9 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
         # Initialize the display component
         self.display = ConsoleDisplay(config=self.context.config)
 
+        # Tool call counter for current turn
+        self._current_turn_tool_calls = 0
+
         # Initialize default parameters, passing model info
         model_kwargs = kwargs.copy()
         if model:
@@ -173,6 +177,8 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
         self.type_converter = type_converter
         self.verb = kwargs.get("verb")
 
+        self._init_api_key = api_key
+
         # Initialize usage tracking
         self.usage_accumulator = UsageAccumulator()
 
@@ -440,15 +446,25 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
 
     def show_tool_result(self, result: CallToolResult) -> None:
         """Display a tool result in a formatted panel."""
-        self.display.show_tool_result(result)
+        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)
+        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.display.show_tool_call(available_tools, tool_name, tool_args)
+        self._current_turn_tool_calls += 1
+        self.display.show_tool_call(available_tools, tool_name, tool_args, name=self.name)
+
+    def _reset_turn_tool_calls(self) -> None:
+        """Reset tool call counter for new turn."""
+        self._current_turn_tool_calls = 0
+
+    def _finalize_turn_usage(self, turn_usage: "TurnUsage") -> None:
+        """Set tool call count on TurnUsage and add to accumulator."""
+        turn_usage.set_tool_calls(self._current_turn_tool_calls)
+        self.usage_accumulator.add_turn(turn_usage)
 
     async def show_assistant_message(
         self,
@@ -556,12 +572,12 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
 
     def _update_streaming_progress(self, content: str, model: str, estimated_tokens: int) -> int:
         """Update streaming progress with token estimation and formatting.
-        
+
         Args:
             content: The text content from the streaming event
             model: The model name
             estimated_tokens: Current token count to update
-            
+
         Returns:
             Updated estimated token count
         """
@@ -569,10 +585,10 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
         text_length = len(content)
         additional_tokens = max(1, text_length // 4)
         new_total = estimated_tokens + additional_tokens
-        
+
         # Format token count for display
         token_str = str(new_total).rjust(5)
-        
+
         # Emit progress event
         data = {
             "progress_action": ProgressAction.STREAMING,
@@ -582,7 +598,7 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
             "details": token_str.strip(),  # Token count goes in details for STREAMING action
         }
         self.logger.info("Streaming progress", data=data)
-        
+
         return new_total
 
     def _log_chat_finished(self, model: Optional[str] = None) -> None:
@@ -692,6 +708,9 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
         return self._message_history
 
     def _api_key(self):
+        if self._init_api_key:
+            return self._init_api_key
+
         from mcp_agent.llm.provider_key_manager import ProviderKeyManager
 
         assert self.provider

mcp_agent/llm/augmented_llm_silent.py

@@ -0,0 +1,48 @@
+"""Silent LLM implementation that suppresses display output while maintaining functionality."""
+
+from typing import Any
+
+from mcp_agent.llm.augmented_llm_passthrough import PassthroughLLM
+from mcp_agent.llm.provider_types import Provider
+from mcp_agent.llm.usage_tracking import TurnUsage, UsageAccumulator
+
+
+class ZeroUsageAccumulator(UsageAccumulator):
+    """Usage accumulator that always reports zero usage."""
+    
+    def add_turn(self, turn: TurnUsage) -> None:
+        """Override to do nothing - no usage accumulation."""
+        pass
+
+
+class SilentLLM(PassthroughLLM):
+    """
+    A specialized LLM that processes messages like PassthroughLLM but suppresses all display output.
+    
+    This is particularly useful for parallel agent workflows where the fan-in agent
+    should aggregate results without polluting the console with intermediate output.
+    Token counting is disabled - the model always reports zero usage.
+    """
+    
+    def __init__(
+        self, provider=Provider.FAST_AGENT, name: str = "Silent", **kwargs: dict[str, Any]
+    ) -> None:
+        super().__init__(name=name, provider=provider, **kwargs)
+        # Override with zero usage accumulator - silent model reports no usage
+        self.usage_accumulator = ZeroUsageAccumulator()
+    
+    def show_user_message(self, message: Any, **kwargs) -> None:
+        """Override to suppress user message display."""
+        pass
+    
+    async def show_assistant_message(self, message: Any, **kwargs) -> None:
+        """Override to suppress assistant message display."""
+        pass
+    
+    def show_tool_calls(self, tool_calls: Any, **kwargs) -> None:
+        """Override to suppress tool call display."""
+        pass
+    
+    def show_tool_results(self, tool_results: Any, **kwargs) -> None:
+        """Override to suppress tool result display."""
+        pass

mcp_agent/llm/model_database.py

@@ -47,6 +47,7 @@ class ModelDatabase:
         "video/mp4",
     ]
     QWEN_MULTIMODAL = ["text/plain", "image/jpeg", "image/png", "image/webp"]
+    XAI_VISION = ["text/plain", "image/jpeg", "image/png", "image/webp"]
     TEXT_ONLY = ["text/plain"]
 
     # Common parameter configurations
@@ -128,10 +129,22 @@ class ModelDatabase:
         context_window=2097152, max_output_tokens=8192, tokenizes=GOOGLE_MULTIMODAL
     )
 
+    # FIXME: xAI has not documented the max output tokens for Grok 4. Using Grok 3 as a placeholder. Will need to update when available (if ever)
+    GROK_4 = ModelParameters(
+        context_window=256000, max_output_tokens=16385, tokenizes=XAI_VISION
+    )
+
+    # Source for Grok 3 max output: https://www.reddit.com/r/grok/comments/1j7209p/exploring_grok_3_beta_output_capacity_a_simple/
+    # xAI does not document Grok 3 max output tokens, using the above source as a reference.
+    GROK_3 = ModelParameters(
+        context_window=131072, max_output_tokens=16385, tokenizes=TEXT_ONLY
+    )
+
     # Model configuration database
     MODELS: Dict[str, ModelParameters] = {
         # internal models
         "passthrough": FAST_AGENT_STANDARD,
+        "silent": FAST_AGENT_STANDARD,
         "playback": FAST_AGENT_STANDARD,
         "slow": FAST_AGENT_STANDARD,
         # aliyun models
@@ -194,6 +207,13 @@ class ModelDatabase:
         "gemini-2.5-pro-preview": GEMINI_2_5_PRO,
         "gemini-2.5-flash-preview-05-20": GEMINI_FLASH,
         "gemini-2.5-pro-preview-05-06": GEMINI_PRO,
+        # xAI Grok Models
+        "grok-4": GROK_4,
+        "grok-4-0709": GROK_4,
+        "grok-3": GROK_3,
+        "grok-3-mini": GROK_3,
+        "grok-3-fast": GROK_3,
+        "grok-3-mini-fast": GROK_3,
     }
 
     @classmethod