@tokenoftrust/storefront-runner 2.4.86 → 2.4.88

package/apps/storefront/dev-plugins/tenant-hot-reload.mjs

@@ -192,7 +192,7 @@ export function seedKnown(root, known) {
 //   - content/**.html — read fresh from disk per request
 //     (LocalContentProvider.readRawDevFile), so just reload. (The Vite HMR client
 //     is injected into these otherwise-pipeline-bypassing pages in dev; see
-//     rawHtmlResponse in src/lib/rawMarketingHtml.ts.)
+//     rawHtmlResponse in src/lib/content/shared/rawMarketingHtml.ts.)
 //   - public/**        — re-mirror the one changed asset into public/tenants/<id>/
 //     (skipping R2-versioned tenants, like copy-tenant-assets.mjs), then reload.
 // content/*.json and other themes/*.json globs are ordinary glob imports, so

package/apps/storefront/env.d.ts

@@ -15,8 +15,8 @@ import type {
   ResolvedRouteTierV1,
   PublicationRoutePlanV1,
 } from "@tot/public-runtime";
-import type { ToTClient } from "@/lib/tot/ToTClient";
-import type { ContentProvider } from "@/lib/storyblok/provider";
+import type { ToTClient } from "@/lib/catalog/tot/ToTClient";
+import type { ContentProvider } from "@/lib/content/storyblok/provider";
 
 /**
  * Minimal binding shapes. We intentionally do NOT depend on

package/apps/storefront/perf/README.md

@@ -3,7 +3,7 @@
 The storefront's go-live framework enforces a performance gate. This directory
 is the **lab half** (a checked-in budget manifest + a CI-runnable assertion
 harness); the **field half** (Real User Monitoring) lives in
-`../src/lib/analytics/`.
+`../src/lib/measurement/analytics/index/`.
 
 ## The pieces
 

package/apps/storefront/public/shared/commerce-chrome.css

@@ -413,7 +413,7 @@ a.article-card__tag:hover { text-decoration: underline; }
 .footer-bottom { margin-top: 28px; padding-top: 18px; border-top: 1px solid color-mix(in srgb, var(--color-primary-contrast) 16%, transparent); display: flex; flex-wrap: wrap; gap: 10px 24px; justify-content: space-between; align-items: center; }
 .footer-bottom p, .footer-bottom a { color: color-mix(in srgb, var(--color-primary-contrast) 60%, transparent); font-size: .875rem; }
 /* The Legal link row (a "Legal"-titled footer column, moved here — see
-   lib/chrome/footerLegal.ts). Wraps under the copyright at narrow widths
+   lib/content/chrome/footerLegal.ts). Wraps under the copyright at narrow widths
    rather than overflowing the bar. */
 .footer-bottom nav ul { display: flex; flex-wrap: wrap; gap: 6px 20px; list-style: none; margin: 0; padding: 0; }
 .footer-bottom nav a:hover { color: var(--color-primary-contrast); text-decoration: underline; }

package/apps/storefront/public/shared/commerce-marketing.css

@@ -19,7 +19,7 @@
    page-local CSS for standard patterns").
 
    OPT-IN, not automatic. A tenant links this only when its chrome.json sets
-   `sharedMarketingCss: true` (see lib/rawChrome.ts SHARED_MARKETING_STYLESHEET) —
+   `sharedMarketingCss: true` (see lib/content/shared/rawChrome.ts SHARED_MARKETING_STYLESHEET) —
    the same deliberate-adoption gate `sharedChrome` uses, so a SHIPPED tenant that
    already hand-authored its own page CSS (e.g. sample-store-2's tenant-scoped
    /tenants/sample-store-2.net/pages/page.css, which reuses names like `.cta-band` /

package/apps/storefront/src/components/{CollectionCard.astro → catalog/storefront/CollectionCard.astro}

@@ -7,7 +7,7 @@
 import type { CatalogCollection } from "@tot/public-runtime";
 import Img from "@/components/assets/storefront/Img.astro";
 import { withBase } from "@/lib/basePath";
-import { pageUrlForm } from "@/lib/seo/urlForm";
+import { pageUrlForm } from "@/lib/content/seo/urlForm";
 
 interface Props {
   collection: CatalogCollection;

package/apps/storefront/src/components/{ProductCard.astro → catalog/storefront/ProductCard.astro}

@@ -7,15 +7,15 @@
  * color swatches; price with struck compare-at. Theme-agnostic.
  */
 import type { CatalogProduct } from "@tot/public-runtime";
-import { discountPercent, truncate } from "@/lib/format";
-import { isOnSale, isNew, isAvailable, fromPrice } from "@/lib/tot/query";
-import { colorOptionValues, resolveSwatch, isLightFill } from "@/lib/colors";
+import { discountPercent, truncate } from "@/lib/content/shared/format";
+import { isOnSale, isNew, isAvailable, fromPrice } from "@/lib/catalog/tot/query";
+import { colorOptionValues, resolveSwatch, isLightFill } from "@/lib/content/shared/colors";
 import Img from "@/components/assets/storefront/Img.astro";
-import Badge from "@/components/Badge.astro";
-import PriceDisplay from "@/components/commerce/PriceDisplay.astro";
-import RatingStars from "@/components/commerce/RatingStars.astro";
+import Badge from "@/components/content/storefront/Badge.astro";
+import PriceDisplay from "@/components/catalog/storefront/commerce/PriceDisplay.astro";
+import RatingStars from "@/components/catalog/storefront/commerce/RatingStars.astro";
 import { withBase } from "@/lib/basePath";
-import { pageUrlForm } from "@/lib/seo/urlForm";
+import { pageUrlForm } from "@/lib/content/seo/urlForm";
 
 interface Props {
   product: CatalogProduct;

package/apps/storefront/src/components/{commerce → catalog/storefront/commerce}/BrandGrid.astro

@@ -13,7 +13,7 @@
  * public/shared/commerce-chrome.css, for tenants that ship hand-authored HTML
  * through the rawMarketingHtml splice pipeline. Keep the two visually equivalent.
  */
-import Section from "@/components/Section.astro";
+import Section from "@/components/content/storefront/Section.astro";
 import Img from "@/components/assets/storefront/Img.astro";
 import { withBase } from "@/lib/basePath";
 

package/apps/storefront/src/components/{commerce → catalog/storefront/commerce}/PriceDisplay.astro

@@ -10,9 +10,9 @@
  * atom is usable outside a CatalogProduct context (cart line, PDP, fixtures).
  */
 import type { CatalogProduct } from "@tot/public-runtime";
-import { formatPrice, discountPercent } from "@/lib/format";
-import { fromPrice, isOnSale } from "@/lib/tot/query";
-import Badge from "@/components/Badge.astro";
+import { formatPrice, discountPercent } from "@/lib/content/shared/format";
+import { fromPrice, isOnSale } from "@/lib/catalog/tot/query";
+import Badge from "@/components/content/storefront/Badge.astro";
 
 interface Props {
   /** Derive amount/compareAt/from/currency from a product. */

package/apps/storefront/src/components/{commerce → catalog/storefront/commerce}/ProductCarousel.astro

@@ -14,13 +14,13 @@
  * through `Astro.locals.tot`; or `tabs` for the multi-source tabbed variant.
  */
 import type { CatalogProduct } from "@tot/public-runtime";
-import Section from "@/components/Section.astro";
-import ProductCard from "@/components/ProductCard.astro";
+import Section from "@/components/content/storefront/Section.astro";
+import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
 import {
   resolveSectionSource,
   DEFAULT_SECTION_LIMIT,
   type SectionSource,
-} from "@/lib/sections";
+} from "@/lib/content/shared/sections";
 
 interface Tab {
   label: string;

package/apps/storefront/src/components/{commerce → catalog/storefront/commerce}/ProductGrid.astro

@@ -9,14 +9,14 @@
  * that this component resolves through `Astro.locals.tot`.
  */
 import type { CatalogProduct } from "@tot/public-runtime";
-import Section from "@/components/Section.astro";
-import ProductCard from "@/components/ProductCard.astro";
-import EmptyState from "@/components/EmptyState.astro";
+import Section from "@/components/content/storefront/Section.astro";
+import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
+import EmptyState from "@/components/content/storefront/EmptyState.astro";
 import {
   resolveSectionSource,
   DEFAULT_SECTION_LIMIT,
   type SectionSource,
-} from "@/lib/sections";
+} from "@/lib/content/shared/sections";
 
 interface Props {
   source?: SectionSource;

package/apps/storefront/src/components/{commerce → catalog/storefront/commerce}/ReviewList.astro

@@ -14,7 +14,7 @@
  */
 import type { Review } from "@tot/public-runtime";
 import RatingStars from "./RatingStars.astro";
-import { formatDate } from "@/lib/format";
+import { formatDate } from "@/lib/content/shared/format";
 
 interface Props {
   reviews: Review[];

package/apps/storefront/src/components/{islands → catalog/storefront/islands}/ImageGallery.tsx

@@ -15,7 +15,7 @@
  */
 import { useCallback, useEffect, useMemo, useRef, useState } from "preact/hooks";
 import type { CatalogImage } from "@tot/public-runtime";
-import { placeholderDataUri, isUsableImageUrl } from "@/lib/placeholder";
+import { placeholderDataUri, isUsableImageUrl } from "@/lib/content/shared/placeholder";
 import { resolveImage } from "@/lib/assets/shared/imageAttrs";
 
 interface Props {

package/apps/storefront/src/components/{islands → catalog/storefront/islands}/QuickView.tsx

@@ -7,8 +7,8 @@
  * reduced-motion-safe entrance via CSS.
  */
 import { useEffect, useRef, useState } from "preact/hooks";
-import { formatPrice } from "@/lib/format";
-import { placeholderDataUri, isUsableImageUrl } from "@/lib/placeholder";
+import { formatPrice } from "@/lib/content/shared/format";
+import { placeholderDataUri, isUsableImageUrl } from "@/lib/content/shared/placeholder";
 import { withClientBase } from "@/lib/basePath";
 
 interface QV {

package/apps/storefront/src/components/{islands → catalog/storefront/islands}/RecentlyViewed.tsx

@@ -6,8 +6,8 @@
  * something to show (no layout shift, no empty state noise).
  */
 import { useEffect, useState } from "preact/hooks";
-import { formatPrice } from "@/lib/format";
-import { placeholderDataUri, isUsableImageUrl } from "@/lib/placeholder";
+import { formatPrice } from "@/lib/content/shared/format";
+import { placeholderDataUri, isUsableImageUrl } from "@/lib/content/shared/placeholder";
 import { withClientBase } from "@/lib/basePath";
 
 export interface RVItem {

package/apps/storefront/src/components/{islands → catalog/storefront/islands}/SearchTypeahead.tsx

@@ -11,9 +11,9 @@
  * open a product, Escape to dismiss. Fetch failures degrade to "no dropdown".
  */
 import { useCallback, useEffect, useRef, useState } from "preact/hooks";
-import type { TypeaheadDoc } from "@/lib/search";
-import { formatPrice } from "@/lib/format";
-import { placeholderDataUri, isUsableImageUrl } from "@/lib/placeholder";
+import type { TypeaheadDoc } from "@/lib/catalog/search/index";
+import { formatPrice } from "@/lib/content/shared/format";
+import { placeholderDataUri, isUsableImageUrl } from "@/lib/content/shared/placeholder";
 import { withClientBase } from "@/lib/basePath";
 
 interface Props {

package/apps/storefront/src/components/{islands → catalog/storefront/islands}/VariantSelector.tsx

@@ -26,8 +26,8 @@ import type {
   MembershipStackingPolicy,
 } from "@tot/public-runtime";
 import { priceForPurchaseOption } from "@tot/public-runtime";
-import { formatPrice } from "@/lib/format";
-import { useCheckoutHandoffCorrelation } from "@/components/islands/useCheckoutHandoffCorrelation";
+import { formatPrice } from "@/lib/content/shared/format";
+import { useCheckoutHandoffCorrelation } from "@/lib/checkout/browser/useCheckoutHandoffCorrelation";
 
 export type PublicSelectorVariant = Pick<CatalogVariant,
   "id" | "sku" | "price" | "compare_at_price" | "option_values" | "inventory" | "image_id">;

package/apps/storefront/src/components/{plp → catalog/storefront/plp}/FacetSidebar.astro

@@ -8,7 +8,7 @@
  */
 import type { Facet, ListProductsQuery } from "@tot/public-runtime";
 import { toggleFacet, buildQueryString, isPriceBucketActive, togglePriceBucket } from "@/lib/url";
-import { PRICE_BUCKETS, bucketByKey } from "@/lib/priceBuckets";
+import { PRICE_BUCKETS, bucketByKey } from "@/lib/catalog/shared/priceBuckets";
 
 interface Props {
   facets: Facet[];

package/apps/storefront/src/components/compliance/{NicotineWarning.astro → storefront/compliance/NicotineWarning.astro}

@@ -10,7 +10,7 @@
  * owner-reviewed custom style), never below the conspicuity floor and never
  * hideable. The markup is nicotineWarningHtml's, shared with the raw-HTML serve path.
  */
-import { nicotineWarningHtml } from "../../../../../packages/cli/src/declared-config.mjs";
+import { nicotineWarningHtml } from "../../../../../../../packages/cli/src/declared-config.mjs";
 
 interface Props {
   variant?: "bar" | "block";

package/apps/storefront/src/components/{islands → compliance/storefront/islands}/AgeGate.tsx

@@ -7,8 +7,8 @@
  * reimplement verification here. Affirmation is remembered in localStorage.
  */
 import { useEffect, useRef, useState } from "preact/hooks";
-import type { ChromeAgeGate } from "@/lib/chrome/model";
-import { deriveAgeGateStorageKey, isSafeAgeGateHref, resolveAgeGateCopy } from "@/lib/chrome/model";
+import type { ChromeAgeGate } from "@/lib/content/chrome/model";
+import { deriveAgeGateStorageKey, isSafeAgeGateHref, resolveAgeGateCopy } from "@/lib/content/chrome/model";
 
 export interface Props {
   minAge: number;

package/apps/storefront/src/components/{islands → compliance/storefront/islands}/CheckoutComplianceGate.tsx

@@ -35,7 +35,7 @@ import {
   writeStoredRef,
   type PreflightResponse,
   type VerificationPhase,
-} from "./checkoutVerificationFlow.js";
+} from "../../../../lib/compliance/browser/checkoutVerificationFlow.js";
 
 interface Props {
   /** Absolute (base-path-aware) URL of the preflight endpoint. */

package/apps/storefront/src/components/{islands → compliance/storefront/islands}/IsolatedAgeGate.tsx

@@ -17,7 +17,7 @@
  */
 import { render } from "preact";
 import { useEffect } from "preact/hooks";
-import type { ChromeAgeGate } from "@/lib/chrome/model";
+import type { ChromeAgeGate } from "@/lib/content/chrome/model";
 import AgeGate from "./AgeGate";
 
 export interface Props {

package/apps/storefront/src/components/{AsyncStylesheet.astro → content/storefront/AsyncStylesheet.astro}

@@ -1,7 +1,7 @@
 ---
 /**
  * <AsyncStylesheet> — loads a non-critical stylesheet without blocking render,
- * and without FOUC, under the storefront's strict CSP (see lib/asyncCss.ts for
+ * and without FOUC, under the storefront's strict CSP (see lib/content/shared/asyncCss.ts for
  * why this can't be the usual `onload="this.rel='stylesheet'"` attribute
  * trick). Use for CSS a page doesn't need for first paint — e.g. a below-fold
  * section, an optional widget, a print stylesheet's screen equivalent. Do NOT
@@ -13,7 +13,7 @@
  * such link to `rel="stylesheet"` after it's fetched) plus a `<noscript>`
  * fallback so the styles still apply with JS disabled.
  */
-import { ASYNC_CSS_ATTR } from "@/lib/asyncCss";
+import { ASYNC_CSS_ATTR } from "@/lib/content/shared/asyncCss";
 
 interface Props {
   href: string;

package/apps/storefront/src/components/{Breadcrumbs.astro → content/storefront/Breadcrumbs.astro}

@@ -10,12 +10,12 @@
  * failing even 2.5.8's 24px floor on every page that renders a trail. The extra height centres
  * around the text, so the crumb does not move.
  *
- * Build `crumbs` with `siteTrail` (lib/breadcrumbs.ts) and pass the SAME array to `breadcrumbLd`.
+ * Build `crumbs` with `siteTrail` (lib/content/shared/breadcrumbs.ts) and pass the SAME array to `breadcrumbLd`.
  * `class` adds a hook for the page's own styles (`breadcrumbs` on the blog templates).
  */
 import { withBase } from "@/lib/basePath";
-import { pageUrlForm } from "@/lib/seo/urlForm";
-import type { Crumb } from "@/lib/breadcrumbs";
+import { pageUrlForm } from "@/lib/content/seo/urlForm";
+import type { Crumb } from "@/lib/content/shared/breadcrumbs";
 
 interface Props {
   crumbs: Crumb[];

package/apps/storefront/src/components/{Seo.astro → content/storefront/Seo.astro}

@@ -3,11 +3,11 @@
  * <Seo> — per-page title/meta, Open Graph, Twitter card, canonical, JSON-LD.
  * (brief §8). Tenant-aware: OG image + site name come from the resolved tenant.
  */
-import { articleSeoMetaTags, resolveOgImage, type ArticleMeta } from "@/lib/seo/meta.js";
-import { withXDefault, type Alternate } from "@/lib/seo/alternates.js";
-import { safeJsonScriptContent } from "@/lib/jsonScript";
-import { documentTitle } from "@/lib/seo/documentTitle";
-import { canonicalUrl } from "@/lib/seo/urlForm";
+import { articleSeoMetaTags, resolveOgImage, type ArticleMeta } from "@/lib/content/seo/meta.js";
+import { withXDefault, type Alternate } from "@/lib/content/seo/alternates.js";
+import { safeJsonScriptContent } from "@/lib/content/shared/jsonScript";
+import { documentTitle } from "@/lib/content/seo/documentTitle";
+import { canonicalUrl } from "@/lib/content/seo/urlForm";
 
 interface JsonLd {
   [key: string]: unknown;

package/apps/storefront/src/components/{blog → content/storefront/blog}/BlogIndexView.astro

@@ -4,12 +4,12 @@
 // component so the hero/grid/pagination markup, and the tenant-copy + pagination
 // contract it implements, can't drift between the two routes (fb-1791301493691-brzl6f).
 import Layout from "@/layouts/Layout.astro";
-import PostAccessBadge from "@/components/blog/PostAccessBadge.astro";
-import type { BlogPostSummary } from "@/lib/blog/types.js";
-import type { BlogIndexCopy } from "@/lib/blog/pagination.js";
-import type { BlogPresentation } from "@/lib/blog/presentation.js";
-import { categorySlug } from "@/lib/blog/collection.js";
-import { collectionPathsV1 } from "@/lib/blog/collectionPaths.js";
+import PostAccessBadge from "@/components/content/storefront/blog/PostAccessBadge.astro";
+import type { BlogPostSummary } from "@/lib/content/blog/types.js";
+import type { BlogIndexCopy } from "@/lib/content/blog/pagination.js";
+import type { BlogPresentation } from "@/lib/content/blog/presentation.js";
+import { categorySlug } from "@/lib/content/blog/collection.js";
+import { collectionPathsV1 } from "@/lib/content/blog/collectionPaths.js";
 
 interface Props {
   basePath: string;

package/apps/storefront/src/components/{blog → content/storefront/blog}/BlogPaywall.astro

@@ -4,7 +4,7 @@
 // badge + headline + one line of value + a single CTA — restyled with the site's
 // design tokens so it reads as native article chrome, and preceded by a fade that
 // dissolves the truncated body into the card.
-import type { BlogAccess } from "@/lib/blog/types.js";
+import type { BlogAccess } from "@/lib/content/blog/types.js";
 
 interface Props {
   access: BlogAccess;

package/apps/storefront/src/components/{blog → content/storefront/blog}/BlogPostArticle.astro

@@ -8,13 +8,13 @@
  * the request.
  */
 import Layout from "@/layouts/Layout.astro";
-import { sourceSeoTitle } from "@/lib/seo/documentTitle";
-import Breadcrumbs from "@/components/Breadcrumbs.astro";
-import BlogPaywall from "@/components/blog/BlogPaywall.astro";
-import ReactionBar from "@/components/blog/ReactionBar.astro";
-import ShareRow from "@/components/blog/ShareRow.astro";
-import { languageLabel } from "@/lib/i18n.js";
-import type { BlogPostViewPropsV1 } from "@/lib/blog/postView.js";
+import { sourceSeoTitle } from "@/lib/content/seo/documentTitle";
+import Breadcrumbs from "@/components/content/storefront/Breadcrumbs.astro";
+import BlogPaywall from "@/components/content/storefront/blog/BlogPaywall.astro";
+import ReactionBar from "@/components/content/storefront/blog/ReactionBar.astro";
+import ShareRow from "@/components/content/storefront/blog/ShareRow.astro";
+import { languageLabel } from "@/lib/content/shared/i18n.js";
+import type { BlogPostViewPropsV1 } from "@/lib/content/blog/postView.js";
 
 type Props = BlogPostViewPropsV1;
 

package/apps/storefront/src/components/{blog → content/storefront/blog}/PostAccessBadge.astro

@@ -3,7 +3,7 @@
 // `post.access` and renders nothing for public posts. No gating logic lives
 // here — entitlement is decided in the route via `viewerHasBlogAccess`; this
 // is purely a "this story is members-only" indicator on listings and archives.
-import type { BlogAccess } from "@/lib/blog/types.js";
+import type { BlogAccess } from "@/lib/content/blog/types.js";
 
 interface Props {
   access?: BlogAccess;

package/apps/storefront/src/components/{blog → content/storefront/blog}/PostGrid.astro

@@ -2,9 +2,9 @@
 // Reader-facing card grid for a list of blog posts, shared by the collection's
 // category and tag index pages. `paths` are the collection's URLs for the space that serves
 // the page (collectionPathsV1); `basePath` is the tenant/preview path prefix from Astro.locals.
-import type { BlogPostSummary } from "@/lib/blog/types.js";
-import type { CollectionPathsV1 } from "@/lib/blog/collectionPaths.js";
-import PostAccessBadge from "@/components/blog/PostAccessBadge.astro";
+import type { BlogPostSummary } from "@/lib/content/blog/types.js";
+import type { CollectionPathsV1 } from "@/lib/content/blog/collectionPaths.js";
+import PostAccessBadge from "@/components/content/storefront/blog/PostAccessBadge.astro";
 
 interface Props {
   posts: BlogPostSummary[];

package/apps/storefront/src/components/{blog → content/storefront/blog}/ReactionBar.astro

@@ -8,7 +8,7 @@
  * moderation — an emoji tally, the first reader-sentiment signal (complements
  * view counts). Tenant/collection-generic: mounts on any post route.
  */
-import { getReactionCounts, REACTIONS, type Reaction } from "@/lib/blog/reactions.js";
+import { getReactionCounts, REACTIONS, type Reaction } from "@/lib/content/blog/reactions.js";
 import { readKv } from "@/lib/runtimeEnv";
 import { withBase } from "@/lib/basePath";
 

package/apps/storefront/src/components/{blog → content/storefront/blog}/ShareRow.astro

@@ -5,7 +5,7 @@
  * works under the strict CSP (no inline handler, no `javascript:` URL) on every serving plane.
  * Each item carries `share-row__item--<target>` so tenant CSS can give it the source theme's icon.
  */
-import type { ShareLink } from "@/lib/blog/presentation.js";
+import type { ShareLink } from "@/lib/content/blog/presentation.js";
 
 interface Props {
   links: ShareLink[];

package/apps/storefront/src/components/{chrome → content/storefront/chrome}/MegaMenu.astro

@@ -7,9 +7,9 @@
  * Used by <SiteHeader> for the desktop nav, and registerable standalone in the
  * style guide.
  */
-import type { ChromeNavItem } from "@/lib/chrome/model";
-import NavDropdown from "@/components/chrome/NavDropdown.astro";
-import { CHROME_PLACEMENT } from "@/lib/chrome/trackingPlacements";
+import type { ChromeNavItem } from "@/lib/content/chrome/model";
+import NavDropdown from "@/components/content/storefront/chrome/NavDropdown.astro";
+import { CHROME_PLACEMENT } from "@/lib/content/chrome/trackingPlacements";
 
 interface Props {
   items: ChromeNavItem[];

package/apps/storefront/src/components/{chrome → content/storefront/chrome}/NavDropdown.astro

@@ -15,9 +15,9 @@
  * With an optional caret, a "NEW"-style badge, and a highlighted `flag` variant.
  * Tenant-agnostic; theme-token skinned.
  */
-import type { ChromeNavItem, ChromeLink } from "@/lib/chrome/model";
+import type { ChromeNavItem, ChromeLink } from "@/lib/content/chrome/model";
 import { withBase } from "@/lib/basePath";
-import { isCurrentNavHref } from "@/lib/chrome/navCurrent";
+import { isCurrentNavHref } from "@/lib/content/chrome/navCurrent";
 import { trackingAttributes } from "@tot/public-runtime";
 
 interface Props {

package/apps/storefront/src/components/{chrome → content/storefront/chrome}/SiteFooter.astro

@@ -7,16 +7,16 @@
  * The newsletter is a plain POST form (progressive); it does not embed any cart
  * or checkout logic (commerce boundary).
  */
-import type { ChromeLink, FooterColumn, FooterNewsletter, SocialLink, ChromeLogo, FooterVariant } from "@/lib/chrome/model";
+import type { ChromeLink, FooterColumn, FooterNewsletter, SocialLink, ChromeLogo, FooterVariant } from "@/lib/content/chrome/model";
 import { withBase } from "@/lib/basePath";
-import { CHROME_PLACEMENT } from "@/lib/chrome/trackingPlacements";
-import { resolveNewsletterAgeAttestation } from "@/lib/chrome/newsletterAgeAttestation";
+import { CHROME_PLACEMENT } from "@/lib/content/chrome/trackingPlacements";
+import { resolveNewsletterAgeAttestation } from "@/lib/content/chrome/newsletterAgeAttestation";
 import { trackingAttributes } from "@tot/public-runtime";
 
 interface Props {
   columns: FooterColumn[];
   brand?: { logo?: ChromeLogo; wordmark?: string; contact?: string[] };
-  /** Content-shape variant (lib/chrome/model.ts FooterVariant). */
+  /** Content-shape variant (lib/content/chrome/model.ts FooterVariant). */
   variant?: FooterVariant;
   newsletter?: FooterNewsletter;
   /** Payment method labels rendered as chips (e.g. "Visa", "PayPal"). */
@@ -30,7 +30,7 @@ interface Props {
   legal?: string;
   /** Bottom-bar policy links (e.g. Privacy Policy, Terms), shown alongside `legal`.
    * The links of a `Legal`-titled footer column, which the caller MOVES out of
-   * `columns` (lib/chrome/footerLegal.ts) — passing them in both places would
+   * `columns` (lib/content/chrome/footerLegal.ts) — passing them in both places would
    * render each one twice. */
   bottomLinks?: ChromeLink[];
   class?: string;

package/apps/storefront/src/components/{chrome → content/storefront/chrome}/SiteHeader.astro

@@ -13,14 +13,14 @@
  * COMMERCE BOUNDARY: the cart is a LINK only — no cart state, no add-to-cart.
  * The count is a static affordance the managed cart can hydrate later.
  */
-import type { ChromeNavItem, ChromeLogo, ChromeCta, HeaderVariant } from "@/lib/chrome/model";
-import MegaMenu from "@/components/chrome/MegaMenu.astro";
-import NavDropdown from "@/components/chrome/NavDropdown.astro";
-import SearchTypeahead from "@/components/islands/SearchTypeahead.tsx";
-import MobileNav from "@/components/islands/MobileNav.tsx";
+import type { ChromeNavItem, ChromeLogo, ChromeCta, HeaderVariant } from "@/lib/content/chrome/model";
+import MegaMenu from "@/components/content/storefront/chrome/MegaMenu.astro";
+import NavDropdown from "@/components/content/storefront/chrome/NavDropdown.astro";
+import SearchTypeahead from "@/components/catalog/storefront/islands/SearchTypeahead.tsx";
+import MobileNav from "@/components/content/storefront/islands/MobileNav.tsx";
 import { withBase } from "@/lib/basePath";
-import { ctaIdentityAttr } from "@/lib/chrome/ctaIdentity";
-import { CHROME_PLACEMENT } from "@/lib/chrome/trackingPlacements";
+import { ctaIdentityAttr } from "@/lib/content/chrome/ctaIdentity";
+import { CHROME_PLACEMENT } from "@/lib/content/chrome/trackingPlacements";
 import { trackingAttributes } from "@tot/public-runtime";
 
 interface Props {
@@ -28,7 +28,7 @@ interface Props {
   /** Fallback wordmark text when no logo image. */
   wordmark?: string;
   /**
-   * Home/brand link target (lib/chrome/model.ts ChromeBrand.href). Run through
+   * Home/brand link target (lib/content/chrome/model.ts ChromeBrand.href). Run through
    * `withBase` same as every other same-origin href. Omit to default to "/".
    */
   brandHref?: string;
@@ -55,7 +55,7 @@ interface Props {
   /** A brand-fixed "dark" header bar (e.g. a navy bar with a light logo) vs. the default light bar. */
   variant?: "light" | "dark";
   /**
-   * Content-shape variant (lib/chrome/model.ts HeaderVariant) — independent of
+   * Content-shape variant (lib/content/chrome/model.ts HeaderVariant) — independent of
    * `variant`'s light/dark TONE above. "minimal" (e.g. checkout/policy pages)
    * renders brand + a reduced action set only: no search, no marketing CTAs,
    * no saved-items affordance, no primary-nav bar, no mobile-menu toggle.

package/apps/storefront/src/components/{chrome → content/storefront/chrome}/UtilityNav.astro

@@ -5,9 +5,9 @@
  * agnostic; theme-token skinned. Hidden on small screens (it's a desktop
  * convenience — the mobile menu carries these links).
  */
-import type { ChromeLink, SocialLink } from "@/lib/chrome/model";
+import type { ChromeLink, SocialLink } from "@/lib/content/chrome/model";
 import { withBase } from "@/lib/basePath";
-import { CHROME_PLACEMENT } from "@/lib/chrome/trackingPlacements";
+import { CHROME_PLACEMENT } from "@/lib/content/chrome/trackingPlacements";
 import { trackingAttributes } from "@tot/public-runtime";
 
 interface Props {

package/apps/storefront/src/components/content/{Callout.astro → storefront/content/Callout.astro}

@@ -16,7 +16,7 @@
  */
 import type { CalloutModel, CalloutTone } from "@/lib/content/callout";
 import { calloutPresentation } from "@/lib/content/callout";
-import RichText from "@/components/content/RichText.astro";
+import RichText from "@/components/content/storefront/content/RichText.astro";
 
 interface Props {
   callout: CalloutModel;

package/apps/storefront/src/components/content/{PromoTiles.astro → storefront/content/PromoTiles.astro}

@@ -1,8 +1,8 @@
 ---
 /** Static, provider-neutral commerce promo presentations. */
-import Section from "@/components/Section.astro";
-import type { PromoTilesBlock } from "@/lib/storyblok/content-model";
-import { promoTilesView } from "@/lib/homeVisualParity";
+import Section from "@/components/content/storefront/Section.astro";
+import type { PromoTilesBlock } from "@/lib/content/storyblok/content-model";
+import { promoTilesView } from "@/lib/content/shared/homeVisualParity";
 
 interface Props {
   block: PromoTilesBlock;

package/apps/storefront/src/components/content/{ProseSections.astro → storefront/content/ProseSections.astro}

@@ -14,9 +14,9 @@
  */
 import type { ProseSection } from "@/lib/content/prose";
 import { normalizeProse, withHeadingIds } from "@/lib/content/prose";
-import RichText from "@/components/content/RichText.astro";
-import Callout from "@/components/content/Callout.astro";
-import NeedsReviewCallout from "@/components/content/NeedsReviewCallout.astro";
+import RichText from "@/components/content/storefront/content/RichText.astro";
+import Callout from "@/components/content/storefront/content/Callout.astro";
+import NeedsReviewCallout from "@/components/content/storefront/content/NeedsReviewCallout.astro";
 
 interface Props {
   sections: ProseSection[];

package/apps/storefront/src/components/{home → content/storefront/home}/Hero.astro

@@ -19,12 +19,12 @@
  * The eyebrow (`.hero__eyebrow`) reads `--color-hero-eyebrow` first, so a theme
  * recolours it with `color.hero-eyebrow` and tenant CSS can target the hook class.
  */
-import type { HeroBlock } from "@/lib/storyblok/content-model";
+import type { HeroBlock } from "@/lib/content/storyblok/content-model";
 import type { CatalogProduct } from "@tot/public-runtime";
 import Img from "@/components/assets/storefront/Img.astro";
 import { withBase } from "@/lib/basePath";
-import { pageUrlForm } from "@/lib/seo/urlForm";
-import { heroSlideshowView } from "@/lib/heroSlideshow";
+import { pageUrlForm } from "@/lib/content/seo/urlForm";
+import { heroSlideshowView } from "@/lib/content/shared/heroSlideshow";
 
 interface Props {
   block: HeroBlock;
@@ -306,7 +306,7 @@ const notice = block.notice?.trim();
 </style>
 
 <script>
-  import { heroAutoplayAllowed, nextHeroSlideIndex } from "@/lib/heroSlideshow";
+  import { heroAutoplayAllowed, nextHeroSlideIndex } from "@/lib/content/shared/heroSlideshow";
 
   const reducedMotion = window.matchMedia("(prefers-reduced-motion: reduce)");