refactor: remove exposure/mcp-runtime mode from gateway-target command

All gateway targets are now behind-gateway only. The mcp-runtime
exposure mode was disabled and never used by customers.

- Remove ExposureMode type, EXPOSURE_MODE_OPTIONS, --exposure and --agents CLI flags
- Simplify wizard flow: name → source → language → gateway → host → confirm
- Remove mcp-runtime code paths from create-mcp, remove-gateway-target, McpGuidedEditor
- Remove existingAgents prop chain (only used for mcp-runtime agent selection)
- Clean up unused imports (ViewMode, AgentCoreMcpRuntimeTool, WizardMultiSelect)

Author: aidandaly24

src/cli/commands/add/actions.ts

@@ -70,8 +70,6 @@ export interface ValidatedAddGatewayTargetOptions {
   source?: 'existing-endpoint' | 'create-new';
   endpoint?: string;
   language: 'Python' | 'TypeScript' | 'Other';
-  exposure: 'mcp-runtime' | 'behind-gateway';
-  agents?: string;
   gateway?: string;
   host?: 'Lambda' | 'AgentCoreRuntime';
   outboundAuthType?: 'OAUTH' | 'API_KEY' | 'NONE';
@@ -306,23 +304,15 @@ function buildGatewayTargetConfig(options: ValidatedAddGatewayTargetOptions): Ad
     description,
     sourcePath,
     language: options.language,
-    exposure: options.exposure,
     source: options.source,
     endpoint: options.endpoint,
-    host: options.exposure === 'mcp-runtime' ? 'AgentCoreRuntime' : options.host!,
+    host: options.host!,
     toolDefinition: {
       name: options.name,
       description,
       inputSchema: { type: 'object' },
     },
-    selectedAgents:
-      options.exposure === 'mcp-runtime'
-        ? options
-            .agents!.split(',')
-            .map(s => s.trim())
-            .filter(Boolean)
-        : [],
-    gateway: options.exposure === 'behind-gateway' ? options.gateway : undefined,
+    gateway: options.gateway,
     outboundAuth,
   };
 }

src/cli/commands/add/command.tsx

@@ -111,8 +111,6 @@ async function handleAddGatewayTargetCLI(options: AddGatewayTargetOptions): Prom
     name: options.name!,
     description: options.description,
     language: options.language! as 'Python' | 'TypeScript',
-    exposure: options.exposure!,
-    agents: options.agents,
     gateway: options.gateway,
     host: options.host,
   });
@@ -266,10 +264,8 @@ export function registerAdd(program: Command) {
     .option('--source <source>', 'Source: existing-endpoint or create-new')
     .option('--endpoint <url>', 'MCP server endpoint URL')
     .option('--language <lang>', 'Language: Python or TypeScript')
-    .option('--exposure <mode>', 'Exposure mode: mcp-runtime or behind-gateway')
-    .option('--agents <names>', 'Comma-separated agent names (for mcp-runtime)')
-    .option('--gateway <name>', 'Gateway name (for behind-gateway)')
-    .option('--host <host>', 'Compute host: Lambda or AgentCoreRuntime (for behind-gateway)')
+    .option('--gateway <name>', 'Gateway name')
+    .option('--host <host>', 'Compute host: Lambda or AgentCoreRuntime')
     .option('--json', 'Output as JSON')
     .action(async options => {
       requireProject();

src/cli/commands/add/types.ts

@@ -49,8 +49,6 @@ export interface AddGatewayTargetOptions {
   source?: string;
   endpoint?: string;
   language?: 'Python' | 'TypeScript' | 'Other';
-  exposure?: 'mcp-runtime' | 'behind-gateway';
-  agents?: string;
   gateway?: string;
   host?: 'Lambda' | 'AgentCoreRuntime';
   outboundAuthType?: 'OAUTH' | 'API_KEY' | 'NONE';

src/cli/commands/add/validate.ts

@@ -213,7 +213,6 @@ export async function validateAddGatewayTargetOptions(options: AddGatewayTargetO
 
     // Populate defaults for fields skipped by external endpoint flow
     options.language ??= 'Other';
-    options.exposure ??= 'behind-gateway';
     options.gateway ??= undefined;
 
     return { valid: true };
@@ -227,27 +226,6 @@ export async function validateAddGatewayTargetOptions(options: AddGatewayTargetO
     return { valid: false, error: 'Invalid language. Valid options: Python, TypeScript, Other' };
   }
 
-  if (!options.exposure) {
-    return { valid: false, error: '--exposure is required' };
-  }
-
-  if (options.exposure !== 'mcp-runtime' && options.exposure !== 'behind-gateway') {
-    return { valid: false, error: "Invalid exposure. Use 'mcp-runtime' or 'behind-gateway'" };
-  }
-
-  if (options.exposure === 'mcp-runtime') {
-    if (!options.agents) {
-      return { valid: false, error: '--agents is required for mcp-runtime exposure' };
-    }
-    const agents = options.agents
-      .split(',')
-      .map(s => s.trim())
-      .filter(Boolean);
-    if (agents.length === 0) {
-      return { valid: false, error: 'At least one agent is required' };
-    }
-  }
-
   // Validate outbound auth configuration
   if (options.outboundAuthType && options.outboundAuthType !== 'NONE') {
     if (!options.credentialName) {

src/cli/operations/mcp/create-mcp.ts

@@ -3,9 +3,7 @@ import type {
   AgentCoreCliMcpDefs,
   AgentCoreGateway,
   AgentCoreGatewayTarget,
-  AgentCoreMcpRuntimeTool,
   AgentCoreMcpSpec,
-  CodeZipRuntimeConfig,
   DirectoryPath,
   FilePath,
 } from '../../../schema';
@@ -255,7 +253,7 @@ export async function createExternalGatewayTarget(config: AddGatewayTargetConfig
 }
 
 /**
- * Create an MCP tool (MCP runtime or behind gateway).
+ * Create an MCP tool (behind gateway only).
  */
 export async function createToolFromWizard(config: AddGatewayTargetConfig): Promise<CreateToolResult> {
   validateGatewayTargetLanguage(config.language);
@@ -280,117 +278,76 @@ export async function createToolFromWizard(config: AddGatewayTargetConfig): Prom
     ToolDefinitionSchema.parse(toolDef);
   }
 
-  if (config.exposure === 'mcp-runtime') {
-    // MCP Runtime tool - always AgentCoreRuntime (single tool)
-    // Build explicit CodeZipRuntimeConfig - no CLI-managed placeholders
-    const runtimeConfig: CodeZipRuntimeConfig = {
-      artifact: 'CodeZip',
-      pythonVersion: DEFAULT_PYTHON_VERSION,
-      name: config.name,
-      entrypoint: 'server.py:main' as FilePath,
-      codeLocation: config.sourcePath as DirectoryPath,
-      networkMode: 'PUBLIC',
-    };
-
-    // 'Other' language requires container config - not supported for mcp-runtime yet
-    if (config.language === 'Other') {
-      throw new Error('Language "Other" is not yet supported for MCP runtime tools. Use Python or TypeScript.');
-    }
-
-    const mcpRuntimeTool: AgentCoreMcpRuntimeTool = {
-      name: config.name,
-      toolDefinition: config.toolDefinition,
-      compute: {
-        host: 'AgentCoreRuntime',
-        implementation: {
-          path: config.sourcePath,
-          language: config.language,
-          handler: DEFAULT_HANDLER,
-        },
-        runtime: runtimeConfig,
-      },
-    };
-
-    const mcpRuntimeTools = mcpSpec.mcpRuntimeTools ?? [];
-    if (mcpRuntimeTools.some(tool => tool.name === mcpRuntimeTool.name)) {
-      throw new Error(`MCP runtime tool "${mcpRuntimeTool.name}" already exists.`);
-    }
-    mcpSpec.mcpRuntimeTools = [...mcpRuntimeTools, mcpRuntimeTool];
-
-    // Write mcp.json
-    await configIO.writeMcpSpec(mcpSpec);
-  } else {
-    // Behind gateway
-    if (!config.gateway) {
-      throw new Error('Gateway name is required for tools behind a gateway.');
-    }
+  // Behind gateway
+  if (!config.gateway) {
+    throw new Error('Gateway name is required for tools behind a gateway.');
+  }
 
-    const gateway = mcpSpec.agentCoreGateways.find(g => g.name === config.gateway);
-    if (!gateway) {
-      throw new Error(`Gateway "${config.gateway}" not found.`);
-    }
+  const gateway = mcpSpec.agentCoreGateways.find(g => g.name === config.gateway);
+  if (!gateway) {
+    throw new Error(`Gateway "${config.gateway}" not found.`);
+  }
 
-    // Check for duplicate target name
-    if (gateway.targets.some(t => t.name === config.name)) {
-      throw new Error(`Target "${config.name}" already exists in gateway "${gateway.name}".`);
-    }
+  // Check for duplicate target name
+  if (gateway.targets.some(t => t.name === config.name)) {
+    throw new Error(`Target "${config.name}" already exists in gateway "${gateway.name}".`);
+  }
 
-    // Check for duplicate tool names
-    for (const toolDef of toolDefs) {
-      for (const existingTarget of gateway.targets) {
-        if ((existingTarget.toolDefinitions ?? []).some(t => t.name === toolDef.name)) {
-          throw new Error(`Tool "${toolDef.name}" already exists in gateway "${gateway.name}".`);
-        }
+  // Check for duplicate tool names
+  for (const toolDef of toolDefs) {
+    for (const existingTarget of gateway.targets) {
+      if ((existingTarget.toolDefinitions ?? []).some(t => t.name === toolDef.name)) {
+        throw new Error(`Tool "${toolDef.name}" already exists in gateway "${gateway.name}".`);
       }
     }
+  }
 
-    // 'Other' language requires container config - not supported for gateway tools yet
-    if (config.language === 'Other') {
-      throw new Error('Language "Other" is not yet supported for gateway tools. Use Python or TypeScript.');
-    }
+  // 'Other' language requires container config - not supported for gateway tools yet
+  if (config.language === 'Other') {
+    throw new Error('Language "Other" is not yet supported for gateway tools. Use Python or TypeScript.');
+  }
 
-    // Create a single target with all tool definitions
-    const target: AgentCoreGatewayTarget = {
-      name: config.name,
-      targetType: config.host === 'AgentCoreRuntime' ? 'mcpServer' : 'lambda',
-      toolDefinitions: toolDefs,
-      compute:
-        config.host === 'Lambda'
-          ? {
-              host: 'Lambda',
-              implementation: {
-                path: config.sourcePath,
-                language: config.language,
-                handler: DEFAULT_HANDLER,
-              },
-              ...(config.language === 'Python'
-                ? { pythonVersion: DEFAULT_PYTHON_VERSION }
-                : { nodeVersion: DEFAULT_NODE_VERSION }),
-            }
-          : {
-              host: 'AgentCoreRuntime',
-              implementation: {
-                path: config.sourcePath,
-                language: 'Python',
-                handler: 'server.py:main',
-              },
-              runtime: {
-                artifact: 'CodeZip',
-                pythonVersion: DEFAULT_PYTHON_VERSION,
-                name: config.name,
-                entrypoint: 'server.py:main' as FilePath,
-                codeLocation: config.sourcePath as DirectoryPath,
-                networkMode: 'PUBLIC',
-              },
+  // Create a single target with all tool definitions
+  const target: AgentCoreGatewayTarget = {
+    name: config.name,
+    targetType: config.host === 'AgentCoreRuntime' ? 'mcpServer' : 'lambda',
+    toolDefinitions: toolDefs,
+    compute:
+      config.host === 'Lambda'
+        ? {
+            host: 'Lambda',
+            implementation: {
+              path: config.sourcePath,
+              language: config.language,
+              handler: DEFAULT_HANDLER,
+            },
+            ...(config.language === 'Python'
+              ? { pythonVersion: DEFAULT_PYTHON_VERSION }
+              : { nodeVersion: DEFAULT_NODE_VERSION }),
+          }
+        : {
+            host: 'AgentCoreRuntime',
+            implementation: {
+              path: config.sourcePath,
+              language: 'Python',
+              handler: 'server.py:main',
             },
-      ...(config.outboundAuth && { outboundAuth: config.outboundAuth }),
-    };
+            runtime: {
+              artifact: 'CodeZip',
+              pythonVersion: DEFAULT_PYTHON_VERSION,
+              name: config.name,
+              entrypoint: 'server.py:main' as FilePath,
+              codeLocation: config.sourcePath as DirectoryPath,
+              networkMode: 'PUBLIC',
+            },
+          },
+    ...(config.outboundAuth && { outboundAuth: config.outboundAuth }),
+  };
 
-    gateway.targets.push(target);
+  gateway.targets.push(target);
 
-    // Write mcp.json for gateway case
-    await configIO.writeMcpSpec(mcpSpec);
-  }
+  // Write mcp.json for gateway case
+  await configIO.writeMcpSpec(mcpSpec);
 
   // Update mcp-defs.json with all tool definitions
   const mcpDefsPath = resolveMcpDefsPath();