Skip to content

Revert "Add fallback mechanism for MCP configuration updates in VS Code (AST-129350)" #1414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cx-rahul-pidde wants to merge 1 commit into from
Closed

Revert "Add fallback mechanism for MCP configuration updates in VS Code (AST-129350)" #1414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 32 additions & 76 deletions packages/core/src/services/mcpSettingsInjector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,33 +79,16 @@ function decodeJwt(apiKey: string): DecodedJwt | null {
}

function getMcpConfigPath(): string {
const homeDir = os.homedir();

if (isIDE(constants.cursorAgent)) {
const homeDir = os.homedir();
return path.join(homeDir, ".cursor", "mcp.json");
}
if (isIDE(constants.windsurfAgent)) {
return path.join(homeDir, ".codeium", "windsurf", "mcp_config.json");
return path.join(os.homedir(), ".codeium", "windsurf", "mcp_config.json");
}
if (isIDE(constants.kiroAgent)) {
return path.join(homeDir, ".kiro", "settings", "mcp.json");
return path.join(os.homedir(), ".kiro", "settings", "mcp.json");
}
// VSCode - platform specific paths
if (isIDE(constants.vsCodeAgentOrginalName)) {
const platform = process.platform;
if (platform === 'win32') {
// Windows: %APPDATA%\Code\User\mcp.json
const appData = process.env.APPDATA || path.join(homeDir, 'AppData', 'Roaming');
return path.join(appData, 'Code', 'User', 'mcp.json');
} else if (platform === 'darwin') {
// macOS: ~/Library/Application Support/Code/User/mcp.json
return path.join(homeDir, 'Library', 'Application Support', 'Code', 'User', 'mcp.json');
} else {
// Linux: ~/.config/Code/User/mcp.json
return path.join(homeDir, '.config', 'Code', 'User', 'mcp.json');
}
}
return path.join(homeDir, '.vscode', 'mcp.json');
}

async function updateMcpJsonFile(mcpServer: McpServer | KiroMcpServer): Promise<void> {
Expand All @@ -122,19 +105,12 @@ async function updateMcpJsonFile(mcpServer: McpServer | KiroMcpServer): Promise<
}
}

if (isIDE(constants.vsCodeAgentOrginalName)) {
if (!mcpConfig.servers) {
mcpConfig.servers = {};
}
mcpConfig.servers[getCheckmarxMcpServerName()] = mcpServer as McpServer;
}
else {
if (!mcpConfig.mcpServers) {
mcpConfig.mcpServers = {};
}
mcpConfig.mcpServers[getCheckmarxMcpServerName()] = mcpServer;
if (!mcpConfig.mcpServers) {
mcpConfig.mcpServers = {};
}

mcpConfig.mcpServers[getCheckmarxMcpServerName()] = mcpServer;

try {
const dir = path.dirname(mcpConfigPath);
if (!fs.existsSync(dir)) {
Expand All @@ -147,33 +123,25 @@ async function updateMcpJsonFile(mcpServer: McpServer | KiroMcpServer): Promise<
}
}

async function removeMcpFromJsonFile(): Promise<void> {
const mcpConfigPath = getMcpConfigPath();
export async function uninstallMcp() {
try {

if (!fs.existsSync(mcpConfigPath)) {
return;
}
if (!isIDE(constants.vsCodeAgentOrginalName)) {
// Handle Cursor, Windsurf and Kiro: Remove from mcp json file
const mcpConfigPath = getMcpConfigPath();

const fileContent = fs.readFileSync(mcpConfigPath, "utf-8");
const mcpConfig: McpConfig = JSON.parse(fileContent);
if (!fs.existsSync(mcpConfigPath)) {
return;
}

// Remove from mcpServers (for Cursor, Windsurf, Kiro)
if (mcpConfig.mcpServers && mcpConfig.mcpServers[getCheckmarxMcpServerName()]) {
delete mcpConfig.mcpServers[getCheckmarxMcpServerName()];
fs.writeFileSync(mcpConfigPath, JSON.stringify(mcpConfig, null, 2), "utf-8");
}
// Remove from servers (for VSCode fallback)
else if (mcpConfig.servers && mcpConfig.servers[getCheckmarxMcpServerName()]) {
delete mcpConfig.servers[getCheckmarxMcpServerName()];
fs.writeFileSync(mcpConfigPath, JSON.stringify(mcpConfig, null, 2), "utf-8");
}
}
const fileContent = fs.readFileSync(mcpConfigPath, "utf-8");
const mcpConfig: McpConfig = JSON.parse(fileContent);

export async function uninstallMcp() {
try {
if (!isIDE(constants.vsCodeAgentOrginalName)) {
// Handle Cursor, Windsurf and Kiro: Remove from mcp json file
await removeMcpFromJsonFile();
if (mcpConfig.mcpServers && mcpConfig.mcpServers[getCheckmarxMcpServerName()]) {
delete mcpConfig.mcpServers[getCheckmarxMcpServerName()];

fs.writeFileSync(mcpConfigPath, JSON.stringify(mcpConfig, null, 2), "utf-8");
}
} else {
// Handle VSCode: Remove from settings
const config = vscode.workspace.getConfiguration();
Expand All @@ -183,17 +151,11 @@ export async function uninstallMcp() {
// Create a new object without the Checkmarx server to avoid proxy issues
const updatedServers = { ...existingServers };
delete updatedServers[getCheckmarxMcpServerName()];
try {
await config.update(
"mcp",
{ servers: updatedServers },
vscode.ConfigurationTarget.Global
);
} catch (error) {
const errorMessage = error instanceof Error ? error.message : String(error);
console.warn(`Failed to update MCP server details. Using fallback mechanism to configure mcp server details. Error: ${errorMessage}`);
await removeMcpFromJsonFile();
}
await config.update(
"mcp",
{ servers: updatedServers },
vscode.ConfigurationTarget.Global
);
}
}
} catch (error) {
Expand Down Expand Up @@ -267,17 +229,11 @@ export async function initializeMcpConfiguration(apiKey: string) {
const updatedServers = { ...existingServers };
updatedServers[getCheckmarxMcpServerName()] = mcpServer;

try {
await config.update(
"mcp",
{ servers: updatedServers },
vscode.ConfigurationTarget.Global
);
} catch (error) {
const errorMessage = error instanceof Error ? error.message : String(error);
console.warn(`Failed to update MCP server details. Using fallback mechanism to configure mcp server details. Error: ${errorMessage}`);
await updateMcpJsonFile(mcpServer);
}
await config.update(
"mcp",
{ servers: updatedServers },
vscode.ConfigurationTarget.Global
);
}

vscode.window.showInformationMessage("MCP configuration saved successfully.");
Expand Down
Loading