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

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

@@ -9,7 +9,20 @@ exports[`ts#dynamodb generator > should generate scripts for finch engine > pack
   ResourceInUseException,
   UpdateTableCommand,
 } from '@aws-sdk/client-dynamodb';
-import { GLOBAL_SECONDARY_INDEXES } from '../src/gsi.js';
+import { readFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const { globalSecondaryIndexes } = JSON.parse(
+  readFileSync(join(__dirname, '../dynamodb.config.json'), 'utf-8'),
+) as {
+  globalSecondaryIndexes: {
+    indexName: string;
+    partitionKey: string;
+    sortKey?: string;
+  }[];
+};
 
 const [tableName, port] = process.argv.slice(2);
 const endpoint = \`http://localhost:\${port}\`;
@@ -48,11 +61,13 @@ const waitForTableActive = async (
 const ensureTable = async (
   tblClient: DynamoDBClient,
   tblName: string,
-  gsIs: { indexName: string; partitionKey: string; sortKey: string }[],
+  gsIs: { indexName: string; partitionKey: string; sortKey?: string }[],
 ): Promise<void> => {
   const gsiAttributeDefinitions = gsIs.flatMap((gsi) => [
     { AttributeName: gsi.partitionKey, AttributeType: 'S' as const },
-    { AttributeName: gsi.sortKey, AttributeType: 'S' as const },
+    ...(gsi.sortKey
+      ? [{ AttributeName: gsi.sortKey, AttributeType: 'S' as const }]
+      : []),
   ]);
   const attributeDefinitions = [
     { AttributeName: 'pk', AttributeType: 'S' as const },
@@ -66,7 +81,9 @@ const ensureTable = async (
     IndexName: gsi.indexName,
     KeySchema: [
       { AttributeName: gsi.partitionKey, KeyType: 'HASH' as const },
-      { AttributeName: gsi.sortKey, KeyType: 'RANGE' as const },
+      ...(gsi.sortKey
+        ? [{ AttributeName: gsi.sortKey, KeyType: 'RANGE' as const }]
+        : []),
     ],
     Projection: { ProjectionType: 'ALL' as const },
   }));
@@ -133,7 +150,14 @@ const ensureTable = async (
               TableName: tblName,
               AttributeDefinitions: [
                 { AttributeName: gsi.partitionKey, AttributeType: 'S' },
-                { AttributeName: gsi.sortKey, AttributeType: 'S' },
+                ...(gsi.sortKey
+                  ? [
+                      {
+                        AttributeName: gsi.sortKey,
+                        AttributeType: 'S' as const,
+                      },
+                    ]
+                  : []),
               ],
               GlobalSecondaryIndexUpdates: [
                 {
@@ -141,7 +165,9 @@ const ensureTable = async (
                     IndexName: gsi.indexName,
                     KeySchema: [
                       { AttributeName: gsi.partitionKey, KeyType: 'HASH' },
-                      { AttributeName: gsi.sortKey, KeyType: 'RANGE' },
+                      ...(gsi.sortKey
+                        ? [{ AttributeName: gsi.sortKey, KeyType: 'RANGE' }]
+                        : []),
                     ],
                     Projection: { ProjectionType: 'ALL' },
                   },
@@ -161,7 +187,7 @@ const ensureTable = async (
   }
 };
 
-await ensureTable(client, tableName, GLOBAL_SECONDARY_INDEXES);
+await ensureTable(client, tableName, globalSecondaryIndexes);
 "
 `;
 
@@ -458,6 +484,16 @@ variable "enable_key_rotation" {
   default     = true
 }
 
+locals {
+  dynamodb_config = jsondecode(file("\${path.module}/../../../../../../../packages/my-table/dynamodb.config.json"))
+  global_secondary_indexes = [for gsi in local.dynamodb_config.globalSecondaryIndexes : {
+    name            = gsi.indexName
+    hash_key        = gsi.partitionKey
+    range_key       = try(gsi.sortKey, null)
+    projection_type = "ALL"
+  }]
+}
+
 module "dynamodb_table" {
   source                         = "../../../core/dynamodb"
   name                           = "proj-my-table"
@@ -465,20 +501,7 @@ module "dynamodb_table" {
   point_in_time_recovery_enabled = var.point_in_time_recovery_enabled
   deletion_protection_enabled    = var.deletion_protection_enabled
   enable_key_rotation            = var.enable_key_rotation
-  global_secondary_indexes = [
-    {
-      name            = "gsi1pk-gsi1sk-index"
-      hash_key        = "gsi1pk"
-      range_key       = "gsi1sk"
-      projection_type = "ALL"
-    },
-    {
-      name            = "gsi2pk-gsi2sk-index"
-      hash_key        = "gsi2pk"
-      range_key       = "gsi2sk"
-      projection_type = "ALL"
-    },
-  ]
+  global_secondary_indexes       = local.global_secondary_indexes
 }
 
 module "add_to_runtime_config" {
@@ -502,7 +525,20 @@ exports[`ts#dynamodb generator > should generate the dynamodb project > packages
   ResourceInUseException,
   UpdateTableCommand,
 } from '@aws-sdk/client-dynamodb';
-import { GLOBAL_SECONDARY_INDEXES } from '../src/gsi.js';
+import { readFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const { globalSecondaryIndexes } = JSON.parse(
+  readFileSync(join(__dirname, '../dynamodb.config.json'), 'utf-8'),
+) as {
+  globalSecondaryIndexes: {
+    indexName: string;
+    partitionKey: string;
+    sortKey?: string;
+  }[];
+};
 
 const [tableName, port] = process.argv.slice(2);
 const endpoint = \`http://localhost:\${port}\`;
@@ -541,11 +577,13 @@ const waitForTableActive = async (
 const ensureTable = async (
   tblClient: DynamoDBClient,
   tblName: string,
-  gsIs: { indexName: string; partitionKey: string; sortKey: string }[],
+  gsIs: { indexName: string; partitionKey: string; sortKey?: string }[],
 ): Promise<void> => {
   const gsiAttributeDefinitions = gsIs.flatMap((gsi) => [
     { AttributeName: gsi.partitionKey, AttributeType: 'S' as const },
-    { AttributeName: gsi.sortKey, AttributeType: 'S' as const },
+    ...(gsi.sortKey
+      ? [{ AttributeName: gsi.sortKey, AttributeType: 'S' as const }]
+      : []),
   ]);
   const attributeDefinitions = [
     { AttributeName: 'pk', AttributeType: 'S' as const },
@@ -559,7 +597,9 @@ const ensureTable = async (
     IndexName: gsi.indexName,
     KeySchema: [
       { AttributeName: gsi.partitionKey, KeyType: 'HASH' as const },
-      { AttributeName: gsi.sortKey, KeyType: 'RANGE' as const },
+      ...(gsi.sortKey
+        ? [{ AttributeName: gsi.sortKey, KeyType: 'RANGE' as const }]
+        : []),
     ],
     Projection: { ProjectionType: 'ALL' as const },
   }));
@@ -626,7 +666,14 @@ const ensureTable = async (
               TableName: tblName,
               AttributeDefinitions: [
                 { AttributeName: gsi.partitionKey, AttributeType: 'S' },
-                { AttributeName: gsi.sortKey, AttributeType: 'S' },
+                ...(gsi.sortKey
+                  ? [
+                      {
+                        AttributeName: gsi.sortKey,
+                        AttributeType: 'S' as const,
+                      },
+                    ]
+                  : []),
               ],
               GlobalSecondaryIndexUpdates: [
                 {
@@ -634,7 +681,9 @@ const ensureTable = async (
                     IndexName: gsi.indexName,
                     KeySchema: [
                       { AttributeName: gsi.partitionKey, KeyType: 'HASH' },
-                      { AttributeName: gsi.sortKey, KeyType: 'RANGE' },
+                      ...(gsi.sortKey
+                        ? [{ AttributeName: gsi.sortKey, KeyType: 'RANGE' }]
+                        : []),
                     ],
                     Projection: { ProjectionType: 'ALL' },
                   },
@@ -654,7 +703,7 @@ const ensureTable = async (
   }
 };
 
-await ensureTable(client, tableName, GLOBAL_SECONDARY_INDEXES);
+await ensureTable(client, tableName, globalSecondaryIndexes);
 "
 `;
 
@@ -889,24 +938,6 @@ exports[`ts#dynamodb generator > should generate the dynamodb project > packages
 "
 `;
 
-exports[`ts#dynamodb generator > should generate the dynamodb project > packages/my-table/src/gsi.ts 1`] = `
-"// GSIs to synchronize on the local table at startup and provision in infrastructure.
-// ElectroDB names GSI keys gsi{n}pk / gsi{n}sk — add one entry per index defined in your entities.
-export const GLOBAL_SECONDARY_INDEXES = [
-  {
-    indexName: 'gsi1pk-gsi1sk-index',
-    partitionKey: 'gsi1pk',
-    sortKey: 'gsi1sk',
-  },
-  {
-    indexName: 'gsi2pk-gsi2sk-index',
-    partitionKey: 'gsi2pk',
-    sortKey: 'gsi2sk',
-  },
-];
-"
-`;
-
 exports[`ts#dynamodb generator > should generate the dynamodb project > packages/my-table/src/index.ts 1`] = `
 "export {
   PACKAGE_NAME,
@@ -917,7 +948,6 @@ exports[`ts#dynamodb generator > should generate the dynamodb project > packages
   LOCAL_TABLE_NAME,
 } from './constants.js';
 export { getDynamoDBClient, resolveTableName } from './client.js';
-export { GLOBAL_SECONDARY_INDEXES } from './gsi.js';
 export * from './entities/index.js';
 "
 `;
@@ -1036,9 +1066,13 @@ export abstract class DynamoDBTable extends Construct {
 
 exports[`ts#dynamodb generator > should generate the dynamodb project 2`] = `
 "import { Construct } from 'constructs';
-import { PACKAGE_NAME, GLOBAL_SECONDARY_INDEXES } from ':proj/my-table';
+import { PACKAGE_NAME } from ':proj/my-table';
 import { AttributeType, ProjectionType } from 'aws-cdk-lib/aws-dynamodb';
 import { DynamoDBTable, DynamoDBTableProps } from '../../core/dynamodb.js';
+import { findWorkspaceRoot } from '../../core/workspace.js';
+import { readFileSync } from 'fs';
+import { join } from 'path';
+import { fileURLToPath } from 'url';
 
 export type MyTableProps = Omit<DynamoDBTableProps, 'runtimeConfigKey'>;
 
@@ -1049,11 +1083,29 @@ export class MyTable extends DynamoDBTable {
       runtimeConfigKey: PACKAGE_NAME,
     });
 
-    for (const gsi of GLOBAL_SECONDARY_INDEXES) {
+    const { globalSecondaryIndexes } = JSON.parse(
+      readFileSync(
+        join(
+          findWorkspaceRoot(fileURLToPath(new URL(import.meta.url))),
+          'packages/my-table/dynamodb.config.json',
+        ),
+        'utf-8',
+      ),
+    ) as {
+      globalSecondaryIndexes: {
+        indexName: string;
+        partitionKey: string;
+        sortKey?: string;
+      }[];
+    };
+
+    for (const gsi of globalSecondaryIndexes) {
       this.table.addGlobalSecondaryIndex({
         indexName: gsi.indexName,
         partitionKey: { name: gsi.partitionKey, type: AttributeType.STRING },
-        sortKey: { name: gsi.sortKey, type: AttributeType.STRING },
+        ...(gsi.sortKey && {
+          sortKey: { name: gsi.sortKey, type: AttributeType.STRING },
+        }),
         projectionType: ProjectionType.ALL,
       });
     }
@@ -1081,7 +1133,20 @@ exports[`ts#dynamodb generator > should generate with infra=none then upgrade to
   ResourceInUseException,
   UpdateTableCommand,
 } from '@aws-sdk/client-dynamodb';
-import { GLOBAL_SECONDARY_INDEXES } from '../src/gsi.js';
+import { readFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const { globalSecondaryIndexes } = JSON.parse(
+  readFileSync(join(__dirname, '../dynamodb.config.json'), 'utf-8'),
+) as {
+  globalSecondaryIndexes: {
+    indexName: string;
+    partitionKey: string;
+    sortKey?: string;
+  }[];
+};
 
 const [tableName, port] = process.argv.slice(2);
 const endpoint = \`http://localhost:\${port}\`;
@@ -1120,11 +1185,13 @@ const waitForTableActive = async (
 const ensureTable = async (
   tblClient: DynamoDBClient,
   tblName: string,
-  gsIs: { indexName: string; partitionKey: string; sortKey: string }[],
+  gsIs: { indexName: string; partitionKey: string; sortKey?: string }[],
 ): Promise<void> => {
   const gsiAttributeDefinitions = gsIs.flatMap((gsi) => [
     { AttributeName: gsi.partitionKey, AttributeType: 'S' as const },
-    { AttributeName: gsi.sortKey, AttributeType: 'S' as const },
+    ...(gsi.sortKey
+      ? [{ AttributeName: gsi.sortKey, AttributeType: 'S' as const }]
+      : []),
   ]);
   const attributeDefinitions = [
     { AttributeName: 'pk', AttributeType: 'S' as const },
@@ -1138,7 +1205,9 @@ const ensureTable = async (
     IndexName: gsi.indexName,
     KeySchema: [
       { AttributeName: gsi.partitionKey, KeyType: 'HASH' as const },
-      { AttributeName: gsi.sortKey, KeyType: 'RANGE' as const },
+      ...(gsi.sortKey
+        ? [{ AttributeName: gsi.sortKey, KeyType: 'RANGE' as const }]
+        : []),
     ],
     Projection: { ProjectionType: 'ALL' as const },
   }));
@@ -1205,7 +1274,14 @@ const ensureTable = async (
               TableName: tblName,
               AttributeDefinitions: [
                 { AttributeName: gsi.partitionKey, AttributeType: 'S' },
-                { AttributeName: gsi.sortKey, AttributeType: 'S' },
+                ...(gsi.sortKey
+                  ? [
+                      {
+                        AttributeName: gsi.sortKey,
+                        AttributeType: 'S' as const,
+                      },
+                    ]
+                  : []),
               ],
               GlobalSecondaryIndexUpdates: [
                 {
@@ -1213,7 +1289,9 @@ const ensureTable = async (
                     IndexName: gsi.indexName,
                     KeySchema: [
                       { AttributeName: gsi.partitionKey, KeyType: 'HASH' },
-                      { AttributeName: gsi.sortKey, KeyType: 'RANGE' },
+                      ...(gsi.sortKey
+                        ? [{ AttributeName: gsi.sortKey, KeyType: 'RANGE' }]
+                        : []),
                     ],
                     Projection: { ProjectionType: 'ALL' },
                   },
@@ -1233,7 +1311,7 @@ const ensureTable = async (
   }
 };
 
-await ensureTable(client, tableName, GLOBAL_SECONDARY_INDEXES);
+await ensureTable(client, tableName, globalSecondaryIndexes);
 "
 `;
 
@@ -1468,24 +1546,6 @@ exports[`ts#dynamodb generator > should generate with infra=none then upgrade to
 "
 `;
 
-exports[`ts#dynamodb generator > should generate with infra=none then upgrade to infra=dynamodb > packages/my-table/src/gsi.ts 1`] = `
-"// GSIs to synchronize on the local table at startup and provision in infrastructure.
-// ElectroDB names GSI keys gsi{n}pk / gsi{n}sk — add one entry per index defined in your entities.
-export const GLOBAL_SECONDARY_INDEXES = [
-  {
-    indexName: 'gsi1pk-gsi1sk-index',
-    partitionKey: 'gsi1pk',
-    sortKey: 'gsi1sk',
-  },
-  {
-    indexName: 'gsi2pk-gsi2sk-index',
-    partitionKey: 'gsi2pk',
-    sortKey: 'gsi2sk',
-  },
-];
-"
-`;
-
 exports[`ts#dynamodb generator > should generate with infra=none then upgrade to infra=dynamodb > packages/my-table/src/index.ts 1`] = `
 "export {
   PACKAGE_NAME,
@@ -1496,7 +1556,6 @@ exports[`ts#dynamodb generator > should generate with infra=none then upgrade to
   LOCAL_TABLE_NAME,
 } from './constants.js';
 export { getDynamoDBClient, resolveTableName } from './client.js';
-export { GLOBAL_SECONDARY_INDEXES } from './gsi.js';
 export * from './entities/index.js';
 "
 `;

package/src/ts/dynamodb/files/dynamodb.config.json

@@ -0,0 +1,14 @@
+{
+  "globalSecondaryIndexes": [
+    {
+      "indexName": "gsi1pk-gsi1sk-index",
+      "partitionKey": "gsi1pk",
+      "sortKey": "gsi1sk"
+    },
+    {
+      "indexName": "gsi2pk-gsi2sk-index",
+      "partitionKey": "gsi2pk",
+      "sortKey": "gsi2sk"
+    }
+  ]
+}

package/src/ts/dynamodb/files/scripts/create-local-table.ts.template

@@ -6,7 +6,14 @@ import {
   ResourceInUseException,
   UpdateTableCommand,
 } from '@aws-sdk/client-dynamodb';
-import { GLOBAL_SECONDARY_INDEXES } from '../src/gsi.js';
+import { readFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const { globalSecondaryIndexes } = JSON.parse(
+  readFileSync(join(__dirname, '../dynamodb.config.json'), 'utf-8'),
+) as { globalSecondaryIndexes: { indexName: string; partitionKey: string; sortKey?: string }[] };
 
 const [tableName, port] = process.argv.slice(2);
 const endpoint = `http://localhost:${port}`;
@@ -45,11 +52,11 @@ const waitForTableActive = async (
 const ensureTable = async (
   tblClient: DynamoDBClient,
   tblName: string,
-  gsIs: { indexName: string; partitionKey: string; sortKey: string }[],
+  gsIs: { indexName: string; partitionKey: string; sortKey?: string }[],
 ): Promise<void> => {
   const gsiAttributeDefinitions = gsIs.flatMap((gsi) => [
     { AttributeName: gsi.partitionKey, AttributeType: 'S' as const },
-    { AttributeName: gsi.sortKey, AttributeType: 'S' as const },
+    ...(gsi.sortKey ? [{ AttributeName: gsi.sortKey, AttributeType: 'S' as const }] : []),
   ]);
   const attributeDefinitions = [
     { AttributeName: 'pk', AttributeType: 'S' as const },
@@ -63,7 +70,7 @@ const ensureTable = async (
     IndexName: gsi.indexName,
     KeySchema: [
       { AttributeName: gsi.partitionKey, KeyType: 'HASH' as const },
-      { AttributeName: gsi.sortKey, KeyType: 'RANGE' as const },
+      ...(gsi.sortKey ? [{ AttributeName: gsi.sortKey, KeyType: 'RANGE' as const }] : []),
     ],
     Projection: { ProjectionType: 'ALL' as const },
   }));
@@ -130,7 +137,7 @@ const ensureTable = async (
               TableName: tblName,
               AttributeDefinitions: [
                 { AttributeName: gsi.partitionKey, AttributeType: 'S' },
-                { AttributeName: gsi.sortKey, AttributeType: 'S' },
+                ...(gsi.sortKey ? [{ AttributeName: gsi.sortKey, AttributeType: 'S' as const }] : []),
               ],
               GlobalSecondaryIndexUpdates: [
                 {
@@ -138,7 +145,7 @@ const ensureTable = async (
                     IndexName: gsi.indexName,
                     KeySchema: [
                       { AttributeName: gsi.partitionKey, KeyType: 'HASH' },
-                      { AttributeName: gsi.sortKey, KeyType: 'RANGE' },
+                      ...(gsi.sortKey ? [{ AttributeName: gsi.sortKey, KeyType: 'RANGE' }] : []),
                     ],
                     Projection: { ProjectionType: 'ALL' },
                   },
@@ -158,4 +165,4 @@ const ensureTable = async (
   }
 };
 
-await ensureTable(client, tableName, GLOBAL_SECONDARY_INDEXES);
+await ensureTable(client, tableName, globalSecondaryIndexes);

package/src/ts/dynamodb/files/src/index.ts.template

@@ -7,5 +7,4 @@ export {
   LOCAL_TABLE_NAME,
 } from './constants.js';
 export { getDynamoDBClient, resolveTableName } from './client.js';
-export { GLOBAL_SECONDARY_INDEXES } from './gsi.js';
 export * from './entities/index.js';

package/src/ts/dynamodb/generator.js

@@ -88,13 +88,15 @@ const tsDynamoDBGenerator = async (tree, options) => {
             nameKebabCase,
             dynamoPackageAlias: (0, npm_scope_1.toScopeAlias)(fullyQualifiedName),
             tableName: localTableName,
+            projectRoot: dir,
         });
     }
     (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
         '@aws-sdk/client-dynamodb',
         'electrodb',
         '@aws-lambda-powertools/parameters',
-    ]), (0, versions_1.withVersions)(['tsx', '@types/aws-lambda']));
+        '@aws-sdk/client-appconfigdata',
+    ]), (0, versions_1.withVersions)(['tsx', '@types/aws-lambda', '@types/node']));
     await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TS_DYNAMODB_GENERATOR_INFO]);
     await (0, format_1.formatFilesInSubtree)(tree);
     return () => {

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

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

package/src/ts/lib/grit/vitest-pass-with-no-tests.grit

@@ -1,7 +1,4 @@
-`test: { $props }` => raw`test: {
-    passWithNoTests: true,
-    $props
-  }` where {
+`test: { $props }` => `test: { passWithNoTests: true, $props }` where {
   $props <: within `defineConfig($_)`,
   $props <: not some `passWithNoTests: $_`
 }

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

@@ -44,6 +44,8 @@ export class SnapshotBedrockServer
 {
   public readonly dockerImage: AgentRuntimeArtifact;
   public readonly agentCoreRuntime: Runtime;
+  /** Default Gateway target name for this MCP server. */
+  public readonly mcpServerName = 'snapshot-bedrock-server';
 
   constructor(
     scope: Construct,
@@ -464,6 +466,59 @@ resource "aws_bedrockagentcore_agent_runtime" "agent_runtime" {
   ]
 }
 
+# MCP consumers (e.g. gateway targets, which fetch tools at creation) can race
+# the runtime's first cold start, so probe it until it serves MCP. The ARN
+# output is routed through this resource so consumers wait for readiness.
+resource "null_resource" "runtime_ready" {
+  count = var.server_protocol == "MCP" ? 1 : 0
+
+  triggers = {
+    runtime_arn = aws_bedrockagentcore_agent_runtime.agent_runtime.agent_runtime_arn
+  }
+
+  provisioner "local-exec" {
+    command = <<-EOT
+      uv run --with boto3 python -c "
+import boto3
+import json
+import time
+import uuid
+
+runtime_arn = '\${self.triggers.runtime_arn}'
+client = boto3.client('bedrock-agentcore')
+initialize_request = json.dumps({
+    'jsonrpc': '2.0',
+    'id': 1,
+    'method': 'initialize',
+    'params': {
+        'protocolVersion': '2025-03-26',
+        'capabilities': {},
+        'clientInfo': {'name': 'readiness-probe', 'version': '1.0'},
+    },
+})
+
+deadline = time.time() + 3 * 60
+while True:
+    try:
+        client.invoke_agent_runtime(
+            agentRuntimeArn=runtime_arn,
+            runtimeSessionId=f'readiness-probe-{uuid.uuid4()}',
+            contentType='application/json',
+            accept='application/json, text/event-stream',
+            payload=initialize_request,
+        )
+        break
+    except Exception:
+        if time.time() >= deadline:
+            raise
+        time.sleep(5)
+
+print(f'Runtime {runtime_arn} is serving MCP')
+"
+    EOT
+  }
+}
+
 # Outputs
 output "agent_core_runtime_role_arn" {
   description = "ARN of the Agent Core Runtime IAM role"
@@ -481,8 +536,8 @@ output "agent_runtime_name" {
 }
 
 output "agent_core_runtime_arn" {
-  description = "ARN of the Bedrock Agent Core runtime"
-  value       = aws_bedrockagentcore_agent_runtime.agent_runtime.agent_runtime_arn
+  description = "ARN of the Bedrock Agent Core runtime. For MCP runtimes the value flows through the readiness probe, so consumers wait until the runtime serves MCP."
+  value       = var.server_protocol == "MCP" ? null_resource.runtime_ready[0].triggers.runtime_arn : aws_bedrockagentcore_agent_runtime.agent_runtime.agent_runtime_arn
 }
 
 output "agent_runtime_id" {

package/src/ts/nx-generator/generator.js

@@ -64,6 +64,8 @@ const tsNxGeneratorGenerator = async (tree, options) => {
         }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
         // Update the docs config to add the page entry to the Generator guides sidebar section
         await (0, ast_1.applyGritQL)(tree, (0, devkit_1.joinPathFragments)('docs', 'astro.config.mjs'), `\`items: [$items]\` where { $items <: within \`sidebar: [$_]\`, $items <: contains \`'ts#project'\`, $items <: not contains \`'/guides/${enhancedOptions.nameKebabCase}'\`, $items += \`, { label: '${name}', link: '/guides/${enhancedOptions.nameKebabCase}' }\` }`);
+        // Expose the generator from the SDK for known prefixes (ts# / py#)
+        addSdkExport(tree, plugin.root, name, generatorSubDir, enhancedOptions);
     }
     else {
         // Local generator in a project other than nx-plugin-for-aws
@@ -116,5 +118,32 @@ const incrementMetric = (metrics) => {
     const maxMetric = Math.max(...metrics.map((m) => Number(m.slice(1))));
     return `g${maxMetric + 1}`;
 };
+// Maps a generator name prefix to the SDK entry point that should re-export it
+const SDK_EXPORT_PREFIXES = {
+    'ts#': 'ts',
+    'py#': 'py',
+};
+// Re-exports a generated generator from the matching SDK entry point so it is
+// available programmatically as part of @aws/nx-plugin's SDK
+const addSdkExport = (tree, pluginRoot, name, generatorSubDir, options) => {
+    const prefix = Object.keys(SDK_EXPORT_PREFIXES).find((p) => name.startsWith(p));
+    if (!prefix) {
+        return;
+    }
+    const sdkPath = (0, devkit_1.joinPathFragments)(pluginRoot, 'sdk', `${SDK_EXPORT_PREFIXES[prefix]}.ts`);
+    const generatorExport = `${options.nameCamelCase}Generator`;
+    const schemaExport = `${options.namePascalCase}GeneratorSchema`;
+    const moduleBase = `../src/${generatorSubDir}`;
+    const contents = tree.exists(sdkPath) ? tree.read(sdkPath).toString() : '';
+    // Idempotent: skip if this generator is already exported
+    if (contents.includes(`${moduleBase}/generator`)) {
+        return;
+    }
+    const block = `// ${options.namePascalCase} Generator\nexport { ${generatorExport} } from '${moduleBase}/generator';\nexport type { ${schemaExport} } from '${moduleBase}/schema';\n`;
+    const prefixContents = contents.trim()
+        ? `${contents.replace(/\s*$/, '')}\n\n`
+        : '';
+    tree.write(sdkPath, `${prefixContents}${block}`);
+};
 exports.default = exports.tsNxGeneratorGenerator;
 //# sourceMappingURL=generator.js.map