@treasuryspatial/surface-kit 0.1.10 → 0.1.16

package/dist/server.js

@@ -1,5 +1,5 @@
 import { NextResponse } from 'next/server.js';
-import { applySurfaceBrandingToManifest, normalizeSurfaceBrandingPayload, } from './index.js';
+import { applySurfaceBrandingToManifest, mapSurfaceBrandingManifestImages, orderSurfaceModeTabs, normalizeSurfaceBrandingPayload, } from './index.js';
 export const SURFACE_AUTH_COOKIE_NAME = 'treasury_auth_token';
 const DEFAULT_ADMIN_API_URL = 'https://admin-api.treasury.space/api';
 const DEFAULT_BRANDING_SCOPE = ['admin'];
@@ -8,16 +8,26 @@ const DEFAULT_BRANDING_TTL = 600;
 const DEFAULT_BRANDING_AUDIENCE = 'assets';
 const DEFAULT_BYPASS_EXACT = new Set(['/favicon.ico', '/robots.txt', '/sitemap.xml']);
 const DEFAULT_BYPASS_PREFIXES = ['/_next', '/fonts', '/textures'];
-const DEFAULT_BYPASS_PATTERN = /\.(?:css|js|map|ico|png|jpg|jpeg|gif|svg|webp|avif|woff2?|ttf|otf|eot|wasm|json|txt|xml|csv)$/i;
+const DEFAULT_BYPASS_PATTERN = /\.(?:css|js|map|ico|png|jpg|jpeg|gif|svg|webp|avif|woff2?|ttf|otf|eot|wasm|json|txt|xml|csv|wav|mp3|m4a|ogg)$/i;
+export const SURFACE_CONTEXT_HEADER = 'x-treasury-surface-context';
+const sanitizeEnvValue = (value) => value?.replace(/[\r\n]+/g, '').trim() || '';
 const readEnv = (...values) => {
     for (const value of values) {
-        const trimmed = value?.trim();
-        if (trimmed)
-            return trimmed;
+        const normalized = sanitizeEnvValue(value);
+        if (normalized)
+            return normalized;
     }
     return '';
 };
 const normalizeTenant = (value) => String(value || '').trim().toLowerCase();
+const asMembershipStringArray = (value) => Array.isArray(value)
+    ? value
+        .map((entry) => String(entry || '').trim().toLowerCase())
+        .filter(Boolean)
+    : [];
+const membershipArrayKeys = [
+    'tenantSurfaceAccess',
+];
 const isLocalUrl = (value) => value.includes('localhost') || value.includes('127.0.0.1');
 const buildServiceAuthHeaders = () => {
     const serviceToken = readEnv(process.env.TREASURY_SERVICE_TOKEN);
@@ -61,7 +71,7 @@ export const normalizeRequestHost = (value) => (value || '')
     .trim()
     .toLowerCase()
     .replace(/:\d+$/, '');
-export const resolveRequestHost = (headers) => normalizeRequestHost(headers.get('x-forwarded-host') || headers.get('host'));
+export const resolveRequestHost = (headers) => normalizeRequestHost(headers.get('x-tenant-host') || headers.get('x-forwarded-host') || headers.get('host'));
 const isHeaderBag = (value) => Boolean(value) && typeof value === 'object' && typeof value.get === 'function';
 const coerceHeaderBag = (requestOrHeaders) => {
     if (isHeaderBag(requestOrHeaders)) {
@@ -75,12 +85,101 @@ const coerceHeaderBag = (requestOrHeaders) => {
     }
     throw new TypeError('Surface request context requires a headers-like object');
 };
+const serializeSurfaceContext = (surfaceContext) => encodeURIComponent(JSON.stringify({
+    publicHost: surfaceContext.publicHost,
+    hostSlug: surfaceContext.hostSlug,
+    tenantSlug: surfaceContext.tenantSlug,
+    effectiveTenantSlug: surfaceContext.effectiveTenantSlug,
+    subtenantSlug: surfaceContext.subtenantSlug,
+    surfaceId: surfaceContext.surfaceId,
+    brandProfile: surfaceContext.brandProfile,
+    compatibilityMode: surfaceContext.compatibilityMode,
+    isMarketingHost: surfaceContext.isMarketingHost,
+}));
+const parseSurfaceContext = (value) => {
+    if (!value)
+        return null;
+    try {
+        const parsed = JSON.parse(decodeURIComponent(value));
+        if (typeof parsed.publicHost !== 'string' ||
+            typeof parsed.hostSlug !== 'string' ||
+            typeof parsed.tenantSlug !== 'string' ||
+            typeof parsed.effectiveTenantSlug !== 'string' ||
+            typeof parsed.surfaceId !== 'string' ||
+            typeof parsed.brandProfile !== 'string' ||
+            typeof parsed.compatibilityMode !== 'string' ||
+            typeof parsed.isMarketingHost !== 'boolean') {
+            return null;
+        }
+        return {
+            publicHost: parsed.publicHost,
+            hostSlug: parsed.hostSlug,
+            tenantSlug: parsed.tenantSlug,
+            effectiveTenantSlug: parsed.effectiveTenantSlug,
+            subtenantSlug: typeof parsed.subtenantSlug === 'string' ? parsed.subtenantSlug : null,
+            surfaceId: parsed.surfaceId,
+            brandProfile: parsed.brandProfile,
+            compatibilityMode: parsed.compatibilityMode,
+            isMarketingHost: parsed.isMarketingHost,
+        };
+    }
+    catch {
+        return null;
+    }
+};
+export const readSurfaceContextHeader = (headers) => parseSurfaceContext(headers.get(SURFACE_CONTEXT_HEADER));
+export const writeSurfaceContextHeaders = (headers, surfaceContext) => {
+    headers.set(SURFACE_CONTEXT_HEADER, serializeSurfaceContext(surfaceContext));
+    return headers;
+};
+const buildSurfaceContextRequestHeaders = (request, surfaceContext) => writeSurfaceContextHeaders(new Headers(request.headers), surfaceContext);
+const isNextRequestLike = (value) => Boolean(value &&
+    typeof value === 'object' &&
+    'nextUrl' in value &&
+    value.nextUrl &&
+    typeof value.nextUrl.searchParams?.get === 'function');
+const readSurfaceRequestResolutionHints = (requestOrHeaders) => {
+    if (!isNextRequestLike(requestOrHeaders))
+        return {};
+    const searchParams = requestOrHeaders.nextUrl.searchParams;
+    return {
+        requestedSubtenantSlug: searchParams.get('subtenant') ||
+            searchParams.get('subtenantSlug') ||
+            searchParams.get('requestedSubtenantSlug'),
+        requestedSubtenantId: searchParams.get('subtenantId') ||
+            searchParams.get('requestedSubtenantId'),
+        surfaceId: searchParams.get('surfaceId'),
+        pathname: requestOrHeaders.nextUrl.pathname,
+    };
+};
 export const resolveSurfaceRequestContext = (requestOrHeaders, resolveSurfaceHostContext) => {
     const headers = coerceHeaderBag(requestOrHeaders);
     const host = resolveRequestHost(headers);
+    const stampedSurfaceContext = readSurfaceContextHeader(headers);
+    if (stampedSurfaceContext) {
+        return {
+            host,
+            surfaceContext: stampedSurfaceContext,
+        };
+    }
     return {
         host,
-        surfaceContext: resolveSurfaceHostContext(host),
+        surfaceContext: resolveSurfaceHostContext(host, readSurfaceRequestResolutionHints(requestOrHeaders)),
+    };
+};
+export const resolveSurfaceRequestContextAsync = async (requestOrHeaders, resolveSurfaceHostContext) => {
+    const headers = coerceHeaderBag(requestOrHeaders);
+    const host = resolveRequestHost(headers);
+    const stampedSurfaceContext = readSurfaceContextHeader(headers);
+    if (stampedSurfaceContext) {
+        return {
+            host,
+            surfaceContext: stampedSurfaceContext,
+        };
+    }
+    return {
+        host,
+        surfaceContext: await resolveSurfaceHostContext(host, readSurfaceRequestResolutionHints(requestOrHeaders)),
     };
 };
 export const resolveAdminApiUrl = (pathname, explicitBase) => {
@@ -94,12 +193,13 @@ export const resolveAdminApiUrl = (pathname, explicitBase) => {
         return `${base}${pathname}`;
     return `${base}/api${pathname}`;
 };
-const getAdminCandidates = (explicitBase) => {
-    const baseUrl = resolveAdminApiUrl('', explicitBase).replace(/\/$/, '');
-    if (isLocalUrl(baseUrl) && baseUrl !== DEFAULT_ADMIN_API_URL) {
-        return [baseUrl, DEFAULT_ADMIN_API_URL];
-    }
-    return [baseUrl];
+const postJsonCandidates = async (pathname, body, { fetchImpl = fetch, adminApiUrl, } = {}) => {
+    return fetchImpl(resolveAdminApiUrl(pathname, adminApiUrl), {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', Accept: 'application/json' },
+        body: JSON.stringify(body),
+        cache: 'no-store',
+    });
 };
 export const resolveTenantLookupSlug = (surfaceContext) => surfaceContext.subtenantSlug ? surfaceContext.tenantSlug : surfaceContext.effectiveTenantSlug;
 export const fetchSurfaceTenant = async (surfaceContext, options = {}) => {
@@ -107,55 +207,166 @@ export const fetchSurfaceTenant = async (surfaceContext, options = {}) => {
     const subtenantQuery = surfaceContext.subtenantSlug
         ? `&subtenantSlug=${encodeURIComponent(surfaceContext.subtenantSlug)}`
         : '';
-    for (const baseUrl of getAdminCandidates(options.adminApiUrl)) {
-        const url = `${baseUrl}/tenants/${encodeURIComponent(slug)}?view=${encodeURIComponent(options.view ?? 'composer')}${subtenantQuery}`;
-        const payload = await fetchJson(url, options);
-        if (payload)
-            return payload;
-    }
-    return null;
+    const baseUrl = resolveAdminApiUrl('', options.adminApiUrl).replace(/\/$/, '');
+    const url = `${baseUrl}/tenants/${encodeURIComponent(slug)}?view=${encodeURIComponent(options.view ?? 'composer')}${subtenantQuery}`;
+    return fetchJson(url, options);
+};
+export const fetchSurfaceTenantBySlug = async (slug, options = {}) => {
+    const normalizedSlug = normalizeTenant(slug);
+    if (!normalizedSlug)
+        return null;
+    const baseUrl = resolveAdminApiUrl('', options.adminApiUrl).replace(/\/$/, '');
+    const url = `${baseUrl}/tenants/${encodeURIComponent(normalizedSlug)}?view=${encodeURIComponent(options.view ?? 'composer')}`;
+    return fetchJson(url, options);
 };
 export const fetchSurfaceBranding = async (surfaceContext, options = {}) => {
     const slug = resolveTenantLookupSlug(surfaceContext);
     const subtenantQuery = surfaceContext.subtenantSlug
         ? `?subtenantSlug=${encodeURIComponent(surfaceContext.subtenantSlug)}`
         : '';
-    for (const baseUrl of getAdminCandidates(options.adminApiUrl)) {
-        const urls = slug
-            ? [
-                `${baseUrl}/branding/${encodeURIComponent(slug)}${subtenantQuery}`,
-                `${baseUrl}/platform/branding?tenantId=${encodeURIComponent(slug)}${surfaceContext.subtenantSlug
-                    ? `&subtenantSlug=${encodeURIComponent(surfaceContext.subtenantSlug)}`
-                    : ''}`,
-            ]
-            : [`${baseUrl}/branding`];
-        for (const url of urls) {
-            const payload = await fetchJson(url, options);
-            if (payload)
-                return payload;
-        }
-    }
-    return null;
+    const baseUrl = resolveAdminApiUrl('', options.adminApiUrl).replace(/\/$/, '');
+    const url = slug
+        ? `${baseUrl}/branding/${encodeURIComponent(slug)}${subtenantQuery}`
+        : `${baseUrl}/branding`;
+    return fetchJson(url, options);
 };
 const isRecord = (value) => Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 const asString = (value) => (typeof value === 'string' && value.trim() ? value.trim() : undefined);
 const asStringArray = (value) => Array.isArray(value) ? value.filter((entry) => typeof entry === 'string' && entry.trim().length > 0) : undefined;
 const joinNonEmpty = (...values) => values.filter(Boolean).join(' ').trim() || undefined;
+const normalizeManifestImage = (value, fallbackAlt) => {
+    if (typeof value === 'string' && value.trim()) {
+        return { src: value.trim(), alt: fallbackAlt };
+    }
+    if (!isRecord(value))
+        return undefined;
+    const src = asString(value.src);
+    if (!src)
+        return undefined;
+    return {
+        src,
+        alt: asString(value.alt) ?? fallbackAlt,
+    };
+};
+const normalizeTopbarLinks = (value) => {
+    if (!Array.isArray(value))
+        return undefined;
+    const links = value
+        .map((entry) => {
+        if (!isRecord(entry))
+            return null;
+        const label = asString(entry.label);
+        const route = entry.route === 'intro' || entry.route === 'compose'
+            ? entry.route
+            : undefined;
+        const href = asString(entry.href);
+        if (!label || (!route && !href))
+            return null;
+        const target = entry.target === '_blank' || entry.target === '_self' ? entry.target : undefined;
+        return {
+            label,
+            ...(route ? { route } : {}),
+            ...(href ? { href } : {}),
+            ...(target ? { target } : {}),
+        };
+    })
+        .filter((entry) => entry !== null);
+    return links.length > 0 ? links : undefined;
+};
+const TOPBAR_CONTEXTS = ['landing', 'login', 'composer', 'admin'];
+const normalizeTopbarContext = (value) => {
+    if (!isRecord(value))
+        return undefined;
+    const title = asString(value.title);
+    const subtitle = asString(value.subtitle);
+    const productLabel = asString(value.productLabel);
+    const productSuffixLabel = asString(value.productSuffixLabel);
+    const links = normalizeTopbarLinks(value.links);
+    if (!title && !subtitle && !productLabel && !productSuffixLabel && !links) {
+        return undefined;
+    }
+    return {
+        ...(title ? { title } : {}),
+        ...(subtitle ? { subtitle } : {}),
+        ...(productLabel ? { productLabel } : {}),
+        ...(productSuffixLabel ? { productSuffixLabel } : {}),
+        ...(links ? { links } : {}),
+    };
+};
+const normalizeTopbarContexts = (value) => {
+    if (!isRecord(value))
+        return undefined;
+    const contexts = TOPBAR_CONTEXTS.reduce((acc, context) => {
+        const normalized = normalizeTopbarContext(value[context]);
+        if (normalized) {
+            acc[context] = normalized;
+        }
+        return acc;
+    }, {});
+    return Object.keys(contexts).length > 0 ? contexts : undefined;
+};
 const normalizeNavigation = (value) => {
     if (!isRecord(value))
         return undefined;
     const surfaceTitle = asString(value.surfaceTitle);
     const introHref = asString(value.introHref);
     const composeHref = asString(value.composeHref);
+    const introTitle = asString(value.introTitle);
+    const composeTitle = asString(value.composeTitle);
     return surfaceTitle && introHref && composeHref
         ? {
             surfaceTitle,
             introHref,
             composeHref,
+            ...(introTitle ? { introTitle } : {}),
+            ...(composeTitle ? { composeTitle } : {}),
             searchEnabled: typeof value.searchEnabled === 'boolean' ? value.searchEnabled : undefined,
         }
         : undefined;
 };
+const normalizeTopbar = (value) => {
+    if (!isRecord(value))
+        return undefined;
+    const title = asString(value.title);
+    const subtitle = asString(value.subtitle);
+    const productLabel = asString(value.productLabel);
+    const productSuffixLabel = asString(value.productSuffixLabel);
+    const secondaryLogo = normalizeManifestImage(value.secondaryLogo, productLabel || 'Secondary');
+    const links = normalizeTopbarLinks(value.links);
+    const contexts = normalizeTopbarContexts(value.contexts);
+    if (!title && !subtitle && !productLabel && !productSuffixLabel && !secondaryLogo && !links && !contexts) {
+        return undefined;
+    }
+    return {
+        ...(secondaryLogo ? { secondaryLogo } : {}),
+        ...(title ? { title } : {}),
+        ...(subtitle ? { subtitle } : {}),
+        ...(productLabel ? { productLabel } : {}),
+        ...(productSuffixLabel ? { productSuffixLabel } : {}),
+        ...(links ? { links } : {}),
+        ...(contexts ? { contexts } : {}),
+    };
+};
+const mergeTopbar = (base, override) => {
+    const contexts = base?.contexts || override?.contexts
+        ? TOPBAR_CONTEXTS.reduce((acc, context) => {
+            const mergedContext = {
+                ...(base?.contexts?.[context] ?? {}),
+                ...(override?.contexts?.[context] ?? {}),
+            };
+            if (Object.keys(mergedContext).length > 0) {
+                acc[context] = mergedContext;
+            }
+            return acc;
+        }, {})
+        : undefined;
+    const merged = {
+        ...(base ?? {}),
+        ...(override ?? {}),
+        ...(contexts && Object.keys(contexts).length > 0 ? { contexts } : {}),
+    };
+    return Object.keys(merged).length > 0 ? merged : undefined;
+};
 const normalizeLoginContent = (value) => {
     if (!isRecord(value))
         return undefined;
@@ -178,29 +389,82 @@ const normalizeLandingContent = (value) => {
     const header = asString(value.header) ?? asString(value.hero?.title);
     const strap = asString(value.strap) ?? asString(value.hero?.subtitle);
     const heroDescription = asString(value.hero?.description);
-    const sectionParagraphs = Array.isArray(value.sections)
-        ? value.sections.flatMap((section) => isRecord(section) && Array.isArray(section.paragraphs)
-            ? section.paragraphs.filter((entry) => typeof entry === 'string' && entry.trim().length > 0)
-            : [])
-        : [];
+    const sections = Array.isArray(value.sections)
+        ? value.sections.flatMap((section) => {
+            if (!isRecord(section))
+                return [];
+            const title = asString(section.title);
+            const paragraphs = asStringArray(section.paragraphs);
+            const bullets = asStringArray(section.bullets);
+            return title || (paragraphs?.length ?? 0) > 0 || (bullets?.length ?? 0) > 0
+                ? [
+                    {
+                        ...(title ? { title } : {}),
+                        ...(paragraphs?.length ? { paragraphs } : {}),
+                        ...(bullets?.length ? { bullets } : {}),
+                    },
+                ]
+                : [];
+        })
+        : undefined;
+    const sectionParagraphs = sections?.flatMap((section) => section.paragraphs ?? []) ?? [];
     const bodyParagraphs = asStringArray(value.bodyParagraphs) ?? [
         ...(heroDescription ? [heroDescription] : []),
         ...sectionParagraphs,
     ];
-    return header && strap && bodyParagraphs.length > 0
+    return header && strap && (bodyParagraphs.length > 0 || (sections?.length ?? 0) > 0)
         ? {
             header,
             strap,
             bodyParagraphs,
+            ...(sections?.length ? { sections } : {}),
         }
         : undefined;
 };
 const normalizeComposerContent = (value) => {
     if (!isRecord(value))
         return undefined;
+    const subtitle = asString(value.subtitle);
     const login = normalizeLoginContent(value.login);
     const landing = normalizeLandingContent(value.landing);
-    return login || landing ? { ...(login ? { login } : {}), ...(landing ? { landing } : {}) } : undefined;
+    const legacyStraps = [login?.strap, landing?.strap]
+        .map((entry) => entry?.trim())
+        .filter((entry) => Boolean(entry));
+    const sharedLegacySubtitle = legacyStraps.length > 0 && legacyStraps.every((entry) => entry === legacyStraps[0])
+        ? legacyStraps[0]
+        : undefined;
+    const resolvedSubtitle = subtitle ?? sharedLegacySubtitle;
+    return resolvedSubtitle || login || landing
+        ? {
+            ...(resolvedSubtitle ? { subtitle: resolvedSubtitle } : {}),
+            ...(login ? { login } : {}),
+            ...(landing ? { landing } : {}),
+        }
+        : undefined;
+};
+const buildComposerContentWarnings = (content) => {
+    if (!content)
+        return [];
+    const warnings = [];
+    const pageStraps = [
+        ['content.login.strap', content.login?.strap],
+        ['content.landing.strap', content.landing?.strap],
+    ].filter((entry) => typeof entry[1] === 'string' && entry[1].trim().length > 0);
+    const sharedSubtitle = content.subtitle?.trim();
+    if (sharedSubtitle) {
+        for (const [path, strap] of pageStraps) {
+            if (strap.trim() !== sharedSubtitle) {
+                warnings.push(`${path} differs from canonical content.subtitle; login and landing subtitles must share one data source.`);
+            }
+        }
+    }
+    else if (pageStraps.length > 1) {
+        const firstStrap = pageStraps[0]?.[1].trim();
+        if (firstStrap && pageStraps.some(([, strap]) => strap.trim() !== firstStrap)) {
+            warnings.push('content.subtitle is missing and legacy login/landing straps disagree; add canonical content.subtitle.');
+        }
+    }
+    return warnings;
 };
 const normalizeModeTabs = (value) => {
     if (!Array.isArray(value))
@@ -210,13 +474,16 @@ const normalizeModeTabs = (value) => {
             return false;
         return typeof entry.id === 'string' && typeof entry.label === 'string' && typeof entry.href === 'string';
     });
-    return tabs.length > 0 ? tabs : undefined;
+    return tabs.length > 0 ? orderSurfaceModeTabs(tabs) : undefined;
 };
 const normalizeRoutePolicy = (value) => {
     if (!isRecord(value))
         return undefined;
     return {
         homeRoute: asString(value.homeRoute),
+        landingMode: value.landingMode === 'composer' || value.landingMode === 'product'
+            ? value.landingMode
+            : undefined,
         publicRoutePrefixes: asStringArray(value.publicRoutePrefixes),
         adminRoutePrefixes: asStringArray(value.adminRoutePrefixes),
         gatedModeIds: asStringArray(value.gatedModeIds),
@@ -224,27 +491,41 @@ const normalizeRoutePolicy = (value) => {
         privateApiPrefixes: asStringArray(value.privateApiPrefixes),
     };
 };
-const normalizePromptPacksByMode = (value) => {
+const normalizeRuntimeRecordRef = (value) => {
+    if (typeof value === 'string') {
+        const id = asString(value);
+        return id ? { id } : undefined;
+    }
     if (!isRecord(value))
         return undefined;
-    const entries = [];
-    for (const [mode, ref] of Object.entries(value)) {
-        if (!isRecord(ref) || typeof ref.id !== 'string')
-            continue;
-        entries.push([mode, { id: ref.id, version: asString(ref.version) }]);
-    }
-    return entries.length > 0 ? Object.fromEntries(entries) : undefined;
+    const id = asString(value.id) ?? asString(value.slug);
+    const version = asString(value.version);
+    return id ? { id, version } : undefined;
 };
 const normalizeRuntime = (value) => {
     if (!isRecord(value))
         return undefined;
+    const surfacePackage = normalizeRuntimeRecordRef(value.surfacePackage ?? value.surfacePackageId);
+    const skinProfile = normalizeRuntimeRecordRef(value.skinProfile ?? value.skinProfileId);
+    const promptPolicy = normalizeRuntimeRecordRef(value.promptPolicy ?? value.promptPolicyId);
+    const toolCatalogSource = value.toolCatalogSource === 'registry-live' || value.toolCatalogSource === 'toolset'
+        ? value.toolCatalogSource
+        : undefined;
+    const toolset = toolCatalogSource === 'registry-live'
+        ? undefined
+        : normalizeRuntimeRecordRef(value.toolset ?? value.toolsetId);
     return {
+        surfacePackage,
+        skinProfile,
+        promptPolicy,
+        toolCatalogSource,
+        toolset,
         defaultToolId: asString(value.defaultToolId),
-        promptPolicyId: asString(value.promptPolicyId),
-        toolsetId: asString(value.toolsetId),
+        promptPolicyId: asString(value.promptPolicyId) ?? promptPolicy?.id,
+        toolsetId: toolCatalogSource === 'registry-live' ? undefined : (asString(value.toolsetId) ?? toolset?.id),
         customModeIds: asStringArray(value.customModeIds),
-        manifestPaths: asStringArray(value.manifestPaths),
-        promptPacksByMode: normalizePromptPacksByMode(value.promptPacksByMode),
+        visibleToolIds: asStringArray(value.visibleToolIds),
+        hiddenToolIds: asStringArray(value.hiddenToolIds),
         promptPackCatalogMode: value.promptPackCatalogMode === 'all' || value.promptPackCatalogMode === 'surface'
             ? value.promptPackCatalogMode
             : undefined,
@@ -273,6 +554,42 @@ const normalizeStudio = (value) => {
         shotTemplates: Array.isArray(value.shotTemplates) ? value.shotTemplates : undefined,
     };
 };
+const normalizeFeedbackRoadmapItems = (value) => {
+    if (!Array.isArray(value))
+        return undefined;
+    const items = value
+        .filter(isRecord)
+        .map((entry) => ({
+        id: asString(entry.id)?.toLowerCase() ?? '',
+        name: asString(entry.name) ?? asString(entry.label) ?? asString(entry.title) ?? '',
+        description: asString(entry.description) ?? asString(entry.summary),
+        category: asString(entry.category)?.toLowerCase(),
+        status: asString(entry.status)?.toLowerCase(),
+        enabled: typeof entry.enabled === 'boolean' ? entry.enabled : undefined,
+        sortOrder: Number.isFinite(Number(entry.sortOrder)) ? Number(entry.sortOrder) : undefined,
+    }))
+        .filter((entry) => entry.id && entry.name);
+    return items.length > 0 ? items : undefined;
+};
+const normalizeFeedbackPanel = (value) => {
+    if (!isRecord(value))
+        return undefined;
+    const roadmap = isRecord(value.roadmap)
+        ? {
+            enabled: typeof value.roadmap.enabled === 'boolean' ? value.roadmap.enabled : undefined,
+            title: asString(value.roadmap.title),
+            description: asString(value.roadmap.description),
+            rankingMode: asString(value.roadmap.rankingMode),
+            items: normalizeFeedbackRoadmapItems(value.roadmap.items),
+        }
+        : undefined;
+    return {
+        enabled: typeof value.enabled === 'boolean' ? value.enabled : undefined,
+        title: asString(value.title),
+        description: asString(value.description),
+        roadmap,
+    };
+};
 const resolveComposerDocument = (raw) => {
     if (!isRecord(raw))
         return null;
@@ -289,52 +606,26 @@ export const normalizeSurfaceComposerData = (raw) => {
     const surfaceId = asString(document.surfaceId);
     if (!tenantSlug || !surfaceId)
         return null;
-    const legacySurfaceConfig = isRecord(document.surfaceConfig) ? document.surfaceConfig : null;
-    const legacyPromptPacks = isRecord(document.promptPacks) ? document.promptPacks : null;
-    const legacyPluginRegistry = isRecord(document.pluginRegistry) ? document.pluginRegistry : null;
-    const runtime = normalizeRuntime(document.runtime) ?? {
-        defaultToolId: legacySurfaceConfig ? asString(legacySurfaceConfig.defaultToolId) : undefined,
-        promptPolicyId: asString(document.promptPolicyId),
-        toolsetId: asString(document.toolsetId),
-        manifestPaths: legacyPluginRegistry ? asStringArray(legacyPluginRegistry.manifestPaths) : undefined,
-        promptPacksByMode: legacyPromptPacks ? normalizePromptPacksByMode(legacyPromptPacks.byMode) : undefined,
-    };
-    const routePolicy = normalizeRoutePolicy(document.routePolicy) ?? {
-        homeRoute: legacySurfaceConfig ? asString(legacySurfaceConfig.homeRoute) : undefined,
-        publicRoutePrefixes: legacySurfaceConfig ? asStringArray(legacySurfaceConfig.publicRoutePrefixes) : undefined,
-        adminRoutePrefixes: legacySurfaceConfig ? asStringArray(legacySurfaceConfig.adminRoutePrefixes) : undefined,
-        gatedModeIds: legacySurfaceConfig ? asStringArray(legacySurfaceConfig.gatedModeIds) : undefined,
-        privateRoutePrefixes: legacySurfaceConfig ? asStringArray(legacySurfaceConfig.privateRoutePrefixes) : undefined,
-        privateApiPrefixes: legacySurfaceConfig ? asStringArray(legacySurfaceConfig.privateApiPrefixes) : undefined,
-    };
+    const runtime = normalizeRuntime(document.runtime);
+    const routePolicy = normalizeRoutePolicy(document.routePolicy);
+    const content = normalizeComposerContent(document.content);
+    const controlPlaneWarnings = buildComposerContentWarnings(content);
     return {
         tenantSlug,
         subtenantSlug: asString(document.subtenantSlug) ?? null,
         surfaceId,
-        title: asString(document.title) ?? (legacySurfaceConfig ? asString(legacySurfaceConfig.title) : undefined),
-        lockedLabel: asString(document.lockedLabel) ?? (legacySurfaceConfig ? asString(legacySurfaceConfig.lockedLabel) : undefined),
-        navigation: normalizeNavigation(document.navigation) ??
-            (legacySurfaceConfig
-                ? {
-                    surfaceTitle: asString(legacySurfaceConfig.surfaceTitle) ??
-                        asString(document.title) ??
-                        asString(legacySurfaceConfig.title) ??
-                        'Composer',
-                    introHref: asString(legacySurfaceConfig.introHref) ?? '/',
-                    composeHref: asString(legacySurfaceConfig.composeHref) ??
-                        asString(legacySurfaceConfig.homeRoute) ??
-                        '/compose',
-                    searchEnabled: typeof legacySurfaceConfig.searchEnabled === 'boolean'
-                        ? legacySurfaceConfig.searchEnabled
-                        : undefined,
-                }
-                : undefined),
-        content: normalizeComposerContent(document.content),
-        modeTabs: normalizeModeTabs(document.modeTabs) ?? (legacySurfaceConfig ? normalizeModeTabs(legacySurfaceConfig.modeTabs) : undefined),
+        title: asString(document.title),
+        lockedLabel: asString(document.lockedLabel),
+        topbar: normalizeTopbar(document.topbar),
+        navigation: normalizeNavigation(document.navigation),
+        content,
+        modeTabs: normalizeModeTabs(document.modeTabs),
         routePolicy,
         runtime,
         featureFlags: normalizeFeatureFlags(document.featureFlags),
         studio: normalizeStudio(document.studio),
+        feedbackPanel: normalizeFeedbackPanel(document.feedbackPanel),
+        controlPlaneWarnings: controlPlaneWarnings.length > 0 ? controlPlaneWarnings : undefined,
     };
 };
 export const mergeSurfaceComposerData = (base, override) => {
@@ -344,30 +635,53 @@ export const mergeSurfaceComposerData = (base, override) => {
         return override ?? null;
     if (!override)
         return base;
+    const mergedModeTabs = override.modeTabs ?? base.modeTabs;
+    const preserveRegistryLiveRuntime = base.runtime?.toolCatalogSource === 'registry-live';
+    const mergedToolCatalogSource = preserveRegistryLiveRuntime
+        ? 'registry-live'
+        : (override.runtime?.toolCatalogSource ?? base.runtime?.toolCatalogSource);
+    const mergedRuntime = base.runtime || override.runtime
+        ? {
+            ...(base.runtime ?? {}),
+            ...(override.runtime ?? {}),
+            surfacePackage: override.runtime?.surfacePackage ?? base.runtime?.surfacePackage,
+            skinProfile: override.runtime?.skinProfile ?? base.runtime?.skinProfile,
+            promptPolicy: override.runtime?.promptPolicy ?? base.runtime?.promptPolicy,
+            toolCatalogSource: mergedToolCatalogSource,
+            toolset: mergedToolCatalogSource === 'registry-live'
+                ? undefined
+                : (override.runtime?.toolset ?? base.runtime?.toolset),
+            defaultToolId: override.runtime?.defaultToolId ?? base.runtime?.defaultToolId,
+            promptPolicyId: override.runtime?.promptPolicyId ?? base.runtime?.promptPolicyId,
+            toolsetId: mergedToolCatalogSource === 'registry-live'
+                ? undefined
+                : (override.runtime?.toolsetId ?? base.runtime?.toolsetId),
+            customModeIds: override.runtime?.customModeIds ?? base.runtime?.customModeIds,
+            visibleToolIds: override.runtime?.visibleToolIds ?? base.runtime?.visibleToolIds,
+            hiddenToolIds: override.runtime?.hiddenToolIds ?? base.runtime?.hiddenToolIds,
+            promptPackCatalogMode: override.runtime?.promptPackCatalogMode ?? base.runtime?.promptPackCatalogMode,
+            moduleCatalogMode: override.runtime?.moduleCatalogMode ?? base.runtime?.moduleCatalogMode,
+        }
+        : undefined;
     return {
         tenantSlug: override.tenantSlug || base.tenantSlug,
         subtenantSlug: override.subtenantSlug ?? base.subtenantSlug,
         surfaceId: override.surfaceId || base.surfaceId,
         title: override.title ?? base.title,
         lockedLabel: override.lockedLabel ?? base.lockedLabel,
+        topbar: mergeTopbar(base.topbar, override.topbar),
         navigation: override.navigation ?? base.navigation,
         content: {
+            subtitle: override.content?.subtitle ?? base.content?.subtitle,
             login: override.content?.login ?? base.content?.login,
             landing: override.content?.landing ?? base.content?.landing,
         },
-        modeTabs: override.modeTabs ?? base.modeTabs,
+        modeTabs: mergedModeTabs ? orderSurfaceModeTabs(mergedModeTabs) : undefined,
         routePolicy: {
             ...base.routePolicy,
             ...override.routePolicy,
         },
-        runtime: {
-            ...base.runtime,
-            ...override.runtime,
-            promptPacksByMode: {
-                ...(base.runtime?.promptPacksByMode ?? {}),
-                ...(override.runtime?.promptPacksByMode ?? {}),
-            },
-        },
+        runtime: mergedRuntime,
         featureFlags: {
             ...base.featureFlags,
             ...override.featureFlags,
@@ -376,6 +690,7 @@ export const mergeSurfaceComposerData = (base, override) => {
             ...base.studio,
             ...override.studio,
         },
+        feedbackPanel: override.feedbackPanel ?? base.feedbackPanel,
     };
 };
 export const fetchSurfaceComposerData = async (surfaceContext, options = {}) => {
@@ -383,13 +698,12 @@ export const fetchSurfaceComposerData = async (surfaceContext, options = {}) =>
     const subtenantQuery = surfaceContext.subtenantSlug
         ? `&subtenantSlug=${encodeURIComponent(surfaceContext.subtenantSlug)}`
         : '';
-    for (const baseUrl of getAdminCandidates(fetchOptions.adminApiUrl)) {
-        const url = `${baseUrl}/platform/composer-data?tenantId=${encodeURIComponent(surfaceContext.tenantSlug)}${subtenantQuery}&surfaceId=${encodeURIComponent(surfaceContext.surfaceId || 'composer')}`;
-        const payload = await fetchJson(url, fetchOptions);
-        const normalized = normalizeSurfaceComposerData(payload);
-        if (normalized) {
-            return mergeSurfaceComposerData(fallbackData, normalized);
-        }
+    const baseUrl = resolveAdminApiUrl('', fetchOptions.adminApiUrl).replace(/\/$/, '');
+    const url = `${baseUrl}/platform/composer-data?tenantId=${encodeURIComponent(surfaceContext.tenantSlug)}${subtenantQuery}&surfaceId=${encodeURIComponent(surfaceContext.surfaceId || 'composer')}`;
+    const payload = await fetchJson(url, fetchOptions);
+    const normalized = normalizeSurfaceComposerData(payload);
+    if (normalized) {
+        return mergeSurfaceComposerData(fallbackData, normalized);
     }
     if (fallbackData || !strict) {
         return fallbackData;
@@ -418,9 +732,34 @@ export const findSurfaceMembership = (memberships = [], tenantSlug) => {
         return membershipTenant === target;
     });
 };
+export const resolveMembershipProducts = (membership) => {
+    if (!membership || typeof membership !== 'object')
+        return [];
+    for (const key of membershipArrayKeys) {
+        if (Object.prototype.hasOwnProperty.call(membership, key)) {
+            return asMembershipStringArray(membership[key]);
+        }
+    }
+    return [];
+};
 const isPrivilegedUser = (user) => Boolean(user?.permissions?.isSuperAdmin ||
     user?.permissions?.canManageTenants ||
     user?.permissions?.canManageUsers);
+const buildSubtenantOnlyMembership = (user, surfaceContext) => {
+    const role = normalizeTenant(user?.subtenant?.role);
+    if (!role)
+        return null;
+    return {
+        tenantId: surfaceContext.tenantSlug,
+        tenant_id: surfaceContext.tenantSlug,
+        tenantSlug: surfaceContext.tenantSlug,
+        tenantName: surfaceContext.tenantSlug,
+        membershipType: role,
+        membership_type: role,
+        roles: [role],
+        tenantSurfaceAccess: ['composer'],
+    };
+};
 export const buildAdminAuthSelection = (surfaceContext) => {
     const tenantId = surfaceContext.subtenantSlug
         ? surfaceContext.tenantSlug
@@ -443,7 +782,9 @@ export const resolveSurfaceAccess = (user, surfaceContext) => {
         return { authorized: Boolean(membership), membership };
     }
     if (resolvedSubtenantSlug && resolvedSubtenantSlug === requestedSubtenantSlug) {
-        const membership = canonicalMembership || compatibilityMembership || null;
+        const membership = canonicalMembership ||
+            compatibilityMembership ||
+            buildSubtenantOnlyMembership(user, surfaceContext);
         return { authorized: Boolean(membership), membership };
     }
     if (compatibilityMembership) {
@@ -474,11 +815,9 @@ export const clearSurfaceAuthCookie = (cookies, path = '/') => {
 export const resolveSecureCookie = (forwardedProto, protocol) => forwardedProto ? forwardedProto === 'https' : protocol === 'https:';
 export const validateSurfaceBrowserSession = async ({ token, surfaceContext, fetchImpl = fetch, adminApiUrl, }) => {
     try {
-        const response = await fetchImpl(resolveAdminApiUrl('/auth/validate', adminApiUrl), {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json', Accept: 'application/json' },
-            body: JSON.stringify({ token, ...buildAdminAuthSelection(surfaceContext) }),
-            cache: 'no-store',
+        const response = await postJsonCandidates('/auth/validate', { token, ...buildAdminAuthSelection(surfaceContext) }, {
+            fetchImpl,
+            adminApiUrl,
         });
         const payload = (await response.json().catch(() => null));
         const valid = Boolean(payload?.valid ?? payload?.success);
@@ -502,11 +841,9 @@ export const validateSurfaceBrowserSession = async ({ token, surfaceContext, fet
 export const exchangeSurfaceBrowserSession = async ({ email, password, surfaceContext, fetchImpl = fetch, adminApiUrl, }) => {
     let response;
     try {
-        response = await fetchImpl(resolveAdminApiUrl('/auth/login', adminApiUrl), {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json', Accept: 'application/json' },
-            body: JSON.stringify({ email, password, ...buildAdminAuthSelection(surfaceContext) }),
-            cache: 'no-store',
+        response = await postJsonCandidates('/auth/login', { email, password, ...buildAdminAuthSelection(surfaceContext) }, {
+            fetchImpl,
+            adminApiUrl,
         });
     }
     catch (error) {
@@ -585,7 +922,11 @@ export const buildSurfaceBrandingAssetCookie = async ({ headers, surfaceContext,
 export const bootstrapSurfaceBranding = async ({ headers, surfaceContext, manifest = null, brandingPayload, requestAssetToken, assetScope, assetPrefix, assetTtl, assetAudience, ...fetchOptions }) => {
     const brandingSource = brandingPayload ?? (await fetchSurfaceBranding(surfaceContext, fetchOptions));
     const branding = normalizeSurfaceBrandingPayload(brandingSource);
-    const brandedManifest = manifest ? applySurfaceBrandingToManifest(manifest, branding) : null;
+    const brandedManifest = manifest
+        ? mapSurfaceBrandingManifestImages(applySurfaceBrandingToManifest(manifest, branding), (src) => shouldSignSurfaceBrandingAsset(src)
+            ? `/api/assets/hdr?src=${encodeURIComponent(src)}`
+            : src)
+        : null;
     const assetCookie = requestAssetToken && branding?.logoUrl
         ? await buildBrandingAssetCookie({
             headers,
@@ -610,7 +951,8 @@ export const isSurfaceStaticBypassPath = (pathname, extraPrefixes = []) => {
         return true;
     return DEFAULT_BYPASS_PATTERN.test(pathname);
 };
-export const createSurfaceMiddleware = ({ resolveSurfaceHostContext, requestAssetToken, bypass, allowUnauthenticated, attachBrandingCookie, loginPath = '/login', clearCookieNames = [], redirectAuthenticatedFromLogin, redirectUnauthenticated, redirectUnauthorized, onAuthorized, ...fetchOptions }) => {
+export const createSurfaceMiddleware = ({ resolveSurfaceHostContext, requestAssetToken, bypass, allowUnauthenticated, attachBrandingCookie, loginPath = '/login', loginPathAliases = [], clearCookieNames = [], redirectAuthenticatedFromLogin, redirectUnauthenticated, redirectUnauthorized, onAuthorized, ...fetchOptions }) => {
+    const loginPaths = new Set([loginPath, ...loginPathAliases]);
     const defaultRedirectToLogin = (request) => {
         const redirectUrl = request.nextUrl.clone();
         redirectUrl.pathname = loginPath;
@@ -652,14 +994,28 @@ export const createSurfaceMiddleware = ({ resolveSurfaceHostContext, requestAsse
     };
     return async (request) => {
         const { pathname } = request.nextUrl;
-        const { surfaceContext } = resolveSurfaceRequestContext(request, resolveSurfaceHostContext);
+        const { surfaceContext } = await resolveSurfaceRequestContextAsync(request, resolveSurfaceHostContext);
+        const nextWithSurfaceContext = () => NextResponse.next({
+            request: {
+                headers: buildSurfaceContextRequestHeaders(request, surfaceContext),
+            },
+        });
+        const rewriteToLoginWithSurfaceContext = () => {
+            const rewriteUrl = request.nextUrl.clone();
+            rewriteUrl.pathname = loginPath;
+            return NextResponse.rewrite(rewriteUrl, {
+                request: {
+                    headers: buildSurfaceContextRequestHeaders(request, surfaceContext),
+                },
+            });
+        };
         if (isSurfaceStaticBypassPath(pathname) || bypass?.(pathname, surfaceContext) || pathname.startsWith('/api/')) {
-            return NextResponse.next();
+            return nextWithSurfaceContext();
         }
         const token = readSurfaceAuthToken(request.cookies);
-        if (pathname === loginPath) {
+        if (loginPaths.has(pathname)) {
             if (!token) {
-                return maybeAttachBrandingCookie(request, NextResponse.next(), surfaceContext);
+                return maybeAttachBrandingCookie(request, pathname === loginPath ? nextWithSurfaceContext() : rewriteToLoginWithSurfaceContext(), surfaceContext);
             }
             const validation = await validateSurfaceBrowserSession({
                 token,
@@ -669,12 +1025,12 @@ export const createSurfaceMiddleware = ({ resolveSurfaceHostContext, requestAsse
             if (validation.valid) {
                 return NextResponse.redirect(redirectAuthenticatedFromLogin?.(request, surfaceContext) ?? new URL('/', request.url));
             }
-            return maybeAttachBrandingCookie(request, clearCookies(NextResponse.next()), surfaceContext);
+            return maybeAttachBrandingCookie(request, clearCookies(pathname === loginPath ? nextWithSurfaceContext() : rewriteToLoginWithSurfaceContext()), surfaceContext);
         }
         const isPublic = allowUnauthenticated?.(pathname, surfaceContext) ?? false;
         if (!token) {
             if (isPublic) {
-                return maybeAttachBrandingCookie(request, NextResponse.next(), surfaceContext);
+                return maybeAttachBrandingCookie(request, nextWithSurfaceContext(), surfaceContext);
             }
             return NextResponse.redirect(redirectUnauthenticated?.(request, surfaceContext) ?? defaultRedirectToLogin(request));
         }
@@ -685,7 +1041,7 @@ export const createSurfaceMiddleware = ({ resolveSurfaceHostContext, requestAsse
         });
         if (!validation.valid) {
             if (isPublic) {
-                return maybeAttachBrandingCookie(request, clearCookies(NextResponse.next()), surfaceContext);
+                return maybeAttachBrandingCookie(request, clearCookies(nextWithSurfaceContext()), surfaceContext);
             }
             return clearCookies(NextResponse.redirect(redirectUnauthorized?.(request, surfaceContext) ?? defaultRedirectToLogin(request)));
         }
@@ -693,6 +1049,6 @@ export const createSurfaceMiddleware = ({ resolveSurfaceHostContext, requestAsse
         if (authorizedResponse) {
             return authorizedResponse;
         }
-        return maybeAttachBrandingCookie(request, NextResponse.next(), surfaceContext);
+        return maybeAttachBrandingCookie(request, nextWithSurfaceContext(), surfaceContext);
     };
 };