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

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/__snapshots__/generator.spec.ts.snap

@@ -157,10 +157,6 @@ exports[`ts#mcp-server generator > should match snapshot for Terraform generated
       source  = "hashicorp/aws"
       version = "6.62.0"
     }
-    external = {
-      source  = "hashicorp/external"
-      version = "2.4.1"
-    }
     null = {
       source  = "hashicorp/null"
       version = "3.3.1"
@@ -204,9 +200,36 @@ variable "authorizer_configuration" {
   default = null
 }
 
-variable "docker_image_tag" {
-  description = "Name of the docker image tag to use as the agent core runtime"
-  type        = string
+variable "container_configuration" {
+  description = "Container artifact for this runtime. Set exactly one of this or \`code_configuration\`; the \`agent-core-container\` module renders it."
+  type = object({
+    container_uri = string
+  })
+  default = null
+}
+
+variable "code_configuration" {
+  description = "Code artifact for this runtime. Set exactly one of this or \`container_configuration\`; the \`agent-core-code\` module renders it."
+  type = object({
+    entry_point = list(string)
+    runtime     = string
+    s3_bucket   = string
+    s3_key      = string
+  })
+  default = null
+
+  validation {
+    # Evaluated at plan time, since Terraform defers validation that reads
+    # another variable.
+    condition     = (var.code_configuration == null) != (var.container_configuration == null)
+    error_message = "Set exactly one of code_configuration or container_configuration."
+  }
+}
+
+variable "artifact_dependencies" {
+  description = "Resources the artifact is produced by (an image push or a code upload), so the runtime is created only once they exist."
+  type        = list(any)
+  default     = []
 }
 
 variable "env" {
@@ -269,47 +292,6 @@ resource "random_id" "unique_suffix" {
   byte_length = 4
 }
 
-# ECR Repository
-resource "aws_ecr_repository" "agent_core_repository" {
-  #checkov:skip=CKV_AWS_136:AES256 encryption is sufficient for ECR repositories
-  name = "\${lower(var.agent_runtime_name)}_repository_\${random_id.unique_suffix.hex}"
-
-  image_tag_mutability = "IMMUTABLE"
-  force_delete         = true
-
-  image_scanning_configuration {
-    scan_on_push = true
-  }
-
-  tags = var.tags
-}
-
-# ECR Repository Policy
-resource "aws_ecr_repository_policy" "agent_core_ecr_policy" {
-  repository = aws_ecr_repository.agent_core_repository.name
-
-  policy = jsonencode({
-    Version = "2012-10-17"
-    Statement = [
-      {
-        Sid    = "AllowPushPull"
-        Effect = "Allow"
-        Principal = {
-          AWS = "arn:aws:iam::\${local.aws_account_id}:root"
-        }
-        Action = [
-          "ecr:GetDownloadUrlForLayer",
-          "ecr:BatchGetImage",
-          "ecr:BatchCheckLayerAvailability",
-          "ecr:PutImage",
-          "ecr:InitiateLayerUpload",
-          "ecr:UploadLayerPart",
-          "ecr:CompleteLayerUpload"
-        ]
-      }
-    ]
-  })
-}
 
 # IAM Role for Agent Core Runtime
 resource "aws_iam_role" "agent_core_runtime_role" {
@@ -348,27 +330,6 @@ resource "aws_iam_policy" "agent_core_runtime_policy" {
   policy = jsonencode({
     Version = "2012-10-17"
     Statement = concat([
-      {
-        Sid    = "ECRImageAccess"
-        Effect = "Allow"
-        Action = [
-          "ecr:BatchGetImage",
-          "ecr:GetDownloadUrlForLayer"
-        ]
-        Resource = [
-          aws_ecr_repository.agent_core_repository.arn
-        ]
-      },
-      {
-        Sid    = "ECRTokenAccess"
-        Effect = "Allow"
-        Action = [
-          "ecr:GetAuthorizationToken"
-        ]
-        Resource = [
-          "*"
-        ]
-      },
       {
         "Effect" : "Allow",
         "Action" : [
@@ -443,46 +404,6 @@ resource "aws_iam_role_policy_attachment" "agent_core_policy" {
   policy_arn = aws_iam_policy.agent_core_runtime_policy.arn
 }
 
-# Data source to get container image digest
-data "external" "docker_digest" {
-  program = ["sh", "-c", "echo '{\\"digest\\":\\"'$(docker inspect \${var.docker_image_tag} --format '{{.Id}}')'\\"}' "]
-}
-
-locals {
-  # Content-based, immutable image tag derived from the local image digest
-  image_tag = replace(data.external.docker_digest.result.digest, "sha256:", "")
-}
-
-# Null resource for container image publish
-resource "null_resource" "docker_publish" {
-  triggers = {
-    docker_digest    = data.external.docker_digest.result.digest
-    repository_url   = aws_ecr_repository.agent_core_repository.repository_url
-    docker_image_tag = var.docker_image_tag
-    image_tag        = local.image_tag
-  }
-
-  provisioner "local-exec" {
-    command = <<-EOT
-      # Get ECR login token
-      aws ecr get-login-password --region "$AWS_REGION" | docker login --username AWS --password-stdin "$REPOSITORY_URL"
-
-      # Tag the image with the immutable content-based tag
-      docker tag "$DOCKER_IMAGE_TAG" "$REPOSITORY_URL:$IMAGE_TAG"
-
-      # Push the image
-      docker push "$REPOSITORY_URL:$IMAGE_TAG"
-    EOT
-    environment = {
-      AWS_REGION       = local.aws_region
-      REPOSITORY_URL   = self.triggers.repository_url
-      DOCKER_IMAGE_TAG = self.triggers.docker_image_tag
-      IMAGE_TAG        = self.triggers.image_tag
-    }
-  }
-
-  depends_on = [aws_ecr_repository_policy.agent_core_ecr_policy]
-}
 
 # Security group for the agent core runtime, used when running inside a VPC
 resource "aws_security_group" "agent_core_runtime" {
@@ -513,8 +434,26 @@ resource "aws_bedrockagentcore_agent_runtime" "agent_runtime" {
   role_arn           = aws_iam_role.agent_core_runtime_role.arn
 
   agent_runtime_artifact {
-    container_configuration {
-      container_uri = "\${aws_ecr_repository.agent_core_repository.repository_url}:\${local.image_tag}"
+    dynamic "container_configuration" {
+      for_each = var.container_configuration != null ? [var.container_configuration] : []
+      content {
+        container_uri = container_configuration.value.container_uri
+      }
+    }
+
+    dynamic "code_configuration" {
+      for_each = var.code_configuration != null ? [var.code_configuration] : []
+      content {
+        entry_point = code_configuration.value.entry_point
+        runtime     = code_configuration.value.runtime
+
+        code {
+          s3 {
+            bucket = code_configuration.value.s3_bucket
+            prefix = code_configuration.value.s3_key
+          }
+        }
+      }
     }
   }
 
@@ -558,7 +497,7 @@ resource "aws_bedrockagentcore_agent_runtime" "agent_runtime" {
   tags = var.tags
 
   depends_on = [
-    null_resource.docker_publish,
+    var.artifact_dependencies,
     aws_iam_role_policy_attachment.agent_core_policy
   ]
 }
@@ -575,7 +514,7 @@ resource "null_resource" "runtime_ready" {
 
   provisioner "local-exec" {
     command = <<-EOT
-      uv run --with boto3==1.43.82 python -c "
+      uv run --with boto3==1.43.83 python -c "
 import boto3
 import json
 import os
@@ -716,15 +655,27 @@ variable "appconfig_application_id" {
   type        = string
 }
 
+variable "asset_ecr_repository_url" {
+  description = "URL of the shared asset ECR repository the agent's image is published to. Instantiate the \`core/asset-ecr\` module once per deployment and pass its \`repository_url\` output here."
+  type        = string
+}
+
+variable "asset_ecr_repository_arn" {
+  description = "ARN of the shared asset ECR repository (from \`core/asset-ecr.repository_arn\`), used to scope the runtime's image pull grant to it."
+  type        = string
+}
+
 variable "appconfig_application_arn" {
   description = "ARN of the shared runtime-config AppConfig application (from \`core/runtime-config/appconfig.application_arn\`). Used to scope the IAM read permission granted to the agent runtime."
   type        = string
 }
 
 module "agent_core_runtime" {
-  source = "../../../core/agent-core"
+  source = "../../../core/agent-core-container"
   agent_runtime_name = "TerraformSnapshotServer"
   docker_image_tag = "proj-terraform-snapshot-server:latest"
+  asset_ecr_repository_url = var.asset_ecr_repository_url
+  asset_ecr_repository_arn = var.asset_ecr_repository_arn
   server_protocol = "MCP"
   enable_vpc = var.enable_vpc
   vpc_id = var.vpc_id

package/src/ts/mcp-server/generator.d.ts

@@ -5,12 +5,17 @@
 import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import { type NxGeneratorInfo } from '../../utils/nx.js';
 import type { IacMetadata } from '../../utils/shared-constructs-constants.js';
-import type { TsMcpServerGeneratorSchema } from './schema';
+import type { TsMcpServerGeneratorSchema, TsMcpServerInfra } from './schema';
 /** The metadata this generator records, which its predicates read. */
 export interface TsMcpServerMetadata extends IacMetadata {
     readonly port: number;
     readonly rc: string;
     readonly auth: string;
+    /**
+     * How this component is packaged and hosted, so a consumer can tell a
+     * code-packaged runtime from a container-packaged one without re-deriving it.
+     */
+    readonly infra: TsMcpServerInfra;
 }
 export declare const DEPENDENCIES: import("../../utils/declared-dependencies.js").DependencyDeclaration<readonly [{
     readonly name: "@modelcontextprotocol/sdk";
@@ -99,6 +104,26 @@ export declare const DEPENDENCIES: import("../../utils/declared-dependencies.js"
     readonly name: "@opentelemetry/propagator-jaeger";
 } & {
     versionOnly: true;
+}, {
+    readonly name: "ncp";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "rimraf";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "make-dir-cli";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "cpy-cli";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "@aws/aws-distro-opentelemetry-node-autoinstrumentation";
+} & {
+    versionOnly: true;
 }], readonly [{
     readonly name: "boto3";
     readonly when: (m: IacMetadata) => boolean;

package/src/ts/mcp-server/generator.js

@@ -4,6 +4,7 @@
  */ import { detectPackageManager, generateFiles, joinPathFragments, OverwriteStrategy, readJson, updateJson, updateProjectConfiguration } from "@nx/devkit";
 import { addTsDependencies } from "../../utils/add-dependencies.js";
 import { AGENT_CORE_CONSTRUCTS_PY_DEPENDENCIES, addMcpServerInfra } from "../../utils/agent-core-constructs/agent-core-constructs.js";
+import { addTypeScriptCodePackageTarget, agentCoreNodeRuntime, CODE_PACKAGE_DEPENDENCIES, isAgentCoreHosted, isContainerHosted } from "../../utils/agent-core-packaging.js";
 import { addTypeScriptBundleTarget, BUNDLE_DEPENDENCIES } from "../../utils/bundle/bundle.js";
 import { resolveContainers } from "../../utils/containers.js";
 import { declareDependencies, ownedElsewhere } from "../../utils/declared-dependencies.js";
@@ -59,7 +60,8 @@ export const DEPENDENCIES = declareDependencies()({
         ...ownedElsewhere(DOCKER_DEPENDENCIES),
         ...ownedElsewhere(SHARED_CONSTRUCTS_DEPENDENCIES),
         ...ownedElsewhere(NODE_IMAGE_DEPENDENCIES),
-        ...ownedElsewhere(ADOT_IMAGE_DEPENDENCIES)
+        ...ownedElsewhere(ADOT_IMAGE_DEPENDENCIES),
+        ...ownedElsewhere(CODE_PACKAGE_DEPENDENCIES)
     ],
     py: ownedElsewhere(AGENT_CORE_CONSTRUCTS_PY_DEPENDENCIES)
 });
@@ -90,8 +92,7 @@ export const tsMcpServerGenerator = async (tree, options)=>{
     // Generate esm if the project's package.json is `type: module`, falling
     // back to the workspace format when the project has no manifest.
     const esm = tree.exists(projectPackageJsonPath) ? readJson(tree, projectPackageJsonPath).type === 'module' : isEsmWorkspace(tree);
-    // Generate example server
-    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), targetSourceDir, {
+    const templateContext = {
         name,
         esm,
         distDir,
@@ -99,11 +100,14 @@ export const tsMcpServerGenerator = async (tree, options)=>{
         jaegerVersion: TS_VERSIONS['@opentelemetry/propagator-jaeger'],
         nodeBaseImage: BASE_IMAGES.node,
         ...nodeImageVersions()
-    }, {
+    };
+    // Generate example server
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'app'), targetSourceDir, templateContext, {
         overwriteStrategy: OverwriteStrategy.KeepExisting
     });
     // Add hosting based on infra
-    if (infra === 'agentcore') {
+    if (isAgentCoreHosted(infra)) {
+        const container = isContainerHosted(infra);
         const containers = await resolveContainers(tree, 'inherit');
         const dockerImageTag = `${getNpmScope(tree)}-${name}:latest`;
         // Add bundle target
@@ -111,34 +115,61 @@ export const tsMcpServerGenerator = async (tree, options)=>{
             targetFilePath: `${targetSourceDirRelativeToProjectRoot}/http.ts`,
             bundleOutputDir: joinPathFragments('mcp', name)
         }, DEPENDENCIES);
-        const dockerOutputDir = joinPathFragments('dist', project.root, 'bundle', 'mcp', name);
-        const dockerTargetName = `${mcpTargetPrefix}-docker`;
-        const fs = new FsCommands(tree, DEPENDENCIES);
-        project.targets[dockerTargetName] = {
-            cache: IMAGE_BUILD_CACHE,
-            executor: 'nx:run-commands',
-            options: {
-                commands: [
-                    fs.cp(`${targetSourceDir}/Dockerfile`, `${dockerOutputDir}/Dockerfile`),
-                    `${containers} build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`
-                ],
-                parallel: false
-            },
-            dependsOn: [
-                'bundle'
-            ]
-        };
-        addDependencyToTargetIfNotPresent(project, 'docker', dockerTargetName);
-        addArtifactDependencyToTargets(project, 'docker');
-        addDockerScanTarget(tree, {
-            project,
-            containerEngine: containers,
-            trivyTargetName: `${mcpTargetPrefix}-trivy`,
-            dockerTargetName,
-            imageTags: [
-                dockerImageTag
-            ]
-        }, DEPENDENCIES);
+        const bundleOutputDir = joinPathFragments('dist', project.root, 'bundle', 'mcp', name);
+        let artifact;
+        if (container) {
+            // Add the Dockerfile
+            generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'deploy'), targetSourceDir, templateContext, {
+                overwriteStrategy: OverwriteStrategy.KeepExisting
+            });
+            const dockerTargetName = `${mcpTargetPrefix}-docker`;
+            const fs = new FsCommands(tree, DEPENDENCIES);
+            project.targets[dockerTargetName] = {
+                cache: IMAGE_BUILD_CACHE,
+                executor: 'nx:run-commands',
+                options: {
+                    commands: [
+                        fs.cp(`${targetSourceDir}/Dockerfile`, `${bundleOutputDir}/Dockerfile`),
+                        `${containers} build --platform linux/arm64 -t ${dockerImageTag} ${bundleOutputDir}`
+                    ],
+                    parallel: false
+                },
+                dependsOn: [
+                    'bundle'
+                ]
+            };
+            addDependencyToTargetIfNotPresent(project, 'docker', dockerTargetName);
+            addArtifactDependencyToTargets(project, 'docker');
+            addDockerScanTarget(tree, {
+                project,
+                containerEngine: containers,
+                trivyTargetName: `${mcpTargetPrefix}-trivy`,
+                dockerTargetName,
+                imageTags: [
+                    dockerImageTag
+                ]
+            }, DEPENDENCIES);
+            artifact = {
+                type: 'container',
+                dockerImageTag,
+                outputDir: bundleOutputDir
+            };
+        } else {
+            const packageOutputDir = joinPathFragments('dist', project.root, 'package', 'mcp', name);
+            addTypeScriptCodePackageTarget(tree, {
+                project,
+                targetName: `${mcpTargetPrefix}-package`,
+                bundleTargetName: 'bundle',
+                bundleOutputDir,
+                packageOutputDir
+            }, DEPENDENCIES);
+            artifact = {
+                type: 'code',
+                outputDir: packageOutputDir,
+                runtime: agentCoreNodeRuntime(),
+                entryPoint: 'index.js'
+            };
+        }
         // Add shared constructs
         await sharedConstructsGenerator(tree, {
             iac
@@ -148,15 +179,11 @@ export const tsMcpServerGenerator = async (tree, options)=>{
             mcpServerNameKebabCase: name,
             mcpServerNameClassName,
             projectName: project.name,
-            dockerImageTag,
-            dockerOutputDir,
+            artifact,
             iac,
             auth,
             containers
         });
-    } else {
-        // No Dockerfile needed for non-hosted MCP
-        tree.delete(joinPathFragments(targetSourceDir, 'Dockerfile'));
     }
     // @modelcontextprotocol/sdk declares zod as a peer dependency with a wide range
     // (^3.25 || ^4.0). Yarn does not dedupe the peer to the workspace's pinned zod, so
@@ -186,6 +213,7 @@ export const tsMcpServerGenerator = async (tree, options)=>{
     // Recorded below and read by the declaration's predicates, so the packages
     // added here are exactly the ones the version sync will own.
     const metadata = {
+        infra,
         port: localDevPort,
         rc: mcpServerNameClassName,
         auth,

package/src/ts/mcp-server/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/mcp-server/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  detectPackageManager,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  readJson,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { addTsDependencies } from '../../utils/add-dependencies.js';\nimport {\n  AGENT_CORE_CONSTRUCTS_PY_DEPENDENCIES,\n  addMcpServerInfra,\n} from '../../utils/agent-core-constructs/agent-core-constructs.js';\nimport {\n  addTypeScriptBundleTarget,\n  BUNDLE_DEPENDENCIES,\n} from '../../utils/bundle/bundle.js';\nimport { resolveContainers } from '../../utils/containers.js';\nimport {\n  declareDependencies,\n  ownedElsewhere,\n} from '../../utils/declared-dependencies.js';\nimport {\n  ADOT_IMAGE_DEPENDENCIES,\n  addDockerScanTarget,\n  DOCKER_DEPENDENCIES,\n  IMAGE_BUILD_CACHE,\n  NODE_IMAGE_DEPENDENCIES,\n  nodeImageVersions,\n} from '../../utils/docker.js';\nimport { formatFilesInSubtree } from '../../utils/format.js';\nimport { FS_DEPENDENCIES, FsCommands } from '../../utils/fs.js';\nimport { resolveIac } from '../../utils/iac.js';\nimport { installDependencies } from '../../utils/install.js';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics.js';\nimport { isEsmWorkspace } from '../../utils/module-format.js';\nimport { kebabCase, toClassName } from '../../utils/names.js';\nimport { getNpmScope } from '../../utils/npm-scope.js';\nimport {\n  addArtifactDependencyToTargets,\n  addComponentDevTarget,\n  addComponentGeneratorMetadata,\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx.js';\nimport { sortObjectKeys } from '../../utils/object.js';\nimport { registerPnpmBuiltDependencies } from '../../utils/pnpm-workspace.js';\nimport { assignPort } from '../../utils/port.js';\nimport {\n  SHARED_CONSTRUCTS_DEPENDENCIES,\n  sharedConstructsGenerator,\n} from '../../utils/shared-constructs.js';\nimport type { IacMetadata } from '../../utils/shared-constructs-constants.js';\nimport { BASE_IMAGES, TS_VERSIONS } from '../../utils/versions.js';\nimport type { TsMcpServerGeneratorSchema } from './schema';\n\n/** The metadata this generator records, which its predicates read. */\nexport interface TsMcpServerMetadata extends IacMetadata {\n  readonly port: number;\n  readonly rc: string;\n  readonly auth: string;\n}\n\nexport const DEPENDENCIES = declareDependencies<TsMcpServerMetadata>()({\n  ts: [\n    { name: '@modelcontextprotocol/sdk' },\n    { name: 'zod' },\n    { name: 'express' },\n    { name: '@aws-lambda-powertools/parameters' },\n    { name: '@aws-sdk/client-appconfigdata' },\n    { name: '@types/express', dev: true },\n    // tsx (local dev) and the MCP inspector are shared tooling.\n    { name: 'tsx', dev: true, root: true },\n    { name: '@modelcontextprotocol/inspector', dev: true, root: true },\n    ...ownedElsewhere(FS_DEPENDENCIES),\n    ...ownedElsewhere(BUNDLE_DEPENDENCIES),\n    ...ownedElsewhere(DOCKER_DEPENDENCIES),\n    ...ownedElsewhere(SHARED_CONSTRUCTS_DEPENDENCIES),\n    ...ownedElsewhere(NODE_IMAGE_DEPENDENCIES),\n    ...ownedElsewhere(ADOT_IMAGE_DEPENDENCIES),\n  ],\n  py: ownedElsewhere(AGENT_CORE_CONSTRUCTS_PY_DEPENDENCIES),\n});\n\nexport const TS_MCP_SERVER_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsMcpServerGenerator = async (\n  tree: Tree,\n  options: TsMcpServerGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const project = readProjectConfigurationUnqualified(tree, options.project);\n\n  if (!tree.exists(joinPathFragments(project.root, 'tsconfig.json'))) {\n    throw new Error(\n      `Unsupported project ${options.project}. Expected a TypeScript project (with a tsconfig.json)`,\n    );\n  }\n\n  const defaultName = `${kebabCase(project.name.split('/').pop())}-mcp-server`;\n  const name = kebabCase(options.name || defaultName);\n  const mcpServerNameClassName = toClassName(name);\n  const mcpTargetPrefix = options.name ? name : 'mcp-server';\n  const targetSourceDirRelativeToProjectRoot = joinPathFragments(\n    'src',\n    mcpTargetPrefix,\n  );\n  const targetSourceDir = joinPathFragments(\n    project.root,\n    targetSourceDirRelativeToProjectRoot,\n  );\n  const relativeSourceDir = targetSourceDir.replace(project.root + '/', './');\n  const distDir = joinPathFragments('dist', project.root);\n\n  const infra = options.infra ?? 'agentcore';\n\n  // Recorded in the metadata below so the version sync can tell a CDK\n  // project from a Terraform one; undefined when no infrastructure was\n  // generated, in which case neither provider's packages were added.\n  const iac =\n    infra !== 'none' ? await resolveIac(tree, options.iac) : undefined;\n\n  if (infra === 'none' && options.auth && options.auth !== 'iam') {\n    console.warn(\n      'Warning: auth is ignored when no infrastructure is configured (no infrastructure is generated)',\n    );\n  }\n\n  const auth = options.auth ?? 'iam';\n\n  const projectPackageJsonPath = joinPathFragments(\n    project.root,\n    'package.json',\n  );\n\n  // Generate esm if the project's package.json is `type: module`, falling\n  // back to the workspace format when the project has no manifest.\n  const esm = tree.exists(projectPackageJsonPath)\n    ? readJson(tree, projectPackageJsonPath).type === 'module'\n    : isEsmWorkspace(tree);\n\n  // Generate example server\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    targetSourceDir,\n    {\n      name,\n      esm,\n      distDir,\n      adotVersion:\n        TS_VERSIONS['@aws/aws-distro-opentelemetry-node-autoinstrumentation'],\n      jaegerVersion: TS_VERSIONS['@opentelemetry/propagator-jaeger'],\n      nodeBaseImage: BASE_IMAGES.node,\n      ...nodeImageVersions(),\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Add hosting based on infra\n  if (infra === 'agentcore') {\n    const containers = await resolveContainers(tree, 'inherit');\n    const dockerImageTag = `${getNpmScope(tree)}-${name}:latest`;\n\n    // Add bundle target\n    await addTypeScriptBundleTarget(\n      tree,\n      project,\n      {\n        targetFilePath: `${targetSourceDirRelativeToProjectRoot}/http.ts`,\n        bundleOutputDir: joinPathFragments('mcp', name),\n      },\n      DEPENDENCIES,\n    );\n\n    const dockerOutputDir = joinPathFragments(\n      'dist',\n      project.root,\n      'bundle',\n      'mcp',\n      name,\n    );\n    const dockerTargetName = `${mcpTargetPrefix}-docker`;\n\n    const fs = new FsCommands(tree, DEPENDENCIES);\n    project.targets[dockerTargetName] = {\n      cache: IMAGE_BUILD_CACHE,\n      executor: 'nx:run-commands',\n      options: {\n        commands: [\n          fs.cp(\n            `${targetSourceDir}/Dockerfile`,\n            `${dockerOutputDir}/Dockerfile`,\n          ),\n          `${containers} build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`,\n        ],\n        parallel: false,\n      },\n      dependsOn: ['bundle'],\n    };\n\n    addDependencyToTargetIfNotPresent(project, 'docker', dockerTargetName);\n    addArtifactDependencyToTargets(project, 'docker');\n\n    addDockerScanTarget(\n      tree,\n      {\n        project,\n        containerEngine: containers,\n        trivyTargetName: `${mcpTargetPrefix}-trivy`,\n        dockerTargetName,\n        imageTags: [dockerImageTag],\n      },\n      DEPENDENCIES,\n    );\n\n    // Add shared constructs\n    await sharedConstructsGenerator(tree, { iac }, DEPENDENCIES);\n\n    // Add the construct to deploy the mcp server\n    await addMcpServerInfra(tree, {\n      mcpServerNameKebabCase: name,\n      mcpServerNameClassName,\n      projectName: project.name,\n      dockerImageTag,\n      dockerOutputDir,\n      iac,\n      auth,\n      containers,\n    });\n  } else {\n    // No Dockerfile needed for non-hosted MCP\n    tree.delete(joinPathFragments(targetSourceDir, 'Dockerfile'));\n  }\n\n  // @modelcontextprotocol/sdk declares zod as a peer dependency with a wide range\n  // (^3.25 || ^4.0). Yarn does not dedupe the peer to the workspace's pinned zod, so\n  // without a resolution it installs a separate zod under the SDK's own node_modules.\n  // The two zod copies have structurally incompatible types, which breaks type\n  // inference for registerTool inputSchema. Scope the resolution to the SDK so\n  // other consumers (e.g. @tanstack/router-generator pinning zod@3) are unaffected.\n  // Classic yarn only honours the `**/`-prefixed descriptor in a workspace, and\n  // berry only the bare one — it deletes a glob descriptor on install — so\n  // declare both.\n  if (detectPackageManager() === 'yarn') {\n    updateJson(tree, 'package.json', (packageJson) => {\n      packageJson.resolutions = {\n        ...packageJson.resolutions,\n        '**/@modelcontextprotocol/sdk/zod': TS_VERSIONS['zod'],\n        '@modelcontextprotocol/sdk/zod': TS_VERSIONS['zod'],\n      };\n      return packageJson;\n    });\n  }\n\n  const localDevPort = assignPort(tree, project, 8000, {\n    component: { info: TS_MCP_SERVER_GENERATOR_INFO, name: mcpTargetPrefix },\n  });\n\n  // Recorded below and read by the declaration's predicates, so the packages\n  // added here are exactly the ones the version sync will own.\n  const metadata: TsMcpServerMetadata = {\n    port: localDevPort,\n    rc: mcpServerNameClassName,\n    auth,\n    ...(iac ? { iac } : {}),\n  };\n\n  // The MCP inspector has a postinstall script that cascades installs into its\n  // client packages, which no-ops when the package is installed as a dependency.\n  // Register it as an explicitly-rejected build so pnpm 11's default\n  // `strictDepBuilds=true` skips it instead of failing the install.\n  registerPnpmBuiltDependencies(tree, {\n    '@modelcontextprotocol/inspector': false,\n  });\n\n  addTsDependencies(tree, DEPENDENCIES, {\n    metadata,\n    projectRoot: project.root,\n  });\n\n  const mcpTargets = {\n    ...project.targets,\n    // Add targets for running the MCP server\n    [`${mcpTargetPrefix}-serve-stdio`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`tsx --watch ${relativeSourceDir}/stdio.ts`],\n        cwd: '{projectRoot}',\n      },\n    },\n    [`${mcpTargetPrefix}-serve`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`tsx --watch ${relativeSourceDir}/http.ts`],\n        cwd: '{projectRoot}',\n        env: {\n          PORT: `${localDevPort}`,\n        },\n      },\n    },\n    [`${mcpTargetPrefix}-dev`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`tsx --watch ${relativeSourceDir}/http.ts`],\n        cwd: '{projectRoot}',\n        env: {\n          PORT: `${localDevPort}`,\n          LOCAL_DEV: 'true',\n        },\n      },\n    },\n    [`${mcpTargetPrefix}-inspect`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      // Launch the inspector against the locally served HTTP server. The dev\n      // target starts the server and any connected dependencies (e.g. a local\n      // database).\n      dependsOn: [`${mcpTargetPrefix}-dev`],\n      options: {\n        commands: [\n          `mcp-inspector --transport http --server-url http://localhost:${localDevPort}/mcp`,\n        ],\n        cwd: '{projectRoot}',\n      },\n    },\n    [`${mcpTargetPrefix}-inspect-stdio`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [\n          `mcp-inspector -- tsx --watch ${relativeSourceDir}/stdio.ts`,\n        ],\n        cwd: '{projectRoot}',\n      },\n    },\n  };\n\n  // Aggregate `<mcp>-dev` under the project-level `dev` target.\n  addComponentDevTarget(mcpTargets, `${mcpTargetPrefix}-dev`);\n\n  updateProjectConfiguration(tree, project.name, {\n    ...project,\n    // Sort targets so their order is stable regardless of insertion order on\n    // first run vs re-run.\n    targets: sortObjectKeys(mcpTargets),\n  });\n\n  addComponentGeneratorMetadata(\n    tree,\n    project.name,\n    TS_MCP_SERVER_GENERATOR_INFO,\n    targetSourceDirRelativeToProjectRoot,\n    mcpTargetPrefix,\n    metadata,\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_MCP_SERVER_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsMcpServerGenerator;\n"],"names":["detectPackageManager","generateFiles","joinPathFragments","OverwriteStrategy","readJson","updateJson","updateProjectConfiguration","addTsDependencies","AGENT_CORE_CONSTRUCTS_PY_DEPENDENCIES","addMcpServerInfra","addTypeScriptBundleTarget","BUNDLE_DEPENDENCIES","resolveContainers","declareDependencies","ownedElsewhere","ADOT_IMAGE_DEPENDENCIES","addDockerScanTarget","DOCKER_DEPENDENCIES","IMAGE_BUILD_CACHE","NODE_IMAGE_DEPENDENCIES","nodeImageVersions","formatFilesInSubtree","FS_DEPENDENCIES","FsCommands","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","isEsmWorkspace","kebabCase","toClassName","getNpmScope","addArtifactDependencyToTargets","addComponentDevTarget","addComponentGeneratorMetadata","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","registerPnpmBuiltDependencies","assignPort","SHARED_CONSTRUCTS_DEPENDENCIES","sharedConstructsGenerator","BASE_IMAGES","TS_VERSIONS","DEPENDENCIES","ts","name","dev","root","py","TS_MCP_SERVER_GENERATOR_INFO","filename","tsMcpServerGenerator","tree","options","project","exists","Error","defaultName","split","pop","mcpServerNameClassName","mcpTargetPrefix","targetSourceDirRelativeToProjectRoot","targetSourceDir","relativeSourceDir","replace","distDir","infra","iac","undefined","auth","console","warn","projectPackageJsonPath","esm","type","dirname","adotVersion","jaegerVersion","nodeBaseImage","node","overwriteStrategy","KeepExisting","containers","dockerImageTag","targetFilePath","bundleOutputDir","dockerOutputDir","dockerTargetName","fs","targets","cache","executor","commands","cp","parallel","dependsOn","containerEngine","trivyTargetName","imageTags","mcpServerNameKebabCase","projectName","delete","packageJson","resolutions","localDevPort","component","info","metadata","port","rc","projectRoot","mcpTargets","continuous","cwd","env","PORT","LOCAL_DEV","preferInstallDependencies","languages"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/mcp-server/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  detectPackageManager,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  readJson,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { addTsDependencies } from '../../utils/add-dependencies.js';\nimport {\n  AGENT_CORE_CONSTRUCTS_PY_DEPENDENCIES,\n  type AgentCoreArtifact,\n  addMcpServerInfra,\n} from '../../utils/agent-core-constructs/agent-core-constructs.js';\nimport {\n  addTypeScriptCodePackageTarget,\n  agentCoreNodeRuntime,\n  CODE_PACKAGE_DEPENDENCIES,\n  isAgentCoreHosted,\n  isContainerHosted,\n} from '../../utils/agent-core-packaging.js';\nimport {\n  addTypeScriptBundleTarget,\n  BUNDLE_DEPENDENCIES,\n} from '../../utils/bundle/bundle.js';\nimport { resolveContainers } from '../../utils/containers.js';\nimport {\n  declareDependencies,\n  ownedElsewhere,\n} from '../../utils/declared-dependencies.js';\nimport {\n  ADOT_IMAGE_DEPENDENCIES,\n  addDockerScanTarget,\n  DOCKER_DEPENDENCIES,\n  IMAGE_BUILD_CACHE,\n  NODE_IMAGE_DEPENDENCIES,\n  nodeImageVersions,\n} from '../../utils/docker.js';\nimport { formatFilesInSubtree } from '../../utils/format.js';\nimport { FS_DEPENDENCIES, FsCommands } from '../../utils/fs.js';\nimport { resolveIac } from '../../utils/iac.js';\nimport { installDependencies } from '../../utils/install.js';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics.js';\nimport { isEsmWorkspace } from '../../utils/module-format.js';\nimport { kebabCase, toClassName } from '../../utils/names.js';\nimport { getNpmScope } from '../../utils/npm-scope.js';\nimport {\n  addArtifactDependencyToTargets,\n  addComponentDevTarget,\n  addComponentGeneratorMetadata,\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx.js';\nimport { sortObjectKeys } from '../../utils/object.js';\nimport { registerPnpmBuiltDependencies } from '../../utils/pnpm-workspace.js';\nimport { assignPort } from '../../utils/port.js';\nimport {\n  SHARED_CONSTRUCTS_DEPENDENCIES,\n  sharedConstructsGenerator,\n} from '../../utils/shared-constructs.js';\nimport type { IacMetadata } from '../../utils/shared-constructs-constants.js';\nimport { BASE_IMAGES, TS_VERSIONS } from '../../utils/versions.js';\nimport type { TsMcpServerGeneratorSchema, TsMcpServerInfra } from './schema';\n\n/** The metadata this generator records, which its predicates read. */\nexport interface TsMcpServerMetadata extends IacMetadata {\n  readonly port: number;\n  readonly rc: string;\n  readonly auth: string;\n  /**\n   * How this component is packaged and hosted, so a consumer can tell a\n   * code-packaged runtime from a container-packaged one without re-deriving it.\n   */\n  readonly infra: TsMcpServerInfra;\n}\n\nexport const DEPENDENCIES = declareDependencies<TsMcpServerMetadata>()({\n  ts: [\n    { name: '@modelcontextprotocol/sdk' },\n    { name: 'zod' },\n    { name: 'express' },\n    { name: '@aws-lambda-powertools/parameters' },\n    { name: '@aws-sdk/client-appconfigdata' },\n    { name: '@types/express', dev: true },\n    // tsx (local dev) and the MCP inspector are shared tooling.\n    { name: 'tsx', dev: true, root: true },\n    { name: '@modelcontextprotocol/inspector', dev: true, root: true },\n    ...ownedElsewhere(FS_DEPENDENCIES),\n    ...ownedElsewhere(BUNDLE_DEPENDENCIES),\n    ...ownedElsewhere(DOCKER_DEPENDENCIES),\n    ...ownedElsewhere(SHARED_CONSTRUCTS_DEPENDENCIES),\n    ...ownedElsewhere(NODE_IMAGE_DEPENDENCIES),\n    ...ownedElsewhere(ADOT_IMAGE_DEPENDENCIES),\n    ...ownedElsewhere(CODE_PACKAGE_DEPENDENCIES),\n  ],\n  py: ownedElsewhere(AGENT_CORE_CONSTRUCTS_PY_DEPENDENCIES),\n});\n\nexport const TS_MCP_SERVER_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsMcpServerGenerator = async (\n  tree: Tree,\n  options: TsMcpServerGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const project = readProjectConfigurationUnqualified(tree, options.project);\n\n  if (!tree.exists(joinPathFragments(project.root, 'tsconfig.json'))) {\n    throw new Error(\n      `Unsupported project ${options.project}. Expected a TypeScript project (with a tsconfig.json)`,\n    );\n  }\n\n  const defaultName = `${kebabCase(project.name.split('/').pop())}-mcp-server`;\n  const name = kebabCase(options.name || defaultName);\n  const mcpServerNameClassName = toClassName(name);\n  const mcpTargetPrefix = options.name ? name : 'mcp-server';\n  const targetSourceDirRelativeToProjectRoot = joinPathFragments(\n    'src',\n    mcpTargetPrefix,\n  );\n  const targetSourceDir = joinPathFragments(\n    project.root,\n    targetSourceDirRelativeToProjectRoot,\n  );\n  const relativeSourceDir = targetSourceDir.replace(project.root + '/', './');\n  const distDir = joinPathFragments('dist', project.root);\n\n  const infra = options.infra ?? 'agentcore';\n\n  // Recorded in the metadata below so the version sync can tell a CDK\n  // project from a Terraform one; undefined when no infrastructure was\n  // generated, in which case neither provider's packages were added.\n  const iac =\n    infra !== 'none' ? await resolveIac(tree, options.iac) : undefined;\n\n  if (infra === 'none' && options.auth && options.auth !== 'iam') {\n    console.warn(\n      'Warning: auth is ignored when no infrastructure is configured (no infrastructure is generated)',\n    );\n  }\n\n  const auth = options.auth ?? 'iam';\n\n  const projectPackageJsonPath = joinPathFragments(\n    project.root,\n    'package.json',\n  );\n\n  // Generate esm if the project's package.json is `type: module`, falling\n  // back to the workspace format when the project has no manifest.\n  const esm = tree.exists(projectPackageJsonPath)\n    ? readJson(tree, projectPackageJsonPath).type === 'module'\n    : isEsmWorkspace(tree);\n\n  const templateContext = {\n    name,\n    esm,\n    distDir,\n    adotVersion:\n      TS_VERSIONS['@aws/aws-distro-opentelemetry-node-autoinstrumentation'],\n    jaegerVersion: TS_VERSIONS['@opentelemetry/propagator-jaeger'],\n    nodeBaseImage: BASE_IMAGES.node,\n    ...nodeImageVersions(),\n  };\n\n  // Generate example server\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'app'),\n    targetSourceDir,\n    templateContext,\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Add hosting based on infra\n  if (isAgentCoreHosted(infra)) {\n    const container = isContainerHosted(infra);\n    const containers = await resolveContainers(tree, 'inherit');\n    const dockerImageTag = `${getNpmScope(tree)}-${name}:latest`;\n\n    // Add bundle target\n    await addTypeScriptBundleTarget(\n      tree,\n      project,\n      {\n        targetFilePath: `${targetSourceDirRelativeToProjectRoot}/http.ts`,\n        bundleOutputDir: joinPathFragments('mcp', name),\n      },\n      DEPENDENCIES,\n    );\n\n    const bundleOutputDir = joinPathFragments(\n      'dist',\n      project.root,\n      'bundle',\n      'mcp',\n      name,\n    );\n\n    let artifact: AgentCoreArtifact;\n\n    if (container) {\n      // Add the Dockerfile\n      generateFiles(\n        tree,\n        joinPathFragments(import.meta.dirname, 'files', 'deploy'),\n        targetSourceDir,\n        templateContext,\n        { overwriteStrategy: OverwriteStrategy.KeepExisting },\n      );\n\n      const dockerTargetName = `${mcpTargetPrefix}-docker`;\n\n      const fs = new FsCommands(tree, DEPENDENCIES);\n      project.targets[dockerTargetName] = {\n        cache: IMAGE_BUILD_CACHE,\n        executor: 'nx:run-commands',\n        options: {\n          commands: [\n            fs.cp(\n              `${targetSourceDir}/Dockerfile`,\n              `${bundleOutputDir}/Dockerfile`,\n            ),\n            `${containers} build --platform linux/arm64 -t ${dockerImageTag} ${bundleOutputDir}`,\n          ],\n          parallel: false,\n        },\n        dependsOn: ['bundle'],\n      };\n\n      addDependencyToTargetIfNotPresent(project, 'docker', dockerTargetName);\n      addArtifactDependencyToTargets(project, 'docker');\n\n      addDockerScanTarget(\n        tree,\n        {\n          project,\n          containerEngine: containers,\n          trivyTargetName: `${mcpTargetPrefix}-trivy`,\n          dockerTargetName,\n          imageTags: [dockerImageTag],\n        },\n        DEPENDENCIES,\n      );\n\n      artifact = {\n        type: 'container',\n        dockerImageTag,\n        outputDir: bundleOutputDir,\n      };\n    } else {\n      const packageOutputDir = joinPathFragments(\n        'dist',\n        project.root,\n        'package',\n        'mcp',\n        name,\n      );\n      addTypeScriptCodePackageTarget(\n        tree,\n        {\n          project,\n          targetName: `${mcpTargetPrefix}-package`,\n          bundleTargetName: 'bundle',\n          bundleOutputDir,\n          packageOutputDir,\n        },\n        DEPENDENCIES,\n      );\n\n      artifact = {\n        type: 'code',\n        outputDir: packageOutputDir,\n        runtime: agentCoreNodeRuntime(),\n        entryPoint: 'index.js',\n      };\n    }\n\n    // Add shared constructs\n    await sharedConstructsGenerator(tree, { iac }, DEPENDENCIES);\n\n    // Add the construct to deploy the mcp server\n    await addMcpServerInfra(tree, {\n      mcpServerNameKebabCase: name,\n      mcpServerNameClassName,\n      projectName: project.name,\n      artifact,\n      iac,\n      auth,\n      containers,\n    });\n  }\n\n  // @modelcontextprotocol/sdk declares zod as a peer dependency with a wide range\n  // (^3.25 || ^4.0). Yarn does not dedupe the peer to the workspace's pinned zod, so\n  // without a resolution it installs a separate zod under the SDK's own node_modules.\n  // The two zod copies have structurally incompatible types, which breaks type\n  // inference for registerTool inputSchema. Scope the resolution to the SDK so\n  // other consumers (e.g. @tanstack/router-generator pinning zod@3) are unaffected.\n  // Classic yarn only honours the `**/`-prefixed descriptor in a workspace, and\n  // berry only the bare one — it deletes a glob descriptor on install — so\n  // declare both.\n  if (detectPackageManager() === 'yarn') {\n    updateJson(tree, 'package.json', (packageJson) => {\n      packageJson.resolutions = {\n        ...packageJson.resolutions,\n        '**/@modelcontextprotocol/sdk/zod': TS_VERSIONS['zod'],\n        '@modelcontextprotocol/sdk/zod': TS_VERSIONS['zod'],\n      };\n      return packageJson;\n    });\n  }\n\n  const localDevPort = assignPort(tree, project, 8000, {\n    component: { info: TS_MCP_SERVER_GENERATOR_INFO, name: mcpTargetPrefix },\n  });\n\n  // Recorded below and read by the declaration's predicates, so the packages\n  // added here are exactly the ones the version sync will own.\n  const metadata: TsMcpServerMetadata = {\n    infra,\n    port: localDevPort,\n    rc: mcpServerNameClassName,\n    auth,\n    ...(iac ? { iac } : {}),\n  };\n\n  // The MCP inspector has a postinstall script that cascades installs into its\n  // client packages, which no-ops when the package is installed as a dependency.\n  // Register it as an explicitly-rejected build so pnpm 11's default\n  // `strictDepBuilds=true` skips it instead of failing the install.\n  registerPnpmBuiltDependencies(tree, {\n    '@modelcontextprotocol/inspector': false,\n  });\n\n  addTsDependencies(tree, DEPENDENCIES, {\n    metadata,\n    projectRoot: project.root,\n  });\n\n  const mcpTargets = {\n    ...project.targets,\n    // Add targets for running the MCP server\n    [`${mcpTargetPrefix}-serve-stdio`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`tsx --watch ${relativeSourceDir}/stdio.ts`],\n        cwd: '{projectRoot}',\n      },\n    },\n    [`${mcpTargetPrefix}-serve`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`tsx --watch ${relativeSourceDir}/http.ts`],\n        cwd: '{projectRoot}',\n        env: {\n          PORT: `${localDevPort}`,\n        },\n      },\n    },\n    [`${mcpTargetPrefix}-dev`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`tsx --watch ${relativeSourceDir}/http.ts`],\n        cwd: '{projectRoot}',\n        env: {\n          PORT: `${localDevPort}`,\n          LOCAL_DEV: 'true',\n        },\n      },\n    },\n    [`${mcpTargetPrefix}-inspect`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      // Launch the inspector against the locally served HTTP server. The dev\n      // target starts the server and any connected dependencies (e.g. a local\n      // database).\n      dependsOn: [`${mcpTargetPrefix}-dev`],\n      options: {\n        commands: [\n          `mcp-inspector --transport http --server-url http://localhost:${localDevPort}/mcp`,\n        ],\n        cwd: '{projectRoot}',\n      },\n    },\n    [`${mcpTargetPrefix}-inspect-stdio`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [\n          `mcp-inspector -- tsx --watch ${relativeSourceDir}/stdio.ts`,\n        ],\n        cwd: '{projectRoot}',\n      },\n    },\n  };\n\n  // Aggregate `<mcp>-dev` under the project-level `dev` target.\n  addComponentDevTarget(mcpTargets, `${mcpTargetPrefix}-dev`);\n\n  updateProjectConfiguration(tree, project.name, {\n    ...project,\n    // Sort targets so their order is stable regardless of insertion order on\n    // first run vs re-run.\n    targets: sortObjectKeys(mcpTargets),\n  });\n\n  addComponentGeneratorMetadata(\n    tree,\n    project.name,\n    TS_MCP_SERVER_GENERATOR_INFO,\n    targetSourceDirRelativeToProjectRoot,\n    mcpTargetPrefix,\n    metadata,\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_MCP_SERVER_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsMcpServerGenerator;\n"],"names":["detectPackageManager","generateFiles","joinPathFragments","OverwriteStrategy","readJson","updateJson","updateProjectConfiguration","addTsDependencies","AGENT_CORE_CONSTRUCTS_PY_DEPENDENCIES","addMcpServerInfra","addTypeScriptCodePackageTarget","agentCoreNodeRuntime","CODE_PACKAGE_DEPENDENCIES","isAgentCoreHosted","isContainerHosted","addTypeScriptBundleTarget","BUNDLE_DEPENDENCIES","resolveContainers","declareDependencies","ownedElsewhere","ADOT_IMAGE_DEPENDENCIES","addDockerScanTarget","DOCKER_DEPENDENCIES","IMAGE_BUILD_CACHE","NODE_IMAGE_DEPENDENCIES","nodeImageVersions","formatFilesInSubtree","FS_DEPENDENCIES","FsCommands","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","isEsmWorkspace","kebabCase","toClassName","getNpmScope","addArtifactDependencyToTargets","addComponentDevTarget","addComponentGeneratorMetadata","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","registerPnpmBuiltDependencies","assignPort","SHARED_CONSTRUCTS_DEPENDENCIES","sharedConstructsGenerator","BASE_IMAGES","TS_VERSIONS","DEPENDENCIES","ts","name","dev","root","py","TS_MCP_SERVER_GENERATOR_INFO","filename","tsMcpServerGenerator","tree","options","project","exists","Error","defaultName","split","pop","mcpServerNameClassName","mcpTargetPrefix","targetSourceDirRelativeToProjectRoot","targetSourceDir","relativeSourceDir","replace","distDir","infra","iac","undefined","auth","console","warn","projectPackageJsonPath","esm","type","templateContext","adotVersion","jaegerVersion","nodeBaseImage","node","dirname","overwriteStrategy","KeepExisting","container","containers","dockerImageTag","targetFilePath","bundleOutputDir","artifact","dockerTargetName","fs","targets","cache","executor","commands","cp","parallel","dependsOn","containerEngine","trivyTargetName","imageTags","outputDir","packageOutputDir","targetName","bundleTargetName","runtime","entryPoint","mcpServerNameKebabCase","projectName","packageJson","resolutions","localDevPort","component","info","metadata","port","rc","projectRoot","mcpTargets","continuous","cwd","env","PORT","LOCAL_DEV","preferInstallDependencies","languages"],"mappings":"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"}

package/src/ts/mcp-server/schema.d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/mcp-server/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { IacOption } from '../../utils/iac.js';\n\nexport type TsMcpServerInfra = 'none' | 'agentcore';\n\nexport type TsMcpServerAuth = 'iam' | 'cognito';\n\nexport interface TsMcpServerGeneratorSchema {\n  project: string;\n  name?: string;\n  infra?: TsMcpServerInfra;\n  auth?: TsMcpServerAuth;\n  iac: IacOption;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAQD,WAOC"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/mcp-server/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { AgentCoreInfra } from '../../utils/agent-core-packaging.js';\nimport { IacOption } from '../../utils/iac.js';\n\nexport type TsMcpServerInfra = AgentCoreInfra;\n\nexport type TsMcpServerAuth = 'iam' | 'cognito';\n\nexport interface TsMcpServerGeneratorSchema {\n  project: string;\n  name?: string;\n  infra?: TsMcpServerInfra;\n  auth?: TsMcpServerAuth;\n  iac: IacOption;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GASD,WAOC"}

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

@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { AgentCoreInfra } from '../../utils/agent-core-packaging.js';
 import { IacOption } from '../../utils/iac.js';
 
-export type TsMcpServerInfra = 'none' | 'agentcore';
+export type TsMcpServerInfra = AgentCoreInfra;
 
 export type TsMcpServerAuth = 'iam' | 'cognito';
 

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"
     },