@aws/nx-plugin 0.116.0 → 0.118.0

package/src/{ts/strands-agent → py/agent}/schema.json

@@ -1,45 +1,53 @@
 {
   "$schema": "https://json-schema.org/schema",
-  "$id": "ts#strands-agent",
-  "title": "ts#strands-agent",
-  "description": "Add a Strands Agent to a TypeScript project",
+  "$id": "py#agent",
+  "title": "py#agent",
+  "description": "Add an AI Agent to a Python project",
   "type": "object",
   "properties": {
     "project": {
       "type": "string",
-      "description": "The project to add the Strands Agent to",
+      "description": "The project to add the Agent to",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "Select the TypeScript project to add the Strands Agent to",
+      "x-prompt": "Select the Python project to add the Agent to",
       "x-dropdown": "projects"
     },
+    "sdk": {
+      "type": "string",
+      "description": "The agent SDK to use.",
+      "x-prompt": "Which agent SDK would you like to use?",
+      "enum": ["strands"],
+      "default": "strands",
+      "x-priority": "important"
+    },
     "computeType": {
       "type": "string",
-      "description": "The type of compute to host your Strands Agent.",
-      "x-prompt": "How would you like to host your Strands Agent server?",
+      "description": "The type of compute to host your Agent.",
+      "x-prompt": "How would you like to host your Agent server?",
       "enum": ["BedrockAgentCoreRuntime", "None"],
       "default": "BedrockAgentCoreRuntime",
       "x-priority": "important"
     },
     "name": {
       "type": "string",
-      "description": "The name of your Strands Agent (default: agent)",
-      "x-prompt": "What would you like to call your Strands Agent? (default: agent)"
+      "description": "The name of your Agent (default: agent)",
+      "x-prompt": "What would you like to call your Agent? (default: agent)"
     },
     "auth": {
       "type": "string",
-      "description": "The method used to authenticate with your Strands Agent. Choose between IAM (default) or Cognito.",
+      "description": "The method used to authenticate with your Agent. Choose between IAM (default) or Cognito.",
       "default": "IAM",
       "enum": ["IAM", "Cognito"],
-      "x-prompt": "How would you like to authenticate with your Strands Agent?",
+      "x-prompt": "How would you like to authenticate with your Agent?",
       "x-priority": "important"
     },
     "protocol": {
       "type": "string",
-      "description": "The server protocol for your Strands Agent. HTTP exposes a tRPC/WebSocket server. A2A exposes an Agent-to-Agent protocol server. AG-UI is not yet supported for TypeScript agents.",
-      "x-prompt": "Which protocol would you like to use for your Strands Agent?",
+      "description": "The server protocol for your Agent. HTTP exposes a FastAPI HTTP server. A2A exposes an Agent-to-Agent protocol server. AG-UI exposes an Agent-User Interaction protocol server for direct frontend integration.",
+      "x-prompt": "Which protocol would you like to use for your Agent?",
       "enum": ["HTTP", "A2A", "AG-UI"],
       "default": "HTTP",
       "x-priority": "important"

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

@@ -648,8 +648,8 @@ version = "0.1.0"
 dependencies = [
   "aws-lambda-powertools==3.29.0",
   "mcp==1.27.1",
-  "uvicorn==0.47.0",
-  "boto3==1.43.9",
+  "uvicorn==0.48.0",
+  "boto3==1.43.14",
   "aws-opentelemetry-distro==0.17.0"
 ]
 

package/src/ts/{strands-agent → agent}/__snapshots__/generator.spec.ts.snap

@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`ts#strands-agent generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > agent-Dockerfile 1`] = `
+exports[`ts#agent generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > agent-Dockerfile 1`] = `
 "FROM public.ecr.aws/docker/library/node:lts-jod
 
 WORKDIR /app
@@ -20,7 +20,7 @@ CMD [ "node", "--require", "@aws/aws-distro-opentelemetry-node-autoinstrumentati
 "
 `;
 
-exports[`ts#strands-agent generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > agent-construct.ts 1`] = `
+exports[`ts#agent generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > agent-construct.ts 1`] = `
 "import { Lazy, Names } from 'aws-cdk-lib';
 import { Platform } from 'aws-cdk-lib/aws-ecr-assets';
 import { Connections, IConnectable } from 'aws-cdk-lib/aws-ec2';
@@ -143,17 +143,17 @@ export class SnapshotBedrockAgent
 "
 `;
 
-exports[`ts#strands-agent generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > agents-index.ts 1`] = `
+exports[`ts#agent generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > agents-index.ts 1`] = `
 "export * from './snapshot-bedrock-agent/snapshot-bedrock-agent.js';
 "
 `;
 
-exports[`ts#strands-agent generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > app-index.ts 1`] = `
+exports[`ts#agent generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > app-index.ts 1`] = `
 "export * from './agents/index.js';
 "
 `;
 
-exports[`ts#strands-agent generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > core-index.ts 1`] = `
+exports[`ts#agent generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > core-index.ts 1`] = `
 "export * from './app.js';
 export * from './checkov.js';
 export * from './runtime-config.js';
@@ -161,7 +161,7 @@ export * from './workspace.js';
 "
 `;
 
-exports[`ts#strands-agent generator > should match snapshot for Terraform generated files > terraform-agent.tf 1`] = `
+exports[`ts#agent generator > should match snapshot for Terraform generated files > terraform-agent.tf 1`] = `
 "variable "env" {
   description = "Environment variables to pass to the agent core runtime"
   type        = map(string)
@@ -256,7 +256,7 @@ output "appconfig_application_id" {
 "
 `;
 
-exports[`ts#strands-agent generator > should match snapshot for Terraform generated files > terraform-agent-core-runtime.tf 1`] = `
+exports[`ts#agent generator > should match snapshot for Terraform generated files > terraform-agent-core-runtime.tf 1`] = `
 "terraform {
   required_version = ">= 1.0"
 
@@ -627,7 +627,7 @@ output "agent_runtime_version" {
 "
 `;
 
-exports[`ts#strands-agent generator > should match snapshot for generated files > strands-agent-agent.ts 1`] = `
+exports[`ts#agent generator > should match snapshot for generated files > agent-agent.ts 1`] = `
 "import { Agent, tool } from '@strands-agents/sdk';
 import { z } from 'zod';
 
@@ -651,9 +651,9 @@ export const getAgent = async () =>
 "
 `;
 
-exports[`ts#strands-agent generator > should match snapshot for generated files > strands-agent-agent-core-mcp-client.ts 1`] = `null`;
+exports[`ts#agent generator > should match snapshot for generated files > agent-agent-core-mcp-client.ts 1`] = `null`;
 
-exports[`ts#strands-agent generator > should match snapshot for generated files > strands-agent-agent-core-trpc-client.ts 1`] = `
+exports[`ts#agent generator > should match snapshot for generated files > agent-agent-core-trpc-client.ts 1`] = `
 "import { randomUUID } from 'node:crypto';
 import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
 import {
@@ -809,7 +809,7 @@ export class AgentCoreTrpcClient {
 "
 `;
 
-exports[`ts#strands-agent generator > should match snapshot for generated files > strands-agent-client.ts 1`] = `
+exports[`ts#agent generator > should match snapshot for generated files > agent-client.ts 1`] = `
 "import { AppRouter } from './router.js';
 import {
   AgentCoreTrpcClient,
@@ -844,7 +844,7 @@ export class SnapshotAgentClient {
 "
 `;
 
-exports[`ts#strands-agent generator > should match snapshot for generated files > strands-agent-index.ts 1`] = `
+exports[`ts#agent generator > should match snapshot for generated files > agent-index.ts 1`] = `
 "import { randomUUID } from 'node:crypto';
 import { createServer } from 'http';
 import {
@@ -911,7 +911,7 @@ console.log(\`TRPC server listening on port \${PORT}\`);
 "
 `;
 
-exports[`ts#strands-agent generator > should match snapshot for generated files > strands-agent-init.ts 1`] = `
+exports[`ts#agent generator > should match snapshot for generated files > agent-init.ts 1`] = `
 "import { initTRPC } from '@trpc/server';
 
 export interface Context {
@@ -924,7 +924,7 @@ export const publicProcedure = t.procedure;
 "
 `;
 
-exports[`ts#strands-agent generator > should match snapshot for generated files > strands-agent-router.ts 1`] = `
+exports[`ts#agent generator > should match snapshot for generated files > agent-router.ts 1`] = `
 "import { publicProcedure, t } from './init.js';
 import { z } from 'zod';
 import { zAsyncIterable } from './schema/z-async-iterable.js';
@@ -966,7 +966,7 @@ export type AppRouter = typeof appRouter;
 "
 `;
 
-exports[`ts#strands-agent generator > should match snapshot for generated files > strands-agent-z-async-iterable.ts 1`] = `
+exports[`ts#agent generator > should match snapshot for generated files > agent-z-async-iterable.ts 1`] = `
 "import { isTrackedEnvelope, tracked, TrackedEnvelope } from '@trpc/server';
 import { z } from 'zod';
 

package/src/ts/agent/a2a-connection/generator.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { GeneratorCallback, Tree } from '@nx/devkit';
+import { TsAgentA2aConnectionGeneratorSchema } from './schema';
+import { NxGeneratorInfo } from '../../../utils/nx';
+export declare const TS_AGENT_A2A_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
+export declare const tsAgentA2aConnectionGenerator: (tree: Tree, options: TsAgentA2aConnectionGeneratorSchema) => Promise<GeneratorCallback>;
+export default tsAgentA2aConnectionGenerator;

package/src/ts/{strands-agent → agent}/a2a-connection/generator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsStrandsAgentA2aConnectionGenerator = exports.TS_STRANDS_AGENT_A2A_CONNECTION_GENERATOR_INFO = void 0;
+exports.tsAgentA2aConnectionGenerator = exports.TS_AGENT_A2A_CONNECTION_GENERATOR_INFO = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -14,14 +14,14 @@ const versions_1 = require("../../../utils/versions");
 const npm_scope_1 = require("../../../utils/npm-scope");
 const ast_1 = require("../../../utils/ast");
 const agent_connection_1 = require("../../../utils/agent-connection/agent-connection");
-exports.TS_STRANDS_AGENT_A2A_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const tsStrandsAgentA2aConnectionGenerator = async (tree, options) => {
+exports.TS_AGENT_A2A_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
+const tsAgentA2aConnectionGenerator = async (tree, options) => {
     const sourceProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.sourceProject);
     const targetProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.targetProject);
     const agentComponent = options.sourceComponent;
     const targetAgentComponent = options.targetComponent;
     if (!agentComponent || !targetAgentComponent) {
-        throw new Error('Both sourceComponent and targetComponent must be provided for ts#strands-agent -> a2a connections');
+        throw new Error('Both sourceComponent and targetComponent must be provided for ts#agent -> a2a connections');
     }
     if (targetAgentComponent.protocol !== 'A2A') {
         throw new Error(`Target agent '${targetAgentComponent.name}' uses the ${targetAgentComponent.protocol ?? 'HTTP'} protocol — only A2A agents can be connected as tools.`);
@@ -102,13 +102,13 @@ const tsStrandsAgentA2aConnectionGenerator = async (tree, options) => {
         'zod',
     ]), {});
     await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
-        exports.TS_STRANDS_AGENT_A2A_CONNECTION_GENERATOR_INFO,
+        exports.TS_AGENT_A2A_CONNECTION_GENERATOR_INFO,
     ]);
     await (0, format_1.formatFilesInSubtree)(tree);
     return () => {
         (0, devkit_1.installPackagesTask)(tree);
     };
 };
-exports.tsStrandsAgentA2aConnectionGenerator = tsStrandsAgentA2aConnectionGenerator;
-exports.default = exports.tsStrandsAgentA2aConnectionGenerator;
+exports.tsAgentA2aConnectionGenerator = tsAgentA2aConnectionGenerator;
+exports.default = exports.tsAgentA2aConnectionGenerator;
 //# sourceMappingURL=generator.js.map

package/src/ts/agent/a2a-connection/generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/agent/a2a-connection/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCASoB;AAEpB,0CAK2B;AAC3B,oDAAyE;AACzE,kDAA6D;AAC7D,gDAAiD;AACjD,sDAAuD;AACvD,wDAAuD;AACvD,4CAI4B;AAC5B,uFAI0D;AAE7C,QAAA,sCAAsC,GACjD,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,6BAA6B,GAAG,KAAK,EAChD,IAAU,EACV,OAA4C,EAChB,EAAE;IAC9B,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,aAAa,CACtB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,aAAa,CACtB,CAAC;IAEF,MAAM,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAC/C,MAAM,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC;IAErD,IAAI,CAAC,cAAc,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CACb,2FAA2F,CAC5F,CAAC;IACJ,CAAC;IAED,IAAI,oBAAoB,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CACb,iBAAiB,oBAAoB,CAAC,IAAI,cAAc,oBAAoB,CAAC,QAAQ,IAAI,MAAM,wDAAwD,CACxJ,CAAC;IACJ,CAAC;IAED,IAAI,oBAAoB,CAAC,IAAI,IAAI,oBAAoB,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACrE,MAAM,IAAI,KAAK,CACb,yEAAyE,oBAAoB,CAAC,IAAI,WAAW,oBAAoB,CAAC,IAAI,mBAAmB,CAC1J,CAAC;IACJ,CAAC;IAED,MAAM,wBAAwB,GAAG,oBAAoB,CAAC,IAAI,IAAI,OAAO,CAAC;IACtE,MAAM,oBAAoB,GAAG,oBAAoB,CAAC,EAAY,CAAC;IAC/D,MAAM,oBAAoB,GAAG,IAAA,iBAAS,EAAC,oBAAoB,CAAC,CAAC;IAC7D,MAAM,eAAe,GAAG,oBAAoB,CAAC,IAAI,IAAI,IAAI,CAAC;IAE1D,MAAM,QAAQ,GAAG,IAAA,uBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,iFAAiF;IACjF,MAAM,IAAA,yDAAsC,EAAC,IAAI,CAAC,CAAC;IACnD,IAAA,0CAAuB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAErC,wDAAwD;IACxD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,CAAC,EAChE,IAAA,0BAAiB,EAAC,+CAA4B,EAAE,KAAK,EAAE,KAAK,CAAC,EAC7D;QACE,oBAAoB;QACpB,oBAAoB;QACpB,eAAe;KAChB,EACD,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IAEF,4BAA4B;IAC5B,MAAM,IAAA,mBAAa,EACjB,IAAI,EACJ,IAAA,0BAAiB,EAAC,+CAA4B,EAAE,KAAK,EAAE,UAAU,CAAC,EAClE,SAAS,oBAAoB,YAAY,CAC1C,CAAC;IAEF,kEAAkE;IAClE,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,aAAa,CAAC,IAAI,EAClB,cAAc,CAAC,IAAI,IAAI,KAAK,CAC7B,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,0BAAiB,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAEpE,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,MAAM,eAAe,GAAG,GAAG,oBAAoB,QAAQ,CAAC;QACxD,MAAM,aAAa,GACjB,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;YAC5C,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,QAAQ,GAAG,MAAM,oBAAoB,EAAE,CAAC;QAC9C,MAAM,WAAW,GAAG,GAAG,aAAa,MAAM,CAAC;QAE3C,wCAAwC;QACxC,MAAM,IAAA,2BAAqB,EACzB,IAAI,EACJ,aAAa,EACb,CAAC,MAAM,CAAC,EACR,qBAAqB,CACtB,CAAC;QACF,MAAM,IAAA,2BAAqB,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QAC/D,MAAM,IAAA,2BAAqB,EACzB,IAAI,EACJ,aAAa,EACb,CAAC,eAAe,CAAC,EACjB,IAAI,QAAQ,mBAAmB,CAChC,CAAC;QAEF,0CAA0C;QAC1C,MAAM,iBAAiB,GAAG,SAAS,aAAa,YAAY,eAAe;UACrE,WAAW;aACR,QAAQ;sDACiC,oBAAoB;;6CAE7B,aAAa;MACpD,CAAC;QAEH,0DAA0D;QAC1D,iEAAiE;QACjE,gDAAgD;QAChD,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,aAAa,EACb;IACF,iBAAiB;;yCAEoB,eAAe;IACpD,iBAAiB;;8EAEyD,eAAe,eAAe,CACvG,CAAC;QAEF,4DAA4D;QAC5D,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,aAAa,EACb,4CAA4C,WAAW,4EAA4E,WAAW,MAAM,CACrJ,CAAC;IACJ,CAAC;IAED,0EAA0E;IAC1E,2EAA2E;IAC3E,MAAM,SAAS,GAAG,cAAc,CAAC,IAAI,IAAI,OAAO,CAAC;IACjD,MAAM,oBAAoB,GAAG,GAAG,SAAS,cAAc,CAAC;IACxD,MAAM,0BAA0B,GAAG,GAAG,wBAAwB,cAAc,CAAC;IAE7E,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAClD,IAAA,sCAAiC,EAAC,aAAa,EAAE,oBAAoB,EAAE;YACrE,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;YAC9B,MAAM,EAAE,0BAA0B;SACnC,CAAC,CAAC;QACH,IAAA,mCAA0B,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACtE,CAAC;IAED,sBAAsB;IACtB,IAAA,qCAA4B,EAC1B,IAAI,EACJ,IAAA,uBAAY,EAAC;QACX,aAAa;QACb,qBAAqB;QACrB,mCAAmC;QACnC,+BAA+B;QAC/B,WAAW;QACX,+BAA+B;QAC/B,KAAK;KACN,CAAC,EACF,EAAE,CACH,CAAC;IAEF,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE;QAC1C,8CAAsC;KACvC,CAAC,CAAC;IAEH,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IACjC,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC,CAAC;AApKW,QAAA,6BAA6B,iCAoKxC;AAEF,kBAAe,qCAA6B,CAAC"}

package/src/ts/{strands-agent/mcp-connection → agent/a2a-connection}/schema.d.ts

@@ -7,7 +7,7 @@ import { ComponentMetadata } from '../../../utils/nx';
 /**
  * TypeScript types for options defined in schema.json
  */
-export interface TsStrandsAgentMcpConnectionGeneratorSchema {
+export interface TsAgentA2aConnectionGeneratorSchema {
   sourceProject: string;
   targetProject: string;
   sourceComponent?: ComponentMetadata;

package/src/ts/{strands-agent → agent}/a2a-connection/schema.json

@@ -1,17 +1,17 @@
 {
   "$schema": "https://json-schema.org/schema",
-  "$id": "ts#strands-agent#a2a-connection",
-  "title": "ts#strands-agent#a2a-connection",
-  "description": "Connect a TypeScript Strands Agent to an A2A agent",
+  "$id": "ts#agent#a2a-connection",
+  "title": "ts#agent#a2a-connection",
+  "description": "Connect a TypeScript Agent to an A2A agent",
   "type": "object",
   "properties": {
     "sourceProject": {
       "type": "string",
-      "description": "The project containing the host Strands Agent"
+      "description": "The project containing the host Agent"
     },
     "targetProject": {
       "type": "string",
-      "description": "The project containing the target A2A Strands Agent"
+      "description": "The project containing the target A2A Agent"
     },
     "sourceComponent": {
       "type": "string",

package/src/ts/agent/files/ag-ui/index.ts.template

@@ -0,0 +1,37 @@
+import { StrandsAgent } from '@ag-ui/aws-strands';
+import { createStrandsApp } from '@ag-ui/aws-strands/server';
+import { randomUUID } from 'node:crypto';
+import type { Request, Response, NextFunction } from 'express';
+import { runWithSessionId } from '<%- agentConnectionImport %>';
+import { getAgent } from './agent.js';
+
+const PORT = parseInt(process.env.PORT || '8080');
+const HOST = '0.0.0.0';
+
+const SESSION_ID_HEADER = 'x-amzn-bedrock-agentcore-runtime-session-id';
+
+void (async () => {
+  const agent = await getAgent();
+
+  // Connect MCP clients and register their tools so StrandsAgent can discover them.
+  await agent.initialize();
+
+  const aguiAgent = new StrandsAgent({
+    agent,
+    name: '<%= agentNameClassName %>',
+    description: 'A Strands Agent exposed via the AG-UI protocol.',
+  });
+
+  const app = await createStrandsApp(aguiAgent, { path: '/invocations' });
+
+  // Bind the inbound session (or a fresh UUID) for downstream MCP / A2A calls.
+  app.use((req: Request, _res: Response, next: NextFunction) => {
+    const header = req.headers[SESSION_ID_HEADER];
+    const sessionId = (Array.isArray(header) ? header[0] : header) ?? randomUUID();
+    runWithSessionId(sessionId, () => next());
+  });
+
+  app.listen(PORT, HOST, () => {
+    console.log(`AG-UI server listening on ${HOST}:${PORT}`);
+  });
+})();

package/src/ts/agent/generator.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { GeneratorCallback, Tree } from '@nx/devkit';
+import { TsAgentGeneratorSchema } from './schema';
+import { NxGeneratorInfo } from '../../utils/nx';
+export declare const TS_AGENT_GENERATOR_INFO: NxGeneratorInfo;
+export declare const tsAgentGenerator: (tree: Tree, options: TsAgentGeneratorSchema) => Promise<GeneratorCallback>;
+export default tsAgentGenerator;

package/src/ts/{strands-agent → agent}/generator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsStrandsAgentGenerator = exports.TS_STRANDS_AGENT_GENERATOR_INFO = void 0;
+exports.tsAgentGenerator = exports.TS_AGENT_GENERATOR_INFO = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -19,8 +19,8 @@ const agent_core_constructs_1 = require("../../utils/agent-core-constructs/agent
 const port_1 = require("../../utils/port");
 const fs_1 = require("../../utils/fs");
 const agent_connection_1 = require("../../utils/agent-connection/agent-connection");
-exports.TS_STRANDS_AGENT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const tsStrandsAgentGenerator = async (tree, options) => {
+exports.TS_AGENT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
+const tsAgentGenerator = async (tree, options) => {
     const project = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.project);
     if (!tree.exists((0, devkit_1.joinPathFragments)(project.root, 'tsconfig.json'))) {
         throw new Error(`Unsupported project ${options.project}. Expected a TypeScript project (with a tsconfig.json)`);
@@ -36,11 +36,6 @@ const tsStrandsAgentGenerator = async (tree, options) => {
     const computeType = options.computeType ?? 'BedrockAgentCoreRuntime';
     const auth = options.auth ?? 'IAM';
     const protocol = options.protocol ?? 'HTTP';
-    if (protocol === 'AG-UI') {
-        throw new Error(`The AG-UI protocol is not yet supported for TypeScript Strands Agents. ` +
-            `Use a Python Strands Agent with protocol='AG-UI' instead, or choose 'HTTP' or 'A2A' for TypeScript. ` +
-            `Track TypeScript support at https://github.com/strands-agents/sdk-typescript/issues/347`);
-    }
     // Ensure the shared agent-connection project exists so the server entry
     // point can import `runWithSessionId` and propagate the AgentCore session
     // ID to any downstream MCP / A2A clients a later connection generator
@@ -91,6 +86,8 @@ const tsStrandsAgentGenerator = async (tree, options) => {
         // Add shared constructs
         const iacProvider = await (0, iac_1.resolveIacProvider)(tree, options.iacProvider);
         await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iacProvider });
+        // 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,
@@ -99,7 +96,7 @@ const tsStrandsAgentGenerator = async (tree, options) => {
             dockerOutputDir,
             iacProvider,
             auth,
-            serverProtocol: protocol,
+            serverProtocol: infraProtocol,
         });
     }
     // Add dependencies
@@ -112,23 +109,31 @@ const tsStrandsAgentGenerator = async (tree, options) => {
         '@modelcontextprotocol/sdk',
         ...(protocol === 'A2A'
             ? ['express', '@a2a-js/sdk']
-            : [
-                '@trpc/server',
-                '@trpc/client',
-                'ws',
-                'cors',
-                'aws4fetch',
-            ]),
+            : protocol === 'AG-UI'
+                ? [
+                    '@ag-ui/aws-strands',
+                    '@ag-ui/core',
+                    '@ag-ui/encoder',
+                    'express',
+                    'cors',
+                ]
+                : [
+                    '@trpc/server',
+                    '@trpc/client',
+                    'ws',
+                    'cors',
+                    'aws4fetch',
+                ]),
     ]), (0, versions_1.withVersions)([
         'tsx',
         '@types/node',
         'agent-chat-cli',
-        ...(protocol === 'A2A'
-            ? ['@types/express']
+        ...(protocol === 'A2A' || protocol === 'AG-UI'
+            ? ['@types/express', '@types/cors']
             : ['@types/ws', '@types/cors']),
     ]));
     // 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);
     // HTTP chat needs a tiny generated script to wrap the project's tRPC
@@ -146,10 +151,14 @@ const tsStrandsAgentGenerator = async (tree, options) => {
     }
     const chatUrl = protocol === 'HTTP'
         ? `ws://localhost:${localDevPort}/ws`
-        : `http://localhost:${localDevPort}`;
+        : protocol === 'AG-UI'
+            ? `http://localhost:${localDevPort}/invocations`
+            : `http://localhost:${localDevPort}`;
     const chatCommand = protocol === 'HTTP'
         ? `tsx ./scripts/${agentTargetPrefix}/chat.ts`
-        : `agent-chat-cli a2a ${chatUrl}`;
+        : protocol === 'AG-UI'
+            ? `agent-chat-cli agui ${chatUrl}`
+            : `agent-chat-cli a2a ${chatUrl}`;
     (0, devkit_1.updateProjectConfiguration)(tree, project.name, {
         ...project,
         targets: {
@@ -190,15 +199,13 @@ const tsStrandsAgentGenerator = async (tree, options) => {
             },
         },
     });
-    (0, nx_1.addComponentGeneratorMetadata)(tree, project.name, exports.TS_STRANDS_AGENT_GENERATOR_INFO, targetSourceDirRelativeToProjectRoot, agentTargetPrefix, { port: localDevPort, rc: agentNameClassName, auth, protocol });
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
-        exports.TS_STRANDS_AGENT_GENERATOR_INFO,
-    ]);
+    (0, nx_1.addComponentGeneratorMetadata)(tree, project.name, exports.TS_AGENT_GENERATOR_INFO, targetSourceDirRelativeToProjectRoot, agentTargetPrefix, { port: localDevPort, rc: agentNameClassName, auth, protocol });
+    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TS_AGENT_GENERATOR_INFO]);
     await (0, format_1.formatFilesInSubtree)(tree);
     return () => {
         (0, devkit_1.installPackagesTask)(tree);
     };
 };
-exports.tsStrandsAgentGenerator = tsStrandsAgentGenerator;
-exports.default = exports.tsStrandsAgentGenerator;
+exports.tsAgentGenerator = tsAgentGenerator;
+exports.default = exports.tsAgentGenerator;
 //# sourceMappingURL=generator.js.map

package/src/ts/agent/generator.js.map

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

package/src/ts/{strands-agent → agent}/mcp-connection/__snapshots__/generator.spec.ts.snap

@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`ts#strands-agent#mcp-connection generator > should match snapshot for agent-connection src files > agent-connection-index.ts 1`] = `
+exports[`ts#agent#mcp-connection generator > should match snapshot for agent-connection src files > agent-connection-index.ts 1`] = `
 "export * from './app/inventory-mcp-client.js';
 export * from './core/with-session-id.js';
 export * from './core/session-context.js';
@@ -8,7 +8,7 @@ export * from './core/session-context.js';
 "
 `;
 
-exports[`ts#strands-agent#mcp-connection generator > should match snapshot for agent-connection src files > agentcore-mcp-client.ts 1`] = `
+exports[`ts#agent#mcp-connection generator > should match snapshot for agent-connection src files > agentcore-mcp-client.ts 1`] = `
 "import { McpClient } from '@strands-agents/sdk';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { AwsClient } from 'aws4fetch';
@@ -140,7 +140,7 @@ export class AgentCoreMcpClient {
 "
 `;
 
-exports[`ts#strands-agent#mcp-connection generator > should match snapshot for agent-connection src files > inventory-mcp-client.ts 1`] = `
+exports[`ts#agent#mcp-connection generator > should match snapshot for agent-connection src files > inventory-mcp-client.ts 1`] = `
 "import { McpClient } from '@strands-agents/sdk';
 import { AgentCoreMcpClient } from '../core/agentcore-mcp-client.js';
 import { getConnectedAgentRuntimeArn } from '../core/runtime-config.js';
@@ -161,7 +161,7 @@ export class InventoryMcpClient {
 "
 `;
 
-exports[`ts#strands-agent#mcp-connection generator > should match snapshot for agent-connection src files > transformed-agent.ts 1`] = `
+exports[`ts#agent#mcp-connection generator > should match snapshot for agent-connection src files > transformed-agent.ts 1`] = `
 "import { InventoryMcpClient } from ':proj/agent-connection';
 import { Agent, tool } from '@strands-agents/sdk';
 import { z } from 'zod';

package/src/ts/agent/mcp-connection/generator.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { GeneratorCallback, Tree } from '@nx/devkit';
+import { TsAgentMcpConnectionGeneratorSchema } from './schema';
+import { NxGeneratorInfo } from '../../../utils/nx';
+export declare const TS_AGENT_MCP_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
+export declare const tsAgentMcpConnectionGenerator: (tree: Tree, options: TsAgentMcpConnectionGeneratorSchema) => Promise<GeneratorCallback>;
+export default tsAgentMcpConnectionGenerator;

package/src/ts/{strands-agent → agent}/mcp-connection/generator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsStrandsAgentMcpConnectionGenerator = exports.TS_STRANDS_AGENT_MCP_CONNECTION_GENERATOR_INFO = void 0;
+exports.tsAgentMcpConnectionGenerator = exports.TS_AGENT_MCP_CONNECTION_GENERATOR_INFO = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -14,14 +14,14 @@ const versions_1 = require("../../../utils/versions");
 const npm_scope_1 = require("../../../utils/npm-scope");
 const ast_1 = require("../../../utils/ast");
 const agent_connection_1 = require("../../../utils/agent-connection/agent-connection");
-exports.TS_STRANDS_AGENT_MCP_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const tsStrandsAgentMcpConnectionGenerator = async (tree, options) => {
+exports.TS_AGENT_MCP_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
+const tsAgentMcpConnectionGenerator = async (tree, options) => {
     const sourceProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.sourceProject);
     const targetProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.targetProject);
     const agentComponent = options.sourceComponent;
     const mcpComponent = options.targetComponent;
     if (!agentComponent || !mcpComponent) {
-        throw new Error('Both sourceComponent and targetComponent must be provided for ts#strands-agent -> mcp connections');
+        throw new Error('Both sourceComponent and targetComponent must be provided for ts#agent -> mcp connections');
     }
     if (mcpComponent.auth && mcpComponent.auth !== 'IAM') {
         throw new Error(`MCP server connection currently only supports IAM authentication, but '${mcpComponent.name}' uses '${mcpComponent.auth}' authentication.`);
@@ -85,13 +85,13 @@ const tsStrandsAgentMcpConnectionGenerator = async (tree, options) => {
         '@aws-sdk/credential-providers',
     ]), {});
     await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
-        exports.TS_STRANDS_AGENT_MCP_CONNECTION_GENERATOR_INFO,
+        exports.TS_AGENT_MCP_CONNECTION_GENERATOR_INFO,
     ]);
     await (0, format_1.formatFilesInSubtree)(tree);
     return () => {
         (0, devkit_1.installPackagesTask)(tree);
     };
 };
-exports.tsStrandsAgentMcpConnectionGenerator = tsStrandsAgentMcpConnectionGenerator;
-exports.default = exports.tsStrandsAgentMcpConnectionGenerator;
+exports.tsAgentMcpConnectionGenerator = tsAgentMcpConnectionGenerator;
+exports.default = exports.tsAgentMcpConnectionGenerator;
 //# sourceMappingURL=generator.js.map

package/src/ts/agent/mcp-connection/generator.js.map

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

package/src/ts/agent/mcp-connection/schema.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ComponentMetadata } from '../../../utils/nx';
+
+/**
+ * TypeScript types for options defined in schema.json
+ */
+export interface TsAgentMcpConnectionGeneratorSchema {
+  sourceProject: string;
+  targetProject: string;
+  sourceComponent?: ComponentMetadata;
+  targetComponent?: ComponentMetadata;
+}

package/src/ts/{strands-agent → agent}/mcp-connection/schema.json

@@ -1,13 +1,13 @@
 {
   "$schema": "https://json-schema.org/schema",
-  "$id": "ts#strands-agent#mcp-connection",
-  "title": "ts#strands-agent#mcp-connection",
-  "description": "Connect a TypeScript Strands Agent to an MCP server",
+  "$id": "ts#agent#mcp-connection",
+  "title": "ts#agent#mcp-connection",
+  "description": "Connect a TypeScript Agent to an MCP server",
   "type": "object",
   "properties": {
     "sourceProject": {
       "type": "string",
-      "description": "The project containing the Strands Agent"
+      "description": "The project containing the Agent"
     },
     "targetProject": {
       "type": "string",