@tokenoftrust/storefront-runner 3.12.1 → 3.12.3

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

@@ -175,6 +175,7 @@ body { overflow-x: clip; }
 }
 /* The menu-drawer copy of search (header.mobile.search "menu") shows only at narrow widths. */
 .header-search--menu { display: none; }
+.header-search--phone { display: none; width: 100%; max-width: none; margin: 0 0 10px; }
 .hamburger { display: none; flex-direction: column; gap: 5px; background: none; border: 0; padding: 6px; min-width: 44px; min-height: 44px; align-items: center; justify-content: center; }
 .hamburger span { width: 26px; height: 2px; background: var(--color-text); border-radius: 2px; }
 
@@ -522,6 +523,8 @@ a.article-card__tag:hover { text-decoration: underline; }
   .site-header[data-variant="compact-centered"] .header-search-trigger,
   .site-header[data-variant="compact-centered"] .header-actions > a[aria-label="Account"],
   .site-header[data-variant="compact-centered"] .member-cue { display: none; }
+  .site-header[data-variant="compact-centered"] .header-search--phone { display: block; }
+  .site-header[data-variant="compact-centered"] .header-search--phone.header-search--labelled { display: flex; }
   .mobile-bottom-nav {
     position: fixed; inset: auto 0 0; z-index: 130; min-height: 62px;
     display: flex; align-items: stretch; justify-content: space-around;

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

@@ -16,6 +16,7 @@ import PriceDisplay from "@/components/catalog/storefront/commerce/PriceDisplay.
 import RatingStars from "@/components/catalog/storefront/commerce/RatingStars.astro";
 import { withBase } from "@/lib/publication/shared/basePath";
 import { pageUrlForm } from "@/lib/content/seo/urlForm";
+import { buildCardCartForm } from "@/lib/checkout/commerce/cardCartForm";
 
 interface Props {
   product: CatalogProduct;
@@ -29,7 +30,7 @@ interface Props {
 }
 
 const { product, priority = false, rating, reviewCount } = Astro.props;
-const { tenant, basePath, features } = Astro.locals;
+const { tenant, basePath, features, commerce, apiBasePath, browserEnvironment } = Astro.locals;
 const showBadges = features.productBadges;
 
 // A compliance-verified item (age/lab/regulatory) earns a "Compliant" badge —
@@ -86,6 +87,14 @@ const snapshot = {
 };
 
 // Richer payload for the quick-view dialog (no variant picker — that's the PDP).
+const cardCart = await buildCardCartForm({
+  product,
+  tenant,
+  commerce,
+  apiBasePath,
+  environment: browserEnvironment.environment,
+});
+
 const quickview = {
   ...snapshot,
   images: product.images.slice(0, 4).map((im) => ({
@@ -200,6 +209,31 @@ const quickview = {
     </h3>
     <PriceDisplay product={product} locale={locale} class="mt-1.5" />
 
+    {
+      cardCart && (
+        <form
+          action={cardCart.action}
+          method={cardCart.method}
+          target="_top"
+          data-managed-cart
+          data-product-handle={product.handle}
+          data-variant-id={cardCart.variantId}
+          class="relative z-10 mt-3"
+        >
+          {cardCart.hidden.map((field) => (
+            <input type="hidden" name={field.name} value={field.value} />
+          ))}
+          <input type="hidden" name={cardCart.quantityName} value="1" />
+          <button
+            type="submit"
+            class="w-full rounded-full bg-[var(--color-primary)] px-4 py-3 font-display text-sm font-medium text-[var(--color-primary-contrast)]"
+          >
+            Add to cart
+          </button>
+        </form>
+      )
+    }
+
     {rating != null && <RatingStars rating={rating} count={reviewCount} class="mt-1.5" />}
 
     {

package/apps/storefront/src/components/catalog/storefront/commerce/ProductCarousel.astro

@@ -44,6 +44,8 @@ interface Props {
   variant?: "default" | "compact";
   tone?: "bg" | "surface";
   class?: string;
+  /** Stable home-block id forwarded to the section. */
+  blockId?: string;
 }
 
 const {
@@ -57,6 +59,7 @@ const {
   variant = "default",
   tone = "bg",
   class: className,
+  blockId,
 } = Astro.props;
 
 const tot = Astro.locals.tot;
@@ -94,7 +97,7 @@ const lgWidth: Record<NonNullable<Props["columns"]>, string> = {
 const gap = variant === "compact" ? "gap-3" : "gap-5";
 ---
 
-<Section title={title} eyebrow={eyebrow} tone={tone} class={className}>
+<Section title={title} eyebrow={eyebrow} tone={tone} class={className} blockId={blockId}>
   <div class="tot-carousel">
     {
       panels.map((panel, i) => (

package/apps/storefront/src/components/catalog/storefront/commerce/ProductGrid.astro

@@ -31,6 +31,8 @@ interface Props {
   /** Hide the whole section when there are no products (default true). */
   hideWhenEmpty?: boolean;
   class?: string;
+  /** Stable home-block id forwarded to the section. */
+  blockId?: string;
 }
 
 const {
@@ -43,6 +45,7 @@ const {
   tone = "bg",
   hideWhenEmpty = true,
   class: className,
+  blockId,
 } = Astro.props;
 
 const products =
@@ -60,7 +63,7 @@ const hidden = hideWhenEmpty && products.length === 0;
 
 {
   !hidden && (
-    <Section title={title} eyebrow={eyebrow} tone={tone} class={className}>
+    <Section title={title} eyebrow={eyebrow} tone={tone} class={className} blockId={blockId}>
       {products.length > 0 ? (
         <div class:list={["grid gap-5", colClass[columns]]}>
           {products.map((p, i) => (

package/apps/storefront/src/components/content/storefront/Section.astro

@@ -13,14 +13,17 @@ interface Props {
   id?: string;
   /** Stable `data-widget` name, so the rendered page says which block this is. */
   widget?: string;
+  /** Stable home-block id. Omitted when the section is not a home block. */
+  blockId?: string;
 }
-const { title, eyebrow, tone = "bg", class: className, id, widget } = Astro.props;
+const { title, eyebrow, tone = "bg", class: className, id, widget, blockId } = Astro.props;
 const bg = tone === "surface" ? "bg-[var(--color-surface)]" : "bg-[var(--color-bg)]";
 ---
 
 <section
   id={id}
   data-widget={widget}
+  data-block={blockId}
   class:list={[bg, "py-[clamp(3rem,7vw,6rem)]", className]}
 >
   <div class="container-prose">

package/apps/storefront/src/components/content/storefront/chrome/SiteHeader.astro

@@ -337,6 +337,19 @@ const currentPath = Astro.url.pathname;
     </div>
   </div>
 
+  {
+    compact && searchAction && (
+      <div class="border-b border-border bg-surface px-4 py-2 md:hidden" data-header-phone-search>
+        <SearchTypeahead
+          client:idle
+          action={searchAction}
+          placeholder={searchPlaceholder}
+          label={searchLabel}
+        />
+      </div>
+    )
+  }
+
   <!-- Primary nav bar: desktop MegaMenu (hidden md:block) + a no-JS-safe mobile
        fallback (md:hidden) below it. The fallback renders the SAME nav data as
        real, crawlable <a href> links via a native <details>/<summary> accordion

package/apps/storefront/src/components/content/storefront/marketing/MarketingBlocks.astro

@@ -6,6 +6,7 @@
  * Reused by the homepage and (future) marketing content pages.
  */
 import type { MarketingBlock } from "@/lib/content/storyblok/content-model";
+import { homeBlockId } from "@/lib/content/shared/homeVisualParity";
 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";
@@ -24,28 +25,69 @@ interface Props {
 const { blocks, basePath } = Astro.props;
 ---
 {
-  blocks.map((block) => {
+  blocks.map((block, index) => {
+    const blockId = homeBlockId(block, index);
     switch (block.component) {
       case "marketing_hero":
-        return <MarketingHero block={block} basePath={basePath} />;
+        return (
+          <div data-block={blockId}>
+            <MarketingHero block={block} basePath={basePath} />
+          </div>
+        );
       case "trust_bar":
-        return <TrustBar block={block} />;
+        return (
+          <div data-block={blockId}>
+            <TrustBar block={block} />
+          </div>
+        );
       case "split_compare":
-        return <SplitCompare block={block} />;
+        return (
+          <div data-block={blockId}>
+            <SplitCompare block={block} />
+          </div>
+        );
       case "steps":
-        return <Steps block={block} />;
+        return (
+          <div data-block={blockId}>
+            <Steps block={block} />
+          </div>
+        );
       case "card_grid":
-        return <CardGrid block={block} basePath={basePath} />;
+        return (
+          <div data-block={blockId}>
+            <CardGrid block={block} basePath={basePath} />
+          </div>
+        );
       case "integrations":
-        return <Integrations block={block} basePath={basePath} />;
+        return (
+          <div data-block={blockId}>
+            <Integrations block={block} basePath={basePath} />
+          </div>
+        );
       case "proof_strip":
-        return <ProofStrip block={block} />;
+        return (
+          <div data-block={blockId}>
+            <ProofStrip block={block} />
+          </div>
+        );
       case "testimonials":
-        return <Testimonials block={block} />;
+        return (
+          <div data-block={blockId}>
+            <Testimonials block={block} />
+          </div>
+        );
       case "faq":
-        return <Faq block={block} />;
+        return (
+          <div data-block={blockId}>
+            <Faq block={block} />
+          </div>
+        );
       case "cta_band":
-        return <CtaBand block={block} basePath={basePath} />;
+        return (
+          <div data-block={blockId}>
+            <CtaBand block={block} basePath={basePath} />
+          </div>
+        );
       default:
         return null;
     }

package/apps/storefront/src/config/tenants.ts

@@ -41,10 +41,12 @@ export const HOME_TENANT: TenantConfig = {
   siteType: "marketing",
 };
 
-// Generic SAMPLE tenant — a placeholder regulated store used to demonstrate the
-// compliance affordance (age-gate + nicotine warning) WITHOUT any real merchant.
-// Routed at /sample-store.example/. Content comes from the developer's grafted
-// checkout (tenants/sample-store.example/); with none present it degrades to the
+// Generic SAMPLE tenant — the public fallback renderer's regulated store.
+// Its page bands come from the same complianceSections() gates as a primary
+// vape-nicotine-us tenant (nicotine warning, shipping restriction, age gate,
+// excise disclosure). No real merchant. Routed at /sample-store.example/.
+// Content comes from the developer's grafted checkout
+// (tenants/sample-store.example/); with none present it degrades to the
 // default scope, and the compliance overlay still renders from this config.
 export const SAMPLE_TENANT: TenantConfig = {
   tenant_id: "sample-store.example",
@@ -62,14 +64,22 @@ export const SAMPLE_TENANT: TenantConfig = {
     repo: "sample-store.example",
     defaultBranch: "main",
   })],
-  // Regulated-store demo: shows the 21+/PACT compliance gate is CONFIG-driven.
+  // Same section inputs as a primary vape-nicotine-us commerce tenant.
+  // pactAct stays unset: the primary page does not emit that band unless the
+  // flag is set. ruleProfile selects the checkout ruleset only.
   compliance: {
+    ruleProfile: "vape-nicotine-us",
     minAge: 21,
     nicotineWarning: true,
     shippingRestriction:
       "Adult signature (21+) required on delivery. Some destinations are restricted — verified at checkout.",
   },
-  siteType: "marketing",
+  capabilities: {
+    cartCheckout: { enabled: true },
+    ageVerification: { enabled: true },
+    exciseTax: { enabled: true },
+  },
+  siteType: "commerce",
 };
 
 const REGISTRY: TenantConfig[] = [HOME_TENANT, SAMPLE_TENANT];

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

@@ -20,6 +20,7 @@ import PactActNotice from "@/components/compliance/storefront/compliance/PactAct
 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 { complianceSections } from "@/lib/compliance/complianceSections";
 import IsolatedAgeGate from "@/components/compliance/storefront/islands/IsolatedAgeGate.tsx";
 import AuthBadge from "@/components/access/storefront/auth/AuthBadge.astro";
 import { referenceTheme } from "@/themes/reference";
@@ -215,6 +216,12 @@ if (chromeHtml && chromeHtml.includes(CHROME_BODY_MARKER)) {
 }
 
 const compliance = tenant.compliance;
+const sections = complianceSections({
+  compliance,
+  ageVerificationEnabled: capabilities.ageVerification.enabled,
+  exciseTaxEnabled: capabilities.exciseTax.enabled,
+  catalog: features.catalog,
+});
 const cartHref = managedCartHref(Astro.locals.commerce);
 
 // Site-chrome data resolution (chrome/* is the canonical, prop-driven
@@ -368,7 +375,7 @@ const footerWidgets = await renderWidgetSlot(
 
     <AuthBadge />
 
-    {compliance?.nicotineWarning && <NicotineWarning variant="bar" declaration={compliance.nicotineWarning} />}
+    {sections.includes("nicotine-warning") && compliance?.nicotineWarning && <NicotineWarning variant="bar" declaration={compliance.nicotineWarning} />}
 
     {sharedChrome ? (
       <Fragment set:html={sharedChrome.header} />
@@ -406,8 +413,12 @@ const footerWidgets = await renderWidgetSlot(
       <slot />
     </main>
 
-    <PactActNotice enabled={compliance?.pactAct} minAge={compliance?.minAge} variant="footer" />
-    <ShippingRestrictionNotice text={compliance?.shippingRestriction} />
+    {sections.includes("pact-act") && (
+      <PactActNotice enabled={compliance?.pactAct} minAge={compliance?.minAge} variant="footer" />
+    )}
+    {sections.includes("shipping-restriction") && (
+      <ShippingRestrictionNotice text={compliance?.shippingRestriction} />
+    )}
 
     {sharedChrome ? (
       <>
@@ -460,7 +471,7 @@ const footerWidgets = await renderWidgetSlot(
       </div>
     ))}
 
-    {capabilities.ageVerification.enabled && compliance?.minAge && (
+    {sections.includes("age-gate") && capabilities.ageVerification.enabled && compliance?.minAge && (
       <IsolatedAgeGate
         client:only="preact"
         minAge={compliance.minAge}
@@ -477,7 +488,7 @@ const footerWidgets = await renderWidgetSlot(
     {/* Excise tax (Track B) — when enabled for this environment, the excise line
         is calculated + added inside the managed cart. This is the storefront's
         honest shopper-facing signal of it. */}
-    {capabilities.exciseTax.enabled && features.catalog && (
+    {sections.includes("excise-tax") && capabilities.exciseTax.enabled && features.catalog && (
       <ExciseTaxNotice variant="footer" config={{ note: EXCISE_TAX_DISCLOSURE_TEXT }} />
     )}
 

package/apps/storefront/src/lib/checkout/commerce/cardCartForm.ts

@@ -0,0 +1,85 @@
+/**
+ * Add-to-cart form for a catalog card. One default variant — the first
+ * available one — signed the same way the product page signs its handoff.
+ * No form when the product cannot be bought or the cart cannot be signed.
+ */
+import type { CatalogProduct, CatalogVariant, ResolvedManagedCheckout, TenantConfig } from "@tot/public-runtime";
+import {
+  ANONYMOUS_MEMBER,
+  buildMemberSignedCartPayload,
+  commerceTenantId,
+  normalizePurchaseOptions,
+  SAMPLE_CART_HANDOFF_URL,
+  sampleVariantCartPayload,
+  visiblePurchaseOptions,
+  isAutopilotEnabled,
+  workerCartApiPath,
+} from "@tot/public-runtime";
+import { isLocalSampleCheckout } from "@/config/declaredTenantConfig";
+import { resolveCartSigning } from "@/lib/checkout/shared/checkoutCommerce";
+
+export interface CardCartForm {
+  action: string;
+  method: "get" | "post";
+  variantId: string;
+  hidden: { name: string; value: string }[];
+  quantityName: string;
+}
+
+/** The card buys the first variant that can ship. Sold out yields none. */
+export function defaultCardVariant(product: CatalogProduct): CatalogVariant | null {
+  return product.variants.find((variant) => variant.inventory.available) ?? null;
+}
+
+export async function buildCardCartForm(input: {
+  product: CatalogProduct;
+  tenant: TenantConfig;
+  commerce: ResolvedManagedCheckout | null | undefined;
+  apiBasePath: string;
+  environment: string;
+}): Promise<CardCartForm | null> {
+  const variant = defaultCardVariant(input.product);
+  if (!variant) return null;
+  const sampleHandoff = isLocalSampleCheckout(input.tenant.tenant_id);
+  if (!sampleHandoff && !input.commerce) return null;
+  const signing = sampleHandoff ? { enabled: true as const, secret: undefined } : await resolveCartSigning(input.commerce!);
+  if (!signing.enabled) return null;
+  try {
+    const autopilotEnabled = isAutopilotEnabled(input.tenant.commerce?.autopilot);
+    const purchaseOption = visiblePurchaseOptions(normalizePurchaseOptions(input.product), { autopilotEnabled })[0];
+    if (!purchaseOption) return null;
+    const payload = sampleHandoff
+      ? sampleVariantCartPayload(input.product.handle, variant.id)
+      : await buildMemberSignedCartPayload(input.product, variant, {
+          mode: input.commerce!.mode,
+          secret: signing.secret,
+          purchaseOption,
+          pricing: { member: ANONYMOUS_MEMBER, program: input.tenant.commerce?.membership },
+          autopilotEnabled,
+          tenantId: commerceTenantId(input.tenant),
+          currency: input.tenant.currency,
+        });
+    const provider = input.tenant.serving?.provider === "s3-overwrite" ? "s3-overwrite" : "worker-r2-pointer";
+    return {
+      action: sampleHandoff
+        ? SAMPLE_CART_HANDOFF_URL
+        : workerCartApiPath({
+            provider,
+            phase: input.environment === "live" ? "publication" : "preview",
+            apiBasePath: input.apiBasePath,
+            endpoint: "/api/commerce/checkout-handoff",
+          }),
+      method: sampleHandoff ? "get" : "post",
+      variantId: variant.id,
+      hidden: payload.hidden,
+      quantityName: payload.quantityName,
+    };
+  } catch (err) {
+    if (!(err instanceof Error) || err.name !== "CartSigningUnavailableError") {
+      console.warn(
+        `[storefront] Invalid checkout purchase options for ${input.product.handle}; cart disabled for this product.`,
+      );
+    }
+    return null;
+  }
+}

package/apps/storefront/src/lib/compliance/complianceSections.ts

@@ -0,0 +1,113 @@
+/**
+ * The page compliance bands, in document order.
+ *
+ * Layout.astro (primary) and the public fallback renderer (the sanitized
+ * sample tenant in the published runner) both decide which bands to emit from
+ * this list. `ruleProfile` selects the checkout ruleset; it does not add a
+ * band. A vape-nicotine-us store shows pact-act only when `compliance.pactAct`
+ * is set, the same gate the primary tenants use today.
+ */
+import {
+  resolveCapabilities,
+  resolveTenantFeatures,
+  type ComplianceConfig,
+  type TenantConfig,
+} from "@tot/public-runtime";
+import {
+  exciseTaxNoticeHtml,
+  nicotineWarningBarHtml,
+  pactActNoticeHtml,
+  shippingRestrictionNoticeHtml,
+  type RawComplianceChromeInput,
+} from "./rawComplianceNotices";
+
+export const COMPLIANCE_SECTION_IDS = [
+  "nicotine-warning",
+  "pact-act",
+  "shipping-restriction",
+  "age-gate",
+  "excise-tax",
+] as const;
+
+export type ComplianceSectionId = (typeof COMPLIANCE_SECTION_IDS)[number];
+
+export interface ComplianceSectionInput {
+  compliance?: ComplianceConfig | null;
+  ageVerificationEnabled: boolean;
+  exciseTaxEnabled: boolean;
+  catalog: boolean;
+}
+
+/** Bands Layout.astro mounts, under the same conditions, in document order. */
+export function complianceSections(input: ComplianceSectionInput): ComplianceSectionId[] {
+  const compliance = input.compliance;
+  const sections: ComplianceSectionId[] = [];
+  if (compliance?.nicotineWarning) sections.push("nicotine-warning");
+  if (compliance?.pactAct) sections.push("pact-act");
+  if (compliance?.shippingRestriction) sections.push("shipping-restriction");
+  if (input.ageVerificationEnabled && compliance?.minAge) sections.push("age-gate");
+  if (input.exciseTaxEnabled && input.catalog) sections.push("excise-tax");
+  return sections;
+}
+
+/**
+ * A primary vape-nicotine-us tenant as the registry declares one: the profile,
+ * 21+, the nicotine warning, a shipping line, commerce (catalog on), and the
+ * three capabilities. `pactAct` stays unset, so the list has no pact-act band.
+ */
+export const VAPE_NICOTINE_US_PRIMARY: ComplianceSectionInput = {
+  compliance: {
+    ruleProfile: "vape-nicotine-us",
+    minAge: 21,
+    nicotineWarning: true,
+    shippingRestriction:
+      "Adult signature (21+) required on delivery. Some destinations are restricted — verified at checkout.",
+  },
+  ageVerificationEnabled: true,
+  exciseTaxEnabled: true,
+  catalog: true,
+};
+
+export function vapeNicotineUsSections(): ComplianceSectionId[] {
+  return complianceSections(VAPE_NICOTINE_US_PRIMARY);
+}
+
+/** Raw-HTML injection for the bands in `sections`. Age-gate is not injectable. */
+export function rawComplianceChrome(
+  sections: readonly ComplianceSectionId[],
+  notices: RawComplianceChromeInput,
+): { top: string; bottom: string } {
+  const on = (id: ComplianceSectionId) => sections.includes(id);
+  const top = on("nicotine-warning") && notices.nicotineWarning
+    ? nicotineWarningBarHtml(notices.nicotineWarning)
+    : "";
+  let bottom = "";
+  if (on("pact-act") && notices.pactAct) bottom += pactActNoticeHtml(notices.minAge);
+  if (on("shipping-restriction")) bottom += shippingRestrictionNoticeHtml(notices.shippingRestriction);
+  if (on("excise-tax") && notices.exciseTaxEnabled) bottom += exciseTaxNoticeHtml();
+  return { top, bottom };
+}
+
+/** The same bands Layout would mount for this tenant, as raw-HTML chrome. */
+export function complianceChromeForTenant(
+  tenant: Pick<TenantConfig, "compliance" | "siteType" | "capabilities" | "features">,
+): { top: string; bottom: string } {
+  const capabilities = resolveCapabilities(tenant);
+  const features = resolveTenantFeatures(tenant);
+  const notices: RawComplianceChromeInput = {
+    nicotineWarning: tenant.compliance?.nicotineWarning,
+    pactAct: !!tenant.compliance?.pactAct,
+    minAge: tenant.compliance?.minAge,
+    shippingRestriction: tenant.compliance?.shippingRestriction,
+    exciseTaxEnabled: capabilities.exciseTax.enabled && features.catalog,
+  };
+  return rawComplianceChrome(
+    complianceSections({
+      compliance: tenant.compliance,
+      ageVerificationEnabled: capabilities.ageVerification.enabled,
+      exciseTaxEnabled: capabilities.exciseTax.enabled,
+      catalog: features.catalog,
+    }),
+    notices,
+  );
+}

package/apps/storefront/src/lib/content/shared/homeVisualParity.ts

@@ -94,6 +94,54 @@ export function promoTilesView(
   };
 }
 
+const BLOCK_ID_MAX = 64;
+
+function blockToken(value: string): string {
+  return value
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "-")
+    .replace(/^-+|-+$/g, "")
+    .slice(0, BLOCK_ID_MAX);
+}
+
+/**
+ * Stable `data-block` id. A declared `id` wins. Otherwise the component name
+ * plus the block's index. Never random, and never a tenant id.
+ */
+export function homeBlockId(block: { component: string; id?: string }, index: number): string {
+  const declared = typeof block.id === "string" ? blockToken(block.id) : "";
+  if (declared) return declared;
+  const component = blockToken(block.component) || "block";
+  const position = Number.isInteger(index) && index >= 0 ? index : 0;
+  return `${component}-${position}`.slice(0, BLOCK_ID_MAX);
+}
+
+export interface EditorialBlockView {
+  excerpt?: string;
+  date?: string;
+  cta: { label: string; href: string; variant: "link" | "button" } | null;
+}
+
+function declaredText(value: string | undefined): string | undefined {
+  const trimmed = value?.trim();
+  return trimmed ? trimmed : undefined;
+}
+
+/** Excerpt, date, and CTA. A button variant carries the label with no arrow. */
+export function editorialBlockView(block: EditorialBlock): EditorialBlockView {
+  const label = declaredText(block.ctaLabel);
+  const href = declaredText(block.ctaHref);
+  return {
+    excerpt: declaredText(block.excerpt),
+    date: declaredText(block.date),
+    cta:
+      label && href && isSafeStorefrontHref(href)
+        ? { label, href, variant: block.ctaVariant === "button" ? "button" : "link" }
+        : null,
+  };
+}
+
 /**
  * The editorial block's media column: the block image, else generated art when
  * the block asks for it with `imageSeed`, else none — a text-only block.

package/apps/storefront/src/lib/content/shared/rawChrome.ts

@@ -281,13 +281,14 @@ function renderNavItem(item: ChromeNavItem, index: number, currentPath?: string)
  * The header search form. `inMenu` is the copy placed inside the menu drawer
  * (header.mobile.search "menu"); it carries its own input id so both can exist.
  */
-function renderSearchForm(search: ChromeSearch, inMenu = false): string {
-  const id = inMenu ? "hdr-q-menu" : "hdr-q";
+function renderSearchForm(search: ChromeSearch, placement: "row" | "menu" | "phone" = "row"): string {
+  const id = placement === "menu" ? "hdr-q-menu" : placement === "phone" ? "hdr-q-phone" : "hdr-q";
   const button = search.buttonLabel
     ? `<button type="submit" class="header-search__submit">${esc(search.buttonLabel)}</button>`
     : `<button type="submit" aria-label="Search">${ICON_SEARCH}</button>`;
+  const placementClass = placement === "menu" ? " header-search--menu" : placement === "phone" ? " header-search--phone" : "";
   return (
-    `<form class="header-search${inMenu ? " header-search--menu" : ""}${search.buttonLabel ? " header-search--labelled" : ""}" action="${esc(search.action ?? "/search")}" method="get" role="search">\n` +
+    `<form class="header-search${placementClass}${search.buttonLabel ? " header-search--labelled" : ""}" action="${esc(search.action ?? "/search")}" method="get" role="search">\n` +
     `      <label class="sr-only" for="${id}">${esc(search.label ?? "Search")}</label>\n` +
     `      <input id="${id}" type="search" name="q" placeholder="${esc(search.placeholder ?? "Search")}" autocomplete="off">\n` +
     `      ${button}\n` +
@@ -381,7 +382,7 @@ function renderHeader(header: ChromeHeader, variant: HeaderVariant, currentPath?
   const navItems = header.nav
     .map((item, i) => renderNavItem(item, i, currentPath))
     .join("\n          ");
-  const menuSearch = searchInMenu ? `        ${renderSearchForm(header.search!, true)}\n` : "";
+  const menuSearch = searchInMenu ? `        ${renderSearchForm(header.search!, "menu")}\n` : "";
   const primaryNav =
     `<nav class="primary-nav" id="primaryNav" aria-label="Primary">\n` +
     menuSearch +
@@ -402,6 +403,7 @@ function renderHeader(header: ChromeHeader, variant: HeaderVariant, currentPath?
     compact && header.search
       ? `<a class="header-search-trigger" data-header-fixed-action href="${esc(header.search.action ?? "/search")}" aria-label="${esc(header.search.label ?? "Search")}">${ICON_SEARCH}</a>`
       : "";
+  const phoneSearch = compact && header.search ? `  ${renderSearchForm(header.search, "phone")}\n` : "";
   const mobileBottom =
     compact
       ? `<nav class="mobile-bottom-nav" aria-label="Quick links">` +
@@ -426,6 +428,7 @@ function renderHeader(header: ChromeHeader, variant: HeaderVariant, currentPath?
     (!minimal && !compact && search ? `    ${search}\n` : "") +
     `    <div class="header-actions">${memberCue}${ctas}${compactSearch}${actionLinks}${account}${cart}${menuLeft ? "" : hamburger}</div>\n` +
     `  </div>\n` +
+    phoneSearch +
     navBar +
     `</header>` +
     mobileBottom

package/apps/storefront/src/lib/content/storyblok/content-model.ts

@@ -14,7 +14,9 @@ import type { Tier } from "@/lib/membership/model";
 import type { TrustStripItem } from "@/lib/content/trustStrip";
 import type { PromoTilePresentation } from "@tot/public-runtime";
 
-export type HomeBlock =
+type BlockIdentity = { id?: string };
+
+export type HomeBlock = (
   | HeroBlock
   | PromoTilesBlock
   | CommerceTrustStripBlock
@@ -23,7 +25,9 @@ export type HomeBlock =
   | MembershipBandBlock
   | EditorialBlock
   | NewsletterBlock
-  | FaqBlock;
+  | FaqBlock
+) &
+  BlockIdentity;
 
 export interface CommerceTrustStripBlock {
   component: "trust_strip";
@@ -139,8 +143,14 @@ export interface EditorialBlock {
   image?: string;
   imageAlt?: string;
   align?: "left" | "right";
+  /** Plain-text dek. Rendered only when declared. */
+  excerpt?: string;
+  /** Plain-text publication date. Rendered only when declared. */
+  date?: string;
   ctaLabel?: string;
   ctaHref?: string;
+  /** `button` is a label with no forced arrow. Absent or `link` keeps the arrow link. */
+  ctaVariant?: "link" | "button";
 }
 
 export interface NewsletterBlock {
@@ -278,7 +288,7 @@ export interface CtaBandBlock {
   ctas?: MarketingCta[];
 }
 
-export type MarketingBlock =
+export type MarketingBlock = (
   | MarketingHeroBlock
   | TrustBarBlock
   | SplitCompareBlock
@@ -288,7 +298,9 @@ export type MarketingBlock =
   | ProofStripBlock
   | TestimonialsBlock
   | FaqBlock
-  | CtaBandBlock;
+  | CtaBandBlock
+) &
+  BlockIdentity;
 
 /** Discriminators that identify a marketing block (vs a commerce HomeBlock). */
 export const MARKETING_COMPONENTS = new Set<MarketingBlock["component"]>([

package/apps/storefront/src/pages/[...slug].astro

@@ -14,7 +14,7 @@ import { breadcrumbLd } from "@/lib/content/shared/jsonld";
 import { truncate } from "@/lib/content/shared/format";
 import { faqFromHtml, faqFromSections } from "@/lib/content/seo/faqItems";
 import { rawHtmlPolicy, rawHtmlResponse, rawPageCanonicalUrl } from "@/lib/content/shared/rawMarketingHtml";
-import { renderRawComplianceTop, renderRawComplianceBottom } from "@/lib/compliance/rawComplianceNotices";
+import { complianceSections, rawComplianceChrome } from "@/lib/compliance/complianceSections";
 import { styleGuideAliasRewrite } from "@/lib/content/shared/styleGuidePaths";
 import { getBlogSettings } from "@/lib/content/blog/provider.js";
 import { loadBlogPostViewV1, type BlogPostViewPropsV1 } from "@/lib/content/blog/postView.js";
@@ -85,6 +85,12 @@ if (!blogPostProps) {
       shippingRestriction: tenant.compliance?.shippingRestriction,
       exciseTaxEnabled: capabilities.exciseTax.enabled && features.catalog,
     };
+    const complianceChrome = rawComplianceChrome(complianceSections({
+      compliance: tenant.compliance,
+      ageVerificationEnabled: capabilities.ageVerification.enabled,
+      exciseTaxEnabled: capabilities.exciseTax.enabled,
+      catalog: features.catalog,
+    }), notices);
     return rawHtmlResponse(rawHtml, {
       nonce: Astro.locals.cspNonce,
       basePath,
@@ -93,8 +99,8 @@ if (!blogPostProps) {
       plan: Astro.locals.integrationPlan,
       consentSnapshot: Astro.locals.consentSnapshot,
       canonicalUrl: rawPageCanonicalUrl(canonicalBase, slug),
-      complianceTop: rawPolicy.regulated ? renderRawComplianceTop(notices) : undefined,
-      complianceBottom: rawPolicy.regulated ? renderRawComplianceBottom(notices) : undefined,
+      complianceTop: complianceChrome.top || undefined,
+      complianceBottom: complianceChrome.bottom || undefined,
     });
   }
 

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

@@ -20,7 +20,7 @@ import MarketingBlocks from "@/components/content/storefront/marketing/Marketing
 import TierCards from "@/components/membership/storefront/membership/TierCards.astro";
 import { withBase } from "@/lib/publication/shared/basePath";
 import { rawHtmlPolicy, rawHtmlResponse } from "@/lib/content/shared/rawMarketingHtml";
-import { renderRawComplianceTop, renderRawComplianceBottom } from "@/lib/compliance/rawComplianceNotices";
+import { complianceSections, rawComplianceChrome } from "@/lib/compliance/complianceSections";
 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";
@@ -38,7 +38,9 @@ import {
 import { resolveSectionSource } from "@/lib/content/shared/sections";
 import { featuredProductsPresentationView } from "@/lib/catalog/shared/featuredProductsPresentation";
 import {
+  editorialBlockView,
   editorialMediaView,
+  homeBlockId,
   resolveCommerceStaticBlock,
   type CommerceStaticResolved,
 } from "@/lib/content/shared/homeVisualParity";
@@ -73,6 +75,12 @@ if (rawHtml && rawPolicy.allowed) {
     shippingRestriction: tenant.compliance?.shippingRestriction,
     exciseTaxEnabled: capabilities.exciseTax.enabled && features.catalog,
   };
+  const complianceChrome = rawComplianceChrome(complianceSections({
+    compliance: tenant.compliance,
+    ageVerificationEnabled: capabilities.ageVerification.enabled,
+    exciseTaxEnabled: capabilities.exciseTax.enabled,
+    catalog: features.catalog,
+  }), notices);
   return rawHtmlResponse(rawHtml, {
     nonce: Astro.locals.cspNonce,
     basePath,
@@ -81,8 +89,8 @@ if (rawHtml && rawPolicy.allowed) {
     plan: Astro.locals.integrationPlan,
     consentSnapshot: Astro.locals.consentSnapshot,
     canonicalUrl: new URL("/", canonicalBase + "/").toString(),
-    complianceTop: rawPolicy.regulated ? renderRawComplianceTop(notices) : undefined,
-    complianceBottom: rawPolicy.regulated ? renderRawComplianceBottom(notices) : undefined,
+    complianceTop: complianceChrome.top || undefined,
+    complianceBottom: complianceChrome.bottom || undefined,
   });
 }
 
@@ -97,11 +105,12 @@ const marketingBlocks: MarketingBlock[] = marketing
 const collections = marketing ? [] : await tot.listCollections();
 
 // --- Resolve each block into a typed, render-ready view-model -----------------
-type Resolved =
+type Resolved = (
   | { kind: "hero"; block: HeroBlock; product: CatalogProduct | null; instanceKey: string }
   | { kind: "collections"; title?: string; cols: CatalogCollection[] }
   | { kind: "products"; title?: string; products: CatalogProduct[]; presentation?: FeaturedProductsBlock["presentation"] }
-  | CommerceStaticResolved;
+  | CommerceStaticResolved
+) & { blockId: string };
 
 async function resolveProducts(
   source: FeaturedProductsBlock["source"],
@@ -116,10 +125,11 @@ async function resolveProducts(
 }
 
 const resolved: Resolved[] = [];
-for (const block of marketing ? [] : home.blocks) {
+for (const [index, block] of (marketing ? [] : home.blocks).entries()) {
+  const blockId = homeBlockId(block, index);
   const staticBlock = resolveCommerceStaticBlock(block);
   if (staticBlock) {
-    resolved.push(staticBlock);
+    resolved.push({ ...staticBlock, blockId });
     continue;
   }
   switch (block.component) {
@@ -130,7 +140,7 @@ for (const block of marketing ? [] : home.blocks) {
         const firstHandle = col?.product_handles[0];
         if (firstHandle) product = await tot.getProductByHandle(firstHandle);
       }
-      resolved.push({ kind: "hero", block, product, instanceKey: `home-${resolved.length}` });
+      resolved.push({ kind: "hero", block, product, instanceKey: `home-${resolved.length}`, blockId });
       break;
     }
     case "featured_collections": {
@@ -140,7 +150,7 @@ for (const block of marketing ? [] : home.blocks) {
       const cols = handles
         .map((h) => collections.find((c) => c.handle === h))
         .filter((c): c is CatalogCollection => !!c);
-      resolved.push({ kind: "collections", title: block.title, cols });
+      resolved.push({ kind: "collections", title: block.title, cols, blockId });
       break;
     }
     case "featured_products": {
@@ -149,7 +159,7 @@ for (const block of marketing ? [] : home.blocks) {
         block.handles,
         block.limit ?? 4,
       );
-      resolved.push({ kind: "products", title: block.title, products, presentation: block.presentation });
+      resolved.push({ kind: "products", title: block.title, products, presentation: block.presentation, blockId });
       break;
     }
   }
@@ -195,17 +205,29 @@ const homeSectionWidgets = marketing
   {
     !marketing && resolved.map((r) => {
       if (r.kind === "hero") {
-        return <Hero block={r.block} featureProduct={r.product} instanceKey={r.instanceKey} />;
+        return (
+          <div data-block={r.blockId}>
+            <Hero block={r.block} featureProduct={r.product} instanceKey={r.instanceKey} />
+          </div>
+        );
       }
       if (r.kind === "promo_tiles") {
-        return <PromoTiles block={r.block} basePath={basePath} tenantId={tenant.tenant_id} />;
+        return (
+          <div data-block={r.blockId}>
+            <PromoTiles block={r.block} basePath={basePath} tenantId={tenant.tenant_id} />
+          </div>
+        );
       }
       if (r.kind === "trust_strip") {
-        return <TrustStrip items={r.block.items} tenantId={tenant.tenant_id} mobile={r.block.mobile} />;
+        return (
+          <div data-block={r.blockId}>
+            <TrustStrip items={r.block.items} tenantId={tenant.tenant_id} mobile={r.block.mobile} />
+          </div>
+        );
       }
       if (r.kind === "collections") {
         return (
-          <Section title={r.title} eyebrow="Collections" tone="bg">
+          <Section title={r.title} eyebrow="Collections" tone="bg" blockId={r.blockId}>
             <div class="grid gap-5 sm:grid-cols-2 lg:grid-cols-3">
               {r.cols.map((c) => (
                 <CollectionCard collection={c} productCount={c.product_handles.length} />
@@ -216,9 +238,9 @@ const homeSectionWidgets = marketing
       }
       if (r.kind === "products") {
         if (featuredProductsPresentationView(r.presentation) === "carousel") {
-          return <ProductCarousel products={r.products} title={r.title} eyebrow="Shop" tone="surface" />;
+          return <ProductCarousel products={r.products} title={r.title} eyebrow="Shop" tone="surface" blockId={r.blockId} />;
         }
-        return <ProductGrid products={r.products} title={r.title} eyebrow="Shop" tone="surface" />;
+        return <ProductGrid products={r.products} title={r.title} eyebrow="Shop" tone="surface" blockId={r.blockId} />;
       }
       if (r.kind === "membership_band") {
         const b = r.block;
@@ -229,7 +251,7 @@ const homeSectionWidgets = marketing
           t.cta ? { ...t, cta: { ...t.cta, href: withBase(basePath, t.cta.href) } } : t,
         );
         return (
-          <section class="bg-[var(--color-surface)] py-[clamp(3rem,7vw,6rem)]">
+          <section class="bg-[var(--color-surface)] py-[clamp(3rem,7vw,6rem)]" data-block={r.blockId}>
             <TierCards tiers={tiers} eyebrow={b.eyebrow} heading={b.title} subhead={b.subhead} />
           </section>
         );
@@ -237,10 +259,11 @@ const homeSectionWidgets = marketing
       if (r.kind === "editorial") {
         const b = r.block;
         const media = editorialMediaView(b, tenant.tenant_id);
+        const fields = editorialBlockView(b);
         const right = b.align !== "left";
         const textOnly = media.kind === "none";
         return (
-          <Section tone="bg">
+          <Section tone="bg" blockId={r.blockId}>
             <div
               class:list={[
                 textOnly ? "max-w-[68ch]" : "grid items-center gap-10 md:grid-cols-2",
@@ -253,15 +276,26 @@ const homeSectionWidgets = marketing
                 <h2 class="display-md">
                   {b.title}
                 </h2>
+                {fields.date && <p class="mt-3 font-mono text-xs uppercase tracking-[0.12em] text-[var(--color-muted)]">{fields.date}</p>}
+                {fields.excerpt && <p class="mt-4 text-[var(--color-text)]">{fields.excerpt}</p>}
                 <div class="rte mt-5 text-[var(--color-muted)]" set:html={b.body_html} />
-                {b.ctaLabel && b.ctaHref && (
+                {fields.cta && (
                   <div class="mt-7">
-                    <a
-                      href={withBase(basePath, b.ctaHref)}
-                      class="link-accent link-accent--cta font-display text-sm font-medium"
-                    >
-                      {b.ctaLabel} →
-                    </a>
+                    {fields.cta.variant === "button" ? (
+                      <a
+                        href={withBase(basePath, fields.cta.href)}
+                        class="inline-flex rounded-full bg-[var(--color-primary)] px-6 py-3 font-display text-sm font-medium text-[var(--color-primary-contrast)]"
+                      >
+                        {fields.cta.label}
+                      </a>
+                    ) : (
+                      <a
+                        href={withBase(basePath, fields.cta.href)}
+                        class="link-accent link-accent--cta font-display text-sm font-medium"
+                      >
+                        {fields.cta.label} →
+                      </a>
+                    )}
                   </div>
                 )}
               </div>
@@ -298,7 +332,7 @@ const homeSectionWidgets = marketing
       if (r.kind === "newsletter") {
         const b = r.block;
         return (
-          <Section tone="surface" id="newsletter">
+          <Section tone="surface" id="newsletter" blockId={r.blockId}>
             <div class="mx-auto max-w-xl text-center" data-reveal>
               <h2 class="display-md">
                 {b.title}
@@ -331,7 +365,11 @@ const homeSectionWidgets = marketing
         );
       }
       if (r.kind === "faq") {
-        return <Faq block={r.block} />;
+        return (
+          <div data-block={r.blockId}>
+            <Faq block={r.block} />
+          </div>
+        );
       }
       return null;
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "3.12.1",
+  "version": "3.12.3",
   "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/scripts/tenant/validate.mjs

@@ -569,6 +569,20 @@ function validateFaq(block, file, at, out) {
   });
 }
 
+function validateEditorial(block, file, at, out) {
+  for (const prop of ["excerpt", "date", "id"]) {
+    if (block[prop] !== undefined && (typeof block[prop] !== "string" || !block[prop].trim())) {
+      out.push(mk(ERROR, "block-prop", file, `${at}.${prop} must be a non-empty string`));
+    }
+  }
+  if (block.ctaVariant !== undefined && block.ctaVariant !== "button" && block.ctaVariant !== "link") {
+    out.push(mk(ERROR, "block-prop", file, `${at}.ctaVariant must be button or link`));
+  }
+  if (typeof block.ctaHref === "string" && !isSafeStorefrontHref(block.ctaHref)) {
+    out.push(mk(ERROR, "navigation-href", file, `${at}.ctaHref must be a same-storefront root-relative path`));
+  }
+}
+
 function validateHomeDoc(doc, file, tenantId) {
   const out = [];
   if (doc == null || typeof doc !== "object" || Array.isArray(doc)) {
@@ -620,12 +634,16 @@ function validateHomeDoc(doc, file, tenantId) {
     if (component === "hero" && block.notice !== undefined && (typeof block.notice !== "string" || !block.notice.trim())) {
       out.push(mk(ERROR, "block-prop", file, `${at}.notice must be a non-empty plain-text string`));
     }
+    if (block.id !== undefined && (typeof block.id !== "string" || !block.id.trim())) {
+      out.push(mk(ERROR, "block-prop", file, `${at}.id must be a non-empty string`));
+    }
     if (component === "editorial" && block.image !== undefined) {
       validateVisualAsset(block.image, file, `${at}.image`, out, tenantId);
       if (typeof block.imageAlt !== "string") {
         out.push(mk(ERROR, "block-required", file, `${at}.imageAlt is required when ${at}.image is supplied`));
       }
     }
+    if (component === "editorial") validateEditorial(block, file, at, out);
     if (component === "promo_tiles") validatePromoTiles(block, file, at, out, tenantId);
     if (component === "trust_strip") validateTrustStrip(block, file, at, out, tenantId);
     if (component === "faq") validateFaq(block, file, at, out);