@aws/nx-plugin 0.99.1 → 0.101.0

package/LICENSE-THIRD-PARTY

@@ -3325,12 +3325,12 @@ SOFTWARE.
 
 ---
 
-The following software may be included in this product: @esbuild/darwin-arm64 (0.27.4)
+The following software may be included in this product: @esbuild/linux-x64 (0.27.4)
 This software contains the following license and notice below:
 
 MIT License
 
-Copyright (c) The maintainers of @esbuild/darwin-arm64 <https://github.com/evanw/esbuild#readme>
+Copyright (c) The maintainers of @esbuild/linux-x64 <https://github.com/evanw/esbuild#readme>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
 associated documentation files (the "Software"), to deal in the Software without restriction, including 
@@ -3349,12 +3349,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---
 
-The following software may be included in this product: @esbuild/darwin-arm64 (0.28.0)
+The following software may be included in this product: @esbuild/linux-x64 (0.28.0)
 This software contains the following license and notice below:
 
 MIT License
 
-Copyright (c) The maintainers of @esbuild/darwin-arm64 <https://github.com/evanw/esbuild#readme>
+Copyright (c) The maintainers of @esbuild/linux-x64 <https://github.com/evanw/esbuild#readme>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
 associated documentation files (the "Software"), to deal in the Software without restriction, including 
@@ -3528,36 +3528,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---
 
-The following software may be included in this product: @getgrit/gritql-darwin-arm64 (0.0.3)
+The following software may be included in this product: @getgrit/gritql-linux-x64-gnu (0.0.3)
 This software contains the following license and notice below:
 
 MIT License
 
-Copyright (c) The maintainers of @getgrit/gritql-darwin-arm64 <https://github.com/biomejs/gritql#readme>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
-associated documentation files (the "Software"), to deal in the Software without restriction, including 
-without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the 
-following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial 
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO 
-EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-The following software may be included in this product: @getgrit/gritql-darwin-universal (0.0.3)
-This software contains the following license and notice below:
-
-MIT License
-
-Copyright (c) The maintainers of @getgrit/gritql-darwin-universal <https://github.com/biomejs/gritql#readme>
+Copyright (c) The maintainers of @getgrit/gritql-linux-x64-gnu <https://github.com/biomejs/gritql#readme>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
 associated documentation files (the "Software"), to deal in the Software without restriction, including 
@@ -5077,7 +5053,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---
 
-The following software may be included in this product: @nx/nx-darwin-arm64 (22.6.5)
+The following software may be included in this product: @nx/nx-linux-x64-gnu (22.6.5)
 This software contains the following license and notice below:
 
 (The MIT License)
@@ -5328,12 +5304,12 @@ SOFTWARE.
 
 ---
 
-The following software may be included in this product: @oxc-resolver/binding-darwin-arm64 (11.19.1)
+The following software may be included in this product: @oxc-resolver/binding-linux-x64-gnu (11.19.1)
 This software contains the following license and notice below:
 
 MIT License
 
-Copyright (c) The maintainers of @oxc-resolver/binding-darwin-arm64 <https://oxc.rs>
+Copyright (c) The maintainers of @oxc-resolver/binding-linux-x64-gnu <https://oxc.rs>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
 associated documentation files (the "Software"), to deal in the Software without restriction, including 
@@ -5664,12 +5640,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---
 
-The following software may be included in this product: @rolldown/binding-darwin-arm64 (1.0.0-rc.15)
+The following software may be included in this product: @rolldown/binding-linux-x64-gnu (1.0.0-rc.15)
 This software contains the following license and notice below:
 
 MIT License
 
-Copyright (c) The maintainers of @rolldown/binding-darwin-arm64 <https://rolldown.rs/>
+Copyright (c) The maintainers of @rolldown/binding-linux-x64-gnu <https://rolldown.rs/>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
 associated documentation files (the "Software"), to deal in the Software without restriction, including 
@@ -5929,7 +5905,7 @@ THE SOFTWARE.
 
 ---
 
-The following software may be included in this product: @rollup/rollup-darwin-arm64 (4.50.1)
+The following software may be included in this product: @rollup/rollup-linux-x64-gnu (4.50.1)
 This software contains the following license and notice below:
 
 MIT License
@@ -5981,7 +5957,7 @@ SOFTWARE.
 
 ---
 
-The following software may be included in this product: @rspack/binding-darwin-arm64 (1.6.8)
+The following software may be included in this product: @rspack/binding-linux-x64-gnu (1.6.8)
 This software contains the following license and notice below:
 
 MIT License
@@ -11257,34 +11233,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ---
 
-The following software may be included in this product: create-nx-workspace (22.6.5)
-This software contains the following license and notice below:
-
-(The MIT License)
-
-Copyright (c) 2017-2026 Narwhal Technologies Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
 The following software may be included in this product: cron-parser (4.9.0)
 This software contains the following license and notice below:
 
@@ -14057,34 +14005,6 @@ OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHE
 
 ---
 
-The following software may be included in this product: fsevents (2.3.3)
-This software contains the following license and notice below:
-
-MIT License
------------
-
-Copyright (C) 2010-2020 by Philipp Dunkel, Ben Noordhuis, Elan Shankar, Paul Miller
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-
 The following software may be included in this product: function-bind (1.1.2)
 This software contains the following license and notice below:
 
@@ -41475,7 +41395,7 @@ defined by the Mozilla Public License, v. 2.0.
 
 ---
 
-The following software may be included in this product: lightningcss-darwin-arm64 (1.32.0)
+The following software may be included in this product: lightningcss-linux-x64-gnu (1.32.0)
 This software contains the following license and notice below:
 
 Mozilla Public License Version 2.0

package/generators.json

@@ -15,6 +15,7 @@
         "connection/react-smithy",
         "connection/react-ts-strands-agent",
         "connection/react-py-strands-agent",
+        "connection/react-agui",
         "connection/py-strands-agent-mcp",
         "connection/ts-strands-agent-mcp",
         "connection/py-strands-agent-a2a",
@@ -102,6 +103,20 @@
       "description": "Add a Strands Agent to a Python project",
       "metric": "g25"
     },
+    "py#strands-agent#mcp-connection": {
+      "factory": "./src/py/strands-agent/mcp-connection/generator",
+      "schema": "./src/py/strands-agent/mcp-connection/schema.json",
+      "description": "Connect a Python Strands Agent to an MCP server",
+      "metric": "g32",
+      "hidden": true
+    },
+    "py#strands-agent#react-connection": {
+      "factory": "./src/py/strands-agent/react-connection/generator",
+      "schema": "./src/py/strands-agent/react-connection/schema.json",
+      "description": "Connect a React website to a Python Strands Agent",
+      "metric": "g34",
+      "hidden": true
+    },
     "smithy#project": {
       "factory": "./src/smithy/project/generator",
       "schema": "./src/smithy/project/schema.json",
@@ -123,6 +138,13 @@
       "metric": "g23",
       "guidePages": ["terraform-project"]
     },
+    "ts#astro-docs": {
+      "factory": "./src/ts/astro-docs/generator",
+      "schema": "./src/ts/astro-docs/schema.json",
+      "description": "Generates an Astro + Starlight documentation site with localisation, snippets, blog, and optional automated documentation translation",
+      "metric": "g37",
+      "guidePages": ["astro-docs"]
+    },
     "ts#infra": {
       "factory": "./src/infra/app/generator",
       "schema": "./src/infra/app/schema.json",
@@ -195,13 +217,6 @@
       "description": "Add a Strands Agent to a TypeScript project",
       "metric": "g30"
     },
-    "ts#strands-agent#react-connection": {
-      "factory": "./src/ts/strands-agent/react-connection/generator",
-      "schema": "./src/ts/strands-agent/react-connection/schema.json",
-      "description": "Connect a React website to a TypeScript Strands Agent",
-      "metric": "g33",
-      "hidden": true
-    },
     "ts#strands-agent#mcp-connection": {
       "factory": "./src/ts/strands-agent/mcp-connection/generator",
       "schema": "./src/ts/strands-agent/mcp-connection/schema.json",
@@ -209,11 +224,11 @@
       "metric": "g31",
       "hidden": true
     },
-    "py#strands-agent#mcp-connection": {
-      "factory": "./src/py/strands-agent/mcp-connection/generator",
-      "schema": "./src/py/strands-agent/mcp-connection/schema.json",
-      "description": "Connect a Python Strands Agent to an MCP server",
-      "metric": "g32",
+    "ts#strands-agent#react-connection": {
+      "factory": "./src/ts/strands-agent/react-connection/generator",
+      "schema": "./src/ts/strands-agent/react-connection/schema.json",
+      "description": "Connect a React website to a TypeScript Strands Agent",
+      "metric": "g33",
       "hidden": true
     },
     "ts#strands-agent#a2a-connection": {
@@ -230,13 +245,6 @@
       "metric": "g36",
       "hidden": true
     },
-    "py#strands-agent#react-connection": {
-      "factory": "./src/py/strands-agent/react-connection/generator",
-      "schema": "./src/py/strands-agent/react-connection/schema.json",
-      "description": "Connect a React website to a Python Strands Agent",
-      "metric": "g34",
-      "hidden": true
-    },
     "ts#sync": {
       "factory": "./src/ts/sync/generator",
       "schema": "./src/ts/sync/schema.json",

package/package.json

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

package/src/preset/__snapshots__/generator.spec.ts.snap

@@ -46,6 +46,8 @@ The following list of generators are what is currently available in the \`@aws/n
 
 - **terraform#project**: Generates a Terraform project
 
+- **ts#astro-docs**: Generates an Astro + Starlight documentation site with localisation, snippets, blog, and optional automated documentation translation
+
 - **ts#infra**: Generates a cdk application
 
 - **ts#lambda-function**: Generate a TypeScript lambda function

package/src/py/mcp-server/__snapshots__/generator.spec.ts.snap

@@ -9,6 +9,7 @@ exports[`py#mcp-server generator > should match snapshot for BedrockAgentCoreRun
 "export * from './app.js';
 export * from './checkov.js';
 export * from './runtime-config.js';
+export * from './workspace.js';
 "
 `;
 
@@ -16,7 +17,6 @@ exports[`py#mcp-server generator > should match snapshot for BedrockAgentCoreRun
 "import { Lazy, Names } from 'aws-cdk-lib';
 import { Platform } from 'aws-cdk-lib/aws-ecr-assets';
 import { Construct } from 'constructs';
-import { execSync } from 'child_process';
 import * as path from 'path';
 import * as url from 'url';
 import {
@@ -27,6 +27,7 @@ import {
 } from '@aws-cdk/aws-bedrock-agentcore-alpha';
 import { IGrantable, IPrincipal, Grant } from 'aws-cdk-lib/aws-iam';
 import { RuntimeConfig } from '../../../core/runtime-config.js';
+import { findWorkspaceRoot } from '../../../core/workspace.js';
 
 export type SnapshotBedrockServerProps = Omit<
   RuntimeProps,
@@ -49,17 +50,16 @@ export class SnapshotBedrockServer extends Construct implements IGrantable {
 
     const rc = RuntimeConfig.ensure(this);
 
-    this.dockerImage = AgentRuntimeArtifact.fromAsset(
-      path.dirname(url.fileURLToPath(new URL(import.meta.url))),
-      {
-        platform: Platform.LINUX_ARM64,
-        extraHash: execSync(
-          \`docker inspect proj-snapshot-bedrock-server:latest --format '{{.Id}}'\`,
-          { encoding: 'utf-8' },
-        ).trim(),
-      },
+    // Resolve the bundle output directory containing the Dockerfile and built artifacts
+    const bundleDir = path.join(
+      findWorkspaceRoot(url.fileURLToPath(new URL(import.meta.url))),
+      'dist/apps/test-project/docker/snapshot-bedrock-server',
     );
 
+    this.dockerImage = AgentRuntimeArtifact.fromAsset(bundleDir, {
+      platform: Platform.LINUX_ARM64,
+    });
+
     this.agentCoreRuntime = new Runtime(this, 'SnapshotBedrockServer', {
       runtimeName: Lazy.string({
         produce: () =>

package/src/py/mcp-server/files/deploy/Dockerfile.template

@@ -3,7 +3,7 @@ FROM public.ecr.aws/docker/library/python:3.12-slim
 WORKDIR /app
 
 # Copy bundled package
-COPY --from=workspace <%- bundleOutputDir %> /app
+COPY . /app
 
 EXPOSE 8000
 

package/src/py/mcp-server/generator.js

@@ -15,6 +15,7 @@ const npm_scope_1 = require("../../utils/npm-scope");
 const agent_core_constructs_1 = require("../../utils/agent-core-constructs/agent-core-constructs");
 const shared_constructs_1 = require("../../utils/shared-constructs");
 const bundle_1 = require("../../utils/bundle/bundle");
+const fs_1 = require("../../utils/fs");
 const versions_1 = require("../../utils/versions");
 const nxlv_python_1 = require("../../utils/nxlv-python");
 const iac_1 = require("../../utils/iac");
@@ -66,14 +67,20 @@ const pyMcpServerGenerator = async (tree, options) => {
             moduleName,
             bundleOutputDir,
         }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+        const dockerOutputDir = (0, devkit_1.joinPathFragments)('dist', project.root, 'docker', name);
         const dockerTargetName = `${mcpTargetPrefix}-docker`;
-        // Add a docker target specific to this MCP server
+        // Add a docker target that prepares the docker context and builds the image
+        const fs = new fs_1.FsCommands(tree);
         project.targets[dockerTargetName] = {
             cache: true,
             executor: 'nx:run-commands',
             options: {
                 commands: [
-                    `docker build --platform linux/arm64 -t ${dockerImageTag} ${targetSourceDir} --build-context workspace=.`,
+                    fs.rm(dockerOutputDir),
+                    fs.mkdir(dockerOutputDir),
+                    fs.cp(bundleOutputDir, dockerOutputDir),
+                    fs.cp(`${targetSourceDir}/Dockerfile`, `${dockerOutputDir}/Dockerfile`),
+                    `docker build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`,
                 ],
                 parallel: false,
             },
@@ -102,6 +109,7 @@ const pyMcpServerGenerator = async (tree, options) => {
             mcpServerNameClassName,
             projectName: project.name,
             dockerImageTag,
+            dockerOutputDir,
             iacProvider,
             auth,
         });

package/src/py/mcp-server/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/mcp-server/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/mcp-server/generator.ts"],"names":[],"mappings":"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"}

package/src/py/strands-agent/__snapshots__/generator.spec.ts.snap

@@ -6,7 +6,7 @@ exports[`py#strands-agent generator > should match snapshot for BedrockAgentCore
 WORKDIR /app
 
 # Copy bundled package
-COPY --from=workspace dist/apps/test-project/bundle-arm /app
+COPY . /app
 
 EXPOSE 8080
 
@@ -23,7 +23,6 @@ exports[`py#strands-agent generator > should match snapshot for BedrockAgentCore
 "import { Lazy, Names } from 'aws-cdk-lib';
 import { Platform } from 'aws-cdk-lib/aws-ecr-assets';
 import { Construct } from 'constructs';
-import { execSync } from 'child_process';
 import * as path from 'path';
 import * as url from 'url';
 import {
@@ -32,8 +31,14 @@ import {
   Runtime,
   RuntimeProps,
 } from '@aws-cdk/aws-bedrock-agentcore-alpha';
-import { IGrantable, IPrincipal, Grant } from 'aws-cdk-lib/aws-iam';
+import {
+  PolicyStatement,
+  IGrantable,
+  IPrincipal,
+  Grant,
+} from 'aws-cdk-lib/aws-iam';
 import { RuntimeConfig } from '../../../core/runtime-config.js';
+import { findWorkspaceRoot } from '../../../core/workspace.js';
 
 export type SnapshotBedrockAgentProps = Omit<
   RuntimeProps,
@@ -52,17 +57,16 @@ export class SnapshotBedrockAgent extends Construct implements IGrantable {
 
     const rc = RuntimeConfig.ensure(this);
 
-    this.dockerImage = AgentRuntimeArtifact.fromAsset(
-      path.dirname(url.fileURLToPath(new URL(import.meta.url))),
-      {
-        platform: Platform.LINUX_ARM64,
-        extraHash: execSync(
-          \`docker inspect proj-snapshot-bedrock-agent:latest --format '{{.Id}}'\`,
-          { encoding: 'utf-8' },
-        ).trim(),
-      },
+    // Resolve the bundle output directory containing the Dockerfile and built artifacts
+    const bundleDir = path.join(
+      findWorkspaceRoot(url.fileURLToPath(new URL(import.meta.url))),
+      'dist/apps/test-project/docker/snapshot-bedrock-agent',
     );
 
+    this.dockerImage = AgentRuntimeArtifact.fromAsset(bundleDir, {
+      platform: Platform.LINUX_ARM64,
+    });
+
     this.agentCoreRuntime = new Runtime(this, 'SnapshotBedrockAgent', {
       runtimeName: Lazy.string({
         produce: () =>
@@ -77,6 +81,20 @@ export class SnapshotBedrockAgent extends Construct implements IGrantable {
       },
     });
 
+    // Grant access for the agent to invoke bedrock models
+    this.agentCoreRuntime.addToRolePolicy(
+      new PolicyStatement({
+        actions: [
+          'bedrock:InvokeModel',
+          'bedrock:InvokeModelWithResponseStream',
+        ],
+        resources: [
+          'arn:aws:bedrock:*:*:foundation-model/*',
+          'arn:aws:bedrock:*:*:inference-profile/*',
+        ],
+      }),
+    );
+
     rc.grantReadAppConfig(this.agentCoreRuntime);
 
     rc.set('agentcore', 'agentRuntimes', {
@@ -127,6 +145,7 @@ exports[`py#strands-agent generator > should match snapshot for BedrockAgentCore
 "export * from './app.js';
 export * from './checkov.js';
 export * from './runtime-config.js';
+export * from './workspace.js';
 "
 `;
 
@@ -176,6 +195,18 @@ module "agent_core_runtime" {
         "appconfig:GetLatestConfiguration"
       ]
       Resource = ["\${module.appconfig.application_arn}/*"]
+    },
+    # Grant access for the agent to invoke bedrock models
+    {
+      Effect = "Allow"
+      Action = [
+        "bedrock:InvokeModel",
+        "bedrock:InvokeModelWithResponseStream"
+      ]
+      Resource = [
+        "arn:aws:bedrock:*:*:foundation-model/*",
+        "arn:aws:bedrock:*:*:inference-profile/*"
+      ]
     }
   ], var.additional_iam_policy_statements)
   tags = var.tags

package/src/py/strands-agent/files/ag-ui/main.py.template

@@ -0,0 +1,19 @@
+import logging
+
+from .agent import get_agent
+from ag_ui_strands import StrandsAgent, create_strands_app
+
+logging.basicConfig(level=logging.INFO)
+
+# Create AG-UI agent wrapper
+_agent_ctx = get_agent(session_id="default")
+_agent = _agent_ctx.__enter__()
+
+agui_agent = StrandsAgent(
+    agent=_agent,
+    name="<%= agentNameClassName %>",
+    description="A Strands Agent exposed via the AG-UI protocol.",
+)
+
+# Create FastAPI app with AG-UI endpoint and health check
+app = create_strands_app(agui_agent, path="/invocations")

package/src/py/strands-agent/files/deploy/Dockerfile.template

@@ -3,7 +3,7 @@ FROM public.ecr.aws/docker/library/python:3.12-slim
 WORKDIR /app
 
 # Copy bundled package
-COPY --from=workspace <%- bundleOutputDir %> /app
+COPY . /app
 
 <%_ if (protocol === 'A2A') { _%>
 EXPOSE 9000
@@ -18,6 +18,8 @@ ENV PATH="/app/bin:${PATH}"
 # https://aws-otel.github.io/docs/getting-started/python-sdk/auto-instr
 <%_ if (protocol === 'A2A') { _%>
 CMD ["python", "bin/opentelemetry-instrument", "python", "-m", "uvicorn", "<%- moduleName %>.<%- agentNameSnakeCase %>.main:app", "--host", "0.0.0.0", "--port", "9000"]
+<%_ } else if (protocol === 'AG-UI') { _%>
+CMD ["python", "bin/opentelemetry-instrument", "python", "-m", "uvicorn", "<%- moduleName %>.<%- agentNameSnakeCase %>.main:app", "--host", "0.0.0.0", "--port", "8080"]
 <%_ } else { _%>
 CMD ["python", "bin/opentelemetry-instrument", "python", "-m", "<%- moduleName %>.<%- agentNameSnakeCase %>.main"]
 <%_ } _%>

package/src/py/strands-agent/generator.js

@@ -13,6 +13,7 @@ const names_1 = require("../../utils/names");
 const py_1 = require("../../utils/py");
 const agent_core_constructs_1 = require("../../utils/agent-core-constructs/agent-core-constructs");
 const bundle_1 = require("../../utils/bundle/bundle");
+const fs_1 = require("../../utils/fs");
 const npm_scope_1 = require("../../utils/npm-scope");
 const shared_constructs_1 = require("../../utils/shared-constructs");
 const nxlv_python_1 = require("../../utils/nxlv-python");
@@ -60,7 +61,9 @@ const pyStrandsAgentGenerator = async (tree, options) => {
         'mcp',
         ...(protocol === 'A2A'
             ? ['strands-agents[a2a]']
-            : ['strands-agents']),
+            : protocol === 'AG-UI'
+                ? ['strands-agents', 'ag-ui-protocol', 'ag-ui-strands']
+                : ['strands-agents']),
         'strands-agents-tools',
         'uvicorn',
     ]);
@@ -80,14 +83,20 @@ const pyStrandsAgentGenerator = async (tree, options) => {
             bundleOutputDir,
             protocol,
         }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+        const dockerOutputDir = (0, devkit_1.joinPathFragments)('dist', project.root, 'docker', name);
         const dockerTargetName = `${agentTargetPrefix}-docker`;
-        // Add a docker target specific to this agent
+        // Add a docker target that prepares the docker context and builds the image
+        const fs = new fs_1.FsCommands(tree);
         project.targets[dockerTargetName] = {
             cache: true,
             executor: 'nx:run-commands',
             options: {
                 commands: [
-                    `docker build --platform linux/arm64 -t ${dockerImageTag} ${targetSourceDir} --build-context workspace=.`,
+                    fs.rm(dockerOutputDir),
+                    fs.mkdir(dockerOutputDir),
+                    fs.cp(bundleOutputDir, dockerOutputDir),
+                    fs.cp(`${targetSourceDir}/Dockerfile`, `${dockerOutputDir}/Dockerfile`),
+                    `docker build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`,
                 ],
                 parallel: false,
             },
@@ -98,24 +107,28 @@ const pyStrandsAgentGenerator = async (tree, options) => {
         // Add shared constructs
         const iacProvider = await (0, iac_1.resolveIacProvider)(tree, options.iacProvider);
         await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iacProvider });
-        // Add the construct to deploy the agent
+        // Add the construct to deploy the agent.
+        // AG-UI uses HTTP as the AgentCore protocol type (AG-UI is HTTP-based with SSE over POST).
+        const infraProtocol = protocol === 'AG-UI' ? 'HTTP' : protocol;
         await (0, agent_core_constructs_1.addAgentInfra)(tree, {
             agentNameKebabCase: name,
             agentNameClassName,
             dockerImageTag,
+            dockerOutputDir,
             iacProvider,
             projectName: project.name,
             auth,
-            serverProtocol: protocol,
+            serverProtocol: infraProtocol,
         });
     }
     // A2A servers use port 9000 as per the Strands A2A SDK default and AgentCore A2A contract.
-    // HTTP agents use port 8081+ to avoid conflict with VS Code server on 8080.
+    // HTTP and AG-UI agents use port 8081+ to avoid conflict with VS Code server on 8080.
     const localDevPortStart = protocol === 'A2A' ? 9000 : 8081;
     const localDevPort = (0, port_1.assignPort)(tree, project, localDevPortStart);
-    // Both protocols use fastapi dev for hot reload:
+    // All protocols use fastapi dev for hot reload:
     // - HTTP: FastAPI app directly defined in init.py
     // - A2A: A2AServer.to_fastapi_app() creates a FastAPI app in main.py
+    // - AG-UI: create_strands_app() creates a FastAPI app in main.py
     const serveCommand = `uv run fastapi dev ${moduleName}/${agentNameSnakeCase}/main.py --port ${localDevPort}`;
     (0, devkit_1.updateProjectConfiguration)(tree, project.name, {
         ...project,