fast-agent-mcp 0.2.16__tar.gz → 0.2.17__tar.gz

{fast_agent_mcp-0.2.16 → fast_agent_mcp-0.2.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.2.16
+Version: 0.2.17
 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
@@ -237,8 +237,6 @@ Requires-Dist: ruff>=0.8.4; extra == 'dev'
 Requires-Dist: tomli>=2.2.1; extra == 'dev'
 Provides-Extra: openai
 Requires-Dist: openai>=1.58.1; extra == 'openai'
-Provides-Extra: temporal
-Requires-Dist: temporalio>=1.8.0; extra == 'temporal'
 Description-Content-Type: text/markdown
 
 <p align="center">
@@ -255,7 +253,7 @@ Description-Content-Type: text/markdown
 > [!TIP]
 > Documentation site is in production here : https://fast-agent.ai. Feel free to feed back what's helpful and what's not. llms.txt link is here: https://fast-agent.ai/llms.txt
 
-**`fast-agent`** enables you to create and interact with sophisticated Agents and Workflows in minutes. It is the first framework with complete, end-to-end tested MCP Feature support including Sampling. Both Anthropic (Haiku, Sonnet, Opus) and OpenAI models (gpt-4o family, o1/o3 family) are supported.
+**`fast-agent`** enables you to create and interact with sophisticated Agents and Workflows in minutes. It is the first framework with complete, end-to-end tested MCP Feature support including Sampling. Both Anthropic (Haiku, Sonnet, Opus) and OpenAI models (gpt-4o/gpt-4.1 family, o1/o3 family) are supported.
 
 The simple declarative syntax lets you concentrate on composing your Prompts and MCP Servers to [build effective agents](https://www.anthropic.com/research/building-effective-agents).
 
@@ -313,7 +311,7 @@ Or start an interactive chat with the Agent:
 
 ```python
 async with fast.run() as agent:
-  await agent()
+  await agent.interactive()
 ```
 
 Here is the complete `sizer.py` Agent application, with boilerplate code:
@@ -330,7 +328,7 @@ fast = FastAgent("Agent Example")
 )
 async def main():
   async with fast.run() as agent:
-    await agent()
+    await agent.interactive()
 
 if __name__ == "__main__":
     asyncio.run(main())

{fast_agent_mcp-0.2.16 → fast_agent_mcp-0.2.17}/README.md

@@ -12,7 +12,7 @@
 > [!TIP]
 > Documentation site is in production here : https://fast-agent.ai. Feel free to feed back what's helpful and what's not. llms.txt link is here: https://fast-agent.ai/llms.txt
 
-**`fast-agent`** enables you to create and interact with sophisticated Agents and Workflows in minutes. It is the first framework with complete, end-to-end tested MCP Feature support including Sampling. Both Anthropic (Haiku, Sonnet, Opus) and OpenAI models (gpt-4o family, o1/o3 family) are supported.
+**`fast-agent`** enables you to create and interact with sophisticated Agents and Workflows in minutes. It is the first framework with complete, end-to-end tested MCP Feature support including Sampling. Both Anthropic (Haiku, Sonnet, Opus) and OpenAI models (gpt-4o/gpt-4.1 family, o1/o3 family) are supported.
 
 The simple declarative syntax lets you concentrate on composing your Prompts and MCP Servers to [build effective agents](https://www.anthropic.com/research/building-effective-agents).
 
@@ -70,7 +70,7 @@ Or start an interactive chat with the Agent:
 
 ```python
 async with fast.run() as agent:
-  await agent()
+  await agent.interactive()
 ```
 
 Here is the complete `sizer.py` Agent application, with boilerplate code:
@@ -87,7 +87,7 @@ fast = FastAgent("Agent Example")
 )
 async def main():
   async with fast.run() as agent:
-    await agent()
+    await agent.interactive()
 
 if __name__ == "__main__":
     asyncio.run(main())

{fast_agent_mcp-0.2.16/src/mcp_agent/resources → fast_agent_mcp-0.2.17}/examples/data-analysis/analysis-campaign.py

@@ -33,7 +33,7 @@ Extract key insights that would be compelling for a social media campaign.
      - Extracted compelling insights suitable for social media promotion
     """,
     request_params=RequestParams(maxTokens=8192),
-    model="gpt-4o",
+    model="gpt-4.1",
 )
 @fast.evaluator_optimizer(
     "analysis_tool",
@@ -55,7 +55,7 @@ Extract key insights that would be compelling for a social media campaign.
     """,
     servers=["fetch", "brave"],  # Using the fetch MCP server for Brave search
     request_params=RequestParams(temperature=0.3),
-    model="gpt-4o",
+    model="gpt-4.1",
 )
 # Social media content generator
 @fast.agent(

{fast_agent_mcp-0.2.16 → fast_agent_mcp-0.2.17}/examples/mcp/state-transfer/fastagent.config.yaml

@@ -5,7 +5,7 @@
 # Check here for current details: https://fast-agent.ai/models/
 
 # set the default model for fast-agent below:
-default_model: gpt-4o
+default_model: gpt-4.1
 
 # Logging and Console Configuration:
 logger:

{fast_agent_mcp-0.2.16/src/mcp_agent/resources → fast_agent_mcp-0.2.17}/examples/researcher/fastagent.config.yaml

@@ -4,7 +4,6 @@
 #
 #
 
-execution_engine: asyncio
 logger:
   type: console
   level: error
@@ -53,14 +52,10 @@ mcp:
       args: ["mcp-server-fetch"]
     sequential:
       command: "npx"
-      args: ["-y","@modelcontextprotocol/server-sequential-thinking"]
-
+      args: ["-y", "@modelcontextprotocol/server-sequential-thinking"]
 #    webmcp:
 #      command: "node"
 #      args: ["/home/ssmith/.webmcp/server.cjs"]
 #      env:
 #         WEBMCP_SERVER_TOKEN: 96e22896d8143fc1d61fec09208fc5ed
 
-
-
-

{fast_agent_mcp-0.2.16/src/mcp_agent/resources → fast_agent_mcp-0.2.17}/examples/workflows/evaluator.py

@@ -40,7 +40,7 @@ fast = FastAgent("Evaluator-Optimizer")
     Summarize your evaluation as a structured response with:
     - Overall quality rating.
     - Specific feedback and areas for improvement.""",
-    model="gpt-4o",
+    model="gpt-4.1",
 )
 # Define the evaluator-optimizer workflow
 @fast.evaluator_optimizer(

{fast_agent_mcp-0.2.16 → fast_agent_mcp-0.2.17}/examples/workflows/fastagent.config.yaml

@@ -3,7 +3,6 @@
 #
 #
 
-execution_engine: asyncio
 logger:
   type: file
   level: error

{fast_agent_mcp-0.2.16/src/mcp_agent/resources → fast_agent_mcp-0.2.17}/examples/workflows/orchestrator.py

@@ -13,7 +13,7 @@ fast = FastAgent("Orchestrator-Workers")
 @fast.agent(
     "author",
     instruction="""You are to role play a poorly skilled writer, 
-    who makes frequent grammar, punctuations and spelling errors. You enjoy
+    who makes frequent grammar, punctuation and spelling errors. You enjoy
     writing short stories, but the narrative doesn't always make sense""",
     servers=["filesystem"],
 )
@@ -25,7 +25,7 @@ fast = FastAgent("Orchestrator-Workers")
             the closest match to a user's request, make the appropriate tool calls, 
             and return the URI and CONTENTS of the closest match.""",
     servers=["fetch", "filesystem"],
-    model="gpt-4o",
+    model="gpt-4.1",
 )
 @fast.agent(
     name="writer",
@@ -40,19 +40,17 @@ fast = FastAgent("Orchestrator-Workers")
             Identify any awkward phrasing or structural issues that could improve clarity. 
             Provide detailed feedback on corrections.""",
     servers=["fetch"],
-    model="gpt-4o",
+    model="gpt-4.1",
 )
 # Define the orchestrator to coordinate the other agents
 @fast.orchestrator(
-    name="orchestrate",
-    agents=["finder", "writer", "proofreader"],
-    plan_type="full",
+    name="orchestrate", agents=["finder", "writer", "proofreader"], plan_type="full", model="sonnet"
 )
 async def main() -> None:
     async with fast.run() as agent:
-        await agent.author(
-            "write a 250 word short story about kittens discovering a castle, and save it to short_story.md"
-        )
+        # await agent.author(
+        #     "write a 250 word short story about kittens discovering a castle, and save it to short_story.md"
+        # )
 
         # The orchestrator can be used just like any other agent
         task = """Load the student's short story from short_story.md, 

{fast_agent_mcp-0.2.16/src/mcp_agent/resources → fast_agent_mcp-0.2.17}/examples/workflows/parallel.py

@@ -25,7 +25,7 @@ fast = FastAgent(
     instruction="""Verify the factual consistency within the story. Identify any contradictions,
     logical inconsistencies, or inaccuracies in the plot, character actions, or setting. 
     Highlight potential issues with reasoning or coherence.""",
-    model="gpt-4o",
+    model="gpt-4.1",
 )
 @fast.agent(
     name="style_enforcer",

{fast_agent_mcp-0.2.16 → fast_agent_mcp-0.2.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fast-agent-mcp"
-version = "0.2.16"
+version = "0.2.17"
 description = "Define, Prompt and Test MCP enabled Agents and Workflows"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -34,9 +34,6 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-temporal = [
-    "temporalio>=1.8.0",
-]
 openai = [
     "openai>=1.58.1",
 ]

{fast_agent_mcp-0.2.16 → fast_agent_mcp-0.2.17}/src/mcp_agent/agents/base_agent.py

@@ -20,6 +20,7 @@ from typing import (
     Union,
 )
 
+from a2a_types.types import AgentCapabilities, AgentCard, AgentSkill
 from mcp.types import (
     CallToolResult,
     EmbeddedResource,
@@ -58,6 +59,11 @@ if TYPE_CHECKING:
     from mcp_agent.context import Context
 
 
+DEFAULT_CAPABILITIES = AgentCapabilities(
+    streaming=False, pushNotifications=False, stateTransitionHistory=False
+)
+
+
 class BaseAgent(MCPAggregator, AgentProtocol):
     """
     A base Agent class that implements the AgentProtocol interface.
@@ -586,7 +592,7 @@ class BaseAgent(MCPAggregator, AgentProtocol):
 
     async def structured(
         self,
-        prompt: List[PromptMessageMultipart],
+        multipart_messages: List[PromptMessageMultipart],
         model: Type[ModelT],
         request_params: RequestParams | None = None,
     ) -> Tuple[ModelT | None, PromptMessageMultipart]:
@@ -603,7 +609,7 @@ class BaseAgent(MCPAggregator, AgentProtocol):
             An instance of the specified model, or None if coercion fails
         """
         assert self._llm
-        return await self._llm.structured(prompt, model, request_params)
+        return await self._llm.structured(multipart_messages, model, request_params)
 
     async def apply_prompt_messages(
         self, prompts: List[PromptMessageMultipart], request_params: RequestParams | None = None
@@ -626,13 +632,51 @@ class BaseAgent(MCPAggregator, AgentProtocol):
     def agent_type(self) -> AgentType:
         """
         Return the type of this agent.
+        """
+        return AgentType.BASIC
+
+    async def agent_card(self) -> AgentCard:
+        """
+        Return an A2A card describing this Agent
+        """
 
-        This is used for display purposes in the interactive prompt and other UI elements.
+        skills: List[AgentSkill] = []
+        tools: ListToolsResult = await self.list_tools()
+        for tool in tools.tools:
+            skills.append(await self.convert(tool))
 
-        Returns:
-            String representing the agent type
+        return AgentCard(
+            name=self.name,
+            description=self.instruction,
+            url=f"fast-agent://agents/{self.name}/",
+            version="0.1",
+            capabilities=DEFAULT_CAPABILITIES,
+            defaultInputModes=["text/plain"],
+            defaultOutputModes=["text/plain"],
+            provider=None,
+            documentationUrl=None,
+            authentication=None,
+            skills=skills,
+        )
+
+    async def convert(self, tool: Tool) -> AgentSkill:
         """
-        return AgentType.BASIC
+        Convert a Tool to an AgentSkill.
+        """
+
+        _, tool_without_namespace = await self._parse_resource_name(tool.name, "tool")
+        return AgentSkill(
+            id=tool.name,
+            name=tool_without_namespace,
+            description=tool.description,
+            tags=["tool"],
+            examples=None,
+            inputModes=None,  # ["text/plain"],
+            # cover TextContent | ImageContent ->
+            # https://github.com/modelcontextprotocol/modelcontextprotocol/pull/223
+            # https://github.com/modelcontextprotocol/modelcontextprotocol/pull/93
+            outputModes=None,  # ,["text/plain", "image/*"],
+        )
 
     @property
     def message_history(self) -> List[PromptMessageMultipart]:

{fast_agent_mcp-0.2.16 → fast_agent_mcp-0.2.17}/src/mcp_agent/agents/workflow/orchestrator_agent.py

@@ -57,6 +57,7 @@ class OrchestratorAgent(BaseAgent):
         config: AgentConfig,
         agents: List[Agent],
         plan_type: Literal["full", "iterative"] = "full",
+        plan_iterations: int = 5,
         context: Optional[Any] = None,
         **kwargs,
     ) -> None:
@@ -83,7 +84,7 @@ class OrchestratorAgent(BaseAgent):
             agent_name = agent.name
             self.logger.info(f"Adding agent '{agent_name}' to orchestrator")
             self.agents[agent_name] = agent
-
+        self.plan_iterations = plan_iterations
         # For tracking state during execution
         self.plan_result: Optional[PlanResult] = None
 
@@ -186,8 +187,8 @@ class OrchestratorAgent(BaseAgent):
         """
         iterations = 0
         total_steps_executed = 0
-        max_iterations = request_params.max_iterations
-        max_steps = getattr(request_params, "max_steps", max_iterations * 5)
+        max_iterations = self.plan_iterations
+        max_steps = getattr(request_params, "max_steps", max_iterations * 3)
 
         # Initialize plan result
         plan_result = PlanResult(objective=objective, step_results=[])
@@ -414,7 +415,7 @@ class OrchestratorAgent(BaseAgent):
             plan_status = "Plan Status: Not Started"
 
         # Calculate iteration information
-        max_iterations = request_params.max_iterations
+        max_iterations = self.plan_iterations
         current_iteration = len(plan_result.step_results)
         current_iteration = min(current_iteration, max_iterations - 1)
         iterations_remaining = max(0, max_iterations - current_iteration - 1)
@@ -536,9 +537,7 @@ class OrchestratorAgent(BaseAgent):
             return ""
 
         # Get agent instruction or default description
-        instruction = (
-            agent.instruction if hasattr(agent, "instruction") else f"Agent '{agent_name}'"
-        )
+        instruction = agent.instruction if agent.instruction else f"Agent '{agent_name}'"
 
         # Format with XML tags
         return f'<fastagent:agent name="{agent_name}">{instruction}</fastagent:agent>'

{fast_agent_mcp-0.2.16 → fast_agent_mcp-0.2.17}/src/mcp_agent/agents/workflow/router_agent.py

@@ -5,9 +5,8 @@ This provides a simplified implementation that routes messages to agents
 by determining the best agent for a request and dispatching to it.
 """
 
-from typing import TYPE_CHECKING, List, Optional, Tuple, Type
+from typing import TYPE_CHECKING, Callable, List, Optional, Tuple, Type
 
-from mcp.types import TextContent
 from pydantic import BaseModel
 
 from mcp_agent.agents.agent import Agent
@@ -17,10 +16,12 @@ from mcp_agent.core.exceptions import AgentConfigError
 from mcp_agent.core.prompt import Prompt
 from mcp_agent.core.request_params import RequestParams
 from mcp_agent.logging.logger import get_logger
-from mcp_agent.mcp.interfaces import ModelT
+from mcp_agent.mcp.interfaces import AugmentedLLMProtocol, ModelT
 from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
 
 if TYPE_CHECKING:
+    from a2a_types.types import AgentCard
+
     from mcp_agent.context import Context
 
 logger = get_logger(__name__)
@@ -36,47 +37,17 @@ Follow these guidelines:
 - Provide your confidence level (high, medium, low) and brief reasoning for your selection
 """
 
-# Default routing instruction with placeholders for context and request
+# Default routing instruction with placeholders for context (AgentCard JSON)
 DEFAULT_ROUTING_INSTRUCTION = """
-You are a highly accurate request router that directs incoming requests to the most appropriate agent.
-
-<fastagent:data>
+Select from the following agents to handle the request:
 <fastagent:agents>
+[
 {context}
+]
 </fastagent:agents>
 
-<fastagent:request>
-{request}
-</fastagent:request>
-</fastagent:data>
-
-Your task is to analyze the request and determine the most appropriate agent from the options above.
-
-<fastagent:instruction>
-Respond with JSON following the schema below:
-{{
-    "type": "object",
-    "required": ["agent", "confidence", "reasoning"],
-    "properties": {{
-        "agent": {{
-            "type": "string",
-            "description": "The exact name of the selected agent"
-        }},
-        "confidence": {{
-            "type": "string",
-            "enum": ["high", "medium", "low"],
-            "description": "Your confidence level in this selection"
-        }},
-        "reasoning": {{
-            "type": "string",
-            "description": "Brief explanation for your selection"
-        }}
-    }}
-}}
-
-Supply only the JSON with no preamble. Use "reasoning" field to describe actions. NEVER EMIT CODE FENCES. 
-
-</fastagent:instruction>
+You must respond with the 'name' of one of the agents listed above.
+
 """
 
 
@@ -85,18 +56,7 @@ class RoutingResponse(BaseModel):
 
     agent: str
     confidence: str
-    reasoning: Optional[str] = None
-
-
-class RouterResult(BaseModel):
-    """Router result with agent reference and confidence rating."""
-
-    result: BaseAgent
-    confidence: str
-    reasoning: Optional[str] = None
-
-    # Allow Agent objects to be stored without serialization
-    model_config = {"arbitrary_types_allowed": True}
+    reasoning: str | None = None
 
 
 class RouterAgent(BaseAgent):
@@ -142,9 +102,7 @@ class RouterAgent(BaseAgent):
         # Set up base router request parameters
         base_params = {"systemPrompt": ROUTING_SYSTEM_INSTRUCTION, "use_history": False}
 
-        # Merge with provided defaults if any
         if default_request_params:
-            # Start with defaults and override with router-specific settings
             merged_params = default_request_params.model_copy(update=base_params)
         else:
             merged_params = RequestParams(**base_params)
@@ -174,32 +132,16 @@ class RouterAgent(BaseAgent):
             except Exception as e:
                 logger.warning(f"Error shutting down agent: {str(e)}")
 
-    async def _get_routing_result(
+    async def attach_llm(
         self,
-        messages: List[PromptMessageMultipart],
-    ) -> Optional[RouterResult]:
-        """
-        Common method to extract request and get routing result.
-
-        Args:
-            messages: The messages to extract request from
-
-        Returns:
-            RouterResult containing the selected agent, or None if no suitable agent found
-        """
-        if not self.initialized:
-            await self.initialize()
-
-        # Extract the request text from the last message
-        request = messages[-1].all_text() if messages else ""
-
-        # Determine which agent to route to
-        routing_result = await self._route_request(request)
-
-        if not routing_result:
-            logger.warning("Could not determine appropriate agent for this request")
-
-        return routing_result
+        llm_factory: type[AugmentedLLMProtocol] | Callable[..., AugmentedLLMProtocol],
+        model: str | None = None,
+        request_params: RequestParams | None = None,
+        **additional_kwargs,
+    ) -> AugmentedLLMProtocol:
+        return await super().attach_llm(
+            llm_factory, model, request_params, verb="Routing", **additional_kwargs
+        )
 
     async def generate(
         self,
@@ -216,32 +158,21 @@ class RouterAgent(BaseAgent):
         Returns:
             The response from the selected agent
         """
-        routing_result = await self._get_routing_result(multipart_messages)
-
-        if not routing_result:
-            return PromptMessageMultipart(
-                role="assistant",
-                content=[
-                    TextContent(
-                        type="text", text="Could not determine appropriate agent for this request."
-                    )
-                ],
-            )
 
-        # Get the selected agent
-        selected_agent = routing_result.result
+        route, warn = await self._route_request(multipart_messages[-1])
 
-        # Log the routing decision
-        logger.info(
-            f"Routing request to agent: {selected_agent.name} (confidence: {routing_result.confidence})"
-        )
+        if not route:
+            return Prompt.assistant(warn or "No routing result or warning received")
+
+        # Get the selected agent
+        agent: Agent = self.agent_map[route.agent]
 
         # Dispatch the request to the selected agent
-        return await selected_agent.generate(multipart_messages, request_params)
+        return await agent.generate(multipart_messages, request_params)
 
     async def structured(
         self,
-        prompt: List[PromptMessageMultipart],
+        multipart_messages: List[PromptMessageMultipart],
         model: Type[ModelT],
         request_params: Optional[RequestParams] = None,
     ) -> Tuple[ModelT | None, PromptMessageMultipart]:
@@ -256,23 +187,22 @@ class RouterAgent(BaseAgent):
         Returns:
             The parsed response from the selected agent, or None if parsing fails
         """
-        routing_result = await self._get_routing_result(prompt)
+        route, warn = await self._route_request(multipart_messages[-1])
 
-        if not routing_result:
-            return None, Prompt.assistant("No routing result")
+        if not route:
+            return None, Prompt.assistant(
+                warn or "No routing result or warning received (structured)"
+            )
 
         # Get the selected agent
-        selected_agent = routing_result.result
-
-        # Log the routing decision
-        logger.info(
-            f"Routing structured request to agent: {selected_agent.name} (confidence: {routing_result.confidence})"
-        )
+        agent: Agent = self.agent_map[route.agent]
 
         # Dispatch the request to the selected agent
-        return await selected_agent.structured(prompt, model, request_params)
+        return await agent.structured(multipart_messages, model, request_params)
 
-    async def _route_request(self, request: str) -> Optional[RouterResult]:
+    async def _route_request(
+        self, message: PromptMessageMultipart
+    ) -> Tuple[RoutingResponse | None, str | None]:
         """
         Determine which agent to route the request to.
 
@@ -283,49 +213,53 @@ class RouterAgent(BaseAgent):
             RouterResult containing the selected agent, or None if no suitable agent was found
         """
         if not self.agents:
-            logger.warning("No agents available for routing")
-            return None
+            logger.error("No agents available for routing")
+            raise AgentConfigError("No agents available for routing - fatal error")
 
         # If only one agent is available, use it directly
         if len(self.agents) == 1:
-            return RouterResult(
-                result=self.agents[0], confidence="high", reasoning="Only one agent available"
-            )
+            return RoutingResponse(
+                agent=self.agents[0].name, confidence="high", reasoning="Only one agent available"
+            ), None
 
         # Generate agent descriptions for the context
         agent_descriptions = []
-        for i, agent in enumerate(self.agents, 1):
-            description = agent.instruction if isinstance(agent.instruction, str) else ""
-            agent_descriptions.append(f"{i}. Name: {agent.name} - {description}")
+        for agent in self.agents:
+            agent_card: AgentCard = await agent.agent_card()
+            agent_descriptions.append(
+                agent_card.model_dump_json(
+                    include={"name", "description", "skills"}, exclude_none=True
+                )
+            )
 
-        context = "\n\n".join(agent_descriptions)
+        context = ",\n".join(agent_descriptions)
 
         # Format the routing prompt
         routing_instruction = self.routing_instruction or DEFAULT_ROUTING_INSTRUCTION
-        prompt_text = routing_instruction.format(context=context, request=request)
-
-        # Create multipart message for the router
-        prompt = PromptMessageMultipart(
-            role="user", content=[TextContent(type="text", text=prompt_text)]
-        )
+        routing_instruction = routing_instruction.format(context=context)
 
-        # Get structured response from LLM
         assert self._llm
+        mutated = message.model_copy(deep=True)
+        mutated.add_text(routing_instruction)
         response, _ = await self._llm.structured(
-            [prompt], RoutingResponse, self._default_request_params
+            [mutated],
+            RoutingResponse,
+            self._default_request_params,
         )
 
+        warn: str | None = None
         if not response:
-            logger.warning("No routing response received from LLM")
-            return None
+            warn = "No routing response received from LLM"
+        elif response.agent not in self.agent_map:
+            warn = f"A response was received, but the agent {response.agent} was not known to the Router"
 
-        # Look up the agent by name
-        selected_agent = self.agent_map.get(response.agent)
-
-        if not selected_agent:
-            logger.warning(f"Agent '{response.agent}' not found in available agents")
-            return None
+        if warn:
+            logger.warning(warn)
+            return None, warn
+        else:
+            assert response
+            logger.info(
+                f"Routing structured request to agent: {response.agent or 'error'} (confidence: {response.confidence or ''})"
+            )
 
-        return RouterResult(
-            result=selected_agent, confidence=response.confidence, reasoning=response.reasoning
-        )
+            return response, None