@aws/nx-plugin 0.112.1 → 0.114.0

package/src/py/strands-agent/mcp-connection/__snapshots__/generator.spec.ts.snap

@@ -3,9 +3,19 @@
 exports[`py#strands-agent#mcp-connection generator > should match snapshot for generated files > agent-connection-init.py 1`] = `
 """"Automatically generated by Nx."""
 
+from .core.session_context import get_current_session_id, session_id_context
+
 from .app.inventory_mcp_client import InventoryMcpClient
 
-__all__ = ["InventoryMcpClient"]
+from .core.with_session_id import with_session_id
+
+
+__all__ = [
+    "get_current_session_id",
+    "session_id_context",
+    "with_session_id",
+    "InventoryMcpClient",
+]
 "
 `;
 
@@ -18,10 +28,32 @@ from mcp.client.streamable_http import streamablehttp_client
 from strands.tools.mcp.mcp_client import MCPClient
 
 from .auth import SigV4HTTPXAuth
+from .session_context import get_current_session_id
+
+SESSION_HEADER = "X-Amzn-Bedrock-AgentCore-Runtime-Session-Id"
+
+
+class _SessionHeaderAuth(httpx.Auth):
+    """Stamps the AgentCore session header from the current async context."""
+
+    requires_request_body = True
+    requires_response_body = True
+
+    def __init__(self, inner: httpx.Auth | None = None):
+        self._inner = inner
+
+    def auth_flow(self, request: httpx.Request):  # type: ignore[override]
+        sid = get_current_session_id()
+        if sid:
+            request.headers[SESSION_HEADER] = sid
+        if self._inner is None:
+            yield request
+            return
+        yield from self._inner.auth_flow(request)
 
 
 class AgentCoreMCPClient:
-    """Factory for clients to call MCP servers hosted on Bedrock AgentCore Runtime."""
+    """Factory for MCP clients that forward the current async-context session."""
 
     @staticmethod
     def _build_url(agent_runtime_arn: str) -> tuple[str, str]:
@@ -31,74 +63,58 @@ class AgentCoreMCPClient:
         """
         region = agent_runtime_arn.split(":")[3]
         encoded_arn = agent_runtime_arn.replace(":", "%3A").replace("/", "%2F")
-        url = f"https://bedrock-agentcore.{region}.amazonaws.com/runtimes/{encoded_arn}/invocations?qualifier=DEFAULT"
+        url = (
+            f"https://bedrock-agentcore.{region}.amazonaws.com/runtimes/"
+            f"{encoded_arn}/invocations?qualifier=DEFAULT"
+        )
         return region, url
 
     @staticmethod
-    def _create(
-        agent_runtime_arn: str,
-        session_id: str,
-        headers: dict | None = None,
-        auth_handler: httpx.Auth | None = None,
-    ) -> MCPClient:
-        _, url = AgentCoreMCPClient._build_url(agent_runtime_arn)
+    def _create(url: str, auth: httpx.Auth | None = None) -> MCPClient:
         return MCPClient(
             lambda: streamablehttp_client(
                 url,
-                auth=auth_handler,
+                auth=_SessionHeaderAuth(auth),
                 timeout=120,
                 terminate_on_close=False,
-                headers={
-                    "X-Amzn-Bedrock-AgentCore-Runtime-Session-Id": session_id,
-                    **(headers if headers is not None else {}),
-                },
             )
         )
 
     @staticmethod
-    def with_iam_auth(agent_runtime_arn: str, session_id: str) -> MCPClient:
-        """Create an MCP client with IAM (SigV4) authentication.
-
-        Region and credentials are derived automatically from the ARN
-        and the default credential provider chain.
-        """
-        region, _ = AgentCoreMCPClient._build_url(agent_runtime_arn)
-        boto_session = boto3.Session(region_name=region)
-        credentials = boto_session.get_credentials()
+    def with_iam_auth(agent_runtime_arn: str) -> MCPClient:
+        """SigV4-authenticated client for a Bedrock AgentCore runtime."""
+        region, url = AgentCoreMCPClient._build_url(agent_runtime_arn)
+        credentials = boto3.Session(region_name=region).get_credentials()
         return AgentCoreMCPClient._create(
-            agent_runtime_arn=agent_runtime_arn,
-            session_id=session_id,
-            auth_handler=SigV4HTTPXAuth(credentials, "bedrock-agentcore", region),
+            url, SigV4HTTPXAuth(credentials, "bedrock-agentcore", region)
         )
 
     @staticmethod
     def with_jwt_auth(
-        agent_runtime_arn: str,
-        access_token_provider: Callable[[], str],
-        session_id: str,
+        agent_runtime_arn: str, access_token_provider: Callable[[], str]
     ) -> MCPClient:
-        """Create an MCP client with JWT authentication.
-
-        Args:
-            agent_runtime_arn: The ARN of the AgentCore runtime.
-            access_token_provider: A callable that returns the JWT access token.
-            session_id: Session ID for the connection.
-        """
-        access_token = access_token_provider()
-        return AgentCoreMCPClient._create(
-            agent_runtime_arn=agent_runtime_arn,
-            session_id=session_id,
-            headers={
-                "Authorization": f"Bearer {access_token}",
-            },
+        """Bearer-authenticated client for a Bedrock AgentCore runtime."""
+        _, url = AgentCoreMCPClient._build_url(agent_runtime_arn)
+        return MCPClient(
+            lambda: streamablehttp_client(
+                url,
+                auth=_SessionHeaderAuth(),
+                headers={"Authorization": f"Bearer {access_token_provider()}"},
+                timeout=120,
+                terminate_on_close=False,
+            )
         )
+
+    @staticmethod
+    def without_auth(url: str) -> MCPClient:
+        """Plain-HTTP client — for local dev."""
+        return AgentCoreMCPClient._create(url)
 "
 `;
 
 exports[`py#strands-agent#mcp-connection generator > should match snapshot for generated files > inventory_mcp_client.py 1`] = `
 "import os
 
-from mcp.client.streamable_http import streamablehttp_client
 from strands.tools.mcp.mcp_client import MCPClient
 
 from proj_agent_connection.core.agentcore_mcp_client import AgentCoreMCPClient
@@ -108,23 +124,14 @@ from proj_agent_connection.core.runtime_config import (
 
 
 class InventoryMcpClient:
-    """Client for connecting to the InventoryMcp MCP server.
-
-    In deployed mode: resolves the AgentCore runtime ARN from runtime config
-    and uses SigV4-authenticated AgentCore transport.
-
-    In local mode (SERVE_LOCAL env var set): connects directly
-    to the local MCP server via Streamable HTTP.
-    """
+    """Client for the InventoryMcp MCP server."""
 
     @staticmethod
-    def create(session_id: str) -> MCPClient:
+    def create() -> MCPClient:
         if os.environ.get("SERVE_LOCAL") == "true":
-            return MCPClient(lambda: streamablehttp_client("http://localhost:8082/mcp"))
-
+            return AgentCoreMCPClient.without_auth("http://localhost:8082/mcp")
         return AgentCoreMCPClient.with_iam_auth(
-            agent_runtime_arn=get_connected_agent_runtime_arn("InventoryMcp"),
-            session_id=session_id,
+            get_connected_agent_runtime_arn("InventoryMcp")
         )
 "
 `;
@@ -145,7 +152,7 @@ def subtract(a: int, b: int) -> int:
 
 @contextmanager
 def get_agent(session_id: str):
-    inventory_mcp = InventoryMcpClient.create(session_id=session_id)
+    inventory_mcp = InventoryMcpClient.create()
     with (
         inventory_mcp,
     ):

package/src/py/strands-agent/mcp-connection/files/agent-connection/app/__mcpServerSnakeCase___client.py.template

@@ -1,6 +1,5 @@
 import os
 
-from mcp.client.streamable_http import streamablehttp_client
 from strands.tools.mcp.mcp_client import MCPClient
 
 from <%- agentConnectionModuleName %>.core.agentcore_mcp_client import AgentCoreMCPClient
@@ -10,21 +9,14 @@ from <%- agentConnectionModuleName %>.core.runtime_config import (
 
 
 class <%- mcpServerClassName %>Client:
-    """Client for connecting to the <%- mcpServerClassName %> MCP server.
-
-    In deployed mode: resolves the AgentCore runtime ARN from runtime config
-    and uses SigV4-authenticated AgentCore transport.
-
-    In local mode (SERVE_LOCAL env var set): connects directly
-    to the local MCP server via Streamable HTTP.
-    """
+    """Client for the <%- mcpServerClassName %> MCP server."""
 
     @staticmethod
-    def create(session_id: str) -> MCPClient:
+    def create() -> MCPClient:
         if os.environ.get("SERVE_LOCAL") == "true":
-            return MCPClient(lambda: streamablehttp_client("http://localhost:<%- mcpServerPort %>/mcp"))
-
+            return AgentCoreMCPClient.without_auth(
+                "http://localhost:<%- mcpServerPort %>/mcp"
+            )
         return AgentCoreMCPClient.with_iam_auth(
-            agent_runtime_arn=get_connected_agent_runtime_arn("<%- mcpServerClassName %>"),
-            session_id=session_id,
+            get_connected_agent_runtime_arn("<%- mcpServerClassName %>")
         )

package/src/py/strands-agent/mcp-connection/generator.js

@@ -141,9 +141,9 @@ const addMcpClientToGetAgent = async (tree, filePath, clientClassName, clientVar
 }`));
     if (addedToWith) {
         // Subsequent connection — also add creation line after the existing one
-        await (0, ast_1.applyGritQL)(tree, filePath, py(`\`$var = $cls.create(session_id=session_id)\` as $stmt where {
+        await (0, ast_1.applyGritQL)(tree, filePath, py(`\`$var = $cls.create()\` as $stmt where {
   $program <: not contains \`${clientClassName}.create\`,
-  $stmt += \`\n${clientVarName} = ${clientClassName}.create(session_id=session_id)\`
+  $stmt += \`\n${clientVarName} = ${clientClassName}.create()\`
 }`));
         return;
     }
@@ -155,7 +155,7 @@ const addMcpClientToGetAgent = async (tree, filePath, clientClassName, clientVar
   $body <: contains \`yield Agent($_)\`,
   $body <: not contains \`with ($_, ): $_\`
 } => \`def get_agent($params):
-    ${clientVarName} = ${clientClassName}.create(session_id=session_id)
+    ${clientVarName} = ${clientClassName}.create()
     with (
         ${clientVarName},
     ):

package/src/smithy/project/__snapshots__/generator.spec.ts.snap

@@ -154,7 +154,7 @@ RUN smithy-install/smithy/install
 
 # Add node dependencies for bundling
 WORKDIR /project
-RUN npm i -g pnpm@10.15.1 rolldown@1.0.0-beta.38
+RUN npm i -g pnpm@11.1.1 rolldown@1.0.0-beta.38
 
 # Copy project files
 COPY smithy-build.json .
@@ -395,7 +395,7 @@ RUN smithy-install/smithy/install
 
 # Add node dependencies for bundling
 WORKDIR /project
-RUN npm i -g pnpm@10.15.1 rolldown@1.0.0-beta.38
+RUN npm i -g pnpm@11.1.1 rolldown@1.0.0-beta.38
 
 # Copy project files
 COPY smithy-build.json .

package/src/smithy/project/files/build.Dockerfile.template

@@ -16,7 +16,7 @@ RUN smithy-install/smithy/install
 
 # Add node dependencies for bundling
 WORKDIR /project
-RUN npm i -g pnpm@10.15.1 rolldown@1.0.0-beta.38
+RUN npm i -g pnpm@11.1.1 rolldown@1.0.0-beta.38
 
 # Copy project files
 COPY smithy-build.json .

package/src/ts/mcp-server/__snapshots__/generator.spec.ts.snap

@@ -593,7 +593,7 @@ app.use(express.json());
 
 app.post('/mcp', async (req: Request, res: Response) => {
   try {
-    const server = createServer();
+    const server = await createServer();
     const transport: StreamableHTTPServerTransport =
       new StreamableHTTPServerTransport({
         sessionIdGenerator: undefined,
@@ -682,7 +682,7 @@ import { registerSampleGuidanceResource } from './resources/sample-guidance';
 /**
  * Create the MCP Server
  */
-export const createServer = () => {
+export const createServer = async () => {
   const server = new McpServer({
     name: 'snapshot-server',
     version: '1.0.0',
@@ -703,7 +703,8 @@ import { createServer } from './server';
 
 export const startMcpServer = async () => {
   const transport = new StdioServerTransport();
-  await createServer().connect(transport);
+  const server = await createServer();
+  await server.connect(transport);
   console.error('MCP Server listening on STDIO');
 };
 

package/src/ts/mcp-server/files/http.ts.template

@@ -10,7 +10,7 @@ app.use(express.json());
 
 app.post('/mcp', async (req: Request, res: Response) => {
   try {
-    const server = createServer();
+    const server = await createServer();
     const transport: StreamableHTTPServerTransport =
       new StreamableHTTPServerTransport({
         sessionIdGenerator: undefined,

package/src/ts/mcp-server/files/server.ts.template

@@ -5,7 +5,7 @@ import { registerSampleGuidanceResource } from './resources/sample-guidance<% if
 /**
  * Create the MCP Server
  */
-export const createServer = () => {
+export const createServer = async () => {
   const server = new McpServer({
     name: "<%- name %>",
     version: "1.0.0"

package/src/ts/mcp-server/files/stdio.ts.template

@@ -4,7 +4,8 @@ import { createServer } from './server<% if (esm) { %>.js<% } %>';
 
 export const startMcpServer = async () => {
   const transport = new StdioServerTransport();
-  await createServer().connect(transport);
+  const server = await createServer();
+  await server.connect(transport);
   console.error('MCP Server listening on STDIO');
 };
 

package/src/ts/nx-plugin/__snapshots__/generator.spec.ts.snap

@@ -13,7 +13,7 @@ app.use(express.json());
 
 app.post('/mcp', async (req: Request, res: Response) => {
   try {
-    const server = createServer();
+    const server = await createServer();
     const transport: StreamableHTTPServerTransport =
       new StreamableHTTPServerTransport({
         sessionIdGenerator: undefined,
@@ -207,7 +207,8 @@ import { createServer } from './server';
 
 export const startMcpServer = async () => {
   const transport = new StdioServerTransport();
-  await createServer().connect(transport);
+  const server = await createServer();
+  await server.connect(transport);
   console.error('MCP Server listening on STDIO');
 };
 

package/src/ts/rdb/__snapshots__/generator.spec.ts.snap

@@ -265,7 +265,7 @@ export const handler = async () => {
 exports[`ts#rdb generator > should add mysql prisma dependencies when engine is MySQL > packages/db/src/prisma.ts 1`] = `
 "import { PrismaMariaDb } from '@prisma/adapter-mariadb';
 import { Signer } from '@aws-sdk/rds-signer';
-import { PrismaClient } from '../generated/prisma/client.js';
+import { Prisma, PrismaClient } from '../generated/prisma/client.js';
 import {
   DB_PACKAGE_NAME,
   LOCAL_DB_HOST,
@@ -276,7 +276,9 @@ import {
 } from './constants.js';
 import { getDatabaseConfig } from './utils.js';
 
-export const getPrisma = async (): Promise<PrismaClient> => {
+export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
+  log: LogOpts[] = ['warn', 'error'] as LogOpts[],
+): Promise<PrismaClient<LogOpts>> => {
   if (process.env.SERVE_LOCAL === 'true') {
     const adapter = new PrismaMariaDb({
       host: LOCAL_DB_HOST,
@@ -286,7 +288,10 @@ export const getPrisma = async (): Promise<PrismaClient> => {
       password: LOCAL_DB_PASSWORD,
       allowPublicKeyRetrieval: true,
     });
-    return new PrismaClient({ adapter });
+    return new PrismaClient({
+      adapter,
+      log,
+    }) as unknown as PrismaClient<LogOpts>;
   }
 
   const { hostname, port, database, dbUser, region } =
@@ -309,7 +314,10 @@ export const getPrisma = async (): Promise<PrismaClient> => {
     },
   });
 
-  return new PrismaClient({ adapter });
+  return new PrismaClient({
+    adapter,
+    log,
+  }) as unknown as PrismaClient<LogOpts>;
 };
 "
 `;
@@ -4078,8 +4086,8 @@ export const handler = async () => {
 exports[`ts#rdb generator > should generate the aurora shared construct > packages/db/src/prisma.ts 1`] = `
 "import { PrismaPg } from '@prisma/adapter-pg';
 import { Signer } from '@aws-sdk/rds-signer';
+import { Prisma, PrismaClient } from '../generated/prisma/client.js';
 import { Pool } from 'pg';
-import { PrismaClient } from '../generated/prisma/client.js';
 import {
   DB_PACKAGE_NAME,
   LOCAL_DB_HOST,
@@ -4090,52 +4098,54 @@ import {
 } from './constants.js';
 import { getDatabaseConfig } from './utils.js';
 
-let prismaPromise: Promise<PrismaClient> | undefined;
-
-export const getPrisma = (): Promise<PrismaClient> => {
-  prismaPromise ??= (async () => {
-    if (process.env.SERVE_LOCAL === 'true') {
-      const adapter = new PrismaPg(
-        new Pool({
-          host: LOCAL_DB_HOST,
-          port: LOCAL_DB_PORT,
-          database: LOCAL_DB_NAME,
-          user: LOCAL_DB_USER,
-          password: LOCAL_DB_PASSWORD,
-          allowExitOnIdle: true,
-        }),
-      );
-      return new PrismaClient({ adapter });
-    }
-
-    const { hostname, port, database, dbUser, region } =
-      await getDatabaseConfig(DB_PACKAGE_NAME);
+export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
+  log: LogOpts[] = ['warn', 'error'] as LogOpts[],
+): Promise<PrismaClient<LogOpts>> => {
+  if (process.env.SERVE_LOCAL === 'true') {
     const adapter = new PrismaPg(
       new Pool({
-        host: hostname,
-        port,
-        database,
-        user: dbUser,
-        ssl: {
-          rejectUnauthorized: true,
-        },
+        host: LOCAL_DB_HOST,
+        port: LOCAL_DB_PORT,
+        database: LOCAL_DB_NAME,
+        user: LOCAL_DB_USER,
+        password: LOCAL_DB_PASSWORD,
         allowExitOnIdle: true,
-        password: async () => {
-          const token = await new Signer({
-            hostname,
-            port,
-            region,
-            username: dbUser,
-          }).getAuthToken();
-          return token;
-        },
       }),
     );
+    return new PrismaClient({
+      adapter,
+      log,
+    }) as unknown as PrismaClient<LogOpts>;
+  }
 
-    return new PrismaClient({ adapter });
-  })();
+  const { hostname, port, database, dbUser, region } =
+    await getDatabaseConfig(DB_PACKAGE_NAME);
+  const adapter = new PrismaPg(
+    new Pool({
+      host: hostname,
+      port,
+      database,
+      user: dbUser,
+      ssl: {
+        rejectUnauthorized: true,
+      },
+      allowExitOnIdle: true,
+      password: async () => {
+        const token = await new Signer({
+          hostname,
+          port,
+          region,
+          username: dbUser,
+        }).getAuthToken();
+        return token;
+      },
+    }),
+  );
 
-  return prismaPromise;
+  return new PrismaClient({
+    adapter,
+    log,
+  }) as unknown as PrismaClient<LogOpts>;
 };
 "
 `;

package/src/ts/rdb/files/src/prisma.ts.template

@@ -1,10 +1,8 @@
 import { <%= prismaAdapterClassName %> } from '<%= prismaAdapterPackage %>';
 import { Signer } from '@aws-sdk/rds-signer';
-<%_ if (engine === 'MySQL') { _%>
-import { PrismaClient } from '../generated/prisma/client.js';
-<%_ } else { _%>
+import { Prisma, PrismaClient } from '../generated/prisma/client.js';
+<%_ if (engine === 'PostgreSQL') { _%>
 import { Pool } from 'pg';
-import { PrismaClient } from '../generated/prisma/client.js';
 <%_ } _%>
 import {
   DB_PACKAGE_NAME,
@@ -17,7 +15,9 @@ import {
 import { getDatabaseConfig } from './utils.js';
 <%_ if (engine === 'MySQL') { _%>
 
-export const getPrisma = async (): Promise<PrismaClient> => {
+export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
+  log: LogOpts[] = ['warn', 'error'] as LogOpts[],
+): Promise<PrismaClient<LogOpts>> => {
   if (process.env.SERVE_LOCAL === 'true') {
     const adapter = new PrismaMariaDb({
       host: LOCAL_DB_HOST,
@@ -27,7 +27,10 @@ export const getPrisma = async (): Promise<PrismaClient> => {
       password: LOCAL_DB_PASSWORD,
       allowPublicKeyRetrieval: true,
     });
-    return new PrismaClient({ adapter });
+    return new PrismaClient({
+      adapter,
+      log,
+    }) as unknown as PrismaClient<LogOpts>;
   }
 
   const { hostname, port, database, dbUser, region } =
@@ -50,55 +53,60 @@ export const getPrisma = async (): Promise<PrismaClient> => {
     },
   });
 
-  return new PrismaClient({ adapter });
+  return new PrismaClient({
+    adapter,
+    log,
+  }) as unknown as PrismaClient<LogOpts>;
 };
 <%_ } else { _%>
 
-let prismaPromise: Promise<PrismaClient> | undefined;
-
-export const getPrisma = (): Promise<PrismaClient> => {
-  prismaPromise ??= (async () => {
-    if (process.env.SERVE_LOCAL === 'true') {
-      const adapter = new PrismaPg(
-        new Pool({
-          host: LOCAL_DB_HOST,
-          port: LOCAL_DB_PORT,
-          database: LOCAL_DB_NAME,
-          user: LOCAL_DB_USER,
-          password: LOCAL_DB_PASSWORD,
-          allowExitOnIdle: true,
-        }),
-      );
-      return new PrismaClient({ adapter });
-    }
-
-    const { hostname, port, database, dbUser, region } =
-      await getDatabaseConfig(DB_PACKAGE_NAME);
+export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
+  log: LogOpts[] = ['warn', 'error'] as LogOpts[],
+): Promise<PrismaClient<LogOpts>> => {
+  if (process.env.SERVE_LOCAL === 'true') {
     const adapter = new PrismaPg(
       new Pool({
-        host: hostname,
-        port,
-        database,
-        user: dbUser,
-        ssl: {
-          rejectUnauthorized: true,
-        },
+        host: LOCAL_DB_HOST,
+        port: LOCAL_DB_PORT,
+        database: LOCAL_DB_NAME,
+        user: LOCAL_DB_USER,
+        password: LOCAL_DB_PASSWORD,
         allowExitOnIdle: true,
-        password: async () => {
-          const token = await new Signer({
-            hostname,
-            port,
-            region,
-            username: dbUser,
-          }).getAuthToken();
-          return token;
-        },
       }),
     );
+    return new PrismaClient({
+      adapter,
+      log,
+    }) as unknown as PrismaClient<LogOpts>;
+  }
 
-    return new PrismaClient({ adapter });
-  })();
+  const { hostname, port, database, dbUser, region } =
+    await getDatabaseConfig(DB_PACKAGE_NAME);
+  const adapter = new PrismaPg(
+    new Pool({
+      host: hostname,
+      port,
+      database,
+      user: dbUser,
+      ssl: {
+        rejectUnauthorized: true,
+      },
+      allowExitOnIdle: true,
+      password: async () => {
+        const token = await new Signer({
+          hostname,
+          port,
+          region,
+          username: dbUser,
+        }).getAuthToken();
+        return token;
+      },
+    }),
+  );
 
-  return prismaPromise;
+  return new PrismaClient({
+    adapter,
+    log,
+  }) as unknown as PrismaClient<LogOpts>;
 };
 <%_ } _%>

package/src/ts/rdb/generator.js

@@ -155,6 +155,9 @@ const tsRdbGenerator = async (tree, options) => {
     }
     (0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'compile', 'generate');
     (0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfig);
+    (0, nx_1.addGeneratorMetadata)(tree, fullyQualifiedName, exports.TS_RDB_GENERATOR_INFO, {
+        engine: options.engine,
+    });
     await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iacProvider });
     await (0, rdb_constructs_1.addRdbInfra)(tree, {
         iacProvider,