@assistant-ui/react-mcp 0.1.17 → 0.1.19

package/dist/resources/McpManagerResource.js

@@ -1,6 +1,7 @@
 import { assertUniqueServerIds } from "../utils/serverId.js";
 import { createMcpId } from "../utils/createMcpId.js";
 import { clearOAuthProviderAuthState } from "../auth/createOAuthProvider.js";
+import { withMcpServerRemovalFence } from "./McpServerRemovalFence.js";
 import { McpServerResource } from "./McpServerResource.js";
 import { McpLocalStorage } from "./storage/McpLocalStorage.js";
 import { attachTransformScopes, useAssistantClientRef, useClientLookup } from "@assistant-ui/store";
@@ -18,6 +19,9 @@ const NO_CONNECTORS = [];
 const reportCustomStorageFailure = (operation, error) => {
 	console.error(`[assistant-ui/react-mcp] failed to ${operation} custom servers:`, error);
 };
+const reportBlockedCustomServerPersistence = () => {
+	console.error("[assistant-ui/react-mcp] custom server changes remain in memory because loading the persisted list failed; remount the manager to retry");
+};
 const persistCustomServers = async (storage, records) => {
 	try {
 		await storage.saveCustomServers(records);
@@ -25,8 +29,173 @@ const persistCustomServers = async (storage, records) => {
 		reportCustomStorageFailure("save", error);
 	}
 };
+const enqueueCustomServerTask = (persistenceQueues, scopeKey, task) => {
+	const next = (persistenceQueues.get(scopeKey) ?? Promise.resolve()).then(task);
+	persistenceQueues.set(scopeKey, next);
+	next.then(() => {
+		if (persistenceQueues.get(scopeKey) === next) persistenceQueues.delete(scopeKey);
+	});
+};
+const enqueueCustomServerPersistence = (persistenceQueues, scopeKey, storage, records) => enqueueCustomServerTask(persistenceQueues, scopeKey, () => persistCustomServers(storage, records));
+const holdCustomServerPersistence = (persistenceQueues, scopeKey) => {
+	let release = () => {};
+	const gate = new Promise((resolve) => {
+		release = resolve;
+	});
+	enqueueCustomServerTask(persistenceQueues, scopeKey, () => gate);
+	return release;
+};
+const deduplicateCustomServers = (records) => {
+	const seen = /* @__PURE__ */ new Set();
+	return records.filter((record) => {
+		if (seen.has(record.id)) {
+			console.error(`[assistant-ui/react-mcp] ignored duplicate custom server id "${record.id}" loaded from storage`);
+			return false;
+		}
+		seen.add(record.id);
+		return true;
+	});
+};
+const useMcpCustomServersResource = (t0) => {
+	const $ = c(22);
+	const { storage, scopeKey, persistenceQueues } = t0;
+	let t1;
+	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+		t1 = [];
+		$[0] = t1;
+	} else t1 = $[0];
+	const [customServers, setCustomServers] = useState(t1);
+	const [isHydrated, setIsHydrated] = useState(false);
+	let t2;
+	if ($[1] === Symbol.for("react.memo_cache_sentinel")) {
+		t2 = [];
+		$[1] = t2;
+	} else t2 = $[1];
+	const customServersRef = useRef(t2);
+	const hydrationStateRef = useRef("pending");
+	const hasPendingMutationRef = useRef(false);
+	const [removedBeforeHydration] = useState(_temp);
+	const reportedBlockedPersistenceRef = useRef(false);
+	let t3;
+	if ($[2] !== persistenceQueues || $[3] !== removedBeforeHydration || $[4] !== scopeKey || $[5] !== storage) {
+		t3 = async (signal) => {
+			while (true) {
+				const pendingPersistence = persistenceQueues.get(scopeKey);
+				if (!pendingPersistence) break;
+				await pendingPersistence;
+				if (signal.cancelled) return;
+				if (persistenceQueues.get(scopeKey) === pendingPersistence) break;
+			}
+			let records;
+			try {
+				const loadedRecords = await storage.loadCustomServers();
+				records = deduplicateCustomServers(loadedRecords);
+			} catch (t4) {
+				const error = t4;
+				if (!signal.cancelled) {
+					reportCustomStorageFailure("load", error);
+					hydrationStateRef.current = "failed";
+					if (hasPendingMutationRef.current) {
+						reportBlockedCustomServerPersistence();
+						reportedBlockedPersistenceRef.current = true;
+					}
+					setIsHydrated(true);
+				}
+				return;
+			}
+			const hadPendingMutation = hasPendingMutationRef.current;
+			const hydratedRecords = records.filter((record) => !removedBeforeHydration.has(record.id));
+			const mergedRecords = (() => {
+				const prev = customServersRef.current;
+				if (prev.length === 0) return hydratedRecords;
+				const persistedIds = new Set(hydratedRecords.map(_temp2));
+				return [...hydratedRecords, ...prev.filter((r_0) => !persistedIds.has(r_0.id))];
+			})();
+			customServersRef.current = mergedRecords;
+			hydrationStateRef.current = "succeeded";
+			hasPendingMutationRef.current = false;
+			if (hadPendingMutation) enqueueCustomServerPersistence(persistenceQueues, scopeKey, storage, mergedRecords);
+			if (signal.cancelled) return;
+			setCustomServers(mergedRecords);
+			setIsHydrated(true);
+		};
+		$[2] = persistenceQueues;
+		$[3] = removedBeforeHydration;
+		$[4] = scopeKey;
+		$[5] = storage;
+		$[6] = t3;
+	} else t3 = $[6];
+	const hydrate = useEffectEvent(t3);
+	let t4;
+	if ($[7] !== hydrate) {
+		t4 = () => {
+			const signal_0 = { cancelled: false };
+			hydrate(signal_0);
+			return () => {
+				signal_0.cancelled = true;
+			};
+		};
+		$[7] = hydrate;
+		$[8] = t4;
+	} else t4 = $[8];
+	let t5;
+	if ($[9] === Symbol.for("react.memo_cache_sentinel")) {
+		t5 = [];
+		$[9] = t5;
+	} else t5 = $[9];
+	useEffect(t4, t5);
+	let t6;
+	if ($[10] !== persistenceQueues || $[11] !== scopeKey || $[12] !== storage) {
+		t6 = (updater) => {
+			const next = updater(customServersRef.current);
+			customServersRef.current = next;
+			setCustomServers(next);
+			if (hydrationStateRef.current === "succeeded") {
+				enqueueCustomServerPersistence(persistenceQueues, scopeKey, storage, next);
+				return;
+			}
+			hasPendingMutationRef.current = true;
+			if (hydrationStateRef.current === "failed" && !reportedBlockedPersistenceRef.current) {
+				reportBlockedCustomServerPersistence();
+				reportedBlockedPersistenceRef.current = true;
+			}
+		};
+		$[10] = persistenceQueues;
+		$[11] = scopeKey;
+		$[12] = storage;
+		$[13] = t6;
+	} else t6 = $[13];
+	const updateCustomServers = t6;
+	let t7;
+	if ($[14] !== removedBeforeHydration || $[15] !== updateCustomServers) {
+		t7 = (id) => {
+			if (hydrationStateRef.current === "pending") removedBeforeHydration.add(id);
+			updateCustomServers((prev_0) => prev_0.filter((record_0) => record_0.id !== id));
+		};
+		$[14] = removedBeforeHydration;
+		$[15] = updateCustomServers;
+		$[16] = t7;
+	} else t7 = $[16];
+	const removeCustomServer = t7;
+	let t8;
+	if ($[17] !== customServers || $[18] !== isHydrated || $[19] !== removeCustomServer || $[20] !== updateCustomServers) {
+		t8 = {
+			customServers,
+			isHydrated,
+			updateCustomServers,
+			removeCustomServer
+		};
+		$[17] = customServers;
+		$[18] = isHydrated;
+		$[19] = removeCustomServer;
+		$[20] = updateCustomServers;
+		$[21] = t8;
+	} else t8 = $[21];
+	return t8;
+};
+const McpCustomServersResource = resource(useMcpCustomServersResource);
 const useMcpManagerResource = (props) => {
-	const $ = c(73);
+	const $ = c(75);
 	const connectors = props.connectors ?? NO_CONNECTORS;
 	const autoConnect = props.autoConnect ?? true;
 	let t0;
@@ -44,107 +213,27 @@ const useMcpManagerResource = (props) => {
 		$[3] = t1;
 	} else t1 = $[3];
 	const storage = useResource(t1);
+	const [persistenceQueues] = useState(_temp3);
+	const storageScopeKey = storage.scopeId === void 0 ? "unscoped" : `scoped:${storage.scopeId}`;
 	let t2;
-	if ($[4] === Symbol.for("react.memo_cache_sentinel")) {
-		t2 = [];
-		$[4] = t2;
-	} else t2 = $[4];
-	const [customServers, setCustomServers] = useState(t2);
-	const [isHydrated, setIsHydrated] = useState(false);
-	const hydratedRef = useRef(false);
-	const storageRef = useRef(storage);
+	if ($[4] !== persistenceQueues || $[5] !== storage || $[6] !== storageScopeKey) {
+		t2 = withKey(storageScopeKey, McpCustomServersResource({
+			storage,
+			scopeKey: storageScopeKey,
+			persistenceQueues
+		}));
+		$[4] = persistenceQueues;
+		$[5] = storage;
+		$[6] = storageScopeKey;
+		$[7] = t2;
+	} else t2 = $[7];
+	const { customServers, isHydrated, updateCustomServers, removeCustomServer } = useResource(t2);
+	assertUniqueServerIds([...connectors.map(_temp4), ...customServers.map(_temp5)]);
 	let t3;
-	if ($[5] === Symbol.for("react.memo_cache_sentinel")) {
-		t3 = Promise.resolve();
-		$[5] = t3;
-	} else t3 = $[5];
-	const persistenceQueueRef = useRef(t3);
-	let t4;
-	let t5;
-	if ($[6] !== storage) {
-		t4 = () => {
-			storageRef.current = storage;
-		};
-		t5 = [storage];
-		$[6] = storage;
-		$[7] = t4;
-		$[8] = t5;
-	} else {
-		t4 = $[7];
-		t5 = $[8];
-	}
-	useEffect(t4, t5);
-	let t6;
-	if ($[9] !== storage) {
-		t6 = async (signal) => {
-			const markHydrated = () => {
-				if (!signal.cancelled) {
-					hydratedRef.current = true;
-					setIsHydrated(true);
-				}
-			};
-			let records;
-			try {
-				records = await storage.loadCustomServers();
-			} catch (t7) {
-				const error = t7;
-				if (!signal.cancelled) reportCustomStorageFailure("load", error);
-				markHydrated();
-				return;
-			}
-			if (signal.cancelled) return;
-			setCustomServers((prev) => {
-				if (prev.length === 0) return records;
-				const persistedIds = new Set(records.map(_temp));
-				return [...records, ...prev.filter((r_0) => !persistedIds.has(r_0.id))];
-			});
-			markHydrated();
-		};
-		$[9] = storage;
-		$[10] = t6;
-	} else t6 = $[10];
-	const hydrate = useEffectEvent(t6);
-	let t7;
-	if ($[11] !== hydrate) {
-		t7 = () => {
-			const signal_0 = { cancelled: false };
-			hydrate(signal_0);
-			return () => {
-				signal_0.cancelled = true;
-			};
-		};
-		$[11] = hydrate;
-		$[12] = t7;
-	} else t7 = $[12];
-	let t8;
-	if ($[13] === Symbol.for("react.memo_cache_sentinel")) {
-		t8 = [];
-		$[13] = t8;
-	} else t8 = $[13];
-	useEffect(t7, t8);
-	let t10;
-	let t9;
-	if ($[14] !== customServers) {
-		t9 = () => {
-			if (!hydratedRef.current) return;
-			const targetStorage = storageRef.current;
-			persistenceQueueRef.current = persistenceQueueRef.current.then(() => persistCustomServers(targetStorage, customServers));
-		};
-		t10 = [customServers];
-		$[14] = customServers;
-		$[15] = t10;
-		$[16] = t9;
-	} else {
-		t10 = $[15];
-		t9 = $[16];
-	}
-	useEffect(t9, t10);
-	assertUniqueServerIds([...connectors.map(_temp2), ...customServers.map(_temp3)]);
-	let t11;
-	if ($[17] !== autoConnect || $[18] !== connectionTimeout || $[19] !== connectors || $[20] !== customServers || $[21] !== redirectUri || $[22] !== storage) {
-		let t12;
-		if ($[24] !== autoConnect || $[25] !== connectionTimeout || $[26] !== redirectUri || $[27] !== storage) {
-			t12 = (c_0) => withKey(c_0.id, McpServerResource({
+	if ($[8] !== autoConnect || $[9] !== connectionTimeout || $[10] !== connectors || $[11] !== customServers || $[12] !== persistenceQueues || $[13] !== redirectUri || $[14] !== removeCustomServer || $[15] !== storage || $[16] !== storageScopeKey) {
+		let t4;
+		if ($[18] !== autoConnect || $[19] !== connectionTimeout || $[20] !== redirectUri || $[21] !== storage) {
+			t4 = (c_0) => withKey(c_0.id, McpServerResource({
 				id: c_0.id,
 				kind: "connector",
 				name: c_0.name,
@@ -157,18 +246,18 @@ const useMcpManagerResource = (props) => {
 				connectionTimeout: c_0.connectionTimeout ?? connectionTimeout,
 				...c_0.cache !== void 0 ? { cache: c_0.cache } : {},
 				...c_0.elicitation !== void 0 ? { elicitation: c_0.elicitation } : {},
-				onRemove: _temp4
+				onRemove: _temp6
 			}));
-			$[24] = autoConnect;
-			$[25] = connectionTimeout;
-			$[26] = redirectUri;
-			$[27] = storage;
-			$[28] = t12;
-		} else t12 = $[28];
-		const connectorElements = connectors.map(t12);
-		let t13;
-		if ($[29] !== autoConnect || $[30] !== connectionTimeout || $[31] !== redirectUri || $[32] !== storage) {
-			t13 = (s_0) => withKey(s_0.id, McpServerResource({
+			$[18] = autoConnect;
+			$[19] = connectionTimeout;
+			$[20] = redirectUri;
+			$[21] = storage;
+			$[22] = t4;
+		} else t4 = $[22];
+		const connectorElements = connectors.map(t4);
+		let t5;
+		if ($[23] !== autoConnect || $[24] !== connectionTimeout || $[25] !== persistenceQueues || $[26] !== redirectUri || $[27] !== removeCustomServer || $[28] !== storage || $[29] !== storageScopeKey) {
+			t5 = (s_0) => withKey(s_0.id, McpServerResource(withMcpServerRemovalFence({
 				id: s_0.id,
 				kind: "custom",
 				name: s_0.name,
@@ -181,56 +270,62 @@ const useMcpManagerResource = (props) => {
 				...s_0.cache !== void 0 ? { cache: s_0.cache } : {},
 				...s_0.elicitation !== void 0 ? { elicitation: s_0.elicitation } : {},
 				onRemove: async () => {
-					setCustomServers((prev_0) => prev_0.filter((x) => x.id !== s_0.id));
+					removeCustomServer(s_0.id);
 				}
-			}));
-			$[29] = autoConnect;
-			$[30] = connectionTimeout;
-			$[31] = redirectUri;
-			$[32] = storage;
-			$[33] = t13;
-		} else t13 = $[33];
-		const customElements = customServers.map(t13);
-		t11 = [...connectorElements, ...customElements];
-		$[17] = autoConnect;
-		$[18] = connectionTimeout;
-		$[19] = connectors;
-		$[20] = customServers;
-		$[21] = redirectUri;
-		$[22] = storage;
-		$[23] = t11;
-	} else t11 = $[23];
-	const lookup = useClientLookup(t11);
+			}, () => holdCustomServerPersistence(persistenceQueues, storageScopeKey))));
+			$[23] = autoConnect;
+			$[24] = connectionTimeout;
+			$[25] = persistenceQueues;
+			$[26] = redirectUri;
+			$[27] = removeCustomServer;
+			$[28] = storage;
+			$[29] = storageScopeKey;
+			$[30] = t5;
+		} else t5 = $[30];
+		const customElements = customServers.map(t5);
+		t3 = [...connectorElements, ...customElements];
+		$[8] = autoConnect;
+		$[9] = connectionTimeout;
+		$[10] = connectors;
+		$[11] = customServers;
+		$[12] = persistenceQueues;
+		$[13] = redirectUri;
+		$[14] = removeCustomServer;
+		$[15] = storage;
+		$[16] = storageScopeKey;
+		$[17] = t3;
+	} else t3 = $[17];
+	const lookup = useClientLookup(t3);
 	const all = lookup.state;
-	let t12;
-	if ($[34] !== all) {
-		t12 = all.filter(_temp5);
-		$[34] = all;
-		$[35] = t12;
-	} else t12 = $[35];
-	let t13;
-	if ($[36] !== all) {
-		t13 = all.filter(_temp6);
-		$[36] = all;
-		$[37] = t13;
-	} else t13 = $[37];
-	let t14;
-	if ($[38] !== all || $[39] !== isHydrated || $[40] !== t12 || $[41] !== t13) {
-		t14 = {
+	let t4;
+	if ($[31] !== all) {
+		t4 = all.filter(_temp7);
+		$[31] = all;
+		$[32] = t4;
+	} else t4 = $[32];
+	let t5;
+	if ($[33] !== all) {
+		t5 = all.filter(_temp8);
+		$[33] = all;
+		$[34] = t5;
+	} else t5 = $[34];
+	let t6;
+	if ($[35] !== all || $[36] !== isHydrated || $[37] !== t4 || $[38] !== t5) {
+		t6 = {
 			servers: all,
-			connectors: t12,
-			customServers: t13,
+			connectors: t4,
+			customServers: t5,
 			isHydrated
 		};
-		$[38] = all;
-		$[39] = isHydrated;
-		$[40] = t12;
-		$[41] = t13;
-		$[42] = t14;
-	} else t14 = $[42];
-	const state = t14;
+		$[35] = all;
+		$[36] = isHydrated;
+		$[37] = t4;
+		$[38] = t5;
+		$[39] = t6;
+	} else t6 = $[39];
+	const state = t6;
 	let out;
-	if ($[43] !== lookup || $[44] !== state.servers) {
+	if ($[40] !== lookup || $[41] !== state.servers) {
 		out = {};
 		for (const server of state.servers) {
 			if (server.connectionState !== "connected") continue;
@@ -244,81 +339,81 @@ const useMcpManagerResource = (props) => {
 				};
 			}
 		}
-		$[43] = lookup;
-		$[44] = state.servers;
-		$[45] = out;
-	} else out = $[45];
+		$[40] = lookup;
+		$[41] = state.servers;
+		$[42] = out;
+	} else out = $[42];
 	const toolkit = out;
 	const clientRef = useAssistantClientRef();
-	let t15;
-	if ($[46] !== clientRef || $[47] !== toolkit) {
-		t15 = () => {
+	let t7;
+	if ($[43] !== clientRef || $[44] !== toolkit) {
+		t7 = () => {
 			const client = clientRef.current;
 			if (!client) return;
 			return client.modelContext.register({ getModelContext: () => ({ tools: toolkit }) });
 		};
-		$[46] = clientRef;
-		$[47] = toolkit;
-		$[48] = t15;
-	} else t15 = $[48];
-	let t16;
-	if ($[49] !== toolkit) {
-		t16 = [toolkit];
-		$[49] = toolkit;
-		$[50] = t16;
-	} else t16 = $[50];
-	useAssistantScopeEffect("modelContext", t15, t16);
-	let t17;
-	if ($[51] !== lookup || $[52] !== state) {
-		t17 = (kind, index) => {
+		$[43] = clientRef;
+		$[44] = toolkit;
+		$[45] = t7;
+	} else t7 = $[45];
+	let t8;
+	if ($[46] !== toolkit) {
+		t8 = [toolkit];
+		$[46] = toolkit;
+		$[47] = t8;
+	} else t8 = $[47];
+	useAssistantScopeEffect("modelContext", t7, t8);
+	let t9;
+	if ($[48] !== lookup || $[49] !== state) {
+		t9 = (kind, index) => {
 			const list = kind === "connector" ? state.connectors : state.customServers;
 			const entry = list[index];
 			if (!entry) throw new Error(`McpManagerResource: no ${kind} at index ${index} (length ${list.length})`);
 			return lookup.get({ key: entry.id });
 		};
-		$[51] = lookup;
-		$[52] = state;
-		$[53] = t17;
-	} else t17 = $[53];
-	const serverByKind = t17;
-	let t18;
-	if ($[54] !== state) {
-		t18 = () => state;
-		$[54] = state;
-		$[55] = t18;
-	} else t18 = $[55];
-	let t19;
-	if ($[56] !== lookup || $[57] !== serverByKind) {
-		t19 = (query) => {
+		$[48] = lookup;
+		$[49] = state;
+		$[50] = t9;
+	} else t9 = $[50];
+	const serverByKind = t9;
+	let t10;
+	if ($[51] !== state) {
+		t10 = () => state;
+		$[51] = state;
+		$[52] = t10;
+	} else t10 = $[52];
+	let t11;
+	if ($[53] !== lookup || $[54] !== serverByKind) {
+		t11 = (query) => {
 			if ("id" in query) return lookup.get({ key: query.id });
 			return serverByKind(query.kind, query.index);
 		};
-		$[56] = lookup;
-		$[57] = serverByKind;
-		$[58] = t19;
-	} else t19 = $[58];
-	let t20;
-	let t21;
-	if ($[59] !== serverByKind) {
-		t20 = (t22) => {
-			const { index: index_0 } = t22;
+		$[53] = lookup;
+		$[54] = serverByKind;
+		$[55] = t11;
+	} else t11 = $[55];
+	let t12;
+	let t13;
+	if ($[56] !== serverByKind) {
+		t12 = (t14) => {
+			const { index: index_0 } = t14;
 			return serverByKind("connector", index_0);
 		};
-		t21 = (t23) => {
-			const { index: index_1 } = t23;
+		t13 = (t15) => {
+			const { index: index_1 } = t15;
 			return serverByKind("custom", index_1);
 		};
-		$[59] = serverByKind;
-		$[60] = t20;
-		$[61] = t21;
+		$[56] = serverByKind;
+		$[57] = t12;
+		$[58] = t13;
 	} else {
-		t20 = $[60];
-		t21 = $[61];
+		t12 = $[57];
+		t13 = $[58];
 	}
-	let t22;
-	if ($[62] === Symbol.for("react.memo_cache_sentinel")) {
-		t22 = async (t23) => {
-			const { name, url, auth, connectionTimeout: connectionTimeout_0, cache, elicitation } = t23;
+	let t14;
+	if ($[59] !== updateCustomServers) {
+		t14 = async (t15) => {
+			const { name, url, auth, connectionTimeout: connectionTimeout_0, cache, elicitation } = t15;
 			const record = {
 				id: createMcpId(),
 				name,
@@ -329,64 +424,83 @@ const useMcpManagerResource = (props) => {
 				...elicitation !== void 0 ? { elicitation } : {},
 				createdAt: Date.now()
 			};
-			setCustomServers((prev_1) => [...prev_1, record]);
+			updateCustomServers((prev) => [...prev, record]);
 			return record.id;
 		};
-		$[62] = t22;
-	} else t22 = $[62];
-	let t23;
-	if ($[63] !== lookup || $[64] !== state || $[65] !== storage) {
-		t23 = async (id) => {
+		$[59] = updateCustomServers;
+		$[60] = t14;
+	} else t14 = $[60];
+	let t15;
+	if ($[61] !== lookup || $[62] !== persistenceQueues || $[63] !== removeCustomServer || $[64] !== state || $[65] !== storage || $[66] !== storageScopeKey) {
+		t15 = async (id) => {
 			if (state.connectors.some((c_1) => c_1.id === id)) throw new Error(`Cannot remove connector "${id}" — connectors are app-defined and not removable. Use a custom server id instead.`);
 			try {
 				await lookup.get({ key: id }).remove();
 			} catch {
-				await clearOAuthProviderAuthState(storage, id);
-				setCustomServers((prev_2) => prev_2.filter((s_3) => s_3.id !== id));
+				const releasePersistence = holdCustomServerPersistence(persistenceQueues, storageScopeKey);
+				try {
+					await clearOAuthProviderAuthState(storage, id);
+					removeCustomServer(id);
+				} catch (t16) {
+					const error = t16;
+					releasePersistence();
+					throw error;
+				}
+				releasePersistence();
 			}
 		};
-		$[63] = lookup;
+		$[61] = lookup;
+		$[62] = persistenceQueues;
+		$[63] = removeCustomServer;
 		$[64] = state;
 		$[65] = storage;
-		$[66] = t23;
-	} else t23 = $[66];
-	let t24;
-	if ($[67] !== t18 || $[68] !== t19 || $[69] !== t20 || $[70] !== t21 || $[71] !== t23) {
-		t24 = {
-			getState: t18,
-			server: t19,
-			connector: t20,
-			customServer: t21,
-			addCustomServer: t22,
-			removeServer: t23
+		$[66] = storageScopeKey;
+		$[67] = t15;
+	} else t15 = $[67];
+	let t16;
+	if ($[68] !== t10 || $[69] !== t11 || $[70] !== t12 || $[71] !== t13 || $[72] !== t14 || $[73] !== t15) {
+		t16 = {
+			getState: t10,
+			server: t11,
+			connector: t12,
+			customServer: t13,
+			addCustomServer: t14,
+			removeServer: t15
 		};
-		$[67] = t18;
-		$[68] = t19;
-		$[69] = t20;
-		$[70] = t21;
-		$[71] = t23;
-		$[72] = t24;
-	} else t24 = $[72];
-	return t24;
+		$[68] = t10;
+		$[69] = t11;
+		$[70] = t12;
+		$[71] = t13;
+		$[72] = t14;
+		$[73] = t15;
+		$[74] = t16;
+	} else t16 = $[74];
+	return t16;
 };
 const McpManagerResource = resource(useMcpManagerResource);
 attachTransformScopes(useMcpManagerResource, (scopes, parent) => {
 	if (!scopes.modelContext && parent.modelContext.source === null) scopes.modelContext = ModelContext();
 });
-function _temp(r) {
+function _temp() {
+	return /* @__PURE__ */ new Set();
+}
+function _temp2(r) {
 	return r.id;
 }
-function _temp2(c) {
+function _temp3() {
+	return /* @__PURE__ */ new Map();
+}
+function _temp4(c) {
 	return c.id;
 }
-function _temp3(s) {
+function _temp5(s) {
 	return s.id;
 }
-async function _temp4() {}
-function _temp5(s_1) {
+async function _temp6() {}
+function _temp7(s_1) {
 	return s_1.kind === "connector";
 }
-function _temp6(s_2) {
+function _temp8(s_2) {
 	return s_2.kind === "custom";
 }
 //#endregion