fix: rename 'MCP Tool' to 'Gateway Target' in UI labels, CLI output, and comments

Author: aidandaly24

src/cli/commands/add/__tests__/add-gateway-target.test.ts

@@ -5,7 +5,7 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
-// MCP Tool feature is disabled (coming soon) - skip all tests
+// Gateway Target feature is disabled (coming soon) - skip all tests
 describe.skip('add gateway-target command', () => {
   let testDir: string;
   let projectDir: string;

src/cli/commands/add/actions.ts

@@ -283,7 +283,7 @@ export async function handleAddGateway(options: ValidatedAddGatewayOptions): Pro
   }
 }
 
-// MCP Tool handler
+// Gateway Target handler
 export function buildGatewayTargetConfig(options: ValidatedAddGatewayTargetOptions): AddGatewayTargetConfig {
   const sourcePath = `${APP_DIR}/${MCP_APP_SUBDIR}/${options.name}`;
 

src/cli/commands/add/command.tsx

@@ -131,7 +131,7 @@ async function handleAddGatewayTargetCLI(options: AddGatewayTargetOptions): Prom
   if (options.json) {
     console.log(JSON.stringify(result));
   } else if (result.success) {
-    console.log(`Added MCP tool '${result.toolName}'`);
+    console.log(`Added gateway target '${result.toolName}'`);
     if (result.sourcePath) {
       console.log(`Tool code: ${result.sourcePath}`);
     }

src/cli/commands/add/types.ts

@@ -41,7 +41,7 @@ export interface AddGatewayResult {
   error?: string;
 }
 
-// MCP Tool types
+// Gateway Target types
 export interface AddGatewayTargetOptions {
   name?: string;
   description?: string;

src/cli/commands/add/validate.ts

@@ -183,7 +183,7 @@ export function validateAddGatewayOptions(options: AddGatewayOptions): Validatio
   return { valid: true };
 }
 
-// MCP Tool validation
+// Gateway Target validation
 export async function validateAddGatewayTargetOptions(options: AddGatewayTargetOptions): Promise<ValidationResult> {
   if (!options.name) {
     return { valid: false, error: '--name is required' };

src/cli/commands/remove/__tests__/remove-gateway-target.test.ts

@@ -5,7 +5,7 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
-// MCP Tool feature is disabled (coming soon) - skip all tests
+// Gateway Target feature is disabled (coming soon) - skip all tests
 describe.skip('remove gateway-target command', () => {
   let testDir: string;
   let projectDir: string;

src/cli/commands/remove/actions.ts

@@ -49,14 +49,14 @@ export async function handleRemove(options: ValidatedRemoveOptions): Promise<Rem
       case 'gateway-target': {
         const tools = await getRemovableGatewayTargets();
         const tool = tools.find(t => t.name === name);
-        if (!tool) return { success: false, error: `MCP tool '${name}' not found` };
+        if (!tool) return { success: false, error: `Gateway target '${name}' not found` };
         const result = await removeGatewayTarget(tool);
         if (!result.ok) return { success: false, error: result.error };
         return {
           success: true,
           resourceType,
           resourceName: name,
-          message: `Removed MCP tool '${name}'`,
+          message: `Removed gateway target '${name}'`,
           note: SOURCE_CODE_NOTE,
         };
       }

src/cli/commands/remove/command.tsx

@@ -142,7 +142,7 @@ export const registerRemove = (program: Command) => {
   registerResourceRemove(removeCommand, 'memory', 'memory', 'Remove a memory provider from the project');
   registerResourceRemove(removeCommand, 'identity', 'identity', 'Remove an identity provider from the project');
 
-  registerResourceRemove(removeCommand, 'gateway-target', 'gateway-target', 'Remove an MCP tool from the project');
+  registerResourceRemove(removeCommand, 'gateway-target', 'gateway-target', 'Remove a gateway target from the project');
 
   registerResourceRemove(removeCommand, 'gateway', 'gateway', 'Remove a gateway from the project');
 

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

@@ -45,7 +45,7 @@ async function readMcpDefs(filePath: string): Promise<AgentCoreCliMcpDefs> {
   const parsed = JSON.parse(raw) as unknown;
   const result = AgentCoreCliMcpDefsSchema.safeParse(parsed);
   if (!result.success) {
-    throw new Error('Invalid mcp-defs.json. Fix it before adding a new MCP tool.');
+    throw new Error('Invalid mcp-defs.json. Fix it before adding a new gateway target.');
   }
   return result.data;
 }
@@ -211,7 +211,7 @@ export async function createGatewayFromWizard(config: AddGatewayConfig): Promise
 
 function validateGatewayTargetLanguage(language: string): asserts language is 'Python' | 'TypeScript' | 'Other' {
   if (language !== 'Python' && language !== 'TypeScript' && language !== 'Other') {
-    throw new Error(`MCP tools for language "${language}" are not yet supported.`);
+    throw new Error(`Gateway targets for language "${language}" are not yet supported.`);
   }
 }
 
@@ -288,7 +288,7 @@ export async function createExternalGatewayTarget(config: AddGatewayTargetConfig
 }
 
 /**
- * Create an MCP tool (behind gateway only).
+ * Create a gateway target (behind gateway only).
  */
 export async function createToolFromWizard(config: AddGatewayTargetConfig): Promise<CreateToolResult> {
   validateGatewayTargetLanguage(config.language);
@@ -400,7 +400,7 @@ export async function createToolFromWizard(config: AddGatewayTargetConfig): Prom
     throw new Error(`MCP saved, but failed to update mcp-defs.json: ${message}`);
   }
 
-  // Render MCP tool project template
+  // Render gateway target project template
   // Resolve absolute path from project root
   const configRoot = requireConfigRoot();
   const projectRoot = dirname(configRoot);

src/cli/operations/remove/remove-gateway-target.ts

@@ -6,7 +6,7 @@ import { rm } from 'fs/promises';
 import { join } from 'path';
 
 /**
- * Represents an MCP tool that can be removed.
+ * Represents a gateway target that can be removed.
  */
 export interface RemovableGatewayTarget {
   name: string;
@@ -15,7 +15,7 @@ export interface RemovableGatewayTarget {
 }
 
 /**
- * Get list of MCP tools available for removal.
+ * Get list of gateway targets available for removal.
  */
 export async function getRemovableGatewayTargets(): Promise<RemovableGatewayTarget[]> {
   try {
@@ -44,7 +44,7 @@ export async function getRemovableGatewayTargets(): Promise<RemovableGatewayTarg
 }
 
 /**
- * Compute the preview of what will be removed when removing an MCP tool.
+ * Compute the preview of what will be removed when removing a gateway target.
  */
 export async function previewRemoveGatewayTarget(tool: RemovableGatewayTarget): Promise<RemovalPreview> {
   const configIO = new ConfigIO();
@@ -150,7 +150,7 @@ function computeRemovedToolMcpDefs(
 }
 
 /**
- * Remove an MCP tool from the project.
+ * Remove a gateway target from the project.
  */
 export async function removeGatewayTarget(tool: RemovableGatewayTarget): Promise<RemovalResult> {
   try {