@getstrata/core 0.5.58 → 0.5.60

package/dist/entries/http/response.js

@@ -297,6 +297,9 @@ class EtaViewEngine {
   }
 }
 // ../../src/core/view/htmlResponse.ts
+function withCharset(contentType) {
+  return contentType.includes("charset=") ? contentType : `${contentType}; charset=utf-8`;
+}
 function htmlResponse(html, init = {}) {
   return new Response(html, {
     status: init.status ?? 200,
@@ -309,6 +312,36 @@ function htmlResponse(html, init = {}) {
 function isHtmxRequest(request) {
   return request.headers.get("HX-Request") === "true";
 }
+function redirectResponse(location, status = 302) {
+  return new Response(null, {
+    status,
+    headers: {
+      Location: location
+    }
+  });
+}
+function notFoundHtmlResponse(body = "Not Found") {
+  return htmlResponse(body, { status: 404 });
+}
+function textResponse(body, init = {}) {
+  return new Response(body, {
+    status: init.status ?? 200,
+    headers: {
+      "Content-Type": "text/plain; charset=utf-8"
+    }
+  });
+}
+function xmlResponse(body, init = {}) {
+  return new Response(body, {
+    status: init.status ?? 200,
+    headers: {
+      "Content-Type": withCharset(init.contentType ?? "application/xml")
+    }
+  });
+}
+function rssResponse(body, init = {}) {
+  return xmlResponse(body, { ...init, contentType: "application/rss+xml" });
+}
 // ../../src/core/view/webLayoutData.ts
 import { currentAuthUser } from "@getstrata/core/auth/authContext";
 import { currentRequestMeta as currentRequestMeta2 } from "@getstrata/core/http/requestMetaContext";
@@ -321,6 +354,42 @@ var CORE_EVENT_BUS_TOKEN = "core.eventBus";
 var CORE_POLICY_GATE_TOKEN = "core.policyGate";
 var CORE_AUTH_TOKEN = "core.auth";
 var CORE_TOKEN_SERVICE_TOKEN = "core.tokenService";
+var CORE_ABILITY_CHECKER_TOKEN = "core.abilityChecker";
+var CORE_AUTH_USER_DIRECTORY_TOKEN = "core.authUserDirectory";
+function isAbilityChecker(value) {
+  if (!value || typeof value !== "object") {
+    return false;
+  }
+  const candidate = value;
+  return typeof candidate.tokenCan === "function" && typeof candidate.requireAbility === "function";
+}
+function isAuthUserDirectory(value) {
+  if (!value || typeof value !== "object") {
+    return false;
+  }
+  return typeof value.findByIdOrThrow === "function";
+}
+function resolveAbilityChecker(container) {
+  if (container.has(CORE_ABILITY_CHECKER_TOKEN)) {
+    return container.resolve(CORE_ABILITY_CHECKER_TOKEN);
+  }
+  return container.resolve(CORE_TOKEN_SERVICE_TOKEN);
+}
+function resolveAuthUserDirectory(container) {
+  if (container.has(CORE_AUTH_USER_DIRECTORY_TOKEN)) {
+    const directory = container.resolve(CORE_AUTH_USER_DIRECTORY_TOKEN);
+    if (isAuthUserDirectory(directory)) {
+      return directory;
+    }
+  }
+  if (container.has(CORE_TOKEN_SERVICE_TOKEN)) {
+    const tokenService = container.resolve(CORE_TOKEN_SERVICE_TOKEN);
+    if (isAuthUserDirectory(tokenService)) {
+      return tokenService;
+    }
+  }
+  return null;
+}
 
 // ../../src/core/http/csrfToken.ts
 import { timingSafeEqual } from "crypto";
@@ -382,6 +451,9 @@ function currentRequestMeta() {
 // ../../src/core/http/csrfToken.ts
 var CSRF_COOKIE = "workhub_csrf";
 var CSRF_TTL_MS = 60 * 60 * 1000;
+function csrfCookieName() {
+  return process.env.CSRF_COOKIE_NAME?.trim() || CSRF_COOKIE;
+}
 function resolveCsrfSecret() {
   return process.env.SESSION_SECRET?.trim() || process.env.OAUTH_STATE_SECRET?.trim() || process.env.ADMIN_API_TOKEN?.trim() || "workhub-dev-csrf-secret";
 }
@@ -401,11 +473,11 @@ function createCsrfTokenCookie() {
   const secure = process.env.APP_ENV === "production" ? "; Secure" : "";
   return {
     token,
-    cookie: `${CSRF_COOKIE}=${encodeURIComponent(token)}; Path=/; SameSite=Lax; Max-Age=${Math.floor(CSRF_TTL_MS / 1000)}${secure}`
+    cookie: `${csrfCookieName()}=${encodeURIComponent(token)}; Path=/; SameSite=Lax; Max-Age=${Math.floor(CSRF_TTL_MS / 1000)}${secure}`
   };
 }
 function resolveCsrfToken(request) {
-  const cookieValue = readRequestCookie(request, CSRF_COOKIE);
+  const cookieValue = readRequestCookie(request, csrfCookieName());
   if (cookieValue && Bun.CSRF.verify(cookieValue, csrfVerifyOptions())) {
     return { token: cookieValue };
   }
@@ -441,7 +513,7 @@ function verifyCsrfToken(request, submittedToken) {
   if (!submittedToken) {
     return false;
   }
-  const cookieValue = readRequestCookie(request, CSRF_COOKIE);
+  const cookieValue = readRequestCookie(request, csrfCookieName());
   if (!cookieValue) {
     return false;
   }
@@ -558,44 +630,56 @@ function withFlashClear(response) {
 }
 
 // ../../src/core/view/webLayoutData.ts
-async function resolveWebLayoutData(container, request) {
-  const csrfToken = request ? resolveCsrfTokenForRequest(request) : "";
-  const flash = request ? currentRequestMeta2().flash ?? pullFlash(request) : null;
+var configuredLayoutOptions = {};
+function configureWebLayoutData(options) {
+  configuredLayoutOptions = { ...options };
+}
+function layoutUserKey(options) {
+  return options.userKey ?? "authUser";
+}
+async function defaultLoadLayoutUser(container, _request) {
   const authUser = currentAuthUser();
   if (!authUser) {
-    return { authUser: null, csrfToken, flash };
+    return null;
   }
   const userId = Number(authUser.id);
   if (!Number.isInteger(userId) || userId <= 0) {
-    return { authUser: null, csrfToken, flash };
+    return null;
   }
-  if (!container.has(CORE_TOKEN_SERVICE_TOKEN)) {
+  const directory = resolveAuthUserDirectory(container);
+  if (!directory) {
     return {
-      authUser: {
-        id: userId,
-        email: "",
-        role: authUser.role ?? "member"
-      },
-      csrfToken,
-      flash
+      id: userId,
+      email: "",
+      role: authUser.role ?? "member"
     };
   }
-  const tokenService = container.resolve(CORE_TOKEN_SERVICE_TOKEN);
   try {
-    const user = await tokenService.findByIdOrThrow(userId);
+    const user = await directory.findByIdOrThrow(userId);
     return {
-      authUser: {
-        id: userId,
-        email: user.email ?? "",
-        role: authUser.role ?? user.role ?? "member"
-      },
-      csrfToken,
-      flash
+      id: userId,
+      email: user.email ?? "",
+      role: authUser.role ?? user.role ?? "member"
     };
   } catch {
-    return { authUser: null, csrfToken, flash };
+    return null;
   }
 }
+async function resolveWebLayoutData(container, request, options = {}) {
+  const resolved = { ...configuredLayoutOptions, ...options };
+  const csrfToken = request ? resolveCsrfTokenForRequest(request) : "";
+  const flash = request ? currentRequestMeta2().flash ?? pullFlash(request) : null;
+  const userKey = layoutUserKey(resolved);
+  const loadUser = resolved.loadUser ?? defaultLoadLayoutUser;
+  const user = await loadUser(container, request);
+  const extra = typeof resolved.extra === "function" ? await resolved.extra(user) : resolved.extra ?? {};
+  return {
+    [userKey]: user,
+    csrfToken,
+    flash,
+    ...extra
+  };
+}
 // ../../src/core/http/contentNegotiation.ts
 function requestPrefersJson(request) {
   if (!request) {

package/dist/entries/http/webErrorResponse.js

@@ -294,6 +294,9 @@ class EtaViewEngine {
   }
 }
 // ../../src/core/view/htmlResponse.ts
+function withCharset(contentType) {
+  return contentType.includes("charset=") ? contentType : `${contentType}; charset=utf-8`;
+}
 function htmlResponse(html, init = {}) {
   return new Response(html, {
     status: init.status ?? 200,
@@ -306,6 +309,36 @@ function htmlResponse(html, init = {}) {
 function isHtmxRequest(request) {
   return request.headers.get("HX-Request") === "true";
 }
+function redirectResponse(location, status = 302) {
+  return new Response(null, {
+    status,
+    headers: {
+      Location: location
+    }
+  });
+}
+function notFoundHtmlResponse(body = "Not Found") {
+  return htmlResponse(body, { status: 404 });
+}
+function textResponse(body, init = {}) {
+  return new Response(body, {
+    status: init.status ?? 200,
+    headers: {
+      "Content-Type": "text/plain; charset=utf-8"
+    }
+  });
+}
+function xmlResponse(body, init = {}) {
+  return new Response(body, {
+    status: init.status ?? 200,
+    headers: {
+      "Content-Type": withCharset(init.contentType ?? "application/xml")
+    }
+  });
+}
+function rssResponse(body, init = {}) {
+  return xmlResponse(body, { ...init, contentType: "application/rss+xml" });
+}
 // ../../src/core/view/webLayoutData.ts
 import { currentAuthUser } from "@getstrata/core/auth/authContext";
 import { currentRequestMeta as currentRequestMeta2 } from "@getstrata/core/http/requestMetaContext";
@@ -318,6 +351,42 @@ var CORE_EVENT_BUS_TOKEN = "core.eventBus";
 var CORE_POLICY_GATE_TOKEN = "core.policyGate";
 var CORE_AUTH_TOKEN = "core.auth";
 var CORE_TOKEN_SERVICE_TOKEN = "core.tokenService";
+var CORE_ABILITY_CHECKER_TOKEN = "core.abilityChecker";
+var CORE_AUTH_USER_DIRECTORY_TOKEN = "core.authUserDirectory";
+function isAbilityChecker(value) {
+  if (!value || typeof value !== "object") {
+    return false;
+  }
+  const candidate = value;
+  return typeof candidate.tokenCan === "function" && typeof candidate.requireAbility === "function";
+}
+function isAuthUserDirectory(value) {
+  if (!value || typeof value !== "object") {
+    return false;
+  }
+  return typeof value.findByIdOrThrow === "function";
+}
+function resolveAbilityChecker(container) {
+  if (container.has(CORE_ABILITY_CHECKER_TOKEN)) {
+    return container.resolve(CORE_ABILITY_CHECKER_TOKEN);
+  }
+  return container.resolve(CORE_TOKEN_SERVICE_TOKEN);
+}
+function resolveAuthUserDirectory(container) {
+  if (container.has(CORE_AUTH_USER_DIRECTORY_TOKEN)) {
+    const directory = container.resolve(CORE_AUTH_USER_DIRECTORY_TOKEN);
+    if (isAuthUserDirectory(directory)) {
+      return directory;
+    }
+  }
+  if (container.has(CORE_TOKEN_SERVICE_TOKEN)) {
+    const tokenService = container.resolve(CORE_TOKEN_SERVICE_TOKEN);
+    if (isAuthUserDirectory(tokenService)) {
+      return tokenService;
+    }
+  }
+  return null;
+}
 
 // ../../src/core/http/csrfToken.ts
 import { timingSafeEqual } from "crypto";
@@ -379,6 +448,9 @@ function currentRequestMeta() {
 // ../../src/core/http/csrfToken.ts
 var CSRF_COOKIE = "workhub_csrf";
 var CSRF_TTL_MS = 60 * 60 * 1000;
+function csrfCookieName() {
+  return process.env.CSRF_COOKIE_NAME?.trim() || CSRF_COOKIE;
+}
 function resolveCsrfSecret() {
   return process.env.SESSION_SECRET?.trim() || process.env.OAUTH_STATE_SECRET?.trim() || process.env.ADMIN_API_TOKEN?.trim() || "workhub-dev-csrf-secret";
 }
@@ -398,11 +470,11 @@ function createCsrfTokenCookie() {
   const secure = process.env.APP_ENV === "production" ? "; Secure" : "";
   return {
     token,
-    cookie: `${CSRF_COOKIE}=${encodeURIComponent(token)}; Path=/; SameSite=Lax; Max-Age=${Math.floor(CSRF_TTL_MS / 1000)}${secure}`
+    cookie: `${csrfCookieName()}=${encodeURIComponent(token)}; Path=/; SameSite=Lax; Max-Age=${Math.floor(CSRF_TTL_MS / 1000)}${secure}`
   };
 }
 function resolveCsrfToken(request) {
-  const cookieValue = readRequestCookie(request, CSRF_COOKIE);
+  const cookieValue = readRequestCookie(request, csrfCookieName());
   if (cookieValue && Bun.CSRF.verify(cookieValue, csrfVerifyOptions())) {
     return { token: cookieValue };
   }
@@ -438,7 +510,7 @@ function verifyCsrfToken(request, submittedToken) {
   if (!submittedToken) {
     return false;
   }
-  const cookieValue = readRequestCookie(request, CSRF_COOKIE);
+  const cookieValue = readRequestCookie(request, csrfCookieName());
   if (!cookieValue) {
     return false;
   }
@@ -555,44 +627,56 @@ function withFlashClear(response) {
 }
 
 // ../../src/core/view/webLayoutData.ts
-async function resolveWebLayoutData(container, request) {
-  const csrfToken = request ? resolveCsrfTokenForRequest(request) : "";
-  const flash = request ? currentRequestMeta2().flash ?? pullFlash(request) : null;
+var configuredLayoutOptions = {};
+function configureWebLayoutData(options) {
+  configuredLayoutOptions = { ...options };
+}
+function layoutUserKey(options) {
+  return options.userKey ?? "authUser";
+}
+async function defaultLoadLayoutUser(container, _request) {
   const authUser = currentAuthUser();
   if (!authUser) {
-    return { authUser: null, csrfToken, flash };
+    return null;
   }
   const userId = Number(authUser.id);
   if (!Number.isInteger(userId) || userId <= 0) {
-    return { authUser: null, csrfToken, flash };
+    return null;
   }
-  if (!container.has(CORE_TOKEN_SERVICE_TOKEN)) {
+  const directory = resolveAuthUserDirectory(container);
+  if (!directory) {
     return {
-      authUser: {
-        id: userId,
-        email: "",
-        role: authUser.role ?? "member"
-      },
-      csrfToken,
-      flash
+      id: userId,
+      email: "",
+      role: authUser.role ?? "member"
     };
   }
-  const tokenService = container.resolve(CORE_TOKEN_SERVICE_TOKEN);
   try {
-    const user = await tokenService.findByIdOrThrow(userId);
+    const user = await directory.findByIdOrThrow(userId);
     return {
-      authUser: {
-        id: userId,
-        email: user.email ?? "",
-        role: authUser.role ?? user.role ?? "member"
-      },
-      csrfToken,
-      flash
+      id: userId,
+      email: user.email ?? "",
+      role: authUser.role ?? user.role ?? "member"
     };
   } catch {
-    return { authUser: null, csrfToken, flash };
+    return null;
   }
 }
+async function resolveWebLayoutData(container, request, options = {}) {
+  const resolved = { ...configuredLayoutOptions, ...options };
+  const csrfToken = request ? resolveCsrfTokenForRequest(request) : "";
+  const flash = request ? currentRequestMeta2().flash ?? pullFlash(request) : null;
+  const userKey = layoutUserKey(resolved);
+  const loadUser = resolved.loadUser ?? defaultLoadLayoutUser;
+  const user = await loadUser(container, request);
+  const extra = typeof resolved.extra === "function" ? await resolved.extra(user) : resolved.extra ?? {};
+  return {
+    [userKey]: user,
+    csrfToken,
+    flash,
+    ...extra
+  };
+}
 // ../../src/core/http/contentNegotiation.ts
 function requestPrefersJson(request) {
   if (!request) {

package/dist/entries/queue/createAppQueue.js

@@ -102,7 +102,9 @@ var jobRegistry = readSharedJobRegistry();
 
 // ../../src/bootstrap/config.ts
 import {
+  CORE_ABILITY_CHECKER_TOKEN,
   CORE_AUTH_TOKEN,
+  CORE_AUTH_USER_DIRECTORY_TOKEN,
   CORE_CACHE_TOKEN,
   CORE_CONFIG_TOKEN,
   CORE_EVENT_BUS_TOKEN,

package/dist/entries/queue/jobRunner.js

@@ -1,7 +1,9 @@
 // @bun
 // ../../src/bootstrap/config.ts
 import {
+  CORE_ABILITY_CHECKER_TOKEN,
   CORE_AUTH_TOKEN,
+  CORE_AUTH_USER_DIRECTORY_TOKEN,
   CORE_CACHE_TOKEN,
   CORE_CONFIG_TOKEN,
   CORE_EVENT_BUS_TOKEN,

package/dist/entries/queue/publicQueue.js

@@ -102,7 +102,9 @@ var jobRegistry = readSharedJobRegistry();
 
 // ../../src/bootstrap/config.ts
 import {
+  CORE_ABILITY_CHECKER_TOKEN,
   CORE_AUTH_TOKEN,
+  CORE_AUTH_USER_DIRECTORY_TOKEN,
   CORE_CACHE_TOKEN,
   CORE_CONFIG_TOKEN,
   CORE_EVENT_BUS_TOKEN,

package/dist/entries/queue/queueMetrics.js

@@ -4,7 +4,9 @@ var {RedisClient: RedisClient2 } = globalThis.Bun;
 
 // ../../src/bootstrap/config.ts
 import {
+  CORE_ABILITY_CHECKER_TOKEN,
   CORE_AUTH_TOKEN,
+  CORE_AUTH_USER_DIRECTORY_TOKEN,
   CORE_CACHE_TOKEN,
   CORE_CONFIG_TOKEN,
   CORE_EVENT_BUS_TOKEN,

package/dist/entries/queue/redisQueue.js

@@ -41,7 +41,9 @@ var jobRegistry = readSharedJobRegistry();
 
 // ../../src/bootstrap/config.ts
 import {
+  CORE_ABILITY_CHECKER_TOKEN,
   CORE_AUTH_TOKEN,
+  CORE_AUTH_USER_DIRECTORY_TOKEN,
   CORE_CACHE_TOKEN,
   CORE_CONFIG_TOKEN,
   CORE_EVENT_BUS_TOKEN,

package/dist/entries/view.js

@@ -213,6 +213,9 @@ class EtaViewEngine {
   }
 }
 // ../../src/core/view/htmlResponse.ts
+function withCharset(contentType) {
+  return contentType.includes("charset=") ? contentType : `${contentType}; charset=utf-8`;
+}
 function htmlResponse(html, init = {}) {
   return new Response(html, {
     status: init.status ?? 200,
@@ -225,6 +228,36 @@ function htmlResponse(html, init = {}) {
 function isHtmxRequest(request) {
   return request.headers.get("HX-Request") === "true";
 }
+function redirectResponse(location, status = 302) {
+  return new Response(null, {
+    status,
+    headers: {
+      Location: location
+    }
+  });
+}
+function notFoundHtmlResponse(body = "Not Found") {
+  return htmlResponse(body, { status: 404 });
+}
+function textResponse(body, init = {}) {
+  return new Response(body, {
+    status: init.status ?? 200,
+    headers: {
+      "Content-Type": "text/plain; charset=utf-8"
+    }
+  });
+}
+function xmlResponse(body, init = {}) {
+  return new Response(body, {
+    status: init.status ?? 200,
+    headers: {
+      "Content-Type": withCharset(init.contentType ?? "application/xml")
+    }
+  });
+}
+function rssResponse(body, init = {}) {
+  return xmlResponse(body, { ...init, contentType: "application/rss+xml" });
+}
 // ../../src/core/view/webLayoutData.ts
 import { currentAuthUser } from "@getstrata/core/auth/authContext";
 import { currentRequestMeta as currentRequestMeta2 } from "@getstrata/core/http/requestMetaContext";
@@ -237,6 +270,42 @@ var CORE_EVENT_BUS_TOKEN = "core.eventBus";
 var CORE_POLICY_GATE_TOKEN = "core.policyGate";
 var CORE_AUTH_TOKEN = "core.auth";
 var CORE_TOKEN_SERVICE_TOKEN = "core.tokenService";
+var CORE_ABILITY_CHECKER_TOKEN = "core.abilityChecker";
+var CORE_AUTH_USER_DIRECTORY_TOKEN = "core.authUserDirectory";
+function isAbilityChecker(value) {
+  if (!value || typeof value !== "object") {
+    return false;
+  }
+  const candidate = value;
+  return typeof candidate.tokenCan === "function" && typeof candidate.requireAbility === "function";
+}
+function isAuthUserDirectory(value) {
+  if (!value || typeof value !== "object") {
+    return false;
+  }
+  return typeof value.findByIdOrThrow === "function";
+}
+function resolveAbilityChecker(container) {
+  if (container.has(CORE_ABILITY_CHECKER_TOKEN)) {
+    return container.resolve(CORE_ABILITY_CHECKER_TOKEN);
+  }
+  return container.resolve(CORE_TOKEN_SERVICE_TOKEN);
+}
+function resolveAuthUserDirectory(container) {
+  if (container.has(CORE_AUTH_USER_DIRECTORY_TOKEN)) {
+    const directory = container.resolve(CORE_AUTH_USER_DIRECTORY_TOKEN);
+    if (isAuthUserDirectory(directory)) {
+      return directory;
+    }
+  }
+  if (container.has(CORE_TOKEN_SERVICE_TOKEN)) {
+    const tokenService = container.resolve(CORE_TOKEN_SERVICE_TOKEN);
+    if (isAuthUserDirectory(tokenService)) {
+      return tokenService;
+    }
+  }
+  return null;
+}
 
 // ../../src/core/http/csrfToken.ts
 import { timingSafeEqual } from "crypto";
@@ -298,6 +367,9 @@ function currentRequestMeta() {
 // ../../src/core/http/csrfToken.ts
 var CSRF_COOKIE = "workhub_csrf";
 var CSRF_TTL_MS = 60 * 60 * 1000;
+function csrfCookieName() {
+  return process.env.CSRF_COOKIE_NAME?.trim() || CSRF_COOKIE;
+}
 function resolveCsrfSecret() {
   return process.env.SESSION_SECRET?.trim() || process.env.OAUTH_STATE_SECRET?.trim() || process.env.ADMIN_API_TOKEN?.trim() || "workhub-dev-csrf-secret";
 }
@@ -317,11 +389,11 @@ function createCsrfTokenCookie() {
   const secure = process.env.APP_ENV === "production" ? "; Secure" : "";
   return {
     token,
-    cookie: `${CSRF_COOKIE}=${encodeURIComponent(token)}; Path=/; SameSite=Lax; Max-Age=${Math.floor(CSRF_TTL_MS / 1000)}${secure}`
+    cookie: `${csrfCookieName()}=${encodeURIComponent(token)}; Path=/; SameSite=Lax; Max-Age=${Math.floor(CSRF_TTL_MS / 1000)}${secure}`
   };
 }
 function resolveCsrfToken(request) {
-  const cookieValue = readRequestCookie(request, CSRF_COOKIE);
+  const cookieValue = readRequestCookie(request, csrfCookieName());
   if (cookieValue && Bun.CSRF.verify(cookieValue, csrfVerifyOptions())) {
     return { token: cookieValue };
   }
@@ -357,7 +429,7 @@ function verifyCsrfToken(request, submittedToken) {
   if (!submittedToken) {
     return false;
   }
-  const cookieValue = readRequestCookie(request, CSRF_COOKIE);
+  const cookieValue = readRequestCookie(request, csrfCookieName());
   if (!cookieValue) {
     return false;
   }
@@ -474,48 +546,66 @@ function withFlashClear(response) {
 }
 
 // ../../src/core/view/webLayoutData.ts
-async function resolveWebLayoutData(container, request) {
-  const csrfToken = request ? resolveCsrfTokenForRequest(request) : "";
-  const flash = request ? currentRequestMeta2().flash ?? pullFlash(request) : null;
+var configuredLayoutOptions = {};
+function configureWebLayoutData(options) {
+  configuredLayoutOptions = { ...options };
+}
+function layoutUserKey(options) {
+  return options.userKey ?? "authUser";
+}
+async function defaultLoadLayoutUser(container, _request) {
   const authUser = currentAuthUser();
   if (!authUser) {
-    return { authUser: null, csrfToken, flash };
+    return null;
   }
   const userId = Number(authUser.id);
   if (!Number.isInteger(userId) || userId <= 0) {
-    return { authUser: null, csrfToken, flash };
+    return null;
   }
-  if (!container.has(CORE_TOKEN_SERVICE_TOKEN)) {
+  const directory = resolveAuthUserDirectory(container);
+  if (!directory) {
     return {
-      authUser: {
-        id: userId,
-        email: "",
-        role: authUser.role ?? "member"
-      },
-      csrfToken,
-      flash
+      id: userId,
+      email: "",
+      role: authUser.role ?? "member"
     };
   }
-  const tokenService = container.resolve(CORE_TOKEN_SERVICE_TOKEN);
   try {
-    const user = await tokenService.findByIdOrThrow(userId);
+    const user = await directory.findByIdOrThrow(userId);
     return {
-      authUser: {
-        id: userId,
-        email: user.email ?? "",
-        role: authUser.role ?? user.role ?? "member"
-      },
-      csrfToken,
-      flash
+      id: userId,
+      email: user.email ?? "",
+      role: authUser.role ?? user.role ?? "member"
     };
   } catch {
-    return { authUser: null, csrfToken, flash };
+    return null;
   }
 }
+async function resolveWebLayoutData(container, request, options = {}) {
+  const resolved = { ...configuredLayoutOptions, ...options };
+  const csrfToken = request ? resolveCsrfTokenForRequest(request) : "";
+  const flash = request ? currentRequestMeta2().flash ?? pullFlash(request) : null;
+  const userKey = layoutUserKey(resolved);
+  const loadUser = resolved.loadUser ?? defaultLoadLayoutUser;
+  const user = await loadUser(container, request);
+  const extra = typeof resolved.extra === "function" ? await resolved.extra(user) : resolved.extra ?? {};
+  return {
+    [userKey]: user,
+    csrfToken,
+    flash,
+    ...extra
+  };
+}
 export {
   DEFAULT_VIEWS_DIRECTORY,
   EtaViewEngine,
+  configureWebLayoutData,
   htmlResponse,
   isHtmxRequest,
-  resolveWebLayoutData
+  notFoundHtmlResponse,
+  redirectResponse,
+  resolveWebLayoutData,
+  rssResponse,
+  textResponse,
+  xmlResponse
 };