@aws/nx-plugin-mcp 1.0.0-rc.0 → 1.0.0-rc.2

package/bin/aws-nx-mcp.js

@@ -19105,7 +19105,8 @@ var generators$1 = {
 		"factory": "./src/py/mcp-server/generator",
 		"schema": "./src/py/mcp-server/schema.json",
 		"description": "Generate a Python Model Context Protocol (MCP) server for providing context to Large Language Models",
-		"metric": "g24"
+		"metric": "g24",
+		"guidePages": ["py-mcp-server"]
 	},
 	"py#project": {
 		"factory": "./src/py/project/generator",
@@ -19118,7 +19119,8 @@ var generators$1 = {
 		"factory": "./src/py/agent/generator",
 		"schema": "./src/py/agent/schema.json",
 		"description": "Add an AI Agent to a Python project",
-		"metric": "g25"
+		"metric": "g25",
+		"guidePages": ["py-agent"]
 	},
 	"py#agent#mcp-connection": {
 		"factory": "./src/py/agent/mcp-connection/generator",
@@ -19187,7 +19189,8 @@ var generators$1 = {
 		"factory": "./src/ts/mcp-server/generator",
 		"schema": "./src/ts/mcp-server/schema.json",
 		"description": "Generate a TypeScript Model Context Protocol (MCP) server for providing context to Large Language Models",
-		"metric": "g18"
+		"metric": "g18",
+		"guidePages": ["ts-mcp-server"]
 	},
 	"ts#nx-generator": {
 		"factory": "./src/ts/nx-generator/generator",
@@ -19257,7 +19260,8 @@ var generators$1 = {
 		"factory": "./src/ts/agent/generator",
 		"schema": "./src/ts/agent/schema.json",
 		"description": "Add an AI Agent to a TypeScript project",
-		"metric": "g30"
+		"metric": "g30",
+		"guidePages": ["ts-agent"]
 	},
 	"ts#agent#mcp-connection": {
 		"factory": "./src/ts/agent/mcp-connection/generator",
@@ -19324,7 +19328,8 @@ var generators$1 = {
 		"factory": "./src/ts/rdb/generator",
 		"schema": "./src/ts/rdb/schema.json",
 		"description": "Create a relational database project",
-		"metric": "g38"
+		"metric": "g38",
+		"guidePages": ["ts-rdb"]
 	},
 	"ts#rdb#smithy-connection": {
 		"factory": "./src/ts/rdb/smithy-connection/generator",
@@ -19392,7 +19397,7 @@ const PackageManagerSchema = _enum(PACKAGE_MANAGERS);
 * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */
-const IAC_PROVIDERS = ["CDK", "Terraform"];
+const IAC_PROVIDERS = ["cdk", "terraform"];
 //#endregion
 //#region ../nx-plugin/src/utils/commands.ts
 const PACKAGE_MANAGER_COMMANDS = {
@@ -19453,13 +19458,13 @@ const buildInstallCommand = (pm, pkg, dev) => {
 * The package manager is auto-detected by @aws/create-nx-workspace from the
 * invoking command, so --pm is not needed.
 */
-const buildCreateNxWorkspaceCommand = (pm, workspace, iacProvider, tag) => {
+const buildCreateNxWorkspaceCommand = (pm, workspace, iac, tag) => {
 	return [
 		PACKAGE_MANAGER_COMMANDS[pm]?.create ?? `${pm} create`,
 		tag ? `@aws/nx-workspace@${tag}` : "@aws/nx-workspace",
 		...pm === "npm" ? ["--"] : [],
 		workspace,
-		...iacProvider ? [`--iacProvider=${iacProvider}`] : []
+		...iac ? [`--iac=${iac}`] : []
 	].join(" ");
 };
 //#endregion
@@ -19488,7 +19493,7 @@ ${buildCreateNxWorkspaceCommand(packageManager, ".")} --no-interactive
 \`\`\`
 
 Note that this will prompt for an Infrastructure as Code provider (${IAC_PROVIDERS.join(", ")}).
-If you know the preferred option, pass ${IAC_PROVIDERS.map((iac) => `\`--iacProvider=${iac}\``).join(" or ")} to the above command to skip the prompt.
+If you know the preferred option, pass ${IAC_PROVIDERS.map((iac) => `\`--iac=${iac}\``).join(" or ")} to the above command to skip the prompt.
 
 Additional options:
 - \`--no-gitSecrets\`: Opt out of the default git-secrets pre-commit hook (prevents committing AWS credentials)
@@ -52285,7 +52290,7 @@ const inlineSnippets = async (tree, opts, deps) => {
 	}
 };
 const applyFilterTransforms = (tree, options) => {
-	const iacProvider = options?.iacProvider;
+	const iac = options?.iac;
 	const transform = (parent) => {
 		const children = parent.children;
 		for (let i = 0; i < children.length; i++) {
@@ -52304,12 +52309,12 @@ const applyFilterTransforms = (tree, options) => {
 				continue;
 			}
 			if (child.name === "Infrastructure") {
-				if (iacProvider === "CDK" || iacProvider === "Terraform") {
+				if (iac === "cdk" || iac === "terraform") {
 					const pseudo = {
 						type: "mdxJsxFlowElement",
 						name: "tmp",
 						attributes: [],
-						children: selectInfrastructureSlot(child, iacProvider)
+						children: selectInfrastructureSlot(child, iac)
 					};
 					transform(pseudo);
 					children.splice(i, 1, ...pseudo.children);
@@ -52340,8 +52345,8 @@ const applyFilterTransforms = (tree, options) => {
 	};
 	transform(tree);
 };
-const selectInfrastructureSlot = (node, iacProvider) => {
-	const slotName = iacProvider.toLowerCase();
+const selectInfrastructureSlot = (node, iac) => {
+	const slotName = iac.toLowerCase();
 	return node.children.find((c) => isJsxElement(c) && c.name === "Fragment" && readStringAttr(c, "slot") === slotName)?.children ?? [];
 };
 /**
@@ -52455,7 +52460,7 @@ const renderComponent = (node, opts, pm, deps) => {
 		case "CreateNxWorkspaceCommand": {
 			const workspace = readStringAttr(node, "workspace");
 			if (!workspace) return void 0;
-			return [codeBlock(buildCreateNxWorkspaceCommand(pm, workspace, readStringAttr(node, "iacProvider")))];
+			return [codeBlock(buildCreateNxWorkspaceCommand(pm, workspace, readStringAttr(node, "iac")))];
 		}
 		case "InstallCommand": {
 			const pkg = readStringAttr(node, "pkg") ?? readExpressionAttr(node, "pkg");
@@ -52852,11 +52857,11 @@ const addListGeneratorsTool = (server, generators) => {
 */
 const addGeneratorGuideTool = (server, generators) => {
 	server.registerTool("generator-guide", {
-		description: "Tool to retrieve detailed information about a specific generator. Pass `options` with the values you intend to use for any filterable option (e.g. computeType, iacProvider, auth, uxProvider, protocol, sourceType, targetType) to receive only the guide content relevant to those choices — this cuts noise and avoids suggesting configuration from a different branch. The filterable keys and their valid values for each generator are listed by the `list-generators` tool; call it first if you are not sure which keys to pass. When the combination you pick is not supported by the generator (e.g. connection from ts#trpc-api to smithy), the tool returns an \"Unsupported combination\" warning with the list of supported pairs. When `options` is omitted, every conditional section is included and prefixed with a `> [!NOTE] Only when …` marker so you can see the branching condition.",
+		description: "Tool to retrieve detailed information about a specific generator. Pass `options` with the values you intend to use for any filterable option (e.g. infra, iac, auth, ux, protocol, sourceType, targetType) to receive only the guide content relevant to those choices — this cuts noise and avoids suggesting configuration from a different branch. The filterable keys and their valid values for each generator are listed by the `list-generators` tool; call it first if you are not sure which keys to pass. When the combination you pick is not supported by the generator (e.g. connection from ts#trpc-api to smithy), the tool returns an \"Unsupported combination\" warning with the list of supported pairs. When `options` is omitted, every conditional section is included and prefixed with a `> [!NOTE] Only when …` marker so you can see the branching condition.",
 		inputSchema: {
 			packageManager: PackageManagerSchema,
 			generator: _enum(generators.map((g) => g.id)),
-			options: record(string$2(), string$2()).optional().describe("Optional map of generator option values (e.g. { computeType: \"ServerlessApiGatewayRestApi\", iacProvider: \"CDK\" }) used to filter the guide to content that applies to those choices.")
+			options: record(string$2(), string$2()).optional().describe("Optional map of generator option values (e.g. { infra: \"rest-lambda\", iac: \"cdk\" }) used to filter the guide to content that applies to those choices.")
 		}
 	}, async ({ packageManager, generator: generatorId, options }) => {
 		const generator = generators.find((g) => g.id === generatorId);

package/docs/guides/connection/py-agent-a2a.mdx

@@ -24,7 +24,7 @@ Before using this generator, ensure you have:
 
 1. A Python project with a <Link path="guides/py-agent">Strands Agent</Link> component (any protocol)
 2. A project with an Agent component generated with `--protocol=A2A` and `--auth=IAM` (either <Link path="guides/ts-agent">`ts#agent`</Link> or <Link path="guides/py-agent">`py#agent`</Link>)
-3. Both components created with `computeType: BedrockAgentCoreRuntime`
+3. Both components created with `infra: agentcore`
 
 ## Usage
 

package/docs/guides/connection/py-agent-mcp.mdx

@@ -24,7 +24,7 @@ Before using this generator, ensure you have:
 
 1. A Python project with a <Link path="guides/py-agent">Strands Agent</Link> component
 2. A project with an MCP server component (either <Link path="guides/ts-mcp-server">`ts#mcp-server`</Link> or <Link path="guides/py-mcp-server">`py#mcp-server`</Link>)
-3. Both components created with `computeType: BedrockAgentCoreRuntime`
+3. Both components created with `infra: agentcore`
 
 ## Usage
 

package/docs/guides/connection/react-agui.mdx

@@ -6,7 +6,7 @@ when:
   targetType:
     - ts#agent
     - py#agent
-  protocol: AG-UI
+  protocol: ag-ui
 ---
 import { FileTree } from '@astrojs/starlight/components';
 import Link from '@components/link.astro';

package/docs/guides/connection/react-py-agent.mdx

@@ -4,7 +4,7 @@ description: Connect a React website to a Python Agent
 when:
   sourceType: react
   targetType: py#agent
-  protocol: HTTP
+  protocol: http
 ---
 import { FileTree } from '@astrojs/starlight/components';
 import Link from '@components/link.astro';

package/docs/guides/connection/react-trpc.mdx

@@ -170,7 +170,7 @@ function MyComponent() {
 ### Subscriptions (Streaming)
 
 :::caution[Subscriptions Compute Type]
-Subscriptions are only supported when the tRPC API uses `ServerlessApiGatewayRestApi` (REST API) as the compute type. API Gateway HTTP APIs do not support response streaming.
+Subscriptions are only supported when the tRPC API uses `rest-lambda` (REST API) as the compute type. API Gateway HTTP APIs do not support response streaming.
 :::
 
 When connecting to a REST API tRPC backend, the generated client is automatically configured with a `splitLink` that routes subscription operations through `httpSubscriptionLink` (using SSE) and regular queries/mutations through `httpLink`. This means subscriptions work out of the box with no additional configuration.

package/docs/guides/connection/react-ts-agent.mdx

@@ -4,7 +4,7 @@ description: Connect a React website to a TypeScript Agent
 when:
   sourceType: react
   targetType: ts#agent
-  protocol: HTTP
+  protocol: http
 ---
 import { FileTree } from '@astrojs/starlight/components';
 import Link from '@components/link.astro';

package/docs/guides/connection/ts-agent-a2a.mdx

@@ -24,7 +24,7 @@ Before using this generator, ensure you have:
 
 1. A TypeScript project with a <Link path="guides/ts-agent">Strands Agent</Link> component (any protocol)
 2. A project with an Agent component generated with `--protocol=A2A` and `--auth=IAM` (either <Link path="guides/ts-agent">`ts#agent`</Link> or <Link path="guides/py-agent">`py#agent`</Link>)
-3. Both components created with `computeType: BedrockAgentCoreRuntime`
+3. Both components created with `infra: agentcore`
 
 ## Usage
 

package/docs/guides/connection/ts-agent-mcp.mdx

@@ -24,7 +24,7 @@ Before using this generator, ensure you have:
 
 1. A TypeScript project with a <Link path="guides/ts-agent">Strands Agent</Link> component
 2. A project with an MCP server component (either <Link path="guides/ts-mcp-server">`ts#mcp-server`</Link> or <Link path="guides/py-mcp-server">`py#mcp-server`</Link>)
-3. Both components created with `computeType: BedrockAgentCoreRuntime`
+3. Both components created with `infra: agentcore`
 
 ## Usage
 

package/docs/guides/fastapi.mdx

@@ -35,7 +35,7 @@ You can generate a new FastAPI in two ways:
 <Snippet name="api/api-choice-note" />
 
 :::tip[API Type]
-Select `ServerlessApiGatewayRestApi` (default) as your `computeType` if you intend to build any streaming operations.
+Select `rest-lambda` (default) as your `infra` if you intend to build any streaming operations.
 :::
 
 :::tip[Integration Pattern]
@@ -185,7 +185,7 @@ Unhandled exceptions are caught by the middleware and:
 It's recommended to specify response models for your API operations for better code generation if using the `connection` generator. <Link path="guides/connection/react-fastapi#errors">See here for more details</Link>.
 :::
 
-<OptionFilter when={{ computeType: 'ServerlessApiGatewayRestApi' }} description="Streaming — REST API only">
+<OptionFilter when={{ infra: 'rest-lambda' }} description="Streaming — REST API only">
 ### Streaming
 
 The generated FastAPI supports streaming responses out of the box when using a REST API. The infrastructure is configured to use the [AWS Lambda Web Adapter](https://github.com/awslabs/aws-lambda-web-adapter) to run your FastAPI via uvicorn inside Lambda, with `ResponseTransferMode.STREAM` in API Gateway for all REST API operations, which enables streaming to work alongside non-streaming operations.
@@ -256,7 +256,7 @@ This sets up:
 
 <Snippet name="api/cors-configuration-cdk-note" />
 
-<OptionFilter when={{ auth: 'Cognito' }} description="Cognito identity construct wiring">
+<OptionFilter when={{ auth: 'cognito' }} description="Cognito identity construct wiring">
 :::note[Cognito Authentication]
 If you selected to use `Cognito` authentication, you will need to supply the `identity` property to the API construct:
 
@@ -279,7 +279,7 @@ The `UserIdentity` construct can be generated using the <Link path="/guides/reac
 :::
 </OptionFilter>
 
-<OptionFilter when={{ auth: 'Custom' }} description="Custom Lambda Authorizer CDK usage">
+<OptionFilter when={{ auth: 'custom' }} description="Custom Lambda Authorizer CDK usage">
 :::caution[Custom Lambda Authorizer]
 When using `Custom` auth, the construct creates a Lambda Authorizer internally from the generated `authorizer.py` file, which **denies all requests by default**. You must implement your authorization logic in that file before your API will accept any traffic.
 :::
@@ -326,7 +326,7 @@ This sets up:
 
 <Snippet name="api/cors-configuration-terraform-note" />
 
-<OptionFilter when={{ auth: 'Cognito' }} description="Cognito module wiring">
+<OptionFilter when={{ auth: 'cognito' }} description="Cognito module wiring">
 :::note[Cognito Authentication]
 If you selected to use `Cognito` authentication, you will need to supply the Cognito configuration:
 
@@ -392,7 +392,7 @@ module "my_api" {
 }
 ```
 
-<OptionFilter when={{ auth: 'Custom' }} description="Custom Lambda Authorizer usage with Terraform">
+<OptionFilter when={{ auth: 'custom' }} description="Custom Lambda Authorizer usage with Terraform">
 :::caution[Custom Lambda Authorizer]
 When using `Custom` auth, your API is protected by a Lambda Authorizer that **denies all requests by default**. You must implement your authorization logic in the generated `authorizer.py` file before your API will accept any traffic.
 :::
@@ -400,7 +400,7 @@ When using `Custom` auth, your API is protected by a Lambda Authorizer that **de
 </Fragment>
 </Infrastructure>
 
-<OptionFilter when={{ computeType: 'ServerlessApiGatewayRestApi' }} description="WAF — REST APIs get a WAF Web ACL by default">
+<OptionFilter when={{ infra: 'rest-lambda' }} description="WAF — REST APIs get a WAF Web ACL by default">
 ### WAF
 
 <Snippet name="api/waf-configuration" parentHeading="WAF" />
@@ -442,7 +442,7 @@ We do not support type-safe integrations for Terraform, and therefore no code ge
 </Fragment>
 </Infrastructure>
 
-<OptionFilter when={{ auth: 'IAM' }} description="IAM-authenticated APIs only">
+<OptionFilter when={{ auth: 'iam' }} description="IAM-authenticated APIs only">
 ### Granting Access (IAM Only)
 
 If you selected to use `IAM` authentication, you can use the `grantInvokeAccess` method to grant access to your API:

package/docs/guides/py-agent.mdx

@@ -47,7 +47,7 @@ First use the <Link path="/guides/python-project">`py#project`</Link> generator
 
 The generator will add the following files to your existing Python project. The files generated depend on the chosen `protocol`:
 
-<OptionFilter when={{ protocol: 'HTTP' }} description="FastAPI HTTP server layout">
+<OptionFilter when={{ protocol: 'http' }} description="FastAPI HTTP server layout">
 ### HTTP Protocol (default)
 
 <FileTree>
@@ -58,13 +58,13 @@ The generator will add the following files to your existing Python project. The
         - init.py FastAPI application setup with CORS and error handling middleware
         - agent.py Main agent definition with sample tools
         - main.py FastAPI entry point for Bedrock AgentCore Runtime
-        - Dockerfile Entry point for hosting your agent (excluded when `computeType` is set to `None`)
+        - Dockerfile Entry point for hosting your agent (excluded when `infra` is set to `None`)
     - pyproject.toml Updated with Strands dependencies
     - project.json Updated with agent serve targets
 </FileTree>
 </OptionFilter>
 
-<OptionFilter when={{ protocol: 'A2A' }} description="Strands A2A server layout">
+<OptionFilter when={{ protocol: 'a2a' }} description="Strands A2A server layout">
 ### A2A Protocol
 
 The entry point uses the [Strands A2A Server](https://strandsagents.com/docs/user-guide/concepts/multi-agent/agent-to-agent) instead of FastAPI:
@@ -76,13 +76,13 @@ The entry point uses the [Strands A2A Server](https://strandsagents.com/docs/use
         - \_\_init\_\_.py Python package initialization
         - agent.py Main agent definition with sample tools
         - main.py A2A server entry point
-        - Dockerfile Entry point for hosting your agent (excluded when `computeType` is set to `None`)
+        - Dockerfile Entry point for hosting your agent (excluded when `infra` is set to `None`)
     - pyproject.toml Updated with Strands dependencies
     - project.json Updated with agent serve targets
 </FileTree>
 </OptionFilter>
 
-<OptionFilter when={{ protocol: 'AG-UI' }} description="AG-UI / CopilotKit server layout">
+<OptionFilter when={{ protocol: 'ag-ui' }} description="AG-UI / CopilotKit server layout">
 ### AG-UI Protocol
 
 The entry point uses the [ag-ui-strands](https://docs.ag-ui.com/) integration, which exposes your agent via the AG-UI protocol for direct frontend integration with [CopilotKit](https://docs.copilotkit.ai/aws-strands):
@@ -94,7 +94,7 @@ The entry point uses the [ag-ui-strands](https://docs.ag-ui.com/) integration, w
         - \_\_init\_\_.py Python package initialization
         - agent.py Main agent definition with sample tools
         - main.py AG-UI server entry point using ag-ui-strands
-        - Dockerfile Entry point for hosting your agent (excluded when `computeType` is set to `None`)
+        - Dockerfile Entry point for hosting your agent (excluded when `infra` is set to `None`)
     - pyproject.toml Updated with Strands and AG-UI dependencies
     - project.json Updated with agent serve targets
 </FileTree>
@@ -106,7 +106,7 @@ AG-UI agents can be connected to a React frontend using the <Link path="/guides/
 
 ### Infrastructure
 
-<OptionFilter when={{ computeType: 'BedrockAgentCoreRuntime' }} description="Bedrock AgentCore Runtime deployment">
+<OptionFilter when={{ infra: 'agentcore' }} description="Bedrock AgentCore Runtime deployment">
 <Snippet name="shared-constructs" />
 
 For deploying your Agent, the following files are generated:
@@ -136,8 +136,8 @@ For deploying your Agent, the following files are generated:
 </Infrastructure>
 </OptionFilter>
 
-<OptionFilter when={{ computeType: 'None' }} description="No infrastructure is vended for computeType=None">
-If you selected `None` for `computeType`, no CDK constructs or Terraform modules are generated — the Agent can only be run locally. The `auth` option is ignored in this mode since there is no hosted endpoint to authenticate.
+<OptionFilter when={{ infra: 'none' }} description="No infrastructure is vended for infra=none">
+If you selected `none` for `infra`, no CDK constructs or Terraform modules are generated — the Agent can only be run locally. The `auth` option is ignored in this mode since there is no hosted endpoint to authenticate.
 </OptionFilter>
 
 #### Architecture
@@ -235,7 +235,7 @@ Your agent's server protocol determines how it communicates. All options are ser
 
 All protocols expose `/ping` for the AgentCore runtime health check contract. A2A agents listen on port `9000`; HTTP and AG-UI agents listen on port `8080`. The generated Dockerfile and infrastructure are configured for you.
 
-<OptionFilter when={{ protocol: 'HTTP' }} description="FastAPI HTTP server details">
+<OptionFilter when={{ protocol: 'http' }} description="FastAPI HTTP server details">
 ## FastAPI Server (HTTP protocol)
 
 The generated HTTP server includes:
@@ -319,7 +319,7 @@ You can find more details about the SDK's capabilities in the [documentation her
 Since the generator vends CDK or Terraform infrastructure which manages deploying your agent, you do not need to utilise the `bedrock-agentcore-starter-toolkit` which the docs mention for deploying your agent.
 :::
 
-<OptionFilter when={{ protocol: 'A2A' }} description="A2A server details">
+<OptionFilter when={{ protocol: 'a2a' }} description="A2A server details">
 ## A2A Server (A2A protocol)
 
 The generated `main.py` mounts `A2AServer.to_fastapi_app()` onto a parent FastAPI app that also exposes `/ping`. When deployed to AgentCore, the entry point resolves the runtime's public ARN from AppConfig and advertises it in the agent card.
@@ -327,7 +327,7 @@ The generated `main.py` mounts `A2AServer.to_fastapi_app()` onto a parent FastAP
 Most users will not need to modify this file — edit `agent.py` to change tools or the system prompt. The A2A server populates the agent card (`/.well-known/agent-card.json`) from the `Agent` constructor's `name` and `description`.
 </OptionFilter>
 
-<OptionFilter when={{ protocol: 'AG-UI' }} description="AG-UI / CopilotKit server details">
+<OptionFilter when={{ protocol: 'ag-ui' }} description="AG-UI / CopilotKit server details">
 ## AG-UI Server (AG-UI protocol)
 
 The generated `main.py` wraps your Strands `Agent` in an `ag_ui_strands.StrandsAgent` and creates a FastAPI app via `create_strands_app()`. The resulting app exposes a single POST endpoint that streams [AG-UI](https://docs.ag-ui.com/) events over Server-Sent Events (SSE), as well as `/ping` for the AgentCore runtime health check.
@@ -364,7 +364,7 @@ For **HTTP** agents, the generator also emits:
 
 When you customize the agent's input shape (e.g. add new fields to `InvokeInput`), update `chat.ts` to pass the new fields when invoking the agent and the rest works automatically.
 
-<OptionFilter when={{ computeType: 'BedrockAgentCoreRuntime' }} description="Bedrock AgentCore Runtime deployment details">
+<OptionFilter when={{ infra: 'agentcore' }} description="Bedrock AgentCore Runtime deployment details">
 ## Deploying Your Agent to Bedrock AgentCore Runtime
 
 <Snippet name="agent/bedrock-deployment" parentHeading="Deploying Your Agent to Bedrock AgentCore Runtime" />
@@ -389,7 +389,7 @@ For more details, refer to the [AgentCore documentation on observability](https:
 
 ## Invoking your Agent
 
-<OptionFilter when={{ protocol: 'HTTP' }} description="FastAPI HTTP invocation details">
+<OptionFilter when={{ protocol: 'http' }} description="FastAPI HTTP invocation details">
 ### Invoke the Local Server
 
 To invoke an Agent running locally via the `<your-agent-name>-serve` target, you can send a simple POST request to `/invocations` on the port your local agent is running on. For example, with `curl`:
@@ -409,7 +409,7 @@ The `-N` argument given to `curl` disables buffering the output stream, so you c
 <Snippet name="agent/runtime-arn" parentHeading="Invoke the Deployed Agent" />
 
 <Tabs syncKey="auth">
-<TabItem label="IAM" _filter={{ auth: 'IAM' }}>
+<TabItem label="IAM" _filter={{ auth: 'iam' }}>
 #### IAM Authentication
 
 For IAM Authentication, the request must be signed using AWS Signature Version 4 (SigV4).
@@ -426,7 +426,7 @@ acurl <region> bedrock-agentcore -N -X POST \
 </Drawer>
 </TabItem>
 
-<TabItem label="Cognito" _filter={{ auth: 'Cognito' }}>
+<TabItem label="Cognito" _filter={{ auth: 'cognito' }}>
 #### JWT / Cognito Authentication
 
 For Cognito Authentication, pass the Cognito Access Token in the `Authorization` header:
@@ -462,7 +462,7 @@ For invoking your Agent from a React website, you can make use of the <Link path
 Refer to the <Link path="/guides/connection/react-py-agent">`connection` generator guide</Link> for details about how the connection is set up.
 </OptionFilter>
 
-<OptionFilter when={{ protocol: 'A2A' }} description="A2A delegation details">
+<OptionFilter when={{ protocol: 'a2a' }} description="A2A delegation details">
 ### Invoking an A2A Agent as a Tool
 
 To delegate work from this agent to a remote A2A agent (either <Link path="/guides/ts-agent">TypeScript</Link> or <Link path="/guides/py-agent">Python</Link>), use the <Link path="/guides/connection/py-agent-a2a">`connection` generator</Link>. It vends a SigV4-authenticated client for the target agent and AST-transforms this agent's `agent.py` to register the remote A2A agent as a `@tool`-decorated delegate.
@@ -472,7 +472,7 @@ To delegate work from this agent to a remote A2A agent (either <Link path="/guid
 Refer to the <Link path="/guides/connection/py-agent-a2a">`connection` generator guide</Link> for details about how the connection is set up.
 </OptionFilter>
 
-<OptionFilter when={{ protocol: 'AG-UI' }} description="AG-UI / React connection details">
+<OptionFilter when={{ protocol: 'ag-ui' }} description="AG-UI / React connection details">
 ### Invoking an AG-UI Agent
 
 To invoke your AG-UI agent from a React website, use the <Link path="/guides/connection/react-agui">`connection` generator</Link>, which wires up a [CopilotKit](https://docs.copilotkit.ai/aws-strands) client configured for your deployed agent with the correct authentication (IAM or Cognito).

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

@@ -49,21 +49,21 @@ The generator will add the following files to your existing Python project:
         - server.py Main server definition with sample tools and resources
         - stdio.py Entry point for STDIO transport, useful for simple local MCP servers
         - http.py Entry point for Streamable HTTP transport, useful for hosting your MCP server
-        - Dockerfile Entry point for hosting your MCP server (excluded when `computeType` is set to `None`)
+        - Dockerfile Entry point for hosting your MCP server (excluded when `infra` is set to `None`)
     - pyproject.toml Updated with MCP dependencies
     - project.json Updated with MCP server serve targets
 </FileTree>
 
 ### Infrastructure
 
-<OptionFilter when={{ computeType: 'BedrockAgentCoreRuntime' }} description="Bedrock AgentCore Runtime deployment">
+<OptionFilter when={{ infra: 'agentcore' }} description="Bedrock AgentCore Runtime deployment">
 <Snippet name="shared-constructs" />
 
 <Snippet name="mcp/shared-constructs" />
 </OptionFilter>
 
-<OptionFilter when={{ computeType: 'None' }} description="No infrastructure is vended for computeType=None">
-If you selected `None` for `computeType`, no CDK constructs or Terraform modules are generated — the MCP server is configured for local STDIO / HTTP use only. The `auth` option is ignored in this mode since there is no hosted endpoint to authenticate.
+<OptionFilter when={{ infra: 'none' }} description="No infrastructure is vended for infra=none">
+If you selected `none` for `infra`, no CDK constructs or Terraform modules are generated — the MCP server is configured for local STDIO / HTTP use only. The `auth` option is ignored in this mode since there is no hosted endpoint to authenticate.
 </OptionFilter>
 
 #### Architecture
@@ -141,7 +141,7 @@ If you would like to run your MCP server locally using [Streamable HTTP transpor
 
 This command uses `uv run uvicorn --reload` to run your MCP server with HTTP transport (typically on port `8000`), and automatically restarts when files change.
 
-<OptionFilter when={{ computeType: 'BedrockAgentCoreRuntime' }} description="Bedrock AgentCore Runtime deployment details">
+<OptionFilter when={{ infra: 'agentcore' }} description="Bedrock AgentCore Runtime deployment details">
 ## Deploying Your MCP Server to Bedrock AgentCore Runtime
 
 <Snippet name="mcp/bedrock-deployment" parentHeading="Deploying Your MCP Server to Bedrock AgentCore Runtime" />

package/docs/guides/python-lambda-function.mdx

@@ -163,8 +163,8 @@ Default metrics include:
 
 ### Type Safety
 
-<OptionFilter not when={{ eventSource: 'Any' }} description="Typed eventSource wires @event_parser with a Pydantic model">
-If you chose an `eventSource` when generating your lambda function, your function is instrumented with [`@event_parser` from AWS Lambda Powertools](https://docs.powertools.aws.dev/lambda/python/latest/utilities/parser/). For example:
+<OptionFilter not when={{ event: 'Any' }} description="Typed event wires @event_parser with a Pydantic model">
+If you chose an `event` when generating your lambda function, your function is instrumented with [`@event_parser` from AWS Lambda Powertools](https://docs.powertools.aws.dev/lambda/python/latest/utilities/parser/). For example:
 
 ```python {3}
 @event_parser(model=EventBridgeModel)
@@ -179,8 +179,8 @@ If you have custom data nested within an event, for example a DynamoDB stream or
 :::
 </OptionFilter>
 
-<OptionFilter when={{ eventSource: 'Any' }} description="eventSource=Any — no parser decorator, event is untyped">
-If you selected `Any` for your `eventSource`, the `@event_parser` decorator is not applied and the handler receives an untyped event dict. Regenerate with a specific `eventSource` if you want Pydantic validation and typed field access.
+<OptionFilter when={{ event: 'Any' }} description="event=Any — no parser decorator, event is untyped">
+If you selected `Any` for your `event`, the `@event_parser` decorator is not applied and the handler receives an untyped event dict. Regenerate with a specific `event` if you want Pydantic validation and typed field access.
 </OptionFilter>
 
 ## Bundling

package/docs/guides/react-website.mdx

@@ -130,11 +130,11 @@ cloudfront -> s3
 
 The [React documentation](https://react.dev/learn) is a good place to start to learn the basics of building with React.
 
-<OptionFilter when={{ uxProvider: 'Cloudscape' }} description="Cloudscape component docs pointer">
+<OptionFilter when={{ ux: 'cloudscape' }} description="Cloudscape component docs pointer">
 You can refer to the [Cloudscape documentation](https://cloudscape.design/components/) for details about the available components and how to use them.
 </OptionFilter>
 
-<OptionFilter when={{ uxProvider: 'Shadcn' }} description="Shadcn component docs pointer">
+<OptionFilter when={{ ux: 'shadcn' }} description="Shadcn component docs pointer">
 You can refer to the [shadcn/ui documentation](https://ui.shadcn.com/docs) for details about the available components and how to use them.
 </OptionFilter>