@lovable.dev/mcp-js 0.21.0-rc.3 → 0.21.0

package/dist/protocols/mcp/index.cjs

@@ -148,23 +148,9 @@ function parseSafeUrl(subject, raw, ErrorClass = Error) {
 
 // src/auth/discovery.ts
 var OAuthConfigurationError = class extends Error {
-  constructor(message, stage) {
-    super(message);
-    this.stage = stage;
-    this.name = "OAuthConfigurationError";
-  }
-};
-var OAuthUpstreamUnreachableError = class extends Error {
-  constructor(message, stage) {
-    super(message);
-    this.stage = stage;
-    this.name = "OAuthUpstreamUnreachableError";
-  }
-};
-var MetadataUnreachableError = class extends Error {
   constructor(message) {
     super(message);
-    this.name = "MetadataUnreachableError";
+    this.name = "OAuthConfigurationError";
   }
 };
 var METADATA_FETCH_TIMEOUT_MS = 5e3;
@@ -196,28 +182,16 @@ async function fetchFirstValidOAuthServerMetadata(metadataUrls, expectedIssuer)
     try {
       return await fetchOAuthServerMetadata(url, expectedIssuer);
     } catch (err) {
-      const error = err instanceof Error ? err : new Error(String(err));
-      log.debug("oauth.discovery.attempt_failed", { url, ...describeError(error) });
-      errors.push(error);
+      log.debug("oauth.discovery.attempt_failed", { url, ...describeError(err) });
+      errors.push(`${url}: ${err instanceof Error ? err.message : String(err)}`);
     }
   }
-  const unreachable = errors.some((e) => e instanceof MetadataUnreachableError);
-  const detail = errors.map((e) => e.message).join("; ");
-  log.error("oauth.discovery.exhausted", { expectedIssuer, urlsTried: metadataUrls, errors: detail, unreachable });
-  const message = `failed to discover OAuth server metadata (${detail})`;
-  throw unreachable ? new MetadataUnreachableError(message) : new Error(message);
+  log.error("oauth.discovery.exhausted", { expectedIssuer, urlsTried: metadataUrls, errors });
+  throw new Error(`failed to discover OAuth server metadata (${errors.join("; ")})`);
 }
 async function fetchOAuthServerMetadata(url, expectedIssuer) {
   log.debug("oauth.discovery.fetch", { url });
-  let response;
-  try {
-    response = await fetch(url, {
-      signal: AbortSignal.timeout(METADATA_FETCH_TIMEOUT_MS),
-      redirect: "manual"
-    });
-  } catch (err) {
-    throw new MetadataUnreachableError(err instanceof Error ? err.message : String(err));
-  }
+  const response = await fetch(url, { signal: AbortSignal.timeout(METADATA_FETCH_TIMEOUT_MS), redirect: "manual" });
   if (!response.ok) {
     throw new Error(String(response.status));
   }
@@ -240,21 +214,14 @@ async function fetchIssuerOAuthServerMetadata(issuer) {
   try {
     return await fetchFirstValidOAuthServerMetadata(oauthMetadataUrlsForIssuer(issuer), issuer);
   } catch (err) {
-    const message = `OAuth issuer discovery failed: ${err instanceof Error ? err.message : String(err)}`;
-    if (err instanceof MetadataUnreachableError) {
-      log.error("oauth.discovery.unreachable", {
-        issuer,
-        ...describeError(err),
-        outcome: "503 authorization server unreachable"
-      });
-      throw new OAuthUpstreamUnreachableError(message, "discovery");
-    }
     log.error("oauth.discovery.config_error", {
       issuer,
       ...describeError(err),
       outcome: "500 oauth configuration error"
     });
-    throw new OAuthConfigurationError(message, "discovery");
+    throw new OAuthConfigurationError(
+      `OAuth issuer discovery failed: ${err instanceof Error ? err.message : String(err)}`
+    );
   }
 }
 function createOAuthDiscoveryResolver(auth) {
@@ -314,13 +281,18 @@ function readString(value) {
 function splitScopes(value) {
   if (typeof value === "string")
     return value.split(/\s+/).filter(Boolean);
-  if (Array.isArray(value))
-    return value.filter((entry) => typeof entry === "string" && entry.length > 0);
-  return [];
+  return stringClaimList(value);
 }
 function stringClaim(claims, name) {
   return readString(claims[name]);
 }
+function stringClaimList(value) {
+  if (typeof value === "string")
+    return value === "" ? [] : [value];
+  if (Array.isArray(value))
+    return value.filter((entry) => typeof entry === "string" && entry !== "");
+  return [];
+}
 
 // src/auth/verifier.ts
 var DEFAULT_JWT_ALGORITHMS = ["RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "EdDSA"];
@@ -347,24 +319,15 @@ function tokenHeaderFields(token) {
   }
 }
 async function fetchVerificationKeySet(jwksUri) {
-  let response;
-  try {
-    response = await fetch(jwksUri, { signal: AbortSignal.timeout(JWKS_FETCH_TIMEOUT_MS), redirect: "manual" });
-  } catch (err) {
-    log.error("oauth.jwks.unreachable", { ...describeError(err), outcome: "503 authorization server unreachable" });
-    throw new OAuthUpstreamUnreachableError(
-      `JWKS fetch failed: ${err instanceof Error ? err.message : String(err)}`,
-      "jwks"
-    );
-  }
   try {
+    const response = await fetch(jwksUri, { signal: AbortSignal.timeout(JWKS_FETCH_TIMEOUT_MS), redirect: "manual" });
     if (!response.ok)
       throw new Error(`JWKS endpoint returned ${response.status}`);
     const json = await response.json();
     return (0, import_jose.createLocalJWKSet)(json);
   } catch (err) {
     log.error("oauth.jwks.fetch_failed", { ...describeError(err), outcome: "500 oauth configuration error" });
-    throw new OAuthConfigurationError(`JWKS fetch failed: ${err instanceof Error ? err.message : String(err)}`, "jwks");
+    throw new OAuthConfigurationError(`JWKS fetch failed: ${err instanceof Error ? err.message : String(err)}`);
   }
 }
 function assertAccessTokenTyp(token, allowed) {
@@ -381,13 +344,12 @@ function assertAccessTokenTyp(token, allowed) {
     throw new OAuthTokenError(401, "invalid_token", "Access token typ header is not accepted");
   }
 }
-async function verifyJwtClaims(token, keySet, issuer, audience, auth) {
+async function verifyJwtClaims(token, keySet, issuer, auth) {
   try {
     const { payload } = await (0, import_jose.jwtVerify)(token, keySet, {
       // `issuer` is trimmed of any trailing slash; accept both forms so a token whose
       // `iss` carries the slash the AS publishes still verifies.
       issuer: [issuer, `${issuer}/`],
-      audience: [...audience],
       algorithms: auth.algorithms ? [...auth.algorithms] : DEFAULT_JWT_ALGORITHMS,
       requiredClaims: ["sub", "exp"],
       clockTolerance: auth.clockToleranceSeconds ?? DEFAULT_CLOCK_TOLERANCE_SECONDS
@@ -398,6 +360,22 @@ async function verifyJwtClaims(token, keySet, issuer, audience, auth) {
     throw err;
   }
 }
+function checkAcceptedAudience(claims, accepted, auth) {
+  const audPopulated = claims.aud !== void 0 && !(Array.isArray(claims.aud) && claims.aud.length === 0);
+  if (audPopulated) {
+    if (stringClaimList(claims.aud).some((audience) => accepted.includes(audience)))
+      return "aud";
+    log.debug("oauth.verify.bad_audience", { tokenAud: claims.aud, accepted, outcome: "401 invalid_token" });
+  } else if (auth.acceptResourceClaim !== false) {
+    const acceptedTrimmed = accepted.map(trimTrailingSlash);
+    if (stringClaimList(claims.resource).some((resource) => acceptedTrimmed.includes(trimTrailingSlash(resource))))
+      return "resource";
+    log.debug("oauth.verify.bad_resource", { tokenResource: claims.resource, accepted, outcome: "401 invalid_token" });
+  } else {
+    log.debug("oauth.verify.empty_audience", { accepted, outcome: "401 invalid_token" });
+  }
+  throw new OAuthTokenError(401, "invalid_token", "token audience is not accepted");
+}
 function assertNonEmptySubject(claims) {
   const sub = claims["sub"];
   if (typeof sub !== "string" || sub.trim() === "") {
@@ -442,14 +420,16 @@ function createOAuthTokenVerifier(auth, discovery) {
     log.debug("oauth.jwks.fetch", { jwksUri });
     const keySet = await fetchVerificationKeySet(jwksUri);
     assertAccessTokenTyp(token, allowedTyps);
-    const claims = await verifyJwtClaims(token, keySet, issuer, acceptedAudiences, auth);
+    const claims = await verifyJwtClaims(token, keySet, issuer, auth);
+    const audienceVia = checkAcceptedAudience(claims, acceptedAudiences, auth);
     assertNonEmptySubject(claims);
     const context = buildMcpAuthContext({ token, claims, issuer, resource, acceptedAudiences });
     assertOAuthClientClaim(auth, context.principal.clientId);
     log.info("oauth.verify.ok", {
       sub: context.principal.sub,
       clientId: context.principal.clientId,
-      scopes: context.principal.scopes
+      scopes: context.principal.scopes,
+      audienceVia
     });
     return context;
   };
@@ -498,12 +478,6 @@ function oauthConfigurationErrorResponse() {
     headers: { ...JSON_HEADERS, "Cache-Control": "no-store" }
   });
 }
-function oauthUpstreamUnreachableResponse() {
-  return new Response(JSON.stringify({ error: "authorization server unreachable" }), {
-    status: 503,
-    headers: { ...JSON_HEADERS, "Cache-Control": "no-store", "Retry-After": "30" }
-  });
-}
 function parseBearerToken(request) {
   const header = request.headers.get("Authorization");
   if (!header)
@@ -568,22 +542,12 @@ function createRequestAuthorizer(mcp, options = {}) {
         assertRequiredScopes(runtime.auth, auth);
         return { ok: true, auth };
       } catch (err) {
-        if (err instanceof OAuthUpstreamUnreachableError) {
-          log.error("auth.upstream_unreachable", { ...describeError(err), stage: err.stage, outcome: "503" });
-          await recorder?.emit({
-            tool: null,
-            method: "authorize",
-            outcome: err.stage === "jwks" ? "auth_jwks_unreachable" : "auth_discovery_unreachable",
-            durationMs: nowMs() - startedAt
-          });
-          return { ok: false, response: oauthUpstreamUnreachableResponse() };
-        }
         if (err instanceof OAuthConfigurationError) {
-          log.error("auth.config_error", { ...describeError(err), stage: err.stage, outcome: "500" });
+          log.error("auth.config_error", { ...describeError(err), outcome: "500" });
           await recorder?.emit({
             tool: null,
             method: "authorize",
-            outcome: err.stage === "jwks" ? "auth_jwks_config_error" : "auth_discovery_config_error",
+            outcome: "auth_config_error",
             durationMs: nowMs() - startedAt
           });
           return { ok: false, response: oauthConfigurationErrorResponse() };
@@ -662,6 +626,14 @@ var ToolContext = class {
   }
 };
 
+// src/core/content.ts
+function extractTextContent(content) {
+  if (!content)
+    return void 0;
+  const text = content.filter((block) => block.type === "text").map((block) => block.text).join("\n").trim();
+  return text.length > 0 ? text : void 0;
+}
+
 // src/core/cors.ts
 var EXPOSE_HEADERS = "WWW-Authenticate, Mcp-Session-Id, Mcp-Protocol-Version";
 var ALLOW_HEADERS = "Authorization, Content-Type, Mcp-Session-Id, Mcp-Protocol-Version, Last-Event-ID";
@@ -712,7 +684,8 @@ function adaptToolToSdkCallback(tool, auth, recorder) {
       tool: tool.name,
       method: "tools/call",
       outcome: result.isError ? "tool_error" : "ok",
-      durationMs: nowMs() - start
+      durationMs: nowMs() - start,
+      errorText: result.isError ? extractTextContent(result.content) : void 0
     });
     return { content: result.content ?? [], structuredContent: result.structuredContent, isError: result.isError };
   };

package/dist/protocols/mcp/index.d.cts

@@ -1,6 +1,6 @@
 import { M as McpRuntimeOptions } from '../../authorize-BMeXd_Sh.js';
-import { d as McpDefinition } from '../../types-CPkhCRxc.js';
-import { M as MetricsRecorder } from '../../base-DTtaX5Rf.js';
+import { d as McpDefinition } from '../../types-qqrmJ736.js';
+import { M as MetricsRecorder } from '../../base-CFy5vZ5Z.js';
 import 'zod';
 
 type McpProtocolHandler = (request: Request, recorder?: MetricsRecorder) => Promise<Response>;

package/dist/protocols/mcp/index.d.ts

@@ -1,6 +1,6 @@
 import { M as McpRuntimeOptions } from '../../authorize-BMeXd_Sh.js';
-import { d as McpDefinition } from '../../types-CPkhCRxc.js';
-import { M as MetricsRecorder } from '../../base-DTtaX5Rf.js';
+import { d as McpDefinition } from '../../types-qqrmJ736.js';
+import { M as MetricsRecorder } from '../../base-CFy5vZ5Z.js';
 import 'zod';
 
 type McpProtocolHandler = (request: Request, recorder?: MetricsRecorder) => Promise<Response>;

package/dist/protocols/mcp/index.js

@@ -1,11 +1,12 @@
 import {
   createMcpProtocolHandler
-} from "../../chunk-5W6JK6OS.js";
+} from "../../chunk-CI7JYLV3.js";
+import "../../chunk-6QFZYYUV.js";
 import "../../chunk-MA5H6PSF.js";
-import "../../chunk-CIAVINZ5.js";
+import "../../chunk-YLU2JTHL.js";
 import "../../chunk-H37EB22A.js";
 import "../../chunk-6DXGZZA4.js";
-import "../../chunk-SIDWSSWV.js";
+import "../../chunk-E3Q3FRKQ.js";
 export {
   createMcpProtocolHandler
 };

package/dist/protocols/oauth-metadata.cjs

@@ -143,23 +143,9 @@ function parseSafeUrl(subject, raw, ErrorClass = Error) {
 
 // src/auth/discovery.ts
 var OAuthConfigurationError = class extends Error {
-  constructor(message, stage) {
-    super(message);
-    this.stage = stage;
-    this.name = "OAuthConfigurationError";
-  }
-};
-var OAuthUpstreamUnreachableError = class extends Error {
-  constructor(message, stage) {
-    super(message);
-    this.stage = stage;
-    this.name = "OAuthUpstreamUnreachableError";
-  }
-};
-var MetadataUnreachableError = class extends Error {
   constructor(message) {
     super(message);
-    this.name = "MetadataUnreachableError";
+    this.name = "OAuthConfigurationError";
   }
 };
 var METADATA_FETCH_TIMEOUT_MS = 5e3;
@@ -191,28 +177,16 @@ async function fetchFirstValidOAuthServerMetadata(metadataUrls, expectedIssuer)
     try {
       return await fetchOAuthServerMetadata(url, expectedIssuer);
     } catch (err) {
-      const error = err instanceof Error ? err : new Error(String(err));
-      log.debug("oauth.discovery.attempt_failed", { url, ...describeError(error) });
-      errors.push(error);
+      log.debug("oauth.discovery.attempt_failed", { url, ...describeError(err) });
+      errors.push(`${url}: ${err instanceof Error ? err.message : String(err)}`);
     }
   }
-  const unreachable = errors.some((e) => e instanceof MetadataUnreachableError);
-  const detail = errors.map((e) => e.message).join("; ");
-  log.error("oauth.discovery.exhausted", { expectedIssuer, urlsTried: metadataUrls, errors: detail, unreachable });
-  const message = `failed to discover OAuth server metadata (${detail})`;
-  throw unreachable ? new MetadataUnreachableError(message) : new Error(message);
+  log.error("oauth.discovery.exhausted", { expectedIssuer, urlsTried: metadataUrls, errors });
+  throw new Error(`failed to discover OAuth server metadata (${errors.join("; ")})`);
 }
 async function fetchOAuthServerMetadata(url, expectedIssuer) {
   log.debug("oauth.discovery.fetch", { url });
-  let response;
-  try {
-    response = await fetch(url, {
-      signal: AbortSignal.timeout(METADATA_FETCH_TIMEOUT_MS),
-      redirect: "manual"
-    });
-  } catch (err) {
-    throw new MetadataUnreachableError(err instanceof Error ? err.message : String(err));
-  }
+  const response = await fetch(url, { signal: AbortSignal.timeout(METADATA_FETCH_TIMEOUT_MS), redirect: "manual" });
   if (!response.ok) {
     throw new Error(String(response.status));
   }
@@ -235,21 +209,14 @@ async function fetchIssuerOAuthServerMetadata(issuer) {
   try {
     return await fetchFirstValidOAuthServerMetadata(oauthMetadataUrlsForIssuer(issuer), issuer);
   } catch (err) {
-    const message = `OAuth issuer discovery failed: ${err instanceof Error ? err.message : String(err)}`;
-    if (err instanceof MetadataUnreachableError) {
-      log.error("oauth.discovery.unreachable", {
-        issuer,
-        ...describeError(err),
-        outcome: "503 authorization server unreachable"
-      });
-      throw new OAuthUpstreamUnreachableError(message, "discovery");
-    }
     log.error("oauth.discovery.config_error", {
       issuer,
       ...describeError(err),
       outcome: "500 oauth configuration error"
     });
-    throw new OAuthConfigurationError(message, "discovery");
+    throw new OAuthConfigurationError(
+      `OAuth issuer discovery failed: ${err instanceof Error ? err.message : String(err)}`
+    );
   }
 }
 function createOAuthDiscoveryResolver(auth) {
@@ -306,13 +273,18 @@ function readString(value) {
 function splitScopes(value) {
   if (typeof value === "string")
     return value.split(/\s+/).filter(Boolean);
-  if (Array.isArray(value))
-    return value.filter((entry) => typeof entry === "string" && entry.length > 0);
-  return [];
+  return stringClaimList(value);
 }
 function stringClaim(claims, name) {
   return readString(claims[name]);
 }
+function stringClaimList(value) {
+  if (typeof value === "string")
+    return value === "" ? [] : [value];
+  if (Array.isArray(value))
+    return value.filter((entry) => typeof entry === "string" && entry !== "");
+  return [];
+}
 
 // src/auth/verifier.ts
 var DEFAULT_JWT_ALGORITHMS = ["RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "EdDSA"];
@@ -339,24 +311,15 @@ function tokenHeaderFields(token) {
   }
 }
 async function fetchVerificationKeySet(jwksUri) {
-  let response;
-  try {
-    response = await fetch(jwksUri, { signal: AbortSignal.timeout(JWKS_FETCH_TIMEOUT_MS), redirect: "manual" });
-  } catch (err) {
-    log.error("oauth.jwks.unreachable", { ...describeError(err), outcome: "503 authorization server unreachable" });
-    throw new OAuthUpstreamUnreachableError(
-      `JWKS fetch failed: ${err instanceof Error ? err.message : String(err)}`,
-      "jwks"
-    );
-  }
   try {
+    const response = await fetch(jwksUri, { signal: AbortSignal.timeout(JWKS_FETCH_TIMEOUT_MS), redirect: "manual" });
     if (!response.ok)
       throw new Error(`JWKS endpoint returned ${response.status}`);
     const json = await response.json();
     return (0, import_jose.createLocalJWKSet)(json);
   } catch (err) {
     log.error("oauth.jwks.fetch_failed", { ...describeError(err), outcome: "500 oauth configuration error" });
-    throw new OAuthConfigurationError(`JWKS fetch failed: ${err instanceof Error ? err.message : String(err)}`, "jwks");
+    throw new OAuthConfigurationError(`JWKS fetch failed: ${err instanceof Error ? err.message : String(err)}`);
   }
 }
 function assertAccessTokenTyp(token, allowed) {
@@ -373,13 +336,12 @@ function assertAccessTokenTyp(token, allowed) {
     throw new OAuthTokenError(401, "invalid_token", "Access token typ header is not accepted");
   }
 }
-async function verifyJwtClaims(token, keySet, issuer, audience, auth) {
+async function verifyJwtClaims(token, keySet, issuer, auth) {
   try {
     const { payload } = await (0, import_jose.jwtVerify)(token, keySet, {
       // `issuer` is trimmed of any trailing slash; accept both forms so a token whose
       // `iss` carries the slash the AS publishes still verifies.
       issuer: [issuer, `${issuer}/`],
-      audience: [...audience],
       algorithms: auth.algorithms ? [...auth.algorithms] : DEFAULT_JWT_ALGORITHMS,
       requiredClaims: ["sub", "exp"],
       clockTolerance: auth.clockToleranceSeconds ?? DEFAULT_CLOCK_TOLERANCE_SECONDS
@@ -390,6 +352,22 @@ async function verifyJwtClaims(token, keySet, issuer, audience, auth) {
     throw err;
   }
 }
+function checkAcceptedAudience(claims, accepted, auth) {
+  const audPopulated = claims.aud !== void 0 && !(Array.isArray(claims.aud) && claims.aud.length === 0);
+  if (audPopulated) {
+    if (stringClaimList(claims.aud).some((audience) => accepted.includes(audience)))
+      return "aud";
+    log.debug("oauth.verify.bad_audience", { tokenAud: claims.aud, accepted, outcome: "401 invalid_token" });
+  } else if (auth.acceptResourceClaim !== false) {
+    const acceptedTrimmed = accepted.map(trimTrailingSlash);
+    if (stringClaimList(claims.resource).some((resource) => acceptedTrimmed.includes(trimTrailingSlash(resource))))
+      return "resource";
+    log.debug("oauth.verify.bad_resource", { tokenResource: claims.resource, accepted, outcome: "401 invalid_token" });
+  } else {
+    log.debug("oauth.verify.empty_audience", { accepted, outcome: "401 invalid_token" });
+  }
+  throw new OAuthTokenError(401, "invalid_token", "token audience is not accepted");
+}
 function assertNonEmptySubject(claims) {
   const sub = claims["sub"];
   if (typeof sub !== "string" || sub.trim() === "") {
@@ -434,14 +412,16 @@ function createOAuthTokenVerifier(auth, discovery) {
     log.debug("oauth.jwks.fetch", { jwksUri });
     const keySet = await fetchVerificationKeySet(jwksUri);
     assertAccessTokenTyp(token, allowedTyps);
-    const claims = await verifyJwtClaims(token, keySet, issuer, acceptedAudiences, auth);
+    const claims = await verifyJwtClaims(token, keySet, issuer, auth);
+    const audienceVia = checkAcceptedAudience(claims, acceptedAudiences, auth);
     assertNonEmptySubject(claims);
     const context = buildMcpAuthContext({ token, claims, issuer, resource, acceptedAudiences });
     assertOAuthClientClaim(auth, context.principal.clientId);
     log.info("oauth.verify.ok", {
       sub: context.principal.sub,
       clientId: context.principal.clientId,
-      scopes: context.principal.scopes
+      scopes: context.principal.scopes,
+      audienceVia
     });
     return context;
   };

package/dist/protocols/oauth-metadata.d.cts

@@ -1,5 +1,5 @@
 import { M as McpRuntimeOptions } from '../authorize-BMeXd_Sh.js';
-import { d as McpDefinition } from '../types-CPkhCRxc.js';
+import { d as McpDefinition } from '../types-qqrmJ736.js';
 import 'zod';
 
 type OAuthProtectedResourceMetadataHandler = (request: Request) => Promise<Response>;

package/dist/protocols/oauth-metadata.d.ts

@@ -1,5 +1,5 @@
 import { M as McpRuntimeOptions } from '../authorize-BMeXd_Sh.js';
-import { d as McpDefinition } from '../types-CPkhCRxc.js';
+import { d as McpDefinition } from '../types-qqrmJ736.js';
 import 'zod';
 
 type OAuthProtectedResourceMetadataHandler = (request: Request) => Promise<Response>;

package/dist/protocols/oauth-metadata.js

@@ -1,10 +1,10 @@
 import {
   createOAuthProtectedResourceMetadataHandler
-} from "../chunk-NENAFXZJ.js";
-import "../chunk-CIAVINZ5.js";
+} from "../chunk-ENJDNFEB.js";
+import "../chunk-YLU2JTHL.js";
 import "../chunk-H37EB22A.js";
 import "../chunk-6DXGZZA4.js";
-import "../chunk-SIDWSSWV.js";
+import "../chunk-E3Q3FRKQ.js";
 export {
   createOAuthProtectedResourceMetadataHandler
 };