@aws/nx-plugin-mcp 1.0.0-rc.90 → 1.0.0-rc.92

package/docs/snippets/mcp/bedrock-deployment.mdx

@@ -6,7 +6,7 @@ import Infrastructure from '@components/infrastructure.astro';
 
 ### Infrastructure as Code
 
-If you selected `agentcore` for `infra`, the relevant CDK or Terraform infrastructure is generated which you can use to deploy your MCP server to [Amazon Bedrock AgentCore Runtime](https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/agents-tools-runtime.html).
+If you selected `agentcore` or `agentcore-ecr` for `infra`, the relevant CDK or Terraform infrastructure is generated which you can use to deploy your MCP server to [Amazon Bedrock AgentCore Runtime](https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/agents-tools-runtime.html).
 
 <Infrastructure>
 <Fragment slot="cdk">
@@ -32,26 +32,43 @@ This construct uses the [`aws-cdk-lib/aws-bedrockagentcore` module](https://docs
 <Fragment slot="terraform">
 A Terraform module is generated for you, named based on the `name` you chose when running the generator, or `<ProjectName>-mcp-server` by default.
 
-Pass the shared <Link path="/guides/runtime-config#writing-configuration">`runtime_config_appconfig`</Link> module's outputs into the MCP server module:
+Pass the shared <Link path="/guides/runtime-config#writing-configuration">`runtime_config_appconfig`</Link> module's outputs into the MCP server module, along with the shared artefact store its packaging uses. Under the default `agentcore` packaging the server's code is staged in the shared asset bucket, so instantiate the `core/asset-bucket` module once per deployment, as the Lambda and API modules already do:
 
 ```terraform
+module "asset_bucket" {
+  source = "../../common/terraform/src/core/asset-bucket"
+}
+
 module "my_project_mcp_server" {
   source = "../../common/terraform/src/app/mcp-servers/my-project-mcp-server"
 
   appconfig_application_id  = module.runtime_config_appconfig.application_id
   appconfig_application_arn = module.runtime_config_appconfig.application_arn
+
+  asset_bucket_name = module.asset_bucket.bucket_name
+  asset_bucket_arn  = module.asset_bucket.bucket_arn
 }
 ```
-</Fragment>
-</Infrastructure>
 
-:::caution[Docker Required]
-[Docker](https://www.docker.com/) is required to build and deploy your MCP server. Make sure you have installed and launched Docker to avoid errors such as:
+Under `agentcore-ecr` the server's image is published to the shared asset registry instead, so pass `core/asset-ecr`'s outputs rather than the bucket's. One registry serves every container in the workspace, so no MCP server needs a repository of its own:
 
+```terraform
+module "asset_ecr" {
+  source = "../../common/terraform/src/core/asset-ecr"
+}
+
+module "my_project_mcp_server" {
+  source = "../../common/terraform/src/app/mcp-servers/my-project-mcp-server"
+
+  appconfig_application_id  = module.runtime_config_appconfig.application_id
+  appconfig_application_arn = module.runtime_config_appconfig.application_arn
+
+  asset_ecr_repository_url = module.asset_ecr.repository_url
+  asset_ecr_repository_arn = module.asset_ecr.repository_arn
+}
 ```
-ERROR: Cannot connect to the Docker daemon at unix://path/to/docker.sock.
-```
-:::
+</Fragment>
+</Infrastructure>
 
 ### Authentication
 

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

@@ -26,6 +26,10 @@ For deploying your MCP Server, the following files are generated:
     - core
       - agent-core
         - runtime.tf Generic module for deploying to Bedrock AgentCore Runtime
+      - agent-core-code (when `infra` is `agentcore`)
+        - runtime.tf Packages your MCP Server's code and delegates to `agent-core`
+      - agent-core-container (when `infra` is `agentcore-ecr`)
+        - runtime.tf Builds and publishes your MCP Server's image and delegates to `agent-core`
 </FileTree>
 </Fragment>
 </Infrastructure>

package/docs/snippets/rdb/deploying.mdx

@@ -37,7 +37,13 @@ The generated infrastructure creates two database users:
 <Fragment slot="terraform">
 The Terraform module is created in `common/terraform`. Example usage:
 
+The migration Lambda is deployed as a container image, published to the shared asset registry. Instantiate the `core/asset-ecr` module once per deployment and pass its `repository_url` into every database module:
+
 ```hcl title="packages/infra/src/main.tf"
+module "asset_ecr" {
+  source = "../../common/terraform/src/core/asset-ecr"
+}
+
 module "my_database" {
   source = "../../common/terraform/src/app/dbs/my-database"
 
@@ -46,11 +52,13 @@ module "my_database" {
   database_subnet_ids = aws_subnet.database[*].id
   lambda_subnet_ids   = aws_subnet.private[*].id
 
+  asset_ecr_repository_url = module.asset_ecr.repository_url
+
   tags = local.common_tags
 }
 ```
 
-This provisions an Aurora cluster with RDS Proxy, admin credentials, create-db-user Lambda, runtime config registration, migration Lambda, and container registry resources.
+This provisions an Aurora cluster with RDS Proxy, admin credentials, create-db-user Lambda, runtime config registration, and migration Lambda.
 
 The database module registers its connection details under the `database` <Link path="guides/runtime-config">runtime configuration</Link> namespace, which the shared runtime configuration AppConfig application exposes by default.
 

package/package.json

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

package/src/py/agent/schema.json

@@ -55,9 +55,9 @@
     },
     "infra": {
       "type": "string",
-      "description": "The type of infrastructure to host your Agent.",
+      "description": "The type of infrastructure to host your Agent. agentcore deploys your code as a zip to an AgentCore managed runtime for the fastest build and deploy cycle. agentcore-ecr builds and hosts a container image instead, for OS-level control or an established container pipeline.",
       "x-prompt": "How would you like to host your Agent server?",
-      "enum": ["agentcore", "none"],
+      "enum": ["agentcore", "agentcore-ecr", "none"],
       "default": "agentcore",
       "x-priority": "important"
     },

package/src/py/mcp-server/schema.json

@@ -39,9 +39,9 @@
     },
     "infra": {
       "type": "string",
-      "description": "The type of infrastructure to host your MCP server. Select none for no hosting.",
+      "description": "The type of infrastructure to host your MCP server. agentcore deploys your code as a zip to an AgentCore managed runtime for the fastest build and deploy cycle. agentcore-ecr builds and hosts a container image instead, for OS-level control or an established container pipeline. Select none for no hosting.",
       "x-prompt": "How would you like to host your MCP server?",
-      "enum": ["agentcore", "none"],
+      "enum": ["agentcore", "agentcore-ecr", "none"],
       "default": "agentcore",
       "x-priority": "important"
     },

package/src/ts/agent/schema.json

@@ -55,9 +55,9 @@
     },
     "infra": {
       "type": "string",
-      "description": "The type of infrastructure to host your Agent.",
+      "description": "The type of infrastructure to host your Agent. agentcore deploys your code as a zip to an AgentCore managed runtime for the fastest build and deploy cycle. agentcore-ecr builds and hosts a container image instead, for OS-level control or an established container pipeline.",
       "x-prompt": "How would you like to host your Agent server?",
-      "enum": ["agentcore", "none"],
+      "enum": ["agentcore", "agentcore-ecr", "none"],
       "default": "agentcore",
       "x-priority": "important"
     },

package/src/ts/mcp-server/schema.json

@@ -39,9 +39,9 @@
     },
     "infra": {
       "type": "string",
-      "description": "The type of infrastructure to host your MCP server. Select none for no hosting.",
+      "description": "The type of infrastructure to host your MCP server. agentcore deploys your code as a zip to an AgentCore managed runtime for the fastest build and deploy cycle. agentcore-ecr builds and hosts a container image instead, for OS-level control or an established container pipeline. Select none for no hosting.",
       "x-prompt": "How would you like to host your MCP server?",
-      "enum": ["agentcore", "none"],
+      "enum": ["agentcore", "agentcore-ecr", "none"],
       "default": "agentcore",
       "x-priority": "important"
     },