@aws/nx-plugin-mcp 1.0.0-rc.45 → 1.0.0-rc.46

package/bin/aws-nx-mcp.js

@@ -19758,7 +19758,7 @@ var generators$1 = {
 		"factory": "./src/init/generator",
 		"schema": "./src/init/schema.json",
 		"description": "Configure an existing Nx workspace to use the @aws/nx-plugin",
-		"metric": "g57",
+		"metric": "g66",
 		"guidePages": ["existing-project"]
 	},
 	"agentcore-gateway": {
@@ -19778,7 +19778,7 @@ var generators$1 = {
 		"factory": "./src/agentcore-gateway/gateway-connection/generator",
 		"schema": "./src/agentcore-gateway/gateway-connection/schema.json",
 		"description": "Connect an AgentCore Gateway to another AgentCore Gateway",
-		"metric": "g52",
+		"metric": "g65",
 		"hidden": true
 	},
 	"connection": {
@@ -19966,7 +19966,7 @@ var generators$1 = {
 		"factory": "./src/ts/dcr-proxy/generator",
 		"schema": "./src/ts/dcr-proxy/schema.json",
 		"description": "Generate an OAuth Dynamic Client Registration (DCR) proxy construct for Cognito-authenticated MCP servers",
-		"metric": "g56"
+		"metric": "g67"
 	},
 	"ts#mcp-server": {
 		"factory": "./src/ts/mcp-server/generator",
@@ -19999,7 +19999,7 @@ var generators$1 = {
 		"factory": "./src/ts/website/app/generator",
 		"schema": "./src/ts/website/app/schema.json",
 		"description": "Generates a website application",
-		"metric": "g43",
+		"metric": "g60",
 		"guidePages": ["website", "react-website"]
 	},
 	"ts#website#auth": {
@@ -20160,27 +20160,27 @@ var generators$1 = {
 		"factory": "./src/ts/dynamodb/generator",
 		"schema": "./src/ts/dynamodb/schema.json",
 		"description": "Create a TypeScript DynamoDB project",
-		"metric": "g43"
+		"metric": "g61"
 	},
 	"ts#dynamodb#trpc-connection": {
 		"factory": "./src/ts/dynamodb/trpc-connection/generator",
 		"schema": "./src/ts/dynamodb/trpc-connection/schema.json",
 		"description": "Connect a ts#trpc-api project to a ts#dynamodb project",
-		"metric": "g44",
+		"metric": "g62",
 		"hidden": true
 	},
 	"ts#dynamodb#smithy-connection": {
 		"factory": "./src/ts/dynamodb/smithy-connection/generator",
 		"schema": "./src/ts/dynamodb/smithy-connection/schema.json",
 		"description": "Connect a Smithy backend to a ts#dynamodb project",
-		"metric": "g45",
+		"metric": "g63",
 		"hidden": true
 	},
 	"ts#dynamodb#agent-connection": {
 		"factory": "./src/ts/dynamodb/agent-connection/generator",
 		"schema": "./src/ts/dynamodb/agent-connection/schema.json",
 		"description": "Connect a ts#agent to a ts#dynamodb project",
-		"metric": "g46",
+		"metric": "g64",
 		"hidden": true
 	},
 	"ts#dynamodb#mcp-server-connection": {

package/docs/get_started/tutorials/contribute-generator.mdx

@@ -308,7 +308,7 @@ To test the generator, we'll link our local Nx Plugin for AWS to an existing cod
 #### Create a Test Project with a tRPC API
 
 :::note[Using Your Own Project]
-If you have completed the <Link path="get_started/tutorials/dungeon_game/overview">dungeon adventure tutorial</Link>, or already have another existing Nx workspace which uses a tRPC API, you can skip this step.
+If you have completed the <Link path="get_started/tutorials/dungeon-game/overview">dungeon adventure tutorial</Link>, or already have another existing Nx workspace which uses a tRPC API, you can skip this step.
 :::
 
 In a separate directory, create a new test workspace:

package/docs/guides/connection/py-fast-api-dynamodb.mdx

@@ -16,7 +16,7 @@ The `connection` generator wires a <Link path="guides/fastapi">FastAPI</Link> to
 
 Before using this generator, ensure you have:
 
-1. A <Link path="guides/fastapi">`py#fast-api`</Link> project
+1. A FastAPI project (generated with `py#api --framework=fastapi`), see the <Link path="guides/fastapi">`py#api`</Link> guide
 2. A <Link path="guides/py-dynamodb">`py#dynamodb`</Link> project
 
 ## Usage

package/docs/guides/connection/py-fast-api-rdb.mdx

@@ -18,7 +18,7 @@ The `connection` generator wires a <Link path="guides/fastapi">FastAPI</Link> to
 
 Before using this generator, ensure you have:
 
-1. A <Link path="guides/fastapi">`py#fast-api`</Link> project
+1. A FastAPI project (generated with `py#api --framework=fastapi`), see the <Link path="guides/fastapi">`py#api`</Link> guide
 2. A <Link path="guides/py-rdb">`py#rdb`</Link> project
 
 ## Usage

package/docs/guides/react-website-auth.mdx

@@ -195,7 +195,7 @@ The user identity module automatically adds the necessary <Link path="guides/rea
 </Infrastructure>
 
 :::caution[Remove localhost callback URLs for production]
-The generated User Pool client allows your CloudFront distribution URL as an OAuth callback/logout URL, plus `http://localhost:4200` and `http://localhost:4300` for local development against the deployed pool.
+The generated User Pool client allows your CloudFront distribution URL (and any custom domain names configured on it) as OAuth callback/logout URLs, plus `http://localhost:4200` and `http://localhost:4300` for local development against the deployed pool.
 
 It is recommended to **remove the `http://localhost` callback/logout URLs for production stages**, keeping the allowlist limited to your real application origins.
 

package/docs/guides/react-website.mdx

@@ -447,7 +447,7 @@ This sets up:
 5. Automatic deployment of website files and runtime configuration
 </Fragment>
 <Fragment slot="terraform">
-To deploy your website, we recommend using the <Link path="guides/terraform-infrastructure">`terraform#project` generator</Link> to create a Terraform project.
+To deploy your website, we recommend using the <Link path="/guides/terraform-project">`terraform#project` generator</Link> to create a Terraform project.
 
 You can use the Terraform module generated for you in `packages/common/terraform` to deploy your website.
 

package/docs/guides/ts-dcr-proxy.mdx

@@ -28,7 +28,7 @@ MCP clients (such as Claude Code, Kiro CLI or the MCP Inspector) expect to authe
 
 ## Generator Output
 
-The generator creates a standalone <Link path="/guides/typescript-project">TypeScript project</Link> containing the Lambda handlers, and infrastructure to deploy them based on your selected `iacProvider`.
+The generator creates a standalone <Link path="/guides/typescript-project">TypeScript project</Link> containing the Lambda handlers, and infrastructure to deploy them based on your selected `iac`.
 
 <FileTree>
 

package/docs/guides/ts-mcp-server.mdx

@@ -79,40 +79,57 @@ If you selected `none` for `infra`, no CDK constructs or Terraform modules are g
 
 ### Adding Tools
 
-Tools are functions that the AI assistant can call to perform actions. You can add new tools in the `server.ts` file:
-
-```typescript
-server.registerTool("toolName", {
-  description: "tool description",
-  inputSchema: { param1: z.string(), param2: z.number() } // Input schema using Zod
-},
-  async ({ param1, param2 }) => {
-    // Tool implementation
-    return {
-      content: [{ type: "text", text: "Result" }]
-    };
-  }
-);
+Tools are functions that the AI assistant can call to perform actions. Each tool lives in its own file under `tools/` that exports a `register<Name>Tool` function, which you then call from `server.ts`. For example, add `tools/my-tool.ts`:
+
+```typescript title="tools/my-tool.ts"
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { z } from 'zod';
+
+export const registerMyTool = (server: McpServer) => {
+  server.registerTool("toolName", {
+    description: "tool description",
+    inputSchema: { param1: z.string(), param2: z.number() } // Input schema using Zod
+  },
+    async ({ param1, param2 }) => {
+      // Tool implementation
+      return {
+        content: [{ type: "text", text: "Result" }]
+      };
+    }
+  );
+};
+```
+
+Then register it in `server.ts`:
+
+```typescript title="server.ts"
+import { registerMyTool } from './tools/my-tool.js';
+
+registerMyTool(server);
 ```
 
 ### Adding Resources
 
-Resources provide context to the AI assistant. You can add static resources from files or dynamic resources:
+Resources provide context to the AI assistant. Like tools, each resource lives in its own file under `resources/` that exports a `register<Name>Resource` function called from `server.ts`. You can add static resources from files or dynamic resources:
+
+```typescript title="resources/my-resource.ts"
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 
-```typescript
-const exampleContext = 'some context to return';
+export const registerMyResource = (server: McpServer) => {
+  const exampleContext = 'some context to return';
 
-server.registerResource('resource-name', 'example://resource', {}, async (uri) => ({
-  contents: [{ uri: uri.href, text: exampleContext }],
-}));
+  server.registerResource('resource-name', 'example://resource', {}, async (uri) => ({
+    contents: [{ uri: uri.href, text: exampleContext }],
+  }));
 
-// Dynamic resource
-server.registerResource('dynamic-resource', 'dynamic://resource', {}, async (uri) => {
-  const data = await fetchSomeData();
-  return {
-    contents: [{ uri: uri.href, text: data }],
-  };
-});
+  // Dynamic resource
+  server.registerResource('dynamic-resource', 'dynamic://resource', {}, async (uri) => {
+    const data = await fetchSomeData();
+    return {
+      contents: [{ uri: uri.href, text: data }],
+    };
+  });
+};
 ```
 
 ## Configuring with AI Assistants

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

@@ -55,14 +55,14 @@ The generator will create the following project structure:
 
 ### Adding Generators
 
-Once you have your plugin project, you can add generators using the <Link path="/guides/ts-nx-generator">`ts#nx-generator`</Link> generator:
+Once you have your plugin project, you can add generators using the <Link path="/guides/nx-generator">`ts#nx-generator`</Link> generator:
 
 <RunGenerator generator="ts#nx-generator" requiredParameters={{ pluginProject: 'your-plugin' }} />
 
 This will add a new generator to your plugin.
 
 :::tip[Generator Documentation]
-Read the <Link path="/guides/ts-nx-generator">`ts#nx-generator` guide</Link> for details about how to implement generators.
+Read the <Link path="/guides/nx-generator">`ts#nx-generator` guide</Link> for details about how to implement generators.
 :::
 
 Make sure to write a detailed `README.md` for your generator, since this is used by the MCP Server's `generator-guide` tool.

package/docs/guides/typescript-infrastructure.mdx

@@ -102,10 +102,11 @@ The `env` property tells CDK which AWS account and region to deploy to. `CDK_DEF
 If you generated with `stageConfig`, the `main.ts` reads account and region from a centralized config file instead, falling back to environment variables when no config is set:
 
 ```ts title="src/main.ts (with stageConfig)"
-import stagesConfig from ':my-scope/common-infra-config';
+import { resolveStage } from ':my-scope/common-infra-config';
 
-const projectStages = stagesConfig.projects?.['packages/infra']?.stages ?? {};
-const sandboxConfig = projectStages['my-app-sandbox'];
+// Looks up the stage under this project (packages/infra), falling back to
+// shared stages. Returns undefined when no config exists for the stage.
+const sandboxConfig = resolveStage('packages/infra', 'my-app-sandbox');
 
 new ApplicationStage(app, 'my-app-sandbox', {
   env: {
@@ -242,7 +243,7 @@ Each stage config includes a required `region` and an optional `account`:
 The generated `main.ts` reads these values from the config so that CDK synthesis and deployment use the same environment settings:
 
 ```ts title="src/main.ts"
-const sandboxConfig = projectStages['my-app-sandbox'];
+const sandboxConfig = resolveStage('packages/infra', 'my-app-sandbox');
 new ApplicationStage(app, 'my-app-sandbox', {
   env: {
     account: sandboxConfig?.account ?? process.env.CDK_DEFAULT_ACCOUNT,

package/generators.json

@@ -7,7 +7,7 @@
       "factory": "./src/init/generator",
       "schema": "./src/init/schema.json",
       "description": "Configure an existing Nx workspace to use the @aws/nx-plugin",
-      "metric": "g57",
+      "metric": "g66",
       "guidePages": ["existing-project"]
     },
     "agentcore-gateway": {
@@ -27,7 +27,7 @@
       "factory": "./src/agentcore-gateway/gateway-connection/generator",
       "schema": "./src/agentcore-gateway/gateway-connection/schema.json",
       "description": "Connect an AgentCore Gateway to another AgentCore Gateway",
-      "metric": "g52",
+      "metric": "g65",
       "hidden": true
     },
     "connection": {
@@ -215,7 +215,7 @@
       "factory": "./src/ts/dcr-proxy/generator",
       "schema": "./src/ts/dcr-proxy/schema.json",
       "description": "Generate an OAuth Dynamic Client Registration (DCR) proxy construct for Cognito-authenticated MCP servers",
-      "metric": "g56"
+      "metric": "g67"
     },
     "ts#mcp-server": {
       "factory": "./src/ts/mcp-server/generator",
@@ -248,7 +248,7 @@
       "factory": "./src/ts/website/app/generator",
       "schema": "./src/ts/website/app/schema.json",
       "description": "Generates a website application",
-      "metric": "g43",
+      "metric": "g60",
       "guidePages": ["website", "react-website"]
     },
     "ts#website#auth": {
@@ -405,27 +405,27 @@
       "factory": "./src/ts/dynamodb/generator",
       "schema": "./src/ts/dynamodb/schema.json",
       "description": "Create a TypeScript DynamoDB project",
-      "metric": "g43"
+      "metric": "g61"
     },
     "ts#dynamodb#trpc-connection": {
       "factory": "./src/ts/dynamodb/trpc-connection/generator",
       "schema": "./src/ts/dynamodb/trpc-connection/schema.json",
       "description": "Connect a ts#trpc-api project to a ts#dynamodb project",
-      "metric": "g44",
+      "metric": "g62",
       "hidden": true
     },
     "ts#dynamodb#smithy-connection": {
       "factory": "./src/ts/dynamodb/smithy-connection/generator",
       "schema": "./src/ts/dynamodb/smithy-connection/schema.json",
       "description": "Connect a Smithy backend to a ts#dynamodb project",
-      "metric": "g45",
+      "metric": "g63",
       "hidden": true
     },
     "ts#dynamodb#agent-connection": {
       "factory": "./src/ts/dynamodb/agent-connection/generator",
       "schema": "./src/ts/dynamodb/agent-connection/schema.json",
       "description": "Connect a ts#agent to a ts#dynamodb project",
-      "metric": "g46",
+      "metric": "g64",
       "hidden": true
     },
     "ts#dynamodb#mcp-server-connection": {

package/package.json

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