@tokenoftrust/storefront-runner 2.4.83 → 2.4.85

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

@@ -141,7 +141,7 @@
 .contact-form .attest input { width: auto; margin-top: 3px; }
 .contact-form .btn { align-self: flex-start; }
 
-/* --- Membership tier cards (mirrors components/membership/TierCards.astro) --
+/* --- Membership tier cards (mirrors components/membership/storefront/membership/TierCards.astro) --
    Illustrative figures carry an "e.g." affordance + data-illustrative hooks in the
    markup; this sheet is presentational only. */
 .tier-grid { display: grid; grid-template-columns: repeat(3, 1fr); gap: clamp(14px, 2vw, 24px); align-items: stretch; }
@@ -162,12 +162,12 @@
 .tier-feats li.is-no .glyph { color: var(--color-muted); }
 .tier-cta { margin-top: 24px; width: 100%; }
 
-/* --- Illustrative label (mirrors components/membership/IllustrativeLabel.astro) */
+/* --- Illustrative label (mirrors components/membership/storefront/membership/IllustrativeLabel.astro) */
 .illus-badge-wrap { margin-top: 14px; }
 .illus-badge { display: inline-flex; align-items: center; gap: 5px; border: 1px solid var(--color-info); color: var(--color-info); border-radius: var(--radius-full); padding: 2px 9px; font-size: .65rem; font-weight: 600; letter-spacing: .06em; text-transform: uppercase; }
 .illus-note { margin-top: 16px; text-align: center; font-size: .75rem; font-style: italic; color: var(--color-muted); }
 
-/* --- Tier comparison table (mirrors components/membership/TierComparisonTable.astro) */
+/* --- Tier comparison table (mirrors components/membership/storefront/membership/TierComparisonTable.astro) */
 .cmp-wrap { overflow-x: auto; border: 1px solid var(--color-border); border-radius: var(--radius-lg); }
 table.cmp { width: 100%; border-collapse: collapse; min-width: 640px; background: var(--color-surface); }
 table.cmp th, table.cmp td { padding: 13px 16px; border-bottom: 1px solid var(--color-border); font-size: .9rem; vertical-align: middle; }

package/apps/storefront/src/components/CollectionCard.astro

@@ -5,7 +5,7 @@
  * utilities only).
  */
 import type { CatalogCollection } from "@tot/public-runtime";
-import Img from "@/components/Img.astro";
+import Img from "@/components/assets/storefront/Img.astro";
 import { withBase } from "@/lib/basePath";
 import { pageUrlForm } from "@/lib/seo/urlForm";
 

package/apps/storefront/src/components/ProductCard.astro

@@ -10,7 +10,7 @@ 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 Img from "@/components/Img.astro";
+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";

package/apps/storefront/src/components/{Img.astro → assets/storefront/Img.astro}

@@ -14,7 +14,7 @@
  * the storefront is served by Cloudflare or CloudFront, so this component never
  * routes them through a provider-specific transformation path.
  */
-import { resolveImage } from "@/lib/imageAttrs";
+import { resolveImage } from "@/lib/assets/shared/imageAttrs";
 
 interface Props {
   src?: string;
@@ -48,7 +48,7 @@ const {
 } = Astro.props;
 
 // Render decision (placeholder / direct rehost / Shopify ?width=) lives in
-// lib/imageAttrs.ts so it's unit-testable without rendering this component.
+// lib/assets/shared/imageAttrs.ts so it's unit-testable without rendering this component.
 const { src: resolvedSrc, srcset } = resolveImage({ src, rehosted, width, height, seed, label });
 
 const loadingAttr = loading ?? (priority ? "eager" : "lazy");

package/apps/storefront/src/components/commerce/ArticleCard.astro

@@ -16,7 +16,7 @@
  * imported/source-copied blog data) and NEVER fabricates authors, dates, or
  * excerpts — omit a field and its row simply doesn't render.
  */
-import Img from "@/components/Img.astro";
+import Img from "@/components/assets/storefront/Img.astro";
 import { withBase } from "@/lib/basePath";
 
 export interface ArticleImage {

package/apps/storefront/src/components/commerce/BrandGrid.astro

@@ -14,7 +14,7 @@
  * through the rawMarketingHtml splice pipeline. Keep the two visually equivalent.
  */
 import Section from "@/components/Section.astro";
-import Img from "@/components/Img.astro";
+import Img from "@/components/assets/storefront/Img.astro";
 import { withBase } from "@/lib/basePath";
 
 export interface Brand {

package/apps/storefront/src/components/{islands → customers/storefront/islands}/SavedList.tsx

@@ -10,7 +10,7 @@ import {
   toggleSaved,
   WISHLIST_EVENT,
   type SavedItem,
-} from "@/lib/wishlist";
+} from "@/lib/customers/shared/wishlist";
 import { formatPrice } from "@/lib/format";
 import { placeholderDataUri, isUsableImageUrl } from "@/lib/placeholder";
 import { withClientBase } from "@/lib/basePath";

package/apps/storefront/src/components/home/Hero.astro

@@ -21,7 +21,7 @@
  */
 import type { HeroBlock } from "@/lib/storyblok/content-model";
 import type { CatalogProduct } from "@tot/public-runtime";
-import Img from "@/components/Img.astro";
+import Img from "@/components/assets/storefront/Img.astro";
 import { withBase } from "@/lib/basePath";
 import { pageUrlForm } from "@/lib/seo/urlForm";
 import { heroSlideshowView } from "@/lib/heroSlideshow";

package/apps/storefront/src/components/islands/ImageGallery.tsx

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

package/apps/storefront/src/components/membership/{TierCards.astro → storefront/membership/TierCards.astro}

@@ -20,7 +20,7 @@
  */
 import type { Tier } from "@/lib/membership/model";
 import { isIllustrative } from "@/lib/membership/model";
-import IllustrativeLabel from "@/components/membership/IllustrativeLabel.astro";
+import IllustrativeLabel from "@/components/membership/storefront/membership/IllustrativeLabel.astro";
 
 interface Props {
   tiers: Tier[];

package/apps/storefront/src/components/membership/{TierComparisonTable.astro → storefront/membership/TierComparisonTable.astro}

@@ -19,7 +19,7 @@
  */
 import type { Tier, ComparisonRow } from "@/lib/membership/model";
 import { isIllustrative } from "@/lib/membership/model";
-import IllustrativeLabel from "@/components/membership/IllustrativeLabel.astro";
+import IllustrativeLabel from "@/components/membership/storefront/membership/IllustrativeLabel.astro";
 
 interface Props {
   tiers: Tier[];

package/apps/storefront/src/components/subscription/SavingsExplainer.astro

@@ -18,7 +18,7 @@
  */
 import type { SubscriptionFigure } from "@/lib/subscription/model";
 import { isIllustrative } from "@/lib/subscription/model";
-import IllustrativeLabel from "@/components/membership/IllustrativeLabel.astro";
+import IllustrativeLabel from "@/components/membership/storefront/membership/IllustrativeLabel.astro";
 
 interface Props {
   figure: SubscriptionFigure;

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

@@ -500,7 +500,7 @@ const footerWidgets = await renderWidgetSlot(
         toggleSaved,
         isSaved,
         WISHLIST_EVENT,
-      } from "@/lib/wishlist";
+      } from "@/lib/customers/shared/wishlist";
 
       function syncCount() {
         const n = readWishlist().length;

package/apps/storefront/src/lib/{admin/services/mock → activity/fixtures}/evidence.ts

@@ -1,9 +1,9 @@
-import type { AdminTenantEnvelope } from "../../envelope";
-import { memoizeByEnvelope } from "../../memoizeByEnvelope";
-import type { EvidenceReference } from "../../evidence/evidenceReference";
-import { getCustomersViewModel } from "./customers";
-import { getOrdersViewModel } from "./orders";
-import { getProductsViewModel } from "./products";
+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";
 
 /**
  * Deterministic evidence graph, built by connecting the domains already

package/apps/storefront/src/lib/admin/README.md

@@ -81,8 +81,8 @@ lib/admin/
   testable source of truth for what the floating Ask button emits — the full
   tenant envelope, active tab, selected record id (if any), role +
   permissions (derived from `isStaff`), active filters, and evidence context.
-  `admin.astro`'s `is:inline` script mirrors this logic in plain JS (inline
-  scripts can't import modules) and emits it on Ask-button click as
+  The processed `adminShell.ts` client imports this builder and emits its
+  result on Ask-button click as
   `window.__toTAdminAsk` and a `tot:admin-ask` `CustomEvent` — **dev-inspectable
   only, no chat backend yet.** The envelope changes whenever the active tab
   changes (kept current by `setAskContext`) and is rebuilt fresh on click so a
@@ -117,6 +117,6 @@ const orders = getOrdersViewModel({
 - **Tabs/pages → lib, never lib → tabs/pages.** Nothing under `lib/admin/**`
   imports from `components/admin/**` or `pages/admin.astro`. Tab components
   and `admin.astro` are free to import from here (`admin.astro` already does,
-  for `resolveAdminTenantMode` and the Ask-envelope logic it mirrors inline).
+  for `resolveAdminTenantMode` and the shared shell configuration).
 - Gaps in these contracts should go back to the workstream board as a
   decision, not get patched from a tab's unit.

package/apps/storefront/src/lib/admin/adminShell.ts

@@ -4,7 +4,7 @@
  * the tablists. Imported from a processed `<script>` in admin.astro (ADR 0013):
  * type-checked, bundled, tree-shaken, and its bundle hash is in the enforced
  * CSP. The Ask envelope is built with the shared, unit-tested
- * `buildAskEnvelope` (ai/askEnvelope) instead of a hand-copied inline mirror.
+ * `buildAskEnvelope` (ai/askEnvelope).
  *
  * There is no chat backend yet — the Ask envelope is emitted for dev inspection
  * only (window.__toTAdminAsk + a "tot:admin-ask" CustomEvent), never sent over
@@ -12,33 +12,23 @@
  */
 import { buildAskEnvelope, type AskEnvelope } from "./ai/askEnvelope";
 
-const TAB_IDS = [
-  "orders",
-  "products",
-  "subscriptions",
-  "customers",
-  "fulfillment",
-  "reporting",
-  "ai-workflows",
-  "blog",
-  "publish",
-  "integrations",
-  "settings",
-] as const;
-
-const ASK_CONTEXTS: Record<string, string> = {
-  orders: "Orders",
-  products: "Products",
-  subscriptions: "Subscriptions",
-  customers: "Customers",
-  fulfillment: "Fulfillment",
-  reporting: "Reporting",
-  "ai-workflows": "AI Workflows",
-  blog: "Blog",
-  publish: "Publish",
-  integrations: "Integrations",
-  settings: "Settings",
-};
+/** Static shell data shared by server-rendered navigation and browser startup. */
+export const ADMIN_SHELL_CONFIG = {
+  workAreas: [
+    { id: "orders", label: "Orders", icon: "i-file" },
+    { id: "products", label: "Products", icon: "i-box" },
+    { id: "subscriptions", label: "Subscriptions", icon: "i-refresh" },
+    { id: "customers", label: "Customers", icon: "i-users" },
+    { id: "fulfillment", label: "Fulfillment", icon: "i-truck" },
+    { id: "reporting", label: "Reporting", icon: "i-chart" },
+    { id: "ai-workflows", label: "AI Workflows", icon: "i-workflows" },
+    { id: "blog", label: "Blog", icon: "i-file" },
+    { id: "publish", label: "Publish", icon: "i-export" },
+    { id: "integrations", label: "Integrations", icon: "i-workflows" },
+    { id: "settings", label: "Settings", icon: "i-gear" },
+  ],
+  defaultTabs: { staff: "orders", merchant: "settings" },
+} as const;
 
 declare global {
   interface Window {
@@ -47,11 +37,13 @@ declare global {
 }
 
 export function initAdminShell(): void {
-  const tabSet = new Set<string>(TAB_IDS);
-  const tabHashPattern = new RegExp(`^#(${TAB_IDS.join("|")})$`);
+  const tabIds = ADMIN_SHELL_CONFIG.workAreas.map(({ id }) => id);
+  const tabSet = new Set<string>(tabIds);
+  const tabHashPattern = new RegExp(`^#(${tabIds.join("|")})$`);
   const canViewInternalGuide =
     document.documentElement.dataset.internalAdminGuide === "true";
-  const defaultTab = canViewInternalGuide ? "orders" : "settings";
+  const defaultTab =
+    ADMIN_SHELL_CONFIG.defaultTabs[canViewInternalGuide ? "staff" : "merchant"];
 
   const buildAskEnvelopeForTab = (id: string): AskEnvelope => {
     const root = document.documentElement.dataset;
@@ -74,7 +66,9 @@ export function initAdminShell(): void {
   };
 
   const setAskContext = (id: string): void => {
-    const label = ASK_CONTEXTS[id] ?? "Storefront";
+    const label =
+      ADMIN_SHELL_CONFIG.workAreas.find((area) => area.id === id)?.label ??
+      "Storefront";
     const askButton = document.querySelector<HTMLElement>("[data-admin-ask]");
     const askContext = document.querySelector<HTMLElement>(
       "[data-admin-ask-context]",
@@ -196,7 +190,7 @@ export function initAdminShell(): void {
       // normalized away to #settings for merchant viewers.
       const hashTab = window.location.hash.slice(1).split("?")[0] ?? "";
       if (!canViewInternalGuide && !tabSet.has(hashTab)) {
-        history.replaceState(null, "", "#settings");
+        history.replaceState(null, "", `#${defaultTab}`);
       }
       if (scroll) requestAnimationFrame(() => scrollToHashTarget(panelId));
       return;
@@ -229,12 +223,6 @@ export function initAdminShell(): void {
     const envelope = buildAskEnvelopeForTab(activeTab);
     window.__toTAdminAsk = envelope;
     document.dispatchEvent(new CustomEvent("tot:admin-ask", { detail: envelope }));
-    if (
-      window.location.hostname === "localhost" ||
-      window.location.hostname === "127.0.0.1"
-    ) {
-      console.debug("[admin:ask]", envelope);
-    }
   });
 
   document.addEventListener("click", (event) => {

package/apps/storefront/src/lib/admin/ai/askEnvelope.ts

@@ -1,10 +1,9 @@
 /**
  * The floating `Ask` button's context envelope (baseline §Horizontal AI
  * Concepts / Ask; ai-evidence-substrate item a). PURE + no I/O so it is
- * unit-testable and reusable from both the inline admin.astro script (via a
- * plain-object mirror, since `is:inline` scripts cannot import modules) and
+ * unit-testable and reusable from the processed adminShell.ts client and
  * any future server-side Ask route. There is no chat backend yet — today
- * this is emitted for dev inspection only (see admin.astro's `data-admin-ask`
+ * this is emitted for dev inspection only (see adminShell.ts's `data-admin-ask`
  * click handler), never sent over the network.
  */
 import type { AdminTenantEnvelope } from "../envelope";

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

@@ -1,12 +1,12 @@
 export { getOrdersViewModel } from "./orders";
 export { getProductsViewModel } from "./products";
-export { getCustomersViewModel } from "./customers";
-export { getReportingViewModel } from "./reporting";
+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 { getAiWorkflowsViewModel } from "./aiWorkflows";
-export { getEvidenceViewModel } from "./evidence";
+export { getEvidenceViewModel } from "../../../activity/fixtures/evidence";
 export { SEEDED_TENANTS, tenantProfile } from "./tenants";
 export type { SeededTenantProfile, MockVertical } from "./tenants";

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

@@ -15,7 +15,7 @@ import {
   randomInt,
   seededRandom,
 } from "../../seed";
-import type { CustomerRow } from "../../viewmodels/customers";
+import type { CustomerRow } from "../../../customers/admin/viewmodels/customers";
 import type { ProductDetail, ProductRow } from "../../viewmodels/products";
 import type {
   SubscriptionAttentionRow,
@@ -28,7 +28,7 @@ import type {
   SubscriptionSubscriberRow,
   SubscriptionsViewModel,
 } from "../../viewmodels/subscriptions";
-import { getCustomersViewModel } from "./customers";
+import { getCustomersViewModel } from "../../../customers/fixtures/customers";
 import { getProductsViewModel } from "./products";
 
 export interface SubscriptionProductSource {

package/apps/storefront/src/lib/{imageAttrs.ts → 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 "../../placeholder.js";
 
 const RESPONSIVE_IMAGE_WIDTHS = [320, 480, 640, 960, 1280, 1600] as const;
 

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

@@ -1,6 +1,6 @@
-import type { AdminTenantEnvelope } from "../../envelope";
-import { memoizeByEnvelope } from "../../memoizeByEnvelope";
-import { MOCK_ANCHOR_ISO, offsetIso, pick, randomBool, randomInt, seededRandom } from "../../seed";
+import type { AdminTenantEnvelope } from "../../admin/envelope";
+import { memoizeByEnvelope } from "../../admin/memoizeByEnvelope";
+import { MOCK_ANCHOR_ISO, offsetIso, pick, randomBool, randomInt, seededRandom } from "../../admin/seed";
 import type {
   BlockedReason,
   CustomerBlockedQueueRow,
@@ -8,7 +8,7 @@ import type {
   CustomerRow,
   CustomersViewModel,
   VerificationState,
-} from "../../viewmodels/customers";
+} from "../admin/viewmodels/customers";
 
 // Must stay index-aligned with orders.ts's CUSTOMER_NAMES: a customer's id is
 // `cust-<tenant>-<position here>`, and orders.ts derives each order's customerId

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

@@ -1,7 +1,7 @@
-import type { AdminTenantEnvelope } from "../../envelope";
-import { memoizeByEnvelope } from "../../memoizeByEnvelope";
-import { pick, randomInt, seededRandom } from "../../seed";
-import type { AnalysisBriefItem, ReportingCategory, ReportingSummary, ReportingViewModel } from "../../viewmodels/reporting";
+import type { AdminTenantEnvelope } from "../../admin/envelope";
+import { memoizeByEnvelope } from "../../admin/memoizeByEnvelope";
+import { pick, randomInt, seededRandom } from "../../admin/seed";
+import type { AnalysisBriefItem, ReportingCategory, ReportingSummary, ReportingViewModel } from "../admin/viewmodels/reporting";
 
 const CATEGORY_DEFS: { category: ReportingCategory; label: string; drilldownHref: string }[] = [
   { category: "sales", label: "Sales", drilldownHref: "#orders" },

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

@@ -14,7 +14,7 @@ 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 Img from "@/components/Img.astro";
+import Img from "@/components/assets/storefront/Img.astro";
 import { parseQuery, buildQueryString } from "@/lib/url";
 import { breadcrumbLd, itemListLd } from "@/lib/jsonld";
 import { truncate } from "@/lib/format";

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

@@ -12,12 +12,12 @@ import Hero from "@/components/home/Hero.astro";
 import ProductCarousel from "@/components/commerce/ProductCarousel.astro";
 import ProductGrid from "@/components/commerce/ProductGrid.astro";
 import CollectionCard from "@/components/CollectionCard.astro";
-import Img from "@/components/Img.astro";
+import Img from "@/components/assets/storefront/Img.astro";
 import PromoTiles from "@/components/content/PromoTiles.astro";
 import TrustStrip from "@/components/content/TrustStrip.astro";
 import Faq from "@/components/marketing/Faq.astro";
 import MarketingBlocks from "@/components/marketing/MarketingBlocks.astro";
-import TierCards from "@/components/membership/TierCards.astro";
+import TierCards from "@/components/membership/storefront/membership/TierCards.astro";
 import { withBase } from "@/lib/basePath";
 import { rawHtmlPolicy, rawHtmlResponse } from "@/lib/rawMarketingHtml";
 import { renderRawComplianceTop, renderRawComplianceBottom } from "@/lib/compliance/rawComplianceNotices";

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

@@ -6,7 +6,7 @@
 import Layout from "@/layouts/Layout.astro";
 import Breadcrumbs from "@/components/Breadcrumbs.astro";
 import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs";
-import SavedList from "@/components/islands/SavedList.tsx";
+import SavedList from "@/components/customers/storefront/islands/SavedList.tsx";
 
 const { tenant } = Astro.locals;
 // Commerce-only route: marketing tenants have no saved-items surface.

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

@@ -55,8 +55,8 @@ import PurchaseLimitNotice from "@/components/compliance/PurchaseLimitNotice.ast
 import StateEligibilityNotice from "@/components/compliance/StateEligibilityNotice.astro";
 import ShippingRestrictionNotice from "@/components/compliance/ShippingRestrictionNotice.astro";
 import ExciseTaxNotice from "@/components/compliance/ExciseTaxNotice.astro";
-import TierCards from "@/components/membership/TierCards.astro";
-import TierComparisonTable from "@/components/membership/TierComparisonTable.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";
 import ProseToc from "@/components/content/ProseToc.astro";
 import Callout from "@/components/content/Callout.astro";
@@ -74,7 +74,7 @@ import SearchTypeahead from "@/components/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 SavedList from "@/components/islands/SavedList.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";

package/docs/widget-library-guide.md

@@ -607,7 +607,7 @@ Model types (`lib/membership/model.ts`):
   by index: boolean→check/dash, string→text, null→em dash).
 - `isIllustrative(tier: Pick<Tier, "real">): boolean` → `tier.real !== true`.
 
-### IllustrativeLabel (`components/membership/IllustrativeLabel.astro`)
+### IllustrativeLabel (`components/membership/storefront/membership/IllustrativeLabel.astro`)
 
 - **Purpose:** The first-class "these figures are examples, not an offer" affordance shared by
   `TierCards`, `TierComparisonTable`, and `SavingsExplainer`.
@@ -618,7 +618,7 @@ Model types (`lib/membership/model.ts`):
 - **Delivery:** platform component (no raw-chrome twin).
 - **Usage:** rendered internally by the tier/savings widgets; `<IllustrativeLabel as="badge" />`.
 
-### TierCards (`components/membership/TierCards.astro`)
+### TierCards (`components/membership/storefront/membership/TierCards.astro`)
 
 - **Purpose:** Membership/pricing tier comparison card row (e.g. Guest / Member / Autopilot). Shows
   tiers, headline figures, feature bullets; each CTA is a plain handoff link. When any shown tier is
@@ -637,7 +637,7 @@ Model types (`lib/membership/model.ts`):
   <TierCards eyebrow="Membership" heading="Choose how you shop" subhead="Compare guest checkout with our membership tiers." tiers={tiers} />
   ```
 
-### TierComparisonTable (`components/membership/TierComparisonTable.astro`)
+### TierComparisonTable (`components/membership/storefront/membership/TierComparisonTable.astro`)
 
 - **Purpose:** Feature matrix companion to `TierCards` — tiers across the top, features down the side,
   one cell per (feature × tier). Same illustrative-figure affordance. Horizontally scrollable.
@@ -1185,7 +1185,7 @@ Client-hydrated Preact `.tsx`. Every island is tenant-agnostic and reads only fi
   <RecentlyViewed client:idle current={rvItem} locale="en-US" />
   ```
 
-### SavedList (`components/islands/SavedList.tsx`)
+### SavedList (`components/customers/storefront/islands/SavedList.tsx`)
 
 - **Purpose:** Renders the wishlist from localStorage on the `/saved` page. Client-only; each item
   links to its PDP and can be removed inline; empty state invites browsing. Phase 2 swaps the store for
@@ -1301,7 +1301,7 @@ Shared primitives composed by the higher-level widgets, plus the homepage hero.
   <EmptyState title="No results" body="Try broadening your filters." ctaLabel="Browse all" ctaHref="/collections/all" />
   ```
 
-### Img (`components/Img.astro`)
+### Img (`components/assets/storefront/Img.astro`)
 
 - **Purpose:** CLS-free, theme-agnostic image with offline placeholder fallback — dead fixture URLs
   render a deterministic gradient SVG keyed by `seed`; real rehosted / Shopify `?width=` URLs get
@@ -1481,7 +1481,7 @@ single themed layer. **Contract-token-only** — reads only `--color-*` / `--fon
 
 **Cross-island `window` CustomEvents:** `variant:image` (VariantSelector → ImageGallery),
 `variant:change` (VariantSelector → any listener), `tot:wishlist-changed` / `WISHLIST_EVENT`
-(`lib/wishlist` → SavedList + header count), and delegated `[data-quickview]` buttons → QuickView.
+(`lib/customers/shared/wishlist` → SavedList + header count), and delegated `[data-quickview]` buttons → QuickView.
 
 **`localStorage` keys:** `"tot:age-affirmed"` (age gate), `"tot:recently-viewed"` (RecentlyViewed),
 `"tot:wishlist"` (SavedList/wishlist), `tot_announce_dismissed` (raw-chrome announce dismissal).

package/package.json

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