@tokenoftrust/storefront-runner 2.4.85 → 2.4.87

package/apps/storefront/src/pages/products/[handle].astro

@@ -9,17 +9,17 @@ import Layout from "@/layouts/Layout.astro";
 import Breadcrumbs from "@/components/Breadcrumbs.astro";
 import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs";
 import Badge from "@/components/Badge.astro";
-import ProductCard from "@/components/ProductCard.astro";
+import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
 import Section from "@/components/Section.astro";
-import ImageGallery from "@/components/islands/ImageGallery.tsx";
-import VariantSelector, { publicSelectorVariants } from "@/components/islands/VariantSelector.tsx";
-import CheckoutComplianceGate from "@/components/islands/CheckoutComplianceGate.tsx";
-import RecentlyViewed from "@/components/islands/RecentlyViewed.tsx";
-import NicotineWarning from "@/components/compliance/NicotineWarning.astro";
-import Prop65Warning from "@/components/compliance/Prop65Warning.astro";
-import ReviewSummary from "@/components/commerce/ReviewSummary.astro";
-import ReviewList from "@/components/commerce/ReviewList.astro";
-import { isOnSale, isNew, isAvailable, fromPrice } from "@/lib/tot/query";
+import ImageGallery from "@/components/catalog/storefront/islands/ImageGallery.tsx";
+import VariantSelector, { publicSelectorVariants } from "@/components/catalog/storefront/islands/VariantSelector.tsx";
+import CheckoutComplianceGate from "@/components/compliance/storefront/islands/CheckoutComplianceGate.tsx";
+import RecentlyViewed from "@/components/catalog/storefront/islands/RecentlyViewed.tsx";
+import NicotineWarning from "@/components/compliance/storefront/compliance/NicotineWarning.astro";
+import Prop65Warning from "@/components/compliance/storefront/compliance/Prop65Warning.astro";
+import ReviewSummary from "@/components/catalog/storefront/commerce/ReviewSummary.astro";
+import ReviewList from "@/components/catalog/storefront/commerce/ReviewList.astro";
+import { isOnSale, isNew, isAvailable, fromPrice } from "@/lib/catalog/tot/query";
 import {
   buildMemberSignedCartPayload,
   workerCartApiPath,
@@ -38,7 +38,7 @@ import type {
   MembershipStackingPolicy,
   PurchaseOptionPricingContext,
 } from "@tot/public-runtime";
-import { resolveCartSigning, shopperCheckoutUnavailableHtml } from "@/lib/checkoutCommerce";
+import { resolveCartSigning, shopperCheckoutUnavailableHtml } from "@/lib/checkout/shared/checkoutCommerce";
 import { isRegulatedTenant } from "@/lib/compliance/enforcement";
 import { resolveMemberContext } from "@/lib/membership/eligibility";
 import { truncate } from "@/lib/format";
@@ -49,9 +49,9 @@ import { productPageType, structuredDataProfile } from "@/lib/seo/structuredData
 import { pageUrlForm } from "@/lib/seo/urlForm";
 import { sourceSeoTitle } from "@/lib/seo/documentTitle";
 import { shippingPolicyPath } from "@/lib/commerce/shippingPolicy";
-import AppWidgetFrame from "@/components/apps/AppWidgetFrame.astro";
-import { getRegistryService } from "@/lib/apps/registryAccess.js";
-import { renderWidgetSlot } from "@/lib/apps/widgets/renderSlot.js";
+import AppWidgetFrame from "@/components/integrations/storefront/apps/AppWidgetFrame.astro";
+import { getRegistryService } from "@/lib/integrations/apps/registryAccess.js";
+import { renderWidgetSlot } from "@/lib/integrations/apps/widgets/renderSlot.js";
 
 const { handle } = Astro.params;
 const { tenant, tot, canonicalBase, basePath, apiBasePath, commerce } = Astro.locals;

package/apps/storefront/src/pages/search.astro

@@ -12,10 +12,10 @@
 import Layout from "@/layouts/Layout.astro";
 import Breadcrumbs from "@/components/Breadcrumbs.astro";
 import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs";
-import ProductCard from "@/components/ProductCard.astro";
+import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
 import EmptyState from "@/components/EmptyState.astro";
 import Section from "@/components/Section.astro";
-import { toTypeaheadDoc } from "@/lib/search";
+import { toTypeaheadDoc } from "@/lib/catalog/search/index";
 import { breadcrumbLd } from "@/lib/jsonld";
 import { withBase } from "@/lib/basePath";
 

package/apps/storefront/src/pages/sitemap.xml.ts

@@ -9,7 +9,7 @@
  * loc is prefix-correct without special-casing here.
  */
 import type { APIContext } from "astro";
-import { nonEmptyCollections } from "@/lib/tot/query.js";
+import { nonEmptyCollections } from "@/lib/catalog/tot/query.js";
 import { getBlogSettings, listBlogPosts } from "@/lib/blog/provider.js";
 import { authorSlug, categorySlug } from "@/lib/blog/collection.js";
 import { resolveBlogIndexCopy } from "@/lib/blog/pagination.js";

package/apps/storefront/src/pages/style-guide/[tenant]/[theme].astro

@@ -24,21 +24,21 @@ import { loadStyleGuideThemes, styleGuideCompositionSheets } from "@/lib/styleGu
 import { styleGuideHref } from "@/lib/styleGuidePaths";
 import { derivedTokenDeclarations } from "@/themes/derivedTokens";
 import "@/styles/global.css";
-import PriceDisplay from "@/components/commerce/PriceDisplay.astro";
-import RatingStars from "@/components/commerce/RatingStars.astro";
-import ReviewSummary from "@/components/commerce/ReviewSummary.astro";
-import ReviewList from "@/components/commerce/ReviewList.astro";
+import PriceDisplay from "@/components/catalog/storefront/commerce/PriceDisplay.astro";
+import RatingStars from "@/components/catalog/storefront/commerce/RatingStars.astro";
+import ReviewSummary from "@/components/catalog/storefront/commerce/ReviewSummary.astro";
+import ReviewList from "@/components/catalog/storefront/commerce/ReviewList.astro";
 import type { Review } from "@tot/public-runtime";
 import Badge from "@/components/Badge.astro";
-import ProductCard from "@/components/ProductCard.astro";
-import ProductCarousel from "@/components/commerce/ProductCarousel.astro";
-import ProductGrid from "@/components/commerce/ProductGrid.astro";
-import BrandGrid from "@/components/commerce/BrandGrid.astro";
-import type { Brand } from "@/components/commerce/BrandGrid.astro";
+import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
+import ProductCarousel from "@/components/catalog/storefront/commerce/ProductCarousel.astro";
+import ProductGrid from "@/components/catalog/storefront/commerce/ProductGrid.astro";
+import BrandGrid from "@/components/catalog/storefront/commerce/BrandGrid.astro";
+import type { Brand } from "@/components/catalog/storefront/commerce/BrandGrid.astro";
 import ArticleCard from "@/components/commerce/ArticleCard.astro";
 import type { Article } from "@/components/commerce/ArticleCard.astro";
-import TagFilterCloud from "@/components/commerce/TagFilterCloud.astro";
-import type { TagItem } from "@/components/commerce/TagFilterCloud.astro";
+import TagFilterCloud from "@/components/catalog/storefront/commerce/TagFilterCloud.astro";
+import type { TagItem } from "@/components/catalog/storefront/commerce/TagFilterCloud.astro";
 import AnnouncementBar from "@/components/chrome/AnnouncementBar.astro";
 import UtilityNav from "@/components/chrome/UtilityNav.astro";
 import SiteHeader from "@/components/chrome/SiteHeader.astro";
@@ -46,15 +46,15 @@ import MegaMenu from "@/components/chrome/MegaMenu.astro";
 import NavDropdown from "@/components/chrome/NavDropdown.astro";
 import SiteFooter from "@/components/chrome/SiteFooter.astro";
 import { CHROME_PLACEMENT } from "@/lib/chrome/trackingPlacements";
-import NicotineWarning from "@/components/compliance/NicotineWarning.astro";
+import NicotineWarning from "@/components/compliance/storefront/compliance/NicotineWarning.astro";
 import { NICOTINE_WARNING_PRESETS } from "../../../../../../packages/cli/src/declared-config.mjs";
-import PactActNotice from "@/components/compliance/PactActNotice.astro";
-import AdultSignatureNotice from "@/components/compliance/AdultSignatureNotice.astro";
-import Prop65Warning from "@/components/compliance/Prop65Warning.astro";
-import PurchaseLimitNotice from "@/components/compliance/PurchaseLimitNotice.astro";
-import StateEligibilityNotice from "@/components/compliance/StateEligibilityNotice.astro";
-import ShippingRestrictionNotice from "@/components/compliance/ShippingRestrictionNotice.astro";
-import ExciseTaxNotice from "@/components/compliance/ExciseTaxNotice.astro";
+import PactActNotice from "@/components/compliance/storefront/compliance/PactActNotice.astro";
+import AdultSignatureNotice from "@/components/compliance/storefront/compliance/AdultSignatureNotice.astro";
+import Prop65Warning from "@/components/compliance/storefront/compliance/Prop65Warning.astro";
+import PurchaseLimitNotice from "@/components/compliance/storefront/compliance/PurchaseLimitNotice.astro";
+import StateEligibilityNotice from "@/components/compliance/storefront/compliance/StateEligibilityNotice.astro";
+import ShippingRestrictionNotice from "@/components/compliance/storefront/compliance/ShippingRestrictionNotice.astro";
+import ExciseTaxNotice from "@/components/compliance/storefront/compliance/ExciseTaxNotice.astro";
 import TierCards from "@/components/membership/storefront/membership/TierCards.astro";
 import TierComparisonTable from "@/components/membership/storefront/membership/TierComparisonTable.astro";
 import ProseSections from "@/components/content/ProseSections.astro";
@@ -64,27 +64,27 @@ import NeedsReviewCallout from "@/components/content/NeedsReviewCallout.astro";
 import TrustStrip from "@/components/content/TrustStrip.astro";
 import type { ProseSection } from "@/lib/content/prose";
 import type { TrustStripItem } from "@/lib/content/trustStrip";
-import HowItWorksSteps from "@/components/subscription/HowItWorksSteps.astro";
-import SavingsExplainer from "@/components/subscription/SavingsExplainer.astro";
-import ManageSubscriptionEntry from "@/components/subscription/ManageSubscriptionEntry.astro";
-import AgeGate from "@/components/islands/AgeGate.tsx";
-import VariantSelector, { publicSelectorVariants } from "@/components/islands/VariantSelector.tsx";
-import QuickView from "@/components/islands/QuickView.tsx";
-import SearchTypeahead from "@/components/islands/SearchTypeahead.tsx";
+import HowItWorksSteps from "@/components/subscriptions/storefront/subscription/HowItWorksSteps.astro";
+import SavingsExplainer from "@/components/subscriptions/storefront/subscription/SavingsExplainer.astro";
+import ManageSubscriptionEntry from "@/components/subscriptions/storefront/subscription/ManageSubscriptionEntry.astro";
+import AgeGate from "@/components/compliance/storefront/islands/AgeGate.tsx";
+import VariantSelector, { publicSelectorVariants } from "@/components/catalog/storefront/islands/VariantSelector.tsx";
+import QuickView from "@/components/catalog/storefront/islands/QuickView.tsx";
+import SearchTypeahead from "@/components/catalog/storefront/islands/SearchTypeahead.tsx";
 import MobileNav from "@/components/islands/MobileNav.tsx";
-import RecentlyViewed from "@/components/islands/RecentlyViewed.tsx";
-import type { RVItem } from "@/components/islands/RecentlyViewed.tsx";
+import RecentlyViewed from "@/components/catalog/storefront/islands/RecentlyViewed.tsx";
+import type { RVItem } from "@/components/catalog/storefront/islands/RecentlyViewed.tsx";
 import SavedList from "@/components/customers/storefront/islands/SavedList.tsx";
-import FacetSidebar from "@/components/plp/FacetSidebar.astro";
-import ActiveFilters from "@/components/plp/ActiveFilters.astro";
-import SortSelect from "@/components/plp/SortSelect.astro";
-import Pagination from "@/components/plp/Pagination.astro";
+import FacetSidebar from "@/components/catalog/storefront/plp/FacetSidebar.astro";
+import ActiveFilters from "@/components/catalog/storefront/plp/ActiveFilters.astro";
+import SortSelect from "@/components/catalog/storefront/plp/SortSelect.astro";
+import Pagination from "@/components/catalog/storefront/plp/Pagination.astro";
 import Hero from "@/components/home/Hero.astro";
 import MarketingBlocks from "@/components/marketing/MarketingBlocks.astro";
-import { sampleProducts, sampleRatings } from "@/lib/fixtures/sampleProducts";
+import { sampleProducts, sampleRatings } from "@/lib/catalog/fixtures/sampleProducts";
 import type { ChromeNavItem } from "@/lib/chrome/model";
 import type { Tier, ComparisonRow } from "@/lib/membership/model";
-import type { SubscriptionStep, SubscriptionManageEntry } from "@/lib/subscription/model";
+import type { SubscriptionStep, SubscriptionManageEntry } from "@/lib/subscriptions/subscription/model";
 import type { Facet, ListProductsQuery } from "@tot/public-runtime";
 import type { HeroBlock, MarketingBlock } from "@/lib/storyblok/content-model";
 

package/docs/widget-library-guide.md

@@ -265,7 +265,7 @@ Product cards, merchandising rows, price/rating atoms, blog cards, and checkout
 class-only block in `public/shared/commerce-chrome.css` (`.article-card`, `.brand-grid`/`.brand-tile`,
 `.tag-cloud`/`.tag-chip`) — keep the two visually equal.
 
-### PriceDisplay (`components/commerce/PriceDisplay.astro`)
+### PriceDisplay (`components/catalog/storefront/commerce/PriceDisplay.astro`)
 
 - **Purpose:** Price atom — struck compare-at when on sale, "From $X" prefix for variant ranges,
   optional sale-percent badge. Accepts a `product` (derives everything) or raw primitives.
@@ -282,7 +282,7 @@ class-only block in `public/shared/commerce-chrome.css` (`.article-card`, `.bran
   <PriceDisplay amount={42} from currency="USD" />
   ```
 
-### RatingStars (`components/commerce/RatingStars.astro`)
+### RatingStars (`components/catalog/storefront/commerce/RatingStars.astro`)
 
 - **Purpose:** 0–5 star rating with fractional fill (single clipped overlay) + accessible label;
   optional numeric review count. Presentation only.
@@ -297,7 +297,7 @@ class-only block in `public/shared/commerce-chrome.css` (`.article-card`, `.bran
   <RatingStars rating={4.5} count={128} />
   ```
 
-### ProductCarousel (`components/commerce/ProductCarousel.astro`)
+### ProductCarousel (`components/catalog/storefront/commerce/ProductCarousel.astro`)
 
 - **Purpose:** Horizontal-scroll row of `<ProductCard>`s bound to a `SectionSource`, with optional
   CSS-only tabs (each tab its own source; radio + adjacent-sibling reveal, zero JS). Presets
@@ -319,7 +319,7 @@ class-only block in `public/shared/commerce-chrome.css` (`.article-card`, `.bran
   <ProductCarousel title="Featured" tabs={[{ label: "New", products: newest }, { label: "On Sale", products: onSale }]} />
   ```
 
-### ProductGrid (`components/commerce/ProductGrid.astro`)
+### ProductGrid (`components/catalog/storefront/commerce/ProductGrid.astro`)
 
 - **Purpose:** Non-scrolling paginated-look grid of `<ProductCard>`s bound to a `SectionSource`.
   Thin sibling of `ProductCarousel`; `columns` tunes density; hides itself when empty.
@@ -337,7 +337,7 @@ class-only block in `public/shared/commerce-chrome.css` (`.article-card`, `.bran
   <ProductGrid title="All Products" products={products} columns={3} />
   ```
 
-### BrandGrid (`components/commerce/BrandGrid.astro`)
+### BrandGrid (`components/catalog/storefront/commerce/BrandGrid.astro`)
 
 - **Purpose:** "Shop by Brands" logo wall — grid of tiles linking to brand collections; each tile is
   a rehosted logo image OR a text-wordmark fallback. Optional "View all brands" CTA.
@@ -373,7 +373,7 @@ class-only block in `public/shared/commerce-chrome.css` (`.article-card`, `.bran
   <ArticleCard article={article} />
   ```
 
-### TagFilterCloud (`components/commerce/TagFilterCloud.astro`)
+### TagFilterCloud (`components/catalog/storefront/commerce/TagFilterCloud.astro`)
 
 - **Purpose:** Cloud of tag/category chips for a blog/article index, each a plain link to its
   filtered view (URL-addressable, zero-JS). Active tag filled + `aria-current`; optional leading
@@ -391,7 +391,7 @@ class-only block in `public/shared/commerce-chrome.css` (`.article-card`, `.bran
   <TagFilterCloud title="Browse by topic" tags={tags} allHref="/blog" allActive={false} />
   ```
 
-### CheckoutLoader (`components/commerce/CheckoutLoader.astro`)
+### CheckoutLoader (`components/checkout/storefront/commerce/CheckoutLoader.astro`)
 
 - **Purpose:** Injects the managed checkout loader near end of `<body>` to enable the cart drawer +
   hosted checkout. Rendered only for commerce tenants; marketing tenants ship nothing.
@@ -404,7 +404,7 @@ class-only block in `public/shared/commerce-chrome.css` (`.article-card`, `.bran
   <CheckoutLoader />
   ```
 
-### CartDrawerStyles (`components/commerce/CartDrawerStyles.astro`)
+### CartDrawerStyles (`components/checkout/storefront/commerce/CartDrawerStyles.astro`)
 
 - **Purpose:** Emits a nonce'd `<style>` mapping the in-page cart drawer (`#fc` light DOM)
   selectors to the tenant's theme tokens so the cart is brand-matched. Baseline layer plus optional
@@ -432,7 +432,7 @@ types live in `packages/public-runtime/src/tenant.ts` (`ComplianceConfig`): `nic
 `pactAct`, `adultSignature` are `boolean`; `shippingRestriction` is `string`; `minAge` is `number`;
 `prop65`/`purchaseLimit`/`stateEligibility`/`exciseTax` are the config objects below.
 
-### ComplianceNotice (`components/compliance/ComplianceNotice.astro`)
+### ComplianceNotice (`components/compliance/storefront/compliance/ComplianceNotice.astro`)
 
 - **Purpose:** Shared presentational shell for the compliance widgets. Owns only the visual
   treatment; the fixed legal text is supplied by each sibling via `<slot />`. Adds no copy of its own.
@@ -448,7 +448,7 @@ types live in `packages/public-runtime/src/tenant.ts` (`ComplianceConfig`): `nic
   `.topbar-warning` (top FDA band), `.footer-warning` (footer band).
 - **Usage:** consumed by the siblings below (not used directly).
 
-### NicotineWarning (`components/compliance/NicotineWarning.astro`)
+### NicotineWarning (`components/compliance/storefront/compliance/NicotineWarning.astro`)
 
 - **Purpose:** FDA-mandated nicotine warning (21 CFR 1143.3). Wording fixed by law, verbatim.
   Self-contained (does not use `ComplianceNotice`).
@@ -464,7 +464,7 @@ types live in `packages/public-runtime/src/tenant.ts` (`ComplianceConfig`): `nic
   <NicotineWarning variant="block" />
   ```
 
-### PactActNotice (`components/compliance/PactActNotice.astro`)
+### PactActNotice (`components/compliance/storefront/compliance/PactActNotice.astro`)
 
 - **Purpose:** PACT Act compliance notice (ENDS/vapor). Federal-requirement wording fixed here; only
   on/off + age come from config.
@@ -481,7 +481,7 @@ types live in `packages/public-runtime/src/tenant.ts` (`ComplianceConfig`): `nic
   <PactActNotice enabled minAge={21} variant="footer" />
   ```
 
-### AdultSignatureNotice (`components/compliance/AdultSignatureNotice.astro`)
+### AdultSignatureNotice (`components/compliance/storefront/compliance/AdultSignatureNotice.astro`)
 
 - **Purpose:** Adult-signature-on-delivery notice. Fixed wording; age reflects `minAge`.
 - **Props:** `enabled?: boolean` (default `false`; from `tenant.compliance.adultSignature`); `minAge?:
@@ -496,7 +496,7 @@ types live in `packages/public-runtime/src/tenant.ts` (`ComplianceConfig`): `nic
   <AdultSignatureNotice enabled minAge={21} variant="inline" />
   ```
 
-### Prop65Warning (`components/compliance/Prop65Warning.astro`)
+### Prop65Warning (`components/compliance/storefront/compliance/Prop65Warning.astro`)
 
 - **Purpose:** California Prop 65 safe-harbor warning. Owns the mandated skeleton, the `⚠` symbol,
   and the official warnings URL. Only harm endpoint(s) + chemical name(s) come from config. Short
@@ -516,7 +516,7 @@ types live in `packages/public-runtime/src/tenant.ts` (`ComplianceConfig`): `nic
   <Prop65Warning config={{ harm: "reproductive", chemicals: ["nicotine"] }} variant="block" />
   ```
 
-### PurchaseLimitNotice (`components/compliance/PurchaseLimitNotice.astro`)
+### PurchaseLimitNotice (`components/compliance/storefront/compliance/PurchaseLimitNotice.astro`)
 
 - **Purpose:** Purchase-quantity-limit **display** (state/PACT order caps). Display surface only —
   enforcement stays product/commerce-owned.
@@ -532,7 +532,7 @@ types live in `packages/public-runtime/src/tenant.ts` (`ComplianceConfig`): `nic
   <PurchaseLimitNotice config={{ text: "2 units per order", reason: "per state law" }} variant="inline" />
   ```
 
-### StateEligibilityNotice (`components/compliance/StateEligibilityNotice.astro`)
+### StateEligibilityNotice (`components/compliance/storefront/compliance/StateEligibilityNotice.astro`)
 
 - **Purpose:** State/jurisdiction sale-eligibility **display**. Shows tenant-configured messaging;
   does **not** decide eligibility for a cart/address. Precedence: explicit `note` wins, else composes
@@ -550,7 +550,7 @@ types live in `packages/public-runtime/src/tenant.ts` (`ComplianceConfig`): `nic
   <StateEligibilityNotice config={{ restrictedStates: ["UT", "AR", "VT"] }} variant="block" />
   ```
 
-### ShippingRestrictionNotice (`components/compliance/ShippingRestrictionNotice.astro`)
+### ShippingRestrictionNotice (`components/compliance/storefront/compliance/ShippingRestrictionNotice.astro`)
 
 - **Purpose:** Shipping-restriction **display** (PACT no-ship states, adult signature, carrier
   limits). Renders the tenant's configured text; the ship/no-ship decision stays product-owned. This
@@ -567,7 +567,7 @@ types live in `packages/public-runtime/src/tenant.ts` (`ComplianceConfig`): `nic
   <ShippingRestrictionNotice text="Adult signature (21+) required on delivery. Not shipped via USPS." variant="footer" />
   ```
 
-### ExciseTaxNotice (`components/compliance/ExciseTaxNotice.astro`)
+### ExciseTaxNotice (`components/compliance/storefront/compliance/ExciseTaxNotice.astro`)
 
 - **Purpose:** Excise-tax **display** cue. Surfaces that excise taxes apply (+ optional
   per-jurisdiction breakdown); **never computes tax** — calculation is product/commerce-owned.
@@ -661,9 +661,9 @@ Model types (`lib/membership/model.ts`):
 Presentational + **education-only**: explain recurring/Autopilot ordering and hand off to the
 tenant's product-owned subscribe/manage flow; **no scheduling/billing/cancellation mechanics**. The
 savings figure is illustrative by default (same discipline as §5). Model in
-`lib/subscription/model.ts`. All emit `data-widget="…"`.
+`lib/subscriptions/subscription/model.ts`. All emit `data-widget="…"`.
 
-Model types (`lib/subscription/model.ts`):
+Model types (`lib/subscriptions/subscription/model.ts`):
 
 - `SubscriptionStep` — `{ title: string; description: string }`.
 - `SubscriptionFigure` — `{ value: string; caption?: string; real?: boolean }` (`value` is display
@@ -671,7 +671,7 @@ Model types (`lib/subscription/model.ts`):
 - `SubscriptionManageEntry` — `{ label: string; description?: string; href: string }` (handoff URL).
 - `isIllustrative(figure: Pick<SubscriptionFigure, "real">): boolean` → `figure.real !== true`.
 
-### HowItWorksSteps (`components/subscription/HowItWorksSteps.astro`)
+### HowItWorksSteps (`components/subscriptions/storefront/subscription/HowItWorksSteps.astro`)
 
 - **Purpose:** Autopilot/subscription "how it works" explainer (numbered steps). Ships no
   scheduling/billing mechanics.
@@ -687,7 +687,7 @@ Model types (`lib/subscription/model.ts`):
   <HowItWorksSteps eyebrow="Autopilot" heading="How Autopilot works" subhead="Set it up once — we handle the rest." steps={steps} />
   ```
 
-### SavingsExplainer (`components/subscription/SavingsExplainer.astro`)
+### SavingsExplainer (`components/subscriptions/storefront/subscription/SavingsExplainer.astro`)
 
 - **Purpose:** Autopilot/subscription savings headline (e.g. "Save 15% — vs. one-time purchase") +
   supporting bullets + plain handoff CTA. Figure illustrative by default → "e.g." affordance +
@@ -707,7 +707,7 @@ Model types (`lib/subscription/model.ts`):
   <SavingsExplainer eyebrow="Autopilot savings" heading="Save on every order" figure={{ value: "Save 15%", caption: "vs. one-time purchase" }} bullets={["Free shipping on every Autopilot order", "Pause or cancel anytime"]} cta={{ label: "How Autopilot works", href: "/autopilot" }} />
   ```
 
-### ManageSubscriptionEntry (`components/subscription/ManageSubscriptionEntry.astro`)
+### ManageSubscriptionEntry (`components/subscriptions/storefront/subscription/ManageSubscriptionEntry.astro`)
 
 - **Purpose:** Set of manage-subscription entry points (e.g. "Update delivery date", "Pause or
   cancel"), each a plain link into the tenant's product-owned manage flow. Renders no controls of its
@@ -946,7 +946,7 @@ form carrying the query, so filtering needs no JS and is back-button safe. All t
 ListProductsQuery` + `basePath: string` (from `@tot/public-runtime`) and share `@/lib/url`
 (`toggleFacet`, `buildQueryString`). None have a raw-chrome twin (PLP-body, not site chrome).
 
-### FacetSidebar (`components/plp/FacetSidebar.astro`)
+### FacetSidebar (`components/catalog/storefront/plp/FacetSidebar.astro`)
 
 - **Purpose:** Faceted filtering UI — each facet value is a real link toggling a querystring param;
   price range is a GET form preserving other params via hidden inputs. Facets ordered: options, then
@@ -963,7 +963,7 @@ ListProductsQuery` + `basePath: string` (from `@tot/public-runtime`) and share `
   <FacetSidebar facets={facets} query={query} basePath="/collections/bestsellers" />
   ```
 
-### ActiveFilters (`components/plp/ActiveFilters.astro`)
+### ActiveFilters (`components/catalog/storefront/plp/ActiveFilters.astro`)
 
 - **Purpose:** Removable filter chips above the grid; each chip is a link that drops exactly one
   filter, plus a "Clear all" link.
@@ -978,7 +978,7 @@ ListProductsQuery` + `basePath: string` (from `@tot/public-runtime`) and share `
   <ActiveFilters query={query} basePath="/collections/bestsellers" />
   ```
 
-### SortSelect (`components/plp/SortSelect.astro`)
+### SortSelect (`components/catalog/storefront/plp/SortSelect.astro`)
 
 - **Purpose:** Sort control — a plain GET `<form>` `<select>` that auto-submits on change (nonce'd
   `is:inline` script; `<noscript>` Apply fallback). Other query params ride along as hidden inputs.
@@ -993,7 +993,7 @@ ListProductsQuery` + `basePath: string` (from `@tot/public-runtime`) and share `
   <SortSelect query={query} basePath="/collections/bestsellers" />
   ```
 
-### Pagination (`components/plp/Pagination.astro`)
+### Pagination (`components/catalog/storefront/plp/Pagination.astro`)
 
 - **Purpose:** SEO-friendly numbered pagination (compact 5-page window with first/last + ellipses) +
   a "Load more" next-page link. All plain anchors carrying the full query — crawlable, back-button
@@ -1019,7 +1019,7 @@ Client-hydrated Preact `.tsx`. Every island is tenant-agnostic and reads only fi
 `/search` endpoint). Cross-island wiring uses `window` CustomEvents; `localStorage` keys in play:
 `"tot:age-affirmed"`, `"tot:recently-viewed"`, `"tot:wishlist"`.
 
-### AgeGate (`components/islands/AgeGate.tsx`)
+### AgeGate (`components/compliance/storefront/islands/AgeGate.tsx`)
 
 - **Purpose:** Soft `minAge`+ affirmation overlay, shown once per device for regulated tenants.
   Front-door affirmation only — real ToT identity/age verification is a later phase (the "Yes" path is
@@ -1039,7 +1039,7 @@ Client-hydrated Preact `.tsx`. Every island is tenant-agnostic and reads only fi
   <AgeGate client:load minAge={21} brand={tenant.brandName} />
   ```
 
-### IsolatedAgeGate (`components/islands/IsolatedAgeGate.tsx`)
+### IsolatedAgeGate (`components/compliance/storefront/islands/IsolatedAgeGate.tsx`)
 
 - **Purpose:** Tamper-resistant wrapper that mounts `<AgeGate>` inside a **closed shadow root** so no
   tenant CSS/JS can select, restyle, or hide it. A light-DOM host `<div data-tot-compliance>` is
@@ -1059,7 +1059,7 @@ Client-hydrated Preact `.tsx`. Every island is tenant-agnostic and reads only fi
   <IsolatedAgeGate client:load minAge={21} brand={tenant.brandName} />
   ```
 
-### VariantSelector (`components/islands/VariantSelector.tsx`)
+### VariantSelector (`components/catalog/storefront/islands/VariantSelector.tsx`)
 
 - **Purpose:** PDP variant picker (the centerpiece interaction) — one radiogroup per product option;
   resolves the matching variant, disables unbuyable combinations, updates a polite live region
@@ -1082,7 +1082,7 @@ Client-hydrated Preact `.tsx`. Every island is tenant-agnostic and reads only fi
   <VariantSelector client:load variants={product.variants} options={product.options} currency={product.price_range.currency} locale="en-US" />
   ```
 
-### ImageGallery (`components/islands/ImageGallery.tsx`)
+### ImageGallery (`components/catalog/storefront/islands/ImageGallery.tsx`)
 
 - **Purpose:** PDP image gallery — main image + thumbnail strip; thumbnails swap the main image, main
   image has click-to-toggle zoom (reduced-motion safe). First image is the LCP candidate until first
@@ -1102,7 +1102,7 @@ Client-hydrated Preact `.tsx`. Every island is tenant-agnostic and reads only fi
   <ImageGallery client:load images={product.images} title={product.title} productHandle={product.handle} />
   ```
 
-### QuickView (`components/islands/QuickView.tsx`)
+### QuickView (`components/catalog/storefront/islands/QuickView.tsx`)
 
 - **Purpose:** One global native `<dialog>` any product card opens via a `[data-quickview]` button
   (event-delegated, so cards stay zero-JS). Shows a peek — image, price, colors, short description —
@@ -1122,7 +1122,7 @@ Client-hydrated Preact `.tsx`. Every island is tenant-agnostic and reads only fi
   <QuickView client:idle locale="en-US" />
   ```
 
-### SearchTypeahead (`components/islands/SearchTypeahead.tsx`)
+### SearchTypeahead (`components/catalog/storefront/islands/SearchTypeahead.tsx`)
 
 - **Purpose:** Compact header search with debounced typeahead dropdown. Fetches `GET
   {action}?q=<q>&format=json` and renders up to 6 results as an ARIA combobox/listbox; submitting
@@ -1162,7 +1162,7 @@ Client-hydrated Preact `.tsx`. Every island is tenant-agnostic and reads only fi
   <MobileNav client:idle nav={nav} announcement="Free US shipping on orders over $100" />
   ```
 
-### RecentlyViewed (`components/islands/RecentlyViewed.tsx`)
+### RecentlyViewed (`components/catalog/storefront/islands/RecentlyViewed.tsx`)
 
 - **Purpose:** "Recently viewed" discovery rail. On a PDP it records the current product to
   localStorage and renders the rest as a quiet strip. Renders nothing until it has something to show
@@ -1238,7 +1238,7 @@ Shared primitives composed by the higher-level widgets, plus the homepage hero.
   <Breadcrumbs crumbs={[{ label: "Home", href: "/" }, { label: "Bestsellers", href: "/collections/bestsellers" }]} />
   ```
 
-### ProductCard (`components/ProductCard.astro`)
+### ProductCard (`components/catalog/storefront/ProductCard.astro`)
 
 - **Purpose:** PLP/grid card using the stretched-link pattern (title is the link; an `::after` overlay
   makes the whole card clickable so wishlist/quick-view controls sit above it). Image hover-zoom +
@@ -1259,7 +1259,7 @@ Shared primitives composed by the higher-level widgets, plus the homepage hero.
   <ProductCard product={p} rating={4.5} reviewCount={128} />
   ```
 
-### CollectionCard (`components/CollectionCard.astro`)
+### CollectionCard (`components/catalog/storefront/CollectionCard.astro`)
 
 - **Purpose:** Editorial collection tile with a dark gradient scrim so the overlaid title (+ optional
   piece count) reads on any image. `data-reveal` scroll-in.
@@ -1317,7 +1317,7 @@ Shared primitives composed by the higher-level widgets, plus the homepage hero.
   <Img src={image?.url} rehosted={image?.rehosted} seed={image?.id ?? handle} alt={title} width={800} height={1000} sizes="(min-width:1024px) 25vw, 100vw" priority />
   ```
 
-### WidgetFrame (`components/WidgetFrame.astro`)
+### WidgetFrame (`components/integrations/storefront/WidgetFrame.astro`)
 
 - **Purpose:** Renders a tenant-registered widget (`isolation: "sandbox"`) in a sandboxed iframe —
   `allow-scripts` without `allow-same-origin` puts it in an opaque origin (can't read page

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "2.4.85",
+  "version": "2.4.87",
   "license": "SEE LICENSE IN LICENSE",
   "description": "World-shareable storefront runner: multi-tenant renderer on Astro/Cloudflare. No control plane.",
   "packageManager": "pnpm@11.9.0",

package/packages/public-runtime/src/chrome.ts

@@ -206,7 +206,7 @@ export interface ChromeAnnouncement {
  * 21+ age-gate interstitial config (regulated tenants). The raw-chrome renderer
  * (rawChrome.ts) embeds this as JSON; the shared behavior JS mounts the gate inside
  * a closed shadow root — the same tamper-resistance pattern
- * components/islands/IsolatedAgeGate.tsx uses for component pages — so tenant
+ * components/compliance/storefront/islands/IsolatedAgeGate.tsx uses for component pages — so tenant
  * CSS/JS can't reach the dialog.
  */
 export const CHROME_AGE_GATE_VARIANTS = ["default", "compact-modal"] as const;

package/packages/public-runtime/src/customization-scripts.ts

@@ -1,7 +1,7 @@
 /**
  * Tenant browser-script vocabulary the renderer needs: the slot / strategy /
  * isolation constants, the CSP hash helper, and the sandboxed widget iframe
- * attributes the renderer draws (`components/WidgetFrame.astro`).
+ * attributes the renderer draws (`components/integrations/storefront/WidgetFrame.astro`).
  *
  * Dependency-free + Workers-portable (Web Crypto, btoa).
  */