@aws/nx-plugin 1.0.0-rc.36 → 1.0.0-rc.38

package/src/mcp-server/tools/add-to-existing-project.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/add-to-existing-project.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';\nimport type { NxGeneratorInfo } from '../../utils/generators';\nimport { fetchGuidePages } from '../generator-info';\nimport { PackageManagerSchema } from '../schema';\n\n/**\n * The guide page (under `get_started/`) that backs this tool, so the tool and\n * the published docs never drift.\n */\nconst EXISTING_PROJECT_GUIDE = 'existing-project';\n\n/**\n * Add a tool which guides an agent through adding @aws/nx-plugin to an\n * existing Nx or non-Nx workspace. Returns the `existing-project` docs page,\n * which includes the full adoption steps and troubleshooting reference.\n */\nexport const addToExistingProjectTool = (\n  server: McpServer,\n  generators: NxGeneratorInfo[],\n) => {\n  server.registerTool(\n    'add-to-existing-project',\n    {\n      title: 'Add to Existing Project',\n      description:\n        'Tool for adding the Nx Plugin for AWS to an existing Nx workspace or non-Nx monorepo. Use this when a user wants to adopt @aws/nx-plugin in a project that was not created with the plugin preset, or hits configuration errors when running generators in such a workspace.',\n      inputSchema: {\n        packageManager: PackageManagerSchema.optional(),\n      },\n    },\n    async ({ packageManager }) => {\n      const guide = await fetchGuidePages(\n        [EXISTING_PROJECT_GUIDE],\n        generators,\n        packageManager,\n      );\n      return {\n        content: [\n          {\n            type: 'text' as const,\n            text: guide,\n          },\n        ],\n      };\n    },\n  );\n};\n"],"names":["fetchGuidePages","PackageManagerSchema","EXISTING_PROJECT_GUIDE","addToExistingProjectTool","server","generators","registerTool","title","description","inputSchema","packageManager","optional","guide","content","type","text"],"mappings":"AAAA;;;CAGC,GAGD,SAASA,eAAe,QAAQ,uBAAoB;AACpD,SAASC,oBAAoB,QAAQ,eAAY;AAEjD;;;CAGC,GACD,MAAMC,yBAAyB;AAE/B;;;;CAIC,GACD,OAAO,MAAMC,2BAA2B,CACtCC,QACAC;IAEAD,OAAOE,YAAY,CACjB,2BACA;QACEC,OAAO;QACPC,aACE;QACFC,aAAa;YACXC,gBAAgBT,qBAAqBU,QAAQ;QAC/C;IACF,GACA,OAAO,EAAED,cAAc,EAAE;QACvB,MAAME,QAAQ,MAAMZ,gBAClB;YAACE;SAAuB,EACxBG,YACAK;QAEF,OAAO;YACLG,SAAS;gBACP;oBACEC,MAAM;oBACNC,MAAMH;gBACR;aACD;QACH;IACF;AAEJ,EAAE"}

package/src/mcp-server/tools/general-guidance.d.ts

@@ -4,7 +4,7 @@
  */
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { NxGeneratorInfo } from '../../utils/generators';
-export declare const TOOL_SELECTION_GUIDE = "## Tool Selection Guide\n\n- Use the `general-guidance` tool for guidance and best practices for working with Nx and the Nx Plugin for AWS.\n- Use the `create-workspace-command` tool to discover how to create a workspace to start a new project.\n- Use the `list-generators` tool to discover the available generators and how to run them.\n- Use the `generator-guide` tool to retrieve detailed information about a specific generator.";
+export declare const TOOL_SELECTION_GUIDE = "## Tool Selection Guide\n\n- Use the `general-guidance` tool for guidance and best practices for working with Nx and the Nx Plugin for AWS.\n- Use the `create-workspace-command` tool to discover how to create a workspace to start a new project.\n- Use the `add-to-existing-project` tool when adding the plugin to an existing Nx workspace or non-Nx monorepo, or when troubleshooting configuration errors in such a workspace.\n- Use the `list-generators` tool to discover the available generators and how to run them.\n- Use the `generator-guide` tool to retrieve detailed information about a specific generator.";
 /**
  * Add a tool which provides general guidance for using Nx and the Nx Plugin for AWS
  */

package/src/mcp-server/tools/general-guidance.js

@@ -8,6 +8,7 @@ export const TOOL_SELECTION_GUIDE = `## Tool Selection Guide
 
 - Use the \`general-guidance\` tool for guidance and best practices for working with Nx and the Nx Plugin for AWS.
 - Use the \`create-workspace-command\` tool to discover how to create a workspace to start a new project.
+- Use the \`add-to-existing-project\` tool when adding the plugin to an existing Nx workspace or non-Nx monorepo, or when troubleshooting configuration errors in such a workspace.
 - Use the \`list-generators\` tool to discover the available generators and how to run them.
 - Use the \`generator-guide\` tool to retrieve detailed information about a specific generator.`;
 /**

package/src/mcp-server/tools/general-guidance.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/general-guidance.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';\nimport type { NxGeneratorInfo } from '../../utils/generators';\nimport { IAC_PROVIDERS } from '../../utils/iac-providers';\nimport { buildNxCommand, fetchGuidePages } from '../generator-info';\nimport { PACKAGE_MANAGERS } from '../schema';\n\nexport const TOOL_SELECTION_GUIDE = `## Tool Selection Guide\n\n- Use the \\`general-guidance\\` tool for guidance and best practices for working with Nx and the Nx Plugin for AWS.\n- Use the \\`create-workspace-command\\` tool to discover how to create a workspace to start a new project.\n- Use the \\`list-generators\\` tool to discover the available generators and how to run them.\n- Use the \\`generator-guide\\` tool to retrieve detailed information about a specific generator.`;\n\n/**\n * Add a tool which provides general guidance for using Nx and the Nx Plugin for AWS\n */\nexport const addGeneralGuidanceTool = (\n  server: McpServer,\n  generators: NxGeneratorInfo[],\n) => {\n  server.registerTool(\n    'general-guidance',\n    {\n      title: 'General Guidance',\n      description:\n        'Tool for guidance and best practices for working with Nx and the Nx Plugin for AWS',\n    },\n    async () => ({\n      content: [\n        {\n          type: 'text' as const,\n          text: `# Nx Plugin for AWS Guidance\n\n${TOOL_SELECTION_GUIDE}\n\n## Getting Started\n\n- Choose a package manager first. You can choose between ${PACKAGE_MANAGERS.join(', ')}. It's recommended to use \"pnpm\" if the user has no preference\n- Choose an infrastructure as code (IaC) provider next. You can choose between ${IAC_PROVIDERS.join(', ')}. It's recommended to use CDK if the user has no preference\n- Next, you must create an Nx workspace. Use the \\`create-workspace-command\\` tool for more details, and provide it with your chosen package manager\n- After this, you can start scaffolding the main components of your application using generators. Use the \\`list-generators\\` tool to discover available generators, and the \\`generator-guide\\` tool for more detailed information about a specific generator\n\n## Nx Primer\n\n- Prefix nx commands with the appropriate prefix for your package manager, for example:\n${PACKAGE_MANAGERS.map((pm) => buildNxCommand('<options>', pm)).join(' - \\n')}\n- Each project in your workspace has a file named \\`project.json\\` which contains important project information such as its name, and defines the \"targets\" which can be run for that project, for example building or testing the project\n- Use the command \\`nx reset\\` to reset the Nx daemon when unexpected issues arise\n- After adding dependencies between TypeScript projects, use \\`nx sync\\` to ensure project references are set up correctly\n\n## General Instructions\n\n- Workspaces contain a single \\`package.json\\` file at the root which defines the dependencies for all projects. Therefore when installing dependencies, you must add these to the root workspace using the appropriate command for your package manager:\n  - pnpm add -w -D <package>\n  - yarn add -D <package>\n  - npm install --legacy-peer-deps -D <package>\n  - bun install -D <package>\n  - (Omit -D for production dependencies)\n- When specifying project names as arguments to generators, prefer the _fully qualified_ project name, for example \\`@workspace-name/project-name\\`. Check the \\`project.json\\` file for the specific package to find its fully qualified name\n- When no generator exists for a specific framework required, use the base \\`ts#project\\` and \\`py#project\\` generators and build on top.\n- Leave the \\`--infra\\` option at its default value unless the user has explicitly instructed otherwise. Generators choose a sensible default type of infrastructure to deploy the project with, so only override \\`--infra\\` when the user has specified a particular requirement.\n\n## Useful Commands\n\n- Fix lint issues with \\`nx run-many --target lint --configuration=fix --all --output-style=stream\\`\n- Build all projects with \\`nx run-many --target build --all --output-style=stream\\`\n- Prefer importing the CDK constructs vended by generators in \\`packages/common/constructs\\` over writing your own\n\n## Best Practices\n\n- After running a generator, use the \\`nx show projects\\` command to check which projects have been added (if any)\n- Carefully examine the files that have been generated and always refer back to the generator guide when working in a generated project\n- Generate all projects into the \\`packages/\\` directory\n- After making changes to your projects, fix linting issues, then run a full build\n- When it's time to start testing a project, suggest to the user that infrastructure is deployed to AWS. For websites, if a runtime-config.json is needed, use the load:runtime-config target after a deployment to point a local website at a sandbox stack.\n\n## Batching Generators\n\nWhen scaffolding several projects in one go, chain generators to avoid a slow dependency install after every generator:\n\n- **Chain generators** with \\`&&\\` in a single command. Pass \\`--prefer-install-dependencies=false\\` on each generator except the last so dependencies install once at the end, for example:\n\n${PACKAGE_MANAGERS.map(\n  (pm) => `  \\`\\`\\`bash\n  ${buildNxCommand('g @aws/nx-plugin:ts#trpc-api --no-interactive --name=my-app-api --auth=IAM --prefer-install-dependencies=false', pm)} && \\\\\n    ${buildNxCommand('g @aws/nx-plugin:ts#react-website --no-interactive --name=my-app-website --prefer-install-dependencies=false', pm)} && \\\\\n    ${buildNxCommand('g @aws/nx-plugin:connection --no-interactive --sourceProject=@my-app/my-app-website --targetProject=@my-app/my-app-api --prefer-install-dependencies=false', pm)} && \\\\\n    ${buildNxCommand('g @aws/nx-plugin:ts#infra --no-interactive --name=infra', pm)} && \\\\\n    ${buildNxCommand('sync', pm)}\n  \\`\\`\\``,\n).join('\\n')}\n\n- **\\`--prefer-install-dependencies=false\\`** asks a generator to defer its dependency install so the batch installs once at the end (the final generator above omits the flag and installs everything).\n- **\\`nx sync\\`** is required before building — generators modify TypeScript project references.\n\n## Detailed Guides\n\nPlease refer to the below documentation for important details regarding workspaces and working with TypeScript or Python projects.\n\n${await fetchGuidePages(['workspace', 'typescript-project', 'python-project'], generators)}\n\n    `,\n        },\n      ],\n    }),\n  );\n};\n"],"names":["IAC_PROVIDERS","buildNxCommand","fetchGuidePages","PACKAGE_MANAGERS","TOOL_SELECTION_GUIDE","addGeneralGuidanceTool","server","generators","registerTool","title","description","content","type","text","join","map","pm"],"mappings":"AAAA;;;CAGC,GAGD,SAASA,aAAa,QAAQ,+BAA4B;AAC1D,SAASC,cAAc,EAAEC,eAAe,QAAQ,uBAAoB;AACpE,SAASC,gBAAgB,QAAQ,eAAY;AAE7C,OAAO,MAAMC,uBAAuB,CAAC;;;;;+FAK0D,CAAC,CAAC;AAEjG;;CAEC,GACD,OAAO,MAAMC,yBAAyB,CACpCC,QACAC;IAEAD,OAAOE,YAAY,CACjB,oBACA;QACEC,OAAO;QACPC,aACE;IACJ,GACA,UAAa,CAAA;YACXC,SAAS;gBACP;oBACEC,MAAM;oBACNC,MAAM,CAAC;;AAEjB,EAAET,qBAAqB;;;;yDAIkC,EAAED,iBAAiBW,IAAI,CAAC,MAAM;+EACR,EAAEd,cAAcc,IAAI,CAAC,MAAM;;;;;;;AAO1G,EAAEX,iBAAiBY,GAAG,CAAC,CAACC,KAAOf,eAAe,aAAae,KAAKF,IAAI,CAAC,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqC9E,EAAEX,iBAAiBY,GAAG,CACpB,CAACC,KAAO,CAAC;EACT,EAAEf,eAAe,kHAAkHe,IAAI;IACrI,EAAEf,eAAe,gHAAgHe,IAAI;IACrI,EAAEf,eAAe,8JAA8Je,IAAI;IACnL,EAAEf,eAAe,2DAA2De,IAAI;IAChF,EAAEf,eAAe,QAAQe,IAAI;QACzB,CAAC,EACPF,IAAI,CAAC,MAAM;;;;;;;;;AASb,EAAE,MAAMZ,gBAAgB;wBAAC;wBAAa;wBAAsB;qBAAiB,EAAEK,YAAY;;IAEvF,CAAC;gBACG;aACD;QACH,CAAA;AAEJ,EAAE"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/general-guidance.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';\nimport type { NxGeneratorInfo } from '../../utils/generators';\nimport { IAC_PROVIDERS } from '../../utils/iac-providers';\nimport { buildNxCommand, fetchGuidePages } from '../generator-info';\nimport { PACKAGE_MANAGERS } from '../schema';\n\nexport const TOOL_SELECTION_GUIDE = `## Tool Selection Guide\n\n- Use the \\`general-guidance\\` tool for guidance and best practices for working with Nx and the Nx Plugin for AWS.\n- Use the \\`create-workspace-command\\` tool to discover how to create a workspace to start a new project.\n- Use the \\`add-to-existing-project\\` tool when adding the plugin to an existing Nx workspace or non-Nx monorepo, or when troubleshooting configuration errors in such a workspace.\n- Use the \\`list-generators\\` tool to discover the available generators and how to run them.\n- Use the \\`generator-guide\\` tool to retrieve detailed information about a specific generator.`;\n\n/**\n * Add a tool which provides general guidance for using Nx and the Nx Plugin for AWS\n */\nexport const addGeneralGuidanceTool = (\n  server: McpServer,\n  generators: NxGeneratorInfo[],\n) => {\n  server.registerTool(\n    'general-guidance',\n    {\n      title: 'General Guidance',\n      description:\n        'Tool for guidance and best practices for working with Nx and the Nx Plugin for AWS',\n    },\n    async () => ({\n      content: [\n        {\n          type: 'text' as const,\n          text: `# Nx Plugin for AWS Guidance\n\n${TOOL_SELECTION_GUIDE}\n\n## Getting Started\n\n- Choose a package manager first. You can choose between ${PACKAGE_MANAGERS.join(', ')}. It's recommended to use \"pnpm\" if the user has no preference\n- Choose an infrastructure as code (IaC) provider next. You can choose between ${IAC_PROVIDERS.join(', ')}. It's recommended to use CDK if the user has no preference\n- Next, you must create an Nx workspace. Use the \\`create-workspace-command\\` tool for more details, and provide it with your chosen package manager\n- After this, you can start scaffolding the main components of your application using generators. Use the \\`list-generators\\` tool to discover available generators, and the \\`generator-guide\\` tool for more detailed information about a specific generator\n\n## Nx Primer\n\n- Prefix nx commands with the appropriate prefix for your package manager, for example:\n${PACKAGE_MANAGERS.map((pm) => buildNxCommand('<options>', pm)).join(' - \\n')}\n- Each project in your workspace has a file named \\`project.json\\` which contains important project information such as its name, and defines the \"targets\" which can be run for that project, for example building or testing the project\n- Use the command \\`nx reset\\` to reset the Nx daemon when unexpected issues arise\n- After adding dependencies between TypeScript projects, use \\`nx sync\\` to ensure project references are set up correctly\n\n## General Instructions\n\n- Workspaces contain a single \\`package.json\\` file at the root which defines the dependencies for all projects. Therefore when installing dependencies, you must add these to the root workspace using the appropriate command for your package manager:\n  - pnpm add -w -D <package>\n  - yarn add -D <package>\n  - npm install --legacy-peer-deps -D <package>\n  - bun install -D <package>\n  - (Omit -D for production dependencies)\n- When specifying project names as arguments to generators, prefer the _fully qualified_ project name, for example \\`@workspace-name/project-name\\`. Check the \\`project.json\\` file for the specific package to find its fully qualified name\n- When no generator exists for a specific framework required, use the base \\`ts#project\\` and \\`py#project\\` generators and build on top.\n- Leave the \\`--infra\\` option at its default value unless the user has explicitly instructed otherwise. Generators choose a sensible default type of infrastructure to deploy the project with, so only override \\`--infra\\` when the user has specified a particular requirement.\n\n## Useful Commands\n\n- Fix lint issues with \\`nx run-many --target lint --configuration=fix --all --output-style=stream\\`\n- Build all projects with \\`nx run-many --target build --all --output-style=stream\\`\n- Prefer importing the CDK constructs vended by generators in \\`packages/common/constructs\\` over writing your own\n\n## Best Practices\n\n- After running a generator, use the \\`nx show projects\\` command to check which projects have been added (if any)\n- Carefully examine the files that have been generated and always refer back to the generator guide when working in a generated project\n- Generate all projects into the \\`packages/\\` directory\n- After making changes to your projects, fix linting issues, then run a full build\n- When it's time to start testing a project, suggest to the user that infrastructure is deployed to AWS. For websites, if a runtime-config.json is needed, use the load:runtime-config target after a deployment to point a local website at a sandbox stack.\n\n## Batching Generators\n\nWhen scaffolding several projects in one go, chain generators to avoid a slow dependency install after every generator:\n\n- **Chain generators** with \\`&&\\` in a single command. Pass \\`--prefer-install-dependencies=false\\` on each generator except the last so dependencies install once at the end, for example:\n\n${PACKAGE_MANAGERS.map(\n  (pm) => `  \\`\\`\\`bash\n  ${buildNxCommand('g @aws/nx-plugin:ts#trpc-api --no-interactive --name=my-app-api --auth=IAM --prefer-install-dependencies=false', pm)} && \\\\\n    ${buildNxCommand('g @aws/nx-plugin:ts#react-website --no-interactive --name=my-app-website --prefer-install-dependencies=false', pm)} && \\\\\n    ${buildNxCommand('g @aws/nx-plugin:connection --no-interactive --sourceProject=@my-app/my-app-website --targetProject=@my-app/my-app-api --prefer-install-dependencies=false', pm)} && \\\\\n    ${buildNxCommand('g @aws/nx-plugin:ts#infra --no-interactive --name=infra', pm)} && \\\\\n    ${buildNxCommand('sync', pm)}\n  \\`\\`\\``,\n).join('\\n')}\n\n- **\\`--prefer-install-dependencies=false\\`** asks a generator to defer its dependency install so the batch installs once at the end (the final generator above omits the flag and installs everything).\n- **\\`nx sync\\`** is required before building — generators modify TypeScript project references.\n\n## Detailed Guides\n\nPlease refer to the below documentation for important details regarding workspaces and working with TypeScript or Python projects.\n\n${await fetchGuidePages(['workspace', 'typescript-project', 'python-project'], generators)}\n\n    `,\n        },\n      ],\n    }),\n  );\n};\n"],"names":["IAC_PROVIDERS","buildNxCommand","fetchGuidePages","PACKAGE_MANAGERS","TOOL_SELECTION_GUIDE","addGeneralGuidanceTool","server","generators","registerTool","title","description","content","type","text","join","map","pm"],"mappings":"AAAA;;;CAGC,GAGD,SAASA,aAAa,QAAQ,+BAA4B;AAC1D,SAASC,cAAc,EAAEC,eAAe,QAAQ,uBAAoB;AACpE,SAASC,gBAAgB,QAAQ,eAAY;AAE7C,OAAO,MAAMC,uBAAuB,CAAC;;;;;;+FAM0D,CAAC,CAAC;AAEjG;;CAEC,GACD,OAAO,MAAMC,yBAAyB,CACpCC,QACAC;IAEAD,OAAOE,YAAY,CACjB,oBACA;QACEC,OAAO;QACPC,aACE;IACJ,GACA,UAAa,CAAA;YACXC,SAAS;gBACP;oBACEC,MAAM;oBACNC,MAAM,CAAC;;AAEjB,EAAET,qBAAqB;;;;yDAIkC,EAAED,iBAAiBW,IAAI,CAAC,MAAM;+EACR,EAAEd,cAAcc,IAAI,CAAC,MAAM;;;;;;;AAO1G,EAAEX,iBAAiBY,GAAG,CAAC,CAACC,KAAOf,eAAe,aAAae,KAAKF,IAAI,CAAC,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqC9E,EAAEX,iBAAiBY,GAAG,CACpB,CAACC,KAAO,CAAC;EACT,EAAEf,eAAe,kHAAkHe,IAAI;IACrI,EAAEf,eAAe,gHAAgHe,IAAI;IACrI,EAAEf,eAAe,8JAA8Je,IAAI;IACnL,EAAEf,eAAe,2DAA2De,IAAI;IAChF,EAAEf,eAAe,QAAQe,IAAI;QACzB,CAAC,EACPF,IAAI,CAAC,MAAM;;;;;;;;;AASb,EAAE,MAAMZ,gBAAgB;wBAAC;wBAAa;wBAAsB;qBAAiB,EAAEK,YAAY;;IAEvF,CAAC;gBACG;aACD;QACH,CAAA;AAEJ,EAAE"}

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

@@ -90,6 +90,8 @@ Nx Console is an editor extension that enriches your developer experience. It le
 The following list of generators are what is currently available in the \`@aws/nx-plugin\`:
 
 
+- **init**: Configure an existing Nx workspace to use the @aws/nx-plugin
+
 - **agentcore-gateway**: Generate an AgentCore Gateway project
 
 - **connection**: Integrates a source project with a target project
@@ -340,6 +342,7 @@ exports[`preset generator > should run successfully > package.json 1`] = `
     "@nx/js": "23.0.2",
     "@nx/workspace": "23.0.2",
     "@swc/helpers": "~0.5.18",
+    "nx": "23.0.2",
     "typescript": "6.0.3"
   },
   "type": "module",

package/src/preset/generator.js

@@ -1,61 +1,17 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { addDependenciesToPackageJson, detectPackageManager, generateFiles, joinPathFragments, OverwriteStrategy, readNxJson, updateJson, updateNxJson } from "@nx/devkit";
-import { initGenerator } from "@nx/js";
+ */ import { addDependenciesToPackageJson, joinPathFragments, OverwriteStrategy, updateJson } from "@nx/devkit";
 import { execSync } from "child_process";
 import enquirer from "enquirer";
 import { readFileSync } from "fs";
-import yaml from "js-yaml";
-import { readModulePackageJson } from "nx/src/utils/package-json";
-import GeneratorsJson from "../../generators.json" with {
-    type: 'json'
-};
-import { SYNC_GENERATOR_NAME as TS_SYNC_GENERATOR_NAME } from "../ts/sync/generator.js";
 import { ensureAwsNxPluginConfig, updateAwsNxPluginConfig } from "../utils/config/utils.js";
-import { inferContainers } from "../utils/containers.js";
-import { DEFAULT_BIOME_CONFIG, formatFilesInSubtree } from "../utils/format.js";
+import { formatFilesInSubtree } from "../utils/format.js";
+import { applyWorkspaceInit } from "../utils/init.js";
 import { installDependencies } from "../utils/install.js";
-import { configureMcpServers } from "../utils/mcp.js";
-import { getNpmScope } from "../utils/npm-scope.js";
 import { getGeneratorInfo } from "../utils/nx.js";
-import { getPackageManagerDisplayCommands } from "../utils/pkg-manager.js";
 import { withVersions } from "../utils/versions.js";
-const WORKSPACES = [
-    'packages/*'
-];
-const NX_TYPESCRIPT_SYNC_GENERATOR = '@nx/js:typescript-sync';
-// Built dependencies whose install scripts the generated workspace trusts.
-// `onlyBuiltDependencies` is the pnpm 10 key (silently ignored by pnpm 11);
-// pnpm 11 reads `allowBuilds` instead. Any dep NOT in this allowlist will
-// have its install scripts skipped with a warning — matching pnpm 10's
-// default behaviour. The user can opt-in later via `pnpm approve-builds`.
-const PNPM_BUILT_DEPENDENCIES = [
-    '@swc/core',
-    'esbuild',
-    'nx',
-    'sharp'
-];
 export const PRESET_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
-const setUpWorkspaces = (tree)=>{
-    if (detectPackageManager() === 'pnpm') {
-        tree.write('pnpm-workspace.yaml', yaml.dump({
-            packages: WORKSPACES,
-            allowBuilds: Object.fromEntries(PNPM_BUILT_DEPENDENCIES.map((dep)=>[
-                    dep,
-                    true
-                ])),
-            onlyBuiltDependencies: PNPM_BUILT_DEPENDENCIES
-        }, {
-            quotingType: "'"
-        }));
-    } else {
-        updateJson(tree, 'package.json', (json)=>{
-            json.workspaces = WORKSPACES;
-            return json;
-        });
-    }
-};
 /**
  * Determines if the current user is an Amazon employee based on their git configuration.
  *
@@ -120,8 +76,6 @@ const setUpGitSecrets = (tree)=>{
     ]));
 };
 export const presetGenerator = async (tree, { iac, gitSecrets, mcp, containers, module, preferInstallDependencies })=>{
-    const resolvedContainers = !containers || containers === 'infer' ? inferContainers() : containers;
-    const esm = (module ?? 'esm') === 'esm';
     if (isAmazonian() && !process.env.VITEST && !process.env.CI && process.env.NX_DRY_RUN !== 'true' && process.env.NX_INTERACTIVE !== 'false') {
         const { engagementId } = await enquirer.prompt([
             {
@@ -140,93 +94,29 @@ export const presetGenerator = async (tree, { iac, gitSecrets, mcp, containers,
             });
         }
     }
-    // Write IaC provider and container engine to plugin config
-    await ensureAwsNxPluginConfig(tree);
-    await updateAwsNxPluginConfig(tree, {
-        iac: {
-            provider: iac
-        },
-        containers: {
-            engine: resolvedContainers
-        }
-    });
-    await initGenerator(tree, {
-        formatter: 'none',
-        addTsPlugin: true
-    });
-    tree.delete('apps/.gitkeep');
-    tree.delete('libs/.gitkeep');
-    tree.write('packages/.gitkeep', '');
-    setUpWorkspaces(tree);
-    const nxJson = readNxJson(tree);
-    updateNxJson(tree, {
-        ...nxJson,
-        analytics: false,
-        targetDefaults: {
-            ...nxJson.targetDefaults,
-            compile: {
-                ...nxJson.targetDefaults?.compile,
-                syncGenerators: [
-                    ...(nxJson.targetDefaults?.compile?.syncGenerators ?? []).filter((g)=>![
-                            TS_SYNC_GENERATOR_NAME,
-                            NX_TYPESCRIPT_SYNC_GENERATOR
-                        ].includes(g)),
-                    NX_TYPESCRIPT_SYNC_GENERATOR,
-                    TS_SYNC_GENERATOR_NAME
-                ]
-            }
-        }
-    });
+    // The preset owns the greenfield workspace's module format: write the root
+    // `type` explicitly from the chosen `--module` so later generators can
+    // infer it. The `init` generator never touches an existing workspace's
+    // `type` field.
     updateJson(tree, 'package.json', (packageJson)=>({
             ...packageJson,
-            // Written explicitly so later generators can infer the workspace's module
-            // format from the root `type`.
-            type: esm ? 'module' : 'commonjs',
-            scripts: {
-                ...packageJson.scripts,
-                dev: 'nx run-many --target dev',
-                build: 'nx run-many --target build',
-                lint: 'nx run-many --target lint --configuration=fix',
-                test: 'nx run-many --target test --all',
-                'build:skip-lint': 'nx run-many --target build --configuration=skip-lint',
-                'build:all': 'nx run-many --target build --all',
-                'affected:all': 'nx affected --target build'
-            }
+            type: (module ?? 'esm') === 'esm' ? 'module' : 'commonjs'
         }));
-    addDependenciesToPackageJson(tree, {}, {
-        '@nx/workspace': readModulePackageJson('@nx/js').packageJson.version,
-        ...withVersions([
-            'typescript',
-            '@biomejs/biome'
-        ])
-    });
-    // Write biome.json for formatting and linting
-    if (!tree.exists('biome.json')) {
-        tree.write('biome.json', JSON.stringify(DEFAULT_BIOME_CONFIG, null, 2));
-    }
-    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), '.', {
-        projectName: getNpmScope(tree),
-        generators: Object.entries(GeneratorsJson.generators).filter(([_, v])=>!v['hidden']).map(([k, v])=>({
-                name: k,
-                description: v.description
-            })),
-        ...(()=>{
-            const cmds = getPackageManagerDisplayCommands();
-            return {
-                pkgMgrCmd: cmds.exec,
-                buildCmd: `${cmds.run} build`,
-                lintCmd: `${cmds.run} lint`
-            };
-        })()
-    }, {
-        overwriteStrategy: OverwriteStrategy.Overwrite
+    // Apply the deterministic workspace configuration shared with the `init`
+    // generator. The preset owns the README of a greenfield workspace.
+    await applyWorkspaceInit(tree, {
+        iac,
+        containers,
+        mcp,
+        readmeOverwriteStrategy: OverwriteStrategy.Overwrite,
+        overwriteScripts: true
     });
+    tree.delete('apps/.gitkeep');
+    tree.delete('libs/.gitkeep');
+    tree.write('packages/.gitkeep', '');
     if (gitSecrets !== false) {
         setUpGitSecrets(tree);
     }
-    if (mcp !== false) {
-        configureMcpServers(tree);
-    }
     await formatFilesInSubtree(tree);
     return ()=>installDependencies(tree, preferInstallDependencies, {
             languages: [

package/src/preset/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/nx-plugin/src/preset/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  readNxJson,\n  type Tree,\n  updateJson,\n  updateNxJson,\n} from '@nx/devkit';\nimport { initGenerator } from '@nx/js';\nimport { execSync } from 'child_process';\nimport enquirer from 'enquirer';\nimport { readFileSync } from 'fs';\nimport yaml from 'js-yaml';\nimport { readModulePackageJson } from 'nx/src/utils/package-json';\nimport GeneratorsJson from '../../generators.json' with { type: 'json' };\nimport { SYNC_GENERATOR_NAME as TS_SYNC_GENERATOR_NAME } from '../ts/sync/generator';\nimport {\n  ensureAwsNxPluginConfig,\n  updateAwsNxPluginConfig,\n} from '../utils/config/utils';\nimport { inferContainers } from '../utils/containers';\nimport { DEFAULT_BIOME_CONFIG, formatFilesInSubtree } from '../utils/format';\nimport { installDependencies } from '../utils/install';\nimport { configureMcpServers } from '../utils/mcp';\nimport { addGeneratorMetricsIfApplicable } from '../utils/metrics';\nimport { getNpmScope } from '../utils/npm-scope';\nimport { getGeneratorInfo, type NxGeneratorInfo } from '../utils/nx';\nimport { getPackageManagerDisplayCommands } from '../utils/pkg-manager';\nimport { withVersions } from '../utils/versions';\nimport type { PresetGeneratorSchema } from './schema';\n\nconst WORKSPACES = ['packages/*'];\nconst NX_TYPESCRIPT_SYNC_GENERATOR = '@nx/js:typescript-sync';\n\n// Built dependencies whose install scripts the generated workspace trusts.\n// `onlyBuiltDependencies` is the pnpm 10 key (silently ignored by pnpm 11);\n// pnpm 11 reads `allowBuilds` instead. Any dep NOT in this allowlist will\n// have its install scripts skipped with a warning — matching pnpm 10's\n// default behaviour. The user can opt-in later via `pnpm approve-builds`.\nconst PNPM_BUILT_DEPENDENCIES = ['@swc/core', 'esbuild', 'nx', 'sharp'];\n\nexport const PRESET_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nconst setUpWorkspaces = (tree: Tree) => {\n  if (detectPackageManager() === 'pnpm') {\n    tree.write(\n      'pnpm-workspace.yaml',\n      yaml.dump(\n        {\n          packages: WORKSPACES,\n          allowBuilds: Object.fromEntries(\n            PNPM_BUILT_DEPENDENCIES.map((dep) => [dep, true]),\n          ),\n          onlyBuiltDependencies: PNPM_BUILT_DEPENDENCIES,\n        },\n        { quotingType: \"'\" },\n      ),\n    );\n  } else {\n    updateJson(tree, 'package.json', (json) => {\n      json.workspaces = WORKSPACES;\n      return json;\n    });\n  }\n};\n\n/**\n * Determines if the current user is an Amazon employee based on their git configuration.\n *\n * This function checks the git user email configuration to identify Amazon employees\n * by looking for email addresses with Amazon domains (e.g., @amazon.com, @amazon.co.uk).\n *\n * @returns {boolean} True if the user's git email has an Amazon domain, false otherwise\n *\n * @example\n * // Returns true for Amazon employee emails\n * // git config user.email = \"john.doe@amazon.com\"\n * isAmazonian(); // true\n *\n * @example\n * // Returns false for non-Amazon emails\n * // git config user.email = \"user@example.com\"\n * isAmazonian(); // false\n *\n * @example\n * // Returns false when git config is not available or throws an error\n * isAmazonian(); // false\n */\nexport function isAmazonian(): boolean {\n  try {\n    // Execute git command to retrieve the user's configured email address\n    const gitEmail = execSync('git config user.email', {\n      encoding: 'utf8',\n    }).trim();\n\n    // Return false if no email is configured\n    if (!gitEmail) {\n      return false;\n    }\n\n    // Split email address to extract domain part\n    const emailParts = gitEmail.split('@');\n    if (emailParts.length < 2) {\n      return false;\n    }\n\n    // Extract domain and normalize to lowercase for comparison\n    const domain = emailParts[1].toLowerCase();\n\n    // Check if domain starts with 'amazon.' (covers amazon.com, amazon.co.uk, etc.)\n    return domain.startsWith('amazon.');\n  } catch (error) {\n    // Return false if git command fails or any other error occurs\n    // This handles cases where git is not installed or configured\n    return false;\n  }\n}\n\nconst setUpGitSecrets = (tree: Tree) => {\n  const gitSecretsDir = joinPathFragments(\n    import.meta.dirname,\n    'git-secrets-files',\n    'git-secrets-dir',\n  );\n  const huskyDir = joinPathFragments(\n    import.meta.dirname,\n    'git-secrets-files',\n    'husky-dir',\n  );\n\n  tree.write(\n    '.git-secrets/git-secrets',\n    readFileSync(joinPathFragments(gitSecretsDir, 'git-secrets'), 'utf-8'),\n  );\n  tree.write(\n    '.husky/pre-commit',\n    readFileSync(joinPathFragments(huskyDir, 'pre-commit'), 'utf-8'),\n  );\n  tree.write('.gitallowed', '\\\\.git-secrets/git-secrets:\\n');\n\n  updateJson(tree, 'package.json', (json) => ({\n    ...json,\n    scripts: {\n      ...json.scripts,\n      prepare: 'husky',\n    },\n  }));\n\n  addDependenciesToPackageJson(tree, {}, withVersions(['husky']));\n};\n\nexport const presetGenerator = async (\n  tree: Tree,\n  {\n    iac,\n    gitSecrets,\n    mcp,\n    containers,\n    module,\n    preferInstallDependencies,\n  }: PresetGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const resolvedContainers =\n    !containers || containers === 'infer' ? inferContainers() : containers;\n  const esm = (module ?? 'esm') === 'esm';\n  if (\n    isAmazonian() &&\n    !process.env.VITEST &&\n    !process.env.CI &&\n    process.env.NX_DRY_RUN !== 'true' &&\n    process.env.NX_INTERACTIVE !== 'false'\n  ) {\n    const { engagementId } = await enquirer.prompt<{ engagementId?: string }>([\n      {\n        name: 'engagementId',\n        message: 'Please enter your engagementId (if known)',\n        type: 'input',\n        initial: 'None',\n      },\n    ]);\n\n    if (engagementId != 'None') {\n      await ensureAwsNxPluginConfig(tree);\n      await updateAwsNxPluginConfig(tree, { tags: [engagementId] });\n    }\n  }\n\n  // Write IaC provider and container engine to plugin config\n  await ensureAwsNxPluginConfig(tree);\n  await updateAwsNxPluginConfig(tree, {\n    iac: { provider: iac },\n    containers: { engine: resolvedContainers },\n  });\n\n  await initGenerator(tree, {\n    formatter: 'none',\n    addTsPlugin: true,\n  });\n\n  tree.delete('apps/.gitkeep');\n  tree.delete('libs/.gitkeep');\n  tree.write('packages/.gitkeep', '');\n\n  setUpWorkspaces(tree);\n\n  const nxJson = readNxJson(tree);\n  updateNxJson(tree, {\n    ...nxJson,\n    analytics: false,\n    targetDefaults: {\n      ...nxJson.targetDefaults,\n      compile: {\n        ...nxJson.targetDefaults?.compile,\n        syncGenerators: [\n          ...(nxJson.targetDefaults?.compile?.syncGenerators ?? []).filter(\n            (g) =>\n              ![TS_SYNC_GENERATOR_NAME, NX_TYPESCRIPT_SYNC_GENERATOR].includes(\n                g,\n              ),\n          ),\n          NX_TYPESCRIPT_SYNC_GENERATOR,\n          TS_SYNC_GENERATOR_NAME,\n        ],\n      },\n    },\n  });\n\n  updateJson(tree, 'package.json', (packageJson) => ({\n    ...packageJson,\n    // Written explicitly so later generators can infer the workspace's module\n    // format from the root `type`.\n    type: esm ? 'module' : 'commonjs',\n    scripts: {\n      ...packageJson.scripts,\n      dev: 'nx run-many --target dev',\n      build: 'nx run-many --target build',\n      lint: 'nx run-many --target lint --configuration=fix',\n      test: 'nx run-many --target test --all',\n      'build:skip-lint': 'nx run-many --target build --configuration=skip-lint',\n      'build:all': 'nx run-many --target build --all',\n      'affected:all': 'nx affected --target build',\n    },\n  }));\n\n  addDependenciesToPackageJson(\n    tree,\n    {},\n    {\n      '@nx/workspace': readModulePackageJson('@nx/js').packageJson.version,\n      ...withVersions(['typescript', '@biomejs/biome']),\n    },\n  );\n\n  // Write biome.json for formatting and linting\n  if (!tree.exists('biome.json')) {\n    tree.write('biome.json', JSON.stringify(DEFAULT_BIOME_CONFIG, null, 2));\n  }\n\n  generateFiles(\n    tree, // the virtual file system\n    joinPathFragments(import.meta.dirname, 'files'),\n    '.',\n    {\n      projectName: getNpmScope(tree),\n      generators: Object.entries(GeneratorsJson.generators)\n        .filter(([_, v]) => !v['hidden'])\n        .map(([k, v]) => ({ name: k, description: v.description })),\n      ...(() => {\n        const cmds = getPackageManagerDisplayCommands();\n        return {\n          pkgMgrCmd: cmds.exec,\n          buildCmd: `${cmds.run} build`,\n          lintCmd: `${cmds.run} lint`,\n        };\n      })(),\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.Overwrite,\n    },\n  );\n\n  if (gitSecrets !== false) {\n    setUpGitSecrets(tree);\n  }\n\n  if (mcp !== false) {\n    configureMcpServers(tree);\n  }\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default presetGenerator;\n"],"names":["addDependenciesToPackageJson","detectPackageManager","generateFiles","joinPathFragments","OverwriteStrategy","readNxJson","updateJson","updateNxJson","initGenerator","execSync","enquirer","readFileSync","yaml","readModulePackageJson","GeneratorsJson","type","SYNC_GENERATOR_NAME","TS_SYNC_GENERATOR_NAME","ensureAwsNxPluginConfig","updateAwsNxPluginConfig","inferContainers","DEFAULT_BIOME_CONFIG","formatFilesInSubtree","installDependencies","configureMcpServers","getNpmScope","getGeneratorInfo","getPackageManagerDisplayCommands","withVersions","WORKSPACES","NX_TYPESCRIPT_SYNC_GENERATOR","PNPM_BUILT_DEPENDENCIES","PRESET_GENERATOR_INFO","filename","setUpWorkspaces","tree","write","dump","packages","allowBuilds","Object","fromEntries","map","dep","onlyBuiltDependencies","quotingType","json","workspaces","isAmazonian","gitEmail","encoding","trim","emailParts","split","length","domain","toLowerCase","startsWith","error","setUpGitSecrets","gitSecretsDir","dirname","huskyDir","scripts","prepare","presetGenerator","iac","gitSecrets","mcp","containers","module","preferInstallDependencies","resolvedContainers","esm","process","env","VITEST","CI","NX_DRY_RUN","NX_INTERACTIVE","engagementId","prompt","name","message","initial","tags","provider","engine","formatter","addTsPlugin","delete","nxJson","analytics","targetDefaults","compile","syncGenerators","filter","g","includes","packageJson","dev","build","lint","test","version","exists","JSON","stringify","projectName","generators","entries","_","v","k","description","cmds","pkgMgrCmd","exec","buildCmd","run","lintCmd","overwriteStrategy","Overwrite","languages"],"mappings":"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"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/preset/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  type GeneratorCallback,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport { execSync } from 'child_process';\nimport enquirer from 'enquirer';\nimport { readFileSync } from 'fs';\nimport {\n  ensureAwsNxPluginConfig,\n  updateAwsNxPluginConfig,\n} from '../utils/config/utils';\nimport { formatFilesInSubtree } from '../utils/format';\nimport { applyWorkspaceInit } from '../utils/init';\nimport { installDependencies } from '../utils/install';\nimport { getGeneratorInfo, type NxGeneratorInfo } from '../utils/nx';\nimport { withVersions } from '../utils/versions';\nimport type { PresetGeneratorSchema } from './schema';\n\nexport const PRESET_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n/**\n * Determines if the current user is an Amazon employee based on their git configuration.\n *\n * This function checks the git user email configuration to identify Amazon employees\n * by looking for email addresses with Amazon domains (e.g., @amazon.com, @amazon.co.uk).\n *\n * @returns {boolean} True if the user's git email has an Amazon domain, false otherwise\n *\n * @example\n * // Returns true for Amazon employee emails\n * // git config user.email = \"john.doe@amazon.com\"\n * isAmazonian(); // true\n *\n * @example\n * // Returns false for non-Amazon emails\n * // git config user.email = \"user@example.com\"\n * isAmazonian(); // false\n *\n * @example\n * // Returns false when git config is not available or throws an error\n * isAmazonian(); // false\n */\nexport function isAmazonian(): boolean {\n  try {\n    // Execute git command to retrieve the user's configured email address\n    const gitEmail = execSync('git config user.email', {\n      encoding: 'utf8',\n    }).trim();\n\n    // Return false if no email is configured\n    if (!gitEmail) {\n      return false;\n    }\n\n    // Split email address to extract domain part\n    const emailParts = gitEmail.split('@');\n    if (emailParts.length < 2) {\n      return false;\n    }\n\n    // Extract domain and normalize to lowercase for comparison\n    const domain = emailParts[1].toLowerCase();\n\n    // Check if domain starts with 'amazon.' (covers amazon.com, amazon.co.uk, etc.)\n    return domain.startsWith('amazon.');\n  } catch (error) {\n    // Return false if git command fails or any other error occurs\n    // This handles cases where git is not installed or configured\n    return false;\n  }\n}\n\nconst setUpGitSecrets = (tree: Tree) => {\n  const gitSecretsDir = joinPathFragments(\n    import.meta.dirname,\n    'git-secrets-files',\n    'git-secrets-dir',\n  );\n  const huskyDir = joinPathFragments(\n    import.meta.dirname,\n    'git-secrets-files',\n    'husky-dir',\n  );\n\n  tree.write(\n    '.git-secrets/git-secrets',\n    readFileSync(joinPathFragments(gitSecretsDir, 'git-secrets'), 'utf-8'),\n  );\n  tree.write(\n    '.husky/pre-commit',\n    readFileSync(joinPathFragments(huskyDir, 'pre-commit'), 'utf-8'),\n  );\n  tree.write('.gitallowed', '\\\\.git-secrets/git-secrets:\\n');\n\n  updateJson(tree, 'package.json', (json) => ({\n    ...json,\n    scripts: {\n      ...json.scripts,\n      prepare: 'husky',\n    },\n  }));\n\n  addDependenciesToPackageJson(tree, {}, withVersions(['husky']));\n};\n\nexport const presetGenerator = async (\n  tree: Tree,\n  {\n    iac,\n    gitSecrets,\n    mcp,\n    containers,\n    module,\n    preferInstallDependencies,\n  }: PresetGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  if (\n    isAmazonian() &&\n    !process.env.VITEST &&\n    !process.env.CI &&\n    process.env.NX_DRY_RUN !== 'true' &&\n    process.env.NX_INTERACTIVE !== 'false'\n  ) {\n    const { engagementId } = await enquirer.prompt<{ engagementId?: string }>([\n      {\n        name: 'engagementId',\n        message: 'Please enter your engagementId (if known)',\n        type: 'input',\n        initial: 'None',\n      },\n    ]);\n\n    if (engagementId != 'None') {\n      await ensureAwsNxPluginConfig(tree);\n      await updateAwsNxPluginConfig(tree, { tags: [engagementId] });\n    }\n  }\n\n  // The preset owns the greenfield workspace's module format: write the root\n  // `type` explicitly from the chosen `--module` so later generators can\n  // infer it. The `init` generator never touches an existing workspace's\n  // `type` field.\n  updateJson(tree, 'package.json', (packageJson) => ({\n    ...packageJson,\n    type: (module ?? 'esm') === 'esm' ? 'module' : 'commonjs',\n  }));\n\n  // Apply the deterministic workspace configuration shared with the `init`\n  // generator. The preset owns the README of a greenfield workspace.\n  await applyWorkspaceInit(tree, {\n    iac,\n    containers,\n    mcp,\n    readmeOverwriteStrategy: OverwriteStrategy.Overwrite,\n    overwriteScripts: true,\n  });\n\n  tree.delete('apps/.gitkeep');\n  tree.delete('libs/.gitkeep');\n  tree.write('packages/.gitkeep', '');\n\n  if (gitSecrets !== false) {\n    setUpGitSecrets(tree);\n  }\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default presetGenerator;\n"],"names":["addDependenciesToPackageJson","joinPathFragments","OverwriteStrategy","updateJson","execSync","enquirer","readFileSync","ensureAwsNxPluginConfig","updateAwsNxPluginConfig","formatFilesInSubtree","applyWorkspaceInit","installDependencies","getGeneratorInfo","withVersions","PRESET_GENERATOR_INFO","filename","isAmazonian","gitEmail","encoding","trim","emailParts","split","length","domain","toLowerCase","startsWith","error","setUpGitSecrets","tree","gitSecretsDir","dirname","huskyDir","write","json","scripts","prepare","presetGenerator","iac","gitSecrets","mcp","containers","module","preferInstallDependencies","process","env","VITEST","CI","NX_DRY_RUN","NX_INTERACTIVE","engagementId","prompt","name","message","type","initial","tags","packageJson","readmeOverwriteStrategy","Overwrite","overwriteScripts","delete","languages"],"mappings":"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"}

package/src/py/agent/__snapshots__/generator.constructs.spec.ts.snap

@@ -20,7 +20,7 @@ CMD ["python", "bin/opentelemetry-instrument", "python", "-m", "proj_test_projec
 `;
 
 exports[`py#agent generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > agent-construct.ts 1`] = `
-"import { Lazy, Names } from 'aws-cdk-lib';
+"import { Fn, Lazy, Names, Stack } from 'aws-cdk-lib';
 import { Platform } from 'aws-cdk-lib/aws-ecr-assets';
 import { Connections, IConnectable } from 'aws-cdk-lib/aws-ec2';
 import { Construct } from 'constructs';
@@ -121,6 +121,22 @@ export class SnapshotBedrockAgent
     return this.agentCoreRuntime.connections;
   }
 
+  /**
+   * The HTTPS invocation URL of the runtime.
+   */
+  public get invocationUrl(): string {
+    // The URL must URL-encode the runtime ARN (':' -> '%3A', '/' -> '%2F').
+    // The ARN is a CDK token, so encode at deploy time via Fn.join/Fn.split.
+    const encodedArn = Fn.join(
+      '%2F',
+      Fn.split(
+        '/',
+        Fn.join('%3A', Fn.split(':', this.agentCoreRuntime.agentRuntimeArn)),
+      ),
+    );
+    return \`https://bedrock-agentcore.\${Stack.of(this).region}.amazonaws.com/runtimes/\${encodedArn}/invocations?qualifier=DEFAULT\`;
+  }
+
   /**
    * Grants IAM permissions to invoke this agent runtime.
    *
@@ -215,7 +231,7 @@ _agent = _agent_ctx.__enter__()
 
 
 class InvokeInput(BaseModel):
-    message: str = Field(max_length=100000)
+    prompt: str = Field(max_length=100000)
 
 
 class StreamChunk(BaseModel):
@@ -224,7 +240,7 @@ class StreamChunk(BaseModel):
 
 async def handle_invoke(input: InvokeInput):
     """Streaming handler for agent invocation"""
-    stream = _agent.stream_async(input.message)
+    stream = _agent.stream_async(input.prompt)
     async for event in stream:
         text = (
             event.get("event", {})

package/src/py/agent/__snapshots__/generator.frameworks.spec.ts.snap

@@ -454,7 +454,7 @@ class TestProjectAgentAdapter implements ChatAdapter {
   }
 
   async *sendMessage(text: string): AsyncIterable<string> {
-    for await (const chunk of this.client.invoke({ message: text })) {
+    for await (const chunk of this.client.invoke({ prompt: text })) {
       if (typeof chunk.content === 'string') yield chunk.content;
     }
   }
@@ -559,7 +559,7 @@ class TestProjectAgentAdapter implements ChatAdapter {
   }
 
   async *sendMessage(text: string): AsyncIterable<string> {
-    for await (const chunk of this.client.invoke({ message: text })) {
+    for await (const chunk of this.client.invoke({ prompt: text })) {
       if (typeof chunk.content === 'string') yield chunk.content;
     }
   }

package/src/py/agent/__snapshots__/generator.protocols.spec.ts.snap

@@ -110,6 +110,11 @@ output "agent_core_runtime_arn" {
   value       = module.agent_core_runtime.agent_core_runtime_arn
 }
 
+output "invocation_url" {
+  description = "HTTPS invocation URL of the runtime"
+  value       = module.agent_core_runtime.invocation_url
+}
+
 output "appconfig_application_id" {
   description = "AppConfig Application ID for runtime config (passthrough of the shared \`appconfig_application_id\` input)."
   value       = var.appconfig_application_id
@@ -583,6 +588,12 @@ print(f'Runtime {runtime_arn} is serving MCP')
 }
 
 # Outputs
+locals {
+  # For MCP runtimes the ARN flows through the readiness probe, so consumers
+  # wait until the runtime serves MCP.
+  ready_runtime_arn = var.server_protocol == "MCP" ? null_resource.runtime_ready[0].triggers.runtime_arn : aws_bedrockagentcore_agent_runtime.agent_runtime.agent_runtime_arn
+}
+
 output "agent_core_runtime_role_arn" {
   description = "ARN of the Agent Core Runtime IAM role"
   value       = aws_iam_role.agent_core_runtime_role.arn
@@ -600,7 +611,12 @@ output "agent_runtime_name" {
 
 output "agent_core_runtime_arn" {
   description = "ARN of the Bedrock Agent Core runtime. For MCP runtimes the value flows through the readiness probe, so consumers wait until the runtime serves MCP."
-  value       = var.server_protocol == "MCP" ? null_resource.runtime_ready[0].triggers.runtime_arn : aws_bedrockagentcore_agent_runtime.agent_runtime.agent_runtime_arn
+  value       = local.ready_runtime_arn
+}
+
+output "invocation_url" {
+  description = "HTTPS invocation URL of the runtime. MCP runtimes get the MCP endpoint (e.g. for use as a Gateway target endpoint), A2A runtimes the A2A endpoint (trailing slash required). For MCP runtimes the value flows through the readiness probe, so consumers wait until the runtime serves MCP."
+  value       = "https://bedrock-agentcore.\${local.aws_region}.amazonaws.com/runtimes/\${urlencode(local.ready_runtime_arn)}/invocations\${var.server_protocol == "A2A" ? "/" : "?qualifier=DEFAULT"}"
 }
 
 output "agent_runtime_id" {

package/src/py/agent/files/http/main.py.template

@@ -21,7 +21,7 @@ _agent = _agent_ctx.__enter__()
 
 
 class InvokeInput(BaseModel):
-    message: str = Field(max_length=100000)
+    prompt: str = Field(max_length=100000)
 
 
 class StreamChunk(BaseModel):
@@ -30,7 +30,7 @@ class StreamChunk(BaseModel):
 
 async def handle_invoke(input: InvokeInput):
     """Streaming handler for agent invocation"""
-    stream = _agent.stream_async(input.message)
+    stream = _agent.stream_async(input.prompt)
     async for event in stream:
         text = event.get("event", {}).get("contentBlockDelta", {}).get("delta", {}).get("text")
         if text is not None:

package/src/py/agent/files/http-langchain/main.py.template

@@ -16,7 +16,7 @@ _graph = get_agent()
 
 
 class InvokeInput(BaseModel):
-    message: str = Field(max_length=100000)
+    prompt: str = Field(max_length=100000)
 
 
 class StreamChunk(BaseModel):
@@ -41,7 +41,7 @@ async def handle_invoke(input: InvokeInput, session_id: str):
     # Re-bind the session: the streaming body runs outside the middleware scope.
     with session_id_context(session_id):
         stream = _graph.astream(
-            {"messages": [{"role": "user", "content": input.message}]},
+            {"messages": [{"role": "user", "content": input.prompt}]},
             config,
             stream_mode="messages",
         )

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

@@ -14,7 +14,7 @@ export * from './workspace.js';
 `;
 
 exports[`py#mcp-server generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > mcp-server-construct.ts 1`] = `
-"import { Lazy, Names } from 'aws-cdk-lib';
+"import { Fn, Lazy, Names, Stack } from 'aws-cdk-lib';
 import { Platform } from 'aws-cdk-lib/aws-ecr-assets';
 import { Connections, IConnectable } from 'aws-cdk-lib/aws-ec2';
 import { Construct } from 'constructs';
@@ -102,6 +102,23 @@ export class SnapshotBedrockServer
     return this.agentCoreRuntime.connections;
   }
 
+  /**
+   * The MCP endpoint URL of the runtime, e.g. for use as a Gateway target
+   * endpoint.
+   */
+  public get invocationUrl(): string {
+    // The URL must URL-encode the runtime ARN (':' -> '%3A', '/' -> '%2F').
+    // The ARN is a CDK token, so encode at deploy time via Fn.join/Fn.split.
+    const encodedArn = Fn.join(
+      '%2F',
+      Fn.split(
+        '/',
+        Fn.join('%3A', Fn.split(':', this.agentCoreRuntime.agentRuntimeArn)),
+      ),
+    );
+    return \`https://bedrock-agentcore.\${Stack.of(this).region}.amazonaws.com/runtimes/\${encodedArn}/invocations?qualifier=DEFAULT\`;
+  }
+
   /**
    * Grants IAM permissions to invoke this agent runtime.
    *
@@ -589,6 +606,12 @@ print(f'Runtime {runtime_arn} is serving MCP')
 }
 
 # Outputs
+locals {
+  # For MCP runtimes the ARN flows through the readiness probe, so consumers
+  # wait until the runtime serves MCP.
+  ready_runtime_arn = var.server_protocol == "MCP" ? null_resource.runtime_ready[0].triggers.runtime_arn : aws_bedrockagentcore_agent_runtime.agent_runtime.agent_runtime_arn
+}
+
 output "agent_core_runtime_role_arn" {
   description = "ARN of the Agent Core Runtime IAM role"
   value       = aws_iam_role.agent_core_runtime_role.arn
@@ -606,7 +629,12 @@ output "agent_runtime_name" {
 
 output "agent_core_runtime_arn" {
   description = "ARN of the Bedrock Agent Core runtime. For MCP runtimes the value flows through the readiness probe, so consumers wait until the runtime serves MCP."
-  value       = var.server_protocol == "MCP" ? null_resource.runtime_ready[0].triggers.runtime_arn : aws_bedrockagentcore_agent_runtime.agent_runtime.agent_runtime_arn
+  value       = local.ready_runtime_arn
+}
+
+output "invocation_url" {
+  description = "HTTPS invocation URL of the runtime. MCP runtimes get the MCP endpoint (e.g. for use as a Gateway target endpoint), A2A runtimes the A2A endpoint (trailing slash required). For MCP runtimes the value flows through the readiness probe, so consumers wait until the runtime serves MCP."
+  value       = "https://bedrock-agentcore.\${local.aws_region}.amazonaws.com/runtimes/\${urlencode(local.ready_runtime_arn)}/invocations\${var.server_protocol == "A2A" ? "/" : "?qualifier=DEFAULT"}"
 }
 
 output "agent_runtime_id" {
@@ -724,6 +752,11 @@ output "agent_core_runtime_arn" {
   value       = module.agent_core_runtime.agent_core_runtime_arn
 }
 
+output "invocation_url" {
+  description = "HTTPS invocation URL of the runtime (the MCP endpoint, e.g. for use as a Gateway target endpoint)"
+  value       = module.agent_core_runtime.invocation_url
+}
+
 output "appconfig_application_id" {
   description = "AppConfig Application ID for runtime config (passthrough of the shared \`appconfig_application_id\` input)."
   value       = var.appconfig_application_id