@aws/nx-plugin-mcp 1.0.0-rc.79 → 1.0.0-rc.80

package/bin/aws-nx-mcp.js

@@ -54023,7 +54023,7 @@ When scaffolding several projects in one go, chain generators to avoid a slow de
 - **Chain generators** with \`&&\` in a single command. Pass \`--prefer-install-dependencies=false\` on each generator except the last so dependencies install once at the end, for example:
 
 ${PACKAGE_MANAGERS.map((pm) => `  \`\`\`bash
-  ${buildNxCommand("g @aws/nx-plugin:ts#trpc-api --no-interactive --name=my-app-api --auth=IAM --prefer-install-dependencies=false", pm)} && \\
+  ${buildNxCommand("g @aws/nx-plugin:ts#trpc-api --no-interactive --name=my-app-api --auth=iam --prefer-install-dependencies=false", pm)} && \\
     ${buildNxCommand("g @aws/nx-plugin:ts#react-website --no-interactive --name=my-app-website --prefer-install-dependencies=false", pm)} && \\
     ${buildNxCommand("g @aws/nx-plugin:connection --no-interactive --sourceProject=@my-app/my-app-website --targetProject=@my-app/my-app-api --prefer-install-dependencies=false", pm)} && \\
     ${buildNxCommand("g @aws/nx-plugin:ts#infra --no-interactive --name=infra", pm)} && \\
@@ -54205,6 +54205,16 @@ var generators$1 = {
 			"connection/smithy-rdb",
 			"connection/ts-mcp-server-rdb",
 			"connection/ts-agent-rdb",
+			"connection/trpc-dynamodb",
+			"connection/smithy-dynamodb",
+			"connection/ts-mcp-server-dynamodb",
+			"connection/ts-agent-dynamodb",
+			"connection/py-fast-api-rdb",
+			"connection/py-agent-rdb",
+			"connection/py-mcp-server-rdb",
+			"connection/py-fast-api-dynamodb",
+			"connection/py-agent-dynamodb",
+			"connection/py-mcp-server-dynamodb",
 			"connection/ts-agent-gateway",
 			"connection/py-agent-gateway",
 			"connection/agentcore-gateway-mcp",

package/docs/get_started/tutorials/contribute-generator.mdx

@@ -54,7 +54,7 @@ Let's create the new generator in `packages/nx-plugin/src/trpc/procedure`.
 
 We provide a generator for creating new generators so you can quickly scaffold your new generator! You can run this generator as follows:
 
-<RunGenerator generator="ts#nx-generator" requiredParameters={{ pluginProject: '@aws/nx-plugin', name: 'ts#trpc-api#procedure', directory: 'trpc/procedure', description: 'Adds a procedure to a tRPC API' }} />
+<RunGenerator generator="ts#nx-generator" requiredParameters={{ project: '@aws/nx-plugin', name: 'ts#trpc-api#procedure', directory: 'trpc/procedure', description: 'Adds a procedure to a tRPC API' }} />
 
 You will notice the following files have been generated for you:
 
@@ -91,7 +91,7 @@ Let's update the schema to add the properties we'll need for the generator:
           "description": "The name of the new procedure",
           "type": "string",
           "x-prompt": "What would you like to call your new procedure?",
-          "x-priority": "important",
+          "x-priority": "important"
         },
         "type": {
           "description": "The type of procedure to generate",

package/docs/guides/connection/py-agent-gateway.mdx

@@ -21,9 +21,13 @@ The generator wires the agent so it authenticates to the Gateway with IAM SigV4
 Before using this generator, ensure you have:
 
 1. A Python project with a <Link path="guides/py-agent">Agent</Link> component (`infra: agentcore`)
-2. A <Link path="guides/agentcore-gateway">`agentcore-gateway`</Link> project with `auth: iam`
+2. A <Link path="guides/agentcore-gateway">`agentcore-gateway`</Link> project with `protocol: mcp` and `auth: iam`
 
-The Gateway must use IAM authentication — the agent signs its requests with SigV4 using its own execution role. The generator rejects Cognito-authenticated gateways.
+The Gateway must serve the `mcp` protocol — the agent reaches it as an MCP client, so its targets are exposed as tools. The Gateway must also use IAM authentication: the agent signs its requests with SigV4 using its own execution role. The generator rejects Cognito-authenticated gateways.
+
+:::note[One direction per Gateway]
+A single Gateway cannot both be called by an agent and front one. Fronting agent runtimes needs `protocol: http` (see <Link path="guides/connection/agentcore-gateway-agent">Gateway to Agent</Link>), whereas being called by an agent needs `protocol: mcp`. Use a separate Gateway for each direction.
+:::
 
 ## Usage
 

package/docs/guides/connection/react-agui.mdx

@@ -2,7 +2,7 @@
 title: React to AG-UI Agent
 description: Connect a React website to an Agent via the AG-UI protocol using CopilotKit
 when:
-  sourceType: react
+  sourceType: ts#react-website
   targetType:
     - ts#agent
     - py#agent

package/docs/guides/connection/react-fastapi.mdx

@@ -2,7 +2,7 @@
 title: React to FastAPI
 description: Connect a React website to a Python FastAPI
 when:
-  sourceType: react
+  sourceType: ts#react-website
   targetType: py#fast-api
 ---
 

package/docs/guides/connection/react-py-agent.mdx

@@ -2,7 +2,7 @@
 title: React to Python Agent
 description: Connect a React website to a Python Agent
 when:
-  sourceType: react
+  sourceType: ts#react-website
   targetType: py#agent
   protocol: http
 ---

package/docs/guides/connection/react-smithy.mdx

@@ -2,8 +2,8 @@
 title: React to Smithy API
 description: Connect a React website to a Smithy TypeScript API
 when:
-  sourceType: react
-  targetType: smithy
+  sourceType: ts#react-website
+  targetType: ts#smithy-api
 ---
 
 import { FileTree, Steps } from '@astrojs/starlight/components';

package/docs/guides/connection/react-trpc.mdx

@@ -2,7 +2,7 @@
 title: React to tRPC
 description: Connect a React website to a tRPC API
 when:
-  sourceType: react
+  sourceType: ts#react-website
   targetType: ts#trpc-api
 ---
 import { FileTree } from '@astrojs/starlight/components';

package/docs/guides/connection/react-ts-agent.mdx

@@ -2,7 +2,7 @@
 title: React to TypeScript Agent
 description: Connect a React website to a TypeScript Agent
 when:
-  sourceType: react
+  sourceType: ts#react-website
   targetType: ts#agent
   protocol: http
 ---

package/docs/guides/connection/smithy-dynamodb.mdx

@@ -2,7 +2,7 @@
 title: Smithy API to DynamoDB
 description: Connect a Smithy API to a TypeScript DynamoDB project
 when:
-  sourceType: smithy
+  sourceType: ts#smithy-api
   targetType: ts#dynamodb
 ---
 import { FileTree } from '@astrojs/starlight/components';

package/docs/guides/connection/smithy-rdb.mdx

@@ -2,7 +2,7 @@
 title: Smithy API to Relational Database
 description: Connect a Smithy API to a Relational Database
 when:
-  sourceType: smithy
+  sourceType: ts#smithy-api
   targetType: ts#rdb
 ---
 import { FileTree } from '@astrojs/starlight/components';

package/docs/guides/connection/ts-agent-gateway.mdx

@@ -21,9 +21,13 @@ The generator wires the agent so it authenticates to the Gateway with IAM SigV4
 Before using this generator, ensure you have:
 
 1. A TypeScript project with a <Link path="guides/ts-agent">Agent</Link> component (`infra: agentcore`)
-2. A <Link path="guides/agentcore-gateway">`agentcore-gateway`</Link> project with `auth: iam`
+2. A <Link path="guides/agentcore-gateway">`agentcore-gateway`</Link> project with `protocol: mcp` and `auth: iam`
 
-The Gateway must use IAM authentication — the agent signs its requests with SigV4 using its own execution role. The generator rejects Cognito-authenticated gateways.
+The Gateway must serve the `mcp` protocol — the agent reaches it as an MCP client, so its targets are exposed as tools. The Gateway must also use IAM authentication: the agent signs its requests with SigV4 using its own execution role. The generator rejects Cognito-authenticated gateways.
+
+:::note[One direction per Gateway]
+A single Gateway cannot both be called by an agent and front one. Fronting agent runtimes needs `protocol: http` (see <Link path="guides/connection/agentcore-gateway-agent">Gateway to Agent</Link>), whereas being called by an agent needs `protocol: mcp`. Use a separate Gateway for each direction.
+:::
 
 ## Usage
 

package/docs/guides/fastapi.mdx

@@ -121,9 +121,7 @@ def read_item(item_id: int):
 The logger automatically includes:
 
 - Correlation IDs for request tracing
-- Request path and method
-- Lambda context information
-- Cold start indicators
+- Request path, matched route and method
 
 #### Tracing
 
@@ -159,8 +157,7 @@ Default metrics include:
 
 - Request counts
 - Success/failure counts
-- Cold start metrics
-- Per-route metrics
+- Per-route metrics (via a `route` dimension of `<method> <path>`)
 
 ### Error Handling
 
@@ -648,7 +645,7 @@ If you are actively working on both your CDK infrastructure and FastAPI together
 <NxCommands
   commands={[
     'watch --projects=<FastAPIProject> -- \\ ',
-    'run <InfraProject>:"generate:<ApiName>-metadata"',
+    'run @<scope>/common-constructs:"generate:<ApiName>-metadata"',
   ]}
 />
 :::

package/docs/guides/py-agent.mdx

@@ -122,8 +122,8 @@ For deploying your Agent, the following files are generated:
   - packages/common/constructs/src
     - app
       - agents
-        - \<project-name>
-          - \<project-name>.ts CDK construct for deploying your agent
+        - \<agent-name>
+          - \<agent-name>.ts CDK construct for deploying your agent
 </FileTree>
 </Fragment>
 <Fragment slot="terraform">
@@ -131,8 +131,8 @@ For deploying your Agent, the following files are generated:
   - packages/common/terraform/src
     - app
       - agents
-        - \<project-name>
-          - \<project-name>.tf Module for deploying your agent
+        - \<agent-name>
+          - \<agent-name>.tf Module for deploying your agent
     - core
       - agent-core
         - runtime.tf Generic module for deploying to Bedrock AgentCore Runtime
@@ -241,7 +241,7 @@ agent = create_agent(
 
 <Tabs syncKey="agent-framework">
 <TabItem label="Strands" _filter={{ framework: 'strands' }}>
-By default, Strands agents use Claude 4 Sonnet, but you can customize the model provider. See the [Strands documentation on model providers](https://strandsagents.com/docs/user-guide/concepts/model-providers/) for configuration options:
+By default, Strands agents use Claude Sonnet 4.6 on Amazon Bedrock, but you can customize the model provider. See the [Strands documentation on model providers](https://strandsagents.com/docs/user-guide/concepts/model-providers/) for configuration options:
 
 ```python
 from strands import Agent
@@ -317,10 +317,10 @@ The agent's invocation endpoint uses [Pydantic](https://docs.pydantic.dev/) mode
 The default `InvokeInput` model accepts a prompt.
 
 ```python
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 class InvokeInput(BaseModel):
-    prompt: str
+    prompt: str = Field(max_length=100000)
 ```
 
 You can extend this model to include any additional fields your agent needs.
@@ -385,7 +385,7 @@ Since the generator vends CDK or Terraform infrastructure which manages deployin
 <OptionFilter when={{ protocol: 'a2a' }} description="A2A server details">
 ## A2A Server (A2A protocol)
 
-The generated `main.py` mounts an A2A server onto a parent FastAPI app that also exposes `/ping`. Strands agents use the Strands `A2AServer`; LangChain agents wrap the compiled graph in an [`a2a-sdk`](https://a2a-protocol.org/) `AgentExecutor`. When deployed to AgentCore, the entry point resolves the runtime's public ARN from AppConfig and advertises it in the agent card.
+The generated `main.py` mounts an A2A server onto a parent FastAPI app that also exposes `/ping`. Strands agents use the Strands `A2AServer`; LangChain agents wrap the compiled graph in an [`a2a-sdk`](https://a2a-protocol.org/) `AgentExecutor`. The URL advertised in the agent card comes from the `AGENTCORE_RUNTIME_URL` environment variable, falling back to `http://localhost:<port>/` for local development.
 
 Most users will not need to modify this file; edit `agent.py` to change tools or the system prompt. The A2A server populates the agent card (`/.well-known/agent-card.json`) from the agent's `name` and `description`.
 </OptionFilter>

package/docs/guides/react-website-auth.mdx

@@ -265,7 +265,9 @@ export class ApplicationStack extends Stack {
     super(scope, id);
 
     const identity = new UserIdentity(this, 'Identity');
-    const api = new MyApi(this, 'MyApi');
+    const api = new MyApi(this, 'MyApi', {
+      integrations: MyApi.defaultIntegrations(this).build(),
+    });
 
     api.grantInvokeAccess(identity.identityPool.authenticatedRole);
 

package/docs/guides/react-website.mdx

@@ -497,7 +497,7 @@ You will also need to create DNS records (for example in Route 53) pointing your
 
 ## Runtime Configuration
 
-Configuration from your infrastructure is provided to your website via <Link href="guides/runtime-config">Runtime Configuration</Link>. This allows your website to access details such as API URLs which are not known until your application is deployed.
+Configuration from your infrastructure is provided to your website via <Link path="guides/runtime-config">Runtime Configuration</Link>. This allows your website to access details such as API URLs which are not known until your application is deployed.
 
 ### Infrastructure
 

package/docs/guides/trpc.mdx

@@ -466,7 +466,7 @@ export const createIdentityPlugin = () => {
 </OptionFilter>
 
 <OptionFilter when={{ auth: 'cognito' }} description="Identity middleware example for Cognito-authenticated APIs">
-When you deploy with `auth: 'cognito'`, the API Gateway Cognito User Pools authorizer verifies the JWT that the caller supplies in the `Authorization` header and places the verified claims on the Lambda event at `event.requestContext.authorizer.claims`. Our middleware just reads those claims — no extra AWS SDK calls, no manual JWT verification.
+When you deploy with `auth: 'cognito'`, the API Gateway Cognito authorizer verifies the JWT that the caller supplies in the `Authorization` header and places the verified claims on the Lambda event. Our middleware just reads those claims — no extra AWS SDK calls, no manual JWT verification.
 
 First, we define what we'll add to the context:
 

package/docs/guides/ts-agent.mdx

@@ -118,8 +118,8 @@ For deploying your Agent, the following files are generated:
   - packages/common/constructs/src
     - app
       - agents
-        - \<project-name>
-          - \<project-name>.ts CDK construct for deploying your agent
+        - \<agent-name>
+          - \<agent-name>.ts CDK construct for deploying your agent
 </FileTree>
 </Fragment>
 <Fragment slot="terraform">
@@ -127,8 +127,8 @@ For deploying your Agent, the following files are generated:
   - packages/common/terraform/src
     - app
       - agents
-        - \<project-name>
-          - \<project-name>.tf Module for deploying your agent
+        - \<agent-name>
+          - \<agent-name>.tf Module for deploying your agent
     - core
       - agent-core
         - runtime.tf Generic module for deploying to Bedrock AgentCore Runtime
@@ -203,7 +203,7 @@ The Strands framework automatically handles:
 
 ### Model Configuration
 
-By default, Strands agents use Claude 4 Sonnet, but you can easily switch between model providers:
+By default, Strands agents use Claude Sonnet 4.6 on Amazon Bedrock, but you can easily switch between model providers:
 
 ```typescript
 import { Agent } from '@strands-agents/sdk';
@@ -247,7 +247,7 @@ For a more in-depth guide to writing Strands agents, refer to the [Strands docum
 <OptionFilter when={{ protocol: 'a2a' }} description="A2A Express server details">
 ## A2A Server (A2A protocol)
 
-The generated `index.ts` mounts the [Strands A2A Express Server](https://strandsagents.com/docs/user-guide/concepts/multi-agent/agent-to-agent) onto an Express app so the generated agent exposes the A2A protocol endpoints alongside a `/ping` health check. When deployed to AgentCore, the entry point resolves the runtime's public ARN from AppConfig and advertises it in the agent card.
+The generated `index.ts` mounts the [Strands A2A Express Server](https://strandsagents.com/docs/user-guide/concepts/multi-agent/agent-to-agent) onto an Express app so the generated agent exposes the A2A protocol endpoints alongside a `/ping` health check. The URL advertised in the agent card comes from the `AGENTCORE_RUNTIME_URL` environment variable, falling back to `http://localhost:<port>/` for local development.
 
 Most users will not need to modify this file — edit `agent.ts` to change tools or the system prompt. A2A agents listen on port `9000` (vs `8080` for HTTP), which the generated Dockerfile and infrastructure are already configured for.
 </OptionFilter>
@@ -255,7 +255,7 @@ Most users will not need to modify this file — edit `agent.ts` to change tools
 <OptionFilter when={{ protocol: 'ag-ui' }} description="AG-UI server details">
 ## AG-UI Server (AG-UI protocol)
 
-The generated `index.ts` wraps your Strands `Agent` in an [`@ag-ui/aws-strands`](https://www.npmjs.com/package/@ag-ui/aws-strands) `StrandsAgent` and creates an Express app via `createStrandsApp()`. The resulting app exposes a single POST endpoint that streams [AG-UI](https://docs.ag-ui.com/) events over Server-Sent Events (SSE), as well as `/ping` for the AgentCore runtime health check.
+The generated `index.ts` wraps your Strands `Agent` in an [`@ag-ui/aws-strands`](https://www.npmjs.com/package/@ag-ui/aws-strands) `StrandsAgent` and builds an Express app. The resulting app exposes a single POST endpoint that streams [AG-UI](https://docs.ag-ui.com/) events over Server-Sent Events (SSE), as well as `/ping` for the AgentCore runtime health check.
 
 AG-UI agents are designed to be consumed directly by a frontend. Use the <Link path="/guides/connection/react-agui">`connection` generator</Link> to wire your React website up to the agent with a [CopilotKit](https://docs.copilotkit.ai/aws-strands) provider and [AG-UI HttpAgent](https://docs.ag-ui.com/) client.
 
@@ -395,11 +395,13 @@ You can invoke a locally running agent using the `.local` factory method from th
 
 You can, for example create a file named `scripts/test.ts` in your workspace which imports the client:
 
+The client class is named after your agent, so an agent named `my-agent` exports `MyAgentClient`.
+
 ```typescript
 // scripts/test.ts
-import { AgentClient } from '../packages/<project>/src/agent/client.js';
+import { MyAgentClient } from '../packages/<project>/src/agent/client.js';
 
-const client = AgentClient.local({ url: 'http://localhost:8081/ws' });
+const client = MyAgentClient.local({ url: 'http://localhost:8081/ws' });
 
 client.invoke.subscribe({ prompt: 'what is 1 plus 1?' }, { onData: console.log });
 ```
@@ -429,9 +431,9 @@ The client factory uses HTTP headers in the WebSocket handshake to authenticate
 You can invoke your deployed agent by passing its ARN to the `withIamAuth` factory method:
 
 ```typescript
-import { AgentClient } from './agent/client.js';
+import { MyAgentClient } from './agent/client.js';
 
-const client = AgentClient.withIamAuth({
+const client = MyAgentClient.withIamAuth({
   agentRuntimeArn: 'arn:aws:bedrock-agentcore:us-west-2:123456789012:runtime/my-agent',
 });
 
@@ -453,7 +455,7 @@ This will use the default AWS credential provider chain to authenticate requests
 Use the `withJwtAuth` factory method to authenticate with the JWT / Cognito access token.
 
 ```typescript
-const client = AgentClient.withJwtAuth({
+const client = MyAgentClient.withJwtAuth({
   agentRuntimeArn: 'arn:aws:bedrock-agentcore:us-west-2:123456789012:runtime/my-agent',
   accessTokenProvider: async () => `<access-token>`,
 });
@@ -470,7 +472,7 @@ import { CognitoIdentityProvider } from "@aws-sdk/client-cognito-identity-provid
 
 const cognito = new CognitoIdentityProvider();
 
-const jwtClient = AgentClient.withJwtAuth({
+const jwtClient = MyAgentClient.withJwtAuth({
   agentRuntimeArn: 'arn:aws:bedrock-agentcore:us-west-2:123456789012:runtime/my-agent',
   accessTokenProvider: async () => {
     const response = await cognito.adminInitiateAuth({

package/docs/guides/ts-mcp-server.mdx

@@ -100,12 +100,18 @@ export const registerMyTool = (server: McpServer) => {
 };
 ```
 
-Then register it in `server.ts`:
+Then register it inside `createServer` in `server.ts`:
 
-```typescript title="server.ts"
+```typescript title="server.ts" {6}
 import { registerMyTool } from './tools/my-tool.js';
 
-registerMyTool(server);
+export const createServer = async () => {
+  const server = new McpServer({ name: 'my-server', version: '1.0.0' });
+
+  registerMyTool(server);
+
+  return server;
+};
 ```
 
 ### Adding Resources

package/docs/guides/ts-nx-plugin.mdx

@@ -57,7 +57,7 @@ The generator will create the following project structure:
 
 Once you have your plugin project, you can add generators using the <Link path="/guides/nx-generator">`ts#nx-generator`</Link> generator:
 
-<RunGenerator generator="ts#nx-generator" requiredParameters={{ pluginProject: 'your-plugin' }} />
+<RunGenerator generator="ts#nx-generator" requiredParameters={{ project: 'your-plugin' }} />
 
 This will add a new generator to your plugin.
 

package/docs/guides/ts-rdb.mdx

@@ -94,7 +94,7 @@ The generator automatically configures the `generate` target to create a type-sa
 
 You can also manually generate the client at any time:
 
-<NxCommands commands={['generate <your-db-project-name>']} />
+<NxCommands commands={['run <your-db-project-name>:generate']} />
 
 Use the `prisma` target to run Prisma CLI commands from the workspace root:
 

package/docs/guides/ts-smithy-api.mdx

@@ -819,7 +819,7 @@ If you are actively working on both your CDK infrastructure and Smithy API toget
 <NxCommands
   commands={[
     'watch --projects=<ModelProject> -- \\ ',
-    'run <InfraProject>:"generate:<ApiName>-metadata"',
+    'run @<scope>/common-constructs:"generate:<ApiName>-metadata"',
   ]}
 />
 :::

package/docs/snippets/api/access-logging.mdx

@@ -14,16 +14,21 @@ API Gateway writes access logs using an account-level CloudWatch Logs role. This
 <Fragment slot="cdk">
 The account role is managed by the `ApiGatewayAccount` construct, a stack-scoped singleton resolved via `ApiGatewayAccount.ensure(scope)`. Each REST API's stage depends on it, and the role is configured by a Lambda-backed custom resource.
 
-You can customise the access log format by passing `deployOptions` when constructing your API:
+The access log format is set by the `RestApi` construct your API extends. To customise it, pass `deployOptions` through to `super` in the generated `packages/common/constructs/src/app/apis/my-api.ts`, keeping the `tracingEnabled` the construct already sets:
 
-```ts {3-5}
-const api = new MyApi(this, 'MyApi', {
-  integrations: MyApi.defaultIntegrations(this).build(),
+```ts {5-8} title="packages/common/constructs/src/app/apis/my-api.ts"
+super(scope, id, {
+  apiName: 'MyApi',
+  // ...
   deployOptions: {
+    tracingEnabled: true,
     accessLogFormat: AccessLogFormat.clf(),
   },
+  ...props,
 });
 ```
+
+`AccessLogFormat` is imported from `aws-cdk-lib/aws-apigateway`. Anything you leave unset keeps the construct's default — a JSON format with the standard fields.
 </Fragment>
 <Fragment slot="terraform">
 The account role is managed by the `core/api/api-gateway-account` module, which is instantiated by the generated API module. It configures the account idempotently and is never reset on `terraform destroy`.

package/docs/snippets/api/type-safe-api-integrations.mdx

@@ -125,36 +125,7 @@ new MyApi(this, 'MyApi', {
 
 </Fragment>
 <Fragment slot="terraform">
-To customize options like VPC configuration, you need to edit the generated Terraform module. For example, to add VPC support to all Lambda functions:
-
-```hcl
-# packages/common/terraform/src/app/apis/my-api/my-api.tf
-# Add VPC variables
-variable "vpc_subnet_ids" {
-  description = "List of VPC subnet IDs for Lambda function"
-  type        = list(string)
-  default     = []
-}
-
-variable "vpc_security_group_ids" {
-  description = "List of VPC security group IDs for Lambda function"
-  type        = list(string)
-  default     = []
-}
-
-# Update the Lambda function resource
-resource "aws_lambda_function" "api_lambda" {
-  # ... existing configuration ...
-
-  # Add VPC configuration
-  vpc_config {
-    subnet_ids         = var.vpc_subnet_ids
-    security_group_ids = var.vpc_security_group_ids
-  }
-}
-```
-
-Then use the module with VPC configuration:
+VPC configuration is already supported by the generated module — set `enable_vpc` along with `vpc_id` and `subnet_ids`, and the module deploys the Lambda function into your VPC behind a security group it creates for you:
 
 ```hcl
 module "my_api" {
@@ -163,12 +134,15 @@ module "my_api" {
   asset_bucket_name = module.asset_bucket.bucket_name
 
   # VPC configuration
-  vpc_subnet_ids         = [aws_subnet.private_a.id, aws_subnet.private_b.id]
-  vpc_security_group_ids = [aws_security_group.lambda_sg.id]
+  enable_vpc = true
+  vpc_id     = aws_vpc.main.id
+  subnet_ids = [aws_subnet.private_a.id, aws_subnet.private_b.id]
 
   tags = local.common_tags
 }
 ```
+
+For options the module does not expose, edit the `aws_lambda_function` resource in the generated Terraform module directly.
 </Fragment>
 </Infrastructure>
 
@@ -344,7 +318,9 @@ Edit `packages/common/terraform/src/app/apis/my-api/my-api.tf`:
 
 # Remove the default single Lambda function
 - resource "aws_lambda_function" "api_lambda" {
--   filename         = data.archive_file.lambda_zip.output_path
+-   s3_bucket         = aws_s3_object.lambda_zip.bucket
+-   s3_key            = aws_s3_object.lambda_zip.key
+-   s3_object_version = aws_s3_object.lambda_zip.version_id
 -   function_name    = "MyApiHandler"
 -   role            = aws_iam_role.lambda_execution_role.arn
 -   handler         = "index.handler"
@@ -372,7 +348,9 @@ Edit `packages/common/terraform/src/app/apis/my-api/my-api.tf`:
 
 # Add individual Lambda functions for each operation using the same bundle
 + resource "aws_lambda_function" "say_hello_handler" {
-+   filename         = data.archive_file.lambda_zip.output_path
++   s3_bucket         = aws_s3_object.lambda_zip.bucket
++   s3_key            = aws_s3_object.lambda_zip.key
++   s3_object_version = aws_s3_object.lambda_zip.version_id
 +   function_name    = "MyApi-SayHello"
 +   role            = aws_iam_role.lambda_execution_role.arn
 +   handler         = "sayHello.handler"  # Specific handler for this operation
@@ -392,7 +370,9 @@ Edit `packages/common/terraform/src/app/apis/my-api/my-api.tf`:
 + }
 
 + resource "aws_lambda_function" "get_documentation_handler" {
-+   filename         = data.archive_file.lambda_zip.output_path
++   s3_bucket         = aws_s3_object.lambda_zip.bucket
++   s3_key            = aws_s3_object.lambda_zip.key
++   s3_object_version = aws_s3_object.lambda_zip.version_id
 +   function_name    = "MyApi-GetDocumentation"
 +   role            = aws_iam_role.lambda_execution_role.arn
 +   handler         = "getDocumentation.handler"  # Specific handler for this operation
@@ -467,8 +447,10 @@ Edit `packages/common/terraform/src/app/apis/my-api/my-api.tf`:
 
 # Remove the default single Lambda function
 - resource "aws_lambda_function" "api_lambda" {
--   filename         = data.archive_file.lambda_zip.output_path
--   function_name    = "MyApiHandler"
+-   s3_bucket         = aws_s3_object.lambda_zip.bucket
+-   s3_key            = aws_s3_object.lambda_zip.key
+-   s3_object_version = aws_s3_object.lambda_zip.version_id
+-   function_name    = "MyApiHandler-${random_string.suffix.result}"
 -   role            = aws_iam_role.lambda_execution_role.arn
 -   handler         = "index.handler"
 -   runtime         = "nodejs22.x"
@@ -477,25 +459,29 @@ Edit `packages/common/terraform/src/app/apis/my-api/my-api.tf`:
 - }
 
 # Remove the default proxy integration
-- resource "aws_apigatewayv2_integration" "lambda_integration" {
--   api_id           = module.http_api.api_id
--   integration_type = "AWS_PROXY"
--   integration_uri  = aws_lambda_function.api_lambda.invoke_arn
+- resource "aws_api_gateway_integration" "lambda_integration" {
+-   rest_api_id = module.rest_api.api_id
+-   resource_id = aws_api_gateway_resource.proxy_resource.id
+-   http_method = aws_api_gateway_method.proxy_method.http_method
+-   integration_http_method = "POST"
+-   type                    = "AWS_PROXY"
+-   uri                     = aws_lambda_function.api_lambda.invoke_arn
 -   # ... rest of configuration
 - }
 
-# Remove the default proxy routes
-- resource "aws_apigatewayv2_route" "proxy_routes" {
--   for_each = toset(["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD"])
--   api_id    = module.http_api.api_id
--   route_key = "${each.key} /{proxy+}"
--   target    = "integrations/${aws_apigatewayv2_integration.lambda_integration.id}"
+# Remove the default catch-all proxy method
+- resource "aws_api_gateway_method" "proxy_method" {
+-   rest_api_id   = module.rest_api.api_id
+-   resource_id   = aws_api_gateway_resource.proxy_resource.id
+-   http_method   = "ANY"
 -   # ... rest of configuration
 - }
 
 # Add individual Lambda functions for each operation using the same bundle
 + resource "aws_lambda_function" "say_hello_handler" {
-+   filename         = data.archive_file.lambda_zip.output_path
++   s3_bucket         = aws_s3_object.lambda_zip.bucket
++   s3_key            = aws_s3_object.lambda_zip.key
++   s3_object_version = aws_s3_object.lambda_zip.version_id
 +   function_name    = "MyApi-SayHello"
 +   role            = aws_iam_role.lambda_execution_role.arn
 +   handler         = "sayHello.handler"  # Specific handler for this operation
@@ -515,7 +501,9 @@ Edit `packages/common/terraform/src/app/apis/my-api/my-api.tf`:
 + }
 
 + resource "aws_lambda_function" "get_documentation_handler" {
-+   filename         = data.archive_file.lambda_zip.output_path
++   s3_bucket         = aws_s3_object.lambda_zip.bucket
++   s3_key            = aws_s3_object.lambda_zip.key
++   s3_object_version = aws_s3_object.lambda_zip.version_id
 +   function_name    = "MyApi-GetDocumentation"
 +   role            = aws_iam_role.lambda_execution_role.arn
 +   handler         = "getDocumentation.handler"  # Specific handler for this operation

package/docs/snippets/mcp/shared-constructs.mdx

@@ -12,9 +12,8 @@ For deploying your MCP Server, the following files are generated:
   - packages/common/constructs/src
     - app
       - mcp-servers
-        - \<project-name>
-          - \<project-name>.ts CDK construct for deploying your MCP Server
-          - Dockerfile Passthrough docker file used by the CDK construct
+        - \<mcp-server-name>
+          - \<mcp-server-name>.ts CDK construct for deploying your MCP Server
 </FileTree>
 </Fragment>
 <Fragment slot="terraform">
@@ -22,8 +21,8 @@ For deploying your MCP Server, the following files are generated:
   - packages/common/terraform/src
     - app
       - mcp-servers
-        - \<project-name>
-          - \<project-name>.tf Module for deploying your MCP Server
+        - \<mcp-server-name>
+          - \<mcp-server-name>.tf Module for deploying your MCP Server
     - core
       - agent-core
         - runtime.tf Generic module for deploying to Bedrock AgentCore Runtime

package/generators.json

@@ -72,6 +72,16 @@
         "connection/smithy-rdb",
         "connection/ts-mcp-server-rdb",
         "connection/ts-agent-rdb",
+        "connection/trpc-dynamodb",
+        "connection/smithy-dynamodb",
+        "connection/ts-mcp-server-dynamodb",
+        "connection/ts-agent-dynamodb",
+        "connection/py-fast-api-rdb",
+        "connection/py-agent-rdb",
+        "connection/py-mcp-server-rdb",
+        "connection/py-fast-api-dynamodb",
+        "connection/py-agent-dynamodb",
+        "connection/py-mcp-server-dynamodb",
         "connection/ts-agent-gateway",
         "connection/py-agent-gateway",
         "connection/agentcore-gateway-mcp",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/nx-plugin-mcp",
-  "version": "1.0.0-rc.79",
+  "version": "1.0.0-rc.80",
   "repository": {
     "type": "git",
     "url": "https://github.com/awslabs/nx-plugin-for-aws.git",

package/src/py/lambda-function/schema.json

@@ -45,7 +45,7 @@
         "CloudFormationCustomResourceCreateModel",
         "CloudFormationCustomResourceUpdateModel",
         "CloudFormationCustomResourceDeleteModel",
-        "CloudwatchLogsModel",
+        "CloudWatchLogsModel",
         "DynamoDBStreamModel",
         "EventBridgeModel",
         "IoTCoreThingEvent",

package/src/py/project/schema.json

@@ -8,6 +8,7 @@
     "name": {
       "type": "string",
       "description": "The name of the Python project",
+      "pattern": "^[a-zA-Z0-9][^:/\\\\]*$",
       "$default": {
         "$source": "argv",
         "index": 0

package/docs/get_started/tutorials/existing-project.mdx

@@ -1,4 +0,0 @@
----
-title: Usage in a existing project
-description: A tutorial on using the @aws/nx-plugin in an existing project.
----