@aws/nx-plugin-mcp 1.0.0 → 1.0.1

package/bin/aws-nx-mcp.js

@@ -21942,14 +21942,14 @@ const NX_VERSION = {
 	"@middy/core": "7.9.2",
 	"@nxlv/python": "23.0.0",
 	"@nx-extend/terraform": "10.4.1",
-	nx: "23.2.0",
-	"@nx/devkit": "23.2.0",
-	"@nx/js": "23.2.0",
-	"@nx/react": "23.2.0",
-	"@nx/vite": "23.2.0",
-	"@nx/vitest": "23.2.0",
-	"@nx/workspace": "23.2.0",
-	"create-nx-workspace": "23.2.0",
+	nx: "23.2.1",
+	"@nx/devkit": "23.2.1",
+	"@nx/js": "23.2.1",
+	"@nx/react": "23.2.1",
+	"@nx/vite": "23.2.1",
+	"@nx/vitest": "23.2.1",
+	"@nx/workspace": "23.2.1",
+	"create-nx-workspace": "23.2.1",
 	"@swc-node/register": "1.12.1",
 	"@swc/core": "1.16.1",
 	"@modelcontextprotocol/sdk": "1.30.0",
@@ -54646,6 +54646,7 @@ const renderComponent = (node, opts, pm, deps) => {
 			if (!commands) return void 0;
 			return [codeBlock(commands.map((c) => buildPackageManagerExecCommand(pm, c)).join("\n"))];
 		}
+		case "ArchitectureDiagram": return [];
 		default: return;
 	}
 };
@@ -54694,7 +54695,7 @@ const filterableValuesForProperty = (prop) => {
 /**
 * Pull out every filterable property (enum or boolean valued) as a
 * `FilterableOption`. Shared between the MCP server (deriving options from a
-* generator's schema) and the docs filter bar (mapping user-referenced keys
+* generator's schema) and the docs site (mapping user-referenced keys
 * onto their values).
 */
 const filterableOptionsFromSchema = (schema) => {
@@ -55424,6 +55425,13 @@ const generatorsJsonEntries = {
 		"metric": "g15",
 		"hidden": true
 	},
+	"open-api#py-client": {
+		"factory": "./src/open-api/py-client/generator",
+		"schema": "./src/open-api/py-client/schema.json",
+		"description": "Generate a Python httpx client from an OpenAPI specification",
+		"metric": "g73",
+		"hidden": true
+	},
 	"open-api#ts-client": {
 		"factory": "./src/open-api/ts-client/generator",
 		"schema": "./src/open-api/ts-client/schema.json",

package/docs/get_started/existing-project.mdx

@@ -43,7 +43,7 @@ pnpm only runs install scripts for allow-listed packages, and `nx` needs its ins
 
 ```yaml title="pnpm-workspace.yaml"
 allowBuilds:
-  - nx
+  nx: true
 ```
 </Aside>
 

package/docs/get_started/quick-start.mdx

@@ -13,7 +13,6 @@ import RunGenerator from '@components/run-generator.astro';
 import NxCommands from '@components/nx-commands.astro';
 import Infrastructure from '@components/infrastructure.astro';
 import EmbeddedGraph from '@components/embedded-graph.astro';
-import Diff from '@components/diff.astro';
 import Prompt from '@components/prompt.astro';
 
 This guide walks you through the basics of installing and using `@aws/nx-plugin` to rapidly build projects on AWS.
@@ -28,13 +27,13 @@ The following global dependencies are needed before proceeding:
 
 Create an <Link path="guides/workspace">Nx workspace</Link> with the package manager of your choice, and open the directory it creates:
 
-<CreateNxWorkspaceCommand workspace="my-project" />
+<CreateNxWorkspaceCommand workspace="my-project" readonly editable={['iac', 'containers']} />
 
 ```sh
 cd my-project
 ```
 
-You are prompted to choose your infrastructure as code provider, either [CDK](https://docs.aws.amazon.com/cdk/) or [Terraform](https://developer.hashicorp.com/terraform), and the container engine used by generators which build container images.
+You are prompted to choose your infrastructure as code provider, either [CDK](https://docs.aws.amazon.com/cdk/) or [Terraform](https://developer.hashicorp.com/terraform).
 
 ## Step 2: Build Your Application
 
@@ -73,25 +72,25 @@ Depending on the type of project you're building, you can choose any combination
 
 #### Add a tRPC API
 
-<RunGenerator generator="ts#api" requiredParameters={{ name: 'demo-api', framework: 'trpc' }} positional={['name']} noInteractive />
+<RunGenerator generator="ts#api" requiredParameters={{ name: 'demo-api', framework: 'trpc' }} positional={['name']} noInteractive readonly />
 
 This will create the API inside the `packages/demo-api` folder.
 
 #### Add a React Website
 
-<RunGenerator generator="ts#website" requiredParameters={{ name: 'demo-website' }} positional={['name']} noInteractive />
+<RunGenerator generator="ts#website" requiredParameters={{ name: 'demo-website' }} positional={['name']} noInteractive readonly />
 
 This scaffolds a new React website in `packages/demo-website`.
 
 #### Add Cognito Authentication
 
-<RunGenerator generator="ts#website#auth" requiredParameters={{ project: 'demo-website' }} noInteractive />
+<RunGenerator generator="ts#website#auth" requiredParameters={{ project: 'demo-website' }} noInteractive readonly />
 
 This sets up the necessary infrastructure and React code to add Cognito Authentication to your website.
 
 #### Connect Frontend to Backend
 
-<RunGenerator generator="connection" requiredParameters={{ sourceProject: 'demo-website', targetProject: 'demo-api' }} noInteractive />
+<RunGenerator generator="connection" requiredParameters={{ sourceProject: 'demo-website', targetProject: 'demo-api' }} noInteractive readonly />
 
 This configures the necessary providers to ensure your website can call your tRPC API.
 
@@ -101,12 +100,12 @@ Add the infrastructure project based on your chosen IAC provider.
 
 <Infrastructure>
 <Fragment slot="cdk">
-<RunGenerator generator="ts#infra" requiredParameters={{ name: 'infra' }} positional={['name']} noInteractive />
+<RunGenerator generator="ts#infra" requiredParameters={{ name: 'infra' }} positional={['name']} noInteractive readonly />
 
 This configures a CDK App which you can use to deploy your infrastructure on AWS.
 </Fragment>
 <Fragment slot="terraform">
-<RunGenerator generator="terraform#project" requiredParameters={{ name: 'infra' }} positional={['name']} noInteractive />
+<RunGenerator generator="terraform#project" requiredParameters={{ name: 'infra' }} positional={['name']} noInteractive readonly />
 
 This configures a Terraform project which you can use to deploy your infrastructure on AWS.
 </Fragment>
@@ -128,54 +127,39 @@ Connecting the website to the API added a `useDemoApi` hook, which returns a [tR
 
 Update `packages/demo-website/src/routes/index.tsx` to call the API's `echo` procedure, showing a spinner while the request is in flight:
 
-<Diff lang="tsx" before={`import { createFileRoute } from '@tanstack/react-router';
-
-export const Route = createFileRoute('/')({
-  component: RouteComponent,
-});
-
-function RouteComponent() {
-  return (
-    <div className="text-center">
-      <header>
-        <h1>Welcome</h1>
-        <p>Welcome to your new React website!</p>
-      </header>
-    </div>
-  );
-}
-`} after={`import { useQuery } from '@tanstack/react-query';
+```diff lang="tsx"
++import { useQuery } from '@tanstack/react-query';
 import { createFileRoute } from '@tanstack/react-router';
-import { Spinner } from '../components/spinner';
-import { useDemoApi } from '../hooks/useDemoApi';
++import { Spinner } from '../components/spinner';
++import { useDemoApi } from '../hooks/useDemoApi';
 
 export const Route = createFileRoute('/')({
   component: RouteComponent,
 });
 
 function RouteComponent() {
-  const trpc = useDemoApi();
-  const echo = useQuery(
-    trpc.echo.queryOptions({ message: 'Hello from the API!' }),
-  );
-
++  const trpc = useDemoApi();
++  const echo = useQuery(
++    trpc.echo.queryOptions({ message: 'Hello from the API!' }),
++  );
++
   return (
     <div className="text-center">
       <header>
         <h1>Welcome</h1>
         <p>Welcome to your new React website!</p>
       </header>
-      {echo.isLoading ? (
-        <Spinner />
-      ) : echo.error ? (
-        <p>Error: {echo.error.message}</p>
-      ) : (
-        <p>{echo.data?.message}</p>
-      )}
++      {echo.isLoading ? (
++        <Spinner />
++      ) : echo.error ? (
++        <p>Error: {echo.error.message}</p>
++      ) : (
++        <p>{echo.data?.message}</p>
++      )}
     </div>
   );
 }
-`} />
+```
 
 Save the file and the page reloads with the message your API echoed back. The call is type-safe end to end — rename `message` in `packages/demo-api/src/schema/echo.ts` and your website stops compiling until you follow the change through.
 
@@ -189,12 +173,12 @@ See the <Link path="guides/connection/react-trpc">React to tRPC connection guide
 <Fragment slot="cdk">
 Open `packages/infra/src/stacks/application-stack.ts` and add the following code:
 
-```typescript
-import {
-  DemoApi,
-  DemoWebsite,
-  UserIdentity,
-} from '@my-project/common-constructs';
+```diff lang="ts"
++import {
++  DemoApi,
++  DemoWebsite,
++  UserIdentity,
++} from '@my-project/common-constructs';
 import { Stack, StackProps } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 
@@ -202,13 +186,13 @@ export class ApplicationStack extends Stack {
   constructor(scope: Construct, id: string, props?: StackProps) {
     super(scope, id, props);
 
-    const identity = new UserIdentity(this, 'identity');
-    const api = new DemoApi(this, 'api', {
-      integrations: DemoApi.defaultIntegrations(this).build(),
-    });
-    api.grantInvokeAccess(identity.identityPool.authenticatedRole);
-
-    new DemoWebsite(this, 'website');
++    const identity = new UserIdentity(this, 'identity');
++    const api = new DemoApi(this, 'api', {
++      integrations: DemoApi.defaultIntegrations(this).build(),
++    });
++    api.grantInvokeAccess(identity.identityPool.authenticatedRole);
++
++    new DemoWebsite(this, 'website');
   }
 }
 ```

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

@@ -54,7 +54,7 @@ Let's create the new generator in `packages/nx-plugin/src/trpc/procedure`.
 
 We provide a generator for creating new generators so you can quickly scaffold your new generator! You can run this generator as follows:
 
-<RunGenerator generator="ts#nx-generator" requiredParameters={{ project: '@aws/nx-plugin', name: 'ts#trpc-api#procedure', directory: 'trpc/procedure', description: 'Adds a procedure to a tRPC API' }} />
+<RunGenerator generator="ts#nx-generator" requiredParameters={{ project: '@aws/nx-plugin', name: 'ts#trpc-api#procedure', directory: 'trpc/procedure', description: 'Adds a procedure to a tRPC API' }} readonly />
 
 You will notice the following files have been generated for you:
 
@@ -313,11 +313,11 @@ If you have completed the <Link path="get_started/tutorials/dungeon-game/overvie
 
 In a separate directory, create a new test workspace:
 
-<CreateNxWorkspaceCommand workspace="trpc-generator-test" />
+<CreateNxWorkspaceCommand workspace="trpc-generator-test" readonly />
 
 Next, let's generate a tRPC API to add the procedure to:
 
-<RunGenerator generator="ts#api" requiredParameters={{name:"test-api", framework:"trpc"}} noInteractive />
+<RunGenerator generator="ts#api" requiredParameters={{name:"test-api", framework:"trpc"}} noInteractive readonly />
 
 #### Link our local Nx Plugin for AWS
 
@@ -337,7 +337,7 @@ Notice above we linked to the compiled plugin in `dist/packages/nx-plugin` rathe
 
 Let's try the new generator:
 
-<RunGenerator generator="ts#trpc-api#procedure" />
+<RunGenerator generator="ts#trpc-api#procedure" readonly />
 
 :::note[Generator Not Showing]
 If you don't see the new generator in the list in VSCode, you might need to refresh the Nx workspace:
@@ -397,7 +397,7 @@ In practice, this process might look like:
 
 1. Create a new workspace
 
-    <CreateNxWorkspaceCommand workspace="my-project" />
+    <CreateNxWorkspaceCommand workspace="my-project" readonly />
   
 1. Run any generators that may be prerequisites to your new generator/feature/fix
 1. Commit your changes (`git commit`)

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

@@ -26,7 +26,7 @@ import gameConversationPng from '@assets/game-conversation.png'
 
 To create a new monorepo, from within your desired directory, run the following command:
 
-<CreateNxWorkspaceCommand workspace="dungeon-adventure" iac="cdk" />
+<CreateNxWorkspaceCommand workspace="dungeon-adventure" iac="cdk" readonly />
 
 :::note[CDK as IaC Provider]
 We use `--iac=cdk` as we will use CDK for infrastructure as code in this tutorial. The Nx Plugin for AWS also supports `terraform`.
@@ -72,7 +72,7 @@ Rather than copying the commands all at once, you can run each generator individ
 
 First, let's create our Game API. To do this, create a tRPC API called `GameApi` using these steps:
 
-<RunGenerator generator="ts#api" requiredParameters={{ name: "GameApi", framework: "trpc" }} noInteractive />
+<RunGenerator generator="ts#api" requiredParameters={{ name: "GameApi", framework: "trpc" }} noInteractive readonly />
 
 <br />
 
@@ -137,7 +137,7 @@ Below is a list of all files which have been generated by the `ts#api` generator
 
 Let us look at these key files:
 
-```ts {7}
+```ts {8}
 // packages/game-api/src/router.ts
 import { echo } from './procedures/echo.js';
 import { t } from './init.js';
@@ -152,7 +152,7 @@ export type AppRouter = typeof appRouter;
 ```
 The router defines the tRPC router for your API and is the place where you will declare all of your API methods. As you can see above, we have a method called `echo` with it's implementation in the `./procedures/echo.ts` file. The Lambda handler entrypoint is in `handler.ts`, which is configured automatically by the generator.
 
-```ts {4-6}
+```ts {5-7}
 // packages/game-api/src/procedures/echo.ts
 import { publicProcedure } from '../init.js';
 import { EchoInputSchema, EchoOutputSchema } from '../schema/index.js';
@@ -403,7 +403,7 @@ Now let's create our Story Agent.
 
 To create a Python project:
 
-<RunGenerator generator="py#project" requiredParameters={{name:"story"}} noInteractive />
+<RunGenerator generator="py#project" requiredParameters={{name:"story"}} noInteractive readonly />
 
 You will see some new files appear in your file tree.
 <details>
@@ -433,7 +433,7 @@ This has configured a Python project and [UV Workspace](https://docs.astral.sh/u
 
 To add a Strands agent to the project with the `py#agent` generator:
 
-<RunGenerator generator="py#agent" requiredParameters={{project:"story", auth:"cognito", protocol:"ag-ui"}} noInteractive />
+<RunGenerator generator="py#agent" requiredParameters={{project:"story", auth:"cognito", protocol:"ag-ui"}} noInteractive readonly />
 
 :::note[AG-UI protocol]
 We choose `--protocol=ag-ui` so the agent speaks the [Agent-User Interaction protocol](https://docs.copilotkit.ai/aws-strands/protocol) — this lets our React website talk to it directly via [CopilotKit](https://docs.copilotkit.ai/), with streaming, tool calls, and conversation history handled by the protocol instead of a hand-rolled HTTP client.
@@ -916,7 +916,7 @@ Let us create an MCP server to provide tools for our Story Agent to manage a pla
 
 First, we create a TypeScript project:
 
-<RunGenerator generator="ts#project" requiredParameters={{name:"inventory"}} noInteractive />
+<RunGenerator generator="ts#project" requiredParameters={{name:"inventory"}} noInteractive readonly />
 
 This will create an empty TypeScript project.
 
@@ -944,7 +944,7 @@ The `ts#project` generator generates these files.
 
 Next, we'll add an MCP server to our TypeScript project:
 
-<RunGenerator generator="ts#mcp-server" requiredParameters={{project:"inventory"}} noInteractive />
+<RunGenerator generator="ts#mcp-server" requiredParameters={{project:"inventory"}} noInteractive readonly />
 
 This will add an MCP server.
 <details>
@@ -977,7 +977,7 @@ The `ts#mcp-server` generator generates these files.
 
 Our game state — saved games and each player's inventory — lives in [Amazon DynamoDB](https://aws.amazon.com/dynamodb/). Create a DynamoDB project called `DungeonDb` with the `ts#dynamodb` generator:
 
-<RunGenerator generator="ts#dynamodb" requiredParameters={{name:"DungeonDb"}} noInteractive />
+<RunGenerator generator="ts#dynamodb" requiredParameters={{name:"DungeonDb"}} noInteractive readonly />
 
 :::tip[Local-first development]
 The `ts#dynamodb` generator vends a `dev` target that runs [DynamoDB Local](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DynamoDBLocal.html) in a container. Combined with the `connection` generator (which we run below), this means **the entire game runs on your machine without a deployment** until the end of the tutorial.
@@ -1029,7 +1029,7 @@ Next, we will create the UI which will allow you to interact with the game.
 
 To create the UI, create a website called `GameUI` using these steps:
 
-<RunGenerator generator="ts#website" requiredParameters={{name:"GameUI", ux:"shadcn"}} noInteractive />
+<RunGenerator generator="ts#website" requiredParameters={{name:"GameUI", ux:"shadcn"}} noInteractive readonly />
 
 :::note[Shadcn UI]
 We select `--ux=shadcn` so the generated website uses [shadcn/ui](https://ui.shadcn.com/) components styled with Tailwind — all our route code uses shadcn primitives like `Card`, `Button`, and `Input`, and the `connection` generator later wires a matching shadcn-themed [CopilotKit](https://docs.copilotkit.ai/) chat surface.
@@ -1166,7 +1166,7 @@ A component will be rendered when navigating to the `/` route. `@tanstack/react-
 
 Let us configure our Game UI to require authenticated access via Amazon Cognito using these steps:
 
-<RunGenerator generator="ts#website#auth" requiredParameters={{cognitoDomain:"game-ui", project:"@dungeon-adventure/game-ui", allowSignup:true}} noInteractive />
+<RunGenerator generator="ts#website#auth" requiredParameters={{cognitoDomain:"game-ui", project:"@dungeon-adventure/game-ui", allowSignup:true}} noInteractive readonly />
 
 You will see some new files appear/change in your file tree.
 
@@ -1250,7 +1250,7 @@ The `RuntimeConfigProvider` and `CognitoAuth` components have been added to the
 
 Let us configure our Game UI to connect to our previously created Game API.
 
-<RunGenerator generator="connection" requiredParameters={{sourceProject:"@dungeon-adventure/game-ui", targetProject:"@dungeon-adventure/game-api"}} noInteractive />
+<RunGenerator generator="connection" requiredParameters={{sourceProject:"@dungeon-adventure/game-ui", targetProject:"@dungeon-adventure/game-api"}} noInteractive readonly />
 
 You will see some new files have appear/change in your file tree.
 
@@ -1344,7 +1344,7 @@ The `main.tsx` file has been updated via an AST transform to inject the tRPC pro
 
 Let us connect our Story Agent to the Inventory MCP server so the agent can discover and invoke the MCP server's tools.
 
-<RunGenerator generator="connection" requiredParameters={{sourceProject:"story", targetProject:"inventory"}} noInteractive />
+<RunGenerator generator="connection" requiredParameters={{sourceProject:"story", targetProject:"inventory"}} noInteractive readonly />
 
 <details>
 <summary>Examine the Story Agent → Inventory MCP connection files</summary>
@@ -1384,7 +1384,7 @@ For more details, refer to the <Link path="guides/connection/py-agent-mcp">Pytho
 
 Let us connect our Game UI to the Story Agent. Since the agent speaks AG-UI, the `connection` generator wires up [CopilotKit](https://docs.copilotkit.ai/): a themed chat component and an `@ag-ui/client` `HttpAgent` ready to render.
 
-<RunGenerator generator="connection" requiredParameters={{sourceProject:"@dungeon-adventure/game-ui", targetProject:"story"}} noInteractive />
+<RunGenerator generator="connection" requiredParameters={{sourceProject:"@dungeon-adventure/game-ui", targetProject:"story"}} noInteractive readonly />
 
 <details>
 <summary>Examine the UI → Story Agent connection files</summary>
@@ -1419,9 +1419,9 @@ For more details, refer to the <Link path="guides/connection/react-agui">React t
 
 Both the Game API and the Inventory MCP server read and write our DynamoDB table, so let us connect them to the `DungeonDb` project. The `connection` generator detects that the target is a `ts#dynamodb` project and wires each source project's `dev` target to start DynamoDB Local automatically.
 
-<RunGenerator generator="connection" requiredParameters={{sourceProject:"@dungeon-adventure/game-api", targetProject:"@dungeon-adventure/dungeon-db"}} noInteractive />
+<RunGenerator generator="connection" requiredParameters={{sourceProject:"@dungeon-adventure/game-api", targetProject:"@dungeon-adventure/dungeon-db"}} noInteractive readonly />
 
-<RunGenerator generator="connection" requiredParameters={{sourceProject:"@dungeon-adventure/inventory", targetProject:"@dungeon-adventure/dungeon-db"}} noInteractive />
+<RunGenerator generator="connection" requiredParameters={{sourceProject:"@dungeon-adventure/inventory", targetProject:"@dungeon-adventure/dungeon-db"}} noInteractive readonly />
 
 <Aside type="tip" title="One command boots the whole stack locally">
 Because the Story Agent's `agent-dev` already depends on the Inventory MCP server's `mcp-server-dev` (via the `story → inventory` connection above), and both the Game API and MCP server now depend on `dungeon-db:dev`, running any one project's `dev` target starts every dependency it needs in the right order.
@@ -1431,7 +1431,7 @@ Because the Story Agent's `agent-dev` already depends on the Inventory MCP serve
 
 Let us create the final sub-project for the CDK infrastructure.
 
-<RunGenerator generator="ts#infra" requiredParameters={{name:"infra"}} noInteractive />
+<RunGenerator generator="ts#infra" requiredParameters={{name:"infra"}} noInteractive readonly />
 
 You will see some new files have appear/change in your file tree.
 

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

@@ -16,6 +16,7 @@ import baselineGamePng from '@assets/baseline-game.png'
 import nxGraphPng from '@assets/nx-graph.png'
 import gameSelectPng from '@assets/game-select.png'
 import gameConversationPng from '@assets/game-conversation.png'
+import EmbeddedGraph from '@components/embedded-graph.astro';
 
 
 Using this tutorial, you will build an Agentic AI-powered dungeon adventure game with `@aws/nx-plugin`. This tutorial does not assume any existing knowledge of the `@aws/nx-plugin` or related technologies. 
@@ -51,76 +52,9 @@ The game interface will resemble something like this diagram:
 
 ### Application architecture
 
-The Agentic AI-powered dungeon adventure game is built using the following architecture:
-
-```d2 inline=true
-direction: down
-
-browser: Web Browser {
-  shape: image
-  icon: /nx-plugin-for-aws/icons/aws/client.svg
-}
-
-cognito: Cognito / IAM {
-  shape: image
-  icon: /nx-plugin-for-aws/icons/aws/cognito.svg
-}
-
-cloudfront: CloudFront {
-  shape: image
-  icon: /nx-plugin-for-aws/icons/aws/cloudfront.svg
-}
-
-s3: Static Assets\n(S3) {
-  shape: image
-  icon: /nx-plugin-for-aws/icons/aws/s3.svg
-}
-
-apigw: API Gateway\n(Game API) {
-  shape: image
-  icon: /nx-plugin-for-aws/icons/aws/api-gateway.svg
-}
-
-lambda: tRPC API\n(Lambda) {
-  shape: image
-  icon: /nx-plugin-for-aws/icons/aws/lambda.svg
-}
-
-story: Story Agent\n(AgentCore) {
-  shape: image
-  icon: /nx-plugin-for-aws/icons/aws/bedrock-agentcore-runtime.svg
-}
-
-mcp: Inventory MCP\n(AgentCore) {
-  shape: image
-  icon: /nx-plugin-for-aws/icons/aws/bedrock-agentcore-runtime.svg
-}
-
-ddb: Game State\n(DynamoDB) {
-  shape: image
-  icon: /nx-plugin-for-aws/icons/aws/dynamodb.svg
-}
-
-sessions: Story Sessions\n(S3) {
-  shape: image
-  icon: /nx-plugin-for-aws/icons/aws/s3.svg
-}
-
-browser -> cognito: Sign in
-browser -> cloudfront
-cloudfront -> s3
-browser -> apigw
-apigw -> lambda
-lambda -> ddb
-lambda -> sessions: Read transcripts
-browser -> story: AG-UI stream
-story -> sessions: Persist turns
-story -> mcp: Tool calls
-mcp -> ddb
-ddb -> sessions: {
-  style.opacity: 0
-}
-```
+The Agentic AI-powered dungeon adventure game is built using the following architecture — switch to **Projects** to see the workspace it is built from, which you scaffold in Module 1:
+
+<EmbeddedGraph preset="dungeon-adventure" workspace="dungeon-adventure" iac="cdk" view="infrastructure" copyable={false} />
 
 - React/Vite frontend website utilising:
   - Amazon Cognito/Identity Pools for secure API calls.

package/docs/guides/agentcore-gateway.mdx

@@ -14,6 +14,7 @@ import Snippet from '@components/snippet.astro';
 import Link from '@components/link.astro';
 import NxCommands from '@components/nx-commands.astro';
 import OptionFilter from '@components/option-filter.astro';
+import ArchitectureDiagram from '@components/architecture-diagram.astro';
 
 Generate an [Amazon Bedrock AgentCore Gateway](https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/gateway.html) project. An AgentCore Gateway is a managed entry point in front of your MCP servers or agents, authenticating inbound requests (IAM or Cognito) and signing outbound traffic to its targets with IAM SigV4.
 
@@ -89,32 +90,7 @@ The Gateway URL is automatically registered in the `agentcore.gateways.<ClassNam
 
 The deployed Gateway has the following architecture, with an [AWS WAFv2](https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html) Web ACL in front of the Gateway, which routes on to its downstream MCP server targets:
 
-```d2 inline=true
-direction: right
-
-client: Client {
-  shape: image
-  icon: /nx-plugin-for-aws/icons/aws/client.svg
-}
-
-waf: WAF {
-  shape: image
-  icon: /nx-plugin-for-aws/icons/aws/waf.svg
-}
-
-gateway: AgentCore Gateway\n(MCP, IAM or Cognito auth) {
-  shape: image
-  icon: /nx-plugin-for-aws/icons/aws/bedrock-agentcore-gateway.svg
-}
-
-targets: Downstream MCP Servers\n(Gateway targets) {
-  shape: rectangle
-}
-
-client -> waf
-waf -> gateway
-gateway -> targets
-```
+<ArchitectureDiagram />
 
 ## Authentication
 

package/docs/guides/connection/agentcore-gateway-agent.mdx

@@ -108,7 +108,7 @@ AgentCore Runtime VPC deployments are only supported in certain availability zon
 <Fragment slot="terraform">
 In the Terraform file where you instantiate the Gateway, wire the agent target in:
 
-```hcl title="packages/infra/src/main.tf" {9-20,24-40}
+```hcl title="packages/infra/src/main.tf" {9-25,28-48}
 module "my_agent" {
   source = "../../common/terraform/src/app/agents/my-agent"
   # ...

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

@@ -72,7 +72,7 @@ The generator transforms your agent's `agent.py` to wrap the remote A2A agent as
 
 <Tabs syncKey="agent-framework">
 <TabItem label="Strands" _filter={{ framework: 'strands' }}>
-```python title="packages/my-project/my_module/agent/agent.py" {4,8-13,15}
+```python title="packages/my-project/my_module/agent/agent.py" {4,8-13,15,17}
 from contextlib import contextmanager
 from strands import Agent, tool
 
@@ -94,7 +94,7 @@ def get_agent():
 ```
 </TabItem>
 <TabItem label="LangChain" _filter={{ framework: 'langchain' }}>
-```python title="packages/my-project/my_module/agent/agent.py" {5,8-13,15}
+```python title="packages/my-project/my_module/agent/agent.py" {5,8-13,15,18}
 from langchain.agents import create_agent
 from langchain_aws import ChatBedrockConverse
 from langchain_core.tools import tool

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

@@ -77,7 +77,7 @@ The generator transforms your agent's `agent.py` to use the Gateway client:
 
 <Tabs syncKey="agent-framework">
 <TabItem label="Strands" _filter={{ framework: 'strands' }}>
-```python title="packages/example/example/my_agent/agent.py" {4,8,9-13}
+```python title="packages/example/example/my_agent/agent.py" {4,8-11,14}
 from contextlib import contextmanager
 from strands import Agent
 

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

@@ -74,7 +74,7 @@ The generator transforms your agent's `agent.py` to use the MCP server's tools:
 
 <Tabs syncKey="agent-framework">
 <TabItem label="Strands" _filter={{ framework: 'strands' }}>
-```python title="packages/my-project/my_module/agent/agent.py" {4,8,9-13}
+```python title="packages/my-project/my_module/agent/agent.py" {4,8-11,14}
 from contextlib import contextmanager
 from strands import Agent
 

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

@@ -186,7 +186,7 @@ For information on how to define subscription procedures in your backend, see th
 
 You can consume subscriptions using the `useSubscription` hook with `subscriptionOptions` from the options proxy:
 
-```tsx {1-2,7-22}
+```tsx {1-2,7-23}
 import { useSubscription } from '@trpc/tanstack-react-query';
 import { useMyApi } from './hooks/useMyApi';
 

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

@@ -84,7 +84,7 @@ The generated code handles authentication depending on your agent's configuratio
 
 The most common use case is streaming the agent's response using the `invoke` subscription with the `use<AgentName>Agent` hook, which returns a [tRPC options proxy](https://trpc.io/docs/client/tanstack-react-query) for use with TanStack Query:
 
-```tsx {1-2,7-22}
+```tsx {1-2,7-23}
 import { useSubscription } from '@trpc/tanstack-react-query';
 import { useMyAgentAgent } from './hooks/useMyAgentAgent';