@agent-native/core 0.105.0 → 0.106.0

package/dist/mcp-client/oauth-routes.js

@@ -0,0 +1,218 @@
+import crypto from "node:crypto";
+import { deleteCookie, defineEventHandler, getCookie, getMethod, getQuery, setCookie, setResponseStatus, } from "h3";
+import { getOrgContext } from "../org/context.js";
+import { decryptSecretValue, encryptSecretValue } from "../secrets/crypto.js";
+import { getSession, safeReturnPath } from "../server/auth.js";
+import { getH3App } from "../server/framework-request-handler.js";
+import { getAppUrl, resolveOAuthRedirectUri } from "../server/google-oauth.js";
+import { runWithRequestContext } from "../server/request-context.js";
+import { finishMcpOAuthAuthorization, startMcpOAuthAuthorization, } from "./oauth-client.js";
+import { addOAuthRemoteServer, normalizeServerName, validateRemoteUrl, } from "./remote-store.js";
+const FLOW_COOKIE = "an_mcp_oauth_flow";
+const FLOW_TTL_SECONDS = 10 * 60;
+export function mountMcpOAuthRoutes(nitroApp, options) {
+    const mountedApps = (globalThis.__agentNativeMcpOAuthMountedApps ??= new WeakSet());
+    if (mountedApps.has(nitroApp))
+        return;
+    mountedApps.add(nitroApp);
+    getH3App(nitroApp).use("/_agent-native/mcp/servers/oauth", defineEventHandler(async (event) => {
+        const method = getMethod(event);
+        const pathname = (event.url?.pathname || "")
+            .replace(/^\/+/, "")
+            .replace(/\/+$/, "");
+        const parts = pathname ? pathname.split("/") : [];
+        if (method !== "GET") {
+            setResponseStatus(event, 405);
+            return { error: "Method not allowed" };
+        }
+        if (parts.length === 1 && parts[0] === "start") {
+            return handleMcpOAuthStart(event);
+        }
+        if (parts.length === 1 && parts[0] === "callback") {
+            return handleMcpOAuthCallback(event, options);
+        }
+        setResponseStatus(event, 404);
+        return { error: "Not found" };
+    }));
+}
+async function handleMcpOAuthStart(event) {
+    const session = await getSession(event).catch(() => null);
+    if (!session?.email)
+        return unauthorized(event);
+    const query = getQuery(event);
+    const rawUrl = text(query.url);
+    const rawName = text(query.name);
+    const returnUrl = text(query.return);
+    if (!rawUrl || !rawName) {
+        setResponseStatus(event, 400);
+        return { error: "MCP OAuth requires a server name and URL." };
+    }
+    const urlCheck = validateRemoteUrl(rawUrl);
+    if (!urlCheck.ok) {
+        setResponseStatus(event, 400);
+        return { error: urlCheck.error ?? "MCP server URL is not allowed." };
+    }
+    const name = normalizeServerName(rawName);
+    if (!name) {
+        setResponseStatus(event, 400);
+        return { error: "MCP server name is invalid." };
+    }
+    const requestedScope = query.scope === "org" ? "org" : "user";
+    const requestedOrgId = text(query.orgId);
+    const org = requestedScope === "org"
+        ? await getOrgContext(event).catch(() => null)
+        : null;
+    const scope = requestedScope;
+    const scopeId = scope === "user" ? session.email : (org?.orgId ?? "");
+    if (scope === "org" && requestedOrgId && requestedOrgId !== scopeId) {
+        setResponseStatus(event, 403);
+        return {
+            error: "The selected organization is not the active organization.",
+        };
+    }
+    if (scope === "org" && (!scopeId || !isOrgAdmin(org?.role))) {
+        setResponseStatus(event, scopeId ? 403 : 400);
+        return {
+            error: scopeId
+                ? "Only organization owners and admins can connect an org MCP server."
+                : "Join an organization before connecting an org MCP server.",
+        };
+    }
+    const redirectUri = resolveOAuthRedirectUri(event, "/_agent-native/mcp/servers/oauth/callback");
+    if (!redirectUri) {
+        setResponseStatus(event, 400);
+        return { error: "Invalid MCP OAuth redirect URI." };
+    }
+    const state = crypto.randomUUID();
+    const safeReturnUrl = returnUrl ? safeReturnPath(returnUrl) : undefined;
+    try {
+        const started = await runWithRequestContext({ userEmail: session.email, orgId: org?.orgId ?? undefined }, () => startMcpOAuthAuthorization({
+            serverUrl: urlCheck.url.toString(),
+            redirectUrl: redirectUri,
+            state,
+        }));
+        const flow = {
+            name,
+            url: urlCheck.url.toString(),
+            description: text(query.description),
+            scope,
+            scopeId,
+            owner: session.email,
+            ...(org?.orgId ? { orgId: org.orgId } : {}),
+            redirectUri,
+            state: started.state,
+            codeVerifier: started.codeVerifier,
+            clientInformation: started.clientInformation,
+            ...(started.discoveryState
+                ? { discoveryState: started.discoveryState }
+                : {}),
+            ...(safeReturnUrl ? { returnUrl: safeReturnUrl } : {}),
+            expiresAt: Date.now() + FLOW_TTL_SECONDS * 1_000,
+        };
+        setCookie(event, FLOW_COOKIE, encryptSecretValue(JSON.stringify(flow)), {
+            httpOnly: true,
+            secure: redirectUri.startsWith("https://"),
+            sameSite: "lax",
+            path: "/",
+            maxAge: FLOW_TTL_SECONDS,
+        });
+        return Response.redirect(started.authorizationUrl.href, 302);
+    }
+    catch {
+        setResponseStatus(event, 400);
+        return {
+            error: "This MCP server could not start OAuth. It may not support standard MCP OAuth discovery or dynamic client registration.",
+        };
+    }
+}
+async function handleMcpOAuthCallback(event, options) {
+    const session = await getSession(event).catch(() => null);
+    if (!session?.email)
+        return unauthorized(event);
+    const query = getQuery(event);
+    const code = text(query.code);
+    const state = text(query.state);
+    const providerError = text(query.error);
+    const flow = readFlow(event);
+    deleteCookie(event, FLOW_COOKIE, { path: "/" });
+    if (providerError || !code || !state) {
+        setResponseStatus(event, 400);
+        return { error: "MCP OAuth authorization was not completed." };
+    }
+    const org = flow?.scope === "org" ? await getOrgContext(event).catch(() => null) : null;
+    if (!flow ||
+        !isValidMcpOAuthFlow(flow, session.email, org?.orgId ?? undefined, state)) {
+        setResponseStatus(event, 400);
+        return { error: "MCP OAuth state is invalid or expired." };
+    }
+    if (flow.scope === "org" && !isOrgAdmin(org?.role)) {
+        setResponseStatus(event, 403);
+        return {
+            error: "Only organization owners and admins can connect an org MCP server.",
+        };
+    }
+    try {
+        const finished = await runWithRequestContext({ userEmail: session.email, orgId: org?.orgId ?? undefined }, () => finishMcpOAuthAuthorization({
+            serverUrl: flow.url,
+            redirectUrl: flow.redirectUri,
+            state: flow.state,
+            clientInformation: flow.clientInformation,
+            codeVerifier: flow.codeVerifier,
+            discoveryState: flow.discoveryState,
+            authorizationCode: code,
+        }));
+        const result = await addOAuthRemoteServer(flow.scope, flow.scopeId, {
+            name: flow.name,
+            url: flow.url,
+            description: flow.description,
+            credentials: finished.credentials,
+        });
+        if (!result.ok) {
+            setResponseStatus(event, 400);
+            return { error: result.error };
+        }
+        await options.reconfigure();
+        const returnPath = flow.returnUrl ??
+            `/settings/connections?connected=mcp-${encodeURIComponent(flow.name)}`;
+        return Response.redirect(getAppUrl(event, returnPath), 302);
+    }
+    catch {
+        setResponseStatus(event, 400);
+        return { error: "MCP OAuth authorization could not be completed." };
+    }
+}
+function readFlow(event) {
+    const encrypted = getCookie(event, FLOW_COOKIE);
+    if (!encrypted)
+        return null;
+    try {
+        const parsed = JSON.parse(decryptSecretValue(encrypted));
+        return parsed && typeof parsed === "object" ? parsed : null;
+    }
+    catch {
+        return null;
+    }
+}
+export function isValidMcpOAuthFlow(flow, email, orgId, state) {
+    const scopeMatches = flow.scope === "user"
+        ? flow.scopeId === email && !flow.orgId
+        : flow.scope === "org" && flow.scopeId === orgId && flow.orgId === orgId;
+    return (flow.expiresAt >= Date.now() &&
+        flow.owner === email &&
+        flow.state === state &&
+        scopeMatches &&
+        typeof flow.scopeId === "string" &&
+        typeof flow.redirectUri === "string" &&
+        flow.redirectUri.includes("/_agent-native/mcp/servers/oauth/callback"));
+}
+function isOrgAdmin(role) {
+    return role === "owner" || role === "admin";
+}
+function text(value) {
+    return typeof value === "string" && value.trim() ? value.trim() : undefined;
+}
+function unauthorized(event) {
+    setResponseStatus(event, 401);
+    return { error: "Authentication required" };
+}
+//# sourceMappingURL=oauth-routes.js.map

package/dist/mcp-client/oauth-routes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-routes.js","sourceRoot":"","sources":["../../src/mcp-client/oauth-routes.ts"],"names":[],"mappings":"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","sourcesContent":["import crypto from \"node:crypto\";\n\nimport type { OAuthClientInformationMixed } from \"@modelcontextprotocol/sdk/shared/auth.js\";\nimport {\n  deleteCookie,\n  defineEventHandler,\n  getCookie,\n  getMethod,\n  getQuery,\n  setCookie,\n  setResponseStatus,\n  type H3Event,\n} from \"h3\";\n\nimport { getOrgContext } from \"../org/context.js\";\nimport { decryptSecretValue, encryptSecretValue } from \"../secrets/crypto.js\";\nimport { getSession, safeReturnPath } from \"../server/auth.js\";\nimport { getH3App } from \"../server/framework-request-handler.js\";\nimport { getAppUrl, resolveOAuthRedirectUri } from \"../server/google-oauth.js\";\nimport { runWithRequestContext } from \"../server/request-context.js\";\nimport {\n  finishMcpOAuthAuthorization,\n  startMcpOAuthAuthorization,\n  type McpOAuthDiscoveryState,\n} from \"./oauth-client.js\";\nimport {\n  addOAuthRemoteServer,\n  normalizeServerName,\n  validateRemoteUrl,\n  type RemoteMcpScope,\n} from \"./remote-store.js\";\n\nconst FLOW_COOKIE = \"an_mcp_oauth_flow\";\nconst FLOW_TTL_SECONDS = 10 * 60;\n\nexport interface McpOAuthFlow {\n  name: string;\n  url: string;\n  description?: string;\n  scope: RemoteMcpScope;\n  scopeId: string;\n  owner: string;\n  orgId?: string;\n  redirectUri: string;\n  state: string;\n  codeVerifier: string;\n  clientInformation: OAuthClientInformationMixed;\n  discoveryState?: McpOAuthDiscoveryState;\n  returnUrl?: string;\n  expiresAt: number;\n}\n\nexport interface McpOAuthRoutesOptions {\n  reconfigure: () => Promise<void>;\n}\n\nexport function mountMcpOAuthRoutes(\n  nitroApp: any,\n  options: McpOAuthRoutesOptions,\n): void {\n  const mountedApps: WeakSet<object> = ((\n    globalThis as any\n  ).__agentNativeMcpOAuthMountedApps ??= new WeakSet<object>());\n  if (mountedApps.has(nitroApp)) return;\n  mountedApps.add(nitroApp);\n\n  getH3App(nitroApp).use(\n    \"/_agent-native/mcp/servers/oauth\",\n    defineEventHandler(async (event: H3Event) => {\n      const method = getMethod(event);\n      const pathname = (event.url?.pathname || \"\")\n        .replace(/^\\/+/, \"\")\n        .replace(/\\/+$/, \"\");\n      const parts = pathname ? pathname.split(\"/\") : [];\n      if (method !== \"GET\") {\n        setResponseStatus(event, 405);\n        return { error: \"Method not allowed\" };\n      }\n      if (parts.length === 1 && parts[0] === \"start\") {\n        return handleMcpOAuthStart(event);\n      }\n      if (parts.length === 1 && parts[0] === \"callback\") {\n        return handleMcpOAuthCallback(event, options);\n      }\n      setResponseStatus(event, 404);\n      return { error: \"Not found\" };\n    }),\n  );\n}\n\nasync function handleMcpOAuthStart(\n  event: H3Event,\n): Promise<Response | Record<string, unknown>> {\n  const session = await getSession(event).catch(() => null);\n  if (!session?.email) return unauthorized(event);\n\n  const query = getQuery(event);\n  const rawUrl = text(query.url);\n  const rawName = text(query.name);\n  const returnUrl = text(query.return);\n  if (!rawUrl || !rawName) {\n    setResponseStatus(event, 400);\n    return { error: \"MCP OAuth requires a server name and URL.\" };\n  }\n  const urlCheck = validateRemoteUrl(rawUrl);\n  if (!urlCheck.ok) {\n    setResponseStatus(event, 400);\n    return { error: urlCheck.error ?? \"MCP server URL is not allowed.\" };\n  }\n  const name = normalizeServerName(rawName);\n  if (!name) {\n    setResponseStatus(event, 400);\n    return { error: \"MCP server name is invalid.\" };\n  }\n\n  const requestedScope = query.scope === \"org\" ? \"org\" : \"user\";\n  const requestedOrgId = text(query.orgId);\n  const org =\n    requestedScope === \"org\"\n      ? await getOrgContext(event).catch(() => null)\n      : null;\n  const scope: RemoteMcpScope = requestedScope;\n  const scopeId = scope === \"user\" ? session.email : (org?.orgId ?? \"\");\n  if (scope === \"org\" && requestedOrgId && requestedOrgId !== scopeId) {\n    setResponseStatus(event, 403);\n    return {\n      error: \"The selected organization is not the active organization.\",\n    };\n  }\n  if (scope === \"org\" && (!scopeId || !isOrgAdmin(org?.role))) {\n    setResponseStatus(event, scopeId ? 403 : 400);\n    return {\n      error: scopeId\n        ? \"Only organization owners and admins can connect an org MCP server.\"\n        : \"Join an organization before connecting an org MCP server.\",\n    };\n  }\n\n  const redirectUri = resolveOAuthRedirectUri(\n    event,\n    \"/_agent-native/mcp/servers/oauth/callback\",\n  );\n  if (!redirectUri) {\n    setResponseStatus(event, 400);\n    return { error: \"Invalid MCP OAuth redirect URI.\" };\n  }\n\n  const state = crypto.randomUUID();\n  const safeReturnUrl = returnUrl ? safeReturnPath(returnUrl) : undefined;\n  try {\n    const started = await runWithRequestContext(\n      { userEmail: session.email, orgId: org?.orgId ?? undefined },\n      () =>\n        startMcpOAuthAuthorization({\n          serverUrl: urlCheck.url!.toString(),\n          redirectUrl: redirectUri,\n          state,\n        }),\n    );\n    const flow: McpOAuthFlow = {\n      name,\n      url: urlCheck.url!.toString(),\n      description: text(query.description),\n      scope,\n      scopeId,\n      owner: session.email,\n      ...(org?.orgId ? { orgId: org.orgId } : {}),\n      redirectUri,\n      state: started.state,\n      codeVerifier: started.codeVerifier,\n      clientInformation: started.clientInformation,\n      ...(started.discoveryState\n        ? { discoveryState: started.discoveryState }\n        : {}),\n      ...(safeReturnUrl ? { returnUrl: safeReturnUrl } : {}),\n      expiresAt: Date.now() + FLOW_TTL_SECONDS * 1_000,\n    };\n    setCookie(event, FLOW_COOKIE, encryptSecretValue(JSON.stringify(flow)), {\n      httpOnly: true,\n      secure: redirectUri.startsWith(\"https://\"),\n      sameSite: \"lax\",\n      path: \"/\",\n      maxAge: FLOW_TTL_SECONDS,\n    });\n    return Response.redirect(started.authorizationUrl.href, 302);\n  } catch {\n    setResponseStatus(event, 400);\n    return {\n      error:\n        \"This MCP server could not start OAuth. It may not support standard MCP OAuth discovery or dynamic client registration.\",\n    };\n  }\n}\n\nasync function handleMcpOAuthCallback(\n  event: H3Event,\n  options: McpOAuthRoutesOptions,\n): Promise<Response | Record<string, unknown>> {\n  const session = await getSession(event).catch(() => null);\n  if (!session?.email) return unauthorized(event);\n\n  const query = getQuery(event);\n  const code = text(query.code);\n  const state = text(query.state);\n  const providerError = text(query.error);\n  const flow = readFlow(event);\n  deleteCookie(event, FLOW_COOKIE, { path: \"/\" });\n  if (providerError || !code || !state) {\n    setResponseStatus(event, 400);\n    return { error: \"MCP OAuth authorization was not completed.\" };\n  }\n  const org =\n    flow?.scope === \"org\" ? await getOrgContext(event).catch(() => null) : null;\n  if (\n    !flow ||\n    !isValidMcpOAuthFlow(flow, session.email, org?.orgId ?? undefined, state)\n  ) {\n    setResponseStatus(event, 400);\n    return { error: \"MCP OAuth state is invalid or expired.\" };\n  }\n  if (flow.scope === \"org\" && !isOrgAdmin(org?.role)) {\n    setResponseStatus(event, 403);\n    return {\n      error:\n        \"Only organization owners and admins can connect an org MCP server.\",\n    };\n  }\n\n  try {\n    const finished = await runWithRequestContext(\n      { userEmail: session.email, orgId: org?.orgId ?? undefined },\n      () =>\n        finishMcpOAuthAuthorization({\n          serverUrl: flow.url,\n          redirectUrl: flow.redirectUri,\n          state: flow.state,\n          clientInformation: flow.clientInformation,\n          codeVerifier: flow.codeVerifier,\n          discoveryState: flow.discoveryState,\n          authorizationCode: code,\n        }),\n    );\n    const result = await addOAuthRemoteServer(flow.scope, flow.scopeId, {\n      name: flow.name,\n      url: flow.url,\n      description: flow.description,\n      credentials: finished.credentials,\n    });\n    if (!result.ok) {\n      setResponseStatus(event, 400);\n      return { error: result.error };\n    }\n    await options.reconfigure();\n    const returnPath =\n      flow.returnUrl ??\n      `/settings/connections?connected=mcp-${encodeURIComponent(flow.name)}`;\n    return Response.redirect(getAppUrl(event, returnPath), 302);\n  } catch {\n    setResponseStatus(event, 400);\n    return { error: \"MCP OAuth authorization could not be completed.\" };\n  }\n}\n\nfunction readFlow(event: H3Event): McpOAuthFlow | null {\n  const encrypted = getCookie(event, FLOW_COOKIE);\n  if (!encrypted) return null;\n  try {\n    const parsed = JSON.parse(decryptSecretValue(encrypted)) as McpOAuthFlow;\n    return parsed && typeof parsed === \"object\" ? parsed : null;\n  } catch {\n    return null;\n  }\n}\n\nexport function isValidMcpOAuthFlow(\n  flow: McpOAuthFlow,\n  email: string,\n  orgId: string | undefined,\n  state: string,\n): boolean {\n  const scopeMatches =\n    flow.scope === \"user\"\n      ? flow.scopeId === email && !flow.orgId\n      : flow.scope === \"org\" && flow.scopeId === orgId && flow.orgId === orgId;\n  return (\n    flow.expiresAt >= Date.now() &&\n    flow.owner === email &&\n    flow.state === state &&\n    scopeMatches &&\n    typeof flow.scopeId === \"string\" &&\n    typeof flow.redirectUri === \"string\" &&\n    flow.redirectUri.includes(\"/_agent-native/mcp/servers/oauth/callback\")\n  );\n}\n\nfunction isOrgAdmin(role: unknown): boolean {\n  return role === \"owner\" || role === \"admin\";\n}\n\nfunction text(value: unknown): string | undefined {\n  return typeof value === \"string\" && value.trim() ? value.trim() : undefined;\n}\n\nfunction unauthorized(event: H3Event) {\n  setResponseStatus(event, 401);\n  return { error: \"Authentication required\" };\n}\n"]}

package/dist/mcp-client/remote-store.d.ts

@@ -20,6 +20,8 @@
  * re-saved to migrate.
  */
 import type { McpHttpServerConfig } from "./config.js";
+import { type McpOAuthCredentialBundle } from "./oauth-client.js";
+export { validateRemoteUrl } from "./remote-url.js";
 export type RemoteMcpScope = "user" | "org";
 export interface StoredRemoteMcpServer {
     /** Stable unique id — used for removal / URLs. */
@@ -43,6 +45,8 @@ export interface StoredRemoteMcpServer {
      * supplied (or for legacy cleartext rows).
      */
     headerSecretKey?: string;
+    /** Reference to the encrypted OAuth credential bundle for this server. */
+    oauthSecretKey?: string;
     /**
      * Trusted first-party Agent-Native app. Only framework-controlled
      * registrations should set this; management routes intentionally do not
@@ -72,12 +76,6 @@ export declare function normalizeServerName(input: string): string;
  * name don't collide in the global MCP manager.
  */
 export declare function hashEmail(email: string): string;
-/** Reject obviously-wrong URLs. Allows http only for localhost. */
-export declare function validateRemoteUrl(raw: string): {
-    ok: boolean;
-    url?: URL;
-    error?: string;
-};
 export declare function listRemoteServers(scope: RemoteMcpScope, scopeId: string): Promise<StoredRemoteMcpServer[]>;
 export declare function addRemoteServer(scope: RemoteMcpScope, scopeId: string, input: {
     name: string;
@@ -92,6 +90,23 @@ export declare function addRemoteServer(scope: RemoteMcpScope, scopeId: string,
     ok: false;
     error: string;
 }>;
+/**
+ * Persist a remote MCP server whose authorization is managed by the MCP
+ * server's OAuth 2.1 metadata and token endpoints. OAuth credentials are
+ * stored separately from the settings row and never returned to clients.
+ */
+export declare function addOAuthRemoteServer(scope: RemoteMcpScope, scopeId: string, input: {
+    name: string;
+    url: string;
+    description?: string;
+    credentials: McpOAuthCredentialBundle;
+}): Promise<{
+    ok: true;
+    server: StoredRemoteMcpServer;
+} | {
+    ok: false;
+    error: string;
+}>;
 export declare function addFirstPartyRemoteServer(orgId: string, input: {
     appId: string;
     name: string;

package/dist/mcp-client/remote-store.d.ts.map

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

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

@@ -23,6 +23,9 @@ import { createHash } from "node:crypto";
 import { writeAppSecret, readAppSecret, deleteAppSecret, } from "../secrets/storage.js";
 import { getOrgSetting, putOrgSetting, deleteOrgSetting, } from "../settings/org-settings.js";
 import { getUserSetting, putUserSetting, deleteUserSetting, } from "../settings/user-settings.js";
+import { deleteMcpOAuthCredentials, getMcpOAuthAccessToken, saveMcpOAuthCredentials, } from "./oauth-client.js";
+import { validateRemoteUrl } from "./remote-url.js";
+export { validateRemoteUrl } from "./remote-url.js";
 const SETTINGS_KEY = "mcp-servers-remote";
 function toSecretScope(scope) {
     return scope === "user" ? "user" : "workspace";
@@ -103,129 +106,6 @@ export function hashEmail(email) {
 function sanitiseOrgId(orgId) {
     return orgId.toLowerCase().replace(/[^a-z0-9-]/g, "-");
 }
-/**
- * Hostname patterns that are always rejected to prevent SSRF via DNS rebinding
- * or well-known internal service names.
- */
-const BLOCKED_HOSTNAME_PATTERNS = [
-    /^localhost$/i,
-    /\.localhost$/i,
-    /\.local$/i,
-    /\.internal$/i,
-    // DNS rebind services
-    /\.nip\.io$/i,
-    /\.sslip\.io$/i,
-    /\.xip\.io$/i,
-    /\.localtest\.me$/i,
-    /\.lvh\.me$/i,
-    // Cloud metadata hosts
-    /^metadata\.google\.internal$/i,
-    /^instance-data$/i,
-];
-/** Literal IPs that are always rejected (cloud metadata endpoints). */
-const BLOCKED_IPS = new Set([
-    "169.254.169.254", // AWS/GCP/Azure IMDS
-    "100.100.100.200", // Alibaba Cloud metadata
-    "::1",
-]);
-/** Parse a dotted-decimal IPv4 string to a 32-bit integer for range checks. */
-function ipv4ToInt(ip) {
-    const parts = ip.split(".");
-    if (parts.length !== 4)
-        return null;
-    let n = 0;
-    for (const part of parts) {
-        const byte = parseInt(part, 10);
-        if (isNaN(byte) || byte < 0 || byte > 255)
-            return null;
-        n = (n << 8) | byte;
-    }
-    return n >>> 0;
-}
-function isPrivateIpv4(hostname) {
-    const n = ipv4ToInt(hostname);
-    if (n === null)
-        return false;
-    // 10.0.0.0/8
-    if ((n & 0xff000000) >>> 0 === 0x0a000000)
-        return true;
-    // 172.16.0.0/12
-    if ((n & 0xfff00000) >>> 0 === 0xac100000)
-        return true;
-    // 192.168.0.0/16
-    if ((n & 0xffff0000) >>> 0 === 0xc0a80000)
-        return true;
-    // 169.254.0.0/16 (link-local, includes AWS/GCP metadata)
-    if ((n & 0xffff0000) >>> 0 === 0xa9fe0000)
-        return true;
-    // 127.0.0.0/8 (loopback)
-    if ((n & 0xff000000) >>> 0 === 0x7f000000)
-        return true;
-    return false;
-}
-function isBlockedHostname(hostname) {
-    const normalized = hostname.toLowerCase().replace(/^\[|\]$/g, "");
-    if (BLOCKED_IPS.has(normalized))
-        return true;
-    if (isPrivateIpv4(normalized))
-        return true;
-    // IPv6 ULA (fc00::/7) and link-local (fe80::/10)
-    if (normalized === "::1")
-        return true;
-    if (normalized.startsWith("fc") || normalized.startsWith("fd"))
-        return true;
-    if (normalized.startsWith("fe80"))
-        return true;
-    if (normalized.startsWith("::ffff:")) {
-        const mapped = normalized.slice("::ffff:".length);
-        if (isPrivateIpv4(mapped))
-            return true;
-        const hexMatch = /^([0-9a-f]{1,4}):([0-9a-f]{1,4})$/i.exec(mapped);
-        if (hexMatch) {
-            const value = (parseInt(hexMatch[1], 16) << 16) | parseInt(hexMatch[2], 16);
-            const dotted = [
-                (value >>> 24) & 0xff,
-                (value >>> 16) & 0xff,
-                (value >>> 8) & 0xff,
-                value & 0xff,
-            ].join(".");
-            if (isPrivateIpv4(dotted))
-                return true;
-        }
-    }
-    for (const pattern of BLOCKED_HOSTNAME_PATTERNS) {
-        if (pattern.test(normalized))
-            return true;
-    }
-    return false;
-}
-/** 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:") {
-        if (isBlockedHostname(url.hostname)) {
-            return {
-                ok: false,
-                error: `Host "${url.hostname}" is not allowed (private/internal address)`,
-            };
-        }
-        return { ok: true, url };
-    }
-    if (url.protocol === "http:") {
-        const host = url.hostname;
-        if (host === "localhost" || host === "127.0.0.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)
@@ -254,6 +134,47 @@ export async function addRemoteServer(scope, scopeId, input) {
     }
     return addRemoteServerInternal(scope, scopeId, input);
 }
+/**
+ * Persist a remote MCP server whose authorization is managed by the MCP
+ * server's OAuth 2.1 metadata and token endpoints. OAuth credentials are
+ * stored separately from the settings row and never returned to clients.
+ */
+export async function addOAuthRemoteServer(scope, scopeId, input) {
+    const oauthSecretKey = `mcp_oauth:${shortId()}`;
+    try {
+        await saveMcpOAuthCredentials({
+            key: oauthSecretKey,
+            scope,
+            scopeId,
+            credentials: input.credentials,
+        });
+        const result = await addRemoteServerInternal(scope, scopeId, {
+            name: input.name,
+            url: input.url,
+            description: input.description,
+            oauthSecretKey,
+        });
+        if (!result.ok) {
+            await deleteMcpOAuthCredentials({
+                key: oauthSecretKey,
+                scope,
+                scopeId,
+            });
+        }
+        return result;
+    }
+    catch (err) {
+        await deleteMcpOAuthCredentials({
+            key: oauthSecretKey,
+            scope,
+            scopeId,
+        }).catch(() => { });
+        return {
+            ok: false,
+            error: `Failed to save MCP OAuth credentials: ${err?.message ?? err}`,
+        };
+    }
+}
 export async function addFirstPartyRemoteServer(orgId, input) {
     const trust = await isFirstPartyRemoteEndpointTrusted(orgId, input.appId, input.url);
     if (!trust.ok)
@@ -313,6 +234,7 @@ async function addRemoteServerInternal(scope, scopeId, input) {
         ...(input.firstPartyAppId
             ? { firstPartyAppId: input.firstPartyAppId }
             : {}),
+        ...(input.oauthSecretKey ? { oauthSecretKey: input.oauthSecretKey } : {}),
         description: input.description?.trim() || undefined,
         createdAt: Date.now(),
     };
@@ -416,6 +338,19 @@ export async function removeRemoteServer(scope, scopeId, id) {
             console.warn(`[mcp-client] Failed to delete MCP header secret ${removed.headerSecretKey}: ${err?.message ?? err}`);
         }
     }
+    if (removed?.oauthSecretKey) {
+        try {
+            await deleteMcpOAuthCredentials({
+                key: removed.oauthSecretKey,
+                scope,
+                scopeId,
+            });
+        }
+        catch (err) {
+            // eslint-disable-next-line no-console
+            console.warn(`[mcp-client] Failed to delete MCP OAuth credentials ${removed.oauthSecretKey}: ${err?.message ?? err}`);
+        }
+    }
     return true;
 }
 /**
@@ -485,10 +420,23 @@ export function toHttpServerConfig(stored) {
  * secrets).
  */
 export async function toHttpServerConfigAsync(scope, scopeId, stored) {
+    let headers = await materializeHeaders(scope, scopeId, stored);
+    if (stored.oauthSecretKey) {
+        const accessToken = await getMcpOAuthAccessToken({
+            key: stored.oauthSecretKey,
+            scope,
+            scopeId,
+            serverUrl: stored.url,
+        });
+        if (accessToken) {
+            headers ??= {};
+            headers.Authorization = `Bearer ${accessToken}`;
+        }
+    }
     return {
         type: "http",
         url: stored.url,
-        headers: await materializeHeaders(scope, scopeId, stored),
+        headers,
         ...(stored.firstParty ? { firstParty: true } : {}),
         ...(stored.firstPartyAppId
             ? { firstPartyAppId: stored.firstPartyAppId }