@aws/nx-plugin-mcp 1.0.0-rc.97 → 1.0.0-rc.98

package/bin/aws-nx-mcp.js

@@ -21915,22 +21915,22 @@ const kebabCase = (str) => {
 const NX_VERSION = {
 	"@a2a-js/sdk": "0.3.14",
 	"@aws/aws-distro-opentelemetry-node-autoinstrumentation": "0.12.0",
-	"@opentelemetry/propagator-jaeger": "2.10.0",
+	"@opentelemetry/propagator-jaeger": "2.11.0",
 	minimatch: "10.2.6",
-	"deepmerge-ts": "8.0.0",
-	mysql2: "3.22.0",
-	"@aws-sdk/client-dynamodb": "3.1121.0",
-	"@aws-sdk/client-api-gateway": "3.1121.0",
-	"@aws-sdk/client-iam": "3.1121.0",
-	"@aws-sdk/client-bedrock-agentcore": "3.1121.0",
-	"@aws-sdk/client-bedrock-runtime": "3.1121.0",
-	"@aws-sdk/client-s3": "3.1121.0",
-	"@aws-sdk/client-sts": "3.1121.0",
-	"@aws-sdk/client-cognito-identity-provider": "3.1121.0",
-	"@aws-sdk/credential-providers": "3.1121.0",
+	"deepmerge-ts": "8.0.2",
+	mysql2: "3.24.3",
+	"@aws-sdk/client-dynamodb": "3.1126.0",
+	"@aws-sdk/client-api-gateway": "3.1126.0",
+	"@aws-sdk/client-iam": "3.1126.0",
+	"@aws-sdk/client-bedrock-agentcore": "3.1126.0",
+	"@aws-sdk/client-bedrock-runtime": "3.1126.0",
+	"@aws-sdk/client-s3": "3.1126.0",
+	"@aws-sdk/client-sts": "3.1126.0",
+	"@aws-sdk/client-cognito-identity-provider": "3.1126.0",
+	"@aws-sdk/credential-providers": "3.1126.0",
 	"@aws-sdk/credential-provider-cognito-identity": "3.972.69",
-	"@aws-sdk/client-secrets-manager": "3.1121.0",
-	"@aws-sdk/rds-signer": "3.1121.0",
+	"@aws-sdk/client-secrets-manager": "3.1126.0",
+	"@aws-sdk/rds-signer": "3.1126.0",
 	"@smithy/server-apigateway": "0.3.3",
 	"@smithy/server-node": "0.3.3",
 	"@aws-lambda-powertools/logger": "2.35.0",
@@ -21938,7 +21938,7 @@ const NX_VERSION = {
 	"@aws-lambda-powertools/parameters": "2.35.0",
 	"@aws-lambda-powertools/tracer": "2.35.0",
 	"@aws-lambda-powertools/parser": "2.35.0",
-	"@aws-sdk/client-appconfigdata": "3.1121.0",
+	"@aws-sdk/client-appconfigdata": "3.1126.0",
 	"@middy/core": "7.9.2",
 	"@nxlv/python": "23.0.0",
 	"@nx-extend/terraform": "10.4.1",
@@ -21953,14 +21953,14 @@ const NX_VERSION = {
 	"@swc-node/register": "1.12.1",
 	"@swc/core": "1.16.1",
 	"@modelcontextprotocol/sdk": "1.30.0",
-	"@modelcontextprotocol/inspector": "2.4.0",
+	"@modelcontextprotocol/inspector": "2.5.0",
 	"@ag-ui/a2ui-toolkit": "0.0.4",
 	"@ag-ui/aws-strands": "0.2.3",
-	"@ag-ui/client": "0.0.57",
-	"@ag-ui/core": "0.0.57",
-	"@ag-ui/encoder": "0.0.57",
+	"@ag-ui/client": "0.0.59",
+	"@ag-ui/core": "0.0.59",
+	"@ag-ui/encoder": "0.0.59",
 	"agent-chat-cli": "0.3.0",
-	"@copilotkit/react-core": "1.69.3",
+	"@copilotkit/react-core": "1.70.1",
 	rxjs: "7.8.2",
 	"@strands-agents/sdk": "1.15.0",
 	"@tanstack/react-router": "1.170.32",
@@ -21968,46 +21968,46 @@ const NX_VERSION = {
 	"@tanstack/router-generator": "1.167.33",
 	"@tanstack/virtual-file-routes": "1.162.0",
 	"@tanstack/router-utils": "1.162.2",
-	"@cloudscape-design/board-components": "3.0.221",
-	"@cloudscape-design/chat-components": "1.0.165",
-	"@cloudscape-design/components": "3.0.1356",
+	"@cloudscape-design/board-components": "3.0.222",
+	"@cloudscape-design/chat-components": "1.0.166",
+	"@cloudscape-design/components": "3.0.1359",
 	"@cloudscape-design/global-styles": "1.0.67",
 	"@tanstack/react-query": "5.102.8",
 	"@tanstack/react-query-devtools": "5.102.8",
 	"@trpc/tanstack-react-query": "11.18.0",
 	"@trpc/client": "11.18.0",
 	"@trpc/server": "11.18.0",
-	"@types/node": "26.4.0",
-	"@types/aws-lambda": "8.10.162",
+	"@types/node": "26.4.1",
+	"@types/aws-lambda": "8.10.163",
 	"@types/cors": "2.8.19",
 	"@types/pg": "8.23.1",
 	"@types/ws": "8.18.1",
 	"@types/express": "5.0.6",
 	"@smithy/config-resolver": "4.7.2",
 	"@smithy/node-config-provider": "4.6.2",
-	"@smithy/node-http-handler": "4.11.3",
-	"@smithy/types": "4.17.2",
+	"@smithy/node-http-handler": "4.12.1",
+	"@smithy/types": "4.18.0",
 	"@vitest/coverage-v8": "4.1.11",
 	"@vitest/ui": "4.1.11",
-	"@astrojs/react": "6.0.4",
-	"@astrojs/starlight": "0.41.10",
-	astro: "7.2.9",
+	"@astrojs/react": "6.0.5",
+	"@astrojs/starlight": "0.42.0",
+	astro: "7.3.1",
 	cookie: "2.0.1",
 	aws4fetch: "1.0.20",
 	"aws-cdk": "2.1139.0",
-	"aws-cdk-lib": "2.267.0",
+	"aws-cdk-lib": "2.268.0",
 	"aws-xray-sdk-core": "3.12.0",
 	constructs: "10.8.1",
 	cors: "2.8.6",
 	chalk: "6.0.0",
 	"class-variance-authority": "0.7.1",
-	clsx: "2.1.1",
+	cn: "0.2.5",
 	commander: "15.0.0",
 	electrodb: "3.9.3",
 	esbuild: "0.28.2",
 	"event-source-polyfill": "1.0.31",
 	"@types/event-source-polyfill": "1.0.5",
-	"@biomejs/biome": "2.5.11",
+	"@biomejs/biome": "2.5.12",
 	"@prisma/adapter-mariadb": "7.10.0",
 	"@prisma/adapter-pg": "7.10.0",
 	"@prisma/client": "7.10.0",
@@ -22018,8 +22018,8 @@ const NX_VERSION = {
 	husky: "9.1.7",
 	"fs-extra": "11.4.0",
 	"@types/fs-extra": "11.0.4",
-	mariadb: "3.5.3",
-	mise: "2026.8.14",
+	mariadb: "3.5.4",
+	mise: "2026.9.1",
 	npm: "12.0.2",
 	"npm-check-updates": "23.1.0",
 	"oidc-client-ts": "3.5.0",
@@ -22028,24 +22028,23 @@ const NX_VERSION = {
 	"react-oidc-context": "3.3.1",
 	react: "19.2.8",
 	"react-dom": "19.2.8",
-	rolldown: "1.2.6",
-	"rolldown-plugin-dts": "0.28.3",
+	rolldown: "1.2.7",
+	"rolldown-plugin-dts": "0.28.5",
 	shx: "0.4.0",
 	"simple-git": "3.36.0",
 	"source-map-support": "0.5.21",
 	"starlight-blog": "0.29.0",
 	tailwindcss: "4.3.3",
 	"@tailwindcss/vite": "4.3.3",
-	tsx: "4.23.12",
-	"lucide-react": "1.37.0",
+	tsx: "4.23.13",
+	"lucide-react": "1.40.0",
 	"radix-ui": "1.6.7",
-	shadcn: "4.19.0",
+	shadcn: "4.21.0",
 	"tw-animate-css": "1.4.0",
-	"tailwind-merge": "3.6.0",
 	vite: "8.2.2",
 	typescript: "6.0.3",
 	vitest: "4.1.11",
-	jsdom: "27.4.0",
+	jsdom: "29.1.1",
 	zod: "4.5.4",
 	ws: "8.21.3"
 }.nx;

package/docs/get_started/existing-project.mdx

@@ -56,7 +56,7 @@ Nx and the plugin are distributed as npm packages, so a project with no Node.js
 }
 ```
 
-Create that file, then run `nx init` and [add the plugin](#adding-the-plugin) as usual. Your existing language tooling is untouched — Nx projects generated by the plugin (including <Link path="guides/py-project">Python projects</Link>) live alongside your existing code, and you can wire your existing build into Nx incrementally.
+Create that file, then run `nx init` and [add the plugin](#adding-the-plugin) as usual. Your existing language tooling is untouched — Nx projects generated by the plugin (including <Link path="guides/python-project">Python projects</Link>) live alongside your existing code, and you can wire your existing build into Nx incrementally.
 
 To bring your existing projects under Nx, you have a few options depending on the language:
 

package/docs/get_started/quick-start.mdx

@@ -3,6 +3,7 @@ title: Quick Start Guide
 description: "A quick start on how to use @aws/nx-plugin."
 ---
 import { Steps } from '@astrojs/starlight/components';
+import Drawer from '@components/drawer.astro';
 import Link from '@components/link.astro';
 import Snippet from '@components/snippet.astro';
 import CreateNxWorkspaceCommand from '@components/create-nx-workspace-command.astro';
@@ -42,6 +43,8 @@ You will be prompted for your preferred infrastructure as code (IaC) provider, e
 <CreateNxWorkspaceCommand workspace="my-project" iac="terraform" />
 </Fragment>
 </Infrastructure>
+
+You are also prompted for the container engine used by generators which build container images. Accept the default (`infer`) to select Docker if it is installed, otherwise Finch.
 :::
 
 Once complete, navigate to the project directory:
@@ -122,8 +125,12 @@ Changes to both your website and API will be reflected in real-time as both the
 Open `packages/infra/src/stacks/application-stack.ts` and add the following code:
 
 ```typescript
+import {
+  DemoApi,
+  DemoWebsite,
+  UserIdentity,
+} from '@my-project/common-constructs';
 import { Stack, StackProps } from 'aws-cdk-lib';
-import { DemoApi, DemoWebsite, UserIdentity } from '@my-project/common-constructs';
 import { Construct } from 'constructs';
 
 export class ApplicationStack extends Stack {
@@ -178,8 +185,8 @@ resource "aws_iam_policy" "api_invoke_policy" {
     Version = "2012-10-17"
     Statement = [
       {
-        Effect = "Allow"
-        Action = "execute-api:Invoke"
+        Effect   = "Allow"
+        Action   = "execute-api:Invoke"
         Resource = "${module.demo_api.api_execution_arn}/*/*"
       }
     ]
@@ -218,8 +225,8 @@ Next, run the following command to build your project:
 
 <PackageManagerShortCommand commands={["build"]} />
 
-:::tip[Fixing Lint Errors]
-If you encounter any lint errors, you can run the following command to automatically fix them.
+:::tip[Fixing Lint and Formatting Errors]
+If you encounter any lint or formatting errors, you can run the following command to automatically fix them.
 
 <PackageManagerShortCommand commands={["lint"]} />
 :::
@@ -280,6 +287,44 @@ This command will first run `terraform plan` to show you what changes will be ma
 
 Your website will be available at `http://localhost:4200`, and will point to the resources you deployed for the API and authentication.
 
+To sign in, you will need to [create a user in the Cognito user pool](https://docs.aws.amazon.com/cognito/latest/developerguide/how-to-create-user-accounts.html).
+
+<Drawer title="Creating a user with the AWS CLI" trigger="Click here for instructions using the AWS CLI">
+
+The following command creates a user in a user pool. You can find the user pool id in your deployment outputs, or in the [Amazon Cognito console](https://console.aws.amazon.com/cognito/). Substitute values for username, email, first and last name, and the temporary password.
+
+```sh
+aws cognito-idp admin-create-user \
+  --user-pool-id <user pool id> \
+  --username <username> \
+  --user-attributes Name=email,Value=<email> Name=email_verified,Value=true Name=given_name,Value=<first name> Name=family_name,Value=<last name> \
+  --temporary-password '<temporary password>' \
+  --message-action SUPPRESS
+```
+
+The first time you sign in as this user you are prompted to choose a new password, then to set up multi-factor authentication with either a code sent by SMS or a time-based one time password from an authenticator app.
+
+</Drawer>
+
+Your website is also served from CloudFront. Open its distribution domain name (which is printed to your terminal after deployment) to use the version running entirely on AWS.
+
+## Step 6: Clean Up
+
+When you have finished, delete the resources you deployed to avoid ongoing costs:
+
+<Infrastructure>
+<Fragment slot="cdk">
+<NxCommands commands={['destroy-sandbox infra']} />
+</Fragment>
+<Fragment slot="terraform">
+<NxCommands commands={['destroy infra']} />
+</Fragment>
+</Infrastructure>
+
+:::note[Retained Resources]
+The Cognito user pool is created with deletion protection enabled, so it is not removed automatically. Delete it (and the IAM role Cognito uses to send SMS messages) manually if you no longer need them.
+:::
+
 ---
 
 Congratulations! 🎉 You have successfully built and deployed a full-stack application using `@aws/nx-plugin`!

package/docs/get_started/tutorials/dungeon-game/1.mdx

@@ -282,7 +282,10 @@ export class GameApi<
       } as FunctionProps,
       buildDefaultIntegration: (op, props: FunctionProps) => {
         const handler = new Function(scope, `GameApi${op}Handler`, props);
-        handler.addEnvironment('RUNTIME_CONFIG_APP_ID', rc.appConfigApplicationId);
+        handler.addEnvironment(
+          'RUNTIME_CONFIG_APP_ID',
+          rc.appConfigApplicationId,
+        );
         rc.grantReadAppConfig(handler);
         return {
           handler,
@@ -1397,6 +1400,7 @@ The `connection` generator generates/updates these files:
         - copilot/
           - **index.tsx** Shadcn-themed `CopilotChat` / `CopilotSidebar` / `CopilotPopup`
           - ShadcnAssistantMessage.tsx, ShadcnUserMessage.tsx, ShadcnChatInput.tsx, ShadcnCursor.tsx, copilot.css
+        - story-agent-chat.tsx a `CopilotChat` pre-bound to the Story Agent's `agentId`
       - hooks/
         - **useAguiStoryAgent.tsx** Builds an `HttpAgent`, injects the Cognito bearer token, and pads `threadId` to AgentCore's 33-char session id
     - **main.tsx** Wraps `<App />` in `<AguiProvider>`
@@ -1476,6 +1480,8 @@ new ApplicationStage(app, 'dungeon-adventure-infra-sandbox', {
   },
 });
 
+// Define other instances of stages, such as beta and prod, below
+
 app.synth();
 ```
 
@@ -1523,7 +1529,7 @@ The `run-many` command will run a target on multiple listed subprojects (`--all`
 
 You can also trigger a build (or any other task) for a single project target by running the target on the project directly. For example, to build the `@dungeon-adventure/infra` project, run the following command:
 
-<NxCommands commands={['build infra']} />
+<NxCommands commands={['build @dungeon-adventure/infra']} />
 
 You can also omit the scope, and use the Nx shorthand syntax if you prefer:
 
@@ -1562,16 +1568,15 @@ You may be prompted with the following:
 ```bash
  NX   The workspace is out of sync
 
-[@nx/js:typescript-sync]: Some TypeScript configuration files are missing project references to the projects they depend on or contain outdated project references.
-
-This will result in an error in CI.
+[@nx/js:typescript-sync]: Some TypeScript configuration files are missing project references to the projects they depend on, contain stale project references, or have duplicate project references.
+[@aws/nx-plugin:ts#sync]: Some files are out of sync.
 
 ? Would you like to sync the identified changes to get your workspace up to date? …
 Yes, sync the changes and run the tasks
 No, run the tasks without syncing the changes
 ```
 
-This message indicates that NX has detected some files which can be updated automatically for you. In this case, it is referring to the `tsconfig.json` files which do not have Typescript references set up on references projects.
+This message indicates that NX has detected some files which can be updated automatically for you. In this case, it is referring to the `tsconfig.json` files which do not have Typescript references set up on referenced projects, and to the workspace dependencies the `@aws/nx-plugin` sync generator declares for you.
 
 Select the **Yes, sync the changes and run the tasks** option to proceed. You should notice all of you IDE related import errors get automatically resolved as the sync generator will add the missing typescript references automatically!
 

package/docs/get_started/tutorials/dungeon-game/2.mdx

@@ -248,6 +248,6 @@ We can try out the MCP server's tools with the [MCP Inspector](https://github.co
 
 <NxCommands commands={["mcp-server-inspect inventory"]} />
 
-This serves the MCP server locally (booting DynamoDB Local too) and launches the MCP Inspector at `http://localhost:6274` pre-configured to connect to it. Click **Connect**, switch to the **Tools** tab, click **List Tools**, and try `add-to-inventory` (e.g. `playerName: Alice`, `itemName: Rusty Sword`, `emoji: ⚔️`) followed by `list-inventory-items` to see it persisted to DynamoDB Local. Stop the server (`Ctrl+C`) when you're done.
+This serves the MCP server locally (booting DynamoDB Local too) and launches the MCP Inspector at `http://localhost:6274` pre-configured to connect to it. Toggle the switch next to the `localhost:8000` server to connect, switch to the **Tools** tab, and try `add-to-inventory` (e.g. `playerName: Alice`, `itemName: Rusty Sword`, `emoji: ⚔️`) followed by `list-inventory-items` to see it persisted to DynamoDB Local. Stop the server (`Ctrl+C`) when you're done.
 
 Congratulations, you have built and tested your first tRPC API and MCP server against a local DynamoDB table!  🎉🎉🎉

package/docs/get_started/tutorials/dungeon-game/4.mdx

@@ -48,6 +48,7 @@ When you ran the `connection` generator for `game-ui → story` in <Link path="g
     - copilot/
       - index.tsx Re-exports themed `CopilotChat` / `CopilotSidebar` / `CopilotPopup`.
       - ShadcnAssistantMessage.tsx, ShadcnUserMessage.tsx, ShadcnChatInput.tsx, ShadcnCursor.tsx, copilot.css
+    - story-agent-chat.tsx A `CopilotChat` pre-bound to the Story Agent's `agentId`.
   - hooks/
     - useAguiStoryAgent.tsx Instantiates an `@ag-ui/client` `HttpAgent` pointing at the deployed Story Agent and pads `threadId` to AgentCore's 33-character minimum session id.
   - main.tsx Wraps `<App />` in `<AguiProvider>`
@@ -146,6 +147,10 @@ dungeon-adventure-infra-sandbox-Application.UserIdentityUserIdentityUserPoolIdXX
 
 Navigate to your CloudFront URL (`GameUIDistributionDomainName` from the CDK outputs), sign up for a new account, and play your game running entirely on AWS!
 
+:::note[Signing up for the first time]
+Cognito emails you a code to confirm your account, then asks you to set up multi-factor authentication (an authenticator app or an SMS code) before your first sign-in — the user pool `ts#website#auth` vends requires MFA. See <Link path="guides/react-website-auth#multi-factor-authentication-mfa">Multi-factor authentication</Link> for how to relax that.
+:::
+
 ## Task 6: Mixing local and deployed components
 
 You've seen two ends of the spectrum: everything local (`dev`) and everything deployed. During day-to-day development it's often useful to mix the two — for example, iterate on website code against the *real* deployed API and agent, or run the API locally against the *real* DynamoDB table.

package/docs/get_started/tutorials/dungeon-game/wrap-up.mdx

@@ -38,4 +38,13 @@ We recommend you try your hand at extending the codebase with the following capa
 
     This will prompt you for a list of stacks to delete which should comprise of the `dungeon-adventure-infra-sandbox/Application/GameUI/waf` and `dungeon-adventure-infra-sandbox/Application`.
 
-2. Enter `Y` to continue. CloudFormation will destroy your stacks.
+2. Enter `y` to continue. CloudFormation will destroy your stacks.
+
+:::caution[Two resources are kept on purpose]
+Deleting the stacks leaves two resources behind, so a teardown can't take your users or their stories with it:
+
+- The **Cognito user pool**, which `ts#website#auth` creates with deletion protection enabled.
+- The **Story Agent's session bucket**, which holds the conversation history and defaults to `RemovalPolicy.RETAIN`.
+
+Delete them by hand once you no longer need them — for the user pool, turn deletion protection off first.
+:::

package/docs/guides/license.mdx

@@ -9,7 +9,6 @@ import GeneratorParameters from '@components/generator-parameters.astro';
 import Drawer from '@components/drawer.astro';
 import LicenseAllowlist from '@components/license-allowlist.astro';
 import NxCommands from '@components/nx-commands.astro';
-import PackageManagerShortCommand from '@components/package-manager-short-command.astro';
 
 Manage licensing across your workspace: synchronise `LICENSE` files and source code headers for your own code (`license.source`), and check that every dependency conforms to a license allowlist (`license.dependencies`).
 
@@ -45,7 +44,7 @@ Whenever you build your projects (and a `lint` target runs), the license sync ge
 
 [@aws/nx-plugin:license#sync]: Project LICENSE files are out of sync:
 - LICENSE
-- packages/<my-project>LICENSE
+- packages/<my-project>/LICENSE
 
 Project package.json files are out of sync:
 - package.json
@@ -348,7 +347,7 @@ This means you don't need to run the check explicitly, though you can still do s
 
 The wiring is a cross-project `dependsOn` on each project's `lint` target that points at the root `license-check` target. To skip the check during a lint or build, set the `LICENSE_DEPENDENCY_CHECK=skip` environment variable:
 
-<PackageManagerShortCommand commands={["LICENSE_DEPENDENCY_CHECK=skip lint"]} />
+<NxCommands commands={['run-many --target lint --all']} env={{ LICENSE_DEPENDENCY_CHECK: 'skip' }} />
 
 ### Configuration
 
@@ -381,7 +380,14 @@ To restrict the allowlist, replace `DEFAULT_LICENSE_ALLOWLIST` with your own arr
 
 #### Per-package exceptions
 
-Use `exceptions` for packages that fail the check — either because their license is not in the allowlist, or because they ship without detectable license metadata. The `reason` field is required so reviewers can see why the exception was granted.
+Use `exceptions` for packages that fail the check — either because their license is not in the allowlist, or because they ship without detectable license metadata.
+
+Each entry accepts:
+
+- `package` (required): the package name the exception applies to
+- `reason` (required): why the exception was granted, so reviewers can see it
+- `version` (optional): restrict the exception to a single version, so a later version is checked again
+- `spdx` (optional): the license to treat the package as declaring, for a package that ships license text without declaring it in its metadata. This is what the `onDependency` hook below reports
 
 ```typescript
 exceptions: [
@@ -389,6 +395,7 @@ exceptions: [
     package: 'union',
     version: '0.5.0',
     reason: 'Package ships verbatim MIT text without declaring license',
+    spdx: 'MIT',
   },
 ];
 ```
@@ -397,7 +404,24 @@ Generators that introduce dependencies with problematic metadata (e.g. the MCP s
 
 #### Collectors
 
-Collectors discover dependencies and extract license metadata. The built-in collectors are `npmCollector()` (scans `node_modules`) and `pythonCollector()` (scans Python virtual environments). The license generator configures `npmCollector()` by default and adds `pythonCollector()` when Python projects are present.
+Collectors discover dependencies and extract license metadata. The built-in collectors are `npmCollector()` (scans `node_modules`) and `pythonCollector()` (scans Python virtual environments), both exported from `@aws/nx-plugin/sdk/license`. The license generator configures `npmCollector()` by default and adds `pythonCollector()` when Python projects are present.
+
+```typescript title="aws-nx-plugin.config.mts"
+import {
+  DEFAULT_LICENSE_ALLOWLIST,
+  npmCollector,
+  pythonCollector,
+} from '@aws/nx-plugin/sdk/license';
+
+export default {
+  license: {
+    dependencies: {
+      allow: DEFAULT_LICENSE_ALLOWLIST,
+      collectors: [npmCollector(), pythonCollector()],
+    },
+  },
+} satisfies AwsNxPluginConfig;
+```
 
 To implement a custom collector, conform to the `LicenseCollector` interface:
 
@@ -443,6 +467,6 @@ Dependency license checking is enabled by the presence of the `license.dependenc
 
 To disable the checks for a single run, set the `LICENSE_DEPENDENCY_CHECK=skip` environment variable:
 
-<PackageManagerShortCommand commands={["LICENSE_DEPENDENCY_CHECK=skip lint"]} />
+<NxCommands commands={['run-many --target lint --all']} env={{ LICENSE_DEPENDENCY_CHECK: 'skip' }} />
 
 To disable permanently, remove the `license.dependencies` key from your configuration in `aws-nx-plugin.config.mts`. You can also re-run the `license` generator with `--dependencyCheck=false` to scaffold without it.

package/docs/guides/nx-generator.mdx

@@ -40,15 +40,14 @@ The generator will create the following project files within the given `project`
     - generator.ts Stub generator implementation
     - generator.spec.ts Tests for your generator
     - README.md Documentation for your generator
-  - generators.json Nx configuration to define your generators
-  - package.json Created or updated to add a "generators" entry
-  - tsconfig.json Updated to use CommonJS
+    - files/
+      - hello.ts.template Example template rendered by the stub generator
+  - src/index.ts Updated to export your generator
+  - generators.json Created or updated to define your generators
+  - project.json Updated to record the generator against the project
+  - package.json Created if absent, and pointed at `generators.json`
 </FileTree>
 
-:::warning[Project Modification]
-This generator will update the selected `project` to use CommonJS, as Nx Generators only support CommonJS at present ([refer to this GitHub issue for ESM support](https://github.com/nrwl/nx/issues/15682)).
-:::
-
 ## Local Generators
 
 :::tip[Dedicated Plugin Project]
@@ -452,7 +451,7 @@ export const myGenerator = async (tree: Tree, schema: MyGeneratorSchema) => {
 We also expose a method which allows you to build a data structure that can be used to iterate over operations in an OpenAPI specification and therefore instrument your own code generation, for example:
 
 ```ts
-import { buildOpenApiCodeGenerationData } from '@aws/nx-plugin/sdk/open-api.js';
+import { buildOpenApiCodeGenerationData } from '@aws/nx-plugin/sdk/open-api';
 
 export const myGenerator = async (tree: Tree, schema: MyGeneratorSchema) => {
   const data = await buildOpenApiCodeGenerationData(tree, 'path/to/spec.json');
@@ -496,15 +495,15 @@ If you don't see your generator in the VSCode plugin UI, you can refresh your Nx
 Unit tests for generators are straightforward to implement. Here's a typical pattern:
 
 ```typescript
-import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
+import { createTreeUsingTsSolutionSetup } from '@aws/nx-plugin/sdk/utils/test';
 import { yourGenerator } from './generator.js';
 
 describe('your generator', () => {
   let tree;
 
   beforeEach(() => {
-    // Create an empty workspace tree
-    tree = createTreeWithEmptyWorkspace();
+    // Create a workspace tree matching the shape our preset generates
+    tree = createTreeUsingTsSolutionSetup();
 
     // Add any files that should already exist in the tree
     tree.write(
@@ -562,7 +561,7 @@ describe('your generator', () => {
 
 Key points for testing generators:
 
-- Use `createTreeWithEmptyWorkspace()` to create a virtual file system
+- Use `createTreeUsingTsSolutionSetup()` from `@aws/nx-plugin/sdk/utils/test` to create a virtual file system. It seeds the workspace markers our preset writes (`tsconfig.base.json`, `pnpm-workspace.yaml`, `biome.json`, a `type: module` root `package.json`), which any generator composing an `@aws/nx-plugin` generator needs
 - Set up any prerequisite files before running the generator
 - Test both the creation of new files and updates to existing files
 - Use snapshots for complex file content

package/docs/guides/ts-nx-plugin.mdx

@@ -33,22 +33,30 @@ The generator will create the following project structure:
 <FileTree>
 - your-plugin/
   - src/
-    - index.ts Empty entry point for your plugin
+    - index.ts Entry point for your plugin
     - mcp-server/
       - index.ts Exports your server
       - server.ts Main MCP server configuration
       - stdio.ts Entry point for your MCP server with STDIO transport
       - http.ts Entry point for your MCP server with Streamable HTTP transport
+      - schema.ts Shared schemas for the MCP server's tools
+      - utils.ts Utility functions for the MCP server
+      - resources/
+        - GENERAL_GUIDANCE.md Guidance served by the `general-guidance` tool
       - tools/
         - create-workspace-command.ts Tool for workspace creation guidance
         - general-guidance.ts Tool for general Nx and plugin guidance
         - list-generators.ts Tool to list available generators
         - generator-guide.ts Tool for detailed generator information
-      - utils.ts Utility functions for the MCP server
   - generators.json Nx generator configuration (initially empty)
   - package.json Plugin package configuration
-  - tsconfig.json TypeScript configuration (CommonJS for Nx compatibility)
   - project.json Nx project configuration with build and package targets
+  - tsconfig.json TypeScript configuration, referencing the two below
+  - tsconfig.lib.json TypeScript configuration for your plugin's source
+  - tsconfig.spec.json TypeScript configuration for your plugin's tests
+  - vitest.config.mts Vitest configuration for your plugin's tests
+  - README.md Documentation for your plugin, served by the `generator-guide` tool
+  - LICENSE Written by the `license` generator's sync, when configured
 </FileTree>
 
 ## Working with Your Nx Plugin
@@ -84,7 +92,7 @@ Creates a distributable package ready for NPM publishing:
 The package target includes all necessary assets:
 - Compiled JavaScript files
 - TypeScript declaration files
-- Generator and executor configuration files
+- The `generators.json`, `executors.json` and `migrations.json` manifests Nx reads from a published plugin
 - Documentation and license files
 
 ## MCP Server Integration
@@ -114,14 +122,16 @@ For more details about writing MCP Servers, refer to the <Link path="/guides/ts-
 
 ### Preparing for Publication
 
-1. **Update Package Information**: Edit your plugin's [`package.json`](https://docs.npmjs.com/cli/v10/configuring-npm/package-json) with proper name, version, description, and repository information.
+1. **Update Package Information**: Edit your plugin's [`package.json`](https://docs.npmjs.com/cli/v10/configuring-npm/package-json) with proper name, version, description, and repository information. Also remove `"private": true`.
 
 2. **Build the Package**:
    <NxCommands commands={['package your-plugin']} />
 
+   The package lands in `dist/<your-plugin's project root>/package` — for a plugin generated with `--name=nx-plugin --directory=tools`, that's `dist/tools/nx-plugin/package`.
+
 3. **Test Locally**: You can test your plugin locally by installing it in another workspace:
    ```bash
-   npm install /path/to/your/workspace/dist/your-plugin/package
+   npm install /path/to/your/workspace/dist/tools/nx-plugin/package
    ```
 
 ### Publishing to NPM
@@ -129,7 +139,7 @@ For more details about writing MCP Servers, refer to the <Link path="/guides/ts-
 Once your plugin is ready:
 
 ```bash
-cd dist/your-plugin/package
+cd dist/tools/nx-plugin/package
 npm publish
 ```
 

package/docs/guides/typescript-infrastructure.mdx

@@ -467,7 +467,9 @@ Destroying is irreversible, so CDK asks you to confirm the stacks it is about to
 
 The `destroy` target tears down whichever stage or stacks you name:
 
-<NxCommands commands={['destroy <my-infra> <my-infra>-sandbox/*']} />
+<NxCommands commands={['destroy <my-infra> <my-infra>-sandbox/**']} />
+
+Use `/**` rather than `/*` for a whole stage: destroying only deletes the stacks the pattern selects, and `/*` misses stacks nested below the stage's stacks, such as the `us-east-1` WebACL stack a website creates for its CloudFront distribution.
 
 To tear down an individual stack, give the full stack name:
 

package/docs/snippets/pdk-migration/faq/type-safe-api.mdx

@@ -199,6 +199,6 @@ Another option is to use GraphQL APIs with websockets on [AppSync](https://aws.a
 
 You can also consider rolling your own code generators which interpret the same vendor extensions as Type Safe API. Refer to the [APIs Modelled with OpenAPI](#apis-modelled-with-openapi) section for details around building custom OpenAPI-based code generators. You can find the templates Type Safe API uses for API Gateway Websocket API Lambda handlers [here](https://github.com/aws/aws-pdk/tree/mainline/packages/type-safe-api/scripts/type-safe-api/generators/typescript-async-runtime/templates), and the client [here](https://github.com/aws/aws-pdk/blob/mainline/packages/type-safe-api/scripts/type-safe-api/generators/typescript-websocket-client/templates/client.ejs).
 
-You can also consider migrating to use the <Link path="/guides/trpc.mdx">`ts#trpc-api` generator</Link> to use tRPC. At the time of writing we don't yet have support for subscriptions/streaming but if this is something you need do add a +1 to our [GitHub issue tracking this](https://github.com/awslabs/nx-plugin-for-aws/issues/194).
+You can also consider migrating to use the <Link path="/guides/trpc">`ts#trpc-api` generator</Link> to use tRPC. At the time of writing we don't yet have support for subscriptions/streaming but if this is something you need do add a +1 to our [GitHub issue tracking this](https://github.com/awslabs/nx-plugin-for-aws/issues/194).
 
 Smithy is protocol agnostic, but does not yet have support for the Websocket protocol, refer to [this GitHub issue tracking support](https://github.com/smithy-lang/smithy/issues/1505).

package/docs/snippets/prerequisites.mdx

@@ -13,5 +13,5 @@ import Snippet from '@components/snippet.astro';
 <Snippet name="recommended-prerequisites" parentHeading="Recommended" />
 
 :::tip[AI Assistant Setup]
-If you use an AI Assistant such as Kiro, Kiro CLI, Cursor, Claude Code or Cline, you may also wish to <Link path="/get_started/building-with-ai">install the Nx Plugin for AWS MCP server.</Link>
+If you use an AI Assistant such as Kiro, Kiro CLI, Cursor, Claude Code or Codex, you may also wish to <Link path="/get_started/building-with-ai">install the Nx Plugin for AWS MCP server.</Link>
 :::

package/package.json

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