npm - @tokenoftrust/storefront-runner - Versions diffs - 1.3.2 → 1.3.4-rc.2 - Mend

@tokenoftrust/storefront-runner 1.3.2 → 1.3.4-rc.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (79) hide show

package/apps/storefront/src/components/commerce/{FoxySidecartStyles.astro → CartDrawerStyles.astro} RENAMED Viewed

@@ -1,28 +1,27 @@
 ---
 /**
- * <FoxySidecartStyles> — brands Foxy's v2.0 sidecart to the tenant's theme.
+ * <CartDrawerStyles> — brands the in-page cart drawer to the tenant's theme.
  *
- * Foxy's loader.js injects the sidecart into OUR page DOM (root `#fc`, light DOM
+ * The managed checkout loader injects the cart into OUR page DOM (root `#fc`, light DOM
  * — no iframe, no shadow root), so it inherits the theme's CSS custom properties
  * (`--color-primary`, `--font-*`, …) and can be restyled with plain CSS. We emit
- * a small nonce'd <style> that maps the sidecart's own selectors to those tokens,
+ * a small nonce'd <style> that maps the cart drawer's own selectors to those tokens,
  * so a merchant's cart matches their brand out of the box.
  *
- * Two layers: this brand BASELINE, then the tenant's optional `sidecartCss`
- * override (commerce.foxy.sidecartCss) appended verbatim for bespoke tweaks.
+ * Two layers: this brand BASELINE, then the tenant's optional `cartDrawerCss`
+ * override (commerce.checkout.cartDrawerCss) appended verbatim for bespoke tweaks.
  *
- * `!important` is deliberate: Foxy's own responsive_styles.css loads from its CDN
- * AFTER this <head> <style>, so equal-specificity rules would lose the cascade.
- * Everything is scoped under `#fc` so nothing leaks to the storefront itself.
+ * `!important` is deliberate: the checkout loader's responsive stylesheet loads
+ * after this <head> <style>, so equal-specificity rules would lose the cascade.
+ * Everything is scoped under `#fc` so nothing leaks into the storefront itself.
  *
  * Rendered only for commerce tenants with a store (Astro.locals.commerce); the
- * hosted checkout PAGE is a separate origin and is themed in the Foxy admin — out
- * of scope here.
+ * hosted checkout page is a separate origin and is themed through checkout settings.
  */
 const { commerce, cspNonce } = Astro.locals;
-// Selectors verified against the live tot-preview sidecart DOM:
-//   #fc                             — sidecart root (in-page)
+// Selectors verified against the live tot-preview cart DOM:
+//   #fc                             — cart root (in-page)
 //   #fc-cart.fc-container           — cart body
 //   .fc-action--checkout--button    — the primary "Proceed to Checkout" CTA
 //   a.fc-btn-action.fc-sidecart-button — the fixed Keep-Shopping/Checkout nav
@@ -54,8 +53,8 @@ const baseline = `
 }
 `.trim();
-const css = commerce?.sidecartCss
-  ? `${baseline}\n\n/* --- tenant override --- */\n${commerce.sidecartCss}`
+const css = commerce?.cartDrawerCss
+  ? `${baseline}\n\n/* --- tenant override --- */\n${commerce.cartDrawerCss}`
   : baseline;
 ---
 {commerce && <style set:html={css} nonce={cspNonce}></style>}

package/apps/storefront/src/components/commerce/CheckoutLoader.astro ADDED Viewed

@@ -0,0 +1,21 @@
+---
+/**
+ * <CheckoutLoader> — injects the managed checkout loader (Track A).
+ *
+ * The loader turns our add-to-cart forms/links into the cart drawer + hosted
+ * checkout. It's loaded from the store's CDN path and must sit near the end of
+ * <body>. Rendered only when the tenant has a store (locals.commerce);
+ * marketing tenants ship nothing.
+ *
+ * Note: the loader is a mutable, versioned CDN artifact and does NOT support
+ * Subresource Integrity. It's constrained instead by the per-tenant CSP
+ * allowlist set in middleware. It is loaded as a plain cross-origin script
+ * (NO `crossorigin` attribute) because the CDN serves it without CORS headers.
+ */
+const { commerce } = Astro.locals;
+---
+{
+  commerce && (
+    <script src={commerce.loaderSrc} async defer></script>
+  )
+}

package/apps/storefront/src/components/islands/VariantSelector.tsx CHANGED Viewed

@@ -11,13 +11,19 @@
  *   - `variant:image`  { imageId }  → <ImageGallery> swaps the main image
  *   - `variant:change` { variantId, available }
  *
- * Buy button is an intentionally-disabled placeholder (Phase 1 has no cart).
+ * Buy button renders when checkout is wired; otherwise it degrades to a
+ * disabled placeholder.
  *
  * A11y: role=radiogroup/radio with aria-checked, disabled values get
  * aria-disabled, live region is aria-live="polite".
  */
 import { useCallback, useEffect, useMemo, useState } from "preact/hooks";
-import type { CatalogVariant, VariantCartPayload } from "@tot/public-runtime";
+import type {
+  CatalogVariant,
+  ProductPurchaseOption,
+  VariantCartPayload,
+} from "@tot/public-runtime";
+import { purchaseOptionPrice } from "@tot/public-runtime";
 import { formatPrice } from "@/lib/format";
 interface OptionDef {
@@ -32,14 +38,15 @@ interface Props {
   currency: string;
   locale?: string;
   /**
-   * FoxyCart add-to-cart (Track A). Server pre-builds a signed cart payload per
-   * variant; the island renders the selected variant's payload as a real Foxy
-   * form (loader.js turns it into the sidecart). Undefined → no cart (marketing
-   * tenant, or signed mode missing secret) → the button stays a placeholder.
+   * Managed add-to-cart (Track A). Server pre-builds a signed cart payload per
+   * variant; the island renders the selected variant's payload as a real checkout
+   * form. Undefined → no cart (marketing tenant, or signed mode missing secret)
+   * → the button stays a placeholder.
    */
-  foxyCart?: {
+  checkoutCart?: {
     action: string;
-    byVariantId: Record<string, VariantCartPayload>;
+    purchaseOptions: ProductPurchaseOption[];
+    byVariantId: Record<string, Record<string, VariantCartPayload>>;
   };
 }
@@ -63,7 +70,7 @@ export default function VariantSelector({
   options,
   currency,
   locale,
-  foxyCart,
+  checkoutCart,
 }: Props) {
   const sortedOptions = useMemo(
     () => [...options].sort((a, b) => a.position - b.position),
@@ -86,12 +93,25 @@ export default function VariantSelector({
   const [selection, setSelection] = useState<Selection>(defaultSelection);
   const [quantity, setQuantity] = useState(1);
+  const [purchaseOptionId, setPurchaseOptionId] = useState<string | undefined>(
+    () => checkoutCart?.purchaseOptions[0]?.id,
+  );
   const selected = useMemo(
     () => findVariant(variants, selection),
     [variants, selection],
   );
+  const purchaseOptions = checkoutCart?.purchaseOptions ?? [];
+  const selectedPurchaseOption =
+    purchaseOptions.find((o) => o.id === purchaseOptionId) ??
+    purchaseOptions[0];
+  useEffect(() => {
+    if (!purchaseOptions.length) return;
+    if (!selectedPurchaseOption) setPurchaseOptionId(purchaseOptions[0]?.id);
+  }, [purchaseOptions, selectedPurchaseOption]);
   const complete = useMemo(
     () => sortedOptions.every((o) => selection[o.name] !== undefined),
     [sortedOptions, selection],
@@ -181,22 +201,38 @@ export default function VariantSelector({
     }
   }
+  const selectedPrice = selected
+    ? purchaseOptionPrice(selected.price, selectedPurchaseOption)
+    : undefined;
   const compareAt = selected?.compare_at_price;
+  const purchaseOptionCompareAt =
+    selectedPrice !== undefined && selected && selectedPrice < selected.price
+      ? selected.price
+      : undefined;
+  const displayCompareAt =
+    compareAt !== undefined && selectedPrice !== undefined && compareAt > selectedPrice
+      ? compareAt
+      : purchaseOptionCompareAt;
   const showCompare =
     selected !== undefined &&
-    compareAt !== undefined &&
-    compareAt > selected.price;
+    selectedPrice !== undefined &&
+    displayCompareAt !== undefined &&
+    displayCompareAt > selectedPrice;
-  // FoxyCart payload for the resolved variant (server pre-signed). Buyable only
+  // Cart payload for the resolved variant (server pre-signed). Buyable only
   // when the selection is complete, in stock, AND a cart is wired.
   const cartPayload =
-    foxyCart && selected ? foxyCart.byVariantId[selected.id] : undefined;
+    checkoutCart && selected && selectedPurchaseOption
+      ? checkoutCart.byVariantId[selected.id]?.[selectedPurchaseOption.id]
+      : undefined;
   const canBuy = complete && available && !!cartPayload;
   const buyLabel = !complete
     ? "Select options"
     : !available
       ? "Sold out"
-      : "Add to cart";
+      : selectedPurchaseOption?.kind === "subscription"
+        ? "Subscribe"
+        : "Add to cart";
   return (
     <div class="flex flex-col gap-6">
@@ -206,11 +242,11 @@ export default function VariantSelector({
           <>
             <div class="flex items-baseline gap-3">
               <span class={`font-display text-[1.75rem] font-semibold tabular-nums leading-none ${showCompare ? "text-sale" : "text-text"}`}>
-                {formatPrice(selected.price, currency, locale)}
+                {formatPrice(selectedPrice ?? selected.price, currency, locale)}
               </span>
               {showCompare && (
                 <span class="font-body text-base text-muted line-through tabular-nums">
-                  {formatPrice(compareAt!, currency, locale)}
+                  {formatPrice(displayCompareAt!, currency, locale)}
                 </span>
               )}
             </div>
@@ -283,6 +319,51 @@ export default function VariantSelector({
         );
       })}
+      {/* Purchase options */}
+      {purchaseOptions.length > 1 && (
+        <fieldset class="flex flex-col gap-2">
+          <legend class="font-mono text-xs uppercase tracking-[0.12em] text-muted">
+            Purchase option
+          </legend>
+          <div role="radiogroup" aria-label="Purchase option" class="grid gap-2">
+            {purchaseOptions.map((option) => {
+              const checked = selectedPurchaseOption?.id === option.id;
+              return (
+                <button
+                  key={option.id}
+                  type="button"
+                  role="radio"
+                  aria-checked={checked}
+                  onClick={() => setPurchaseOptionId(option.id)}
+                  class={[
+                    "grid min-h-[4.25rem] w-full gap-1 rounded-md border px-4 py-3 text-left transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary",
+                    checked
+                      ? "border-primary bg-[color-mix(in_srgb,var(--color-primary)_10%,var(--color-surface))]"
+                      : "border-border bg-surface hover:border-primary",
+                  ].join(" ")}
+                >
+                  <span class="flex flex-wrap items-baseline justify-between gap-2">
+                    <span class="font-display text-sm font-semibold text-text">
+                      {option.label}
+                    </span>
+                    {"savingsLabel" in option && option.savingsLabel && (
+                      <span class="rounded-full bg-accent px-2 py-0.5 font-mono text-[0.68rem] uppercase tracking-[0.08em] text-primary-contrast">
+                        {option.savingsLabel}
+                      </span>
+                    )}
+                  </span>
+                  {option.description && (
+                    <span class="text-xs leading-relaxed text-muted">
+                      {option.description}
+                    </span>
+                  )}
+                </button>
+              );
+            })}
+          </div>
+        </fieldset>
+      )}
       {/* Quantity stepper (UI only) */}
       <div class="flex flex-col gap-2">
         <span
@@ -323,15 +404,15 @@ export default function VariantSelector({
         </div>
       </div>
-      {/* Add to cart. With a wired FoxyCart store this is a real Foxy form —
-          loader.js turns the submit into the sidecart + hosted checkout. The
+      {/* Add to cart. With a wired checkout store this is a real checkout form —
+          loader.js turns the submit into the cart drawer + hosted checkout. The
           product fields are server-pre-signed (tamper-proof); the quantity
           rides along as the selected stepper value. Without a store (marketing
           tenant / signed mode missing secret) it degrades to a disabled
           placeholder. */}
-      {foxyCart ? (
+      {checkoutCart ? (
         <div class="flex flex-col gap-1.5">
-          <form action={foxyCart.action} method="post" target="_top">
+          <form action={checkoutCart.action} method="post" target="_top">
             {canBuy &&
               cartPayload!.hidden.map((f) => (
                 <input key={f.name} type="hidden" name={f.name} value={f.value} />

package/apps/storefront/src/config/adminTargetTenant.ts CHANGED Viewed

@@ -5,8 +5,8 @@
  * The admin console can operate on a target tenant that differs from the routed
  * (adminApp) tenant on `Astro.locals.tenant` — a real ToT-staff session may point
  * `targetTenant` at another tenant it has access to (see lib/adminTenantEnvelope).
- * Panels that need the target's real config (e.g. the FoxyCart cart-appearance
- * panel, which derives from `theme_tokens` + `commerce.foxy`) resolve it HERE,
+ * Panels that need the target's real config (e.g. the checkout appearance
+ * panel, which derives from `theme_tokens` + `commerce.checkout`) resolve it HERE,
  * in the config layer, rather than reaching into the static tenant map — so they
  * stay behind the `tenancy-resolver-fence` (.dependency-cruiser.cjs) and a
  * single-tenant extraction stays a drop-in (the concrete resolver is swapped, not

package/apps/storefront/src/config/devTenantSeed.ts CHANGED Viewed

@@ -24,55 +24,104 @@
  */
 import type { DeepPartial, TenantConfig, ThemeTokens } from "@tot/public-runtime";
+/** Per-dir overrides the resolver derives from disk before synthesis. */
+export interface DevTenantHints {
+  /**
+   * (E3) The resolvable appDomain for a SLUG tenant whose dir name isn't its
+   * domain. Read from the checkout's `.tot/config.json` `scope` when that scope
+   * looks like a hostname (has a dot) — mirrors scripts/tot-dev.mjs resolveDomain.
+   * Undefined ⇒ the colocation convention (dir == appDomain == scope).
+   */
+  appDomain?: string;
+  /**
+   * (E2) True when catalog fixtures for this tenant's data scope are committed on
+   * disk (the same `packages/migration/out/catalog/<scope>/` the FixtureToTClient
+   * reads). When true we serve a real COMMERCE tenant so /collections + /products
+   * render from them; when false we degrade to a marketing home (no catalog).
+   */
+  hasCatalog?: boolean;
+}
 /**
- * A minimal servable TenantConfig whose identity is its colocated dir name.
- * No Storyblok space (a "PLACEHOLDER" token → LocalContentProvider serves the
- * checkout's content/), no catalog/compliance (siteType "marketing" degrades
- * commerce to empty). Theme tokens come from the checkout's theme.json.
+ * A servable TenantConfig for a local dev-loop checkout. Identity defaults to the
+ * colocated dir name (dir == id == appDomain == tot_data_scope); a slug tenant can
+ * override the resolvable appDomain via `hints.appDomain` (E3). No Storyblok space
+ * (a "PLACEHOLDER" token → LocalContentProvider serves the checkout's content/).
+ * Commerce is data-driven (E2): with catalog fixtures on disk the tenant is
+ * COMMERCE (catalog on); without them it degrades to a marketing home (siteType
+ * "marketing" → no catalog required, so the root renders instead of 404ing).
+ * Theme tokens come from the checkout's theme.json.
  */
 export function synthesizeDevTenant(
   id: string,
   themeTokens: DeepPartial<ThemeTokens>,
+  hints: DevTenantHints = {},
 ): TenantConfig {
-  return {
+  // (E3) Prefer the .tot/config.json scope for a slug tenant; else colocation.
+  const appDomain = hints.appDomain ?? id;
+  const base: TenantConfig = {
     tenant_id: id,
-    appDomain: id,
-    domains: [id],
-    canonicalDomain: id,
+    appDomain,
+    domains: [appDomain],
+    canonicalDomain: appDomain,
     displayName: id,
-    // Contains "PLACEHOLDER" → createContentProvider picks LocalContentProvider,
-    // which serves the checkout's content/home.html (globbed by dir == this id).
+    // Contains "PLACEHOLDER" → LocalContentProvider serves the checkout's
+    // content/home.html (globbed by dir == this id).
     storyblok_space_token: "STORYBLOK_DEV_TENANT_TOKEN_PLACEHOLDER",
-    tot_data_scope: id,
+    tot_data_scope: appDomain,
     currency: "USD",
     locale: "en-US",
     theme_tokens: themeTokens,
-    // No bundled catalog for an arbitrary dev tenant → serve the raw marketing
-    // home and degrade commerce to empty rather than 404 the tenant root.
-    siteType: "marketing",
   };
+  if (hints.hasCatalog) {
+    // (E2) Catalog fixtures on disk → a real commerce tenant (siteType omitted ==
+    // commerce → catalog on). Cart wires to the shared ToT demo checkout store
+    // (test mode, no secret), the same as the bundled demo tenants — so
+    // /collections + /products resolve and add-to-cart works on localhost.
+    return {
+      ...base,
+      commerce: { checkout: { storeSubDomain: "tot-preview", mode: "unsigned-demo" } },
+    };
+  }
+  // No catalog on disk → serve the raw marketing home and degrade commerce to
+  // empty rather than 404 the tenant root.
+  return { ...base, siteType: "marketing" };
+}
+/** Per-dir disk facts the resolver supplies so synthesis can go beyond colocation. */
+export interface DevTenantSeedOptions {
+  /** (E3) Resolved appDomain for a slug tenant (from `.tot/config.json` scope). */
+  scopeFor?: (id: string) => string | undefined;
+  /** (E2) Whether catalog fixtures are committed on disk for a given data scope. */
+  hasCatalog?: (scope: string) => boolean;
 }
 /**
  * The dev tenants to seed ALONGSIDE staticTenants: one synthesized config per
  * local tenant dir that isn't already a static tenant (those keep their richer
- * hardcoded config). `themeFor` supplies each dir's theme tokens.
+ * hardcoded config). `themeFor` supplies each dir's theme tokens; `opts` carries
+ * the per-dir disk facts (E2 catalog presence, E3 slug scope) the resolver reads.
  *
  * @param localDirIds dir names discovered under `tenants/*` (dir == tenant id)
  * @param staticIds   tenant_ids already in the static registry (skipped)
  * @param themeFor    theme-token lookup by dir/tenant id
+ * @param opts        optional per-dir hints (scopeFor, hasCatalog)
  */
 export function devTenantsToSeed(
   localDirIds: Iterable<string>,
   staticIds: ReadonlySet<string>,
   themeFor: (id: string) => DeepPartial<ThemeTokens>,
+  opts: DevTenantSeedOptions = {},
 ): TenantConfig[] {
   const out: TenantConfig[] = [];
   const seen = new Set<string>();
   for (const id of localDirIds) {
     if (!id || staticIds.has(id) || seen.has(id)) continue;
     seen.add(id);
-    out.push(synthesizeDevTenant(id, themeFor(id)));
+    const appDomain = opts.scopeFor?.(id);
+    const scope = appDomain ?? id;
+    const hasCatalog = opts.hasCatalog?.(scope) ?? false;
+    out.push(synthesizeDevTenant(id, themeFor(id), { appDomain, hasCatalog }));
   }
   return out;
 }

package/apps/storefront/src/config/resolver.ts CHANGED Viewed

@@ -55,6 +55,48 @@ function localTenantDirIds(): string[] {
   return [...ids];
 }
+// (E2) Catalog fixtures committed on disk, keyed by data scope (== out/catalog dir
+// name). A dev tenant whose scope has fixtures is served as a real COMMERCE tenant
+// (see devTenantSeed); one without them degrades to a marketing home. Keys only —
+// the same fixtures the FixtureToTClient reads. Repo root is four up from config/.
+const catalogFixtureFiles = import.meta.glob(
+  "../../../../packages/migration/out/catalog/*/products.json",
+);
+/** Data scopes (== out/catalog dir names) that have committed catalog fixtures. */
+function catalogScopes(): Set<string> {
+  const scopes = new Set<string>();
+  for (const key of Object.keys(catalogFixtureFiles)) {
+    const scope = /\/out\/catalog\/([^/]+)\//.exec(key)?.[1];
+    if (scope) scopes.add(scope);
+  }
+  return scopes;
+}
+// (E3) A slug tenant (dir name != its domain) declares its resolvable appDomain in
+// the checkout's `.tot/config.json` `scope`. Read eagerly (tiny JSON) so synthesis
+// can resolve it at `/<domain>/`; trusted only when it looks like a hostname (has a
+// dot), mirroring scripts/tot-dev.mjs resolveDomain. Only the DEV fallback consults
+// it. The explicit `.tot` literal in the pattern matches the dotdir; if the glob
+// sees nothing, synthesis simply falls back to the colocation convention.
+const tenantMarkerFiles = import.meta.glob<{ scope?: string }>(
+  "../../../../tenants/*/.tot/config.json",
+  { eager: true, import: "default" },
+);
+/** dir id → resolved appDomain from `.tot/config.json` scope (hostname only). */
+function slugScopes(): Map<string, string> {
+  const map = new Map<string, string>();
+  for (const [key, cfg] of Object.entries(tenantMarkerFiles)) {
+    const id = /\/tenants\/([^/]+)\//.exec(key)?.[1];
+    const scope = cfg?.scope;
+    // A hostname scope that DIFFERS from the dir is the slug override; a scope
+    // equal to the dir (the colocation norm) needs no override.
+    if (id && scope && scope.includes(".") && scope !== id) map.set(id, scope);
+  }
+  return map;
+}
 /**
  * The fallback resolver consulted on a KV miss. In PROD it's the plain static
  * registry. In DEV it's the static registry EXTENDED with a synthesized,
@@ -68,7 +110,12 @@ function localTenantDirIds(): string[] {
 function devFallbackResolver(): TenantResolver {
   if (!import.meta.env.DEV) return staticResolver;
   const staticIds = new Set(staticTenants.map((t) => t.tenant_id));
-  const dev = devTenantsToSeed(localTenantDirIds(), staticIds, getTenantTheme);
+  const withCatalog = catalogScopes(); // E2
+  const scopes = slugScopes(); // E3
+  const dev = devTenantsToSeed(localTenantDirIds(), staticIds, getTenantTheme, {
+    scopeFor: (id) => scopes.get(id),
+    hasCatalog: (scope) => withCatalog.has(scope),
+  });
   if (dev.length === 0) return staticResolver;
   // registry[0] stays the static default (HOME_TENANT) for unknown-host fallback.
   return new StaticTenantResolver([...staticTenants, ...dev]);

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

@@ -10,8 +10,8 @@ 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 FoxyLoader from "@/components/commerce/FoxyLoader.astro";
-import FoxySidecartStyles from "@/components/commerce/FoxySidecartStyles.astro";
+import CheckoutLoader from "@/components/commerce/CheckoutLoader.astro";
+import CartDrawerStyles from "@/components/commerce/CartDrawerStyles.astro";
 import NicotineWarning from "@/components/compliance/NicotineWarning.astro";
 import ShippingRestrictionNotice from "@/components/compliance/ShippingRestrictionNotice.astro";
 import IsolatedAgeGate from "@/components/islands/IsolatedAgeGate.tsx";
@@ -182,11 +182,12 @@ const analyticsEnabled =
     <AuthBadge />
+    {compliance?.nicotineWarning && <NicotineWarning variant="bar" />}
     {sharedChrome ? (
       <Fragment set:html={sharedChrome.header} />
     ) : (
       <>
-        {compliance?.nicotineWarning && <NicotineWarning variant="bar" />}
         <div class="sticky top-0 z-40">
           {chrome.announcement && <AnnouncementBar text={chrome.announcement} variant="static" />}
           <SiteHeader
@@ -209,11 +210,12 @@ const analyticsEnabled =
       <slot />
     </main>
+    <ShippingRestrictionNotice text={compliance?.shippingRestriction} />
     {sharedChrome ? (
       <Fragment set:html={sharedChrome.footer} />
     ) : (
       <>
-        <ShippingRestrictionNotice text={compliance?.shippingRestriction} />
         <SiteFooter
           brand={{
             wordmark: tenant.displayName,
@@ -237,8 +239,8 @@ const analyticsEnabled =
     {features.quickView && <QuickView client:idle locale={tenant.locale} />}
     {/* Excise tax (Track B) — when enabled for this environment, the excise line
-        is calculated + added inside the FoxyCart cart (tot-foxycart pre-cart
-        webhook). This is the storefront's honest shopper-facing signal of it. */}
+        is calculated + added inside the managed cart. This is the storefront's
+        honest shopper-facing signal of it. */}
     {capabilities.exciseTax.enabled && features.catalog && (
       <p
         class="border-t border-[var(--color-border)] bg-[var(--color-bg)] py-2.5 text-center text-xs text-[var(--color-muted)]"
@@ -248,13 +250,13 @@ const analyticsEnabled =
       </p>
     )}
-    {/* FoxyCart loader (Powered by FoxyCart) — turns add-to-cart forms into the
-        sidecart + hosted checkout. Only for commerce tenants with a store. */}
-    <FoxyLoader />
+    {/* Checkout loader — turns add-to-cart forms into the cart drawer + hosted
+        checkout. Only for commerce tenants with a store. */}
+    <CheckoutLoader />
-    {/* Brand Foxy's in-page sidecart to the tenant theme (baseline + optional
-        per-tenant commerce.foxy.sidecartCss override). Commerce tenants only. */}
-    <FoxySidecartStyles />
+    {/* Brand the in-page cart drawer to the tenant theme (baseline + optional
+        per-tenant commerce.checkout.cartDrawerCss override). Commerce tenants only. */}
+    <CartDrawerStyles />
     {/* Wishlist hearts: event-delegated toggle + state hydration + count sync.
         Cards/PDP carry [data-wishlist]; the header shows [data-wishlist-count].

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

@@ -1,7 +1,7 @@
 # `lib/admin` — admin data/view + AI/evidence contracts
-Read-oriented view models and deterministic mock services for the 7 admin
-domains (orders, products, customers, fulfillment, reporting, settings,
+Read-oriented view models and deterministic mock services for the 8 admin
+domains (orders, products, subscriptions, customers, fulfillment, reporting, settings,
 ai-workflows), plus the AI/evidence substrate (`ai/`, `evidence/`) those
 domains' assist surfaces build on. See
 `docs/handoffs/admin-app-implementation-baseline.md` for the product spec

package/apps/storefront/src/lib/admin/checkoutStyleInput.ts CHANGED Viewed

@@ -8,8 +8,8 @@
  * complete descriptor. It is the WRITE-side guard; the go-live GateReport (U13)
  * still does the deeper compliance/contrast/perf pass on promote.
  *
- * Two hard constraints enforced here (both from the epic's Foxy-theme reality):
- *   - **ASCII-safe.** Foxy's checkout cache pass is not Unicode-safe — a non-ASCII
+ * Two hard constraints enforced here:
+ *   - **ASCII-safe.** Hosted checkout cache pass is not Unicode-safe — a non-ASCII
  *     byte in a value that U11 renders into the pushed CSS can blank the checkout.
  *     Every provided string leaf must be printable ASCII.
  *   - **CSS-token hygiene.** These values are interpolated into generated CSS
@@ -32,7 +32,7 @@ export type CheckoutStyleInputResult =
   | { ok: false; errors: string[] };
 /** Per-field length ceilings — generous enough for real stacks, tight enough to
- *  bound what gets pushed to Foxy. */
+ *  bound what gets pushed to checkout. */
 const MAX = {
   color: 64,
   fontFamily: 200,
@@ -50,7 +50,7 @@ const COLOR_KEYS: (keyof CheckoutStyleColors)[] = [
 ];
 /** Printable ASCII only (0x20–0x7E). Rejects control chars, newlines, and any
- *  non-ASCII (the Foxy-cache Unicode hazard). */
+ *  non-ASCII (the hosted-checkout Unicode hazard). */
 function isPrintableAscii(value: string): boolean {
   return /^[\x20-\x7E]*$/.test(value);
 }
@@ -88,7 +88,7 @@ function takeString(
     return undefined;
   }
   if (!isPrintableAscii(value)) {
-    errors.push(`${label} must be printable ASCII (Foxy checkout is not Unicode-safe)`);
+    errors.push(`${label} must be printable ASCII (hosted checkout is not Unicode-safe)`);
     return undefined;
   }
   if (hasUnsafeCssChars(value)) {