fast-agent-mcp 0.2.57__py3-none-any.whl → 0.3.0__py3-none-any.whl

{mcp_agent/human_input → fast_agent/ui}/elicitation_form.py

@@ -5,9 +5,7 @@ from typing import Any, Dict, Optional
 
 from mcp.types import ElicitRequestedSchema
 from prompt_toolkit import Application
-from prompt_toolkit.application.current import get_app
 from prompt_toolkit.buffer import Buffer
-from prompt_toolkit.filters import Condition
 from prompt_toolkit.formatted_text import FormattedText
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.key_binding.bindings.focus import focus_next, focus_previous
@@ -24,8 +22,7 @@ from prompt_toolkit.widgets import (
 from pydantic import AnyUrl, EmailStr
 from pydantic import ValidationError as PydanticValidationError
 
-from mcp_agent.human_input.elicitation_forms import ELICITATION_STYLE
-from mcp_agent.human_input.elicitation_state import elicitation_state
+from fast_agent.ui.elicitation_style import ELICITATION_STYLE
 
 
 class SimpleNumberValidator(Validator):
@@ -282,10 +279,15 @@ class ElicitationForm:
             ]
         )
 
-        # Create dialog frame with title
+        # Choose dialog title: prefer schema.title if provided
+        dialog_title = self.schema.get("title") if isinstance(self.schema, dict) else None
+        if not dialog_title or not isinstance(dialog_title, str):
+            dialog_title = "Elicitation Request"
+
+        # Create dialog frame with dynamic title
         dialog = Frame(
             body=full_content,
-            title="Elicitation Request",
+            title=dialog_title,
             style="class:dialog",
         )
 
@@ -327,16 +329,21 @@ class ElicitationForm:
         def focus_previous_left(event):
             focus_previous(event)
 
-        # Create filter for non-multiline fields
-        not_in_multiline = Condition(lambda: not self._is_in_multiline_field())
-
-        @kb.add("c-m", filter=not_in_multiline)  # Enter to submit only when not in multiline
+        # Enter always submits
+        @kb.add("c-m")
         def submit(event):
             self._accept()
 
-        @kb.add("c-j")  # Ctrl+J as alternative submit for multiline fields
-        def submit_alt(event):
-            self._accept()
+        # Ctrl+J inserts newlines
+        @kb.add("c-j")
+        def insert_newline(event):
+            # Insert a newline at the cursor position
+            event.current_buffer.insert_text("\n")
+            # Mark this field as multiline when user adds a newline
+            for field_name, widget in self.field_widgets.items():
+                if isinstance(widget, Buffer) and widget == event.current_buffer:
+                    self.multiline_fields.add(field_name)
+                    break
 
         # ESC should ALWAYS cancel immediately, no matter what
         @kb.add("escape", eager=True, is_global=True)
@@ -353,7 +360,7 @@ class ElicitationForm:
                 [
                     (
                         "class:bottom-toolbar.text",
-                        " <TAB> or ↑↓→← to navigate. <ENTER> submit (<Ctrl+J> in multiline). <ESC> to cancel. ",
+                        " <TAB>/↑↓→← navigate. <ENTER> submit. <Ctrl+J> insert new line. <ESC> cancel. ",
                     ),
                     (
                         "class:bottom-toolbar.text",
@@ -510,7 +517,8 @@ class ElicitationForm:
             enum_names = field_def.get("enumNames", enum_values)
             values = [(val, name) for val, name in zip(enum_values, enum_names)]
 
-            radio_list = RadioList(values=values)
+            default_value = field_def.get("default")
+            radio_list = RadioList(values=values, default=default_value)
             self.field_widgets[field_name] = radio_list
 
             return HSplit([label, Frame(radio_list, height=min(len(values) + 2, 6))])
@@ -541,23 +549,35 @@ class ElicitationForm:
             else:
                 constraints = {}
 
-            # Determine if field should be multiline based on max_length
+            default_value = field_def.get("default")
+
+            # Determine if field should be multiline based on max_length or default value length
             if field_type == "string":
                 max_length = constraints.get("maxLength")
+                # Check default value length if maxLength not specified
+                if not max_length and default_value is not None:
+                    max_length = len(str(default_value))
             else:
                 max_length = None
-            if max_length and max_length > 100:
+
+            # Check if default value contains newlines
+            if field_type == "string" and default_value is not None and "\n" in str(default_value):
+                multiline = True
+                self.multiline_fields.add(field_name)  # Track multiline fields
+                # Set height to actual line count for fields with newlines in default
+                initial_height = str(default_value).count("\n") + 1
+            elif max_length and max_length > 100:
                 # Use multiline for longer fields
                 multiline = True
                 self.multiline_fields.add(field_name)  # Track multiline fields
                 if max_length <= 300:
-                    height = 3
+                    initial_height = 3
                 else:
-                    height = 5
+                    initial_height = 5
             else:
                 # Single line for shorter fields
                 multiline = False
-                height = 1
+                initial_height = 1
 
             buffer = Buffer(
                 validator=validator,
@@ -566,6 +586,8 @@ class ElicitationForm:
                 complete_while_typing=False,  # Disable completion for cleaner experience
                 enable_history_search=False,  # Disable history for cleaner experience
             )
+            if default_value is not None:
+                buffer.text = str(default_value)
             self.field_widgets[field_name] = buffer
 
             # Create dynamic style function for focus highlighting and validation errors
@@ -581,31 +603,24 @@ class ElicitationForm:
                 else:
                     return "class:input-field"
 
+            # Create a dynamic height function based on content
+            def get_dynamic_height():
+                if not buffer.text:
+                    return initial_height
+                # Calculate height based on number of newlines in buffer
+                line_count = buffer.text.count("\n") + 1
+                # Use initial height as minimum, grow up to 20 lines
+                return min(max(line_count, initial_height), 20)
+
             text_input = Window(
                 BufferControl(buffer=buffer),
-                height=height,
+                height=get_dynamic_height,  # Use dynamic height function
                 style=get_field_style,  # Use dynamic style function
                 wrap_lines=True if multiline else False,  # Enable word wrap for multiline
             )
 
             return HSplit([label, Frame(text_input)])
 
-    def _is_in_multiline_field(self) -> bool:
-        """Check if currently focused field is a multiline field."""
-
-        focused = get_app().layout.current_control
-
-        # Find which field this control belongs to
-        # Only Buffer widgets can be multiline, so only check those
-        for field_name, widget in self.field_widgets.items():
-            if (
-                isinstance(widget, Buffer)
-                and hasattr(focused, "buffer")
-                and widget == focused.buffer
-            ):
-                return field_name in self.multiline_fields
-        return False
-
     def _validate_form(self) -> tuple[bool, Optional[str]]:
         """Validate the entire form."""
 
@@ -715,8 +730,10 @@ class ElicitationForm:
         self.app.exit()
 
     def _cancel_all(self):
-        """Handle cancel all - cancels and disables future elicitations."""
-        elicitation_state.disable_server(self.server_name)
+        """Handle cancel all: signal disable; no side effects here.
+
+        UI emits an action; handler/orchestration is responsible for updating state.
+        """
         self.action = "disable"
         self._clear_status_bar()
         self.app.exit()

mcp_agent/human_input/elicitation_forms.py → fast_agent/ui/elicitation_style.py

@@ -1,4 +1,4 @@
-"""Shared styling configuration for MCP elicitation forms."""
+"""Shared styling configuration for elicitation UIs (prompt_toolkit)."""
 
 from prompt_toolkit.styles import Style
 

{mcp_agent/core → fast_agent/ui}/enhanced_prompt.py

@@ -19,8 +19,9 @@ from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.styles import Style
 from rich import print as rich_print
 
-from mcp_agent.core.agent_types import AgentType
-from mcp_agent.core.exceptions import PromptExitError
+from fast_agent.agents.agent_types import AgentType
+from fast_agent.core.exceptions import PromptExitError
+from fast_agent.llm.model_info import get_model_info
 
 # Get the application version
 try:
@@ -59,9 +60,12 @@ async def _display_agent_info_helper(agent_name: str, agent_provider: object) ->
             # This is a single agent
             agent = agent_provider
 
-        # Get counts
-        servers = await agent.list_servers()
-        server_count = len(servers) if servers else 0
+        # Get counts TODO -- add this to the type library or adjust the way aggregator/reporting works
+        server_count = 0
+        if hasattr(agent, "_aggregator") and hasattr(agent._aggregator, "server_names"):
+            server_count = (
+                len(agent._aggregator.server_names) if agent._aggregator.server_names else 0
+            )
 
         tools_result = await agent.list_tools()
         tool_count = (
@@ -290,12 +294,13 @@ class AgentCompleter(Completer):
         self.agents = agents
         # Map commands to their descriptions for better completion hints
         self.commands = {
-            "tools": "List and call MCP tools",
-            "prompt": "List and select MCP prompts, or apply specific prompt (/prompt <name>)",
+            "tools": "List available MCP tools",
+            "prompt": "List and choose MCP prompts, or apply specific prompt (/prompt <name>)",
             "agents": "List available agents",
             "usage": "Show current usage statistics",
             "markdown": "Show last assistant message without markdown formatting",
-            "help": "Show available commands",
+            "save_history": "Save history; .json = MCP JSON, others = Markdown",
+            "help": "Show commands and shortcuts",
             "clear": "Clear the screen",
             "STOP": "Stop this prompting session and move to next workflow step",
             "EXIT": "Exit fast-agent, terminating any running workflows",
@@ -578,32 +583,91 @@ async def get_enhanced_input(
         if in_multiline_mode:
             mode_style = "ansired"  # More noticeable for multiline mode
             mode_text = "MULTILINE"
-            toggle_text = "Normal"
+        #           toggle_text = "Normal"
         else:
             mode_style = "ansigreen"
             mode_text = "NORMAL"
-            toggle_text = "Multiline"
+        #            toggle_text = "Multiline"
 
-        shortcuts = [
-            ("Ctrl+T", toggle_text),
-            ("Ctrl+J", "Newline" if not in_multiline_mode else None),
-            ("Ctrl+E", "External"),
-            ("Ctrl+Y", "Copy"),
-            ("Ctrl+L", "Clear"),
-            ("↑/↓", "History"),
-            ("EXIT", "Exit")
-        ]
-
-        newline = "Ctrl+J:Submit" if in_multiline_mode else "&lt;Enter&gt;:Submit"
+        # No shortcut hints in the toolbar for now
+        shortcuts = []
 
         # Only show relevant shortcuts based on mode
         shortcuts = [(k, v) for k, v in shortcuts if v]
 
         shortcut_text = " | ".join(f"{key}:{action}" for key, action in shortcuts)
 
-        return HTML(
-            f" <style fg='{toolbar_color}' bg='ansiblack'> {agent_name} </style> Mode: <style fg='{mode_style}' bg='ansiblack'> {mode_text} </style> {newline} | {shortcut_text} | v{app_version}"
-        )
+        # Resolve model name and TDV from the current agent if available
+        model_display = None
+        tdv_segment = None
+        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:
+                    # Truncate model name to max 25 characters with ellipsis
+                    max_len = 25
+                    if len(model_name) > max_len:
+                        # Keep total length at max_len including ellipsis
+                        model_display = model_name[: max_len - 1] + "…"
+                    else:
+                        model_display = model_name
+
+                # Build TDV capability segment based on model database
+                info = get_model_info(agent_obj)
+                # 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
+
+                def _style_flag(letter: str, supported: bool) -> str:
+                    # Enabled uses the same color as NORMAL mode (ansigreen), disabled is dim
+                    enabled_color = "ansigreen"
+                    return (
+                        f"<style fg='{enabled_color}' bg='ansiblack'>{letter}</style>"
+                        if supported
+                        else 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:
+            # If anything goes wrong determining the model, omit it gracefully
+            model_display = None
+            tdv_segment = None
+
+        # Build dynamic middle segments: model (in green) and optional shortcuts
+        middle_segments = []
+        if model_display:
+            # Model chip + inline TDV flags
+            if tdv_segment:
+                middle_segments.append(
+                    f"{tdv_segment} <style bg='ansigreen'>{model_display}</style>"
+                )
+            else:
+                middle_segments.append(f"<style bg='ansigreen'>{model_display}</style>")
+        if shortcut_text:
+            middle_segments.append(shortcut_text)
+        middle = " | ".join(middle_segments)
+
+        # Version/app label in green (dynamic version)
+        version_segment = f"fast-agent {app_version}"
+
+        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}"
+            )
+        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}"
+            )
 
     # A more terminal-agnostic style that should work across themes
     custom_style = Style.from_dict(
@@ -676,7 +740,7 @@ async def get_enhanced_input(
     def pre_process_input(text):
         # Command processing
         if text and text.startswith("/"):
-            if text == "/": 
+            if text == "/":
                 return ""
             cmd_parts = text[1:].strip().split(maxsplit=1)
             cmd = cmd_parts[0].lower()
@@ -691,6 +755,11 @@ async def get_enhanced_input(
                 return "SHOW_USAGE"
             elif cmd == "markdown":
                 return "MARKDOWN"
+            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
+                return {"save_history": True, "filename": filename}
             elif cmd == "prompt":
                 # Handle /prompt with no arguments as interactive mode
                 if len(cmd_parts) > 1:
@@ -867,6 +936,8 @@ async def handle_special_commands(command, agent_app=None):
         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("  @agent_name    - Switch to agent")
         rich_print("  STOP           - Return control back to the workflow")
         rich_print("  EXIT           - Exit fast-agent, terminating any running workflows")