@aws/nx-plugin 1.0.0-rc.11 → 1.0.0-rc.13

package/src/agentcore-gateway/files/project/serve-local.ts.template

@@ -0,0 +1,133 @@
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import {
+  CallToolRequestSchema,
+  ListToolsRequestSchema,
+} from '@modelcontextprotocol/sdk/types.js';
+import express from 'express';
+import { AsyncLocalStorage } from 'node:async_hooks';
+
+const PORT = parseInt(process.env.PORT || '<%- port %>');
+const PREFIX_SEPARATOR = '___';
+const SESSION_HEADER = 'x-amzn-bedrock-agentcore-runtime-session-id';
+
+interface AttachedMcpServer {
+  name: string;
+  url: string;
+}
+
+// MCP servers attached to this gateway, maintained by the
+// `agentcore-gateway#mcp-connection` generator.
+const ATTACHED_MCP_SERVERS: AttachedMcpServer[] = [<% attachedMcpServers.forEach((s) => { %>
+  { name: '<%- s.name %>', url: 'http://localhost:<%- s.port %>/mcp' },<% }); %>
+];
+
+// Forwards the inbound request's AgentCore session header to upstream calls
+const sessionContext = new AsyncLocalStorage<string | undefined>();
+
+const createUpstreamClient = async (url: string): Promise<Client> => {
+  const fetchWithSession: typeof fetch = async (input, init) => {
+    const headers = new Headers(init?.headers);
+    const sessionId = sessionContext.getStore();
+    if (sessionId) headers.set(SESSION_HEADER, sessionId);
+    return fetch(input, { ...init, headers });
+  };
+  const client = new Client({ name: '<%- nameKebabCase %>', version: '1.0.0' });
+  await client.connect(
+    new StreamableHTTPClientTransport(new URL(url), {
+      fetch: fetchWithSession,
+    }),
+  );
+  return client;
+};
+
+/**
+ * Local gateway for <%- nameClassName %>: a single MCP endpoint aggregating
+ * every attached MCP server, with tools exposed as `<target>___<tool>` to
+ * match the deployed AgentCore Gateway. Unlike the real gateway, Cedar
+ * policies are not evaluated and there is no semantic tool search.
+ */
+const createServer = async (): Promise<Server> => {
+  const server = new Server(
+    { name: '<%- nameKebabCase %>', version: '1.0.0' },
+    { capabilities: { tools: {} } },
+  );
+
+  server.setRequestHandler(ListToolsRequestSchema, async () => {
+    const lists = await Promise.all(
+      ATTACHED_MCP_SERVERS.map(async (s) => {
+        const client = await createUpstreamClient(s.url);
+        try {
+          const { tools } = await client.listTools();
+          return tools.map((t) => ({
+            ...t,
+            name: `${s.name}${PREFIX_SEPARATOR}${t.name}`,
+          }));
+        } finally {
+          await client.close();
+        }
+      }),
+    );
+    return { tools: lists.flat() };
+  });
+
+  server.setRequestHandler(CallToolRequestSchema, async (request) => {
+    const name = request.params.name;
+    const upstream = ATTACHED_MCP_SERVERS.find((s) =>
+      name.startsWith(`${s.name}${PREFIX_SEPARATOR}`),
+    );
+    if (!upstream) {
+      throw new Error(`Unknown tool: ${name}`);
+    }
+    const client = await createUpstreamClient(upstream.url);
+    try {
+      return await client.callTool({
+        ...request.params,
+        name: name.slice(upstream.name.length + PREFIX_SEPARATOR.length),
+      });
+    } finally {
+      await client.close();
+    }
+  });
+
+  return server;
+};
+
+const app = express();
+app.use(express.json());
+
+app.post('/mcp', async (req, res) => {
+  const sessionId = req.headers[SESSION_HEADER];
+  await sessionContext.run(
+    typeof sessionId === 'string' ? sessionId : undefined,
+    async () => {
+      try {
+        const server = await createServer();
+        const transport = new StreamableHTTPServerTransport({
+          sessionIdGenerator: undefined,
+        });
+        res.on('close', () => {
+          transport.close();
+          server.close();
+        });
+        await server.connect(transport);
+        await transport.handleRequest(req, res, req.body);
+      } catch (error) {
+        console.error('Error handling MCP request:', error);
+        if (!res.headersSent) {
+          res.status(500).json({
+            jsonrpc: '2.0',
+            error: { code: -32603, message: 'Internal server error' },
+            id: null,
+          });
+        }
+      }
+    },
+  );
+});
+
+app.listen(PORT, () => {
+  console.log(`<%- nameKebabCase %>: local gateway listening on port ${PORT}`);
+});

package/src/agentcore-gateway/generator.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type GeneratorCallback, type ProjectConfiguration, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../utils/nx';
+import type { AgentcoreGatewayGeneratorSchema } from './schema';
+export declare const AGENTCORE_GATEWAY_GENERATOR_INFO: NxGeneratorInfo;
+export declare const agentcoreGatewayGenerator: (tree: Tree, options: AgentcoreGatewayGeneratorSchema) => Promise<GeneratorCallback>;
+/**
+ * Gateway details stored in the gateway project's metadata.
+ */
+export interface AgentCoreGatewayMetadata {
+    name: string;
+    rc: string;
+    protocol: string;
+    auth: string;
+    port: number;
+}
+/**
+ * Read a gateway project's metadata, validating it was generated by the
+ * agentcore-gateway generator.
+ */
+export declare const readAgentCoreGatewayMetadata: (project: ProjectConfiguration) => AgentCoreGatewayMetadata;
+export default agentcoreGatewayGenerator;

package/src/agentcore-gateway/generator.js

@@ -0,0 +1,129 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readAgentCoreGatewayMetadata = exports.agentcoreGatewayGenerator = exports.AGENTCORE_GATEWAY_GENERATOR_INFO = void 0;
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const devkit_1 = require("@nx/devkit");
+const agent_core_constructs_1 = require("../utils/agent-core-constructs/agent-core-constructs");
+const format_1 = require("../utils/format");
+const iac_1 = require("../utils/iac");
+const metrics_1 = require("../utils/metrics");
+const names_1 = require("../utils/names");
+const npm_scope_1 = require("../utils/npm-scope");
+const nx_1 = require("../utils/nx");
+const port_1 = require("../utils/port");
+const shared_constructs_1 = require("../utils/shared-constructs");
+const versions_1 = require("../utils/versions");
+exports.AGENTCORE_GATEWAY_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
+const agentcoreGatewayGenerator = async (tree, options) => {
+    const name = (0, names_1.kebabCase)(options.name);
+    const nameClassName = (0, names_1.toClassName)(name);
+    const parentDir = options.directory ?? 'packages';
+    const subDir = options.subDirectory ?? name;
+    const projectRoot = (0, devkit_1.joinPathFragments)(parentDir, subDir);
+    const fullyQualifiedName = `${(0, npm_scope_1.getNpmScopePrefix)(tree)}${name}`;
+    // Protocol / auth are fixed to mcp / iam in v1 — the enums accept only
+    // these values, but we still persist the resolved value in metadata so
+    // that connection generators can read it uniformly (and future additions
+    // are non-breaking).
+    const protocol = options.protocol ?? 'mcp';
+    const auth = options.auth ?? 'iam';
+    const cedarPolicy = options.cedarPolicy ?? true;
+    const infra = options.infra ?? 'agentcore';
+    // serve-local.ts is the local gateway: a continuous MCP aggregator chaining
+    // onto attached MCP servers' serve-local targets (added by the
+    // mcp-connection generator), so a single `nx run <agent>:<agent>-serve-local`
+    // boots the gateway and every attached MCP server together.
+    //
+    // `serve` exists for parity with other generators; the deployed Gateway is
+    // a managed AWS resource, so `serve`-mode agents talk to it via runtime
+    // config and the local gateway sits idle.
+    const localGatewayTarget = (port) => ({
+        executor: 'nx:run-commands',
+        continuous: true,
+        options: {
+            command: 'tsx serve-local.ts',
+            cwd: '{projectRoot}',
+            env: { PORT: `${port}` },
+        },
+        dependsOn: [],
+    });
+    let project;
+    if ((0, nx_1.projectExists)(tree, fullyQualifiedName)) {
+        project = (0, nx_1.readProjectConfigurationUnqualified)(tree, fullyQualifiedName);
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(tree, fullyQualifiedName, {
+            name: fullyQualifiedName,
+            root: projectRoot,
+            projectType: 'library',
+            sourceRoot: projectRoot,
+            tags: [],
+            targets: {},
+            metadata: {
+                generator: exports.AGENTCORE_GATEWAY_GENERATOR_INFO.id,
+            },
+        });
+        project = (0, nx_1.readProjectConfigurationUnqualified)(tree, fullyQualifiedName);
+    }
+    const port = (0, port_1.assignPort)(tree, project, 8100);
+    // Re-run: keep existing targets (their dependsOn may have been populated
+    // by the mcp-connection generator), just ensure both exist.
+    project.targets ??= {};
+    project.targets[`${name}-serve`] ??= localGatewayTarget(port);
+    project.targets[`${name}-serve-local`] ??= localGatewayTarget(port);
+    (0, devkit_1.updateProjectConfiguration)(tree, project.name, project);
+    // Scaffold the gateway project: serve-local.ts (+ Cedar policies if requested)
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'project'), projectRoot, { nameClassName, nameKebabCase: name, port, attachedMcpServers: [] }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    if (cedarPolicy) {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'cedar'), projectRoot, { nameClassName }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    }
+    (0, nx_1.addGeneratorMetadata)(tree, fullyQualifiedName, exports.AGENTCORE_GATEWAY_GENERATOR_INFO, {
+        name,
+        rc: nameClassName,
+        protocol,
+        auth,
+        port,
+    });
+    // serve-local.ts dependencies (+ ejs for Cedar policy rendering in the
+    // shared gateway construct)
+    (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)(['@modelcontextprotocol/sdk', 'express']), (0, versions_1.withVersions)(['tsx', '@types/express', 'ejs', '@types/ejs']));
+    // Wire up infra (CDK or Terraform); re-running with infra=agentcore adds
+    // the infrastructure to a previously infra-less gateway.
+    if (infra === 'agentcore') {
+        const iac = await (0, iac_1.resolveIac)(tree, options.iac);
+        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iac });
+        await (0, agent_core_constructs_1.addAgentCoreGatewayInfra)(tree, {
+            gatewayNameClassName: nameClassName,
+            gatewayNameKebabCase: name,
+            projectName: fullyQualifiedName,
+            projectDirectory: projectRoot,
+            cedarPolicy,
+            iac,
+        });
+    }
+    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
+        exports.AGENTCORE_GATEWAY_GENERATOR_INFO,
+    ]);
+    await (0, format_1.formatFilesInSubtree)(tree);
+    return () => {
+        (0, devkit_1.installPackagesTask)(tree);
+    };
+};
+exports.agentcoreGatewayGenerator = agentcoreGatewayGenerator;
+/**
+ * Read a gateway project's metadata, validating it was generated by the
+ * agentcore-gateway generator.
+ */
+const readAgentCoreGatewayMetadata = (project) => {
+    const metadata = project.metadata;
+    if (metadata?.generator !== exports.AGENTCORE_GATEWAY_GENERATOR_INFO.id) {
+        throw new Error(`Project '${project.name}' was not generated by the '${exports.AGENTCORE_GATEWAY_GENERATOR_INFO.id}' generator.`);
+    }
+    return metadata;
+};
+exports.readAgentCoreGatewayMetadata = readAgentCoreGatewayMetadata;
+exports.default = exports.agentcoreGatewayGenerator;
+//# sourceMappingURL=generator.js.map

package/src/agentcore-gateway/generator.js.map

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

package/src/agentcore-gateway/mcp-connection/generator.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { AgentcoreGatewayMcpConnectionGeneratorSchema } from './schema';
+export declare const AGENTCORE_GATEWAY_MCP_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
+/**
+ * Connect an AgentCore Gateway to an MCP server.
+ *
+ * Chains the gateway's serve-local target to the MCP server's serve-local
+ * target, and registers the server in the gateway's local serve-local.ts so
+ * the local gateway aggregates its tools. Users must still call
+ * `gateway.addMcpServer(...)` in their application stack to create the
+ * actual CDK/Terraform resource.
+ */
+export declare const agentcoreGatewayMcpConnectionGenerator: (tree: Tree, options: AgentcoreGatewayMcpConnectionGeneratorSchema) => Promise<GeneratorCallback>;
+export default agentcoreGatewayMcpConnectionGenerator;

package/src/agentcore-gateway/mcp-connection/generator.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.agentcoreGatewayMcpConnectionGenerator = exports.AGENTCORE_GATEWAY_MCP_CONNECTION_GENERATOR_INFO = void 0;
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const devkit_1 = require("@nx/devkit");
+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 nx_1 = require("../../utils/nx");
+const generator_1 = require("../generator");
+exports.AGENTCORE_GATEWAY_MCP_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
+/**
+ * Connect an AgentCore Gateway to an MCP server.
+ *
+ * Chains the gateway's serve-local target to the MCP server's serve-local
+ * target, and registers the server in the gateway's local serve-local.ts so
+ * the local gateway aggregates its tools. Users must still call
+ * `gateway.addMcpServer(...)` in their application stack to create the
+ * actual CDK/Terraform resource.
+ */
+const agentcoreGatewayMcpConnectionGenerator = async (tree, options) => {
+    const sourceProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.sourceProject);
+    const targetProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.targetProject);
+    const gateway = (0, generator_1.readAgentCoreGatewayMetadata)(sourceProject);
+    const mcpComponent = options.targetComponent;
+    if (!mcpComponent) {
+        throw new Error(`Target project '${options.targetProject}' has no MCP server component metadata. Did you run the 'ts#mcp-server' or 'py#mcp-server' generator?`);
+    }
+    if (gateway.protocol !== 'mcp') {
+        throw new Error(`Gateway '${gateway.name}' has protocol='${gateway.protocol}'. MCP server targets can only be attached to MCP-protocol gateways.`);
+    }
+    if (mcpComponent.auth && mcpComponent.auth !== 'iam') {
+        throw new Error(`MCP server '${mcpComponent.name}' uses auth='${mcpComponent.auth}'. Gateway->MCP connections currently require the MCP server to use IAM authentication.`);
+    }
+    const gatewayKebabCase = (0, names_1.kebabCase)(gateway.rc);
+    const gatewayServeLocalTargetName = `${gatewayKebabCase}-serve-local`;
+    // The target name must match what the deployed Gateway uses
+    // (`mcpServerName` on the MCP construct, derived from the project's class
+    // name) so `<target>___<tool>` resolves identically locally and deployed.
+    // Component-level `name` would clash whenever two MCP server projects
+    // both default to `mcp-server`.
+    const mcpTargetName = (0, names_1.kebabCase)(mcpComponent.rc);
+    const mcpComponentName = mcpComponent.name ?? 'mcp-server';
+    const mcpServeLocalTargetName = `${mcpComponentName}-serve-local`;
+    const mcpPort = mcpComponent.port ?? 8000;
+    // 1. Wire serve-local chain
+    if (sourceProject.targets?.[gatewayServeLocalTargetName]) {
+        (0, nx_1.addDependencyToTargetIfNotPresent)(sourceProject, gatewayServeLocalTargetName, {
+            projects: [targetProject.name],
+            target: mcpServeLocalTargetName,
+        });
+        (0, devkit_1.updateProjectConfiguration)(tree, sourceProject.name, sourceProject);
+    }
+    // 2. Register the MCP server in the gateway's local serve-local.ts
+    const serveTsPath = (0, devkit_1.joinPathFragments)(sourceProject.root, 'serve-local.ts');
+    if (tree.exists(serveTsPath)) {
+        const entry = `{ name: '${mcpTargetName}', url: 'http://localhost:${mcpPort}/mcp' }`;
+        await (0, ast_1.applyGritQL)(tree, serveTsPath, `or {
+  \`const ATTACHED_MCP_SERVERS: AttachedMcpServer[] = []\` => \`const ATTACHED_MCP_SERVERS: AttachedMcpServer[] = [${entry}]\`,
+  \`const ATTACHED_MCP_SERVERS: AttachedMcpServer[] = [$items]\` => \`const ATTACHED_MCP_SERVERS: AttachedMcpServer[] = [${entry}, $items]\` where {
+    $items <: not contains \`'${mcpTargetName}'\`
+  }
+}`);
+    }
+    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
+        exports.AGENTCORE_GATEWAY_MCP_CONNECTION_GENERATOR_INFO,
+    ]);
+    await (0, format_1.formatFilesInSubtree)(tree);
+    return () => {
+        (0, devkit_1.installPackagesTask)(tree);
+    };
+};
+exports.agentcoreGatewayMcpConnectionGenerator = agentcoreGatewayMcpConnectionGenerator;
+exports.default = exports.agentcoreGatewayMcpConnectionGenerator;
+//# sourceMappingURL=generator.js.map

package/src/agentcore-gateway/mcp-connection/generator.js.map

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

package/src/agentcore-gateway/mcp-connection/schema.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { ComponentMetadata } from '../../utils/nx';
+
+export interface AgentcoreGatewayMcpConnectionGeneratorSchema {
+  sourceProject: string;
+  targetProject: string;
+  sourceComponent?: ComponentMetadata;
+  targetComponent?: ComponentMetadata;
+}

package/src/agentcore-gateway/mcp-connection/schema.json

@@ -0,0 +1,26 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "agentcore-gateway#mcp-connection",
+  "title": "agentcore-gateway#mcp-connection",
+  "description": "Connect an AgentCore Gateway to an MCP server",
+  "type": "object",
+  "properties": {
+    "sourceProject": {
+      "type": "string",
+      "description": "The gateway project"
+    },
+    "targetProject": {
+      "type": "string",
+      "description": "The MCP server project"
+    },
+    "sourceComponent": {
+      "type": "string",
+      "description": "The gateway component in the source project"
+    },
+    "targetComponent": {
+      "type": "string",
+      "description": "The MCP server component in the target project"
+    }
+  },
+  "required": ["sourceProject", "targetProject"]
+}

package/src/agentcore-gateway/schema.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { IacOption } from '../utils/iac';
+
+export interface AgentcoreGatewayGeneratorSchema {
+  name: string;
+  directory?: string;
+  subDirectory?: string;
+  protocol?: 'mcp';
+  auth?: 'iam';
+  cedarPolicy?: boolean;
+  infra?: 'agentcore' | 'none';
+  iac: IacOption;
+}

package/src/agentcore-gateway/schema.json

@@ -0,0 +1,65 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "agentcore-gateway",
+  "title": "agentcore-gateway",
+  "description": "Generate an AgentCore Gateway project",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of your AgentCore Gateway project",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What would you like to call your AgentCore Gateway?",
+      "x-priority": "important"
+    },
+    "directory": {
+      "type": "string",
+      "description": "Parent directory where the gateway project is placed.",
+      "default": "packages"
+    },
+    "subDirectory": {
+      "type": "string",
+      "description": "The sub directory the project is placed in. By default this is the project name."
+    },
+    "protocol": {
+      "type": "string",
+      "description": "The inbound protocol exposed by your gateway. Only mcp is supported today; additional protocols may be added in future.",
+      "enum": ["mcp"],
+      "default": "mcp",
+      "x-priority": "important"
+    },
+    "auth": {
+      "type": "string",
+      "description": "The method used to authenticate inbound requests to your gateway. Only iam is supported today; cognito and custom-jwt may be added in future.",
+      "enum": ["iam"],
+      "default": "iam",
+      "x-priority": "important"
+    },
+    "cedarPolicy": {
+      "type": "boolean",
+      "description": "Whether to include a Cedar policy engine enforcing fine-grained authorization on the gateway.",
+      "default": true,
+      "x-priority": "important"
+    },
+    "infra": {
+      "type": "string",
+      "description": "The type of infrastructure to host your gateway. Select none for no hosting.",
+      "x-prompt": "How would you like to host your gateway?",
+      "enum": ["agentcore", "none"],
+      "default": "agentcore",
+      "x-priority": "important"
+    },
+    "iac": {
+      "type": "string",
+      "description": "The preferred IaC provider. By default this is inherited from your initial selection.",
+      "enum": ["inherit", "cdk", "terraform"],
+      "x-priority": "important",
+      "default": "inherit",
+      "x-prompt": "Which provider would you like to manage your infrastructure? (default: inherit)"
+    }
+  },
+  "required": ["name"]
+}

package/src/connection/generator.d.ts

@@ -10,7 +10,7 @@ import type { ConnectionGeneratorSchema } from './schema';
  * These can be project-level types (determined by introspection) or
  * component generator ids (from component metadata).
  */
-declare const SUPPORTED_PROJECT_TYPES: readonly ["ts#trpc-api", "py#fast-api", "react", "smithy", "ts#rdb", "ts#dynamodb"];
+declare const SUPPORTED_PROJECT_TYPES: readonly ["ts#trpc-api", "py#fast-api", "react", "smithy", "ts#rdb", "ts#dynamodb", "agentcore-gateway"];
 type ProjectType = (typeof SUPPORTED_PROJECT_TYPES)[number];
 export type Connection = {
     source: string;