@aws/agentcore 0.3.0-preview.1.0 → 0.3.0-preview.2.1

package/dist/assets/agents/AGENTS.md

@@ -60,21 +60,32 @@ file maps to a JSON config file and includes validation constraints as comments.
 
 ### Common Enum Values
 
-- **BuildType**: `'CodeZip'`
+- **BuildType**: `'CodeZip'` | `'Container'`
 - **NetworkMode**: `'PUBLIC'`
 - **RuntimeVersion**: `'PYTHON_3_10'` | `'PYTHON_3_11'` | `'PYTHON_3_12'` | `'PYTHON_3_13'`
 - **MemoryStrategyType**: `'SEMANTIC'` | `'SUMMARIZATION'` | `'USER_PREFERENCE'`
 
+### Build Types
+
+- **CodeZip**: Python source is packaged as a zip artifact and deployed directly to AgentCore Runtime.
+- **Container**: Agent code is built as a Docker container image. Requires a `Dockerfile` in the agent's `codeLocation`
+  directory. At deploy time, the source is uploaded to S3, built in CodeBuild (ARM64), pushed to a per-agent ECR
+  repository, and the container URI is provided to the AgentCore Runtime. For local development (`agentcore dev`), the
+  container is built and run locally with volume-mounted hot-reload.
+
 ### Supported Frameworks (for template agents)
 
 - **Strands** - Works with Bedrock, Anthropic, OpenAI, Gemini
 - **LangChain_LangGraph** - Works with Bedrock, Anthropic, OpenAI, Gemini
+- **CrewAI** - Works with Bedrock, Anthropic, OpenAI, Gemini
 - **GoogleADK** - Gemini only
 - **OpenAIAgents** - OpenAI only
+- **AutoGen** - Works with Bedrock, Anthropic, OpenAI, Gemini
 
 ### Specific Context
 
-Directory pathing to local projects is required for runtimes. Only Python offers a zip based direct code deploy option.
+Directory pathing to local projects is required for runtimes. Both CodeZip (Python zip) and Container (Docker image)
+deployment options are available.
 
 ## Deployment
 

package/dist/assets/container/python/Dockerfile

@@ -0,0 +1,28 @@
+FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim
+
+WORKDIR /app
+
+ENV UV_SYSTEM_PYTHON=1 \
+    UV_COMPILE_BYTECODE=1 \
+    UV_NO_PROGRESS=1 \
+    PYTHONUNBUFFERED=1 \
+    DOCKER_CONTAINER=1
+
+RUN useradd -m -u 1000 bedrock_agentcore
+
+COPY pyproject.toml uv.lock ./
+RUN uv sync --frozen --no-dev --no-install-project
+
+COPY --chown=bedrock_agentcore:bedrock_agentcore . .
+RUN uv sync --frozen --no-dev
+
+USER bedrock_agentcore
+
+# AgentCore Runtime service contract ports
+# https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/runtime-service-contract.html
+# 8080: HTTP Mode
+# 8000: MCP Mode
+# 9000: A2A Mode
+EXPOSE 8080 8000 9000
+
+CMD ["opentelemetry-instrument", "python", "-m", "{{entrypoint}}"]

package/dist/assets/container/python/dockerignore.template

@@ -0,0 +1,27 @@
+# Python
+__pycache__/
+*.py[cod]
+*.egg-info/
+.venv/
+dist/
+build/
+
+# IDE
+.vscode/
+.idea/
+
+# Testing
+.pytest_cache/
+.coverage
+htmlcov/
+
+# Secrets and environment files
+.env
+.env.*
+
+# Version control
+.git/
+
+# AgentCore build artifacts
+.agentcore/artifacts/
+*.zip

package/dist/assets/python/autogen/base/README.md

@@ -2,25 +2,23 @@ This is a project generated by the agentcore create CLI tool!
 
 # Layout
 
-There is one directory with generated application code, `src/` . At the root, there is a `.gitignore` file, a
-`.agentcore` folder which represents the configurations and state associated with this project. Other `agentcore`
+The generated application code lives at the agent root directory. At the root, there is a `.gitignore` file, an
+`agentcore/` folder which represents the configurations and state associated with this project. Other `agentcore`
 commands like `deploy`, `dev`, and `invoke` rely on the configuration stored here.
 
-## src/
+## Agent Root
 
-The main entrypoint to your app is defined in `src/main.py`. Using the AgentCore SDK `@app.entrypoint` decorator, this
+The main entrypoint to your app is defined in `main.py`. Using the AgentCore SDK `@app.entrypoint` decorator, this
 file defines a Starlette ASGI app with the AutoGen framework running within.
 
-`src/model/load.py` instantiates your chosen model provider.
+`model/load.py` instantiates your chosen model provider.
 
 ## Environment Variables
 
-| Variable                       | Required        | Description                                                      |
-| ------------------------------ | --------------- | ---------------------------------------------------------------- |
-| `AGENTCORE_IDENTITY_OPENAI`    | Yes (OpenAI)    | OpenAI API key (local) or Identity provider name (deployed)      |
-| `AGENTCORE_IDENTITY_ANTHROPIC` | Yes (Anthropic) | Anthropic API key (local) or Identity provider name (deployed)   |
-| `AGENTCORE_IDENTITY_GEMINI`    | Yes (Gemini)    | Gemini API key (local) or Identity provider name (deployed)      |
-| `LOCAL_DEV`                    | No              | Set to `1` to use `agentcore/.env` instead of AgentCore Identity |
+| Variable | Required | Description |
+| --- | --- | --- |
+{{#if hasIdentity}}| `{{identityProviders.[0].envVarName}}` | Yes | {{modelProvider}} API key (local) or Identity provider name (deployed) |
+{{/if}}| `LOCAL_DEV` | No | Set to `1` to use `.env.local` instead of AgentCore Identity |
 
 # Developing locally
 

package/dist/assets/python/autogen/base/gitignore.template

@@ -24,6 +24,7 @@ wheels/
 *.egg
 
 # Virtual environments
+.venv/
 venv/
 ENV/
 env/

package/dist/assets/python/autogen/base/mcp_client/__init__.py

@@ -0,0 +1 @@
+# Package marker

package/dist/assets/python/autogen/base/model/__init__.py

@@ -0,0 +1 @@
+# Package marker

package/dist/assets/python/autogen/base/pyproject.toml

@@ -15,7 +15,6 @@ dependencies = [
     "opentelemetry-exporter-otlp",
     "bedrock-agentcore >= 1.0.3",
     "botocore[crt] >= 1.35.0",
-    "python-dotenv >= 1.0.1",
     "tiktoken",
 {{#if (eq modelProvider "Bedrock")}}
     "autogen-ext[anthropic] >= 0.7.5",

package/dist/assets/python/crewai/base/README.md

@@ -2,25 +2,23 @@ This is a project generated by the agentcore create CLI tool!
 
 # Layout
 
-There is one directory with generated application code, `src/` . At the root, there is a `.gitignore` file, a
-`.agentcore` folder which represents the configurations and state associated with this project. Other `agentcore`
+The generated application code lives at the agent root directory. At the root, there is a `.gitignore` file, an
+`agentcore/` folder which represents the configurations and state associated with this project. Other `agentcore`
 commands like `deploy`, `dev`, and `invoke` rely on the configuration stored here.
 
-## src/
+## Agent Root
 
-The main entrypoint to your app is defined in `src/main.py`. Using the AgentCore SDK `@app.entrypoint` decorator, this
+The main entrypoint to your app is defined in `main.py`. Using the AgentCore SDK `@app.entrypoint` decorator, this
 file defines a Starlette ASGI app with the CrewAI framework running within.
 
-`src/model/load.py` instantiates your chosen model provider.
+`model/load.py` instantiates your chosen model provider.
 
 ## Environment Variables
 
-| Variable                       | Required        | Description                                                      |
-| ------------------------------ | --------------- | ---------------------------------------------------------------- |
-| `AGENTCORE_IDENTITY_OPENAI`    | Yes (OpenAI)    | OpenAI API key (local) or Identity provider name (deployed)      |
-| `AGENTCORE_IDENTITY_ANTHROPIC` | Yes (Anthropic) | Anthropic API key (local) or Identity provider name (deployed)   |
-| `AGENTCORE_IDENTITY_GEMINI`    | Yes (Gemini)    | Gemini API key (local) or Identity provider name (deployed)      |
-| `LOCAL_DEV`                    | No              | Set to `1` to use `agentcore/.env` instead of AgentCore Identity |
+| Variable | Required | Description |
+| --- | --- | --- |
+{{#if hasIdentity}}| `{{identityProviders.[0].envVarName}}` | Yes | {{modelProvider}} API key (local) or Identity provider name (deployed) |
+{{/if}}| `LOCAL_DEV` | No | Set to `1` to use `.env.local` instead of AgentCore Identity |
 
 # Developing locally
 

package/dist/assets/python/crewai/base/gitignore.template

@@ -24,6 +24,7 @@ wheels/
 *.egg
 
 # Virtual environments
+.venv/
 venv/
 ENV/
 env/

package/dist/assets/python/crewai/base/model/__init__.py

@@ -0,0 +1 @@
+# Package marker

package/dist/assets/python/crewai/base/model/load.py

@@ -87,7 +87,7 @@ def load_model() -> LLM:
     # CrewAI requires OPENAI_API_KEY env var (ignores api_key parameter)
     os.environ["OPENAI_API_KEY"] = api_key
     return LLM(
-        model="openai/gpt-4o",
+        model="openai/gpt-4.1",
         api_key=api_key
     )
 {{/if}}
@@ -127,7 +127,7 @@ def load_model() -> LLM:
     # CrewAI requires GEMINI_API_KEY env var (ignores api_key parameter)
     os.environ["GEMINI_API_KEY"] = api_key
     return LLM(
-        model="gemini/gemini-2.0-flash",
+        model="gemini/gemini-2.5-flash",
         api_key=api_key
     )
 {{/if}}

package/dist/assets/python/crewai/base/pyproject.toml

@@ -13,7 +13,6 @@ dependencies = [
     "opentelemetry-exporter-otlp",
     "bedrock-agentcore >= 1.0.3",
     "botocore[crt] >= 1.35.0",
-    "python-dotenv >= 1.0.1",
 {{#if (eq modelProvider "Bedrock")}}
     "crewai[tools,bedrock] >= 1.3.0",
 {{/if}}

package/dist/assets/python/googleadk/base/README.md

@@ -2,23 +2,23 @@ This is a project generated by the agentcore create CLI tool!
 
 # Layout
 
-There is one directory with generated application code, `src/` . At the root, there is a `.gitignore` file, a
-`.agentcore` folder which represents the configurations and state associated with this project. Other `agentcore`
+The generated application code lives at the agent root directory. At the root, there is a `.gitignore` file, an
+`agentcore/` folder which represents the configurations and state associated with this project. Other `agentcore`
 commands like `deploy`, `dev`, and `invoke` rely on the configuration stored here.
 
-## src/
+## Agent Root
 
-The main entrypoint to your app is defined in `src/main.py`. Using the AgentCore SDK `@app.entrypoint` decorator, this
+The main entrypoint to your app is defined in `main.py`. Using the AgentCore SDK `@app.entrypoint` decorator, this
 file defines a Starlette ASGI app with the Google ADK framework running within.
 
-`src/model/load.py` instantiates your chosen model provider (Gemini).
+`model/load.py` instantiates your chosen model provider (Gemini).
 
 ## Environment Variables
 
-| Variable                    | Required | Description                                                      |
-| --------------------------- | -------- | ---------------------------------------------------------------- |
-| `AGENTCORE_IDENTITY_GEMINI` | Yes      | Gemini API key (local) or Identity provider name (deployed)      |
-| `LOCAL_DEV`                 | No       | Set to `1` to use `agentcore/.env` instead of AgentCore Identity |
+| Variable | Required | Description |
+| --- | --- | --- |
+{{#if hasIdentity}}| `{{identityProviders.[0].envVarName}}` | Yes | {{modelProvider}} API key (local) or Identity provider name (deployed) |
+{{/if}}| `LOCAL_DEV` | No | Set to `1` to use `.env.local` instead of AgentCore Identity |
 
 # Developing locally
 

package/dist/assets/python/googleadk/base/gitignore.template

@@ -24,6 +24,7 @@ wheels/
 *.egg
 
 # Virtual environments
+.venv/
 venv/
 ENV/
 env/

package/dist/assets/python/googleadk/base/main.py

@@ -22,12 +22,18 @@ def add_numbers(a: int, b: int) -> int:
     return a + b
 
 
-# Set environment variables for model authentication
-load_model()
-
 # Get MCP Toolset
 mcp_toolset = [get_streamable_http_mcp_client()]
 
+_credentials_loaded = False
+
+def ensure_credentials_loaded():
+    global _credentials_loaded
+    if not _credentials_loaded:
+        load_model()
+        _credentials_loaded = True
+
+
 # Agent Definition
 agent = Agent(
     model=MODEL_ID,
@@ -40,6 +46,7 @@ agent = Agent(
 
 # Session and Runner
 async def setup_session_and_runner(user_id, session_id):
+    ensure_credentials_loaded()
     session_service = InMemorySessionService()
     session = await session_service.create_session(
         app_name=APP_NAME, user_id=user_id, session_id=session_id

package/dist/assets/python/googleadk/base/mcp_client/__init__.py

@@ -0,0 +1 @@
+# Package marker

package/dist/assets/python/googleadk/base/model/__init__.py

@@ -0,0 +1 @@
+# Package marker

package/dist/assets/python/googleadk/base/pyproject.toml

@@ -14,7 +14,6 @@ dependencies = [
     "google-adk >= 1.17.0",
     "bedrock-agentcore >= 1.0.3",
     "botocore[crt] >= 1.35.0",
-    "python-dotenv >= 1.0.1",
 ]
 
 [tool.hatch.build.targets.wheel]

package/dist/assets/python/langchain_langgraph/base/README.md

@@ -2,25 +2,23 @@ This is a project generated by the agentcore create CLI tool!
 
 # Layout
 
-There is one directory with generated application code, `src/` . At the root, there is a `.gitignore` file, a
-`.agentcore` folder which represents the configurations and state associated with this project. Other `agentcore`
+The generated application code lives at the agent root directory. At the root, there is a `.gitignore` file, an
+`agentcore/` folder which represents the configurations and state associated with this project. Other `agentcore`
 commands like `deploy`, `dev`, and `invoke` rely on the configuration stored here.
 
-## src/
+## Agent Root
 
-The main entrypoint to your app is defined in `src/main.py`. Using the AgentCore SDK `@app.entrypoint` decorator, this
+The main entrypoint to your app is defined in `main.py`. Using the AgentCore SDK `@app.entrypoint` decorator, this
 file defines a Starlette ASGI app with the LangChain/LangGraph framework running within.
 
-`src/model/load.py` instantiates your chosen model provider.
+`model/load.py` instantiates your chosen model provider.
 
 ## Environment Variables
 
-| Variable                       | Required        | Description                                                      |
-| ------------------------------ | --------------- | ---------------------------------------------------------------- |
-| `AGENTCORE_IDENTITY_OPENAI`    | Yes (OpenAI)    | OpenAI API key (local) or Identity provider name (deployed)      |
-| `AGENTCORE_IDENTITY_ANTHROPIC` | Yes (Anthropic) | Anthropic API key (local) or Identity provider name (deployed)   |
-| `AGENTCORE_IDENTITY_GEMINI`    | Yes (Gemini)    | Gemini API key (local) or Identity provider name (deployed)      |
-| `LOCAL_DEV`                    | No              | Set to `1` to use `agentcore/.env` instead of AgentCore Identity |
+| Variable | Required | Description |
+| --- | --- | --- |
+{{#if hasIdentity}}| `{{identityProviders.[0].envVarName}}` | Yes | {{modelProvider}} API key (local) or Identity provider name (deployed) |
+{{/if}}| `LOCAL_DEV` | No | Set to `1` to use `.env.local` instead of AgentCore Identity |
 
 # Developing locally
 

package/dist/assets/python/langchain_langgraph/base/gitignore.template

@@ -24,6 +24,7 @@ wheels/
 *.egg
 
 # Virtual environments
+.venv/
 venv/
 ENV/
 env/

package/dist/assets/python/langchain_langgraph/base/main.py

@@ -9,8 +9,13 @@ from mcp_client.client import get_streamable_http_mcp_client
 app = BedrockAgentCoreApp()
 log = app.logger
 
-# Instantiate model
-llm = load_model()
+_llm = None
+
+def get_or_create_model():
+    global _llm
+    if _llm is None:
+        _llm = load_model()
+    return _llm
 
 
 # Define a simple function tool
@@ -35,7 +40,7 @@ async def invoke(payload, context):
     mcp_tools = await mcp_client.get_tools()
 
     # Define the agent using create_react_agent
-    graph = create_react_agent(llm, tools=mcp_tools + tools)
+    graph = create_react_agent(get_or_create_model(), tools=mcp_tools + tools)
 
     # Process the user prompt
     prompt = payload.get("prompt", "What can you help me with?")

package/dist/assets/python/langchain_langgraph/base/mcp_client/__init__.py

@@ -0,0 +1 @@
+# Package marker

package/dist/assets/python/langchain_langgraph/base/model/__init__.py

@@ -0,0 +1 @@
+# Package marker

package/dist/assets/python/langchain_langgraph/base/model/load.py

@@ -80,7 +80,7 @@ def _get_api_key() -> str:
 def load_model() -> ChatOpenAI:
     """Get authenticated OpenAI model client."""
     return ChatOpenAI(
-        model="gpt-4o",
+        model="gpt-4.1",
         api_key=_get_api_key()
     )
 {{/if}}
@@ -117,7 +117,7 @@ def _get_api_key() -> str:
 def load_model() -> ChatGoogleGenerativeAI:
     """Get authenticated Gemini model client."""
     return ChatGoogleGenerativeAI(
-        model="gemini-2.0-flash",
+        model="gemini-2.5-flash",
         api_key=_get_api_key()
     )
 {{/if}}

package/dist/assets/python/langchain_langgraph/base/pyproject.toml

@@ -18,7 +18,6 @@ dependencies = [
     "tiktoken == 0.11.0",
     "bedrock-agentcore >= 1.0.3",
     "botocore[crt] >= 1.35.0",
-    "python-dotenv >= 1.0.1",
 {{#if (eq modelProvider "Bedrock")}}
     "langchain-aws >= 1.0.0",
 {{/if}}

package/dist/assets/python/openaiagents/base/README.md

@@ -2,23 +2,23 @@ This is a project generated by the agentcore create CLI tool!
 
 # Layout
 
-There is one directory with generated application code, `src/` . At the root, there is a `.gitignore` file, a
-`.agentcore` folder which represents the configurations and state associated with this project. Other `agentcore`
+The generated application code lives at the agent root directory. At the root, there is a `.gitignore` file, an
+`agentcore/` folder which represents the configurations and state associated with this project. Other `agentcore`
 commands like `deploy`, `dev`, and `invoke` rely on the configuration stored here.
 
-## src/
+## Agent Root
 
-The main entrypoint to your app is defined in `src/main.py`. Using the AgentCore SDK `@app.entrypoint` decorator, this
+The main entrypoint to your app is defined in `main.py`. Using the AgentCore SDK `@app.entrypoint` decorator, this
 file defines a Starlette ASGI app with the OpenAI Agents SDK framework running within.
 
-`src/model/load.py` instantiates your chosen model provider (OpenAI).
+`model/load.py` instantiates your chosen model provider (OpenAI).
 
 ## Environment Variables
 
-| Variable                    | Required | Description                                                      |
-| --------------------------- | -------- | ---------------------------------------------------------------- |
-| `AGENTCORE_IDENTITY_OPENAI` | Yes      | OpenAI API key (local) or Identity provider name (deployed)      |
-| `LOCAL_DEV`                 | No       | Set to `1` to use `agentcore/.env` instead of AgentCore Identity |
+| Variable | Required | Description |
+| --- | --- | --- |
+{{#if hasIdentity}}| `{{identityProviders.[0].envVarName}}` | Yes | {{modelProvider}} API key (local) or Identity provider name (deployed) |
+{{/if}}| `LOCAL_DEV` | No | Set to `1` to use `.env.local` instead of AgentCore Identity |
 
 # Developing locally
 

package/dist/assets/python/openaiagents/base/gitignore.template

@@ -24,6 +24,7 @@ wheels/
 *.egg
 
 # Virtual environments
+.venv/
 venv/
 ENV/
 env/

package/dist/assets/python/openaiagents/base/main.py

@@ -7,12 +7,17 @@ from mcp_client.client import get_streamable_http_mcp_client
 app = BedrockAgentCoreApp()
 log = app.logger
 
-# Set environment variables for model authentication
-load_model()
-
 # Get MCP Server
 mcp_server = get_streamable_http_mcp_client()
 
+_credentials_loaded = False
+
+def ensure_credentials_loaded():
+    global _credentials_loaded
+    if not _credentials_loaded:
+        load_model()
+        _credentials_loaded = True
+
 
 # Define a simple function tool
 @function_tool
@@ -23,13 +28,15 @@ def add_numbers(a: int, b: int) -> int:
 
 # Define the agent execution
 async def main(query):
+    ensure_credentials_loaded()
     try:
         async with mcp_server as server:
             active_servers = [server] if server else []
-            # Currently defaults to GPT-4.1
-            # https://openai.github.io/openai-agents-python/models/
             agent = Agent(
-                name="{{ name }}", mcp_servers=active_servers, tools=[add_numbers]
+                name="{{ name }}",
+                model="gpt-4.1",
+                mcp_servers=active_servers,
+                tools=[add_numbers]
             )
             result = await Runner.run(agent, query)
             return result

package/dist/assets/python/openaiagents/base/mcp_client/__init__.py

@@ -0,0 +1 @@
+# Package marker

package/dist/assets/python/openaiagents/base/model/__init__.py

@@ -0,0 +1 @@
+# Package marker

package/dist/assets/python/openaiagents/base/pyproject.toml

@@ -13,7 +13,6 @@ dependencies = [
     "openai-agents >= 0.4.2",
     "bedrock-agentcore >= 1.0.3",
     "botocore[crt] >= 1.35.0",
-    "python-dotenv >= 1.0.1",
 ]
 
 [tool.hatch.build.targets.wheel]

package/dist/assets/python/strands/base/README.md

@@ -2,25 +2,23 @@ This is a project generated by the agentcore create basic CLI tool!
 
 # Layout
 
-There is one directory with generated application code, `src/` . At the root, there is a `.gitignore` file, a
-`.agentcore` folder which represents the configurations and state associated with this project. Other `agentcore`
+The generated application code lives at the agent root directory. At the root, there is a `.gitignore` file, an
+`agentcore/` folder which represents the configurations and state associated with this project. Other `agentcore`
 commands like `deploy`, `dev`, and `invoke` rely on the configuration stored here.
 
-## src/
+## Agent Root
 
-The main entrypoint to your app is defined in `src/main.py`. Using the AgentCore SDK `@app.entrypoint` decorator, this
+The main entrypoint to your app is defined in `main.py`. Using the AgentCore SDK `@app.entrypoint` decorator, this
 file defines a Starlette ASGI app with the chosen Agent framework SDK running within.
 
-`src/model/load.py` instantiates your chosen model provider.
+`model/load.py` instantiates your chosen model provider.
 
 ## Environment Variables
 
-| Variable                       | Required        | Description                                                      |
-| ------------------------------ | --------------- | ---------------------------------------------------------------- |
-| `AGENTCORE_IDENTITY_OPENAI`    | Yes (OpenAI)    | OpenAI API key (local) or Identity provider name (deployed)      |
-| `AGENTCORE_IDENTITY_ANTHROPIC` | Yes (Anthropic) | Anthropic API key (local) or Identity provider name (deployed)   |
-| `AGENTCORE_IDENTITY_GEMINI`    | Yes (Gemini)    | Gemini API key (local) or Identity provider name (deployed)      |
-| `LOCAL_DEV`                    | No              | Set to `1` to use `agentcore/.env` instead of AgentCore Identity |
+| Variable | Required | Description |
+| --- | --- | --- |
+{{#if hasIdentity}}| `{{identityProviders.[0].envVarName}}` | Yes | {{modelProvider}} API key (local) or Identity provider name (deployed) |
+{{/if}}| `LOCAL_DEV` | No | Set to `1` to use `.env.local` instead of AgentCore Identity |
 
 # Developing locally
 

package/dist/assets/python/strands/base/gitignore.template

@@ -1,6 +1,5 @@
 # Environment variables
 .env
-.env
 
 # Python
 __pycache__/
@@ -25,6 +24,7 @@ wheels/
 *.egg
 
 # Virtual environments
+.venv/
 venv/
 ENV/
 env/

package/dist/assets/python/strands/base/main.py

@@ -42,14 +42,19 @@ def agent_factory():
     return get_or_create_agent
 get_or_create_agent = agent_factory()
 {{else}}
-# Create agent
-agent = Agent(
-    model=load_model(),
-    system_prompt="""
-        You are a helpful assistant. Use tools when appropriate.
-    """,
-    tools=tools+[mcp_client]
-)
+_agent = None
+
+def get_or_create_agent():
+    global _agent
+    if _agent is None:
+        _agent = Agent(
+            model=load_model(),
+            system_prompt="""
+                You are a helpful assistant. Use tools when appropriate.
+            """,
+            tools=tools+[mcp_client]
+        )
+    return _agent
 {{/if}}
 
 
@@ -61,8 +66,10 @@ async def invoke(payload, context):
     session_id = getattr(context, 'session_id', 'default-session')
     user_id = getattr(context, 'user_id', 'default-user')
     agent = get_or_create_agent(session_id, user_id)
-
+{{else}}
+    agent = get_or_create_agent()
 {{/if}}
+
     # Execute and format response
     stream = agent.stream_async(payload.get("prompt"))
 

package/dist/assets/python/strands/base/mcp_client/__init__.py

@@ -0,0 +1 @@
+# Package marker

package/dist/assets/python/strands/base/model/__init__.py

@@ -0,0 +1 @@
+# Package marker