@tokenoftrust/storefront-runner 2.4.86 → 2.4.88

package/apps/storefront/src/lib/{tot → catalog/tot}/syncState.ts

@@ -101,7 +101,7 @@ export interface CatalogSyncState {
 // document, so the Worker has no runtime filesystem dependency — same pattern
 // as productGlobs/collectionGlobs/reviewGlobs in ToTClient.ts.
 const syncStateGlobs = import.meta.glob<CatalogSyncState>(
-  "../../../../../packages/migration/out/catalog/*/sync-state.json",
+  "../../../../../../packages/migration/out/catalog/*/sync-state.json",
   { import: "default" },
 );
 

package/apps/storefront/src/lib/{tot → catalog/tot}/tenantCatalog.ts

@@ -26,7 +26,7 @@ import {
   readCatalogListing,
   type CatalogStore,
 } from "@tot/public-runtime/catalog-files";
-import { LocalContentProvider, type ContentProvider } from "../storyblok/provider.js";
+import { LocalContentProvider, type ContentProvider } from "../../content/storyblok/provider.js";
 
 export type CatalogArtifactSource = Pick<
   ContentProvider,

package/apps/storefront/src/lib/{admin/services/mock → checkout/fixtures}/checkoutSettings.ts

@@ -18,13 +18,13 @@ import { resolveManagedCheckout } from "@tot/public-runtime";
 import type { TenantConfig } from "@tot/public-runtime";
 import { referenceTheme } from "@/themes/reference";
 import { mergeTheme } from "@/themes/schema";
-import type { AdminTenantEnvelope } from "../../envelope";
+import type { AdminTenantEnvelope } from "../../admin/envelope";
 import {
   buildCheckoutSettingsFields,
   deriveCheckoutSettings,
   type CheckoutSettingsOverrides,
   type CheckoutSettingsField,
-} from "@/lib/commerce/checkoutSettings";
+} from "@/lib/checkout/commerce/checkoutSettings";
 
 export interface CheckoutSettingsViewModel {
   targetTenant: string;

package/apps/storefront/src/lib/{blog → content/blog}/collection.ts

@@ -6,7 +6,7 @@ import {
 } from "@tot/public-runtime";
 import type { AuthorBio, BlogPost, BlogPostSummary, BlogSettings, PostStatus } from "./types.js";
 import type { ContentProvider } from "../storyblok/provider.js";
-import { readEnv } from "../env.js";
+import { readEnv } from "../../env.js";
 
 type ArtifactSource = Pick<ContentProvider, "readArtifact" | "listArtifactPaths">;
 function canReadArtifacts(value: ArtifactSource | undefined): value is ArtifactSource {
@@ -29,29 +29,29 @@ export interface Collection {
 // is the set of `posts/*.json` files — there is no hand-maintained index.json.
 const postGlobs = import.meta.glob<BlogPost>(
   [
-    "../../../../../tenants/*/content/*/posts/*.json",
-    "../../../../../tenants/e2e/*/content/*/posts/*.json",
+    "../../../../../../tenants/*/content/*/posts/*.json",
+    "../../../../../../tenants/e2e/*/content/*/posts/*.json",
   ],
   { import: "default" },
 );
 const redirectGlobs = import.meta.glob<Record<string, string>>(
   [
-    "../../../../../tenants/*/content/*/redirects.json",
-    "../../../../../tenants/e2e/*/content/*/redirects.json",
+    "../../../../../../tenants/*/content/*/redirects.json",
+    "../../../../../../tenants/e2e/*/content/*/redirects.json",
   ],
   { import: "default" },
 );
 const authorsGlobs = import.meta.glob<Record<string, AuthorBio>>(
   [
-    "../../../../../tenants/*/content/*/authors.json",
-    "../../../../../tenants/e2e/*/content/*/authors.json",
+    "../../../../../../tenants/*/content/*/authors.json",
+    "../../../../../../tenants/e2e/*/content/*/authors.json",
   ],
   { import: "default" },
 );
 const settingsGlobs = import.meta.glob<BlogSettings>(
   [
-    "../../../../../tenants/*/content/*/settings.json",
-    "../../../../../tenants/e2e/*/content/*/settings.json",
+    "../../../../../../tenants/*/content/*/settings.json",
+    "../../../../../../tenants/e2e/*/content/*/settings.json",
   ],
   { import: "default" },
 );

package/apps/storefront/src/lib/{blog → content/blog}/postView.ts

@@ -15,12 +15,12 @@ import {
   type BlogPresentation,
   type ShareLink,
 } from "./presentation.js";
-import { homeCrumbLabel, siteTrail, type Crumb } from "@/lib/breadcrumbs.js";
+import { homeCrumbLabel, siteTrail, type Crumb } from "@/lib/content/shared/breadcrumbs.js";
 import { viewerHasBlogAccess } from "./access.js";
 import { articleBodyHtml } from "./teaser.js";
 import { readViewerSession, safeNext } from "@/lib/auth/route.js";
-import { buildAlternates, type Alternate } from "@/lib/seo/alternates.js";
-import { breadcrumbLd, blogPostingLd } from "@/lib/jsonld.js";
+import { buildAlternates, type Alternate } from "@/lib/content/seo/alternates.js";
+import { breadcrumbLd, blogPostingLd } from "@/lib/content/shared/jsonld.js";
 import { collectionPathsV1, blogPathOptsV1 } from "./collectionPaths.js";
 import type { BlogPost } from "./types.js";
 import type { SessionRecord } from "@/lib/auth/session.js";

package/apps/storefront/src/lib/{blog → content/blog}/provider.ts

@@ -13,7 +13,7 @@ import {
 import { getIndexSettings, listPosts } from "./collection.js";
 import type { BlogPost, BlogPostSummary, BlogSettings } from "./types.js";
 import type { ContentProvider } from "../storyblok/provider.js";
-import { readEnv } from "../env.js";
+import { readEnv } from "../../env.js";
 
 /** The collection id `/blog` reads — the derived fallback's second argument. */
 const BLOG_COLLECTION = "blog";
@@ -34,22 +34,22 @@ async function visibilityTimestamp(explicit?: string | null): Promise<string | n
 // tenant's keys back up.
 const indexGlobs = import.meta.glob<BlogPostSummary[]>(
   [
-    "../../../../../tenants/*/content/blog/index.json",
-    "../../../../../tenants/e2e/*/content/blog/index.json",
+    "../../../../../../tenants/*/content/blog/index.json",
+    "../../../../../../tenants/e2e/*/content/blog/index.json",
   ],
   { import: "default" },
 );
 const postGlobs = import.meta.glob<BlogPost>(
   [
-    "../../../../../tenants/*/content/blog/posts/*.json",
-    "../../../../../tenants/e2e/*/content/blog/posts/*.json",
+    "../../../../../../tenants/*/content/blog/posts/*.json",
+    "../../../../../../tenants/e2e/*/content/blog/posts/*.json",
   ],
   { import: "default" },
 );
 const redirectGlobs = import.meta.glob<Record<string, string>>(
   [
-    "../../../../../tenants/*/content/blog/redirects.json",
-    "../../../../../tenants/e2e/*/content/blog/redirects.json",
+    "../../../../../../tenants/*/content/blog/redirects.json",
+    "../../../../../../tenants/e2e/*/content/blog/redirects.json",
   ],
   { import: "default" },
 );

package/apps/storefront/src/lib/{chrome → content/chrome}/footerLegal.ts

@@ -1,7 +1,7 @@
 /**
  * The footer's Legal split — ONE source of truth for both renderers (the
- * raw-string footer in lib/rawChrome.ts and the component footer in
- * components/chrome/SiteFooter.astro), so a tenant's `Legal` column can never
+ * raw-string footer in lib/content/shared/rawChrome.ts and the component footer in
+ * components/content/storefront/chrome/SiteFooter.astro), so a tenant's `Legal` column can never
  * land in the grid on one surface and in the bottom bar on the other.
  *
  * Contract, title-based (no extra schema field): a footer column titled

package/apps/storefront/src/lib/{chrome → content/chrome}/trackingPlacements.ts

@@ -26,7 +26,7 @@ export const CHROME_PLACEMENT = {
   /**
    * Footer bottom legal/policy link row, on either surface — the links of a
    * `Legal`-titled footer column, which both renderers move out of the grid and
-   * into the bottom bar (lib/chrome/footerLegal.ts). `ChromeFooter.bottom`
+   * into the bottom bar (lib/content/chrome/footerLegal.ts). `ChromeFooter.bottom`
    * itself carries text only.
    */
   footerBottom: "footer-bottom",

package/apps/storefront/src/lib/content/index.ts

@@ -7,7 +7,7 @@
  * trust strip. Re-exported here alongside the tier/comparison contracts already
  * defined in lib/membership/model, so a membership page and a policy page
  * import from the same place. (The <BrandGrid> `Brand` contract lives with its
- * component in components/commerce/BrandGrid.astro.)
+ * component in components/catalog/storefront/commerce/BrandGrid.astro.)
  */
 export * from "./richtext.js";
 export * from "./callout.js";

package/apps/storefront/src/lib/{seo → content/seo}/faqItems.ts

@@ -1,6 +1,6 @@
 /**
  * The question/answer pairs a page visibly carries, for a declared FAQPage node
- * (lib/seo/structuredData.ts). Derived from the rendered content itself, so the markup can never
+ * (lib/content/seo/structuredData.ts). Derived from the rendered content itself, so the markup can never
  * claim an answer the page does not show: a heading phrased as a question, answered by the text
  * up to the next heading. Fewer than two pairs is not an FAQ.
  */

package/apps/storefront/src/lib/{seo → content/seo}/structuredData.ts

@@ -16,7 +16,7 @@ import type {
   StructuredDataPageType,
   TenantConfig,
 } from "@tot/public-runtime";
-import { productLd } from "../jsonld.js";
+import { productLd } from "../shared/jsonld.js";
 import { pageUrlForm } from "./urlForm.js";
 
 type Node = Record<string, unknown>;

package/apps/storefront/src/lib/{breadcrumbs.ts → content/shared/breadcrumbs.ts}

@@ -1,4 +1,4 @@
-import type { ChromeConfig } from "./chrome/model.js";
+import type { ChromeConfig } from "../chrome/model.js";
 
 /**
  * One breadcrumb trail per page. A page builds it ONCE with `siteTrail` and hands the same array

package/apps/storefront/src/lib/{heroSlideshow.ts → content/shared/heroSlideshow.ts}

@@ -1,4 +1,4 @@
-import type { HeroBlock } from "@/lib/storyblok/content-model";
+import type { HeroBlock } from "@/lib/content/storyblok/content-model";
 import { withBase } from "@/lib/basePath";
 
 export function heroAutoplayAllowed(input: {

package/apps/storefront/src/lib/{homeVisualParity.ts → content/shared/homeVisualParity.ts}

@@ -12,7 +12,7 @@ import type {
   MembershipBandBlock,
   NewsletterBlock,
   PromoTilesBlock,
-} from "@/lib/storyblok/content-model";
+} from "@/lib/content/storyblok/content-model";
 
 export type CommerceStaticResolved =
   | { kind: "promo_tiles"; block: PromoTilesBlock }

package/apps/storefront/src/lib/{jsonld.ts → content/shared/jsonld.ts}

@@ -3,7 +3,7 @@
  * BreadcrumbList, Organization. Kept pure so pages compose them and pass to <Seo>.
  */
 import type { CatalogProduct, Review, TenantConfig } from "@tot/public-runtime";
-import { isAvailable } from "./tot/query.js";
+import { isAvailable } from "../../catalog/tot/query.js";
 
 export function organizationLd(tenant: TenantConfig, base: string) {
   // Logo sourced from the migrated brand assets (og image / logo), so the

package/apps/storefront/src/lib/{rawChrome.ts → content/shared/rawChrome.ts}

@@ -2,12 +2,12 @@
  * Canonical RAW chrome renderer.
  *
  * ONE platform-shipped chrome wrapper, driven entirely by a tenant's `chrome.json`
- * (typed `ChromeConfig`, lib/chrome/model.ts) — CONTENT ONLY. It replaces the three
+ * (typed `ChromeConfig`, lib/content/chrome/model.ts) — CONTENT ONLY. It replaces the three
  * divergent, hand-authored `content/<tenant>/chrome.html` documents with a single
  * generator, so chrome lives in ONE place and a tenant supplies only data. The
  * output is a full wrapper document carrying the splice markers the rawMarketingHtml
  * pipeline understands (`<!--PAGE_HEAD-->` / `<!--PAGE_BODY-->`), so body-only page
- * fragments get wrapped exactly as before (see lib/rawMarketingHtml.ts,
+ * fragments get wrapped exactly as before (see lib/content/shared/rawMarketingHtml.ts,
  * wrapFragmentInChrome). Two governing constraints:
  *   - Single stylesheet: the wrapper LINKS the platform stylesheet
  *     (/shared/commerce-chrome.css) and emits NO inline chrome CSS — every
@@ -25,11 +25,11 @@
  * defense-in-depth, not a sanitizer for untrusted input.
  */
 import { CHROME_BODY_MARKER, CHROME_HEAD_MARKER } from "./rawMarketingHtml.js";
-import { isCurrentNavHref } from "./chrome/navCurrent.js";
-import { ctaIdentityAttr } from "./chrome/ctaIdentity.js";
-import { CHROME_PLACEMENT } from "./chrome/trackingPlacements.js";
-import { LEGAL_NAV_LABEL, splitFooterLegal } from "./chrome/footerLegal.js";
-import { resolveNewsletterAgeAttestation } from "./chrome/newsletterAgeAttestation.js";
+import { isCurrentNavHref } from "../chrome/navCurrent.js";
+import { ctaIdentityAttr } from "../chrome/ctaIdentity.js";
+import { CHROME_PLACEMENT } from "../chrome/trackingPlacements.js";
+import { LEGAL_NAV_LABEL, splitFooterLegal } from "../chrome/footerLegal.js";
+import { resolveNewsletterAgeAttestation } from "../chrome/newsletterAgeAttestation.js";
 import { trackingAttributesHtml } from "@tot/public-runtime";
 import type {
   ChromeAgeGate,
@@ -46,9 +46,9 @@ import type {
   ChromeUtilityNav,
   HeaderVariant,
   SocialLink,
-} from "./chrome/model.js";
-import { isSafeAgeGateHref, resolveAgeGateCopy, resolveChromeAssignment } from "./chrome/model.js";
-import { resolveHeaderVariant } from "./chrome/variant.js";
+} from "../chrome/model.js";
+import { isSafeAgeGateHref, resolveAgeGateCopy, resolveChromeAssignment } from "../chrome/model.js";
+import { resolveHeaderVariant } from "../chrome/variant.js";
 
 /** HTML-escape text/attribute content. Covers the five significant characters. */
 function esc(value: string): string {
@@ -295,7 +295,7 @@ function renderSearchForm(search: ChromeSearch, inMenu = false): string {
 
 /**
  * Labelled header action links, in authored order. A `kind: "cart"` link carries
- * the `cart` class, so bindManagedCartAnchors (lib/chrome/managedCart.ts) binds it
+ * the `cart` class, so bindManagedCartAnchors (lib/content/chrome/managedCart.ts) binds it
  * to the managed checkout exactly like the icon cart.
  */
 function renderActionLinks(links: ChromeHeaderActionLink[]): string {
@@ -431,7 +431,7 @@ function renderHeader(header: ChromeHeader, variant: HeaderVariant, currentPath?
 /**
  * Age-gate config, embedded as JSON. The CHROME_BEHAVIOR_JS mechanism
  * reads this and builds the dialog itself inside a closed shadow root — the same
- * tamper-resistance pattern components/islands/IsolatedAgeGate.tsx uses for
+ * tamper-resistance pattern components/compliance/storefront/islands/IsolatedAgeGate.tsx uses for
  * component pages (see its header comment). `<` is escaped so an authored value
  * can't close the tag early.
  */
@@ -526,7 +526,7 @@ function renderFooter(footer: ChromeFooter): string {
           return `      <div class="footer-brand">${logo}${text}${news}</div>\n`;
         })()
       : "";
-  // A `Legal`-titled column moves to the bottom bar (lib/chrome/footerLegal.ts)
+  // A `Legal`-titled column moves to the bottom bar (lib/content/chrome/footerLegal.ts)
   // — scope indices count RENDERED grid columns, so they describe where a link
   // actually is rather than where it sat in the authored array.
   const { gridColumns, legalLinks } = splitFooterLegal(footer.columns);
@@ -683,7 +683,7 @@ export const CHROME_BEHAVIOR_JS = `(function () {
   }
 
   // 21+ age gate — shadow-isolated. Only the host <div> lives in light
-  // DOM (data-tot-compliance, the same marker components/islands/IsolatedAgeGate.tsx
+  // DOM (data-tot-compliance, the same marker components/compliance/storefront/islands/IsolatedAgeGate.tsx
   // uses); its contents sit behind a closed shadow root, so tenant CSS/JS can't
   // select, restyle, or hide the dialog. A MutationObserver re-asserts the host the
   // same way that component does. Config comes from the validated ChromeAgeGate

package/apps/storefront/src/lib/{rawMarketingHtml.ts → content/shared/rawMarketingHtml.ts}

@@ -22,9 +22,9 @@ import {
   type EffectivePlan,
   type ConsentSnapshot,
 } from "@tot/public-runtime";
-import { reportTrackingChainHealth } from "./tracking/interactionHealth.js";
+import { reportTrackingChainHealth } from "../../measurement/tracking/interactionHealth.js";
 import { ASYNC_CSS_SWAP_JS } from "./asyncCss.js";
-import { ROOT_SERVED_HREF_NAMESPACES } from "./basePath.js";
+import { ROOT_SERVED_HREF_NAMESPACES } from "../../basePath.js";
 
 export { rawHtmlPolicy } from "@tot/public-runtime";
 
@@ -139,7 +139,7 @@ export function interactionTrackingScript(nonce: string): string {
 /**
  * Swaps every `data-async-css`-tagged `<link rel="preload">` to
  * `rel="stylesheet"` once fetched — the raw-mount half of the
- * `<AsyncStylesheet>` primitive (lib/asyncCss.ts; Layout.astro is the other,
+ * `<AsyncStylesheet>` primitive (lib/content/shared/asyncCss.ts; Layout.astro is the other,
  * same one-engine-two-mounts discipline as {@link interactionTrackingScript}).
  * A raw-HTML tenant hand-authors the plain `<link rel="preload" as="style"
  * data-async-css>` + `<noscript>` markup directly (no Astro component

package/apps/storefront/src/lib/{sections.ts → content/shared/sections.ts}

@@ -16,8 +16,8 @@ import {
   type CatalogProduct,
   type ProductSectionSource,
 } from "@tot/public-runtime";
-import type { ToTClient } from "@/lib/tot/ToTClient";
-import { isOnSale } from "@/lib/tot/query";
+import type { ToTClient } from "@/lib/catalog/tot/ToTClient";
+import { isOnSale } from "@/lib/catalog/tot/query";
 
 /**
  * Where a merchandising section gets its products. Exactly one shape per source.

package/apps/storefront/src/lib/{styleGuideThemes.ts → content/shared/styleGuideThemes.ts}

@@ -1,5 +1,5 @@
 import { tenantDirSegment } from "@tot/public-runtime";
-import type { ContentProvider } from "@/lib/storyblok/provider";
+import type { ContentProvider } from "@/lib/content/storyblok/provider";
 
 export type StyleGuideTheme = Record<string, unknown> & {
   id: string;
@@ -11,8 +11,8 @@ export type StyleGuideTheme = Record<string, unknown> & {
 
 const localThemeModules = import.meta.glob<Record<string, unknown>>(
   [
-    "../../../../tenants/*/content/themes/*.json",
-    "../../../../tenants/e2e/*/content/themes/*.json",
+    "../../../../../../tenants/*/content/themes/*.json",
+    "../../../../../../tenants/e2e/*/content/themes/*.json",
   ],
   { eager: true, import: "default" },
 );

package/apps/storefront/src/lib/{storyblok → content/storyblok}/content-model.ts

@@ -354,6 +354,6 @@ export interface EditorialPage {
 }
 
 // Site chrome (header/footer) is the ONE consolidated schema in
-// lib/chrome/model.ts (`ChromeConfig`) — see that file's header comment for
+// lib/content/chrome/model.ts (`ChromeConfig`) — see that file's header comment for
 // why the old `SiteChrome`/`SiteNavItem` pair that used to live here was
 // retired.

package/apps/storefront/src/lib/{storyblok → content/storyblok}/provider.ts

@@ -33,10 +33,10 @@ import {
   tenantDirRelative,
   tenantDirSegment,
 } from "@tot/public-runtime";
-import { renderRawChrome } from "../rawChrome.js";
+import { renderRawChrome } from "../shared/rawChrome.js";
 import { parseChromeConfig } from "../chrome/parseConfig.js";
 import { parseChromeAssignments } from "../chrome/model.js";
-import { stampTrackingIdsAtPublish } from "../tracking/publishSafetyNet.js";
+import { stampTrackingIdsAtPublish } from "../../measurement/tracking/publishSafetyNet.js";
 import { readWithImagePreviewRewriteOverlay } from "@tot/public-runtime/image-preview-rewrite-overlay";
 
 /** Safe, always-valid fallback when neither the tenant's own chrome.json nor
@@ -67,7 +67,7 @@ export interface ContentProvider {
   /**
    * The tenant's shared-chrome WRAPPER document (raw HTML), or null. A full
    * document containing the CHROME_BODY_MARKER where a body-only page fragment is
-   * spliced in (see lib/rawMarketingHtml.ts). Lets raw pages stop duplicating
+   * spliced in (see lib/content/shared/rawMarketingHtml.ts). Lets raw pages stop duplicating
    * chrome: chrome lives once here, pages become fragments. File:
    * `content/<tenant>/chrome.html`. Tenant-owned (no cross-tenant fallback).
    *
@@ -110,17 +110,17 @@ export interface DerivedArtifact {
 // Per-tenant local content lives under the colocated repo-root layout
 // tenants/<tenant_id>/content/. Vite globs bundle every tenant's JSON at build
 // time; a file missing for a tenant falls back to the default scope, so a
-// partially-adopted tenant still renders. Depth: from src/lib/storyblok/ the
-// repo root is five levels up (storyblok→lib→src→storefront→apps→root).
+// partially-adopted tenant still renders. Depth: from src/lib/content/storyblok/ the
+// repo root is six levels up (storyblok→content→lib→src→storefront→apps→root).
 const homeGlobs = import.meta.glob<HomeContent>([
-  "../../../../../tenants/*/content/home.json",
-  "../../../../../tenants/e2e/*/content/home.json",
+  "../../../../../../tenants/*/content/home.json",
+  "../../../../../../tenants/e2e/*/content/home.json",
 ], {
   import: "default",
 });
 const chromeGlobs = import.meta.glob<unknown>([
-  "../../../../../tenants/*/content/chrome.json",
-  "../../../../../tenants/e2e/*/content/chrome.json",
+  "../../../../../../tenants/*/content/chrome.json",
+  "../../../../../../tenants/e2e/*/content/chrome.json",
 ], {
   import: "default",
 });
@@ -129,22 +129,22 @@ const chromeGlobs = import.meta.glob<unknown>([
 // convention as chromeGlobs above.
 const chromeAssignmentGlobs = import.meta.glob<unknown>(
   [
-    "../../../../../tenants/*/content/chrome-assignments.json",
-    "../../../../../tenants/e2e/*/content/chrome-assignments.json",
+    "../../../../../../tenants/*/content/chrome-assignments.json",
+    "../../../../../../tenants/e2e/*/content/chrome-assignments.json",
   ],
   { import: "default" },
 );
 const pageGlobs = import.meta.glob<EditorialPage>([
-  "../../../../../tenants/*/content/pages/*.json",
-  "../../../../../tenants/e2e/*/content/pages/*.json",
+  "../../../../../../tenants/*/content/pages/*.json",
+  "../../../../../../tenants/e2e/*/content/pages/*.json",
 ], {
   import: "default",
 });
 // Raw self-authored home documents (marketing tenants). `?raw` bundles the file
 // as a string; a tenant with no home.html simply has no entry here.
 const homeHtmlGlobs = import.meta.glob<string>([
-  "../../../../../tenants/*/content/home.html",
-  "../../../../../tenants/e2e/*/content/home.html",
+  "../../../../../../tenants/*/content/home.html",
+  "../../../../../../tenants/e2e/*/content/home.html",
 ], {
   query: "?raw",
   import: "default",
@@ -152,8 +152,8 @@ const homeHtmlGlobs = import.meta.glob<string>([
 // Raw self-authored SUBPAGE documents: tenants/<tenant>/content/pages-html/<slug>.html
 // (e.g. pages-html/pricing.html -> /pricing/). `**` supports nested slugs.
 const pageHtmlGlobs = import.meta.glob<string>([
-  "../../../../../tenants/*/content/pages-html/**/*.html",
-  "../../../../../tenants/e2e/*/content/pages-html/**/*.html",
+  "../../../../../../tenants/*/content/pages-html/**/*.html",
+  "../../../../../../tenants/e2e/*/content/pages-html/**/*.html",
 ], {
   query: "?raw",
   import: "default",
@@ -161,15 +161,15 @@ const pageHtmlGlobs = import.meta.glob<string>([
 // Shared-chrome wrapper document (marketing tenants that author body-only page
 // fragments). One per tenant; a tenant without it keeps serving full documents.
 const chromeHtmlGlobs = import.meta.glob<string>([
-  "../../../../../tenants/*/content/chrome.html",
-  "../../../../../tenants/e2e/*/content/chrome.html",
+  "../../../../../../tenants/*/content/chrome.html",
+  "../../../../../../tenants/e2e/*/content/chrome.html",
 ], {
   query: "?raw",
   import: "default",
 });
 const artifactGlobs = import.meta.glob<string>([
-  "../../../../../tenants/*/content/**/*",
-  "../../../../../tenants/e2e/*/content/**/*",
+  "../../../../../../tenants/*/content/**/*",
+  "../../../../../../tenants/e2e/*/content/**/*",
 ], {
   query: "?raw",
   import: "default",
@@ -251,10 +251,10 @@ async function readRawDevFile(scope: string, relative: string): Promise<string |
       import("node:url"),
       import("node:path"),
     ]);
-    // provider.ts lives at apps/storefront/src/lib/storyblok/ — the repo root is five
-    // levels up, mirroring the import.meta.glob prefix ("../../../../../tenants/...").
+    // provider.ts lives at apps/storefront/src/lib/content/storyblok/ — the repo root is six
+    // levels up, mirroring the import.meta.glob prefix ("../../../../../../tenants/...").
     const here = dirname(fileURLToPath(import.meta.url));
-    const abs = resolve(here, "../../../../..", ...tenantDirRelative(scope).split("/"), "content", relative);
+    const abs = resolve(here, "../../../../../..", ...tenantDirRelative(scope).split("/"), "content", relative);
     return await readFile(abs, "utf8");
   } catch {
     return null;
@@ -305,7 +305,7 @@ export class LocalContentProvider implements ContentProvider {
     if (loader) return loader();
     // (2) No chrome.html: render the CANONICAL shared chrome from the
     //     tenant's chrome.json — but only when it validates whole against the
-    //     consolidated ChromeConfig schema (lib/chrome/parseConfig.ts). Tenant-
+    //     consolidated ChromeConfig schema (lib/content/chrome/parseConfig.ts). Tenant-
     //     owned only, like the raw HTML above (no cross-tenant fallback).
     const config = await this.loadChromeConfig();
     if (!config) return null;
@@ -708,7 +708,7 @@ export class PublishedContentProvider implements ContentProvider {
   }
   async getChrome(): Promise<ChromeConfig> {
     // Runs through the SAME fail-closed schema validator as getChromeHtml's
-    // chrome.json branch (lib/chrome/parseConfig.ts) — a published artifact is
+    // chrome.json branch (lib/content/chrome/parseConfig.ts) — a published artifact is
     // no longer trusted blind (was: JSON.parse + a raw cast to SiteChrome).
     const config = parseChromeConfig(await this.published<unknown>("chrome.json"));
     return config ?? ((await this.usesVersionedContent()) ? EMPTY_CHROME_CONFIG : this.base.getChrome());

package/apps/storefront/src/lib/{the-build → content/the-build}/provider.ts

@@ -1,5 +1,5 @@
 // Thin wrapper binding the generic blog engine to the "the-build" collection.
-// The engine (src/lib/blog/collection.ts) is the single implementation; this
+// The engine (src/lib/content/blog/collection.ts) is the single implementation; this
 // module only fixes the collection id so existing/downstream callers can import
 // collection-bound helpers.
 import { getIndexSettings, getPost, listPosts, resolveRedirect, type Collection } from "../blog/collection.js";

package/apps/storefront/src/lib/{the-build → content/the-build}/toc.ts

@@ -5,7 +5,7 @@
 // (`annotate`), so a render path can feed `htmlWithHeadingIds(post.contentHtml)`
 // to `set:html` and `toc(post.contentHtml)` to the aside and the anchors line up.
 import { parseFragment, serialize } from "parse5";
-import { slugifyHeading } from "../content/prose.js";
+import { slugifyHeading } from "../prose.js";
 
 /** Minimal structural view of a parse5 node (duck-typed, as scripts/dev/locate.mjs does). */
 interface P5Node {

package/apps/storefront/src/lib/d1/schema-apps.ts

@@ -151,7 +151,7 @@ export const activityEvents = sqliteTable(
 
 // --- Per-tenant raw-interaction store directory ------------------------------
 // The DIRECTORY of per-tenant D1 databases that hold raw declarative-tracking
-// interaction rows — one database per tenant (`lib/tracking/interactionSchema.ts`
+// interaction rows — one database per tenant (`lib/measurement/tracking/interactionSchema.ts`
 // is that database's schema). This table holds NO interaction data: only the
 // `tenant_id → (database_name, database_uuid)` mapping the Worker needs to
 // address a tenant's own database over the D1 REST API, since Worker bindings
@@ -177,7 +177,7 @@ export const trackingTenantDatabases = sqliteTable(
   {
     tenantId: text("tenant_id").primaryKey(),
     // The Cloudflare D1 database name, derived deterministically from the tenant
-    // id (`lib/tracking/tenantD1Registry.ts`) — recorded so an operator can find
+    // id (`lib/measurement/tracking/tenantD1Registry.ts`) — recorded so an operator can find
     // it in the dashboard without re-deriving.
     databaseName: text("database_name").notNull(),
     // The D1 UUID — what the REST data plane actually addresses.

package/apps/storefront/src/lib/email/candidateConflictEmail.ts

@@ -6,7 +6,7 @@
  * notification for that case — the author is pinged the MOMENT their change actually
  * conflicts with someone else's merge, not at their own accept attempt.
  *
- * Rendered here (our brand), transmitted by tot20 (see lib/messaging/messagesClient.ts).
+ * Rendered here (our brand), transmitted by tot20 (see lib/engagement/messaging/messagesClient.ts).
  * Email HTML rules: inline styles only, table-free simple layout, a visible fallback URL
  * under the button.
  */

package/apps/storefront/src/lib/email/magicLinkInviteEmail.ts

@@ -1,7 +1,7 @@
 /**
  * The storefront's OWN branded developer-invite email (magic-link flow). The storefront
  * owns presentation now — this is our template, our brand, rendered here and handed to
- * tot20 only for transport (see lib/messaging/messagesClient.ts). A single primary CTA
+ * tot20 only for transport (see lib/engagement/messaging/messagesClient.ts). A single primary CTA
  * links to the GET-safe /auth/magic landing carrying the one-time token.
  *
  * Email HTML rules: inline styles only (no <style>/external CSS — mail clients strip them),

package/apps/storefront/src/lib/{newsletter → engagement/newsletter}/digest.ts

@@ -1,6 +1,6 @@
 /**
  * Hand-rolled newsletter digest HTML builder — the email analogue of
- * `renderRssFeed` (src/lib/blog/rss.ts): pure string concatenation, no
+ * `renderRssFeed` (src/lib/content/blog/rss.ts): pure string concatenation, no
  * templating dependency. Fed the engine's live-visible post list, so drafts /
  * unlisted / not-yet-scheduled posts can never reach an inbox.
  *
@@ -10,7 +10,7 @@
  * ESP (see send.ts). The RFC 8058 `List-Unsubscribe` headers are set on the
  * SEND call, not in this HTML body.
  */
-import type { BlogPostSummary } from "../blog/types.js";
+import type { BlogPostSummary } from "../../content/blog/types.js";
 
 /** Replaced per-recipient with the subscriber's opaque token at send time. */
 export const UNSUBSCRIBE_TOKEN_PLACEHOLDER = "{{unsubscribe_token}}";

package/apps/storefront/src/lib/{newsletter → engagement/newsletter}/resendClient.ts

@@ -5,7 +5,7 @@
  * (`POST /emails/batch`, up to 100 messages/call); audience/consent/unsubscribe
  * state stays first-party in our D1, never in a vendor list.
  */
-import { readEnv } from "../env.js";
+import { readEnv } from "../../env.js";
 
 /** Resend's batch limit: at most 100 messages per `/emails/batch` call. */
 export const RESEND_BATCH_LIMIT = 100;

package/apps/storefront/src/lib/{newsletter → engagement/newsletter}/send.ts

@@ -18,8 +18,8 @@
  * per-subscriber diff. "New since last send" is computed once from the previous
  * ledger row's `sent_at`, not per-subscriber.
  */
-import type { Queryable } from "../d1/catalog.js";
-import type { BlogPostSummary } from "../blog/types.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
+import type { BlogPostSummary } from "../../content/blog/types.js";
 import {
   sendBatch as realSendBatch,
   RESEND_BATCH_LIMIT,

package/apps/storefront/src/lib/{newsletter → engagement/newsletter}/subscribers.ts

@@ -9,7 +9,7 @@
  * caller is responsible for resolving `tenantId` from the request host/session
  * (NEVER a client body) — that is the multi-tenant isolation boundary.
  */
-import type { Queryable } from "../d1/catalog.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 
 export type SubscriberStatus = "pending" | "confirmed" | "unsubscribed" | "bounced";