@aws/agentcore 0.3.0-preview.5.0 → 0.3.0-preview.6.0

package/dist/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap

@@ -351,7 +351,7 @@ exports[`Assets Directory Snapshots > CDK assets > cdk/cdk/package.json should m
   },
   "dependencies": {
     "@aws/agentcore-cdk": "^0.1.0-alpha.1",
-    "aws-cdk-lib": "2.239.0",
+    "aws-cdk-lib": "2.243.0",
     "constructs": "^10.0.0"
   }
 }
@@ -372,6 +372,8 @@ test('AgentCoreStack synthesizes with empty spec', () => {
       agents: [],
       memories: [],
       credentials: [],
+      evaluators: [],
+      onlineEvalConfigs: [],
     },
   });
   const template = Template.fromStack(stack);
@@ -438,54 +440,78 @@ exports[`Assets Directory Snapshots > File listing > should match the expected f
   "mcp/python/README.md",
   "mcp/python/pyproject.toml",
   "mcp/python/server.py",
-  "python/autogen/base/README.md",
-  "python/autogen/base/gitignore.template",
-  "python/autogen/base/main.py",
-  "python/autogen/base/mcp_client/__init__.py",
-  "python/autogen/base/mcp_client/client.py",
-  "python/autogen/base/model/__init__.py",
-  "python/autogen/base/model/load.py",
-  "python/autogen/base/pyproject.toml",
-  "python/crewai/base/README.md",
-  "python/crewai/base/gitignore.template",
-  "python/crewai/base/main.py",
-  "python/crewai/base/model/__init__.py",
-  "python/crewai/base/model/load.py",
-  "python/crewai/base/pyproject.toml",
-  "python/googleadk/base/README.md",
-  "python/googleadk/base/gitignore.template",
-  "python/googleadk/base/main.py",
-  "python/googleadk/base/mcp_client/__init__.py",
-  "python/googleadk/base/mcp_client/client.py",
-  "python/googleadk/base/model/__init__.py",
-  "python/googleadk/base/model/load.py",
-  "python/googleadk/base/pyproject.toml",
-  "python/langchain_langgraph/base/README.md",
-  "python/langchain_langgraph/base/gitignore.template",
-  "python/langchain_langgraph/base/main.py",
-  "python/langchain_langgraph/base/mcp_client/__init__.py",
-  "python/langchain_langgraph/base/mcp_client/client.py",
-  "python/langchain_langgraph/base/model/__init__.py",
-  "python/langchain_langgraph/base/model/load.py",
-  "python/langchain_langgraph/base/pyproject.toml",
-  "python/openaiagents/base/README.md",
-  "python/openaiagents/base/gitignore.template",
-  "python/openaiagents/base/main.py",
-  "python/openaiagents/base/mcp_client/__init__.py",
-  "python/openaiagents/base/mcp_client/client.py",
-  "python/openaiagents/base/model/__init__.py",
-  "python/openaiagents/base/model/load.py",
-  "python/openaiagents/base/pyproject.toml",
-  "python/strands/base/README.md",
-  "python/strands/base/gitignore.template",
-  "python/strands/base/main.py",
-  "python/strands/base/mcp_client/__init__.py",
-  "python/strands/base/mcp_client/client.py",
-  "python/strands/base/model/__init__.py",
-  "python/strands/base/model/load.py",
-  "python/strands/base/pyproject.toml",
-  "python/strands/capabilities/memory/__init__.py",
-  "python/strands/capabilities/memory/session.py",
+  "python/a2a/googleadk/base/README.md",
+  "python/a2a/googleadk/base/gitignore.template",
+  "python/a2a/googleadk/base/main.py",
+  "python/a2a/googleadk/base/model/__init__.py",
+  "python/a2a/googleadk/base/model/load.py",
+  "python/a2a/googleadk/base/pyproject.toml",
+  "python/a2a/langchain_langgraph/base/README.md",
+  "python/a2a/langchain_langgraph/base/gitignore.template",
+  "python/a2a/langchain_langgraph/base/main.py",
+  "python/a2a/langchain_langgraph/base/model/__init__.py",
+  "python/a2a/langchain_langgraph/base/model/load.py",
+  "python/a2a/langchain_langgraph/base/pyproject.toml",
+  "python/a2a/strands/base/README.md",
+  "python/a2a/strands/base/gitignore.template",
+  "python/a2a/strands/base/main.py",
+  "python/a2a/strands/base/model/__init__.py",
+  "python/a2a/strands/base/model/load.py",
+  "python/a2a/strands/base/pyproject.toml",
+  "python/a2a/strands/capabilities/memory/__init__.py",
+  "python/a2a/strands/capabilities/memory/session.py",
+  "python/http/autogen/base/README.md",
+  "python/http/autogen/base/gitignore.template",
+  "python/http/autogen/base/main.py",
+  "python/http/autogen/base/mcp_client/__init__.py",
+  "python/http/autogen/base/mcp_client/client.py",
+  "python/http/autogen/base/model/__init__.py",
+  "python/http/autogen/base/model/load.py",
+  "python/http/autogen/base/pyproject.toml",
+  "python/http/crewai/base/README.md",
+  "python/http/crewai/base/gitignore.template",
+  "python/http/crewai/base/main.py",
+  "python/http/crewai/base/model/__init__.py",
+  "python/http/crewai/base/model/load.py",
+  "python/http/crewai/base/pyproject.toml",
+  "python/http/googleadk/base/README.md",
+  "python/http/googleadk/base/gitignore.template",
+  "python/http/googleadk/base/main.py",
+  "python/http/googleadk/base/mcp_client/__init__.py",
+  "python/http/googleadk/base/mcp_client/client.py",
+  "python/http/googleadk/base/model/__init__.py",
+  "python/http/googleadk/base/model/load.py",
+  "python/http/googleadk/base/pyproject.toml",
+  "python/http/langchain_langgraph/base/README.md",
+  "python/http/langchain_langgraph/base/gitignore.template",
+  "python/http/langchain_langgraph/base/main.py",
+  "python/http/langchain_langgraph/base/mcp_client/__init__.py",
+  "python/http/langchain_langgraph/base/mcp_client/client.py",
+  "python/http/langchain_langgraph/base/model/__init__.py",
+  "python/http/langchain_langgraph/base/model/load.py",
+  "python/http/langchain_langgraph/base/pyproject.toml",
+  "python/http/openaiagents/base/README.md",
+  "python/http/openaiagents/base/gitignore.template",
+  "python/http/openaiagents/base/main.py",
+  "python/http/openaiagents/base/mcp_client/__init__.py",
+  "python/http/openaiagents/base/mcp_client/client.py",
+  "python/http/openaiagents/base/model/__init__.py",
+  "python/http/openaiagents/base/model/load.py",
+  "python/http/openaiagents/base/pyproject.toml",
+  "python/http/strands/base/README.md",
+  "python/http/strands/base/gitignore.template",
+  "python/http/strands/base/main.py",
+  "python/http/strands/base/mcp_client/__init__.py",
+  "python/http/strands/base/mcp_client/client.py",
+  "python/http/strands/base/model/__init__.py",
+  "python/http/strands/base/model/load.py",
+  "python/http/strands/base/pyproject.toml",
+  "python/http/strands/capabilities/memory/__init__.py",
+  "python/http/strands/capabilities/memory/session.py",
+  "python/mcp/standalone/base/README.md",
+  "python/mcp/standalone/base/gitignore.template",
+  "python/mcp/standalone/base/main.py",
+  "python/mcp/standalone/base/pyproject.toml",
   "typescript/.gitkeep",
 ]
 `;
@@ -861,7 +887,828 @@ packages = ["."]
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/autogen/base/README.md should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/googleadk/base/README.md should match snapshot 1`] = `
+"# {{ name }}
+
+An A2A (Agent-to-Agent) agent deployed on Amazon Bedrock AgentCore using Google ADK.
+
+## Overview
+
+This agent implements the A2A protocol using Google's Agent Development Kit, enabling agent-to-agent communication.
+
+## Local Development
+
+\`\`\`bash
+uv sync
+uv run python main.py
+\`\`\`
+
+The agent starts on port 9000.
+
+## Deploy
+
+\`\`\`bash
+agentcore deploy
+\`\`\`
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/googleadk/base/gitignore.template should match snapshot 1`] = `
+"# Environment variables
+.env
+
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Virtual environments
+.venv/
+venv/
+ENV/
+env/
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+Thumbs.db
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/googleadk/base/main.py should match snapshot 1`] = `
+"from google.adk.agents import Agent
+from google.adk.a2a.executor.a2a_agent_executor import A2aAgentExecutor
+from google.adk.runners import Runner
+from google.adk.sessions import InMemorySessionService
+from a2a.types import AgentCapabilities, AgentCard, AgentSkill
+from bedrock_agentcore.runtime import serve_a2a
+from model.load import load_model
+
+
+def add_numbers(a: int, b: int) -> int:
+    """Return the sum of two numbers."""
+    return a + b
+
+
+agent = Agent(
+    model=load_model(),
+    name="{{ name }}",
+    description="A helpful assistant that can use tools.",
+    instruction="You are a helpful assistant. Use tools when appropriate.",
+    tools=[add_numbers],
+)
+
+runner = Runner(
+    app_name=agent.name,
+    agent=agent,
+    session_service=InMemorySessionService(),
+)
+
+card = AgentCard(
+    name=agent.name,
+    description=agent.description,
+    url="http://localhost:9000/",
+    version="0.1.0",
+    capabilities=AgentCapabilities(streaming=True),
+    skills=[
+        AgentSkill(
+            id="tools",
+            name="tools",
+            description="Use tools to help answer questions",
+            tags=["tools"],
+        )
+    ],
+    default_input_modes=["text"],
+    default_output_modes=["text"],
+)
+
+if __name__ == "__main__":
+    serve_a2a(A2aAgentExecutor(runner=runner), card)
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/googleadk/base/model/__init__.py should match snapshot 1`] = `
+"# Package marker
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/googleadk/base/model/load.py should match snapshot 1`] = `
+"import os
+from bedrock_agentcore.identity.auth import requires_api_key
+
+IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
+
+
+@requires_api_key(provider_name=IDENTITY_PROVIDER_NAME)
+def _agentcore_identity_api_key_provider(api_key: str) -> str:
+    """Fetch API key from AgentCore Identity."""
+    return api_key
+
+
+def _get_api_key() -> str:
+    """
+    Uses AgentCore Identity for API key management in deployed environments.
+    For local development, run via 'agentcore dev' which loads agentcore/.env.
+    """
+    if os.getenv("LOCAL_DEV") == "1":
+        api_key = os.getenv(IDENTITY_ENV_VAR)
+        if not api_key:
+            raise RuntimeError(
+                f"{IDENTITY_ENV_VAR} not found. Add {IDENTITY_ENV_VAR}=your-key to .env.local"
+            )
+        return api_key
+    return _agentcore_identity_api_key_provider()
+
+
+def load_model() -> None:
+    """
+    Set up Gemini API key authentication.
+    Uses AgentCore Identity for API key management in deployed environments,
+    and falls back to .env file for local development.
+    Sets the GOOGLE_API_KEY environment variable for the Google ADK.
+    """
+    api_key = _get_api_key()
+    # Use Google AI Studios API Key Authentication.
+    # https://google.github.io/adk-docs/agents/models/#google-ai-studio
+    os.environ["GOOGLE_API_KEY"] = api_key
+    # Set to TRUE is using Google Vertex AI, Set to FALSE for Google AI Studio
+    os.environ["GOOGLE_GENAI_USE_VERTEXAI"] = "FALSE"
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/googleadk/base/pyproject.toml should match snapshot 1`] = `
+"[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "{{ name }}"
+version = "0.1.0"
+description = "AgentCore A2A Agent using Google ADK"
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+    "a2a-sdk >= 0.2.0",
+    "aws-opentelemetry-distro",
+    "bedrock-agentcore[a2a] >= 1.0.3",
+    "google-adk >= 1.0.0",
+    "google-genai >= 1.0.0",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["."]
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/langchain_langgraph/base/README.md should match snapshot 1`] = `
+"# {{ name }}
+
+An A2A (Agent-to-Agent) agent deployed on Amazon Bedrock AgentCore using LangChain + LangGraph.
+
+## Overview
+
+This agent implements the A2A protocol using LangGraph, enabling agent-to-agent communication.
+
+## Local Development
+
+\`\`\`bash
+uv sync
+uv run python main.py
+\`\`\`
+
+The agent starts on port 9000.
+
+## Deploy
+
+\`\`\`bash
+agentcore deploy
+\`\`\`
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/langchain_langgraph/base/gitignore.template should match snapshot 1`] = `
+"# Environment variables
+.env
+
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Virtual environments
+.venv/
+venv/
+ENV/
+env/
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+Thumbs.db
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/langchain_langgraph/base/main.py should match snapshot 1`] = `
+"from langchain_core.tools import tool
+from langgraph.prebuilt import create_react_agent
+from a2a.server.agent_execution import AgentExecutor, RequestContext
+from a2a.server.events import EventQueue
+from a2a.server.tasks import TaskUpdater
+from a2a.types import AgentCapabilities, AgentCard, AgentSkill, Part, TextPart
+from a2a.utils import new_task
+from bedrock_agentcore.runtime import serve_a2a
+from model.load import load_model
+
+
+@tool
+def add_numbers(a: int, b: int) -> int:
+    """Return the sum of two numbers."""
+    return a + b
+
+
+model = load_model()
+graph = create_react_agent(model, tools=[add_numbers])
+
+
+class LangGraphA2AExecutor(AgentExecutor):
+    """Wraps a LangGraph CompiledGraph as an a2a-sdk AgentExecutor."""
+
+    def __init__(self, graph):
+        self.graph = graph
+
+    async def execute(self, context: RequestContext, event_queue: EventQueue) -> None:
+        task = context.current_task or new_task(context.message)
+        if not context.current_task:
+            await event_queue.enqueue_event(task)
+        updater = TaskUpdater(event_queue, task.id, task.context_id)
+
+        user_text = context.get_user_input()
+        result = await self.graph.ainvoke({"messages": [("user", user_text)]})
+        response = result["messages"][-1].content
+
+        await updater.add_artifact([Part(root=TextPart(text=response))])
+        await updater.complete()
+
+    async def cancel(self, context: RequestContext, event_queue: EventQueue) -> None:
+        pass
+
+
+card = AgentCard(
+    name="{{ name }}",
+    description="A LangGraph agent on Bedrock AgentCore",
+    url="http://localhost:9000/",
+    version="0.1.0",
+    capabilities=AgentCapabilities(streaming=True),
+    skills=[
+        AgentSkill(
+            id="tools",
+            name="tools",
+            description="Use tools to help answer questions",
+            tags=["tools"],
+        )
+    ],
+    default_input_modes=["text"],
+    default_output_modes=["text"],
+)
+
+if __name__ == "__main__":
+    serve_a2a(LangGraphA2AExecutor(graph), card)
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/langchain_langgraph/base/model/__init__.py should match snapshot 1`] = `
+"# Package marker
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/langchain_langgraph/base/model/load.py should match snapshot 1`] = `
+"{{#if (eq modelProvider "Bedrock")}}
+from langchain_aws import ChatBedrock
+
+# Uses global inference profile for Claude Sonnet 4.5
+# https://docs.aws.amazon.com/bedrock/latest/userguide/inference-profiles-support.html
+MODEL_ID = "global.anthropic.claude-sonnet-4-5-20250929-v1:0"
+
+
+def load_model() -> ChatBedrock:
+    """Get Bedrock model client using IAM credentials."""
+    return ChatBedrock(model_id=MODEL_ID)
+{{/if}}
+{{#if (eq modelProvider "Anthropic")}}
+import os
+from langchain_anthropic import ChatAnthropic
+from bedrock_agentcore.identity.auth import requires_api_key
+
+IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
+
+
+@requires_api_key(provider_name=IDENTITY_PROVIDER_NAME)
+def _agentcore_identity_api_key_provider(api_key: str) -> str:
+    """Fetch API key from AgentCore Identity."""
+    return api_key
+
+
+def _get_api_key() -> str:
+    """
+    Uses AgentCore Identity for API key management in deployed environments.
+    For local development, run via 'agentcore dev' which loads agentcore/.env.
+    """
+    if os.getenv("LOCAL_DEV") == "1":
+        api_key = os.getenv(IDENTITY_ENV_VAR)
+        if not api_key:
+            raise RuntimeError(
+                f"{IDENTITY_ENV_VAR} not found. Add {IDENTITY_ENV_VAR}=your-key to .env.local"
+            )
+        return api_key
+    return _agentcore_identity_api_key_provider()
+
+
+def load_model() -> ChatAnthropic:
+    """Get authenticated Anthropic model client."""
+    return ChatAnthropic(
+        model="claude-sonnet-4-5-20250929",
+        api_key=_get_api_key()
+    )
+{{/if}}
+{{#if (eq modelProvider "OpenAI")}}
+import os
+from langchain_openai import ChatOpenAI
+from bedrock_agentcore.identity.auth import requires_api_key
+
+IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
+
+
+@requires_api_key(provider_name=IDENTITY_PROVIDER_NAME)
+def _agentcore_identity_api_key_provider(api_key: str) -> str:
+    """Fetch API key from AgentCore Identity."""
+    return api_key
+
+
+def _get_api_key() -> str:
+    """
+    Uses AgentCore Identity for API key management in deployed environments.
+    For local development, run via 'agentcore dev' which loads agentcore/.env.
+    """
+    if os.getenv("LOCAL_DEV") == "1":
+        api_key = os.getenv(IDENTITY_ENV_VAR)
+        if not api_key:
+            raise RuntimeError(
+                f"{IDENTITY_ENV_VAR} not found. Add {IDENTITY_ENV_VAR}=your-key to .env.local"
+            )
+        return api_key
+    return _agentcore_identity_api_key_provider()
+
+
+def load_model() -> ChatOpenAI:
+    """Get authenticated OpenAI model client."""
+    return ChatOpenAI(
+        model="gpt-4.1",
+        api_key=_get_api_key()
+    )
+{{/if}}
+{{#if (eq modelProvider "Gemini")}}
+import os
+from langchain_google_genai import ChatGoogleGenerativeAI
+from bedrock_agentcore.identity.auth import requires_api_key
+
+IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
+
+
+@requires_api_key(provider_name=IDENTITY_PROVIDER_NAME)
+def _agentcore_identity_api_key_provider(api_key: str) -> str:
+    """Fetch API key from AgentCore Identity."""
+    return api_key
+
+
+def _get_api_key() -> str:
+    """
+    Uses AgentCore Identity for API key management in deployed environments.
+    For local development, run via 'agentcore dev' which loads agentcore/.env.
+    """
+    if os.getenv("LOCAL_DEV") == "1":
+        api_key = os.getenv(IDENTITY_ENV_VAR)
+        if not api_key:
+            raise RuntimeError(
+                f"{IDENTITY_ENV_VAR} not found. Add {IDENTITY_ENV_VAR}=your-key to .env.local"
+            )
+        return api_key
+    return _agentcore_identity_api_key_provider()
+
+
+def load_model() -> ChatGoogleGenerativeAI:
+    """Get authenticated Gemini model client."""
+    return ChatGoogleGenerativeAI(
+        model="gemini-2.5-flash",
+        api_key=_get_api_key()
+    )
+{{/if}}
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/langchain_langgraph/base/pyproject.toml should match snapshot 1`] = `
+"[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "{{ name }}"
+version = "0.1.0"
+description = "AgentCore A2A Agent using LangChain + LangGraph"
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+    "a2a-sdk >= 0.2.0",
+    {{#if (eq modelProvider "Anthropic")}}"langchain-anthropic >= 0.3.0",
+    {{/if}}{{#if (eq modelProvider "Bedrock")}}"langchain-aws >= 0.2.0",
+    {{/if}}{{#if (eq modelProvider "Gemini")}}"langchain-google-genai >= 2.0.0",
+    {{/if}}{{#if (eq modelProvider "OpenAI")}}"langchain-openai >= 0.2.0",
+    {{/if}}"aws-opentelemetry-distro",
+    "bedrock-agentcore[a2a] >= 1.0.3",
+    "botocore[crt] >= 1.35.0",
+    "langgraph >= 0.2.0",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["."]
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/strands/base/README.md should match snapshot 1`] = `
+"# {{ name }}
+
+An A2A (Agent-to-Agent) agent deployed on Amazon Bedrock AgentCore using Strands SDK.
+
+## Overview
+
+This agent implements the A2A protocol, enabling agent-to-agent communication. Other agents can discover and interact with this agent via the \`/.well-known/agent-card.json\` endpoint.
+
+## Local Development
+
+\`\`\`bash
+uv sync
+uv run python main.py
+\`\`\`
+
+The agent starts on port 9000.
+
+## Deploy
+
+\`\`\`bash
+agentcore deploy
+\`\`\`
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/strands/base/gitignore.template should match snapshot 1`] = `
+"# Environment variables
+.env
+
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Virtual environments
+.venv/
+venv/
+ENV/
+env/
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+Thumbs.db
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/strands/base/main.py should match snapshot 1`] = `
+"from strands import Agent, tool
+from strands.multiagent.a2a.executor import StrandsA2AExecutor
+from bedrock_agentcore.runtime import serve_a2a
+from model.load import load_model
+{{#if hasMemory}}
+from memory.session import get_memory_session_manager
+{{/if}}
+
+
+@tool
+def add_numbers(a: int, b: int) -> int:
+    """Return the sum of two numbers."""
+    return a + b
+
+
+tools = [add_numbers]
+
+{{#if hasMemory}}
+def agent_factory():
+    cache = {}
+    def get_or_create_agent(session_id, user_id):
+        key = f"{session_id}/{user_id}"
+        if key not in cache:
+            cache[key] = Agent(
+                model=load_model(),
+                session_manager=get_memory_session_manager(session_id, user_id),
+                system_prompt="You are a helpful assistant. Use tools when appropriate.",
+                tools=tools,
+            )
+        return cache[key]
+    return get_or_create_agent
+
+get_or_create_agent = agent_factory()
+agent = get_or_create_agent("default-session", "default-user")
+{{else}}
+agent = Agent(
+    model=load_model(),
+    system_prompt="You are a helpful assistant. Use tools when appropriate.",
+    tools=tools,
+)
+{{/if}}
+
+if __name__ == "__main__":
+    serve_a2a(StrandsA2AExecutor(agent))
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/strands/base/model/__init__.py should match snapshot 1`] = `
+"# Package marker
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/strands/base/model/load.py should match snapshot 1`] = `
+"{{#if (eq modelProvider "Bedrock")}}
+from strands.models.bedrock import BedrockModel
+
+
+def load_model() -> BedrockModel:
+    """Get Bedrock model client using IAM credentials."""
+    return BedrockModel(model_id="global.anthropic.claude-sonnet-4-5-20250929-v1:0")
+{{/if}}
+{{#if (eq modelProvider "Anthropic")}}
+import os
+
+from strands.models.anthropic import AnthropicModel
+from bedrock_agentcore.identity.auth import requires_api_key
+
+IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
+
+
+@requires_api_key(provider_name=IDENTITY_PROVIDER_NAME)
+def _agentcore_identity_api_key_provider(api_key: str) -> str:
+    """Fetch API key from AgentCore Identity."""
+    return api_key
+
+
+def _get_api_key() -> str:
+    """
+    Uses AgentCore Identity for API key management in deployed environments.
+    For local development, run via 'agentcore dev' which loads agentcore/.env.
+    """
+    if os.getenv("LOCAL_DEV") == "1":
+        api_key = os.getenv(IDENTITY_ENV_VAR)
+        if not api_key:
+            raise RuntimeError(
+                f"{IDENTITY_ENV_VAR} not found. Add {IDENTITY_ENV_VAR}=your-key to .env.local"
+            )
+        return api_key
+    return _agentcore_identity_api_key_provider()
+
+
+def load_model() -> AnthropicModel:
+    """Get authenticated Anthropic model client."""
+    return AnthropicModel(
+        client_args={"api_key": _get_api_key()},
+        model_id="claude-sonnet-4-5-20250929",
+        max_tokens=5000,
+    )
+{{/if}}
+{{#if (eq modelProvider "OpenAI")}}
+import os
+
+from strands.models.openai import OpenAIModel
+from bedrock_agentcore.identity.auth import requires_api_key
+
+IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
+
+
+@requires_api_key(provider_name=IDENTITY_PROVIDER_NAME)
+def _agentcore_identity_api_key_provider(api_key: str) -> str:
+    """Fetch API key from AgentCore Identity."""
+    return api_key
+
+
+def _get_api_key() -> str:
+    """
+    Uses AgentCore Identity for API key management in deployed environments.
+    For local development, run via 'agentcore dev' which loads agentcore/.env.
+    """
+    if os.getenv("LOCAL_DEV") == "1":
+        api_key = os.getenv(IDENTITY_ENV_VAR)
+        if not api_key:
+            raise RuntimeError(
+                f"{IDENTITY_ENV_VAR} not found. Add {IDENTITY_ENV_VAR}=your-key to .env.local"
+            )
+        return api_key
+    return _agentcore_identity_api_key_provider()
+
+
+def load_model() -> OpenAIModel:
+    """Get authenticated OpenAI model client."""
+    return OpenAIModel(
+        client_args={"api_key": _get_api_key()},
+        model_id="gpt-4.1",
+    )
+{{/if}}
+{{#if (eq modelProvider "Gemini")}}
+import os
+
+from strands.models.gemini import GeminiModel
+from bedrock_agentcore.identity.auth import requires_api_key
+
+IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
+
+
+@requires_api_key(provider_name=IDENTITY_PROVIDER_NAME)
+def _agentcore_identity_api_key_provider(api_key: str) -> str:
+    """Fetch API key from AgentCore Identity."""
+    return api_key
+
+
+def _get_api_key() -> str:
+    """
+    Uses AgentCore Identity for API key management in deployed environments.
+    For local development, run via 'agentcore dev' which loads agentcore/.env.
+    """
+    if os.getenv("LOCAL_DEV") == "1":
+        api_key = os.getenv(IDENTITY_ENV_VAR)
+        if not api_key:
+            raise RuntimeError(
+                f"{IDENTITY_ENV_VAR} not found. Add {IDENTITY_ENV_VAR}=your-key to .env.local"
+            )
+        return api_key
+    return _agentcore_identity_api_key_provider()
+
+
+def load_model() -> GeminiModel:
+    """Get authenticated Gemini model client."""
+    return GeminiModel(
+        client_args={"api_key": _get_api_key()},
+        model_id="gemini-2.5-flash",
+    )
+{{/if}}
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/strands/base/pyproject.toml should match snapshot 1`] = `
+"[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "{{ name }}"
+version = "0.1.0"
+description = "AgentCore A2A Agent using Strands SDK"
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+    {{#if (eq modelProvider "Anthropic")}}"anthropic >= 0.30.0",
+    {{/if}}"a2a-sdk[all] >= 0.2.0",
+    "aws-opentelemetry-distro",
+    "bedrock-agentcore[a2a] >= 1.0.3",
+    "botocore[crt] >= 1.35.0",
+    {{#if (eq modelProvider "Gemini")}}"google-genai >= 1.0.0",
+    {{/if}}{{#if (eq modelProvider "OpenAI")}}"openai >= 1.0.0",
+    {{/if}}"strands-agents >= 1.13.0",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["."]
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/strands/capabilities/memory/__init__.py should match snapshot 1`] = `
+"# Package marker
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/strands/capabilities/memory/session.py should match snapshot 1`] = `
+"import os
+from typing import Optional
+
+from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig{{#if memoryProviders.[0].strategies.length}}, RetrievalConfig{{/if}}
+from bedrock_agentcore.memory.integrations.strands.session_manager import AgentCoreMemorySessionManager
+
+MEMORY_ID = os.getenv("{{memoryProviders.[0].envVarName}}")
+REGION = os.getenv("AWS_REGION")
+
+def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
+    if not MEMORY_ID:
+        return None
+
+{{#if memoryProviders.[0].strategies.length}}
+    retrieval_config = {
+{{#if (includes memoryProviders.[0].strategies "SEMANTIC")}}
+        f"/users/{actor_id}/facts": RetrievalConfig(top_k=3, relevance_score=0.5),
+{{/if}}
+{{#if (includes memoryProviders.[0].strategies "USER_PREFERENCE")}}
+        f"/users/{actor_id}/preferences": RetrievalConfig(top_k=3, relevance_score=0.5),
+{{/if}}
+{{#if (includes memoryProviders.[0].strategies "SUMMARIZATION")}}
+        f"/summaries/{actor_id}/{session_id}": RetrievalConfig(top_k=3, relevance_score=0.5),
+{{/if}}
+    }
+{{/if}}
+
+    return AgentCoreMemorySessionManager(
+        AgentCoreMemoryConfig(
+            memory_id=MEMORY_ID,
+            session_id=session_id,
+            actor_id=actor_id,
+{{#if memoryProviders.[0].strategies.length}}
+            retrieval_config=retrieval_config,
+{{/if}}
+        ),
+        REGION
+    )
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/autogen/base/README.md should match snapshot 1`] = `
 "This is a project generated by the agentcore create CLI tool!
 
 # Layout
@@ -904,7 +1751,7 @@ Use \`agentcore invoke\` to invoke your deployed agent.
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/autogen/base/gitignore.template should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/autogen/base/gitignore.template should match snapshot 1`] = `
 "# Environment variables
 .env
 
@@ -949,7 +1796,7 @@ Thumbs.db
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/autogen/base/main.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/autogen/base/main.py should match snapshot 1`] = `
 "import os
 from autogen_agentchat.agents import AssistantAgent
 from autogen_core.tools import FunctionTool
@@ -1005,13 +1852,22 @@ if __name__ == "__main__":
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/autogen/base/mcp_client/__init__.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/autogen/base/mcp_client/__init__.py should match snapshot 1`] = `
 "# Package marker
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/autogen/base/mcp_client/client.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/autogen/base/mcp_client/client.py should match snapshot 1`] = `
 "from typing import List
+{{#if isVpc}}
+# VPC mode: external MCP endpoints are not reachable without a NAT gateway.
+# Add an AgentCore Gateway with \`agentcore add gateway\`, or configure your own endpoint below.
+
+
+async def get_streamable_http_mcp_tools() -> List:
+    """No MCP server configured. Add a gateway with \`agentcore add gateway\`."""
+    return []
+{{else}}
 from autogen_ext.tools.mcp import (
     StreamableHttpMcpToolAdapter,
     StreamableHttpServerParams,
@@ -1029,15 +1885,16 @@ async def get_streamable_http_mcp_tools() -> List[StreamableHttpMcpToolAdapter]:
     # to use an MCP server that supports bearer authentication, add headers={"Authorization": f"Bearer {access_token}"}
     server_params = StreamableHttpServerParams(url=EXAMPLE_MCP_ENDPOINT)
     return await mcp_server_tools(server_params)
+{{/if}}
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/autogen/base/model/__init__.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/autogen/base/model/__init__.py should match snapshot 1`] = `
 "# Package marker
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/autogen/base/model/load.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/autogen/base/model/load.py should match snapshot 1`] = `
 "{{#if (eq modelProvider "Bedrock")}}
 import os
 from autogen_ext.models.anthropic import AnthropicBedrockChatCompletionClient
@@ -1177,7 +2034,7 @@ def load_model() -> OpenAIChatCompletionClient:
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/autogen/base/pyproject.toml should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/autogen/base/pyproject.toml should match snapshot 1`] = `
 "[build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
@@ -1215,7 +2072,7 @@ packages = ["."]
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/crewai/base/README.md should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/crewai/base/README.md should match snapshot 1`] = `
 "This is a project generated by the agentcore create CLI tool!
 
 # Layout
@@ -1258,7 +2115,7 @@ Use \`agentcore invoke\` to invoke your deployed agent.
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/crewai/base/gitignore.template should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/crewai/base/gitignore.template should match snapshot 1`] = `
 "# Environment variables
 .env
 
@@ -1303,7 +2160,7 @@ Thumbs.db
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/crewai/base/main.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/crewai/base/main.py should match snapshot 1`] = `
 "from crewai import Agent, Crew, Task, Process
 from crewai.tools import tool
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
@@ -1362,12 +2219,12 @@ if __name__ == "__main__":
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/crewai/base/model/__init__.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/crewai/base/model/__init__.py should match snapshot 1`] = `
 "# Package marker
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/crewai/base/model/load.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/crewai/base/model/load.py should match snapshot 1`] = `
 "{{#if (eq modelProvider "Bedrock")}}
 from crewai import LLM
 
@@ -1504,7 +2361,7 @@ def load_model() -> LLM:
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/crewai/base/pyproject.toml should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/crewai/base/pyproject.toml should match snapshot 1`] = `
 "[build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
@@ -1539,7 +2396,7 @@ packages = ["."]
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/googleadk/base/README.md should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/googleadk/base/README.md should match snapshot 1`] = `
 "This is a project generated by the agentcore create CLI tool!
 
 # Layout
@@ -1582,7 +2439,7 @@ Use \`agentcore invoke\` to invoke your deployed agent.
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/googleadk/base/gitignore.template should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/googleadk/base/gitignore.template should match snapshot 1`] = `
 "# Environment variables
 .env
 
@@ -1627,7 +2484,7 @@ Thumbs.db
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/googleadk/base/main.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/googleadk/base/main.py should match snapshot 1`] = `
 "import os
 from google.adk.agents import Agent
 from google.adk.runners import Runner
@@ -1731,12 +2588,12 @@ if __name__ == "__main__":
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/googleadk/base/mcp_client/__init__.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/googleadk/base/mcp_client/__init__.py should match snapshot 1`] = `
 "# Package marker
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/googleadk/base/mcp_client/client.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/googleadk/base/mcp_client/client.py should match snapshot 1`] = `
 "import os
 import logging
 from google.adk.tools.mcp_tool.mcp_toolset import MCPToolset
@@ -1792,6 +2649,14 @@ def get_all_gateway_mcp_toolsets() -> list[MCPToolset]:
     {{/each}}
     return toolsets
 {{else}}
+{{#if isVpc}}
+# VPC mode: external MCP endpoints are not reachable without a NAT gateway.
+# Add an AgentCore Gateway with \`agentcore add gateway\`, or configure your own endpoint below.
+
+def get_streamable_http_mcp_client() -> MCPToolset | None:
+    """No MCP server configured. Add a gateway with \`agentcore add gateway\`."""
+    return None
+{{else}}
 # ExaAI provides information about code through web searches, crawling and code context searches through their platform. Requires no authentication
 EXAMPLE_MCP_ENDPOINT = "https://mcp.exa.ai/mcp"
 
@@ -1803,15 +2668,16 @@ def get_streamable_http_mcp_client() -> MCPToolset:
         connection_params=StreamableHTTPConnectionParams(url=EXAMPLE_MCP_ENDPOINT)
     )
 {{/if}}
+{{/if}}
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/googleadk/base/model/__init__.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/googleadk/base/model/__init__.py should match snapshot 1`] = `
 "# Package marker
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/googleadk/base/model/load.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/googleadk/base/model/load.py should match snapshot 1`] = `
 "import os
 from bedrock_agentcore.identity.auth import requires_api_key
 
@@ -1856,7 +2722,7 @@ def load_model() -> None:
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/googleadk/base/pyproject.toml should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/googleadk/base/pyproject.toml should match snapshot 1`] = `
 "[build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
@@ -1882,7 +2748,7 @@ packages = ["."]
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/langchain_langgraph/base/README.md should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/langchain_langgraph/base/README.md should match snapshot 1`] = `
 "This is a project generated by the agentcore create CLI tool!
 
 # Layout
@@ -1925,7 +2791,7 @@ Use \`agentcore invoke\` to invoke your deployed agent.
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/langchain_langgraph/base/gitignore.template should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/langchain_langgraph/base/gitignore.template should match snapshot 1`] = `
 "# Environment variables
 .env
 
@@ -1970,7 +2836,7 @@ Thumbs.db
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/langchain_langgraph/base/main.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/langchain_langgraph/base/main.py should match snapshot 1`] = `
 "import os
 from langchain_core.messages import HumanMessage
 from langgraph.prebuilt import create_react_agent
@@ -2040,12 +2906,12 @@ if __name__ == "__main__":
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/langchain_langgraph/base/mcp_client/__init__.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/langchain_langgraph/base/mcp_client/__init__.py should match snapshot 1`] = `
 "# Package marker
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/langchain_langgraph/base/mcp_client/client.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/langchain_langgraph/base/mcp_client/client.py should match snapshot 1`] = `
 "import os
 import logging
 from langchain_mcp_adapters.client import MultiServerMCPClient
@@ -2098,6 +2964,14 @@ def get_all_gateway_mcp_client() -> MultiServerMCPClient | None:
         return None
     return MultiServerMCPClient(servers)
 {{else}}
+{{#if isVpc}}
+# VPC mode: external MCP endpoints are not reachable without a NAT gateway.
+# Add an AgentCore Gateway with \`agentcore add gateway\`, or configure your own endpoint below.
+
+def get_streamable_http_mcp_client() -> MultiServerMCPClient | None:
+    """No MCP server configured. Add a gateway with \`agentcore add gateway\`."""
+    return None
+{{else}}
 # ExaAI provides information about code through web searches, crawling and code context searches through their platform. Requires no authentication
 EXAMPLE_MCP_ENDPOINT = "https://mcp.exa.ai/mcp"
 
@@ -2114,15 +2988,16 @@ def get_streamable_http_mcp_client() -> MultiServerMCPClient:
         }
     )
 {{/if}}
+{{/if}}
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/langchain_langgraph/base/model/__init__.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/langchain_langgraph/base/model/__init__.py should match snapshot 1`] = `
 "# Package marker
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/langchain_langgraph/base/model/load.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/langchain_langgraph/base/model/load.py should match snapshot 1`] = `
 "{{#if (eq modelProvider "Bedrock")}}
 from langchain_aws import ChatBedrock
 
@@ -2249,7 +3124,7 @@ def load_model() -> ChatGoogleGenerativeAI:
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/langchain_langgraph/base/pyproject.toml should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/langchain_langgraph/base/pyproject.toml should match snapshot 1`] = `
 "[build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
@@ -2290,7 +3165,7 @@ packages = ["."]
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/openaiagents/base/README.md should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/openaiagents/base/README.md should match snapshot 1`] = `
 "This is a project generated by the agentcore create CLI tool!
 
 # Layout
@@ -2333,7 +3208,7 @@ Use \`agentcore invoke\` to invoke your deployed agent.
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/openaiagents/base/gitignore.template should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/openaiagents/base/gitignore.template should match snapshot 1`] = `
 "# Environment variables
 .env
 
@@ -2378,7 +3253,7 @@ Thumbs.db
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/openaiagents/base/main.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/openaiagents/base/main.py should match snapshot 1`] = `
 "import os
 from agents import Agent, Runner, function_tool
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
@@ -2485,12 +3360,12 @@ if __name__ == "__main__":
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/openaiagents/base/mcp_client/__init__.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/openaiagents/base/mcp_client/__init__.py should match snapshot 1`] = `
 "# Package marker
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/openaiagents/base/mcp_client/client.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/openaiagents/base/mcp_client/client.py should match snapshot 1`] = `
 "import os
 import logging
 from agents.mcp import MCPServerStreamableHttp
@@ -2545,6 +3420,14 @@ def get_all_gateway_mcp_servers() -> list[MCPServerStreamableHttp]:
     {{/each}}
     return servers
 {{else}}
+{{#if isVpc}}
+# VPC mode: external MCP endpoints are not reachable without a NAT gateway.
+# Add an AgentCore Gateway with \`agentcore add gateway\`, or configure your own endpoint below.
+
+def get_streamable_http_mcp_client() -> MCPServerStreamableHttp | None:
+    """No MCP server configured. Add a gateway with \`agentcore add gateway\`."""
+    return None
+{{else}}
 # ExaAI provides information about code through web searches, crawling and code context searches through their platform. Requires no authentication
 EXAMPLE_MCP_ENDPOINT = "https://mcp.exa.ai/mcp"
 
@@ -2556,15 +3439,16 @@ def get_streamable_http_mcp_client() -> MCPServerStreamableHttp:
         name="AgentCore Gateway MCP", params={"url": EXAMPLE_MCP_ENDPOINT}
     )
 {{/if}}
+{{/if}}
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/openaiagents/base/model/__init__.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/openaiagents/base/model/__init__.py should match snapshot 1`] = `
 "# Package marker
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/openaiagents/base/model/load.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/openaiagents/base/model/load.py should match snapshot 1`] = `
 "import os
 from bedrock_agentcore.identity.auth import requires_api_key
 
@@ -2605,7 +3489,7 @@ def load_model() -> None:
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/openaiagents/base/pyproject.toml should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/openaiagents/base/pyproject.toml should match snapshot 1`] = `
 "[build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
@@ -2630,7 +3514,7 @@ packages = ["."]
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/strands/base/README.md should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/strands/base/README.md should match snapshot 1`] = `
 "This is a project generated by the AgentCore CLI!
 
 # Layout
@@ -2673,7 +3557,7 @@ Use \`agentcore invoke\` to invoke your deployed agent.
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/strands/base/gitignore.template should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/strands/base/gitignore.template should match snapshot 1`] = `
 "# Environment variables
 .env
 
@@ -2717,7 +3601,7 @@ env/
 Thumbs.db"
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/strands/base/main.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/strands/base/main.py should match snapshot 1`] = `
 "from strands import Agent, tool
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
@@ -2817,12 +3701,12 @@ if __name__ == "__main__":
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/strands/base/mcp_client/__init__.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/strands/base/mcp_client/__init__.py should match snapshot 1`] = `
 "# Package marker
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/strands/base/mcp_client/client.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/strands/base/mcp_client/client.py should match snapshot 1`] = `
 "import os
 import logging
 from mcp.client.streamable_http import streamablehttp_client
@@ -2879,6 +3763,14 @@ def get_all_gateway_mcp_clients() -> list[MCPClient]:
     {{/each}}
     return clients
 {{else}}
+{{#if isVpc}}
+# VPC mode: external MCP endpoints are not reachable without a NAT gateway.
+# Add an AgentCore Gateway with \`agentcore add gateway\`, or configure your own endpoint below.
+
+def get_streamable_http_mcp_client() -> MCPClient | None:
+    """No MCP server configured. Add a gateway with \`agentcore add gateway\`."""
+    return None
+{{else}}
 # ExaAI provides information about code through web searches, crawling and code context searches through their platform. Requires no authentication
 EXAMPLE_MCP_ENDPOINT = "https://mcp.exa.ai/mcp"
 
@@ -2887,15 +3779,16 @@ def get_streamable_http_mcp_client() -> MCPClient:
     # to use an MCP server that supports bearer authentication, add headers={"Authorization": f"Bearer {access_token}"}
     return MCPClient(lambda: streamablehttp_client(EXAMPLE_MCP_ENDPOINT))
 {{/if}}
+{{/if}}
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/strands/base/model/__init__.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/strands/base/model/__init__.py should match snapshot 1`] = `
 "# Package marker
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/strands/base/model/load.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/strands/base/model/load.py should match snapshot 1`] = `
 "{{#if (eq modelProvider "Bedrock")}}
 from strands.models.bedrock import BedrockModel
 
@@ -3022,7 +3915,7 @@ def load_model() -> GeminiModel:
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/strands/base/pyproject.toml should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/strands/base/pyproject.toml should match snapshot 1`] = `
 "[build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
@@ -3051,12 +3944,12 @@ packages = ["."]
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/strands/capabilities/memory/__init__.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/strands/capabilities/memory/__init__.py should match snapshot 1`] = `
 "# Package marker
 "
 `;
 
-exports[`Assets Directory Snapshots > Python framework assets > python/python/strands/capabilities/memory/session.py should match snapshot 1`] = `
+exports[`Assets Directory Snapshots > Python framework assets > python/python/http/strands/capabilities/memory/session.py should match snapshot 1`] = `
 "import os
 from typing import Optional
 
@@ -3099,6 +3992,140 @@ def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[Agent
 "
 `;
 
+exports[`Assets Directory Snapshots > Python framework assets > python/python/mcp/standalone/base/README.md should match snapshot 1`] = `
+"# {{ name }}
+
+An MCP (Model Context Protocol) server deployed on Amazon Bedrock AgentCore.
+
+## Overview
+
+This project implements an MCP server using FastMCP. MCP servers expose tools that can be consumed by MCP clients (other agents or applications).
+
+## Local Development
+
+\`\`\`bash
+# Install dependencies
+uv sync
+
+# Run the MCP server locally
+uv run python main.py
+\`\`\`
+
+The server starts on port 8000 with Streamable HTTP transport.
+
+## Adding Tools
+
+Define tools using the \`@mcp.tool()\` decorator in \`main.py\`:
+
+\`\`\`python
+@mcp.tool()
+def my_tool(param: str) -> str:
+    """Description of what the tool does."""
+    return f"Result: {param}"
+\`\`\`
+
+## Deploy
+
+\`\`\`bash
+agentcore deploy
+\`\`\`
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/mcp/standalone/base/gitignore.template should match snapshot 1`] = `
+"# Environment variables
+.env
+
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Virtual environments
+.venv/
+venv/
+ENV/
+env/
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+Thumbs.db
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/mcp/standalone/base/main.py should match snapshot 1`] = `
+"from mcp.server.fastmcp import FastMCP
+
+mcp = FastMCP("{{ name }}", host="0.0.0.0", stateless_http=True)
+
+
+@mcp.tool()
+def add_numbers(a: int, b: int) -> int:
+    """Add two numbers together"""
+    return a + b
+
+
+@mcp.tool()
+def multiply_numbers(a: int, b: int) -> int:
+    """Multiply two numbers together"""
+    return a * b
+
+
+@mcp.tool()
+def greet_user(name: str) -> str:
+    """Greet a user by name"""
+    return f"Hello, {name}! Nice to meet you."
+
+
+if __name__ == "__main__":
+    mcp.run(transport="streamable-http")
+"
+`;
+
+exports[`Assets Directory Snapshots > Python framework assets > python/python/mcp/standalone/base/pyproject.toml should match snapshot 1`] = `
+"[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "{{ name }}"
+version = "0.1.0"
+description = "AgentCore MCP Server"
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+    "mcp >= 1.19.0",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["."]
+"
+`;
+
 exports[`Assets Directory Snapshots > Root-level assets > AGENTS.md should match snapshot 1`] = `
 "## AgentCore Templates