From 216900a6779ea4e94d2190693e472256a97fb573 Mon Sep 17 00:00:00 2001
From: a7m-1st <Ahmed.jimi.awelkeir500@gmail.com>
Date: Fri, 12 Sep 2025 15:24:35 +0300
Subject: [PATCH] fix: duplicate mcp server names

---
 src/pages/Setting/MCP.tsx | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/pages/Setting/MCP.tsx b/src/pages/Setting/MCP.tsx
index 34010d016..40ab2b188 100644
--- a/src/pages/Setting/MCP.tsx
+++ b/src/pages/Setting/MCP.tsx
@@ -20,6 +20,7 @@ import { getProxyBaseURL } from "@/lib";
 import { useAuthStore } from "@/store/authStore";
 
 import { toast } from "sonner";
+import { ConfigFile } from "electron/main/utils/mcpConfig";
 
 export default function SettingMCP() {
 	const navigate = useNavigate();
@@ -236,9 +237,27 @@ export default function SettingMCP() {
 		setInstalling(true);
 		try {
 			if (addType === "local") {
-				let data;
+				let data:ConfigFile;
 				try {
 					data = JSON.parse(localJson);
+
+					// validate mcpServers structure
+					if (!data.mcpServers || typeof data.mcpServers !== "object") {
+						throw new Error("Invalid mcpServers");
+					}
+
+					// check for name conflicts with existing items
+					const serverNames = Object.keys(data.mcpServers);
+					const conflict = serverNames.find((name) =>
+						items.some((d) => d.mcp_name === name)
+					);
+					if (conflict) {
+						toast.error(`MCP server "${conflict}" already exists`, {
+							closeButton: true,
+						});
+						setInstalling(false);
+						return;
+					}
 				} catch (e) {
 					toast.error("Invalid JSON", { closeButton: true });
 					setInstalling(false);