feat: assign unassigned targets to gateways and preserve targets on removal

Author: aidandaly24

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

@@ -82,6 +82,22 @@ function buildAuthorizerConfiguration(config: AddGatewayConfig): AgentCoreGatewa
   };
 }
 
+/**
+ * Get list of unassigned targets from MCP spec.
+ */
+export async function getUnassignedTargets(): Promise<AgentCoreGatewayTarget[]> {
+  try {
+    const configIO = new ConfigIO();
+    if (!configIO.configExists('mcp')) {
+      return [];
+    }
+    const mcpSpec = await configIO.readMcpSpec();
+    return mcpSpec.unassignedTargets ?? [];
+  } catch {
+    return [];
+  }
+}
+
 /**
  * Get list of existing gateway names from project spec.
  */
@@ -162,15 +178,34 @@ export async function createGatewayFromWizard(config: AddGatewayConfig): Promise
     throw new Error(`Gateway "${config.name}" already exists.`);
   }
 
+  // Collect selected unassigned targets
+  const selectedTargets: AgentCoreGatewayTarget[] = [];
+  if (config.selectedTargets && config.selectedTargets.length > 0) {
+    const unassignedTargets = mcpSpec.unassignedTargets ?? [];
+    for (const targetName of config.selectedTargets) {
+      const target = unassignedTargets.find(t => t.name === targetName);
+      if (target) {
+        selectedTargets.push(target);
+      }
+    }
+  }
+
   const gateway: AgentCoreGateway = {
     name: config.name,
     description: config.description,
-    targets: [],
+    targets: selectedTargets,
     authorizerType: config.authorizerType,
     authorizerConfiguration: buildAuthorizerConfiguration(config),
   };
 
   mcpSpec.agentCoreGateways.push(gateway);
+
+  // Remove selected targets from unassigned targets
+  if (config.selectedTargets && config.selectedTargets.length > 0) {
+    const selected = config.selectedTargets;
+    mcpSpec.unassignedTargets = (mcpSpec.unassignedTargets ?? []).filter(t => !selected.includes(t.name));
+  }
+
   await configIO.writeMcpSpec(mcpSpec);
 
   return { name: config.name };

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

@@ -34,7 +34,7 @@ export async function previewRemoveGateway(gatewayName: string): Promise<Removal
   const schemaChanges: SchemaChange[] = [];
 
   if (gateway.targets.length > 0) {
-    summary.push(`Note: ${gateway.targets.length} target(s) behind this gateway will become orphaned`);
+    summary.push(`Note: ${gateway.targets.length} target(s) will become unassigned`);
   }
 
   // Compute schema changes
@@ -52,9 +52,15 @@ export async function previewRemoveGateway(gatewayName: string): Promise<Removal
  * Compute the MCP spec after removing a gateway.
  */
 function computeRemovedGatewayMcpSpec(mcpSpec: AgentCoreMcpSpec, gatewayName: string): AgentCoreMcpSpec {
+  const gatewayToRemove = mcpSpec.agentCoreGateways.find(g => g.name === gatewayName);
+  const targetsToPreserve = gatewayToRemove?.targets ?? [];
+
   return {
     ...mcpSpec,
     agentCoreGateways: mcpSpec.agentCoreGateways.filter(g => g.name !== gatewayName),
+    ...(targetsToPreserve.length > 0 || mcpSpec.unassignedTargets
+      ? { unassignedTargets: [...(mcpSpec.unassignedTargets ?? []), ...targetsToPreserve] }
+      : {}),
   };
 }
 

src/cli/tui/hooks/useCreateMcp.ts

@@ -5,6 +5,7 @@ import {
   getAvailableAgents,
   getExistingGateways,
   getExistingToolNames,
+  getUnassignedTargets,
 } from '../../operations/mcp/create-mcp';
 import type { AddGatewayConfig, AddGatewayTargetConfig } from '../screens/mcp/types';
 import { useCallback, useEffect, useState } from 'react';
@@ -117,3 +118,22 @@ export function useExistingToolNames() {
 
   return { toolNames, refresh };
 }
+
+export function useUnassignedTargets() {
+  const [targets, setTargets] = useState<string[]>([]);
+
+  useEffect(() => {
+    async function load() {
+      const result = await getUnassignedTargets();
+      setTargets(result.map(t => t.name));
+    }
+    void load();
+  }, []);
+
+  const refresh = useCallback(async () => {
+    const result = await getUnassignedTargets();
+    setTargets(result.map(t => t.name));
+  }, []);
+
+  return { targets, refresh };
+}

src/cli/tui/screens/mcp/AddGatewayFlow.tsx

@@ -3,7 +3,7 @@ import type { SelectableItem } from '../../components';
 import { HELP_TEXT } from '../../constants';
 import { useListNavigation } from '../../hooks';
 import { useAgents, useAttachGateway, useGateways } from '../../hooks/useAttach';
-import { useCreateGateway, useExistingGateways } from '../../hooks/useCreateMcp';
+import { useCreateGateway, useExistingGateways, useUnassignedTargets } from '../../hooks/useCreateMcp';
 import { AddSuccessScreen } from '../add/AddSuccessScreen';
 import { AddGatewayScreen } from './AddGatewayScreen';
 import type { AddGatewayConfig } from './types';
@@ -55,6 +55,7 @@ export function AddGatewayFlow({
 }: AddGatewayFlowProps) {
   const { createGateway, reset: resetCreate } = useCreateGateway();
   const { gateways: existingGateways, refresh: refreshGateways } = useExistingGateways();
+  const { targets: unassignedTargets } = useUnassignedTargets();
   const [flow, setFlow] = useState<FlowState>({ name: 'mode-select' });
 
   // Bind flow hooks
@@ -157,6 +158,7 @@ export function AddGatewayFlow({
         <AddGatewayScreen
           existingGateways={existingGateways}
           availableAgents={availableAgents}
+          unassignedTargets={unassignedTargets}
           onComplete={handleCreateComplete}
           onExit={onBack}
         />
@@ -183,6 +185,7 @@ export function AddGatewayFlow({
       <AddGatewayScreen
         existingGateways={existingGateways}
         availableAgents={availableAgents}
+        unassignedTargets={unassignedTargets}
         onComplete={handleCreateComplete}
         onExit={() => setFlow({ name: 'mode-select' })}
       />

src/cli/tui/screens/mcp/AddGatewayScreen.tsx

@@ -24,10 +24,17 @@ interface AddGatewayScreenProps {
   onExit: () => void;
   existingGateways: string[];
   availableAgents: string[];
+  unassignedTargets: string[];
 }
 
-export function AddGatewayScreen({ onComplete, onExit, existingGateways, availableAgents }: AddGatewayScreenProps) {
-  const wizard = useAddGatewayWizard();
+export function AddGatewayScreen({
+  onComplete,
+  onExit,
+  existingGateways,
+  availableAgents,
+  unassignedTargets,
+}: AddGatewayScreenProps) {
+  const wizard = useAddGatewayWizard(unassignedTargets.length);
 
   // JWT config sub-step tracking (0 = discoveryUrl, 1 = audience, 2 = clients)
   const [jwtSubStep, setJwtSubStep] = useState(0);
@@ -39,6 +46,11 @@ export function AddGatewayScreen({ onComplete, onExit, existingGateways, availab
     [availableAgents]
   );
 
+  const unassignedTargetItems: SelectableItem[] = useMemo(
+    () => unassignedTargets.map(name => ({ id: name, title: name })),
+    [unassignedTargets]
+  );
+
   const authorizerItems: SelectableItem[] = useMemo(
     () => AUTHORIZER_TYPE_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description })),
     []
@@ -48,6 +60,7 @@ export function AddGatewayScreen({ onComplete, onExit, existingGateways, availab
   const isAuthorizerStep = wizard.step === 'authorizer';
   const isJwtConfigStep = wizard.step === 'jwt-config';
   const isAgentsStep = wizard.step === 'agents';
+  const isIncludeTargetsStep = wizard.step === 'include-targets';
   const isConfirmStep = wizard.step === 'confirm';
 
   const authorizerNav = useListNavigation({
@@ -66,6 +79,15 @@ export function AddGatewayScreen({ onComplete, onExit, existingGateways, availab
     requireSelection: false,
   });
 
+  const targetsNav = useMultiSelectNavigation({
+    items: unassignedTargetItems,
+    getId: item => item.id,
+    onConfirm: ids => wizard.setSelectedTargets(ids),
+    onExit: () => wizard.goBack(),
+    isActive: isIncludeTargetsStep,
+    requireSelection: false,
+  });
+
   useListNavigation({
     items: [{ id: 'confirm', title: 'Confirm' }],
     onSelect: () => onComplete(wizard.config),
@@ -113,13 +135,14 @@ export function AddGatewayScreen({ onComplete, onExit, existingGateways, availab
     }
   };
 
-  const helpText = isAgentsStep
-    ? 'Space toggle · Enter confirm · Esc back'
-    : isConfirmStep
-      ? HELP_TEXT.CONFIRM_CANCEL
-      : isAuthorizerStep
-        ? HELP_TEXT.NAVIGATE_SELECT
-        : HELP_TEXT.TEXT_INPUT;
+  const helpText =
+    isAgentsStep || isIncludeTargetsStep
+      ? 'Space toggle · Enter confirm · Esc back'
+      : isConfirmStep
+        ? HELP_TEXT.CONFIRM_CANCEL
+        : isAuthorizerStep
+          ? HELP_TEXT.NAVIGATE_SELECT
+          : HELP_TEXT.TEXT_INPUT;
 
   const headerContent = <StepIndicator steps={wizard.steps} currentStep={wizard.step} labels={GATEWAY_STEP_LABELS} />;
 
@@ -178,6 +201,18 @@ export function AddGatewayScreen({ onComplete, onExit, existingGateways, availab
             </Text>
           ))}
 
+        {isIncludeTargetsStep &&
+          (unassignedTargetItems.length > 0 ? (
+            <WizardMultiSelect
+              title="Select unassigned targets to include in this gateway"
+              items={unassignedTargetItems}
+              cursorIndex={targetsNav.cursorIndex}
+              selectedIds={targetsNav.selectedIds}
+            />
+          ) : (
+            <Text dimColor>No unassigned targets available. Press Enter to continue.</Text>
+          ))}
+
         {isConfirmStep && (
           <ConfirmReview
             fields={[
@@ -192,6 +227,13 @@ export function AddGatewayScreen({ onComplete, onExit, existingGateways, availab
                   ]
                 : []),
               { label: 'Agents', value: wizard.config.agents.length > 0 ? wizard.config.agents.join(', ') : '(none)' },
+              {
+                label: 'Targets',
+                value:
+                  wizard.config.selectedTargets && wizard.config.selectedTargets.length > 0
+                    ? wizard.config.selectedTargets.join(', ')
+                    : '(none)',
+              },
             ]}
           />
         )}

src/cli/tui/screens/mcp/types.ts

@@ -4,7 +4,7 @@ import type { GatewayAuthorizerType, NodeRuntime, PythonRuntime, ToolDefinition
 // Gateway Flow Types
 // ─────────────────────────────────────────────────────────────────────────────
 
-export type AddGatewayStep = 'name' | 'authorizer' | 'jwt-config' | 'agents' | 'confirm';
+export type AddGatewayStep = 'name' | 'authorizer' | 'jwt-config' | 'agents' | 'include-targets' | 'confirm';
 
 export interface AddGatewayConfig {
   name: string;
@@ -19,13 +19,16 @@ export interface AddGatewayConfig {
     allowedAudience: string[];
     allowedClients: string[];
   };
+  /** Selected unassigned targets to include in this gateway */
+  selectedTargets?: string[];
 }
 
 export const GATEWAY_STEP_LABELS: Record<AddGatewayStep, string> = {
   name: 'Name',
   authorizer: 'Authorizer',
   'jwt-config': 'JWT Config',
   agents: 'Agents',
+  'include-targets': 'Include Targets',
   confirm: 'Confirm',
 };
 

src/cli/tui/screens/mcp/useAddGatewayWizard.ts

@@ -16,20 +16,32 @@ function getDefaultConfig(): AddGatewayConfig {
     agents: [],
     authorizerType: 'NONE',
     jwtConfig: undefined,
+    selectedTargets: [],
   };
 }
 
-export function useAddGatewayWizard() {
+export function useAddGatewayWizard(unassignedTargetsCount = 0) {
   const [config, setConfig] = useState<AddGatewayConfig>(getDefaultConfig);
   const [step, setStep] = useState<AddGatewayStep>('name');
 
-  // Dynamic steps based on authorizer type
+  // Dynamic steps based on authorizer type and unassigned targets
   const steps = useMemo<AddGatewayStep[]>(() => {
+    const baseSteps: AddGatewayStep[] = ['name', 'authorizer'];
+
     if (config.authorizerType === 'CUSTOM_JWT') {
-      return ['name', 'authorizer', 'jwt-config', 'agents', 'confirm'];
+      baseSteps.push('jwt-config');
+    }
+
+    baseSteps.push('agents');
+
+    if (unassignedTargetsCount > 0) {
+      baseSteps.push('include-targets');
     }
-    return ['name', 'authorizer', 'agents', 'confirm'];
-  }, [config.authorizerType]);
+
+    baseSteps.push('confirm');
+
+    return baseSteps;
+  }, [config.authorizerType, unassignedTargetsCount]);
 
   const currentIndex = steps.indexOf(step);
 
@@ -69,10 +81,21 @@ export function useAddGatewayWizard() {
     []
   );
 
-  const setAgents = useCallback((agents: string[]) => {
+  const setAgents = useCallback(
+    (agents: string[]) => {
+      setConfig(c => ({
+        ...c,
+        agents,
+      }));
+      setStep(unassignedTargetsCount > 0 ? 'include-targets' : 'confirm');
+    },
+    [unassignedTargetsCount]
+  );
+
+  const setSelectedTargets = useCallback((selectedTargets: string[]) => {
     setConfig(c => ({
       ...c,
-      agents,
+      selectedTargets,
     }));
     setStep('confirm');
   }, []);
@@ -92,6 +115,7 @@ export function useAddGatewayWizard() {
     setAuthorizerType,
     setJwtConfig,
     setAgents,
+    setSelectedTargets,
     reset,
   };
 }