@aws/agentcore 1.0.0-preview.12 → 1.0.0-preview.14

package/dist/schema/schemas/mcp.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgentCoreMcpRuntimeToolSchema = exports.McpRuntimeBindingSchema = exports.AgentCoreGatewaySchema = exports.GatewayPolicyEngineConfigurationSchema = exports.PolicyEngineModeSchema = exports.GatewayExceptionLevelSchema = exports.AgentCoreGatewayTargetSchema = exports.SchemaSourceSchema = exports.ToolComputeConfigSchema = exports.RuntimeConfigSchema = exports.IamPolicyDocumentSchema = exports.ToolImplementationBindingSchema = exports.ComputeHostSchema = exports.McpImplLanguageSchema = exports.LambdaFunctionArnConfigSchema = exports.ApiGatewayConfigSchema = exports.ApiGatewayToolConfigurationSchema = exports.ApiGatewayToolOverrideSchema = exports.ApiGatewayToolFilterSchema = exports.ApiGatewayHttpMethodSchema = exports.TARGET_TYPE_AUTH_CONFIG = exports.OutboundAuthSchema = exports.OutboundAuthTypeSchema = exports.GatewayTargetTypeSchema = void 0;
+exports.AgentCoreMcpRuntimeToolSchema = exports.McpRuntimeBindingSchema = exports.AgentCoreGatewaySchema = exports.GatewayProtocolTypeSchema = exports.GatewayPolicyEngineConfigurationSchema = exports.PolicyEngineModeSchema = exports.GatewayExceptionLevelSchema = exports.AgentCoreGatewayTargetSchema = exports.PassthroughConfigSchema = exports.PassthroughProtocolTypeSchema = exports.StickinessConfigSchema = exports.HttpRuntimeConfigSchema = exports.SchemaSourceSchema = exports.ToolComputeConfigSchema = exports.RuntimeConfigSchema = exports.IamPolicyDocumentSchema = exports.ToolImplementationBindingSchema = exports.ComputeHostSchema = exports.McpImplLanguageSchema = exports.LambdaFunctionArnConfigSchema = exports.ApiGatewayConfigSchema = exports.ApiGatewayToolConfigurationSchema = exports.ApiGatewayToolOverrideSchema = exports.ApiGatewayToolFilterSchema = exports.ApiGatewayHttpMethodSchema = exports.TARGET_TYPE_AUTH_CONFIG = exports.OutboundAuthSchema = exports.OutboundAuthTypeSchema = exports.REAL_KB_ID_PATTERN = exports.ConnectorIdSchema = exports.CONNECTOR_ID_VALUES = exports.CONNECTOR_ID = exports.MCP_TARGET_TYPES = exports.NON_MCP_TARGET_TYPES = exports.GatewayTargetTypeSchema = void 0;
 const constants_1 = require("../constants");
 const agent_env_1 = require("./agent-env");
 const auth_1 = require("./auth");
@@ -17,18 +17,67 @@ exports.GatewayTargetTypeSchema = zod_1.z.enum([
     'smithyModel',
     'apiGateway',
     'lambdaFunctionArn',
+    'httpRuntime',
+    'connector',
+    'passthrough',
+    'webSearch',
 ]);
+/**
+ * Target types that use the non-MCP (HTTP) protocol.
+ * These targets require a gateway with protocolType: "None".
+ */
+exports.NON_MCP_TARGET_TYPES = ['httpRuntime', 'passthrough'];
+/**
+ * Target types that use the MCP protocol.
+ */
+exports.MCP_TARGET_TYPES = [
+    'lambda',
+    'mcpServer',
+    'openApiSchema',
+    'smithyModel',
+    'apiGateway',
+    'lambdaFunctionArn',
+];
+// ============================================================================
+// Connector (managed-service gateway target)
+// ============================================================================
+/**
+ * Managed-service connector identifiers. The L3 maps each one to an operation
+ * name + Enabled list via CONNECTOR_DEFAULTS.
+ *
+ * Spec note: the original DevEx doc (cli-knowledge-bases-devex.md) uses
+ * `agentic-retrieve`, but the service accepts `bedrock-agentic-retrieve`. The
+ * latter is canonical.
+ */
+exports.CONNECTOR_ID = {
+    BEDROCK_KNOWLEDGE_BASES: 'bedrock-knowledge-bases',
+    BEDROCK_AGENTIC_RETRIEVE: 'bedrock-agentic-retrieve',
+};
+exports.CONNECTOR_ID_VALUES = [
+    exports.CONNECTOR_ID.BEDROCK_KNOWLEDGE_BASES,
+    exports.CONNECTOR_ID.BEDROCK_AGENTIC_RETRIEVE,
+];
+exports.ConnectorIdSchema = zod_1.z.enum(exports.CONNECTOR_ID_VALUES);
+/**
+ * Real Bedrock Knowledge Base IDs are 10 uppercase alphanumeric chars.
+ * KB names follow the standard primitive-name shape (1-48 chars, starts with a letter).
+ * The two formats can never collide, so a connector target's `knowledgeBaseId`
+ * field is unambiguously a project KB name or a literal external KB ID.
+ */
+exports.REAL_KB_ID_PATTERN = /^[A-Z0-9]{10}$/;
 // ============================================================================
 // Gateway Authorization Schemas
 // ============================================================================
 // Auth schemas (GatewayAuthorizerTypeSchema, CustomJwtAuthorizerConfigSchema, etc.)
 // are defined in ./auth.ts and exported via the barrel (index.ts).
-exports.OutboundAuthTypeSchema = zod_1.z.enum(['OAUTH', 'API_KEY', 'NONE']);
+exports.OutboundAuthTypeSchema = zod_1.z.enum(['OAUTH', 'API_KEY', 'NONE', 'GATEWAY_IAM_ROLE', 'JWT_PASSTHROUGH']);
 exports.OutboundAuthSchema = zod_1.z
     .object({
     type: exports.OutboundAuthTypeSchema.default('NONE'),
     credentialName: zod_1.z.string().min(1).optional(),
     scopes: zod_1.z.array(zod_1.z.string()).optional(),
+    service: zod_1.z.string().min(1).max(64).optional(),
+    region: zod_1.z.string().min(1).max(32).optional(),
 })
     .strict();
 // ============================================================================
@@ -48,6 +97,17 @@ exports.TARGET_TYPE_AUTH_CONFIG = {
     mcpServer: { authRequired: false, validAuthTypes: ['OAUTH', 'NONE'], iamRoleFallback: false },
     lambda: { authRequired: false, validAuthTypes: ['OAUTH', 'NONE'], iamRoleFallback: true },
     lambdaFunctionArn: { authRequired: false, validAuthTypes: ['OAUTH', 'NONE'], iamRoleFallback: true },
+    httpRuntime: { authRequired: false, validAuthTypes: ['OAUTH', 'NONE'], iamRoleFallback: true },
+    // Connector targets call the underlying managed service (Bedrock KB, etc.)
+    // via the gateway's IAM role. No outbound auth applies.
+    connector: { authRequired: false, validAuthTypes: [], iamRoleFallback: true },
+    passthrough: {
+        authRequired: true,
+        validAuthTypes: ['GATEWAY_IAM_ROLE', 'OAUTH', 'JWT_PASSTHROUGH'],
+        iamRoleFallback: false,
+    },
+    // Amazon Web Search is invoked via the gateway's IAM role. No outbound auth.
+    webSearch: { authRequired: false, validAuthTypes: [], iamRoleFallback: true },
 };
 // ============================================================================
 // API Gateway Target Schemas
@@ -255,6 +315,39 @@ exports.SchemaSourceSchema = zod_1.z.union([
     zod_1.z.object({ s3: SchemaS3SourceSchema }).strict(),
 ]);
 // ============================================================================
+// HTTP Runtime Configuration
+// ============================================================================
+exports.HttpRuntimeConfigSchema = zod_1.z
+    .object({
+    runtime: zod_1.z.string().min(1),
+    runtimeEndpoint: zod_1.z.string().min(1).optional(),
+})
+    .strict();
+// ============================================================================
+// Passthrough Target Configuration
+// ============================================================================
+exports.StickinessConfigSchema = zod_1.z
+    .object({
+    identifier: zod_1.z.string().min(1).max(256),
+    timeout: zod_1.z.number().int().min(1).max(86400).optional(),
+})
+    .strict();
+/**
+ * Passthrough protocol type. HTTP is NOT valid — use CUSTOM for plain HTTP/REST backends.
+ */
+exports.PassthroughProtocolTypeSchema = zod_1.z.enum(['MCP', 'A2A', 'INFERENCE', 'CUSTOM']);
+exports.PassthroughConfigSchema = zod_1.z
+    .object({
+    endpoint: zod_1.z
+        .string()
+        .min(1)
+        .regex(/^https:\/\/[a-zA-Z0-9\-.]+(:[0-9]{1,5})?(\/.*)?$/, 'Must be a valid HTTPS URL'),
+    /** Protocol type for the passthrough backend. Defaults to CUSTOM (generic HTTP/REST). */
+    protocolType: exports.PassthroughProtocolTypeSchema.default('CUSTOM'),
+    stickinessConfiguration: exports.StickinessConfigSchema.optional(),
+})
+    .strict();
+// ============================================================================
 // Gateway Target
 // ============================================================================
 /**
@@ -273,7 +366,7 @@ exports.AgentCoreGatewayTargetSchema = zod_1.z
     toolDefinitions: zod_1.z.array(mcp_defs_1.ToolDefinitionSchema).optional(),
     /** Compute configuration. Required for Lambda/Runtime scaffold targets. */
     compute: exports.ToolComputeConfigSchema.optional(),
-    /** MCP Server endpoint URL. Required for external MCP Server targets. */
+    /** Endpoint URL for mcpServer targets. */
     endpoint: zod_1.z.string().url().optional(),
     /** Outbound auth configuration for the target. */
     outboundAuth: exports.OutboundAuthSchema.optional(),
@@ -283,6 +376,47 @@ exports.AgentCoreGatewayTargetSchema = zod_1.z
     schemaSource: exports.SchemaSourceSchema.optional(),
     /** Lambda Function ARN configuration. Required for lambdaFunctionArn target type. */
     lambdaFunctionArn: exports.LambdaFunctionArnConfigSchema.optional(),
+    /** HTTP Runtime configuration. Required for httpRuntime target type. */
+    httpRuntime: exports.HttpRuntimeConfigSchema.optional(),
+    /**
+     * Managed-service connector identifier. Required for `connector` target type.
+     */
+    connectorId: exports.ConnectorIdSchema.optional(),
+    /**
+     * For `bedrock-knowledge-bases` connector targets: either a project KB
+     * name (references an entry in `knowledgeBases[]` on the project spec)
+     * or a literal 10-character KB ID (refers to an external KB this project
+     * does not own). The L3 disambiguates by regex match. Mutually exclusive
+     * with `knowledgeBaseIds`.
+     */
+    knowledgeBaseId: zod_1.z
+        .string()
+        .min(1)
+        .max(48)
+        .regex(/^[a-zA-Z0-9_-]+$/, 'Must be a KB name (1-48 chars, letters/digits/dash/underscore) or a 10-char KB ID')
+        .optional(),
+    /**
+     * For `bedrock-agentic-retrieve` connector targets only. List of project
+     * KB names or literal 10-char external KB IDs that this orchestrated
+     * retriever should fan out across. Each entry is disambiguated the same
+     * way `knowledgeBaseId` is. Mutually exclusive with `knowledgeBaseId`.
+     */
+    knowledgeBaseIds: zod_1.z
+        .array(zod_1.z
+        .string()
+        .min(1)
+        .max(48)
+        .regex(/^[a-zA-Z0-9_-]+$/, 'Each entry must be a KB name (1-48 chars) or a 10-char KB ID'))
+        .min(1)
+        .optional(),
+    /** Passthrough configuration. Required for passthrough target type. */
+    passthrough: exports.PassthroughConfigSchema.optional(),
+    /**
+     * For `webSearch` target type only. Domains to exclude from web search
+     * results. Maps to the connector's `domainFilter.exclude` parameterValue
+     * at synth time.
+     */
+    excludeDomains: zod_1.z.array(zod_1.z.string().min(1)).min(1).optional(),
 })
     .strict()
     .superRefine((data, ctx) => {
@@ -426,6 +560,101 @@ exports.AgentCoreGatewayTargetSchema = zod_1.z
             });
         }
     }
+    if (data.targetType === 'httpRuntime') {
+        if (!data.httpRuntime) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'httpRuntime targets require an httpRuntime configuration (with a runtime reference).',
+                path: ['httpRuntime'],
+            });
+        }
+        if (data.endpoint) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'httpRuntime targets should use httpRuntime.runtimeEndpoint instead of endpoint.',
+                path: ['endpoint'],
+            });
+        }
+        if (data.compute) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'compute is not applicable for httpRuntime target type',
+                path: ['compute'],
+            });
+        }
+        if (data.apiGateway) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'apiGateway is not applicable for httpRuntime target type',
+                path: ['apiGateway'],
+            });
+        }
+        if (data.lambdaFunctionArn) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'lambdaFunctionArn is not applicable for httpRuntime target type',
+                path: ['lambdaFunctionArn'],
+            });
+        }
+        if (data.toolDefinitions && data.toolDefinitions.length > 0) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'toolDefinitions is not applicable for httpRuntime target type',
+                path: ['toolDefinitions'],
+            });
+        }
+    }
+    if (data.targetType === 'passthrough') {
+        if (!data.passthrough) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'passthrough targets require a passthrough configuration (with an endpoint).',
+                path: ['passthrough'],
+            });
+        }
+        if (data.endpoint) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'passthrough targets should use passthrough.endpoint instead of endpoint.',
+                path: ['endpoint'],
+            });
+        }
+        if (data.compute) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'compute is not applicable for passthrough target type',
+                path: ['compute'],
+            });
+        }
+        if (data.apiGateway) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'apiGateway is not applicable for passthrough target type',
+                path: ['apiGateway'],
+            });
+        }
+        if (data.lambdaFunctionArn) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'lambdaFunctionArn is not applicable for passthrough target type',
+                path: ['lambdaFunctionArn'],
+            });
+        }
+        if (data.httpRuntime) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'httpRuntime is not applicable for passthrough target type',
+                path: ['httpRuntime'],
+            });
+        }
+        if (data.toolDefinitions && data.toolDefinitions.length > 0) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'toolDefinitions is not applicable for passthrough target type',
+                path: ['toolDefinitions'],
+            });
+        }
+    }
     if (data.targetType === 'lambda' && !data.compute) {
         ctx.addIssue({
             code: zod_1.z.ZodIssueCode.custom,
@@ -440,6 +669,214 @@ exports.AgentCoreGatewayTargetSchema = zod_1.z
             path: ['toolDefinitions'],
         });
     }
+    if (data.targetType === 'connector') {
+        if (!data.connectorId) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'connectorId is required for connector target type',
+                path: ['connectorId'],
+            });
+        }
+        if (data.connectorId === exports.CONNECTOR_ID.BEDROCK_KNOWLEDGE_BASES) {
+            if (!data.knowledgeBaseId) {
+                ctx.addIssue({
+                    code: zod_1.z.ZodIssueCode.custom,
+                    message: `knowledgeBaseId is required for connectorId '${data.connectorId}'`,
+                    path: ['knowledgeBaseId'],
+                });
+            }
+            if (data.knowledgeBaseIds) {
+                ctx.addIssue({
+                    code: zod_1.z.ZodIssueCode.custom,
+                    message: `knowledgeBaseIds is not applicable for connectorId '${data.connectorId}' (use knowledgeBaseId)`,
+                    path: ['knowledgeBaseIds'],
+                });
+            }
+        }
+        if (data.connectorId === exports.CONNECTOR_ID.BEDROCK_AGENTIC_RETRIEVE) {
+            if (!data.knowledgeBaseIds || data.knowledgeBaseIds.length === 0) {
+                ctx.addIssue({
+                    code: zod_1.z.ZodIssueCode.custom,
+                    message: `knowledgeBaseIds (non-empty) is required for connectorId '${data.connectorId}'`,
+                    path: ['knowledgeBaseIds'],
+                });
+            }
+            if (data.knowledgeBaseId) {
+                ctx.addIssue({
+                    code: zod_1.z.ZodIssueCode.custom,
+                    message: `knowledgeBaseId is not applicable for connectorId '${data.connectorId}' (use knowledgeBaseIds)`,
+                    path: ['knowledgeBaseId'],
+                });
+            }
+        }
+        if (data.excludeDomains) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: `excludeDomains only applies to webSearch target type`,
+                path: ['excludeDomains'],
+            });
+        }
+        if (data.compute) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'compute is not applicable for connector target type',
+                path: ['compute'],
+            });
+        }
+        if (data.endpoint) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'endpoint is not applicable for connector target type',
+                path: ['endpoint'],
+            });
+        }
+        if (data.toolDefinitions && data.toolDefinitions.length > 0) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'toolDefinitions is not applicable for connector target type',
+                path: ['toolDefinitions'],
+            });
+        }
+        if (data.apiGateway) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'apiGateway is not applicable for connector target type',
+                path: ['apiGateway'],
+            });
+        }
+        if (data.lambdaFunctionArn) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'lambdaFunctionArn is not applicable for connector target type',
+                path: ['lambdaFunctionArn'],
+            });
+        }
+        if (data.schemaSource) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'schemaSource is not applicable for connector target type',
+                path: ['schemaSource'],
+            });
+        }
+    }
+    if (data.targetType === 'webSearch') {
+        // Web search is invoked via the gateway's IAM role and takes only an
+        // optional excludeDomains list. Reject anything else.
+        if (data.compute) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'compute is not applicable for webSearch target type',
+                path: ['compute'],
+            });
+        }
+        if (data.endpoint) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'endpoint is not applicable for webSearch target type',
+                path: ['endpoint'],
+            });
+        }
+        if (data.toolDefinitions && data.toolDefinitions.length > 0) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'toolDefinitions is not applicable for webSearch target type',
+                path: ['toolDefinitions'],
+            });
+        }
+        if (data.apiGateway) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'apiGateway is not applicable for webSearch target type',
+                path: ['apiGateway'],
+            });
+        }
+        if (data.lambdaFunctionArn) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'lambdaFunctionArn is not applicable for webSearch target type',
+                path: ['lambdaFunctionArn'],
+            });
+        }
+        if (data.schemaSource) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'schemaSource is not applicable for webSearch target type',
+                path: ['schemaSource'],
+            });
+        }
+        if (data.httpRuntime) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'httpRuntime is not applicable for webSearch target type',
+                path: ['httpRuntime'],
+            });
+        }
+        if (data.passthrough) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'passthrough is not applicable for webSearch target type',
+                path: ['passthrough'],
+            });
+        }
+        if (data.outboundAuth && data.outboundAuth.type !== 'NONE') {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'outboundAuth is not applicable for webSearch target type (uses gateway IAM role)',
+                path: ['outboundAuth'],
+            });
+        }
+        if (data.connectorId) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'connectorId is not applicable for webSearch target type',
+                path: ['connectorId'],
+            });
+        }
+        if (data.knowledgeBaseId) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'knowledgeBaseId is not applicable for webSearch target type',
+                path: ['knowledgeBaseId'],
+            });
+        }
+        if (data.knowledgeBaseIds) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: 'knowledgeBaseIds is not applicable for webSearch target type',
+                path: ['knowledgeBaseIds'],
+            });
+        }
+    }
+    if (data.targetType !== 'connector' && data.targetType !== 'webSearch') {
+        if (data.connectorId) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: `connectorId only applies to connector target type`,
+                path: ['connectorId'],
+            });
+        }
+        if (data.knowledgeBaseId) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: `knowledgeBaseId only applies to connector target type`,
+                path: ['knowledgeBaseId'],
+            });
+        }
+        if (data.knowledgeBaseIds) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: `knowledgeBaseIds only applies to connector target type`,
+                path: ['knowledgeBaseIds'],
+            });
+        }
+        if (data.excludeDomains) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: `excludeDomains only applies to webSearch target type`,
+                path: ['excludeDomains'],
+            });
+        }
+    }
     // Centralized outbound auth validation (driven by TARGET_TYPE_AUTH_CONFIG)
     const authConfig = exports.TARGET_TYPE_AUTH_CONFIG[data.targetType];
     const authType = data.outboundAuth?.type ?? 'NONE';
@@ -464,13 +901,35 @@ exports.AgentCoreGatewayTargetSchema = zod_1.z
             path: ['outboundAuth'],
         });
     }
-    if (data.outboundAuth && data.outboundAuth.type !== 'NONE' && !data.outboundAuth.credentialName) {
+    if (data.outboundAuth &&
+        data.outboundAuth.type !== 'NONE' &&
+        data.outboundAuth.type !== 'GATEWAY_IAM_ROLE' &&
+        data.outboundAuth.type !== 'JWT_PASSTHROUGH' &&
+        !data.outboundAuth.credentialName) {
         ctx.addIssue({
             code: zod_1.z.ZodIssueCode.custom,
             message: `${data.outboundAuth.type} outbound auth requires a credentialName.`,
             path: ['outboundAuth', 'credentialName'],
         });
     }
+    // GATEWAY_IAM_ROLE on passthrough requires service
+    if (data.targetType === 'passthrough' &&
+        data.outboundAuth?.type === 'GATEWAY_IAM_ROLE' &&
+        !data.outboundAuth.service) {
+        ctx.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            message: 'GATEWAY_IAM_ROLE outbound auth on passthrough targets requires a service name.',
+            path: ['outboundAuth', 'service'],
+        });
+    }
+    // JWT_PASSTHROUGH is only valid for passthrough targets
+    if (data.outboundAuth?.type === 'JWT_PASSTHROUGH' && data.targetType !== 'passthrough') {
+        ctx.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            message: 'JWT_PASSTHROUGH outbound auth is only valid for passthrough targets.',
+            path: ['outboundAuth', 'type'],
+        });
+    }
 });
 // ============================================================================
 // Gateway Exception Level
@@ -493,11 +952,14 @@ exports.GatewayPolicyEngineConfigurationSchema = zod_1.z
  * Gateway abstraction with opinionated defaults.
  * Supports NONE (default) or CUSTOM_JWT authorizer types.
  */
+exports.GatewayProtocolTypeSchema = zod_1.z.enum(['MCP', 'None']);
 exports.AgentCoreGatewaySchema = zod_1.z
     .object({
     name: agent_env_1.GatewayNameSchema,
     /** Actual AWS resource name for imported gateways. When set, CDK uses this instead of generating projectName-name. */
     resourceName: agent_env_1.GatewayNameSchema.optional(),
+    /** Protocol type for this gateway. */
+    protocolType: exports.GatewayProtocolTypeSchema.optional(),
     description: zod_1.z.string().optional(),
     targets: zod_1.z.array(exports.AgentCoreGatewayTargetSchema),
     /** Authorization type for the gateway. Defaults to 'NONE'. */
@@ -528,6 +990,19 @@ exports.AgentCoreGatewaySchema = zod_1.z
 }, {
     message: 'customJwtAuthorizer configuration is required when authorizerType is CUSTOM_JWT',
     path: ['authorizerConfiguration'],
+})
+    .superRefine((gw, ctx) => {
+    // A protocolType: "None" (HTTP) gateway is a superset: it can host any target
+    // type, including MCP targets (mcpServer, connector, KB, etc.). Only an MCP
+    // gateway is restrictive — it cannot host the HTTP-only target types.
+    for (const target of gw.targets) {
+        if (gw.protocolType !== 'None' && exports.NON_MCP_TARGET_TYPES.includes(target.targetType)) {
+            ctx.addIssue({
+                code: zod_1.z.ZodIssueCode.custom,
+                message: `Target "${target.name}" is ${target.targetType} but gateway does not have protocolType: "None". Add --protocol-type None when creating the gateway.`,
+            });
+        }
+    }
 });
 // ============================================================================
 // MCP Runtime Tool