@aws/nx-plugin 1.0.0-rc.0 → 1.0.0-rc.10

package/src/trpc/backend/schema.json

@@ -13,14 +13,6 @@
       },
       "x-prompt": "What name would you like your API to have? i.e: MyApi"
     },
-    "computeType": {
-      "type": "string",
-      "description": "The type of compute to use to deploy this API. Choose between ServerlessApiGatewayRestApi (default) or ServerlessApiGatewayHttpApi.",
-      "default": "ServerlessApiGatewayRestApi",
-      "enum": ["ServerlessApiGatewayRestApi", "ServerlessApiGatewayHttpApi"],
-      "x-prompt": "What compute type would you like to deploy your API with?",
-      "x-priority": "important"
-    },
     "integrationPattern": {
       "type": "string",
       "description": "How API Gateway integrations are generated for the API. Choose between isolated (default) and shared.",
@@ -45,9 +37,9 @@
     },
     "auth": {
       "type": "string",
-      "description": "The method used to authenticate with your API. Choose between IAM (default), Cognito or Custom.",
-      "default": "IAM",
-      "enum": ["IAM", "Cognito", "Custom"],
+      "description": "The method used to authenticate with your API. Choose between iam (default), cognito or custom.",
+      "default": "iam",
+      "enum": ["iam", "cognito", "custom"],
       "x-prompt": "How would you like users to authenticate with your API?",
       "x-priority": "important"
     },
@@ -64,13 +56,21 @@
       "description": "The sub directory the project is placed in. By default this is the project name.",
       "x-prompt": "Which sub directory do you want to create the project in? (By default this is the project name)"
     },
-    "iacProvider": {
+    "iac": {
       "type": "string",
       "description": "The preferred IaC provider. By default this is inherited from your initial selection.",
-      "enum": ["Inherit", "CDK", "Terraform"],
+      "enum": ["inherit", "cdk", "terraform"],
       "x-priority": "important",
-      "default": "Inherit",
-      "x-prompt": "Which provider would you like to manage your infrastructure? (default: Inherit)"
+      "default": "inherit",
+      "x-prompt": "Which provider would you like to manage your infrastructure? (default: inherit)"
+    },
+    "infra": {
+      "type": "string",
+      "description": "The type of infrastructure to use to deploy this API.",
+      "default": "rest-lambda",
+      "enum": ["rest-lambda", "http-lambda", "none"],
+      "x-prompt": "What infrastructure would you like to deploy your API with?",
+      "x-priority": "important"
     }
   },
   "required": ["name"]

package/src/trpc/react/__snapshots__/generator.spec.ts.snap

@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`trpc react generator > REST API (ServerlessApiGatewayRestApi) > should generate REST API client provider with splitLink for Cognito auth > TestApiClientProvider-REST-Cognito.tsx 1`] = `
+exports[`trpc react generator > REST API (rest-lambda) > should generate REST API client provider with splitLink for Cognito auth > TestApiClientProvider-REST-Cognito.tsx 1`] = `
 "import { AppRouter } from 'backend';
 import { useQueryClient } from '@tanstack/react-query';
 import { createTRPCOptionsProxy } from '@trpc/tanstack-react-query';
@@ -77,7 +77,7 @@ export default TestApiClientProvider;
 "
 `;
 
-exports[`trpc react generator > REST API (ServerlessApiGatewayRestApi) > should generate REST API client provider with splitLink for Custom auth > TestApiClientProvider-REST-Custom.tsx 1`] = `
+exports[`trpc react generator > REST API (rest-lambda) > should generate REST API client provider with splitLink for Custom auth > TestApiClientProvider-REST-Custom.tsx 1`] = `
 "import { AppRouter } from 'backend';
 import { useQueryClient } from '@tanstack/react-query';
 import { createTRPCOptionsProxy } from '@trpc/tanstack-react-query';
@@ -147,7 +147,7 @@ export default TestApiClientProvider;
 "
 `;
 
-exports[`trpc react generator > REST API (ServerlessApiGatewayRestApi) > should generate REST API client provider with splitLink for IAM auth > TestApiClientProvider-REST-IAM.tsx 1`] = `
+exports[`trpc react generator > REST API (rest-lambda) > should generate REST API client provider with splitLink for IAM auth > TestApiClientProvider-REST-IAM.tsx 1`] = `
 "import { AppRouter } from 'backend';
 import { useQueryClient } from '@tanstack/react-query';
 import { createTRPCOptionsProxy } from '@trpc/tanstack-react-query';

package/src/trpc/react/files/src/components/__apiNameClassName__ClientProvider.tsx.template

@@ -9,9 +9,9 @@ import { EventSourcePolyfill } from "event-source-polyfill";
 <%_ } else { _%>
 import { HTTPLinkOptions, TRPCClient, createTRPCClient, httpLink } from "@trpc/client";
 <%_ } _%>
-<%_ if (auth === 'IAM') { _%>
+<%_ if (auth === 'iam') { _%>
 import { useSigV4 } from "../hooks/useSigV4";
-<%_ } else if (auth === 'Cognito') { _%>
+<%_ } else if (auth === 'cognito') { _%>
 import { useAuth } from "react-oidc-context";
 <%_ } _%>
 
@@ -28,9 +28,9 @@ export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
   const queryClient = useQueryClient();
   const runtimeConfig = useRuntimeConfig();
   const apiUrl = runtimeConfig.apis.<%= apiNameClassName %>;
-  <%_ if (auth === 'IAM') { _%>
+  <%_ if (auth === 'iam') { _%>
   const sigv4Client = useSigV4();
-  <%_ } else if (auth === 'Cognito') { _%>
+  <%_ } else if (auth === 'cognito') { _%>
   const auth = useAuth();
   const user = auth?.user;
   <%_ } _%>
@@ -45,7 +45,7 @@ export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
             url: apiUrl,
             EventSource: EventSourcePolyfill,
             eventSourceOptions: async ({ op }) => {
-              <%_ if (auth === 'IAM') { _%>
+              <%_ if (auth === 'iam') { _%>
               const url =
                 `${apiUrl.replace(/\/$/, '')}/${op.path}` +
                 (op.input !== undefined
@@ -57,13 +57,13 @@ export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
                 headers[k] = v;
               });
               return { headers };
-              <%_ } else if (auth === 'Cognito') { _%>
+              <%_ } else if (auth === 'cognito') { _%>
               return {
                 headers: {
                   Authorization: `Bearer ${user?.id_token}`,
                 },
               };
-              <%_ } else if (auth === 'Custom') { _%>
+              <%_ } else if (auth === 'custom') { _%>
               // TODO: Add headers required by your custom authorizer
               return { headers: {} };
               <%_ } _%>
@@ -71,13 +71,13 @@ export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
           }),
           false: httpLink({
             url: apiUrl,
-            <%_ if (auth === 'IAM') { _%>
+            <%_ if (auth === 'iam') { _%>
             fetch: sigv4Client.fetch,
-            <%_ } else if (auth === 'Cognito') { _%>
+            <%_ } else if (auth === 'cognito') { _%>
             headers: {
               Authorization: `Bearer ${user?.id_token}`,
             },
-            <%_ } else if (auth === 'Custom') { _%>
+            <%_ } else if (auth === 'custom') { _%>
             // TODO: Add headers required by your custom authorizer
             headers: {},
             <%_ } _%>
@@ -88,13 +88,13 @@ export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
     <%_ } else { _%>
     const linkOptions: HTTPLinkOptions<any> = {
       url: apiUrl,
-      <%_ if (auth === 'IAM') { _%>
+      <%_ if (auth === 'iam') { _%>
       fetch: sigv4Client.fetch,
-      <%_ } else if (auth === 'Cognito') { _%>
+      <%_ } else if (auth === 'cognito') { _%>
       headers: {
         Authorization: `Bearer ${user?.id_token}`,
       },
-      <%_ } else if (auth === 'Custom') { _%>
+      <%_ } else if (auth === 'custom') { _%>
       // TODO: Add headers required by your custom authorizer
       headers: {},
       <%_ } _%>
@@ -111,7 +111,7 @@ export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
     });
 
     return { optionsProxy, client };
-  }, [apiUrl, queryClient<% if (auth === 'IAM') { %>, sigv4Client<% } else if (auth === 'Cognito') { %>, user<% } %>]);
+  }, [apiUrl, queryClient<% if (auth === 'iam') { %>, sigv4Client<% } else if (auth === 'cognito') { %>, user<% } %>]);
 
   return (
     <<%= apiNameClassName %>TRPCContext.Provider value={container}>

package/src/trpc/react/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
-import { ReactGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../utils/nx';
+import { type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { ReactGeneratorSchema } from './schema';
 export declare const TRPC_REACT_GENERATOR_INFO: NxGeneratorInfo;
 export declare function reactGenerator(tree: Tree, options: ReactGeneratorSchema): Promise<() => void>;
 export default reactGenerator;

package/src/trpc/react/generator.js

@@ -7,15 +7,15 @@ exports.reactGenerator = reactGenerator;
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
+const serve_local_1 = require("../../connection/serve-local");
 const generator_1 = require("../../ts/react-website/runtime-config/generator");
-const npm_scope_1 = require("../../utils/npm-scope");
-const versions_1 = require("../../utils/versions");
 const ast_1 = require("../../utils/ast");
-const names_1 = require("../../utils/names");
 const format_1 = require("../../utils/format");
-const nx_1 = require("../../utils/nx");
 const metrics_1 = require("../../utils/metrics");
-const serve_local_1 = require("../../connection/serve-local");
+const names_1 = require("../../utils/names");
+const npm_scope_1 = require("../../utils/npm-scope");
+const nx_1 = require("../../utils/nx");
+const versions_1 = require("../../utils/versions");
 exports.TRPC_REACT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 async function reactGenerator(tree, options) {
     const frontendProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.frontendProjectName);
@@ -23,9 +23,10 @@ async function reactGenerator(tree, options) {
     /* eslint-disable @typescript-eslint/no-explicit-any */
     const metadata = backendProjectConfig.metadata;
     const apiName = metadata.apiName;
-    const auth = metadata.auth ?? 'IAM';
+    const auth = (metadata.auth ?? 'iam').toLowerCase();
     const port = metadata.port ?? metadata.ports?.[0] ?? 2022;
-    const isRestApi = metadata.computeType === 'ServerlessApiGatewayRestApi';
+    const rawInfra = (metadata.infra ?? metadata.computeType ?? '').toLowerCase();
+    const isRestApi = rawInfra === 'rest-lambda' || rawInfra === 'serverlessapigatewayrestapi';
     const apiNameClassName = (0, names_1.toClassName)(apiName);
     const backendProjectAlias = (0, npm_scope_1.toScopeAlias)(backendProjectConfig.name);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), frontendProjectConfig.root, {
@@ -42,7 +43,7 @@ async function reactGenerator(tree, options) {
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../../utils/files/website/components/tanstack-query'), (0, devkit_1.joinPathFragments)(frontendProjectConfig.sourceRoot, 'components'), {}, {
         overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
     });
-    if (auth === 'IAM') {
+    if (auth === 'iam') {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../../utils/files/website/hooks/sigv4'), (0, devkit_1.joinPathFragments)(frontendProjectConfig.sourceRoot, 'hooks'), {}, {
             overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
         });
@@ -69,7 +70,7 @@ async function reactGenerator(tree, options) {
         '@tanstack/react-query',
         '@tanstack/react-query-devtools',
         ...(isRestApi ? ['event-source-polyfill'] : []),
-        ...(auth === 'IAM'
+        ...(auth === 'iam'
             ? [
                 'oidc-client-ts',
                 'aws4fetch',
@@ -77,7 +78,7 @@ async function reactGenerator(tree, options) {
                 'react-oidc-context',
             ]
             : []),
-        ...(auth === 'Cognito' ? ['react-oidc-context'] : []),
+        ...(auth === 'cognito' ? ['react-oidc-context'] : []),
     ]), (0, versions_1.withVersions)([
         '@smithy/types',
         ...(isRestApi ? ['@types/event-source-polyfill'] : []),

package/src/trpc/react/generator.js.map

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

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

@@ -292,7 +292,7 @@ variable "server_protocol" {
   default     = "HTTP"
   validation {
     condition     = contains(["MCP", "HTTP", "A2A"], var.server_protocol)
-    error_message = "Protocol type must be either 'MCP', 'HTTP', or 'A2A'."
+    error_message = "Protocol type must be either 'mcp', 'http', or 'a2a'."
   }
 }
 
@@ -629,6 +629,7 @@ output "agent_runtime_version" {
 
 exports[`ts#agent generator > should match snapshot for generated files > agent-agent.ts 1`] = `
 "import { Agent, tool } from '@strands-agents/sdk';
+import { logModelErrors } from ':proj/agent-connection';
 import { z } from 'zod';
 
 const multiply = tool({
@@ -641,13 +642,16 @@ const multiply = tool({
   callback: ({ a, b }) => a * b,
 });
 
-export const getAgent = async () =>
-  new Agent({
+export const getAgent = async () => {
+  const agent = new Agent({
     systemPrompt: \`You are a mathematical wizard.
   Use your tools for mathematical tasks.
   Refer to tools as your 'spellbook'.\`,
     tools: [multiply],
   });
+  logModelErrors(agent);
+  return agent;
+};
 "
 `;
 
@@ -728,7 +732,8 @@ export interface AgentCoreTrpcClientOptions {
   sessionId?: string;
 }
 
-export interface AgentCoreTrpcClientIamOptions extends AgentCoreTrpcClientOptions {
+export interface AgentCoreTrpcClientIamOptions
+  extends AgentCoreTrpcClientOptions {
   /**
    * Optional AWS credential provider. If not provided, uses the default
    * credential provider chain from the AWS SDK.
@@ -736,7 +741,8 @@ export interface AgentCoreTrpcClientIamOptions extends AgentCoreTrpcClientOption
   credentialProvider?: ReturnType<typeof fromNodeProviderChain>;
 }
 
-export interface AgentCoreTrpcClientJwtOptions extends AgentCoreTrpcClientOptions {
+export interface AgentCoreTrpcClientJwtOptions
+  extends AgentCoreTrpcClientOptions {
   /**
    * A function which returns the JWT access token used to authenticate
    */

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

@@ -2,9 +2,9 @@
  * 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';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../../utils/nx';
+import type { TsAgentA2aConnectionGeneratorSchema } from './schema';
 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/agent/a2a-connection/generator.js

@@ -6,14 +6,14 @@ exports.tsAgentA2aConnectionGenerator = exports.TS_AGENT_A2A_CONNECTION_GENERATO
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const nx_1 = require("../../../utils/nx");
-const metrics_1 = require("../../../utils/metrics");
+const agent_connection_1 = require("../../../utils/agent-connection/agent-connection");
+const ast_1 = require("../../../utils/ast");
 const format_1 = require("../../../utils/format");
+const metrics_1 = require("../../../utils/metrics");
 const names_1 = require("../../../utils/names");
-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");
+const nx_1 = require("../../../utils/nx");
+const versions_1 = require("../../../utils/versions");
 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);
@@ -23,10 +23,11 @@ const tsAgentA2aConnectionGenerator = async (tree, options) => {
     if (!agentComponent || !targetAgentComponent) {
         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.`);
+    if ((targetAgentComponent.protocol ?? '').toLowerCase() !== 'a2a') {
+        throw new Error(`Target agent '${targetAgentComponent.name}' uses the ${targetAgentComponent.protocol ?? 'http'} protocol — only A2A agents can be connected as tools.`);
     }
-    if (targetAgentComponent.auth && targetAgentComponent.auth !== 'IAM') {
+    if (targetAgentComponent.auth &&
+        targetAgentComponent.auth.toLowerCase() !== 'iam') {
         throw new Error(`A2A agent connection currently only supports IAM authentication, but '${targetAgentComponent.name}' uses '${targetAgentComponent.auth}' authentication.`);
     }
     const targetAgentComponentName = targetAgentComponent.name ?? 'agent';

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

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

package/src/ts/agent/files/common/agent.ts.template

@@ -1,4 +1,5 @@
 import { Agent, tool } from '@strands-agents/sdk';
+import { logModelErrors } from '<%- agentConnectionImport %>';
 import { z } from 'zod';
 
 const multiply = tool({
@@ -11,10 +12,13 @@ const multiply = tool({
   callback: ({ a, b }) => a * b,
 });
 
-export const getAgent = async () =>
-  new Agent({
+export const getAgent = async () => {
+  const agent = new Agent({
     systemPrompt: `You are a mathematical wizard.
   Use your tools for mathematical tasks.
   Refer to tools as your 'spellbook'.`,
     tools: [multiply],
   });
+  logModelErrors(agent);
+  return agent;
+};

package/src/ts/agent/files/deploy/Dockerfile.template

@@ -9,7 +9,7 @@ RUN npm install @aws/aws-distro-opentelemetry-node-autoinstrumentation@<%- adotV
 # Copy bundled agent
 COPY index.js /app
 
-<%_ if (protocol === 'A2A') { _%>
+<%_ if (protocol === 'a2a') { _%>
 EXPOSE 9000
 <%_ } else { _%>
 EXPOSE 8080

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

@@ -2,9 +2,9 @@
  * 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';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { TsAgentGeneratorSchema } from './schema';
 export declare const TS_AGENT_GENERATOR_INFO: NxGeneratorInfo;
 export declare const tsAgentGenerator: (tree: Tree, options: TsAgentGeneratorSchema) => Promise<GeneratorCallback>;
 export default tsAgentGenerator;

package/src/ts/agent/generator.js

@@ -6,20 +6,21 @@ exports.tsAgentGenerator = exports.TS_AGENT_GENERATOR_INFO = void 0;
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const nx_1 = require("../../utils/nx");
-const metrics_1 = require("../../utils/metrics");
+const agent_connection_1 = require("../../utils/agent-connection/agent-connection");
+const agent_core_constructs_1 = require("../../utils/agent-core-constructs/agent-core-constructs");
+const bundle_1 = require("../../utils/bundle/bundle");
+const containers_1 = require("../../utils/containers");
 const format_1 = require("../../utils/format");
+const fs_1 = require("../../utils/fs");
+const iac_1 = require("../../utils/iac");
+const metrics_1 = require("../../utils/metrics");
 const names_1 = require("../../utils/names");
-const versions_1 = require("../../utils/versions");
 const npm_scope_1 = require("../../utils/npm-scope");
-const bundle_1 = require("../../utils/bundle/bundle");
-const iac_1 = require("../../utils/iac");
-const containers_1 = require("../../utils/containers");
-const shared_constructs_1 = require("../../utils/shared-constructs");
-const agent_core_constructs_1 = require("../../utils/agent-core-constructs/agent-core-constructs");
+const nx_1 = require("../../utils/nx");
+const object_1 = require("../../utils/object");
 const port_1 = require("../../utils/port");
-const fs_1 = require("../../utils/fs");
-const agent_connection_1 = require("../../utils/agent-connection/agent-connection");
+const shared_constructs_1 = require("../../utils/shared-constructs");
+const versions_1 = require("../../utils/versions");
 exports.TS_AGENT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 const tsAgentGenerator = async (tree, options) => {
     const project = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.project);
@@ -34,12 +35,12 @@ const tsAgentGenerator = async (tree, options) => {
     const targetSourceDir = (0, devkit_1.joinPathFragments)(project.root, targetSourceDirRelativeToProjectRoot);
     const relativeSourceDir = targetSourceDir.replace(project.root + '/', './');
     const distDir = (0, devkit_1.joinPathFragments)('dist', project.root);
-    const computeType = options.computeType ?? 'BedrockAgentCoreRuntime';
-    const protocol = options.protocol ?? 'HTTP';
-    if (computeType === 'None' && options.auth && options.auth !== 'IAM') {
-        console.warn('Warning: auth is ignored when no compute type is configured (no infrastructure is generated)');
+    const infra = options.infra ?? 'agentcore';
+    const protocol = options.protocol ?? 'http';
+    if (infra === 'none' && options.auth && options.auth !== 'iam') {
+        console.warn('Warning: auth is ignored when no infrastructure is configured (no infrastructure is generated)');
     }
-    const auth = options.auth ?? 'IAM';
+    const auth = options.auth ?? 'iam';
     // 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
@@ -55,8 +56,8 @@ const tsAgentGenerator = async (tree, options) => {
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common'), targetSourceDir, templateContext, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
     // Generate protocol-specific files
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', protocol.toLowerCase()), targetSourceDir, templateContext, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
-    if (computeType === 'BedrockAgentCoreRuntime') {
-        const containerEngine = await (0, containers_1.resolveContainerEngine)(tree, 'Inherit');
+    if (infra === 'agentcore') {
+        const containers = await (0, containers_1.resolveContainers)(tree, 'inherit');
         const dockerImageTag = `${(0, npm_scope_1.getNpmScope)(tree)}-${name}:latest`;
         // Add bundle target
         await (0, bundle_1.addTypeScriptBundleTarget)(tree, project, {
@@ -80,7 +81,7 @@ const tsAgentGenerator = async (tree, options) => {
             options: {
                 commands: [
                     fs.cp(`${targetSourceDir}/Dockerfile`, `${dockerOutputDir}/Dockerfile`),
-                    `${containerEngine} build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`,
+                    `${containers} build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`,
                 ],
                 parallel: false,
             },
@@ -89,20 +90,20 @@ const tsAgentGenerator = async (tree, options) => {
         (0, nx_1.addDependencyToTargetIfNotPresent)(project, 'docker', dockerTargetName);
         (0, nx_1.addDependencyToTargetIfNotPresent)(project, 'build', 'docker');
         // Add shared constructs
-        const iacProvider = await (0, iac_1.resolveIacProvider)(tree, options.iacProvider);
-        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iacProvider });
+        const iac = await (0, iac_1.resolveIac)(tree, options.iac);
+        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iac });
         // 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;
+        const infraProtocol = protocol === 'ag-ui' ? 'http' : protocol;
         await (0, agent_core_constructs_1.addAgentInfra)(tree, {
             agentNameKebabCase: name,
             agentNameClassName,
             projectName: project.name,
             dockerImageTag,
             dockerOutputDir,
-            iacProvider,
+            iac,
             auth,
             serverProtocol: infraProtocol,
-            containerEngine,
+            containers,
         });
     }
     // Add dependencies
@@ -113,9 +114,9 @@ const tsAgentGenerator = async (tree, options) => {
         '@aws-sdk/client-appconfigdata',
         '@aws-lambda-powertools/parameters',
         '@modelcontextprotocol/sdk',
-        ...(protocol === 'A2A'
+        ...(protocol === 'a2a'
             ? ['express', '@a2a-js/sdk']
-            : protocol === 'AG-UI'
+            : protocol === 'ag-ui'
                 ? [
                     '@ag-ui/aws-strands',
                     '@ag-ui/core',
@@ -134,18 +135,20 @@ const tsAgentGenerator = async (tree, options) => {
         'tsx',
         '@types/node',
         'agent-chat-cli',
-        ...(protocol === 'A2A' || protocol === 'AG-UI'
+        ...(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 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);
+    const localDevPortStart = protocol === 'a2a' ? 9000 : 8081;
+    const localDevPort = (0, port_1.assignPort)(tree, project, localDevPortStart, {
+        component: { info: exports.TS_AGENT_GENERATOR_INFO, name: agentTargetPrefix },
+    });
     // HTTP chat needs a tiny generated script to wrap the project's tRPC
     // WebSocket client in a `ChatAdapter`. A2A speaks the standard A2A
     // protocol, so we can run `agent-chat-cli` directly as a binary.
-    if (protocol === 'HTTP') {
+    if (protocol === 'http') {
         const scriptsDir = (0, devkit_1.joinPathFragments)(project.root, 'scripts', agentTargetPrefix);
         const relativeAgentImport = `../../${targetSourceDirRelativeToProjectRoot}`;
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'scripts', 'http'), scriptsDir, {
@@ -155,19 +158,21 @@ const tsAgentGenerator = async (tree, options) => {
             relativeAgentImport,
         }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
     }
-    const chatUrl = protocol === 'HTTP'
+    const chatUrl = protocol === 'http'
         ? `ws://localhost:${localDevPort}/ws`
-        : protocol === 'AG-UI'
+        : protocol === 'ag-ui'
             ? `http://localhost:${localDevPort}/invocations`
             : `http://localhost:${localDevPort}`;
-    const chatCommand = protocol === 'HTTP'
+    const chatCommand = protocol === 'http'
         ? `tsx ./scripts/${agentTargetPrefix}/chat.ts`
-        : protocol === 'AG-UI'
+        : protocol === 'ag-ui'
             ? `agent-chat-cli agui ${chatUrl}`
             : `agent-chat-cli a2a ${chatUrl}`;
     (0, devkit_1.updateProjectConfiguration)(tree, project.name, {
         ...project,
-        targets: {
+        // Sort targets so their order is stable regardless of insertion order on
+        // first run vs re-run.
+        targets: (0, object_1.sortObjectKeys)({
             ...project.targets,
             [`${agentTargetPrefix}-serve`]: {
                 executor: 'nx:run-commands',
@@ -203,7 +208,7 @@ const tsAgentGenerator = async (tree, options) => {
                 },
                 dependsOn: [`${agentTargetPrefix}-serve-local`],
             },
-        },
+        }),
     });
     (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]);