@openhands/agent-canvas 1.1.0 → 1.2.1

package/dist/components/features/mcp-page/install-server-modal.js

@@ -3,23 +3,25 @@ import { I18nKey as t } from "../../../i18n/declaration.js";
 import { retrieveAxiosErrorMessage as n } from "../../../utils/retrieve-axios-error-message.js";
 import { displaySuccessToast as r } from "../../../utils/custom-toast-handlers.js";
 import i from "../../../node_modules/uuid/dist/v4.js";
-import { ModalBackdrop as a } from "../../shared/modals/modal-backdrop.js";
-import { modalTitleLgClassName as o } from "../../../utils/modal-classes.js";
-import { ModalCloseButton as s } from "../../shared/modals/modal-close-button.js";
-import { BrandButton as c } from "../settings/brand-button.js";
-import { SettingsInput as l } from "../settings/settings-input.js";
-import { getInstallableMcpConnectionOption as u } from "../../../utils/mcp-marketplace-utils.js";
-import { McpLogoBadge as d } from "../mcp-logo-badge.js";
-import { SaveAsSecretToggle as f } from "./save-as-secret-toggle.js";
-import { useAddMcpServer as p } from "../../../hooks/mutation/use-add-mcp-server.js";
-import { useTestMcpServer as m } from "../../../hooks/mutation/use-test-mcp-server.js";
-import { useSaveFieldsAsSecrets as h } from "../../../hooks/mutation/use-save-fields-as-secrets.js";
-import g from "react";
-import { Fragment as _, jsx as v, jsxs as y } from "react/jsx-runtime";
+import { toMcpServerName as a } from "../../../utils/mcp-server-name.js";
+import { ModalBackdrop as o } from "../../shared/modals/modal-backdrop.js";
+import { modalTitleLgClassName as s } from "../../../utils/modal-classes.js";
+import { ModalCloseButton as c } from "../../shared/modals/modal-close-button.js";
+import { BrandButton as l } from "../settings/brand-button.js";
+import { SettingsInput as u } from "../settings/settings-input.js";
+import { getInstallableMcpConnectionOption as d, getMcpOAuthAuthenticationConfig as ee } from "../../../utils/mcp-marketplace-utils.js";
+import { McpLogoBadge as f } from "../mcp-logo-badge.js";
+import { SaveAsSecretToggle as p } from "./save-as-secret-toggle.js";
+import { useAddMcpServer as m } from "../../../hooks/mutation/use-add-mcp-server.js";
+import h from "../../../api/mcp-service/mcp-service.api.js";
+import { useTestMcpServer as g } from "../../../hooks/mutation/use-test-mcp-server.js";
+import { useSaveFieldsAsSecrets as _ } from "../../../hooks/mutation/use-save-fields-as-secrets.js";
+import v from "react";
+import { Fragment as y, jsx as b, jsxs as x } from "react/jsx-runtime";
 //#region src/components/features/mcp-page/install-server-modal.tsx
-function b(e) {
+function S(e) {
 	let t = /\[([^\]]+)\]\(([^)]+)\)/g, n = [], r = 0;
-	for (let i of e.matchAll(t)) i.index > r && n.push(e.slice(r, i.index)), n.push(/* @__PURE__ */ v("a", {
+	for (let i of e.matchAll(t)) i.index > r && n.push(e.slice(r, i.index)), n.push(/* @__PURE__ */ b("a", {
 		href: /^https?:\/\//i.test(i[2]) ? i[2] : "#",
 		target: "_blank",
 		rel: "noreferrer",
@@ -28,33 +30,39 @@ function b(e) {
 	}, i.index)), r = i.index + i[0].length;
 	return r < e.length && n.push(e.slice(r)), n;
 }
-function x(e) {
-	return e?.transport.kind !== "shttp" && e?.transport.kind !== "sse" ? !1 : [
-		"api_key",
-		"bearer",
-		"basic"
-	].includes(e.auth.strategy);
+function C(e) {
+	return e?.transport.kind !== "shttp" && e?.transport.kind !== "sse" ? !1 : ["api_key", "bearer"].includes(e.auth.strategy);
 }
-function S(e) {
+function w(e) {
+	return !!e && e.auth.strategy === "oauth2";
+}
+function T(e) {
 	return e.transport.kind === "stdio" ? e.auth.apiKeyOptional ?? !1 : e.auth.apiKeyOptional ?? e.transport.apiKeyOptional ?? !1;
 }
-function C(e) {
-	let t = {}, n = {}, r = u(e), i = r?.transport;
+function E(e) {
+	return e?.transport.kind !== "shttp" && e?.transport.kind !== "sse" ? [] : e.transport.headerFields ?? [];
+}
+function D(e) {
+	let t = {}, n = {}, r = d(e), i = r?.transport;
 	if (i?.kind === "stdio") {
 		for (let e of i.envFields ?? []) t[e.key] = "", n[e.key] = e.type === "password";
 		for (let e of i.argFields ?? []) t[e.key] = "";
-	} else x(r) && (t.api_key = "", r?.auth.credentialSecretName && (n.api_key = r.auth.saveCredentialAsSecretByDefault ?? !1));
+	} else if (i?.kind === "shttp" || i?.kind === "sse") {
+		t.url = i.url;
+		for (let e of E(r)) t[e.key] = "", n[e.key] = e.type === "password";
+		C(r) && (t.api_key = "", r?.auth.credentialSecretName && (n.api_key = r.auth.saveCredentialAsSecretByDefault ?? !1));
+	}
 	return {
 		values: t,
 		errors: {},
 		savedAsSecret: n
 	};
 }
-function w({ entry: w, onClose: T, onSuccess: E }) {
-	let { t: D } = e("openhands"), { mutate: O, isPending: k } = p(), { mutate: A, isPending: j } = m(), M = h(), [N, P] = g.useState(() => C(w)), F = g.useRef(N);
-	F.current = N;
-	let [I, L] = g.useState(null), [R, z] = g.useState(!1), B = u(w), V = B?.transport, H = j || k || R, U = (e, t) => {
-		P((n) => ({
+function O({ entry: O, onClose: k, onSuccess: A }) {
+	let { t: j } = e("openhands"), { mutate: M, isPending: N } = m(), { mutate: P, isPending: F } = g(), I = _(), [L, R] = v.useState(() => D(O)), z = v.useRef(L);
+	z.current = L;
+	let [B, V] = v.useState(null), [H, U] = v.useState(!1), [W, G] = v.useState(!1), K = d(O), q = K?.transport, J = F || W || N || H, Y = (e, t) => {
+		R((n) => ({
 			...n,
 			values: {
 				...n.values,
@@ -64,79 +72,139 @@ function w({ entry: w, onClose: T, onSuccess: E }) {
 				...n.errors,
 				[e]: null
 			}
-		})), L(null);
-	}, W = (e, t) => {
-		P((n) => ({
+		})), V(null);
+	}, X = (e, t) => {
+		R((n) => ({
 			...n,
 			savedAsSecret: {
 				...n.savedAsSecret,
 				[e]: t
 			}
 		}));
-	}, G = () => {
-		let e = B?.auth.credentialSecretName, t = F.current.values.api_key?.trim();
-		return !e || !t || !F.current.savedAsSecret.api_key ? Promise.resolve() : M([{
+	}, te = () => {
+		let e = K?.auth.credentialSecretName, t = z.current.values.api_key?.trim();
+		return !e || !t || !z.current.savedAsSecret.api_key ? Promise.resolve() : I([{
 			key: e,
-			label: B.auth.credentialLabel ?? e,
+			label: K.auth.credentialLabel ?? e,
 			type: "password"
 		}], { [e]: t }, { [e]: !0 });
-	}, K = () => V?.kind === "stdio" ? M(V.envFields ?? [], F.current.values, F.current.savedAsSecret) : V?.kind === "shttp" || V?.kind === "sse" ? G() : Promise.resolve(), q = (e) => {
+	}, Z = () => q?.kind === "stdio" ? I(q.envFields ?? [], z.current.values, z.current.savedAsSecret) : q?.kind === "shttp" || q?.kind === "sse" ? Promise.all([te(), I(E(K), z.current.values, z.current.savedAsSecret)]).then(() => void 0) : Promise.resolve(), Q = (e) => {
 		switch (e.error_kind) {
-			case "timeout": return D(t.MCP$TEST_ERROR_TIMEOUT);
-			case "connection": return D(t.MCP$TEST_ERROR_CONNECTION);
-			case "credentials": return D(t.MCP$TEST_ERROR_CREDENTIALS, { error: e.error });
-			default: return D(t.MCP$TEST_ERROR_UNKNOWN, { error: e.error });
+			case "timeout": return j(t.MCP$TEST_ERROR_TIMEOUT);
+			case "connection": return j(t.MCP$TEST_ERROR_CONNECTION);
+			case "credentials": return j(t.MCP$TEST_ERROR_CREDENTIALS, { error: e.error });
+			default: return j(t.MCP$TEST_ERROR_UNKNOWN, { error: e.error });
 		}
-	}, J = (e) => {
-		A(e, {
+	}, $ = (e) => {
+		if (e.auth?.strategy === "oauth2") {
+			G(!0), h.authorizeOAuth(e).then((i) => {
+				if (!i.ok) {
+					V(Q(i));
+					return;
+				}
+				M(i.oauth_state ? {
+					...e,
+					auth: {
+						...e.auth,
+						state: i.oauth_state
+					}
+				} : e, {
+					onSuccess: () => {
+						r(j(t.MCP$INSTALL_SUCCESS)), U(!0), (async () => {
+							try {
+								await Z();
+							} finally {
+								A?.(O), k();
+							}
+						})();
+					},
+					onError: (e) => {
+						V(n(e) || j(t.ERROR$GENERIC));
+					}
+				});
+			}).catch((e) => {
+				V(n(e) || j(t.ERROR$GENERIC));
+			}).finally(() => G(!1));
+			return;
+		}
+		P(e, {
 			onSuccess: (i) => {
 				if (!i.ok) {
-					L(q(i));
+					V(Q(i));
 					return;
 				}
-				O(e, {
+				M(i.oauth_state && e.auth?.strategy === "oauth2" ? {
+					...e,
+					auth: {
+						...e.auth,
+						state: i.oauth_state
+					}
+				} : e, {
 					onSuccess: () => {
-						r(D(t.MCP$INSTALL_SUCCESS)), z(!0), (async () => {
+						r(j(t.MCP$INSTALL_SUCCESS)), U(!0), (async () => {
 							try {
-								await K();
+								await Z();
 							} finally {
-								E?.(w), T();
+								A?.(O), k();
 							}
 						})();
 					},
 					onError: (e) => {
-						L(n(e) || D(t.ERROR$GENERIC));
+						V(n(e) || j(t.ERROR$GENERIC));
 					}
 				});
 			},
 			onError: (e) => {
-				L(n(e) || D(t.ERROR$GENERIC));
+				V(n(e) || j(t.ERROR$GENERIC));
 			}
 		});
-	}, Y = () => {
-		if (V?.kind !== "shttp" && V?.kind !== "sse" || !B) return;
-		let e = N.values.api_key?.trim() ?? "", n = x(B);
-		if (n && !S(B) && !e) {
-			P((e) => ({
+	}, ne = () => {
+		if (q?.kind !== "shttp" && q?.kind !== "sse" || !K) return;
+		let e = L.values.api_key?.trim() ?? "", n = q.urlEditable ? L.values.url?.trim() ?? "" : q.url, r = w(K), o = C(K), s = E(K), c = {};
+		if (!n) c.url = j(t.SETTINGS$MCP_ERROR_URL_REQUIRED);
+		else try {
+			let e = new URL(n);
+			["http:", "https:"].includes(e.protocol) || (c.url = j(t.SETTINGS$MCP_ERROR_URL_INVALID_PROTOCOL));
+		} catch {
+			c.url = j(t.SETTINGS$MCP_ERROR_URL_INVALID);
+		}
+		for (let e of s) e.required && !(L.values[e.key] ?? "").trim() && (c[e.key] = j(t.MCP$ERROR_FIELD_REQUIRED));
+		if (!r && o && !T(K) && !e && (c.api_key = j(t.MCP$ERROR_FIELD_REQUIRED)), Object.values(c).some(Boolean)) {
+			R((e) => ({
 				...e,
-				errors: { api_key: D(t.MCP$ERROR_FIELD_REQUIRED) }
+				errors: c
 			}));
 			return;
 		}
-		J({
-			id: `${V.kind}-${i()}`,
-			type: V.kind,
-			name: w.id,
-			url: V.url,
-			...n && e && { api_key: e }
+		let l = r ? ee(K) : void 0, u = Object.fromEntries(s.map((e) => [e.key, L.values[e.key]?.trim() ?? ""]).filter(([, e]) => e)), d = Object.keys(u).length > 0, f;
+		r ? f = {
+			strategy: "oauth2",
+			...l && { authentication: l }
+		} : o && e ? f = K.auth.strategy === "api_key" ? {
+			strategy: "api_key",
+			value: e,
+			...K.auth.apiKeyHeaderName && { header_name: K.auth.apiKeyHeaderName }
+		} : {
+			strategy: "bearer",
+			value: e
+		} : d && (f = {
+			strategy: "header",
+			headers: u
+		}), $({
+			id: `${q.kind}-${i()}`,
+			type: q.kind,
+			name: a(O.id),
+			url: n,
+			...f && { auth: f },
+			...d && f?.strategy !== "header" && { headers: u }
 		});
-	}, X = () => {
-		if (V?.kind !== "stdio") return;
-		let e = V, n = {};
-		for (let r of e.envFields ?? []) r.required && !(N.values[r.key] ?? "").trim() && (n[r.key] = D(t.MCP$ERROR_FIELD_REQUIRED));
-		for (let r of e.argFields ?? []) r.required && !(N.values[r.key] ?? "").trim() && (n[r.key] = D(t.MCP$ERROR_FIELD_REQUIRED));
+	}, re = () => {
+		if (q?.kind !== "stdio") return;
+		let e = q, n = {};
+		for (let r of e.envFields ?? []) r.required && !(L.values[r.key] ?? "").trim() && (n[r.key] = j(t.MCP$ERROR_FIELD_REQUIRED));
+		for (let r of e.argFields ?? []) r.required && !(L.values[r.key] ?? "").trim() && (n[r.key] = j(t.MCP$ERROR_FIELD_REQUIRED));
 		if (Object.values(n).some(Boolean)) {
-			P((e) => ({
+			R((e) => ({
 				...e,
 				errors: n
 			}));
@@ -144,15 +212,15 @@ function w({ entry: w, onClose: T, onSuccess: E }) {
 		}
 		let r = {};
 		for (let t of e.envFields ?? []) {
-			let e = N.values[t.key]?.trim();
+			let e = L.values[t.key]?.trim();
 			e && (r[t.key] = e);
 		}
 		let a = [];
 		for (let t of e.argFields ?? []) {
-			let e = N.values[t.key]?.trim();
+			let e = L.values[t.key]?.trim();
 			if (e) for (let t of e.split(/\s+/)) t && a.push(t);
 		}
-		J({
+		$({
 			id: `stdio-${i()}`,
 			type: "stdio",
 			name: e.serverName,
@@ -161,180 +229,227 @@ function w({ entry: w, onClose: T, onSuccess: E }) {
 			...Object.keys(r).length > 0 && { env: r }
 		});
 	};
-	return /* @__PURE__ */ v(a, {
-		onClose: T,
-		"aria-label": w.name,
-		children: /* @__PURE__ */ y("form", {
+	return /* @__PURE__ */ b(o, {
+		onClose: k,
+		"aria-label": O.name,
+		children: /* @__PURE__ */ x("form", {
 			"data-testid": "mcp-install-modal",
-			"data-marketplace-id": w.id,
-			onSubmit: (e) => (e.preventDefault(), L(null), V?.kind === "shttp" || V?.kind === "sse" ? Y() : X()),
+			"data-marketplace-id": O.id,
+			onSubmit: (e) => (e.preventDefault(), V(null), q?.kind === "shttp" || q?.kind === "sse" ? ne() : re()),
 			className: "relative bg-base-secondary p-6 rounded-xl flex flex-col gap-4 border border-[var(--oh-border)] w-[520px] max-w-[90vw] max-h-[85vh] overflow-y-auto custom-scrollbar",
 			children: [
-				/* @__PURE__ */ v(s, {
-					onClose: T,
+				/* @__PURE__ */ b(c, {
+					onClose: k,
 					testId: "mcp-install-modal-close",
-					disabled: H
+					disabled: J
 				}),
-				/* @__PURE__ */ y("div", {
+				/* @__PURE__ */ x("div", {
 					className: "flex items-start gap-3 pr-6",
-					children: [/* @__PURE__ */ v(d, { entry: w }), /* @__PURE__ */ y("div", {
+					children: [/* @__PURE__ */ b(f, { entry: O }), /* @__PURE__ */ x("div", {
 						className: "flex flex-col flex-1",
-						children: [/* @__PURE__ */ v("h2", {
-							className: o,
-							children: w.name
-						}), /* @__PURE__ */ v("p", {
+						children: [/* @__PURE__ */ b("h2", {
+							className: s,
+							children: O.name
+						}), /* @__PURE__ */ b("p", {
 							className: "text-xs text-tertiary-light",
-							children: w.description
+							children: O.description
 						})]
 					})]
 				}),
-				w.installHint && /* @__PURE__ */ v("p", {
+				O.installHint && /* @__PURE__ */ b("p", {
 					className: "text-xs text-tertiary-light",
-					children: w.installHint
+					children: O.installHint
 				}),
-				w.docsUrl && /* @__PURE__ */ v("a", {
-					href: w.docsUrl,
+				O.docsUrl && /* @__PURE__ */ b("a", {
+					href: O.docsUrl,
 					target: "_blank",
 					rel: "noreferrer",
 					className: "text-xs text-[var(--oh-muted)] hover:text-white hover:underline self-start transition-colors",
-					children: D(t.MCP$VIEW_DOCS)
+					children: j(t.MCP$VIEW_DOCS)
 				}),
-				/* @__PURE__ */ v("div", {
+				/* @__PURE__ */ b("div", {
 					className: "flex flex-col gap-3",
 					children: (() => {
-						if (V?.kind === "shttp" || V?.kind === "sse") {
-							let e = x(B), n = B ? S(B) : !1, r = B?.auth.credentialSecretName;
-							return /* @__PURE__ */ y(_, { children: [/* @__PURE__ */ v(l, {
-								testId: "mcp-install-field-url",
-								name: "url",
-								type: "url",
-								label: D(t.SETTINGS$MCP_URL),
-								value: V.url,
-								onChange: () => {},
-								isDisabled: !0,
-								className: "w-full"
-							}), e ? /* @__PURE__ */ y("div", {
-								className: "flex flex-col gap-1",
-								children: [
-									/* @__PURE__ */ v(l, {
-										testId: "mcp-install-field-api_key",
-										name: "api_key",
-										type: "password",
-										label: B?.auth.credentialLabel ?? D(t.SETTINGS$MCP_API_KEY),
-										value: N.values.api_key ?? "",
-										onChange: (e) => U("api_key", e),
-										placeholder: B?.auth.credentialPlaceholder ?? D(t.SETTINGS$MCP_API_KEY_PLACEHOLDER),
-										showOptionalTag: n,
-										required: !n,
-										className: "w-full"
-									}),
-									B?.auth.credentialHelp && /* @__PURE__ */ v("p", {
+						if (q?.kind === "shttp" || q?.kind === "sse") {
+							let e = w(K), n = C(K), r = K ? T(K) : !1, i = K?.auth.credentialSecretName, a = E(K);
+							return /* @__PURE__ */ x(y, { children: [
+								/* @__PURE__ */ b(u, {
+									testId: "mcp-install-field-url",
+									name: "url",
+									type: "url",
+									label: j(t.SETTINGS$MCP_URL),
+									value: L.values.url ?? q.url,
+									onChange: (e) => Y("url", e),
+									isDisabled: !q.urlEditable,
+									className: "w-full"
+								}),
+								L.errors.url && /* @__PURE__ */ b("p", {
+									className: "text-xs text-red-500",
+									children: L.errors.url
+								}),
+								a.map((e) => /* @__PURE__ */ x("div", {
+									className: "flex flex-col gap-1",
+									children: [
+										/* @__PURE__ */ b(u, {
+											testId: `mcp-install-field-${e.key}`,
+											name: e.key,
+											type: e.type === "password" ? "password" : "text",
+											label: e.label,
+											value: L.values[e.key] ?? "",
+											onChange: (t) => Y(e.key, t),
+											placeholder: e.placeholder,
+											required: e.required,
+											showOptionalTag: !e.required,
+											className: "w-full"
+										}),
+										e.helperText && /* @__PURE__ */ b("p", {
+											className: "text-xs text-tertiary-alt",
+											children: S(e.helperText)
+										}),
+										L.errors[e.key] && /* @__PURE__ */ b("p", {
+											className: "text-xs text-red-500",
+											children: L.errors[e.key]
+										}),
+										e.key in L.savedAsSecret && /* @__PURE__ */ b(p, {
+											fieldKey: e.key,
+											checked: L.savedAsSecret[e.key] ?? !1,
+											onToggle: (t) => X(e.key, t)
+										})
+									]
+								}, e.key)),
+								e ? /* @__PURE__ */ x("div", {
+									"data-testid": "mcp-install-oauth-info",
+									className: "flex flex-col gap-2 p-3 rounded-lg border border-[var(--oh-border)] bg-base-tertiary",
+									children: [/* @__PURE__ */ b("p", {
+										className: "text-sm text-secondary-light",
+										children: j(t.MCP$OAUTH_CONNECT_INFO)
+									}), /* @__PURE__ */ b("p", {
 										className: "text-xs text-tertiary-alt",
-										children: b(B.auth.credentialHelp)
-									}),
-									N.errors.api_key && /* @__PURE__ */ v("p", {
-										className: "text-xs text-red-500",
-										children: N.errors.api_key
-									}),
-									r && /* @__PURE__ */ v(f, {
-										fieldKey: r,
-										checked: N.savedAsSecret.api_key ?? !1,
-										onToggle: (e) => W("api_key", e)
-									})
-								]
-							}) : null] });
+										children: j(t.MCP$OAUTH_CONNECT_HINT)
+									})]
+								}) : n ? /* @__PURE__ */ x("div", {
+									className: "flex flex-col gap-1",
+									children: [
+										/* @__PURE__ */ b(u, {
+											testId: "mcp-install-field-api_key",
+											name: "api_key",
+											type: "password",
+											label: K?.auth.credentialLabel ?? j(t.SETTINGS$MCP_API_KEY),
+											value: L.values.api_key ?? "",
+											onChange: (e) => Y("api_key", e),
+											placeholder: K?.auth.credentialPlaceholder ?? j(t.SETTINGS$MCP_API_KEY_PLACEHOLDER),
+											showOptionalTag: r,
+											required: !r,
+											className: "w-full"
+										}),
+										K?.auth.credentialHelp && /* @__PURE__ */ b("p", {
+											className: "text-xs text-tertiary-alt",
+											children: S(K.auth.credentialHelp)
+										}),
+										L.errors.api_key && /* @__PURE__ */ b("p", {
+											className: "text-xs text-red-500",
+											children: L.errors.api_key
+										}),
+										i && /* @__PURE__ */ b(p, {
+											fieldKey: i,
+											checked: L.savedAsSecret.api_key ?? !1,
+											onToggle: (e) => X("api_key", e)
+										})
+									]
+								}) : null
+							] });
 						}
-						if (V?.kind !== "stdio") return null;
-						let e = V;
-						return /* @__PURE__ */ y(_, { children: [
-							/* @__PURE__ */ v(l, {
+						if (q?.kind !== "stdio") return null;
+						let e = q;
+						return /* @__PURE__ */ x(y, { children: [
+							/* @__PURE__ */ b(u, {
 								testId: "mcp-install-field-command-readonly",
 								name: "command-readonly",
 								type: "text",
-								label: D(t.MCP$COMMAND_LABEL),
+								label: j(t.MCP$COMMAND_LABEL),
 								value: `${e.command} ${e.args.join(" ")}`.trim(),
 								onChange: () => {},
 								isDisabled: !0,
 								className: "w-full"
 							}),
-							(e.envFields ?? []).map((e) => /* @__PURE__ */ y("div", {
+							(e.envFields ?? []).map((e) => /* @__PURE__ */ x("div", {
 								className: "flex flex-col gap-1",
 								children: [
-									/* @__PURE__ */ v(l, {
+									/* @__PURE__ */ b(u, {
 										testId: `mcp-install-field-${e.key}`,
 										name: e.key,
 										type: e.type === "password" ? "password" : "text",
 										label: e.label,
-										value: N.values[e.key] ?? "",
-										onChange: (t) => U(e.key, t),
+										value: L.values[e.key] ?? "",
+										onChange: (t) => Y(e.key, t),
 										placeholder: e.placeholder,
 										required: e.required,
 										showOptionalTag: !e.required,
 										className: "w-full"
 									}),
-									e.helperText && /* @__PURE__ */ v("p", {
+									e.helperText && /* @__PURE__ */ b("p", {
 										className: "text-xs text-tertiary-alt",
-										children: b(e.helperText)
+										children: S(e.helperText)
 									}),
-									N.errors[e.key] && /* @__PURE__ */ v("p", {
+									L.errors[e.key] && /* @__PURE__ */ b("p", {
 										className: "text-xs text-red-500",
-										children: N.errors[e.key]
+										children: L.errors[e.key]
 									}),
-									e.key in N.savedAsSecret && /* @__PURE__ */ v(f, {
+									e.key in L.savedAsSecret && /* @__PURE__ */ b(p, {
 										fieldKey: e.key,
-										checked: N.savedAsSecret[e.key],
-										onToggle: (t) => W(e.key, t)
+										checked: L.savedAsSecret[e.key],
+										onToggle: (t) => X(e.key, t)
 									})
 								]
 							}, e.key)),
-							(e.argFields ?? []).map((e) => /* @__PURE__ */ y("div", {
+							(e.argFields ?? []).map((e) => /* @__PURE__ */ x("div", {
 								className: "flex flex-col gap-1",
 								children: [
-									/* @__PURE__ */ v(l, {
+									/* @__PURE__ */ b(u, {
 										testId: `mcp-install-field-${e.key}`,
 										name: e.key,
 										type: e.type === "password" ? "password" : "text",
 										label: e.label,
-										value: N.values[e.key] ?? "",
-										onChange: (t) => U(e.key, t),
+										value: L.values[e.key] ?? "",
+										onChange: (t) => Y(e.key, t),
 										placeholder: e.placeholder,
 										required: e.required,
 										showOptionalTag: !e.required,
 										className: "w-full"
 									}),
-									e.helperText && /* @__PURE__ */ v("p", {
+									e.helperText && /* @__PURE__ */ b("p", {
 										className: "text-xs text-tertiary-alt",
-										children: b(e.helperText)
+										children: S(e.helperText)
 									}),
-									N.errors[e.key] && /* @__PURE__ */ v("p", {
+									L.errors[e.key] && /* @__PURE__ */ b("p", {
 										className: "text-xs text-red-500",
-										children: N.errors[e.key]
+										children: L.errors[e.key]
 									})
 								]
 							}, e.key))
 						] });
 					})()
 				}),
-				I && /* @__PURE__ */ v("p", {
+				B && /* @__PURE__ */ b("p", {
 					"data-testid": "mcp-install-modal-error",
 					className: "text-sm text-red-500 whitespace-pre-wrap",
-					children: I
+					children: B
 				}),
-				/* @__PURE__ */ y("div", {
+				/* @__PURE__ */ x("div", {
 					className: "flex justify-end gap-2 mt-2",
-					children: [/* @__PURE__ */ v(c, {
+					children: [/* @__PURE__ */ b(l, {
 						type: "button",
 						variant: "secondary",
-						onClick: T,
+						onClick: k,
 						testId: "mcp-install-cancel",
-						isDisabled: H,
-						children: D(t.BUTTON$CANCEL)
-					}), /* @__PURE__ */ v(c, {
+						isDisabled: J,
+						children: j(t.BUTTON$CANCEL)
+					}), /* @__PURE__ */ b(l, {
 						type: "submit",
 						variant: "primary",
-						isDisabled: H,
+						isDisabled: J,
 						testId: "mcp-install-submit",
-						children: D(j ? t.MCP$VERIFYING : k || R ? t.SETTINGS$SAVING : t.MCP$INSTALL_BUTTON)
+						children: j(F || W ? t.MCP$VERIFYING : N || H ? t.SETTINGS$SAVING : t.MCP$INSTALL_BUTTON)
 					})]
 				})
 			]
@@ -342,6 +457,6 @@ function w({ entry: w, onClose: T, onSuccess: E }) {
 	});
 }
 //#endregion
-export { w as InstallServerModal };
+export { O as InstallServerModal };
 
 //# sourceMappingURL=install-server-modal.js.map