@tokenoftrust/storefront-runner 2.4.86 → 2.4.88

package/apps/storefront/src/components/{islands → content/storefront/islands}/MobileNav.tsx

@@ -11,8 +11,8 @@
  * prefers-reduced-motion.
  */
 import { useCallback, useEffect, useRef, useState } from "preact/hooks";
-import { isCurrentNavHref } from "@/lib/chrome/navCurrent";
-import { CHROME_PLACEMENT } from "@/lib/chrome/trackingPlacements";
+import { isCurrentNavHref } from "@/lib/content/chrome/navCurrent";
+import { CHROME_PLACEMENT } from "@/lib/content/chrome/trackingPlacements";
 import { trackingAttributes } from "@tot/public-runtime";
 
 /**

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

@@ -4,8 +4,8 @@
  * component, three visual variants (density + emphasis). Cards may link
  * internally (base-path prefixed) or externally.
  */
-import Section from "@/components/Section.astro";
-import type { CardGridBlock } from "@/lib/storyblok/content-model";
+import Section from "@/components/content/storefront/Section.astro";
+import type { CardGridBlock } from "@/lib/content/storyblok/content-model";
 import { withBase } from "@/lib/basePath";
 
 interface Props {

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

@@ -5,7 +5,7 @@
  * inject markup or scripts. Samples must be public/server-side framed — never
  * embed secret keys or tokens (see the epic's D7 secret-scan guardrail).
  */
-import type { CodeSample } from "@/lib/storyblok/content-model";
+import type { CodeSample } from "@/lib/content/storyblok/content-model";
 interface Props {
   sample: CodeSample;
 }

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

@@ -3,8 +3,8 @@
  * <CtaBand> — the final conversion band: a headline, optional subhead, and a
  * centered CTA row. Sits on the surface tone to close the page.
  */
-import type { CtaBandBlock } from "@/lib/storyblok/content-model";
-import MarketingCtas from "@/components/marketing/MarketingCtas.astro";
+import type { CtaBandBlock } from "@/lib/content/storyblok/content-model";
+import MarketingCtas from "@/components/content/storefront/marketing/MarketingCtas.astro";
 interface Props {
   block: CtaBandBlock;
   basePath: string;

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

@@ -3,13 +3,13 @@
  * <Faq> — a no-JS accordion of question/answer pairs using native
  * <details>/<summary>. Emits FAQPage JSON-LD so answers are eligible for rich
  * results — unless the tenant declares a structured-data profile, which owns every
- * JSON-LD node on the page (lib/seo/structuredData.ts). Answers are plain text
+ * JSON-LD node on the page (lib/content/seo/structuredData.ts). Answers are plain text
  * (auto-escaped).
  */
-import Section from "@/components/Section.astro";
-import type { FaqBlock } from "@/lib/storyblok/content-model";
-import { safeJsonScriptContent } from "@/lib/jsonScript";
-import { structuredDataProfile } from "@/lib/seo/structuredData";
+import Section from "@/components/content/storefront/Section.astro";
+import type { FaqBlock } from "@/lib/content/storyblok/content-model";
+import { safeJsonScriptContent } from "@/lib/content/shared/jsonScript";
+import { structuredDataProfile } from "@/lib/content/seo/structuredData";
 interface Props {
   block: FaqBlock;
 }

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

@@ -4,9 +4,9 @@
  * platform names/links, optional implementation points, and an optional safe
  * code sample. Platform links open externally when they carry an http href.
  */
-import Section from "@/components/Section.astro";
-import CodeSample from "@/components/marketing/CodeSample.astro";
-import type { IntegrationsBlock } from "@/lib/storyblok/content-model";
+import Section from "@/components/content/storefront/Section.astro";
+import CodeSample from "@/components/content/storefront/marketing/CodeSample.astro";
+import type { IntegrationsBlock } from "@/lib/content/storyblok/content-model";
 import { withBase } from "@/lib/basePath";
 
 interface Props {

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

@@ -5,17 +5,17 @@
  * block is styled through theme tokens and reads its copy from tenant content.
  * Reused by the homepage and (future) marketing content pages.
  */
-import type { MarketingBlock } from "@/lib/storyblok/content-model";
-import MarketingHero from "@/components/marketing/MarketingHero.astro";
-import TrustBar from "@/components/marketing/TrustBar.astro";
-import SplitCompare from "@/components/marketing/SplitCompare.astro";
-import Steps from "@/components/marketing/Steps.astro";
-import CardGrid from "@/components/marketing/CardGrid.astro";
-import Integrations from "@/components/marketing/Integrations.astro";
-import ProofStrip from "@/components/marketing/ProofStrip.astro";
-import Testimonials from "@/components/marketing/Testimonials.astro";
-import Faq from "@/components/marketing/Faq.astro";
-import CtaBand from "@/components/marketing/CtaBand.astro";
+import type { MarketingBlock } from "@/lib/content/storyblok/content-model";
+import MarketingHero from "@/components/content/storefront/marketing/MarketingHero.astro";
+import TrustBar from "@/components/content/storefront/marketing/TrustBar.astro";
+import SplitCompare from "@/components/content/storefront/marketing/SplitCompare.astro";
+import Steps from "@/components/content/storefront/marketing/Steps.astro";
+import CardGrid from "@/components/content/storefront/marketing/CardGrid.astro";
+import Integrations from "@/components/content/storefront/marketing/Integrations.astro";
+import ProofStrip from "@/components/content/storefront/marketing/ProofStrip.astro";
+import Testimonials from "@/components/content/storefront/marketing/Testimonials.astro";
+import Faq from "@/components/content/storefront/marketing/Faq.astro";
+import CtaBand from "@/components/content/storefront/marketing/CtaBand.astro";
 
 interface Props {
   blocks: MarketingBlock[];

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

@@ -5,7 +5,7 @@
  * a new tab with rel="noopener"; same-origin root-absolute hrefs get the tenant
  * base-path prefix so path-routed tenants stay in-tenant.
  */
-import type { MarketingCta } from "@/lib/storyblok/content-model";
+import type { MarketingCta } from "@/lib/content/storyblok/content-model";
 import { withBase } from "@/lib/basePath";
 
 interface Props {

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

@@ -5,8 +5,8 @@
  * Right (optional): a "product moment" panel of demo/evidence log lines.
  * All copy is plain text (auto-escaped); no raw HTML is rendered.
  */
-import type { MarketingHeroBlock } from "@/lib/storyblok/content-model";
-import MarketingCtas from "@/components/marketing/MarketingCtas.astro";
+import type { MarketingHeroBlock } from "@/lib/content/storyblok/content-model";
+import MarketingCtas from "@/components/content/storefront/marketing/MarketingCtas.astro";
 
 interface Props {
   block: MarketingHeroBlock;

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

@@ -4,7 +4,7 @@
  * data"). A bold statement + supporting copy + a grid of proof bullets. Painted
  * in the primary color for a single strong moment. Plain text only.
  */
-import type { ProofStripBlock } from "@/lib/storyblok/content-model";
+import type { ProofStripBlock } from "@/lib/content/storyblok/content-model";
 interface Props {
   block: ProofStripBlock;
 }

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

@@ -4,8 +4,8 @@
  * patchwork" vs "one platform"). The `before` column reads as the problem
  * (muted, ⚠) and `after` as the solution (accent, ✓).
  */
-import Section from "@/components/Section.astro";
-import type { SplitCompareBlock } from "@/lib/storyblok/content-model";
+import Section from "@/components/content/storefront/Section.astro";
+import type { SplitCompareBlock } from "@/lib/content/storyblok/content-model";
 interface Props {
   block: SplitCompareBlock;
 }

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

@@ -3,8 +3,8 @@
  * <Steps> — a numbered/emoji journey (e.g. the checkout verification flow).
  * Renders as a horizontal-scrolling rail on small screens, a wrapped row above.
  */
-import Section from "@/components/Section.astro";
-import type { StepsBlock } from "@/lib/storyblok/content-model";
+import Section from "@/components/content/storefront/Section.astro";
+import type { StepsBlock } from "@/lib/content/storyblok/content-model";
 interface Props {
   block: StepsBlock;
 }

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

@@ -3,8 +3,8 @@
  * <Testimonials> — outcome/quote cards with an optional stat lead-in and
  * attribution, plus an optional row of rating tokens. Plain text only.
  */
-import Section from "@/components/Section.astro";
-import type { TestimonialsBlock } from "@/lib/storyblok/content-model";
+import Section from "@/components/content/storefront/Section.astro";
+import type { TestimonialsBlock } from "@/lib/content/storyblok/content-model";
 interface Props {
   block: TestimonialsBlock;
 }

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

@@ -3,7 +3,7 @@
  * <TrustBar> — a quiet horizontal strip of proof tokens (countries, standards,
  * platform names, ratings). Plain text, dot-separated on small screens.
  */
-import type { TrustBarBlock } from "@/lib/storyblok/content-model";
+import type { TrustBarBlock } from "@/lib/content/storyblok/content-model";
 interface Props {
   block: TrustBarBlock;
 }

package/apps/storefront/src/components/{style-guide → content/storefront/style-guide}/StyleGuideNav.astro

@@ -14,7 +14,7 @@
  * aria-current="page". When `headings` is supplied (the guide's H2 outline) a
  * nested table of contents is rendered as in-page anchor links.
  */
-import { styleGuideHref } from "@/lib/styleGuidePaths";
+import { styleGuideHref } from "@/lib/content/shared/styleGuidePaths";
 
 type Active = "index" | "tenant" | "components" | "chrome" | "guide";
 

package/apps/storefront/src/components/{the-build → content/storefront/the-build}/TheBuildIndexView.astro

@@ -5,11 +5,11 @@
 // implements, can't drift between the two routes (the-build sibling of fb-1791301493691-brzl6f —
 // mirrors @/components/blog/BlogIndexView.astro).
 import Layout from "@/layouts/Layout.astro";
-import PostAccessBadge from "@/components/blog/PostAccessBadge.astro";
-import type { BlogPostSummary } from "@/lib/blog/types.js";
-import type { TheBuildIndexCopy } from "@/lib/the-build/pagination.js";
-import type { BlogPresentation } from "@/lib/blog/presentation.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 { TheBuildIndexCopy } from "@/lib/content/the-build/pagination.js";
+import type { BlogPresentation } from "@/lib/content/blog/presentation.js";
+import { collectionPathsV1 } from "@/lib/content/blog/collectionPaths.js";
 
 interface Props {
   basePath: string;

package/apps/storefront/src/components/customers/storefront/islands/SavedList.tsx

@@ -11,8 +11,8 @@ import {
   WISHLIST_EVENT,
   type SavedItem,
 } from "@/lib/customers/shared/wishlist";
-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 Props {

package/apps/storefront/src/components/{subscription → subscriptions/storefront/subscription}/HowItWorksSteps.astro

@@ -10,7 +10,7 @@
  * (--color-…, --radius-…); no hardcoded brand color.
  * data-widget="subscription-how-it-works" is the audit/test hook.
  */
-import type { SubscriptionStep } from "@/lib/subscription/model";
+import type { SubscriptionStep } from "@/lib/subscriptions/subscription/model";
 
 interface Props {
   steps: SubscriptionStep[];

package/apps/storefront/src/components/{subscription → subscriptions/storefront/subscription}/ManageSubscriptionEntry.astro

@@ -9,7 +9,7 @@
  * Token-styled only; data-widget="subscription-manage-entry" is the
  * audit/test hook.
  */
-import type { SubscriptionManageEntry } from "@/lib/subscription/model";
+import type { SubscriptionManageEntry } from "@/lib/subscriptions/subscription/model";
 
 interface Props {
   entries: SubscriptionManageEntry[];

package/apps/storefront/src/components/{subscription → subscriptions/storefront/subscription}/SavingsExplainer.astro

@@ -16,8 +16,8 @@
  * Token-styled only; data-widget="subscription-savings-explainer" is the
  * audit/test hook.
  */
-import type { SubscriptionFigure } from "@/lib/subscription/model";
-import { isIllustrative } from "@/lib/subscription/model";
+import type { SubscriptionFigure } from "@/lib/subscriptions/subscription/model";
+import { isIllustrative } from "@/lib/subscriptions/subscription/model";
 import IllustrativeLabel from "@/components/membership/storefront/membership/IllustrativeLabel.astro";
 
 interface Props {

package/apps/storefront/src/layouts/Layout.astro

@@ -8,34 +8,34 @@ import "@/styles/global.css";
 // Self-hosted web fonts (audit finding 6) — replaces the render-blocking
 // fonts.googleapis.com stylesheet. Bundled by Vite, served same-origin.
 import "@/styles/fonts.css";
-import Seo from "@/components/Seo.astro";
-import AnnouncementBar from "@/components/chrome/AnnouncementBar.astro";
-import SiteHeader from "@/components/chrome/SiteHeader.astro";
-import SiteFooter from "@/components/chrome/SiteFooter.astro";
-import QuickView from "@/components/islands/QuickView.tsx";
-import CheckoutLoader from "@/components/commerce/CheckoutLoader.astro";
-import CartDrawerStyles from "@/components/commerce/CartDrawerStyles.astro";
-import NicotineWarning from "@/components/compliance/NicotineWarning.astro";
-import PactActNotice from "@/components/compliance/PactActNotice.astro";
-import ShippingRestrictionNotice from "@/components/compliance/ShippingRestrictionNotice.astro";
-import ExciseTaxNotice from "@/components/compliance/ExciseTaxNotice.astro";
+import Seo from "@/components/content/storefront/Seo.astro";
+import AnnouncementBar from "@/components/content/storefront/chrome/AnnouncementBar.astro";
+import SiteHeader from "@/components/content/storefront/chrome/SiteHeader.astro";
+import SiteFooter from "@/components/content/storefront/chrome/SiteFooter.astro";
+import QuickView from "@/components/catalog/storefront/islands/QuickView.tsx";
+import CheckoutLoader from "@/components/checkout/storefront/commerce/CheckoutLoader.astro";
+import CartDrawerStyles from "@/components/checkout/storefront/commerce/CartDrawerStyles.astro";
+import NicotineWarning from "@/components/compliance/storefront/compliance/NicotineWarning.astro";
+import PactActNotice from "@/components/compliance/storefront/compliance/PactActNotice.astro";
+import ShippingRestrictionNotice from "@/components/compliance/storefront/compliance/ShippingRestrictionNotice.astro";
+import ExciseTaxNotice from "@/components/compliance/storefront/compliance/ExciseTaxNotice.astro";
 import { EXCISE_TAX_DISCLOSURE_TEXT } from "@/lib/compliance/rawComplianceNotices";
-import IsolatedAgeGate from "@/components/islands/IsolatedAgeGate.tsx";
+import IsolatedAgeGate from "@/components/compliance/storefront/islands/IsolatedAgeGate.tsx";
 import AuthBadge from "@/components/auth/AuthBadge.astro";
 import { referenceTheme } from "@/themes/reference";
 import { mergeTheme } from "@/themes/schema";
-import { organizationLd, websiteLd } from "@/lib/jsonld";
-import { composeStructuredData, structuredDataProfile, type StructuredDataPage } from "@/lib/seo/structuredData";
-import { canonicalUrl } from "@/lib/seo/urlForm";
-import { documentTitle } from "@/lib/seo/documentTitle";
-import { nonceInlineTags, prefixApiFormActions, CHROME_BODY_MARKER } from "@/lib/rawMarketingHtml";
-import { CHROME_BEHAVIOR_JS, CHROME_HEAD_JS, sanitizeSharedChromeFragment } from "@/lib/rawChrome";
-import { ASYNC_CSS_SWAP_JS } from "@/lib/asyncCss";
-import { reportTrackingChainHealth } from "@/lib/tracking/interactionHealth";
-import { resolveHeaderVariant, resolveFooterVariant } from "@/lib/chrome/variant";
-import { splitFooterLegal } from "@/lib/chrome/footerLegal";
-import { bindManagedCartAnchors, managedCartHref } from "@/lib/chrome/managedCart";
-import type { HeaderVariant, FooterVariant } from "@/lib/chrome/model";
+import { organizationLd, websiteLd } from "@/lib/content/shared/jsonld";
+import { composeStructuredData, structuredDataProfile, type StructuredDataPage } from "@/lib/content/seo/structuredData";
+import { canonicalUrl } from "@/lib/content/seo/urlForm";
+import { documentTitle } from "@/lib/content/seo/documentTitle";
+import { nonceInlineTags, prefixApiFormActions, CHROME_BODY_MARKER } from "@/lib/content/shared/rawMarketingHtml";
+import { CHROME_BEHAVIOR_JS, CHROME_HEAD_JS, sanitizeSharedChromeFragment } from "@/lib/content/shared/rawChrome";
+import { ASYNC_CSS_SWAP_JS } from "@/lib/content/shared/asyncCss";
+import { reportTrackingChainHealth } from "@/lib/measurement/tracking/interactionHealth";
+import { resolveHeaderVariant, resolveFooterVariant } from "@/lib/content/chrome/variant";
+import { splitFooterLegal } from "@/lib/content/chrome/footerLegal";
+import { bindManagedCartAnchors, managedCartHref } from "@/lib/content/chrome/managedCart";
+import type { HeaderVariant, FooterVariant } from "@/lib/content/chrome/model";
 import { renderIntegrationPhases, INTERACTION_TRACKING_BOOT_JS } from "@tot/public-runtime";
 import { readViewerSession } from "@/lib/auth/route";
 import AppWidgetFrame from "@/components/integrations/storefront/apps/AppWidgetFrame.astro";
@@ -54,7 +54,7 @@ interface Props {
   jsonLd?: Record<string, unknown> | Record<string, unknown>[];
   /**
    * What the page knows about itself for the tenant's declared structured-data profile
-   * (lib/seo/structuredData.ts). When the profile declares a graph for `pageType`, that graph
+   * (lib/content/seo/structuredData.ts). When the profile declares a graph for `pageType`, that graph
    * is the page's ONLY JSON-LD and `jsonLd` is not emitted.
    */
   structuredData?: StructuredDataPage;
@@ -66,7 +66,7 @@ interface Props {
   fullBleed?: boolean;
   /**
    * Explicit per-page header/footer content-variant override (see
-   * lib/chrome/model.ts HeaderVariant/FooterVariant). NEVER inferred from the
+   * lib/content/chrome/model.ts HeaderVariant/FooterVariant). NEVER inferred from the
    * route/CSS/title — a page that wants e.g. a minimal checkout header sets
    * this prop. Absent ⇒ the tenant's chrome-config default
    * (chrome.header.variant / chrome.footer.variant). An unrecognized value
@@ -76,7 +76,7 @@ interface Props {
   headerVariant?: HeaderVariant;
   footerVariant?: FooterVariant;
   // --- Article SEO hardening: pass-through to <Seo> (all additive) ---
-  article?: import("@/lib/seo/meta.js").ArticleMeta;
+  article?: import("@/lib/content/seo/meta.js").ArticleMeta;
   imageAlt?: string;
   imageWidth?: number;
   imageHeight?: number;
@@ -86,7 +86,7 @@ interface Props {
   // --- hreflang / <html lang> (additive) ---
   /** Per-variant `hreflang` alternates for a translated article; threaded to
    *  <Seo>. Absent/empty ⇒ no alternate links (singleton unchanged). */
-  alternates?: import("@/lib/seo/alternates.js").Alternate[];
+  alternates?: import("@/lib/content/seo/alternates.js").Alternate[];
   /** Overrides `<html lang>` (e.g. a translated article's `inLanguage`). Absent ⇒
    *  the tenant-locale default, so non-translated pages are unchanged. */
   lang?: string;
@@ -156,7 +156,7 @@ const chrome = await Astro.locals.content.getChrome();
 
 // Explicit variant resolution (fail-closed): the page's override wins over
 // the tenant's chrome-config default; an unrecognized value throws with an
-// actionable message rather than silently falling back (lib/chrome/variant.ts).
+// actionable message rather than silently falling back (lib/content/chrome/variant.ts).
 const resolvedHeaderVariant = resolveHeaderVariant(headerVariant, chrome.header.variant);
 const resolvedFooterVariant = resolveFooterVariant(footerVariant, chrome.footer.variant);
 const footerCompliance = [chrome.footer.warning, chrome.complianceStrip]
@@ -256,7 +256,7 @@ const themeHeaderLogo =
     ? { src: headerLogoSrc, alt: tenant.displayName }
     : undefined;
 
-// chrome.header.brand (lib/chrome/model.ts ChromeBrand) is the governed,
+// chrome.header.brand (lib/content/chrome/model.ts ChromeBrand) is the governed,
 // schema-validated brand identity — SOURCE OF TRUTH per field when set,
 // falling back to the theme-derived values above only where a field is
 // absent, so a tenant that hasn't authored a brand config is unaffected.
@@ -268,7 +268,7 @@ const headerBrandHref = brand?.href;
 
 // Footer bottom bar: a "Legal"-titled column MOVES out of the grid and its
 // links render beside the copyright — one shared split with the raw renderer
-// (lib/chrome/footerLegal.ts), so neither surface can duplicate them.
+// (lib/content/chrome/footerLegal.ts), so neither surface can duplicate them.
 const { gridColumns: footerColumns, legalLinks: bottomLinks } = splitFooterLegal(
   chrome.footer.columns,
 );
@@ -636,7 +636,7 @@ const footerWidgets = await renderWidgetSlot(
 
     {/* Swaps every <AsyncStylesheet>-rendered preload link to rel="stylesheet"
         once fetched. ONE nonced script per document handles every such link,
-        however many <AsyncStylesheet> instances rendered (lib/asyncCss.ts —
+        however many <AsyncStylesheet> instances rendered (lib/content/shared/asyncCss.ts —
         the onload="" attribute trick can't carry a nonce under this CSP). A
         no-op when the page has none. */}
     <script is:inline nonce={cspNonce} set:html={ASYNC_CSS_SWAP_JS}></script>

package/apps/storefront/src/lib/activity/alerts.ts

@@ -59,7 +59,7 @@ import {
   type ActivityTimelineRow,
   type DeploySkewSummary,
 } from "./query.js";
-import type { Queryable } from "../d1/catalog.js";
+import type { Queryable } from "../catalog/d1/catalog.js";
 
 /** Severity, mirroring `rumAlert.AlertSeverity` / `manifest.Severity`. */
 export type AlertSeverity = "page" | "critical" | "warning" | "info";

package/apps/storefront/src/lib/activity/candidateSubmitLease.ts

@@ -1,4 +1,4 @@
-import type { D1Like } from "@/lib/d1/catalog";
+import type { D1Like } from "@/lib/catalog/d1/catalog";
 
 const DIAGNOSTIC_STUCK_AFTER_MS = 5 * 60 * 1000;
 

package/apps/storefront/src/lib/activity/fixtures/evidence.ts

@@ -2,8 +2,8 @@ import type { AdminTenantEnvelope } from "../../admin/envelope";
 import { memoizeByEnvelope } from "../../admin/memoizeByEnvelope";
 import type { EvidenceReference } from "../evidence/evidenceReference";
 import { getCustomersViewModel } from "../../customers/fixtures/customers";
-import { getOrdersViewModel } from "../../admin/services/mock/orders";
-import { getProductsViewModel } from "../../admin/services/mock/products";
+import { getOrdersViewModel } from "../../orders/fixtures/orders";
+import { getProductsViewModel } from "../../catalog/fixtures/products";
 
 /**
  * Deterministic evidence graph, built by connecting the domains already

package/apps/storefront/src/lib/activity/query.ts

@@ -5,7 +5,7 @@
  * tenant's lifecycle activity newest-first for the `/admin` ops timeline UI
  * ("who shipped/rejected what, when, why — and what happened to my change/
  * deploy"). PURE over the injected `Queryable` seam (D1 in the Worker, an
- * in-memory `node:sqlite` in tests), same posture as `lib/d1/catalog.ts` and the
+ * in-memory `node:sqlite` in tests), same posture as `lib/catalog/d1/catalog.ts` and the
  * write path (`store.ts`).
  *
  * TENANT ISOLATION IS THE INVARIANT. `tenantId` is REQUIRED on every query and is
@@ -38,7 +38,7 @@ import {
   type ActivitySource,
   type ActivityStatus,
 } from "@tot/public-runtime";
-import type { Queryable } from "../d1/catalog.js";
+import type { Queryable } from "../catalog/d1/catalog.js";
 import { workerCommitShort, UNKNOWN_COMMIT } from "./workerCommit.js";
 
 /** Hard cap on rows returned by one query — the ops timeline is paged/bounded,

package/apps/storefront/src/lib/activity/store.ts

@@ -19,7 +19,7 @@
  * critical path via `runAfterResponse` at the call site.
  */
 import { getActionSpec, type ActivityEvent, type ActivitySink } from "@tot/public-runtime";
-import type { Queryable } from "../d1/catalog.js";
+import type { Queryable } from "../catalog/d1/catalog.js";
 
 /** The slice of Cloudflare's Analytics Engine dataset binding we use. */
 export interface AnalyticsEngineLike {

package/apps/storefront/src/lib/admin/services/mock/index.ts

@@ -1,11 +1,11 @@
-export { getOrdersViewModel } from "./orders";
-export { getProductsViewModel } from "./products";
+export { getOrdersViewModel } from "../../../orders/fixtures/orders";
+export { getProductsViewModel } from "../../../catalog/fixtures/products";
 export { getCustomersViewModel } from "../../../customers/fixtures/customers";
 export { getReportingViewModel } from "../../../reporting/fixtures/reporting";
 export { getSettingsViewModel } from "./settings";
-export { getCheckoutSettingsViewModel } from "./checkoutSettings";
-export type { CheckoutSettingsViewModel } from "./checkoutSettings";
-export { getSubscriptionsViewModel } from "./subscriptions";
+export { getCheckoutSettingsViewModel } from "../../../checkout/fixtures/checkoutSettings";
+export type { CheckoutSettingsViewModel } from "../../../checkout/fixtures/checkoutSettings";
+export { getSubscriptionsViewModel } from "../../../subscriptions/fixtures/subscriptions";
 export { getAiWorkflowsViewModel } from "./aiWorkflows";
 export { getEvidenceViewModel } from "../../../activity/fixtures/evidence";
 export { SEEDED_TENANTS, tenantProfile } from "./tenants";

package/apps/storefront/src/lib/assets/shared/imageAttrs.ts

@@ -8,7 +8,7 @@
  *   - referenced Shopify CDN -> Shopify's native ?width= scheme
  *   - anything else usable   -> the URL as-is, no srcset
  */
-import { placeholderDataUri, isUsableImageUrl } from "../../placeholder.js";
+import { placeholderDataUri, isUsableImageUrl } from "../../content/shared/placeholder.js";
 
 const RESPONSIVE_IMAGE_WIDTHS = [320, 480, 640, 960, 1280, 1600] as const;
 

package/apps/storefront/src/lib/basePath.ts

@@ -34,7 +34,7 @@
  * covers that one, so the two cannot drift apart unnoticed.
  *
  * Consumers: {@link withBase} (and through it {@link bindBasePathAnchors}) and
- * `prefixTenantLinks` (lib/rawMarketingHtml.ts).
+ * `prefixTenantLinks` (lib/content/shared/rawMarketingHtml.ts).
  */
 export const ROOT_SERVED_HREF_NAMESPACES = [
   "_a",

package/apps/storefront/src/lib/{admin → catalog/admin}/catalogSettingsClient.ts

@@ -2,8 +2,8 @@
 import {
   applySaveAfterEdits, draftIsDirty, editorFromPayload, parseSettingsNumber, saveBody, selectDraftMethod,
   type SettingsEditorState, type SettingsPayload,
-} from "@/lib/admin/catalogSettingsState";
-import { latestPreview, type PreviewStatus } from "@/lib/admin/catalogSettingsPreview";
+} from "@/lib/catalog/admin/catalogSettingsState";
+import { latestPreview, type PreviewStatus } from "@/lib/catalog/admin/catalogSettingsPreview";
 
 interface MethodOption { id: string; title: string; reason: string }
 interface SettingsResponse extends SettingsPayload {

package/apps/storefront/src/lib/{admin → catalog/admin}/services/catalogProducts.ts

@@ -5,8 +5,8 @@
  */
 import type { CatalogProduct, TenantConfig } from "@tot/public-runtime";
 import { CatalogFileError } from "@tot/public-runtime/catalog-files";
-import { readGrandfatheredSnapshot } from "@/lib/tot/ToTClient";
-import { readTenantCatalogFiles, type CatalogArtifactSource } from "@/lib/tot/tenantCatalog";
+import { readGrandfatheredSnapshot } from "@/lib/catalog/tot/ToTClient";
+import { readTenantCatalogFiles, type CatalogArtifactSource } from "@/lib/catalog/tot/tenantCatalog";
 
 export type CatalogOrigin = "files" | "snapshot" | "none";
 

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

@@ -19,7 +19,7 @@ import {
   type ListProductsQuery,
   type ListProductsResponse,
 } from "@tot/public-runtime";
-import { PRICE_BUCKETS } from "../priceBuckets.js";
+import { PRICE_BUCKETS } from "../shared/priceBuckets.js";
 
 /** Minimal async query seam — implemented by D1 and by the node:sqlite test shim. */
 export interface Queryable {

package/apps/storefront/src/lib/{admin/services/mock → catalog/fixtures}/products.ts

@@ -1,5 +1,5 @@
-import type { AdminTenantEnvelope } from "../../envelope";
-import { MOCK_ANCHOR_ISO, offsetIso, pick, randomBool, randomInt, seededRandom } from "../../seed";
+import type { AdminTenantEnvelope } from "../../admin/envelope";
+import { MOCK_ANCHOR_ISO, offsetIso, pick, randomBool, randomInt, seededRandom } from "../../admin/seed";
 import type {
   ExciseCheckKey,
   ExciseReadinessCheck,
@@ -7,9 +7,9 @@ import type {
   ProductRow,
   ProductsViewModel,
   ProductVariant,
-} from "../../viewmodels/products";
-import { tenantProfile } from "./tenants";
-import { memoizeByEnvelope } from "../../memoizeByEnvelope";
+} from "../admin/viewmodels/products";
+import { tenantProfile } from "../../admin/services/mock/tenants";
+import { memoizeByEnvelope } from "../../admin/memoizeByEnvelope";
 
 // Must stay index-aligned with orders.ts's ITEM_POOLS: a product's id is
 // `prod-<tenant>-<position here>`, and orders.ts derives each order's productId

package/apps/storefront/src/lib/{search → catalog/search}/index.ts

@@ -3,7 +3,7 @@
  *
  * Used by FixtureToTClient.search (no D1 binding): typo-tolerant, relevance-ranked
  * search over the bundled catalog snapshot, zero infra. When a D1 binding is wired
- * (D1ToTClient), search instead goes through FTS5 — see lib/d1/catalog.ts.
+ * (D1ToTClient), search instead goes through FTS5 — see lib/catalog/d1/catalog.ts.
  * This module is the portable floor an extracted
  * merchant gets out of the box (docs/extraction-runbook.md).
  */

package/apps/storefront/src/lib/{featuredProductsPresentation.ts → catalog/shared/featuredProductsPresentation.ts}

@@ -1,4 +1,4 @@
-import type { FeaturedProductsBlock } from "@/lib/storyblok/content-model";
+import type { FeaturedProductsBlock } from "@/lib/content/storyblok/content-model";
 
 export function featuredProductsPresentationView(presentation: FeaturedProductsBlock["presentation"]) {
   return presentation === "carousel" ? "carousel" : "grid";

package/apps/storefront/src/lib/{priceBuckets.ts → catalog/shared/priceBuckets.ts}

@@ -3,7 +3,7 @@
  * product's "from" price (price_range.min — the same figure ProductCard shows
  * and price-asc/desc sorts by), so a product falls into exactly one bucket
  * (no double-counting across buckets). Shared by both listProducts engines
- * (lib/tot/query.ts, lib/d1/catalog.ts) and the FacetSidebar so bucket
+ * (lib/catalog/tot/query.ts, lib/catalog/d1/catalog.ts) and the FacetSidebar so bucket
  * boundaries + labels never drift between them.
  */
 export interface PriceBucket {

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

@@ -128,15 +128,15 @@ type FixtureBundle = {
 // tracked only for the tenants in scripts/tenant/catalog-in-repo-exceptions.json (plus
 // the e2e scopes). Vite resolves these globs at build time. reviews.json is optional.
 const productGlobs = import.meta.glob<CatalogProduct[]>(
-  "../../../../../packages/migration/out/catalog/*/products.json",
+  "../../../../../../packages/migration/out/catalog/*/products.json",
   { import: "default" },
 );
 const collectionGlobs = import.meta.glob<CatalogCollection[]>(
-  "../../../../../packages/migration/out/catalog/*/collections.json",
+  "../../../../../../packages/migration/out/catalog/*/collections.json",
   { import: "default" },
 );
 const reviewGlobs = import.meta.glob<Record<string, Review[]>>(
-  "../../../../../packages/migration/out/catalog/*/reviews.json",
+  "../../../../../../packages/migration/out/catalog/*/reviews.json",
   { import: "default" },
 );
 

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

@@ -10,7 +10,7 @@ import type {
   FacetValue,
   ListProductsQuery,
 } from "@tot/public-runtime";
-import { PRICE_BUCKETS, bucketForPrice } from "../priceBuckets.js";
+import { PRICE_BUCKETS, bucketForPrice } from "../shared/priceBuckets.js";
 
 /** Lowest variant price (the "from" price shown on cards). */
 export function fromPrice(p: CatalogProduct): number {