@aws/nx-plugin 1.0.0-rc.4 → 1.0.0-rc.41

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

@@ -1,116 +1,121 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsMcpServerGenerator = exports.TS_MCP_SERVER_GENERATOR_INFO = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const nx_1 = require("../../utils/nx");
-const metrics_1 = require("../../utils/metrics");
-const format_1 = require("../../utils/format");
-const versions_1 = require("../../utils/versions");
-const names_1 = require("../../utils/names");
-const shared_constructs_1 = require("../../utils/shared-constructs");
-const agent_core_constructs_1 = require("../../utils/agent-core-constructs/agent-core-constructs");
-const npm_scope_1 = require("../../utils/npm-scope");
-const iac_1 = require("../../utils/iac");
-const containers_1 = require("../../utils/containers");
-const bundle_1 = require("../../utils/bundle/bundle");
-const port_1 = require("../../utils/port");
-const fs_1 = require("../../utils/fs");
-exports.TS_MCP_SERVER_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const tsMcpServerGenerator = async (tree, options) => {
-    const project = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.project);
-    if (!tree.exists((0, devkit_1.joinPathFragments)(project.root, 'tsconfig.json'))) {
+ */ import { addDependenciesToPackageJson, detectPackageManager, generateFiles, joinPathFragments, OverwriteStrategy, readJson, updateJson, updateProjectConfiguration } from "@nx/devkit";
+import { ensureLicenseExceptions } from "../../license/config.js";
+import { MCP_INSPECTOR_EXCEPTIONS } from "../../license/known-exceptions.js";
+import { addMcpServerInfra } from "../../utils/agent-core-constructs/agent-core-constructs.js";
+import { addTypeScriptBundleTarget } from "../../utils/bundle/bundle.js";
+import { resolveContainers } from "../../utils/containers.js";
+import { addDockerScanTarget } from "../../utils/docker.js";
+import { formatFilesInSubtree } from "../../utils/format.js";
+import { FsCommands } from "../../utils/fs.js";
+import { resolveIac } from "../../utils/iac.js";
+import { installDependencies } from "../../utils/install.js";
+import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
+import { isEsmWorkspace } from "../../utils/module-format.js";
+import { kebabCase, toClassName } from "../../utils/names.js";
+import { getNpmScope } from "../../utils/npm-scope.js";
+import { addComponentDevTarget, addComponentGeneratorMetadata, addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../utils/nx.js";
+import { sortObjectKeys } from "../../utils/object.js";
+import { assignPort } from "../../utils/port.js";
+import { sharedConstructsGenerator } from "../../utils/shared-constructs.js";
+import { BASE_IMAGES, TS_VERSIONS, withVersions } from "../../utils/versions.js";
+export const TS_MCP_SERVER_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const tsMcpServerGenerator = async (tree, options)=>{
+    const project = readProjectConfigurationUnqualified(tree, options.project);
+    if (!tree.exists(joinPathFragments(project.root, 'tsconfig.json'))) {
         throw new Error(`Unsupported project ${options.project}. Expected a TypeScript project (with a tsconfig.json)`);
     }
-    const defaultName = `${(0, names_1.kebabCase)(project.name.split('/').pop())}-mcp-server`;
-    const name = (0, names_1.kebabCase)(options.name || defaultName);
-    const mcpServerNameClassName = (0, names_1.toClassName)(name);
+    const defaultName = `${kebabCase(project.name.split('/').pop())}-mcp-server`;
+    const name = kebabCase(options.name || defaultName);
+    const mcpServerNameClassName = toClassName(name);
     const mcpTargetPrefix = options.name ? name : 'mcp-server';
-    const targetSourceDirRelativeToProjectRoot = (0, devkit_1.joinPathFragments)('src', mcpTargetPrefix);
-    const targetSourceDir = (0, devkit_1.joinPathFragments)(project.root, targetSourceDirRelativeToProjectRoot);
+    const targetSourceDirRelativeToProjectRoot = joinPathFragments('src', mcpTargetPrefix);
+    const targetSourceDir = joinPathFragments(project.root, targetSourceDirRelativeToProjectRoot);
     const relativeSourceDir = targetSourceDir.replace(project.root + '/', './');
-    const distDir = (0, devkit_1.joinPathFragments)('dist', project.root);
+    const distDir = joinPathFragments('dist', project.root);
     const infra = options.infra ?? 'agentcore';
     if (infra === 'none' && options.auth && options.auth !== 'iam') {
         console.warn('Warning: auth is ignored when no infrastructure is configured (no infrastructure is generated)');
     }
     const auth = options.auth ?? 'iam';
-    // Create a package.json if one doesn't exist, since we want to add the server as a bin target
-    const projectPackageJsonPath = (0, devkit_1.joinPathFragments)(project.root, 'package.json');
-    if (!tree.exists(projectPackageJsonPath)) {
-        // Default to esm if no package.json found
-        (0, devkit_1.writeJson)(tree, projectPackageJsonPath, {
-            name: project.name,
-            type: 'module',
-        });
-    }
-    // Generate esm if the package.json is of type module, otherwise we generate commonjs
-    // We support commonjs here because nx plugins must be commonjs
-    // https://github.com/nrwl/nx/issues/15682
-    const esm = (0, devkit_1.readJson)(tree, projectPackageJsonPath).type === 'module';
-    // Add a target for running the MCP server with stdio transport
-    // This allows for the project to be published to npm and then configured with npx, ie:
-    // npx -p my-package mcp-server
-    (0, devkit_1.updateJson)(tree, projectPackageJsonPath, (pkg) => {
-        pkg.bin ??= {};
-        pkg.bin[name] = `${relativeSourceDir}/stdio.js`;
-        return pkg;
-    });
+    const projectPackageJsonPath = joinPathFragments(project.root, 'package.json');
+    // Generate esm if the module system is esm, otherwise commonjs. Projects
+    // don't typically have their own package.json (dependencies are declared in
+    // the workspace root), so fall back to the workspace format when absent.
+    const esm = tree.exists(projectPackageJsonPath) ? readJson(tree, projectPackageJsonPath).type === 'module' : isEsmWorkspace(tree);
     // Generate example server
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), targetSourceDir, {
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), targetSourceDir, {
         name,
         esm,
         distDir,
-        adotVersion: versions_1.TS_VERSIONS['@aws/aws-distro-opentelemetry-node-autoinstrumentation'],
-    }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+        adotVersion: TS_VERSIONS['@aws/aws-distro-opentelemetry-node-autoinstrumentation'],
+        nodeBaseImage: BASE_IMAGES.node,
+        npmVersion: TS_VERSIONS.npm
+    }, {
+        overwriteStrategy: OverwriteStrategy.KeepExisting
+    });
     // Add dependencies
-    const deps = (0, versions_1.withVersions)([
+    const deps = withVersions([
         '@modelcontextprotocol/sdk',
         'zod',
         'express',
         '@aws-lambda-powertools/parameters',
-        '@aws-sdk/client-appconfigdata',
+        '@aws-sdk/client-appconfigdata'
     ]);
-    const devDeps = (0, versions_1.withVersions)([
+    const devDeps = withVersions([
         'tsx',
         '@types/express',
-        '@modelcontextprotocol/inspector',
+        '@modelcontextprotocol/inspector'
     ]);
     // Add hosting based on infra
     if (infra === 'agentcore') {
-        const containers = await (0, containers_1.resolveContainers)(tree, 'inherit');
-        const dockerImageTag = `${(0, npm_scope_1.getNpmScope)(tree)}-${name}:latest`;
+        const containers = await resolveContainers(tree, 'inherit');
+        const dockerImageTag = `${getNpmScope(tree)}-${name}:latest`;
         // Add bundle target
-        await (0, bundle_1.addTypeScriptBundleTarget)(tree, project, {
+        await addTypeScriptBundleTarget(tree, project, {
             targetFilePath: `${targetSourceDirRelativeToProjectRoot}/http.ts`,
-            bundleOutputDir: (0, devkit_1.joinPathFragments)('mcp', name),
+            bundleOutputDir: joinPathFragments('mcp', name)
         });
-        const dockerOutputDir = (0, devkit_1.joinPathFragments)('dist', project.root, 'bundle', 'mcp', name);
+        const dockerOutputDir = joinPathFragments('dist', project.root, 'bundle', 'mcp', name);
         const dockerTargetName = `${mcpTargetPrefix}-docker`;
-        const fs = new fs_1.FsCommands(tree);
+        const fs = new FsCommands(tree);
         project.targets[dockerTargetName] = {
             cache: true,
-            outputs: [`{workspaceRoot}/${dockerOutputDir}/Dockerfile`],
+            outputs: [
+                `{workspaceRoot}/${dockerOutputDir}/Dockerfile`
+            ],
             executor: 'nx:run-commands',
             options: {
                 commands: [
                     fs.cp(`${targetSourceDir}/Dockerfile`, `${dockerOutputDir}/Dockerfile`),
-                    `${containers} build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`,
+                    `${containers} build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`
                 ],
-                parallel: false,
+                parallel: false
             },
-            dependsOn: ['bundle'],
+            dependsOn: [
+                'bundle'
+            ]
         };
-        (0, nx_1.addDependencyToTargetIfNotPresent)(project, 'docker', dockerTargetName);
-        (0, nx_1.addDependencyToTargetIfNotPresent)(project, 'build', 'docker');
+        addDependencyToTargetIfNotPresent(project, 'docker', dockerTargetName);
+        addDependencyToTargetIfNotPresent(project, 'build', 'docker');
+        addDockerScanTarget(tree, {
+            project,
+            containerEngine: containers,
+            trivyTargetName: `${mcpTargetPrefix}-trivy`,
+            dockerTargetName,
+            imageTags: [
+                dockerImageTag
+            ]
+        });
         // Add shared constructs
-        const iac = await (0, iac_1.resolveIac)(tree, options.iac);
-        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iac });
+        const iac = await resolveIac(tree, options.iac);
+        await sharedConstructsGenerator(tree, {
+            iac
+        });
         // Add the construct to deploy the mcp server
-        await (0, agent_core_constructs_1.addMcpServerInfra)(tree, {
+        await addMcpServerInfra(tree, {
             mcpServerNameKebabCase: name,
             mcpServerNameClassName,
             projectName: project.name,
@@ -118,90 +123,130 @@ const tsMcpServerGenerator = async (tree, options) => {
             dockerOutputDir,
             iac,
             auth,
-            containers,
+            containers
         });
-    }
-    else {
+    } else {
         // No Dockerfile needed for non-hosted MCP
-        tree.delete((0, devkit_1.joinPathFragments)(targetSourceDir, 'Dockerfile'));
+        tree.delete(joinPathFragments(targetSourceDir, 'Dockerfile'));
+    }
+    addDependenciesToPackageJson(tree, deps, devDeps);
+    // Add to the project's package.json too if it has one (e.g. nx plugins),
+    // otherwise dependencies live in the workspace root only.
+    if (tree.exists(projectPackageJsonPath)) {
+        addDependenciesToPackageJson(tree, deps, devDeps, projectPackageJsonPath);
     }
-    (0, devkit_1.addDependenciesToPackageJson)(tree, deps, devDeps);
-    (0, devkit_1.addDependenciesToPackageJson)(tree, deps, devDeps, projectPackageJsonPath);
     // @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
     // without a resolution it installs a separate zod under the SDK's own node_modules.
     // The two zod copies have structurally incompatible types, which breaks type
     // inference for registerTool inputSchema. Scope the resolution to the SDK so
     // other consumers (e.g. @tanstack/router-generator pinning zod@3) are unaffected.
-    if ((0, devkit_1.detectPackageManager)() === 'yarn') {
-        (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
+    if (detectPackageManager() === 'yarn') {
+        updateJson(tree, 'package.json', (packageJson)=>{
             packageJson.resolutions = {
                 ...packageJson.resolutions,
-                '**/@modelcontextprotocol/sdk/zod': versions_1.TS_VERSIONS['zod'],
+                '**/@modelcontextprotocol/sdk/zod': TS_VERSIONS['zod']
             };
             return packageJson;
         });
     }
-    const localDevPort = (0, port_1.assignPort)(tree, project, 8000);
-    (0, devkit_1.updateProjectConfiguration)(tree, project.name, {
-        ...project,
-        targets: {
-            ...project.targets,
-            // Add targets for running the MCP server
-            [`${mcpTargetPrefix}-serve-stdio`]: {
-                executor: 'nx:run-commands',
-                options: {
-                    commands: [`tsx --watch ${relativeSourceDir}/stdio.ts`],
-                    cwd: '{projectRoot}',
-                },
-                continuous: true,
-            },
-            [`${mcpTargetPrefix}-serve`]: {
-                executor: 'nx:run-commands',
-                options: {
-                    commands: [`tsx --watch ${relativeSourceDir}/http.ts`],
-                    cwd: '{projectRoot}',
-                    env: {
-                        PORT: `${localDevPort}`,
-                    },
-                },
-                continuous: true,
-            },
-            [`${mcpTargetPrefix}-serve-local`]: {
-                executor: 'nx:run-commands',
-                options: {
-                    commands: [`tsx --watch ${relativeSourceDir}/http.ts`],
-                    cwd: '{projectRoot}',
-                    env: {
-                        PORT: `${localDevPort}`,
-                        SERVE_LOCAL: 'true',
-                    },
-                },
-                continuous: true,
-            },
-            [`${mcpTargetPrefix}-inspect`]: {
-                executor: 'nx:run-commands',
-                options: {
-                    commands: [
-                        `mcp-inspector -- tsx --watch ${relativeSourceDir}/stdio.ts`,
-                    ],
-                    cwd: '{projectRoot}',
-                },
-                continuous: true,
-            },
+    const localDevPort = assignPort(tree, project, 8000, {
+        component: {
+            info: TS_MCP_SERVER_GENERATOR_INFO,
+            name: mcpTargetPrefix
+        }
+    });
+    const mcpTargets = {
+        ...project.targets,
+        // Add targets for running the MCP server
+        [`${mcpTargetPrefix}-serve-stdio`]: {
+            executor: 'nx:run-commands',
+            continuous: true,
+            options: {
+                commands: [
+                    `tsx --watch ${relativeSourceDir}/stdio.ts`
+                ],
+                cwd: '{projectRoot}'
+            }
+        },
+        [`${mcpTargetPrefix}-serve`]: {
+            executor: 'nx:run-commands',
+            continuous: true,
+            options: {
+                commands: [
+                    `tsx --watch ${relativeSourceDir}/http.ts`
+                ],
+                cwd: '{projectRoot}',
+                env: {
+                    PORT: `${localDevPort}`
+                }
+            }
         },
+        [`${mcpTargetPrefix}-dev`]: {
+            executor: 'nx:run-commands',
+            continuous: true,
+            options: {
+                commands: [
+                    `tsx --watch ${relativeSourceDir}/http.ts`
+                ],
+                cwd: '{projectRoot}',
+                env: {
+                    PORT: `${localDevPort}`,
+                    LOCAL_DEV: 'true'
+                }
+            }
+        },
+        [`${mcpTargetPrefix}-inspect`]: {
+            executor: 'nx:run-commands',
+            continuous: true,
+            // Launch the inspector against the locally served HTTP server. The dev
+            // target starts the server and any connected dependencies (e.g. a local
+            // database).
+            dependsOn: [
+                `${mcpTargetPrefix}-dev`
+            ],
+            options: {
+                commands: [
+                    `mcp-inspector --transport http --server-url http://localhost:${localDevPort}/mcp`
+                ],
+                cwd: '{projectRoot}'
+            }
+        },
+        [`${mcpTargetPrefix}-inspect-stdio`]: {
+            executor: 'nx:run-commands',
+            continuous: true,
+            options: {
+                commands: [
+                    `mcp-inspector -- tsx --watch ${relativeSourceDir}/stdio.ts`
+                ],
+                cwd: '{projectRoot}'
+            }
+        }
+    };
+    // Aggregate `<mcp>-dev` under the project-level `dev` target.
+    addComponentDevTarget(mcpTargets, `${mcpTargetPrefix}-dev`);
+    updateProjectConfiguration(tree, project.name, {
+        ...project,
+        // Sort targets so their order is stable regardless of insertion order on
+        // first run vs re-run.
+        targets: sortObjectKeys(mcpTargets)
     });
-    (0, nx_1.addComponentGeneratorMetadata)(tree, project.name, exports.TS_MCP_SERVER_GENERATOR_INFO, targetSourceDirRelativeToProjectRoot, mcpTargetPrefix, {
+    addComponentGeneratorMetadata(tree, project.name, TS_MCP_SERVER_GENERATOR_INFO, targetSourceDirRelativeToProjectRoot, mcpTargetPrefix, {
         port: localDevPort,
         rc: mcpServerNameClassName,
-        auth,
+        auth
     });
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TS_MCP_SERVER_GENERATOR_INFO]);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return () => {
-        (0, devkit_1.installPackagesTask)(tree);
-    };
+    await addGeneratorMetricsIfApplicable(tree, [
+        TS_MCP_SERVER_GENERATOR_INFO
+    ]);
+    await ensureLicenseExceptions(tree, MCP_INSPECTOR_EXCEPTIONS);
+    await formatFilesInSubtree(tree);
+    return ()=>installDependencies(tree, options.preferInstallDependencies, {
+            languages: [
+                'typescript'
+            ]
+        });
 };
-exports.tsMcpServerGenerator = tsMcpServerGenerator;
-exports.default = exports.tsMcpServerGenerator;
+export default tsMcpServerGenerator;
+
 //# sourceMappingURL=generator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/mcp-server/generator.ts"],"names":[],"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  addDependenciesToPackageJson,\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 { ensureLicenseExceptions } from '../../license/config';\nimport { MCP_INSPECTOR_EXCEPTIONS } from '../../license/known-exceptions';\nimport { addMcpServerInfra } from '../../utils/agent-core-constructs/agent-core-constructs';\nimport { addTypeScriptBundleTarget } from '../../utils/bundle/bundle';\nimport { resolveContainers } from '../../utils/containers';\nimport { addDockerScanTarget } from '../../utils/docker';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FsCommands } from '../../utils/fs';\nimport { resolveIac } from '../../utils/iac';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { isEsmWorkspace } from '../../utils/module-format';\nimport { kebabCase, toClassName } from '../../utils/names';\nimport { getNpmScope } from '../../utils/npm-scope';\nimport {\n  addComponentDevTarget,\n  addComponentGeneratorMetadata,\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { assignPort } from '../../utils/port';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport { BASE_IMAGES, TS_VERSIONS, withVersions } from '../../utils/versions';\nimport type { TsMcpServerGeneratorSchema } from './schema';\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  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 module system is esm, otherwise commonjs. Projects\n  // don't typically have their own package.json (dependencies are declared in\n  // the workspace root), so fall back to the workspace format when absent.\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      nodeBaseImage: BASE_IMAGES.node,\n      npmVersion: TS_VERSIONS.npm,\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Add dependencies\n  const deps = withVersions([\n    '@modelcontextprotocol/sdk',\n    'zod',\n    'express',\n    '@aws-lambda-powertools/parameters',\n    '@aws-sdk/client-appconfigdata',\n  ]);\n  const devDeps = withVersions([\n    'tsx',\n    '@types/express',\n    '@modelcontextprotocol/inspector',\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(tree, project, {\n      targetFilePath: `${targetSourceDirRelativeToProjectRoot}/http.ts`,\n      bundleOutputDir: joinPathFragments('mcp', name),\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);\n    project.targets[dockerTargetName] = {\n      cache: true,\n      outputs: [`{workspaceRoot}/${dockerOutputDir}/Dockerfile`],\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    addDependencyToTargetIfNotPresent(project, 'build', 'docker');\n\n    addDockerScanTarget(tree, {\n      project,\n      containerEngine: containers,\n      trivyTargetName: `${mcpTargetPrefix}-trivy`,\n      dockerTargetName,\n      imageTags: [dockerImageTag],\n    });\n\n    // Add shared constructs\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, { iac });\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  addDependenciesToPackageJson(tree, deps, devDeps);\n  // Add to the project's package.json too if it has one (e.g. nx plugins),\n  // otherwise dependencies live in the workspace root only.\n  if (tree.exists(projectPackageJsonPath)) {\n    addDependenciesToPackageJson(tree, deps, devDeps, projectPackageJsonPath);\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  if (detectPackageManager() === 'yarn') {\n    updateJson(tree, 'package.json', (packageJson) => {\n      packageJson.resolutions = {\n        ...packageJson.resolutions,\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  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    {\n      port: localDevPort,\n      rc: mcpServerNameClassName,\n      auth,\n    },\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_MCP_SERVER_GENERATOR_INFO]);\n\n  await ensureLicenseExceptions(tree, MCP_INSPECTOR_EXCEPTIONS);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsMcpServerGenerator;\n"],"names":["addDependenciesToPackageJson","detectPackageManager","generateFiles","joinPathFragments","OverwriteStrategy","readJson","updateJson","updateProjectConfiguration","ensureLicenseExceptions","MCP_INSPECTOR_EXCEPTIONS","addMcpServerInfra","addTypeScriptBundleTarget","resolveContainers","addDockerScanTarget","formatFilesInSubtree","FsCommands","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","isEsmWorkspace","kebabCase","toClassName","getNpmScope","addComponentDevTarget","addComponentGeneratorMetadata","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","assignPort","sharedConstructsGenerator","BASE_IMAGES","TS_VERSIONS","withVersions","TS_MCP_SERVER_GENERATOR_INFO","filename","tsMcpServerGenerator","tree","options","project","exists","root","Error","defaultName","name","split","pop","mcpServerNameClassName","mcpTargetPrefix","targetSourceDirRelativeToProjectRoot","targetSourceDir","relativeSourceDir","replace","distDir","infra","auth","console","warn","projectPackageJsonPath","esm","type","dirname","adotVersion","nodeBaseImage","node","npmVersion","npm","overwriteStrategy","KeepExisting","deps","devDeps","containers","dockerImageTag","targetFilePath","bundleOutputDir","dockerOutputDir","dockerTargetName","fs","targets","cache","outputs","executor","commands","cp","parallel","dependsOn","containerEngine","trivyTargetName","imageTags","iac","mcpServerNameKebabCase","projectName","delete","packageJson","resolutions","localDevPort","component","info","mcpTargets","continuous","cwd","env","PORT","LOCAL_DEV","port","rc","preferInstallDependencies","languages"],"mappings":"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"}

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

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

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

@@ -0,0 +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';\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"}

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

@@ -15,4 +15,5 @@ export interface TsMcpServerGeneratorSchema {
   infra?: TsMcpServerInfra;
   auth?: TsMcpServerAuth;
   iac: IacOption;
+  preferInstallDependencies?: boolean;
 }

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

@@ -43,6 +43,11 @@
       "enum": ["agentcore", "none"],
       "default": "agentcore",
       "x-priority": "important"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["project"]

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

@@ -33,7 +33,7 @@ You can generate a foo#bar in two ways:
 The generator will create the following project files:
 
 <FileTree>
-  - todo.txt Update this section with what your generator generates!
+ - todo.txt Update this section with what your generator generates!
 </FileTree>
 
 ### Infrastructure
@@ -41,19 +41,24 @@ The generator will create the following project files:
 <Snippet name="shared-constructs" />
 
 <Infrastructure>
-  <Fragment slot="cdk">
-    <FileTree>
-      - packages/common/constructs/src - app - todo.txt document app specific
-      cdk constructs if any - core - todo.txt document core cdk constructs if
-      any
-    </FileTree>
-  </Fragment>
-  <Fragment slot="terraform">
-    <FileTree>
-      - packages/common/terraform/src - app - todo.txt document app specific tf
-      modules if any - core - todo.txt document core tf modules if any
-    </FileTree>
-  </Fragment>
+<Fragment slot="cdk">
+<FileTree>
+  - packages/common/constructs/src
+    - app
+      - todo.txt document app specific cdk constructs if any
+    - core
+      - todo.txt document core cdk constructs if any
+</FileTree>
+</Fragment>
+<Fragment slot="terraform">
+<FileTree>
+  - packages/common/terraform/src
+    - app
+      - todo.txt document app specific tf modules if any
+    - core
+      - todo.txt document core tf modules if any
+</FileTree>
+</Fragment>
 </Infrastructure>
 
 :::danger
@@ -104,14 +109,16 @@ describe('foo#bar generator', () => {
 `;
 
 exports[`nx-generator generator > within @aws/nx-plugin > should generate an example schema, generator and test > generator.ts 1`] = `
-"import { GeneratorCallback, Tree, installPackagesTask } from '@nx/devkit';
-import { FooBarGeneratorSchema } from './schema';
-import { NxGeneratorInfo, getGeneratorInfo } from '../utils/nx';
+"import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import type { FooBarGeneratorSchema } from './schema.js';
+import { type NxGeneratorInfo, getGeneratorInfo } from '../utils/nx';
 import { addGeneratorMetricsIfApplicable } from '../utils/metrics';
 import { formatFilesInSubtree } from '../utils/format';
+import { installDependencies } from '../utils/install';
 
-export const FOO_BAR_GENERATOR_INFO: NxGeneratorInfo =
-  getGeneratorInfo(__filename);
+export const FOO_BAR_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(
+  import.meta.filename,
+);
 
 export const fooBarGenerator = async (
   tree: Tree,
@@ -122,9 +129,10 @@ export const fooBarGenerator = async (
   await addGeneratorMetricsIfApplicable(tree, [FOO_BAR_GENERATOR_INFO]);
 
   await formatFilesInSubtree(tree);
-  return () => {
-    installPackagesTask(tree);
-  };
+  return () =>
+    installDependencies(tree, options.preferInstallDependencies, {
+      languages: ['typescript'],
+    });
 };
 
 export default fooBarGenerator;
@@ -139,6 +147,7 @@ exports[`nx-generator generator > within @aws/nx-plugin > should generate an exa
 export interface FooBarGeneratorSchema {
   // Replace with your options
   exampleOption: string;
+  preferInstallDependencies?: boolean;
 }
 "
 `;
@@ -156,6 +165,11 @@ exports[`nx-generator generator > within @aws/nx-plugin > should generate an exa
       "description": "An example option. Refer to https://nx.dev/extending-nx/recipes/generator-options for more info",
       "x-priority": "important",
       "x-prompt": "This is an example option!"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["exampleOption"]
@@ -212,12 +226,12 @@ describe('foo#bar generator', () => {
 
 exports[`nx-generator generator > within another workspace > should generate an example schema, generator and test > local-generator.ts 1`] = `
 "import {
-  GeneratorCallback,
-  Tree,
+  type GeneratorCallback,
+  type Tree,
   generateFiles,
   joinPathFragments,
 } from '@nx/devkit';
-import { FooBarGeneratorSchema } from './schema';
+import type { FooBarGeneratorSchema } from './schema.js';
 
 export const fooBarGenerator = async (
   tree: Tree,
@@ -226,7 +240,7 @@ export const fooBarGenerator = async (
   // TODO: implement your generator here, for example:
   generateFiles(
     tree,
-    joinPathFragments(__dirname, 'files'),
+    joinPathFragments(import.meta.dirname, 'files'),
     'target/dir',
     options,
   );
@@ -244,6 +258,7 @@ exports[`nx-generator generator > within another workspace > should generate an
 export interface FooBarGeneratorSchema {
   // Replace with your options
   exampleOption: string;
+  preferInstallDependencies?: boolean;
 }
 "
 `;
@@ -261,6 +276,11 @@ exports[`nx-generator generator > within another workspace > should generate an
       "description": "An example option. Refer to https://nx.dev/extending-nx/recipes/generator-options for more info",
       "x-priority": "important",
       "x-prompt": "This is an example option!"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["exampleOption"]

package/src/ts/nx-generator/files/common/schema.d.ts.template

@@ -5,4 +5,5 @@
 export interface <%- namePascalCase %>GeneratorSchema {
   // Replace with your options
   exampleOption: string;
+  preferInstallDependencies?: boolean;
 }