@aws/agentcore 0.3.0-preview.2.0 → 0.3.0-preview.3.0

package/dist/assets/cdk/README.md

@@ -1,14 +1,26 @@
-# Welcome to your CDK TypeScript project
+# AgentCore CDK Project
 
-This is a blank project for CDK development with TypeScript.
+This CDK project is managed by the AgentCore CLI. It deploys your agent infrastructure into AWS using the `@aws/agentcore-cdk` L3 constructs.
 
-The `cdk.json` file tells the CDK Toolkit how to execute your app.
+## Structure
+
+- `bin/cdk.ts` — Entry point. Reads project configuration from `agentcore/` and creates a stack per deployment target.
+- `lib/cdk-stack.ts` — Defines `AgentCoreStack`, which wraps the `AgentCoreApplication` L3 construct.
+- `test/cdk.test.ts` — Unit tests for stack synthesis.
 
 ## Useful commands
 
-- `npm run build` compile typescript to js
-- `npm run watch` watch for changes and compile
-- `npm run test` perform the jest unit tests
+- `npm run build` compile TypeScript to JavaScript
+- `npm run test` run unit tests
+- `npx cdk synth` emit the synthesized CloudFormation template
 - `npx cdk deploy` deploy this stack to your default AWS account/region
 - `npx cdk diff` compare deployed stack with current state
-- `npx cdk synth` emits the synthesized CloudFormation template
+
+## Usage
+
+You typically don't need to interact with this directory directly. The AgentCore CLI handles synthesis and deployment:
+
+```bash
+agentcore deploy    # synthesizes and deploys via CDK
+agentcore status    # checks deployment status
+```

package/dist/assets/cdk/bin/cdk.ts

@@ -3,6 +3,7 @@ import { AgentCoreStack } from '../lib/cdk-stack';
 import { ConfigIO, type AwsDeploymentTarget } from '@aws/agentcore-cdk';
 import { App, type Environment } from 'aws-cdk-lib';
 import * as path from 'path';
+import * as fs from 'fs';
 
 function toEnvironment(target: AwsDeploymentTarget): Environment {
   return {
@@ -11,8 +12,12 @@ function toEnvironment(target: AwsDeploymentTarget): Environment {
   };
 }
 
+function sanitize(name: string): string {
+  return name.replace(/_/g, '-');
+}
+
 function toStackName(projectName: string, targetName: string): string {
-  return `AgentCore-${projectName}-${targetName}`;
+  return `AgentCore-${sanitize(projectName)}-${sanitize(targetName)}`;
 }
 
 async function main() {
@@ -23,6 +28,22 @@ async function main() {
   const spec = await configIO.readProjectSpec();
   const targets = await configIO.readAWSDeploymentTargets();
 
+  // Read MCP configuration if it exists
+  let mcpSpec;
+  try {
+    mcpSpec = await configIO.readMcpSpec();
+  } catch {
+    // MCP config is optional
+  }
+
+  // Read deployed state for credential ARNs (populated by pre-deploy identity setup)
+  let deployedState: Record<string, unknown> | undefined;
+  try {
+    deployedState = JSON.parse(fs.readFileSync(path.join(configRoot, '.cli', 'deployed-state.json'), 'utf8'));
+  } catch {
+    // Deployed state may not exist on first deploy
+  }
+
   if (targets.length === 0) {
     throw new Error('No deployment targets configured. Please define targets in agentcore/aws-targets.json');
   }
@@ -33,8 +54,19 @@ async function main() {
     const env = toEnvironment(target);
     const stackName = toStackName(spec.name, target.name);
 
+    // Extract credentials from deployed state for this target
+    const targetState = (deployedState as Record<string, unknown>)?.targets as
+      | Record<string, Record<string, unknown>>
+      | undefined;
+    const targetResources = targetState?.[target.name]?.resources as Record<string, unknown> | undefined;
+    const credentials = targetResources?.credentials as
+      | Record<string, { credentialProviderArn: string; clientSecretArn?: string }>
+      | undefined;
+
     new AgentCoreStack(app, stackName, {
       spec,
+      mcpSpec,
+      credentials,
       env,
       description: `AgentCore stack for ${spec.name} deployed to ${target.name} (${target.region})`,
       tags: {
@@ -47,4 +79,7 @@ async function main() {
   app.synth();
 }
 
-main();
+main().catch((error: unknown) => {
+  console.error('AgentCore CDK synthesis failed:', error instanceof Error ? error.message : error);
+  process.exitCode = 1;
+});

package/dist/assets/cdk/lib/cdk-stack.ts

@@ -1,4 +1,9 @@
-import { AgentCoreApplication, type AgentCoreProjectSpec } from '@aws/agentcore-cdk';
+import {
+  AgentCoreApplication,
+  AgentCoreMcp,
+  type AgentCoreProjectSpec,
+  type AgentCoreMcpSpec,
+} from '@aws/agentcore-cdk';
 import { CfnOutput, Stack, type StackProps } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 
@@ -7,6 +12,14 @@ export interface AgentCoreStackProps extends StackProps {
    * The AgentCore project specification containing agents, memories, and credentials.
    */
   spec: AgentCoreProjectSpec;
+  /**
+   * The MCP specification containing gateways and servers.
+   */
+  mcpSpec?: AgentCoreMcpSpec;
+  /**
+   * Credential provider ARNs from deployed state, keyed by credential name.
+   */
+  credentials?: Record<string, { credentialProviderArn: string; clientSecretArn?: string }>;
 }
 
 /**
@@ -22,13 +35,23 @@ export class AgentCoreStack extends Stack {
   constructor(scope: Construct, id: string, props: AgentCoreStackProps) {
     super(scope, id, props);
 
-    const { spec } = props;
+    const { spec, mcpSpec, credentials } = props;
 
     // Create AgentCoreApplication with all agents
     this.application = new AgentCoreApplication(this, 'Application', {
       spec,
     });
 
+    // Create AgentCoreMcp if there are gateways configured
+    if (mcpSpec?.agentCoreGateways && mcpSpec.agentCoreGateways.length > 0) {
+      new AgentCoreMcp(this, 'Mcp', {
+        projectName: spec.name,
+        mcpSpec,
+        agentCoreApplication: this.application,
+        credentials,
+      });
+    }
+
     // Stack-level output
     new CfnOutput(this, 'StackNameOutput', {
       description: 'Name of the CloudFormation Stack',

package/dist/assets/cdk/package.json

@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@aws/agentcore-cdk": "^0.1.0-alpha.1",
-    "aws-cdk-lib": "2.234.1",
+    "aws-cdk-lib": "2.239.0",
     "constructs": "^10.0.0"
   }
 }

package/dist/assets/cdk/test/cdk.test.ts

@@ -1,16 +1,20 @@
-// import * as cdk from 'aws-cdk-lib/core';
-// import { Template } from 'aws-cdk-lib/assertions';
-// import * as Cdk from '../lib/cdk-stack';
+import * as cdk from 'aws-cdk-lib';
+import { Template } from 'aws-cdk-lib/assertions';
+import { AgentCoreStack } from '../lib/cdk-stack';
 
-// example test. To run these tests, uncomment this file along with the
-// example resource in lib/cdk-stack.ts
-test('SQS Queue Created', () => {
-  //   const app = new cdk.App();
-  //     // WHEN
-  //   const stack = new Cdk.CdkStack(app, 'MyTestStack');
-  //     // THEN
-  //   const template = Template.fromStack(stack);
-  //   template.hasResourceProperties('AWS::SQS::Queue', {
-  //     VisibilityTimeout: 300
-  //   });
+test('AgentCoreStack synthesizes with empty spec', () => {
+  const app = new cdk.App();
+  const stack = new AgentCoreStack(app, 'TestStack', {
+    spec: {
+      name: 'testproject',
+      version: 1,
+      agents: [],
+      memories: [],
+      credentials: [],
+    },
+  });
+  const template = Template.fromStack(stack);
+  template.hasOutput('StackNameOutput', {
+    Description: 'Name of the CloudFormation Stack',
+  });
 });

package/dist/assets/cdk/tsconfig.json

@@ -10,14 +10,14 @@
     "strictNullChecks": true,
     "noImplicitThis": true,
     "alwaysStrict": true,
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
     "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": false,
+    "noFallthroughCasesInSwitch": true,
     "inlineSourceMap": true,
     "inlineSources": true,
     "experimentalDecorators": true,
-    "strictPropertyInitialization": false,
+    "strictPropertyInitialization": true,
     "skipLibCheck": true,
     "typeRoots": ["./node_modules/@types"],
     "rootDir": ".",

package/dist/assets/container/python/Dockerfile

@@ -1,24 +1,34 @@
 FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim
 
+ARG UV_DEFAULT_INDEX
+ARG UV_INDEX
+
 WORKDIR /app
 
 ENV UV_SYSTEM_PYTHON=1 \
     UV_COMPILE_BYTECODE=1 \
     UV_NO_PROGRESS=1 \
     PYTHONUNBUFFERED=1 \
-    DOCKER_CONTAINER=1
-
-COPY pyproject.toml uv.lock* ./
-RUN uv pip install -r pyproject.toml
+    DOCKER_CONTAINER=1 \
+    UV_DEFAULT_INDEX=${UV_DEFAULT_INDEX} \
+    UV_INDEX=${UV_INDEX} \
+    PATH="/app/.venv/bin:$PATH"
 
 RUN useradd -m -u 1000 bedrock_agentcore
-USER bedrock_agentcore
 
-COPY . .
+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
 
-# 8080: AgentCore runtime endpoint
-# 8000: Local dev server (uvicorn)
-# 9000: OpenTelemetry collector
+# 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

@@ -15,6 +15,13 @@ build/
 .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/mcp_client/__init__.py

@@ -1 +1 @@
-
+# Package marker

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

@@ -1 +1 @@
-
+# Package marker

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/model/__init__.py

@@ -1 +1 @@
-
+# Package marker

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/main.py

@@ -5,7 +5,11 @@ from google.adk.sessions import InMemorySessionService
 from google.genai import types
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
+{{#if hasGateway}}
+from mcp_client.client import get_all_gateway_mcp_toolsets
+{{else}}
 from mcp_client.client import get_streamable_http_mcp_client
+{{/if}}
 
 app = BedrockAgentCoreApp()
 log = app.logger
@@ -23,7 +27,12 @@ def add_numbers(a: int, b: int) -> int:
 
 
 # Get MCP Toolset
-mcp_toolset = [get_streamable_http_mcp_client()]
+{{#if hasGateway}}
+mcp_toolset = get_all_gateway_mcp_toolsets()
+{{else}}
+mcp_client = get_streamable_http_mcp_client()
+mcp_toolset = [mcp_client] if mcp_client else []
+{{/if}}
 
 _credentials_loaded = False
 

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

@@ -1 +1 @@
-
+# Package marker

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

@@ -1,15 +1,66 @@
+import os
+import logging
 from google.adk.tools.mcp_tool.mcp_toolset import MCPToolset
 from google.adk.tools.mcp_tool.mcp_session_manager import StreamableHTTPConnectionParams
 
+logger = logging.getLogger(__name__)
+
+{{#if hasGateway}}
+{{#if (includes gatewayAuthTypes "AWS_IAM")}}
+import httpx
+from mcp_proxy_for_aws.sigv4_helper import SigV4HTTPXAuth, create_aws_session
+{{/if}}
+{{#if (includes gatewayAuthTypes "CUSTOM_JWT")}}
+from bedrock_agentcore.identity import requires_access_token
+{{/if}}
+
+{{#each gatewayProviders}}
+{{#if (eq authType "CUSTOM_JWT")}}
+@requires_access_token(
+    provider_name="{{credentialProviderName}}",
+    scopes=[{{#if scopes}}"{{scopes}}"{{/if}}],
+    auth_flow="M2M",
+)
+def _get_bearer_token_{{snakeCase name}}(*, access_token: str):
+    """Obtain OAuth access token via AgentCore Identity for {{name}}."""
+    return access_token
+
+{{/if}}
+{{/each}}
+
+def get_all_gateway_mcp_toolsets() -> list[MCPToolset]:
+    """Returns MCP Toolsets for all configured gateways."""
+    toolsets = []
+    {{#each gatewayProviders}}
+    url = os.environ.get("{{envVarName}}")
+    if url:
+        {{#if (eq authType "AWS_IAM")}}
+        session = create_aws_session()
+        auth = SigV4HTTPXAuth(session.get_credentials(), "bedrock-agentcore", session.region_name)
+        toolsets.append(MCPToolset(connection_params=StreamableHTTPConnectionParams(
+            url=url,
+            httpx_client_factory=lambda **kwargs: httpx.AsyncClient(auth=auth, **kwargs)
+        )))
+        {{else if (eq authType "CUSTOM_JWT")}}
+        token = _get_bearer_token_{{snakeCase name}}()
+        headers = {"Authorization": f"Bearer {token}"} if token else None
+        toolsets.append(MCPToolset(connection_params=StreamableHTTPConnectionParams(url=url, headers=headers)))
+        {{else}}
+        toolsets.append(MCPToolset(connection_params=StreamableHTTPConnectionParams(url=url)))
+        {{/if}}
+    else:
+        logger.warning("{{envVarName}} not set — {{name}} gateway tools unavailable")
+    {{/each}}
+    return toolsets
+{{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"
 
 
 def get_streamable_http_mcp_client() -> MCPToolset:
-    """
-    Returns an MCP Toolset compatible with Google ADK.
-    """
+    """Returns an MCP Toolset compatible with Google ADK."""
     # to use an MCP server that supports bearer authentication, add headers={"Authorization": f"Bearer {access_token}"}
     return MCPToolset(
         connection_params=StreamableHTTPConnectionParams(url=EXAMPLE_MCP_ENDPOINT)
     )
+{{/if}}

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

@@ -1 +1 @@
-
+# Package marker

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

@@ -14,6 +14,8 @@ dependencies = [
     "google-adk >= 1.17.0",
     "bedrock-agentcore >= 1.0.3",
     "botocore[crt] >= 1.35.0",
+    {{#if hasGateway}}{{#if (includes gatewayAuthTypes "AWS_IAM")}}"mcp-proxy-for-aws >= 1.1.0",
+    {{/if}}{{/if}}
 ]
 
 [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/main.py

@@ -4,7 +4,11 @@ from langgraph.prebuilt import create_react_agent
 from langchain.tools import tool
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
+{{#if hasGateway}}
+from mcp_client.client import get_all_gateway_mcp_client
+{{else}}
 from mcp_client.client import get_streamable_http_mcp_client
+{{/if}}
 
 app = BedrockAgentCoreApp()
 log = app.logger
@@ -34,10 +38,16 @@ async def invoke(payload, context):
     log.info("Invoking Agent.....")
 
     # Get MCP Client
+    {{#if hasGateway}}
+    mcp_client = get_all_gateway_mcp_client()
+    {{else}}
     mcp_client = get_streamable_http_mcp_client()
+    {{/if}}
 
     # Load MCP Tools
-    mcp_tools = await mcp_client.get_tools()
+    mcp_tools = []
+    if mcp_client:
+        mcp_tools = await mcp_client.get_tools()
 
     # Define the agent using create_react_agent
     graph = create_react_agent(get_or_create_model(), tools=mcp_tools + tools)

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

@@ -1 +1 @@
-
+# Package marker