fast-agent-mcp 0.0.12__tar.gz → 0.0.13__tar.gz

{fast_agent_mcp-0.0.12 → fast_agent_mcp-0.0.13}/.gitignore

@@ -179,3 +179,4 @@ examples/**/*.jsonl
 mcp_agent.config.yaml
 mcp_agent.secrets.yaml
 fastagent.secrets.yaml
+CLAUDE.md

{fast_agent_mcp-0.0.12 → fast_agent_mcp-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.0.12
+Version: 0.0.13
 Summary: Define, Prompt and Test MCP enabled Agents and Workflows
 Author-email: Shaun Smith <fastagent@llmindset.co.uk>, Sarmad Qadri <sarmad@lastmileai.dev>
 License:                                  Apache License
@@ -269,6 +269,12 @@ Other bootstrap examples include a Researcher (with Evaluator-Optimizer workflow
 
 > Windows Users - there are a couple of configuration changes needed for the Filesystem and Docker MCP Servers - necessary changes are detailed within the configuration files.
 
+## Agent Development
+
+FastAgent lets you interact with Agents during a workflow, enabling "warm-up" and diagnostic prompting to improve behaviour and refine prompts.
+
+## MCP Server Development
+
 ### llmindset.co.uk fork:
 
 - "FastAgent" style prototyping, with per-agent models

{fast_agent_mcp-0.0.12 → fast_agent_mcp-0.0.13}/README.md

@@ -32,6 +32,12 @@ Other bootstrap examples include a Researcher (with Evaluator-Optimizer workflow
 
 > Windows Users - there are a couple of configuration changes needed for the Filesystem and Docker MCP Servers - necessary changes are detailed within the configuration files.
 
+## Agent Development
+
+FastAgent lets you interact with Agents during a workflow, enabling "warm-up" and diagnostic prompting to improve behaviour and refine prompts.
+
+## MCP Server Development
+
 ### llmindset.co.uk fork:
 
 - "FastAgent" style prototyping, with per-agent models

{fast_agent_mcp-0.0.12 → fast_agent_mcp-0.0.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fast-agent-mcp"
-version = "0.0.12"
+version = "0.0.13"
 description = "Define, Prompt and Test MCP enabled Agents and Workflows"
 readme = "README.md"
 license = { file = "LICENSE" }

{fast_agent_mcp-0.0.12 → fast_agent_mcp-0.0.13}/src/mcp_agent/agents/agent.py

@@ -11,6 +11,7 @@ from mcp.types import (
     Tool,
 )
 
+from mcp_agent.core.exceptions import PromptExitError
 from mcp_agent.mcp.mcp_aggregator import MCPAggregator
 from mcp_agent.workflows.llm.augmented_llm import RequestParams
 from mcp_agent.human_input.types import (
@@ -24,6 +25,7 @@ from mcp_agent.logging.logger import get_logger
 
 if TYPE_CHECKING:
     from mcp_agent.context import Context
+import traceback
 
 logger = get_logger(__name__)
 
@@ -148,10 +150,7 @@ class Agent(MCPAggregator):
         """
         await super().close()
 
-    async def request_human_input(
-        self,
-        request: HumanInputRequest,
-    ) -> str:
+    async def request_human_input(self, request: HumanInputRequest) -> str:
         """
         Request input from a human user. Pauses the workflow until input is received.
 
@@ -170,14 +169,23 @@ class Agent(MCPAggregator):
         # Generate a unique ID for this request to avoid signal collisions
         request_id = f"{HUMAN_INPUT_SIGNAL_NAME}_{self.name}_{uuid.uuid4()}"
         request.request_id = request_id
-
+        # Use metadata as a dictionary to pass agent name
+        request.metadata = {"agent_name": self.name}
         self.logger.debug("Requesting human input:", data=request)
 
         async def call_callback_and_signal():
             try:
                 user_input = await self.human_input_callback(request)
+
                 self.logger.debug("Received human input:", data=user_input)
                 await self.executor.signal(signal_name=request_id, payload=user_input)
+            except PromptExitError as e:
+                # Propagate the exit error through the signal system
+                self.logger.info("User requested to exit session")
+                await self.executor.signal(
+                    signal_name=request_id,
+                    payload={"exit_requested": True, "error": str(e)},
+                )
             except Exception as e:
                 await self.executor.signal(
                     request_id, payload=f"Error getting human input: {str(e)}"
@@ -197,6 +205,10 @@ class Agent(MCPAggregator):
             signal_type=HumanInputResponse,  # TODO: saqadri - should this be HumanInputResponse?
         )
 
+        if isinstance(result, dict) and result.get("exit_requested", False):
+            raise PromptExitError(
+                result.get("error", "User requested to exit FastAgent session")
+            )
         self.logger.debug("Received human input signal", data=result)
         return result
 
@@ -253,13 +265,39 @@ class Agent(MCPAggregator):
     ) -> CallToolResult:
         # Handle human input request
         try:
-            request = HumanInputRequest(**arguments.get("request"))
-            result: HumanInputResponse = await self.request_human_input(request=request)
+            # Make sure arguments is not None
+            if arguments is None:
+                arguments = {}
+
+            # Extract request data
+            request_data = arguments.get("request")
+
+            # Handle both string and dict request formats
+            if isinstance(request_data, str):
+                request = HumanInputRequest(prompt=request_data)
+            elif isinstance(request_data, dict):
+                request = HumanInputRequest(**request_data)
+            else:
+                # Fallback for invalid or missing request data
+                request = HumanInputRequest(prompt="Please provide input:")
+
+            result = await self.request_human_input(request=request)
+
+            # Use response attribute if available, otherwise use the result directly
+            response_text = (
+                result.response
+                if isinstance(result, HumanInputResponse)
+                else str(result)
+            )
+
             return CallToolResult(
                 content=[
-                    TextContent(type="text", text=f"Human response: {result.response}")
+                    TextContent(type="text", text=f"Human response: {response_text}")
                 ]
             )
+
+        except PromptExitError:
+            raise
         except TimeoutError as e:
             return CallToolResult(
                 isError=True,
@@ -271,6 +309,8 @@ class Agent(MCPAggregator):
                 ],
             )
         except Exception as e:
+            print(f"Error in _call_human_input_tool: {traceback.format_exc()}")
+
             return CallToolResult(
                 isError=True,
                 content=[

{fast_agent_mcp-0.0.12 → fast_agent_mcp-0.0.13}/src/mcp_agent/cli/commands/bootstrap.py

@@ -26,6 +26,7 @@ EXAMPLE_TYPES = {
             "orchestrator.py",
             "parallel.py",
             "router.py",
+            "fastagent.config.yaml",
         ],
         "create_subdir": False,
     },

{fast_agent_mcp-0.0.12 → fast_agent_mcp-0.0.13}/src/mcp_agent/cli/commands/setup.py

@@ -119,7 +119,7 @@ fast = FastAgent("FastAgent Example")
 
 
 # Define the agent
-@fast.agent(servers=["fetch"])
+@fast.agent(instruction="You are a helpful AI Agent", servers=["fetch"])
 async def main():
     # use the --model command line switch or agent arguments to change model
     async with fast.run() as agent:

{fast_agent_mcp-0.0.12 → fast_agent_mcp-0.0.13}/src/mcp_agent/cli/main.py

@@ -32,7 +32,7 @@ def show_welcome():
 
     table.add_row("setup", "Set up a new agent project with configuration files")
     table.add_row(
-        "bootstrap", "Create example applications (decorator, researcher, etc.)"
+        "bootstrap", "Create example applications (workflow, researcher, etc.)"
     )
     # table.add_row("config", "Manage agent configuration settings")
 
@@ -41,8 +41,8 @@ def show_welcome():
     console.print("\n[bold]Getting Started:[/bold]")
     console.print("1. Set up a new project:")
     console.print("   fastagent setup")
-    console.print("\n2. Try an example:")
-    console.print("   fastagent bootstrap create decorator")
+    console.print("\n2. Try an example workflow:")
+    console.print("   fastagent bootstrap create workflow")
     console.print("\nUse --help with any command for more information")
     console.print("Example: fastagent bootstrap --help")
 

{fast_agent_mcp-0.0.12 → fast_agent_mcp-0.0.13}/src/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]")

{fast_agent_mcp-0.0.12 → fast_agent_mcp-0.0.13}/src/mcp_agent/core/exceptions.py

@@ -45,3 +45,20 @@ 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 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)

{fast_agent_mcp-0.0.12 → fast_agent_mcp-0.0.13}/src/mcp_agent/core/fastagent.py

@@ -3,7 +3,17 @@ Decorator-based interface for MCP Agent applications.
 Provides a simplified way to create and manage agents using decorators.
 """
 
-from typing import List, Optional, Dict, Callable, TypeVar, Any, Union, TypeAlias
+from typing import (
+    List,
+    Optional,
+    Dict,
+    Callable,
+    TypeVar,
+    Any,
+    Union,
+    TypeAlias,
+    Literal,
+)
 from enum import Enum
 import yaml
 import argparse
@@ -11,6 +21,8 @@ from contextlib import asynccontextmanager
 
 from mcp_agent.core.exceptions import (
     AgentConfigError,
+    ModelConfigError,
+    PromptExitError,
     ServerConfigError,
     ProviderKeyError,
     ServerInitializationError,
@@ -175,7 +187,7 @@ class AgentApp:
 
         # Pass all available agent names for auto-completion
         available_agents = list(self._agents.keys())
-        
+
         # Create agent_types dictionary mapping agent names to their types
         agent_types = {}
         for name, proxy in self._agents.items():
@@ -633,6 +645,7 @@ class FastAgent(ContextDependent):
         use_history: bool = False,
         request_params: Optional[Dict] = None,
         human_input: bool = False,
+        plan_type: Literal["full", "iterative"] = "full",
     ) -> Callable:
         """
         Decorator to create and register an orchestrator.
@@ -645,6 +658,7 @@ class FastAgent(ContextDependent):
             use_history: Whether to maintain conversation history (forced false)
             request_params: Additional request parameters for the LLM
             human_input: Whether to enable human input capabilities
+            plan_type: Planning approach - "full" generates entire plan first, "iterative" plans one step at a time
         """
         default_instruction = """
             You are an expert planner. Given an objective task and a list of MCP servers (which are collections of tools)
@@ -666,6 +680,7 @@ class FastAgent(ContextDependent):
             use_history=use_history,
             request_params=request_params,
             human_input=human_input,
+            plan_type=plan_type,
         )
         return decorator
 
@@ -864,7 +879,7 @@ class FastAgent(ContextDependent):
                         which can be performed by LLMs with access to the servers or agents.
                         """,
                         servers=[],  # Planner doesn't need server access
-                        model=config.model,  # Use same model as orchestrator
+                        model=config.model,
                         default_request_params=base_params,
                     )
                     planner_agent = Agent(
@@ -885,8 +900,10 @@ class FastAgent(ContextDependent):
                         available_agents=child_agents,
                         context=agent_app.context,
                         request_params=planner.default_request_params,  # Base params already include model settings
-                        plan_type="full",  # TODO -- support iterative plan type properly
-                        verb=ProgressAction.PLANNING,  # Using PLANNING instead of ORCHESTRATING
+                        plan_type=agent_data.get(
+                            "plan_type", "full"
+                        ),  # Get plan_type from agent_data
+                        verb=ProgressAction.PLANNING,
                     )
 
                 elif agent_type == AgentType.EVALUATOR_OPTIMIZER:
@@ -1228,10 +1245,28 @@ class FastAgent(ContextDependent):
             had_error = True
             self._handle_error(
                 e,
-                "Server Startup Error",
+                "MCP Server Startup Error",
                 "There was an error starting up the MCP Server.",
             )
             raise SystemExit(1)
+
+        except ModelConfigError as e:
+            had_error = True
+            self._handle_error(
+                e,
+                "Model Configuration Error",
+                "Common models: gpt-4o, o3-mini, sonnet, haiku. for o3, set reasoning effort with o3-mini.high",
+            )
+            raise SystemExit(1)
+
+        except PromptExitError as e:
+            had_error = True
+            self._handle_error(
+                e,
+                "User requested exit",
+            )
+            raise SystemExit(1)
+
         finally:
             # Clean up any active agents without re-raising errors
             if active_agents and not had_error:
@@ -1239,7 +1274,8 @@ class FastAgent(ContextDependent):
                     if isinstance(proxy, LLMAgentProxy):
                         try:
                             await proxy._agent.__aexit__(None, None, None)
-                        except Exception:
+                        except Exception as e:
+                            print(f"DEBUG {e.message}")
                             pass  # Ignore cleanup errors
 
     def _handle_error(

fast_agent_mcp-0.0.13/src/mcp_agent/human_input/handler.py

@@ -0,0 +1,78 @@
+import asyncio
+from rich.panel import Panel
+
+from mcp_agent.console import console
+from mcp_agent.human_input.types import (
+    HumanInputRequest,
+    HumanInputResponse,
+)
+from mcp_agent.progress_display import progress_display
+from mcp_agent.core.enhanced_prompt import get_enhanced_input, handle_special_commands
+
+
+async def console_input_callback(request: HumanInputRequest) -> HumanInputResponse:
+    """Request input from a human user via console using prompt_toolkit."""
+
+    # Prepare the prompt text
+    prompt_text = request.prompt
+    if request.description:
+        prompt_text = f"[bold]{request.description}[/bold]\n\n{request.prompt}"
+
+    # Create a panel with the prompt
+    panel = Panel(
+        prompt_text,
+        title="[HUMAN INPUT REQUESTED]",
+        title_align="left",
+        style="green",
+        border_style="bold white",
+        padding=(1, 2),
+    )
+
+    # Extract agent name from metadata dictionary
+    agent_name = (
+        request.metadata.get("agent_name", "Unknown Agent")
+        if request.metadata
+        else "Unknown Agent"
+    )
+
+    # Use the context manager to pause the progress display while getting input
+    with progress_display.paused():
+        console.print(panel)
+
+        try:
+            if request.timeout_seconds:
+                try:
+                    # Use get_enhanced_input with empty agent list to disable agent switching
+                    response = await asyncio.wait_for(
+                        get_enhanced_input(
+                            agent_name=agent_name,
+                            available_agent_names=[],  # No agents for selection
+                            show_stop_hint=False,
+                            is_human_input=True,
+                            toolbar_color="ansimagenta",
+                        ),
+                        request.timeout_seconds,
+                    )
+                except asyncio.TimeoutError:
+                    console.print("\n[red]Timeout waiting for input[/red]")
+                    raise TimeoutError("No response received within timeout period")
+            else:
+                response = await get_enhanced_input(
+                    agent_name=agent_name,
+                    available_agent_names=[],  # No agents for selection
+                    show_stop_hint=False,
+                    is_human_input=True,
+                    toolbar_color="ansimagenta",
+                )
+
+            #            if response and (response.startswith("/") or response.startswith("@")):
+            await handle_special_commands(response)
+
+        except KeyboardInterrupt:
+            console.print("\n[yellow]Input interrupted[/yellow]")
+            response = ""
+        except EOFError:
+            console.print("\n[yellow]Input terminated[/yellow]")
+            response = ""
+
+    return HumanInputResponse(request_id=request.request_id, response=response.strip())