fast-agent-mcp 0.1.3__py3-none-any.whl → 0.1.5__py3-none-any.whl

{fast_agent_mcp-0.1.3.dist-info → fast_agent_mcp-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.1.3
+Version: 0.1.5
 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
@@ -519,6 +519,10 @@ agent["greeter"].send("Good Evening!")          # Dictionary access is supported
 )
 ```
 
+### Prompts
+
+MCP Prompts are supported with `apply_prompt(name)`. Prompts can be
+
 #### Chain
 
 ```python

{fast_agent_mcp-0.1.3.dist-info → fast_agent_mcp-0.1.5.dist-info}/RECORD

@@ -8,7 +8,7 @@ mcp_agent/event_progress.py,sha256=25iz0yyg-O4glMmtijcYpDdUmtUIKsCmR_8A52GgeC4,2
 mcp_agent/mcp_server_registry.py,sha256=5x30L1IlmC18JASl7NQbZYHMqPWS3ay0f_3U3uleaMM,9884
 mcp_agent/progress_display.py,sha256=GeJU9VUt6qKsFVymG688hCMVCsAygG9ifiiEb5IcbN4,361
 mcp_agent/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/agents/agent.py,sha256=losanPSdZXZzmeiX-J6ctOinLlkhNZsxwi3Swr8lnxA,11482
+mcp_agent/agents/agent.py,sha256=DpsqvrQYsyHrn5nFnQ7wcB7fDRhV22LSVPWhVGLp93M,13497
 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=DE6EZzspfzHwPK59x8vL4AIDHRQkVQ1Ja70XRGU1IQs,2753
@@ -17,17 +17,20 @@ mcp_agent/cli/commands/bootstrap.py,sha256=Rmwbuwl52eHfnya7fnwKk2J7nCsHpSh6irka4
 mcp_agent/cli/commands/config.py,sha256=32YTS5jmsYAs9QzAhjkG70_daAHqOemf4XbZBBSMz6g,204
 mcp_agent/cli/commands/setup.py,sha256=_SCpd6_PrixqbSaE72JQ7erIRkZnJGmh_3TvvwSzEiE,6392
 mcp_agent/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/core/agent_app.py,sha256=6U3HLYAJOfyVuUpZVELWT5lOo64-b_sfWp0yn88s7Wo,6085
+mcp_agent/core/agent_app.py,sha256=PkD1ihpeDaAgJt6AsaU5hkE1AR9azKdXPcio9HBVYdU,26881
 mcp_agent/core/agent_types.py,sha256=yKiMbv9QO2dduq4zXmoMZlOZpXJZhM4oNwIq1-134FE,318
 mcp_agent/core/agent_utils.py,sha256=QMvwmxZyCqYhBzSyL9xARsxTuwdmlyjQvrPpsH36HnQ,1888
-mcp_agent/core/enhanced_prompt.py,sha256=Zh1I_PZtQmH_v70dJ-gK5lnLOc42h6_Ai8FGi3aLBvU,13400
+mcp_agent/core/decorators.py,sha256=gYqXvwF0pFL-FFU2Vkq5-HsqBWJsXy3YeEdesL8o-jM,16110
+mcp_agent/core/enhanced_prompt.py,sha256=gyYwDfxzSCdrwKt0Gv1Ap8neOpT-z6gAiKxDyKi4n-w,16365
 mcp_agent/core/error_handling.py,sha256=D3HMW5odrbJvaKqcpCGj6eDXrbFcuqYaCZz7fyYiTu4,623
 mcp_agent/core/exceptions.py,sha256=a2-JGRwFFRoQEPuAq0JC5PhAJ5TO3xVJfdS4-VN29cw,2225
-mcp_agent/core/fastagent.py,sha256=G0GNOD1JMD37rAaZdYRNsa7gXYjvYiV6Cg39laBKRW8,59714
-mcp_agent/core/proxies.py,sha256=5eIqi63wcJMG9aLu_8QF78mS9w4hYas-bcdJqcWZ-fU,6638
+mcp_agent/core/factory.py,sha256=cmsv6qhdxdYoQ2Xjc0bIBKFbg3yQPe2bAjDovx4Wrus,20447
+mcp_agent/core/fastagent.py,sha256=3amBjjsVtFaqOz6jtiPC2xUh1IivxuWzWXYiy8lPjFw,19319
+mcp_agent/core/proxies.py,sha256=yP5H89niJmyV17ekIO9NeI2o07XPr1neWAx8GwZ9rzE,7978
 mcp_agent/core/server_validation.py,sha256=_59cn16nNT4HGPwg19HgxMtHK4MsdWYDUw_CuL-5xek,1696
 mcp_agent/core/simulator_registry.py,sha256=rcd1cyFGx8MAnN5O0UgwElmVKU_uoIBh9s24pxP33Jc,573
 mcp_agent/core/types.py,sha256=Zhi9iW7uiOfdpSt9NC0FCtGRFtJPg4mpZPK2aYi7a7M,817
+mcp_agent/core/validation.py,sha256=x0fsx5eLTawASFm9MDtEukwGOj_RTdY1OW064UihMR8,8309
 mcp_agent/eval/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/executor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/executor/decorator_registry.py,sha256=eONv5WvIcjKd43jVqeP7iB2EkAK-ErhdmXt6ogN0K_w,3848
@@ -37,7 +40,7 @@ mcp_agent/executor/temporal.py,sha256=U-wyltgWlVmzJoyivT6rR0Z1U3S6TbMXpeCxyuXako
 mcp_agent/executor/workflow.py,sha256=lA6r7PNEvxCVFHp4XkEJkaR0QCTf-J6iw9JwNx-tzNY,6727
 mcp_agent/executor/workflow_signal.py,sha256=3PWwSgXhz3PhkA8SRX3u0BDVoSlQqRGqC9d1qLC25vE,11210
 mcp_agent/human_input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/human_input/handler.py,sha256=37ERNg9OXaFgm4Ew-6aaU4y2jKre4VpekSnYZtRYFFI,2904
+mcp_agent/human_input/handler.py,sha256=fF2qSSG4snIYOodrIuy_t2qOYssOYqAygw3qq9XsmXU,3158
 mcp_agent/human_input/types.py,sha256=ZvuDHvI0-wO2tFoS0bzrv8U5B83zYdxAG7g9G9jCxug,1489
 mcp_agent/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/logging/events.py,sha256=qfYJnrqgXdujV-nl-iOwBEBh6HMraowBI4zeAWPPU4A,3461
@@ -52,18 +55,24 @@ mcp_agent/mcp/gen_client.py,sha256=u0HwdJiw9YCerS5JC7JDuGgBh9oTcLd7vv9vPjwibXc,3
 mcp_agent/mcp/mcp_activity.py,sha256=CajXCFWZ2cKEX9s4-HfNVAj471ePTVs4NOkvmIh65tE,592
 mcp_agent/mcp/mcp_agent_client_session.py,sha256=NtWcQhjmnnaR3yYcYj2d2lh-m563NexZUa57K1tAjeM,9477
 mcp_agent/mcp/mcp_agent_server.py,sha256=xP09HZTeguJi4Fq0p3fjLBP55uSYe5AdqM90xCgn9Ho,1639
-mcp_agent/mcp/mcp_aggregator.py,sha256=RVsgNnSJ1IPBkqKgF_Gp-Cpv97FVBIdppPey6FRoHB0,14751
-mcp_agent/mcp/mcp_connection_manager.py,sha256=WLli0w3TVcsszyD9M7zP7vLKPetnQLTf_0PGhvMm9YM,13145
+mcp_agent/mcp/mcp_aggregator.py,sha256=qY9rCy14diC4QJbZormqeuOjJnK2ReK-kpY7y_LfIL0,35805
+mcp_agent/mcp/mcp_connection_manager.py,sha256=EPJTKiEMKnFYpC37SOXiLriQL2YyhH0s6vvZWQRb_Mo,13663
 mcp_agent/mcp/stdio.py,sha256=tW075R5rQ-UlflXWFKIFDgCbWbuhKqxhiYolWvyEkFs,3985
+mcp_agent/mcp_server/__init__.py,sha256=SEWyU7aSFzdSk6iTYnrQu-llji5_P5dp3TaztCt_rzo,154
+mcp_agent/mcp_server/agent_server.py,sha256=SUBggPyrzWtBRUC5xIMpCxu6ei-6Vah3q9Si12BQ-zY,4444
 mcp_agent/resources/examples/data-analysis/analysis-campaign.py,sha256=EG-HhaDHltZ4hHAqhgfX_pHM2wem48aYhSIKJxyWHKc,7269
 mcp_agent/resources/examples/data-analysis/analysis.py,sha256=5zLoioZQNKUfXt1EXLrGX3TU06-0N06-L9Gtp9BIr6k,2611
 mcp_agent/resources/examples/data-analysis/fastagent.config.yaml,sha256=ini94PHyJCfgpjcjHKMMbGuHs6LIj46F1NwY0ll5HVk,1609
 mcp_agent/resources/examples/data-analysis/mount-point/WA_Fn-UseC_-HR-Employee-Attrition.csv,sha256=pcMeOL1_r8m8MziE6xgbBrQbjl5Ijo98yycZn7O-dlk,227977
 mcp_agent/resources/examples/internal/agent.py,sha256=f-jTgYabV3nWCQm0ZP9NtSEWjx3nQbRngzArRufcELg,384
+mcp_agent/resources/examples/internal/fastagent.config.yaml,sha256=98vKDiGLnpshPBqrkbPPaeKrGZ13RWGBxXhJBb9Hv6M,1850
 mcp_agent/resources/examples/internal/job.py,sha256=WEKIAANMEAuKr13__rYf3PqJeTAsNB_kqYqbqVYQlUM,4093
+mcp_agent/resources/examples/internal/prompt_category.py,sha256=b3tjkfrVIW1EPoDjr4mG87wlZ7D0Uju9eg6asXAYYpI,551
+mcp_agent/resources/examples/internal/prompt_sizing.py,sha256=UtQ_jvwS4yMh80PHhUQXJ9WXk-fqNYlqUMNTNkZosKM,2003
+mcp_agent/resources/examples/internal/sizer.py,sha256=FC9zTscPRStlaaeDFVUODnrD5ytGUa3sD0NkfrhiQOc,707
 mcp_agent/resources/examples/internal/social.py,sha256=Cot2lg3PLhLm13gPdVFvFEN28-mm6x3-jHu2YsV4N3s,1707
 mcp_agent/resources/examples/mcp_researcher/researcher-eval.py,sha256=kNPjIU-JwE0oIBQKwhv6lZsUF_SPtYVkiEEbY1ZVZxk,1807
-mcp_agent/resources/examples/researcher/fastagent.config.yaml,sha256=2_VXZneckR6zk6RWzzL-smV_oWmgg4uSkLWqZv8jF0I,1995
+mcp_agent/resources/examples/researcher/fastagent.config.yaml,sha256=bNOnID9OgdSBTUEhdimKB8LjaZLa1B6igmp-nxx8nr4,2271
 mcp_agent/resources/examples/researcher/researcher-eval.py,sha256=kNPjIU-JwE0oIBQKwhv6lZsUF_SPtYVkiEEbY1ZVZxk,1807
 mcp_agent/resources/examples/researcher/researcher-imp.py,sha256=Xfw2YAyjXd47pQz-uljgG5ii5x77fVuCP2XCivRDI48,7885
 mcp_agent/resources/examples/researcher/researcher.py,sha256=jPRafm7jbpHKkX_dQiYGG3Sw-e1Dm86q-JZT-WZDhM0,1425
@@ -75,8 +84,10 @@ mcp_agent/resources/examples/workflows/human_input.py,sha256=c8cBdLEPbaMXddFwsfN
 mcp_agent/resources/examples/workflows/orchestrator.py,sha256=oyKzmLA1z00wbAwDwBCthJ_qJx4fai6GAJpeOXDR-bE,2569
 mcp_agent/resources/examples/workflows/parallel.py,sha256=pLbQrtXfbdYqMVddxtg5dZnBnm5Wo2mXlIa1Vf2F1FQ,3096
 mcp_agent/resources/examples/workflows/router.py,sha256=XT_ewCrxPxdUTMCYQGw34qZQ3GGu8TYY_v5Lige8By4,1707
+mcp_agent/resources/examples/workflows/sse.py,sha256=tdmmh7p87YNfcF_fCq3evAmc1Nek0oY0YOqLRKBLqKg,570
 mcp_agent/telemetry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/telemetry/usage_tracking.py,sha256=ePujKMSjPxB7k6X34DGaVlnsV1728mcWZq38OqahiCU,501
+mcp_agent/ui/console_display.py,sha256=6LiZLPrxVvDjslNR6cwxdrx1XnW5NT5qFYkEHO0mFKM,9746
 mcp_agent/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/workflows/embedding/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/workflows/embedding/embedding_base.py,sha256=-c20ggQ8s7XhMxRX-WEhOgHE7vP_Ca6wtdoXlse-AAA,1681
@@ -93,9 +104,9 @@ mcp_agent/workflows/intent_classifier/intent_classifier_llm.py,sha256=WSLUv2Casb
 mcp_agent/workflows/intent_classifier/intent_classifier_llm_anthropic.py,sha256=Hp4454IniWFxV4ml50Ml8ip9rS1La5FBn5pd7vm1FHA,1964
 mcp_agent/workflows/intent_classifier/intent_classifier_llm_openai.py,sha256=zj76WlTYnSCYjBQ_IDi5vFBQGmNwYaoUq1rT730sY98,1940
 mcp_agent/workflows/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/workflows/llm/augmented_llm.py,sha256=Hyx-jwgbMjE_WQ--YjIUvdj6HAgX36IvXBesGy6uic0,25884
-mcp_agent/workflows/llm/augmented_llm_anthropic.py,sha256=q-WWkD59b_aYMn5Dh1Vaz1pknBgFnacvfbdhRd-u9Kk,23183
-mcp_agent/workflows/llm/augmented_llm_openai.py,sha256=a95Q4AFiVw36bXMgYNLFrC2zyDmHERWwkjxJFHlL6JU,25061
+mcp_agent/workflows/llm/augmented_llm.py,sha256=BF2HupWTdvN7B91HhNfeb1btrcO3lGijvYezIAV2f2M,29407
+mcp_agent/workflows/llm/augmented_llm_anthropic.py,sha256=NjOYcDvQZ82hbyehSj4-42mpzqBXLY2qZvWJihd7Afc,25012
+mcp_agent/workflows/llm/augmented_llm_openai.py,sha256=yV0FdPTgRsmNiCcssX4en7WW2pkB8LWjIG_qSev_goM,27055
 mcp_agent/workflows/llm/enhanced_passthrough.py,sha256=rHNbb6pYllIuVMOhuzUbt63_6WlUnjm57Y7r59N1pnk,2388
 mcp_agent/workflows/llm/llm_selector.py,sha256=G7pIybuBDwtmyxUDov_QrNYH2FoI0qFRu2JfoxWUF5Y,11045
 mcp_agent/workflows/llm/model_factory.py,sha256=ZyO3FpiIiM2EiFgE8Y5PhdzLglKENfgknmF9unmKWJ8,7075
@@ -118,8 +129,8 @@ mcp_agent/workflows/swarm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 mcp_agent/workflows/swarm/swarm.py,sha256=-lAIeSWDqbGHGRPTvjiP9nIKWvxxy9DAojl9yQzO1Pw,11050
 mcp_agent/workflows/swarm/swarm_anthropic.py,sha256=pW8zFx5baUWGd5Vw3nIDF2oVOOGNorij4qvGJKdYPcs,1624
 mcp_agent/workflows/swarm/swarm_openai.py,sha256=wfteywvAGkT5bLmIxX_StHJq8144whYmCRnJASAjOes,1596
-fast_agent_mcp-0.1.3.dist-info/METADATA,sha256=Hxlhct68x9F9beQ16vrdjC_AkzP9ex6-VuAuCkNpl-0,27924
-fast_agent_mcp-0.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fast_agent_mcp-0.1.3.dist-info/entry_points.txt,sha256=2IXtSmDK9XjWN__RWuRIJTgWyW17wJnJ_h-pb0pZAxo,174
-fast_agent_mcp-0.1.3.dist-info/licenses/LICENSE,sha256=cN3FxDURL9XuzE5mhK9L2paZo82LTfjwCYVT7e3j0e4,10939
-fast_agent_mcp-0.1.3.dist-info/RECORD,,
+fast_agent_mcp-0.1.5.dist-info/METADATA,sha256=bgvTRasBYWqrvTCI24b4wriirVl5irj7EeKPYIRr54M,28006
+fast_agent_mcp-0.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fast_agent_mcp-0.1.5.dist-info/entry_points.txt,sha256=2IXtSmDK9XjWN__RWuRIJTgWyW17wJnJ_h-pb0pZAxo,174
+fast_agent_mcp-0.1.5.dist-info/licenses/LICENSE,sha256=cN3FxDURL9XuzE5mhK9L2paZo82LTfjwCYVT7e3j0e4,10939
+fast_agent_mcp-0.1.5.dist-info/RECORD,,

mcp_agent/agents/agent.py

@@ -319,3 +319,49 @@ class Agent(MCPAggregator):
                     )
                 ],
             )
+
+    async def apply_prompt(self, prompt_name: str, arguments: dict[str, str] = None) -> str:
+        """
+        Apply an MCP Server Prompt by name and return the assistant's response.
+        Will search all available servers for the prompt if not namespaced.
+        
+        If the last message in the prompt is from a user, this will automatically
+        generate an assistant response to ensure we always end with an assistant message.
+
+        Args:
+            prompt_name: The name of the prompt to apply
+            arguments: Optional dictionary of string arguments to pass to the prompt template
+            
+        Returns:
+            The assistant's response or error message
+        """
+        # If we don't have an LLM, we can't apply the prompt
+        if not hasattr(self, "_llm") or not self._llm:
+            raise RuntimeError("Agent has no attached LLM")
+
+        # Get the prompt - this will search all servers if needed
+        self.logger.debug(f"Loading prompt '{prompt_name}'")
+        prompt_result = await self.get_prompt(prompt_name, arguments)
+
+        if not prompt_result or not prompt_result.messages:
+            error_msg = (
+                f"Prompt '{prompt_name}' could not be found or contains no messages"
+            )
+            self.logger.warning(error_msg)
+            return error_msg
+
+        # Get the display name (namespaced version)
+        display_name = getattr(prompt_result, "namespaced_name", prompt_name)
+
+        # Apply the prompt template and get the result
+        # The LLM will automatically generate a response if needed
+        result = await self._llm.apply_prompt_template(prompt_result, display_name)
+        return result
+
+    # For backward compatibility
+    async def load_prompt(self, prompt_name: str, arguments: dict[str, str] = None) -> str:
+        """
+        Legacy method - use apply_prompt instead.
+        This is maintained for backward compatibility.
+        """
+        return await self.apply_prompt(prompt_name, arguments)

mcp_agent/core/agent_app.py

@@ -15,7 +15,6 @@ from mcp_agent.workflows.evaluator_optimizer.evaluator_optimizer import (
 # Import proxies directly - they handle their own circular imports
 from mcp_agent.core.proxies import (
     BaseAgentProxy,
-    AgentProxy,
     LLMAgentProxy,
     RouterProxy,
     ChainProxy,
@@ -112,12 +111,377 @@ class AgentApp:
                 command_result = await handle_special_commands(user_input, self)
 
                 # Check if we should switch agents
-                if (
-                    isinstance(command_result, dict)
-                    and "switch_agent" in command_result
-                ):
-                    agent = command_result["switch_agent"]
-                    continue
+                if isinstance(command_result, dict):
+                    if "switch_agent" in command_result:
+                        agent = command_result["switch_agent"]
+                        continue
+                    elif "list_prompts" in command_result:
+                        # Handle listing of prompts
+                        from rich import print as rich_print
+
+                        try:
+                            # Check if we have any agents with aggregator capabilities
+                            found_prompts = False
+                            for agent_name, agent_proxy in self._agents.items():
+                                # Check if agent has an mcp_aggregator (agent instance)
+                                if hasattr(agent_proxy, "_agent") and hasattr(
+                                    agent_proxy._agent, "list_prompts"
+                                ):
+                                    rich_print(
+                                        f"\n[bold]Fetching prompts for agent [cyan]{agent_name}[/cyan]...[/bold]"
+                                    )
+                                    prompt_servers = (
+                                        await agent_proxy._agent.list_prompts()
+                                    )
+
+                                    if prompt_servers:
+                                        found_prompts = True
+                                        for (
+                                            server_name,
+                                            prompts_info,
+                                        ) in prompt_servers.items():
+                                            if (
+                                                prompts_info
+                                                and hasattr(prompts_info, "prompts")
+                                                and prompts_info.prompts
+                                            ):
+                                                rich_print(
+                                                    f"\n[bold cyan]{server_name}:[/bold cyan]"
+                                                )
+                                                for prompt in prompts_info.prompts:
+                                                    rich_print(f"  {prompt.name}")
+                                            elif (
+                                                isinstance(prompts_info, list)
+                                                and prompts_info
+                                            ):
+                                                rich_print(
+                                                    f"\n[bold cyan]{server_name}:[/bold cyan]"
+                                                )
+                                                for prompt in prompts_info:
+                                                    if (
+                                                        isinstance(prompt, dict)
+                                                        and "name" in prompt
+                                                    ):
+                                                        rich_print(
+                                                            f"  {prompt['name']}"
+                                                        )
+                                                    else:
+                                                        rich_print(f"  {prompt}")
+
+                            if not found_prompts:
+                                rich_print("[yellow]No prompts available[/yellow]")
+                        except Exception as e:
+                            rich_print(f"[red]Error listing prompts: {e}[/red]")
+                        continue
+                    elif "select_prompt" in command_result:
+                        from rich import print as rich_print
+                        from rich.table import Table
+                        from rich.console import Console
+                        from prompt_toolkit import PromptSession
+                        from prompt_toolkit.formatted_text import HTML
+                        from prompt_toolkit.completion import WordCompleter
+
+                        console = Console()
+
+                        # Get the current agent proxy
+                        current_proxy = self._agents[agent]
+
+                        # Check if the agent has prompt capabilities
+                        if not hasattr(current_proxy, "_agent") or not hasattr(
+                            current_proxy._agent, "list_prompts"
+                        ):
+                            rich_print(
+                                f"[red]Current agent '{agent}' does not support prompts[/red]"
+                            )
+                            continue
+
+                        try:
+                            # Create a list to store prompt data for selection
+                            all_prompts = []
+
+                            # Get prompts from the current agent
+                            rich_print(
+                                f"\n[bold]Fetching prompts for agent [cyan]{agent}[/cyan]...[/bold]"
+                            )
+                            prompt_servers = await current_proxy._agent.list_prompts()
+
+                            if not prompt_servers:
+                                rich_print(
+                                    "[yellow]No prompts available for this agent[/yellow]"
+                                )
+                                continue
+
+                            # Process retrieved prompts
+                            for server_name, prompts_info in prompt_servers.items():
+                                # Skip servers with no prompts
+                                if not prompts_info:
+                                    continue
+
+                                # Extract prompts from the response
+                                prompts = []
+                                if hasattr(prompts_info, "prompts"):
+                                    prompts = prompts_info.prompts
+                                elif isinstance(prompts_info, list):
+                                    prompts = prompts_info
+
+                                # Process each prompt
+                                for prompt in prompts:
+                                    # Basic prompt information
+                                    prompt_name = getattr(prompt, "name", "Unknown")
+                                    description = getattr(
+                                        prompt, "description", "No description"
+                                    )
+
+                                    # Extract argument information
+                                    arg_names = []
+                                    required_args = []
+                                    optional_args = []
+                                    arg_descriptions = {}
+
+                                    # Get arguments list from prompt (MCP SDK Prompt.arguments)
+                                    arguments = getattr(prompt, "arguments", None)
+                                    if arguments:
+                                        for arg in arguments:
+                                            # Each arg is a PromptArgument with name and required fields
+                                            name = getattr(arg, "name", None)
+                                            if name:
+                                                arg_names.append(name)
+
+                                                # Store description if available
+                                                description = getattr(
+                                                    arg, "description", None
+                                                )
+                                                if description:
+                                                    arg_descriptions[name] = description
+
+                                                # Check if required (default to False per MCP spec)
+                                                if getattr(arg, "required", False):
+                                                    required_args.append(name)
+                                                else:
+                                                    optional_args.append(name)
+
+                                    # Create a namespaced version with the server
+                                    namespaced_name = f"{server_name}-{prompt_name}"
+
+                                    # Add to our collection
+                                    all_prompts.append(
+                                        {
+                                            "server": server_name,
+                                            "name": prompt_name,
+                                            "namespaced_name": namespaced_name,
+                                            "description": description,
+                                            "arg_count": len(arg_names),
+                                            "arg_names": arg_names,
+                                            "required_args": required_args,
+                                            "optional_args": optional_args,
+                                            "arg_descriptions": arg_descriptions,
+                                        }
+                                    )
+
+                            # If no prompts were found
+                            if not all_prompts:
+                                rich_print(
+                                    "[yellow]No prompts available for this agent[/yellow]"
+                                )
+                                continue
+
+                            # Sort prompts by server then name
+                            all_prompts.sort(key=lambda p: (p["server"], p["name"]))
+
+                            # Check if a specific prompt was requested
+                            if (
+                                "prompt_name" in command_result
+                                and command_result["prompt_name"]
+                            ):
+                                requested_name = command_result["prompt_name"]
+                                # Find the prompt in our list (either by name or namespaced name)
+                                matching_prompts = [
+                                    p
+                                    for p in all_prompts
+                                    if p["name"] == requested_name
+                                    or p["namespaced_name"] == requested_name
+                                ]
+
+                                if not matching_prompts:
+                                    rich_print(
+                                        f"[red]Prompt '{requested_name}' not found[/red]"
+                                    )
+                                    rich_print("[yellow]Available prompts:[/yellow]")
+                                    for p in all_prompts:
+                                        rich_print(f"  {p['namespaced_name']}")
+                                    continue
+
+                                # If we found exactly one match, use it
+                                if len(matching_prompts) == 1:
+                                    selected_prompt = matching_prompts[0]
+                                else:
+                                    # If multiple matches, show them and ask user to be more specific
+                                    rich_print(
+                                        f"[yellow]Multiple prompts match '{requested_name}':[/yellow]"
+                                    )
+                                    for i, p in enumerate(matching_prompts):
+                                        rich_print(
+                                            f"  {i + 1}. {p['namespaced_name']} - {p['description']}"
+                                        )
+
+                                    # Ask user to select one
+                                    prompt_session = PromptSession()
+                                    selection = await prompt_session.prompt_async(
+                                        "Enter prompt number to select: ", default="1"
+                                    )
+
+                                    try:
+                                        idx = int(selection) - 1
+                                        if 0 <= idx < len(matching_prompts):
+                                            selected_prompt = matching_prompts[idx]
+                                        else:
+                                            rich_print("[red]Invalid selection[/red]")
+                                            continue
+                                    except ValueError:
+                                        rich_print(
+                                            "[red]Invalid input, please enter a number[/red]"
+                                        )
+                                        continue
+                            else:
+                                # Display prompt selection UI
+                                table = Table(title="Available MCP Prompts")
+                                table.add_column("#", justify="right", style="cyan")
+                                table.add_column("Server", style="green")
+                                table.add_column("Prompt Name", style="bright_blue")
+                                table.add_column("Description")
+                                table.add_column("Args", justify="center")
+
+                                # Add all prompts to the table
+                                for i, prompt in enumerate(all_prompts):
+                                    # Get argument counts
+                                    required_args = prompt["required_args"]
+                                    optional_args = prompt["optional_args"]
+
+                                    # Format args column nicely
+                                    if required_args and optional_args:
+                                        args_display = f"[bold]{len(required_args)}[/bold]+{len(optional_args)}"
+                                    elif required_args:
+                                        args_display = (
+                                            f"[bold]{len(required_args)}[/bold]"
+                                        )
+                                    elif optional_args:
+                                        args_display = f"{len(optional_args)} opt"
+                                    else:
+                                        args_display = "0"
+
+                                    table.add_row(
+                                        str(i + 1),
+                                        prompt["server"],
+                                        prompt["name"],
+                                        prompt["description"] or "No description",
+                                        args_display,
+                                    )
+
+                                console.print(table)
+                                prompt_names = [
+                                    str(i + 1) for i in range(len(all_prompts))
+                                ]
+                                completer = WordCompleter(prompt_names)
+
+                                # Ask user to select a prompt
+                                prompt_session = PromptSession(completer=completer)
+                                selection = await prompt_session.prompt_async(
+                                    "Enter prompt number to select (or press Enter to cancel): "
+                                )
+
+                                # Make cancellation easier
+                                if not selection or selection.strip() == "":
+                                    rich_print(
+                                        "[yellow]Prompt selection cancelled[/yellow]"
+                                    )
+                                    continue
+
+                                try:
+                                    idx = int(selection) - 1
+                                    if 0 <= idx < len(all_prompts):
+                                        selected_prompt = all_prompts[idx]
+                                    else:
+                                        rich_print("[red]Invalid selection[/red]")
+                                        continue
+                                except ValueError:
+                                    rich_print(
+                                        "[red]Invalid input, please enter a number[/red]"
+                                    )
+                                    continue
+
+                            # Get our prompt arguments
+                            required_args = selected_prompt["required_args"]
+                            optional_args = selected_prompt["optional_args"]
+                            arg_descriptions = selected_prompt.get(
+                                "arg_descriptions", {}
+                            )
+
+                            # Always initialize arg_values
+                            arg_values = {}
+
+                            # Show argument info if we have any
+                            if required_args or optional_args:
+                                # Display information about the arguments
+                                if required_args and optional_args:
+                                    rich_print(
+                                        f"\n[bold]Prompt [cyan]{selected_prompt['name']}[/cyan] requires {len(required_args)} arguments and has {len(optional_args)} optional arguments:[/bold]"
+                                    )
+                                elif required_args:
+                                    rich_print(
+                                        f"\n[bold]Prompt [cyan]{selected_prompt['name']}[/cyan] requires {len(required_args)} arguments:[/bold]"
+                                    )
+                                elif optional_args:
+                                    rich_print(
+                                        f"\n[bold]Prompt [cyan]{selected_prompt['name']}[/cyan] has {len(optional_args)} optional arguments:[/bold]"
+                                    )
+
+                                # Collect required arguments
+                                for arg_name in required_args:
+                                    # Show description if available
+                                    description = arg_descriptions.get(arg_name, "")
+                                    if description:
+                                        rich_print(
+                                            f"  [dim]{arg_name}: {description}[/dim]"
+                                        )
+
+                                # Only include non-empty values for optional arguments
+                                if optional_args:
+                                    # Collect optional arguments
+                                    for arg_name in optional_args:
+                                        # Show description if available
+                                        description = arg_descriptions.get(arg_name, "")
+                                        if description:
+                                            rich_print(
+                                                f"  [dim]{arg_name}: {description}[/dim]"
+                                            )
+
+                                        arg_value = await PromptSession().prompt_async(
+                                            HTML(
+                                                f"Enter value for <ansibrightcyan>{arg_name}</ansibrightcyan> (optional, press Enter to skip): "
+                                            )
+                                        )
+                                        # Only include non-empty values for optional arguments
+                                        if arg_value:
+                                            arg_values[arg_name] = arg_value
+
+                            # Apply the prompt with or without arguments
+                            rich_print(
+                                f"\n[bold]Applying prompt [cyan]{selected_prompt['namespaced_name']}[/cyan]...[/bold]"
+                            )
+
+                            # Call apply_prompt on the agent - always pass arg_values (empty dict if no args)
+                            await current_proxy._agent.apply_prompt(
+                                selected_prompt["namespaced_name"], arg_values
+                            )
+
+                        except Exception as e:
+                            import traceback
+
+                            rich_print(
+                                f"[red]Error selecting or applying prompt: {e}[/red]"
+                            )
+                            rich_print(f"[dim]{traceback.format_exc()}[/dim]")
+                        continue
 
                 # Skip further processing if command was handled
                 if command_result:
@@ -145,13 +509,13 @@ class AgentApp:
         """Support: agent.researcher"""
         if name not in self._agents:
             raise AttributeError(f"No agent named '{name}'")
-        return AgentProxy(self, name)
+        return self._agents[name]
 
     def __getitem__(self, name: str) -> BaseAgentProxy:
         """Support: agent['researcher']"""
         if name not in self._agents:
             raise KeyError(f"No agent named '{name}'")
-        return AgentProxy(self, name)
+        return self._agents[name]
 
     async def __call__(
         self, message: Optional[str] = "", agent_name: Optional[str] = None