From 792548b3793727ecf21085d9be5cd50c109ae003 Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Tue, 13 Jan 2026 13:46:17 -0800
Subject: [PATCH 01/18] feat: add MCP connector frontend UI and integration

---
 .../assistant-ui/connector-popup.tsx          |   3 +
 .../components/connector-card.tsx             |  17 +-
 .../components/mcp-connect-form.tsx           | 276 ++++++++++++++++
 .../connector-popup/connect-forms/index.tsx   |   4 +
 .../components/mcp-config.tsx                 | 310 ++++++++++++++++++
 .../connector-configs/index.tsx               |   5 +
 .../views/connector-connect-view.tsx          |   1 +
 .../views/connector-edit-view.tsx             |   8 +-
 .../constants/connector-constants.ts          |   6 +
 .../hooks/use-connector-dialog.ts             |  65 +++-
 .../tabs/active-connectors-tab.tsx            | 110 +++++--
 .../views/connector-accounts-list-view.tsx    |  16 +-
 surfsense_web/contracts/enums/connector.ts    |   1 +
 .../contracts/enums/connectorIcons.tsx        |   2 +
 .../contracts/types/connector.types.ts        |   4 +
 surfsense_web/contracts/types/mcp.types.ts    |  83 +++++
 .../lib/apis/connectors-api.service.ts        |  78 +++++
 17 files changed, 948 insertions(+), 41 deletions(-)
 create mode 100644 surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
 create mode 100644 surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
 create mode 100644 surfsense_web/contracts/types/mcp.types.ts

diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index 1e6dd09ae..28fe5b5b0 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -68,6 +68,7 @@ export const ConnectorIndicator: FC = () => {
 		setEndDate,
 		setPeriodicEnabled,
 		setFrequencyMinutes,
+		setOtherMCPConnectorIds,
 		handleOpenChange,
 		handleTabChange,
 		handleScroll,
@@ -239,6 +240,8 @@ export const ConnectorIndicator: FC = () => {
 						isSaving={isSaving}
 						isDisconnecting={isDisconnecting}
 						isIndexing={indexingConnectorIds.has(editingConnector.id)}
+						searchSpaceId={searchSpaceId?.toString()}
+						onOtherMCPConnectorsLoaded={setOtherMCPConnectorIds}
 						onStartDateChange={setStartDate}
 						onEndDateChange={setEndDate}
 						onPeriodicEnabledChange={setPeriodicEnabled}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/components/connector-card.tsx b/surfsense_web/components/assistant-ui/connector-popup/components/connector-card.tsx
index fa4b8feb6..bb35ee8a3 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/components/connector-card.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/components/connector-card.tsx
@@ -27,6 +27,16 @@ interface ConnectorCardProps {
 	onManage?: () => void;
 }
 
+/**
+ * Check if a connector type is indexable (has documents)
+ * MCP connectors are tools only and don't have indexable content
+ */
+function isIndexableConnector(connectorType?: string): boolean {
+	if (!connectorType) return true; // Default to true for unknown types
+	const nonIndexableTypes = ["MCP_CONNECTOR"];
+	return !nonIndexableTypes.includes(connectorType);
+}
+
 /**
  * Extract a number from the active task message for display
  * Looks for patterns like "45 indexed", "Processing 123", etc.
@@ -135,7 +145,12 @@ export const ConnectorCard: FC<ConnectorCardProps> = ({
 		}
 
 		if (isConnected) {
-			// Show last indexed date for connected connectors
+			// For non-indexable connectors (like MCP), show description instead of index status
+			if (!isIndexableConnector(connectorType)) {
+				return description;
+			}
+
+			// Show last indexed date for connected indexable connectors
 			if (lastIndexedAt) {
 				return (
 					<span className="whitespace-nowrap text-[10px]">
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
new file mode 100644
index 000000000..3ef43b3db
--- /dev/null
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
@@ -0,0 +1,276 @@
+"use client";
+
+import { CheckCircle2, Server, XCircle } from "lucide-react";
+import { type FC, useRef, useState } from "react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { Label } from "@/components/ui/label";
+import { Textarea } from "@/components/ui/textarea";
+import { EnumConnectorName } from "@/contracts/enums/connector";
+import type { MCPServerConfig, MCPToolDefinition } from "@/contracts/types/mcp.types";
+import { connectorsApiService } from "@/lib/apis/connectors-api.service";
+import type { ConnectFormProps } from "..";
+
+const DEFAULT_CONFIG = `[
+  {
+    "name": "MCP Server 1",
+    "command": "npx",
+    "args": ["-y", "@modelcontextprotocol/server-filesystem", "/path/to/allowed/directory"],
+    "env": {},
+    "transport": "stdio"
+  }
+]`;
+
+interface MCPServerWithName extends MCPServerConfig {
+	name: string;
+}
+
+export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting }) => {
+	const isSubmittingRef = useRef(false);
+	const [configJson, setConfigJson] = useState(DEFAULT_CONFIG);
+	const [jsonError, setJsonError] = useState<string | null>(null);
+	const [isTesting, setIsTesting] = useState(false);
+	const [testResults, setTestResults] = useState<Array<{
+		name: string;
+		status: "success" | "error";
+		message: string;
+		tools: MCPToolDefinition[];
+	}> | null>(null);
+
+	const parseConfigs = (): { configs: MCPServerWithName[] | null; error: string | null } => {
+		try {
+			const parsed = JSON.parse(configJson);
+			
+			// Must be an array
+			if (!Array.isArray(parsed)) {
+				return {
+					configs: null,
+					error: "Configuration must be an array of MCP server objects",
+				};
+			}
+
+			if (parsed.length === 0) {
+				return {
+					configs: null,
+					error: "Array must contain at least one MCP server configuration",
+				};
+			}
+
+			// Validate each server config
+			const configs: MCPServerWithName[] = [];
+			for (let i = 0; i < parsed.length; i++) {
+				const server = parsed[i];
+				
+				if (!server.name || typeof server.name !== "string") {
+					return {
+						configs: null,
+						error: `Server ${i + 1}: 'name' field is required and must be a string`,
+					};
+				}
+
+				if (!server.command || typeof server.command !== "string") {
+					return {
+						configs: null,
+						error: `Server ${i + 1} (${server.name}): 'command' field is required and must be a string`,
+					};
+				}
+
+				configs.push({
+					name: server.name,
+					command: server.command,
+					args: Array.isArray(server.args) ? server.args : [],
+					env: typeof server.env === "object" && server.env !== null ? server.env : {},
+					transport: server.transport || "stdio",
+				});
+			}
+
+			return { configs, error: null };
+		} catch (error) {
+			return {
+				configs: null,
+				error: error instanceof Error ? error.message : "Invalid JSON",
+			};
+		}
+	};
+
+	const handleConfigChange = (value: string) => {
+		setConfigJson(value);
+		if (jsonError) {
+			setJsonError(null);
+		}
+	};
+
+	const handleTestConnection = async () => {
+		const { configs, error } = parseConfigs();
+		
+		if (!configs || error) {
+			setJsonError(error);
+			setTestResults([{
+				name: "Parse Error",
+				status: "error",
+				message: error || "Invalid configuration",
+				tools: [],
+			}]);
+			return;
+		}
+
+		setIsTesting(true);
+		setTestResults(null);
+		setJsonError(null);
+
+		const results: Array<{
+			name: string;
+			status: "success" | "error";
+			message: string;
+			tools: MCPToolDefinition[];
+		}> = [];
+
+		for (const config of configs) {
+			try {
+				const result = await connectorsApiService.testMCPConnection(config);
+				results.push({
+					name: config.name,
+					...result,
+				});
+			} catch (error) {
+				results.push({
+					name: config.name,
+					status: "error",
+					message: error instanceof Error ? error.message : "Failed to connect to MCP server",
+					tools: [],
+				});
+			}
+		}
+
+		setTestResults(results);
+		setIsTesting(false);
+	};
+
+	const handleSubmit = async (e: React.FormEvent) => {
+		e.preventDefault();
+
+		// Prevent multiple submissions
+		if (isSubmittingRef.current || isSubmitting) {
+			return;
+		}
+
+		const { configs, error } = parseConfigs();
+		
+		if (!configs || error) {
+			setJsonError(error);
+			alert(error || "Invalid JSON configuration");
+			return;
+		}
+
+		isSubmittingRef.current = true;
+		try {
+			// Submit all servers
+			for (const config of configs) {
+				await onSubmit({
+					name: config.name,
+					connector_type: EnumConnectorName.MCP_CONNECTOR,
+					config: { server_config: config },
+					is_indexable: false,
+					is_active: true,
+					last_indexed_at: null,
+					periodic_indexing_enabled: false,
+					indexing_frequency_minutes: null,
+					next_scheduled_at: null,
+				});
+			}
+		} finally {
+			isSubmittingRef.current = false;
+		}
+	};
+
+	return (
+		<div className="space-y-6 pb-6">
+			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3 flex items-start [&>svg]:relative [&>svg]:left-0 [&>svg]:top-1">
+				<Server className="h-4 w-4 shrink-0 ml-1" />
+				<div className="-ml-1">
+					<AlertTitle className="text-xs sm:text-sm">MCP Servers</AlertTitle>
+					<AlertDescription className="text-[10px] sm:text-xs pl-0!">
+						Connect to one or more MCP (Model Context Protocol) servers. Paste a JSON array of server configurations below.
+					</AlertDescription>
+				</div>
+			</Alert>
+
+			<form id="mcp-connect-form" onSubmit={handleSubmit} className="space-y-6">
+				<div className="rounded-xl border border-border bg-slate-400/5 dark:bg-white/5 p-4 sm:p-6 space-y-4">
+					<div className="space-y-2">
+						<Label htmlFor="config">MCP Servers Configuration (JSON Array)</Label>
+						<Textarea
+							id="config"
+							value={configJson}
+							onChange={(e) => handleConfigChange(e.target.value)}
+							placeholder={DEFAULT_CONFIG}
+							rows={16}
+							className={`font-mono text-xs ${jsonError ? "border-red-500" : ""}`}
+						/>
+						{jsonError && (
+							<p className="text-xs text-red-500">JSON Error: {jsonError}</p>
+						)}
+						<p className="text-[10px] sm:text-xs text-muted-foreground">
+							Paste an array of MCP server configurations. Each object must have: name, command, args (optional), env (optional), transport (optional).
+						</p>
+					</div>
+
+					<div className="pt-4">
+						<Button
+							type="button"
+							onClick={handleTestConnection}
+							disabled={isTesting}
+							variant="outline"
+							className="w-full"
+						>
+							{isTesting ? "Testing All Servers..." : "Test All Connections"}
+						</Button>
+					</div>
+
+					{testResults && testResults.length > 0 && (
+						<div className="space-y-3">
+							{testResults.map((result, index) => (
+								<Alert
+									key={index}
+									className={
+										result.status === "success"
+											? "border-green-500/50 bg-green-500/10"
+											: "border-red-500/50 bg-red-500/10"
+									}
+								>
+									{result.status === "success" ? (
+										<CheckCircle2 className="h-4 w-4 text-green-500" />
+									) : (
+										<XCircle className="h-4 w-4 text-red-500" />
+									)}
+									<div>
+										<AlertTitle className="text-sm">
+											{result.name}: {result.status === "success" ? "Connected" : "Failed"}
+										</AlertTitle>
+										<AlertDescription className="text-xs">
+											{result.message}
+											{result.status === "success" && result.tools.length > 0 && (
+												<div className="mt-2">
+													<p className="font-semibold mb-1">
+														Found {result.tools.length} tools:
+													</p>
+													<ul className="list-disc list-inside space-y-1">
+														{result.tools.map((tool, i) => (
+															<li key={i} className="text-xs">
+																<strong>{tool.name}</strong>: {tool.description}
+															</li>
+														))}
+													</ul>
+												</div>
+											)}
+										</AlertDescription>
+									</div>
+								</Alert>
+							))}
+						</div>
+					)}
+				</div>
+			</form>
+		</div>
+	);
+};
\ No newline at end of file
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/index.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/index.tsx
index 024e0dc04..4710f9ad5 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/index.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/index.tsx
@@ -6,6 +6,7 @@ import { ElasticsearchConnectForm } from "./components/elasticsearch-connect-for
 import { GithubConnectForm } from "./components/github-connect-form";
 import { LinkupApiConnectForm } from "./components/linkup-api-connect-form";
 import { LumaConnectForm } from "./components/luma-connect-form";
+import { MCPConnectForm } from "./components/mcp-connect-form";
 import { SearxngConnectForm } from "./components/searxng-connect-form";
 import { TavilyApiConnectForm } from "./components/tavily-api-connect-form";
 
@@ -15,6 +16,7 @@ export interface ConnectFormProps {
 		connector_type: string;
 		config: Record<string, unknown>;
 		is_indexable: boolean;
+		is_active: boolean;
 		last_indexed_at: null;
 		periodic_indexing_enabled: boolean;
 		indexing_frequency_minutes: number | null;
@@ -54,6 +56,8 @@ export function getConnectFormComponent(connectorType: string): ConnectFormCompo
 			return LumaConnectForm;
 		case "CIRCLEBACK_CONNECTOR":
 			return CirclebackConnectForm;
+		case "MCP_CONNECTOR":
+			return MCPConnectForm;
 		// Add other connector types here as needed
 		default:
 			return null;
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
new file mode 100644
index 000000000..771107c93
--- /dev/null
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
@@ -0,0 +1,310 @@
+"use client";
+
+import { CheckCircle2, Server, XCircle } from "lucide-react";
+import type { FC } from "react";
+import { useEffect, useState } from "react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Textarea } from "@/components/ui/textarea";
+import type { MCPServerConfig, MCPToolDefinition } from "@/contracts/types/mcp.types";
+import { connectorsApiService } from "@/lib/apis/connectors-api.service";
+import type { ConnectorConfigProps } from "../index";
+
+interface MCPConfigProps extends ConnectorConfigProps {
+	onNameChange?: (name: string) => void;
+	searchSpaceId?: string;
+	onOtherMCPConnectorsLoaded?: (connectorIds: number[]) => void;
+}
+
+export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNameChange, searchSpaceId, onOtherMCPConnectorsLoaded }) => {
+	const [name, setName] = useState<string>("MCPs");
+	const [configJson, setConfigJson] = useState("");
+	const [jsonError, setJsonError] = useState<string | null>(null);
+	const [isTesting, setIsTesting] = useState(false);
+	const [testResult, setTestResult] = useState<{
+		status: "success" | "error";
+		message: string;
+		tools: MCPToolDefinition[];
+	} | null>(null);
+	const [allMCPConnectors, setAllMCPConnectors] = useState<any[]>([]);
+
+	// Load all MCP connectors for this search space
+	useEffect(() => {
+		const loadAllMCPConnectors = async () => {
+			if (!searchSpaceId) return;
+			
+			try {
+				const connectors = await connectorsApiService.getConnectors({
+					queryParams: { search_space_id: parseInt(searchSpaceId, 10) }
+				});
+				const mcpConnectors = connectors.filter((c: any) => c.connector_type === "MCP_CONNECTOR");
+				setAllMCPConnectors(mcpConnectors);
+				
+				// Notify parent about other MCP connectors that should be deleted on save
+				const otherConnectorIds = mcpConnectors
+					.filter((c: any) => c.id !== connector.id)
+					.map((c: any) => c.id);
+				if (onOtherMCPConnectorsLoaded && otherConnectorIds.length > 0) {
+					onOtherMCPConnectorsLoaded(otherConnectorIds);
+				}
+				
+				// Collect all server configs from all MCP connectors
+				const allServerConfigs: MCPServerConfig[] = [];
+				for (const mcpConn of mcpConnectors) {
+					const serverConfigs = mcpConn.config?.server_configs as MCPServerConfig[] | undefined;
+					if (serverConfigs && Array.isArray(serverConfigs)) {
+						allServerConfigs.push(...serverConfigs);
+					} else {
+						// Fallback to single server_config
+						const serverConfig = mcpConn.config?.server_config as MCPServerConfig | undefined;
+						if (serverConfig) {
+							allServerConfigs.push(serverConfig);
+						}
+					}
+				}
+				
+				if (allServerConfigs.length > 0) {
+					setConfigJson(JSON.stringify(allServerConfigs, null, 2));
+				} else {
+					setConfigJson(JSON.stringify([{
+						command: "",
+						args: [],
+						env: {},
+						transport: "stdio",
+					}], null, 2));
+				}
+			} catch (error) {
+				console.error("Failed to load MCP connectors:", error);
+			}
+		};
+		
+		loadAllMCPConnectors();
+	}, [searchSpaceId]);
+
+
+	const handleNameChange = (value: string) => {
+		setName(value);
+		if (onNameChange) {
+			onNameChange(value);
+		}
+	};
+
+	const parseConfig = (): MCPServerConfig[] | null => {
+		try {
+			const parsed = JSON.parse(configJson);
+			
+			// Handle both single object and array
+			const configs = Array.isArray(parsed) ? parsed : [parsed];
+			
+			// Validate each config
+			const validConfigs: MCPServerConfig[] = [];
+			for (let i = 0; i < configs.length; i++) {
+				const cfg = configs[i];
+				if (!cfg.command || typeof cfg.command !== "string") {
+					setJsonError(`Config ${i + 1}: 'command' field is required and must be a string`);
+					return null;
+				}
+				validConfigs.push({
+					command: cfg.command,
+					args: cfg.args || [],
+					env: cfg.env || {},
+					transport: cfg.transport || "stdio",
+				});
+			}
+			
+			setJsonError(null);
+			return validConfigs;
+		} catch (error) {
+			setJsonError(error instanceof Error ? error.message : "Invalid JSON");
+			return null;
+		}
+	};
+
+	const handleConfigChange = (value: string) => {
+		setConfigJson(value);
+		// Clear error when user starts typing
+		if (jsonError) {
+			setJsonError(null);
+		}
+		
+		// Try to parse and update parent if valid
+		try {
+			const parsed = JSON.parse(value);
+			const configs = Array.isArray(parsed) ? parsed : [parsed];
+			
+			// Validate each config
+			const validConfigs: MCPServerConfig[] = [];
+			for (const cfg of configs) {
+				if (cfg.command && typeof cfg.command === "string") {
+					validConfigs.push({
+						command: cfg.command,
+						args: cfg.args || [],
+						env: cfg.env || {},
+						transport: cfg.transport || "stdio",
+					});
+				}
+			}
+			
+			// Update parent if we have valid configs
+			if (validConfigs.length > 0 && onConfigChange) {
+				onConfigChange({ server_configs: validConfigs });
+			}
+		} catch {
+			// Ignore parse errors while typing - don't update parent with invalid config
+		}
+	};
+
+	const handleTestConnection = async () => {
+		const serverConfigs = parseConfig();
+		if (!serverConfigs || serverConfigs.length === 0) {
+			setTestResult({
+				status: "error",
+				message: jsonError || "Invalid configuration",
+				tools: [],
+			});
+			return;
+		}
+
+		// Update parent with the config array
+		if (onConfigChange) {
+			onConfigChange({ server_configs: serverConfigs });
+		}
+
+		setIsTesting(true);
+		setTestResult(null);
+
+		try {
+			// Test all servers and collect results
+			const allTools: MCPToolDefinition[] = [];
+			const errors: string[] = [];
+			
+			for (const serverConfig of serverConfigs) {
+				try {
+					const result = await connectorsApiService.testMCPConnection(serverConfig);
+					if (result.status === "success") {
+						allTools.push(...result.tools);
+					} else {
+						errors.push(`${serverConfig.command}: ${result.message}`);
+					}
+				} catch (error) {
+					errors.push(`${serverConfig.command}: ${error instanceof Error ? error.message : "Failed to connect"}`);
+				}
+			}
+			
+			if (errors.length === 0) {
+				setTestResult({
+					status: "success",
+					message: `Successfully connected to ${serverConfigs.length} server(s)`,
+					tools: allTools,
+				});
+			} else if (allTools.length > 0) {
+				setTestResult({
+					status: "success",
+					message: `Partially successful. Errors: ${errors.join("; ")}`,
+					tools: allTools,
+				});
+			} else {
+				setTestResult({
+					status: "error",
+					message: errors.join("; "),
+					tools: [],
+				});
+			}
+		} catch (error) {
+			setTestResult({
+				status: "error",
+				message: error instanceof Error ? error.message : "Failed to connect to MCP servers",
+				tools: [],
+			});
+		} finally {
+			setIsTesting(false);
+		}
+	};
+
+	return (
+		<div className="space-y-6">
+			{/* Server Configuration */}
+			<div className="space-y-4">
+				<h3 className="font-medium text-sm sm:text-base flex items-center gap-2">
+					<Server className="h-4 w-4" />
+					Server Configuration
+				</h3>
+
+				<div className="rounded-xl border border-border bg-slate-400/5 dark:bg-white/5 p-3 sm:p-6 space-y-4">
+					<div className="space-y-2">
+						<Textarea
+							value={configJson}
+							onChange={(e) => handleConfigChange(e.target.value)}
+							rows={12}
+							className={`font-mono text-xs border-slate-400/20 focus-visible:border-slate-400/40 ${
+								jsonError ? "border-red-500" : ""
+							}`}
+						/>
+						{jsonError && (
+							<p className="text-xs text-red-500">
+								JSON Error: {jsonError}
+							</p>
+						)}
+						<p className="text-[10px] sm:text-xs text-muted-foreground">
+							Edit your MCP server configurations (array format). Each server requires: command, args, env, transport.
+						</p>
+					</div>
+
+					{/* Test Connection */}
+					<div className="pt-4">
+						<Button
+							type="button"
+							onClick={handleTestConnection}
+							disabled={isTesting}
+							variant="outline"
+							className="w-full"
+						>
+							{isTesting ? "Testing..." : "Test Connection"}
+						</Button>
+					</div>
+
+					{/* Test Result */}
+					{testResult && (
+						<Alert
+							className={
+								testResult.status === "success"
+									? "border-green-500/50 bg-green-500/10"
+									: "border-red-500/50 bg-red-500/10"
+							}
+						>
+							{testResult.status === "success" ? (
+								<CheckCircle2 className="h-4 w-4 text-green-500" />
+							) : (
+								<XCircle className="h-4 w-4 text-red-500" />
+							)}
+							<div>
+								<AlertTitle className="text-sm">
+									{testResult.status === "success" ? "Connection Successful" : "Connection Failed"}
+								</AlertTitle>
+								<AlertDescription className="text-xs">
+									{testResult.message}
+									{testResult.status === "success" && testResult.tools.length > 0 && (
+										<div className="mt-2">
+											<p className="font-semibold mb-1">
+												Found {testResult.tools.length} tools:
+											</p>
+											<ul className="list-disc list-inside space-y-1">
+												{testResult.tools.map((tool, i) => (
+													<li key={i} className="text-xs">
+														<strong>{tool.name}</strong>: {tool.description}
+													</li>
+												))}
+											</ul>
+										</div>
+									)}
+								</AlertDescription>
+							</div>
+						</Alert>
+					)}
+				</div>
+			</div>
+		</div>
+	);
+};
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/index.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/index.tsx
index 267e85115..4c1ff3ed2 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/index.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/index.tsx
@@ -14,6 +14,7 @@ import { GoogleDriveConfig } from "./components/google-drive-config";
 import { JiraConfig } from "./components/jira-config";
 import { LinkupApiConfig } from "./components/linkup-api-config";
 import { LumaConfig } from "./components/luma-config";
+import { MCPConfig } from "./components/mcp-config";
 import { SearxngConfig } from "./components/searxng-config";
 import { SlackConfig } from "./components/slack-config";
 import { TavilyApiConfig } from "./components/tavily-api-config";
@@ -24,6 +25,8 @@ export interface ConnectorConfigProps {
 	connector: SearchSourceConnector;
 	onConfigChange?: (config: Record<string, unknown>) => void;
 	onNameChange?: (name: string) => void;
+	searchSpaceId?: string;
+	onOtherMCPConnectorsLoaded?: (connectorIds: number[]) => void;
 }
 
 export type ConnectorConfigComponent = FC<ConnectorConfigProps>;
@@ -69,6 +72,8 @@ export function getConnectorConfigComponent(
 			return LumaConfig;
 		case "CIRCLEBACK_CONNECTOR":
 			return CirclebackConfig;
+		case "MCP_CONNECTOR":
+			return MCPConfig;
 		// OAuth connectors (Gmail, Calendar, Airtable, Notion) and others don't need special config UI
 		default:
 			return null;
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
index e3941367b..5d198436d 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
@@ -56,6 +56,7 @@ export const ConnectorConnectView: FC<ConnectorConnectViewProps> = ({
 			GITHUB_CONNECTOR: "github-connect-form",
 			LUMA_CONNECTOR: "luma-connect-form",
 			CIRCLEBACK_CONNECTOR: "circleback-connect-form",
+			MCP_CONNECTOR: "mcp-connect-form",
 		};
 		const formId = formIdMap[connectorType];
 		if (formId) {
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
index d163a0bdc..0b625f176 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
@@ -19,6 +19,8 @@ interface ConnectorEditViewProps {
 	isSaving: boolean;
 	isDisconnecting: boolean;
 	isIndexing?: boolean;
+	searchSpaceId?: string;
+	onOtherMCPConnectorsLoaded?: (connectorIds: number[]) => void;
 	onStartDateChange: (date: Date | undefined) => void;
 	onEndDateChange: (date: Date | undefined) => void;
 	onPeriodicEnabledChange: (enabled: boolean) => void;
@@ -40,6 +42,8 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 	isSaving,
 	isDisconnecting,
 	isIndexing = false,
+	searchSpaceId,
+	onOtherMCPConnectorsLoaded,
 	onStartDateChange,
 	onEndDateChange,
 	onPeriodicEnabledChange,
@@ -149,7 +153,7 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 						</div>
 						<div className="flex-1 min-w-0">
 							<h2 className="text-xl sm:text-2xl font-semibold tracking-tight text-wrap whitespace-normal wrap-break-word">
-								{connector.name}
+							{connector.connector_type === "MCP_CONNECTOR" ? "MCPs" : connector.name}
 							</h2>
 							<p className="text-xs sm:text-base text-muted-foreground mt-1">
 								Manage your connector settings and sync configuration
@@ -197,6 +201,8 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 								connector={connector}
 								onConfigChange={onConfigChange}
 								onNameChange={onNameChange}
+								searchSpaceId={searchSpaceId}
+								onOtherMCPConnectorsLoaded={onOtherMCPConnectorsLoaded}
 							/>
 						)}
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup/constants/connector-constants.ts b/surfsense_web/components/assistant-ui/connector-popup/constants/connector-constants.ts
index 23982e6f3..1ac3549df 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/constants/connector-constants.ts
+++ b/surfsense_web/components/assistant-ui/connector-popup/constants/connector-constants.ts
@@ -160,6 +160,12 @@ export const OTHER_CONNECTORS = [
 		description: "Receive meeting notes, transcripts",
 		connectorType: EnumConnectorName.CIRCLEBACK_CONNECTOR,
 	},
+	{
+		id: "mcp-connector",
+		title: "MCPs",
+		description: "Connect to MCP servers for AI tools",
+		connectorType: EnumConnectorName.MCP_CONNECTOR,
+	},
 ] as const;
 
 // Re-export IndexingConfigState from schemas for backward compatibility
diff --git a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
index 99bd11f53..899222863 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
+++ b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
@@ -68,6 +68,7 @@ export const useConnectorDialog = () => {
 	const [isDisconnecting, setIsDisconnecting] = useState(false);
 	const [connectorConfig, setConnectorConfig] = useState<Record<string, unknown> | null>(null);
 	const [connectorName, setConnectorName] = useState<string | null>(null);
+	const [otherMCPConnectorIds, setOtherMCPConnectorIds] = useState<number[]>([]);
 
 	// Connect mode state (for non-OAuth connectors)
 	const [connectingConnectorType, setConnectingConnectorType] = useState<string | null>(null);
@@ -421,6 +422,7 @@ export const useConnectorDialog = () => {
 					connector_type: EnumConnectorName.WEBCRAWLER_CONNECTOR,
 					config: {},
 					is_indexable: true,
+					is_active: true,
 					last_indexed_at: null,
 					periodic_indexing_enabled: false,
 					indexing_frequency_minutes: null,
@@ -522,17 +524,18 @@ export const useConnectorDialog = () => {
 					data: {
 						...connectorData,
 						connector_type: connectorData.connector_type as EnumConnectorName,
-						next_scheduled_at: connectorData.next_scheduled_at as string | null,
-					},
-					queryParams: {
-						search_space_id: searchSpaceId,
-					},
-				});
+					is_active: true,
+					next_scheduled_at: connectorData.next_scheduled_at as string | null,
+				},
+				queryParams: {
+					search_space_id: searchSpaceId,
+				},
+			});
 
-				// Refetch connectors to get the new one
-				const result = await refetchAllConnectors();
-				if (result.data) {
-					const connector = result.data.find(
+			// Refetch connectors to get the new one
+			const result = await refetchAllConnectors();
+			if (result.data) {
+				const connector = result.data.find(
 						(c: SearchSourceConnector) => c.id === newConnector.id
 					);
 					if (connector) {
@@ -1009,7 +1012,7 @@ export const useConnectorDialog = () => {
 	// Handle saving connector changes
 	const handleSaveConnector = useCallback(
 		async (refreshConnectors: () => void) => {
-			if (!editingConnector || !searchSpaceId) return;
+			if (!editingConnector || !searchSpaceId || isSaving) return;
 
 			// Validate date range (skip for Google Drive which uses folder selection, Webcrawler which uses config, and non-indexable connectors)
 			if (
@@ -1044,6 +1047,21 @@ export const useConnectorDialog = () => {
 				const startDateStr = startDate ? format(startDate, "yyyy-MM-dd") : undefined;
 				const endDateStr = endDate ? format(endDate, "yyyy-MM-dd") : undefined;
 
+				// For MCP connectors, delete other MCP connectors first (consolidate all into one)
+				if (editingConnector.connector_type === "MCP_CONNECTOR" && otherMCPConnectorIds.length > 0) {
+					// Silently delete other MCP connectors without showing toasts
+					await Promise.all(
+						otherMCPConnectorIds.map((id) =>
+							deleteConnector({
+								id,
+							}).catch(() => {
+								// Silently ignore errors for individual deletions
+							})
+						)
+					);
+					setOtherMCPConnectorIds([]);
+				}
+
 				// Update connector with periodic sync settings, config changes, and name
 				// Note: Periodic sync is disabled for Google Drive connectors and non-indexable connectors
 				const frequency =
@@ -1148,11 +1166,16 @@ export const useConnectorDialog = () => {
 					);
 				}
 
-				toast.success(`${editingConnector.name} updated successfully`, {
-					description: periodicEnabled
-						? `Periodic sync ${frequency ? `enabled every ${getFrequencyLabel(frequencyMinutes)}` : "enabled"}. ${indexingDescription}`
-						: indexingDescription,
-				});
+				toast.success(
+					editingConnector.connector_type === "MCP_CONNECTOR" 
+						? "MCPs updated successfully" 
+						: `${editingConnector.name} updated successfully`,
+					{
+						description: periodicEnabled
+							? `Periodic sync ${frequency ? `enabled every ${getFrequencyLabel(frequencyMinutes)}` : "enabled"}. ${indexingDescription}`
+							: indexingDescription,
+					}
+				);
 
 				// Update URL - the effect will handle closing the modal and clearing state
 				const url = new URL(window.location.href);
@@ -1176,6 +1199,7 @@ export const useConnectorDialog = () => {
 		[
 			editingConnector,
 			searchSpaceId,
+			isSaving,
 			startDate,
 			endDate,
 			indexConnector,
@@ -1186,6 +1210,8 @@ export const useConnectorDialog = () => {
 			router,
 			connectorConfig,
 			connectorName,
+			otherMCPConnectorIds,
+			deleteConnector,
 		]
 	);
 
@@ -1207,7 +1233,11 @@ export const useConnectorDialog = () => {
 					editingConnector.id
 				);
 
-				toast.success(`${editingConnector.name} disconnected successfully`);
+				toast.success(
+					editingConnector.connector_type === "MCP_CONNECTOR"
+						? "MCPs disconnected successfully"
+						: `${editingConnector.name} disconnected successfully`
+				);
 
 				// Update URL - the effect will handle closing the modal and clearing state
 				const url = new URL(window.location.href);
@@ -1375,6 +1405,7 @@ export const useConnectorDialog = () => {
 		setPeriodicEnabled,
 		setFrequencyMinutes,
 		setConnectorName,
+		setOtherMCPConnectorIds,
 
 		// Handlers
 		handleOpenChange,
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
index 7f1bd28f0..d05a4c8dd 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
@@ -4,12 +4,15 @@ import { differenceInDays, differenceInMinutes, format, isToday, isYesterday } f
 import { ArrowRight, Cable, Loader2 } from "lucide-react";
 import { useRouter } from "next/navigation";
 import type { FC } from "react";
+import { useState } from "react";
 import { getDocumentTypeLabel } from "@/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon";
 import { Button } from "@/components/ui/button";
+import { Switch } from "@/components/ui/switch";
 import { TabsContent } from "@/components/ui/tabs";
 import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
 import type { SearchSourceConnector } from "@/contracts/types/connector.types";
 import type { LogActiveTask, LogSummary } from "@/contracts/types/log.types";
+import { connectorsApiService } from "@/lib/apis/connectors-api.service";
 import { cn } from "@/lib/utils";
 import { OAUTH_CONNECTORS } from "../constants/connector-constants";
 import { getDocumentCountForConnector } from "../utils/connector-document-mapping";
@@ -28,6 +31,14 @@ interface ActiveConnectorsTabProps {
 	onViewAccountsList?: (connectorType: string, connectorTitle: string) => void;
 }
 
+/**
+ * Check if a connector type is indexable
+ */
+function isIndexableConnector(connectorType: string): boolean {
+	const nonIndexableTypes = ["MCP_CONNECTOR"];
+	return !nonIndexableTypes.includes(connectorType);
+}
+
 export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 	searchQuery,
 	hasSources,
@@ -112,9 +123,12 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 	// Get OAuth connector types set for quick lookup
 	const oauthConnectorTypes = new Set<string>(OAUTH_CONNECTORS.map((c) => c.connectorType));
 
-	// Separate OAuth and non-OAuth connectors
+	// Separate OAuth, MCP, and other non-OAuth connectors
 	const oauthConnectors = connectors.filter((c) => oauthConnectorTypes.has(c.connector_type));
-	const nonOauthConnectors = connectors.filter((c) => !oauthConnectorTypes.has(c.connector_type));
+	const mcpConnectors = connectors.filter((c) => c.connector_type === "MCP_CONNECTOR");
+	const nonOauthConnectors = connectors.filter(
+		(c) => !oauthConnectorTypes.has(c.connector_type) && c.connector_type !== "MCP_CONNECTOR"
+	);
 
 	// Group OAuth connectors by type
 	const oauthConnectorsByType = oauthConnectors.reduce(
@@ -165,8 +179,17 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 		);
 	});
 
+	// Check if MCPs match search query
+	const showMCPs =
+		mcpConnectors.length > 0 &&
+		(!searchQuery ||
+			"mcps".includes(searchQuery.toLowerCase()) ||
+			"model context protocol".includes(searchQuery.toLowerCase()));
+
 	const hasActiveConnectors =
-		filteredOAuthConnectorTypes.length > 0 || filteredNonOAuthConnectors.length > 0;
+		filteredOAuthConnectorTypes.length > 0 ||
+		filteredNonOAuthConnectors.length > 0 ||
+		showMCPs;
 
 	return (
 		<TabsContent value="active" className="m-0">
@@ -229,14 +252,20 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 													</p>
 												) : (
 													<p className="text-[10px] text-muted-foreground mt-1 whitespace-nowrap">
-														{mostRecentLastIndexed
-															? `Last indexed: ${formatLastIndexedDate(mostRecentLastIndexed)}`
-															: "Never indexed"}
-													</p>
+														{isIndexableConnector(connectorType)
+															? mostRecentLastIndexed
+																? `Last indexed: ${formatLastIndexedDate(mostRecentLastIndexed)}`
+																: "Never indexed"
+															: "Active"}
+												</p>
 												)}
 												<p className="text-[10px] text-muted-foreground mt-0.5 flex items-center gap-1.5">
-													<span>{formatDocumentCount(documentCount)}</span>
-													<span className="text-muted-foreground/50">•</span>
+													{isIndexableConnector(connectorType) && (
+														<>
+															<span>{formatDocumentCount(documentCount)}</span>
+															<span className="text-muted-foreground/50">•</span>
+														</>
+													)}
 													<span>
 														{accountCount} {accountCount === 1 ? "Account" : "Accounts"}
 													</span>
@@ -254,6 +283,44 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 									);
 								})}
 
+								{/* MCP Connectors - Single Grouped Card */}
+								{showMCPs && (
+									<div
+										className={cn(
+											"flex items-center gap-4 p-4 rounded-xl border border-border transition-all",
+											"hover:bg-slate-400/10 dark:hover:bg-white/10"
+										)}
+									>
+										<div
+											className={cn(
+												"flex h-12 w-12 items-center justify-center rounded-lg border shrink-0",
+												"bg-slate-400/5 dark:bg-white/5 border-slate-400/5 dark:border-white/5"
+											)}
+										>
+											{getConnectorIcon("MCP_CONNECTOR", "size-6")}
+										</div>
+										<div className="flex-1 min-w-0">
+											<p className="text-[14px] font-semibold leading-tight truncate">MCPs</p>
+											<p className="text-[10px] text-muted-foreground mt-1 whitespace-nowrap">
+												Active
+											</p>
+											<p className="text-[10px] text-muted-foreground mt-0.5">
+												{mcpConnectors.length} {mcpConnectors.length === 1 ? "Server" : "Servers"}
+											</p>
+										</div>
+										<Button
+											variant="secondary"
+											size="sm"
+											className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-slate-50 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-secondary/80 shrink-0"
+											onClick={
+												onManage && mcpConnectors[0] ? () => onManage(mcpConnectors[0]) : undefined
+											}
+										>
+											Manage
+										</Button>
+									</div>
+								)}
+
 								{/* Non-OAuth Connectors - Individual Cards */}
 								{filteredNonOAuthConnectors.map((connector) => {
 									const isIndexing = indexingConnectorIds.has(connector.id);
@@ -264,7 +331,6 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 										connector.connector_type,
 										documentTypeCounts
 									);
-
 									return (
 										<div
 											key={`connector-${connector.id}`}
@@ -286,9 +352,11 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 												{getConnectorIcon(connector.connector_type, "size-6")}
 											</div>
 											<div className="flex-1 min-w-0">
-												<p className="text-[14px] font-semibold leading-tight truncate">
-													{connector.name}
-												</p>
+												<div className="flex items-center gap-2">
+													<p className="text-[14px] font-semibold leading-tight">
+														{connector.name}
+													</p>
+												</div>
 												{isIndexing ? (
 													<p className="text-[11px] text-primary mt-1 flex items-center gap-1.5">
 														<Loader2 className="size-3 animate-spin" />
@@ -301,14 +369,18 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 													</p>
 												) : (
 													<p className="text-[10px] text-muted-foreground mt-1 whitespace-nowrap">
-														{connector.last_indexed_at
-															? `Last indexed: ${formatLastIndexedDate(connector.last_indexed_at)}`
-															: "Never indexed"}
+														{isIndexableConnector(connector.connector_type)
+															? connector.last_indexed_at
+																? `Last indexed: ${formatLastIndexedDate(connector.last_indexed_at)}`
+																: "Never indexed"
+															: "Active"}
+													</p>
+												)}
+												{isIndexableConnector(connector.connector_type) && (
+													<p className="text-[10px] text-muted-foreground mt-0.5">
+														{formatDocumentCount(documentCount)}
 													</p>
 												)}
-												<p className="text-[10px] text-muted-foreground mt-0.5">
-													{formatDocumentCount(documentCount)}
-												</p>
 											</div>
 											<Button
 												variant="secondary"
diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
index bec4bfcb8..95409725e 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
@@ -23,6 +23,14 @@ interface ConnectorAccountsListViewProps {
 	isConnecting?: boolean;
 }
 
+/**
+ * Check if a connector type is indexable
+ */
+function isIndexableConnector(connectorType: string): boolean {
+	const nonIndexableTypes = ["MCP_CONNECTOR"];
+	return !nonIndexableTypes.includes(connectorType);
+}
+
 /**
  * Format last indexed date with contextual messages
  */
@@ -177,9 +185,11 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 										</p>
 									) : (
 										<p className="text-[10px] text-muted-foreground mt-1 whitespace-nowrap truncate">
-											{connector.last_indexed_at
-												? `Last indexed: ${formatLastIndexedDate(connector.last_indexed_at)}`
-												: "Never indexed"}
+											{isIndexableConnector(connector.connector_type)
+												? connector.last_indexed_at
+													? `Last indexed: ${formatLastIndexedDate(connector.last_indexed_at)}`
+													: "Never indexed"
+												: "Active"}
 										</p>
 									)}
 								</div>
diff --git a/surfsense_web/contracts/enums/connector.ts b/surfsense_web/contracts/enums/connector.ts
index fc65585e2..f4e1ee7b4 100644
--- a/surfsense_web/contracts/enums/connector.ts
+++ b/surfsense_web/contracts/enums/connector.ts
@@ -22,4 +22,5 @@ export enum EnumConnectorName {
 	WEBCRAWLER_CONNECTOR = "WEBCRAWLER_CONNECTOR",
 	YOUTUBE_CONNECTOR = "YOUTUBE_CONNECTOR",
 	CIRCLEBACK_CONNECTOR = "CIRCLEBACK_CONNECTOR",
+	MCP_CONNECTOR = "MCP_CONNECTOR",
 }
diff --git a/surfsense_web/contracts/enums/connectorIcons.tsx b/surfsense_web/contracts/enums/connectorIcons.tsx
index e2d667a16..5f147b63b 100644
--- a/surfsense_web/contracts/enums/connectorIcons.tsx
+++ b/surfsense_web/contracts/enums/connectorIcons.tsx
@@ -64,6 +64,8 @@ export const getConnectorIcon = (connectorType: EnumConnectorName | string, clas
 			return <Image src="/connectors/youtube.svg" alt="YouTube" {...imgProps} />;
 		case EnumConnectorName.CIRCLEBACK_CONNECTOR:
 			return <IconUsersGroup {...iconProps} />;
+		case EnumConnectorName.MCP_CONNECTOR:
+			return <Webhook {...iconProps} />;
 		// Additional cases for non-enum connector types
 		case "YOUTUBE_CONNECTOR":
 			return <Image src="/connectors/youtube.svg" alt="YouTube" {...imgProps} />;
diff --git a/surfsense_web/contracts/types/connector.types.ts b/surfsense_web/contracts/types/connector.types.ts
index f864ae16f..afd20b474 100644
--- a/surfsense_web/contracts/types/connector.types.ts
+++ b/surfsense_web/contracts/types/connector.types.ts
@@ -26,6 +26,7 @@ export const searchSourceConnectorTypeEnum = z.enum([
 	"YOUTUBE_CONNECTOR",
 	"BOOKSTACK_CONNECTOR",
 	"CIRCLEBACK_CONNECTOR",
+	"MCP_CONNECTOR",
 ]);
 
 export const searchSourceConnector = z.object({
@@ -33,6 +34,7 @@ export const searchSourceConnector = z.object({
 	name: z.string(),
 	connector_type: searchSourceConnectorTypeEnum,
 	is_indexable: z.boolean(),
+	is_active: z.boolean().default(true),
 	last_indexed_at: z.string().nullable(),
 	config: z.record(z.string(), z.any()),
 	periodic_indexing_enabled: z.boolean(),
@@ -85,6 +87,7 @@ export const createConnectorRequest = z.object({
 		name: true,
 		connector_type: true,
 		is_indexable: true,
+		is_active: true,
 		last_indexed_at: true,
 		config: true,
 		periodic_indexing_enabled: true,
@@ -108,6 +111,7 @@ export const updateConnectorRequest = z.object({
 			name: true,
 			connector_type: true,
 			is_indexable: true,
+			is_active: true,
 			last_indexed_at: true,
 			config: true,
 			periodic_indexing_enabled: true,
diff --git a/surfsense_web/contracts/types/mcp.types.ts b/surfsense_web/contracts/types/mcp.types.ts
new file mode 100644
index 000000000..e25ffe3c5
--- /dev/null
+++ b/surfsense_web/contracts/types/mcp.types.ts
@@ -0,0 +1,83 @@
+import { z } from "zod";
+
+/**
+ * MCP Server Configuration Schema (similar to Cursor's config)
+ */
+export const mcpServerConfig = z.object({
+	command: z.string().min(1, "Command is required"),
+	args: z.array(z.string()).default([]),
+	env: z.record(z.string(), z.string()).default({}),
+	transport: z.enum(["stdio", "sse", "http"]).default("stdio"),
+});
+
+/**
+ * MCP Connector Schemas
+ */
+export const mcpConnectorCreate = z.object({
+	name: z.string().min(1, "Connector name is required"),
+	server_config: mcpServerConfig,
+});
+
+export const mcpConnectorUpdate = z.object({
+	name: z.string().min(1).optional(),
+	server_config: mcpServerConfig.optional(),
+});
+
+export const mcpConnectorRead = z.object({
+	id: z.number(),
+	name: z.string(),
+	connector_type: z.literal("MCP_CONNECTOR"),
+	server_config: mcpServerConfig,
+	search_space_id: z.number(),
+	user_id: z.string(),
+	created_at: z.string(),
+	updated_at: z.string(),
+});
+
+/**
+ * API Request/Response Types
+ */
+export const createMCPConnectorRequest = z.object({
+	data: mcpConnectorCreate,
+	queryParams: z.object({
+		search_space_id: z.number().or(z.string()),
+	}),
+});
+
+export const updateMCPConnectorRequest = z.object({
+	id: z.number(),
+	data: mcpConnectorUpdate,
+});
+
+export const getMCPConnectorsRequest = z.object({
+	queryParams: z.object({
+		search_space_id: z.number().or(z.string()),
+	}),
+});
+
+// Inferred Types
+export type MCPServerConfig = z.infer<typeof mcpServerConfig>;
+export type MCPConnectorCreate = z.infer<typeof mcpConnectorCreate>;
+export type MCPConnectorUpdate = z.infer<typeof mcpConnectorUpdate>;
+export type MCPConnectorRead = z.infer<typeof mcpConnectorRead>;
+export type CreateMCPConnectorRequest = z.infer<typeof createMCPConnectorRequest>;
+export type UpdateMCPConnectorRequest = z.infer<typeof updateMCPConnectorRequest>;
+export type GetMCPConnectorsRequest = z.infer<typeof getMCPConnectorsRequest>;
+
+/**
+ * Tool definition from MCP server
+ */
+export type MCPToolDefinition = {
+	name: string;
+	description: string;
+	input_schema: Record<string, any>;
+};
+
+/**
+ * Test connection response
+ */
+export type MCPTestConnectionResponse = {
+	status: "success" | "error";
+	message: string;
+	tools: MCPToolDefinition[];
+};
diff --git a/surfsense_web/lib/apis/connectors-api.service.ts b/surfsense_web/lib/apis/connectors-api.service.ts
index e193948a2..17e2d0b3f 100644
--- a/surfsense_web/lib/apis/connectors-api.service.ts
+++ b/surfsense_web/lib/apis/connectors-api.service.ts
@@ -24,6 +24,14 @@ import {
 	updateConnectorRequest,
 	updateConnectorResponse,
 } from "@/contracts/types/connector.types";
+import type {
+	CreateMCPConnectorRequest,
+	GetMCPConnectorsRequest,
+	MCPConnectorRead,
+	MCPServerConfig,
+	MCPTestConnectionResponse,
+	UpdateMCPConnectorRequest,
+} from "@/contracts/types/mcp.types";
 import { ValidationError } from "../error";
 import { baseApiService } from "./base-api.service";
 
@@ -224,6 +232,76 @@ class ConnectorsApiService {
 			listGoogleDriveFoldersResponse
 		);
 	};
+
+	// =============================================================================
+	// MCP Connector Methods
+	// =============================================================================
+
+	/**
+	 * Get all MCP connectors for a search space
+	 */
+	getMCPConnectors = async (request: GetMCPConnectorsRequest) => {
+		const { search_space_id } = request.queryParams;
+
+		const queryString = new URLSearchParams({
+			search_space_id: String(search_space_id),
+		}).toString();
+
+		return baseApiService.get<MCPConnectorRead[]>(`/api/v1/connectors/mcp?${queryString}`);
+	};
+
+	/**
+	 * Get a single MCP connector by ID
+	 */
+	getMCPConnector = async (connectorId: number) => {
+		return baseApiService.get<MCPConnectorRead>(`/api/v1/connectors/mcp/${connectorId}`);
+	};
+
+	/**
+	 * Create a new MCP connector
+	 */
+	createMCPConnector = async (request: CreateMCPConnectorRequest) => {
+		const { data, queryParams } = request;
+
+		const queryString = new URLSearchParams({
+			search_space_id: String(queryParams.search_space_id),
+		}).toString();
+
+		return baseApiService.post<MCPConnectorRead>(`/api/v1/connectors/mcp?${queryString}`, undefined, {
+			body: data,
+		});
+	};
+
+	/**
+	 * Update an existing MCP connector
+	 */
+	updateMCPConnector = async (request: UpdateMCPConnectorRequest) => {
+		const { id, data } = request;
+
+		return baseApiService.put<MCPConnectorRead>(`/api/v1/connectors/mcp/${id}`, undefined, {
+			body: data,
+		});
+	};
+
+	/**
+	 * Delete an MCP connector
+	 */
+	deleteMCPConnector = async (connectorId: number) => {
+		return baseApiService.delete<void>(`/api/v1/connectors/mcp/${connectorId}`);
+	};
+
+	/**
+	 * Test MCP server connection and retrieve available tools
+	 */
+	testMCPConnection = async (serverConfig: MCPServerConfig) => {
+		return baseApiService.post<MCPTestConnectionResponse>(
+			"/api/v1/connectors/mcp/test",
+			undefined,
+			{
+				body: serverConfig,
+			}
+		);
+	};
 }
 
 export const connectorsApiService = new ConnectorsApiService();

From c78ea98a68514dbe721f1f8d18f7ef2a87132d67 Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Tue, 13 Jan 2026 21:10:03 -0800
Subject: [PATCH 02/18] Add front end logic for MCP connectors

---
 .../app/agents/new_chat/tools/mcp_tool.py     | 62 ++++++++++---------
 .../routes/search_source_connectors_routes.py | 10 +--
 .../app/schemas/search_source_connector.py    | 13 ++--
 .../components/mcp-connect-form.tsx           | 27 ++++----
 .../components/mcp-config.tsx                 |  6 --
 .../views/connector-connect-view.tsx          |  4 +-
 .../tabs/active-connectors-tab.tsx            |  8 ++-
 surfsense_web/contracts/types/mcp.types.ts    |  6 +-
 8 files changed, 71 insertions(+), 65 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/tools/mcp_tool.py b/surfsense_backend/app/agents/new_chat/tools/mcp_tool.py
index 81c7d074f..dd374cdae 100644
--- a/surfsense_backend/app/agents/new_chat/tools/mcp_tool.py
+++ b/surfsense_backend/app/agents/new_chat/tools/mcp_tool.py
@@ -141,40 +141,46 @@ async def load_mcp_tools(
         tools: list[StructuredTool] = []
         for connector in result.scalars():
             try:
-                # Extract server config
+                # Extract server configs array
                 config = connector.config or {}
-                server_config = config.get("server_config", {})
-
-                command = server_config.get("command")
-                args = server_config.get("args", [])
-                env = server_config.get("env", {})
-
-                if not command:
-                    logger.warning(f"MCP connector {connector.id} missing command, skipping")
+                server_configs = config.get("server_configs", [])
+                
+                if not server_configs:
+                    logger.warning(f"MCP connector {connector.id} missing server_configs, skipping")
                     continue
 
-                # Create MCP client
-                mcp_client = MCPClient(command, args, env)
+                # Process each server config
+                for server_config in server_configs:
+                    command = server_config.get("command")
+                    args = server_config.get("args", [])
+                    env = server_config.get("env", {})
 
-                # Connect and discover tools
-                async with mcp_client.connect():
-                    tool_definitions = await mcp_client.list_tools()
+                    if not command:
+                        logger.warning(f"MCP connector {connector.id} server config missing command, skipping")
+                        continue
 
-                    logger.info(
-                        f"Discovered {len(tool_definitions)} tools from MCP server "
-                        f"'{command}' (connector {connector.id})"
-                    )
+                    # Create MCP client
+                    mcp_client = MCPClient(command, args, env)
 
-                    # Create LangChain tools from definitions
-                    for tool_def in tool_definitions:
-                        try:
-                            tool = await _create_mcp_tool_from_definition(tool_def, mcp_client)
-                            tools.append(tool)
-                        except Exception as e:
-                            logger.exception(
-                                f"Failed to create tool '{tool_def.get('name')}' "
-                                f"from connector {connector.id}: {e!s}",
-                            )
+                    # Connect and discover tools
+                    async with mcp_client.connect():
+                        tool_definitions = await mcp_client.list_tools()
+
+                        logger.info(
+                            f"Discovered {len(tool_definitions)} tools from MCP server "
+                            f"'{command}' (connector {connector.id})"
+                        )
+
+                        # Create LangChain tools from definitions
+                        for tool_def in tool_definitions:
+                            try:
+                                tool = await _create_mcp_tool_from_definition(tool_def, mcp_client)
+                                tools.append(tool)
+                            except Exception as e:
+                                logger.exception(
+                                    f"Failed to create tool '{tool_def.get('name')}' "
+                                    f"from connector {connector.id}: {e!s}",
+                                )
 
             except Exception as e:
                 logger.exception(
diff --git a/surfsense_backend/app/routes/search_source_connectors_routes.py b/surfsense_backend/app/routes/search_source_connectors_routes.py
index a7c577bba..a3d9d10ef 100644
--- a/surfsense_backend/app/routes/search_source_connectors_routes.py
+++ b/surfsense_backend/app/routes/search_source_connectors_routes.py
@@ -2018,12 +2018,12 @@ async def create_mcp_connector(
             "You don't have permission to create connectors in this search space",
         )
 
-        # Create the connector with server config
+        # Create the connector with server configs array
         db_connector = SearchSourceConnector(
             name=connector_data.name,
             connector_type=SearchSourceConnectorType.MCP_CONNECTOR,
             is_indexable=False,  # MCP connectors are not indexable
-            config={"server_config": connector_data.server_config.model_dump()},
+            config={"server_configs": [sc.model_dump() for sc in connector_data.server_configs]},
             periodic_indexing_enabled=False,
             indexing_frequency_minutes=None,
             search_space_id=search_space_id,
@@ -2035,7 +2035,7 @@ async def create_mcp_connector(
         await session.refresh(db_connector)
 
         logger.info(
-            f"Created MCP connector {db_connector.id} for server '{connector_data.server_config.command}' "
+            f"Created MCP connector {db_connector.id} with {len(connector_data.server_configs)} server(s) "
             f"for user {user.id} in search space {search_space_id}"
         )
 
@@ -2202,9 +2202,9 @@ async def update_mcp_connector(
         if connector_update.name is not None:
             connector.name = connector_update.name
 
-        if connector_update.server_config is not None:
+        if connector_update.server_configs is not None:
             connector.config = {
-                "server_config": connector_update.server_config.model_dump()
+                "server_configs": [sc.model_dump() for sc in connector_update.server_configs]
             }
 
         connector.updated_at = datetime.now(UTC)
diff --git a/surfsense_backend/app/schemas/search_source_connector.py b/surfsense_backend/app/schemas/search_source_connector.py
index e27cc775c..93d877261 100644
--- a/surfsense_backend/app/schemas/search_source_connector.py
+++ b/surfsense_backend/app/schemas/search_source_connector.py
@@ -93,23 +93,23 @@ class MCPConnectorCreate(BaseModel):
     """Schema for creating an MCP connector."""
 
     name: str
-    server_config: MCPServerConfig
+    server_configs: list[MCPServerConfig]  # Array of MCP server configurations
 
 
 class MCPConnectorUpdate(BaseModel):
     """Schema for updating an MCP connector."""
 
     name: str | None = None
-    server_config: MCPServerConfig | None = None
+    server_configs: list[MCPServerConfig] | None = None
 
 
 class MCPConnectorRead(BaseModel):
-    """Schema for reading an MCP connector with server config."""
+    """Schema for reading an MCP connector with server configs."""
 
     id: int
     name: str
     connector_type: SearchSourceConnectorType
-    server_config: MCPServerConfig
+    server_configs: list[MCPServerConfig]
     search_space_id: int
     user_id: uuid.UUID
     created_at: datetime
@@ -121,13 +121,14 @@ class MCPConnectorRead(BaseModel):
     def from_connector(cls, connector: SearchSourceConnectorRead) -> "MCPConnectorRead":
         """Convert from base SearchSourceConnectorRead."""
         config = connector.config or {}
-        server_config = MCPServerConfig(**config.get("server_config", {}))
+        server_configs_data = config.get("server_configs", [])
+        server_configs = [MCPServerConfig(**sc) for sc in server_configs_data]
 
         return cls(
             id=connector.id,
             name=connector.name,
             connector_type=connector.connector_type,
-            server_config=server_config,
+            server_configs=server_configs,
             search_space_id=connector.search_space_id,
             user_id=connector.user_id,
             created_at=connector.created_at,
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
index 3ef43b3db..34a07c6f5 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
@@ -164,20 +164,19 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 
 		isSubmittingRef.current = true;
 		try {
-			// Submit all servers
-			for (const config of configs) {
-				await onSubmit({
-					name: config.name,
-					connector_type: EnumConnectorName.MCP_CONNECTOR,
-					config: { server_config: config },
-					is_indexable: false,
-					is_active: true,
-					last_indexed_at: null,
-					periodic_indexing_enabled: false,
-					indexing_frequency_minutes: null,
-					next_scheduled_at: null,
-				});
-			}
+			// Submit all servers as a single connector with server_configs array
+			// This creates one connector instead of N connectors (one toast instead of N toasts)
+			await onSubmit({
+				name: configs.length === 1 ? configs[0].name : "MCPs",
+				connector_type: EnumConnectorName.MCP_CONNECTOR,
+				config: { server_configs: configs },
+				is_indexable: false,
+				is_active: true,
+				last_indexed_at: null,
+				periodic_indexing_enabled: false,
+				indexing_frequency_minutes: null,
+				next_scheduled_at: null,
+			});
 		} finally {
 			isSubmittingRef.current = false;
 		}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
index 771107c93..d010967d2 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
@@ -56,12 +56,6 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 					const serverConfigs = mcpConn.config?.server_configs as MCPServerConfig[] | undefined;
 					if (serverConfigs && Array.isArray(serverConfigs)) {
 						allServerConfigs.push(...serverConfigs);
-					} else {
-						// Fallback to single server_config
-						const serverConfig = mcpConn.config?.server_config as MCPServerConfig | undefined;
-						if (serverConfig) {
-							allServerConfigs.push(serverConfig);
-						}
 					}
 				}
 				
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
index 5d198436d..ff69e3947 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
@@ -99,7 +99,7 @@ export const ConnectorConnectView: FC<ConnectorConnectViewProps> = ({
 					</div>
 					<div>
 						<h2 className="text-xl sm:text-2xl font-semibold tracking-tight">
-							Connect {getConnectorTypeDisplay(connectorType)}
+							Connect {connectorType === "MCP_CONNECTOR" ? "MCP(s)" : getConnectorTypeDisplay(connectorType)}
 						</h2>
 						<p className="text-xs sm:text-base text-muted-foreground mt-1">
 							Enter your connection details
@@ -139,7 +139,7 @@ export const ConnectorConnectView: FC<ConnectorConnectViewProps> = ({
 							Connecting...
 						</>
 					) : (
-						<>Connect {getConnectorTypeDisplay(connectorType)}</>
+						<>Connect {connectorType === "MCP_CONNECTOR" ? "MCP(s)" : getConnectorTypeDisplay(connectorType)}</>
 					)}
 				</Button>
 			</div>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
index d05a4c8dd..1b1c3ea4d 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
@@ -130,6 +130,12 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 		(c) => !oauthConnectorTypes.has(c.connector_type) && c.connector_type !== "MCP_CONNECTOR"
 	);
 
+	// Calculate total number of MCP servers across all MCP connectors
+	const totalMCPServers = mcpConnectors.reduce((total, connector) => {
+		const serverConfigs = connector.config?.server_configs;
+		return total + (Array.isArray(serverConfigs) ? serverConfigs.length : 0);
+	}, 0);
+
 	// Group OAuth connectors by type
 	const oauthConnectorsByType = oauthConnectors.reduce(
 		(acc, connector) => {
@@ -305,7 +311,7 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 												Active
 											</p>
 											<p className="text-[10px] text-muted-foreground mt-0.5">
-												{mcpConnectors.length} {mcpConnectors.length === 1 ? "Server" : "Servers"}
+												{totalMCPServers} {totalMCPServers === 1 ? "Server" : "Servers"}
 											</p>
 										</div>
 										<Button
diff --git a/surfsense_web/contracts/types/mcp.types.ts b/surfsense_web/contracts/types/mcp.types.ts
index e25ffe3c5..eaed344df 100644
--- a/surfsense_web/contracts/types/mcp.types.ts
+++ b/surfsense_web/contracts/types/mcp.types.ts
@@ -15,19 +15,19 @@ export const mcpServerConfig = z.object({
  */
 export const mcpConnectorCreate = z.object({
 	name: z.string().min(1, "Connector name is required"),
-	server_config: mcpServerConfig,
+	server_configs: z.array(mcpServerConfig).min(1, "At least one server configuration is required"),
 });
 
 export const mcpConnectorUpdate = z.object({
 	name: z.string().min(1).optional(),
-	server_config: mcpServerConfig.optional(),
+	server_configs: z.array(mcpServerConfig).optional(),
 });
 
 export const mcpConnectorRead = z.object({
 	id: z.number(),
 	name: z.string(),
 	connector_type: z.literal("MCP_CONNECTOR"),
-	server_config: mcpServerConfig,
+	server_configs: z.array(mcpServerConfig),
 	search_space_id: z.number(),
 	user_id: z.string(),
 	created_at: z.string(),

From 5c22238c10c85e06ea85d393c8f8d2cbc5b5c32b Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Tue, 13 Jan 2026 21:17:37 -0800
Subject: [PATCH 03/18] minor changes

---
 .../components/mcp-config.tsx                 | 14 ++++-
 .../hooks/use-connector-dialog.ts             | 51 +++++++++++++++++++
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
index d010967d2..a8618aeaf 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
@@ -123,6 +123,15 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 			setJsonError(null);
 		}
 		
+		// Treat empty/whitespace-only input as empty array (user wants to remove all servers)
+		const trimmedValue = value.trim();
+		if (trimmedValue === "") {
+			if (onConfigChange) {
+				onConfigChange({ server_configs: [] });
+			}
+			return;
+		}
+		
 		// Try to parse and update parent if valid
 		try {
 			const parsed = JSON.parse(value);
@@ -141,8 +150,9 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 				}
 			}
 			
-			// Update parent if we have valid configs
-			if (validConfigs.length > 0 && onConfigChange) {
+			// Always update parent with configs (including empty array)
+			// Empty array signals that all servers should be removed
+			if (onConfigChange) {
 				onConfigChange({ server_configs: validConfigs });
 			}
 		} catch {
diff --git a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
index 899222863..f1ae50262 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
+++ b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
@@ -1047,6 +1047,57 @@ export const useConnectorDialog = () => {
 				const startDateStr = startDate ? format(startDate, "yyyy-MM-dd") : undefined;
 				const endDateStr = endDate ? format(endDate, "yyyy-MM-dd") : undefined;
 
+				// For MCP connectors, check if all servers were removed (empty array)
+				if (editingConnector.connector_type === "MCP_CONNECTOR") {
+					const serverConfigs = connectorConfig?.server_configs;
+					if (!serverConfigs || (Array.isArray(serverConfigs) && serverConfigs.length === 0)) {
+						// All servers removed - delete the entire connector
+						await deleteConnector({
+							id: editingConnector.id,
+						});
+
+						// Also delete other MCP connectors that were consolidated
+						if (otherMCPConnectorIds.length > 0) {
+							await Promise.all(
+								otherMCPConnectorIds.map((id) =>
+									deleteConnector({
+										id,
+									}).catch(() => {
+										// Silently ignore errors for individual deletions
+									})
+								)
+							);
+							setOtherMCPConnectorIds([]);
+						}
+
+						toast.success("MCPs disconnected successfully", {
+							description: "All MCP servers have been removed.",
+						});
+
+						// Update URL to close modal
+						const url = new URL(window.location.href);
+						url.searchParams.delete("modal");
+						url.searchParams.delete("tab");
+						url.searchParams.delete("view");
+						url.searchParams.delete("connectorId");
+						router.replace(url.pathname + url.search, { scroll: false });
+
+						// Refresh connectors and reset state
+						refreshConnectors();
+						setEditingConnector(null);
+						setConnectorName("");
+						setConnectorConfig(null);
+						setPeriodicEnabled(false);
+						setFrequencyMinutes("1440");
+						setStartDate(undefined);
+						setEndDate(undefined);
+						setOtherMCPConnectorIds([]);
+
+						setIsSaving(false);
+						return;
+					}
+				}
+
 				// For MCP connectors, delete other MCP connectors first (consolidate all into one)
 				if (editingConnector.connector_type === "MCP_CONNECTOR" && otherMCPConnectorIds.length > 0) {
 					// Silently delete other MCP connectors without showing toasts

From 16f79aa88b89a99f1d5640b6a64c597362512ada Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Fri, 16 Jan 2026 11:00:20 -0800
Subject: [PATCH 04/18] fix migrations

---
 ..._allow_multiple_connectors_with_unique_.py | 94 ++++++++++++++-----
 .../versions/63_add_message_author_id.py      |  9 +-
 .../a1b2c3d4e5f6_add_mcp_connector_type.py    |  4 +-
 3 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/surfsense_backend/alembic/versions/5263aa4e7f94_allow_multiple_connectors_with_unique_.py b/surfsense_backend/alembic/versions/5263aa4e7f94_allow_multiple_connectors_with_unique_.py
index de9505e3a..d49009c94 100644
--- a/surfsense_backend/alembic/versions/5263aa4e7f94_allow_multiple_connectors_with_unique_.py
+++ b/surfsense_backend/alembic/versions/5263aa4e7f94_allow_multiple_connectors_with_unique_.py
@@ -7,6 +7,8 @@ Create Date: 2026-01-13 12:23:31.481643
 """
 from collections.abc import Sequence
 
+from sqlalchemy import text
+
 from alembic import op
 
 # revision identifiers, used by Alembic.
@@ -18,33 +20,77 @@ depends_on: str | Sequence[str] | None = None
 
 def upgrade() -> None:
     """Upgrade schema."""
-    # Drop the old unique constraint
-    op.drop_constraint(
-        'uq_searchspace_user_connector_type',
-        'search_source_connectors',
-        type_='unique'
-    )
+    connection = op.get_bind()
     
-    # Create new unique constraint that includes name
-    op.create_unique_constraint(
-        'uq_searchspace_user_connector_type_name',
-        'search_source_connectors',
-        ['search_space_id', 'user_id', 'connector_type', 'name']
-    )
+    # Check if old constraint exists before trying to drop it
+    old_constraint_exists = connection.execute(
+        text("""
+            SELECT 1 FROM information_schema.table_constraints 
+            WHERE table_name='search_source_connectors' 
+              AND constraint_type='UNIQUE' 
+              AND constraint_name='uq_searchspace_user_connector_type'
+        """)
+    ).scalar()
+    
+    if old_constraint_exists:
+        op.drop_constraint(
+            'uq_searchspace_user_connector_type',
+            'search_source_connectors',
+            type_='unique'
+        )
+    
+    # Check if new constraint already exists before creating
+    new_constraint_exists = connection.execute(
+        text("""
+            SELECT 1 FROM information_schema.table_constraints 
+            WHERE table_name='search_source_connectors' 
+              AND constraint_type='UNIQUE' 
+              AND constraint_name='uq_searchspace_user_connector_type_name'
+        """)
+    ).scalar()
+    
+    if not new_constraint_exists:
+        op.create_unique_constraint(
+            'uq_searchspace_user_connector_type_name',
+            'search_source_connectors',
+            ['search_space_id', 'user_id', 'connector_type', 'name']
+        )
 
 
 def downgrade() -> None:
     """Downgrade schema."""
-    # Drop the new constraint
-    op.drop_constraint(
-        'uq_searchspace_user_connector_type_name',
-        'search_source_connectors',
-        type_='unique'
-    )
+    connection = op.get_bind()
     
-    # Restore the old constraint
-    op.create_unique_constraint(
-        'uq_searchspace_user_connector_type',
-        'search_source_connectors',
-        ['search_space_id', 'user_id', 'connector_type']
-    )
+    # Check if new constraint exists before dropping
+    new_constraint_exists = connection.execute(
+        text("""
+            SELECT 1 FROM information_schema.table_constraints 
+            WHERE table_name='search_source_connectors' 
+              AND constraint_type='UNIQUE' 
+              AND constraint_name='uq_searchspace_user_connector_type_name'
+        """)
+    ).scalar()
+    
+    if new_constraint_exists:
+        op.drop_constraint(
+            'uq_searchspace_user_connector_type_name',
+            'search_source_connectors',
+            type_='unique'
+        )
+    
+    # Only restore old constraint if it doesn't exist
+    old_constraint_exists = connection.execute(
+        text("""
+            SELECT 1 FROM information_schema.table_constraints 
+            WHERE table_name='search_source_connectors' 
+              AND constraint_type='UNIQUE' 
+              AND constraint_name='uq_searchspace_user_connector_type'
+        """)
+    ).scalar()
+    
+    if not old_constraint_exists:
+        op.create_unique_constraint(
+            'uq_searchspace_user_connector_type',
+            'search_source_connectors',
+            ['search_space_id', 'user_id', 'connector_type']
+        )
diff --git a/surfsense_backend/alembic/versions/63_add_message_author_id.py b/surfsense_backend/alembic/versions/63_add_message_author_id.py
index 2fc3f0b4c..42d4af85e 100644
--- a/surfsense_backend/alembic/versions/63_add_message_author_id.py
+++ b/surfsense_backend/alembic/versions/63_add_message_author_id.py
@@ -37,11 +37,6 @@ def upgrade() -> None:
 
 def downgrade() -> None:
     """Remove author_id column from new_chat_messages table."""
-    op.execute(
-        """
-        DROP INDEX IF EXISTS ix_new_chat_messages_author_id;
-        ALTER TABLE new_chat_messages
-        DROP COLUMN IF EXISTS author_id;
-        """
-    )
+    op.execute("DROP INDEX IF EXISTS ix_new_chat_messages_author_id")
+    op.execute("ALTER TABLE new_chat_messages DROP COLUMN IF EXISTS author_id")
 
diff --git a/surfsense_backend/alembic/versions/a1b2c3d4e5f6_add_mcp_connector_type.py b/surfsense_backend/alembic/versions/a1b2c3d4e5f6_add_mcp_connector_type.py
index e47bb2fa3..2fb4b65c2 100644
--- a/surfsense_backend/alembic/versions/a1b2c3d4e5f6_add_mcp_connector_type.py
+++ b/surfsense_backend/alembic/versions/a1b2c3d4e5f6_add_mcp_connector_type.py
@@ -1,7 +1,7 @@
 """Add MCP connector type
 
 Revision ID: a1b2c3d4e5f6
-Revises: 61
+Revises: 63
 Create Date: 2026-01-09 15:19:51.827647
 
 """
@@ -11,7 +11,7 @@ from alembic import op
 
 # revision identifiers, used by Alembic.
 revision: str = 'a1b2c3d4e5f6'
-down_revision: str | None = '61'
+down_revision: str | None = '63'
 branch_labels: str | Sequence[str] | None = None
 depends_on: str | Sequence[str] | None = None
 

From c97a3c1ab60134a4c85ab1ec35b1e750a14d9e37 Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Fri, 16 Jan 2026 11:25:47 -0800
Subject: [PATCH 05/18] some reverts

---
 .../versions/62_add_mcp_connector_type.py     |  8 +-
 ..._allow_multiple_connectors_with_unique_.py | 97 +++++++++++++++++++
 2 files changed, 101 insertions(+), 4 deletions(-)
 create mode 100644 surfsense_backend/alembic/versions/63_allow_multiple_connectors_with_unique_.py

diff --git a/surfsense_backend/alembic/versions/62_add_mcp_connector_type.py b/surfsense_backend/alembic/versions/62_add_mcp_connector_type.py
index d28e76019..706b79497 100644
--- a/surfsense_backend/alembic/versions/62_add_mcp_connector_type.py
+++ b/surfsense_backend/alembic/versions/62_add_mcp_connector_type.py
@@ -1,7 +1,7 @@
 """Add MCP connector type
 
-Revision ID: a1b2c3d4e5f6
-Revises: 63
+Revision ID: 62
+Revises: 61
 Create Date: 2026-01-09 15:19:51.827647
 
 """
@@ -11,8 +11,8 @@ from collections.abc import Sequence
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision: str = 'a1b2c3d4e5f6'
-down_revision: str | None = '63'
+revision: str = '62'
+down_revision: str | None = '61'
 branch_labels: str | Sequence[str] | None = None
 depends_on: str | Sequence[str] | None = None
 
diff --git a/surfsense_backend/alembic/versions/63_allow_multiple_connectors_with_unique_.py b/surfsense_backend/alembic/versions/63_allow_multiple_connectors_with_unique_.py
new file mode 100644
index 000000000..ff3f98906
--- /dev/null
+++ b/surfsense_backend/alembic/versions/63_allow_multiple_connectors_with_unique_.py
@@ -0,0 +1,97 @@
+"""allow_multiple_connectors_with_unique_names
+
+Revision ID: 63
+Revises: 62
+Create Date: 2026-01-13 12:23:31.481643
+
+"""
+
+from collections.abc import Sequence
+
+from sqlalchemy import text
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "63"
+down_revision: str | None = "62"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    connection = op.get_bind()
+
+    # Check if old constraint exists before trying to drop it
+    old_constraint_exists = connection.execute(
+        text("""
+            SELECT 1 FROM information_schema.table_constraints 
+            WHERE table_name='search_source_connectors' 
+              AND constraint_type='UNIQUE' 
+              AND constraint_name='uq_searchspace_user_connector_type'
+        """)
+    ).scalar()
+
+    if old_constraint_exists:
+        op.drop_constraint(
+            "uq_searchspace_user_connector_type",
+            "search_source_connectors",
+            type_="unique",
+        )
+
+    # Check if new constraint already exists before creating it
+    new_constraint_exists = connection.execute(
+        text("""
+            SELECT 1 FROM information_schema.table_constraints 
+            WHERE table_name='search_source_connectors' 
+              AND constraint_type='UNIQUE' 
+              AND constraint_name='uq_searchspace_user_connector_type_name'
+        """)
+    ).scalar()
+
+    if not new_constraint_exists:
+        op.create_unique_constraint(
+            "uq_searchspace_user_connector_type_name",
+            "search_source_connectors",
+            ["search_space_id", "user_id", "connector_type", "name"],
+        )
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    connection = op.get_bind()
+
+    # Check if new constraint exists before trying to drop it
+    new_constraint_exists = connection.execute(
+        text("""
+            SELECT 1 FROM information_schema.table_constraints 
+            WHERE table_name='search_source_connectors' 
+              AND constraint_type='UNIQUE' 
+              AND constraint_name='uq_searchspace_user_connector_type_name'
+        """)
+    ).scalar()
+
+    if new_constraint_exists:
+        op.drop_constraint(
+            "uq_searchspace_user_connector_type_name",
+            "search_source_connectors",
+            type_="unique",
+        )
+
+    # Check if old constraint already exists before creating it
+    old_constraint_exists = connection.execute(
+        text("""
+            SELECT 1 FROM information_schema.table_constraints 
+            WHERE table_name='search_source_connectors' 
+              AND constraint_type='UNIQUE' 
+              AND constraint_name='uq_searchspace_user_connector_type'
+        """)
+    ).scalar()
+
+    if not old_constraint_exists:
+        op.create_unique_constraint(
+            "uq_searchspace_user_connector_type",
+            "search_source_connectors",
+            ["search_space_id", "user_id", "connector_type"],
+        )

From 08366b14bb987432494bb24a0b29742c71e931e4 Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Fri, 16 Jan 2026 11:26:28 -0800
Subject: [PATCH 06/18] some reverts

---
 .../alembic/versions/62_add_mcp_connector_type.py             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/surfsense_backend/alembic/versions/62_add_mcp_connector_type.py b/surfsense_backend/alembic/versions/62_add_mcp_connector_type.py
index 706b79497..5c5ccf106 100644
--- a/surfsense_backend/alembic/versions/62_add_mcp_connector_type.py
+++ b/surfsense_backend/alembic/versions/62_add_mcp_connector_type.py
@@ -11,8 +11,8 @@ from collections.abc import Sequence
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision: str = '62'
-down_revision: str | None = '61'
+revision: str = "62"
+down_revision: str | None = "61"
 branch_labels: str | Sequence[str] | None = None
 depends_on: str | Sequence[str] | None = None
 

From be0e840333f3552f25c0a2852a35e9a562b95db6 Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Fri, 16 Jan 2026 11:44:10 -0800
Subject: [PATCH 07/18] consolidate list of mcp tools in the success box

---
 .../components/mcp-connect-form.tsx           | 171 +++++++++++-------
 .../components/mcp-config.tsx                 |  54 ++++--
 2 files changed, 146 insertions(+), 79 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
index 34a07c6f5..6bfb5c883 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { CheckCircle2, Server, XCircle } from "lucide-react";
+import { CheckCircle2, ChevronDown, ChevronUp, Server, XCircle } from "lucide-react";
 import { type FC, useRef, useState } from "react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
@@ -30,12 +30,13 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 	const [configJson, setConfigJson] = useState(DEFAULT_CONFIG);
 	const [jsonError, setJsonError] = useState<string | null>(null);
 	const [isTesting, setIsTesting] = useState(false);
-	const [testResults, setTestResults] = useState<Array<{
-		name: string;
+	const [showDetails, setShowDetails] = useState(false);
+	const [testResult, setTestResult] = useState<{
 		status: "success" | "error";
 		message: string;
 		tools: MCPToolDefinition[];
-	}> | null>(null);
+		errors?: string[];
+	} | null>(null);
 
 	const parseConfigs = (): { configs: MCPServerWithName[] | null; error: string | null } => {
 		try {
@@ -105,44 +106,56 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 		
 		if (!configs || error) {
 			setJsonError(error);
-			setTestResults([{
-				name: "Parse Error",
+			setTestResult({
 				status: "error",
 				message: error || "Invalid configuration",
 				tools: [],
-			}]);
+			});
 			return;
 		}
 
 		setIsTesting(true);
-		setTestResults(null);
+		setTestResult(null);
 		setJsonError(null);
 
-		const results: Array<{
-			name: string;
-			status: "success" | "error";
-			message: string;
-			tools: MCPToolDefinition[];
-		}> = [];
+		const allTools: MCPToolDefinition[] = [];
+		const errors: string[] = [];
 
 		for (const config of configs) {
 			try {
 				const result = await connectorsApiService.testMCPConnection(config);
-				results.push({
-					name: config.name,
-					...result,
-				});
+				if (result.status === "success") {
+					allTools.push(...result.tools);
+				} else {
+					errors.push(`${config.name}: ${result.message}`);
+				}
 			} catch (error) {
-				results.push({
-					name: config.name,
-					status: "error",
-					message: error instanceof Error ? error.message : "Failed to connect to MCP server",
-					tools: [],
-				});
+				errors.push(`${config.name}: ${error instanceof Error ? error.message : "Failed to connect"}`);
 			}
 		}
 
-		setTestResults(results);
+		if (errors.length === 0) {
+			setTestResult({
+				status: "success",
+				message: `Successfully connected to ${configs.length} server${configs.length !== 1 ? 's' : ''}. Found ${allTools.length} tool${allTools.length !== 1 ? 's' : ''}.`,
+				tools: allTools,
+			});
+		} else if (allTools.length > 0) {
+			setTestResult({
+				status: "success",
+				message: `Partially successful. Connected ${allTools.length} tool${allTools.length !== 1 ? 's' : ''}.`,
+				tools: allTools,
+				errors,
+			});
+		} else {
+			setTestResult({
+				status: "error",
+				message: "Failed to connect to all servers",
+				tools: [],
+				errors,
+			});
+		}
+
 		setIsTesting(false);
 	};
 
@@ -226,47 +239,75 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 						</Button>
 					</div>
 
-					{testResults && testResults.length > 0 && (
-						<div className="space-y-3">
-							{testResults.map((result, index) => (
-								<Alert
-									key={index}
-									className={
-										result.status === "success"
-											? "border-green-500/50 bg-green-500/10"
-											: "border-red-500/50 bg-red-500/10"
-									}
-								>
-									{result.status === "success" ? (
-										<CheckCircle2 className="h-4 w-4 text-green-500" />
-									) : (
-										<XCircle className="h-4 w-4 text-red-500" />
-									)}
-									<div>
-										<AlertTitle className="text-sm">
-											{result.name}: {result.status === "success" ? "Connected" : "Failed"}
-										</AlertTitle>
-										<AlertDescription className="text-xs">
-											{result.message}
-											{result.status === "success" && result.tools.length > 0 && (
-												<div className="mt-2">
-													<p className="font-semibold mb-1">
-														Found {result.tools.length} tools:
-													</p>
-													<ul className="list-disc list-inside space-y-1">
-														{result.tools.map((tool, i) => (
-															<li key={i} className="text-xs">
-																<strong>{tool.name}</strong>: {tool.description}
-															</li>
-														))}
-													</ul>
-												</div>
+					{testResult && (
+						<Alert
+							className={
+								testResult.status === "success"
+									? "border-green-500/50 bg-green-500/10"
+									: "border-red-500/50 bg-red-500/10"
+							}
+						>
+							{testResult.status === "success" ? (
+								<CheckCircle2 className="h-4 w-4 text-green-500" />
+							) : (
+								<XCircle className="h-4 w-4 text-red-500" />
+							)}
+							<div className="flex-1">
+								<div className="flex items-center justify-between">
+									<AlertTitle className="text-sm">
+										{testResult.status === "success" ? "Connection Successful" : "Connection Failed"}
+									</AlertTitle>
+									{testResult.tools.length > 0 && (
+										<Button
+											type="button"
+											variant="ghost"
+											size="sm"
+											className="h-6 px-2"
+											onClick={(e) => {
+												e.preventDefault();
+												e.stopPropagation();
+												setShowDetails(!showDetails);
+											}}
+										>
+											{showDetails ? (
+												<>
+													<ChevronUp className="h-3 w-3 mr-1" />
+													Hide Details
+												</>
+											) : (
+												<>
+													<ChevronDown className="h-3 w-3 mr-1" />
+													Show Details
+												</>
 											)}
-										</AlertDescription>
-									</div>
-								</Alert>
-							))}
-						</div>
+										</Button>
+									)}
+								</div>
+								<AlertDescription className="text-xs mt-1">
+									{testResult.message}
+									{testResult.errors && testResult.errors.length > 0 && (
+										<div className="mt-2 text-red-600">
+											<p className="font-semibold">Errors:</p>
+											{testResult.errors.map((err, i) => (
+												<div key={i}>• {err}</div>
+											))}
+										</div>
+									)}
+									{showDetails && testResult.tools.length > 0 && (
+										<div className="mt-3 pt-3 border-t border-green-500/20">
+											<p className="font-semibold mb-2">
+												Available tools:
+											</p>
+											<ul className="list-disc list-inside text-xs space-y-0.5">
+												{testResult.tools.map((tool, i) => (
+													<li key={i}>{tool.name}</li>
+												))}
+											</ul>
+										</div>
+									)}
+								</AlertDescription>
+							</div>
+						</Alert>
 					)}
 				</div>
 			</form>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
index a8618aeaf..dcd20cefd 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { CheckCircle2, Server, XCircle } from "lucide-react";
+import { CheckCircle2, ChevronDown, ChevronUp, Server, XCircle } from "lucide-react";
 import type { FC } from "react";
 import { useEffect, useState } from "react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
@@ -23,6 +23,7 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 	const [configJson, setConfigJson] = useState("");
 	const [jsonError, setJsonError] = useState<string | null>(null);
 	const [isTesting, setIsTesting] = useState(false);
+	const [showDetails, setShowDetails] = useState(false);
 	const [testResult, setTestResult] = useState<{
 		status: "success" | "error";
 		message: string;
@@ -283,22 +284,47 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 							) : (
 								<XCircle className="h-4 w-4 text-red-500" />
 							)}
-							<div>
-								<AlertTitle className="text-sm">
-									{testResult.status === "success" ? "Connection Successful" : "Connection Failed"}
-								</AlertTitle>
-								<AlertDescription className="text-xs">
+							<div className="flex-1">
+								<div className="flex items-center justify-between">
+									<AlertTitle className="text-sm">
+										{testResult.status === "success" ? "Connection Successful" : "Connection Failed"}
+									</AlertTitle>
+									{testResult.tools.length > 0 && (
+										<Button
+											type="button"
+											variant="ghost"
+											size="sm"
+											className="h-6 px-2"
+											onClick={(e) => {
+												e.preventDefault();
+												e.stopPropagation();
+												setShowDetails(!showDetails);
+											}}
+										>
+											{showDetails ? (
+												<>
+													<ChevronUp className="h-3 w-3 mr-1" />
+													Hide Details
+												</>
+											) : (
+												<>
+													<ChevronDown className="h-3 w-3 mr-1" />
+													Show Details
+												</>
+											)}
+										</Button>
+									)}
+								</div>
+								<AlertDescription className="text-xs mt-1">
 									{testResult.message}
-									{testResult.status === "success" && testResult.tools.length > 0 && (
-										<div className="mt-2">
-											<p className="font-semibold mb-1">
-												Found {testResult.tools.length} tools:
+									{showDetails && testResult.status === "success" && testResult.tools.length > 0 && (
+										<div className="mt-3 pt-3 border-t border-green-500/20">
+											<p className="font-semibold mb-2">
+												Found {testResult.tools.length} tool{testResult.tools.length !== 1 ? 's' : ''}:
 											</p>
-											<ul className="list-disc list-inside space-y-1">
+											<ul className="list-disc list-inside text-xs space-y-0.5">
 												{testResult.tools.map((tool, i) => (
-													<li key={i} className="text-xs">
-														<strong>{tool.name}</strong>: {tool.description}
-													</li>
+													<li key={i}>{tool.name}</li>
 												))}
 											</ul>
 										</div>

From ab9565dcec5216184746bf9b02f48896d6a84ad0 Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Fri, 16 Jan 2026 12:05:13 -0800
Subject: [PATCH 08/18] make the count of connectors consistent with number of
 servers

---
 .../components/assistant-ui/connector-popup.tsx       | 10 +++++++++-
 .../connector-popup/tabs/active-connectors-tab.tsx    |  9 ++++++++-
 .../connector-popup/tabs/all-connectors-tab.tsx       | 11 ++++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index 28fe5b5b0..01670f3fd 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -156,7 +156,15 @@ export const ConnectorIndicator: FC = () => {
 	const hasConnectors = connectors.length > 0;
 	const hasSources = hasConnectors || activeDocumentTypes.length > 0;
 	const totalSourceCount = connectors.length + activeDocumentTypes.length;
-	const activeConnectorsCount = connectors.length; // Only actual connectors, not document types
+	
+	// Count connectors properly: for MCP, count each server; for others, count connectors
+	const activeConnectorsCount = connectors.reduce((total, c: SearchSourceConnector) => {
+		if (c.connector_type === "MCP_CONNECTOR") {
+			const serverConfigs = c.config?.server_configs;
+			return total + (Array.isArray(serverConfigs) ? serverConfigs.length : 0);
+		}
+		return total + 1;
+	}, 0);
 
 	// Check which connectors are already connected
 	const connectedTypes = new Set(
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
index 1b1c3ea4d..a095a1fe5 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
@@ -218,7 +218,14 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 										connectorType,
 										documentTypeCounts
 									);
-									const accountCount = typeConnectors.length;
+									// Calculate account count - for MCP, count servers; for others, count connectors
+									const accountCount =
+										connectorType === "MCP_CONNECTOR"
+											? typeConnectors.reduce((total, c) => {
+													const serverConfigs = c.config?.server_configs;
+													return total + (Array.isArray(serverConfigs) ? serverConfigs.length : 0);
+												}, 0)
+											: typeConnectors.length;
 									const mostRecentLastIndexed = getMostRecentLastIndexed(typeConnectors);
 
 									const handleManageClick = () => {
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx
index 6129b49b7..a51b7d26a 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx
@@ -103,6 +103,15 @@ export const AllConnectorsTab: FC<AllConnectorsTabProps> = ({
 										)
 									: [];
 
+							// Calculate account count - for MCP, count servers; for others, count connectors
+							const accountCount =
+								connector.connectorType === "MCP_CONNECTOR"
+									? typeConnectors.reduce((total, c) => {
+											const serverConfigs = c.config?.server_configs;
+											return total + (Array.isArray(serverConfigs) ? serverConfigs.length : 0);
+										}, 0)
+									: typeConnectors.length;
+
 							// Get the most recent last_indexed_at across all accounts
 							const mostRecentLastIndexed = typeConnectors.reduce<string | undefined>(
 								(latest, c) => {
@@ -138,7 +147,7 @@ export const AllConnectorsTab: FC<AllConnectorsTabProps> = ({
 									isConnected={isConnected}
 									isConnecting={isConnecting}
 									documentCount={documentCount}
-									accountCount={typeConnectors.length}
+									accountCount={accountCount}
 									lastIndexedAt={mostRecentLastIndexed}
 									isIndexing={isIndexing}
 									activeTask={activeTask}

From 485c9dc4e4af4766f3f03d179a3a8e2fd0262254 Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Fri, 16 Jan 2026 12:08:18 -0800
Subject: [PATCH 09/18] remove active from connector tile if mcp server

---
 .../tabs/active-connectors-tab.tsx            | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
index a095a1fe5..ba4a03084 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
@@ -264,13 +264,15 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 														Indexing...
 													</p>
 												) : (
-													<p className="text-[10px] text-muted-foreground mt-1 whitespace-nowrap">
-														{isIndexableConnector(connectorType)
-															? mostRecentLastIndexed
+												<>
+													{isIndexableConnector(connectorType) && (
+														<p className="text-[10px] text-muted-foreground mt-1 whitespace-nowrap">
+															{mostRecentLastIndexed
 																? `Last indexed: ${formatLastIndexedDate(mostRecentLastIndexed)}`
-																: "Never indexed"
-															: "Active"}
-												</p>
+																: "Never indexed"}
+														</p>
+													)}
+												</>
 												)}
 												<p className="text-[10px] text-muted-foreground mt-0.5 flex items-center gap-1.5">
 													{isIndexableConnector(connectorType) && (
@@ -314,10 +316,7 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 										</div>
 										<div className="flex-1 min-w-0">
 											<p className="text-[14px] font-semibold leading-tight truncate">MCPs</p>
-											<p className="text-[10px] text-muted-foreground mt-1 whitespace-nowrap">
-												Active
-											</p>
-											<p className="text-[10px] text-muted-foreground mt-0.5">
+										<p className="text-[10px] text-muted-foreground mt-1">
 												{totalMCPServers} {totalMCPServers === 1 ? "Server" : "Servers"}
 											</p>
 										</div>

From ab0582cb1dc5bfdcbf714a437965abeeb40a99d9 Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Fri, 16 Jan 2026 12:13:58 -0800
Subject: [PATCH 10/18] Add logic to make the toast dynamic

---
 .../hooks/use-connector-dialog.ts             | 74 ++++++++++++-------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
index f1ae50262..6cfc279ac 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
+++ b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
@@ -1047,6 +1047,16 @@ export const useConnectorDialog = () => {
 				const startDateStr = startDate ? format(startDate, "yyyy-MM-dd") : undefined;
 				const endDateStr = endDate ? format(endDate, "yyyy-MM-dd") : undefined;
 
+				// For MCP connectors, track original server count for toast messages
+				let originalServerCount = 0;
+				let newServerCount = 0;
+				if (editingConnector.connector_type === "MCP_CONNECTOR") {
+					const originalServerConfigs = editingConnector.config?.server_configs;
+					originalServerCount = Array.isArray(originalServerConfigs) ? originalServerConfigs.length : 0;
+					const newServerConfigs = connectorConfig?.server_configs;
+					newServerCount = Array.isArray(newServerConfigs) ? newServerConfigs.length : 0;
+				}
+
 				// For MCP connectors, check if all servers were removed (empty array)
 				if (editingConnector.connector_type === "MCP_CONNECTOR") {
 					const serverConfigs = connectorConfig?.server_configs;
@@ -1217,35 +1227,43 @@ export const useConnectorDialog = () => {
 					);
 				}
 
-				toast.success(
-					editingConnector.connector_type === "MCP_CONNECTOR" 
-						? "MCPs updated successfully" 
-						: `${editingConnector.name} updated successfully`,
-					{
-						description: periodicEnabled
-							? `Periodic sync ${frequency ? `enabled every ${getFrequencyLabel(frequencyMinutes)}` : "enabled"}. ${indexingDescription}`
-							: indexingDescription,
-					}
-				);
-
-				// Update URL - the effect will handle closing the modal and clearing state
-				const url = new URL(window.location.href);
-				url.searchParams.delete("modal");
-				url.searchParams.delete("tab");
-				url.searchParams.delete("view");
-				url.searchParams.delete("connectorId");
-				router.replace(url.pathname + url.search, { scroll: false });
-
-				refreshConnectors();
-				queryClient.invalidateQueries({
-					queryKey: cacheKeys.logs.summary(Number(searchSpaceId)),
-				});
-			} catch (error) {
-				console.error("Error saving connector:", error);
-				toast.error("Failed to save connector changes");
-			} finally {
-				setIsSaving(false);
+			// Generate toast message based on connector type
+			let toastTitle = `${editingConnector.name} updated successfully`;
+			if (editingConnector.connector_type === "MCP_CONNECTOR") {
+				const serverDiff = newServerCount - originalServerCount;
+				if (serverDiff > 0) {
+					toastTitle = `${serverDiff} MCP ${serverDiff === 1 ? "server" : "servers"} added`;
+				} else if (serverDiff < 0) {
+					toastTitle = `${Math.abs(serverDiff)} MCP ${Math.abs(serverDiff) === 1 ? "server" : "servers"} removed`;
+				} else {
+					toastTitle = "MCPs updated successfully";
+				}
 			}
+
+			toast.success(toastTitle, {
+				description: periodicEnabled
+					? `Periodic sync ${frequency ? `enabled every ${getFrequencyLabel(frequencyMinutes)}` : "enabled"}. ${indexingDescription}`
+					: indexingDescription,
+			});
+
+			// Update URL - the effect will handle closing the modal and clearing state
+			const url = new URL(window.location.href);
+			url.searchParams.delete("modal");
+			url.searchParams.delete("tab");
+			url.searchParams.delete("view");
+			url.searchParams.delete("connectorId");
+			router.replace(url.pathname + url.search, { scroll: false });
+
+			refreshConnectors();
+			queryClient.invalidateQueries({
+				queryKey: cacheKeys.logs.summary(Number(searchSpaceId)),
+			});
+		} catch (error) {
+			console.error("Error saving connector:", error);
+			toast.error("Failed to save connector changes");
+		} finally {
+			setIsSaving(false);
+		}
 		},
 		[
 			editingConnector,

From 4c07c0fe4f72f820783f46cf3b704c712765dd11 Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Fri, 16 Jan 2026 14:39:44 -0800
Subject: [PATCH 11/18] change the flow of mcp connectors

---
 .../app/agents/new_chat/tools/mcp_tool.py     |  61 ++--
 .../routes/search_source_connectors_routes.py |  10 +-
 .../app/schemas/search_source_connector.py    |  12 +-
 .../assistant-ui/connector-popup.tsx          |  26 +-
 .../components/mcp-connect-form.tsx           | 206 ++++++--------
 .../components/mcp-config.tsx                 | 227 ++++++---------
 .../constants/connector-popup.schemas.ts      |   2 +-
 .../hooks/use-connector-dialog.ts             | 265 +++++++++---------
 .../tabs/active-connectors-tab.tsx            |  68 +----
 .../tabs/all-connectors-tab.tsx               |   9 +-
 .../views/mcp-connector-list-view.tsx         | 122 ++++++++
 surfsense_web/contracts/types/mcp.types.ts    |   6 +-
 12 files changed, 492 insertions(+), 522 deletions(-)
 create mode 100644 surfsense_web/components/assistant-ui/connector-popup/views/mcp-connector-list-view.tsx

diff --git a/surfsense_backend/app/agents/new_chat/tools/mcp_tool.py b/surfsense_backend/app/agents/new_chat/tools/mcp_tool.py
index 95960dad2..50339fb93 100644
--- a/surfsense_backend/app/agents/new_chat/tools/mcp_tool.py
+++ b/surfsense_backend/app/agents/new_chat/tools/mcp_tool.py
@@ -146,19 +146,17 @@ async def load_mcp_tools(
         tools: list[StructuredTool] = []
         for connector in result.scalars():
             try:
-                # Extract server configs array
+                # Extract single server config
                 config = connector.config or {}
-                server_configs = config.get("server_configs", [])
+                server_config = config.get("server_config", {})
                 
-                if not server_configs:
-                    logger.warning(f"MCP connector {connector.id} missing server_configs, skipping")
+                if not server_config:
+                    logger.warning(f"MCP connector {connector.id} missing server_config, skipping")
                     continue
 
-                # Process each server config
-                for server_config in server_configs:
-                    command = server_config.get("command")
-                    args = server_config.get("args", [])
-                    env = server_config.get("env", {})
+                command = server_config.get("command")
+                args = server_config.get("args", [])
+                env = server_config.get("env", {})
 
                 if not command:
                     logger.warning(
@@ -166,34 +164,33 @@ async def load_mcp_tools(
                     )
                     continue
 
-                    # Create MCP client
-                    mcp_client = MCPClient(command, args, env)
+                # Create MCP client
+                mcp_client = MCPClient(command, args, env)
 
-                    # Connect and discover tools
-                    async with mcp_client.connect():
-                        tool_definitions = await mcp_client.list_tools()
+                # Connect and discover tools
+                async with mcp_client.connect():
+                    tool_definitions = await mcp_client.list_tools()
 
-                        logger.info(
-                            f"Discovered {len(tool_definitions)} tools from MCP server "
-                            f"'{command}' (connector {connector.id})"
+                    logger.info(
+                        f"Discovered {len(tool_definitions)} tools from MCP server "
+                        f"'{command}' (connector {connector.id})"
+                    )
+
+                # Create LangChain tools from definitions
+                for tool_def in tool_definitions:
+                    try:
+                        tool = await _create_mcp_tool_from_definition(
+                            tool_def, mcp_client
+                        )
+                        tools.append(tool)
+                    except Exception as e:
+                        logger.exception(
+                            f"Failed to create tool '{tool_def.get('name')}' "
+                            f"from connector {connector.id}: {e!s}"
                         )
-
-                    # Create LangChain tools from definitions
-                    for tool_def in tool_definitions:
-                        try:
-                            tool = await _create_mcp_tool_from_definition(
-                                tool_def, mcp_client
-                            )
-                            tools.append(tool)
-                        except Exception as e:
-                            logger.exception(
-                                f"Failed to create tool '{tool_def.get('name')}' "
-                                f"from connector {connector.id}: {e!s}",
-                            )
-
             except Exception as e:
                 logger.exception(
-                    f"Failed to load tools from MCP connector {connector.id}: {e!s}",
+                    f"Failed to load tools from MCP connector {connector.id}: {e!s}"
                 )
 
         logger.info(f"Loaded {len(tools)} MCP tools for search space {search_space_id}")
diff --git a/surfsense_backend/app/routes/search_source_connectors_routes.py b/surfsense_backend/app/routes/search_source_connectors_routes.py
index a3d9d10ef..f9dd69235 100644
--- a/surfsense_backend/app/routes/search_source_connectors_routes.py
+++ b/surfsense_backend/app/routes/search_source_connectors_routes.py
@@ -2018,12 +2018,12 @@ async def create_mcp_connector(
             "You don't have permission to create connectors in this search space",
         )
 
-        # Create the connector with server configs array
+        # Create the connector with single server config
         db_connector = SearchSourceConnector(
             name=connector_data.name,
             connector_type=SearchSourceConnectorType.MCP_CONNECTOR,
             is_indexable=False,  # MCP connectors are not indexable
-            config={"server_configs": [sc.model_dump() for sc in connector_data.server_configs]},
+            config={"server_config": connector_data.server_config.model_dump()},
             periodic_indexing_enabled=False,
             indexing_frequency_minutes=None,
             search_space_id=search_space_id,
@@ -2035,7 +2035,7 @@ async def create_mcp_connector(
         await session.refresh(db_connector)
 
         logger.info(
-            f"Created MCP connector {db_connector.id} with {len(connector_data.server_configs)} server(s) "
+            f"Created MCP connector {db_connector.id} "
             f"for user {user.id} in search space {search_space_id}"
         )
 
@@ -2202,9 +2202,9 @@ async def update_mcp_connector(
         if connector_update.name is not None:
             connector.name = connector_update.name
 
-        if connector_update.server_configs is not None:
+        if connector_update.server_config is not None:
             connector.config = {
-                "server_configs": [sc.model_dump() for sc in connector_update.server_configs]
+                "server_config": connector_update.server_config.model_dump()
             }
 
         connector.updated_at = datetime.now(UTC)
diff --git a/surfsense_backend/app/schemas/search_source_connector.py b/surfsense_backend/app/schemas/search_source_connector.py
index 73ab56e53..b45645053 100644
--- a/surfsense_backend/app/schemas/search_source_connector.py
+++ b/surfsense_backend/app/schemas/search_source_connector.py
@@ -95,14 +95,14 @@ class MCPConnectorCreate(BaseModel):
     """Schema for creating an MCP connector."""
 
     name: str
-    server_configs: list[MCPServerConfig]  # Array of MCP server configurations
+    server_config: MCPServerConfig  # Single MCP server configuration
 
 
 class MCPConnectorUpdate(BaseModel):
     """Schema for updating an MCP connector."""
 
     name: str | None = None
-    server_configs: list[MCPServerConfig] | None = None
+    server_config: MCPServerConfig | None = None
 
 
 class MCPConnectorRead(BaseModel):
@@ -111,7 +111,7 @@ class MCPConnectorRead(BaseModel):
     id: int
     name: str
     connector_type: SearchSourceConnectorType
-    server_configs: list[MCPServerConfig]
+    server_config: MCPServerConfig
     search_space_id: int
     user_id: uuid.UUID
     created_at: datetime
@@ -123,14 +123,14 @@ class MCPConnectorRead(BaseModel):
     def from_connector(cls, connector: SearchSourceConnectorRead) -> "MCPConnectorRead":
         """Convert from base SearchSourceConnectorRead."""
         config = connector.config or {}
-        server_configs_data = config.get("server_configs", [])
-        server_configs = [MCPServerConfig(**sc) for sc in server_configs_data]
+        server_config_data = config.get("server_config", {})
+        server_config = MCPServerConfig(**server_config_data)
 
         return cls(
             id=connector.id,
             name=connector.name,
             connector_type=connector.connector_type,
-            server_configs=server_configs,
+            server_config=server_config,
             search_space_id=connector.search_space_id,
             user_id=connector.user_id,
             created_at=connector.created_at,
diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index 01670f3fd..664e13097 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -24,6 +24,7 @@ import { useConnectorDialog } from "./connector-popup/hooks/use-connector-dialog
 import { ActiveConnectorsTab } from "./connector-popup/tabs/active-connectors-tab";
 import { AllConnectorsTab } from "./connector-popup/tabs/all-connectors-tab";
 import { ConnectorAccountsListView } from "./connector-popup/views/connector-accounts-list-view";
+import { MCPConnectorListView } from "./connector-popup/views/mcp-connector-list-view";
 import { YouTubeCrawlerView } from "./connector-popup/views/youtube-crawler-view";
 
 export const ConnectorIndicator: FC = () => {
@@ -63,6 +64,7 @@ export const ConnectorIndicator: FC = () => {
 		frequencyMinutes,
 		allConnectors,
 		viewingAccountsType,
+		viewingMCPList,
 		setSearchQuery,
 		setStartDate,
 		setEndDate,
@@ -87,6 +89,8 @@ export const ConnectorIndicator: FC = () => {
 		handleBackFromYouTube,
 		handleViewAccountsList,
 		handleBackFromAccountsList,
+		handleBackFromMCPList,
+		handleAddNewMCPFromList,
 		handleQuickIndexConnector,
 		connectorConfig,
 		setConnectorConfig,
@@ -157,14 +161,7 @@ export const ConnectorIndicator: FC = () => {
 	const hasSources = hasConnectors || activeDocumentTypes.length > 0;
 	const totalSourceCount = connectors.length + activeDocumentTypes.length;
 	
-	// Count connectors properly: for MCP, count each server; for others, count connectors
-	const activeConnectorsCount = connectors.reduce((total, c: SearchSourceConnector) => {
-		if (c.connector_type === "MCP_CONNECTOR") {
-			const serverConfigs = c.config?.server_configs;
-			return total + (Array.isArray(serverConfigs) ? serverConfigs.length : 0);
-		}
-		return total + 1;
-	}, 0);
+	const activeConnectorsCount = connectors.length;
 
 	// Check which connectors are already connected
 	const connectedTypes = new Set(
@@ -208,6 +205,19 @@ export const ConnectorIndicator: FC = () => {
 				{/* YouTube Crawler View - shown when adding YouTube videos */}
 				{isYouTubeView && searchSpaceId ? (
 					<YouTubeCrawlerView searchSpaceId={searchSpaceId} onBack={handleBackFromYouTube} />
+				) : viewingMCPList ? (
+					<div className="p-6 sm:p-12 h-full overflow-hidden">
+						<MCPConnectorListView
+							mcpConnectors={
+								(allConnectors || []).filter(
+									(c: SearchSourceConnector) => c.connector_type === "MCP_CONNECTOR"
+								) as SearchSourceConnector[]
+							}
+							onAddNew={handleAddNewMCPFromList}
+							onManageConnector={handleStartEdit}
+							onBack={handleBackFromMCPList}
+						/>
+					</div>
 				) : viewingAccountsType ? (
 					<ConnectorAccountsListView
 						connectorType={viewingAccountsType.connectorType}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
index 6bfb5c883..1a79c6ca9 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
@@ -4,6 +4,7 @@ import { CheckCircle2, ChevronDown, ChevronUp, Server, XCircle } from "lucide-re
 import { type FC, useRef, useState } from "react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Textarea } from "@/components/ui/textarea";
 import { EnumConnectorName } from "@/contracts/enums/connector";
@@ -11,23 +12,9 @@ import type { MCPServerConfig, MCPToolDefinition } from "@/contracts/types/mcp.t
 import { connectorsApiService } from "@/lib/apis/connectors-api.service";
 import type { ConnectFormProps } from "..";
 
-const DEFAULT_CONFIG = `[
-  {
-    "name": "MCP Server 1",
-    "command": "npx",
-    "args": ["-y", "@modelcontextprotocol/server-filesystem", "/path/to/allowed/directory"],
-    "env": {},
-    "transport": "stdio"
-  }
-]`;
-
-interface MCPServerWithName extends MCPServerConfig {
-	name: string;
-}
-
 export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting }) => {
 	const isSubmittingRef = useRef(false);
-	const [configJson, setConfigJson] = useState(DEFAULT_CONFIG);
+	const [configJson, setConfigJson] = useState("");
 	const [jsonError, setJsonError] = useState<string | null>(null);
 	const [isTesting, setIsTesting] = useState(false);
 	const [showDetails, setShowDetails] = useState(false);
@@ -35,62 +22,50 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 		status: "success" | "error";
 		message: string;
 		tools: MCPToolDefinition[];
-		errors?: string[];
 	} | null>(null);
 
-	const parseConfigs = (): { configs: MCPServerWithName[] | null; error: string | null } => {
+	const DEFAULT_CONFIG = JSON.stringify(
+		{
+			name: "My MCP Server",
+			command: "npx",
+			args: ["-y", "@modelcontextprotocol/server-filesystem", "/path/to/directory"],
+			env: {
+				API_KEY: "your_api_key_here",
+			},
+			transport: "stdio",
+		},
+		null,
+		2
+	);
+
+	const parseConfig = (): MCPServerConfig | null => {
 		try {
 			const parsed = JSON.parse(configJson);
-			
-			// Must be an array
-			if (!Array.isArray(parsed)) {
-				return {
-					configs: null,
-					error: "Configuration must be an array of MCP server objects",
-				};
+
+			// Validate that it's an object, not an array
+			if (Array.isArray(parsed)) {
+				setJsonError("Please provide a single server configuration object, not an array");
+				return null;
 			}
 
-			if (parsed.length === 0) {
-				return {
-					configs: null,
-					error: "Array must contain at least one MCP server configuration",
-				};
+			// Validate required fields
+			if (!parsed.command || typeof parsed.command !== "string") {
+				setJsonError("'command' field is required and must be a string");
+				return null;
 			}
 
-			// Validate each server config
-			const configs: MCPServerWithName[] = [];
-			for (let i = 0; i < parsed.length; i++) {
-				const server = parsed[i];
-				
-				if (!server.name || typeof server.name !== "string") {
-					return {
-						configs: null,
-						error: `Server ${i + 1}: 'name' field is required and must be a string`,
-					};
-				}
-
-				if (!server.command || typeof server.command !== "string") {
-					return {
-						configs: null,
-						error: `Server ${i + 1} (${server.name}): 'command' field is required and must be a string`,
-					};
-				}
-
-				configs.push({
-					name: server.name,
-					command: server.command,
-					args: Array.isArray(server.args) ? server.args : [],
-					env: typeof server.env === "object" && server.env !== null ? server.env : {},
-					transport: server.transport || "stdio",
-				});
-			}
-
-			return { configs, error: null };
-		} catch (error) {
-			return {
-				configs: null,
-				error: error instanceof Error ? error.message : "Invalid JSON",
+			const config: MCPServerConfig = {
+				command: parsed.command,
+				args: parsed.args || [],
+				env: parsed.env || {},
+				transport: parsed.transport || "stdio",
 			};
+
+			setJsonError(null);
+			return config;
+		} catch (error) {
+			setJsonError(error instanceof Error ? error.message : "Invalid JSON");
+			return null;
 		}
 	};
 
@@ -102,13 +77,11 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 	};
 
 	const handleTestConnection = async () => {
-		const { configs, error } = parseConfigs();
-		
-		if (!configs || error) {
-			setJsonError(error);
+		const serverConfig = parseConfig();
+		if (!serverConfig) {
 			setTestResult({
 				status: "error",
-				message: error || "Invalid configuration",
+				message: jsonError || "Invalid configuration",
 				tools: [],
 			});
 			return;
@@ -116,47 +89,32 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 
 		setIsTesting(true);
 		setTestResult(null);
-		setJsonError(null);
 
-		const allTools: MCPToolDefinition[] = [];
-		const errors: string[] = [];
-
-		for (const config of configs) {
-			try {
-				const result = await connectorsApiService.testMCPConnection(config);
-				if (result.status === "success") {
-					allTools.push(...result.tools);
-				} else {
-					errors.push(`${config.name}: ${result.message}`);
-				}
-			} catch (error) {
-				errors.push(`${config.name}: ${error instanceof Error ? error.message : "Failed to connect"}`);
+		try {
+			const result = await connectorsApiService.testMCPConnection(serverConfig);
+			
+			if (result.status === "success") {
+				setTestResult({
+					status: "success",
+					message: `Successfully connected. Found ${result.tools.length} tool${result.tools.length !== 1 ? 's' : ''}.`,
+					tools: result.tools,
+				});
+			} else {
+				setTestResult({
+					status: "error",
+					message: result.message || "Failed to connect",
+					tools: [],
+				});
 			}
-		}
-
-		if (errors.length === 0) {
-			setTestResult({
-				status: "success",
-				message: `Successfully connected to ${configs.length} server${configs.length !== 1 ? 's' : ''}. Found ${allTools.length} tool${allTools.length !== 1 ? 's' : ''}.`,
-				tools: allTools,
-			});
-		} else if (allTools.length > 0) {
-			setTestResult({
-				status: "success",
-				message: `Partially successful. Connected ${allTools.length} tool${allTools.length !== 1 ? 's' : ''}.`,
-				tools: allTools,
-				errors,
-			});
-		} else {
+		} catch (error) {
 			setTestResult({
 				status: "error",
-				message: "Failed to connect to all servers",
+				message: error instanceof Error ? error.message : "Failed to connect",
 				tools: [],
-				errors,
 			});
+		} finally {
+			setIsTesting(false);
 		}
-
-		setIsTesting(false);
 	};
 
 	const handleSubmit = async (e: React.FormEvent) => {
@@ -167,22 +125,28 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 			return;
 		}
 
-		const { configs, error } = parseConfigs();
-		
-		if (!configs || error) {
-			setJsonError(error);
-			alert(error || "Invalid JSON configuration");
+		const serverConfig = parseConfig();
+		if (!serverConfig) {
 			return;
 		}
 
+		// Extract server name from config if provided
+		let serverName = "MCP Server";
+		try {
+			const parsed = JSON.parse(configJson);
+			if (parsed.name && typeof parsed.name === "string") {
+				serverName = parsed.name;
+			}
+		} catch {
+			// Use default name
+		}
+
 		isSubmittingRef.current = true;
 		try {
-			// Submit all servers as a single connector with server_configs array
-			// This creates one connector instead of N connectors (one toast instead of N toasts)
 			await onSubmit({
-				name: configs.length === 1 ? configs[0].name : "MCPs",
+				name: serverName,
 				connector_type: EnumConnectorName.MCP_CONNECTOR,
-				config: { server_configs: configs },
+				config: { server_config: serverConfig },
 				is_indexable: false,
 				is_active: true,
 				last_indexed_at: null,
@@ -200,9 +164,9 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3 flex items-start [&>svg]:relative [&>svg]:left-0 [&>svg]:top-1">
 				<Server className="h-4 w-4 shrink-0 ml-1" />
 				<div className="-ml-1">
-					<AlertTitle className="text-xs sm:text-sm">MCP Servers</AlertTitle>
+					<AlertTitle className="text-xs sm:text-sm">MCP Server</AlertTitle>
 					<AlertDescription className="text-[10px] sm:text-xs pl-0!">
-						Connect to one or more MCP (Model Context Protocol) servers. Paste a JSON array of server configurations below.
+						Connect to an MCP (Model Context Protocol) server. Each MCP server is added as a separate connector.
 					</AlertDescription>
 				</div>
 			</Alert>
@@ -210,7 +174,7 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 			<form id="mcp-connect-form" onSubmit={handleSubmit} className="space-y-6">
 				<div className="rounded-xl border border-border bg-slate-400/5 dark:bg-white/5 p-4 sm:p-6 space-y-4">
 					<div className="space-y-2">
-						<Label htmlFor="config">MCP Servers Configuration (JSON Array)</Label>
+						<Label htmlFor="config">MCP Server Configuration (JSON)</Label>
 						<Textarea
 							id="config"
 							value={configJson}
@@ -223,7 +187,7 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 							<p className="text-xs text-red-500">JSON Error: {jsonError}</p>
 						)}
 						<p className="text-[10px] sm:text-xs text-muted-foreground">
-							Paste an array of MCP server configurations. Each object must have: name, command, args (optional), env (optional), transport (optional).
+							Paste a single MCP server configuration. Must include: name, command, args (optional), env (optional), transport (optional).
 						</p>
 					</div>
 
@@ -235,7 +199,7 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 							variant="outline"
 							className="w-full"
 						>
-							{isTesting ? "Testing All Servers..." : "Test All Connections"}
+							{isTesting ? "Testing Connection..." : "Test Connection"}
 						</Button>
 					</div>
 
@@ -248,9 +212,9 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 							}
 						>
 							{testResult.status === "success" ? (
-								<CheckCircle2 className="h-4 w-4 text-green-500" />
+								<CheckCircle2 className="h-4 w-4 text-green-600" />
 							) : (
-								<XCircle className="h-4 w-4 text-red-500" />
+								<XCircle className="h-4 w-4 text-red-600" />
 							)}
 							<div className="flex-1">
 								<div className="flex items-center justify-between">
@@ -285,14 +249,6 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 								</div>
 								<AlertDescription className="text-xs mt-1">
 									{testResult.message}
-									{testResult.errors && testResult.errors.length > 0 && (
-										<div className="mt-2 text-red-600">
-											<p className="font-semibold">Errors:</p>
-											{testResult.errors.map((err, i) => (
-												<div key={i}>• {err}</div>
-											))}
-										</div>
-									)}
 									{showDetails && testResult.tools.length > 0 && (
 										<div className="mt-3 pt-3 border-t border-green-500/20">
 											<p className="font-semibold mb-2">
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
index dcd20cefd..4d141d4ea 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
@@ -14,12 +14,10 @@ import type { ConnectorConfigProps } from "../index";
 
 interface MCPConfigProps extends ConnectorConfigProps {
 	onNameChange?: (name: string) => void;
-	searchSpaceId?: string;
-	onOtherMCPConnectorsLoaded?: (connectorIds: number[]) => void;
 }
 
-export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNameChange, searchSpaceId, onOtherMCPConnectorsLoaded }) => {
-	const [name, setName] = useState<string>("MCPs");
+export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNameChange }) => {
+	const [name, setName] = useState<string>("");
 	const [configJson, setConfigJson] = useState("");
 	const [jsonError, setJsonError] = useState<string | null>(null);
 	const [isTesting, setIsTesting] = useState(false);
@@ -29,55 +27,26 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 		message: string;
 		tools: MCPToolDefinition[];
 	} | null>(null);
-	const [allMCPConnectors, setAllMCPConnectors] = useState<any[]>([]);
 
-	// Load all MCP connectors for this search space
+	// Initialize form from connector config (only on mount)
 	useEffect(() => {
-		const loadAllMCPConnectors = async () => {
-			if (!searchSpaceId) return;
-			
-			try {
-				const connectors = await connectorsApiService.getConnectors({
-					queryParams: { search_space_id: parseInt(searchSpaceId, 10) }
-				});
-				const mcpConnectors = connectors.filter((c: any) => c.connector_type === "MCP_CONNECTOR");
-				setAllMCPConnectors(mcpConnectors);
-				
-				// Notify parent about other MCP connectors that should be deleted on save
-				const otherConnectorIds = mcpConnectors
-					.filter((c: any) => c.id !== connector.id)
-					.map((c: any) => c.id);
-				if (onOtherMCPConnectorsLoaded && otherConnectorIds.length > 0) {
-					onOtherMCPConnectorsLoaded(otherConnectorIds);
-				}
-				
-				// Collect all server configs from all MCP connectors
-				const allServerConfigs: MCPServerConfig[] = [];
-				for (const mcpConn of mcpConnectors) {
-					const serverConfigs = mcpConn.config?.server_configs as MCPServerConfig[] | undefined;
-					if (serverConfigs && Array.isArray(serverConfigs)) {
-						allServerConfigs.push(...serverConfigs);
-					}
-				}
-				
-				if (allServerConfigs.length > 0) {
-					setConfigJson(JSON.stringify(allServerConfigs, null, 2));
-				} else {
-					setConfigJson(JSON.stringify([{
-						command: "",
-						args: [],
-						env: {},
-						transport: "stdio",
-					}], null, 2));
-				}
-			} catch (error) {
-				console.error("Failed to load MCP connectors:", error);
-			}
-		};
+		if (connector.name) {
+			setName(connector.name);
+		}
 		
-		loadAllMCPConnectors();
-	}, [searchSpaceId]);
-
+		const serverConfig = connector.config?.server_config as MCPServerConfig | undefined;
+		if (serverConfig) {
+			// Convert server config to JSON string for editing (name is in separate field)
+			const configObj = {
+				command: serverConfig.command || "",
+				args: serverConfig.args || [],
+				env: serverConfig.env || {},
+				transport: serverConfig.transport || "stdio",
+			};
+			setConfigJson(JSON.stringify(configObj, null, 2));
+		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, []); // Only run on mount to preserve user edits
 
 	const handleNameChange = (value: string) => {
 		setName(value);
@@ -86,31 +55,31 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 		}
 	};
 
-	const parseConfig = (): MCPServerConfig[] | null => {
+	const parseConfig = (): MCPServerConfig | null => {
 		try {
 			const parsed = JSON.parse(configJson);
-			
-			// Handle both single object and array
-			const configs = Array.isArray(parsed) ? parsed : [parsed];
-			
-			// Validate each config
-			const validConfigs: MCPServerConfig[] = [];
-			for (let i = 0; i < configs.length; i++) {
-				const cfg = configs[i];
-				if (!cfg.command || typeof cfg.command !== "string") {
-					setJsonError(`Config ${i + 1}: 'command' field is required and must be a string`);
-					return null;
-				}
-				validConfigs.push({
-					command: cfg.command,
-					args: cfg.args || [],
-					env: cfg.env || {},
-					transport: cfg.transport || "stdio",
-				});
+
+			// Validate that it's an object, not an array
+			if (Array.isArray(parsed)) {
+				setJsonError("Please provide a single server configuration object, not an array");
+				return null;
 			}
-			
+
+			// Validate required fields
+			if (!parsed.command || typeof parsed.command !== "string") {
+				setJsonError("'command' field is required and must be a string");
+				return null;
+			}
+
+			const config: MCPServerConfig = {
+				command: parsed.command,
+				args: parsed.args || [],
+				env: parsed.env || {},
+				transport: parsed.transport || "stdio",
+			};
+
 			setJsonError(null);
-			return validConfigs;
+			return config;
 		} catch (error) {
 			setJsonError(error instanceof Error ? error.message : "Invalid JSON");
 			return null;
@@ -119,51 +88,32 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 
 	const handleConfigChange = (value: string) => {
 		setConfigJson(value);
-		// Clear error when user starts typing
 		if (jsonError) {
 			setJsonError(null);
 		}
 		
-		// Treat empty/whitespace-only input as empty array (user wants to remove all servers)
-		const trimmedValue = value.trim();
-		if (trimmedValue === "") {
-			if (onConfigChange) {
-				onConfigChange({ server_configs: [] });
-			}
-			return;
-		}
-		
 		// Try to parse and update parent if valid
 		try {
 			const parsed = JSON.parse(value);
-			const configs = Array.isArray(parsed) ? parsed : [parsed];
-			
-			// Validate each config
-			const validConfigs: MCPServerConfig[] = [];
-			for (const cfg of configs) {
-				if (cfg.command && typeof cfg.command === "string") {
-					validConfigs.push({
-						command: cfg.command,
-						args: cfg.args || [],
-						env: cfg.env || {},
-						transport: cfg.transport || "stdio",
-					});
+			if (!Array.isArray(parsed) && parsed.command) {
+				const config: MCPServerConfig = {
+					command: parsed.command,
+					args: parsed.args || [],
+					env: parsed.env || {},
+					transport: parsed.transport || "stdio",
+				};
+				if (onConfigChange) {
+					onConfigChange({ server_config: config });
 				}
 			}
-			
-			// Always update parent with configs (including empty array)
-			// Empty array signals that all servers should be removed
-			if (onConfigChange) {
-				onConfigChange({ server_configs: validConfigs });
-			}
 		} catch {
-			// Ignore parse errors while typing - don't update parent with invalid config
+			// Ignore parse errors while typing
 		}
 	};
 
 	const handleTestConnection = async () => {
-		const serverConfigs = parseConfig();
-		if (!serverConfigs || serverConfigs.length === 0) {
+		const serverConfig = parseConfig();
+		if (!serverConfig) {
 			setTestResult({
 				status: "error",
 				message: jsonError || "Invalid configuration",
@@ -172,55 +122,34 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 			return;
 		}
 
-		// Update parent with the config array
+		// Update parent with the config
 		if (onConfigChange) {
-			onConfigChange({ server_configs: serverConfigs });
+			onConfigChange({ server_config: serverConfig });
 		}
 
 		setIsTesting(true);
 		setTestResult(null);
 
 		try {
-			// Test all servers and collect results
-			const allTools: MCPToolDefinition[] = [];
-			const errors: string[] = [];
+			const result = await connectorsApiService.testMCPConnection(serverConfig);
 			
-			for (const serverConfig of serverConfigs) {
-				try {
-					const result = await connectorsApiService.testMCPConnection(serverConfig);
-					if (result.status === "success") {
-						allTools.push(...result.tools);
-					} else {
-						errors.push(`${serverConfig.command}: ${result.message}`);
-					}
-				} catch (error) {
-					errors.push(`${serverConfig.command}: ${error instanceof Error ? error.message : "Failed to connect"}`);
-				}
-			}
-			
-			if (errors.length === 0) {
+			if (result.status === "success") {
 				setTestResult({
 					status: "success",
-					message: `Successfully connected to ${serverConfigs.length} server(s)`,
-					tools: allTools,
-				});
-			} else if (allTools.length > 0) {
-				setTestResult({
-					status: "success",
-					message: `Partially successful. Errors: ${errors.join("; ")}`,
-					tools: allTools,
+					message: `Connected successfully! Found ${result.tools.length} tool(s).`,
+					tools: result.tools,
 				});
 			} else {
 				setTestResult({
 					status: "error",
-					message: errors.join("; "),
+					message: result.message || "Failed to connect",
 					tools: [],
 				});
 			}
 		} catch (error) {
 			setTestResult({
 				status: "error",
-				message: error instanceof Error ? error.message : "Failed to connect to MCP servers",
+				message: error instanceof Error ? error.message : "Failed to connect",
 				tools: [],
 			});
 		} finally {
@@ -230,6 +159,18 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 
 	return (
 		<div className="space-y-6">
+			{/* Server Name */}
+			<div className="space-y-2">
+				<Label htmlFor="name">Server Name *</Label>
+				<Input
+					id="name"
+					value={name}
+					onChange={(e) => handleNameChange(e.target.value)}
+					placeholder="e.g., Filesystem Server"
+					required
+				/>
+			</div>
+
 			{/* Server Configuration */}
 			<div className="space-y-4">
 				<h3 className="font-medium text-sm sm:text-base flex items-center gap-2">
@@ -239,21 +180,19 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 
 				<div className="rounded-xl border border-border bg-slate-400/5 dark:bg-white/5 p-3 sm:p-6 space-y-4">
 					<div className="space-y-2">
+						<Label htmlFor="config">MCP Server Configuration (JSON)</Label>
 						<Textarea
+							id="config"
 							value={configJson}
 							onChange={(e) => handleConfigChange(e.target.value)}
-							rows={12}
-							className={`font-mono text-xs border-slate-400/20 focus-visible:border-slate-400/40 ${
-								jsonError ? "border-red-500" : ""
-							}`}
+							rows={16}
+							className={`font-mono text-xs ${jsonError ? "border-red-500" : ""}`}
 						/>
 						{jsonError && (
-							<p className="text-xs text-red-500">
-								JSON Error: {jsonError}
-							</p>
+							<p className="text-xs text-red-500">JSON Error: {jsonError}</p>
 						)}
 						<p className="text-[10px] sm:text-xs text-muted-foreground">
-							Edit your MCP server configurations (array format). Each server requires: command, args, env, transport.
+							Edit your MCP server configuration. Must include: name, command, args (optional), env (optional), transport (optional).
 						</p>
 					</div>
 
@@ -266,7 +205,7 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 							variant="outline"
 							className="w-full"
 						>
-							{isTesting ? "Testing..." : "Test Connection"}
+							{isTesting ? "Testing Connection..." : "Test Connection"}
 						</Button>
 					</div>
 
@@ -280,9 +219,9 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 							}
 						>
 							{testResult.status === "success" ? (
-								<CheckCircle2 className="h-4 w-4 text-green-500" />
+								<CheckCircle2 className="h-4 w-4 text-green-600" />
 							) : (
-								<XCircle className="h-4 w-4 text-red-500" />
+								<XCircle className="h-4 w-4 text-red-600" />
 							)}
 							<div className="flex-1">
 								<div className="flex items-center justify-between">
@@ -317,10 +256,10 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 								</div>
 								<AlertDescription className="text-xs mt-1">
 									{testResult.message}
-									{showDetails && testResult.status === "success" && testResult.tools.length > 0 && (
+									{showDetails && testResult.tools.length > 0 && (
 										<div className="mt-3 pt-3 border-t border-green-500/20">
 											<p className="font-semibold mb-2">
-												Found {testResult.tools.length} tool{testResult.tools.length !== 1 ? 's' : ''}:
+												Available tools:
 											</p>
 											<ul className="list-disc list-inside text-xs space-y-0.5">
 												{testResult.tools.map((tool, i) => (
diff --git a/surfsense_web/components/assistant-ui/connector-popup/constants/connector-popup.schemas.ts b/surfsense_web/components/assistant-ui/connector-popup/constants/connector-popup.schemas.ts
index a1b303163..d74d66203 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/constants/connector-popup.schemas.ts
+++ b/surfsense_web/components/assistant-ui/connector-popup/constants/connector-popup.schemas.ts
@@ -7,7 +7,7 @@ import { searchSourceConnectorTypeEnum } from "@/contracts/types/connector.types
 export const connectorPopupQueryParamsSchema = z.object({
 	modal: z.enum(["connectors"]).optional(),
 	tab: z.enum(["all", "active"]).optional(),
-	view: z.enum(["configure", "edit", "connect", "youtube", "accounts"]).optional(),
+	view: z.enum(["configure", "edit", "connect", "youtube", "accounts", "mcp-list"]).optional(),
 	connector: z.string().optional(),
 	connectorId: z.string().optional(),
 	connectorType: z.string().optional(),
diff --git a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
index 6cfc279ac..8583da7bf 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
+++ b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
@@ -68,7 +68,6 @@ export const useConnectorDialog = () => {
 	const [isDisconnecting, setIsDisconnecting] = useState(false);
 	const [connectorConfig, setConnectorConfig] = useState<Record<string, unknown> | null>(null);
 	const [connectorName, setConnectorName] = useState<string | null>(null);
-	const [otherMCPConnectorIds, setOtherMCPConnectorIds] = useState<number[]>([]);
 
 	// Connect mode state (for non-OAuth connectors)
 	const [connectingConnectorType, setConnectingConnectorType] = useState<string | null>(null);
@@ -81,12 +80,18 @@ export const useConnectorDialog = () => {
 		connectorTitle: string;
 	} | null>(null);
 
+	// MCP list view state (for managing multiple MCP connectors)
+	const [viewingMCPList, setViewingMCPList] = useState(false);
+
 	// Track if we came from accounts list when entering edit mode
 	const [cameFromAccountsList, setCameFromAccountsList] = useState<{
 		connectorType: string;
 		connectorTitle: string;
 	} | null>(null);
 
+	// Track if we came from MCP list view when entering edit mode
+	const [cameFromMCPList, setCameFromMCPList] = useState(false);
+
 	// Helper function to get frequency label
 	const getFrequencyLabel = useCallback((minutes: string): string => {
 		switch (minutes) {
@@ -140,6 +145,16 @@ export const useConnectorDialog = () => {
 					setViewingAccountsType(null);
 				}
 
+				// Clear MCP list view if view is not "mcp-list" anymore
+				if (params.view !== "mcp-list" && viewingMCPList) {
+					setViewingMCPList(false);
+				}
+
+				// Handle MCP list view
+				if (params.view === "mcp-list" && !viewingMCPList) {
+					setViewingMCPList(true);
+				}
+
 				// Handle connect view
 				if (params.view === "connect" && params.connectorType && !connectingConnectorType) {
 					setConnectingConnectorType(params.connectorType);
@@ -623,32 +638,34 @@ export const useConnectorDialog = () => {
 									},
 								});
 
-								toast.success(`${connectorTitle} connected and indexing started!`, {
-									description: periodicEnabledForIndexing
-										? `Periodic sync enabled every ${getFrequencyLabel(frequencyMinutesForIndexing)}.`
-										: "You can continue working while we sync your data.",
-								});
+							const successMessage = currentConnectorType === "MCP_CONNECTOR"
+								? `${connector.name} MCP server added successfully`
+								: `${connectorTitle} connected and indexing started!`;
+							toast.success(successMessage, {
+								description: periodicEnabledForIndexing
+									? `Periodic sync enabled every ${getFrequencyLabel(frequencyMinutesForIndexing)}.`
+									: "You can continue working while we sync your data.",
+							});
 
-								// Close modal and return to main view
-								const url = new URL(window.location.href);
-								url.searchParams.delete("modal");
-								url.searchParams.delete("tab");
-								url.searchParams.delete("view");
-								url.searchParams.delete("connectorType");
-								router.replace(url.pathname + url.search, { scroll: false });
+							const url = new URL(window.location.href);
+							url.searchParams.delete("modal");
+							url.searchParams.delete("tab");
+							url.searchParams.delete("view");
+							url.searchParams.delete("connectorType");
+							router.replace(url.pathname + url.search, { scroll: false });
 
-								// Clear indexing config state since we're not showing the view
-								setIndexingConfig(null);
-								setIndexingConnector(null);
-								setIndexingConnectorConfig(null);
+							// Clear indexing config state since we're not showing the view
+							setIndexingConfig(null);
+							setIndexingConnector(null);
+							setIndexingConnectorConfig(null);
 
-								// Invalidate queries to refresh data
-								queryClient.invalidateQueries({
-									queryKey: cacheKeys.logs.summary(Number(searchSpaceId)),
-								});
+							// Invalidate queries to refresh data
+							queryClient.invalidateQueries({
+								queryKey: cacheKeys.logs.summary(Number(searchSpaceId)),
+							});
 
-								// Refresh connectors list
-								await refetchAllConnectors();
+							// Refresh connectors list
+							await refetchAllConnectors();
 							} else {
 								// Non-indexable connector
 								// For Circleback, transition to edit view to show webhook URL
@@ -685,7 +702,10 @@ export const useConnectorDialog = () => {
 									await refetchAllConnectors();
 								} else {
 									// Other non-indexable connectors - just show success message and close
-									toast.success(`${connectorTitle} connected successfully!`);
+									const successMessage = currentConnectorType === "MCP_CONNECTOR"
+										? `${connector.name} MCP server added successfully`
+										: `${connectorTitle} connected successfully!`;
+									toast.success(successMessage);
 
 									// Close modal and return to main view
 									const url = new URL(window.location.href);
@@ -729,11 +749,18 @@ export const useConnectorDialog = () => {
 	const handleBackFromConnect = useCallback(() => {
 		const url = new URL(window.location.href);
 		url.searchParams.set("modal", "connectors");
-		url.searchParams.set("tab", "all");
-		url.searchParams.delete("view");
+		
+		// If we're connecting an MCP and came from list view, go back to list
+		if (connectingConnectorType === "MCP_CONNECTOR" && viewingMCPList) {
+			url.searchParams.set("view", "mcp-list");
+		} else {
+			url.searchParams.set("tab", "all");
+			url.searchParams.delete("view");
+		}
+		
 		url.searchParams.delete("connectorType");
 		router.replace(url.pathname + url.search, { scroll: false });
-	}, [router]);
+	}, [router, connectingConnectorType, viewingMCPList]);
 
 	// Handle going back from YouTube view
 	const handleBackFromYouTube = useCallback(() => {
@@ -776,6 +803,38 @@ export const useConnectorDialog = () => {
 		router.replace(url.pathname + url.search, { scroll: false });
 	}, [router]);
 
+	// Handle viewing MCP list
+	const handleViewMCPList = useCallback(() => {
+		if (!searchSpaceId) return;
+
+		setViewingMCPList(true);
+
+		// Update URL to show MCP list view
+		const url = new URL(window.location.href);
+		url.searchParams.set("modal", "connectors");
+		url.searchParams.set("view", "mcp-list");
+		window.history.pushState({ modal: true }, "", url.toString());
+	}, [searchSpaceId]);
+
+	// Handle going back from MCP list view
+	const handleBackFromMCPList = useCallback(() => {
+		setViewingMCPList(false);
+		const url = new URL(window.location.href);
+		url.searchParams.set("modal", "connectors");
+		url.searchParams.delete("view");
+		router.replace(url.pathname + url.search, { scroll: false });
+	}, [router]);
+
+	// Handle adding new MCP from list view
+	const handleAddNewMCPFromList = useCallback(() => {
+		setConnectingConnectorType("MCP_CONNECTOR");
+		const url = new URL(window.location.href);
+		url.searchParams.set("modal", "connectors");
+		url.searchParams.set("view", "connect");
+		url.searchParams.set("connectorType", "MCP_CONNECTOR");
+		router.replace(url.pathname + url.search, { scroll: false });
+	}, [router]);
+
 	// Handle starting indexing
 	const handleStartIndexing = useCallback(
 		async (refreshConnectors: () => void) => {
@@ -961,6 +1020,13 @@ export const useConnectorDialog = () => {
 		(connector: SearchSourceConnector) => {
 			if (!searchSpaceId) return;
 
+			// For MCP connectors from "All Connectors" tab, show the list view instead of directly editing
+			// (unless we're already in the MCP list view or on the Active tab where individual MCPs are shown)
+			if (connector.connector_type === "MCP_CONNECTOR" && !viewingMCPList && activeTab === "all") {
+				handleViewMCPList();
+				return;
+			}
+
 			// All connector types should be handled in the popup edit view
 			// Validate connector data
 			const connectorValidation = searchSourceConnector.safeParse(connector);
@@ -977,6 +1043,13 @@ export const useConnectorDialog = () => {
 				setCameFromAccountsList(null);
 			}
 
+			// Track if we came from MCP list view
+			if (viewingMCPList && connector.connector_type === "MCP_CONNECTOR") {
+				setCameFromMCPList(true);
+			} else {
+				setCameFromMCPList(false);
+			}
+
 			// Track index with date range opened event
 			if (connector.is_indexable) {
 				trackIndexWithDateRangeOpened(
@@ -1006,7 +1079,7 @@ export const useConnectorDialog = () => {
 			url.searchParams.set("connectorId", connector.id.toString());
 			window.history.pushState({ modal: true }, "", url.toString());
 		},
-		[searchSpaceId, viewingAccountsType]
+		[searchSpaceId, viewingAccountsType, viewingMCPList, handleViewMCPList, activeTab]
 	);
 
 	// Handle saving connector changes
@@ -1047,82 +1120,6 @@ export const useConnectorDialog = () => {
 				const startDateStr = startDate ? format(startDate, "yyyy-MM-dd") : undefined;
 				const endDateStr = endDate ? format(endDate, "yyyy-MM-dd") : undefined;
 
-				// For MCP connectors, track original server count for toast messages
-				let originalServerCount = 0;
-				let newServerCount = 0;
-				if (editingConnector.connector_type === "MCP_CONNECTOR") {
-					const originalServerConfigs = editingConnector.config?.server_configs;
-					originalServerCount = Array.isArray(originalServerConfigs) ? originalServerConfigs.length : 0;
-					const newServerConfigs = connectorConfig?.server_configs;
-					newServerCount = Array.isArray(newServerConfigs) ? newServerConfigs.length : 0;
-				}
-
-				// For MCP connectors, check if all servers were removed (empty array)
-				if (editingConnector.connector_type === "MCP_CONNECTOR") {
-					const serverConfigs = connectorConfig?.server_configs;
-					if (!serverConfigs || (Array.isArray(serverConfigs) && serverConfigs.length === 0)) {
-						// All servers removed - delete the entire connector
-						await deleteConnector({
-							id: editingConnector.id,
-						});
-
-						// Also delete other MCP connectors that were consolidated
-						if (otherMCPConnectorIds.length > 0) {
-							await Promise.all(
-								otherMCPConnectorIds.map((id) =>
-									deleteConnector({
-										id,
-									}).catch(() => {
-										// Silently ignore errors for individual deletions
-									})
-								)
-							);
-							setOtherMCPConnectorIds([]);
-						}
-
-						toast.success("MCPs disconnected successfully", {
-							description: "All MCP servers have been removed.",
-						});
-
-						// Update URL to close modal
-						const url = new URL(window.location.href);
-						url.searchParams.delete("modal");
-						url.searchParams.delete("tab");
-						url.searchParams.delete("view");
-						url.searchParams.delete("connectorId");
-						router.replace(url.pathname + url.search, { scroll: false });
-
-						// Refresh connectors and reset state
-						refreshConnectors();
-						setEditingConnector(null);
-						setConnectorName("");
-						setConnectorConfig(null);
-						setPeriodicEnabled(false);
-						setFrequencyMinutes("1440");
-						setStartDate(undefined);
-						setEndDate(undefined);
-						setOtherMCPConnectorIds([]);
-
-						setIsSaving(false);
-						return;
-					}
-				}
-
-				// For MCP connectors, delete other MCP connectors first (consolidate all into one)
-				if (editingConnector.connector_type === "MCP_CONNECTOR" && otherMCPConnectorIds.length > 0) {
-					// Silently delete other MCP connectors without showing toasts
-					await Promise.all(
-						otherMCPConnectorIds.map((id) =>
-							deleteConnector({
-								id,
-							}).catch(() => {
-								// Silently ignore errors for individual deletions
-							})
-						)
-					);
-					setOtherMCPConnectorIds([]);
-				}
-
 				// Update connector with periodic sync settings, config changes, and name
 				// Note: Periodic sync is disabled for Google Drive connectors and non-indexable connectors
 				const frequency =
@@ -1228,17 +1225,7 @@ export const useConnectorDialog = () => {
 				}
 
 			// Generate toast message based on connector type
-			let toastTitle = `${editingConnector.name} updated successfully`;
-			if (editingConnector.connector_type === "MCP_CONNECTOR") {
-				const serverDiff = newServerCount - originalServerCount;
-				if (serverDiff > 0) {
-					toastTitle = `${serverDiff} MCP ${serverDiff === 1 ? "server" : "servers"} added`;
-				} else if (serverDiff < 0) {
-					toastTitle = `${Math.abs(serverDiff)} MCP ${Math.abs(serverDiff) === 1 ? "server" : "servers"} removed`;
-				} else {
-					toastTitle = "MCPs updated successfully";
-				}
-			}
+			const toastTitle = `${editingConnector.name} updated successfully`;
 
 			toast.success(toastTitle, {
 				description: periodicEnabled
@@ -1279,8 +1266,6 @@ export const useConnectorDialog = () => {
 			router,
 			connectorConfig,
 			connectorName,
-			otherMCPConnectorIds,
-			deleteConnector,
 		]
 	);
 
@@ -1304,16 +1289,24 @@ export const useConnectorDialog = () => {
 
 				toast.success(
 					editingConnector.connector_type === "MCP_CONNECTOR"
-						? "MCPs disconnected successfully"
+						? `${editingConnector.name} MCP server removed successfully`
 						: `${editingConnector.name} disconnected successfully`
 				);
 
-				// Update URL - the effect will handle closing the modal and clearing state
+				// Update URL - for MCP, go back to list; for others, close modal
 				const url = new URL(window.location.href);
-				url.searchParams.delete("modal");
-				url.searchParams.delete("tab");
-				url.searchParams.delete("view");
-				url.searchParams.delete("connectorId");
+				if (editingConnector.connector_type === "MCP_CONNECTOR") {
+					// Go back to MCP list view
+					setViewingMCPList(true);
+					url.searchParams.set("modal", "connectors");
+					url.searchParams.set("view", "mcp-list");
+					url.searchParams.delete("connectorId");
+				} else {
+					url.searchParams.delete("modal");
+					url.searchParams.delete("tab");
+					url.searchParams.delete("view");
+					url.searchParams.delete("connectorId");
+				}
 				router.replace(url.pathname + url.search, { scroll: false });
 
 				refreshConnectors();
@@ -1365,6 +1358,21 @@ export const useConnectorDialog = () => {
 
 	// Handle going back from edit view
 	const handleBackFromEdit = useCallback(() => {
+		// If editing an MCP connector and came from MCP list, go back to MCP list view
+		if (editingConnector?.connector_type === "MCP_CONNECTOR" && cameFromMCPList) {
+			setViewingMCPList(true);
+			setCameFromMCPList(false);
+			const url = new URL(window.location.href);
+			url.searchParams.set("modal", "connectors");
+			url.searchParams.set("view", "mcp-list");
+			url.searchParams.delete("connectorId");
+			router.replace(url.pathname + url.search, { scroll: false });
+			setEditingConnector(null);
+			setConnectorName(null);
+			setConnectorConfig(null);
+			return;
+		}
+
 		// If we came from accounts list view, go back there
 		if (cameFromAccountsList && editingConnector) {
 			// Restore accounts list view
@@ -1377,10 +1385,10 @@ export const useConnectorDialog = () => {
 			url.searchParams.delete("connectorId");
 			router.replace(url.pathname + url.search, { scroll: false });
 		} else {
-			// Otherwise, go back to main connector popup
+			// Otherwise, go back to main connector popup (preserve the tab the user was on)
 			const url = new URL(window.location.href);
 			url.searchParams.set("modal", "connectors");
-			url.searchParams.set("tab", "all");
+			url.searchParams.set("tab", activeTab); // Use current tab instead of always "all"
 			url.searchParams.delete("view");
 			url.searchParams.delete("connectorId");
 			router.replace(url.pathname + url.search, { scroll: false });
@@ -1388,7 +1396,7 @@ export const useConnectorDialog = () => {
 		setEditingConnector(null);
 		setConnectorName(null);
 		setConnectorConfig(null);
-	}, [router, cameFromAccountsList, editingConnector]);
+	}, [router, cameFromAccountsList, editingConnector, cameFromMCPList, activeTab]);
 
 	// Handle dialog open/close
 	const handleOpenChange = useCallback(
@@ -1466,6 +1474,7 @@ export const useConnectorDialog = () => {
 		searchSpaceId,
 		allConnectors,
 		viewingAccountsType,
+		viewingMCPList,
 
 		// Setters
 		setSearchQuery,
@@ -1474,7 +1483,6 @@ export const useConnectorDialog = () => {
 		setPeriodicEnabled,
 		setFrequencyMinutes,
 		setConnectorName,
-		setOtherMCPConnectorIds,
 
 		// Handlers
 		handleOpenChange,
@@ -1495,6 +1503,9 @@ export const useConnectorDialog = () => {
 		handleBackFromYouTube,
 		handleViewAccountsList,
 		handleBackFromAccountsList,
+		handleViewMCPList,
+		handleBackFromMCPList,
+		handleAddNewMCPFromList,
 		handleQuickIndexConnector,
 		connectorConfig,
 		setConnectorConfig,
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
index ba4a03084..b7edf3643 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
@@ -123,19 +123,12 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 	// Get OAuth connector types set for quick lookup
 	const oauthConnectorTypes = new Set<string>(OAUTH_CONNECTORS.map((c) => c.connectorType));
 
-	// Separate OAuth, MCP, and other non-OAuth connectors
+	// Separate OAuth and non-OAuth connectors
 	const oauthConnectors = connectors.filter((c) => oauthConnectorTypes.has(c.connector_type));
-	const mcpConnectors = connectors.filter((c) => c.connector_type === "MCP_CONNECTOR");
 	const nonOauthConnectors = connectors.filter(
-		(c) => !oauthConnectorTypes.has(c.connector_type) && c.connector_type !== "MCP_CONNECTOR"
+		(c) => !oauthConnectorTypes.has(c.connector_type)
 	);
 
-	// Calculate total number of MCP servers across all MCP connectors
-	const totalMCPServers = mcpConnectors.reduce((total, connector) => {
-		const serverConfigs = connector.config?.server_configs;
-		return total + (Array.isArray(serverConfigs) ? serverConfigs.length : 0);
-	}, 0);
-
 	// Group OAuth connectors by type
 	const oauthConnectorsByType = oauthConnectors.reduce(
 		(acc, connector) => {
@@ -185,17 +178,9 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 		);
 	});
 
-	// Check if MCPs match search query
-	const showMCPs =
-		mcpConnectors.length > 0 &&
-		(!searchQuery ||
-			"mcps".includes(searchQuery.toLowerCase()) ||
-			"model context protocol".includes(searchQuery.toLowerCase()));
-
 	const hasActiveConnectors =
 		filteredOAuthConnectorTypes.length > 0 ||
-		filteredNonOAuthConnectors.length > 0 ||
-		showMCPs;
+		filteredNonOAuthConnectors.length > 0;
 
 	return (
 		<TabsContent value="active" className="m-0">
@@ -217,16 +202,8 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 									const documentCount = getDocumentCountForConnector(
 										connectorType,
 										documentTypeCounts
-									);
-									// Calculate account count - for MCP, count servers; for others, count connectors
-									const accountCount =
-										connectorType === "MCP_CONNECTOR"
-											? typeConnectors.reduce((total, c) => {
-													const serverConfigs = c.config?.server_configs;
-													return total + (Array.isArray(serverConfigs) ? serverConfigs.length : 0);
-												}, 0)
-											: typeConnectors.length;
-									const mostRecentLastIndexed = getMostRecentLastIndexed(typeConnectors);
+					);
+						const accountCount = typeConnectors.length;
 
 									const handleManageClick = () => {
 										if (onViewAccountsList) {
@@ -298,41 +275,6 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 									);
 								})}
 
-								{/* MCP Connectors - Single Grouped Card */}
-								{showMCPs && (
-									<div
-										className={cn(
-											"flex items-center gap-4 p-4 rounded-xl border border-border transition-all",
-											"hover:bg-slate-400/10 dark:hover:bg-white/10"
-										)}
-									>
-										<div
-											className={cn(
-												"flex h-12 w-12 items-center justify-center rounded-lg border shrink-0",
-												"bg-slate-400/5 dark:bg-white/5 border-slate-400/5 dark:border-white/5"
-											)}
-										>
-											{getConnectorIcon("MCP_CONNECTOR", "size-6")}
-										</div>
-										<div className="flex-1 min-w-0">
-											<p className="text-[14px] font-semibold leading-tight truncate">MCPs</p>
-										<p className="text-[10px] text-muted-foreground mt-1">
-												{totalMCPServers} {totalMCPServers === 1 ? "Server" : "Servers"}
-											</p>
-										</div>
-										<Button
-											variant="secondary"
-											size="sm"
-											className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-slate-50 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-secondary/80 shrink-0"
-											onClick={
-												onManage && mcpConnectors[0] ? () => onManage(mcpConnectors[0]) : undefined
-											}
-										>
-											Manage
-										</Button>
-									</div>
-								)}
-
 								{/* Non-OAuth Connectors - Individual Cards */}
 								{filteredNonOAuthConnectors.map((connector) => {
 									const isIndexing = indexingConnectorIds.has(connector.id);
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx
index a51b7d26a..0653a1cbe 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx
@@ -103,14 +103,7 @@ export const AllConnectorsTab: FC<AllConnectorsTabProps> = ({
 										)
 									: [];
 
-							// Calculate account count - for MCP, count servers; for others, count connectors
-							const accountCount =
-								connector.connectorType === "MCP_CONNECTOR"
-									? typeConnectors.reduce((total, c) => {
-											const serverConfigs = c.config?.server_configs;
-											return total + (Array.isArray(serverConfigs) ? serverConfigs.length : 0);
-										}, 0)
-									: typeConnectors.length;
+							const accountCount = typeConnectors.length;
 
 							// Get the most recent last_indexed_at across all accounts
 							const mostRecentLastIndexed = typeConnectors.reduce<string | undefined>(
diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/mcp-connector-list-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/mcp-connector-list-view.tsx
new file mode 100644
index 000000000..2da6352a9
--- /dev/null
+++ b/surfsense_web/components/assistant-ui/connector-popup/views/mcp-connector-list-view.tsx
@@ -0,0 +1,122 @@
+"use client";
+
+import { Plus, Server } from "lucide-react";
+import type { FC } from "react";
+import { Button } from "@/components/ui/button";
+import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
+import type { SearchSourceConnector } from "@/contracts/types/connector.types";
+import { cn } from "@/lib/utils";
+
+interface MCPConnectorListViewProps {
+	mcpConnectors: SearchSourceConnector[];
+	onAddNew: () => void;
+	onManageConnector: (connector: SearchSourceConnector) => void;
+	onBack: () => void;
+}
+
+export const MCPConnectorListView: FC<MCPConnectorListViewProps> = ({
+	mcpConnectors,
+	onAddNew,
+	onManageConnector,
+	onBack,
+}) => {
+	return (
+		<div className="flex flex-col h-full">
+			{/* Header */}
+			<div className="flex items-center justify-between mb-6 shrink-0">
+				<div className="flex items-center gap-3">
+					<Button
+						variant="ghost"
+						size="icon"
+						onClick={onBack}
+						className="h-8 w-8"
+					>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							width="16"
+							height="16"
+							viewBox="0 0 24 24"
+							fill="none"
+							stroke="currentColor"
+							strokeWidth="2"
+							strokeLinecap="round"
+							strokeLinejoin="round"
+						>
+							<path d="m15 18-6-6 6-6" />
+						</svg>
+					</Button>
+					<div>
+						<h2 className="text-lg sm:text-xl font-semibold">MCP Connectors</h2>
+						<p className="text-xs sm:text-sm text-muted-foreground">
+							Manage your Model Context Protocol servers
+						</p>
+					</div>
+				</div>
+			</div>
+
+			{/* Add New Button */}
+			<div className="mb-4 shrink-0">
+				<Button
+					onClick={onAddNew}
+					className="w-full"
+					variant="outline"
+				>
+					<Plus className="h-4 w-4 mr-2" />
+					Add New MCP Server
+				</Button>
+			</div>
+
+			{/* MCP Connectors List */}
+			<div className="space-y-3 flex-1 overflow-y-auto">
+				{mcpConnectors.length === 0 ? (
+					<div className="flex flex-col items-center justify-center py-12 text-center">
+						<div className="h-16 w-16 rounded-full bg-slate-400/5 dark:bg-white/5 flex items-center justify-center mb-4">
+							<Server className="h-8 w-8 text-muted-foreground" />
+						</div>
+						<h3 className="text-sm font-medium mb-1">No MCP Servers</h3>
+						<p className="text-xs text-muted-foreground max-w-[280px]">
+							Get started by adding your first Model Context Protocol server
+						</p>
+					</div>
+				) : (
+					mcpConnectors.map((connector) => {
+						// Extract server name from config
+						const serverName = connector.config?.server_config?.name || connector.name;
+						
+						return (
+							<div
+								key={connector.id}
+								className={cn(
+									"flex items-center gap-4 p-4 rounded-xl border border-border transition-all",
+									"bg-slate-400/5 dark:bg-white/5 hover:bg-slate-400/10 dark:hover:bg-white/10"
+								)}
+							>
+								<div
+									className={cn(
+										"flex h-12 w-12 items-center justify-center rounded-lg border shrink-0",
+										"bg-slate-400/5 dark:bg-white/5 border-slate-400/5 dark:border-white/5"
+									)}
+								>
+									{getConnectorIcon("MCP_CONNECTOR", "size-6")}
+								</div>
+								<div className="flex-1 min-w-0">
+									<p className="text-[14px] font-semibold leading-tight truncate">
+										{serverName}
+									</p>
+								</div>
+								<Button
+									variant="secondary"
+									size="sm"
+									className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-slate-50 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-secondary/80 shrink-0"
+									onClick={() => onManageConnector(connector)}
+								>
+									Manage
+								</Button>
+							</div>
+						);
+					})
+				)}
+			</div>
+		</div>
+	);
+};
diff --git a/surfsense_web/contracts/types/mcp.types.ts b/surfsense_web/contracts/types/mcp.types.ts
index eaed344df..e25ffe3c5 100644
--- a/surfsense_web/contracts/types/mcp.types.ts
+++ b/surfsense_web/contracts/types/mcp.types.ts
@@ -15,19 +15,19 @@ export const mcpServerConfig = z.object({
  */
 export const mcpConnectorCreate = z.object({
 	name: z.string().min(1, "Connector name is required"),
-	server_configs: z.array(mcpServerConfig).min(1, "At least one server configuration is required"),
+	server_config: mcpServerConfig,
 });
 
 export const mcpConnectorUpdate = z.object({
 	name: z.string().min(1).optional(),
-	server_configs: z.array(mcpServerConfig).optional(),
+	server_config: mcpServerConfig.optional(),
 });
 
 export const mcpConnectorRead = z.object({
 	id: z.number(),
 	name: z.string(),
 	connector_type: z.literal("MCP_CONNECTOR"),
-	server_configs: z.array(mcpServerConfig),
+	server_config: mcpServerConfig,
 	search_space_id: z.number(),
 	user_id: z.string(),
 	created_at: z.string(),

From 1340121d5e61efa3c618205850537b0e6aee94b9 Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Fri, 16 Jan 2026 15:02:44 -0800
Subject: [PATCH 12/18] nit

---
 .../connect-forms/components/mcp-connect-form.tsx | 15 ++++++---------
 .../views/connector-connect-view.tsx              |  4 ++--
 .../views/connector-edit-view.tsx                 |  2 +-
 .../connector-popup/hooks/use-connector-dialog.ts |  7 ++++---
 .../tabs/active-connectors-tab.tsx                |  2 ++
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
index 1a79c6ca9..62d017509 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
@@ -161,15 +161,12 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 
 	return (
 		<div className="space-y-6 pb-6">
-			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3 flex items-start [&>svg]:relative [&>svg]:left-0 [&>svg]:top-1">
-				<Server className="h-4 w-4 shrink-0 ml-1" />
-				<div className="-ml-1">
-					<AlertTitle className="text-xs sm:text-sm">MCP Server</AlertTitle>
-					<AlertDescription className="text-[10px] sm:text-xs pl-0!">
-						Connect to an MCP (Model Context Protocol) server. Each MCP server is added as a separate connector.
-					</AlertDescription>
-				</div>
-			</Alert>
+			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3 [&>svg]:top-2 sm:[&>svg]:top-3">
+			<Server className="h-4 w-4 shrink-0" />
+			<AlertDescription className="text-[10px] sm:text-xs">
+				Connect to an MCP (Model Context Protocol) server. Each MCP server is added as a separate connector.
+			</AlertDescription>
+		</Alert>
 
 			<form id="mcp-connect-form" onSubmit={handleSubmit} className="space-y-6">
 				<div className="rounded-xl border border-border bg-slate-400/5 dark:bg-white/5 p-4 sm:p-6 space-y-4">
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
index ff69e3947..5047e703b 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
@@ -99,7 +99,7 @@ export const ConnectorConnectView: FC<ConnectorConnectViewProps> = ({
 					</div>
 					<div>
 						<h2 className="text-xl sm:text-2xl font-semibold tracking-tight">
-							Connect {connectorType === "MCP_CONNECTOR" ? "MCP(s)" : getConnectorTypeDisplay(connectorType)}
+							Connect {connectorType === "MCP_CONNECTOR" ? "MCP Server" : getConnectorTypeDisplay(connectorType)}
 						</h2>
 						<p className="text-xs sm:text-base text-muted-foreground mt-1">
 							Enter your connection details
@@ -139,7 +139,7 @@ export const ConnectorConnectView: FC<ConnectorConnectViewProps> = ({
 							Connecting...
 						</>
 					) : (
-						<>Connect {connectorType === "MCP_CONNECTOR" ? "MCP(s)" : getConnectorTypeDisplay(connectorType)}</>
+						<>{connectorType === "MCP_CONNECTOR" ? "Connect" : `Connect ${getConnectorTypeDisplay(connectorType)}`}</>
 					)}
 				</Button>
 			</div>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
index 0b625f176..f880e30e8 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
@@ -153,7 +153,7 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 						</div>
 						<div className="flex-1 min-w-0">
 							<h2 className="text-xl sm:text-2xl font-semibold tracking-tight text-wrap whitespace-normal wrap-break-word">
-							{connector.connector_type === "MCP_CONNECTOR" ? "MCPs" : connector.name}
+						{connector.connector_type === "MCP_CONNECTOR" ? "MCP Server" : connector.name}
 							</h2>
 							<p className="text-xs sm:text-base text-muted-foreground mt-1">
 								Manage your connector settings and sync configuration
diff --git a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
index 8583da7bf..0ffda5ceb 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
+++ b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
@@ -1293,15 +1293,16 @@ export const useConnectorDialog = () => {
 						: `${editingConnector.name} disconnected successfully`
 				);
 
-				// Update URL - for MCP, go back to list; for others, close modal
+				// Update URL - for MCP from list view, go back to list; otherwise close modal
 				const url = new URL(window.location.href);
-				if (editingConnector.connector_type === "MCP_CONNECTOR") {
-					// Go back to MCP list view
+				if (editingConnector.connector_type === "MCP_CONNECTOR" && cameFromMCPList) {
+					// Go back to MCP list view only if we came from there
 					setViewingMCPList(true);
 					url.searchParams.set("modal", "connectors");
 					url.searchParams.set("view", "mcp-list");
 					url.searchParams.delete("connectorId");
 				} else {
+					// Close modal for all other cases
 					url.searchParams.delete("modal");
 					url.searchParams.delete("tab");
 					url.searchParams.delete("view");
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
index b7edf3643..2e179e0c7 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
@@ -327,6 +327,8 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 															? connector.last_indexed_at
 																? `Last indexed: ${formatLastIndexedDate(connector.last_indexed_at)}`
 																: "Never indexed"
+														: connector.connector_type === "MCP_CONNECTOR"
+															? ""
 															: "Active"}
 													</p>
 												)}

From 1ad81583c0a8d653d347483793f04e559d04994a Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Fri, 16 Jan 2026 15:11:01 -0800
Subject: [PATCH 13/18] fix errors

---
 .../assistant-ui/connector-popup.tsx          |  3 +--
 .../tabs/active-connectors-tab.tsx            | 21 +++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index 664e13097..b3b785c6f 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -70,7 +70,6 @@ export const ConnectorIndicator: FC = () => {
 		setEndDate,
 		setPeriodicEnabled,
 		setFrequencyMinutes,
-		setOtherMCPConnectorIds,
 		handleOpenChange,
 		handleTabChange,
 		handleScroll,
@@ -259,7 +258,7 @@ export const ConnectorIndicator: FC = () => {
 						isDisconnecting={isDisconnecting}
 						isIndexing={indexingConnectorIds.has(editingConnector.id)}
 						searchSpaceId={searchSpaceId?.toString()}
-						onOtherMCPConnectorsLoaded={setOtherMCPConnectorIds}
+
 						onStartDateChange={setStartDate}
 						onEndDateChange={setEndDate}
 						onPeriodicEnabledChange={setPeriodicEnabled}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
index 2e179e0c7..19e00cf07 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
@@ -202,17 +202,16 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 									const documentCount = getDocumentCountForConnector(
 										connectorType,
 										documentTypeCounts
-					);
-						const accountCount = typeConnectors.length;
-
-									const handleManageClick = () => {
-										if (onViewAccountsList) {
-											onViewAccountsList(connectorType, title);
-										} else if (onManage && typeConnectors[0]) {
-											onManage(typeConnectors[0]);
-										}
-									};
-
+								);
+								const accountCount = typeConnectors.length;
+								const mostRecentLastIndexed = getMostRecentLastIndexed(typeConnectors);
+								const handleManageClick = () => {
+									if (onViewAccountsList) {
+										onViewAccountsList(connectorType, title);
+									} else if (onManage && typeConnectors[0]) {
+										onManage(typeConnectors[0]);
+									}
+								};
 									return (
 										<div
 											key={`oauth-type-${connectorType}`}

From d33e9aa63a654bc782c64482ec8638d5442ccadc Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Fri, 16 Jan 2026 15:15:34 -0800
Subject: [PATCH 14/18] remove unnecessary props

---
 .../assistant-ui/connector-popup/connector-configs/index.tsx  | 1 -
 .../connector-configs/views/connector-edit-view.tsx           | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/index.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/index.tsx
index 4c1ff3ed2..b493ce746 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/index.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/index.tsx
@@ -26,7 +26,6 @@ export interface ConnectorConfigProps {
 	onConfigChange?: (config: Record<string, unknown>) => void;
 	onNameChange?: (name: string) => void;
 	searchSpaceId?: string;
-	onOtherMCPConnectorsLoaded?: (connectorIds: number[]) => void;
 }
 
 export type ConnectorConfigComponent = FC<ConnectorConfigProps>;
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
index f880e30e8..128b96955 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
@@ -20,7 +20,6 @@ interface ConnectorEditViewProps {
 	isDisconnecting: boolean;
 	isIndexing?: boolean;
 	searchSpaceId?: string;
-	onOtherMCPConnectorsLoaded?: (connectorIds: number[]) => void;
 	onStartDateChange: (date: Date | undefined) => void;
 	onEndDateChange: (date: Date | undefined) => void;
 	onPeriodicEnabledChange: (enabled: boolean) => void;
@@ -43,7 +42,6 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 	isDisconnecting,
 	isIndexing = false,
 	searchSpaceId,
-	onOtherMCPConnectorsLoaded,
 	onStartDateChange,
 	onEndDateChange,
 	onPeriodicEnabledChange,
@@ -202,7 +200,7 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 								onConfigChange={onConfigChange}
 								onNameChange={onNameChange}
 								searchSpaceId={searchSpaceId}
-								onOtherMCPConnectorsLoaded={onOtherMCPConnectorsLoaded}
+
 							/>
 						)}
 

From 69badbceabc2e338c1d0db8a7f371e04e942819d Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Fri, 16 Jan 2026 15:29:05 -0800
Subject: [PATCH 15/18] remove redundant code and make modular

---
 .../components/mcp-connect-form.tsx           | 86 ++++--------------
 .../components/mcp-config.tsx                 | 91 +++++++------------
 .../views/mcp-connector-list-view.tsx         | 25 ++++-
 3 files changed, 75 insertions(+), 127 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
index 62d017509..92de0c059 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
@@ -8,9 +8,14 @@ import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Textarea } from "@/components/ui/textarea";
 import { EnumConnectorName } from "@/contracts/enums/connector";
-import type { MCPServerConfig, MCPToolDefinition } from "@/contracts/types/mcp.types";
-import { connectorsApiService } from "@/lib/apis/connectors-api.service";
+import type { MCPToolDefinition } from "@/contracts/types/mcp.types";
 import type { ConnectFormProps } from "..";
+import {
+	extractServerName,
+	parseMCPConfig,
+	testMCPConnection,
+	type MCPConnectionTestResult,
+} from "../../utils/mcp-config-validator";
 
 export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting }) => {
 	const isSubmittingRef = useRef(false);
@@ -18,11 +23,7 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 	const [jsonError, setJsonError] = useState<string | null>(null);
 	const [isTesting, setIsTesting] = useState(false);
 	const [showDetails, setShowDetails] = useState(false);
-	const [testResult, setTestResult] = useState<{
-		status: "success" | "error";
-		message: string;
-		tools: MCPToolDefinition[];
-	} | null>(null);
+	const [testResult, setTestResult] = useState<MCPConnectionTestResult | null>(null);
 
 	const DEFAULT_CONFIG = JSON.stringify(
 		{
@@ -38,35 +39,14 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 		2
 	);
 
-	const parseConfig = (): MCPServerConfig | null => {
-		try {
-			const parsed = JSON.parse(configJson);
-
-			// Validate that it's an object, not an array
-			if (Array.isArray(parsed)) {
-				setJsonError("Please provide a single server configuration object, not an array");
-				return null;
-			}
-
-			// Validate required fields
-			if (!parsed.command || typeof parsed.command !== "string") {
-				setJsonError("'command' field is required and must be a string");
-				return null;
-			}
-
-			const config: MCPServerConfig = {
-				command: parsed.command,
-				args: parsed.args || [],
-				env: parsed.env || {},
-				transport: parsed.transport || "stdio",
-			};
-
+	const parseConfig = () => {
+		const result = parseMCPConfig(configJson);
+		if (result.error) {
+			setJsonError(result.error);
+		} else {
 			setJsonError(null);
-			return config;
-		} catch (error) {
-			setJsonError(error instanceof Error ? error.message : "Invalid JSON");
-			return null;
 		}
+		return result.config;
 	};
 
 	const handleConfigChange = (value: string) => {
@@ -90,31 +70,9 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 		setIsTesting(true);
 		setTestResult(null);
 
-		try {
-			const result = await connectorsApiService.testMCPConnection(serverConfig);
-			
-			if (result.status === "success") {
-				setTestResult({
-					status: "success",
-					message: `Successfully connected. Found ${result.tools.length} tool${result.tools.length !== 1 ? 's' : ''}.`,
-					tools: result.tools,
-				});
-			} else {
-				setTestResult({
-					status: "error",
-					message: result.message || "Failed to connect",
-					tools: [],
-				});
-			}
-		} catch (error) {
-			setTestResult({
-				status: "error",
-				message: error instanceof Error ? error.message : "Failed to connect",
-				tools: [],
-			});
-		} finally {
-			setIsTesting(false);
-		}
+		const result = await testMCPConnection(serverConfig);
+		setTestResult(result);
+		setIsTesting(false);
 	};
 
 	const handleSubmit = async (e: React.FormEvent) => {
@@ -131,15 +89,7 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 		}
 
 		// Extract server name from config if provided
-		let serverName = "MCP Server";
-		try {
-			const parsed = JSON.parse(configJson);
-			if (parsed.name && typeof parsed.name === "string") {
-				serverName = parsed.name;
-			}
-		} catch {
-			// Use default name
-		}
+		const serverName = extractServerName(configJson);
 
 		isSubmittingRef.current = true;
 		try {
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
index 4d141d4ea..f6788105e 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
@@ -8,25 +8,43 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Textarea } from "@/components/ui/textarea";
+import { EnumConnectorName } from "@/contracts/enums/connector";
 import type { MCPServerConfig, MCPToolDefinition } from "@/contracts/types/mcp.types";
-import { connectorsApiService } from "@/lib/apis/connectors-api.service";
 import type { ConnectorConfigProps } from "../index";
+import {
+	parseMCPConfig,
+	testMCPConnection,
+	type MCPConnectionTestResult,
+} from "../../utils/mcp-config-validator";
 
 interface MCPConfigProps extends ConnectorConfigProps {
 	onNameChange?: (name: string) => void;
 }
 
 export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNameChange }) => {
+	// Validate that this is an MCP connector
+	if (connector.connector_type !== EnumConnectorName.MCP_CONNECTOR) {
+		console.error(
+			"MCPConfig received non-MCP connector:",
+			connector.connector_type
+		);
+		return (
+			<Alert className="border-red-500/50 bg-red-500/10">
+				<XCircle className="h-4 w-4 text-red-600" />
+				<AlertTitle>Invalid Connector Type</AlertTitle>
+				<AlertDescription>
+					This component can only be used with MCP connectors.
+				</AlertDescription>
+			</Alert>
+		);
+	}
+
 	const [name, setName] = useState<string>("");
 	const [configJson, setConfigJson] = useState("");
 	const [jsonError, setJsonError] = useState<string | null>(null);
 	const [isTesting, setIsTesting] = useState(false);
 	const [showDetails, setShowDetails] = useState(false);
-	const [testResult, setTestResult] = useState<{
-		status: "success" | "error";
-		message: string;
-		tools: MCPToolDefinition[];
-	} | null>(null);
+	const [testResult, setTestResult] = useState<MCPConnectionTestResult | null>(null);
 
 	// Initialize form from connector config (only on mount)
 	useEffect(() => {
@@ -55,35 +73,14 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 		}
 	};
 
-	const parseConfig = (): MCPServerConfig | null => {
-		try {
-			const parsed = JSON.parse(configJson);
-
-			// Validate that it's an object, not an array
-			if (Array.isArray(parsed)) {
-				setJsonError("Please provide a single server configuration object, not an array");
-				return null;
-			}
-
-			// Validate required fields
-			if (!parsed.command || typeof parsed.command !== "string") {
-				setJsonError("'command' field is required and must be a string");
-				return null;
-			}
-
-			const config: MCPServerConfig = {
-				command: parsed.command,
-				args: parsed.args || [],
-				env: parsed.env || {},
-				transport: parsed.transport || "stdio",
-			};
-
+	const parseConfig = () => {
+		const result = parseMCPConfig(configJson);
+		if (result.error) {
+			setJsonError(result.error);
+		} else {
 			setJsonError(null);
-			return config;
-		} catch (error) {
-			setJsonError(error instanceof Error ? error.message : "Invalid JSON");
-			return null;
 		}
+		return result.config;
 	};
 
 	const handleConfigChange = (value: string) => {
@@ -130,31 +127,9 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 		setIsTesting(true);
 		setTestResult(null);
 
-		try {
-			const result = await connectorsApiService.testMCPConnection(serverConfig);
-			
-			if (result.status === "success") {
-				setTestResult({
-					status: "success",
-					message: `Connected successfully! Found ${result.tools.length} tool(s).`,
-					tools: result.tools,
-				});
-			} else {
-				setTestResult({
-					status: "error",
-					message: result.message || "Failed to connect",
-					tools: [],
-				});
-			}
-		} catch (error) {
-			setTestResult({
-				status: "error",
-				message: error instanceof Error ? error.message : "Failed to connect",
-				tools: [],
-			});
-		} finally {
-			setIsTesting(false);
-		}
+		const result = await testMCPConnection(serverConfig);
+		setTestResult(result);
+		setIsTesting(false);
 	};
 
 	return (
diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/mcp-connector-list-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/mcp-connector-list-view.tsx
index 2da6352a9..c826e9fc4 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/views/mcp-connector-list-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/views/mcp-connector-list-view.tsx
@@ -1,8 +1,10 @@
 "use client";
 
-import { Plus, Server } from "lucide-react";
+import { Plus, Server, XCircle } from "lucide-react";
 import type { FC } from "react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
+import { EnumConnectorName } from "@/contracts/enums/connector";
 import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
 import type { SearchSourceConnector } from "@/contracts/types/connector.types";
 import { cn } from "@/lib/utils";
@@ -20,6 +22,27 @@ export const MCPConnectorListView: FC<MCPConnectorListViewProps> = ({
 	onManageConnector,
 	onBack,
 }) => {
+	// Validate that all connectors are MCP connectors
+	const invalidConnectors = mcpConnectors.filter(
+		(c) => c.connector_type !== EnumConnectorName.MCP_CONNECTOR
+	);
+
+	if (invalidConnectors.length > 0) {
+		console.error(
+			"MCPConnectorListView received non-MCP connectors:",
+			invalidConnectors.map((c) => c.connector_type)
+		);
+		return (
+			<Alert className="border-red-500/50 bg-red-500/10">
+				<XCircle className="h-4 w-4 text-red-600" />
+				<AlertTitle>Invalid Connector Type</AlertTitle>
+				<AlertDescription>
+					This view can only display MCP connectors. Found {invalidConnectors.length} invalid
+					connector(s).
+				</AlertDescription>
+			</Alert>
+		);
+	}
 	return (
 		<div className="flex flex-col h-full">
 			{/* Header */}

From 18ce599c81372f3b3462f2e0456f724a6b6cab92 Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Fri, 16 Jan 2026 16:13:20 -0800
Subject: [PATCH 16/18] fix electric fallback

---
 .../components/assistant-ui/connector-popup.tsx | 12 ++++++------
 .../hooks/use-connector-dialog.ts               |  3 +++
 .../tabs/active-connectors-tab.tsx              |  5 +++--
 .../connector-popup/tabs/all-connectors-tab.tsx |  3 ++-
 surfsense_web/hooks/use-connectors-electric.ts  | 17 +++++++++++------
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index afb762fe5..90113707e 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -99,15 +99,15 @@ export const ConnectorIndicator: FC = () => {
 		refreshConnectors: refreshConnectorsElectric,
 	} = useConnectorsElectric(searchSpaceId);
 
-	// Fallback to API if Electric fails or is not available
-	const connectors =
-		connectorsFromElectric.length > 0 || !connectorsError
-			? connectorsFromElectric
-			: allConnectors || [];
+	// Fallback to API if Electric is not available or fails
+	// Use Electric data if: 1) we have data, or 2) still loading without error
+	// Use API data if: Electric failed (has error) or finished loading with no data
+	const useElectricData = connectorsFromElectric.length > 0 || (connectorsLoading && !connectorsError);
+	const connectors = useElectricData ? connectorsFromElectric : allConnectors || [];
 
 	// Manual refresh function that works with both Electric and API
 	const refreshConnectors = async () => {
-		if (connectorsFromElectric.length > 0 || !connectorsError) {
+		if (useElectricData) {
 			await refreshConnectorsElectric();
 		} else {
 			// Fallback: use allConnectors from useConnectorDialog (which uses connectorsAtom)
diff --git a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
index fd6c63658..1344abfce 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
+++ b/surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts
@@ -715,6 +715,9 @@ export const useConnectorDialog = () => {
 										: `${connectorTitle} connected successfully!`;
 									toast.success(successMessage);
 
+									// Refresh connectors list before closing modal
+									await refetchAllConnectors();
+
 									// Close modal and return to main view
 									const url = new URL(window.location.href);
 									url.searchParams.delete("modal");
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
index 965add11c..1e25d24a0 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
@@ -240,6 +240,7 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 										connector.connector_type,
 										documentTypeCounts
 									);
+									const isMCPConnector = connector.connector_type === "MCP_CONNECTOR";
 									return (
 										<div
 											key={`connector-${connector.id}`}
@@ -271,11 +272,11 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 														<Loader2 className="size-3 animate-spin" />
 														Syncing
 													</p>
-												) : (
+												) : !isMCPConnector ? (
 													<p className="text-[10px] text-muted-foreground mt-1">
 														{formatDocumentCount(documentCount)}
 													</p>
-												)}
+												) : null}
 											</div>
 											<Button
 												variant="secondary"
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx
index a9a4791fd..d358037c2 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx
@@ -122,7 +122,7 @@ export const AllConnectorsTab: FC<AllConnectorsTabProps> = ({
 									isConnecting={isConnecting}
 									documentCount={documentCount}
 									accountCount={accountCount}
-									lastIndexedAt={mostRecentLastIndexed}
+
 									isIndexing={isIndexing}
 									onConnect={() => onConnectOAuth(connector)}
 									onManage={
@@ -176,6 +176,7 @@ export const AllConnectorsTab: FC<AllConnectorsTabProps> = ({
 									isConnected={isConnected}
 									isConnecting={isConnecting}
 									documentCount={documentCount}
+
 									isIndexing={isIndexing}
 									onConnect={handleConnect}
 									onManage={
diff --git a/surfsense_web/hooks/use-connectors-electric.ts b/surfsense_web/hooks/use-connectors-electric.ts
index ccda052b1..94d5062c9 100644
--- a/surfsense_web/hooks/use-connectors-electric.ts
+++ b/surfsense_web/hooks/use-connectors-electric.ts
@@ -46,12 +46,17 @@ export function useConnectorsElectric(searchSpaceId: number | string | null) {
 
 	// Start syncing when Electric client is available
 	useEffect(() => {
-		// Wait for both searchSpaceId and Electric client to be available
-		if (!searchSpaceId || !electricClient) {
-			setLoading(!electricClient); // Still loading if waiting for Electric
-			if (!searchSpaceId) {
-				setConnectors([]);
-			}
+		// If no Electric client available, immediately mark as not loading (disabled)
+		if (!electricClient) {
+			setLoading(false);
+			setError(new Error("Electric SQL not configured"));
+			return;
+		}
+
+		// Wait for searchSpaceId to be available
+		if (!searchSpaceId) {
+			setConnectors([]);
+			setLoading(false);
 			return;
 		}
 

From f78c2a685e28e60db484fc3879c81c0af73e7047 Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Sat, 17 Jan 2026 09:18:46 -0800
Subject: [PATCH 17/18] add error handling to mcp_tool python files

---
 .../app/agents/new_chat/tools/mcp_client.py   | 104 +++++++++++++-----
 .../app/agents/new_chat/tools/mcp_tool.py     |  45 ++++++--
 2 files changed, 110 insertions(+), 39 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/tools/mcp_client.py b/surfsense_backend/app/agents/new_chat/tools/mcp_client.py
index 437f93043..d4dbe2a0c 100644
--- a/surfsense_backend/app/agents/new_chat/tools/mcp_client.py
+++ b/surfsense_backend/app/agents/new_chat/tools/mcp_client.py
@@ -4,6 +4,7 @@ This module provides a client for communicating with MCP servers via stdio trans
 It handles server lifecycle management, tool discovery, and tool execution.
 """
 
+import asyncio
 import logging
 import os
 from contextlib import asynccontextmanager
@@ -14,6 +15,11 @@ from mcp.client.stdio import StdioServerParameters, stdio_client
 
 logger = logging.getLogger(__name__)
 
+# Retry configuration
+MAX_RETRIES = 3
+RETRY_DELAY = 1.0  # seconds
+RETRY_BACKOFF = 2.0  # exponential backoff multiplier
+
 
 class MCPClient:
     """Client for communicating with an MCP server."""
@@ -35,44 +41,86 @@ class MCPClient:
         self.session: ClientSession | None = None
 
     @asynccontextmanager
-    async def connect(self):
+    async def connect(self, max_retries: int = MAX_RETRIES):
         """Connect to the MCP server and manage its lifecycle.
 
+        Args:
+            max_retries: Maximum number of connection retry attempts
+
         Yields:
             ClientSession: Active MCP session for making requests
 
+        Raises:
+            RuntimeError: If all connection attempts fail
+
         """
-        try:
-            # Merge env vars with current environment
-            server_env = os.environ.copy()
-            server_env.update(self.env)
+        last_error = None
+        delay = RETRY_DELAY
 
-            # Create server parameters with env
-            server_params = StdioServerParameters(
-                command=self.command, args=self.args, env=server_env
-            )
+        for attempt in range(max_retries):
+            try:
+                # Merge env vars with current environment
+                server_env = os.environ.copy()
+                server_env.update(self.env)
 
-            # Spawn server process and create session
-            # Note: Cannot combine these context managers because ClientSession
-            # needs the read/write streams from stdio_client
-            async with stdio_client(server=server_params) as (read, write):  # noqa: SIM117
-                async with ClientSession(read, write) as session:
-                    # Initialize the connection
-                    await session.initialize()
-                    self.session = session
-                    logger.info(
-                        "Connected to MCP server: %s %s",
-                        self.command,
-                        " ".join(self.args),
+                # Create server parameters with env
+                server_params = StdioServerParameters(
+                    command=self.command, args=self.args, env=server_env
+                )
+
+                # Spawn server process and create session
+                # Note: Cannot combine these context managers because ClientSession
+                # needs the read/write streams from stdio_client
+                async with stdio_client(server=server_params) as (read, write):  # noqa: SIM117
+                    async with ClientSession(read, write) as session:
+                        # Initialize the connection
+                        await session.initialize()
+                        self.session = session
+                        
+                        if attempt > 0:
+                            logger.info(
+                                "Connected to MCP server on attempt %d: %s %s",
+                                attempt + 1,
+                                self.command,
+                                " ".join(self.args),
+                            )
+                        else:
+                            logger.info(
+                                "Connected to MCP server: %s %s",
+                                self.command,
+                                " ".join(self.args),
+                            )
+                        yield session
+                        return  # Success, exit retry loop
+
+            except Exception as e:
+                last_error = e
+                if attempt < max_retries - 1:
+                    logger.warning(
+                        "MCP server connection failed (attempt %d/%d): %s. Retrying in %.1fs...",
+                        attempt + 1,
+                        max_retries,
+                        e,
+                        delay,
                     )
-                    yield session
+                    await asyncio.sleep(delay)
+                    delay *= RETRY_BACKOFF  # Exponential backoff
+                else:
+                    logger.error(
+                        "Failed to connect to MCP server after %d attempts: %s",
+                        max_retries,
+                        e,
+                        exc_info=True,
+                    )
+            finally:
+                self.session = None
 
-        except Exception as e:
-            logger.error("Failed to connect to MCP server: %s", e, exc_info=True)
-            raise
-        finally:
-            self.session = None
-            logger.info("Disconnected from MCP server: %s", self.command)
+        # All retries exhausted
+        error_msg = f"Failed to connect to MCP server '{self.command}' after {max_retries} attempts"
+        if last_error:
+            error_msg += f": {last_error}"
+        logger.error(error_msg)
+        raise RuntimeError(error_msg) from last_error
 
     async def list_tools(self) -> list[dict[str, Any]]:
         """List all tools available from the MCP server.
diff --git a/surfsense_backend/app/agents/new_chat/tools/mcp_tool.py b/surfsense_backend/app/agents/new_chat/tools/mcp_tool.py
index 50339fb93..d7c9210af 100644
--- a/surfsense_backend/app/agents/new_chat/tools/mcp_tool.py
+++ b/surfsense_backend/app/agents/new_chat/tools/mcp_tool.py
@@ -90,16 +90,22 @@ async def _create_mcp_tool_from_definition(
     input_model = _create_dynamic_input_model_from_schema(tool_name, input_schema)
 
     async def mcp_tool_call(**kwargs) -> str:
-        """Execute the MCP tool call via the client."""
+        """Execute the MCP tool call via the client with retry support."""
         logger.info(f"MCP tool '{tool_name}' called with params: {kwargs}")
 
         try:
-            # Connect to server and call tool
+            # Connect to server and call tool (connect has built-in retry logic)
             async with mcp_client.connect():
                 result = await mcp_client.call_tool(tool_name, kwargs)
                 return str(result)
+        except RuntimeError as e:
+            # Connection failures after all retries
+            error_msg = f"MCP tool '{tool_name}' connection failed after retries: {e!s}"
+            logger.error(error_msg)
+            return f"Error: {error_msg}"
         except Exception as e:
-            error_msg = f"MCP tool '{tool_name}' failed: {e!s}"
+            # Tool execution or other errors
+            error_msg = f"MCP tool '{tool_name}' execution failed: {e!s}"
             logger.exception(error_msg)
             return f"Error: {error_msg}"
 
@@ -146,21 +152,38 @@ async def load_mcp_tools(
         tools: list[StructuredTool] = []
         for connector in result.scalars():
             try:
-                # Extract single server config
+                # Early validation: Extract and validate connector config
                 config = connector.config or {}
                 server_config = config.get("server_config", {})
                 
-                if not server_config:
-                    logger.warning(f"MCP connector {connector.id} missing server_config, skipping")
+                # Validate server_config exists and is a dict
+                if not server_config or not isinstance(server_config, dict):
+                    logger.warning(
+                        f"MCP connector {connector.id} (name: '{connector.name}') has invalid or missing server_config, skipping"
+                    )
                     continue
 
+                # Validate required command field
                 command = server_config.get("command")
-                args = server_config.get("args", [])
-                env = server_config.get("env", {})
-
-                if not command:
+                if not command or not isinstance(command, str):
                     logger.warning(
-                        f"MCP connector {connector.id} missing command, skipping"
+                        f"MCP connector {connector.id} (name: '{connector.name}') missing or invalid command field, skipping"
+                    )
+                    continue
+
+                # Validate args field (must be list if present)
+                args = server_config.get("args", [])
+                if not isinstance(args, list):
+                    logger.warning(
+                        f"MCP connector {connector.id} (name: '{connector.name}') has invalid args field (must be list), skipping"
+                    )
+                    continue
+
+                # Validate env field (must be dict if present)
+                env = server_config.get("env", {})
+                if not isinstance(env, dict):
+                    logger.warning(
+                        f"MCP connector {connector.id} (name: '{connector.name}') has invalid env field (must be dict), skipping"
                     )
                     continue
 

From f9a83718523c5a0202c95c410ced59eaa5d44259 Mon Sep 17 00:00:00 2001
From: Manoj Aggarwal <manoj6543@gmail.com>
Date: Sat, 17 Jan 2026 09:29:34 -0800
Subject: [PATCH 18/18] add some caching and json validation using zod

---
 .../components/mcp-connect-form.tsx           |  10 ++
 .../components/mcp-config.tsx                 |  23 +--
 .../utils/mcp-config-validator.ts             | 163 ++++++++++++++++--
 3 files changed, 169 insertions(+), 27 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
index 92de0c059..a671c91e8 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
@@ -51,9 +51,19 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 
 	const handleConfigChange = (value: string) => {
 		setConfigJson(value);
+		
+		// Clear previous error
 		if (jsonError) {
 			setJsonError(null);
 		}
+		
+		// Validate immediately to show errors as user types (with debouncing via parseMCPConfig cache)
+		if (value.trim()) {
+			const result = parseMCPConfig(value);
+			if (result.error) {
+				setJsonError(result.error);
+			}
+		}
 	};
 
 	const handleTestConnection = async () => {
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
index f6788105e..a0868e2f5 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
@@ -89,23 +89,14 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 			setJsonError(null);
 		}
 		
-		// Try to parse and update parent if valid
-		try {
-			const parsed = JSON.parse(value);
-			if (!Array.isArray(parsed) && parsed.command) {
-				const config: MCPServerConfig = {
-					command: parsed.command,
-					args: parsed.args || [],
-					env: parsed.env || {},
-					transport: parsed.transport || "stdio",
-				};
-				if (onConfigChange) {
-					onConfigChange({ server_config: config });
-				}
-			}
-		} catch {
-			// Ignore parse errors while typing
+		// Use shared utility for validation and parsing (with caching)
+		const result = parseMCPConfig(value);
+		
+		if (result.config && onConfigChange) {
+			// Valid config - update parent immediately
+			onConfigChange({ server_config: result.config });
 		}
+		// Ignore errors while typing - only show errors when user tests or saves
 	};
 
 	const handleTestConnection = async () => {
diff --git a/surfsense_web/components/assistant-ui/connector-popup/utils/mcp-config-validator.ts b/surfsense_web/components/assistant-ui/connector-popup/utils/mcp-config-validator.ts
index 5c636bdbe..dea547be7 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/utils/mcp-config-validator.ts
+++ b/surfsense_web/components/assistant-ui/connector-popup/utils/mcp-config-validator.ts
@@ -1,6 +1,54 @@
+/**
+ * MCP Configuration Validator Utility
+ * 
+ * Shared validation and parsing logic for MCP (Model Context Protocol) server configurations.
+ * 
+ * Features:
+ * - Zod schema validation for runtime type safety
+ * - Configuration caching to avoid repeated parsing (5-minute TTL)
+ * - Standardized error messages
+ * - Connection testing utilities
+ * 
+ * Usage:
+ * ```typescript
+ * // Parse and validate config
+ * const result = parseMCPConfig(jsonString);
+ * if (result.config) {
+ *   // Valid config
+ * } else {
+ *   // Show result.error to user
+ * }
+ * 
+ * // Test connection
+ * const testResult = await testMCPConnection(config);
+ * if (testResult.status === "success") {
+ *   console.log(`Found ${testResult.tools.length} tools`);
+ * }
+ * ```
+ * 
+ * @module mcp-config-validator
+ */
+
+import { z } from "zod";
 import type { MCPServerConfig, MCPToolDefinition } from "@/contracts/types/mcp.types";
 import { connectorsApiService } from "@/lib/apis/connectors-api.service";
 
+/**
+ * Zod schema for MCP server configuration
+ * Provides compile-time and runtime type safety
+ * 
+ * Exported for advanced use cases (e.g., form builders)
+ */
+export const MCPServerConfigSchema = z.object({
+	name: z.string().optional(),
+	command: z
+		.string({ required_error: "Command field is required" })
+		.min(1, "Command cannot be empty"),
+	args: z.array(z.string()).optional().default([]),
+	env: z.record(z.string(), z.string()).optional().default({}),
+	transport: z.enum(["stdio", "sse"]).optional().default("stdio"),
+});
+
 /**
  * Shared MCP configuration validation result
  */
@@ -18,46 +66,112 @@ export interface MCPConnectionTestResult {
 	tools: MCPToolDefinition[];
 }
 
+/**
+ * Cache for parsed configurations to avoid re-parsing
+ * Key: JSON string, Value: { config, timestamp }
+ */
+const configCache = new Map<string, { config: MCPServerConfig; timestamp: number }>();
+const CACHE_TTL = 5 * 60 * 1000; // 5 minutes
+
+/**
+ * Clear expired entries from config cache
+ */
+const clearExpiredCache = () => {
+	const now = Date.now();
+	for (const [key, value] of configCache.entries()) {
+		if (now - value.timestamp > CACHE_TTL) {
+			configCache.delete(key);
+		}
+	}
+};
+
 /**
  * Parse and validate MCP server configuration from JSON string
+ * Uses Zod for schema validation and caching to avoid re-parsing
  * @param configJson - JSON string containing MCP server configuration
  * @returns Validation result with parsed config or error message
  */
 export const parseMCPConfig = (configJson: string): MCPConfigValidationResult => {
+	// Check cache first
+	const cached = configCache.get(configJson);
+	if (cached && Date.now() - cached.timestamp < CACHE_TTL) {
+		console.log('[MCP Validator] ✅ Using cached config');
+		return { config: cached.config, error: null };
+	}
+
+	console.log('[MCP Validator] 🔍 Parsing new config...');
+
+	// Clean up expired cache entries periodically
+	if (configCache.size > 100) {
+		clearExpiredCache();
+	}
+
 	try {
 		const parsed = JSON.parse(configJson);
 
 		// Validate that it's an object, not an array
 		if (Array.isArray(parsed)) {
+			console.error('[MCP Validator] ❌ Error: Config is an array, expected object');
 			return {
 				config: null,
 				error: "Please provide a single server configuration object, not an array",
 			};
 		}
 
-		// Validate required fields
-		if (!parsed.command || typeof parsed.command !== "string") {
+		// Use Zod schema validation for robust type checking
+		const result = MCPServerConfigSchema.safeParse(parsed);
+
+		if (!result.success) {
+			// Format Zod validation errors for user-friendly display
+			const firstError = result.error.issues[0];
+			const fieldPath = firstError.path.join(".");
+			
+			// Clean up error message - remove technical Zod jargon
+			let errorMsg = firstError.message;
+			
+			// Replace technical error messages with user-friendly ones
+			if (errorMsg.includes("expected string, received undefined")) {
+				errorMsg = "This field is required";
+			} else if (errorMsg.includes("Invalid input")) {
+				errorMsg = "Invalid value";
+			}
+			
+			const formattedError = fieldPath ? `${fieldPath}: ${errorMsg}` : errorMsg;
+			
+			console.error('[MCP Validator] ❌ Validation error:', formattedError);
+			console.error('[MCP Validator] Full Zod errors:', result.error.issues);
+			
 			return {
 				config: null,
-				error: "'command' field is required and must be a string",
+				error: formattedError,
 			};
 		}
 
 		const config: MCPServerConfig = {
-			command: parsed.command,
-			args: parsed.args || [],
-			env: parsed.env || {},
-			transport: parsed.transport || "stdio",
+			command: result.data.command,
+			args: result.data.args,
+			env: result.data.env,
+			transport: result.data.transport,
 		};
 
+		// Cache the successfully parsed config
+		configCache.set(configJson, {
+			config,
+			timestamp: Date.now(),
+		});
+		
+		console.log('[MCP Validator] ✅ Config parsed successfully:', config);
+
 		return {
 			config,
 			error: null,
 		};
 	} catch (error) {
+		const errorMsg = error instanceof Error ? error.message : "Invalid JSON";
+		console.error('[MCP Validator] ❌ JSON parse error:', errorMsg);
 		return {
 			config: null,
-			error: error instanceof Error ? error.message : "Invalid JSON",
+			error: errorMsg,
 		};
 	}
 };
@@ -96,18 +210,45 @@ export const testMCPConnection = async (
 };
 
 /**
- * Extract server name from MCP config JSON
+ * Extract server name from MCP config JSON with caching
  * @param configJson - JSON string containing MCP server configuration
  * @returns Server name if found, otherwise default name
  */
 export const extractServerName = (configJson: string): string => {
 	try {
 		const parsed = JSON.parse(configJson);
-		if (parsed.name && typeof parsed.name === "string") {
-			return parsed.name;
+		
+		// Use Zod to validate and extract name field safely
+		const nameSchema = z.object({ name: z.string().optional() });
+		const result = nameSchema.safeParse(parsed);
+		
+		if (result.success && result.data.name) {
+			return result.data.name;
 		}
 	} catch {
 		// Return default if parsing fails
 	}
 	return "MCP Server";
 };
+
+/**
+ * Clear the configuration cache
+ * Useful for testing or when memory management is needed
+ */
+export const clearConfigCache = () => {
+	configCache.clear();
+};
+
+/**
+ * Get cache statistics for monitoring/debugging
+ */
+export const getConfigCacheStats = () => {
+	return {
+		size: configCache.size,
+		entries: Array.from(configCache.entries()).map(([key, value]) => ({
+			configPreview: key.substring(0, 50) + (key.length > 50 ? "..." : ""),
+			timestamp: new Date(value.timestamp).toISOString(),
+			age: Date.now() - value.timestamp,
+		})),
+	};
+};