@aws/nx-plugin 1.0.0-rc.62 → 1.0.0-rc.63

package/migrations.json

@@ -37,6 +37,11 @@
       "description": "Clone the react website 'load:runtime-config' target to a 'load-runtime-config' target so it can be run with the verb syntax (nx load-runtime-config <project>)",
       "implementation": "./src/migrations/latest/rename-load-runtime-config-target/migration"
     },
+    "latest-add-deploy-sandbox-target": {
+      "version": "1.0.0-rc.63",
+      "description": "Add a deploy-sandbox target to CDK infrastructure projects which deploys the sandbox stage",
+      "implementation": "./src/migrations/latest/add-deploy-sandbox-target/migration"
+    },
     "v1.0.0-rc.50-0001-modernize-function-props-cast": {
       "version": "1.0.0-rc.50",
       "description": "Replace the legacy angle-bracket FunctionProps type assertion with the modern as syntax in generated API constructs",
@@ -78,14 +83,14 @@
       "implementation": "./src/migrations/v1.0.0-rc.57/0001-ts-agent-session-management-support/migration"
     },
     "sync-vended-versions": {
-      "version": "1.0.0-rc.62",
+      "version": "1.0.0-rc.63",
       "description": "Sync vended dependency versions and the tracked plugin version to those vended by this release",
       "implementation": "./src/utils/version-upgrade-migration/migration"
     }
   },
   "packageJsonUpdates": {
     "nx-23.1.1-nx-packages": {
-      "version": "1.0.0-rc.62",
+      "version": "1.0.0-rc.63",
       "packages": {
         "nx": {
           "version": "23.1.1",

package/package.json

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

package/src/agentcore-gateway/__snapshots__/generator.spec.ts.snap

@@ -9,6 +9,10 @@ exports[`agentcore-gateway generator > protocol: http > omits protocol_type from
       source  = "hashicorp/aws"
       version = "6.57.1"
     }
+    time = {
+      source  = "hashicorp/time"
+      version = "0.14.0"
+    }
     random = {
       source  = "hashicorp/random"
       version = "3.9.0"
@@ -85,6 +89,22 @@ resource "aws_iam_role_policy" "gateway_role_policy" {
   })
 }
 
+# IAM is eventually consistent, and the gateway assumes this role to reach its
+# targets — an MCP target fetches tools at creation time. Without this wait the
+# fetch intermittently runs before the policy above has propagated and the
+# target lands in FAILED with an authorization error.
+resource "time_sleep" "gateway_role_policy_propagation" {
+  count = length(var.additional_iam_policy_statements) > 0 ? 1 : 0
+
+  depends_on = [aws_iam_role_policy.gateway_role_policy]
+
+  create_duration = "30s"
+
+  triggers = {
+    policy = aws_iam_role_policy.gateway_role_policy[0].policy
+  }
+}
+
 resource "aws_bedrockagentcore_gateway" "this" {
   # Cap the name so the 11-char service suffix keeps the gateway id within its
   # 50-char limit (30 prefix + "-<8 hex>" + 11 = 50).
@@ -97,6 +117,8 @@ resource "aws_bedrockagentcore_gateway" "this" {
   # (\`/<targetName>/invocations\`).
 
   authorizer_type = "AWS_IAM"
+
+  depends_on = [time_sleep.gateway_role_policy_propagation]
 }
 
 # WAFv2 protection for the gateway. AgentCore Gateway requires a REGIONAL web

package/src/infra/app/__snapshots__/generator.spec.ts.snap

@@ -184,6 +184,17 @@ exports[`infra generator > should configure project.json with correct targets >
         "cwd": "{projectRoot}",
       },
     },
+    "deploy-sandbox": {
+      "dependsOn": [
+        "^build",
+        "compile",
+      ],
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "cdk deploy --require-approval=never "proj-test-sandbox/*"",
+        "cwd": "{projectRoot}",
+      },
+    },
     "destroy": {
       "dependsOn": [
         "^build",
@@ -410,6 +421,8 @@ new ApplicationStage(app, 'proj-test-sandbox', {
   },
 });
 
+// Define other instances of stages, such as beta and prod, below
+
 app.synth();
 ",
   "src/stacks/application-stack.ts": "import { Stack, StackProps } from 'aws-cdk-lib';
@@ -562,6 +575,8 @@ new ApplicationStage(app, 'proj-test-sandbox', {
   },
 });
 
+// Define other instances of stages, such as beta and prod, below
+
 app.synth();
 "
 `;
@@ -649,6 +664,8 @@ new ApplicationStage(app, 'proj-custom-infra-sandbox', {
   },
 });
 
+// Define other instances of stages, such as beta and prod, below
+
 app.synth();
 ",
   "src/stacks/application-stack.ts": "import { Stack, StackProps } from 'aws-cdk-lib';
@@ -762,6 +779,17 @@ exports[`infra generator > should handle custom project names correctly > custom
         "cwd": "{projectRoot}",
       },
     },
+    "deploy-sandbox": {
+      "dependsOn": [
+        "^build",
+        "compile",
+      ],
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "cdk deploy --require-approval=never "proj-custom-infra-sandbox/*"",
+        "cwd": "{projectRoot}",
+      },
+    },
     "destroy": {
       "dependsOn": [
         "^build",

package/src/infra/app/files/app/README.md.template

@@ -27,13 +27,17 @@ You can also automatically fix some lint errors by running the following command
 
 ## Deploy to AWS
 
-### Deploy all Stacks
+### Deploy your Sandbox Stage
 
-Run `<%= pkgMgrCmd %> nx deploy <%= fullyQualifiedName %> --all`
+Run `<%= pkgMgrCmd %> nx deploy-sandbox <%= fullyQualifiedName %>`
+
+### Deploy all Stacks in a Stage
+
+Run `<%= pkgMgrCmd %> nx deploy <%= fullyQualifiedName %> "[stageName]/*"`
 
 ### Deploy a single Stack
 
-Run `<%= pkgMgrCmd %> nx deploy <%= fullyQualifiedName %> [stackName]`
+Run `<%= pkgMgrCmd %> nx deploy <%= fullyQualifiedName %> [stageName]/[stackName]`
 
 ### Hotswap deployment
 
@@ -44,7 +48,7 @@ Use the --hotswap flag with the deploy target to attempt to update your AWS reso
 
 Currently hot swapping supports Lambda functions, Step Functions state machines, and Amazon ECS container images. The --hotswap flag also disables rollback (i.e., implies --no-rollback).
 
-Run `<%= pkgMgrCmd %> nx deploy <%= fullyQualifiedName %> --hotswap --all`
+Run `<%= pkgMgrCmd %> nx deploy-sandbox <%= fullyQualifiedName %> --hotswap`
 
 ## Checkov Rule Suppressions
 

package/src/infra/app/files/app/src/main.ts.template

@@ -17,6 +17,8 @@ new ApplicationStage(app, '<%= namespace %>-sandbox', {
     region: sandboxConfig?.region ?? process.env.CDK_DEFAULT_REGION,
   },
 });
+
+// Define other instances of stages, such as beta and prod, below
 <% } else { %>
 // Use this to deploy your own sandbox environment (assumes your CLI credentials)
 new ApplicationStage(app, '<%= namespace %>-sandbox', {
@@ -25,5 +27,7 @@ new ApplicationStage(app, '<%= namespace %>-sandbox', {
     region: process.env.CDK_DEFAULT_REGION,
   },
 });
+
+// Define other instances of stages, such as beta and prod, below
 <% } %>
 app.synth();

package/src/infra/app/generator.js

@@ -105,11 +105,14 @@ export async function tsInfraGenerator(tree, schema) {
     const npmScopePrefix = getNpmScopePrefix(tree);
     const scopeAlias = npmScopePrefix;
     const fullyQualifiedName = `${npmScopePrefix}${schema.name}`;
+    const namespace = kebabCase(fullyQualifiedName);
+    // The stage instantiated in main.ts. Quoted so the shell does not glob `*`.
+    const sandboxStagePattern = `"${namespace}-sandbox/*"`;
     tree.delete(joinPathFragments(libraryRoot, 'src'));
     generateFiles(tree, joinPathFragments(import.meta.dirname, './files/app'), libraryRoot, {
         synthDir: synthDirFromProject,
         scopeAlias: scopeAlias,
-        namespace: kebabCase(fullyQualifiedName),
+        namespace,
         fullyQualifiedName,
         pkgMgrCmd: getPackageManagerDisplayCommands().exec,
         dir: lib.dir,
@@ -173,6 +176,19 @@ export async function tsInfraGenerator(tree, schema) {
                 command: 'cdk deploy --require-approval=never'
             })
         };
+        config.targets['deploy-sandbox'] = {
+            executor: 'nx:run-commands',
+            dependsOn: [
+                '^build',
+                'compile'
+            ],
+            options: stageConfig ? withCdkEnv({
+                command: `tsx packages/common/scripts/src/infra/infra-deploy.ts ${libraryRoot} ${sandboxStagePattern}`
+            }) : withCdkEnv({
+                cwd: '{projectRoot}',
+                command: `cdk deploy --require-approval=never ${sandboxStagePattern}`
+            })
+        };
         config.targets['deploy-ci'] = {
             executor: 'nx:run-commands',
             options: withCdkEnv({

package/src/infra/app/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  readProjectConfiguration,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport path from 'path';\nimport tsProjectGenerator, { getTsLibDetails } from '../../ts/lib/generator';\nimport { mergeTsReferences } from '../../ts/lib/ts-project-utils';\nimport { addTsDependencies } from '../../utils/add-dependencies';\nimport { resolveContainers } from '../../utils/containers';\nimport {\n  declareDependencies,\n  ownedElsewhere,\n} from '../../utils/declared-dependencies';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { esmVars } from '../../utils/module-format';\nimport { kebabCase } from '../../utils/names';\nimport { getNpmScopePrefix } from '../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { getPackageManagerDisplayCommands } from '../../utils/pkg-manager';\nimport { uvxCommand } from '../../utils/py';\nimport {\n  SHARED_CONSTRUCTS_DEPENDENCIES,\n  sharedConstructsGenerator,\n} from '../../utils/shared-constructs';\nimport {\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n  SHARED_INFRA_CONFIG_DIR,\n} from '../../utils/shared-constructs-constants';\nimport { sharedInfraConfigGenerator } from '../../utils/shared-infra-config';\nimport {\n  SHARED_INFRA_SCRIPTS_DEPENDENCIES,\n  sharedInfraScriptsGenerator,\n} from '../../utils/shared-infra-scripts';\nimport type { TsInfraGeneratorSchema } from './schema';\n\n// This generator records no metadata, so nothing a predicate could read: the\n// CDK app always needs the app libraries, and the CLI, bundler and tsx are\n// shared tooling.\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [\n    { name: 'aws-cdk-lib' },\n    { name: 'constructs' },\n    { name: 'source-map-support' },\n    // The `aws-cdk` CLI, esbuild (CDK bundling) and tsx are shared tooling.\n    { name: 'aws-cdk', dev: true, root: true },\n    { name: 'esbuild', dev: true, root: true },\n    { name: 'tsx', dev: true, root: true },\n    ...ownedElsewhere(SHARED_CONSTRUCTS_DEPENDENCIES),\n    ...ownedElsewhere(SHARED_INFRA_SCRIPTS_DEPENDENCIES),\n  ],\n});\n\nexport const INFRA_APP_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport async function tsInfraGenerator(\n  tree: Tree,\n  schema: TsInfraGeneratorSchema,\n): Promise<GeneratorCallback> {\n  const lib = getTsLibDetails(tree, schema);\n\n  if (!projectExists(tree, lib.fullyQualifiedName)) {\n    await tsProjectGenerator(tree, {\n      ...schema,\n      preferInstallDependencies: false,\n    });\n  }\n\n  // CDK shells out to a container engine to build image assets. Default\n  // (docker) needs no env override; finch is set via CDK_DOCKER per\n  // https://docs.aws.amazon.com/cdk/v2/guide/build-containers.html#build-container-replace.\n  const containers = await resolveContainers(tree, 'inherit');\n  const cdkEnv: Record<string, string> | undefined =\n    containers === 'docker' ? undefined : { CDK_DOCKER: containers };\n  const withCdkEnv = <T extends Record<string, unknown>>(opts: T): T => {\n    if (!cdkEnv) return opts;\n    const existingEnv = (opts.env as Record<string, string> | undefined) ?? {};\n    return { ...opts, env: { ...existingEnv, ...cdkEnv } } as T;\n  };\n\n  // This generator IS the CDK infrastructure project, so the provider is fixed.\n  addGeneratorMetadata(tree, lib.fullyQualifiedName, INFRA_APP_GENERATOR_INFO, {\n    iac: 'cdk',\n  });\n\n  // Shared constructs always in CDK for typescript infra generator\n  await sharedConstructsGenerator(\n    tree,\n    {\n      iac: 'cdk',\n    },\n    DEPENDENCIES,\n  );\n\n  // Shared infra-config and infra-scripts packages (lazy creation, only when enabled)\n  const stageConfig = schema.stageConfig ?? false;\n  if (stageConfig) {\n    await sharedInfraConfigGenerator(tree);\n    await sharedInfraScriptsGenerator(tree, DEPENDENCIES);\n  }\n\n  const synthDirFromRoot = `/dist/${lib.dir}/cdk.out`;\n  const synthDirFromProject =\n    lib.dir\n      .split('/')\n      .map(() => '..')\n      .join('/') + `/dist/${lib.dir}/cdk.out`;\n  const distDirFromProjectRoot =\n    lib.dir\n      .split('/')\n      .map(() => '..')\n      .join('/') + '/dist/{projectRoot}/cdk.out';\n  const projectConfig = readProjectConfiguration(tree, lib.fullyQualifiedName);\n  const libraryRoot = projectConfig.root;\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const scopeAlias = npmScopePrefix;\n  const fullyQualifiedName = `${npmScopePrefix}${schema.name}`;\n  tree.delete(joinPathFragments(libraryRoot, 'src'));\n\n  generateFiles(\n    tree, // the virtual file system\n    joinPathFragments(import.meta.dirname, './files/app'), // path to the file templates\n    libraryRoot, // destination path of the files\n    {\n      synthDir: synthDirFromProject,\n      scopeAlias: scopeAlias,\n      namespace: kebabCase(fullyQualifiedName),\n      fullyQualifiedName,\n      pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n      dir: lib.dir,\n      stageConfig,\n      ...schema,\n      ...esmVars(tree),\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.Overwrite,\n    },\n  );\n\n  updateJson(\n    tree,\n    `${libraryRoot}/project.json`,\n    (config: ProjectConfiguration) => {\n      config.projectType = 'application';\n      addDependencyToTargetIfNotPresent(config, 'build', 'synth');\n      addDependencyToTargetIfNotPresent(config, 'build', 'checkov');\n      config.targets.compile.outputs = [\n        '{workspaceRoot}/dist/{projectRoot}/tsc',\n      ];\n      config.targets.synth = {\n        cache: true,\n        executor: 'nx:run-commands',\n        inputs: ['default'],\n        outputs: ['{workspaceRoot}/dist/{projectRoot}/cdk.out'],\n        dependsOn: ['^build', 'compile'], // compile clobbers dist directory, so ensure synth runs afterwards\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: 'cdk synth',\n        }),\n      };\n      config.targets.checkov = {\n        cache: true,\n        executor: 'nx:run-commands',\n        inputs: ['{workspaceRoot}/dist/{projectRoot}/cdk.out'],\n        outputs: ['{workspaceRoot}/dist/{projectRoot}/checkov'],\n        dependsOn: ['synth'],\n        options: {\n          command: uvxCommand(\n            'checkov',\n            '--config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation',\n          ),\n        },\n      };\n      config.targets.deploy = {\n        executor: 'nx:run-commands',\n        dependsOn: ['^build', 'compile'],\n        options: stageConfig\n          ? withCdkEnv({\n              command: `tsx packages/common/scripts/src/infra/infra-deploy.ts ${libraryRoot}`,\n            })\n          : withCdkEnv({\n              cwd: '{projectRoot}',\n              command: 'cdk deploy --require-approval=never',\n            }),\n      };\n      config.targets['deploy-ci'] = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: `cdk deploy --require-approval=never --app ${distDirFromProjectRoot}`,\n        }),\n      };\n      config.targets.destroy = {\n        executor: 'nx:run-commands',\n        dependsOn: ['^build', 'compile'],\n        options: stageConfig\n          ? withCdkEnv({\n              command: `tsx packages/common/scripts/src/infra/infra-destroy.ts ${libraryRoot}`,\n            })\n          : withCdkEnv({\n              cwd: '{projectRoot}',\n              command: 'cdk destroy --require-approval=never',\n            }),\n      };\n      config.targets['destroy-ci'] = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: `cdk destroy --require-approval=never --app ${distDirFromProjectRoot}`,\n        }),\n      };\n      config.targets.cdk = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: 'cdk',\n        }),\n      };\n      config.targets.bootstrap = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: 'cdk bootstrap',\n        }),\n      };\n      config.targets = sortObjectKeys(config.targets);\n      return config;\n    },\n  );\n\n  addTsDependencies(tree, DEPENDENCIES, { projectRoot: libraryRoot });\n\n  updateJson(tree, `${libraryRoot}/tsconfig.lib.json`, (tsConfig) => ({\n    ...tsConfig,\n    references: mergeTsReferences(tsConfig.references, [\n      {\n        path: `${path.relative(\n          libraryRoot,\n          `${tree.root}/${PACKAGES_DIR}`,\n        )}/${SHARED_CONSTRUCTS_DIR}/tsconfig.lib.json`,\n      },\n      ...(stageConfig\n        ? [\n            {\n              path: `${path.relative(\n                libraryRoot,\n                `${tree.root}/${PACKAGES_DIR}`,\n              )}/${SHARED_INFRA_CONFIG_DIR}/tsconfig.json`,\n            },\n          ]\n        : []),\n    ]),\n  }));\n\n  await addGeneratorMetricsIfApplicable(tree, [INFRA_APP_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n}\nexport default tsInfraGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readProjectConfiguration","updateJson","path","tsProjectGenerator","getTsLibDetails","mergeTsReferences","addTsDependencies","resolveContainers","declareDependencies","ownedElsewhere","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","esmVars","kebabCase","getNpmScopePrefix","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","projectExists","sortObjectKeys","getPackageManagerDisplayCommands","uvxCommand","SHARED_CONSTRUCTS_DEPENDENCIES","sharedConstructsGenerator","PACKAGES_DIR","SHARED_CONSTRUCTS_DIR","SHARED_INFRA_CONFIG_DIR","sharedInfraConfigGenerator","SHARED_INFRA_SCRIPTS_DEPENDENCIES","sharedInfraScriptsGenerator","DEPENDENCIES","ts","name","dev","root","INFRA_APP_GENERATOR_INFO","filename","tsInfraGenerator","tree","schema","lib","fullyQualifiedName","preferInstallDependencies","containers","cdkEnv","undefined","CDK_DOCKER","withCdkEnv","opts","existingEnv","env","iac","stageConfig","synthDirFromRoot","dir","synthDirFromProject","split","map","join","distDirFromProjectRoot","projectConfig","libraryRoot","npmScopePrefix","scopeAlias","delete","dirname","synthDir","namespace","pkgMgrCmd","exec","overwriteStrategy","Overwrite","config","projectType","targets","compile","outputs","synth","cache","executor","inputs","dependsOn","options","cwd","command","checkov","deploy","destroy","cdk","bootstrap","projectRoot","tsConfig","references","relative","languages"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  readProjectConfiguration,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport path from 'path';\nimport tsProjectGenerator, { getTsLibDetails } from '../../ts/lib/generator';\nimport { mergeTsReferences } from '../../ts/lib/ts-project-utils';\nimport { addTsDependencies } from '../../utils/add-dependencies';\nimport { resolveContainers } from '../../utils/containers';\nimport {\n  declareDependencies,\n  ownedElsewhere,\n} from '../../utils/declared-dependencies';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { esmVars } from '../../utils/module-format';\nimport { kebabCase } from '../../utils/names';\nimport { getNpmScopePrefix } from '../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { getPackageManagerDisplayCommands } from '../../utils/pkg-manager';\nimport { uvxCommand } from '../../utils/py';\nimport {\n  SHARED_CONSTRUCTS_DEPENDENCIES,\n  sharedConstructsGenerator,\n} from '../../utils/shared-constructs';\nimport {\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n  SHARED_INFRA_CONFIG_DIR,\n} from '../../utils/shared-constructs-constants';\nimport { sharedInfraConfigGenerator } from '../../utils/shared-infra-config';\nimport {\n  SHARED_INFRA_SCRIPTS_DEPENDENCIES,\n  sharedInfraScriptsGenerator,\n} from '../../utils/shared-infra-scripts';\nimport type { TsInfraGeneratorSchema } from './schema';\n\n// This generator records no metadata, so nothing a predicate could read: the\n// CDK app always needs the app libraries, and the CLI, bundler and tsx are\n// shared tooling.\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [\n    { name: 'aws-cdk-lib' },\n    { name: 'constructs' },\n    { name: 'source-map-support' },\n    // The `aws-cdk` CLI, esbuild (CDK bundling) and tsx are shared tooling.\n    { name: 'aws-cdk', dev: true, root: true },\n    { name: 'esbuild', dev: true, root: true },\n    { name: 'tsx', dev: true, root: true },\n    ...ownedElsewhere(SHARED_CONSTRUCTS_DEPENDENCIES),\n    ...ownedElsewhere(SHARED_INFRA_SCRIPTS_DEPENDENCIES),\n  ],\n});\n\nexport const INFRA_APP_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport async function tsInfraGenerator(\n  tree: Tree,\n  schema: TsInfraGeneratorSchema,\n): Promise<GeneratorCallback> {\n  const lib = getTsLibDetails(tree, schema);\n\n  if (!projectExists(tree, lib.fullyQualifiedName)) {\n    await tsProjectGenerator(tree, {\n      ...schema,\n      preferInstallDependencies: false,\n    });\n  }\n\n  // CDK shells out to a container engine to build image assets. Default\n  // (docker) needs no env override; finch is set via CDK_DOCKER per\n  // https://docs.aws.amazon.com/cdk/v2/guide/build-containers.html#build-container-replace.\n  const containers = await resolveContainers(tree, 'inherit');\n  const cdkEnv: Record<string, string> | undefined =\n    containers === 'docker' ? undefined : { CDK_DOCKER: containers };\n  const withCdkEnv = <T extends Record<string, unknown>>(opts: T): T => {\n    if (!cdkEnv) return opts;\n    const existingEnv = (opts.env as Record<string, string> | undefined) ?? {};\n    return { ...opts, env: { ...existingEnv, ...cdkEnv } } as T;\n  };\n\n  // This generator IS the CDK infrastructure project, so the provider is fixed.\n  addGeneratorMetadata(tree, lib.fullyQualifiedName, INFRA_APP_GENERATOR_INFO, {\n    iac: 'cdk',\n  });\n\n  // Shared constructs always in CDK for typescript infra generator\n  await sharedConstructsGenerator(\n    tree,\n    {\n      iac: 'cdk',\n    },\n    DEPENDENCIES,\n  );\n\n  // Shared infra-config and infra-scripts packages (lazy creation, only when enabled)\n  const stageConfig = schema.stageConfig ?? false;\n  if (stageConfig) {\n    await sharedInfraConfigGenerator(tree);\n    await sharedInfraScriptsGenerator(tree, DEPENDENCIES);\n  }\n\n  const synthDirFromRoot = `/dist/${lib.dir}/cdk.out`;\n  const synthDirFromProject =\n    lib.dir\n      .split('/')\n      .map(() => '..')\n      .join('/') + `/dist/${lib.dir}/cdk.out`;\n  const distDirFromProjectRoot =\n    lib.dir\n      .split('/')\n      .map(() => '..')\n      .join('/') + '/dist/{projectRoot}/cdk.out';\n  const projectConfig = readProjectConfiguration(tree, lib.fullyQualifiedName);\n  const libraryRoot = projectConfig.root;\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const scopeAlias = npmScopePrefix;\n  const fullyQualifiedName = `${npmScopePrefix}${schema.name}`;\n  const namespace = kebabCase(fullyQualifiedName);\n  // The stage instantiated in main.ts. Quoted so the shell does not glob `*`.\n  const sandboxStagePattern = `\"${namespace}-sandbox/*\"`;\n  tree.delete(joinPathFragments(libraryRoot, 'src'));\n\n  generateFiles(\n    tree, // the virtual file system\n    joinPathFragments(import.meta.dirname, './files/app'), // path to the file templates\n    libraryRoot, // destination path of the files\n    {\n      synthDir: synthDirFromProject,\n      scopeAlias: scopeAlias,\n      namespace,\n      fullyQualifiedName,\n      pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n      dir: lib.dir,\n      stageConfig,\n      ...schema,\n      ...esmVars(tree),\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.Overwrite,\n    },\n  );\n\n  updateJson(\n    tree,\n    `${libraryRoot}/project.json`,\n    (config: ProjectConfiguration) => {\n      config.projectType = 'application';\n      addDependencyToTargetIfNotPresent(config, 'build', 'synth');\n      addDependencyToTargetIfNotPresent(config, 'build', 'checkov');\n      config.targets.compile.outputs = [\n        '{workspaceRoot}/dist/{projectRoot}/tsc',\n      ];\n      config.targets.synth = {\n        cache: true,\n        executor: 'nx:run-commands',\n        inputs: ['default'],\n        outputs: ['{workspaceRoot}/dist/{projectRoot}/cdk.out'],\n        dependsOn: ['^build', 'compile'], // compile clobbers dist directory, so ensure synth runs afterwards\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: 'cdk synth',\n        }),\n      };\n      config.targets.checkov = {\n        cache: true,\n        executor: 'nx:run-commands',\n        inputs: ['{workspaceRoot}/dist/{projectRoot}/cdk.out'],\n        outputs: ['{workspaceRoot}/dist/{projectRoot}/checkov'],\n        dependsOn: ['synth'],\n        options: {\n          command: uvxCommand(\n            'checkov',\n            '--config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation',\n          ),\n        },\n      };\n      config.targets.deploy = {\n        executor: 'nx:run-commands',\n        dependsOn: ['^build', 'compile'],\n        options: stageConfig\n          ? withCdkEnv({\n              command: `tsx packages/common/scripts/src/infra/infra-deploy.ts ${libraryRoot}`,\n            })\n          : withCdkEnv({\n              cwd: '{projectRoot}',\n              command: 'cdk deploy --require-approval=never',\n            }),\n      };\n      config.targets['deploy-sandbox'] = {\n        executor: 'nx:run-commands',\n        dependsOn: ['^build', 'compile'],\n        options: stageConfig\n          ? withCdkEnv({\n              command: `tsx packages/common/scripts/src/infra/infra-deploy.ts ${libraryRoot} ${sandboxStagePattern}`,\n            })\n          : withCdkEnv({\n              cwd: '{projectRoot}',\n              command: `cdk deploy --require-approval=never ${sandboxStagePattern}`,\n            }),\n      };\n      config.targets['deploy-ci'] = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: `cdk deploy --require-approval=never --app ${distDirFromProjectRoot}`,\n        }),\n      };\n      config.targets.destroy = {\n        executor: 'nx:run-commands',\n        dependsOn: ['^build', 'compile'],\n        options: stageConfig\n          ? withCdkEnv({\n              command: `tsx packages/common/scripts/src/infra/infra-destroy.ts ${libraryRoot}`,\n            })\n          : withCdkEnv({\n              cwd: '{projectRoot}',\n              command: 'cdk destroy --require-approval=never',\n            }),\n      };\n      config.targets['destroy-ci'] = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: `cdk destroy --require-approval=never --app ${distDirFromProjectRoot}`,\n        }),\n      };\n      config.targets.cdk = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: 'cdk',\n        }),\n      };\n      config.targets.bootstrap = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: 'cdk bootstrap',\n        }),\n      };\n      config.targets = sortObjectKeys(config.targets);\n      return config;\n    },\n  );\n\n  addTsDependencies(tree, DEPENDENCIES, { projectRoot: libraryRoot });\n\n  updateJson(tree, `${libraryRoot}/tsconfig.lib.json`, (tsConfig) => ({\n    ...tsConfig,\n    references: mergeTsReferences(tsConfig.references, [\n      {\n        path: `${path.relative(\n          libraryRoot,\n          `${tree.root}/${PACKAGES_DIR}`,\n        )}/${SHARED_CONSTRUCTS_DIR}/tsconfig.lib.json`,\n      },\n      ...(stageConfig\n        ? [\n            {\n              path: `${path.relative(\n                libraryRoot,\n                `${tree.root}/${PACKAGES_DIR}`,\n              )}/${SHARED_INFRA_CONFIG_DIR}/tsconfig.json`,\n            },\n          ]\n        : []),\n    ]),\n  }));\n\n  await addGeneratorMetricsIfApplicable(tree, [INFRA_APP_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n}\nexport default tsInfraGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readProjectConfiguration","updateJson","path","tsProjectGenerator","getTsLibDetails","mergeTsReferences","addTsDependencies","resolveContainers","declareDependencies","ownedElsewhere","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","esmVars","kebabCase","getNpmScopePrefix","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","projectExists","sortObjectKeys","getPackageManagerDisplayCommands","uvxCommand","SHARED_CONSTRUCTS_DEPENDENCIES","sharedConstructsGenerator","PACKAGES_DIR","SHARED_CONSTRUCTS_DIR","SHARED_INFRA_CONFIG_DIR","sharedInfraConfigGenerator","SHARED_INFRA_SCRIPTS_DEPENDENCIES","sharedInfraScriptsGenerator","DEPENDENCIES","ts","name","dev","root","INFRA_APP_GENERATOR_INFO","filename","tsInfraGenerator","tree","schema","lib","fullyQualifiedName","preferInstallDependencies","containers","cdkEnv","undefined","CDK_DOCKER","withCdkEnv","opts","existingEnv","env","iac","stageConfig","synthDirFromRoot","dir","synthDirFromProject","split","map","join","distDirFromProjectRoot","projectConfig","libraryRoot","npmScopePrefix","scopeAlias","namespace","sandboxStagePattern","delete","dirname","synthDir","pkgMgrCmd","exec","overwriteStrategy","Overwrite","config","projectType","targets","compile","outputs","synth","cache","executor","inputs","dependsOn","options","cwd","command","checkov","deploy","destroy","cdk","bootstrap","projectRoot","tsConfig","references","relative","languages"],"mappings":"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"}

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

@@ -65,6 +65,7 @@ ${PACKAGE_MANAGERS.map((pm)=>buildNxCommand('<options>', pm)).join(' - \n')}
 - Generate all projects into the \`packages/\` directory
 - After making changes to your projects, fix linting issues, then run a full build
 - 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.
+- For CDK infrastructure projects, deploy the sandbox stage with the \`deploy-sandbox\` target (eg \`nx deploy-sandbox infra\`) rather than passing a stage pattern to \`deploy\` — it already targets the sandbox stage declared in \`main.ts\`.
 
 ## Batching Generators
 

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 \\`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 \\`upgrade-workspace\\` tool when upgrading Nx or the Nx Plugin for AWS to a newer version.\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- Each project declares the third-party runtime dependencies its source imports in its own \\`package.json\\`; shared build/test tooling (test runners, bundlers, etc.) is declared in the root \\`package.json\\` \\`devDependencies\\`. Versions follow a single version policy, recorded in the package manager's dependency catalog where supported (referenced as \\`catalog:\\`). Install with the appropriate command for your package manager:\n  - Add a project runtime dependency: \\`pnpm add <package> --filter <project>\\` / \\`yarn workspace <project> add <package>\\` / \\`npm install <package> -w <project>\\` / \\`bun add <package> --cwd <project-directory>\\`\n  - Add a shared dev tool at the root: \\`pnpm add -Dw <package>\\` / \\`yarn add -D <package>\\` / \\`npm install --legacy-peer-deps -D <package>\\` / \\`bun install -D <package>\\`\n- The \\`noUndeclaredDependencies\\` lint rule enforces that a project's source only imports packages declared in its own \\`package.json\\`\n- Projects in the same workspace can import one another directly by package name (eg \\`@workspace-name/project-name\\`) without declaring a dependency in \\`package.json\\` — TypeScript path aliases in \\`tsconfig.base.json\\` resolve these imports\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;;;;;;;+FAO0D,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoC9E,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 \\`upgrade-workspace\\` tool when upgrading Nx or the Nx Plugin for AWS to a newer version.\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- Each project declares the third-party runtime dependencies its source imports in its own \\`package.json\\`; shared build/test tooling (test runners, bundlers, etc.) is declared in the root \\`package.json\\` \\`devDependencies\\`. Versions follow a single version policy, recorded in the package manager's dependency catalog where supported (referenced as \\`catalog:\\`). Install with the appropriate command for your package manager:\n  - Add a project runtime dependency: \\`pnpm add <package> --filter <project>\\` / \\`yarn workspace <project> add <package>\\` / \\`npm install <package> -w <project>\\` / \\`bun add <package> --cwd <project-directory>\\`\n  - Add a shared dev tool at the root: \\`pnpm add -Dw <package>\\` / \\`yarn add -D <package>\\` / \\`npm install --legacy-peer-deps -D <package>\\` / \\`bun install -D <package>\\`\n- The \\`noUndeclaredDependencies\\` lint rule enforces that a project's source only imports packages declared in its own \\`package.json\\`\n- Projects in the same workspace can import one another directly by package name (eg \\`@workspace-name/project-name\\`) without declaring a dependency in \\`package.json\\` — TypeScript path aliases in \\`tsconfig.base.json\\` resolve these imports\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- For CDK infrastructure projects, deploy the sandbox stage with the \\`deploy-sandbox\\` target (eg \\`nx deploy-sandbox infra\\`) rather than passing a stage pattern to \\`deploy\\` — it already targets the sandbox stage declared in \\`main.ts\\`.\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;;;;;;;+FAO0D,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/migrations/latest/add-deploy-sandbox-target/metadata.json

@@ -0,0 +1,3 @@
+{
+  "description": "Add a deploy-sandbox target to CDK infrastructure projects which deploys the sandbox stage"
+}

package/src/migrations/latest/add-deploy-sandbox-target/migration.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type MigrationReturnObject, type Tree } from '@nx/devkit';
+export default function migration(tree: Tree): Promise<MigrationReturnObject>;

package/src/migrations/latest/add-deploy-sandbox-target/migration.js

@@ -0,0 +1,83 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { getProjects, joinPathFragments, updateProjectConfiguration } from "@nx/devkit";
+import { INFRA_APP_GENERATOR_INFO } from "../../../infra/app/generator.js";
+import { captureGritQLVariable } from "../../../utils/ast.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { normalizeTargetKeyOrder } from "../../../utils/nx.js";
+import { sortObjectKeys } from "../../../utils/object.js";
+/**
+ * CDK infrastructure projects gained a `deploy-sandbox` target, which deploys the
+ * sandbox stage without the user having to spell out its stage pattern
+ * (`nx deploy-sandbox infra` rather than `nx deploy infra "my-app-infra-sandbox/*"`).
+ *
+ * The stage id is read from `main.ts` rather than recomputed from the project
+ * name, so a project whose sandbox stage has been renamed gets a target that
+ * deploys the stage it actually declares.
+ *
+ * How to write a migration:
+ * - https://nx.dev/docs/kb/migration-generators
+ * - What `nextSteps` means: https://nx.dev/docs/reference/devkit/MigrationReturnObject
+ */ const TARGET = 'deploy-sandbox';
+/**
+ * Matches `new ApplicationStage(app, '<id>-sandbox', { ... })`, binding the
+ * quoted stage id. The regex spans the quotes because it is matched against the
+ * whole string literal node; both quote styles are accepted since the user's
+ * formatter may have rewritten them.
+ *
+ * `main.ts` can declare several stages (beta, prod), so the pattern selects the
+ * sandbox one rather than whichever comes first.
+ */ const SANDBOX_STAGE_PATTERN = '`new ApplicationStage($app, $id, $props)` where { $id <: r"[\'\\"].*-sandbox[\'\\"]" }';
+/** The id of the sandbox stage a project's `main.ts` instantiates. */ const sandboxStageId = async (tree, projectRoot)=>{
+    const captured = await captureGritQLVariable(tree, joinPathFragments(projectRoot, 'src', 'main.ts'), SANDBOX_STAGE_PATTERN, 'id');
+    // The binding keeps the quotes from the source.
+    return captured?.slice(1, -1);
+};
+export default async function migration(tree) {
+    const nextSteps = [];
+    for (const [projectName, project] of getProjects(tree)){
+        const generator = project.metadata?.generator;
+        if (generator !== INFRA_APP_GENERATOR_INFO.id || project.targets?.[TARGET]) {
+            continue;
+        }
+        // The new target mirrors `deploy`, so it inherits whatever that resolved to
+        // when the project was generated: the `tsx` credential-resolving script
+        // under `stageConfig`, plain `cdk deploy` otherwise.
+        const deploy = project.targets.deploy;
+        const command = deploy?.options?.command;
+        const mainPath = joinPathFragments(project.root, 'src/main.ts');
+        const stageId = await sandboxStageId(tree, project.root);
+        if (typeof command !== 'string') {
+            nextSteps.push(`Add a '${TARGET}' target to ${projectName} by hand if necessary — its 'deploy' target no longer matches the shape the generator produced.`);
+            continue;
+        }
+        if (!stageId) {
+            nextSteps.push(`Add a '${TARGET}' target to ${projectName} by hand if necessary — no sandbox stage was found in ${mainPath}.`);
+            continue;
+        }
+        project.targets[TARGET] = normalizeTargetKeyOrder({
+            executor: deploy.executor,
+            ...deploy.dependsOn ? {
+                dependsOn: [
+                    ...deploy.dependsOn
+                ]
+            } : {},
+            // Quoted so the shell does not glob the `*`.
+            options: {
+                ...deploy.options,
+                command: `${command} "${stageId}/*"`
+            }
+        });
+        updateProjectConfiguration(tree, projectName, {
+            ...project,
+            targets: sortObjectKeys(project.targets)
+        });
+    }
+    await formatFilesInSubtree(tree);
+    return {
+        nextSteps
+    };
+}
+
+//# sourceMappingURL=migration.js.map

package/src/migrations/latest/add-deploy-sandbox-target/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/latest/add-deploy-sandbox-target/migration.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  getProjects,\n  joinPathFragments,\n  type MigrationReturnObject,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { INFRA_APP_GENERATOR_INFO } from '../../../infra/app/generator';\nimport { captureGritQLVariable } from '../../../utils/ast';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { normalizeTargetKeyOrder } from '../../../utils/nx';\nimport { sortObjectKeys } from '../../../utils/object';\n\n/**\n * CDK infrastructure projects gained a `deploy-sandbox` target, which deploys the\n * sandbox stage without the user having to spell out its stage pattern\n * (`nx deploy-sandbox infra` rather than `nx deploy infra \"my-app-infra-sandbox/*\"`).\n *\n * The stage id is read from `main.ts` rather than recomputed from the project\n * name, so a project whose sandbox stage has been renamed gets a target that\n * deploys the stage it actually declares.\n *\n * How to write a migration:\n * - https://nx.dev/docs/kb/migration-generators\n * - What `nextSteps` means: https://nx.dev/docs/reference/devkit/MigrationReturnObject\n */\n\nconst TARGET = 'deploy-sandbox';\n\n/**\n * Matches `new ApplicationStage(app, '<id>-sandbox', { ... })`, binding the\n * quoted stage id. The regex spans the quotes because it is matched against the\n * whole string literal node; both quote styles are accepted since the user's\n * formatter may have rewritten them.\n *\n * `main.ts` can declare several stages (beta, prod), so the pattern selects the\n * sandbox one rather than whichever comes first.\n */\nconst SANDBOX_STAGE_PATTERN =\n  '`new ApplicationStage($app, $id, $props)` where { $id <: r\"[\\'\\\\\"].*-sandbox[\\'\\\\\"]\" }';\n\n/** The id of the sandbox stage a project's `main.ts` instantiates. */\nconst sandboxStageId = async (\n  tree: Tree,\n  projectRoot: string,\n): Promise<string | undefined> => {\n  const captured = await captureGritQLVariable(\n    tree,\n    joinPathFragments(projectRoot, 'src', 'main.ts'),\n    SANDBOX_STAGE_PATTERN,\n    'id',\n  );\n  // The binding keeps the quotes from the source.\n  return captured?.slice(1, -1);\n};\n\nexport default async function migration(\n  tree: Tree,\n): Promise<MigrationReturnObject> {\n  const nextSteps: string[] = [];\n\n  for (const [projectName, project] of getProjects(tree)) {\n    const generator = (project.metadata as { generator?: string } | undefined)\n      ?.generator;\n    if (\n      generator !== INFRA_APP_GENERATOR_INFO.id ||\n      project.targets?.[TARGET]\n    ) {\n      // Not a CDK infrastructure project, or the target is already present.\n      continue;\n    }\n\n    // The new target mirrors `deploy`, so it inherits whatever that resolved to\n    // when the project was generated: the `tsx` credential-resolving script\n    // under `stageConfig`, plain `cdk deploy` otherwise.\n    const deploy = project.targets.deploy;\n    const command = deploy?.options?.command;\n    const mainPath = joinPathFragments(project.root, 'src/main.ts');\n    const stageId = await sandboxStageId(tree, project.root);\n\n    if (typeof command !== 'string') {\n      nextSteps.push(\n        `Add a '${TARGET}' target to ${projectName} by hand if necessary — its 'deploy' target no longer matches the shape the generator produced.`,\n      );\n      continue;\n    }\n    if (!stageId) {\n      nextSteps.push(\n        `Add a '${TARGET}' target to ${projectName} by hand if necessary — no sandbox stage was found in ${mainPath}.`,\n      );\n      continue;\n    }\n\n    project.targets[TARGET] = normalizeTargetKeyOrder({\n      executor: deploy.executor,\n      ...(deploy.dependsOn ? { dependsOn: [...deploy.dependsOn] } : {}),\n      // Quoted so the shell does not glob the `*`.\n      options: { ...deploy.options, command: `${command} \"${stageId}/*\"` },\n    });\n    updateProjectConfiguration(tree, projectName, {\n      ...project,\n      targets: sortObjectKeys(project.targets),\n    });\n  }\n\n  await formatFilesInSubtree(tree);\n\n  return { nextSteps };\n}\n"],"names":["getProjects","joinPathFragments","updateProjectConfiguration","INFRA_APP_GENERATOR_INFO","captureGritQLVariable","formatFilesInSubtree","normalizeTargetKeyOrder","sortObjectKeys","TARGET","SANDBOX_STAGE_PATTERN","sandboxStageId","tree","projectRoot","captured","slice","migration","nextSteps","projectName","project","generator","metadata","id","targets","deploy","command","options","mainPath","root","stageId","push","executor","dependsOn"],"mappings":"AAAA;;;CAGC,GACD,SACEA,WAAW,EACXC,iBAAiB,EAGjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,wBAAwB,QAAQ,kCAA+B;AACxE,SAASC,qBAAqB,QAAQ,wBAAqB;AAC3D,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,uBAAuB,QAAQ,uBAAoB;AAC5D,SAASC,cAAc,QAAQ,2BAAwB;AAEvD;;;;;;;;;;;;CAYC,GAED,MAAMC,SAAS;AAEf;;;;;;;;CAQC,GACD,MAAMC,wBACJ;AAEF,oEAAoE,GACpE,MAAMC,iBAAiB,OACrBC,MACAC;IAEA,MAAMC,WAAW,MAAMT,sBACrBO,MACAV,kBAAkBW,aAAa,OAAO,YACtCH,uBACA;IAEF,gDAAgD;IAChD,OAAOI,UAAUC,MAAM,GAAG,CAAC;AAC7B;AAEA,eAAe,eAAeC,UAC5BJ,IAAU;IAEV,MAAMK,YAAsB,EAAE;IAE9B,KAAK,MAAM,CAACC,aAAaC,QAAQ,IAAIlB,YAAYW,MAAO;QACtD,MAAMQ,YAAaD,QAAQE,QAAQ,EAC/BD;QACJ,IACEA,cAAchB,yBAAyBkB,EAAE,IACzCH,QAAQI,OAAO,EAAE,CAACd,OAAO,EACzB;YAEA;QACF;QAEA,4EAA4E;QAC5E,wEAAwE;QACxE,qDAAqD;QACrD,MAAMe,SAASL,QAAQI,OAAO,CAACC,MAAM;QACrC,MAAMC,UAAUD,QAAQE,SAASD;QACjC,MAAME,WAAWzB,kBAAkBiB,QAAQS,IAAI,EAAE;QACjD,MAAMC,UAAU,MAAMlB,eAAeC,MAAMO,QAAQS,IAAI;QAEvD,IAAI,OAAOH,YAAY,UAAU;YAC/BR,UAAUa,IAAI,CACZ,CAAC,OAAO,EAAErB,OAAO,YAAY,EAAES,YAAY,+FAA+F,CAAC;YAE7I;QACF;QACA,IAAI,CAACW,SAAS;YACZZ,UAAUa,IAAI,CACZ,CAAC,OAAO,EAAErB,OAAO,YAAY,EAAES,YAAY,sDAAsD,EAAES,SAAS,CAAC,CAAC;YAEhH;QACF;QAEAR,QAAQI,OAAO,CAACd,OAAO,GAAGF,wBAAwB;YAChDwB,UAAUP,OAAOO,QAAQ;YACzB,GAAIP,OAAOQ,SAAS,GAAG;gBAAEA,WAAW;uBAAIR,OAAOQ,SAAS;iBAAC;YAAC,IAAI,CAAC,CAAC;YAChE,6CAA6C;YAC7CN,SAAS;gBAAE,GAAGF,OAAOE,OAAO;gBAAED,SAAS,GAAGA,QAAQ,EAAE,EAAEI,QAAQ,GAAG,CAAC;YAAC;QACrE;QACA1B,2BAA2BS,MAAMM,aAAa;YAC5C,GAAGC,OAAO;YACVI,SAASf,eAAeW,QAAQI,OAAO;QACzC;IACF;IAEA,MAAMjB,qBAAqBM;IAE3B,OAAO;QAAEK;IAAU;AACrB"}

package/src/ts/astro-docs/__snapshots__/generator.spec.ts.snap

@@ -221,3 +221,17 @@ exports[`ts#astro-docs generator > should generate a docs site with default opti
 }
 "
 `;
+
+exports[`ts#astro-docs generator > should omit the blog when --noBlog is passed > content.config.ts 1`] = `
+"import { defineCollection } from 'astro:content';
+import { docsLoader } from '@astrojs/starlight/loaders';
+import { docsSchema } from '@astrojs/starlight/schema';
+
+export const collections = {
+  docs: defineCollection({
+    loader: docsLoader(),
+    schema: docsSchema(),
+  }),
+};
+"
+`;

package/src/ts/astro-docs/files/base/src/content/docs/en/index.mdx.template

@@ -17,10 +17,10 @@ import { CardGrid, Card } from '@astrojs/starlight/components';
   <Card title="Guides" icon="open-book">
     Reference documentation for <%= title %>.
   </Card>
-  <Card title="Blog" icon="pencil">
+<% if (includeBlog) { %>  <Card title="Blog" icon="pencil">
     News and updates from the team.
   </Card>
-  <Card title="Snippets" icon="seti:config">
+<% } %>  <Card title="Snippets" icon="seti:config">
     Reusable content fragments used across the docs.
   </Card>
   <Card title="Localised" icon="translate">

package/src/ts/astro-docs/files/base/src/content.config.ts.template

@@ -1,13 +1,13 @@
 import { defineCollection } from 'astro:content';
 import { docsLoader } from '@astrojs/starlight/loaders';
 import { docsSchema } from '@astrojs/starlight/schema';
-import { blogSchema } from 'starlight-blog/schema';
-
+<% if (includeBlog) { %>import { blogSchema } from 'starlight-blog/schema';
+<% } %>
 export const collections = {
   docs: defineCollection({
     loader: docsLoader(),
-    schema: docsSchema({
+    schema: docsSchema(<% if (includeBlog) { %>{
       extend: (context) => blogSchema(context),
-    }),
+    }<% } %>),
   }),
 };

package/src/utils/agent-core-constructs/files/terraform/app/agentcore-gateway/__nameKebabCase__/__nameKebabCase__.tf.template

@@ -11,11 +11,11 @@ terraform {
       source  = "hashicorp/external"
       version = "<%- externalProviderVersion %>"
     }
+<%_ } _%>
     time = {
       source  = "hashicorp/time"
       version = "<%- timeProviderVersion %>"
     }
-<%_ } _%>
     random = {
       source  = "hashicorp/random"
       version = "<%- randomProviderVersion %>"
@@ -168,6 +168,22 @@ resource "aws_iam_role_policy" "gateway_role_policy" {
     Statement = var.additional_iam_policy_statements
   })
 }
+
+# IAM is eventually consistent, and the gateway assumes this role to reach its
+# targets — an MCP target fetches tools at creation time. Without this wait the
+# fetch intermittently runs before the policy above has propagated and the
+# target lands in FAILED with an authorization error.
+resource "time_sleep" "gateway_role_policy_propagation" {
+  count = length(var.additional_iam_policy_statements) > 0 ? 1 : 0
+
+  depends_on = [aws_iam_role_policy.gateway_role_policy]
+
+  create_duration = "30s"
+
+  triggers = {
+    policy = aws_iam_role_policy.gateway_role_policy[0].policy
+  }
+}
 <%_ } _%>
 <%_ if (cedarPolicy) { _%>
 
@@ -215,9 +231,9 @@ resource "aws_bedrockagentcore_gateway" "this" {
     arn  = aws_bedrockagentcore_policy_engine.this.policy_engine_arn
     mode = "ENFORCE"
   }
+<%_ } _%>
 
   depends_on = [time_sleep.gateway_role_policy_propagation]
-<%_ } _%>
 }
 
 # WAFv2 protection for the gateway. AgentCore Gateway requires a REGIONAL web