@agent-native/core 0.7.4 → 0.7.7

package/dist/mcp-client/remote-store.js

@@ -0,0 +1,200 @@
+/**
+ * Persistent store for user-added remote MCP servers.
+ *
+ * Servers added through the settings UI live in the framework's `settings`
+ * table, keyed by scope:
+ *   - User scope: `u:<email>:mcp-servers-remote`
+ *   - Org scope:  `o:<orgId>:mcp-servers-remote`
+ *
+ * Both scopes store the same shape — a list of `StoredRemoteMcpServer`
+ * records. The running MCP manager merges this list with the file-based
+ * `mcp.config.json` on startup and after every mutation.
+ */
+import { createHash } from "node:crypto";
+import { getUserSetting, putUserSetting, deleteUserSetting, } from "../settings/user-settings.js";
+import { getOrgSetting, putOrgSetting, deleteOrgSetting, } from "../settings/org-settings.js";
+const SETTINGS_KEY = "mcp-servers-remote";
+/** Tiny nanoid — matches the inline helper used elsewhere in this package. */
+function shortId() {
+    const rand = globalThis.crypto?.randomUUID?.().replace(/-/g, "") ??
+        Math.random().toString(36).slice(2) + Date.now().toString(36);
+    return rand.slice(0, 16);
+}
+/**
+ * Validate a candidate MCP server name — used as a key in the merged config
+ * and as part of the prefixed tool name (`mcp__<merged-key>__<tool>`).
+ *
+ * Allowed: letters, digits, hyphen; 1–40 chars. Lowercased. Underscores are
+ * excluded on purpose — the merged-key format uses `_` as a separator between
+ * `<scope>`, `<owner>`, and `<name>`, so allowing `_` in names would make the
+ * parse ambiguous.
+ */
+export function normalizeServerName(input) {
+    return input
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9-]/g, "-")
+        .slice(0, 40);
+}
+/**
+ * Short, deterministic, URL-safe hash of an email. Used as the owner
+ * discriminator in user-scope merged keys so two users with the same server
+ * name don't collide in the global MCP manager.
+ */
+export function hashEmail(email) {
+    return createHash("sha256")
+        .update(email.toLowerCase().trim())
+        .digest("hex")
+        .slice(0, 10);
+}
+/**
+ * Sanitise an org id to the character set allowed in merged keys.
+ * Org ids are already nanoid-style alphanumeric, but we normalise defensively.
+ */
+function sanitiseOrgId(orgId) {
+    return orgId.toLowerCase().replace(/[^a-z0-9-]/g, "-");
+}
+/** Reject obviously-wrong URLs. Allows http only for localhost. */
+export function validateRemoteUrl(raw) {
+    let url;
+    try {
+        url = new URL(raw);
+    }
+    catch {
+        return { ok: false, error: "Not a valid URL" };
+    }
+    if (url.protocol === "https:")
+        return { ok: true, url };
+    if (url.protocol === "http:") {
+        const host = url.hostname;
+        if (host === "localhost" || host === "127.0.0.1" || host === "::1") {
+            return { ok: true, url };
+        }
+        return { ok: false, error: "Plain http is only allowed for localhost" };
+    }
+    return { ok: false, error: `Unsupported protocol: ${url.protocol}` };
+}
+async function readList(scope, scopeId) {
+    const raw = scope === "user"
+        ? await getUserSetting(scopeId, SETTINGS_KEY)
+        : await getOrgSetting(scopeId, SETTINGS_KEY);
+    if (!raw || !Array.isArray(raw.servers))
+        return [];
+    return raw.servers.filter((s) => s && typeof s.id === "string" && typeof s.url === "string");
+}
+async function writeList(scope, scopeId, servers) {
+    if (scope === "user") {
+        await putUserSetting(scopeId, SETTINGS_KEY, { servers });
+    }
+    else {
+        await putOrgSetting(scopeId, SETTINGS_KEY, { servers });
+    }
+}
+export async function listRemoteServers(scope, scopeId) {
+    return readList(scope, scopeId);
+}
+export async function addRemoteServer(scope, scopeId, input) {
+    const name = normalizeServerName(input.name);
+    if (!name)
+        return { ok: false, error: "Name is required" };
+    const urlCheck = validateRemoteUrl(input.url);
+    if (!urlCheck.ok)
+        return { ok: false, error: urlCheck.error ?? "Bad URL" };
+    const existing = await readList(scope, scopeId);
+    if (existing.some((s) => s.name === name)) {
+        return { ok: false, error: `A server named "${name}" already exists` };
+    }
+    const server = {
+        id: `mcps_${shortId()}`,
+        name,
+        url: urlCheck.url.toString(),
+        headers: input.headers && Object.keys(input.headers).length > 0
+            ? { ...input.headers }
+            : undefined,
+        description: input.description?.trim() || undefined,
+        createdAt: Date.now(),
+    };
+    await writeList(scope, scopeId, [...existing, server]);
+    return { ok: true, server };
+}
+export async function removeRemoteServer(scope, scopeId, id) {
+    const existing = await readList(scope, scopeId);
+    const next = existing.filter((s) => s.id !== id);
+    if (next.length === existing.length)
+        return false;
+    if (next.length === 0) {
+        if (scope === "user") {
+            await deleteUserSetting(scopeId, SETTINGS_KEY);
+        }
+        else {
+            await deleteOrgSetting(scopeId, SETTINGS_KEY);
+        }
+    }
+    else {
+        await writeList(scope, scopeId, next);
+    }
+    return true;
+}
+/**
+ * Project a stored server into the runtime `McpHttpServerConfig` shape that
+ * `McpClientManager` consumes. The merged-config key is the scope + name
+ * so a user-scope and org-scope server can both share a readable name
+ * without clobbering each other.
+ */
+export function toHttpServerConfig(stored) {
+    return {
+        type: "http",
+        url: stored.url,
+        headers: stored.headers,
+        description: stored.description,
+    };
+}
+/**
+ * Build the merged-config key for a stored server.
+ *
+ * The key encodes the owning scope + owner identity so two users adding a
+ * server called `zapier` produce distinct ids (`user_ab12cd34ef_zapier` vs
+ * `user_99aa88bb77_zapier`) and Alice's tool calls never route through Bob's
+ * credentials in a shared-process deployment.
+ *
+ * - User scope: `user_<emailhash>_<name>`
+ * - Org scope:  `org_<orgId>_<name>`
+ *
+ * `ownerId` is the raw email for user scope, and the org id for org scope.
+ */
+export function mergedConfigKey(scope, stored, ownerId) {
+    const owner = scope === "user" ? hashEmail(ownerId) : sanitiseOrgId(ownerId);
+    return `${scope}_${owner}_${stored.name}`;
+}
+/**
+ * Parse a merged key (or a full prefixed tool name like
+ * `mcp__user_abcd1234ef_zapier__run-task`) back into its scope + owner + name
+ * components. Returns null for non-merged keys (e.g. stdio file-config servers
+ * like `claude-in-chrome`) so callers can treat them as always-visible.
+ *
+ * `hub_<orgId>_<name>` entries (pulled from a remote hub via
+ * `hub-client.ts`) project to `scope: "org"` so they pass through the same
+ * per-request visibility gate as locally-stored org servers — the tool is
+ * only visible to requests whose active org matches the hub entry's org.
+ */
+export function parseMergedKey(keyOrToolName) {
+    let key = keyOrToolName;
+    if (key.startsWith("mcp__")) {
+        const rest = key.slice("mcp__".length);
+        const idx = rest.indexOf("__");
+        key = idx >= 0 ? rest.slice(0, idx) : rest;
+    }
+    const m = /^(user|org|hub)_([^_]+)_(.+)$/.exec(key);
+    if (!m)
+        return null;
+    const prefix = m[1];
+    // Hub-sourced servers are scoped to the org they came from — treat them
+    // as org-scope for visibility purposes (see isMcpToolAllowedForRequest).
+    const scope = prefix === "user" ? "user" : "org";
+    return {
+        scope,
+        owner: m[2],
+        name: m[3],
+    };
+}
+//# sourceMappingURL=remote-store.js.map

package/dist/mcp-client/remote-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote-store.js","sourceRoot":"","sources":["../../src/mcp-client/remote-store.ts"],"names":[],"mappings":"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"}

package/dist/mcp-client/routes.d.ts

@@ -0,0 +1,55 @@
+/**
+ * HTTP routes for user- and org-scope remote MCP server management.
+ *
+ * Mounted under `/_agent-native/mcp/servers` by `agent-chat-plugin` —
+ * requires a reference to the running `McpClientManager` so mutations can
+ * hot-reload the configured server set.
+ *
+ *   GET    /_agent-native/mcp/servers           list user + org servers
+ *   POST   /_agent-native/mcp/servers           add a server
+ *   DELETE /_agent-native/mcp/servers/:id       remove a server (scope via ?scope=)
+ *   POST   /_agent-native/mcp/servers/:id/test  dry-run connect (no persist)
+ *   POST   /_agent-native/mcp/servers/test      dry-run a URL before persisting
+ */
+import type { McpClientManager } from "./manager.js";
+import type { McpConfig } from "./config.js";
+import { type RemoteMcpScope } from "./remote-store.js";
+export interface ClientServer {
+    id: string;
+    scope: RemoteMcpScope;
+    name: string;
+    url: string;
+    headers?: Record<string, {
+        set: true;
+    }>;
+    description?: string;
+    createdAt: number;
+    /** The key under which this server is registered in the running MCP manager. */
+    mergedId: string;
+    status: ServerStatus;
+}
+type ServerStatus = {
+    state: "connected";
+    toolCount: number;
+} | {
+    state: "error";
+    error: string;
+} | {
+    state: "unknown";
+};
+/**
+ * Build the merged MCP config the manager should run with: file/env config
+ * plus **every** user-scope and org-scope remote server persisted in the
+ * settings store. Scanning all scopes means a mutation from one user's
+ * session never drops another user's servers from the running manager.
+ *
+ * Each persisted server's merged key includes its owner discriminator
+ * (`user_<emailhash>_<name>` or `org_<orgId>_<name>`) so two users' servers
+ * with the same name coexist; the request-time gate in
+ * `isMcpToolAllowedForRequest` then scopes tool visibility back down to the
+ * calling user.
+ */
+export declare function buildMergedConfig(): Promise<McpConfig | null>;
+export declare function mountMcpServersRoutes(nitroApp: any, manager: McpClientManager): void;
+export {};
+//# sourceMappingURL=routes.d.ts.map

package/dist/mcp-client/routes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/mcp-client/routes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAeH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,SAAS,EAAmB,MAAM,aAAa,CAAC;AAE9D,OAAO,EAOL,KAAK,cAAc,EAEpB,MAAM,mBAAmB,CAAC;AAgC3B,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,cAAc,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,gFAAgF;IAChF,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,YAAY,CAAC;CACtB;AAED,KAAK,YAAY,GACb;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACzC;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AAiBzB;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA4CnE;AAoCD,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE,gBAAgB,GACxB,IAAI,CAiDN"}

package/dist/mcp-client/routes.js

@@ -0,0 +1,384 @@
+/**
+ * HTTP routes for user- and org-scope remote MCP server management.
+ *
+ * Mounted under `/_agent-native/mcp/servers` by `agent-chat-plugin` —
+ * requires a reference to the running `McpClientManager` so mutations can
+ * hot-reload the configured server set.
+ *
+ *   GET    /_agent-native/mcp/servers           list user + org servers
+ *   POST   /_agent-native/mcp/servers           add a server
+ *   DELETE /_agent-native/mcp/servers/:id       remove a server (scope via ?scope=)
+ *   POST   /_agent-native/mcp/servers/:id/test  dry-run connect (no persist)
+ *   POST   /_agent-native/mcp/servers/test      dry-run a URL before persisting
+ */
+import { defineEventHandler, getMethod, getQuery, setResponseHeader, setResponseStatus, } from "h3";
+import { getH3App } from "../server/framework-request-handler.js";
+import { readBody } from "../server/h3-helpers.js";
+import { getOrgContext } from "../org/context.js";
+import { getSession } from "../server/auth.js";
+import { getAllSettings } from "../settings/store.js";
+import { loadMcpConfig, autoDetectMcpConfig } from "./config.js";
+import { addRemoteServer, listRemoteServers, mergedConfigKey, removeRemoteServer, toHttpServerConfig, validateRemoteUrl, } from "./remote-store.js";
+import { fetchHubServers } from "./hub-client.js";
+/** Redact obvious auth header values before sending to the client. */
+function redactHeaders(headers) {
+    if (!headers)
+        return undefined;
+    const out = {};
+    for (const k of Object.keys(headers))
+        out[k] = { set: true };
+    return out;
+}
+function projectForClient(stored, scope, ownerId, status) {
+    return {
+        id: stored.id,
+        scope,
+        name: stored.name,
+        url: stored.url,
+        headers: redactHeaders(stored.headers),
+        description: stored.description,
+        createdAt: stored.createdAt,
+        mergedId: mergedConfigKey(scope, stored, ownerId),
+        status,
+    };
+}
+function statusFor(manager, mergedId) {
+    const snap = manager.getStatus();
+    if (snap.connectedServers.includes(mergedId)) {
+        const toolCount = snap.tools.filter((t) => t.source === mergedId).length;
+        return { state: "connected", toolCount };
+    }
+    if (snap.errors[mergedId]) {
+        return { state: "error", error: snap.errors[mergedId] };
+    }
+    if (snap.configuredServers.includes(mergedId)) {
+        return { state: "unknown" };
+    }
+    return { state: "unknown" };
+}
+/**
+ * Build the merged MCP config the manager should run with: file/env config
+ * plus **every** user-scope and org-scope remote server persisted in the
+ * settings store. Scanning all scopes means a mutation from one user's
+ * session never drops another user's servers from the running manager.
+ *
+ * Each persisted server's merged key includes its owner discriminator
+ * (`user_<emailhash>_<name>` or `org_<orgId>_<name>`) so two users' servers
+ * with the same name coexist; the request-time gate in
+ * `isMcpToolAllowedForRequest` then scopes tool visibility back down to the
+ * calling user.
+ */
+export async function buildMergedConfig() {
+    const base = loadMcpConfig() ?? autoDetectMcpConfig();
+    const servers = { ...(base?.servers ?? {}) };
+    const all = await getAllSettings().catch(() => ({}));
+    for (const [fullKey, value] of Object.entries(all)) {
+        const userMatch = /^u:([^:]+):mcp-servers-remote$/.exec(fullKey);
+        const orgMatch = /^o:([^:]+):mcp-servers-remote$/.exec(fullKey);
+        let scope = null;
+        let ownerId = null;
+        if (userMatch) {
+            scope = "user";
+            ownerId = userMatch[1];
+        }
+        else if (orgMatch) {
+            scope = "org";
+            ownerId = orgMatch[1];
+        }
+        if (!scope || !ownerId)
+            continue;
+        const list = value.servers;
+        if (!Array.isArray(list))
+            continue;
+        for (const stored of list) {
+            if (!stored || typeof stored.url !== "string" || !stored.name)
+                continue;
+            servers[mergedConfigKey(scope, stored, ownerId)] =
+                toHttpServerConfig(stored);
+        }
+    }
+    // Hub-consume: if this app is configured to consume from a remote hub
+    // (AGENT_NATIVE_MCP_HUB_URL + AGENT_NATIVE_MCP_HUB_TOKEN), pull its
+    // org-scope servers and merge. Hub entries use `hub_<orgId>_<name>` so
+    // they never collide with local `org_<orgId>_<name>` rows.
+    try {
+        const hubServers = await fetchHubServers();
+        for (const [mergedKey, cfg] of Object.entries(hubServers)) {
+            servers[mergedKey] = cfg;
+        }
+    }
+    catch (err) {
+        console.warn(`[mcp-client] hub merge failed: ${err?.message ?? err}. Continuing with local config.`);
+    }
+    if (Object.keys(servers).length === 0)
+        return null;
+    return { servers, source: base?.source ?? "merged" };
+}
+async function resolveContextForRequest(event) {
+    let email = null;
+    try {
+        const session = await getSession(event);
+        email = session?.email ?? null;
+    }
+    catch {
+        email = null;
+    }
+    let orgId = null;
+    let role = null;
+    try {
+        const ctx = await getOrgContext(event);
+        orgId = ctx.orgId;
+        role = ctx.role;
+        if (!email)
+            email = ctx.email;
+    }
+    catch {
+        // ignore — no org context
+    }
+    // In solo/dev mode `getSession` can return nothing but getOrgContext still
+    // yields the fallback email. Keep that as the user-scope id so single-user
+    // desktop installs work without a login flow.
+    if (!email)
+        email = "local@localhost";
+    return { email, orgId, role };
+}
+async function reconfigureManager(manager) {
+    const merged = await buildMergedConfig();
+    await manager.reconfigure(merged);
+}
+export function mountMcpServersRoutes(nitroApp, manager) {
+    if (globalThis.__agentNativeMcpServersMounted)
+        return;
+    globalThis.__agentNativeMcpServersMounted = true;
+    try {
+        getH3App(nitroApp).use("/_agent-native/mcp/servers", defineEventHandler(async (event) => {
+            const method = getMethod(event);
+            const pathname = (event.url?.pathname || "")
+                .replace(/^\/+/, "")
+                .replace(/\/+$/, "");
+            const parts = pathname ? pathname.split("/") : [];
+            setResponseHeader(event, "Content-Type", "application/json");
+            // POST /servers/test — dry-run a URL+headers before persisting
+            if (method === "POST" && parts.length === 1 && parts[0] === "test") {
+                return handleTestUrl(event);
+            }
+            // Collection root
+            if (parts.length === 0) {
+                if (method === "GET")
+                    return handleList(event, manager);
+                if (method === "POST")
+                    return handleAdd(event, manager);
+                setResponseStatus(event, 405);
+                return { error: "Method not allowed" };
+            }
+            // /:id  /  /:id/test
+            if (parts.length === 1 || parts.length === 2) {
+                const id = parts[0];
+                if (parts.length === 2 && parts[1] === "test" && method === "POST") {
+                    return handleTestExisting(event, manager, id);
+                }
+                if (parts.length === 1 && method === "DELETE") {
+                    return handleDelete(event, manager, id);
+                }
+            }
+            setResponseStatus(event, 404);
+            return { error: "Not found" };
+        }));
+    }
+    catch (err) {
+        console.warn(`[mcp-client] Failed to mount /_agent-native/mcp/servers: ${err?.message ?? err}`);
+    }
+}
+async function handleList(event, manager) {
+    const { email, orgId, role } = await resolveContextForRequest(event);
+    const userServers = email ? await listRemoteServers("user", email) : [];
+    const orgServers = orgId ? await listRemoteServers("org", orgId) : [];
+    return {
+        user: userServers.map((s) => projectForClient(s, "user", email ?? "", statusFor(manager, mergedConfigKey("user", s, email ?? "")))),
+        org: orgServers.map((s) => projectForClient(s, "org", orgId ?? "", statusFor(manager, mergedConfigKey("org", s, orgId ?? "")))),
+        orgId,
+        role,
+    };
+}
+async function handleAdd(event, manager) {
+    const body = (await readBody(event).catch(() => ({})));
+    const scope = body.scope === "org" ? "org" : body.scope === "user" ? "user" : null;
+    if (!scope) {
+        setResponseStatus(event, 400);
+        return { error: 'scope must be "user" or "org"' };
+    }
+    const name = typeof body.name === "string" ? body.name : "";
+    const url = typeof body.url === "string" ? body.url : "";
+    if (!name.trim() || !url.trim()) {
+        setResponseStatus(event, 400);
+        return { error: "name and url are required" };
+    }
+    const headers = normalizeHeaders(body.headers);
+    const description = typeof body.description === "string" ? body.description : undefined;
+    const { email, orgId, role } = await resolveContextForRequest(event);
+    let scopeId = null;
+    if (scope === "user") {
+        scopeId = email;
+    }
+    else {
+        if (!orgId) {
+            setResponseStatus(event, 400);
+            return {
+                error: "You must belong to an organization to add an org-scope server",
+            };
+        }
+        if (role !== "owner" && role !== "admin") {
+            setResponseStatus(event, 403);
+            return { error: "Only owners and admins can add org-scope MCP servers" };
+        }
+        scopeId = orgId;
+    }
+    if (!scopeId) {
+        setResponseStatus(event, 401);
+        return { error: "Authentication required" };
+    }
+    const result = await addRemoteServer(scope, scopeId, {
+        name,
+        url,
+        headers,
+        description,
+    });
+    if (result.ok !== true) {
+        setResponseStatus(event, 400);
+        return { error: result.error };
+    }
+    await reconfigureManager(manager);
+    const mergedId = mergedConfigKey(scope, result.server, scopeId);
+    return {
+        ok: true,
+        server: projectForClient(result.server, scope, scopeId, statusFor(manager, mergedId)),
+    };
+}
+async function handleDelete(event, manager, id) {
+    const scope = getQuery(event).scope;
+    const parsedScope = scope === "org" ? "org" : scope === "user" ? "user" : null;
+    if (!parsedScope) {
+        setResponseStatus(event, 400);
+        return { error: 'scope query param must be "user" or "org"' };
+    }
+    const { email, orgId, role } = await resolveContextForRequest(event);
+    let scopeId = null;
+    if (parsedScope === "user") {
+        scopeId = email;
+    }
+    else {
+        if (!orgId) {
+            setResponseStatus(event, 400);
+            return { error: "No active organization" };
+        }
+        if (role !== "owner" && role !== "admin") {
+            setResponseStatus(event, 403);
+            return {
+                error: "Only owners and admins can remove org-scope MCP servers",
+            };
+        }
+        scopeId = orgId;
+    }
+    if (!scopeId) {
+        setResponseStatus(event, 401);
+        return { error: "Authentication required" };
+    }
+    const removed = await removeRemoteServer(parsedScope, scopeId, id);
+    if (!removed) {
+        setResponseStatus(event, 404);
+        return { error: "Server not found" };
+    }
+    await reconfigureManager(manager);
+    return { ok: true };
+}
+async function handleTestUrl(event) {
+    const body = (await readBody(event).catch(() => ({})));
+    const url = typeof body.url === "string" ? body.url : "";
+    const check = validateRemoteUrl(url);
+    if (!check.ok) {
+        setResponseStatus(event, 400);
+        return { ok: false, error: check.error };
+    }
+    const headers = normalizeHeaders(body.headers);
+    const result = await tryConnect(check.url.toString(), headers);
+    if (result.ok !== true) {
+        setResponseStatus(event, 400);
+        return { ok: false, error: result.error };
+    }
+    return { ok: true, toolCount: result.toolCount, tools: result.tools };
+}
+async function handleTestExisting(event, manager, id) {
+    const scope = getQuery(event).scope;
+    const parsedScope = scope === "org" ? "org" : scope === "user" ? "user" : null;
+    if (!parsedScope) {
+        setResponseStatus(event, 400);
+        return { error: 'scope query param must be "user" or "org"' };
+    }
+    const { email, orgId } = await resolveContextForRequest(event);
+    const scopeId = parsedScope === "user" ? email : orgId;
+    if (!scopeId) {
+        setResponseStatus(event, 401);
+        return { error: "Authentication required" };
+    }
+    const list = await listRemoteServers(parsedScope, scopeId);
+    const server = list.find((s) => s.id === id);
+    if (!server) {
+        setResponseStatus(event, 404);
+        return { error: "Server not found" };
+    }
+    const result = await tryConnect(server.url, server.headers);
+    if (result.ok !== true) {
+        setResponseStatus(event, 400);
+        return { ok: false, error: result.error };
+    }
+    return { ok: true, toolCount: result.toolCount, tools: result.tools };
+}
+async function tryConnect(url, headers) {
+    try {
+        const [{ Client }, { StreamableHTTPClientTransport }] = await Promise.all([
+            import("@modelcontextprotocol/sdk/client/index.js"),
+            import("@modelcontextprotocol/sdk/client/streamableHttp.js"),
+        ]);
+        const requestInit = {};
+        if (headers && Object.keys(headers).length > 0) {
+            requestInit.headers = headers;
+        }
+        const transport = new StreamableHTTPClientTransport(new URL(url), {
+            requestInit,
+        });
+        const client = new Client({ name: "agent-native-mcp-client-test", version: "1.0.0" }, { capabilities: {} });
+        try {
+            await client.connect(transport);
+            const listed = await client.listTools();
+            const names = (listed?.tools ?? []).map((t) => t.name);
+            return { ok: true, toolCount: names.length, tools: names };
+        }
+        finally {
+            try {
+                await client.close();
+            }
+            catch { }
+            try {
+                await transport.close();
+            }
+            catch { }
+        }
+    }
+    catch (err) {
+        return { ok: false, error: err?.message ?? String(err) };
+    }
+}
+function normalizeHeaders(input) {
+    if (!input || typeof input !== "object")
+        return undefined;
+    const out = {};
+    for (const [k, v] of Object.entries(input)) {
+        if (typeof k !== "string" || !k.trim())
+            continue;
+        if (typeof v !== "string")
+            continue;
+        out[k.trim()] = v;
+    }
+    return Object.keys(out).length > 0 ? out : undefined;
+}
+//# sourceMappingURL=routes.js.map