fast-agent-mcp 0.0.12__py3-none-any.whl → 0.0.14__py3-none-any.whl

mcp_agent/core/enhanced_prompt.py

@@ -13,6 +13,8 @@ from prompt_toolkit.filters import Condition
 from pygments.lexers.python import PythonLexer
 from rich import print as rich_print
 
+from mcp_agent.core.exceptions import PromptExitError
+
 # Map of agent names to their history
 agent_histories = {}
 
@@ -29,9 +31,25 @@ agent_messages_shown = set()
 class AgentCompleter(Completer):
     """Provide completion for agent names and common commands."""
 
-    def __init__(self, agents: List[str], commands: List[str] = None, agent_types: dict = None):
+    def __init__(
+        self,
+        agents: List[str],
+        commands: List[str] = None,
+        agent_types: dict = None,
+        is_human_input: bool = False,
+    ):
         self.agents = agents
-        self.commands = commands or ["help", "clear", "STOP"]
+        # Map commands to their descriptions for better completion hints
+        self.commands = {
+            "help": "Show available commands",
+            "clear": "Clear the screen",
+            "agents": "List available agents",
+            "STOP": "Stop this prompting session and move to next workflow step",
+            "EXIT": "Exit FastAgent, terminating any running workflows",
+            **(commands or {}),  # Allow custom commands to be passed in
+        }
+        if is_human_input:
+            self.commands.pop("agents")
         self.agent_types = agent_types or {}
 
     def get_completions(self, document, complete_event):
@@ -41,13 +59,13 @@ class AgentCompleter(Completer):
         # Complete commands
         if text.startswith("/"):
             cmd = text[1:]
-            for command in self.commands:
+            for command, description in self.commands.items():
                 if command.lower().startswith(cmd):
                     yield Completion(
                         command,
                         start_position=-len(cmd),
                         display=command,
-                        display_meta="Command",
+                        display_meta=description,
                     )
 
         # Complete agent names for agent-related commands
@@ -62,6 +80,7 @@ class AgentCompleter(Completer):
                         start_position=-len(agent_name),
                         display=agent,
                         display_meta=agent_type,
+                        style="bg:ansiblack fg:ansiblue",
                     )
 
 
@@ -79,9 +98,10 @@ def create_keybindings(on_toggle_multiline=None, app=None):
         """Enter: insert newline when in multiline mode."""
         event.current_buffer.insert_text("\n")
 
-    @kb.add("escape", "enter")
+    # Use c-j (Ctrl+J) as an alternative to represent Ctrl+Enter in multiline mode
+    @kb.add("c-j", filter=Condition(lambda: in_multiline_mode))
     def _(event):
-        """Alt+Enter: always submit even in multiline mode."""
+        """Ctrl+J (equivalent to Ctrl+Enter): Submit in multiline mode."""
         event.current_buffer.validate_and_handle()
 
     @kb.add("c-t")
@@ -105,7 +125,7 @@ def create_keybindings(on_toggle_multiline=None, app=None):
 
     @kb.add("c-l")
     def _(event):
-        """Ctrl+L: Clear input."""
+        """Ctrl+L: Clear the input buffer."""
         event.current_buffer.text = ""
 
     return kb
@@ -120,6 +140,8 @@ async def get_enhanced_input(
     available_agent_names: List[str] = None,
     syntax: str = None,
     agent_types: dict = None,
+    is_human_input: bool = False,
+    toolbar_color: str = "ansiblue",
 ) -> str:
     """
     Enhanced input with advanced prompt_toolkit features.
@@ -133,6 +155,8 @@ async def get_enhanced_input(
         available_agent_names: List of agent names for auto-completion
         syntax: Syntax highlighting (e.g., 'python', 'sql')
         agent_types: Dictionary mapping agent names to their types for display
+        is_human_input: Whether this is a human input request (disables agent selection features)
+        toolbar_color: Color to use for the agent name in the toolbar (default: "ansiblue")
 
     Returns:
         User input string
@@ -167,16 +191,20 @@ async def get_enhanced_input(
 
         shortcuts = [
             ("Ctrl+T", toggle_text),
-            ("Alt+Enter", "Submit" if in_multiline_mode else ""),
             ("Ctrl+L", "Clear"),
             ("↑/↓", "History"),
         ]
+
+        newline = (
+            "Ctrl+<Enter>:Submit" if in_multiline_mode else "<Enter>:Submit"
+        )
+
         # 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" <b>Agent:</b> <ansiblue> {agent_name} </ansiblue> | <b>Mode:</b> <{mode_style}> {mode_text} </{mode_style}> | {shortcut_text}"
+            f" <{toolbar_color}> {agent_name} </{toolbar_color}> | <b>Mode:</b> <{mode_style}> {mode_text} </{mode_style}> {newline} | {shortcut_text}"
         )
 
     # Create session with history and completions
@@ -185,12 +213,13 @@ async def get_enhanced_input(
         completer=AgentCompleter(
             agents=list(available_agents) if available_agents else [],
             agent_types=agent_types or {},
+            is_human_input=is_human_input,
         ),
         complete_while_typing=True,
         lexer=PygmentsLexer(PythonLexer) if syntax == "python" else None,
         multiline=Condition(lambda: in_multiline_mode),
         complete_in_thread=True,
-        mouse_support=True,
+        mouse_support=False,
         bottom_toolbar=get_toolbar,  # Pass the function here
     )
 
@@ -220,9 +249,14 @@ async def get_enhanced_input(
 
     # Mention available features but only on first usage for this agent
     if agent_name not in agent_messages_shown:
-        rich_print(
-            "[dim]Tip: Type /help for commands, press F1 for keyboard shortcuts. Ctrl+T toggles multiline mode. @Agent to switch agent[/dim]"
-        )
+        if is_human_input:
+            rich_print(
+                "[dim]Tip: Type /help for commands. Ctrl+T toggles multiline mode. Ctrl+Enter to submit in multiline mode.[/dim]"
+            )
+        else:
+            rich_print(
+                "[dim]Tip: Type /help for commands, @Agent to switch agent. Ctrl+T toggles multiline mode. [/dim]"
+            )
         agent_messages_shown.add(agent_name)
 
     # Process special commands
@@ -236,6 +270,10 @@ async def get_enhanced_input(
                 return "CLEAR"
             elif cmd == "agents":
                 return "LIST_AGENTS"
+            elif cmd == "exit":
+                return "EXIT"
+            elif cmd == "stop":
+                return "STOP"
 
         # Agent switching
         if text and text.startswith("@"):
@@ -272,16 +310,18 @@ async def handle_special_commands(command, agent_app=None):
         rich_print("  /clear         - Clear screen")
         rich_print("  /agents        - List available agents")
         rich_print("  @agent_name    - Switch to agent")
-        rich_print("  STOP           - End session")
+        rich_print("  STOP           - Return control back to the workflow")
+        rich_print(
+            "  EXIT           - Exit FastAgent, terminating any running workflows"
+        )
         rich_print("\n[bold]Keyboard Shortcuts:[/bold]")
         rich_print(
             "  Enter          - Submit (normal mode) / New line (multiline mode)"
         )
-        rich_print("  Alt+Enter      - Always submit (even in multiline mode)")
+        rich_print("  Ctrl+Enter      - Always submit (even in multiline mode)")
         rich_print("  Ctrl+T         - Toggle multiline mode")
         rich_print("  Ctrl+L         - Clear input")
         rich_print("  Up/Down        - Navigate history")
-        rich_print("  F1             - Show help")
         return True
 
     elif command == "CLEAR":
@@ -289,6 +329,9 @@ async def handle_special_commands(command, agent_app=None):
         print("\033c", end="")
         return True
 
+    elif command == "EXIT":
+        raise PromptExitError("User requested to exit FastAgent session")
+
     elif command == "LIST_AGENTS":
         if available_agents:
             rich_print("\n[bold]Available Agents:[/bold]")

mcp_agent/core/exceptions.py

@@ -45,3 +45,27 @@ class ServerInitializationError(FastAgentError):
 
     def __init__(self, message: str, details: str = ""):
         super().__init__(message, details)
+
+
+class ModelConfigError(FastAgentError):
+    """Raised when there are issues with LLM model configuration
+    Example: Unknown model name in model specification string
+    """
+
+    def __init__(self, message: str, details: str = ""):
+        super().__init__(message, details)
+
+
+class CircularDependencyError(FastAgentError):
+    """Raised when we detect a Circular Dependency in the workflow"""
+
+    def __init__(self, message: str, details: str = ""):
+        super().__init__(message, details)
+
+
+class PromptExitError(FastAgentError):
+    """Raised from enhanced_prompt when the user requests hard exits"""
+
+    # TODO an exception for flow control :(
+    def __init__(self, message: str, details: str = ""):
+        super().__init__(message, details)