mcp_client implements tool_provider

Author: dbschmigelski

src/strands/agent/agent.py

@@ -544,19 +544,7 @@ async def cleanup_async(self) -> None:
 
         logger.debug("agent_id=<%s> | cleaning up agent resources", self.agent_id)
 
-        for provider in self.tool_registry.tool_providers:
-            try:
-                await provider.cleanup()
-                logger.debug(
-                    "agent_id=<%s>, provider=<%s> | cleaned up tool provider", self.agent_id, type(provider).__name__
-                )
-            except Exception as e:
-                logger.warning(
-                    "agent_id=<%s>, provider=<%s>, error=<%s> | failed to cleanup tool provider",
-                    self.agent_id,
-                    type(provider).__name__,
-                    e,
-                )
+        await self.tool_registry.cleanup_async()
 
         self._cleanup_called = True
         logger.debug("agent_id=<%s> | agent cleanup complete", self.agent_id)

src/strands/experimental/tools/mcp/__init__.py

@@ -27,12 +27,23 @@ async def load_tools(self, **kwargs: Any) -> Sequence["AgentTool"]:
         pass
 
     @abstractmethod
-    async def cleanup(self, **kwargs: Any) -> None:
-        """Clean up resources used by the tools in this provider.
+    async def add_provider_consumer(self, id: Any, **kwargs: Any) -> None:
+        """Add a consumer to this tool provider.
 
         Args:
+            id: Unique identifier for the consumer.
+            **kwargs: Additional arguments for future compatibility.
+        """
+        pass
+
+    @abstractmethod
+    async def remove_provider_consumer(self, id: Any, **kwargs: Any) -> None:
+        """Remove a consumer from this tool provider.
+
+        Args:
+            id: Unique identifier for the consumer.
             **kwargs: Additional arguments for future compatibility.
 
-        Should be called when the tools are no longer needed.
+        Provider may clean up resources when no consumers remain.
         """
         pass

src/strands/experimental/tools/mcp/mcp_tool_provider.py

@@ -7,7 +7,7 @@
 """
 
 from .mcp_agent_tool import MCPAgentTool
-from .mcp_client import MCPClient
+from .mcp_client import MCPClient, ToolFilters
 from .mcp_types import MCPTransport
 
-__all__ = ["MCPAgentTool", "MCPClient", "MCPTransport"]
+__all__ = ["MCPAgentTool", "MCPClient", "MCPTransport", "ToolFilters"]