fast-agent-mcp 0.2.5__py3-none-any.whl → 0.2.6__py3-none-any.whl

{fast_agent_mcp-0.2.5.dist-info → fast_agent_mcp-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.2.5
+Version: 0.2.6
 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

{fast_agent_mcp-0.2.5.dist-info → fast_agent_mcp-0.2.6.dist-info}/RECORD

@@ -8,33 +8,33 @@ mcp_agent/event_progress.py,sha256=25iz0yyg-O4glMmtijcYpDdUmtUIKsCmR_8A52GgeC4,2
 mcp_agent/mcp_server_registry.py,sha256=r24xX4BYXj4BbWbU37uwuW9e1mFOYgpb258OMb21SaY,9928
 mcp_agent/progress_display.py,sha256=GeJU9VUt6qKsFVymG688hCMVCsAygG9ifiiEb5IcbN4,361
 mcp_agent/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/agents/agent.py,sha256=NKz8HTCdjIBDSJwl6EHU2NDnZcAtYiaYH3YnbVGrc3Q,3882
-mcp_agent/agents/base_agent.py,sha256=mhLgsS_pST1LeBZmnBo9ldEthcKV9LZdBSdt5PkafCk,23184
+mcp_agent/agents/agent.py,sha256=Tn2YKw_ytx9b8jC-65WYQmrnD43kYiZsLa4sVHxn9d4,3854
+mcp_agent/agents/base_agent.py,sha256=9IExAXyPpao4t7J_uF2pjSlbnlKp-229oiOykbE6KDI,23515
 mcp_agent/agents/workflow/__init__.py,sha256=HloteEW6kalvgR0XewpiFAqaQlMPlPJYg5p3K33IUzI,25
-mcp_agent/agents/workflow/chain_agent.py,sha256=ff5ksaJiAm007MMl8QO4pBTTIgQLcf9GLZpRtYkfBJQ,6201
-mcp_agent/agents/workflow/evaluator_optimizer.py,sha256=ArM2CySsTY0gSPndox1DdjecRdNtWIj-Qm9ApUWkygw,13103
-mcp_agent/agents/workflow/orchestrator_agent.py,sha256=nf7_Rq3XOiLfLsZ7MHVKAMkhaWJIz5NkWe2xYFH3yqc,21409
+mcp_agent/agents/workflow/chain_agent.py,sha256=EW10IgEnKJ3YfwLY61B1SQlYC-84jcXsrRmzpLQbngE,6384
+mcp_agent/agents/workflow/evaluator_optimizer.py,sha256=VWdzVIy_qSiVsDJO22ta3RB3drkvBfXk9HxBYMpsC5U,13300
+mcp_agent/agents/workflow/orchestrator_agent.py,sha256=30hFQyAmtjQTX6Li_zWWIHCpdNpfZkDo57YXXW5xIsI,21561
 mcp_agent/agents/workflow/orchestrator_models.py,sha256=5P_aXADVT4Et8qT4e1cb9RelmHX5dCRrzu8j8T41Kdg,7230
 mcp_agent/agents/workflow/orchestrator_prompts.py,sha256=EXKEI174sshkZyPPEnWbwwNafzSPuA39MXL7iqG9cWc,9106
-mcp_agent/agents/workflow/parallel_agent.py,sha256=denkFKrvZJZ4c3Cja9cx-EOUhd-mDO30UIU48WGMnEM,6901
-mcp_agent/agents/workflow/router_agent.py,sha256=iOIPhMP9-w-lho50obx1rvGphI_-7Hdr9E9ohlKmtJk,10484
+mcp_agent/agents/workflow/parallel_agent.py,sha256=SgIXJx2X_MSlLOv6WXYRezwjDYjU9f95eKQzTm5Y_lk,7087
+mcp_agent/agents/workflow/router_agent.py,sha256=WLv2ny_-6mAJ7tjU-6nUe2yVhW008vso5NU9tczNTn0,10666
 mcp_agent/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/cli/__main__.py,sha256=AVZ7tQFhU_sDOGuUGJq8ujgKtcxsYJBJwHbVaaiRDlI,166
 mcp_agent/cli/main.py,sha256=PZdPJfsAJOm80vTu7j_XpMPhaDZOpqSe-ciU3YQsmA4,3149
 mcp_agent/cli/terminal.py,sha256=GRwD-RGW7saIz2IOWZn5vD6JjiArscELBThm1GTFkuI,1065
 mcp_agent/cli/commands/bootstrap.py,sha256=Pv3LQUQLK_5-8nbOQ6iibJI7awgD04P9xh6-VpU15pw,11571
 mcp_agent/cli/commands/config.py,sha256=jU2gl4d5YESrdUboh3u6mxf7CxVT-_DT_sK8Vuh3ajw,231
-mcp_agent/cli/commands/setup.py,sha256=iXsKrf31Szv4Umbk9JfR5as9HcivFJchhE1KKzHxyIo,6345
+mcp_agent/cli/commands/setup.py,sha256=CsmfIvKFfOhU1bOkm1cTqNseQdn3qdlfXN4BALwQ3Ik,6345
 mcp_agent/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/core/agent_app.py,sha256=9c7V-gZKudl-6u2BB__aLEvC4iemJeWpyoI8fGpXsXk,10145
-mcp_agent/core/agent_types.py,sha256=Qyhvzy2CcD7wMaxavuMUOQnD_rg5LZ1RT3DwXVYaM1Q,1345
-mcp_agent/core/direct_decorators.py,sha256=_kS0C9UbwRQ54z58vfUapFXXyJrm1XRVyLMuB7bL0b8,14471
-mcp_agent/core/direct_factory.py,sha256=oMozbr6kK37vWtAIvzCKtlX1i7KTez3hLdQfeXCWUjM,17580
+mcp_agent/core/agent_app.py,sha256=5nQJNo8DocIRWiX4pVKAHUZF8s6HWpc-hJnfzl_1v1c,9697
+mcp_agent/core/agent_types.py,sha256=LuWslu9YI6JRnAWwh_A1ZejK72-e839wH7tf2MHxSIU,1389
+mcp_agent/core/direct_decorators.py,sha256=Q6t3VpRPLCRzqJycPZIkKbbEJMVocxdScp5o2xn4gLU,14460
+mcp_agent/core/direct_factory.py,sha256=hYFCucZVAQ2wrfqIe9Qameoa-cCRaQ53R97EMHvUZAM,17572
 mcp_agent/core/enhanced_prompt.py,sha256=P9FAtc0rqIYQfUDkTNVXitFIZEtB3fdq_Nr0-st64Qg,17948
 mcp_agent/core/error_handling.py,sha256=xoyS2kLe0eG0bj2eSJCJ2odIhGUve2SbDR7jP-A-uRw,624
 mcp_agent/core/exceptions.py,sha256=ENAD_qGG67foxy6vDkIvc-lgopIUQy6O7zvNPpPXaQg,2289
 mcp_agent/core/fastagent.py,sha256=HTy1OCAhpHIM-4cd37-dxvb97eZUELN-ICAEFgqmJMk,18503
-mcp_agent/core/interactive_prompt.py,sha256=04yoeOX2JLatr2tuOFfnb84GMwFUIBnBC7y1M_gqOM8,17692
+mcp_agent/core/interactive_prompt.py,sha256=zU53h8mmaJBnddYy2j57tH7jreQ9PUz7vLEo2gdDrio,17704
 mcp_agent/core/mcp_content.py,sha256=2D7KHY9mG_vxoDwFLKvsPQV9VRIzHItM7V-jcEnACh8,8878
 mcp_agent/core/prompt.py,sha256=qnintOUGEoDPYLI9bu9G2OlgVMCe5ZPUZilgMzydXhc,7919
 mcp_agent/core/request_params.py,sha256=bEjWo86fqxdiWm2U5nPDd1uCUpcIQO9oiCinhB8lQN0,1185
@@ -50,7 +50,7 @@ mcp_agent/human_input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 mcp_agent/human_input/handler.py,sha256=s712Z5ssTCwjL9-VKoIdP5CtgMh43YvepynYisiWTTA,3144
 mcp_agent/human_input/types.py,sha256=RtWBOVzy8vnYoQrc36jRLn8z8N3C4pDPMBN5vF6qM5Y,1476
 mcp_agent/llm/__init__.py,sha256=d8zgwG-bRFuwiMNMYkywg_qytk4P8lawyld_meuUmHI,68
-mcp_agent/llm/augmented_llm.py,sha256=K7sfUaJrFqupEbq7xi7hDjyAC4UMXQBYQxza5TFJ6VA,18117
+mcp_agent/llm/augmented_llm.py,sha256=AFNA_v7cuxy9MSpCigv9FM9CEg27NsaUfeme4tiy1y8,18125
 mcp_agent/llm/augmented_llm_passthrough.py,sha256=U0LssNWNVuZRuD9I7Wuvpo7vdDW4xtoPLirnYCgBGTY,6128
 mcp_agent/llm/augmented_llm_playback.py,sha256=YVR2adzjMf9Q5WfYBytryWMRqJ87a3kNBnjxhApsMcU,3413
 mcp_agent/llm/memory.py,sha256=UakoBCJBf59JBtB6uyZM0OZjlxDW_VHtSfDs08ibVEc,3312
@@ -80,7 +80,7 @@ mcp_agent/logging/tracing.py,sha256=d5lSXakzzi5PtQpUkVkOnYaGX8NduGPq__S7vx-Ln8U,
 mcp_agent/logging/transport.py,sha256=m8YsLLu5T8eof_ndpLQs4gHOzqqEL98xsVwBwDsBfxI,17335
 mcp_agent/mcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/mcp/gen_client.py,sha256=fAVwFVCgSamw4PwoWOV4wrK9TABx1S_zZv8BctRyF2k,3030
-mcp_agent/mcp/interfaces.py,sha256=8fsQj8r7sMrIyrJHHbUIEP86SVLyXPpEI36KZq1abc0,6644
+mcp_agent/mcp/interfaces.py,sha256=vma7bbWbY3zp1RM6hMYxVO4aV6Vfaygm-nLwzK2jFKI,6748
 mcp_agent/mcp/logger_textio.py,sha256=OpnqMam9Pu0oVzYQWFMhrX1dRg2f5Fqb3qqPA6QAATM,2778
 mcp_agent/mcp/mcp_activity.py,sha256=CajXCFWZ2cKEX9s4-HfNVAj471ePTVs4NOkvmIh65tE,592
 mcp_agent/mcp/mcp_agent_client_session.py,sha256=RMYNltc2pDIzxwEJSS5589RbvPO0KWV4Y3jSyAmhKf0,4181
@@ -102,7 +102,7 @@ mcp_agent/mcp/prompts/prompt_load.py,sha256=VkcY6dD1jRCu-OB5AtSO8YwVATjEoYCkyAIG
 mcp_agent/mcp/prompts/prompt_server.py,sha256=tXtQd4EnH86MmdAvHlXm4oOS1dWLSCW5PvoA7uU1TvA,16493
 mcp_agent/mcp/prompts/prompt_template.py,sha256=EejiqGkau8OizORNyKTUwUjrPof5V-hH1H_MBQoQfXw,15732
 mcp_agent/mcp_server/__init__.py,sha256=zBU51ITHIEPScd9nRafnhEddsWqXRPAAvHhkrbRI2_4,155
-mcp_agent/mcp_server/agent_server.py,sha256=5jEHJcoKHKRhMAwn3HArqiqtiiLcFZvantABoEHSw8k,6470
+mcp_agent/mcp_server/agent_server.py,sha256=LVZNML2_ysK7nVVLDou8pQuQWiEsMFZLryn_KihmkUQ,6431
 mcp_agent/resources/examples/data-analysis/analysis-campaign.py,sha256=QdNdo0-7LR4Uzw61hEU_jVKmWyk6A9YpGo81kMwVobM,7267
 mcp_agent/resources/examples/data-analysis/analysis.py,sha256=M9z8Q4YC5OGuqSa5uefYmmfmctqMn-WqCSfg5LI407o,2609
 mcp_agent/resources/examples/data-analysis/fastagent.config.yaml,sha256=ini94PHyJCfgpjcjHKMMbGuHs6LIj46F1NwY0ll5HVk,1609
@@ -134,8 +134,8 @@ mcp_agent/resources/examples/workflows/orchestrator.py,sha256=rOGilFTliWWnZ3Jx5w
 mcp_agent/resources/examples/workflows/parallel.py,sha256=n0dFN26QvYd2wjgohcaUBflac2SzXYx-bCyxMSousJE,1884
 mcp_agent/resources/examples/workflows/router.py,sha256=E4x_-c3l4YW9w1i4ARcDtkdeqIdbWEGfsMzwLYpdbVc,1677
 mcp_agent/ui/console_display.py,sha256=TVGDtJ37hc6UG0ei9g7ZPZZfFNeS1MYozt-Mx8HsPCk,9752
-fast_agent_mcp-0.2.5.dist-info/METADATA,sha256=oL4nXJVnNJOv5M5KccLqjAY7jZsygvnIY2-1ZdXb1SI,29839
-fast_agent_mcp-0.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fast_agent_mcp-0.2.5.dist-info/entry_points.txt,sha256=qPM7vwtN1_KmP3dXehxgiCxUBHtqP7yfenZigztvY-w,226
-fast_agent_mcp-0.2.5.dist-info/licenses/LICENSE,sha256=cN3FxDURL9XuzE5mhK9L2paZo82LTfjwCYVT7e3j0e4,10939
-fast_agent_mcp-0.2.5.dist-info/RECORD,,
+fast_agent_mcp-0.2.6.dist-info/METADATA,sha256=f1wgZfK_zZRytbHKacbUDGvP7JS0Qqjp2YemYm1td9Y,29839
+fast_agent_mcp-0.2.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fast_agent_mcp-0.2.6.dist-info/entry_points.txt,sha256=qPM7vwtN1_KmP3dXehxgiCxUBHtqP7yfenZigztvY-w,226
+fast_agent_mcp-0.2.6.dist-info/licenses/LICENSE,sha256=cN3FxDURL9XuzE5mhK9L2paZo82LTfjwCYVT7e3j0e4,10939
+fast_agent_mcp-0.2.6.dist-info/RECORD,,

mcp_agent/agents/agent.py

@@ -66,7 +66,7 @@ class Agent(BaseAgent):
         agent_name_str = str(self.name)
 
         # Create agent_types dictionary with just this agent
-        agent_types = {agent_name_str: getattr(self.config, "agent_type", "Agent")}
+        agent_types = {agent_name_str: self.agent_type}
 
         # Create the interactive prompt
         prompt = InteractivePrompt(agent_types=agent_types)

mcp_agent/agents/base_agent.py

@@ -622,6 +622,18 @@ class BaseAgent(MCPAggregator, AgentProtocol):
         response = await self.generate(prompts, request_params)
         return response.first_text()
 
+    @property
+    def agent_type(self) -> str:
+        """
+        Return the type of this agent. 
+        
+        This is used for display purposes in the interactive prompt and other UI elements.
+        
+        Returns:
+            String representing the agent type
+        """
+        return self.config.agent_type
+        
     @property
     def message_history(self) -> List[PromptMessageMultipart]:
         """

mcp_agent/agents/workflow/chain_agent.py

@@ -9,8 +9,9 @@ from typing import Any, List, Optional, Tuple, Type
 
 from mcp.types import TextContent
 
-from mcp_agent.agents.agent import Agent, AgentConfig
+from mcp_agent.agents.agent import Agent
 from mcp_agent.agents.base_agent import BaseAgent
+from mcp_agent.core.agent_types import AgentConfig, AgentType
 from mcp_agent.core.prompt import Prompt
 from mcp_agent.core.request_params import RequestParams
 from mcp_agent.mcp.interfaces import ModelT
@@ -22,6 +23,11 @@ class ChainAgent(BaseAgent):
     A chain agent that processes requests through a series of specialized agents in sequence.
     Passes the output of each agent to the next agent in the chain.
     """
+    
+    @property
+    def agent_type(self) -> str:
+        """Return the type of this agent."""
+        return AgentType.CHAIN.value
 
     def __init__(
         self,

mcp_agent/agents/workflow/evaluator_optimizer.py

@@ -14,6 +14,7 @@ from pydantic import BaseModel, Field
 
 from mcp_agent.agents.agent import Agent
 from mcp_agent.agents.base_agent import BaseAgent
+from mcp_agent.core.agent_types import AgentType
 from mcp_agent.core.exceptions import AgentConfigError
 from mcp_agent.core.prompt import Prompt
 from mcp_agent.core.request_params import RequestParams
@@ -63,6 +64,11 @@ class EvaluatorOptimizerAgent(BaseAgent):
     for refinement, continuing until a quality threshold is reached or a maximum
     number of refinement cycles is completed.
     """
+    
+    @property
+    def agent_type(self) -> str:
+        """Return the type of this agent."""
+        return AgentType.EVALUATOR_OPTIMIZER.value
 
     def __init__(
         self,

mcp_agent/agents/workflow/orchestrator_agent.py

@@ -27,7 +27,7 @@ from mcp_agent.agents.workflow.orchestrator_prompts import (
     SYNTHESIZE_PLAN_PROMPT_TEMPLATE,
     TASK_PROMPT_TEMPLATE,
 )
-from mcp_agent.core.agent_types import AgentConfig
+from mcp_agent.core.agent_types import AgentConfig, AgentType
 from mcp_agent.core.exceptions import AgentConfigError
 from mcp_agent.core.prompt import Prompt
 from mcp_agent.core.request_params import RequestParams
@@ -46,6 +46,11 @@ class OrchestratorAgent(BaseAgent):
     to specialized worker agents, synthesizing their results into a cohesive output.
     Supports both full planning and iterative planning modes.
     """
+    
+    @property
+    def agent_type(self) -> str:
+        """Return the type of this agent."""
+        return AgentType.ORCHESTRATOR.value
 
     def __init__(
         self,

mcp_agent/agents/workflow/parallel_agent.py

@@ -3,8 +3,9 @@ from typing import Any, List, Optional, Tuple
 
 from mcp.types import TextContent
 
-from mcp_agent.agents.agent import Agent, AgentConfig
+from mcp_agent.agents.agent import Agent
 from mcp_agent.agents.base_agent import BaseAgent
+from mcp_agent.core.agent_types import AgentConfig, AgentType
 from mcp_agent.core.request_params import RequestParams
 from mcp_agent.mcp.interfaces import ModelT
 from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
@@ -17,6 +18,11 @@ class ParallelAgent(BaseAgent):
     This workflow performs both the fan-out and fan-in operations using LLMs.
     From the user's perspective, an input is specified and the output is returned.
     """
+    
+    @property
+    def agent_type(self) -> str:
+        """Return the type of this agent."""
+        return AgentType.PARALLEL.value
 
     def __init__(
         self,

mcp_agent/agents/workflow/router_agent.py

@@ -12,7 +12,7 @@ from pydantic import BaseModel
 
 from mcp_agent.agents.agent import Agent
 from mcp_agent.agents.base_agent import BaseAgent
-from mcp_agent.core.agent_types import AgentConfig
+from mcp_agent.core.agent_types import AgentConfig, AgentType
 from mcp_agent.core.exceptions import AgentConfigError
 from mcp_agent.core.prompt import Prompt
 from mcp_agent.core.request_params import RequestParams
@@ -53,7 +53,7 @@ You are a highly accurate request router that directs incoming requests to the m
 Your task is to analyze the request and determine the most appropriate agent from the options above.
 
 <fastagent:instruction>
-Respond in JSON format. NEVER include Code Fences:
+Respond in JSON format. ONLY include JSON (no explanation). NEVER include Code Fences:
 {{
     "agent": "<agent name>",
     "confidence": "<high, medium or low>",
@@ -87,6 +87,11 @@ class RouterAgent(BaseAgent):
     A simplified router that uses an LLM to determine the best agent for a request,
     then dispatches the request to that agent and returns the response.
     """
+    
+    @property
+    def agent_type(self) -> str:
+        """Return the type of this agent."""
+        return AgentType.ROUTER.value
 
     def __init__(
         self,

mcp_agent/cli/commands/setup.py

@@ -73,7 +73,7 @@ mcp:
 
 GITIGNORE_TEMPLATE = """
 # FastAgent secrets file
-fastagent-secrets.yaml
+fastagent.secrets.yaml
 
 # Python
 __pycache__/
@@ -215,7 +215,7 @@ def init(
         if "fastagent.secrets.yaml" in created:
             console.print("\n[yellow]Important:[/yellow] Remember to:")
             console.print(
-                "1. Add your API keys to fastagent-secrets.yaml or set OPENAI_API_KEY and ANTHROPIC_API_KEY environment variables"
+                "1. Add your API keys to fastagent.secrets.yaml or set OPENAI_API_KEY and ANTHROPIC_API_KEY environment variables"
             )
             console.print(
                 "2. Keep fastagent.secrets.yaml secure and never commit it to version control"

mcp_agent/core/agent_app.py

@@ -69,7 +69,7 @@ class AgentApp:
         if message:
             return await self._agent(agent_name).send(message)
 
-        return await self.interactive(agent_name=agent_name, default_prompt=default_prompt)
+        return await self.interactive(agent=agent_name, default_prompt=default_prompt)
 
     async def send(
         self,
@@ -220,9 +220,9 @@ class AgentApp:
         """
         Deprecated - use interactive() instead.
         """
-        return await self.interactive(agent_name=agent_name, default_prompt=default_prompt)
+        return await self.interactive(agent=agent_name, default_prompt=default_prompt)
 
-    async def interactive(self, agent_name: str | None = None, default_prompt: str = "") -> str:
+    async def interactive(self, agent: str | None = None, default_prompt: str = "") -> str:
         """
         Interactive prompt for sending messages with advanced features.
 
@@ -235,11 +235,11 @@ class AgentApp:
         """
 
         # Get the default agent name if none specified
-        if agent_name:
+        if agent:
             # Validate that this agent exists
-            if agent_name not in self._agents:
-                raise ValueError(f"Agent '{agent_name}' not found")
-            target_name = agent_name
+            if agent not in self._agents:
+                raise ValueError(f"Agent '{agent}' not found")
+            target_name = agent
         else:
             # Use the first agent's name as default
             target_name = next(iter(self._agents.keys()))
@@ -248,18 +248,7 @@ class AgentApp:
         # The agent's prompt method doesn't fully support switching between agents
 
         # Create agent_types dictionary mapping agent names to their types
-        agent_types = {}
-        for name, agent in self._agents.items():
-            # Determine agent type if possible
-            agent_type = "Agent"  # Default type
-
-            # Try to get the type from the agent directly
-            if hasattr(agent, "agent_type"):
-                agent_type = agent.agent_type
-            elif hasattr(agent, "config") and hasattr(agent.config, "agent_type"):
-                agent_type = agent.config.agent_type
-
-            agent_types[name] = agent_type
+        agent_types = {name: agent.agent_type for name, agent in self._agents.items()}
 
         # Create the interactive prompt
         prompt = InteractivePrompt(agent_types=agent_types)

mcp_agent/core/agent_types.py

@@ -33,6 +33,7 @@ class AgentConfig:
     use_history: bool = True
     default_request_params: RequestParams | None = None
     human_input: bool = False
+    agent_type: str = AgentType.BASIC.value
 
     def __post_init__(self) -> None:
         """Ensure default_request_params exists with proper history setting"""

mcp_agent/core/direct_decorators.py

@@ -269,6 +269,7 @@ def router(
     *,
     agents: List[str],
     instruction: Optional[str] = None,
+    servers: List[str] = [],
     model: Optional[str] = None,
     use_history: bool = False,
     request_params: RequestParams | None = None,
@@ -301,7 +302,7 @@ def router(
             AgentType.ROUTER,
             name=name,
             instruction=instruction or default_instruction,
-            servers=[],  # Routers don't connect to servers directly
+            servers=servers,
             model=model,
             use_history=use_history,
             request_params=request_params,

mcp_agent/core/direct_factory.py

@@ -236,7 +236,7 @@ async def create_agents_by_type(
                     config=config,
                     context=app_instance.context,
                     agents=router_agents,
-                    routing_instruction=agent_data.get("routing_instruction"),
+                    routing_instruction=agent_data.get("instruction"),
                 )
                 await router.initialize()
 

mcp_agent/core/interactive_prompt.py

@@ -77,7 +77,7 @@ class InteractivePrompt:
         if agent not in available_agents:
             raise ValueError(f"No agent named '{agent}'")
 
-        # Create agent_types dictionary if not provided
+        # Ensure we track available agents in a set for fast lookup
         available_agents_set = set(available_agents)
 
         result = ""

mcp_agent/llm/augmented_llm.py

@@ -147,7 +147,7 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
         """Apply the prompt and return the result as a Pydantic model, or None if coercion fails"""
         try:
             result: PromptMessageMultipart = await self.generate(prompt, request_params)
-            json_data = from_json(result.first_text(), allow_partial=True)
+            json_data = from_json(result.first_text().strip(), allow_partial=True)
             validated_model = model.model_validate(json_data)
             return cast("ModelT", validated_model), Prompt.assistant(json_data)
         except Exception as e:

mcp_agent/mcp/interfaces.py

@@ -136,6 +136,11 @@ class AgentProtocol(AugmentedLLMProtocol, Protocol):
 
     name: str
 
+    @property
+    def agent_type(self) -> str:
+        """Return the type of this agent"""
+        ...
+
     async def __call__(self, message: Union[str, PromptMessage, PromptMessageMultipart]) -> str:
         """Make the agent callable for sending messages directly."""
         ...

mcp_agent/mcp_server/agent_server.py

@@ -38,7 +38,7 @@ class AgentMCPServer:
 
         # Basic send message tool
         @self.mcp_server.tool(
-            name=f"{agent_name}.send",
+            name=f"{agent_name}_send",
             description=f"Send a message to the {agent_name} agent",
         )
         async def send_message(message: str, ctx: MCPContext) -> str:
@@ -58,23 +58,23 @@ class AgentMCPServer:
                 return await execute_send()
 
         # Register a history prompt for this agent
-        @self.mcp_server.prompt(name=f"{agent_name}.history", description=f"Conversation history for the {agent_name} agent")
+        @self.mcp_server.prompt(
+            name=f"{agent_name}_history",
+            description=f"Conversation history for the {agent_name} agent",
+        )
         async def get_history_prompt() -> list:
             """Return the conversation history as MCP messages."""
             # Get the conversation history from the agent's LLM
             if not hasattr(agent, "_llm") or agent._llm is None:
                 return []
-                
+
             # Convert the multipart message history to standard PromptMessages
             multipart_history = agent._llm.message_history
             prompt_messages = mcp_agent.core.prompt.Prompt.from_multipart(multipart_history)
-            
+
             # In FastMCP, we need to return the raw list of messages
             # that matches the structure that FastMCP expects (list of dicts with role/content)
-            return [
-                {"role": msg.role, "content": msg.content}
-                for msg in prompt_messages
-            ]
+            return [{"role": msg.role, "content": msg.content} for msg in prompt_messages]
 
     def run(self, transport: str = "sse", host: str = "0.0.0.0", port: int = 8000) -> None:
         """Run the MCP server."""