refactor(gateway): replace legacy MCP config methods with new gateway endpoint

Author: Lasim

services/gateway/src/core/auth/api-client.ts

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import fetch from 'node-fetch';
 import { StoredCredentials, UserInfo, TokenInfo, Team, AuthError, AuthenticationError } from '../../types/auth';
-import { MCPInstallationsResponse } from '../../types/mcp';
 import { buildAuthConfig } from '../../utils/auth-config';
 import { Device, DeviceInfo } from '../../utils/device-detection';
 
@@ -76,29 +75,6 @@ export class DeployStackAPI {
     return (response as { team: Team }).team;
   }
 
-  /**
-   * Get MCP installations for a team
-   * @param teamId Team ID
-   * @returns MCP installations response
-   */
-  async getTeamMCPInstallations(teamId: string): Promise<MCPInstallationsResponse> {
-    const endpoint = `${this.baseUrl}/api/teams/${teamId}/mcp/installations`;
-    const response = await this.makeRequest(endpoint);
-    return response as MCPInstallationsResponse;
-  }
-
-  /**
-   * Get user configurations for an MCP installation
-   * @param teamId Team ID
-   * @param installationId Installation ID
-   * @returns User configurations response
-   */
-  async getUserConfigurations(teamId: string, installationId: string): Promise<any> {
-    const endpoint = `${this.baseUrl}/api/teams/${teamId}/mcp/installations/${installationId}/user-configs`;
-    const response = await this.makeRequest(endpoint);
-    return response;
-  }
-
   /**
    * Get merged MCP configurations for gateway (NEW THREE-TIER ENDPOINT)
    * This endpoint merges Template + Team + User configurations and returns ready-to-use server configs

services/gateway/src/core/mcp/config-service.ts

@@ -2,7 +2,6 @@ import chalk from 'chalk';
 import ora from 'ora';
 import { DeployStackAPI } from '../auth/api-client';
 import { CredentialStorage } from '../auth/storage';
-import { processMCPInstallations, filterValidInstallations } from './config-processor';
 import { TeamMCPConfig } from '../../types/mcp';
 import { AuthenticationError, AuthError } from '../../types/auth';
 
@@ -97,106 +96,7 @@ export class MCPConfigService {
   }
 
   /**
-   * Download and store MCP configuration for a team (LEGACY METHOD)
-   * @param teamId Team ID
-   * @param teamName Team name (optional, will be set from API if not provided)
-   * @param api DeployStack API client
-   * @param showSpinner Whether to show progress spinner
-   * @returns Downloaded MCP configuration
-   */
-  async downloadAndStoreMCPConfig(
-    teamId: string,
-    teamName?: string,
-    api?: DeployStackAPI,
-    showSpinner: boolean = true
-  ): Promise<TeamMCPConfig> {
-    let spinner: ReturnType<typeof ora> | null = null;
-    
-    try {
-      if (showSpinner) {
-        spinner = ora('Downloading MCP server configurations...').start();
-      }
-
-      // Use provided API client or create one
-      let apiClient = api;
-      if (!apiClient) {
-        const credentials = await this.storage.getCredentials();
-        if (!credentials) {
-          throw new AuthenticationError(
-            AuthError.STORAGE_ERROR,
-            'No authentication found - cannot download MCP config'
-          );
-        }
-        apiClient = new DeployStackAPI(credentials, credentials.baseUrl);
-      }
-
-      // Download MCP installations for the team
-      const response = await apiClient.getTeamMCPInstallations(teamId);
-      
-      if (!response.success) {
-        throw new AuthenticationError(
-          AuthError.NETWORK_ERROR,
-          'Failed to download MCP installations from API'
-        );
-      }
-
-      const installations = response.data || [];
-      
-      if (showSpinner && spinner) {
-        spinner.text = `Downloading user configurations for ${installations.length} installation${installations.length === 1 ? '' : 's'}...`;
-      }
-
-      // Download user configurations for each installation
-      const allUserConfigurations = [];
-      for (const installation of installations) {
-        try {
-          const userConfigResponse = await apiClient.getUserConfigurations(teamId, installation.id);
-          if (userConfigResponse.success && userConfigResponse.data) {
-            allUserConfigurations.push(...userConfigResponse.data);
-          }
-        } catch (error) {
-          // Log warning but continue - user configs are optional
-          console.log(chalk.yellow(`⚠️  Could not fetch user configurations for installation ${installation.installation_name}: ${error instanceof Error ? error.message : String(error)}`));
-        }
-      }
-
-      if (showSpinner && spinner) {
-        spinner.text = `Processing ${installations.length} installation${installations.length === 1 ? '' : 's'} with ${allUserConfigurations.length} user configuration${allUserConfigurations.length === 1 ? '' : 's'}...`;
-      }
-
-      // Filter and validate installations
-      const validInstallations = filterValidInstallations(installations);
-      
-      if (validInstallations.length < installations.length) {
-        const invalidCount = installations.length - validInstallations.length;
-        console.log(chalk.yellow(`⚠️  Skipped ${invalidCount} invalid installation${invalidCount === 1 ? '' : 's'}`));
-      }
-
-      // Process installations into server configurations with three-tier architecture
-      const config = processMCPInstallations(teamId, teamName || `Team ${teamId}`, validInstallations, allUserConfigurations);
-
-      if (showSpinner && spinner) {
-        spinner.text = 'Storing MCP configuration securely...';
-      }
-
-      // Store the configuration securely
-      await this.storage.storeMCPConfig(config);
-
-      if (showSpinner && spinner) {
-        spinner.succeed(`MCP configuration downloaded and stored (${config.servers.length} server${config.servers.length === 1 ? '' : 's'})`);
-      }
-
-      return config;
-    } catch (error) {
-      if (spinner) {
-        spinner.fail('Failed to download MCP configuration');
-      }
-      throw error;
-    }
-  }
-
-  /**
-   * Switch team MCP configuration
+   * Switch team MCP configuration using new gateway endpoint
    * Clears old config and downloads new config for the team
    * @param teamId New team ID
    * @param teamName New team name
@@ -214,8 +114,24 @@ export class MCPConfigService {
       await this.storage.clearMCPConfig(credentials.selectedTeam.id);
     }
 
-    // Download and store new configuration
-    return await this.downloadAndStoreMCPConfig(teamId, teamName, api, true);
+    // Detect device info for hardware_id
+    const { detectDeviceInfo } = await import('../../utils/device-detection');
+    const deviceInfo = await detectDeviceInfo();
+
+    // Download merged configuration using new gateway endpoint
+    const gatewayConfig = await this.downloadGatewayMCPConfig(deviceInfo.hardware_id, api, true);
+    
+    // Convert and store the gateway config in the format expected by local storage
+    const teamMCPConfig = this.convertGatewayConfigToTeamConfig(
+      teamId,
+      teamName,
+      gatewayConfig
+    );
+    
+    // Store the converted configuration
+    await this.storeMCPConfig(teamMCPConfig);
+    
+    return teamMCPConfig;
   }
 
   /**

services/gateway/src/core/mcp/team-context-manager.ts

@@ -110,12 +110,26 @@ export class TeamContextManager extends EventEmitter {
         console.log(chalk.gray('   Downloading new team\'s MCP configuration...'));
       }
 
-      newTeamConfig = await this.mcpConfigService.downloadAndStoreMCPConfig(
-        newTeamId,
-        newTeamName,
+      // Detect device info for hardware_id
+      const { detectDeviceInfo } = await import('../../utils/device-detection');
+      const deviceInfo = await detectDeviceInfo();
+
+      // Download merged configuration using new gateway endpoint
+      const gatewayConfig = await this.mcpConfigService.downloadGatewayMCPConfig(
+        deviceInfo.hardware_id,
         api,
         forceRefresh
       );
+      
+      // Convert and store the gateway config in the format expected by local storage
+      newTeamConfig = this.mcpConfigService.convertGatewayConfigToTeamConfig(
+        newTeamId,
+        newTeamName,
+        gatewayConfig
+      );
+      
+      // Store the converted configuration
+      await this.mcpConfigService.storeMCPConfig(newTeamConfig);
 
       if (showProgress) {
         console.log(chalk.green(`✅ Downloaded configuration for ${newTeamConfig.servers.length} MCP server${newTeamConfig.servers.length === 1 ? '' : 's'}`));