@frontmcp/auth 1.8.0 → 1.8.2

package/index.js

@@ -269,9 +269,9 @@ __export(index_exports, {
   EagerCredentialLoader: () => EagerCredentialLoader,
   ElicitationSecretRequiredError: () => ElicitationSecretRequiredError,
   EncryptedRedisVault: () => EncryptedRedisVault,
-  EncryptedStorageError: () => import_utils23.EncryptedStorageError,
+  EncryptedStorageError: () => import_utils24.EncryptedStorageError,
   EncryptedStorageSecureStoreBackend: () => EncryptedStorageSecureStoreBackend,
-  EncryptedTypedStorage: () => import_utils23.EncryptedTypedStorage,
+  EncryptedTypedStorage: () => import_utils24.EncryptedTypedStorage,
   EncryptionContextNotSetError: () => EncryptionContextNotSetError,
   EncryptionKeyNotConfiguredError: () => EncryptionKeyNotConfiguredError,
   FetchCredentialMiddleware: () => FetchCredentialMiddleware,
@@ -319,7 +319,7 @@ __export(index_exports, {
   TokenVault: () => TokenVault,
   TransparentAuthorization: () => TransparentAuthorization,
   TransportIdGenerator: () => TransportIdGenerator,
-  TypedStorage: () => import_utils22.TypedStorage,
+  TypedStorage: () => import_utils23.TypedStorage,
   VaultEncryption: () => VaultEncryption,
   VaultLoadError: () => VaultLoadError,
   VaultNotFoundError: () => VaultNotFoundError,
@@ -401,9 +401,9 @@ __export(index_exports, {
   credentialTypeSchema: () => credentialTypeSchema,
   customCredentialSchema: () => customCredentialSchema,
   decodeJwtPayloadSafe: () => decodeJwtPayloadSafe,
-  decryptAesGcm: () => import_utils33.decryptAesGcm,
+  decryptAesGcm: () => import_utils34.decryptAesGcm,
   decryptSessionJson: () => decryptSessionJson,
-  decryptValue: () => import_utils33.decryptValue,
+  decryptValue: () => import_utils34.decryptValue,
   defaultSessionRateLimiter: () => defaultSessionRateLimiter,
   deriveAuthorizationId: () => deriveAuthorizationId,
   deriveExpectedAudience: () => deriveExpectedAudience,
@@ -411,13 +411,13 @@ __export(index_exports, {
   deriveTypedUser: () => deriveTypedUser,
   detectAuthProviders: () => detectAuthProviders,
   detectedAuthProviderSchema: () => detectedAuthProviderSchema,
-  encryptAesGcm: () => import_utils33.encryptAesGcm,
+  encryptAesGcm: () => import_utils34.encryptAesGcm,
   encryptJson: () => encryptJson,
-  encryptValue: () => import_utils33.encryptValue,
+  encryptValue: () => import_utils34.encryptValue,
   encryptedBlobSchema: () => encryptedBlobSchema,
   encryptedDataSchema: () => encryptedDataSchema,
   encryptedVaultEntrySchema: () => encryptedVaultEntrySchema,
-  escapeHtml: () => import_utils3.escapeHtml,
+  escapeHtml: () => import_utils4.escapeHtml,
   extraWideLayout: () => extraWideLayout,
   extractBearerToken: () => extractBearerToken,
   extractCacheHeaders: () => extractCacheHeaders,
@@ -439,8 +439,9 @@ __export(index_exports, {
   getTokenSignatureFingerprint: () => getTokenSignatureFingerprint,
   hasOnlyLocalhostRedirectUris: () => hasOnlyLocalhostRedirectUris,
   headerApplier: () => headerApplier,
-  hkdfSha256: () => import_utils33.hkdfSha256,
+  hkdfSha256: () => import_utils34.hkdfSha256,
   incrementalAuthConfigSchema: () => incrementalAuthConfigSchema,
+  isAnonymousSubject: () => isAnonymousSubject,
   isCimdClientId: () => isCimdClientId,
   isFrontMcpCredentials: () => isFrontMcpCredentials,
   isJwt: () => isJwt,
@@ -453,7 +454,7 @@ __export(index_exports, {
   isRedisTokenStorage: () => isRedisTokenStorage,
   isRemoteMode: () => isRemoteMode,
   isSessionComplete: () => isSessionComplete,
-  isSignedSession: () => import_utils15.isSignedData,
+  isSignedSession: () => import_utils16.isSignedData,
   isSoonExpiring: () => isSoonExpiring,
   isSoonExpiringProvider: () => isSoonExpiringProvider,
   isSqliteTokenStorage: () => isSqliteTokenStorage,
@@ -549,6 +550,9 @@ module.exports = __toCommonJS(index_exports);
 
 // libs/auth/src/jwks/jwks.service.ts
 var import_jose = require("jose");
+var import_utils2 = require("@frontmcp/utils");
+
+// libs/auth/src/cimd/cimd.validator.ts
 var import_utils = require("@frontmcp/utils");
 
 // libs/auth/src/cimd/cimd.errors.ts
@@ -814,122 +818,38 @@ function isIpAddress(hostname) {
   }
   return false;
 }
+var BLOCKED_RANGE_REASONS = /* @__PURE__ */ new Map([
+  ["0.0.0.0/8", "Current network addresses (0.x.x.x) are not allowed"],
+  ["10.0.0.0/8", "Private IP addresses (10.x.x.x) are not allowed"],
+  ["100.64.0.0/10", "Carrier-grade NAT addresses (100.64-127.x.x) are not allowed"],
+  ["127.0.0.0/8", "Loopback addresses (127.x.x.x) are not allowed"],
+  ["169.254.0.0/16", "Link-local addresses (169.254.x.x) are not allowed"],
+  ["172.16.0.0/12", "Private IP addresses (172.16-31.x.x) are not allowed"],
+  ["192.0.0.0/24", "IETF protocol-assignment addresses (192.0.0.0/24) are not allowed"],
+  ["192.168.0.0/16", "Private IP addresses (192.168.x.x) are not allowed"],
+  ["224.0.0.0/4", "Multicast addresses are not allowed"],
+  ["255.255.255.255/32", "Broadcast address is not allowed"],
+  ["::/128", "IPv6 unspecified address (::) is not allowed"],
+  ["::1/128", "IPv6 loopback address (::1) is not allowed"],
+  ["fc00::/7", "IPv6 unique local addresses (fc00::/7) are not allowed"],
+  ["fe80::/10", "IPv6 link-local addresses (fe80::/10) are not allowed"]
+]);
 function checkIpAddress(ip) {
-  const cleanIp = ip.replace(/^\[|\]$/g, "");
-  if (cleanIp.includes(".") && !cleanIp.includes(":")) {
-    return checkIpv4(cleanIp);
-  }
-  return checkIpv6(cleanIp);
-}
-function checkIpv4(ip) {
-  const parts = ip.split(".").map(Number);
-  if (parts.length !== 4 || parts.some((p) => isNaN(p) || p < 0 || p > 255)) {
-    return { allowed: false, reason: "Invalid IPv4 address" };
-  }
-  const [a, b, c, d] = parts;
-  if (a === 127) {
-    return { allowed: false, reason: "Loopback addresses (127.x.x.x) are not allowed" };
-  }
-  if (a === 10) {
-    return { allowed: false, reason: "Private IP addresses (10.x.x.x) are not allowed" };
-  }
-  if (a === 172 && b >= 16 && b <= 31) {
-    return { allowed: false, reason: "Private IP addresses (172.16-31.x.x) are not allowed" };
-  }
-  if (a === 192 && b === 168) {
-    return { allowed: false, reason: "Private IP addresses (192.168.x.x) are not allowed" };
-  }
-  if (a === 169 && b === 254) {
-    return { allowed: false, reason: "Link-local addresses (169.254.x.x) are not allowed" };
-  }
-  if (a === 100 && b >= 64 && b <= 127) {
-    return { allowed: false, reason: "Carrier-grade NAT addresses (100.64-127.x.x) are not allowed" };
-  }
-  if (a === 192 && b === 0 && c === 0) {
-    return { allowed: false, reason: "IETF protocol-assignment addresses (192.0.0.0/24) are not allowed" };
-  }
-  if (a === 0) {
-    return { allowed: false, reason: "Current network addresses (0.x.x.x) are not allowed" };
-  }
-  if (a === 255 && b === 255 && c === 255 && d === 255) {
-    return { allowed: false, reason: "Broadcast address is not allowed" };
-  }
-  if (a >= 224 && a <= 239) {
-    return { allowed: false, reason: "Multicast addresses are not allowed" };
-  }
-  return { allowed: true, reason: "" };
-}
-function expandIpv6(ip) {
-  let text = ip.toLowerCase();
-  if (text.includes("%")) {
-    text = text.slice(0, text.indexOf("%"));
-  }
-  const dottedQuad = text.match(/^(.*:)(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/);
-  if (dottedQuad) {
-    const octets = dottedQuad[2].split(".").map(Number);
-    if (octets.some((octet) => !Number.isInteger(octet) || octet < 0 || octet > 255)) return null;
-    const high = (octets[0] << 8 | octets[1]).toString(16);
-    const low = (octets[2] << 8 | octets[3]).toString(16);
-    text = `${dottedQuad[1]}${high}:${low}`;
-  }
-  const halves = text.split("::");
-  if (halves.length > 2) return null;
-  const parseGroups = (part) => {
-    if (part === "") return [];
-    const groups = [];
-    for (const group of part.split(":")) {
-      if (!/^[0-9a-f]{1,4}$/.test(group)) return null;
-      groups.push(parseInt(group, 16));
-    }
-    return groups;
-  };
-  const head = parseGroups(halves[0]);
-  if (head === null) return null;
-  if (halves.length === 1) {
-    return head.length === 8 ? head : null;
-  }
-  const tail = parseGroups(halves[1]);
-  if (tail === null) return null;
-  if (head.length + tail.length > 7) return null;
-  return [...head, ...new Array(8 - head.length - tail.length).fill(0), ...tail];
-}
-function checkIpv6(ip) {
-  const groups = expandIpv6(ip);
-  if (!groups) {
-    return { allowed: false, reason: `Malformed IPv6 address: ${ip}` };
-  }
-  const isZeroPrefix = groups.slice(0, 7).every((group) => group === 0);
-  if (isZeroPrefix && groups[7] === 1) {
-    return { allowed: false, reason: "IPv6 loopback address (::1) is not allowed" };
-  }
-  if (isZeroPrefix && groups[7] === 0) {
-    return { allowed: false, reason: "IPv6 unspecified address (::) is not allowed" };
-  }
-  if ((groups[0] & 65472) === 65152) {
-    return { allowed: false, reason: "IPv6 link-local addresses (fe80::/10) are not allowed" };
-  }
-  if ((groups[0] & 65024) === 64512) {
-    return { allowed: false, reason: "IPv6 unique local addresses (fc00::/7) are not allowed" };
+  const classification = (0, import_utils.classifyIpAddress)(ip);
+  if (!classification) {
+    const bareIp = ip.replace(/^\[|\]$/g, "");
+    return {
+      allowed: false,
+      reason: bareIp.includes(":") ? `Malformed IPv6 address: ${bareIp}` : "Invalid IPv4 address"
+    };
   }
-  const embedded = extractEmbeddedIpv4(groups);
-  if (embedded) {
-    return checkIpv4(embedded);
+  if (classification.range === "public") {
+    return { allowed: true, reason: "" };
   }
-  return { allowed: true, reason: "" };
-}
-function extractEmbeddedIpv4(groups) {
-  const toDotted = () => {
-    const high = groups[6];
-    const low = groups[7];
-    return `${high >> 8}.${high & 255}.${low >> 8}.${low & 255}`;
+  return {
+    allowed: false,
+    reason: BLOCKED_RANGE_REASONS.get(classification.cidr) ?? `Addresses in the ${classification.range} range (${classification.cidr}) are not allowed`
   };
-  const firstFive = groups.slice(0, 5).every((group) => group === 0);
-  if (firstFive && groups[5] === 65535) return toDotted();
-  if (firstFive && groups[5] === 0) return toDotted();
-  if (groups[0] === 100 && groups[1] === 65435 && groups.slice(2, 6).every((group) => group === 0)) {
-    return toDotted();
-  }
-  return null;
 }
 function isDomainInList(hostname, domainList) {
   const lowerHostname = hostname.toLowerCase();
@@ -1060,9 +980,9 @@ var JwksService = class {
    * Returns null if persistence is disabled (production).
    */
   async getKeyPersistence() {
-    if ((0, import_utils.isProduction)()) return null;
+    if ((0, import_utils2.isProduction)()) return null;
     if (!this.keyPersistence) {
-      this.keyPersistence = await (0, import_utils.createKeyPersistence)({
+      this.keyPersistence = await (0, import_utils2.createKeyPersistence)({
         baseDir: ".frontmcp/keys"
       });
     }
@@ -1181,7 +1101,7 @@ var JwksService = class {
       if (!jwtAlg) {
         return { ok: false, error: "missing_alg" };
       }
-      const isValid = await (0, import_utils.rsaVerify)(
+      const isValid = await (0, import_utils2.rsaVerify)(
         jwtAlg,
         Buffer.from(signatureInput),
         matchingKey,
@@ -1324,10 +1244,10 @@ var JwksService = class {
         const parsed = new URL(currentUrl);
         const host = parsed.hostname.toLowerCase();
         const isLocalhost = host === "localhost" || host === "127.0.0.1" || host === "::1" || host === "[::1]" || host.endsWith(".localhost");
-        if (parsed.protocol !== "https:" && !(parsed.protocol === "http:" && (isLocalhost || !(0, import_utils.isProduction)()))) {
+        if (parsed.protocol !== "https:" && !(parsed.protocol === "http:" && (isLocalhost || !(0, import_utils2.isProduction)()))) {
           throw new Error(`insecure scheme "${parsed.protocol}"`);
         }
-        if (!(isLocalhost && !(0, import_utils.isProduction)())) {
+        if (!(isLocalhost && !(0, import_utils2.isProduction)())) {
           const ssrf = await resolveAndCheckHostname(parsed.hostname);
           if (!ssrf.allowed) throw new Error(`blocked host: ${ssrf.reason}`);
         }
@@ -1338,11 +1258,10 @@ var JwksService = class {
           // Follow redirects manually so each hop is re-validated (scheme + SSRF).
           redirect: "manual"
         });
-        if (res.status >= 300 && res.status < 400) {
+        if ((0, import_utils2.isRedirectResponse)(res)) {
           const location = res.headers.get("location");
-          if (!location || hop >= MAX_JWKS_FETCH_HOPS) {
-            throw new Error("too many redirects");
-          }
+          if (!location) throw new Error("redirect without a readable Location header");
+          if (hop >= MAX_JWKS_FETCH_HOPS) throw new Error("too many redirects");
           currentUrl = new URL(location, currentUrl).toString();
           continue;
         }
@@ -1435,13 +1354,13 @@ var JwksService = class {
     const { generateKeyPairSync } = require("node:crypto");
     if (alg === "RS256") {
       const { privateKey, publicKey } = generateKeyPairSync("rsa", { modulusLength: 2048 });
-      const kid = (0, import_utils.bytesToHex)((0, import_utils.randomBytes)(8));
+      const kid = (0, import_utils2.bytesToHex)((0, import_utils2.randomBytes)(8));
       const publicJwk = publicKey.export({ format: "jwk" });
       Object.assign(publicJwk, { kid, alg: "RS256", use: "sig", kty: "RSA" });
       return { kid, privateKey, publicJwk: { keys: [publicJwk] }, createdAt: Date.now() };
     } else {
       const { privateKey, publicKey } = generateKeyPairSync("ec", { namedCurve: "P-256" });
-      const kid = (0, import_utils.bytesToHex)((0, import_utils.randomBytes)(8));
+      const kid = (0, import_utils2.bytesToHex)((0, import_utils2.randomBytes)(8));
       const publicJwk = publicKey.export({ format: "jwk" });
       Object.assign(publicJwk, { kid, alg: "ES256", use: "sig", kty: "EC" });
       return { kid, privateKey, publicJwk: { keys: [publicJwk] }, createdAt: Date.now() };
@@ -1450,8 +1369,8 @@ var JwksService = class {
 };
 
 // libs/auth/src/ui/base-layout.ts
-var import_utils2 = require("@frontmcp/utils");
 var import_utils3 = require("@frontmcp/utils");
+var import_utils4 = require("@frontmcp/utils");
 var CDN = {
   /** Tailwind CSS v4 Browser CDN - generates styles on-the-fly with @theme support */
   tailwind: "https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4",
@@ -1530,13 +1449,13 @@ function baseLayout(content, options) {
     }
     ${customCss}
   </style>` : "";
-  const metaDescription = description ? `<meta name="description" content="${(0, import_utils2.escapeHtml)(description)}">` : "";
+  const metaDescription = description ? `<meta name="description" content="${(0, import_utils3.escapeHtml)(description)}">` : "";
   return `<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>${(0, import_utils2.escapeHtml)(title)} - FrontMCP</title>
+  <title>${(0, import_utils3.escapeHtml)(title)} - FrontMCP</title>
   ${metaDescription}
 
   <!-- Google Fonts CDN - Inter (modern UI font) -->
@@ -1547,7 +1466,7 @@ function baseLayout(content, options) {
   ${tailwindBlock}
   ${headExtra}
 </head>
-<body class="${(0, import_utils2.escapeHtml)(bodyClass)}">
+<body class="${(0, import_utils3.escapeHtml)(bodyClass)}">
   ${content}
 </body>
 </html>`;
@@ -1602,7 +1521,7 @@ function extraWideLayout(content, options) {
 }
 
 // libs/auth/src/ui/templates.ts
-var escapeHtml3 = import_utils3.escapeHtml;
+var escapeHtml3 = import_utils4.escapeHtml;
 function buildConsentPage(params) {
   const { apps, clientName, pendingAuthId, csrfToken, callbackPath } = params;
   const appCards = apps.map((app) => buildAppCardHtml(app, pendingAuthId, csrfToken, callbackPath)).join("\n");
@@ -2104,7 +2023,7 @@ function renderLocalLoginPage(login, ctx, values) {
 
 // libs/auth/src/session/authorization.store.ts
 var import_lazy_zod = require("@frontmcp/lazy-zod");
-var import_utils4 = require("@frontmcp/utils");
+var import_utils5 = require("@frontmcp/utils");
 var pkceChallengeSchema = import_lazy_zod.z.object({
   challenge: import_lazy_zod.z.string().min(43).max(128),
   method: import_lazy_zod.z.literal("S256")
@@ -2139,10 +2058,10 @@ var AUTH_CODE_TTL_MS = 60 * 1e3;
 var PENDING_AUTH_TTL_MS = 10 * 60 * 1e3;
 var REFRESH_TOKEN_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
 function generateAuthorizationCode() {
-  return (0, import_utils4.randomUUID)().replace(/-/g, "") + (0, import_utils4.randomUUID)().replace(/-/g, "");
+  return (0, import_utils5.randomUUID)().replace(/-/g, "") + (0, import_utils5.randomUUID)().replace(/-/g, "");
 }
 function generateRefreshTokenValue() {
-  return (0, import_utils4.randomUUID)() + "-" + (0, import_utils4.randomUUID)();
+  return (0, import_utils5.randomUUID)() + "-" + (0, import_utils5.randomUUID)();
 }
 function buildCodeRecord(params) {
   const now = Date.now();
@@ -2173,7 +2092,7 @@ function buildCodeRecord(params) {
 function buildPendingRecord(params) {
   const now = Date.now();
   return {
-    id: (0, import_utils4.randomUUID)(),
+    id: (0, import_utils5.randomUUID)(),
     clientId: params.clientId,
     redirectUri: params.redirectUri,
     scopes: params.scopes,
@@ -2222,11 +2141,11 @@ function verifyPkce(codeVerifier, challenge) {
   if (challenge.method !== "S256") {
     return false;
   }
-  const hash = (0, import_utils4.sha256Base64url)(codeVerifier);
+  const hash = (0, import_utils5.sha256Base64url)(codeVerifier);
   return hash === challenge.challenge;
 }
 function generatePkceChallenge(codeVerifier) {
-  const challenge = (0, import_utils4.sha256Base64url)(codeVerifier);
+  const challenge = (0, import_utils5.sha256Base64url)(codeVerifier);
   return { challenge, method: "S256" };
 }
 var InMemoryAuthorizationStore = class {
@@ -2422,7 +2341,7 @@ var RedisAuthorizationStore = class {
 };
 
 // libs/auth/src/session/storage-authorization.store.ts
-var import_utils5 = require("@frontmcp/utils");
+var import_utils6 = require("@frontmcp/utils");
 var StorageAuthorizationStore = class {
   codeStore;
   pendingStore;
@@ -2433,9 +2352,9 @@ var StorageAuthorizationStore = class {
     this.namespace = options.namespace ?? "oauth";
     this.storageIsNamespaced = this.isNamespacedStorage(storage);
     const base = this.storageIsNamespaced ? storage.namespace(this.namespace) : storage;
-    this.codeStore = new import_utils5.TypedStorage(base);
-    this.pendingStore = new import_utils5.TypedStorage(base);
-    this.refreshStore = new import_utils5.TypedStorage(base);
+    this.codeStore = new import_utils6.TypedStorage(base);
+    this.pendingStore = new import_utils6.TypedStorage(base);
+    this.refreshStore = new import_utils6.TypedStorage(base);
   }
   // ============================================
   // Record builders (pure; shared with in-memory store)
@@ -2808,11 +2727,11 @@ var authorizationVaultEntrySchema = import_lazy_zod2.z.object({
 });
 
 // libs/auth/src/session/session-credential-vault.ts
-var import_utils7 = require("@frontmcp/utils");
+var import_utils8 = require("@frontmcp/utils");
 
 // libs/auth/src/session/vault-encryption.ts
 var import_lazy_zod3 = require("@frontmcp/lazy-zod");
-var import_utils6 = require("@frontmcp/utils");
+var import_utils7 = require("@frontmcp/utils");
 var encryptedDataSchema = import_lazy_zod3.z.object({
   /** Version for future algorithm changes */
   v: import_lazy_zod3.z.literal(1),
@@ -2852,7 +2771,7 @@ var VaultEncryption = class {
     ];
     const ikm = new TextEncoder().encode(ikmParts.join(""));
     const infoBytes = new TextEncoder().encode(this.hkdfInfo);
-    const key = await (0, import_utils6.hkdfSha256)(ikm, new Uint8Array(0), infoBytes, 32);
+    const key = await (0, import_utils7.hkdfSha256)(ikm, new Uint8Array(0), infoBytes, 32);
     return key;
   }
   /**
@@ -2879,7 +2798,7 @@ var VaultEncryption = class {
     ];
     const ikm = new TextEncoder().encode(ikmParts.join(""));
     const infoBytes = new TextEncoder().encode(this.hkdfInfo);
-    const key = await (0, import_utils6.hkdfSha256)(ikm, new Uint8Array(0), infoBytes, 32);
+    const key = await (0, import_utils7.hkdfSha256)(ikm, new Uint8Array(0), infoBytes, 32);
     return key;
   }
   /**
@@ -2893,14 +2812,14 @@ var VaultEncryption = class {
     if (key.length !== 32) {
       throw new Error("Encryption key must be 32 bytes");
     }
-    const iv = (0, import_utils6.randomBytes)(12);
-    const { ciphertext, tag } = await (0, import_utils6.encryptAesGcm)(key, new TextEncoder().encode(plaintext), iv);
+    const iv = (0, import_utils7.randomBytes)(12);
+    const { ciphertext, tag } = await (0, import_utils7.encryptAesGcm)(key, new TextEncoder().encode(plaintext), iv);
     return {
       v: 1,
       alg: "aes-256-gcm",
-      iv: (0, import_utils6.base64urlEncode)(iv),
-      ct: (0, import_utils6.base64urlEncode)(ciphertext),
-      tag: (0, import_utils6.base64urlEncode)(tag)
+      iv: (0, import_utils7.base64urlEncode)(iv),
+      ct: (0, import_utils7.base64urlEncode)(ciphertext),
+      tag: (0, import_utils7.base64urlEncode)(tag)
     };
   }
   /**
@@ -2920,11 +2839,11 @@ var VaultEncryption = class {
       throw new Error("Invalid encrypted data format");
     }
     const { iv, ct, tag } = parsed.data;
-    const ivBuffer = (0, import_utils6.base64urlDecode)(iv);
-    const ciphertext = (0, import_utils6.base64urlDecode)(ct);
-    const tagBuffer = (0, import_utils6.base64urlDecode)(tag);
+    const ivBuffer = (0, import_utils7.base64urlDecode)(iv);
+    const ciphertext = (0, import_utils7.base64urlDecode)(ct);
+    const tagBuffer = (0, import_utils7.base64urlDecode)(tag);
     try {
-      const plaintext = await (0, import_utils6.decryptAesGcm)(key, ciphertext, ivBuffer, tagBuffer);
+      const plaintext = await (0, import_utils7.decryptAesGcm)(key, ciphertext, ivBuffer, tagBuffer);
       return new TextDecoder().decode(plaintext);
     } catch (_error) {
       throw new Error("Decryption failed: invalid key or corrupted data");
@@ -3064,7 +2983,7 @@ var SessionCredentialVault = class {
    * it expires via TTL when configured.
    */
   async rotateVault(sub) {
-    const vaultId = (0, import_utils7.randomUUID)();
+    const vaultId = (0, import_utils8.randomUUID)();
     await this.storage.set(this.indexKey(sub), vaultId, this.credentialSetOpts);
     return vaultId;
   }
@@ -3213,19 +3132,19 @@ var SessionCredentialVault = class {
   }
 };
 function resolveVaultPepper(logger) {
-  const fromEnv = (0, import_utils7.getEnv)("VAULT_SECRET") ?? (0, import_utils7.getEnv)("JWT_SECRET");
+  const fromEnv = (0, import_utils8.getEnv)("VAULT_SECRET") ?? (0, import_utils8.getEnv)("JWT_SECRET");
   if (fromEnv && fromEnv.trim().length > 0) return fromEnv;
   logger.warn(
     "SessionCredentialVault: neither VAULT_SECRET nor JWT_SECRET is set; using a random per-process pepper. Stored credentials will NOT survive a restart and cannot be shared across instances. Set VAULT_SECRET (or JWT_SECRET) for persistent, multi-instance credential storage."
   );
-  return (0, import_utils7.randomUUID)() + (0, import_utils7.randomUUID)();
+  return (0, import_utils8.randomUUID)() + (0, import_utils8.randomUUID)();
 }
 function errMsg(err) {
   return err instanceof Error ? err.message : String(err);
 }
 
 // libs/auth/src/session/token-storage.factory.ts
-var import_utils8 = require("@frontmcp/utils");
+var import_utils9 = require("@frontmcp/utils");
 function isRedisTokenStorage(config) {
   return typeof config === "object" && config !== null && "redis" in config && !!config.redis;
 }
@@ -3237,7 +3156,7 @@ function isPersistentTokenStorage(config) {
 }
 async function createTokenStorageAdapter(config) {
   if (config === void 0 || config === "memory") {
-    const adapter = new import_utils8.MemoryStorageAdapter();
+    const adapter = new import_utils9.MemoryStorageAdapter();
     await adapter.connect();
     return adapter;
   }
@@ -3254,14 +3173,14 @@ async function createTokenStorageAdapter(config) {
   }
   if (isRedisTokenStorage(config)) {
     const { host, port, password, db, tls, keyPrefix } = config.redis;
-    const adapter = new import_utils8.RedisStorageAdapter({
+    const adapter = new import_utils9.RedisStorageAdapter({
       config: { host, port, password, db, tls },
       keyPrefix: keyPrefix ?? ""
     });
     await adapter.connect();
     return adapter;
   }
-  const fallback = new import_utils8.MemoryStorageAdapter();
+  const fallback = new import_utils9.MemoryStorageAdapter();
   await fallback.connect();
   return fallback;
 }
@@ -3281,7 +3200,7 @@ async function createSessionCredentialVault(options) {
 }
 
 // libs/auth/src/session/credential-resume-link.ts
-var import_utils9 = require("@frontmcp/utils");
+var import_utils10 = require("@frontmcp/utils");
 var DEFAULT_RESUME_TTL_MS = 6e5;
 function signCredentialResumeToken(input, secret) {
   const payload = {
@@ -3290,7 +3209,7 @@ function signCredentialResumeToken(input, secret) {
     ...input.context !== void 0 ? { context: input.context } : {},
     exp: Date.now() + (input.ttlMs ?? DEFAULT_RESUME_TTL_MS)
   };
-  const signedJson = (0, import_utils9.signData)(payload, { secret });
+  const signedJson = (0, import_utils10.signData)(payload, { secret });
   return Buffer.from(signedJson, "utf8").toString("base64url");
 }
 function verifyCredentialResumeToken(token, secret, now = Date.now()) {
@@ -3300,7 +3219,7 @@ function verifyCredentialResumeToken(token, secret, now = Date.now()) {
   } catch {
     return null;
   }
-  const payload = (0, import_utils9.verifyData)(signedJson, { secret });
+  const payload = (0, import_utils10.verifyData)(signedJson, { secret });
   if (!payload) return null;
   if (typeof payload.sub !== "string" || typeof payload.key !== "string" || !Number.isFinite(payload.exp)) {
     return null;
@@ -3319,7 +3238,7 @@ function buildCredentialResumeUrl(basePath, token) {
 }
 
 // libs/auth/src/session/incremental-auth-ticket.ts
-var import_utils10 = require("@frontmcp/utils");
+var import_utils11 = require("@frontmcp/utils");
 var DEFAULT_INCREMENTAL_TICKET_TTL_MS = 3e5;
 function signIncrementalAuthTicket(input, secret) {
   const payload = {
@@ -3327,10 +3246,10 @@ function signIncrementalAuthTicket(input, secret) {
     appId: input.appId,
     ...input.toolId !== void 0 ? { toolId: input.toolId } : {},
     ...input.priorAppIds !== void 0 ? { priorAppIds: input.priorAppIds } : {},
-    jti: (0, import_utils10.randomUUID)(),
+    jti: (0, import_utils11.randomUUID)(),
     exp: Date.now() + (input.ttlMs ?? DEFAULT_INCREMENTAL_TICKET_TTL_MS)
   };
-  const signedJson = (0, import_utils10.signData)(payload, { secret });
+  const signedJson = (0, import_utils11.signData)(payload, { secret });
   return Buffer.from(signedJson, "utf8").toString("base64url");
 }
 function verifyIncrementalAuthTicket(token, secret, now = Date.now()) {
@@ -3340,7 +3259,7 @@ function verifyIncrementalAuthTicket(token, secret, now = Date.now()) {
   } catch {
     return null;
   }
-  const payload = (0, import_utils10.verifyData)(signedJson, { secret });
+  const payload = (0, import_utils11.verifyData)(signedJson, { secret });
   if (!payload) return null;
   if (typeof payload.sub !== "string" || payload.sub.length === 0) return null;
   if (typeof payload.appId !== "string" || payload.appId.length === 0) return null;
@@ -3520,7 +3439,7 @@ function errMsg2(err) {
 var SECURE_STORE_ACCESSOR = /* @__PURE__ */ Symbol.for("frontmcp:SECURE_STORE_ACCESSOR");
 
 // libs/auth/src/session/secure-store-accessor.impl.ts
-var import_utils11 = require("@frontmcp/utils");
+var import_utils12 = require("@frontmcp/utils");
 var GLOBAL_NAMESPACE = "global";
 var SecureStoreAccessorImpl = class {
   backend;
@@ -3549,12 +3468,12 @@ var SecureStoreAccessorImpl = class {
         return GLOBAL_NAMESPACE;
       case "session": {
         const sid = this.resolveSessionId();
-        return sid ? `s:${(0, import_utils11.sha256Hex)(sid).slice(0, 32)}` : void 0;
+        return sid ? `s:${(0, import_utils12.sha256Hex)(sid).slice(0, 32)}` : void 0;
       }
       case "user":
       default: {
         const sub = this.resolveSub();
-        return sub ? `u:${(0, import_utils11.sha256Hex)(sub).slice(0, 32)}` : void 0;
+        return sub ? `u:${(0, import_utils12.sha256Hex)(sub).slice(0, 32)}` : void 0;
       }
     }
   }
@@ -3595,7 +3514,7 @@ function errMsg3(err) {
 }
 
 // libs/auth/src/session/secure-store.factory.ts
-var import_utils12 = require("@frontmcp/utils");
+var import_utils13 = require("@frontmcp/utils");
 function isCustomBackendConfig(config) {
   return typeof config === "object" && config !== null && "backend" in config && !!config.backend;
 }
@@ -3644,7 +3563,7 @@ async function createSecureStore(options) {
   if (storage) {
     adapter = storage;
   } else if (kind === "memory") {
-    adapter = new import_utils12.MemoryStorageAdapter();
+    adapter = new import_utils13.MemoryStorageAdapter();
     await adapter.connect();
   } else {
     adapter = await createTokenStorageAdapter(toTokenStorageConfig(config));
@@ -3658,7 +3577,7 @@ async function createSecureStore(options) {
 }
 
 // libs/auth/src/session/token.vault.ts
-var import_utils13 = require("@frontmcp/utils");
+var import_utils14 = require("@frontmcp/utils");
 var TokenVault = class {
   /** Active key used for new encryptions */
   active;
@@ -3687,14 +3606,14 @@ var TokenVault = class {
     this.keys.set(k.kid, k.key);
   }
   async encrypt(plaintext, opts) {
-    const iv = (0, import_utils13.randomBytes)(12);
-    const { ciphertext, tag } = await (0, import_utils13.encryptAesGcm)(this.active.key, new TextEncoder().encode(plaintext), iv);
+    const iv = (0, import_utils14.randomBytes)(12);
+    const { ciphertext, tag } = await (0, import_utils14.encryptAesGcm)(this.active.key, new TextEncoder().encode(plaintext), iv);
     return {
       alg: "A256GCM",
       kid: this.active.kid,
-      iv: (0, import_utils13.base64urlEncode)(iv),
-      tag: (0, import_utils13.base64urlEncode)(tag),
-      data: (0, import_utils13.base64urlEncode)(ciphertext),
+      iv: (0, import_utils14.base64urlEncode)(iv),
+      tag: (0, import_utils14.base64urlEncode)(tag),
+      data: (0, import_utils14.base64urlEncode)(ciphertext),
       exp: opts?.exp,
       meta: opts?.meta
     };
@@ -3708,16 +3627,16 @@ var TokenVault = class {
     }
     const key = this.keys.get(blob.kid);
     if (!key) throw new Error(`vault_unknown_kid:${blob.kid}`);
-    const iv = (0, import_utils13.base64urlDecode)(blob.iv);
-    const tag = (0, import_utils13.base64urlDecode)(blob.tag);
-    const data = (0, import_utils13.base64urlDecode)(blob.data);
-    const plaintext = await (0, import_utils13.decryptAesGcm)(key, data, iv, tag);
+    const iv = (0, import_utils14.base64urlDecode)(blob.iv);
+    const tag = (0, import_utils14.base64urlDecode)(blob.tag);
+    const data = (0, import_utils14.base64urlDecode)(blob.data);
+    const plaintext = await (0, import_utils14.decryptAesGcm)(key, data, iv, tag);
     return new TextDecoder().decode(plaintext);
   }
 };
 
 // libs/auth/src/session/index.ts
-var import_utils33 = require("@frontmcp/utils");
+var import_utils34 = require("@frontmcp/utils");
 
 // libs/auth/src/session/transport-session.types.ts
 var import_lazy_zod4 = require("@frontmcp/lazy-zod");
@@ -3813,10 +3732,10 @@ var redisConfigSchema = import_lazy_zod4.z.object({
 });
 
 // libs/auth/src/session/session-crypto.ts
-var import_utils15 = require("@frontmcp/utils");
+var import_utils16 = require("@frontmcp/utils");
 
 // libs/auth/src/errors/auth-internal.error.ts
-var import_utils14 = require("@frontmcp/utils");
+var import_utils15 = require("@frontmcp/utils");
 var AuthInternalError = class extends Error {
   /**
    * Unique error ID for tracking in logs.
@@ -3838,7 +3757,7 @@ var AuthInternalError = class extends Error {
     super(message);
     this.name = this.constructor.name;
     this.code = code;
-    this.errorId = `err_${(0, import_utils14.bytesToHex)((0, import_utils14.randomBytes)(8))}`;
+    this.errorId = `err_${(0, import_utils15.bytesToHex)((0, import_utils15.randomBytes)(8))}`;
     Error.captureStackTrace(this, this.constructor);
   }
   /**
@@ -3977,9 +3896,9 @@ var AuthFlowError = class extends AuthInternalError {
 
 // libs/auth/src/session/session-crypto.ts
 function getSigningSecret(config) {
-  const secret = config?.secret || (0, import_utils15.getEnv)("MCP_SESSION_SECRET");
+  const secret = config?.secret || (0, import_utils16.getEnv)("MCP_SESSION_SECRET");
   if (!secret) {
-    if ((0, import_utils15.isProduction)()) {
+    if ((0, import_utils16.isProduction)()) {
       throw new SessionSecretRequiredError("session signing");
     }
     console.warn("[SessionCrypto] MCP_SESSION_SECRET not set. Using insecure default for development only.");
@@ -3991,13 +3910,13 @@ function resolveConfig(config) {
   return { secret: getSigningSecret(config) };
 }
 function signSession(session, config) {
-  return (0, import_utils15.signData)(session, resolveConfig(config));
+  return (0, import_utils16.signData)(session, resolveConfig(config));
 }
 function verifySession(signedData, config) {
-  return (0, import_utils15.verifyData)(signedData, resolveConfig(config));
+  return (0, import_utils16.verifyData)(signedData, resolveConfig(config));
 }
 function verifyOrParseSession(data, config) {
-  return (0, import_utils15.verifyOrParseData)(data, resolveConfig(config));
+  return (0, import_utils16.verifyOrParseData)(data, resolveConfig(config));
 }
 
 // libs/auth/src/session/session-rate-limiter.ts
@@ -4124,7 +4043,7 @@ var SessionRateLimiter = class {
 var defaultSessionRateLimiter = new SessionRateLimiter();
 
 // libs/auth/src/session/session.transport.ts
-var import_utils16 = require("@frontmcp/utils");
+var import_utils17 = require("@frontmcp/utils");
 var TransportIdGenerator = class {
   /**
    * Create a transport session ID.
@@ -4133,7 +4052,7 @@ var TransportIdGenerator = class {
    * @returns A transport session ID (UUID without dashes)
    */
   static createId() {
-    return (0, import_utils16.randomUUID)().replace(/-/g, "");
+    return (0, import_utils17.randomUUID)().replace(/-/g, "");
   }
 };
 
@@ -4182,7 +4101,7 @@ var TinyTtlCache = class {
 };
 
 // libs/auth/src/session/utils/auth-token.utils.ts
-var import_utils17 = require("@frontmcp/utils");
+var import_utils18 = require("@frontmcp/utils");
 function isJwt(token) {
   if (!token) return false;
   return token.split(".").length === 3;
@@ -4192,7 +4111,7 @@ function getTokenSignatureFingerprint(token) {
     const sig = token.split(".")[2];
     if (sig) return sig;
   }
-  return (0, import_utils17.sha256Base64url)(token);
+  return (0, import_utils18.sha256Base64url)(token);
 }
 function extractClaimValue(claims, key, validator) {
   const value = claims[key];
@@ -4224,26 +4143,26 @@ function extractBearerToken(header) {
 }
 
 // libs/auth/src/session/utils/session-crypto.utils.ts
-var import_utils18 = require("@frontmcp/utils");
+var import_utils19 = require("@frontmcp/utils");
 var cachedKey = null;
 function getKey() {
   if (cachedKey) return cachedKey;
-  const secret = (0, import_utils18.getEnv)("MCP_SESSION_SECRET");
+  const secret = (0, import_utils19.getEnv)("MCP_SESSION_SECRET");
   if (!secret) {
-    if ((0, import_utils18.isProduction)()) {
+    if ((0, import_utils19.isProduction)()) {
       throw new SessionSecretRequiredError("session ID encryption");
     }
     console.warn(
       "[SessionIdUtils] Using machine ID as session encryption secret - NOT SECURE FOR PRODUCTION. Set MCP_SESSION_SECRET environment variable for secure session encryption."
     );
   }
-  const base = secret || (0, import_utils18.getMachineId)();
-  cachedKey = (0, import_utils18.sha256)(new TextEncoder().encode(base));
+  const base = secret || (0, import_utils19.getMachineId)();
+  cachedKey = (0, import_utils19.sha256)(new TextEncoder().encode(base));
   return cachedKey;
 }
 function encryptJson(obj) {
   const key = getKey();
-  const encrypted = (0, import_utils18.encryptValue)(obj, key);
+  const encrypted = (0, import_utils19.encryptValue)(obj, key);
   return `${encrypted.iv}.${encrypted.tag}.${encrypted.data}`;
 }
 function decryptSessionJson(sessionId) {
@@ -4252,7 +4171,7 @@ function decryptSessionJson(sessionId) {
   const [ivB64, tagB64, ctB64] = parts;
   if (!ivB64 || !tagB64 || !ctB64) return null;
   const key = getKey();
-  return (0, import_utils18.decryptValue)({ alg: "A256GCM", iv: ivB64, tag: tagB64, data: ctB64 }, key);
+  return (0, import_utils19.decryptValue)({ alg: "A256GCM", iv: ivB64, tag: tagB64, data: ctB64 }, key);
 }
 function safeDecrypt(sessionId) {
   try {
@@ -4266,11 +4185,11 @@ function resetCachedKey() {
 }
 
 // libs/auth/src/session/storage/index.ts
-var import_utils22 = require("@frontmcp/utils");
 var import_utils23 = require("@frontmcp/utils");
+var import_utils24 = require("@frontmcp/utils");
 
 // libs/auth/src/session/storage/storage-token-store.ts
-var import_utils19 = require("@frontmcp/utils");
+var import_utils20 = require("@frontmcp/utils");
 var StorageTokenStore = class {
   storage;
   namespace;
@@ -4282,13 +4201,13 @@ var StorageTokenStore = class {
     this.defaultTtlSeconds = options.defaultTtlSeconds;
     this.storageIsNamespaced = "namespace" in storage && typeof storage.namespace === "function";
     const namespacedStorage = this.storageIsNamespaced ? storage.namespace(this.namespace) : storage;
-    this.storage = new import_utils19.TypedStorage(namespacedStorage);
+    this.storage = new import_utils20.TypedStorage(namespacedStorage);
   }
   /**
    * Allocate a new unique ID for a token record.
    */
   allocId() {
-    return (0, import_utils19.randomUUID)();
+    return (0, import_utils20.randomUUID)();
   }
   /**
    * Store an encrypted token blob.
@@ -4351,7 +4270,7 @@ var StorageTokenStore = class {
 };
 
 // libs/auth/src/session/storage/storage-authorization-vault.ts
-var import_utils20 = require("@frontmcp/utils");
+var import_utils21 = require("@frontmcp/utils");
 var StorageAuthorizationVault = class {
   storage;
   namespace;
@@ -4360,7 +4279,7 @@ var StorageAuthorizationVault = class {
     this.namespace = options.namespace ?? "vault";
     this.pendingAuthTtlMs = options.pendingAuthTtlMs ?? 10 * 60 * 1e3;
     const namespacedStorage = this.isNamespacedStorage(storage) ? storage.namespace(this.namespace) : storage;
-    this.storage = new import_utils20.TypedStorage(namespacedStorage, {
+    this.storage = new import_utils21.TypedStorage(namespacedStorage, {
       schema: options.validateOnRead ? authorizationVaultEntrySchema : void 0,
       throwOnInvalid: false
     });
@@ -4371,7 +4290,7 @@ var StorageAuthorizationVault = class {
   async create(params) {
     const now = Date.now();
     const entry = {
-      id: (0, import_utils20.randomUUID)(),
+      id: (0, import_utils21.randomUUID)(),
       userSub: params.userSub,
       userEmail: params.userEmail,
       userName: params.userName,
@@ -4445,7 +4364,7 @@ var StorageAuthorizationVault = class {
     }
     const now = Date.now();
     const pendingAuth = {
-      id: (0, import_utils20.randomUUID)(),
+      id: (0, import_utils21.randomUUID)(),
       appId: params.appId,
       toolId: params.toolId,
       authUrl: params.authUrl,
@@ -4649,11 +4568,11 @@ var StorageAuthorizationVault = class {
 };
 
 // libs/auth/src/session/storage/in-memory-authorization-vault.ts
-var import_utils21 = require("@frontmcp/utils");
+var import_utils22 = require("@frontmcp/utils");
 var InMemoryAuthorizationVault = class extends StorageAuthorizationVault {
   memoryAdapter;
   constructor(options = {}) {
-    const memoryAdapter = new import_utils21.MemoryStorageAdapter();
+    const memoryAdapter = new import_utils22.MemoryStorageAdapter();
     super(memoryAdapter, {
       namespace: options.namespace ?? "vault",
       pendingAuthTtlMs: options.pendingAuthTtlMs
@@ -4674,7 +4593,7 @@ var InMemoryAuthorizationVault = class extends StorageAuthorizationVault {
 };
 
 // libs/auth/src/session/redis-session.store.ts
-var import_utils24 = require("@frontmcp/utils");
+var import_utils25 = require("@frontmcp/utils");
 var RedisSessionStore = class {
   storage;
   keyPrefix;
@@ -4696,14 +4615,14 @@ var RedisSessionStore = class {
       });
     }
     if ("redis" in config && config.redis) {
-      this.storage = new import_utils24.RedisStorageAdapter({
+      this.storage = new import_utils25.RedisStorageAdapter({
         client: config.redis,
         keyPrefix: this.keyPrefix
       });
       this.externalInstance = true;
     } else {
       const redisConfig = config;
-      this.storage = new import_utils24.RedisStorageAdapter({
+      this.storage = new import_utils25.RedisStorageAdapter({
         config: {
           host: redisConfig.host,
           port: redisConfig.port ?? 6379,
@@ -4885,7 +4804,7 @@ var RedisSessionStore = class {
    * Allocate a new session ID
    */
   allocId() {
-    return (0, import_utils24.randomUUID)();
+    return (0, import_utils25.randomUUID)();
   }
   /**
    * Disconnect from Redis (only if we created the connection)
@@ -4921,7 +4840,7 @@ var RedisSessionStore = class {
 };
 
 // libs/auth/src/session/vercel-kv-session.store.ts
-var import_utils25 = require("@frontmcp/utils");
+var import_utils26 = require("@frontmcp/utils");
 var VercelKvSessionStore = class {
   storage;
   keyPrefix;
@@ -4941,7 +4860,7 @@ var VercelKvSessionStore = class {
         maxRequests: this.security.rateLimiting?.maxRequests
       });
     }
-    this.storage = new import_utils25.VercelKvStorageAdapter({
+    this.storage = new import_utils26.VercelKvStorageAdapter({
       url: config.url,
       token: config.token,
       keyPrefix: this.keyPrefix
@@ -5115,7 +5034,7 @@ var VercelKvSessionStore = class {
    * Allocate a new session ID
    */
   allocId() {
-    return (0, import_utils25.randomUUID)();
+    return (0, import_utils26.randomUUID)();
   }
   /**
    * Disconnect from Vercel KV
@@ -5144,7 +5063,7 @@ var VercelKvSessionStore = class {
 };
 
 // libs/auth/src/session/orchestrated-token.store.ts
-var import_utils26 = require("@frontmcp/utils");
+var import_utils27 = require("@frontmcp/utils");
 var InMemoryOrchestratedTokenStore = class {
   /** Token storage: Map<compositeKey, ProviderTokenRecord> */
   tokens = /* @__PURE__ */ new Map();
@@ -5186,7 +5105,7 @@ var InMemoryOrchestratedTokenStore = class {
     }
     const info = new TextEncoder().encode(`orchestrated-token:${compositeKey}`);
     const salt = new TextEncoder().encode("frontmcp-token-store");
-    const derivedKey = (0, import_utils26.hkdfSha256)(this.encryptionKey, salt, info, 32);
+    const derivedKey = (0, import_utils27.hkdfSha256)(this.encryptionKey, salt, info, 32);
     this.derivedKeys.set(compositeKey, derivedKey);
     return derivedKey;
   }
@@ -5196,8 +5115,8 @@ var InMemoryOrchestratedTokenStore = class {
   async encryptRecord(compositeKey, record) {
     const key = await this.deriveKeyForRecord(compositeKey);
     const plaintext = JSON.stringify(record);
-    const iv = (0, import_utils26.randomBytes)(12);
-    const { ciphertext, tag } = (0, import_utils26.encryptAesGcm)(key, new TextEncoder().encode(plaintext), iv);
+    const iv = (0, import_utils27.randomBytes)(12);
+    const { ciphertext, tag } = (0, import_utils27.encryptAesGcm)(key, new TextEncoder().encode(plaintext), iv);
     return JSON.stringify({
       iv: Buffer.from(iv).toString("base64url"),
       tag: Buffer.from(tag).toString("base64url"),
@@ -5213,7 +5132,7 @@ var InMemoryOrchestratedTokenStore = class {
     const ivBytes = Buffer.from(iv, "base64url");
     const tagBytes = Buffer.from(tag, "base64url");
     const ciphertextBytes = Buffer.from(data, "base64url");
-    const plaintext = (0, import_utils26.decryptAesGcm)(key, ciphertextBytes, ivBytes, tagBytes);
+    const plaintext = (0, import_utils27.decryptAesGcm)(key, ciphertextBytes, ivBytes, tagBytes);
     return JSON.parse(new TextDecoder().decode(plaintext));
   }
   /**
@@ -5415,7 +5334,7 @@ var InMemoryOrchestratedTokenStore = class {
 };
 
 // libs/auth/src/session/orchestrated-token.crypto.ts
-var import_utils27 = require("@frontmcp/utils");
+var import_utils28 = require("@frontmcp/utils");
 var HKDF_SALT = new TextEncoder().encode("frontmcp-token-store");
 function deriveKeyForRecord(masterKey, compositeKey, cache) {
   const cached = cache.get(compositeKey);
@@ -5423,14 +5342,14 @@ function deriveKeyForRecord(masterKey, compositeKey, cache) {
     return cached;
   }
   const info = new TextEncoder().encode(`orchestrated-token:${compositeKey}`);
-  const derived = (0, import_utils27.hkdfSha256)(masterKey, HKDF_SALT, info, 32);
+  const derived = (0, import_utils28.hkdfSha256)(masterKey, HKDF_SALT, info, 32);
   cache.set(compositeKey, derived);
   return derived;
 }
 function encryptRecord(key, record) {
   const plaintext = JSON.stringify(record);
-  const iv = (0, import_utils27.randomBytes)(12);
-  const { ciphertext, tag } = (0, import_utils27.encryptAesGcm)(key, new TextEncoder().encode(plaintext), iv);
+  const iv = (0, import_utils28.randomBytes)(12);
+  const { ciphertext, tag } = (0, import_utils28.encryptAesGcm)(key, new TextEncoder().encode(plaintext), iv);
   return JSON.stringify({
     iv: Buffer.from(iv).toString("base64url"),
     tag: Buffer.from(tag).toString("base64url"),
@@ -5442,7 +5361,7 @@ function decryptRecord(key, encrypted) {
   const ivBytes = Buffer.from(iv, "base64url");
   const tagBytes = Buffer.from(tag, "base64url");
   const ciphertextBytes = Buffer.from(data, "base64url");
-  const plaintext = (0, import_utils27.decryptAesGcm)(key, ciphertextBytes, ivBytes, tagBytes);
+  const plaintext = (0, import_utils28.decryptAesGcm)(key, ciphertextBytes, ivBytes, tagBytes);
   return JSON.parse(new TextDecoder().decode(plaintext));
 }
 
@@ -5621,7 +5540,7 @@ var StorageOrchestratedTokenStore = class {
 };
 
 // libs/auth/src/session/federated-auth.session.ts
-var import_utils28 = require("@frontmcp/utils");
+var import_utils29 = require("@frontmcp/utils");
 function toSessionRecord(session) {
   return {
     ...session,
@@ -5696,7 +5615,7 @@ var InMemoryFederatedAuthSessionStore = class {
   createSession(params) {
     const now = Date.now();
     return {
-      id: (0, import_utils28.randomUUID)(),
+      id: (0, import_utils29.randomUUID)(),
       pendingAuthId: params.pendingAuthId,
       clientId: params.clientId,
       redirectUri: params.redirectUri,
@@ -5728,7 +5647,7 @@ var InMemoryFederatedAuthSessionStore = class {
 function createFederatedAuthSession(params, ttlMs = 15 * 60 * 1e3) {
   const now = Date.now();
   return {
-    id: (0, import_utils28.randomUUID)(),
+    id: (0, import_utils29.randomUUID)(),
     pendingAuthId: params.pendingAuthId,
     clientId: params.clientId,
     redirectUri: params.redirectUri,
@@ -5785,7 +5704,7 @@ function startNextProvider(session, pkce, state) {
 }
 
 // libs/auth/src/session/storage-federated-auth.session.ts
-var import_utils29 = require("@frontmcp/utils");
+var import_utils30 = require("@frontmcp/utils");
 var StorageFederatedAuthSessionStore = class {
   storage;
   namespace;
@@ -5794,7 +5713,7 @@ var StorageFederatedAuthSessionStore = class {
     this.namespace = options.namespace ?? "fed";
     this.storageIsNamespaced = this.isNamespacedStorage(storage);
     const namespacedStorage = this.storageIsNamespaced ? storage.namespace(this.namespace) : storage;
-    this.storage = new import_utils29.TypedStorage(namespacedStorage);
+    this.storage = new import_utils30.TypedStorage(namespacedStorage);
   }
   async store(session) {
     await this.put(session);
@@ -5865,7 +5784,7 @@ var InMemoryConsentStore = class {
 };
 
 // libs/auth/src/session/storage-consent.store.ts
-var import_utils30 = require("@frontmcp/utils");
+var import_utils31 = require("@frontmcp/utils");
 var StorageConsentStore = class {
   storage;
   namespace;
@@ -5874,7 +5793,7 @@ var StorageConsentStore = class {
     this.namespace = options.namespace ?? "remembered-consent";
     this.storageIsNamespaced = this.isNamespacedStorage(storage);
     const namespacedStorage = this.storageIsNamespaced ? storage.namespace(this.namespace) : storage;
-    this.storage = new import_utils30.TypedStorage(namespacedStorage);
+    this.storage = new import_utils31.TypedStorage(namespacedStorage);
   }
   async get(userSub, clientId) {
     return this.storage.get(this.key(userSub, clientId));
@@ -5896,7 +5815,7 @@ var StorageConsentStore = class {
 
 // libs/auth/src/session/encrypted-authorization-vault.ts
 var import_lazy_zod5 = require("@frontmcp/lazy-zod");
-var import_utils31 = require("@frontmcp/utils");
+var import_utils32 = require("@frontmcp/utils");
 var redisVaultEntrySchema = import_lazy_zod5.z.object({
   /** Vault ID */
   id: import_lazy_zod5.z.string(),
@@ -5921,7 +5840,7 @@ var redisVaultEntrySchema = import_lazy_zod5.z.object({
   /** Encrypted sensitive data blob */
   encrypted: encryptedDataSchema
 });
-var encryptionContextStorage = new import_utils31.AsyncLocalStorage();
+var encryptionContextStorage = new import_utils32.AsyncLocalStorage();
 var EncryptedRedisVault = class {
   constructor(redis, encryption, namespace = "vault:") {
     this.redis = redis;
@@ -6057,7 +5976,7 @@ var EncryptedRedisVault = class {
   async create(params) {
     const now = Date.now();
     const entry = {
-      id: (0, import_utils31.randomUUID)(),
+      id: (0, import_utils32.randomUUID)(),
       userSub: params.userSub,
       userEmail: params.userEmail,
       userName: params.userName,
@@ -6116,7 +6035,7 @@ var EncryptedRedisVault = class {
     }
     const now = Date.now();
     const pendingAuth = {
-      id: (0, import_utils31.randomUUID)(),
+      id: (0, import_utils32.randomUUID)(),
       appId: params.appId,
       toolId: params.toolId,
       authUrl: params.authUrl,
@@ -6294,7 +6213,7 @@ function createEncryptedVault(redis, config = {}) {
 }
 
 // libs/auth/src/session/token.refresh.ts
-var import_utils32 = require("@frontmcp/utils");
+var import_utils33 = require("@frontmcp/utils");
 function toEpochSeconds(exp) {
   if (exp == null) return void 0;
   if (exp instanceof Date) return Math.floor(exp.getTime() / 1e3);
@@ -6316,7 +6235,7 @@ function tryJwtExp(token) {
   const parts = token.split(".");
   if (parts.length < 2) return void 0;
   try {
-    const json = JSON.parse(new TextDecoder().decode((0, import_utils32.base64urlDecode)(parts[1])));
+    const json = JSON.parse(new TextDecoder().decode((0, import_utils33.base64urlDecode)(parts[1])));
     const e = json?.exp;
     return typeof e === "number" ? toEpochSeconds(e) : void 0;
   } catch {
@@ -6379,7 +6298,7 @@ var progressiveAuthStateSchema = import_lazy_zod6.z.object({
 });
 
 // libs/auth/src/authorization/authorization.class.ts
-var import_utils35 = require("@frontmcp/utils");
+var import_utils36 = require("@frontmcp/utils");
 var AuthorizationBase = class _AuthorizationBase {
   id;
   isAnonymous;
@@ -6427,14 +6346,14 @@ var AuthorizationBase = class _AuthorizationBase {
    * @param fingerprint - Optional client fingerprint for tracking
    */
   createTransportSession(protocol, fingerprint) {
-    const sessionId = (0, import_utils35.randomUUID)();
+    const sessionId = (0, import_utils36.randomUUID)();
     const session = {
       id: sessionId,
       authorizationId: this.id,
       protocol,
       createdAt: Date.now(),
       expiresAt: this.expiresAt,
-      nodeId: (0, import_utils35.getMachineId)(),
+      nodeId: (0, import_utils36.getMachineId)(),
       clientFingerprint: fingerprint
     };
     this.#sessions.set(session.id, session);
@@ -6575,7 +6494,7 @@ var AuthorizationBase = class _AuthorizationBase {
    */
   static isJwtHeader(segment) {
     try {
-      const bytes = (0, import_utils35.base64urlDecode)(segment);
+      const bytes = (0, import_utils36.base64urlDecode)(segment);
       const text = new TextDecoder().decode(bytes);
       const parsed = JSON.parse(text);
       return typeof parsed === "object" && parsed !== null && typeof parsed.alg === "string";
@@ -6627,7 +6546,7 @@ var AuthorizationBase = class _AuthorizationBase {
 };
 
 // libs/auth/src/authorization/public.authorization.ts
-var import_utils36 = require("@frontmcp/utils");
+var import_utils37 = require("@frontmcp/utils");
 var PublicAuthorization = class _PublicAuthorization extends AuthorizationBase {
   mode = "public";
   /**
@@ -6663,7 +6582,7 @@ var PublicAuthorization = class _PublicAuthorization extends AuthorizationBase {
       allowedTools = "all",
       allowedPrompts = "all"
     } = ctx;
-    const uuid = (0, import_utils36.randomUUID)();
+    const uuid = (0, import_utils37.randomUUID)();
     const sub = `${prefix}:${uuid}`;
     const user = {
       sub,
@@ -6747,7 +6666,7 @@ var PublicAuthorization = class _PublicAuthorization extends AuthorizationBase {
 };
 
 // libs/auth/src/authorization/transparent.authorization.ts
-var import_utils37 = require("@frontmcp/utils");
+var import_utils38 = require("@frontmcp/utils");
 var TransparentAuthorization = class _TransparentAuthorization extends AuthorizationBase {
   mode = "transparent";
   /**
@@ -6847,7 +6766,7 @@ var TransparentAuthorization = class _TransparentAuthorization extends Authoriza
   static generateAuthorizationId(token) {
     const parts = token.split(".");
     const signature = parts[2] || token;
-    return (0, import_utils37.sha256Hex)(signature).substring(0, 16);
+    return (0, import_utils38.sha256Hex)(signature).substring(0, 16);
   }
   /**
    * Get the issuer from the token claims
@@ -6873,11 +6792,11 @@ var TransparentAuthorization = class _TransparentAuthorization extends Authoriza
 };
 
 // libs/auth/src/utils/authorization-id.utils.ts
-var import_utils38 = require("@frontmcp/utils");
+var import_utils39 = require("@frontmcp/utils");
 function deriveAuthorizationId(token) {
   const parts = token.split(".");
   const signature = parts[2] || token;
-  return (0, import_utils38.sha256Hex)(signature).substring(0, 16);
+  return (0, import_utils39.sha256Hex)(signature).substring(0, 16);
 }
 
 // libs/auth/src/authorization/orchestrated.authorization.ts
@@ -7246,7 +7165,7 @@ var OrchestratedAuthAccessorAdapter = class {
 };
 
 // libs/auth/src/authorization/dcr-client.registry.ts
-var import_utils39 = require("@frontmcp/utils");
+var import_utils40 = require("@frontmcp/utils");
 var DEFAULT_MAX_DYNAMIC_CLIENTS = 1e3;
 function globMatch(pattern, input) {
   let p = 0;
@@ -7372,7 +7291,7 @@ var DcrClientRegistry = class {
     if (!isConfidential) return "ok";
     if (!client.client_secret) return "invalid";
     if (!presentedSecret) return "invalid";
-    return (0, import_utils39.timingSafeEqual)((0, import_utils39.sha256)(presentedSecret), (0, import_utils39.sha256)(client.client_secret)) ? "ok" : "invalid";
+    return (0, import_utils40.timingSafeEqual)((0, import_utils40.sha256)(presentedSecret), (0, import_utils40.sha256)(client.client_secret)) ? "ok" : "invalid";
   }
   /** Whether a client id is known to the registry. */
   has(clientId) {
@@ -7460,7 +7379,7 @@ var DcrClientRegistry = class {
     if (typeof presented !== "string" || presented.length === 0) {
       return false;
     }
-    return (0, import_utils39.timingSafeEqual)((0, import_utils39.sha256)(presented), (0, import_utils39.sha256)(expected));
+    return (0, import_utils40.timingSafeEqual)((0, import_utils40.sha256)(presented), (0, import_utils40.sha256)(expected));
   }
 };
 
@@ -7789,6 +7708,7 @@ var cimdConfigSchema = import_lazy_zod9.z.object({
 init_cimd_cache();
 
 // libs/auth/src/cimd/cimd.service.ts
+var import_utils41 = require("@frontmcp/utils");
 init_cimd_cache();
 var CimdService = class {
   config;
@@ -7963,7 +7883,7 @@ var CimdService = class {
             httpStatus: 304
           });
         }
-        if (response.status >= 300 && response.status < 400) {
+        if ((0, import_utils41.isRedirectResponse)(response)) {
           const location = response.headers.get("location");
           if (!location) {
             throw new CimdFetchError(clientId, "Redirect response missing Location header", {
@@ -9548,7 +9468,7 @@ var CredentialCache = class {
 var AUTH_PROVIDERS_ACCESSOR = /* @__PURE__ */ Symbol.for("frontmcp:AUTH_PROVIDERS_ACCESSOR");
 
 // libs/auth/src/vault/auth-providers.accessor.impl.ts
-var import_utils42 = require("@frontmcp/utils");
+var import_utils44 = require("@frontmcp/utils");
 var AuthProvidersAccessorImpl = class {
   constructor(registry, vault, cache, loader, context, logger) {
     this.registry = registry;
@@ -9763,7 +9683,7 @@ var AuthProvidersAccessorImpl = class {
         return { [credential.headerName]: credential.key };
       case "basic": {
         const value = `${credential.username}:${credential.password}`;
-        const encoded = credential.encodedValue ?? (0, import_utils42.base64Encode)(new TextEncoder().encode(value));
+        const encoded = credential.encodedValue ?? (0, import_utils44.base64Encode)(new TextEncoder().encode(value));
         return { Authorization: `Basic ${encoded}` };
       }
       case "custom":
@@ -10351,6 +10271,18 @@ var noopRelationshipResolver = {
     return false;
   }
 };
+function resolveAuthUser(authInfo) {
+  const extraUser = authInfo?.extra?.["user"];
+  if (authInfo?.user) return authInfo.user;
+  return typeof extraUser === "object" && extraUser !== null ? extraUser : {};
+}
+function isAnonymousSubject(sub) {
+  return typeof sub !== "string" || sub === "" || sub.startsWith("anon:");
+}
+function signedInSubject(rawSub, mappedSub) {
+  if (rawSub !== void 0 && isAnonymousSubject(rawSub)) return void 0;
+  return [mappedSub, rawSub].find((candidate) => !isAnonymousSubject(candidate));
+}
 var AuthoritiesContextBuilder = class {
   claimsMapping;
   claimsResolver;
@@ -10368,7 +10300,7 @@ var AuthoritiesContextBuilder = class {
       const resolved = this.claimsResolver(authInfo);
       return {
         user: {
-          sub: authInfo?.user?.sub ?? "",
+          sub: signedInSubject(resolveAuthUser(authInfo).sub),
           roles: resolved.roles,
           permissions: resolved.permissions,
           claims: resolved.claims
@@ -10378,7 +10310,7 @@ var AuthoritiesContextBuilder = class {
         relationships: this.relationshipResolver
       };
     }
-    const user = authInfo?.user ?? {};
+    const user = resolveAuthUser(authInfo);
     const authorization = authInfo?.extra?.["authorization"];
     const authorizationClaims = authorization?.["claims"] ?? {};
     const rawClaims = {
@@ -10399,10 +10331,10 @@ var AuthoritiesContextBuilder = class {
     } else {
       permissions = toStringArray(user["permissions"] ?? []);
     }
-    const sub = this.claimsMapping?.userId ? String(resolveDotPath(rawClaims, this.claimsMapping.userId) ?? "") : user.sub ?? "";
+    const mappedSub = this.claimsMapping?.userId ? resolveDotPath(rawClaims, this.claimsMapping.userId) : void 0;
     return {
       user: {
-        sub,
+        sub: signedInSubject(user.sub, mappedSub),
         roles,
         permissions,
         claims: rawClaims
@@ -10434,15 +10366,17 @@ var FrontMcpAuthContextImpl = class {
   roles;
   permissions;
   constructor(source, claimsMapping) {
-    const rawUser = source.user ?? {};
-    const sub = claimsMapping?.userId ? String(resolveDotPath(this.buildRawClaims(source), claimsMapping.userId) ?? rawUser.sub ?? "") : String(rawUser.sub ?? "");
+    const rawUser = resolveAuthUser(source);
+    const mappedSub = claimsMapping?.userId ? resolveDotPath(this.buildRawClaims(source), claimsMapping.userId) : void 0;
+    const signedInSub = signedInSubject(rawUser.sub, mappedSub);
+    const sub = signedInSub ?? (typeof rawUser.sub === "string" ? rawUser.sub : "");
     this.user = Object.freeze({
       sub,
       name: rawUser.name,
       email: rawUser.email,
       picture: rawUser.picture
     });
-    this.isAnonymous = sub === "" || sub.startsWith("anon:");
+    this.isAnonymous = signedInSub === void 0;
     const extraAuth = source.extra?.["authorization"];
     this.mode = String(
       source.extra?.["authMode"] ?? extraAuth?.["mode"] ?? (source.extra?.["isPublic"] === true || rawUser["anonymous"] === true ? "public" : "authenticated")
@@ -10500,7 +10434,7 @@ var FrontMcpAuthContextImpl = class {
    * Mirrors the logic in AuthoritiesContextBuilder.build().
    */
   buildRawClaims(source) {
-    const rawUser = source.user ?? {};
+    const rawUser = resolveAuthUser(source);
     const extraAuth = source.extra?.["authorization"];
     const authorizationClaims = extraAuth?.["claims"] ?? {};
     return {
@@ -10719,8 +10653,9 @@ function resolveValue(value, ctx) {
 }
 function applyOperator(actual, op, expected) {
   switch (op) {
+    // A missing expected value (e.g. an absent fromInput) never matches, even an absent actual value
     case "eq":
-      return actual === expected;
+      return expected !== void 0 && actual === expected;
     case "neq":
       return actual !== expected;
     case "in":
@@ -10769,7 +10704,7 @@ function evaluateAbac(policy, ctx) {
     for (const [path, expectedRaw] of Object.entries(policy.match)) {
       const actual = resolveDotPath(envelope, path);
       const expected = resolveValue(expectedRaw, ctx);
-      if (actual !== expected) {
+      if (expected === void 0 || actual !== expected) {
         return {
           granted: false,
           deniedBy: `attributes.match: '${path}' expected '${String(expected)}' but got '${String(actual)}'`,
@@ -10809,6 +10744,15 @@ function resolveResourceId(ref, ctx) {
   return void 0;
 }
 async function evaluateSingleRebac(policy, ctx) {
+  const userSub = ctx.user.sub;
+  if (userSub === void 0 || isAnonymousSubject(userSub)) {
+    return {
+      granted: false,
+      deniedBy: `relationships: an anonymous caller cannot be '${policy.type}' of ${policy.resource}`,
+      denial: { kind: "relationships", path: "user.sub", expected: "a signed-in caller", actual: void 0 },
+      evaluatedPolicies: ["relationships"]
+    };
+  }
   const resourceId = resolveResourceId(policy.resourceId, ctx);
   if (resourceId === void 0) {
     return {
@@ -10823,11 +10767,11 @@ async function evaluateSingleRebac(policy, ctx) {
       evaluatedPolicies: ["relationships"]
     };
   }
-  const hasRelationship = await ctx.relationships.check(policy.type, policy.resource, resourceId, ctx.user.sub, ctx);
+  const hasRelationship = await ctx.relationships.check(policy.type, policy.resource, resourceId, userSub, ctx);
   if (!hasRelationship) {
     return {
       granted: false,
-      deniedBy: `relationships: user '${ctx.user.sub}' is not '${policy.type}' of ${policy.resource}:${resourceId}`,
+      deniedBy: `relationships: user '${userSub}' is not '${policy.type}' of ${policy.resource}:${resourceId}`,
       denial: {
         kind: "relationships",
         path: "relationships",
@@ -11501,6 +11445,7 @@ var FetchCredentialMiddleware = class {
   headerApplier,
   hkdfSha256,
   incrementalAuthConfigSchema,
+  isAnonymousSubject,
   isCimdClientId,
   isFrontMcpCredentials,
   isJwt,