refactor: address review feedback for AgentCoreToolSearchPlugin

- Rename DefaultIntentProvider to StrandsIntentProvider
- Filter to user-only messages to prevent PII leakage
- Add configurable system_prompt parameter
- Add existing tool check to prevent overwriting static tools
- Add missing __init__.py at gateway/integrations/ and gateway/integrations/strands/
- Add module docstrings for ruff compliance

Author: senthilkumarmohan

src/bedrock_agentcore/gateway/integrations/__init__.py

@@ -0,0 +1 @@
+"""Gateway integrations."""

src/bedrock_agentcore/gateway/integrations/strands/__init__.py

@@ -0,0 +1 @@
+"""Strands Agents integrations for AgentCore Gateway."""

src/bedrock_agentcore/gateway/integrations/strands/plugins/agentcore_tool_search/README.md

@@ -13,7 +13,7 @@ A semantic tool discovery plugin for [Strands Agents](https://github.com/strands
 ## Installation
 
 ```bash
-pip install agentcore-tool-search-plugin
+pip install 'bedrock-agentcore[strands-agents]'
 ```
 
 ## Usage
@@ -22,7 +22,7 @@ pip install agentcore-tool-search-plugin
 from mcp_proxy_for_aws.client import aws_iam_streamablehttp_client
 from strands import Agent
 from strands.tools.mcp import MCPClient
-from agentcore_tool_search_plugin import AgentCoreToolSearchPlugin
+from bedrock_agentcore.gateway.integrations.strands.plugins import AgentCoreToolSearchPlugin
 
 mcp_client = MCPClient(lambda: aws_iam_streamablehttp_client(
     endpoint="https://<gateway-id>.gateway.bedrock-agentcore.<region>.amazonaws.com/mcp",
@@ -63,9 +63,9 @@ Previously loaded tools are cleared before each search, so the agent always has
 
 An `IntentProvider` is responsible for analyzing conversation messages and producing a concise intent string that drives tool search. The plugin calls `derive_intent(messages, model)` before each invocation to determine what tools to load.
 
-### Default Intent Provider
+### StrandsIntentProvider
 
-`DefaultIntentProvider` uses an LLM to classify the last few conversation messages into a concise intent string. By default it uses the agent's model.
+`StrandsIntentProvider` uses a Strands Agent to classify the last few conversation messages into a concise intent string. By default it uses the parent agent's model.
 
 **Basic usage (uses the agent's model automatically):**
 
@@ -82,13 +82,29 @@ agent = Agent(plugins=[
 ```python
 from strands.models.bedrock import BedrockModel
 from bedrock_agentcore.gateway.integrations.strands.plugins import AgentCoreToolSearchPlugin
-from bedrock_agentcore.gateway.integrations.strands.plugins.agentcore_tool_search.intent_providers import DefaultIntentProvider
+from bedrock_agentcore.gateway.integrations.strands.plugins.agentcore_tool_search.intent_providers import StrandsIntentProvider
 
 intent_model = BedrockModel(model_id="us.anthropic.claude-haiku-4-5-20251001-v1:0")
 agent = Agent(plugins=[
     AgentCoreToolSearchPlugin(
         mcp_client=mcp_client,
-        intent_provider=DefaultIntentProvider(model=intent_model),
+        intent_provider=StrandsIntentProvider(model=intent_model),
+    )
+])
+```
+
+**With a custom system prompt:**
+
+```python
+from bedrock_agentcore.gateway.integrations.strands.plugins import AgentCoreToolSearchPlugin
+from bedrock_agentcore.gateway.integrations.strands.plugins.agentcore_tool_search.intent_providers import StrandsIntentProvider
+
+agent = Agent(plugins=[
+    AgentCoreToolSearchPlugin(
+        mcp_client=mcp_client,
+        intent_provider=StrandsIntentProvider(
+            system_prompt="Classify the user's intent in one sentence. Focus on the action, not details."
+        ),
     )
 ])
 ```

src/bedrock_agentcore/gateway/integrations/strands/plugins/agentcore_tool_search/__init__.py

@@ -1,3 +1,6 @@
-from .intent_providers import IntentProvider, DefaultIntentProvider
+"""AgentCore Tool Search plugin for Strands Agents."""
 
-__all__ = ["IntentProvider", "DefaultIntentProvider"]
+from .intent_providers import IntentProvider, StrandsIntentProvider
+from .plugin import AgentCoreToolSearchPlugin
+
+__all__ = ["AgentCoreToolSearchPlugin", "IntentProvider", "StrandsIntentProvider"]

src/bedrock_agentcore/gateway/integrations/strands/plugins/agentcore_tool_search/intent_providers/__init__.py

@@ -1,6 +1,6 @@
 """Intent provider interfaces and implementations."""
 
-from .default_intent_provider import DefaultIntentProvider
 from .intent_provider import IntentProvider
+from .strands_intent_provider import StrandsIntentProvider
 
-__all__ = ["DefaultIntentProvider", "IntentProvider"]
+__all__ = ["StrandsIntentProvider", "IntentProvider"]

src/bedrock_agentcore/gateway/integrations/strands/plugins/agentcore_tool_search/intent_providers/intent_provider.py

@@ -1,3 +1,5 @@
+"""Intent provider abstract interface."""
+
 from abc import ABC, abstractmethod
 
 

…ent_providers/default_intent_provider.py …ent_providers/strands_intent_provider.pysrc/bedrock_agentcore/gateway/integrations/strands/plugins/agentcore_tool_search/intent_providers/default_intent_provider.py renamed to src/bedrock_agentcore/gateway/integrations/strands/plugins/agentcore_tool_search/intent_providers/strands_intent_provider.py src/bedrock_agentcore/gateway/integrations/strands/plugins/agentcore_tool_search/intent_providers/default_intent_provider.py renamed to src/bedrock_agentcore/gateway/integrations/strands/plugins/agentcore_tool_search/intent_providers/strands_intent_provider.py

@@ -1,3 +1,5 @@
+"""Strands Agent-based intent provider implementation."""
+
 import logging
 
 from strands import Agent
@@ -14,21 +16,29 @@
 )
 
 
-class DefaultIntentProvider(IntentProvider):
-    """LLM-based intent provider that classifies the last N messages."""
+class StrandsIntentProvider(IntentProvider):
+    """LLM-based intent provider that uses a Strands Agent to classify the last N messages."""
+
+    def __init__(self, message_window: int = 5, model=None, system_prompt: str = INTENT_SYSTEM_PROMPT):
+        """Initialize StrandsIntentProvider.
 
-    def __init__(self, message_window: int = 5, model=None):
+        Args:
+            message_window: Number of recent messages to consider.
+            model: Optional explicit model for intent classification.
+            system_prompt: System prompt for the intent classifier. Defaults to INTENT_SYSTEM_PROMPT.
+        """
         self._message_window = message_window
         self._explicit_model = model
+        self._system_prompt = system_prompt
 
     def derive_intent(self, messages: list[dict], model=None) -> str:
         """Derive intent using an LLM. Falls back to agent's model if no explicit model set."""
         try:
-            recent_messages = messages[-self._message_window:] if messages else []
+            recent_messages = messages[-self._message_window :] if messages else []
             if not recent_messages:
                 return ""
 
-            kwargs = {"system_prompt": INTENT_SYSTEM_PROMPT, "tools": []}
+            kwargs = {"system_prompt": self._system_prompt, "tools": []}
             # Priority: explicit model > agent's model > Strands default
             resolved_model = self._explicit_model or model
             if resolved_model:
@@ -42,17 +52,22 @@ def derive_intent(self, messages: list[dict], model=None) -> str:
             return ""
 
     def _format_messages_for_prompt(self, messages: list[dict]) -> str:
-        """Format messages into a text prompt for the intent LLM."""
+        """Format user messages into a text prompt for the intent LLM.
+
+        Only includes user-role messages to avoid leaking PII or sensitive data
+        from tool results or assistant responses.
+        """
         parts = []
         for msg in messages:
-            role = msg.get("role", "unknown")
+            role = msg.get("role", "")
+            if role != "user":
+                continue
             content = msg.get("content", [])
             text = ""
             if isinstance(content, list):
                 text = " ".join(
-                    block.get("text", "")
-                    for block in content
-                    if isinstance(block, dict) and "text" in block
+                    block.get("text", "") for block in content if isinstance(block, dict) and "text" in block
                 )
-            parts.append(f"{role}: {text}")
+            if text.strip():
+                parts.append(text.strip())
         return "\n".join(parts)

src/bedrock_agentcore/gateway/integrations/strands/plugins/agentcore_tool_search/plugin.py

@@ -9,7 +9,7 @@
 from strands.tools.mcp import MCPClient
 from strands.tools.mcp.mcp_agent_tool import MCPAgentTool
 
-from .intent_providers import DefaultIntentProvider, IntentProvider
+from .intent_providers import IntentProvider, StrandsIntentProvider
 
 logger = logging.getLogger(__name__)
 
@@ -19,7 +19,7 @@ class AgentCoreToolSearchPlugin(Plugin):
 
     Args:
         mcp_client: MCPClient connected to an AgentCore Gateway.
-        intent_provider: Strategy for deriving intent. Defaults to DefaultIntentProvider.
+        intent_provider: Strategy for deriving intent. Defaults to StrandsIntentProvider.
     """
 
     name = "agentcore-tool-search-plugin"
@@ -29,13 +29,20 @@ def __init__(
         mcp_client: MCPClient,
         intent_provider: IntentProvider | None = None,
     ):
+        """Initialize the plugin.
+
+        Args:
+            mcp_client: MCPClient connected to an AgentCore Gateway.
+            intent_provider: Strategy for deriving intent. Defaults to StrandsIntentProvider.
+        """
         super().__init__()
-        self._intent_provider = intent_provider or DefaultIntentProvider()
+        self._intent_provider = intent_provider or StrandsIntentProvider()
         self._mcp_client = mcp_client
         self._loaded_tool_names: set[str] = set()
 
     @property
     def tools(self):
+        """Return empty list; tools are loaded dynamically via the hook."""
         return []
 
     @hook
@@ -68,6 +75,13 @@ def on_before_invocation(self, event: BeforeInvocationEvent) -> None:
 
         for agent_tool in agent_tools:
             try:
+                # Skip if a non-dynamic tool with this name already exists
+                if (
+                    agent_tool.tool_name in event.agent.tool_registry.registry
+                    and agent_tool.tool_name not in self._loaded_tool_names
+                ):
+                    logger.debug("Skipping tool %s: already registered as a static tool", agent_tool.tool_name)
+                    continue
                 event.agent.tool_registry.register_tool(agent_tool)
                 self._loaded_tool_names.add(agent_tool.tool_name)
             except Exception as e: