@aws/nx-plugin 0.97.1 → 0.99.0

package/src/utils/agent-connection/agent-connection.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AGENT_CONNECTION_PROJECT_DIR = void 0;
+exports.PY_CORE_TEMPLATES = exports.TS_CORE_TEMPLATES = exports.AGENT_CONNECTION_PROJECT_DIR = void 0;
 exports.getPythonAgentConnectionProjectDir = getPythonAgentConnectionProjectDir;
 exports.getPythonAgentConnectionModuleName = getPythonAgentConnectionModuleName;
 exports.getPythonAgentConnectionPackageName = getPythonAgentConnectionPackageName;
 exports.ensureTypeScriptAgentConnectionProject = ensureTypeScriptAgentConnectionProject;
+exports.addTypeScriptCoreClient = addTypeScriptCoreClient;
 exports.ensurePythonAgentConnectionProject = ensurePythonAgentConnectionProject;
+exports.addPythonCoreClient = addPythonCoreClient;
 exports.addPythonReExport = addPythonReExport;
 const tslib_1 = require("tslib");
 /**
@@ -55,50 +57,65 @@ function getPythonAgentConnectionPackageName(tree) {
     return fullyQualifiedName;
 }
 /**
- * Ensure the shared TypeScript agent-connection project exists.
- * Creates the project with the core AgentCoreMcpClient if it doesn't exist.
+ * Directories (relative to this file) holding per-protocol core client
+ * template files. Per-connection generators select which set to emit so
+ * the MCP connection doesn't pull in the A2A client (or vice versa).
+ */
+exports.TS_CORE_TEMPLATES = {
+    mcp: 'core-mcp',
+    a2a: 'core-a2a',
+};
+exports.PY_CORE_TEMPLATES = {
+    mcp: 'py-core-mcp',
+    a2a: 'py-core-a2a',
+    /** Shared SigV4 `httpx.Auth` used by both MCP and A2A clients. */
+    auth: 'py-core-auth',
+};
+/**
+ * Ensure the shared TypeScript agent-connection project exists and has the
+ * shared core helpers (runtime-config loader). Per-connection generators
+ * are responsible for emitting their own per-protocol core client templates.
  */
 async function ensureTypeScriptAgentConnectionProject(tree) {
     const projectJsonPath = (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'project.json');
-    if (tree.exists(projectJsonPath)) {
-        return; // Already exists
+    if (!tree.exists(projectJsonPath)) {
+        await (0, generator_1.default)(tree, {
+            name: AGENT_CONNECTION_DIR,
+            directory: (0, devkit_1.joinPathFragments)(PACKAGES_DIR, COMMON_DIR),
+        });
     }
-    // Create the TS project
-    await (0, generator_1.default)(tree, {
-        name: AGENT_CONNECTION_DIR,
-        directory: (0, devkit_1.joinPathFragments)(PACKAGES_DIR, COMMON_DIR),
-    });
-    // Generate the core files (agentcore-mcp-client.ts)
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'core'), (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'src', 'core'), {}, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    // Shared core helpers — emitted regardless of which per-protocol core
+    // client the caller needs, so both MCP and A2A clients can import from them.
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'core-runtime-config'), (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'src', 'core'), {}, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+}
+/**
+ * Emit one of the TypeScript core client templates (mcp or a2a) into the
+ * agent-connection project's `src/core/` directory. Safe to call multiple
+ * times — `KeepExisting` preserves customised files.
+ */
+function addTypeScriptCoreClient(tree, kind) {
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', exports.TS_CORE_TEMPLATES[kind]), (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'src', 'core'), {}, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
 }
 /**
  * Ensure the shared Python agent-connection project exists.
- * Creates the project with the core AgentCoreMCPClient if it doesn't exist.
+ * Only creates the project shell — per-connection generators are responsible
+ * for emitting their own core client templates.
  */
 async function ensurePythonAgentConnectionProject(tree) {
     const projectDir = getPythonAgentConnectionProjectDir(tree);
     const moduleName = getPythonAgentConnectionModuleName(tree);
     const projectJsonPath = (0, devkit_1.joinPathFragments)(projectDir, 'project.json');
-    if (tree.exists(projectJsonPath)) {
-        return; // Already exists
+    if (!tree.exists(projectJsonPath)) {
+        // Create the Python project using the standard py#project generator
+        await (0, generator_2.default)(tree, {
+            name: PY_AGENT_CONNECTION_NAME,
+            directory: (0, devkit_1.joinPathFragments)(PACKAGES_DIR, COMMON_DIR),
+            projectType: 'library',
+        });
     }
-    // Create the Python project using the standard py#project generator
-    await (0, generator_2.default)(tree, {
-        name: PY_AGENT_CONNECTION_NAME,
-        directory: (0, devkit_1.joinPathFragments)(PACKAGES_DIR, COMMON_DIR),
-        projectType: 'library',
-    });
-    // Add dependencies needed by the core agentcore_mcp_client
-    (0, py_1.addDependenciesToPyProjectToml)(tree, projectDir, [
-        'boto3',
-        'mcp',
-        'strands-agents',
-    ]);
     const moduleDir = (0, devkit_1.joinPathFragments)(projectDir, moduleName);
-    // Generate the core files (agentcore_mcp_client.py)
-    const coreDir = (0, devkit_1.joinPathFragments)(moduleDir, 'core');
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'py-core'), coreDir, {}, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
     // Ensure core/__init__.py exists
+    const coreDir = (0, devkit_1.joinPathFragments)(moduleDir, 'core');
     if (!tree.exists((0, devkit_1.joinPathFragments)(coreDir, '__init__.py'))) {
         tree.write((0, devkit_1.joinPathFragments)(coreDir, '__init__.py'), '');
     }
@@ -107,6 +124,21 @@ async function ensurePythonAgentConnectionProject(tree) {
     if (!tree.exists(appInitPath)) {
         tree.write(appInitPath, '');
     }
+    // Shared core helpers — emitted regardless of which per-protocol core
+    // client the caller needs, so both MCP and A2A clients can import them.
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'py-core-runtime-config'), coreDir, {}, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    // Shared core helpers depend on aws-lambda-powertools for AppConfig access.
+    (0, py_1.addDependenciesToPyProjectToml)(tree, projectDir, ['aws-lambda-powertools']);
+}
+/**
+ * Emit a Python core client template (mcp / a2a / shared auth) into the
+ * agent-connection project's core directory.
+ */
+function addPythonCoreClient(tree, kind) {
+    const projectDir = getPythonAgentConnectionProjectDir(tree);
+    const moduleName = getPythonAgentConnectionModuleName(tree);
+    const coreDir = (0, devkit_1.joinPathFragments)(projectDir, moduleName, 'core');
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', exports.PY_CORE_TEMPLATES[kind]), coreDir, {}, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
 }
 /**
  * Add a re-export to the Python agent-connection module's __init__.py.

package/src/utils/agent-connection/agent-connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-connection.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/agent-connection/agent-connection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-connection.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/agent-connection/agent-connection.ts"],"names":[],"mappings":"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"}

package/src/utils/agent-connection/files/core-a2a/agentcore-a2a-client.ts.template

@@ -0,0 +1,134 @@
+import {
+  ClientFactory,
+  ClientFactoryOptions,
+  DefaultAgentCardResolver,
+  JsonRpcTransportFactory,
+} from '@a2a-js/sdk/client';
+import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
+import { A2AAgent } from '@strands-agents/sdk/a2a';
+import { AwsClient } from 'aws4fetch';
+
+/**
+ * Common options for creating an AgentCore A2A client
+ */
+export interface AgentCoreA2aClientOptions {
+  /**
+   * The ARN of the Bedrock AgentCore Runtime to connect to
+   */
+  agentRuntimeArn: string;
+  /**
+   * Session ID to include in request headers.
+   */
+  sessionId?: string;
+  /**
+   * Optional description for the remote agent.
+   */
+  description?: string;
+  /**
+   * Optional friendly name for the remote agent.
+   */
+  name?: string;
+}
+
+/**
+ * Options for creating an AgentCore A2A client with IAM authentication
+ */
+export interface AgentCoreA2aClientIamOptions
+  extends AgentCoreA2aClientOptions {
+  /**
+   * Optional AWS credential provider. If not provided, uses the default
+   * credential provider chain from the AWS SDK.
+   */
+  credentialProvider?: ReturnType<typeof fromNodeProviderChain>;
+}
+
+/**
+ * Options for creating an AgentCore A2A client with JWT authentication
+ */
+export interface AgentCoreA2aClientJwtOptions
+  extends AgentCoreA2aClientOptions {
+  /**
+   * A function which returns the JWT access token used to authenticate
+   */
+  accessTokenProvider: () => Promise<string>;
+}
+
+/**
+ * Factory for clients to call A2A agents hosted on Bedrock AgentCore Runtime
+ */
+export class AgentCoreA2aClient {
+  /**
+   * Construct the A2A invocations URL for an AgentCore runtime ARN and extract the region.
+   * ARN format: arn:partition:service:region:account-id:resource
+   * A2A on AgentCore is mounted at `/invocations/` (trailing slash matters).
+   */
+  private static buildUrl(agentRuntimeArn: string): {
+    region: string;
+    url: string;
+  } {
+    const region = agentRuntimeArn.split(':')[3];
+    const url = `https://bedrock-agentcore.${region}.amazonaws.com/runtimes/${encodeURIComponent(agentRuntimeArn)}/invocations/`;
+    return { region, url };
+  }
+
+  /**
+   * Build a Strands `A2AAgent` for a URL plus a fetch that is already
+   * authenticated (SigV4-signing or Bearer-adding).
+   */
+  private static build(
+    url: string,
+    authFetch: typeof fetch,
+    options: Pick<AgentCoreA2aClientOptions, 'name' | 'description'>,
+  ): A2AAgent {
+    const clientFactory = new ClientFactory({
+      ...ClientFactoryOptions.default,
+      transports: [new JsonRpcTransportFactory({ fetchImpl: authFetch })],
+      cardResolver: new DefaultAgentCardResolver({ fetchImpl: authFetch }),
+    });
+
+    return new A2AAgent({
+      url,
+      clientFactory,
+      ...(options.name ? { name: options.name } : {}),
+      ...(options.description ? { description: options.description } : {}),
+    });
+  }
+
+  /**
+   * Create an `A2AAgent` with IAM (SigV4) authentication.
+   */
+  static withIamAuth(options: AgentCoreA2aClientIamOptions): A2AAgent {
+    const credentialProvider =
+      options.credentialProvider ?? fromNodeProviderChain();
+    const { region, url } = AgentCoreA2aClient.buildUrl(options.agentRuntimeArn);
+
+    const sigv4Fetch: typeof fetch = async (...args) => {
+      const credentials = await credentialProvider();
+      const client = new AwsClient({
+        ...credentials,
+        service: 'bedrock-agentcore',
+        region,
+      });
+      return client.fetch(...args);
+    };
+
+    return AgentCoreA2aClient.build(url, sigv4Fetch, options);
+  }
+
+  /**
+   * Create an `A2AAgent` with JWT authentication.
+   */
+  static withJwtAuth(options: AgentCoreA2aClientJwtOptions): A2AAgent {
+    const { accessTokenProvider } = options;
+    const { url } = AgentCoreA2aClient.buildUrl(options.agentRuntimeArn);
+
+    const bearerFetch: typeof fetch = async (input, init) => {
+      const token = await accessTokenProvider();
+      const headers = new Headers(init?.headers);
+      headers.set('Authorization', `Bearer ${token}`);
+      return fetch(input, { ...init, headers });
+    };
+
+    return AgentCoreA2aClient.build(url, bearerFetch, options);
+  }
+}

package/src/utils/agent-connection/files/{core → core-mcp}/agentcore-mcp-client.ts.template

@@ -76,33 +76,18 @@ export class AgentCoreMcpClient {
     const {
       url,
       sessionId = randomUUID(),
-      buildHeaders = async () => ({}),
+      buildHeaders = async (): Promise<Record<string, string>> => ({}),
       fetch: customFetch,
     } = options;
 
     // Create a custom fetch that adds required headers
     const fetchWithHeaders: typeof fetch = async (input, init) => {
-      const headers = {
-        'X-Amzn-Bedrock-AgentCore-Runtime-Session-Id': sessionId,
-        ...(await buildHeaders()),
-      };
-      const existingHeaders = init?.headers;
-
-      const mergedInit = {
-        ...init,
-        headers: !existingHeaders
-          ? headers
-          : existingHeaders instanceof Headers
-            ? (() => {
-                const h = new Headers(existingHeaders);
-                Object.entries(headers).forEach(([k, v]) => h.append(k, v));
-                return h;
-              })()
-            : Array.isArray(existingHeaders)
-              ? [...existingHeaders, ...Object.entries(headers)]
-              : { ...existingHeaders, ...headers },
-      };
-      return (customFetch || fetch)(input, mergedInit);
+      const headers = new Headers(init?.headers);
+      headers.set('X-Amzn-Bedrock-AgentCore-Runtime-Session-Id', sessionId);
+      for (const [k, v] of Object.entries(await buildHeaders())) {
+        headers.set(k, v);
+      }
+      return (customFetch || fetch)(input, { ...init, headers });
     };
 
     // Create the transport

package/src/utils/agent-connection/files/core-runtime-config/runtime-config.ts.template

@@ -0,0 +1,40 @@
+import { getAppConfig } from '@aws-lambda-powertools/parameters/appconfig';
+
+/**
+ * Read the runtime-config `agentcore` namespace from AppConfig.
+ * `RUNTIME_CONFIG_APP_ID` is set on the AgentCore runtime by the generated
+ * CDK/Terraform construct for this project.
+ */
+const getAgentCoreRuntimeConfig = async (): Promise<{
+  agentRuntimes?: Record<string, string>;
+}> => {
+  const application = process.env.RUNTIME_CONFIG_APP_ID;
+  if (!application) {
+    throw new Error(
+      'RUNTIME_CONFIG_APP_ID is not set — cannot resolve connected agent ARNs from AppConfig.',
+    );
+  }
+  return (await getAppConfig('agentcore', {
+    application,
+    environment: 'default',
+    transform: 'json',
+  })) as { agentRuntimes?: Record<string, string> };
+};
+
+/**
+ * Resolve the AgentCore runtime ARN for a connected agent or MCP server
+ * from this project's runtime configuration. `name` must match the class
+ * name of the target construct (e.g. `MyAgent`, `InventoryMcpServer`).
+ */
+export const getConnectedAgentRuntimeArn = async (
+  name: string,
+): Promise<string> => {
+  const config = await getAgentCoreRuntimeConfig();
+  const arn = config.agentRuntimes?.[name];
+  if (!arn) {
+    throw new Error(
+      `No connected agent runtime named '${name}' found in runtime configuration.`,
+    );
+  }
+  return arn;
+};

package/src/utils/agent-connection/files/py-core-a2a/agentcore_a2a_client.py.template

@@ -0,0 +1,91 @@
+from collections.abc import Callable
+from urllib.parse import quote
+
+import boto3
+import httpx
+from a2a.client import ClientConfig
+from strands.agent.a2a_agent import A2AAgent
+
+from .auth import SigV4HTTPXAuth
+
+
+class AgentCoreA2aClient:
+    """Factory for clients to call A2A agents hosted on Bedrock AgentCore Runtime."""
+
+    @staticmethod
+    def _build_url(agent_runtime_arn: str) -> tuple[str, str]:
+        """Extract region from ARN and construct the A2A invocations URL.
+
+        ARN format: arn:partition:service:region:account-id:resource
+        A2A on AgentCore is mounted at `/invocations/` (trailing slash matters).
+        """
+        region = agent_runtime_arn.split(":")[3]
+        encoded_arn = quote(agent_runtime_arn, safe="")
+        url = f"https://bedrock-agentcore.{region}.amazonaws.com/runtimes/{encoded_arn}/invocations/"
+        return region, url
+
+    @staticmethod
+    def _build(
+        url: str,
+        auth: httpx.Auth | None,
+        headers: dict | None,
+        *,
+        name: str | None,
+        description: str | None,
+    ) -> A2AAgent:
+        httpx_client = httpx.AsyncClient(
+            auth=auth,
+            headers=headers or {},
+            timeout=120,
+        )
+        client_config = ClientConfig(httpx_client=httpx_client, streaming=False)
+        kwargs: dict = {"endpoint": url, "client_config": client_config}
+        if name:
+            kwargs["name"] = name
+        if description:
+            kwargs["description"] = description
+        return A2AAgent(**kwargs)
+
+    @staticmethod
+    def with_iam_auth(
+        agent_runtime_arn: str,
+        *,
+        name: str | None = None,
+        description: str | None = None,
+        session_id: str | None = None,
+    ) -> A2AAgent:
+        """Create an `A2AAgent` with IAM (SigV4) authentication."""
+        region, url = AgentCoreA2aClient._build_url(agent_runtime_arn)
+        credentials = boto3.Session(region_name=region).get_credentials()
+        headers = {}
+        if session_id:
+            headers["X-Amzn-Bedrock-AgentCore-Runtime-Session-Id"] = session_id
+        return AgentCoreA2aClient._build(
+            url,
+            SigV4HTTPXAuth(credentials, "bedrock-agentcore", region),
+            headers,
+            name=name,
+            description=description,
+        )
+
+    @staticmethod
+    def with_jwt_auth(
+        agent_runtime_arn: str,
+        access_token_provider: Callable[[], str],
+        *,
+        name: str | None = None,
+        description: str | None = None,
+        session_id: str | None = None,
+    ) -> A2AAgent:
+        """Create an `A2AAgent` with JWT Bearer authentication."""
+        _, url = AgentCoreA2aClient._build_url(agent_runtime_arn)
+        headers = {"Authorization": f"Bearer {access_token_provider()}"}
+        if session_id:
+            headers["X-Amzn-Bedrock-AgentCore-Runtime-Session-Id"] = session_id
+        return AgentCoreA2aClient._build(
+            url,
+            None,
+            headers,
+            name=name,
+            description=description,
+        )

package/src/utils/agent-connection/files/py-core-auth/auth/__init__.py.template

@@ -0,0 +1,3 @@
+from .sigv4 import SigV4HTTPXAuth
+
+__all__ = ["SigV4HTTPXAuth"]

package/src/utils/agent-connection/files/py-core-auth/auth/sigv4.py.template

@@ -0,0 +1,48 @@
+import hashlib
+from collections.abc import Generator
+from typing import Any
+
+import httpx
+from botocore.auth import SigV4Auth
+from botocore.awsrequest import AWSRequest
+
+
+class SigV4HTTPXAuth(httpx.Auth):
+    """HTTPX Auth class that signs requests with AWS SigV4.
+
+    The target AWS service (e.g. ``bedrock-agentcore``) is passed as a
+    parameter so the same auth class can be reused across different
+    AgentCore resource types (A2A agents, MCP servers, etc.).
+    """
+
+    requires_request_body = True
+
+    def __init__(self, credentials: Any, service: str, region: str):
+        self.credentials = credentials
+        self.service = service
+        self.region = region
+        self.signer = SigV4Auth(credentials, service, region)
+
+    def auth_flow(
+        self, request: httpx.Request
+    ) -> Generator[httpx.Request, httpx.Response, None]:
+        headers = dict(request.headers)
+
+        headers.pop("connection", None)
+        headers["x-amz-content-sha256"] = hashlib.sha256(
+            request.content if request.content else b""
+        ).hexdigest()
+
+        aws_request = AWSRequest(
+            method=request.method,
+            url=str(request.url),
+            data=request.content,
+            headers=headers,
+        )
+
+        self.signer.add_auth(aws_request)
+
+        request.headers.clear()
+        request.headers.update(dict(aws_request.headers))
+
+        yield request

package/src/utils/agent-connection/files/{py-core → py-core-mcp}/agentcore_mcp_client.py.template

@@ -1,43 +1,9 @@
-import hashlib
-from collections.abc import Generator
-from typing import Any
-
 import boto3
 import httpx
-from botocore.auth import SigV4Auth
-from botocore.awsrequest import AWSRequest
 from mcp.client.streamable_http import streamablehttp_client
 from strands.tools.mcp.mcp_client import MCPClient
 
-
-class SigV4HTTPXAuth(httpx.Auth):
-    """HTTPX Auth class that signs requests with AWS SigV4."""
-
-    def __init__(self, credentials: Any, region: str):
-        self.credentials = credentials
-        self.service = "bedrock-agentcore"
-        self.region = region
-        self.signer = SigV4Auth(credentials, self.service, region)
-
-    def auth_flow(self, request: httpx.Request) -> Generator[httpx.Request, httpx.Response, None]:
-        headers = dict(request.headers)
-
-        headers.pop("connection", None)
-        headers["x-amz-content-sha256"] = hashlib.sha256(request.content if request.content else b"").hexdigest()
-
-        aws_request = AWSRequest(
-            method=request.method,
-            url=str(request.url),
-            data=request.content,
-            headers=headers,
-        )
-
-        self.signer.add_auth(aws_request)
-
-        request.headers.clear()
-        request.headers.update(dict(aws_request.headers))
-
-        yield request
+from .auth import SigV4HTTPXAuth
 
 
 class AgentCoreMCPClient:
@@ -88,7 +54,7 @@ class AgentCoreMCPClient:
         return AgentCoreMCPClient._create(
             agent_runtime_arn=agent_runtime_arn,
             session_id=session_id,
-            auth_handler=SigV4HTTPXAuth(credentials, region),
+            auth_handler=SigV4HTTPXAuth(credentials, "bedrock-agentcore", region),
         )
 
     @staticmethod

package/src/utils/agent-connection/files/py-core-runtime-config/runtime_config.py.template

@@ -0,0 +1,44 @@
+import os
+
+from aws_lambda_powertools.utilities import parameters
+from botocore.config import Config
+
+
+def _get_agentcore_runtime_config() -> dict:
+    """Read the runtime-config ``agentcore`` namespace from AppConfig.
+
+    ``RUNTIME_CONFIG_APP_ID`` is set on the AgentCore runtime by the generated
+    CDK/Terraform construct for this project.
+    """
+    application = os.environ.get("RUNTIME_CONFIG_APP_ID")
+    if not application:
+        raise RuntimeError(
+            "RUNTIME_CONFIG_APP_ID is not set — cannot resolve connected agent ARNs from AppConfig."
+        )
+    region = os.environ.get("AWS_REGION", os.environ.get("AWS_DEFAULT_REGION"))
+    provider_kwargs = {}
+    if region:
+        provider_kwargs["config"] = Config(region_name=region)
+    provider = parameters.AppConfigProvider(
+        environment="default",
+        application=application,
+        **provider_kwargs,
+    )
+    return provider.get("agentcore", transform="json")
+
+
+def get_connected_agent_runtime_arn(name: str) -> str:
+    """Resolve the AgentCore runtime ARN for a connected agent or MCP server
+    from this project's runtime configuration.
+
+    ``name`` must match the class name of the target construct
+    (e.g. ``MyAgent``, ``InventoryMcpServer``).
+    """
+    config = _get_agentcore_runtime_config()
+    agent_runtimes = config.get("agentRuntimes", {}) if config else {}
+    arn = agent_runtimes.get(name)
+    if not arn:
+        raise RuntimeError(
+            f"No connected agent runtime named '{name}' found in runtime configuration."
+        )
+    return arn

package/src/utils/agent-core-constructs/agent-core-constructs.d.ts

@@ -14,7 +14,7 @@ export interface AddAgentCoreInfraProps {
     projectName: string;
     dockerImageTag: string;
     appDirectory: string;
-    serverProtocol: 'MCP' | 'HTTP';
+    serverProtocol: 'MCP' | 'HTTP' | 'A2A';
     auth: AgentCoreAuth;
 }
 export interface AddMcpServerInfraProps {
@@ -34,9 +34,10 @@ export interface AddAgentInfraProps {
     projectName: string;
     dockerImageTag: string;
     auth: AgentCoreAuth;
+    serverProtocol?: 'HTTP' | 'A2A';
 }
 /**
- * Add an MCP server CDK construct
+ * Add an agent CDK construct
  */
 export declare const addAgentInfra: (tree: Tree, options: AddAgentInfraProps & IACProvider) => Promise<void>;
 export {};

package/src/utils/agent-core-constructs/agent-core-constructs.js

@@ -73,7 +73,7 @@ const addMcpServerInfra = async (tree, options) => {
 };
 exports.addMcpServerInfra = addMcpServerInfra;
 /**
- * Add an MCP server CDK construct
+ * Add an agent CDK construct
  */
 const addAgentInfra = async (tree, options) => {
     await addAgentCoreInfra(tree, {
@@ -82,7 +82,7 @@ const addAgentInfra = async (tree, options) => {
         projectName: options.projectName,
         dockerImageTag: options.dockerImageTag,
         appDirectory: 'agents',
-        serverProtocol: 'HTTP',
+        serverProtocol: options.serverProtocol ?? 'HTTP',
         iacProvider: options.iacProvider,
         auth: options.auth,
     });